- Revision
- 519
- Author
- mward
- Date
- 2007-12-19 18:07:13 -0600 (Wed, 19 Dec 2007)
Log Message
dropped Http prefix from several classes that were named HttpSession*
Modified Paths
- trunk/waffle-core/src/main/java/org/codehaus/waffle/registrar/pico/DefaultParameterResolver.java
- trunk/waffle-core/src/test/java/org/codehaus/waffle/registrar/pico/DefaultPicoContainerParameterResolverTest.java
Added Paths
- trunk/waffle-core/src/main/java/org/codehaus/waffle/registrar/SessionAttributeReference.java
- trunk/waffle-core/src/main/java/org/codehaus/waffle/registrar/pico/SessionAttributeParameter.java
- trunk/waffle-core/src/test/java/org/codehaus/waffle/registrar/SessionAttributeReferenceTest.java
- trunk/waffle-core/src/test/java/org/codehaus/waffle/registrar/pico/SessionAttributeParameterTest.java
Removed Paths
- trunk/waffle-core/src/main/java/org/codehaus/waffle/registrar/HttpSessionAttributeReference.java
- trunk/waffle-core/src/main/java/org/codehaus/waffle/registrar/pico/HttpSessionAttributeParameter.java
- trunk/waffle-core/src/test/java/org/codehaus/waffle/registrar/HttpSessionAttributeReferenceTest.java
- trunk/waffle-core/src/test/java/org/codehaus/waffle/registrar/pico/HttpSessionAttributeParameterTest.java
Diff
Deleted: trunk/waffle-core/src/main/java/org/codehaus/waffle/registrar/HttpSessionAttributeReference.java (518 => 519)
--- trunk/waffle-core/src/main/java/org/codehaus/waffle/registrar/HttpSessionAttributeReference.java 2007-12-19 14:38:49 UTC (rev 518) +++ trunk/waffle-core/src/main/java/org/codehaus/waffle/registrar/HttpSessionAttributeReference.java 2007-12-20 00:07:13 UTC (rev 519) @@ -1,26 +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; - -public class HttpSessionAttributeReference extends AbstractReference { - - public HttpSessionAttributeReference(Object key) { - super(key); - } - - /** - * This method can be statically imported into an Application's Registrar allowing - * for a more fluent interface to define components and their dependencies - */ - public static HttpSessionAttributeReference sessionAttribute(Object key) { - return new HttpSessionAttributeReference(key); - } -}
Copied: trunk/waffle-core/src/main/java/org/codehaus/waffle/registrar/SessionAttributeReference.java (from rev 518, trunk/waffle-core/src/main/java/org/codehaus/waffle/registrar/HttpSessionAttributeReference.java) (0 => 519)
--- trunk/waffle-core/src/main/java/org/codehaus/waffle/registrar/SessionAttributeReference.java (rev 0) +++ trunk/waffle-core/src/main/java/org/codehaus/waffle/registrar/SessionAttributeReference.java 2007-12-20 00:07:13 UTC (rev 519) @@ -0,0 +1,26 @@ +/***************************************************************************** + * 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; + +public class SessionAttributeReference extends AbstractReference { + + public SessionAttributeReference(Object key) { + super(key); + } + + /** + * This method can be statically imported into an Application's Registrar allowing + * for a more fluent interface to define components and their dependencies + */ + public static SessionAttributeReference sessionAttribute(Object key) { + return new SessionAttributeReference(key); + } +}
Modified: trunk/waffle-core/src/main/java/org/codehaus/waffle/registrar/pico/DefaultParameterResolver.java (518 => 519)
--- trunk/waffle-core/src/main/java/org/codehaus/waffle/registrar/pico/DefaultParameterResolver.java 2007-12-19 14:38:49 UTC (rev 518) +++ trunk/waffle-core/src/main/java/org/codehaus/waffle/registrar/pico/DefaultParameterResolver.java 2007-12-20 00:07:13 UTC (rev 519) @@ -12,7 +12,7 @@ import org.codehaus.waffle.registrar.Reference; import org.codehaus.waffle.registrar.ComponentReference; -import org.codehaus.waffle.registrar.HttpSessionAttributeReference; +import org.codehaus.waffle.registrar.SessionAttributeReference; import org.codehaus.waffle.registrar.RequestAttributeReference; import org.codehaus.waffle.registrar.ServletContextAttributeReference; import org.codehaus.waffle.registrar.RequestParameterReference; @@ -39,8 +39,8 @@ return new RequestParameterParameter(reference.getKey().toString(), stringTransmuter); } 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 SessionAttributeReference) { + return new SessionAttributeParameter(reference.getKey().toString()); } else if(reference instanceof ServletContextAttributeReference) { return new ServletContextAttributeParameter(reference.getKey().toString()); }
Deleted: trunk/waffle-core/src/main/java/org/codehaus/waffle/registrar/pico/HttpSessionAttributeParameter.java (518 => 519)
--- trunk/waffle-core/src/main/java/org/codehaus/waffle/registrar/pico/HttpSessionAttributeParameter.java 2007-12-19 14:38:49 UTC (rev 518) +++ trunk/waffle-core/src/main/java/org/codehaus/waffle/registrar/pico/HttpSessionAttributeParameter.java 2007-12-20 00:07:13 UTC (rev 519) @@ -1,28 +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.ComponentAdapter; -import org.picocontainer.PicoContainer; - -import javax.servlet.http.HttpSession; - -class HttpSessionAttributeParameter extends AbstractWaffleParameter { - - protected HttpSessionAttributeParameter(String key) { - super(key); - } - - public Object resolveInstance(PicoContainer picoContainer, ComponentAdapter componentAdapter, Class clazz) { - HttpSession session = (HttpSession) picoContainer.getComponentInstanceOfType(HttpSession.class); - return session.getAttribute(getKey()); - } -}
Copied: trunk/waffle-core/src/main/java/org/codehaus/waffle/registrar/pico/SessionAttributeParameter.java (from rev 518, trunk/waffle-core/src/main/java/org/codehaus/waffle/registrar/pico/HttpSessionAttributeParameter.java) (0 => 519)
--- trunk/waffle-core/src/main/java/org/codehaus/waffle/registrar/pico/SessionAttributeParameter.java (rev 0) +++ trunk/waffle-core/src/main/java/org/codehaus/waffle/registrar/pico/SessionAttributeParameter.java 2007-12-20 00:07:13 UTC (rev 519) @@ -0,0 +1,28 @@ +/***************************************************************************** + * 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.ComponentAdapter; +import org.picocontainer.PicoContainer; + +import javax.servlet.http.HttpSession; + +class SessionAttributeParameter extends AbstractWaffleParameter { + + protected SessionAttributeParameter(String key) { + super(key); + } + + public Object resolveInstance(PicoContainer picoContainer, ComponentAdapter componentAdapter, Class clazz) { + HttpSession session = (HttpSession) picoContainer.getComponentInstanceOfType(HttpSession.class); + return session.getAttribute(getKey()); + } +}
Deleted: trunk/waffle-core/src/test/java/org/codehaus/waffle/registrar/HttpSessionAttributeReferenceTest.java (518 => 519)
--- trunk/waffle-core/src/test/java/org/codehaus/waffle/registrar/HttpSessionAttributeReferenceTest.java 2007-12-19 14:38:49 UTC (rev 518) +++ trunk/waffle-core/src/test/java/org/codehaus/waffle/registrar/HttpSessionAttributeReferenceTest.java 2007-12-20 00:07:13 UTC (rev 519) @@ -1,13 +0,0 @@ -package org.codehaus.waffle.registrar; - -import org.junit.Test; -import org.junit.Assert; - -public class HttpSessionAttributeReferenceTest { - - @Test - public void canConstructInstanceFromSessionMethod() { - Reference reference = HttpSessionAttributeReference.sessionAttribute("foo"); - Assert.assertEquals("foo", reference.getKey()); - } -}
Copied: trunk/waffle-core/src/test/java/org/codehaus/waffle/registrar/SessionAttributeReferenceTest.java (from rev 518, trunk/waffle-core/src/test/java/org/codehaus/waffle/registrar/HttpSessionAttributeReferenceTest.java) (0 => 519)
--- trunk/waffle-core/src/test/java/org/codehaus/waffle/registrar/SessionAttributeReferenceTest.java (rev 0) +++ trunk/waffle-core/src/test/java/org/codehaus/waffle/registrar/SessionAttributeReferenceTest.java 2007-12-20 00:07:13 UTC (rev 519) @@ -0,0 +1,13 @@ +package org.codehaus.waffle.registrar; + +import org.junit.Test; +import org.junit.Assert; + +public class SessionAttributeReferenceTest { + + @Test + public void canConstructInstanceFromSessionMethod() { + Reference reference = SessionAttributeReference.sessionAttribute("foo"); + Assert.assertEquals("foo", reference.getKey()); + } +}
Modified: trunk/waffle-core/src/test/java/org/codehaus/waffle/registrar/pico/DefaultPicoContainerParameterResolverTest.java (518 => 519)
--- trunk/waffle-core/src/test/java/org/codehaus/waffle/registrar/pico/DefaultPicoContainerParameterResolverTest.java 2007-12-19 14:38:49 UTC (rev 518) +++ trunk/waffle-core/src/test/java/org/codehaus/waffle/registrar/pico/DefaultPicoContainerParameterResolverTest.java 2007-12-20 00:07:13 UTC (rev 519) @@ -12,7 +12,7 @@ import org.codehaus.waffle.registrar.Reference; import org.codehaus.waffle.registrar.ComponentReference; -import org.codehaus.waffle.registrar.HttpSessionAttributeReference; +import org.codehaus.waffle.registrar.SessionAttributeReference; import org.codehaus.waffle.registrar.RequestAttributeReference; import org.codehaus.waffle.registrar.RequestParameterReference; import org.codehaus.waffle.registrar.ServletContextAttributeReference; @@ -54,11 +54,11 @@ } @Test - public void canResolveHttpSessionAttributeParameter() { + public void canResolveSessionAttributeParameter() { ParameterResolver parameterResolver = new DefaultParameterResolver(null); - Reference reference = new HttpSessionAttributeReference("foo"); + Reference reference = new SessionAttributeReference("foo"); - Assert.assertTrue(parameterResolver.resolve(reference) instanceof HttpSessionAttributeParameter); + Assert.assertTrue(parameterResolver.resolve(reference) instanceof SessionAttributeParameter); } @Test
Deleted: trunk/waffle-core/src/test/java/org/codehaus/waffle/registrar/pico/HttpSessionAttributeParameterTest.java (518 => 519)
--- trunk/waffle-core/src/test/java/org/codehaus/waffle/registrar/pico/HttpSessionAttributeParameterTest.java 2007-12-19 14:38:49 UTC (rev 518) +++ trunk/waffle-core/src/test/java/org/codehaus/waffle/registrar/pico/HttpSessionAttributeParameterTest.java 2007-12-20 00:07:13 UTC (rev 519) @@ -1,47 +0,0 @@ -package org.codehaus.waffle.registrar.pico; - -import static org.junit.Assert.assertEquals; - -import javax.servlet.http.HttpSession; - -import org.codehaus.waffle.testmodel.DependsOnValue; -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.Parameter; -import org.picocontainer.defaults.DefaultPicoContainer; - -/** - * - * @author Michael Ward - * @author Mauro Talevi - */ [EMAIL PROTECTED](JMock.class) -public class HttpSessionAttributeParameterTest { - private Mockery mockery = new Mockery(); - - @Test - public void componentDependsOnSessionAttribute() { - // Mock HttpSession - final HttpSession session = mockery.mock(HttpSession.class); - mockery.checking(new Expectations() { - { - exactly(2).of(session).getAttribute("foobar"); - will(returnValue("helloWorld")); - } - }); - - Parameter[] parameters = { new HttpSessionAttributeParameter("foobar") }; - - MutablePicoContainer pico = new DefaultPicoContainer(); - pico.registerComponentInstance(session); - pico.registerComponentImplementation("x", DependsOnValue.class, parameters); - - DependsOnValue dependsOnValue = (DependsOnValue) pico.getComponentInstance("x"); - - assertEquals("helloWorld", dependsOnValue.getValue()); - } -}
Copied: trunk/waffle-core/src/test/java/org/codehaus/waffle/registrar/pico/SessionAttributeParameterTest.java (from rev 518, trunk/waffle-core/src/test/java/org/codehaus/waffle/registrar/pico/HttpSessionAttributeParameterTest.java) (0 => 519)
--- trunk/waffle-core/src/test/java/org/codehaus/waffle/registrar/pico/SessionAttributeParameterTest.java (rev 0) +++ trunk/waffle-core/src/test/java/org/codehaus/waffle/registrar/pico/SessionAttributeParameterTest.java 2007-12-20 00:07:13 UTC (rev 519) @@ -0,0 +1,46 @@ +package org.codehaus.waffle.registrar.pico; + +import org.codehaus.waffle.testmodel.DependsOnValue; +import org.jmock.Expectations; +import org.jmock.Mockery; +import org.jmock.integration.junit4.JMock; +import static org.junit.Assert.assertEquals; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.picocontainer.MutablePicoContainer; +import org.picocontainer.Parameter; +import org.picocontainer.defaults.DefaultPicoContainer; + +import javax.servlet.http.HttpSession; + +/** + * + * @author Michael Ward + * @author Mauro Talevi + */ [EMAIL PROTECTED](JMock.class) +public class SessionAttributeParameterTest { + private Mockery mockery = new Mockery(); + + @Test + public void componentDependsOnSessionAttribute() { + // Mock HttpSession + final HttpSession session = mockery.mock(HttpSession.class); + mockery.checking(new Expectations() { + { + exactly(2).of(session).getAttribute("foobar"); + will(returnValue("helloWorld")); + } + }); + + Parameter[] parameters = { new SessionAttributeParameter("foobar") }; + + MutablePicoContainer pico = new DefaultPicoContainer(); + pico.registerComponentInstance(session); + pico.registerComponentImplementation("x", DependsOnValue.class, parameters); + + DependsOnValue dependsOnValue = (DependsOnValue) pico.getComponentInstance("x"); + + assertEquals("helloWorld", dependsOnValue.getValue()); + } +}
To unsubscribe from this list please visit:
