[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: Fri Apr 13 09:59:07 2012
New Revision: 4174

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4174&view=rev
Log:
IDP 169.  Encoders now take <foo extends AttributeValue> rather than <foo>

Modified:
    trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/attribute/encoding/AbstractSaml1AttributeEncoder.java
    trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/attribute/encoding/AbstractSaml2AttributeEncoder.java
    trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/attribute/encoding/AbstractSamlAttributeEncoder.java

Modified: trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/attribute/encoding/AbstractSaml1AttributeEncoder.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/attribute/encoding/AbstractSaml1AttributeEncoder.java?rev=4174&r1=4173&r2=4174&view=diff
==============================================================================
--- trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/attribute/encoding/AbstractSaml1AttributeEncoder.java (original)
+++ trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/attribute/encoding/AbstractSaml1AttributeEncoder.java Fri Apr 13 09:59:07 2012
@@ -20,6 +20,7 @@
 import java.util.List;
 
 import net.shibboleth.idp.attribute.AttributeEncodingException;
+import net.shibboleth.idp.attribute.AttributeValue;
 
 import org.opensaml.core.xml.XMLObject;
 import org.opensaml.core.xml.config.XMLObjectProviderRegistrySupport;
@@ -32,7 +33,7 @@
  * 
  * @param <EncodedType> the type of data that can be encoded by the encoder
  */
-public abstract class AbstractSaml1AttributeEncoder<EncodedType> extends
+public abstract class AbstractSaml1AttributeEncoder<EncodedType extends AttributeValue> extends
         AbstractSamlAttributeEncoder<Attribute, EncodedType> {
 
     /** Builder used to construct {@link Attribute} objects. */

Modified: trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/attribute/encoding/AbstractSaml2AttributeEncoder.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/attribute/encoding/AbstractSaml2AttributeEncoder.java?rev=4174&r1=4173&r2=4174&view=diff
==============================================================================
--- trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/attribute/encoding/AbstractSaml2AttributeEncoder.java (original)
+++ trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/attribute/encoding/AbstractSaml2AttributeEncoder.java Fri Apr 13 09:59:07 2012
@@ -20,6 +20,7 @@
 import java.util.List;
 
 import net.shibboleth.idp.attribute.AttributeEncodingException;
+import net.shibboleth.idp.attribute.AttributeValue;
 import net.shibboleth.utilities.java.support.component.UnmodifiableComponentException;
 import net.shibboleth.utilities.java.support.primitive.StringSupport;
 
@@ -34,7 +35,7 @@
  * 
  * @param <EncodedType> the type of data that can be encoded by the encoder
  */
-public abstract class AbstractSaml2AttributeEncoder<EncodedType> extends
+public abstract class AbstractSaml2AttributeEncoder<EncodedType extends AttributeValue> extends
         AbstractSamlAttributeEncoder<Attribute, EncodedType> {
 
     /** Builder used to construct {@link Attribute} objects. */

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=4174&r1=4173&r2=4174&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 Fri Apr 13 09:59:07 2012
@@ -22,6 +22,7 @@
 
 import net.shibboleth.idp.attribute.AttributeEncoder;
 import net.shibboleth.idp.attribute.AttributeEncodingException;
+import net.shibboleth.idp.attribute.AttributeValue;
 import net.shibboleth.utilities.java.support.component.AbstractInitializableComponent;
 import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
 import net.shibboleth.utilities.java.support.component.UnmodifiableComponent;
@@ -40,8 +41,8 @@
  * @param <EncodedType> the type of data that can be encoded by the encoder
  */
 // TODO display name and description
-public abstract class AbstractSamlAttributeEncoder<AttributeType extends SAMLObject, EncodedType> extends
-        AbstractInitializableComponent implements AttributeEncoder<AttributeType>, UnmodifiableComponent {
+public abstract class AbstractSamlAttributeEncoder<AttributeType extends SAMLObject, EncodedType extends AttributeValue>
+        extends AbstractInitializableComponent implements AttributeEncoder<AttributeType>, UnmodifiableComponent {
 
     /** Class logger. */

[... 22 lines stripped ...]