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

[noreply at shibboleth.net]

Author: rdw
Date: Tue Apr 17 11:53:58 2012
New Revision: 4176

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4176&view=rev
Log:
More work to recognise that Attributes carry AttributeValues not Objects, including tightening up the types in and around the internal APIS.

Add tests for the NameID and NameIdentifier encoders.

Added:
    trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/attribute/encoding/Saml1XmlObjectSubjectNameIdentifierEncoderTest.java   (with props)
    trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/attribute/encoding/Saml2XmlObjectSubjectNameIDEncoderTest.java   (with props)
Modified:
    trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/attribute/encoding/AbstractSamlAttributeEncoder.java
    trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/attribute/encoding/AbstractSamlNameIdentifierEncoder.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/attribute/encoding/Saml1ByteAttributeEncoder.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/attribute/encoding/Saml1StringAttributeEncoder.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/attribute/encoding/Saml1XmlObjectAttributeEncoder.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/attribute/encoding/Saml1XmlObjectSubjectNameIdentifierEncoder.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/attribute/encoding/Saml2ByteAttributeEncoder.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/attribute/encoding/Saml2StringAttributeEncoder.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/attribute/encoding/Saml2XmlObjectAttributeEncoder.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/attribute/encoding/Saml2XmlObjectSubjectNameIDEncoder.java
    trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/attribute/encoding/Saml1StringAttributeEncoderTest.java
    trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/attribute/encoding/Saml2StringAttributeEncoderTest.java

Modified: trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/attribute/encoding/AbstractSamlAttributeEncoder.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/attribute/encoding/AbstractSamlAttributeEncoder.java?rev=4176&r1=4175&r2=4176&view=diff
==============================================================================
--- trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/attribute/encoding/AbstractSamlAttributeEncoder.java (original)
+++ trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/attribute/encoding/AbstractSamlAttributeEncoder.java Tue Apr 17 11:53:58 2012
@@ -129,7 +129,7 @@
 
         EncodedType attributeValue;
         XMLObject samlAttributeValue;
-        for (Object o : attribute.getValues()) {
+        for (AttributeValue o : attribute.getValues()) {
             if (o == null) {
                 log.debug("Skipping null value of attribute {}", attributeId);
                 continue;
@@ -169,7 +169,7 @@
      * @return true if the encoder can encoder this value, false if not
      */
     protected abstract boolean
-            canEncodeValue(final net.shibboleth.idp.attribute.Attribute attribute, final Object value);
+            canEncodeValue(final net.shibboleth.idp.attribute.Attribute attribute, final AttributeValue value);
 
     /**
      * Encodes an attribute value in to a SAML attribute value element.

Modified: trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/attribute/encoding/AbstractSamlNameIdentifierEncoder.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/attribute/encoding/AbstractSamlNameIdentifierEncoder.java?rev=4176&r1=4175&r2=4176&view=diff
==============================================================================
--- trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/attribute/encoding/AbstractSamlNameIdentifierEncoder.java (original)
+++ trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/attribute/encoding/AbstractSamlNameIdentifierEncoder.java Tue Apr 17 11:53:58 2012
@@ -17,6 +17,8 @@
 
 package net.shibboleth.idp.saml.attribute.encoding;
 
+import org.opensaml.saml.common.SAMLObject;
+
 import net.shibboleth.idp.attribute.AttributeEncoder;
 import net.shibboleth.utilities.java.support.primitive.StringSupport;
 
@@ -25,7 +27,8 @@
  * 
  * @param <NameIdType> type of name identifier produced by this encoder
  */
-public abstract class AbstractSamlNameIdentifierEncoder<NameIdType> implements AttributeEncoder<NameIdType> {
+public abstract class AbstractSamlNameIdentifierEncoder<NameIdType extends SAMLObject> implements
+        AttributeEncoder<NameIdType> {
 
     /** The format of the name identifier. */
     private String format;

Modified: trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/attribute/encoding/Saml1ByteAttributeEncoder.java

[... 249 lines stripped ...]