[java-identity-provider] 01/02: CheckStyle

[Rod Widdowson]

This is an automated email from the git hooks/post-receive script.

rdw pushed a commit to branch master
in repository java-identity-provider.

View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=3ede2c2c62bee9faa27ebe5943d6001424fbcf78

commit 3ede2c2c62bee9faa27ebe5943d6001424fbcf78
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Wed Nov 21 16:35:29 2018 +0000

    CheckStyle
---
 .../resolver/dc/ldap/impl/LDAPDataConnector.java   |  3 ++
 .../dc/http/impl/HTTPDataConnectorParser.java      |  2 +
 .../AbstractDynamicMetadataProviderParser.java     | 43 ++++++++++++++--------
 .../impl/DynamicHTTPMetadataProviderParser.java    |  3 +-
 4 files changed, 35 insertions(+), 16 deletions(-)

diff --git a/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/ldap/impl/LDAPDataConnector.java b/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/ldap/impl/LDAPDataConnector.java
index 208ae7d..f36133b 100644
--- a/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/ldap/impl/LDAPDataConnector.java
+++ b/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/ldap/impl/LDAPDataConnector.java
@@ -126,6 +126,7 @@ public class LDAPDataConnector extends AbstractSearchDataConnector<ExecutableSea
         defaultMappingStrategy = false;
     }
 
+// CheckStyle: CyclomaticComplexity OFF
     /** {@inheritDoc} */
     @Override protected void doInitialize() throws ComponentInitializationException {
         if (connectionFactory == null) {
@@ -185,6 +186,8 @@ public class LDAPDataConnector extends AbstractSearchDataConnector<ExecutableSea
             }
         }
     }
+// CheckStyle: CyclomaticComplexity ON
+
 
     /**
      * Attempts to retrieve attributes from the LDAP.
diff --git a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/http/impl/HTTPDataConnectorParser.java b/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/http/impl/HTTPDataConnectorParser.java
index 87066f2..83a7df7 100644
--- a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/http/impl/HTTPDataConnectorParser.java
+++ b/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/http/impl/HTTPDataConnectorParser.java
@@ -243,6 +243,7 @@ public class HTTPDataConnectorParser extends AbstractDataConnectorParser {
         }
 
 // Checkstyle: CyclomaticComplexity OFF
+// Checkstyle: MethodLength OFF
         /**
          * Create the definition of the POST search builder.
          * 
@@ -330,6 +331,7 @@ public class HTTPDataConnectorParser extends AbstractDataConnectorParser {
             return templateBuilder.getBeanDefinition();
         }
 // Checkstyle: CyclomaticComplexity OFF
+// Checkstyle: MethodLength ON
         
         /**
          * Get the bean ID of an externally defined mapping strategy.
diff --git a/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/impl/AbstractDynamicMetadataProviderParser.java b/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/impl/AbstractDynamicMetadataProviderParser.java
index d0cdcba..bfc50e7 100644
--- a/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/impl/AbstractDynamicMetadataProviderParser.java
+++ b/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/impl/AbstractDynamicMetadataProviderParser.java
@@ -56,6 +56,33 @@ public abstract class AbstractDynamicMetadataProviderParser extends AbstractMeta
             builder.addConstructorArgReference(timerRef);
         }
 
+        processTimingProperties(element, parserContext, builder);
+
+        if (element.hasAttributeNS(null, "expirationWarningThreshold")) {
+            builder.addPropertyValue("expirationWarningThreshold",
+                    StringSupport.trimOrNull(element.getAttributeNS(null, "expirationWarningThreshold")));
+        }
+
+        if (element.hasAttributeNS(null, "indexesRef")) {
+            builder.addPropertyReference("indexes",
+                    StringSupport.trimOrNull(element.getAttributeNS(null, "indexesRef")));
+        }
+
+        builder.addPropertyReference("parserPool", getParserPoolRef(element));
+
+        processPersistentCachingProperties(element, parserContext, builder);
+    }
+
+    /**
+     * Process options related to time.
+     *
+     * @param element current element
+     * @param parserContext current parser context
+     * @param builder current builder
+     */
+    protected void processTimingProperties(final Element element, final ParserContext parserContext, 
+            final BeanDefinitionBuilder builder) {
+
         if (element.hasAttributeNS(null, "refreshDelayFactor")) {
             builder.addPropertyValue("refreshDelayFactor",
                     StringSupport.trimOrNull(element.getAttributeNS(null, "refreshDelayFactor")));
@@ -90,25 +117,11 @@ public abstract class AbstractDynamicMetadataProviderParser extends AbstractMeta
             builder.addPropertyValue("cleanupTaskInterval",
                     StringSupport.trimOrNull(element.getAttributeNS(null, "cleanupTaskInterval")));
         }
-        
-        if (element.hasAttributeNS(null, "expirationWarningThreshold")) {
-            builder.addPropertyValue("expirationWarningThreshold",
-                    StringSupport.trimOrNull(element.getAttributeNS(null, "expirationWarningThreshold")));
-        }
-        
-        if (element.hasAttributeNS(null, "indexesRef")) {
-            builder.addPropertyReference("indexes",
-                    StringSupport.trimOrNull(element.getAttributeNS(null, "indexesRef")));
-        }
-
-        builder.addPropertyReference("parserPool", getParserPoolRef(element));
-        
-        processPersistentCachingProperties(element, parserContext, builder);
     }
     
     /**
      * Process options related to persistent caching support.
-     * 
+     *
      * @param element current element
      * @param parserContext current parser context
      * @param builder current builder
diff --git a/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/impl/DynamicHTTPMetadataProviderParser.java b/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/impl/DynamicHTTPMetadataProviderParser.java
index 37ab60d..e7fc3ea 100644
--- a/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/impl/DynamicHTTPMetadataProviderParser.java
+++ b/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/impl/DynamicHTTPMetadataProviderParser.java
@@ -129,7 +129,8 @@ public class DynamicHTTPMetadataProviderParser extends AbstractDynamicHTTPMetada
             final String transformRef =
                     StringSupport.trimOrNull(StringSupport.trimOrNull(mdq.getAttributeNS(null, "transformRef")));
             final String secondaryURLBuildersRef =
-                    StringSupport.trimOrNull(StringSupport.trimOrNull(mdq.getAttributeNS(null, "secondaryURLBuildersRef")));
+                    StringSupport.trimOrNull(StringSupport.trimOrNull(mdq.getAttributeNS(null,
+                            "secondaryURLBuildersRef")));
 
             final BeanDefinitionBuilder builder =
                     BeanDefinitionBuilder.genericBeanDefinition(MetadataQueryProtocolRequestURLBuilder.class);

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.