[java-identity-provider COMMIT] in /trunk: idp-saml-api/src/main/java/net/shibboleth/idp/saml/nameid/NameIdentifierAt...

[noreply at shibboleth.net]

Author: scantor
Date: Tue Jan 28 18:41:02 2014
New Revision: 5265

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5265&view=rev
Log:
Require legacy NameID encoders to support format predicate.

Modified:
    trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/nameid/NameIdentifierAttributeEncoder.java
    trunk/idp-saml-api/src/test/java/net/shibboleth/idp/saml/attribute/encoding/AbstractSAML1NameIdentifierEncoderTest.java
    trunk/idp-saml-api/src/test/java/net/shibboleth/idp/saml/attribute/encoding/AbstractSAML2NameIDEncoderTest.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/attribute/encoding/SAML1StringNameIdentifierEncoder.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/attribute/encoding/SAML1XMLObjectNameIdentifierEncoder.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/attribute/encoding/SAML2StringNameIDEncoder.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/attribute/encoding/SAML2XMLObjectNameIDEncoder.java

Modified: trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/nameid/NameIdentifierAttributeEncoder.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/nameid/NameIdentifierAttributeEncoder.java?rev=5265&r1=5264&r2=5265&view=diff
==============================================================================
--- trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/nameid/NameIdentifierAttributeEncoder.java (original)
+++ trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/nameid/NameIdentifierAttributeEncoder.java Tue Jan 28 18:41:02 2014
@@ -21,13 +21,18 @@
 
 import org.opensaml.saml.common.SAMLObject;
 
+import com.google.common.base.Predicate;
+
 /**
  * Marker interface for {@link AttributeEncoder} that produces SAML name identifiers
  * instead of attributes.
  * 
+ * <p>Implementations must be able to support a predicate test indicating
+ * support, or not, for a particular name identifier format.</p> 
+ * 
  * @param <NameIdType>  type of object produced
  */
 public interface NameIdentifierAttributeEncoder<NameIdType extends SAMLObject>
-    extends AttributeEncoder<NameIdType> {
+    extends AttributeEncoder<NameIdType>, Predicate<String> {
 
 }

Modified: trunk/idp-saml-api/src/test/java/net/shibboleth/idp/saml/attribute/encoding/AbstractSAML1NameIdentifierEncoderTest.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-saml-api/src/test/java/net/shibboleth/idp/saml/attribute/encoding/AbstractSAML1NameIdentifierEncoderTest.java?rev=5265&r1=5264&r2=5265&view=diff
==============================================================================
--- trunk/idp-saml-api/src/test/java/net/shibboleth/idp/saml/attribute/encoding/AbstractSAML1NameIdentifierEncoderTest.java (original)
+++ trunk/idp-saml-api/src/test/java/net/shibboleth/idp/saml/attribute/encoding/AbstractSAML1NameIdentifierEncoderTest.java Tue Jan 28 18:41:02 2014
@@ -35,8 +35,12 @@
             public NameIdentifier encode(IdPAttribute attribute) throws AttributeEncodingException {
                 return null;
             }
+
+            public boolean apply(String input) {
+                return false;
+            }
         };
         // Again, use constants
         Assert.assertEquals(encoder.getProtocol(), "urn:oasis:names:tc:SAML:1.1:protocol");
     }
-}
+}

Modified: trunk/idp-saml-api/src/test/java/net/shibboleth/idp/saml/attribute/encoding/AbstractSAML2NameIDEncoderTest.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-saml-api/src/test/java/net/shibboleth/idp/saml/attribute/encoding/AbstractSAML2NameIDEncoderTest.java?rev=5265&r1=5264&r2=5265&view=diff
==============================================================================
--- trunk/idp-saml-api/src/test/java/net/shibboleth/idp/saml/attribute/encoding/AbstractSAML2NameIDEncoderTest.java (original)
+++ trunk/idp-saml-api/src/test/java/net/shibboleth/idp/saml/attribute/encoding/AbstractSAML2NameIDEncoderTest.java Tue Jan 28 18:41:02 2014
@@ -41,13 +41,15 @@
                 return null;
             }
 
-            @Nullable public
-                    AttributeMapper<RequestedAttribute, IdPRequestedAttribute>
-                    getMapper(String name) {
+            @Nullable public AttributeMapper<RequestedAttribute, IdPRequestedAttribute> getMapper(String name) {
                 return null;
+            }
+
+            public boolean apply(String input) {
+                return false;
             }
         };
         // Again, use constants
         Assert.assertEquals(encoder.getProtocol(), "urn:oasis:names:tc:SAML:2.0:protocol");
     }
-}
+}

Modified: trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/attribute/encoding/SAML1StringNameIdentifierEncoder.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/attribute/encoding/SAML1StringNameIdentifierEncoder.java?rev=5265&r1=5264&r2=5265&view=diff

[... 97 lines stripped ...]