Polishing

Author: jhoeller

spring-aspects/src/main/java/org/springframework/cache/aspectj/JCacheCacheAspect.aj

@@ -63,7 +63,6 @@ public aspect JCacheCacheAspect extends JCacheAspectSupport {
 
 		};
 
-
 		try {
 			return execute(aspectJInvoker, thisJoinPoint.getTarget(), method, thisJoinPoint.getArgs());
 		}

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

@@ -17,7 +17,6 @@
 package org.springframework.beans.factory.config;
 
 import java.io.IOException;
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
@@ -83,8 +82,7 @@ public abstract class YamlProcessor {
 	 * @param matchers a map of keys to value patterns (regular expressions)
 	 */
 	public void setDocumentMatchers(DocumentMatcher... matchers) {
-		this.documentMatchers = Collections
-				.unmodifiableList(new ArrayList<DocumentMatcher>(Arrays.asList(matchers)));
+		this.documentMatchers = Arrays.asList(matchers);
 	}
 
 	/**
@@ -114,7 +112,7 @@ public void setResolutionMethod(ResolutionMethod resolutionMethod) {
 	 * @see ResolutionMethod
 	 */
 	public void setResources(Resource... resources) {
-		this.resources = (resources == null ? null : resources.clone());
+		this.resources = resources;
 	}
 
 
@@ -152,8 +150,8 @@ private boolean process(MatchCallback callback, Yaml yaml, Resource resource) {
 				}
 			}
 			if (this.logger.isDebugEnabled()) {
-				this.logger.debug("Loaded " + count + " document"
-						+ (count > 1 ? "s" : "") + " from YAML resource: " + resource);
+				this.logger.debug("Loaded " + count + " document" + (count > 1 ? "s" : "") +
+						" from YAML resource: " + resource);
 			}
 		}
 		catch (IOException ex) {
@@ -218,8 +216,7 @@ private boolean process(Map<String, Object> map, MatchCallback callback) {
 			result = MatchStatus.getMostSpecific(match, result);
 			if (match == MatchStatus.FOUND) {
 				if (this.logger.isDebugEnabled()) {
-					this.logger.debug("Matched document with document matcher: "
-							+ properties);
+					this.logger.debug("Matched document with document matcher: " + properties);
 				}
 				callback.process(properties, map);
 				return true;
@@ -328,7 +325,7 @@ public static enum MatchStatus {
 		 * Compare two {@link MatchStatus} items, returning the most specific status.
 		 */
 		public static MatchStatus getMostSpecific(MatchStatus a, MatchStatus b) {
-			return a.ordinal() < b.ordinal() ? a : b;
+			return (a.ordinal() < b.ordinal() ? a : b);
 		}
 	}
 

spring-context/src/main/java/org/springframework/cache/annotation/CachingConfigurerSupport.java

@@ -50,4 +50,5 @@ public CacheResolver cacheResolver() {
 	public CacheErrorHandler errorHandler() {
 		return null;
 	}
+
 }

spring-context/src/main/java/org/springframework/context/event/SimpleApplicationEventMulticaster.java

@@ -96,8 +96,7 @@ protected Executor getTaskExecutor() {
 	 * and logs exceptions (a la
 	 * {@link org.springframework.scheduling.support.TaskUtils#LOG_AND_SUPPRESS_ERROR_HANDLER})
 	 * or an implementation that logs exceptions while nevertheless propagating them
-	 * (e.g.,
-	 * {@link org.springframework.scheduling.support.TaskUtils#LOG_AND_PROPAGATE_ERROR_HANDLER}).
+	 * (e.g. {@link org.springframework.scheduling.support.TaskUtils#LOG_AND_PROPAGATE_ERROR_HANDLER}).
 	 * @since 4.1
 	 */
 	public void setErrorHandler(ErrorHandler errorHandler) {

spring-context/src/main/java/org/springframework/scheduling/annotation/AsyncAnnotationBeanPostProcessor.java

@@ -56,8 +56,7 @@
  * @see #setBeforeExistingAdvisors
  */
 @SuppressWarnings("serial")
-public class AsyncAnnotationBeanPostProcessor extends AbstractAdvisingBeanPostProcessor
-		implements BeanFactoryAware {
+public class AsyncAnnotationBeanPostProcessor extends AbstractAdvisingBeanPostProcessor implements BeanFactoryAware {
 
 	private Class<? extends Annotation> asyncAnnotationType;
 
@@ -70,6 +69,7 @@ public AsyncAnnotationBeanPostProcessor() {
 		setBeforeExistingAdvisors(true);
 	}
 
+
 	/**
 	 * Set the 'async' annotation type to be detected at either class or method
 	 * level. By default, both the {@link Async} annotation and the EJB 3.1

spring-context/src/main/java/org/springframework/scheduling/annotation/AsyncConfigurerSupport.java

@@ -39,4 +39,5 @@ public Executor getAsyncExecutor() {
 	public AsyncUncaughtExceptionHandler getAsyncUncaughtExceptionHandler() {
 		return null;
 	}
+
 }

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

@@ -150,8 +150,7 @@ static class Config {
 
 	@Target(ElementType.TYPE)
 	@Retention(RetentionPolicy.RUNTIME)
-	@Import({ DeferredImportSelector1.class, DeferredImportSelector2.class,
-		ImportSelector1.class, ImportSelector2.class })
+	@Import({DeferredImportSelector1.class, DeferredImportSelector2.class, ImportSelector1.class, ImportSelector2.class})
 	public static @interface Sample {
 	}
 

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

@@ -75,7 +75,6 @@ public class AntPathMatcher implements PathMatcher {
 	 * Create a new instance with the {@link #DEFAULT_PATH_SEPARATOR}.
 	 */
 	public AntPathMatcher() {
-
 	}
 
 	/**

spring-core/src/main/java/org/springframework/util/concurrent/FailureCallback.java

@@ -27,8 +27,8 @@ public interface FailureCallback {
 
 	/**
 	 * Called when the {@link ListenableFuture} fails to complete.
-	 * @param t the exception that triggered the failure
+	 * @param ex the exception that triggered the failure
 	 */
-	void onFailure(Throwable t);
+	void onFailure(Throwable ex);
 
 }

spring-core/src/main/java/org/springframework/util/concurrent/ListenableFutureAdapter.java

@@ -30,11 +30,10 @@
  * @author Arjen Poutsma
  * @since 4.0
  */
-public abstract class ListenableFutureAdapter<T, S> extends FutureAdapter<T, S>
-		implements ListenableFuture<T> {
+public abstract class ListenableFutureAdapter<T, S> extends FutureAdapter<T, S> implements ListenableFuture<T> {
 
 	/**
-	 * Constructs a new {@code ListenableFutureAdapter} with the given adaptee.
+	 * Construct a new {@code ListenableFutureAdapter} with the given adaptee.
 	 * @param adaptee the future to adaptee to
 	 */
 	protected ListenableFutureAdapter(ListenableFuture<S> adaptee) {
@@ -48,8 +47,7 @@ public void addCallback(final ListenableFutureCallback<? super T> callback) {
 	}
 
 	@Override
-	public void addCallback(final SuccessCallback<? super T> successCallback,
-							final FailureCallback failureCallback) {
+	public void addCallback(final SuccessCallback<? super T> successCallback, final FailureCallback failureCallback) {
 		ListenableFuture<S> listenableAdaptee = (ListenableFuture<S>) getAdaptee();
 		listenableAdaptee.addCallback(new ListenableFutureCallback<S>() {
 			@Override
@@ -65,10 +63,9 @@ public void onSuccess(S result) {
 					onFailure(t);
 				}
 			}
-
 			@Override
-			public void onFailure(Throwable t) {
-				failureCallback.onFailure(t);
+			public void onFailure(Throwable ex) {
+				failureCallback.onFailure(ex);
 			}
 		});
 	}