- Revision
- 550
- Author
- mward
- Date
- 2008-01-16 20:37:37 -0600 (Wed, 16 Jan 2008)
Log Message
WAFFLE-54 : fixed RequestParameterReference so that it returns the correct type. Updated all reference implementation to now ensure correct type is returned.
Modified Paths
- trunk/waffle-core/src/main/java/org/codehaus/waffle/registrar/RequestParameterReference.java
- trunk/waffle-core/src/test/java/org/codehaus/waffle/registrar/RequestAttributeReferenceTest.java
- trunk/waffle-core/src/test/java/org/codehaus/waffle/registrar/RequestParameterReferenceTest.java
- trunk/waffle-core/src/test/java/org/codehaus/waffle/registrar/ServletContextAttributeReferenceTest.java
- trunk/waffle-core/src/test/java/org/codehaus/waffle/registrar/SessionAttributeReferenceTest.java
Diff
Modified: trunk/waffle-core/src/main/java/org/codehaus/waffle/registrar/RequestParameterReference.java (549 => 550)
--- trunk/waffle-core/src/main/java/org/codehaus/waffle/registrar/RequestParameterReference.java 2008-01-15 04:27:44 UTC (rev 549) +++ trunk/waffle-core/src/main/java/org/codehaus/waffle/registrar/RequestParameterReference.java 2008-01-17 02:37:37 UTC (rev 550) @@ -12,7 +12,7 @@ public class RequestParameterReference extends AbstractReference { - public RequestParameterReference(Object key) { + public RequestParameterReference(String key) { super(key); } @@ -20,7 +20,7 @@ * 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 RequestAttributeReference requestParameter(String key) { - return new RequestAttributeReference(key); + public static RequestParameterReference requestParameter(String key) { + return new RequestParameterReference(key); } }
Modified: trunk/waffle-core/src/test/java/org/codehaus/waffle/registrar/RequestAttributeReferenceTest.java (549 => 550)
--- trunk/waffle-core/src/test/java/org/codehaus/waffle/registrar/RequestAttributeReferenceTest.java 2008-01-15 04:27:44 UTC (rev 549) +++ trunk/waffle-core/src/test/java/org/codehaus/waffle/registrar/RequestAttributeReferenceTest.java 2008-01-17 02:37:37 UTC (rev 550) @@ -8,7 +8,7 @@ @Test public void canConstructInstanceFromRequestMethod() { - Reference reference = requestAttribute("foo"); + RequestAttributeReference reference = requestAttribute("foo"); Assert.assertEquals("foo", reference.getKey()); } }
Modified: trunk/waffle-core/src/test/java/org/codehaus/waffle/registrar/RequestParameterReferenceTest.java (549 => 550)
--- trunk/waffle-core/src/test/java/org/codehaus/waffle/registrar/RequestParameterReferenceTest.java 2008-01-15 04:27:44 UTC (rev 549) +++ trunk/waffle-core/src/test/java/org/codehaus/waffle/registrar/RequestParameterReferenceTest.java 2008-01-17 02:37:37 UTC (rev 550) @@ -1,14 +1,14 @@ package org.codehaus.waffle.registrar; +import static org.codehaus.waffle.registrar.RequestParameterReference.requestParameter; +import static org.junit.Assert.assertEquals; import org.junit.Test; -import org.junit.Assert; -import static org.codehaus.waffle.registrar.RequestParameterReference.requestParameter; public class RequestParameterReferenceTest { @Test public void canConstructInstanceFromParameterMethod() { - Reference reference = requestParameter("foo"); - Assert.assertEquals("foo", reference.getKey()); + RequestParameterReference reference = requestParameter("foo"); + assertEquals("foo", reference.getKey()); } }
Modified: trunk/waffle-core/src/test/java/org/codehaus/waffle/registrar/ServletContextAttributeReferenceTest.java (549 => 550)
--- trunk/waffle-core/src/test/java/org/codehaus/waffle/registrar/ServletContextAttributeReferenceTest.java 2008-01-15 04:27:44 UTC (rev 549) +++ trunk/waffle-core/src/test/java/org/codehaus/waffle/registrar/ServletContextAttributeReferenceTest.java 2008-01-17 02:37:37 UTC (rev 550) @@ -8,7 +8,7 @@ @Test public void canConstructInstanceFromParameterMethod() { - Reference reference = servletContextAttribute("foo"); + ServletContextAttributeReference reference = servletContextAttribute("foo"); Assert.assertEquals("foo", reference.getKey()); } }
Modified: trunk/waffle-core/src/test/java/org/codehaus/waffle/registrar/SessionAttributeReferenceTest.java (549 => 550)
--- trunk/waffle-core/src/test/java/org/codehaus/waffle/registrar/SessionAttributeReferenceTest.java 2008-01-15 04:27:44 UTC (rev 549) +++ trunk/waffle-core/src/test/java/org/codehaus/waffle/registrar/SessionAttributeReferenceTest.java 2008-01-17 02:37:37 UTC (rev 550) @@ -8,7 +8,7 @@ @Test public void canConstructInstanceFromSessionMethod() { - Reference reference = sessionAttribute("foo"); + SessionAttributeReference reference = sessionAttribute("foo"); Assert.assertEquals("foo", reference.getKey()); } }
To unsubscribe from this list please visit:
