[waffle-scm] [945] trunk: upgrade to full picocontainer 2.9 compat from Damian Gajda

[paul]

Title: [waffle-scm] [945] trunk: upgrade to full picocontainer 2.9 compat from Damian Gajda

Revision

945

Author

paul

Date

2009-05-17 19:51:28 -0500 (Sun, 17 May 2009)

Log Message

upgrade to full picocontainer 2.9 compat from Damian Gajda

Modified Paths

• trunk/pom.xml
• trunk/waffle-core/src/main/java/org/codehaus/waffle/pico/AbstractWaffleParameter.java
• trunk/waffle-core/src/main/java/org/codehaus/waffle/pico/RequestAttributeParameter.java
• trunk/waffle-core/src/main/java/org/codehaus/waffle/pico/RequestParameterParameter.java
• trunk/waffle-core/src/main/java/org/codehaus/waffle/pico/ServletContextAttributeParameter.java
• trunk/waffle-core/src/main/java/org/codehaus/waffle/pico/SessionAttributeParameter.java
• trunk/waffle-core/src/test/java/org/codehaus/waffle/pico/AbstractWaffleParameterTest.java

Diff

Modified: trunk/pom.xml (944 => 945)

--- trunk/pom.xml	2009-04-28 09:45:48 UTC (rev 944)
+++ trunk/pom.xml	2009-05-18 00:51:28 UTC (rev 945)
@@ -53,7 +53,7 @@
       <dependency>
         <groupId>com.thoughtworks.paranamer</groupId>
         <artifactId>paranamer</artifactId>
-        <version>1.3</version>
+        <version>1.4</version>
         <scope>provided</scope>
       </dependency>
       <dependency>
@@ -113,7 +113,7 @@
         <plugin>
           <groupId>com.thoughtworks.paranamer</groupId>
           <artifactId>paranamer-maven-plugin</artifactId>
-          <version>1.3</version>
+          <version>1.4</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>

Modified: trunk/waffle-core/src/main/java/org/codehaus/waffle/pico/AbstractWaffleParameter.java (944 => 945)

--- trunk/waffle-core/src/main/java/org/codehaus/waffle/pico/AbstractWaffleParameter.java	2009-04-28 09:45:48 UTC (rev 944)
+++ trunk/waffle-core/src/main/java/org/codehaus/waffle/pico/AbstractWaffleParameter.java	2009-05-18 00:51:28 UTC (rev 945)
@@ -28,10 +28,6 @@
         return key;
     }
 
-    public boolean isResolvable(PicoContainer picoContainer, ComponentAdapter<?> componentAdapter, Type type, NameBinding nameBinding, boolean b, Annotation annotation) {
-        return resolveInstance(picoContainer, componentAdapter, type, nameBinding, b, annotation) != null;
-    }
-
     public void verify(PicoContainer picoContainer, ComponentAdapter<?> componentAdapter, Type type, NameBinding nameBinding, boolean b, Annotation annotation) {
     }
 

Modified: trunk/waffle-core/src/main/java/org/codehaus/waffle/pico/RequestAttributeParameter.java (944 => 945)

--- trunk/waffle-core/src/main/java/org/codehaus/waffle/pico/RequestAttributeParameter.java	2009-04-28 09:45:48 UTC (rev 944)
+++ trunk/waffle-core/src/main/java/org/codehaus/waffle/pico/RequestAttributeParameter.java	2009-05-18 00:51:28 UTC (rev 945)
@@ -6,7 +6,6 @@
 import org.picocontainer.ComponentAdapter;
 import org.picocontainer.PicoContainer;
 import org.picocontainer.NameBinding;
-import org.codehaus.waffle.pico.AbstractWaffleParameter;
 
 import javax.servlet.http.HttpServletRequest;
 import java.lang.annotation.Annotation;
@@ -23,10 +22,12 @@
         super(key);
     }
 
-    public Object resolveInstance(PicoContainer picoContainer, ComponentAdapter<?> componentAdapter, Type type,
-            NameBinding nameBinding, boolean b, Annotation annotation) {
+    public Resolver resolve(PicoContainer picoContainer, ComponentAdapter<?> forAdapter,
+            ComponentAdapter<?> injecteeAdapter, Type expectedType, NameBinding expectedNameBinding,
+            boolean useNames, Annotation binding) {
         HttpServletRequest request = picoContainer.getComponent(HttpServletRequest.class);
-        return request.getAttribute(getKey());
+        Object value = request.getAttribute(getKey());
+        return new ValueResolver(value != null, value, forAdapter);
     }
 
 }

Modified: trunk/waffle-core/src/main/java/org/codehaus/waffle/pico/RequestParameterParameter.java (944 => 945)

--- trunk/waffle-core/src/main/java/org/codehaus/waffle/pico/RequestParameterParameter.java	2009-04-28 09:45:48 UTC (rev 944)
+++ trunk/waffle-core/src/main/java/org/codehaus/waffle/pico/RequestParameterParameter.java	2009-05-18 00:51:28 UTC (rev 945)
@@ -7,7 +7,6 @@
 import org.picocontainer.PicoContainer;
 import org.picocontainer.NameBinding;
 import org.codehaus.waffle.bind.StringTransmuter;
-import org.codehaus.waffle.pico.AbstractWaffleParameter;
 
 import javax.servlet.http.HttpServletRequest;
 import java.lang.annotation.Annotation;
@@ -32,16 +31,18 @@
 
 
     @SuppressWarnings({"unchecked"})
