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

[noreply at shibboleth.net]

Author: rdw
Date: Fri Aug 26 08:44:11 2016
New Revision: 8354

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=8354&view=rev
Log:
IDP-813 Missed checkin

https://issues.shibboleth.net/jira/browse/IDP-813

Modified:
    trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/ScriptedAttributeDefinitionParser.java

Modified: trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/ScriptedAttributeDefinitionParser.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/ScriptedAttributeDefinitionParser.java?rev=8354&r1=8353&r2=8354&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/ScriptedAttributeDefinitionParser.java	(original)
+++ trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/ScriptedAttributeDefinitionParser.java	Fri Aug 26 08:44:11 2016
@@ -23,19 +23,19 @@
 import javax.annotation.Nullable;
 import javax.xml.namespace.QName;
 
+import net.shibboleth.ext.spring.factory.EvaluableScriptFactoryBean;
+import net.shibboleth.idp.attribute.resolver.ad.impl.ScriptedAttributeDefinition;
+import net.shibboleth.idp.attribute.resolver.spring.ad.BaseAttributeDefinitionParser;
+import net.shibboleth.idp.attribute.resolver.spring.impl.AttributeResolverNamespaceHandler;
+import net.shibboleth.utilities.java.support.primitive.StringSupport;
+import net.shibboleth.utilities.java.support.xml.ElementSupport;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.BeanCreationException;
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.springframework.beans.factory.xml.ParserContext;
 import org.w3c.dom.Element;
-
-import net.shibboleth.ext.spring.factory.EvaluableScriptFactoryBean;
-import net.shibboleth.idp.attribute.resolver.ad.impl.ScriptedAttributeDefinition;
-import net.shibboleth.idp.attribute.resolver.spring.ad.BaseAttributeDefinitionParser;
-import net.shibboleth.idp.attribute.resolver.spring.impl.AttributeResolverNamespaceHandler;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
-import net.shibboleth.utilities.java.support.xml.ElementSupport;
 
 /**
  * Spring bean definition parser for scripted attribute configuration elements.
@@ -48,7 +48,7 @@
 
     /** Schema type name - resolver: . */
     @Nonnull public static final QName TYPE_NAME_RESOLVER =
-            new QName(AttributeResolverNamespaceHandler.NAMESPACE, "Script");
+            new QName(AttributeResolverNamespaceHandler.NAMESPACE, "ScriptedAttribute");
 
     /** Script file element name. */
     @Nonnull public static final QName SCRIPT_FILE_ELEMENT_NAME_AD =
@@ -70,7 +70,7 @@
     @Nonnull private final Logger log = LoggerFactory.getLogger(ScriptedAttributeDefinitionParser.class);
 
     /** {@inheritDoc} */
-    @Override protected Class<ScriptedAttributeDefinition> getBeanClass(@Nullable Element element) {
+    @Override protected Class<ScriptedAttributeDefinition> getBeanClass(@Nullable final Element element) {
         return ScriptedAttributeDefinition.class;
     }
 
@@ -111,7 +111,7 @@
             throw new BeanCreationException("No script or script file specified for this attribute definition");
         }
 
-        String customRef = StringSupport.trimOrNull(config.getAttributeNS(null, "customObjectRef"));
+        final String customRef = StringSupport.trimOrNull(config.getAttributeNS(null, "customObjectRef"));
         if (null != customRef) {
             builder.addPropertyReference("customObject", customRef);
         }