- Revision
- 507
- Author
- mward
- Date
- 2007-12-18 21:03:18 -0600 (Tue, 18 Dec 2007)
Log Message
refactoring: dropped 'PicoContainer' prefix from ParameterResolver (package is already pico)
Modified Paths
- trunk/waffle-core/src/main/java/org/codehaus/waffle/context/pico/PicoComponentRegistry.java
- trunk/waffle-core/src/main/java/org/codehaus/waffle/registrar/pico/PicoRegistrar.java
- trunk/waffle-core/src/test/java/org/codehaus/waffle/context/pico/PicoComponentRegistryTest.java
- trunk/waffle-core/src/test/java/org/codehaus/waffle/registrar/pico/DefaultPicoContainerParameterResolverTest.java
- trunk/waffle-core/src/test/java/org/codehaus/waffle/registrar/pico/PicoRegistrarTest.java
Added Paths
- trunk/waffle-core/src/main/java/org/codehaus/waffle/registrar/pico/DefaultParameterResolver.java
- trunk/waffle-core/src/main/java/org/codehaus/waffle/registrar/pico/ParameterResolver.java
- trunk/waffle-core/src/test/java/org/codehaus/waffle/testmodel/StubParameterResolver.java
Removed Paths
- trunk/waffle-core/src/main/java/org/codehaus/waffle/registrar/pico/DefaultPicoContainerParameterResolver.java
- trunk/waffle-core/src/main/java/org/codehaus/waffle/registrar/pico/PicoContainerParameterResolver.java
- trunk/waffle-core/src/test/java/org/codehaus/waffle/testmodel/StubPicoContainerParameterResolver.java
Diff
Modified: trunk/waffle-core/src/main/java/org/codehaus/waffle/context/pico/PicoComponentRegistry.java (506 => 507)
--- trunk/waffle-core/src/main/java/org/codehaus/waffle/context/pico/PicoComponentRegistry.java 2007-12-18 23:48:22 UTC (rev 506) +++ trunk/waffle-core/src/main/java/org/codehaus/waffle/context/pico/PicoComponentRegistry.java 2007-12-19 03:03:18 UTC (rev 507) @@ -12,8 +12,8 @@ import org.codehaus.waffle.ComponentRegistry; import org.codehaus.waffle.WaffleException; -import org.codehaus.waffle.registrar.pico.PicoContainerParameterResolver; -import org.codehaus.waffle.registrar.pico.DefaultPicoContainerParameterResolver; +import org.codehaus.waffle.registrar.pico.ParameterResolver; +import org.codehaus.waffle.registrar.pico.DefaultParameterResolver; import org.codehaus.waffle.action.ActionMethodExecutor; import org.codehaus.waffle.action.ActionMethodResponseHandler; import org.codehaus.waffle.action.AnnotatedMethodDefinitionFinder; @@ -104,7 +104,7 @@ register(Validator.class, DefaultValidator.class, servletContext); register(ViewDispatcher.class, DefaultViewDispatcher.class, servletContext); register(ViewResolver.class, DefaultViewResolver.class, servletContext); - register(PicoContainerParameterResolver.class, DefaultPicoContainerParameterResolver.class, servletContext); + register(ParameterResolver.class, DefaultParameterResolver.class, servletContext); // register other components registerOtherComponents(servletContext);
Copied: trunk/waffle-core/src/main/java/org/codehaus/waffle/registrar/pico/DefaultParameterResolver.java (from rev 506, trunk/waffle-core/src/main/java/org/codehaus/waffle/registrar/pico/DefaultPicoContainerParameterResolver.java) (0 => 507)
--- trunk/waffle-core/src/main/java/org/codehaus/waffle/registrar/pico/DefaultParameterResolver.java (rev 0) +++ trunk/waffle-core/src/main/java/org/codehaus/waffle/registrar/pico/DefaultParameterResolver.java 2007-12-19 03:03:18 UTC (rev 507) @@ -0,0 +1,47 @@ +/***************************************************************************** + * Copyright (C) 2005,2006 Michael Ward * + * All rights reserved. * + * ------------------------------------------------------------------------- * + * The software in this package is published under the terms of the BSD * + * style license a copy of which has been included with this distribution in * + * the LICENSE.txt file. * + * * + * Original code by: Michael Ward * + *****************************************************************************/ +package org.codehaus.waffle.registrar.pico; + +import org.codehaus.waffle.registrar.Reference; +import org.codehaus.waffle.registrar.ComponentReference; +import org.codehaus.waffle.registrar.HttpSessionAttributeReference; +import org.codehaus.waffle.registrar.RequestAttributeReference; +import org.codehaus.waffle.registrar.ServletContextAttributeReference; +import org.codehaus.waffle.registrar.RequestParameterReference; +import org.codehaus.waffle.WaffleException; +import org.picocontainer.Parameter; +import org.picocontainer.defaults.ComponentParameter; +import org.picocontainer.defaults.ConstantParameter; + +public class DefaultParameterResolver implements ParameterResolver { + + public Parameter resolve(Object argument) { + if (argument instanceof Reference) { + Reference reference = (Reference) argument; + + if (reference instanceof ComponentReference) { + return new ComponentParameter(reference.getKey()); + } else if(reference instanceof RequestParameterReference) { + return new RequestParameterParameter(reference.getKey().toString()); + } else if(reference instanceof RequestAttributeReference) { + return new RequestAttributeParameter(reference.getKey().toString()); + } else if(reference instanceof HttpSessionAttributeReference) { + return new HttpSessionAttributeParameter(reference.getKey().toString()); + } else if(reference instanceof ServletContextAttributeReference) { + return new ServletContextAttributeParameter(reference.getKey().toString()); + } + } else { + return new ConstantParameter(argument); + } + + throw new WaffleException("Unable to resolve a pico parameter for " + argument); + } +}
Deleted: trunk/waffle-core/src/main/java/org/codehaus/waffle/registrar/pico/DefaultPicoContainerParameterResolver.java (506 => 507)
--- trunk/waffle-core/src/main/java/org/codehaus/waffle/registrar/pico/DefaultPicoContainerParameterResolver.java 2007-12-18 23:48:22 UTC (rev 506) +++ trunk/waffle-core/src/main/java/org/codehaus/waffle/registrar/pico/DefaultPicoContainerParameterResolver.java 2007-12-19 03:03:18 UTC (rev 507) @@ -1,47 +0,0 @@ -/***************************************************************************** - * Copyright (C) 2005,2006 Michael Ward * - * All rights reserved. * - * ------------------------------------------------------------------------- * - * The software in this package is published under the terms of the BSD * - * style license a copy of which has been included with this distribution in * - * the LICENSE.txt file. * - * * - * Original code by: Michael Ward * - *****************************************************************************/ -package org.codehaus.waffle.registrar.pico; - -import org.codehaus.waffle.registrar.Reference; -import org.codehaus.waffle.registrar.ComponentReference; -import org.codehaus.waffle.registrar.HttpSessionAttributeReference; -import org.codehaus.waffle.registrar.RequestAttributeReference; -import org.codehaus.waffle.registrar.ServletContextAttributeReference; -import org.codehaus.waffle.registrar.RequestParameterReference; -import org.codehaus.waffle.WaffleException; -import org.picocontainer.Parameter; -import org.picocontainer.defaults.ComponentParameter; -import org.picocontainer.defaults.ConstantParameter; - -public class DefaultPicoContainerParameterResolver implements PicoContainerParameterResolver { - - public Parameter resolve(Object argument) { - if (argument instanceof Reference) { - Reference reference = (Reference) argument; - - if (reference instanceof ComponentReference) { - return new ComponentParameter(reference.getKey()); - } else if(reference instanceof RequestParameterReference) { - return new RequestParameterParameter(reference.getKey().toString()); - } else if(reference instanceof RequestAttributeReference) { - return new RequestAttributeParameter(reference.getKey().toString()); - } else if(reference instanceof HttpSessionAttributeReference) { - return new HttpSessionAttributeParameter(reference.getKey().toString()); - } else if(reference instanceof ServletContextAttributeReference) { - return new ServletContextAttributeParameter(reference.getKey().toString()); - } - } else { - return new ConstantParameter(argument); - } - - throw new WaffleException("Unable to resolve a pico parameter for " + argument); - } -}
Copied: trunk/waffle-core/src/main/java/org/codehaus/waffle/registrar/pico/ParameterResolver.java (from rev 504, trunk/waffle-core/src/main/java/org/codehaus/waffle/registrar/pico/PicoContainerParameterResolver.java) (0 => 507)
--- trunk/waffle-core/src/main/java/org/codehaus/waffle/registrar/pico/ParameterResolver.java (rev 0) +++ trunk/waffle-core/src/main/java/org/codehaus/waffle/registrar/pico/ParameterResolver.java 2007-12-19 03:03:18 UTC (rev 507) @@ -0,0 +1,17 @@ +/***************************************************************************** + * Copyright (C) 2005,2006 Michael Ward * + * All rights reserved. * + * ------------------------------------------------------------------------- * + * The software in this package is published under the terms of the BSD * + * style license a copy of which has been included with this distribution in * + * the LICENSE.txt file. * + * * + * Original code by: Michael Ward * + *****************************************************************************/ +package org.codehaus.waffle.registrar.pico; + +import org.picocontainer.Parameter; + +public interface ParameterResolver { + Parameter resolve(Object arg); +}
Deleted: trunk/waffle-core/src/main/java/org/codehaus/waffle/registrar/pico/PicoContainerParameterResolver.java (506 => 507)
--- trunk/waffle-core/src/main/java/org/codehaus/waffle/registrar/pico/PicoContainerParameterResolver.java 2007-12-18 23:48:22 UTC (rev 506) +++ trunk/waffle-core/src/main/java/org/codehaus/waffle/registrar/pico/PicoContainerParameterResolver.java 2007-12-19 03:03:18 UTC (rev 507) @@ -1,17 +0,0 @@ -/***************************************************************************** - * Copyright (C) 2005,2006 Michael Ward * - * All rights reserved. * - * ------------------------------------------------------------------------- * - * The software in this package is published under the terms of the BSD * - * style license a copy of which has been included with this distribution in * - * the LICENSE.txt file. * - * * - * Original code by: Michael Ward * - *****************************************************************************/ -package org.codehaus.waffle.registrar.pico; - -import org.picocontainer.Parameter; - -public interface PicoContainerParameterResolver { - Parameter resolve(Object arg); -}
Modified: trunk/waffle-core/src/main/java/org/codehaus/waffle/registrar/pico/PicoRegistrar.java (506 => 507)
--- trunk/waffle-core/src/main/java/org/codehaus/waffle/registrar/pico/PicoRegistrar.java 2007-12-18 23:48:22 UTC (rev 506) +++ trunk/waffle-core/src/main/java/org/codehaus/waffle/registrar/pico/PicoRegistrar.java 2007-12-19 03:03:18 UTC (rev 507) @@ -31,17 +31,17 @@ */ public class PicoRegistrar implements Registrar, RubyAwareRegistrar { private final MutablePicoContainer picoContainer; - private final PicoContainerParameterResolver picoContainerParameterResolver; + private final ParameterResolver parameterResolver; private final LifecycleStrategy lifecycleStrategy; private final RegistrarMonitor registrarMonitor; private Injection injection = Injection.CONSTRUCTOR; public PicoRegistrar(MutablePicoContainer picoContainer, - PicoContainerParameterResolver picoContainerParameterResolver, + ParameterResolver parameterResolver, LifecycleStrategy lifecycleStrategy, RegistrarMonitor registrarMonitor) { this.picoContainer = picoContainer; - this.picoContainerParameterResolver = picoContainerParameterResolver; + this.parameterResolver = parameterResolver; this.lifecycleStrategy = lifecycleStrategy; this.registrarMonitor = registrarMonitor; } @@ -114,7 +114,7 @@ Parameter[] picoParameters = new Parameter[parameters.length]; for (int i = 0; i < parameters.length; i++) { - picoParameters[i] = picoContainerParameterResolver.resolve(parameters[i]); + picoParameters[i] = parameterResolver.resolve(parameters[i]); } return picoParameters; }
Modified: trunk/waffle-core/src/test/java/org/codehaus/waffle/context/pico/PicoComponentRegistryTest.java (506 => 507)
--- trunk/waffle-core/src/test/java/org/codehaus/waffle/context/pico/PicoComponentRegistryTest.java 2007-12-18 23:48:22 UTC (rev 506) +++ trunk/waffle-core/src/test/java/org/codehaus/waffle/context/pico/PicoComponentRegistryTest.java 2007-12-19 03:03:18 UTC (rev 507) @@ -1,7 +1,7 @@ package org.codehaus.waffle.context.pico; import org.codehaus.waffle.ComponentRegistry; -import org.codehaus.waffle.registrar.pico.PicoContainerParameterResolver; +import org.codehaus.waffle.registrar.pico.ParameterResolver; import org.codehaus.waffle.action.ActionMethodExecutor; import org.codehaus.waffle.action.ActionMethodResponseHandler; import org.codehaus.waffle.action.ArgumentResolver; @@ -50,7 +50,7 @@ import org.codehaus.waffle.testmodel.StubValidator; import org.codehaus.waffle.testmodel.StubViewDispatcher; import org.codehaus.waffle.testmodel.StubViewResolver; -import org.codehaus.waffle.testmodel.StubPicoContainerParameterResolver; +import org.codehaus.waffle.testmodel.StubParameterResolver; import org.codehaus.waffle.validation.DefaultValidator; import org.codehaus.waffle.validation.Validator; import org.codehaus.waffle.view.DefaultViewDispatcher; @@ -219,8 +219,8 @@ will(returnValue(StubMonitor.class.getName())); one(servletContext).getInitParameter(ViewResolver.class.getName()); will(returnValue(StubViewResolver.class.getName())); - one(servletContext).getInitParameter(PicoContainerParameterResolver.class.getName()); - will(returnValue(StubPicoContainerParameterResolver.class.getName())); + one(servletContext).getInitParameter(ParameterResolver.class.getName()); + will(returnValue(StubParameterResolver.class.getName())); } }); ComponentRegistry componentRegistry = new PicoComponentRegistry(servletContext);
Modified: trunk/waffle-core/src/test/java/org/codehaus/waffle/registrar/pico/DefaultPicoContainerParameterResolverTest.java (506 => 507)
--- trunk/waffle-core/src/test/java/org/codehaus/waffle/registrar/pico/DefaultPicoContainerParameterResolverTest.java 2007-12-18 23:48:22 UTC (rev 506) +++ trunk/waffle-core/src/test/java/org/codehaus/waffle/registrar/pico/DefaultPicoContainerParameterResolverTest.java 2007-12-19 03:03:18 UTC (rev 507) @@ -25,13 +25,13 @@ @Test public void canResolveConstantParameters() { - PicoContainerParameterResolver parameterResolver = new DefaultPicoContainerParameterResolver(); + ParameterResolver parameterResolver = new DefaultParameterResolver(); Assert.assertTrue(parameterResolver.resolve("foobar") instanceof ConstantParameter); } @Test public void canResolveComponentParameters() { - PicoContainerParameterResolver parameterResolver = new DefaultPicoContainerParameterResolver(); + ParameterResolver parameterResolver = new DefaultParameterResolver(); Reference reference = new ComponentReference("foo"); Assert.assertTrue(parameterResolver.resolve(reference) instanceof ComponentParameter); @@ -39,7 +39,7 @@ @Test public void canResolveRequestParameterParameter() { - PicoContainerParameterResolver parameterResolver = new DefaultPicoContainerParameterResolver(); + ParameterResolver parameterResolver = new DefaultParameterResolver(); Reference reference = new RequestParameterReference("foo"); Assert.assertTrue(parameterResolver.resolve(reference) instanceof RequestParameterParameter); @@ -47,7 +47,7 @@ @Test public void canResolveRequestAttributeParameter() { - PicoContainerParameterResolver parameterResolver = new DefaultPicoContainerParameterResolver(); + ParameterResolver parameterResolver = new DefaultParameterResolver(); Reference reference = new RequestAttributeReference("foo"); Assert.assertTrue(parameterResolver.resolve(reference) instanceof RequestAttributeParameter); @@ -55,7 +55,7 @@ @Test public void canResolveHttpSessionAttributeParameter() { - PicoContainerParameterResolver parameterResolver = new DefaultPicoContainerParameterResolver(); + ParameterResolver parameterResolver = new DefaultParameterResolver(); Reference reference = new HttpSessionAttributeReference("foo"); Assert.assertTrue(parameterResolver.resolve(reference) instanceof HttpSessionAttributeParameter); @@ -63,7 +63,7 @@ @Test public void canResolveServletContextAttributeParameter() { - PicoContainerParameterResolver parameterResolver = new DefaultPicoContainerParameterResolver(); + ParameterResolver parameterResolver = new DefaultParameterResolver(); Reference reference = new ServletContextAttributeReference("foo"); Assert.assertTrue(parameterResolver.resolve(reference) instanceof ServletContextAttributeParameter);
Modified: trunk/waffle-core/src/test/java/org/codehaus/waffle/registrar/pico/PicoRegistrarTest.java (506 => 507)
--- trunk/waffle-core/src/test/java/org/codehaus/waffle/registrar/pico/PicoRegistrarTest.java 2007-12-18 23:48:22 UTC (rev 506) +++ trunk/waffle-core/src/test/java/org/codehaus/waffle/registrar/pico/PicoRegistrarTest.java 2007-12-19 03:03:18 UTC (rev 507) @@ -214,7 +214,7 @@ @Test public void canRegisterComponentWithConstantParameters() { MutablePicoContainer pico = new DefaultPicoContainer(); - PicoContainerParameterResolver parameterResolver = new DefaultPicoContainerParameterResolver(); + ParameterResolver parameterResolver = new DefaultParameterResolver(); PicoRegistrar picoRegistrar = new PicoRegistrar(pico, parameterResolver, lifecycleStrategy, new SilentMonitor()); picoRegistrar.register("component", ComponentWithParameterDependencies.class, "foo", "bar"); @@ -229,7 +229,7 @@ @Test public void canRegisterComponentWithNamedDependecy() { MutablePicoContainer pico = new DefaultPicoContainer(); - PicoContainerParameterResolver parameterResolver = new DefaultPicoContainerParameterResolver(); + ParameterResolver parameterResolver = new DefaultParameterResolver(); PicoRegistrar picoRegistrar = new PicoRegistrar(pico, parameterResolver, lifecycleStrategy, new SilentMonitor()); picoRegistrar.registerInstance("one", "foo")
Copied: trunk/waffle-core/src/test/java/org/codehaus/waffle/testmodel/StubParameterResolver.java (from rev 504, trunk/waffle-core/src/test/java/org/codehaus/waffle/testmodel/StubPicoContainerParameterResolver.java) (0 => 507)
--- trunk/waffle-core/src/test/java/org/codehaus/waffle/testmodel/StubParameterResolver.java (rev 0) +++ trunk/waffle-core/src/test/java/org/codehaus/waffle/testmodel/StubParameterResolver.java 2007-12-19 03:03:18 UTC (rev 507) @@ -0,0 +1,20 @@ +/***************************************************************************** + * Copyright (C) 2005,2006 Michael Ward * + * All rights reserved. * + * ------------------------------------------------------------------------- * + * The software in this package is published under the terms of the BSD * + * style license a copy of which has been included with this distribution in * + * the LICENSE.txt file. * + * * + * Original code by: Michael Ward * + *****************************************************************************/ +package org.codehaus.waffle.testmodel; + +import org.codehaus.waffle.registrar.pico.ParameterResolver; +import org.picocontainer.Parameter; + +public class StubParameterResolver implements ParameterResolver { + public Parameter resolve(Object arg) { + return null; + } +}
Deleted: trunk/waffle-core/src/test/java/org/codehaus/waffle/testmodel/StubPicoContainerParameterResolver.java (506 => 507)
--- trunk/waffle-core/src/test/java/org/codehaus/waffle/testmodel/StubPicoContainerParameterResolver.java 2007-12-18 23:48:22 UTC (rev 506) +++ trunk/waffle-core/src/test/java/org/codehaus/waffle/testmodel/StubPicoContainerParameterResolver.java 2007-12-19 03:03:18 UTC (rev 507) @@ -1,20 +0,0 @@ -/***************************************************************************** - * Copyright (C) 2005,2006 Michael Ward * - * All rights reserved. * - * ------------------------------------------------------------------------- * - * The software in this package is published under the terms of the BSD * - * style license a copy of which has been included with this distribution in * - * the LICENSE.txt file. * - * * - * Original code by: Michael Ward * - *****************************************************************************/ -package org.codehaus.waffle.testmodel; - -import org.codehaus.waffle.registrar.pico.PicoContainerParameterResolver; -import org.picocontainer.Parameter; - -public class StubPicoContainerParameterResolver implements PicoContainerParameterResolver { - public Parameter resolve(Object arg) { - return null; - } -}
To unsubscribe from this list please visit:
