Polishing

Author: jhoeller

org.springframework.beans/src/main/java/org/springframework/beans/factory/annotation/InitDestroyAnnotationBeanPostProcessor.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.
@@ -265,7 +265,7 @@ public LifecycleMetadata(Class<?> targetClass, Collection<LifecycleElement> init
 		}
 
 		public void checkConfigMembers(RootBeanDefinition beanDefinition) {
-			synchronized(this.initMethods) {
+			synchronized (this.initMethods) {
 				for (Iterator<LifecycleElement> it = this.initMethods.iterator(); it.hasNext();) {
 					String methodIdentifier = it.next().getIdentifier();
 					if (!beanDefinition.isExternallyManagedInitMethod(methodIdentifier)) {
@@ -276,7 +276,7 @@ public void checkConfigMembers(RootBeanDefinition beanDefinition) {
 					}
 				}
 			}
-			synchronized(this.destroyMethods) {
+			synchronized (this.destroyMethods) {
 				for (Iterator<LifecycleElement> it = this.destroyMethods.iterator(); it.hasNext();) {
 					String methodIdentifier = it.next().getIdentifier();
 					if (!beanDefinition.isExternallyManagedDestroyMethod(methodIdentifier)) {

org.springframework.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.
@@ -269,7 +269,6 @@ public Annotation[] getMethodAnnotations() {
 	 * @param annotationType the annotation type to look for
 	 * @return the annotation object, or <code>null</code> if not found
 	 */
-	@SuppressWarnings("unchecked")
 	public <T extends Annotation> T getMethodAnnotation(Class<T> annotationType) {
 		return getAnnotatedElement().getAnnotation(annotationType);
 	}
@@ -311,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);
 	}
 
 	/**
@@ -417,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) {
@@ -460,7 +437,6 @@ else if (this.getMember().equals(other.getMember())) {
 		return false;
 	}
 
-
 	@Override
 	public int hashCode() {
 		int result = this.hash;
@@ -472,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");
+		}
+	}
+
 }

org.springframework.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);

org.springframework.expression/src/main/java/org/springframework/expression/spel/support/ReflectivePropertyAccessor.java

@@ -86,7 +86,7 @@ public boolean canRead(EvaluationContext context, Object target, String name) th
 			Field field = findField(name, type, target);
 			if (field != null) {
 				TypeDescriptor typeDescriptor = new TypeDescriptor(field);
-				this.readerCache.put(cacheKey, new InvokerPair(field,typeDescriptor));
+				this.readerCache.put(cacheKey, new InvokerPair(field, typeDescriptor));
 				this.typeDescriptorCache.put(cacheKey, typeDescriptor);
 				return true;
 			}
@@ -264,15 +264,15 @@ private TypeDescriptor getTypeDescriptor(EvaluationContext context, Object targe
 			return TypeDescriptor.valueOf(Integer.TYPE);
 		}
 		CacheKey cacheKey = new CacheKey(type, name);
-		TypeDescriptor typeDescriptor =  this.typeDescriptorCache.get(cacheKey);
+		TypeDescriptor typeDescriptor = this.typeDescriptorCache.get(cacheKey);
 		if (typeDescriptor == null) {
 			// attempt to populate the cache entry
 			try {
 				if (canRead(context, target, name)) {
-					typeDescriptor =  this.typeDescriptorCache.get(cacheKey);
+					typeDescriptor = this.typeDescriptorCache.get(cacheKey);
 				}
 				else if (canWrite(context, target, name)) {
-					typeDescriptor =  this.typeDescriptorCache.get(cacheKey);
+					typeDescriptor = this.typeDescriptorCache.get(cacheKey);
 				}
 			}
 			catch (AccessException ex) {

org.springframework.web.servlet/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() + "]");
 		}