[java-identity-provider COMMIT] /trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resol...

[noreply at shibboleth.net]

Author: rdw
Date: Mon Feb 23 09:56:55 2015
New Revision: 7367

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7367&view=rev
Log:
IDP-621 use the new Spring mechanism to stop the "name" attribute being parsed as an alias.

Modified:
    trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/enc/BaseAttributeEncoderParser.java

Modified: trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/enc/BaseAttributeEncoderParser.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/enc/BaseAttributeEncoderParser.java?rev=7367&r1=7366&r2=7367&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/enc/BaseAttributeEncoderParser.java (original)
+++ trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/enc/BaseAttributeEncoderParser.java Mon Feb 23 09:56:55 2015
@@ -22,9 +22,7 @@
 import net.shibboleth.utilities.java.support.primitive.StringSupport;
 
 import org.springframework.beans.factory.BeanCreationException;
-import org.springframework.beans.factory.config.BeanDefinitionHolder;
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.springframework.beans.factory.support.BeanDefinitionRegistry;
 import org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser;
 import org.springframework.beans.factory.xml.ParserContext;
 import org.w3c.dom.Element;
@@ -77,17 +75,14 @@
 
     }
 
-    /** {@inheritDoc}
-     * We do <em>not</em> want Spring to add aliases derived from {@literal #NAME_ATTRIBUTE_NAME} so strip them out 
-     * from the registry. */
-    @Override protected void registerBeanDefinition(BeanDefinitionHolder definition, BeanDefinitionRegistry registry) {
-        // Register bean definition under primary name. Do *not* register the aliases.
-        String beanName = definition.getBeanName();
-        registry.registerBeanDefinition(beanName, definition.getBeanDefinition()); 
-    }
-
     /** {@inheritDoc} */
     @Override public boolean shouldGenerateId() {
         return true;
     }
+    
+    /** {@inheritDoc}. <br/> We parse the attribute "name" and we do not want Spring to. see #IDP-571. */
+    @Override
+    protected boolean shouldParseNameAsAliases() {
+        return false;
+    }
 }