Remove trailing whitespace in source files

  find . -type f -name "*.java" -or -name "*.aj" | \
    xargs perl -p -i -e "s/[ \t]*$//g" {} \;

Issue: SPR-10127

gradle/jdiff/Null.java

@@ -1,6 +1,6 @@
-/** 
+/**
  * This class is used only as a "null" argument for Javadoc when comparing
- * two API files. Javadoc has to have a package, .java or .class file as an 
+ * two API files. Javadoc has to have a package, .java or .class file as an
  * argument, even though JDiff doesn't use it.
  */
 public class Null {

spring-aop/src/main/java/org/springframework/aop/Advisor.java

@@ -18,14 +18,14 @@
 
 import org.aopalliance.aop.Advice;
 
-/** 
+/**
  * Base interface holding AOP <b>advice</b> (action to take at a joinpoint)
- * and a filter determining the applicability of the advice (such as 
+ * and a filter determining the applicability of the advice (such as
  * a pointcut). <i>This interface is not for use by Spring users, but to
  * allow for commonality in support for different types of advice.</i>
  *
  * <p>Spring AOP is based around <b>around advice</b> delivered via method
- * <b>interception</b>, compliant with the AOP Alliance interception API. 
+ * <b>interception</b>, compliant with the AOP Alliance interception API.
  * The Advisor interface allows support for different types of advice,
  * such as <b>before</b> and <b>after</b> advice, which need not be
  * implemented using interception.

spring-aop/src/main/java/org/springframework/aop/DynamicIntroductionAdvice.java

@@ -18,7 +18,7 @@
 
 import org.aopalliance.aop.Advice;
 
-/** 
+/**
  * Subinterface of AOP Alliance Advice that allows additional interfaces
  * to be implemented by an Advice, and available via a proxy using that
  * interceptor. This is a fundamental AOP concept called <b>introduction</b>.
@@ -37,7 +37,7 @@
  * @see IntroductionAdvisor
  */
 public interface DynamicIntroductionAdvice extends Advice {
-	
+
 	/**
 	 * Does this introduction advice implement the given interface?
 	 * @param intf the interface to check

spring-aop/src/main/java/org/springframework/aop/IntroductionAdvisor.java

@@ -30,7 +30,7 @@
  * @see IntroductionInterceptor
  */
 public interface IntroductionAdvisor extends Advisor, IntroductionInfo {
-	
+
 	/**
 	 * Return the filter determining which target classes this introduction
 	 * should apply to.
@@ -39,7 +39,7 @@ public interface IntroductionAdvisor extends Advisor, IntroductionInfo {
 	 * @return the class filter
 	 */
 	ClassFilter getClassFilter();
-	
+
 	/**
 	 * Can the advised interfaces be implemented by the introduction advice?
 	 * Invoked before adding an IntroductionAdvisor.

spring-aop/src/main/java/org/springframework/aop/IntroductionInfo.java

@@ -29,7 +29,7 @@
  * @since 1.1.1
  */
 public interface IntroductionInfo {
-	
+
 	/**
 	 * Return the additional interfaces introduced by this Advisor or Advice.
 	 * @return the introduced interfaces

spring-aop/src/main/java/org/springframework/aop/MethodBeforeAdvice.java

@@ -1,12 +1,12 @@
 /*
  * Copyright 2002-2005 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.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -28,7 +28,7 @@
  * @author Rod Johnson
  */
 public interface MethodBeforeAdvice extends BeforeAdvice {
-	
+
 	/**
 	 * Callback before a given method is invoked.
 	 * @param method method being invoked

spring-aop/src/main/java/org/springframework/aop/PointcutAdvisor.java

@@ -1,12 +1,12 @@
 /*
  * Copyright 2002-2005 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.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

spring-aop/src/main/java/org/springframework/aop/TrueClassFilter.java

@@ -24,9 +24,9 @@
  * @author Rod Johnson
  */
 class TrueClassFilter implements ClassFilter, Serializable {
-	
+
 	public static final TrueClassFilter INSTANCE = new TrueClassFilter();
-	
+
 	/**
 	 * Enforce Singleton pattern.
 	 */
@@ -36,7 +36,7 @@ private TrueClassFilter() {
 	public boolean matches(Class clazz) {
 		return true;
 	}
-	
+
 	/**
 	 * Required to support serialization. Replaces with canonical
 	 * instance on deserialization, protecting Singleton pattern.

spring-aop/src/main/java/org/springframework/aop/TrueMethodMatcher.java

@@ -25,9 +25,9 @@
  * @author Rod Johnson
  */
 class TrueMethodMatcher implements MethodMatcher, Serializable {
-	
+
 	public static final TrueMethodMatcher INSTANCE = new TrueMethodMatcher();
-	
+
 	/**
 	 * Enforce Singleton pattern.
 	 */
@@ -46,7 +46,7 @@ public boolean matches(Method method, Class targetClass, Object[] args) {
 		// Should never be invoked as isRuntime returns false.
 		throw new UnsupportedOperationException();
 	}
-	
+
 	/**
 	 * Required to support serialization. Replaces with canonical
 	 * instance on deserialization, protecting Singleton pattern.
@@ -55,7 +55,7 @@ public boolean matches(Method method, Class targetClass, Object[] args) {
 	private Object readResolve() {
 		return INSTANCE;
 	}
-	
+
 	@Override
 	public String toString() {
 		return "MethodMatcher.TRUE";

spring-aop/src/main/java/org/springframework/aop/TruePointcut.java

@@ -24,9 +24,9 @@
  * @author Rod Johnson
  */
 class TruePointcut implements Pointcut, Serializable {
-	
+
 	public static final TruePointcut INSTANCE = new TruePointcut();
-	
+
 	/**
 	 * Enforce Singleton pattern.
 	 */
@@ -40,7 +40,7 @@ public ClassFilter getClassFilter() {
 	public MethodMatcher getMethodMatcher() {
 		return MethodMatcher.TRUE;
 	}
-	
+
 	/**
 	 * Required to support serialization. Replaces with canonical
 	 * instance on deserialization, protecting Singleton pattern.

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

@@ -211,7 +211,7 @@ public int getOrder() {
 	public void setAspectName(String name) {
 		this.aspectName = name;
 	}
-	
+
 	public String getAspectName() {
 		return this.aspectName;
 	}
@@ -268,7 +268,7 @@ public void setReturningName(String name) {
 		throw new UnsupportedOperationException("Only afterReturning advice can be used to bind a return value");
 	}
 
-	/** 
+	/**
 	 * We need to hold the returning name at this level for argument binding calculations,
 	 * this method allows the afterReturning advice subclass to set the name.
 	 */
@@ -302,7 +302,7 @@ public void setThrowingName(String name) {
 		throw new UnsupportedOperationException("Only afterThrowing advice can be used to bind a thrown exception");
 	}
 
-	/** 
+	/**
 	 * We need to hold the throwing name at this level for argument binding calculations,
 	 * this method allows the afterThrowing advice subclass to set the name.
 	 */
@@ -365,11 +365,11 @@ public synchronized final void calculateArgumentBindings() {
 		Class[] parameterTypes = this.aspectJAdviceMethod.getParameterTypes();
 		if (maybeBindJoinPoint(parameterTypes[0]) || maybeBindProceedingJoinPoint(parameterTypes[0])) {
 			numUnboundArgs--;
-		} 
+		}
 		else if (maybeBindJoinPointStaticPart(parameterTypes[0])) {
 			numUnboundArgs--;
 		}
-			
+
 		if (numUnboundArgs > 0) {
 			// need to bind arguments by name as returned from the pointcut match
 			bindArgumentsByName(numUnboundArgs);
@@ -398,7 +398,7 @@ private boolean maybeBindProceedingJoinPoint(Class candidateParameterType) {
 		}
 		else {
 			return false;
-		}		
+		}
 	}
 
 	protected boolean supportsProceedingJoinPoint() {
@@ -409,7 +409,7 @@ private boolean maybeBindJoinPointStaticPart(Class candidateParameterType) {
 		if (candidateParameterType.equals(JoinPoint.StaticPart.class)) {
 			this.joinPointStaticPartArgumentIndex = 0;
 			return true;
-		} 
+		}
 		else {
 			return false;
 		}
@@ -422,7 +422,7 @@ private void bindArgumentsByName(int numArgumentsExpectingToBind) {
 		if (this.argumentNames != null) {
 			// We have been able to determine the arg names.
 			bindExplicitArguments(numArgumentsExpectingToBind);
-		} 
+		}
 		else {
 			throw new IllegalStateException("Advice method [" + this.aspectJAdviceMethod.getName() + "] " +
 					"requires " + numArgumentsExpectingToBind + " arguments to be bound by name, but " +
@@ -471,9 +471,9 @@ private void bindExplicitArguments(int numArgumentsLeftToBind) {
 		// specified, and find the discovered argument types.
 		if (this.returningName != null) {
 			if (!this.argumentBindings.containsKey(this.returningName)) {
-				throw new IllegalStateException("Returning argument name '" 
+				throw new IllegalStateException("Returning argument name '"
 						+ this.returningName + "' was not bound in advice arguments");
-			} 
+			}
 			else {
 				Integer index = this.argumentBindings.get(this.returningName);
 				this.discoveredReturningType = this.aspectJAdviceMethod.getParameterTypes()[index];
@@ -482,9 +482,9 @@ private void bindExplicitArguments(int numArgumentsLeftToBind) {
 		}
 		if (this.throwingName != null) {
 			if (!this.argumentBindings.containsKey(this.throwingName)) {
-				throw new IllegalStateException("Throwing argument name '" 
+				throw new IllegalStateException("Throwing argument name '"
 						+ this.throwingName + "' was not bound in advice arguments");
-			} 
+			}
 			else {
 				Integer index = this.argumentBindings.get(this.throwingName);
 				this.discoveredThrowingType = this.aspectJAdviceMethod.getParameterTypes()[index];
@@ -525,7 +525,7 @@ private void configurePointcutParameters(int argumentIndexOffset) {
 			pointcutParameterTypes[index] = methodParameterTypes[i];
 			index++;
 		}
-		
+
 		this.pointcut.setParameterNames(pointcutParameterNames);
 		this.pointcut.setParameterTypes(pointcutParameterTypes);
 	}
@@ -549,7 +549,7 @@ protected Object[] argBinding(JoinPoint jp, JoinPointMatch jpMatch, Object retur
 		if (this.joinPointArgumentIndex != -1) {
 			adviceInvocationArgs[this.joinPointArgumentIndex] = jp;
 			numBound++;
-		} 
+		}
 		else if (this.joinPointStaticPartArgumentIndex != -1) {
 			adviceInvocationArgs[this.joinPointStaticPartArgumentIndex] = jp.getStaticPart();
 			numBound++;
@@ -582,8 +582,8 @@ else if (this.joinPointStaticPartArgumentIndex != -1) {
 
 		if (numBound != this.adviceInvocationArgumentCount) {
 			throw new IllegalStateException("Required to bind " + this.adviceInvocationArgumentCount
-					+ " arguments, but only bound " + numBound + " (JoinPointMatch " + 
-					(jpMatch == null ? "was NOT" : "WAS") + 
+					+ " arguments, but only bound " + numBound + " (JoinPointMatch " +
+					(jpMatch == null ? "was NOT" : "WAS") +
 					" bound in invocation)");
 		}
 

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

@@ -36,7 +36,7 @@ public AspectJAfterAdvice(
 
 		super(aspectJBeforeAdviceMethod, pointcut, aif);
 	}
-	
+
 	public Object invoke(MethodInvocation mi) throws Throwable {
 		try {
 			return mi.proceed();

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

@@ -259,7 +259,7 @@ public boolean matches(Class targetClass) {
 						ex);
 				return false;
 			}
-		} 
+		}
 		catch (BCException ex) {
 			logger.debug("PointcutExpression matching rejected target class", ex);
 			return false;
@@ -554,7 +554,7 @@ private FuzzyBoolean contextMatch(Class targetType) {
 			String advisedBeanName = getCurrentProxiedBeanName();
 			if (advisedBeanName == null) {  // no proxy creation in progress
 				// abstain; can't return YES, since that will make pointcut with negation fail
-				return FuzzyBoolean.MAYBE; 
+				return FuzzyBoolean.MAYBE;
 			}
 			if (BeanFactoryUtils.isGeneratedBeanName(advisedBeanName)) {
 				return FuzzyBoolean.NO;

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

@@ -21,7 +21,7 @@
 
 /**
  * Spring AOP Advisor that can be used for any AspectJ pointcut expression.
- * 
+ *
  * @author Rob Harrop
  * @since 2.0
  */

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

@@ -30,7 +30,7 @@
  * @since 2.0
  */
 public abstract class AspectJProxyUtils {
-	
+
 	/**
 	 * Add special advisors if necessary to work with a proxy chain that contains AspectJ advisors.
 	 * This will expose the current Spring AOP invocation (necessary for some AspectJ pointcut matching)