-    public Object resolveInstance(PicoContainer picoContainer, ComponentAdapter componentAdapter, Type expectedType, NameBinding nameBinding, boolean b, Annotation annotation) {
+    public Resolver resolve(PicoContainer picoContainer, ComponentAdapter<?> forAdapter,
+            ComponentAdapter<?> injecteeAdapter, Type expectedType, NameBinding expectedNameBinding,
+            boolean useNames, Annotation binding) {
         HttpServletRequest request = picoContainer
                 .getComponent(HttpServletRequest.class);
         String value = request.getParameter(getKey());
         Object result = stringTransmuter.transmute(value, expectedType);
 
         if(result == null) {
-            return defaultValue;
+            result = defaultValue;
         }
 
-        return result;
+        return new ValueResolver(result != null, result, forAdapter);
     }
 }

Modified: trunk/waffle-core/src/main/java/org/codehaus/waffle/pico/ServletContextAttributeParameter.java (944 => 945)

--- trunk/waffle-core/src/main/java/org/codehaus/waffle/pico/ServletContextAttributeParameter.java	2009-04-28 09:45:48 UTC (rev 944)
+++ trunk/waffle-core/src/main/java/org/codehaus/waffle/pico/ServletContextAttributeParameter.java	2009-05-18 00:51:28 UTC (rev 945)
@@ -6,7 +6,6 @@
 import org.picocontainer.ComponentAdapter;
 import org.picocontainer.PicoContainer;
 import org.picocontainer.NameBinding;
-import org.codehaus.waffle.pico.AbstractWaffleParameter;
 
 import javax.servlet.ServletContext;
 import java.lang.annotation.Annotation;
@@ -24,13 +23,11 @@
     }
 
     @SuppressWarnings({"unchecked"})
-    public Object resolveInstance(PicoContainer picoContainer,
-                                 ComponentAdapter componentAdapter,
-                                 Type type,
-                                 NameBinding nameBinding,
-                                 boolean b,
-                                 Annotation annotation) {
+    public Resolver resolve(PicoContainer picoContainer, ComponentAdapter<?> forAdapter,
+            ComponentAdapter<?> injecteeAdapter, Type expectedType, NameBinding expectedNameBinding,
+            boolean useNames, Annotation binding) {
         ServletContext servletContext = picoContainer.getComponent(ServletContext.class);
-        return servletContext.getAttribute(getKey());
+        Object value = servletContext.getAttribute(getKey());
+        return new ValueResolver(value != null, value, forAdapter);
     }
 }

Modified: trunk/waffle-core/src/main/java/org/codehaus/waffle/pico/SessionAttributeParameter.java (944 => 945)

--- trunk/waffle-core/src/main/java/org/codehaus/waffle/pico/SessionAttributeParameter.java	2009-04-28 09:45:48 UTC (rev 944)
+++ trunk/waffle-core/src/main/java/org/codehaus/waffle/pico/SessionAttributeParameter.java	2009-05-18 00:51:28 UTC (rev 945)
@@ -6,7 +6,6 @@
 import org.picocontainer.ComponentAdapter;
 import org.picocontainer.PicoContainer;
 import org.picocontainer.NameBinding;
-import org.codehaus.waffle.pico.AbstractWaffleParameter;
 
 import javax.servlet.http.HttpSession;
 import java.lang.annotation.Annotation;
@@ -24,13 +23,11 @@
     }
 
     @SuppressWarnings({"unchecked"})
-    public Object resolveInstance(PicoContainer picoContainer,
-                                 ComponentAdapter componentAdapter,
-                                 Type type,
-                                 NameBinding nameBinding,
-                                 boolean b,
-                                 Annotation annotation) {
+    public Resolver resolve(PicoContainer picoContainer, ComponentAdapter<?> forAdapter,
+            ComponentAdapter<?> injecteeAdapter, Type expectedType, NameBinding expectedNameBinding,
+            boolean useNames, Annotation binding) {
         HttpSession session = picoContainer.getComponent(HttpSession.class);
-        return session.getAttribute(getKey());
+        Object value = session.getAttribute(getKey());
+        return new ValueResolver(value != null, value, forAdapter);
     }
 }

Modified: trunk/waffle-core/src/test/java/org/codehaus/waffle/pico/AbstractWaffleParameterTest.java (944 => 945)

--- trunk/waffle-core/src/test/java/org/codehaus/waffle/pico/AbstractWaffleParameterTest.java	2009-04-28 09:45:48 UTC (rev 944)
+++ trunk/waffle-core/src/test/java/org/codehaus/waffle/pico/AbstractWaffleParameterTest.java	2009-05-18 00:51:28 UTC (rev 945)
@@ -9,7 +9,6 @@
 import org.picocontainer.PicoContainer;
 import org.picocontainer.PicoVisitor;
 import org.picocontainer.NameBinding;
-import org.codehaus.waffle.pico.AbstractWaffleParameter;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Type;
@@ -29,7 +28,9 @@
         final AbstractWaffleParameter parameter = new AbstractWaffleParameter("foobar") {
 
             @SuppressWarnings("unchecked")
-            public Object resolveInstance(PicoContainer picoContainer, ComponentAdapter componentAdapter, Type type, NameBinding nameBinding, boolean b, Annotation annotation) {
+            public Resolver resolve(PicoContainer picoContainer, ComponentAdapter<?> forAdapter,
+                    ComponentAdapter<?> injecteeAdapter, Type expectedType, NameBinding expectedNameBinding,
+                    boolean useNames, Annotation binding) {
                 throw new UnsupportedOperationException("don't call");
             }
         };

---

To unsubscribe from this list please visit:

http://xircles.codehaus.org/manage_email