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

[noreply at shibboleth.net]

Author: scantor
Date: Mon Jul 21 13:20:21 2014
New Revision: 632

URL: http://svn.shibboleth.net/view/utilities?rev=632&view=rev
Log:
Support both string and boolean to Predicate conversions.

Added:
    spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/config/StringBooleanToPredicateConverter.java
      - copied, changed from r630, spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/config/BooleanToPredicateConverter.java
Modified:
    spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/config/BooleanToPredicateConverter.java
    spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/util/SpringSupport.java

Modified: spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/config/BooleanToPredicateConverter.java
URL: http://svn.shibboleth.net/view/utilities/spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/config/BooleanToPredicateConverter.java?rev=632&r1=631&r2=632&view=diff
==============================================================================
--- spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/config/BooleanToPredicateConverter.java (original)
+++ spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/config/BooleanToPredicateConverter.java Mon Jul 21 13:20:21 2014
@@ -23,13 +23,13 @@
 import com.google.common.base.Predicates;
 
 /**
- * Allows setting of fixed {@link Predicate} properties using a boolean string.
+ * Allows setting of fixed {@link Predicate} properties using a boolean value.
  */
-public class BooleanToPredicateConverter implements Converter<String,Predicate> {
+public class BooleanToPredicateConverter implements Converter<Boolean,Predicate> {
 
     /** {@inheritDoc} */
-    public Predicate convert(String source) {
-        return Boolean.valueOf(source) ? Predicates.alwaysTrue() : Predicates.alwaysFalse();
+    public Predicate convert(Boolean source) {
+        return source ? Predicates.alwaysTrue() : Predicates.alwaysFalse();
     }
     
 }

Copied: spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/config/StringBooleanToPredicateConverter.java (from r630, spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/config/BooleanToPredicateConverter.java)
URL: http://svn.shibboleth.net/view/utilities/spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/config/StringBooleanToPredicateConverter.java?p2=spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/config/StringBooleanToPredicateConverter.java&p1=spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/config/BooleanToPredicateConverter.java&r1=630&r2=632&rev=632&view=diff
==============================================================================
--- spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/config/BooleanToPredicateConverter.java (original)
+++ spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/config/StringBooleanToPredicateConverter.java Mon Jul 21 13:20:21 2014
@@ -25,7 +25,7 @@
 /**
  * Allows setting of fixed {@link Predicate} properties using a boolean string.
  */
-public class BooleanToPredicateConverter implements Converter<String,Predicate> {
+public class StringBooleanToPredicateConverter implements Converter<String,Predicate> {
 
     /** {@inheritDoc} */
     public Predicate convert(String source) {

Modified: spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/util/SpringSupport.java
URL: http://svn.shibboleth.net/view/utilities/spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/util/SpringSupport.java?rev=632&r1=631&r2=632&view=diff
==============================================================================
--- spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/util/SpringSupport.java (original)
+++ spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/util/SpringSupport.java Mon Jul 21 13:20:21 2014
@@ -26,7 +26,7 @@
 import javax.annotation.Nullable;
 import javax.xml.namespace.QName;
 
-import net.shibboleth.ext.spring.config.BooleanToPredicateConverter;
+import net.shibboleth.ext.spring.config.StringBooleanToPredicateConverter;
 import net.shibboleth.ext.spring.config.DurationToLongConverter;
 import net.shibboleth.ext.spring.config.StringToIPRangeConverter;
 import net.shibboleth.ext.spring.context.FilesystemGenericApplicationContext;
@@ -95,7 +95,7 @@
 
         ConversionServiceFactoryBean service = new ConversionServiceFactoryBean();
         service.setConverters(Sets.newHashSet(new DurationToLongConverter(), new StringToIPRangeConverter(),
-                new BooleanToPredicateConverter()));
+                new StringBooleanToPredicateConverter()));
         service.afterPropertiesSet();
 
         context.getBeanFactory().setConversionService(service.getObject());