Polishing

Author: jhoeller

spring-aop/src/main/java/org/springframework/aop/aspectj/MethodInvocationProceedingJoinPoint.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2015 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.
@@ -243,6 +243,7 @@ public String toString() {
 
 		private String toString(boolean includeModifier, boolean includeReturnTypeAndArgs,
 				boolean useLongReturnAndArgumentTypeName, boolean useLongTypeName) {
+
 			StringBuilder sb = new StringBuilder();
 			if (includeModifier) {
 				sb.append(Modifier.toString(getModifiers()));
@@ -262,8 +263,9 @@ private String toString(boolean includeModifier, boolean includeReturnTypeAndArg
 			return sb.toString();
 		}
 
-		private void appendTypes(StringBuilder sb, Class<?>[] types,
-				boolean includeArgs, boolean useLongReturnAndArgumentTypeName) {
+		private void appendTypes(StringBuilder sb, Class<?>[] types, boolean includeArgs,
+				boolean useLongReturnAndArgumentTypeName) {
+
 			if (includeArgs) {
 				for (int size = types.length, i = 0; i < size; i++) {
 					appendType(sb, types[i], useLongReturnAndArgumentTypeName);

spring-beans/src/main/java/org/springframework/beans/factory/config/BeanPostProcessor.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2015 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.
@@ -48,8 +48,8 @@ public interface BeanPostProcessor {
 	 * The returned bean instance may be a wrapper around the original.
 	 * @param bean the new bean instance
 	 * @param beanName the name of the bean
-	 * @return the bean instance to use, either the original or a wrapped one; if
-	 * {@code null}, no subsequent BeanPostProcessors will be invoked
+	 * @return the bean instance to use, either the original or a wrapped one;
+	 * if {@code null}, no subsequent BeanPostProcessors will be invoked
 	 * @throws org.springframework.beans.BeansException in case of errors
 	 * @see org.springframework.beans.factory.InitializingBean#afterPropertiesSet
 	 */
@@ -69,8 +69,8 @@ public interface BeanPostProcessor {
 	 * in contrast to all other BeanPostProcessor callbacks.
 	 * @param bean the new bean instance
 	 * @param beanName the name of the bean
-	 * @return the bean instance to use, either the original or a wrapped one; if
-	 * {@code null}, no subsequent BeanPostProcessors will be invoked
+	 * @return the bean instance to use, either the original or a wrapped one;
+	 * if {@code null}, no subsequent BeanPostProcessors will be invoked
 	 * @throws org.springframework.beans.BeansException in case of errors
 	 * @see org.springframework.beans.factory.InitializingBean#afterPropertiesSet
 	 * @see org.springframework.beans.factory.FactoryBean

spring-beans/src/main/java/org/springframework/beans/factory/support/DisposableBeanAdapter.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2014 the original author or authors.
+ * Copyright 2002-2015 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.
@@ -37,11 +37,12 @@
 import org.springframework.beans.factory.config.DestructionAwareBeanPostProcessor;
 import org.springframework.util.Assert;
 import org.springframework.util.ClassUtils;
+import org.springframework.util.CollectionUtils;
 import org.springframework.util.ReflectionUtils;
 
 /**
- * Adapter that implements the {@link DisposableBean} and {@link Runnable} interfaces
- * performing various destruction steps on a given bean instance:
+ * Adapter that implements the {@link DisposableBean} and {@link Runnable}
+ * interfaces performing various destruction steps on a given bean instance:
  * <ul>
  * <li>DestructionAwareBeanPostProcessors;
  * <li>the bean implementing DisposableBean itself;
@@ -175,8 +176,8 @@ private DisposableBeanAdapter(Object bean, String beanName, boolean invokeDispos
 	/**
 	 * If the current value of the given beanDefinition's "destroyMethodName" property is
 	 * {@link AbstractBeanDefinition#INFER_METHOD}, then attempt to infer a destroy method.
-	 * Candidate methods are currently limited to public, no-arg methods named "close"
-	 * (whether declared locally or inherited). The given BeanDefinition's
+	 * Candidate methods are currently limited to public, no-arg methods named "close" or
+	 * "shutdown" (whether declared locally or inherited). The given BeanDefinition's
 	 * "destroyMethodName" is updated to be null if no such method is found, otherwise set
 	 * to the name of the inferred method. This constant serves as the default for the
 	 * {@code @Bean#destroyMethod} attribute and the value of the constant may also be
@@ -215,7 +216,7 @@ private String inferDestroyMethodIfNecessary(Object bean, RootBeanDefinition bea
 	 */
 	private List<DestructionAwareBeanPostProcessor> filterPostProcessors(List<BeanPostProcessor> postProcessors) {
 		List<DestructionAwareBeanPostProcessor> filteredPostProcessors = null;
-		if (postProcessors != null && !postProcessors.isEmpty()) {
+		if (!CollectionUtils.isEmpty(postProcessors)) {
 			filteredPostProcessors = new ArrayList<DestructionAwareBeanPostProcessor>(postProcessors.size());
 			for (BeanPostProcessor postProcessor : postProcessors) {
 				if (postProcessor instanceof DestructionAwareBeanPostProcessor) {
@@ -234,7 +235,7 @@ public void run() {
 
 	@Override
 	public void destroy() {
-		if (this.beanPostProcessors != null && !this.beanPostProcessors.isEmpty()) {
+		if (!CollectionUtils.isEmpty(this.beanPostProcessors)) {
 			for (DestructionAwareBeanPostProcessor processor : this.beanPostProcessors) {
 				processor.postProcessBeforeDestruction(this.bean, this.beanName);
 			}

spring-context/src/test/java/org/springframework/context/annotation/AnnotationConfigApplicationContextTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2015 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.
@@ -25,6 +25,7 @@
 import org.springframework.beans.factory.NoSuchBeanDefinitionException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.config.BeanPostProcessor;
+import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation6.ComponentForScanning;
 import org.springframework.context.annotation6.ConfigForScanning;
 import org.springframework.context.annotation6.Jsr330NamedForScanning;
@@ -40,10 +41,10 @@
  */
 public class AnnotationConfigApplicationContextTests {
 
-	@Test(expected=IllegalArgumentException.class)
+	@Test(expected = IllegalArgumentException.class)
 	public void nullGetBeanParameterIsDisallowed() {
-		AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(Config.class);
-		context.getBean((Class<?>)null);
+		ApplicationContext context = new AnnotationConfigApplicationContext(Config.class);
+		context.getBean((Class<?>) null);
 	}
 
 	@Test
@@ -83,7 +84,7 @@ public void getBeansWithAnnotation() {
 
 	@Test
 	public void getBeanByType() {
-		AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(Config.class);
+		ApplicationContext context = new AnnotationConfigApplicationContext(Config.class);
 		TestBean testBean = context.getBean(TestBean.class);
 		assertNotNull("getBean() should not return null", testBean);
 		assertThat(testBean.name, equalTo("foo"));
@@ -95,7 +96,7 @@ public void getBeanByType() {
 	 */
 	@Test
 	public void defaultConfigClassBeanNameIsGeneratedProperly() {
-		AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(Config.class);
+		ApplicationContext context = new AnnotationConfigApplicationContext(Config.class);
 
 		// attempt to retrieve the instance by its generated bean name
 		Config configObject = (Config) context.getBean("annotationConfigApplicationContextTests.Config");
@@ -108,18 +109,16 @@ public void defaultConfigClassBeanNameIsGeneratedProperly() {
 	 */
 	@Test
 	public void explicitConfigClassBeanNameIsRespected() {
-		AnnotationConfigApplicationContext context =
-			new AnnotationConfigApplicationContext(ConfigWithCustomName.class);
+		ApplicationContext context = new AnnotationConfigApplicationContext(ConfigWithCustomName.class);
 
 		// attempt to retrieve the instance by its specified name
-		ConfigWithCustomName configObject =
-			(ConfigWithCustomName) context.getBean("customConfigBeanName");
+		ConfigWithCustomName configObject = (ConfigWithCustomName) context.getBean("customConfigBeanName");
 		assertNotNull(configObject);
 	}
 
 	@Test
 	public void getBeanByTypeRaisesNoSuchBeanDefinitionException() {
-		AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(Config.class);
+		ApplicationContext context = new AnnotationConfigApplicationContext(Config.class);
 
 		// attempt to retrieve a bean that does not exist
 		Class<?> targetType = Pattern.class;
@@ -135,7 +134,7 @@ public void getBeanByTypeRaisesNoSuchBeanDefinitionException() {
 
 	@Test
 	public void getBeanByTypeAmbiguityRaisesException() {
-		AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(TwoTestBeanConfig.class);
+		ApplicationContext context = new AnnotationConfigApplicationContext(TwoTestBeanConfig.class);
 
 		try {
 			context.getBean(TestBean.class);
@@ -153,7 +152,7 @@ public void getBeanByTypeAmbiguityRaisesException() {
 
 	@Test
 	public void autowiringIsEnabledByDefault() {
-		AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(AutowiredConfig.class);
+		ApplicationContext context = new AnnotationConfigApplicationContext(AutowiredConfig.class);
 		assertThat(context.getBean(TestBean.class).name, equalTo("foo"));
 	}
 
@@ -255,13 +254,14 @@ public boolean isSingleton() {
 }
 
 class TestBean {
+
 	String name;
 
 	@Override
 	public int hashCode() {
 		final int prime = 31;
 		int result = 1;
-		result = prime * result + ((name == null) ? 0 : name.hashCode());
+		result = prime * result + (name == null ? 0 : name.hashCode());
 		return result;
 	}
 
@@ -277,7 +277,8 @@ public boolean equals(Object obj) {
 		if (name == null) {
 			if (other.name != null)
 				return false;
-		} else if (!name.equals(other.name))
+		}
+		else if (!name.equals(other.name))
 			return false;
 		return true;
 	}

spring-core/src/main/java/org/springframework/util/ReflectionUtils.java

@@ -102,7 +102,7 @@ public static Field findField(Class<?> clazz, String name, Class<?> type) {
 	 * <p>Thrown exceptions are handled via a call to {@link #handleReflectionException(Exception)}.
 	 * @param field the field to set
 	 * @param target the target object on which to set the field
-	 * @param value the value to set; may be {@code null}
+	 * @param value the value to set (may be {@code null})
 	 */
 	public static void setField(Field field, Object target, Object value) {
 		try {
@@ -284,12 +284,11 @@ public static void handleInvocationTargetException(InvocationTargetException ex)
 
 	/**
 	 * Rethrow the given {@link Throwable exception}, which is presumably the
-	 * <em>target exception</em> of an {@link InvocationTargetException}. Should
-	 * only be called if no checked exception is expected to be thrown by the
-	 * target method.
+	 * <em>target exception</em> of an {@link InvocationTargetException}.
+	 * Should only be called if no checked exception is expected to be thrown
+	 * by the target method.
 	 * <p>Rethrows the underlying exception cast to an {@link RuntimeException} or
-	 * {@link Error} if appropriate; otherwise, throws an
-	 * {@link IllegalStateException}.
+	 * {@link Error} if appropriate; otherwise, throws an {@link IllegalStateException}.
 	 * @param ex the exception to rethrow
 	 * @throws RuntimeException the rethrown exception
 	 */
@@ -305,12 +304,11 @@ public static void rethrowRuntimeException(Throwable ex) {
 
 	/**
 	 * Rethrow the given {@link Throwable exception}, which is presumably the
-	 * <em>target exception</em> of an {@link InvocationTargetException}. Should
-	 * only be called if no checked exception is expected to be thrown by the
-	 * target method.
+	 * <em>target exception</em> of an {@link InvocationTargetException}.
+	 * Should only be called if no checked exception is expected to be thrown
+	 * by the target method.
 	 * <p>Rethrows the underlying exception cast to an {@link Exception} or
-	 * {@link Error} if appropriate; otherwise, throws an
-	 * {@link IllegalStateException}.
+	 * {@link Error} if appropriate; otherwise, throws an {@link IllegalStateException}.
 	 * @param ex the exception to rethrow
 	 * @throws Exception the rethrown exception (in case of a checked exception)
 	 */

spring-jdbc/src/main/java/org/springframework/jdbc/core/SqlParameter.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2014 the original author or authors.
+ * Copyright 2002-2015 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.
@@ -43,7 +43,6 @@ public class SqlParameter {
 	/** Used for types that are user-named like: STRUCT, DISTINCT, JAVA_OBJECT, named array types */
 	private String typeName;
 
-
 	/** The scale to apply in case of a NUMERIC or DECIMAL type, if any */
 	private Integer scale;
 
@@ -126,7 +125,7 @@ public SqlParameter(SqlParameter otherParam) {
 
 
 	/**
-	 * Return the name of the parameter.
+	 * Return the name of the parameter, or {@code null} if anonymous.
 	 */
 	public String getName() {
 		return this.name;

spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/SimpleJdbcCall.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2014 the original author or authors.
+ * Copyright 2002-2015 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.
@@ -39,18 +39,19 @@
  * the JDBC driver. Since we rely on the JDBC driver, this "auto-detection"
  * can only be used for databases that are known to provide accurate meta data.
  * These currently include Derby, MySQL, Microsoft SQL Server, Oracle, DB2,
- * Sybase and PostgreSQL. For any other databases you are required to declare all
- * parameters explicitly. You can of course declare all parameters explicitly even
- * if the database provides the necessary meta data. In that case your declared
- * parameters will take precedence. You can also turn off any meta data processing
- * if you want to use parameter names that do not match what is declared during
- * the stored procedure compilation.
+ * Sybase and PostgreSQL. For any other databases you are required to declare
+ * all parameters explicitly. You can of course declare all parameters
+ * explicitly even if the database provides the necessary meta data. In that
+ * case your declared parameters will take precedence. You can also turn off
+ * any metadata processing if you want to use parameter names that do not
+ * match what is declared during the stored procedure compilation.
  *
  * <p>The actual insert is being handled using Spring's
  * {@link org.springframework.jdbc.core.JdbcTemplate}.
  *
- * <p>Many of the configuration methods return the current instance of the SimpleJdbcCall
- * to provide the ability to chain multiple ones together in a "fluent" interface style.
+ * <p>Many of the configuration methods return the current instance of the
+ * SimpleJdbcCall in order to provide the ability to chain multiple ones
+ * together in a "fluent" interface style.
  *
  * @author Thomas Risberg
  * @since 2.5
@@ -60,8 +61,8 @@
 public class SimpleJdbcCall extends AbstractJdbcCall implements SimpleJdbcCallOperations {
 
 	/**
-	 * Constructor that takes one parameter with the JDBC DataSource to use when creating the
-	 * JdbcTemplate.
+	 * Constructor that takes one parameter with the JDBC DataSource to use when
+	 * creating the underlying JdbcTemplate.
 	 * @param dataSource the {@code DataSource} to use
 	 * @see org.springframework.jdbc.core.JdbcTemplate#setDataSource
 	 */

spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/SimpleJdbcCallTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2015 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.
@@ -103,8 +103,7 @@ public void testAddInvoiceProcWithoutMetaDataUsingMapParamSource() throws Except
 		adder.declareParameters(
 				new SqlParameter("amount", Types.INTEGER),
 				new SqlParameter("custid", Types.INTEGER),
-				new SqlOutParameter("newid",
-				Types.INTEGER));
+				new SqlOutParameter("newid", Types.INTEGER));
 		Number newId = adder.executeObject(Number.class, new MapSqlParameterSource().
 				addValue("amount", 1103).
 				addValue("custid", 3));
@@ -120,8 +119,7 @@ public void testAddInvoiceProcWithoutMetaDataUsingArrayParams() throws Exception
 		adder.declareParameters(
 				new SqlParameter("amount", Types.INTEGER),
 				new SqlParameter("custid", Types.INTEGER),
-				new SqlOutParameter("newid",
-				Types.INTEGER));
+				new SqlOutParameter("newid", Types.INTEGER));
 		Number newId = adder.executeObject(Number.class, 1103, 3);
 		assertEquals(4, newId.intValue());
 		verifyAddInvoiceWithoutMetaData(false);
@@ -193,7 +191,8 @@ public void testAddInvoiceFuncWithMetaDataUsingMapParamSource() throws Exception
 
 	}
 
-	@Test public void testAddInvoiceFuncWithMetaDataUsingArrayParams() throws Exception {
+	@Test
+	public void testAddInvoiceFuncWithMetaDataUsingArrayParams() throws Exception {
 		initializeAddInvoiceWithMetaData(true);
 		SimpleJdbcCall adder = new SimpleJdbcCall(dataSource).withFunctionName("add_invoice");
 		Number newId = adder.executeFunction(Number.class, 1103, 3);
@@ -203,8 +202,7 @@ public void testAddInvoiceFuncWithMetaDataUsingMapParamSource() throws Exception
 
 	}
 
-	private void initializeAddInvoiceWithoutMetaData(boolean isFunction)
-			throws SQLException {
+	private void initializeAddInvoiceWithoutMetaData(boolean isFunction) throws SQLException {
 		given(databaseMetaData.getDatabaseProductName()).willReturn("MyDB");
 		given(databaseMetaData.getUserName()).willReturn("me");
 		given(databaseMetaData.storesLowerCaseIdentifiers()).willReturn(true);
@@ -281,6 +279,6 @@ private void verifyAddInvoiceWithMetaData(boolean isFunction) throws SQLExceptio
 		verify(callableStatement).close();
 		verify(proceduresResultSet).close();
 		verify(procedureColumnsResultSet).close();
+	}
 
 }
-}