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

[noreply at shibboleth.net]

Author: dfisher
Date: Thu May  2 01:05:28 2013
New Revision: 4448

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4448&view=rev
Log:
Cleanup variable naming.
Add coding standard annotations.

Modified:
    trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/LdapDataConnectorParser.java

Modified: trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/LdapDataConnectorParser.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/LdapDataConnectorParser.java?rev=4448&r1=4447&r2=4448&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/LdapDataConnectorParser.java (original)
+++ trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/LdapDataConnectorParser.java Thu May  2 01:05:28 2013
@@ -21,6 +21,8 @@
 import java.util.List;
 import java.util.Map;
 
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 import javax.xml.namespace.QName;
 
 import net.shibboleth.idp.attribute.Attribute;
@@ -31,6 +33,7 @@
 import net.shibboleth.idp.attribute.resolver.impl.dc.ldap.ParameterizedExecutableSearchFilterBuilder;
 import net.shibboleth.idp.attribute.resolver.spring.dc.BaseDataConnectorParser;
 import net.shibboleth.idp.attribute.resolver.spring.dc.DataConnectorNamespaceHandler;
+import net.shibboleth.utilities.java.support.logic.Constraint;
 import net.shibboleth.utilities.java.support.xml.AttributeSupport;
 import net.shibboleth.utilities.java.support.xml.ElementSupport;
 
@@ -77,7 +80,7 @@
     private final Logger log = LoggerFactory.getLogger(LdapDataConnectorParser.class);
 
     /** {@inheritDoc} */
-    protected Class getBeanClass(Element element) {
+    protected Class getBeanClass(final Element element) {
         return LdapDataConnector.class;
     }
 
@@ -108,33 +111,34 @@
             final BeanDefinitionBuilder builder) {
 
         final Element springBeans = getSpringBeansElement(config);
-        final BeanFactory bf = createBeanFactory(springBeans);
-        final ConnectionFactory cf = bf.getBean(ConnectionFactory.class);
-        final SearchExecutor se = bf.getBean(SearchExecutor.class);
-
-        ExecutableSearchBuilder sb = getBean(bf, ExecutableSearchBuilder.class);
-        if (sb == null) {
+        final BeanFactory beanFactory = createBeanFactory(springBeans);
+        final ConnectionFactory connectionFactory = beanFactory.getBean(ConnectionFactory.class);
+        final SearchExecutor searchExecutor = beanFactory.getBean(SearchExecutor.class);
+
+        ExecutableSearchBuilder searchBuilder = getBean(beanFactory, ExecutableSearchBuilder.class);
+        if (searchBuilder == null) {
             // TODO this should use the Templated builder once the velocity engine is working
-            sb = new ParameterizedExecutableSearchFilterBuilder(se.getSearchFilter().getFilter());
-            log.debug("no executable search builder configured, created {}", sb);
-        }
-
-        final Validator v = getBean(bf, Validator.class);
-        final MappingStrategy ms = getBean(bf, MappingStrategy.class);
-        final Cache<String, Optional<Map<String, Attribute>>> cache = getBean(bf, Cache.class);
+            searchBuilder =
+                    new ParameterizedExecutableSearchFilterBuilder(searchExecutor.getSearchFilter().getFilter());
+            log.debug("no executable search builder configured, created {}", searchBuilder);
+        }
+
+        final Validator validator = getBean(beanFactory, Validator.class);
+        final MappingStrategy strategy = getBean(beanFactory, MappingStrategy.class);
+        final Cache<String, Optional<Map<String, Attribute>>> cache = getBean(beanFactory, Cache.class);
         final Boolean noResultAnError =
                 AttributeSupport.getAttributeValueAsBoolean(AttributeSupport.getAttribute(config, new QName(
                         "noResultIsError")));
         log.debug("parsed noResultAnError {}", noResultAnError);
 
-        builder.addPropertyValue("connectionFactory", cf);
-        builder.addPropertyValue("searchExecutor", se);
-        builder.addPropertyValue("executableSearchBuilder", sb);
-        if (v != null) {
-            builder.addPropertyValue("validator", v);
-        }
-        if (ms != null) {
-            builder.addPropertyValue("mappingStrategy", ms);
+        builder.addPropertyValue("connectionFactory", connectionFactory);
+        builder.addPropertyValue("searchExecutor", searchExecutor);
+        builder.addPropertyValue("executableSearchBuilder", searchBuilder);
+        if (validator != null) {
+            builder.addPropertyValue("validator", validator);
+        }
+        if (strategy != null) {
+            builder.addPropertyValue("mappingStrategy", strategy);
         }

[... 315 lines stripped ...]