[waffle-scm] [713] trunk/waffle-core/src/test/java/org/codehaus/waffle/action: Cleanup generic warnings.

Tue, 17 Jun 2008 05:05:22 -0700

Title: [waffle-scm] [713] trunk/waffle-core/src/test/java/org/codehaus/waffle/action: Cleanup generic warnings.

Diff

Modified: trunk/waffle-core/src/test/java/org/codehaus/waffle/action/AnnotatedMethodDefinitionFinderTest.java (712 => 713)

--- trunk/waffle-core/src/test/java/org/codehaus/waffle/action/AnnotatedMethodDefinitionFinderTest.java	2008-06-16 21:27:30 UTC (rev 712)
+++ trunk/waffle-core/src/test/java/org/codehaus/waffle/action/AnnotatedMethodDefinitionFinderTest.java	2008-06-17 10:43:07 UTC (rev 713)
@@ -13,7 +13,6 @@
 import java.lang.reflect.Method;
 import java.lang.reflect.Type;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;

Modified: trunk/waffle-core/src/test/java/org/codehaus/waffle/context/pico/PicoContextContainerFactoryTest.java (712 => 713)

--- trunk/waffle-core/src/test/java/org/codehaus/waffle/context/pico/PicoContextContainerFactoryTest.java	2008-06-16 21:27:30 UTC (rev 712)
+++ trunk/waffle-core/src/test/java/org/codehaus/waffle/context/pico/PicoContextContainerFactoryTest.java	2008-06-17 10:43:07 UTC (rev 713)
@@ -10,6 +10,20 @@
  *****************************************************************************/
 package org.codehaus.waffle.context.pico;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+
+import java.lang.reflect.Field;
+import java.util.Collection;
+import java.util.Locale;
+
+import javax.servlet.ServletContext;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpSession;
+
 import org.codehaus.waffle.Constants;
 import org.codehaus.waffle.Startable;
 import org.codehaus.waffle.context.AbstractContextContainerFactory;
@@ -33,27 +47,14 @@
 import org.jmock.Mockery;
 import org.jmock.integration.junit4.JMock;
 import org.junit.Assert;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.picocontainer.DefaultPicoContainer;
 import org.picocontainer.MutablePicoContainer;
-import org.picocontainer.PicoContainer;
-import org.picocontainer.DefaultPicoContainer;
+import org.picocontainer.behaviors.Caching;
 import org.picocontainer.containers.EmptyPicoContainer;
-import org.picocontainer.behaviors.Caching;
 import org.picocontainer.monitors.NullComponentMonitor;
 
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
-import java.lang.reflect.Field;
-import java.util.Collection;
-import java.util.Locale;
-
 /**
  * 
  * @author Michael Ward

Modified: trunk/waffle-core/src/test/java/org/codehaus/waffle/context/pico/PicoContextContainerTest.java (712 => 713)

--- trunk/waffle-core/src/test/java/org/codehaus/waffle/context/pico/PicoContextContainerTest.java	2008-06-16 21:27:30 UTC (rev 712)
+++ trunk/waffle-core/src/test/java/org/codehaus/waffle/context/pico/PicoContextContainerTest.java	2008-06-17 10:43:07 UTC (rev 713)
@@ -19,7 +19,7 @@
 public class PicoContextContainerTest {
     private Mockery mockery = new Mockery();
 
-    @SuppressWarnings({"ThrowableInstanceNeverThrown"})
+    @SuppressWarnings({"ThrowableInstanceNeverThrown", "serial"})
     @Test
     public void getComponentInstanceShouldWrapAnyPicoException() {
         final MutablePicoContainer mutablePicoContainer = mockery.mock(MutablePicoContainer.class);

Modified: trunk/waffle-core/src/test/java/org/codehaus/waffle/registrar/pico/PicoRegistrarTest.java (712 => 713)

--- trunk/waffle-core/src/test/java/org/codehaus/waffle/registrar/pico/PicoRegistrarTest.java	2008-06-16 21:27:30 UTC (rev 712)
+++ trunk/waffle-core/src/test/java/org/codehaus/waffle/registrar/pico/PicoRegistrarTest.java	2008-06-17 10:43:07 UTC (rev 713)
@@ -244,8 +244,8 @@
     public void canRegisterComponentAdapter() {
         MutablePicoContainer pico = new DefaultPicoContainer(new Caching(), new NullLifecycleStrategy(), new EmptyPicoContainer(), cm);
 
-        ConstructorInjector componentAdapter
-                = new ConstructorInjector("a", FakeController.class);
+        ConstructorInjector<FakeController> componentAdapter
+                = new ConstructorInjector<FakeController>("a", FakeController.class);
 
         PicoRegistrar registrar = new PicoRegistrar(pico, null, lifecycleStrategy, new SilentMonitor(), cm);
         registrar.registerComponentAdapter(componentAdapter);

Modified: trunk/waffle-core/src/test/java/org/codehaus/waffle/testmodel/FakeBean.java (712 => 713)

--- trunk/waffle-core/src/test/java/org/codehaus/waffle/testmodel/FakeBean.java	2008-06-16 21:27:30 UTC (rev 712)
+++ trunk/waffle-core/src/test/java/org/codehaus/waffle/testmodel/FakeBean.java	2008-06-17 10:43:07 UTC (rev 713)
@@ -4,7 +4,7 @@
 
 public class FakeBean {
     private int count;
-    private List list;
+    private List<?> list;
 
     public int getCount() {
         return count;
@@ -14,11 +14,11 @@
         this.count = count;
     }
 
-    public List getList() {
+    public List<?> getList() {
         return list;
     }
 
-    public void setList(List list) {
+    public void setList(List<?> list) {
         this.list = list;
     }
 }

Modified: trunk/waffle-core/src/test/java/org/codehaus/waffle/testmodel/SampleForMethodFinder.java (712 => 713)

--- trunk/waffle-core/src/test/java/org/codehaus/waffle/testmodel/SampleForMethodFinder.java	2008-06-16 21:27:30 UTC (rev 712)
+++ trunk/waffle-core/src/test/java/org/codehaus/waffle/testmodel/SampleForMethodFinder.java	2008-06-17 10:43:07 UTC (rev 713)
@@ -33,7 +33,7 @@
     public HttpServletResponse response;
     public HttpSession session;
     public ServletContext servletContext;
-    private MessagesContext messagesContext;
+    public MessagesContext messagesContext;
 
     public void noArgumentMethod() {
         noArgumentMethodInvoked = true;
@@ -44,7 +44,7 @@
     }
 
     @ActionMethod(parameters = {"foobaz"})
-    public void methodTwo(List list) {
+    public void methodTwo(List<?> list) {
         methodTwoObject = list;
     }
 
@@ -54,7 +54,7 @@
     }
 
     @ActionMethod(parameters = {"foobaz"})
-    public void methodAmbiguous(List list) {
+    public void methodAmbiguous(List<?> list) {
         methodThreeObject = list;
     }
 
@@ -116,7 +116,7 @@
     }
 
     @ActionMethod(parameters = {"foobaz"})
-    public void actionMethodNeedsCustomConverter(List list) {
+    public void actionMethodNeedsCustomConverter(List<?> list) {
 
     }

To unsubscribe from this list please visit:

http://xircles.codehaus.org/manage_email

Reply via email to