[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 May  2 11:22:11 2013
New Revision: 4453

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4453&view=rev
Log:
IDP-284  Attribute encoders never return null.  Fix the annotation and the code for the concrete implementations.

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
    trunk/idp-saml-api/src/test/java/net/shibboleth/idp/saml/attribute/encoding/AbstractSamlAttributeEncoderTest.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/attribute/encoding/Saml1StringSubjectNameIdentifierEncoder.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/Saml2StringSubjectNameIDEncoder.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/Saml1ByteAttributeEncoderTest.java
    trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/attribute/encoding/Saml1ScopedStringAttributeEncoderTest.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/Saml1StringSubjectNameIdentifierEncoderTest.java
    trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/attribute/encoding/Saml1XmlObjectAttributeEncoderTest.java
    trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/attribute/encoding/Saml1XmlObjectSubjectNameIdentifierEncoderTest.java
    trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/attribute/encoding/Saml2ByteAttributeEncoderTest.java
    trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/attribute/encoding/Saml2ScopedStringAttributeEncoderTest.java
    trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/attribute/encoding/Saml2StringAttributeEncoderTest.java
    trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/attribute/encoding/Saml2StringSubjectNameIDEncoderTest.java
    trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/attribute/encoding/Saml2XmlObjectAttributeEncoderTest.java
    trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/attribute/encoding/Saml2XmlObjectSubjectNameIDEncoderTest.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=4453&r1=4452&r2=4453&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 May  2 11:22:11 2013
@@ -58,7 +58,7 @@
     }
 
     /** {@inheritDoc} */
-    protected Attribute buildAttribute(@Nonnull final net.shibboleth.idp.attribute.Attribute attribute,
+    @Nonnull protected Attribute buildAttribute(@Nonnull final net.shibboleth.idp.attribute.Attribute attribute,
             @Nonnull @NonnullElements final List<XMLObject> attributeValues) throws AttributeEncodingException {
 
         final Attribute samlAttribute = attributeBuilder.buildObject();

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=4453&r1=4452&r2=4453&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 Thu May  2 11:22:11 2013
@@ -96,7 +96,7 @@
 
 
     /** {@inheritDoc} */
-    protected Attribute buildAttribute(final net.shibboleth.idp.attribute.Attribute attribute,
+    @Nonnull protected Attribute buildAttribute(final net.shibboleth.idp.attribute.Attribute attribute,
             final List<XMLObject> attributeValues) throws AttributeEncodingException {
 
         final Attribute samlAttribute = attributeBuilder.buildObject();

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

[... 1162 lines stripped ...]