[java-identity-provider COMMIT] in /trunk: idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/res...

[noreply at shibboleth.net]

Author: rdw
Date: Tue Jan 28 07:47:47 2014
New Revision: 5254

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5254&view=rev
Log:
IDP-359 Further refactoring of NameID C14N

The actual decoding gets offloaded into an Interface and the previous monolith gets
split into a Generic NameID canonicalization and a specific Transient decoder.

Betters tests for both classes in the defining module.

Added:
    trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/nameid/NameIdentifierAttributeDecoder.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/nameid/NameIDCanonicalization.java
      - copied, changed from r5253, trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/nameid/NameIDTransientCanonicalization.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/nameid/TransientDecoder.java
      - copied, changed from r5253, trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/nameid/AbstractTransientCanonicalization.java
    trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/nameid/NameIDCanonicalizationTest.java
    trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/nameid/TransientDecoderTest.java
Modified:
    trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/ad/TransientIdAttributeDefinitionTest.java
    trunk/idp-saml-impl/pom.xml
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/nameid/AbstractSAMLNameCanonicalization.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/nameid/AbstractTransientCanonicalization.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/nameid/NameIDTransientCanonicalization.java

Modified: trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/ad/TransientIdAttributeDefinitionTest.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/ad/TransientIdAttributeDefinitionTest.java?rev=5254&r1=5253&r2=5254&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/ad/TransientIdAttributeDefinitionTest.java (original)
+++ trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/ad/TransientIdAttributeDefinitionTest.java Tue Jan 28 07:47:47 2014
@@ -32,7 +32,8 @@
 import net.shibboleth.idp.authn.context.SubjectCanonicalizationContext;
 import net.shibboleth.idp.saml.authn.principal.NameIDPrincipal;
 import net.shibboleth.idp.saml.impl.attribute.encoding.SAML2StringNameIDEncoder;
-import net.shibboleth.idp.saml.impl.nameid.NameIDTransientCanonicalization;
+import net.shibboleth.idp.saml.impl.nameid.NameIDCanonicalization;
+import net.shibboleth.idp.saml.impl.nameid.TransientDecoder;
 import net.shibboleth.idp.saml.nameid.TransientIdParameters;
 import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
 
@@ -205,9 +206,15 @@
         encoder.setNameFormat("https://example.org/");
         final NameID nameid = encoder.encode(result);
         
-        final NameIDTransientCanonicalization canon = new NameIDTransientCanonicalization();
+        final TransientDecoder decoder = new TransientDecoder();
+        decoder.setIdStore(store);
+        decoder.setId("Transient Decoder");
+        decoder.initialize();
+
+        final NameIDCanonicalization canon = new NameIDCanonicalization();
         canon.setFormats(Collections.singleton("https://example.org/"));
-        canon.setIdStore(store);
+        canon.setDecoder(decoder);
+        canon.initialize();
         
         final ProfileRequestContext prc = new ProfileRequestContext<>();
         final SubjectCanonicalizationContext scc = prc.getSubcontext(SubjectCanonicalizationContext.class, true);
@@ -218,7 +225,6 @@
         scc.setRequesterId(TestSources.SP_ENTITY_ID);
         scc.setResponderId(TestSources.IDP_ENTITY_ID);
         
-        canon.initialize();
         canon.execute(prc);
         
         ActionTestingSupport.assertProceedEvent(prc);

Modified: trunk/idp-saml-impl/pom.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-saml-impl/pom.xml?rev=5254&r1=5253&r2=5254&view=diff
==============================================================================
--- trunk/idp-saml-impl/pom.xml (original)
+++ trunk/idp-saml-impl/pom.xml Tue Jan 28 07:47:47 2014
@@ -66,6 +66,11 @@
         <dependency>
             <groupId>${opensaml.groupId}</groupId>
             <artifactId>opensaml-xmlsec-api</artifactId>
+            <version>${opensaml.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>${opensaml.groupId}</groupId>
+            <artifactId>opensaml-storage-api</artifactId>
             <version>${opensaml.version}</version>
         </dependency>
         <dependency>
@@ -142,6 +147,12 @@
             <type>test-jar</type>

[... 287 lines stripped ...]