[utilities COMMIT] in /spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/config: DurationPropertyEditor...

[noreply at shibboleth.net]

Author: scantor
Date: Fri May 29 21:34:45 2015
New Revision: 800

URL: http://svn.shibboleth.net/view/utilities?rev=800&view=rev
Log:
IDP-730 - trim input on Duration conversion

Modified:
    spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/config/DurationPropertyEditor.java
    spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/config/DurationToLongConverter.java
    spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/config/StringToIPRangeConverter.java
    spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/config/StringToResourceConverter.java

Modified: spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/config/DurationPropertyEditor.java
URL: http://svn.shibboleth.net/view/utilities/spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/config/DurationPropertyEditor.java?rev=800&r1=799&r2=800&view=diff
==============================================================================
--- spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/config/DurationPropertyEditor.java	(original)
+++ spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/config/DurationPropertyEditor.java	Fri May 29 21:34:45 2015
@@ -28,10 +28,11 @@
 public class DurationPropertyEditor extends PropertyEditorSupport {
 
     /** {@inheritDoc} */
+    @Override
     public void setAsText(String text) {
 
         if (text.startsWith("P")) {
-            setValue(DOMTypeSupport.getDataTypeFactory().newDuration(text));
+            setValue(DOMTypeSupport.getDataTypeFactory().newDuration(text.trim()));
         } else if (text.startsWith("-P")) {
             throw new IllegalArgumentException("Negative durations are not supported");
         } else {

Modified: spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/config/DurationToLongConverter.java
URL: http://svn.shibboleth.net/view/utilities/spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/config/DurationToLongConverter.java?rev=800&r1=799&r2=800&view=diff
==============================================================================
--- spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/config/DurationToLongConverter.java	(original)
+++ spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/config/DurationToLongConverter.java	Fri May 29 21:34:45 2015
@@ -17,6 +17,8 @@
 
 package net.shibboleth.ext.spring.config;
 
+import javax.annotation.Nonnull;
+
 import net.shibboleth.utilities.java.support.annotation.Duration;
 import net.shibboleth.utilities.java.support.xml.DOMTypeSupport;
 
@@ -29,21 +31,21 @@
 /**
  * Allows setting of Duration-valued properties using lexical string form.
  */
-public class DurationToLongConverter implements Converter<String, Long>, ConditionalConverter {
+public class DurationToLongConverter implements Converter<String,Long>, ConditionalConverter {
 
     /** Logger. */
-    private Logger log = LoggerFactory.getLogger(DurationToLongConverter.class);
+    @Nonnull private Logger log = LoggerFactory.getLogger(DurationToLongConverter.class);
 
     /** {@inheritDoc} */
     @Override public Long convert(String source) {
         if (source.startsWith("P")) {
-            return DOMTypeSupport.durationToLong(source);
+            return DOMTypeSupport.durationToLong(source.trim());
         } else if (source.startsWith("-P")) {
             throw new IllegalArgumentException("Negative durations are not supported");
         } else {
             // Treat as a milliseconds.  But note this
             final long duration = Long.valueOf(source);
-            log.info("Deprecated duration of {} was specified.  Use XML duration of  {}", source,
+            log.info("Deprecated duration of {} was specified. Use XML duration of {}", source,
                     DOMTypeSupport.longToDuration(duration));
             return duration;
         }

Modified: spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/config/StringToIPRangeConverter.java
URL: http://svn.shibboleth.net/view/utilities/spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/config/StringToIPRangeConverter.java?rev=800&r1=799&r2=800&view=diff
==============================================================================
--- spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/config/StringToIPRangeConverter.java	(original)
+++ spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/config/StringToIPRangeConverter.java	Fri May 29 21:34:45 2015
@@ -28,6 +28,7 @@
 public class StringToIPRangeConverter implements Converter<String,IPRange> {
 
     /** {@inheritDoc} */
+    @Override
     public IPRange convert(String source) {
         return IPRange.parseCIDRBlock(source);
     }

Modified: spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/config/StringToResourceConverter.java
URL: http://svn.shibboleth.net/view/utilities/spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/config/StringToResourceConverter.java?rev=800&r1=799&r2=800&view=diff

[... 35 lines stripped ...]