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

[noreply at shibboleth.net]

Author: rdw
Date: Mon Jan  7 05:45:41 2013
New Revision: 4253

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4253&view=rev
Log:
https://issues.shibboleth.net/jira/browse/IDP-13

Cleanup some code structure and most notably:  The IdP EntityId is the NameQualifier, the SP one is the NameSPQualifier.

Modified:
    trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/ad/SAML2NameIDAttributeDefinition.java
    trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/ad/SAML2NameIDAttributeDefinitionTest.java

Modified: trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/ad/SAML2NameIDAttributeDefinition.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/ad/SAML2NameIDAttributeDefinition.java?rev=4253&r1=4252&r2=4253&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/ad/SAML2NameIDAttributeDefinition.java (original)
+++ trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/ad/SAML2NameIDAttributeDefinition.java Mon Jan  7 05:45:41 2013
@@ -74,9 +74,9 @@
     private Function<AttributeResolutionContext, String> relyingPartyEntityIdStrategy;
 
     /** Strategy used to locate the IdP EntityId given a {@link AttributeResolutionContext}. */
+    // TODO(rdw) These needs to be changed when the profile handling has been finalized
     private Function<AttributeResolutionContext, String> idPEntityIdStrategy;
 
-    // TODO(rdw) These needs to be changed when the profile handling has been finalized
 
     /**
      * Constructor.
@@ -206,14 +206,16 @@
      * 
      * @return the constructed NameID
      */
-    protected NameID buildNameId(String nameIdValue, AttributeResolutionContext resolutionContext) {
+    protected NameID buildNameId(@Nonnull String nameIdValue, @Nonnull AttributeResolutionContext resolutionContext) {
+
+        log.debug("NameIdAttribute {} : Building a SAML2 NameID with value for {}", getId(), nameIdValue);
+
+        final String relyingPartyEntityId = relyingPartyEntityIdStrategy.apply(resolutionContext);
+        final String idpEntityId = idPEntityIdStrategy.apply(resolutionContext);
+
         NameID nameId = nameIDBuilder.buildObject();
         nameId.setValue(nameIdValue);
 
-        log.debug("NameIdAttribute {} : Building a SAML2 NameID with value for {}", getId(), nameIdValue);
-
-        final String relyingPartyEntityId = relyingPartyEntityIdStrategy.apply(resolutionContext);
-        final String idpEntityId = idPEntityIdStrategy.apply(resolutionContext);
 
         if (nameIdFormat != null) {
             nameId.setFormat(nameIdFormat);
@@ -222,13 +224,13 @@
         if (nameIdQualifier != null) {
             nameId.setNameQualifier(nameIdQualifier);
         } else {
-            nameId.setNameQualifier(relyingPartyEntityId);
+            nameId.setNameQualifier(idpEntityId);
         }
 
         if (nameIdSPQualifier != null) {
             nameId.setSPNameQualifier(nameIdSPQualifier);
         } else {
-            nameId.setSPNameQualifier(idpEntityId);
+            nameId.setSPNameQualifier(relyingPartyEntityId);
         }
 
         return nameId;

Modified: trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/ad/SAML2NameIDAttributeDefinitionTest.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/SAML2NameIDAttributeDefinitionTest.java?rev=4253&r1=4252&r2=4253&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/ad/SAML2NameIDAttributeDefinitionTest.java (original)
+++ trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/ad/SAML2NameIDAttributeDefinitionTest.java Mon Jan  7 05:45:41 2013
@@ -124,8 +124,8 @@
             NameID id = (NameID) val.getValue();
             Assert.assertNull(id.getFormat());
             Assert.assertNull(id.getSPProvidedID());
-            Assert.assertEquals(id.getSPNameQualifier(), IDP_ENTITY_ID);
-            Assert.assertEquals(id.getNameQualifier(), SP_ENTITY_ID);
+            Assert.assertEquals(id.getSPNameQualifier(), SP_ENTITY_ID);
+            Assert.assertEquals(id.getNameQualifier(), IDP_ENTITY_ID);
             nameValues.add(id.getValue());
         }
         Assert.assertTrue(nameValues.contains(TestSources.COMMON_ATTRIBUTE_VALUE_STRING));