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

[noreply at shibboleth.net]

Author: rdw
Date: Mon Apr  4 11:28:51 2016
New Revision: 8193

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=8193&view=rev
Log:
IDP-873 Allow integers as durations in the DataConnector parsers

https://issues.shibboleth.net/jira/browse/IDP-872#

Extremely long coversation in the notes above

Modified:
    trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/impl/LDAPDataConnectorParser.java
    trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/rdbms/impl/RDBMSDataConnectorParser.java
    trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/LDAPDataConnectorParserTest.java
    trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/rdbms/RDBMSDataConnectorParserTest.java

Modified: trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/impl/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/impl/LDAPDataConnectorParser.java?rev=8193&r1=8192&r2=8193&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/impl/LDAPDataConnectorParser.java	(original)
+++ trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/impl/LDAPDataConnectorParser.java	Mon Apr  4 11:28:51 2016
@@ -32,10 +32,10 @@
 import net.shibboleth.idp.attribute.resolver.spring.dc.impl.AbstractDataConnectorParser;
 import net.shibboleth.idp.attribute.resolver.spring.dc.impl.CacheConfigParser;
 import net.shibboleth.idp.attribute.resolver.spring.dc.impl.DataConnectorNamespaceHandler;
+import net.shibboleth.utilities.java.support.annotation.Duration;
 import net.shibboleth.utilities.java.support.logic.Constraint;
 import net.shibboleth.utilities.java.support.primitive.StringSupport;
 import net.shibboleth.utilities.java.support.xml.AttributeSupport;
-import net.shibboleth.utilities.java.support.xml.DOMTypeSupport;
 import net.shibboleth.utilities.java.support.xml.ElementSupport;
 import net.shibboleth.utilities.java.support.xml.XMLConstants;
 
@@ -129,7 +129,7 @@
         final BeanDefinitionBuilder providerConfig =
                 BeanDefinitionBuilder.genericBeanDefinition(DefaultConnectionFactory.getDefaultProvider()
                         .getProviderConfig().getClass());
-        String connectionStrategy = AttributeSupport.getAttributeValue(config, new QName("connectionStrategy"));
+        final String connectionStrategy = AttributeSupport.getAttributeValue(config, new QName("connectionStrategy"));
         if (connectionStrategy == null) {
             providerConfig.addPropertyValue("connectionStrategy", ConnectionStrategy.ACTIVE_PASSIVE);
         } else {
@@ -156,7 +156,7 @@
         final List<Element> propertyElements =
                 ElementSupport.getChildElements(config, new QName(DataConnectorNamespaceHandler.NAMESPACE,
                         "LDAPProperty"));
-        for (Element e : propertyElements) {
+        for (final Element e : propertyElements) {
             props.put(AttributeSupport.getAttributeValue(e, new QName("name")),
                     AttributeSupport.getAttributeValue(e, new QName("value")));
         }
@@ -301,7 +301,7 @@
          * @return credential config
          */
         @Nonnull protected BeanDefinition createCredentialConfig(@Nonnull final ParserContext parserContext) {
-            BeanDefinitionBuilder result =
+            final BeanDefinitionBuilder result =
                     BeanDefinitionBuilder.genericBeanDefinition(CredentialConfigFactoryBean.class);
 
             final List<Element> trustElements =
@@ -643,14 +643,14 @@
          * Converts the supplied duration to milliseconds and divides it by the divisor. Useful for modifying durations
          * while resolving property replacement.
          * 
-         * @param duration string format
+         * @param duration the duration (which may have gone through spring translation from iso to long)
          * @param divisor to modify the duration with
          * 
          * @return result of the division
          */
-        public static long buildDuration(final String duration, final long divisor) {
-            return DOMTypeSupport.durationToLong(duration) / divisor;
-        }
+        public static long buildDuration(@Duration final long duration, final long divisor) {
+            return duration / divisor;
+        } 
 
         /**
          * Converts the supplied value to a list of strings delimited by {@link XMLConstants#LIST_DELIMITERS} and comma.

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

[... 477 lines stripped ...]