[java-identity-provider COMMIT] in /trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml: attribute/encoding/Abst...

[noreply at shibboleth.net]

Author: scantor
Date: Tue Jan 28 17:51:43 2014
New Revision: 5261

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5261&view=rev
Log:
Add marker interfaces for version-specific NameID encoders.

Added:
    trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/nameid/SAML1NameIdentifierAttributeEncoder.java   (with props)
    trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/nameid/SAML2NameIDAttributeEncoder.java   (with props)
Modified:
    trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/attribute/encoding/AbstractSAML1NameIdentifierEncoder.java
    trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/attribute/encoding/AbstractSAML2NameIDEncoder.java

Modified: trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/attribute/encoding/AbstractSAML1NameIdentifierEncoder.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/attribute/encoding/AbstractSAML1NameIdentifierEncoder.java?rev=5261&r1=5260&r2=5261&view=diff
==============================================================================
--- trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/attribute/encoding/AbstractSAML1NameIdentifierEncoder.java (original)
+++ trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/attribute/encoding/AbstractSAML1NameIdentifierEncoder.java Tue Jan 28 17:51:43 2014
@@ -19,15 +19,15 @@
 
 import javax.annotation.Nonnull;
 
-import net.shibboleth.idp.saml.nameid.NameIdentifierAttributeEncoder;
+import net.shibboleth.idp.saml.nameid.SAML1NameIdentifierAttributeEncoder;
 
 import org.opensaml.saml.common.xml.SAMLConstants;
-import org.opensaml.saml.saml1.core.NameIdentifier;
 
-/** Base class for attribute encoders that produce a SAML 1 {@link NameIdentifier}. */
-public abstract class AbstractSAML1NameIdentifierEncoder implements NameIdentifierAttributeEncoder<NameIdentifier> {
+/** Base class for {@link SAML1NameIdentifierAttributeEncoder}s. */
+public abstract class AbstractSAML1NameIdentifierEncoder implements SAML1NameIdentifierAttributeEncoder {
 
     /** {@inheritDoc} */
+    @Override
     @Nonnull public final String getProtocol() {
         return SAMLConstants.SAML11P_NS;
     }

Modified: trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/attribute/encoding/AbstractSAML2NameIDEncoder.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/attribute/encoding/AbstractSAML2NameIDEncoder.java?rev=5261&r1=5260&r2=5261&view=diff
==============================================================================
--- trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/attribute/encoding/AbstractSAML2NameIDEncoder.java (original)
+++ trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/attribute/encoding/AbstractSAML2NameIDEncoder.java Tue Jan 28 17:51:43 2014
@@ -19,13 +19,12 @@
 
 import javax.annotation.Nonnull;
 
-import net.shibboleth.idp.saml.nameid.NameIdentifierAttributeEncoder;
+import net.shibboleth.idp.saml.nameid.SAML2NameIDAttributeEncoder;
 
 import org.opensaml.saml.common.xml.SAMLConstants;
-import org.opensaml.saml.saml2.core.NameID;
 
-/** Base class for attribute encoders that produce a SAML 2 {@link NameID}. */
-public abstract class AbstractSAML2NameIDEncoder implements NameIdentifierAttributeEncoder<NameID> {
+/** Base class for {@link SAML2NameIDAttributeEncoder}s. */
+public abstract class AbstractSAML2NameIDEncoder implements SAML2NameIDAttributeEncoder {
 
     /** {@inheritDoc} */
     @Nonnull public final String getProtocol() {