Polishing

spring-aspects/src/main/java/org/springframework/context/annotation/aspectj/SpringConfiguredConfiguration.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.
@@ -28,9 +28,9 @@ import org.springframework.context.annotation.Role;
  * annotated with @{@link org.springframework.beans.factory.annotation.Configurable
  * Configurable}.
  *
- * <p>This configuration class is automatically imported when using the @{@link
+ * <p>This configuration class is automatically imported when using the
- * EnableSpringConfigured} annotation. See {@code @EnableSpringConfigured} Javadoc for
+ * @{@link EnableSpringConfigured} annotation. See {@code @EnableSpringConfigured}'s
- * complete usage details.
+ * javadoc for complete usage details.
  *
  * @author Chris Beams
  * @since 3.1
@@ -47,4 +47,5 @@ public class SpringConfiguredConfiguration {
 	public AnnotationBeanConfigurerAspect beanConfigurerAspect() {
 		return AnnotationBeanConfigurerAspect.aspectOf();
 	}
+
 }

spring-context/src/main/java/org/springframework/context/annotation/LoadTimeWeavingConfiguration.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.

spring-context/src/main/java/org/springframework/scheduling/annotation/AbstractAsyncConfiguration.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,6 +43,7 @@ public abstract class AbstractAsyncConfiguration implements ImportAware {
 	protected AnnotationAttributes enableAsync;
 
 	protected Executor executor;
+
 	protected AsyncUncaughtExceptionHandler exceptionHandler;
 
 

spring-jdbc/src/main/java/org/springframework/jdbc/datasource/init/ScriptStatementFailedException.java

@@ -30,27 +30,27 @@ import org.springframework.core.io.support.EncodedResource;
 public class ScriptStatementFailedException extends ScriptException {
 
 	/**
-	 * Build an error message based on the supplied parameters.
+	 * Construct a new {@code ScriptStatementFailedException}.
 	 * @param statement the actual SQL statement that failed
 	 * @param statementNumber the statement number in the SQL script (i.e.,
 	 * the nth statement present in the resource)
-	 * @param encodedResource the resource from which the SQL statement was read
+	 * @param resource the resource from which the SQL statement was read
+	 * @param cause the underlying cause of the failure
 	 */
-	public static String buildErrorMessage(String statement, int statementNumber, EncodedResource encodedResource) {
+	public ScriptStatementFailedException(String statement, int statementNumber, EncodedResource resource, Throwable cause) {
-		return String.format("Failed to execute SQL script statement #%s of %s: %s",
+		super(buildErrorMessage(statement, statementNumber, resource), cause);
-				statementNumber, encodedResource, statement);
 	}
 
 	/**
-	 * Construct a new {@code ScriptStatementFailedException}.
+	 * Build an error message based on the supplied parameters.
 	 * @param statement the actual SQL statement that failed
 	 * @param statementNumber the statement number in the SQL script (i.e.,
 	 * the nth statement present in the resource)
-	 * @param resource the resource from which the SQL statement was read
+	 * @param encodedResource the resource from which the SQL statement was read
-	 * @param cause the underlying cause of the failure
 	 */
-	public ScriptStatementFailedException(String statement, int statementNumber, EncodedResource resource, Throwable cause) {
+	public static String buildErrorMessage(String statement, int statementNumber, EncodedResource encodedResource) {
-		super(buildErrorMessage(statement, statementNumber, resource), cause);
+		return String.format("Failed to execute SQL script statement #%s of %s: %s",
+				statementNumber, encodedResource, statement);
 	}
 
 }

spring-tx/src/main/java/org/springframework/transaction/annotation/ProxyTransactionManagementConfiguration.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.
@@ -26,8 +26,8 @@ import org.springframework.transaction.interceptor.TransactionAttributeSource;
 import org.springframework.transaction.interceptor.TransactionInterceptor;
 
 /**
- * {@code @Configuration} class that registers the Spring infrastructure beans necessary
+ * {@code @Configuration} class that registers the Spring infrastructure beans
- * to enable proxy-based annotation-driven transaction management.
+ * necessary to enable proxy-based annotation-driven transaction management.
  *
  * @author Chris Beams
  * @since 3.1

spring-websocket/src/main/java/org/springframework/web/socket/config/annotation/DelegatingWebSocketMessageBrokerConfiguration.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.
@@ -29,10 +29,10 @@ import org.springframework.messaging.simp.config.MessageBrokerRegistry;
 import org.springframework.util.CollectionUtils;
 
 /**
- * A {@link WebSocketMessageBrokerConfigurationSupport} extension that detects beans of type
+ * A {@link WebSocketMessageBrokerConfigurationSupport} extension that detects
- * {@link WebSocketMessageBrokerConfigurer}
+ * beans of type {@link WebSocketMessageBrokerConfigurer} and delegates to all
- * and delegates to all of them allowing callback style customization of the
+ * of them allowing callback style customization of the configuration provided
- * configuration provided in {@link WebSocketMessageBrokerConfigurationSupport}.
+ * in {@link WebSocketMessageBrokerConfigurationSupport}.
  *
  * <p>This class is typically imported via {@link EnableWebSocketMessageBroker}.
  *
@@ -42,7 +42,7 @@ import org.springframework.util.CollectionUtils;
 @Configuration
 public class DelegatingWebSocketMessageBrokerConfiguration extends WebSocketMessageBrokerConfigurationSupport {
 
-	private List<WebSocketMessageBrokerConfigurer> configurers = new ArrayList<WebSocketMessageBrokerConfigurer>();
+	private final List<WebSocketMessageBrokerConfigurer> configurers = new ArrayList<WebSocketMessageBrokerConfigurer>();
 
 
 	@Autowired(required = false)
@@ -55,51 +55,51 @@ public class DelegatingWebSocketMessageBrokerConfiguration extends WebSocketMess
 
 	@Override
 	protected void registerStompEndpoints(StompEndpointRegistry registry) {
-		for (WebSocketMessageBrokerConfigurer c : this.configurers) {
+		for (WebSocketMessageBrokerConfigurer configurer : this.configurers) {
-			c.registerStompEndpoints(registry);
+			configurer.registerStompEndpoints(registry);
 		}
 	}
 
 	@Override
 	protected void configureWebSocketTransport(WebSocketTransportRegistration registration) {
-		for (WebSocketMessageBrokerConfigurer c : this.configurers) {
+		for (WebSocketMessageBrokerConfigurer configurer : this.configurers) {
-			c.configureWebSocketTransport(registration);
+			configurer.configureWebSocketTransport(registration);
 		}
 	}
 
 	@Override
 	protected void configureClientInboundChannel(ChannelRegistration registration) {
-		for (WebSocketMessageBrokerConfigurer c : this.configurers) {
+		for (WebSocketMessageBrokerConfigurer configurer : this.configurers) {
-			c.configureClientInboundChannel(registration);
+			configurer.configureClientInboundChannel(registration);
 		}
 	}
 
 	@Override
 	protected void configureClientOutboundChannel(ChannelRegistration registration) {
-		for (WebSocketMessageBrokerConfigurer c : this.configurers) {
+		for (WebSocketMessageBrokerConfigurer configurer : this.configurers) {
-			c.configureClientOutboundChannel(registration);
+			configurer.configureClientOutboundChannel(registration);
 		}
 	}
 
 	@Override
 	protected void addArgumentResolvers(List<HandlerMethodArgumentResolver> argumentResolvers) {
-		for (WebSocketMessageBrokerConfigurer c : this.configurers) {
+		for (WebSocketMessageBrokerConfigurer configurer : this.configurers) {
-			c.addArgumentResolvers(argumentResolvers);
+			configurer.addArgumentResolvers(argumentResolvers);
 		}
 	}
 
 	@Override
 	protected void addReturnValueHandlers(List<HandlerMethodReturnValueHandler> returnValueHandlers) {
-		for (WebSocketMessageBrokerConfigurer c : this.configurers) {
+		for (WebSocketMessageBrokerConfigurer configurer : this.configurers) {
-			c.addReturnValueHandlers(returnValueHandlers);
+			configurer.addReturnValueHandlers(returnValueHandlers);
 		}
 	}
 
 	@Override
 	protected boolean configureMessageConverters(List<MessageConverter> messageConverters) {
 		boolean registerDefaults = true;
-		for (WebSocketMessageBrokerConfigurer c : this.configurers) {
+		for (WebSocketMessageBrokerConfigurer configurer : this.configurers) {
-			if (!c.configureMessageConverters(messageConverters)) {
+			if (!configurer.configureMessageConverters(messageConverters)) {
 				registerDefaults = false;
 			}
 		}
@@ -108,8 +108,8 @@ public class DelegatingWebSocketMessageBrokerConfiguration extends WebSocketMess
 
 	@Override
 	protected void configureMessageBroker(MessageBrokerRegistry registry) {
-		for (WebSocketMessageBrokerConfigurer c : this.configurers) {
+		for (WebSocketMessageBrokerConfigurer configurer : this.configurers) {
-			c.configureMessageBroker(registry);
+			configurer.configureMessageBroker(registry);
 		}
 	}