From 88aa6a4eefe0d964197c188a37f64cd92606f725 Mon Sep 17 00:00:00 2001 From: Erwin Vervaet Date: Fri, 23 Mar 2007 19:30:14 +0000 Subject: [PATCH] Code polishing after analysis with FindBugs and PMD. --- .../springframework/binding/convert/ConversionExecutor.java | 4 +--- .../binding/expression/EvaluationAttempt.java | 4 +--- .../springframework/binding/format/FormatterFactory.java | 4 +--- .../binding/method/MethodInvocationException.java | 2 ++ .../org/springframework/binding/method/MethodSignature.java | 6 ++---- .../java/org/springframework/binding/method/Parameter.java | 4 +--- .../java/org/springframework/binding/method/Parameters.java | 3 +-- 7 files changed, 9 insertions(+), 18 deletions(-) diff --git a/spring-binding/src/main/java/org/springframework/binding/convert/ConversionExecutor.java b/spring-binding/src/main/java/org/springframework/binding/convert/ConversionExecutor.java index 467a1dda..53efce5e 100644 --- a/spring-binding/src/main/java/org/springframework/binding/convert/ConversionExecutor.java +++ b/spring-binding/src/main/java/org/springframework/binding/convert/ConversionExecutor.java @@ -15,8 +15,6 @@ */ package org.springframework.binding.convert; -import java.io.Serializable; - import org.springframework.core.style.ToStringCreator; import org.springframework.util.Assert; @@ -29,7 +27,7 @@ import org.springframework.util.Assert; * * @author Keith Donald */ -public class ConversionExecutor implements Serializable { +public class ConversionExecutor { /** * The source value type this executor will attempt to convert from. diff --git a/spring-binding/src/main/java/org/springframework/binding/expression/EvaluationAttempt.java b/spring-binding/src/main/java/org/springframework/binding/expression/EvaluationAttempt.java index 3aac17e9..d011e73d 100644 --- a/spring-binding/src/main/java/org/springframework/binding/expression/EvaluationAttempt.java +++ b/spring-binding/src/main/java/org/springframework/binding/expression/EvaluationAttempt.java @@ -15,8 +15,6 @@ */ package org.springframework.binding.expression; -import java.io.Serializable; - import org.springframework.core.style.ToStringCreator; /** @@ -24,7 +22,7 @@ import org.springframework.core.style.ToStringCreator; * * @author Keith Donald */ -public class EvaluationAttempt implements Serializable { +public class EvaluationAttempt { /** * The expression that attempted to evaluate. diff --git a/spring-binding/src/main/java/org/springframework/binding/format/FormatterFactory.java b/spring-binding/src/main/java/org/springframework/binding/format/FormatterFactory.java index 3c8032ce..7a2cb209 100644 --- a/spring-binding/src/main/java/org/springframework/binding/format/FormatterFactory.java +++ b/spring-binding/src/main/java/org/springframework/binding/format/FormatterFactory.java @@ -15,8 +15,6 @@ */ package org.springframework.binding.format; -import java.text.Format; - /** * Source for shared and commonly used Formatters. *

@@ -24,7 +22,7 @@ import java.text.Format; * aren't thread safe: so implementations of this service should take care to * synchronize them as neccessary. * - * @see Format + * @see java.text.Format * * @author Keith Donald */ diff --git a/spring-binding/src/main/java/org/springframework/binding/method/MethodInvocationException.java b/spring-binding/src/main/java/org/springframework/binding/method/MethodInvocationException.java index 8dd0dc58..bf2e5f7a 100644 --- a/spring-binding/src/main/java/org/springframework/binding/method/MethodInvocationException.java +++ b/spring-binding/src/main/java/org/springframework/binding/method/MethodInvocationException.java @@ -46,6 +46,8 @@ public class MethodInvocationException extends NestedRuntimeException { */ public MethodInvocationException(MethodSignature methodSignature, Object[] arguments, Exception cause) { super("Unable to invoke method " + methodSignature + " with arguments " + StylerUtils.style(arguments), cause); + this.methodSignature = methodSignature; + this.arguments = arguments; } /** diff --git a/spring-binding/src/main/java/org/springframework/binding/method/MethodSignature.java b/spring-binding/src/main/java/org/springframework/binding/method/MethodSignature.java index 0537ef8d..cade750e 100644 --- a/spring-binding/src/main/java/org/springframework/binding/method/MethodSignature.java +++ b/spring-binding/src/main/java/org/springframework/binding/method/MethodSignature.java @@ -15,8 +15,6 @@ */ package org.springframework.binding.method; -import java.io.Serializable; - import org.springframework.core.style.ToStringCreator; import org.springframework.util.Assert; @@ -28,7 +26,7 @@ import org.springframework.util.Assert; * * @author Keith Donald */ -public class MethodSignature implements Serializable { +public class MethodSignature { /** * The name of the method, e.g "execute". @@ -88,7 +86,7 @@ public class MethodSignature implements Serializable { return false; } MethodSignature other = (MethodSignature) obj; - return methodName.equals(methodName) && parameters.equals(other.parameters); + return methodName.equals(other.methodName) && parameters.equals(other.parameters); } public int hashCode() { diff --git a/spring-binding/src/main/java/org/springframework/binding/method/Parameter.java b/spring-binding/src/main/java/org/springframework/binding/method/Parameter.java index 3c16483c..e1d49f83 100644 --- a/spring-binding/src/main/java/org/springframework/binding/method/Parameter.java +++ b/spring-binding/src/main/java/org/springframework/binding/method/Parameter.java @@ -15,8 +15,6 @@ */ package org.springframework.binding.method; -import java.io.Serializable; - import org.springframework.binding.expression.EvaluationContext; import org.springframework.binding.expression.Expression; import org.springframework.core.style.ToStringCreator; @@ -29,7 +27,7 @@ import org.springframework.util.ObjectUtils; * * @author Keith Donald */ -public class Parameter implements Serializable { +public class Parameter { /** * The class of the parameter, e.g "springbank.AccountNumber". diff --git a/spring-binding/src/main/java/org/springframework/binding/method/Parameters.java b/spring-binding/src/main/java/org/springframework/binding/method/Parameters.java index 1c636881..f900efd5 100644 --- a/spring-binding/src/main/java/org/springframework/binding/method/Parameters.java +++ b/spring-binding/src/main/java/org/springframework/binding/method/Parameters.java @@ -15,7 +15,6 @@ */ package org.springframework.binding.method; -import java.io.Serializable; import java.util.ArrayList; import java.util.Arrays; import java.util.Iterator; @@ -26,7 +25,7 @@ import java.util.List; * * @author Keith */ -public class Parameters implements Serializable { +public class Parameters { /** * Canonical instance for an empty parameters list.