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

[noreply at shibboleth.net]

Author: scantor
Date: Thu Mar 13 23:13:46 2014
New Revision: 5570

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5570&view=rev
Log:
Reduce code duplication in NameID generators, add Persistent SAML2 generator.

Added:
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/nameid/PersistentSAML2NameIDGenerator.java   (with props)
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/profile/config/navigate/RelyingPartyIdLookupFunction.java   (with props)
Modified:
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/attribute/resolver/ComputedIDDataConnector.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/attribute/resolver/StoredIDDataConnector.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/nameid/AttributeSourcedSAML1NameIdentifierGenerator.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/nameid/AttributeSourcedSAML2NameIDGenerator.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/nameid/ComputedPersistentIdGenerationStrategy.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/nameid/PersistentIdGenerationStrategy.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/nameid/StoredPersistentIdGenerationStrategy.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/nameid/TransientSAML1NameIdentifierGenerator.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/nameid/TransientSAML2NameIDGenerator.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/nameid/package-info.java

Modified: trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/attribute/resolver/ComputedIDDataConnector.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/attribute/resolver/ComputedIDDataConnector.java?rev=5570&r1=5569&r2=5570&view=diff
==============================================================================
--- trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/attribute/resolver/ComputedIDDataConnector.java (original)
+++ trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/attribute/resolver/ComputedIDDataConnector.java Thu Mar 13 23:13:46 2014
@@ -142,7 +142,8 @@
         }
         
         try {
-            return encodeAsAttribute(idStrategy.get(attributeIssuerId, attributeRecipientID, principalName, sourceId));
+            return encodeAsAttribute(idStrategy.generate(attributeIssuerId, attributeRecipientID, principalName,
+                    sourceId));
         } catch (final ProfileException e) {
             throw new ResolutionException(e);
         }

Modified: trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/attribute/resolver/StoredIDDataConnector.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/attribute/resolver/StoredIDDataConnector.java?rev=5570&r1=5569&r2=5570&view=diff
==============================================================================
--- trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/attribute/resolver/StoredIDDataConnector.java (original)
+++ trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/attribute/resolver/StoredIDDataConnector.java Thu Mar 13 23:13:46 2014
@@ -159,7 +159,7 @@
         }
 
         try {
-            return encodeAsAttribute(storedIdStrategy.get(attributeIssuerID, attributeRecipientID, principalName,
+            return encodeAsAttribute(storedIdStrategy.generate(attributeIssuerID, attributeRecipientID, principalName,
                     sourceId));
         } catch (final ProfileException e) {
             throw new ResolutionException(e);

Modified: trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/nameid/AttributeSourcedSAML1NameIdentifierGenerator.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/nameid/AttributeSourcedSAML1NameIdentifierGenerator.java?rev=5570&r1=5569&r2=5570&view=diff
==============================================================================
--- trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/nameid/AttributeSourcedSAML1NameIdentifierGenerator.java (original)
+++ trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/nameid/AttributeSourcedSAML1NameIdentifierGenerator.java Thu Mar 13 23:13:46 2014
@@ -32,7 +32,8 @@
 import net.shibboleth.idp.attribute.XMLObjectAttributeValue;
 import net.shibboleth.idp.attribute.context.AttributeContext;
 import net.shibboleth.idp.profile.context.RelyingPartyContext;
-import net.shibboleth.idp.relyingparty.RelyingPartyConfiguration;
+import net.shibboleth.idp.saml.impl.profile.config.navigate.RelyingPartyIdLookupFunction;
+import net.shibboleth.idp.saml.impl.profile.config.navigate.ResponderIdLookupFunction;
 import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;

[... 445 lines stripped ...]