[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: Sun Aug  3 10:14:07 2014
New Revision: 6379

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6379&view=rev
Log:
IDP-458 remove assumption in populateMapper() that the friendlyName is non null.  Fixes a difficult to diag nose initialization bug

Modified:
    trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/attribute/encoding/AbstractSAML2AttributeEncoder.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/attribute/encoding/impl/SAML2ByteAttributeEncoder.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/attribute/encoding/impl/SAML2ScopedStringAttributeEncoder.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/attribute/encoding/impl/SAML2StringAttributeEncoder.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/attribute/encoding/impl/SAML2XMLObjectAttributeEncoder.java

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=6379&r1=6378&r2=6379&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 Sun Aug  3 10:14:07 2014
@@ -67,8 +67,7 @@
     }
 
     /** {@inheritDoc} */
-    @Override
-    @Nonnull public final String getProtocol() {
+    @Override @Nonnull public final String getProtocol() {
         return SAMLConstants.SAML20P_NS;
     }
 
@@ -88,7 +87,7 @@
      */
     public void setFriendlyName(@Nullable final String attributeFriendlyName) {
         ComponentSupport.ifInitializedThrowUnmodifiabledComponentException(this);
-        
+
         friendlyName = StringSupport.trimOrNull(attributeFriendlyName);
     }
 
@@ -100,7 +99,7 @@
     @Nullable public String getNameFormat() {
         return format;
     }
-    
+
     /**
      * Get the name format, or the SAML constants for "unspecified", if not set.
      * 
@@ -109,7 +108,7 @@
     @Nonnull @NotEmpty public String getEffectiveNameFormat() {
         return format != null ? format : Attribute.UNSPECIFIED;
     }
-    
+
     /**
      * Set the format of the attribute name.
      * 
@@ -117,13 +116,12 @@
      */
     public void setNameFormat(@Nullable final String nameFormat) {
         ComponentSupport.ifInitializedThrowUnmodifiabledComponentException(this);
-        
+
         format = StringSupport.trimOrNull(nameFormat);
     }
-    
+
     /** {@inheritDoc} */
-    @Override
-    @Nonnull protected Attribute buildAttribute(@Nonnull final IdPAttribute idpAttribute,
+    @Override @Nonnull protected Attribute buildAttribute(@Nonnull final IdPAttribute idpAttribute,
             @Nonnull @NonnullElements final List<XMLObject> attributeValues) throws AttributeEncodingException {
 
         final Attribute samlAttribute = attributeBuilder.buildObject();
@@ -135,14 +133,26 @@
         return samlAttribute;
     }
 
+    /**
+     * Generate an Id suitable for the mapper.
+     * 
+     * @return a suitable Id for the mapper
+     */
+    @Nonnull protected String getMapperId() {
+        ComponentSupport.ifNotInitializedThrowUninitializedComponentException(this);
+        if (null != getFriendlyName()) {
+            return "MapperFor" + getFriendlyName();
+        }
+        return "MapperForAttribute" + getFriendlyName();
+    }
+
     /** {@inheritDoc} */
-    @Override
-    public boolean equals(Object obj) {
+    @Override public boolean equals(Object obj) {
 
         if (!super.equals(obj)) {
             return false;
         }
-        
+
         if (!(obj instanceof AbstractSAML2AttributeEncoder)) {
             return false;
         }
@@ -153,8 +163,7 @@
     }
 
     /** {@inheritDoc} */
-    @Override
-    public int hashCode() {
+    @Override public int hashCode() {
         return Objects.hashCode(super.hashCode(), getEffectiveNameFormat());
     }
 }

Modified: trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/attribute/encoding/impl/SAML2ByteAttributeEncoder.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/attribute/encoding/impl/SAML2ByteAttributeEncoder.java?rev=6379&r1=6378&r2=6379&view=diff
==============================================================================
--- trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/attribute/encoding/impl/SAML2ByteAttributeEncoder.java (original)
+++ trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/attribute/encoding/impl/SAML2ByteAttributeEncoder.java Sun Aug  3 10:14:07 2014
@@ -59,7 +59,7 @@
     @Override @Nonnull public void populateAttributeMapper(final
             AbstractSAMLAttributeMapper<RequestedAttribute, IdPRequestedAttribute> mapper) {

[... 52 lines stripped ...]