- Revision
- 883
- Author
- paul
- Date
- 2009-01-15 14:08:31 -0600 (Thu, 15 Jan 2009)
Log Message
killing ContextContainer
Modified Paths
- sandbox/v2experiment/waffle-core/src/main/java/org/codehaus/waffle/controller/ControllerDefinitionFactory.java
- sandbox/v2experiment/waffle-core/src/main/java/org/codehaus/waffle/servlet/WaffleVelocityServlet.java
- sandbox/v2experiment/waffle-core/src/test/java/org/codehaus/waffle/action/InterceptingActionMethodExecutorTest.java
- sandbox/v2experiment/waffle-core/src/test/java/org/codehaus/waffle/controller/ContextControllerDefinitionFactoryTest.java
Removed Paths
Diff
Deleted: sandbox/v2experiment/waffle-core/src/main/java/org/codehaus/waffle/context/ContextContainer.java (882 => 883)
--- sandbox/v2experiment/waffle-core/src/main/java/org/codehaus/waffle/context/ContextContainer.java 2009-01-15 20:02:55 UTC (rev 882) +++ sandbox/v2experiment/waffle-core/src/main/java/org/codehaus/waffle/context/ContextContainer.java 2009-01-15 20:08:31 UTC (rev 883) @@ -1,69 +0,0 @@ -/* - * Copyright (c) terms as published in http://waffle.codehaus.org/license.html - */ -package org.codehaus.waffle.context; - -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; - -import org.codehaus.waffle.WaffleException; -import org.codehaus.waffle.context.ContextContainer; -import org.codehaus.waffle.i18n.DefaultMessageResources; -import org.codehaus.waffle.i18n.MessageResources; -import org.picocontainer.DefaultPicoContainer; -import org.picocontainer.MutablePicoContainer; -import org.picocontainer.PicoContainer; -import org.picocontainer.PicoException; -import org.picocontainer.containers.AbstractDelegatingPicoContainer; -import org.picocontainer.containers.AbstractDelegatingMutablePicoContainer; -import org.picocontainer.behaviors.Caching; - -...@suppresswarnings("serial") -public class ContextContainer extends AbstractDelegatingMutablePicoContainer { - private final MessageResources messageResources; - - public ContextContainer() { - this(new DefaultPicoContainer(new Caching())); - } - - public ContextContainer(MutablePicoContainer delegate) { - this(delegate, new DefaultMessageResources()); - } - - public ContextContainer(MutablePicoContainer delegate, MessageResources messageResources) { - super(delegate); - this.messageResources = messageResources; - } - - public Object getComponent(Object key) { - try { - return getDelegate().getComponent(key); - } catch (PicoException e) { - String message = messageResources.getMessageWithDefault("componentInstantiationFailed", - "Failed to instantiate component for key ''{0}''", key); - throw new WaffleException(message, e); - } - } - - public <T> List<T> getComponents(Class<T> type) { - List<T> all = new ArrayList<T>(); - traverseContainerHeirarchy(getDelegate(), type, all); - - return all; - } - - public void validateComponentInstances() { - getDelegate().getComponents(); - } - - private <T> void traverseContainerHeirarchy(PicoContainer container, Class<T> type, List<T> collection) { - collection.addAll(container.getComponents(type)); - - PicoContainer parent = container.getParent(); - if (parent != null) { - traverseContainerHeirarchy(parent, type, collection); - } - } - -}
Modified: sandbox/v2experiment/waffle-core/src/main/java/org/codehaus/waffle/controller/ControllerDefinitionFactory.java (882 => 883)
--- sandbox/v2experiment/waffle-core/src/main/java/org/codehaus/waffle/controller/ControllerDefinitionFactory.java 2009-01-15 20:02:55 UTC (rev 882) +++ sandbox/v2experiment/waffle-core/src/main/java/org/codehaus/waffle/controller/ControllerDefinitionFactory.java 2009-01-15 20:08:31 UTC (rev 883) @@ -4,7 +4,6 @@ package org.codehaus.waffle.controller; import org.codehaus.waffle.i18n.MessagesContext; -import org.codehaus.waffle.context.ContextContainer; import org.picocontainer.MutablePicoContainer; import javax.servlet.http.HttpServletRequest;
Modified: sandbox/v2experiment/waffle-core/src/main/java/org/codehaus/waffle/servlet/WaffleVelocityServlet.java (882 => 883)
--- sandbox/v2experiment/waffle-core/src/main/java/org/codehaus/waffle/servlet/WaffleVelocityServlet.java 2009-01-15 20:02:55 UTC (rev 882) +++ sandbox/v2experiment/waffle-core/src/main/java/org/codehaus/waffle/servlet/WaffleVelocityServlet.java 2009-01-15 20:08:31 UTC (rev 883) @@ -5,7 +5,6 @@ import org.codehaus.waffle.Constants; import org.codehaus.waffle.i18n.MessagesContext; -import org.codehaus.waffle.context.ContextContainer; import org.codehaus.waffle.controller.ControllerDefinition; import org.codehaus.waffle.controller.ControllerDefinitionFactory; import org.apache.velocity.Template; @@ -58,7 +57,7 @@ protected Template handleRequest(HttpServletRequest request, HttpServletResponse response, Context context) throws Exception { // Always add the controller to the context - ContextContainer container = (ContextContainer) currentRequestContainer.get(); + MutablePicoContainer container = currentRequestContainer.get(); MessagesContext messageContext = container.getComponent(MessagesContext.class); ControllerDefinition controllerDefinition = controllerDefinitionFactory.getControllerDefinition(request, response, messageContext, container); context.put(Constants.CONTROLLER_KEY, controllerDefinition.getController());
Modified: sandbox/v2experiment/waffle-core/src/test/java/org/codehaus/waffle/action/InterceptingActionMethodExecutorTest.java (882 => 883)
--- sandbox/v2experiment/waffle-core/src/test/java/org/codehaus/waffle/action/InterceptingActionMethodExecutorTest.java 2009-01-15 20:02:55 UTC (rev 882) +++ sandbox/v2experiment/waffle-core/src/test/java/org/codehaus/waffle/action/InterceptingActionMethodExecutorTest.java 2009-01-15 20:08:31 UTC (rev 883) @@ -10,7 +10,6 @@ import java.lang.reflect.Method; import java.util.ArrayList; -import org.codehaus.waffle.context.ContextContainer; import org.codehaus.waffle.controller.ControllerDefinition; import org.codehaus.waffle.monitor.SilentMonitor; import org.codehaus.waffle.testmodel.FakeController;
Deleted: sandbox/v2experiment/waffle-core/src/test/java/org/codehaus/waffle/context/pico/PicoContextContainerTest.java (882 => 883)
--- sandbox/v2experiment/waffle-core/src/test/java/org/codehaus/waffle/context/pico/PicoContextContainerTest.java 2009-01-15 20:02:55 UTC (rev 882) +++ sandbox/v2experiment/waffle-core/src/test/java/org/codehaus/waffle/context/pico/PicoContextContainerTest.java 2009-01-15 20:08:31 UTC (rev 883) @@ -1,35 +0,0 @@ -package org.codehaus.waffle.context.pico; - -import org.codehaus.waffle.WaffleException; -import org.codehaus.waffle.context.ContextContainer; -import org.jmock.Expectations; -import org.jmock.Mockery; -import org.jmock.integration.junit4.JMock; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.picocontainer.MutablePicoContainer; -import org.picocontainer.PicoException; - -/** - * @author Michael Ward - */ -...@runwith(JMock.class) -public class PicoContextContainerTest { - private Mockery mockery = new Mockery(); - - @SuppressWarnings("serial") - @Test(expected = WaffleException.class) - public void canWrapPicoContainerExceptionsAsWaffleExceptions() { - final MutablePicoContainer delegate = mockery.mock(MutablePicoContainer.class); - mockery.checking(new Expectations() { - { - one(delegate).getComponent("foo"); - will(throwException(new PicoException("mock") { - })); - } - }); - - ContextContainer container = new ContextContainer(delegate); - container.getComponent("foo"); - } -}
Modified: sandbox/v2experiment/waffle-core/src/test/java/org/codehaus/waffle/controller/ContextControllerDefinitionFactoryTest.java (882 => 883)
--- sandbox/v2experiment/waffle-core/src/test/java/org/codehaus/waffle/controller/ContextControllerDefinitionFactoryTest.java 2009-01-15 20:02:55 UTC (rev 882) +++ sandbox/v2experiment/waffle-core/src/test/java/org/codehaus/waffle/controller/ContextControllerDefinitionFactoryTest.java 2009-01-15 20:08:31 UTC (rev 883) @@ -10,7 +10,6 @@ import org.codehaus.waffle.WaffleException; import org.codehaus.waffle.action.MethodDefinition; import org.codehaus.waffle.action.MethodDefinitionFinder; -import org.codehaus.waffle.context.ContextContainer; import org.codehaus.waffle.i18n.DefaultMessageResources; import org.codehaus.waffle.i18n.MessagesContext; import org.codehaus.waffle.monitor.SilentMonitor; @@ -37,7 +36,6 @@ public void canGetControllerDefinition() throws NoSuchMethodException { final MutablePicoContainer pico = new DefaultPicoContainer(new Caching()); pico.addComponent("theController", FakeController.class); - ContextContainer container = new ContextContainer(pico); // Mock HttpServletRequest final HttpServletRequest request = mockery.mock(HttpServletRequest.class); @@ -68,7 +66,7 @@ ControllerDefinitionFactory controllerDefinitionFactory = new ContextControllerDefinitionFactory(finder, new ContextPathControllerNameResolver(new SilentMonitor()), new SilentMonitor(), new DefaultMessageResources()); ControllerDefinition controllerDefinition = controllerDefinitionFactory.getControllerDefinition(request, - response, messagesContext, container); + response, messagesContext, pico); assertNotNull(controllerDefinition.getController()); assertSame(methodDefinition, controllerDefinition.getMethodDefinition()); @@ -77,7 +75,6 @@ @Test(expected = WaffleException.class) public void cannotRequestControllerDefinitionThatiIsNotRegistered() { MutablePicoContainer pico = new DefaultPicoContainer(new Caching()); - ContextContainer container = new ContextContainer(pico); // Mock HttpServletRequest final HttpServletRequest request = mockery.mock(HttpServletRequest.class); @@ -101,7 +98,7 @@ ControllerDefinitionFactory controllerDefinitionFactory = new ContextControllerDefinitionFactory(finder, new ContextPathControllerNameResolver(new SilentMonitor()), new SilentMonitor(), new DefaultMessageResources()); - ControllerDefinition definition = controllerDefinitionFactory.getControllerDefinition(request, response, context, container); + ControllerDefinition definition = controllerDefinitionFactory.getControllerDefinition(request, response, context, pico); } @Test(expected = WaffleException.class)
To unsubscribe from this list please visit:
