From 531318a4b220cc1a384c157e18e450b90ac8cbfd Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Thu, 13 Dec 2012 00:03:26 +0100 Subject: [PATCH] Polishing --- .../springframework/core/MethodParameter.java | 51 +++++++++---------- .../core/MethodParameterTests.java | 5 +- .../multiaction/MultiActionController.java | 4 +- 3 files changed, 29 insertions(+), 31 deletions(-) diff --git a/spring-core/src/main/java/org/springframework/core/MethodParameter.java b/spring-core/src/main/java/org/springframework/core/MethodParameter.java index 5c7e9bc7f56..a9ace689561 100644 --- a/spring-core/src/main/java/org/springframework/core/MethodParameter.java +++ b/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 class MethodParameter { * 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 boolean hasParameterAnnotation(Class annotationType) { - return getParameterAnnotation(annotationType) != null; + return (getParameterAnnotation(annotationType) != null); } /** @@ -416,28 +416,6 @@ public class MethodParameter { return this.typeIndexesPerLevel; } - - /** - * Create a new MethodParameter for the given method or constructor. - *

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 @@ public class MethodParameter { return false; } - @Override public int hashCode() { int result = this.hash; @@ -471,4 +448,26 @@ public class MethodParameter { return result; } + + /** + * Create a new MethodParameter for the given method or constructor. + *

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"); + } + } + } diff --git a/spring-core/src/test/java/org/springframework/core/MethodParameterTests.java b/spring-core/src/test/java/org/springframework/core/MethodParameterTests.java index 2f1ce99bfd9..c3c3e7d1399 100644 --- a/spring-core/src/test/java/org/springframework/core/MethodParameterTests.java +++ b/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 class MethodParameterTests { intReturnType = new MethodParameter(method, -1); } - - @Test public void testEquals() throws NoSuchMethodException { assertEquals(stringParameter, stringParameter); diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/multiaction/MultiActionController.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/multiaction/MultiActionController.java index 178f0fcf897..f88c921c919 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/multiaction/MultiActionController.java +++ b/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 @@ public class MultiActionController extends AbstractController implements LastMod * @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() + "]"); }