[java-identity-provider] 24/27: Wire registry service into SAML 1 queries and fix test.

[Scott Cantor]

This is an automated email from the git hooks/post-receive script.

scantor pushed a commit to branch feature/IDP-1434
in repository java-identity-provider.

View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=8a4e8b63230f6f4be2348250af6cb06b0b703124

commit 8a4e8b63230f6f4be2348250af6cb06b0b703124
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Thu May 2 15:13:14 2019 -0400

    Wire registry service into SAML 1 queries and fix test.
---
 .../src/main/resources/system/flows/saml/saml-abstract-beans.xml     | 4 ----
 .../main/resources/system/flows/saml/saml1/attribute-query-beans.xml | 4 ++++
 .../shibboleth/idp/test/flows/saml1/SAML1AttributeQueryFlowTest.java | 5 -----
 3 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/idp-conf/src/main/resources/system/flows/saml/saml-abstract-beans.xml b/idp-conf/src/main/resources/system/flows/saml/saml-abstract-beans.xml
index 1bedd54..183f3d9 100644
--- a/idp-conf/src/main/resources/system/flows/saml/saml-abstract-beans.xml
+++ b/idp-conf/src/main/resources/system/flows/saml/saml-abstract-beans.xml
@@ -239,10 +239,6 @@
         p:maskFailures="%{idp.service.attribute.filter.maskFailures:true}"
         p:metadataResolver-ref="shibboleth.MetadataResolver" />
 
-    <bean id="FilterByQueriedAttributeDesignators"
-        class="net.shibboleth.idp.saml.saml1.profile.impl.FilterByQueriedAttributeDesignators" scope="prototype"
-        c:mapper-ref="shibboleth.SAML1AttributeDesignatorsMapperService" />
-
     <bean id="FilterByQueriedAttributes"
         class="net.shibboleth.idp.saml.saml2.profile.impl.FilterByQueriedAttributes" scope="prototype"
         c:mapper-ref="shibboleth.SAML2AttributesMapperService" />
diff --git a/idp-conf/src/main/resources/system/flows/saml/saml1/attribute-query-beans.xml b/idp-conf/src/main/resources/system/flows/saml/saml1/attribute-query-beans.xml
index 4cf0537..974d005 100644
--- a/idp-conf/src/main/resources/system/flows/saml/saml1/attribute-query-beans.xml
+++ b/idp-conf/src/main/resources/system/flows/saml/saml1/attribute-query-beans.xml
@@ -41,6 +41,10 @@
         class="net.shibboleth.utilities.java.support.logic.FunctionSupport" factory-method="constant"
         c:_0-ref="shibboleth.OutgoingSOAPBindings" />
 
+    <bean id="FilterByQueriedAttributeDesignators"
+        class="net.shibboleth.idp.saml.saml1.profile.impl.FilterByQueriedAttributeDesignators" scope="prototype"
+        p:transcoderRegistry-ref="shibboleth.AttributeRegistryService" />
+
     <bean id="CopyNameIdentifierFromRequest"
             class="org.opensaml.saml.saml1.profile.impl.CopyNameIdentifierFromRequest" scope="prototype" />
 
diff --git a/idp-conf/src/test/java/net/shibboleth/idp/test/flows/saml1/SAML1AttributeQueryFlowTest.java b/idp-conf/src/test/java/net/shibboleth/idp/test/flows/saml1/SAML1AttributeQueryFlowTest.java
index a1b83a4..58a55a4 100644
--- a/idp-conf/src/test/java/net/shibboleth/idp/test/flows/saml1/SAML1AttributeQueryFlowTest.java
+++ b/idp-conf/src/test/java/net/shibboleth/idp/test/flows/saml1/SAML1AttributeQueryFlowTest.java
@@ -161,11 +161,6 @@ public class SAML1AttributeQueryFlowTest extends AbstractSAML1FlowTest {
             designator.setAttributeNamespace(SAMLConstants.SAML1_ATTR_NAMESPACE_URI);
             designator.setAttributeName("urn:mace:dir:attribute-def:mail");
             attributeQuery.getAttributeQuery().getAttributeDesignators().add(designator);
-    
-            designator = designatorBuilder.buildObject();
-            designator.setAttributeNamespace(SAMLConstants.SAML1_ATTR_NAMESPACE_URI);
-            designator.setAttributeName("urn:mace:dir:attribute-def:foo");
-            attributeQuery.getAttributeQuery().getAttributeDesignators().add(designator);
         }
 
         final Envelope envelope = buildSOAP11Envelope(attributeQuery);

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.