- Revision
- 342
- Author
- mward
- Date
- 2007-11-06 17:53:47 -0600 (Tue, 06 Nov 2007)
Log Message
fixed several potential bugs (thanks to findbugs)
Modified Paths
- trunk/core/src/main/java/org/codehaus/waffle/action/intercept/MethodInterceptorComparator.java
- trunk/core/src/main/java/org/codehaus/waffle/action/intercept/Sortable.java
- trunk/core/src/main/java/org/codehaus/waffle/bind/IntrospectingRequestAttributeBinder.java
- trunk/core/src/main/java/org/codehaus/waffle/context/ContextContainer.java
- trunk/core/src/main/java/org/codehaus/waffle/context/pico/PicoLifecycleStrategy.java
- trunk/core/src/main/ruby/org/codehaus/waffle/erb_extension.rb
- trunk/core/src/test/java/org/codehaus/waffle/action/RequestParameterMethodNameResolverTest.java
- trunk/core/src/test/java/org/codehaus/waffle/action/intercept/MethodInterceptorComparatorTest.java
- trunk/core/src/test/java/org/codehaus/waffle/bind/DefaultBindErrorMessageResolverTest.java
- trunk/core/src/test/java/org/codehaus/waffle/bind/OgnlTypeConverterTest.java
- trunk/core/src/test/java/org/codehaus/waffle/controller/ContextControllerDefinitionFactoryTest.java
- trunk/core/src/test/java/org/codehaus/waffle/monitor/AbstractWritingMonitorTest.java
- trunk/core/src/test/java/org/codehaus/waffle/servlet/WaffleServletTest.java
Diff
Modified: trunk/core/src/main/java/org/codehaus/waffle/action/intercept/MethodInterceptorComparator.java (341 => 342)
--- trunk/core/src/main/java/org/codehaus/waffle/action/intercept/MethodInterceptorComparator.java 2007-11-04 10:47:26 UTC (rev 341) +++ trunk/core/src/main/java/org/codehaus/waffle/action/intercept/MethodInterceptorComparator.java 2007-11-06 23:53:47 UTC (rev 342) @@ -11,14 +11,15 @@ package org.codehaus.waffle.action.intercept; import java.util.Comparator; +import java.io.Serializable; -public class MethodInterceptorComparator implements Comparator<MethodInterceptor> { +public class MethodInterceptorComparator implements Comparator<MethodInterceptor>, Serializable { public int compare(MethodInterceptor first, MethodInterceptor second) { if (first instanceof Sortable && second instanceof Sortable) { Sortable first; Sortable two = (Sortable) second; - return new Integer(one.getIndex()).compareTo(two.getIndex()); + return one.getIndex().compareTo(two.getIndex()); } else if (first instanceof Sortable) { return -1; // force to be less } else {
Modified: trunk/core/src/main/java/org/codehaus/waffle/action/intercept/Sortable.java (341 => 342)
--- trunk/core/src/main/java/org/codehaus/waffle/action/intercept/Sortable.java 2007-11-04 10:47:26 UTC (rev 341) +++ trunk/core/src/main/java/org/codehaus/waffle/action/intercept/Sortable.java 2007-11-06 23:53:47 UTC (rev 342) @@ -12,5 +12,5 @@ public interface Sortable { - int getIndex(); + Integer getIndex(); }
Modified: trunk/core/src/main/java/org/codehaus/waffle/bind/IntrospectingRequestAttributeBinder.java (341 => 342)
--- trunk/core/src/main/java/org/codehaus/waffle/bind/IntrospectingRequestAttributeBinder.java 2007-11-04 10:47:26 UTC (rev 341) +++ trunk/core/src/main/java/org/codehaus/waffle/bind/IntrospectingRequestAttributeBinder.java 2007-11-06 23:53:47 UTC (rev 342) @@ -50,11 +50,11 @@ private void handleRubyController(HttpServletRequest request, RubyController rubyController) { IRubyObject iRubyObject = rubyController.getRubyObject(); Map<String, IRubyObject> iVars = iRubyObject.getInstanceVariables(); - Set<String> keys = iVars.keySet(); + Set<Map.Entry<String, IRubyObject>> entries = iVars.entrySet(); - for (String key : keys) { - Object value = JavaEmbedUtils.rubyToJava(iRubyObject.getRuntime(), iVars.get(key), Object.class); - request.setAttribute(key.substring(1), value); + for (Map.Entry<String, IRubyObject> entry : entries) { + Object value = JavaEmbedUtils.rubyToJava(iRubyObject.getRuntime(), entry.getValue(), Object.class); + request.setAttribute(entry.getKey().substring(1), value); } } }
Modified: trunk/core/src/main/java/org/codehaus/waffle/context/ContextContainer.java (341 => 342)
--- trunk/core/src/main/java/org/codehaus/waffle/context/ContextContainer.java 2007-11-04 10:47:26 UTC (rev 341) +++ trunk/core/src/main/java/org/codehaus/waffle/context/ContextContainer.java 2007-11-06 23:53:47 UTC (rev 342) @@ -13,8 +13,9 @@ import org.codehaus.waffle.Startable; import java.util.Collection; +import java.io.Serializable; -public interface ContextContainer extends Startable { +public interface ContextContainer extends Startable, Serializable { void dispose();
Modified: trunk/core/src/main/java/org/codehaus/waffle/context/pico/PicoLifecycleStrategy.java (341 => 342)
--- trunk/core/src/main/java/org/codehaus/waffle/context/pico/PicoLifecycleStrategy.java 2007-11-04 10:47:26 UTC (rev 341) +++ trunk/core/src/main/java/org/codehaus/waffle/context/pico/PicoLifecycleStrategy.java 2007-11-06 23:53:47 UTC (rev 342) @@ -19,7 +19,7 @@ public class PicoLifecycleStrategy extends DefaultLifecycleStrategy { private static Method start, stop; - { + static { try { start = Startable.class.getMethod("start", (Class[]) null); stop = Startable.class.getMethod("stop", (Class[]) null);
Modified: trunk/core/src/main/ruby/org/codehaus/waffle/erb_extension.rb (341 => 342)
--- trunk/core/src/main/ruby/org/codehaus/waffle/erb_extension.rb 2007-11-04 10:47:26 UTC (rev 341) +++ trunk/core/src/main/ruby/org/codehaus/waffle/erb_extension.rb 2007-11-06 23:53:47 UTC (rev 342) @@ -43,6 +43,8 @@ return "File Not Found: Unable to render file '#{path}'." unless File.exist?(path) + + # TODO can't we just call open() ?? template = '' File.open(path).each { |line| template << line }
Modified: trunk/core/src/test/java/org/codehaus/waffle/action/RequestParameterMethodNameResolverTest.java (341 => 342)
--- trunk/core/src/test/java/org/codehaus/waffle/action/RequestParameterMethodNameResolverTest.java 2007-11-04 10:47:26 UTC (rev 341) +++ trunk/core/src/test/java/org/codehaus/waffle/action/RequestParameterMethodNameResolverTest.java 2007-11-06 23:53:47 UTC (rev 342) @@ -75,7 +75,7 @@ mockery.checking(new Expectations() { { one(map).keySet(); - will(returnValue(new HashSet(Arrays.asList(new String[]{name})))); + will(returnValue(new HashSet(Arrays.asList(name)))); } }); return map;
Modified: trunk/core/src/test/java/org/codehaus/waffle/action/intercept/MethodInterceptorComparatorTest.java (341 => 342)
--- trunk/core/src/test/java/org/codehaus/waffle/action/intercept/MethodInterceptorComparatorTest.java 2007-11-04 10:47:26 UTC (rev 341) +++ trunk/core/src/test/java/org/codehaus/waffle/action/intercept/MethodInterceptorComparatorTest.java 2007-11-06 23:53:47 UTC (rev 342) @@ -62,7 +62,7 @@ this.index = index; } - public int getIndex() { + public Integer getIndex() { return index; }
Modified: trunk/core/src/test/java/org/codehaus/waffle/bind/DefaultBindErrorMessageResolverTest.java (341 => 342)
--- trunk/core/src/test/java/org/codehaus/waffle/bind/DefaultBindErrorMessageResolverTest.java 2007-11-04 10:47:26 UTC (rev 341) +++ trunk/core/src/test/java/org/codehaus/waffle/bind/DefaultBindErrorMessageResolverTest.java 2007-11-06 23:53:47 UTC (rev 342) @@ -28,9 +28,9 @@ final MessageResources messageResources = mockery.mock(MessageResources.class); mockery.checking(new Expectations() { { - one(messageResources).getMessageWithDefault("decimal", "decimal", new Object[] {}); + one(messageResources).getMessageWithDefault("decimal", "decimal"); will(returnValue("my.field.name")); - one(messageResources).getMessage("my.field.name.bind.error", new Object[] { "bad-value" }); + one(messageResources).getMessage("my.field.name.bind.error", "bad-value"); will(returnValue("My Error Message")); } }); @@ -41,18 +41,19 @@ assertEquals("My Error Message", message); } + @SuppressWarnings({"ThrowableInstanceNeverThrown"}) @Test public void canResolveToTypeBasedBindErrorMessage() { // Mock MessageResources final MessageResources messageResources = mockery.mock(MessageResources.class); mockery.checking(new Expectations() { { - one(messageResources).getMessageWithDefault("count", "count", new Object[] {}); + one(messageResources).getMessageWithDefault("count", "count"); will(returnValue("my.field.name")); - one(messageResources).getMessage("my.field.name.bind.error", new Object[] { "bad-value" }); + one(messageResources).getMessage("my.field.name.bind.error", "bad-value"); will(throwException(new MissingResourceException("fake", "class", "key"))); - one(messageResources).getMessage("number.bind.error", - new Object[] { "my.field.name", "bad-value" }); + one(messageResources).getMessage("number.bind.error", + "my.field.name", "bad-value"); will(returnValue("The error message")); } }); @@ -62,21 +63,22 @@ assertEquals("The error message", message); } + @SuppressWarnings({"ThrowableInstanceNeverThrown"}) @Test public void canResolveToDefaultBindErrorMessage() { // Mock MessageResources final MessageResources messageResources = mockery.mock(MessageResources.class); mockery.checking(new Expectations() { { - one(messageResources).getMessageWithDefault("count", "count", new Object[] {}); + one(messageResources).getMessageWithDefault("count", "count"); will(returnValue("my.field.name")); - one(messageResources).getMessage("my.field.name.bind.error", new Object[] { "bad-value" }); + one(messageResources).getMessage("my.field.name.bind.error", "bad-value"); will(throwException(new MissingResourceException("fake", "class", "key"))); - one(messageResources).getMessage("number.bind.error", - new Object[] { "my.field.name", "bad-value" }); + one(messageResources).getMessage("number.bind.error", + "my.field.name", "bad-value"); will(throwException(new MissingResourceException("fake", "class", "key"))); one(messageResources).getMessage("default.bind.error", - new Object[] { "my.field.name", "bad-value" }); + "my.field.name", "bad-value"); will(returnValue("The default error message")); } });
Modified: trunk/core/src/test/java/org/codehaus/waffle/bind/OgnlTypeConverterTest.java (341 => 342)
--- trunk/core/src/test/java/org/codehaus/waffle/bind/OgnlTypeConverterTest.java 2007-11-04 10:47:26 UTC (rev 341) +++ trunk/core/src/test/java/org/codehaus/waffle/bind/OgnlTypeConverterTest.java 2007-11-06 23:53:47 UTC (rev 342) @@ -34,7 +34,7 @@ OgnlTypeConverter converter = new OgnlTypeConverter(); Integer value = (Integer) converter.convertValue("foobar", "15", Integer.class); - assertEquals(15, value.intValue()); + assertEquals(15, value); } @Test
Modified: trunk/core/src/test/java/org/codehaus/waffle/controller/ContextControllerDefinitionFactoryTest.java (341 => 342)
--- trunk/core/src/test/java/org/codehaus/waffle/controller/ContextControllerDefinitionFactoryTest.java 2007-11-04 10:47:26 UTC (rev 341) +++ trunk/core/src/test/java/org/codehaus/waffle/controller/ContextControllerDefinitionFactoryTest.java 2007-11-06 23:53:47 UTC (rev 342) @@ -43,7 +43,7 @@ one(request).getPathInfo(); will(returnValue("/theController.htm")); one(request).setAttribute(Constants.CONTROLLER_KEY, - (FakeController) pico.getComponentInstanceOfType(FakeController.class)); + pico.getComponentInstanceOfType(FakeController.class)); } });
Modified: trunk/core/src/test/java/org/codehaus/waffle/monitor/AbstractWritingMonitorTest.java (341 => 342)
--- trunk/core/src/test/java/org/codehaus/waffle/monitor/AbstractWritingMonitorTest.java 2007-11-04 10:47:26 UTC (rev 341) +++ trunk/core/src/test/java/org/codehaus/waffle/monitor/AbstractWritingMonitorTest.java 2007-11-06 23:53:47 UTC (rev 342) @@ -56,6 +56,7 @@ assertEquals(5, sb.toString().split("\n").length); } + @SuppressWarnings({"ThrowableInstanceNeverThrown"}) @Test public void canTraceExceptions() { final StringWriter monitorWriter = new StringWriter();
Modified: trunk/core/src/test/java/org/codehaus/waffle/servlet/WaffleServletTest.java (341 => 342)
--- trunk/core/src/test/java/org/codehaus/waffle/servlet/WaffleServletTest.java 2007-11-04 10:47:26 UTC (rev 341) +++ trunk/core/src/test/java/org/codehaus/waffle/servlet/WaffleServletTest.java 2007-11-06 23:53:47 UTC (rev 342) @@ -303,7 +303,7 @@ waffleServlet.service(request, response); } - @SuppressWarnings({"serial"}) + @SuppressWarnings({"serial", "ThrowableInstanceNeverThrown"}) @Test public void canThrowExceptionInMethodInvocation() throws Exception { final NonDispatchingController nonDispatchingController = new NonDispatchingController();
To unsubscribe from this list please visit:
