[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: Thu Apr 19 13:28:38 2012
New Revision: 4177

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4177&view=rev
Log:
IDP-168 Unit tests for Attriburte encoder base classes.  Some bug fixes to them but also use of ComponentSupport and addition of annotations

Added:
    trunk/idp-saml-api/src/test/java/net/shibboleth/idp/saml/attribute/
    trunk/idp-saml-api/src/test/java/net/shibboleth/idp/saml/attribute/encoding/
    trunk/idp-saml-api/src/test/java/net/shibboleth/idp/saml/attribute/encoding/AbstractSaml1AttributeEncoderTest.java   (with props)
    trunk/idp-saml-api/src/test/java/net/shibboleth/idp/saml/attribute/encoding/AbstractSaml1NameIdentifierEncoderTest.java   (with props)
    trunk/idp-saml-api/src/test/java/net/shibboleth/idp/saml/attribute/encoding/AbstractSaml2AttributeEncoderTest.java   (with props)
    trunk/idp-saml-api/src/test/java/net/shibboleth/idp/saml/attribute/encoding/AbstractSaml2NameIdentifierEncoderTest.java   (with props)
    trunk/idp-saml-api/src/test/java/net/shibboleth/idp/saml/attribute/encoding/AbstractSamlAttributeEncoderTest.java   (with props)
    trunk/idp-saml-api/src/test/java/net/shibboleth/idp/saml/attribute/encoding/AbstractSamlNameIdentifierEncoderTest.java   (with props)
    trunk/idp-saml-api/src/test/java/net/shibboleth/idp/saml/attribute/encoding/SamlEncoderSupportTest.java   (with props)
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/AbstractSaml1NameIdentifierEncoder.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/AbstractSaml2NameIdentifierEncoder.java
    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-api/src/main/java/net/shibboleth/idp/saml/attribute/encoding/SamlEncoderSupport.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=4177&r1=4176&r2=4177&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 Thu Apr 19 13:28:38 2012
@@ -19,8 +19,12 @@
 
 import java.util.List;
 
+import javax.annotation.Nonnull;
+
 import net.shibboleth.idp.attribute.AttributeEncodingException;
 import net.shibboleth.idp.attribute.AttributeValue;
+import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
+import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
 
 import org.opensaml.core.xml.XMLObject;
 import org.opensaml.core.xml.config.XMLObjectProviderRegistrySupport;
@@ -49,13 +53,13 @@
     }
 
     /** {@inheritDoc} */
-    public final String getProtocol() {
+    @Nonnull @NotEmpty public final String getProtocol() {
         return SAMLConstants.SAML10P_NS;
     }
 
     /** {@inheritDoc} */
-    protected Attribute buildAttribute(final net.shibboleth.idp.attribute.Attribute attribute,
-            final List<XMLObject> attributeValues) throws AttributeEncodingException {
+    protected Attribute buildAttribute(@Nonnull final net.shibboleth.idp.attribute.Attribute attribute,
+            @Nonnull @NonnullElements final List<XMLObject> attributeValues) throws AttributeEncodingException {
 
         final Attribute samlAttribute = attributeBuilder.buildObject();
         samlAttribute.setAttributeName(getName());

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=4177&r1=4176&r2=4177&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 Thu Apr 19 13:28:38 2012
@@ -17,6 +17,8 @@
 
 package net.shibboleth.idp.saml.attribute.encoding;
 
+import javax.annotation.Nonnull;
+
 import org.opensaml.saml.common.xml.SAMLConstants;
 import org.opensaml.saml.saml1.core.NameIdentifier;
 
@@ -24,7 +26,7 @@

[... 355 lines stripped ...]