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

[noreply at shibboleth.net]

Author: scantor
Date: Tue Jan 24 21:29:43 2017
New Revision: 8603

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=8603&view=rev
Log:
Checkstyle.

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

Modified: trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/CacheConfigParser.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/impl/CacheConfigParser.java?rev=8603&r1=8602&r2=8603&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/CacheConfigParser.java	(original)
+++ trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/CacheConfigParser.java	Tue Jan 24 21:29:43 2017
@@ -109,17 +109,21 @@
         }
         
         final Element cacheElement = cacheElements.get(0);
-        final String elementTimeToLive = AttributeSupport.getAttributeValue(cacheElement, new QName("elementTimeToLive"));
+        final String elementTimeToLive =
+                AttributeSupport.getAttributeValue(cacheElement, new QName("elementTimeToLive"));
         if (null != elementTimeToLive) {
             log.warn("ResultCache: Attribute 'elementTimeToLive' is deprecated, consider using 'expireAfterAccess'");
         }
-        final String expireAfterWrite = AttributeSupport.getAttributeValue(cacheElement, new QName("expireAfterWrite"));
-        final String expireAfterAccess = AttributeSupport.getAttributeValue(cacheElement, new QName("expireAfterAccess"));
+        final String expireAfterWrite =
+                AttributeSupport.getAttributeValue(cacheElement, new QName("expireAfterWrite"));
+        final String expireAfterAccess =
+                AttributeSupport.getAttributeValue(cacheElement, new QName("expireAfterAccess"));
         
         final BeanDefinitionBuilder cache;
         if (expireAfterWrite != null) {
             if (null != expireAfterAccess || null != elementTimeToLive) {
-                log.warn("ResultCache:  Attribute 'expireAfterAccess' is mututally exclusive with 'expireAfterWrite'. Used 'expireAfterWrite'.");
+                log.warn("ResultCache: Attribute 'expireAfterAccess' is mututally exclusive with 'expireAfterWrite'."
+                        + " Used 'expireAfterWrite'.");
             }
             cache = BeanDefinitionBuilder.rootBeanDefinition(CacheConfigParser.class, "buildCacheWrite");            
             cache.addConstructorArgValue(expireAfterWrite);            
@@ -135,7 +139,8 @@
         return cache.getBeanDefinition();
     }
     
-    /** Helper function to return size provided with a suitable default/
+    /** Helper function to return size provided with a suitable default.
+     * 
      * @param maximumSize long string
      * @return the input as a long, or DEFAULT_CACHE_ENTRIES
      */