- Revision
- 404
- Author
- mauro
- Date
- 2007-11-20 05:57:12 -0600 (Tue, 20 Nov 2007)
Log Message
Made DefaultValueConverterFinder use OgnlValueConverter as default converter is none are specified.
Modified Paths
Diff
Modified: trunk/waffle-core/src/main/java/org/codehaus/waffle/bind/DefaultValueConverterFinder.java (403 => 404)
--- trunk/waffle-core/src/main/java/org/codehaus/waffle/bind/DefaultValueConverterFinder.java 2007-11-20 10:10:50 UTC (rev 403) +++ trunk/waffle-core/src/main/java/org/codehaus/waffle/bind/DefaultValueConverterFinder.java 2007-11-20 11:57:12 UTC (rev 404) @@ -14,24 +14,31 @@ import java.util.Map; /** + * <p> * Default implementation of <code>ValueConverterFinder</code> which caches * converters found per type. + * </p> + * <p> + * If no converters are specified, the <code>OgnlValueConverter</code> is used as default. + * </p> * * @author Michael Ward * @author Mauro Talevi + * @see OgnlValueConverter */ public class DefaultValueConverterFinder implements ValueConverterFinder { + private static final ValueConverter DEFAULT_VALUE_CONVERTER = new OgnlValueConverter(); private final Map<Class<?>, ValueConverter> cache = new HashMap<Class<?>, ValueConverter>(); private final ValueConverter[] converters; public DefaultValueConverterFinder() { - this.converters = new ValueConverter[0]; + this.converters = new ValueConverter[]{DEFAULT_VALUE_CONVERTER}; } public DefaultValueConverterFinder(ValueConverter... converters) { if (converters == null) { - this.converters = new ValueConverter[0]; + this.converters = new ValueConverter[]{DEFAULT_VALUE_CONVERTER}; } else { this.converters = converters; }
Modified: trunk/waffle-core/src/test/java/org/codehaus/waffle/action/AnnotatedMethodDefinitionFinderTest.java (403 => 404)
--- trunk/waffle-core/src/test/java/org/codehaus/waffle/action/AnnotatedMethodDefinitionFinderTest.java 2007-11-20 10:10:50 UTC (rev 403) +++ trunk/waffle-core/src/test/java/org/codehaus/waffle/action/AnnotatedMethodDefinitionFinderTest.java 2007-11-20 11:57:12 UTC (rev 404) @@ -340,7 +340,7 @@ SampleForMethodFinder sampleForMethodFinder = new SampleForMethodFinder(); MethodDefinitionFinder methodDefinitionFinder = new AnnotatedMethodDefinitionFinder(null, argumentResolver, - methodNameResolver, new DefaultValueConverterFinder(new OgnlValueConverter()), monitor); + methodNameResolver, new DefaultValueConverterFinder(), monitor); MethodDefinition methodDefinition = methodDefinitionFinder.find(sampleForMethodFinder, request, response); assertEquals(45, methodDefinition.getMethodArguments().get(0)); } @@ -374,7 +374,7 @@ SampleForMethodFinder sampleForMethodFinder = new SampleForMethodFinder(); MethodDefinitionFinder methodDefinitionFinder = new AnnotatedMethodDefinitionFinder(null, argumentResolver, - methodNameResolver, new DefaultValueConverterFinder(new OgnlValueConverter()), monitor); + methodNameResolver, new DefaultValueConverterFinder(), monitor); MethodDefinition methodDefinition = methodDefinitionFinder.find(sampleForMethodFinder, request, response); assertEquals(45, methodDefinition.getMethodArguments().get(0)); } @@ -408,7 +408,7 @@ SampleForMethodFinder sampleForMethodFinder = new SampleForMethodFinder(); MethodDefinitionFinder methodDefinitionFinder = new AnnotatedMethodDefinitionFinder(null, argumentResolver, - methodNameResolver, new DefaultValueConverterFinder(new OgnlValueConverter()), monitor); + methodNameResolver, new DefaultValueConverterFinder(), monitor); MethodDefinition methodDefinition = methodDefinitionFinder.find(sampleForMethodFinder, request, response); assertEquals(99.99f, methodDefinition.getMethodArguments().get(0)); @@ -443,7 +443,7 @@ SampleForMethodFinder sampleForMethodFinder = new SampleForMethodFinder(); MethodDefinitionFinder methodDefinitionFinder = new AnnotatedMethodDefinitionFinder(null, argumentResolver, - methodNameResolver, new DefaultValueConverterFinder(new OgnlValueConverter()), monitor); + methodNameResolver, new DefaultValueConverterFinder(), monitor); MethodDefinition methodDefinition = methodDefinitionFinder.find(sampleForMethodFinder, request, response); assertTrue((Boolean) methodDefinition.getMethodArguments().get(0)); @@ -534,7 +534,7 @@ SampleForMethodFinder sampleForMethodFinder = new SampleForMethodFinder(); MethodDefinitionFinder methodDefinitionFinder = new AnnotatedMethodDefinitionFinder(null, argumentResolver, - methodNameResolver, new DefaultValueConverterFinder(new OgnlValueConverter()), monitor); + methodNameResolver, new DefaultValueConverterFinder(), monitor); MethodDefinition methodDefinition = methodDefinitionFinder.find(sampleForMethodFinder, request, response); Method expectedMethod = SampleForMethodFinder.class.getMethod("methodDependsOnRequestAndInteger",
Modified: trunk/waffle-core/src/test/java/org/codehaus/waffle/action/ParanamerMethodDefinitionFinderTest.java (403 => 404)
--- trunk/waffle-core/src/test/java/org/codehaus/waffle/action/ParanamerMethodDefinitionFinderTest.java 2007-11-20 10:10:50 UTC (rev 403) +++ trunk/waffle-core/src/test/java/org/codehaus/waffle/action/ParanamerMethodDefinitionFinderTest.java 2007-11-20 11:57:12 UTC (rev 404) @@ -343,7 +343,7 @@ SampleForMethodFinder sampleForMethodFinder = new SampleForMethodFinder(); MethodDefinitionFinder methodDefinitionFinder = new ParanamerMethodDefinitionFinder(null, argumentResolver, - methodNameResolver, new DefaultValueConverterFinder(new OgnlValueConverter()), monitor); + methodNameResolver, new DefaultValueConverterFinder(), monitor); MethodDefinition methodDefinition = methodDefinitionFinder.find(sampleForMethodFinder, request, response); assertEquals(45, methodDefinition.getMethodArguments().get(0)); } @@ -377,7 +377,7 @@ SampleForMethodFinder sampleForMethodFinder = new SampleForMethodFinder(); MethodDefinitionFinder methodDefinitionFinder = new ParanamerMethodDefinitionFinder(null, argumentResolver, - methodNameResolver, new DefaultValueConverterFinder(new OgnlValueConverter()), monitor); + methodNameResolver, new DefaultValueConverterFinder(), monitor); MethodDefinition methodDefinition = methodDefinitionFinder.find(sampleForMethodFinder, request, response); assertEquals(45, methodDefinition.getMethodArguments().get(0)); } @@ -411,7 +411,7 @@ SampleForMethodFinder sampleForMethodFinder = new SampleForMethodFinder(); MethodDefinitionFinder methodDefinitionFinder = new ParanamerMethodDefinitionFinder(null, argumentResolver, - methodNameResolver, new DefaultValueConverterFinder(new OgnlValueConverter()), monitor); + methodNameResolver, new DefaultValueConverterFinder(), monitor); MethodDefinition methodDefinition = methodDefinitionFinder.find(sampleForMethodFinder, request, response); assertEquals(99.99f, methodDefinition.getMethodArguments().get(0)); @@ -446,7 +446,7 @@ SampleForMethodFinder sampleForMethodFinder = new SampleForMethodFinder(); MethodDefinitionFinder methodDefinitionFinder = new ParanamerMethodDefinitionFinder(null, argumentResolver, - methodNameResolver, new DefaultValueConverterFinder(new OgnlValueConverter()), monitor); + methodNameResolver, new DefaultValueConverterFinder(), monitor); MethodDefinition methodDefinition = methodDefinitionFinder.find(sampleForMethodFinder, request, response); assertTrue((Boolean) methodDefinition.getMethodArguments().get(0)); @@ -537,7 +537,7 @@ SampleForMethodFinder sampleForMethodFinder = new SampleForMethodFinder(); MethodDefinitionFinder methodDefinitionFinder = new ParanamerMethodDefinitionFinder(null, argumentResolver, - methodNameResolver, new DefaultValueConverterFinder(new OgnlValueConverter()), monitor); + methodNameResolver, new DefaultValueConverterFinder(), monitor); MethodDefinition methodDefinition = methodDefinitionFinder.find(sampleForMethodFinder, request, response); Method expectedMethod = SampleForMethodFinder.class.getMethod("methodDependsOnRequestAndInteger",
To unsubscribe from this list please visit:
