Polishing

Author: jhoeller

spring-core/src/main/java/org/springframework/core/MethodParameter.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * Copyright 2002-2012 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -310,14 +310,14 @@ public <T extends Annotation> T getParameterAnnotation(Class<T> annotationType)
  * Return true if the parameter has at least one annotation, false if it has none.
  */
 public boolean hasParameterAnnotations() {
-return getParameterAnnotations().length != 0;
+return (getParameterAnnotations().length != 0);
 }
 
 /**
  * Return true if the parameter has the given annotation type, and false if it doesn't.
  */
 public <T extends Annotation> boolean hasParameterAnnotation(Class<T> annotationType) {
-return getParameterAnnotation(annotationType) != null;
+return (getParameterAnnotation(annotationType) != null);
 }
 
 /**
@@ -416,28 +416,6 @@ private Map<Integer, Integer> getTypeIndexesPerLevel() {
 return this.typeIndexesPerLevel;
 }
 
-
-/**
- * Create a new MethodParameter for the given method or constructor.
- * <p>This is a convenience constructor for scenarios where a
- * Method or Constructor reference is treated in a generic fashion.
- * @param methodOrConstructor the Method or Constructor to specify a parameter for
- * @param parameterIndex the index of the parameter
- * @return the corresponding MethodParameter instance
- */
-public static MethodParameter forMethodOrConstructor(Object methodOrConstructor, int parameterIndex) {
-if (methodOrConstructor instanceof Method) {
-return new MethodParameter((Method) methodOrConstructor, parameterIndex);
-}
-else if (methodOrConstructor instanceof Constructor) {
-return new MethodParameter((Constructor) methodOrConstructor, parameterIndex);
-}
-else {
-throw new IllegalArgumentException(
-"Given object [" + methodOrConstructor + "] is neither a Method nor a Constructor");
-}
-}
-
 @Override
 public boolean equals(Object obj) {
 if (this == obj) {
@@ -459,7 +437,6 @@ else if (this.getMember().equals(other.getMember())) {
 return false;
 }
 
-
 @Override
 public int hashCode() {
 int result = this.hash;
@@ -471,4 +448,26 @@ public int hashCode() {
 return result;
 }
 
+
+/**
+ * Create a new MethodParameter for the given method or constructor.
+ * <p>This is a convenience constructor for scenarios where a
+ * Method or Constructor reference is treated in a generic fashion.
+ * @param methodOrConstructor the Method or Constructor to specify a parameter for
+ * @param parameterIndex the index of the parameter
+ * @return the corresponding MethodParameter instance
+ */
+public static MethodParameter forMethodOrConstructor(Object methodOrConstructor, int parameterIndex) {
+if (methodOrConstructor instanceof Method) {
+return new MethodParameter((Method) methodOrConstructor, parameterIndex);
+}
+else if (methodOrConstructor instanceof Constructor) {
+return new MethodParameter((Constructor) methodOrConstructor, parameterIndex);
+}
+else {
+throw new IllegalArgumentException(
+"Given object [" + methodOrConstructor + "] is neither a Method nor a Constructor");
+}
+}
+
 }

spring-core/src/test/java/org/springframework/core/MethodParameterTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * Copyright 2002-2012 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -34,6 +34,7 @@ public class MethodParameterTests {
 
 private MethodParameter intReturnType;
 
+
 @Before
 public void setUp() throws NoSuchMethodException {
 Method method = getClass().getMethod("method", String.class, Long.TYPE);
@@ -42,8 +43,6 @@ public void setUp() throws NoSuchMethodException {
 intReturnType = new MethodParameter(method, -1);
 }
 
-
-
 @Test
 public void testEquals() throws NoSuchMethodException {
 assertEquals(stringParameter, stringParameter);

spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/multiaction/MultiActionController.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * Copyright 2002-2012 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -513,7 +513,7 @@ else if (returnValue instanceof String) {
  * @throws Exception if the command object could not be instantiated
  * @see org.springframework.beans.BeanUtils#instantiateClass(Class)
  */
-protected Object newCommandObject(Class clazz) throws Exception {
+protected Object newCommandObject(Class<?> clazz) throws Exception {
 if (logger.isDebugEnabled()) {
 logger.debug("Creating new command of class [" + clazz.getName() + "]");
 }