Polish formatting

Minor formatting polish across that codebase. Primarily fixing
whitespace issues.

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

@@ -282,8 +282,8 @@ else if (shadowMatch.neverMatches()) {
 			return false;
 		}
 		else {
-		  // the maybe case
-		  return (beanHasIntroductions || matchesIgnoringSubtypes(shadowMatch) || matchesTarget(shadowMatch, targetClass));
+			// the maybe case
+			return (beanHasIntroductions || matchesIgnoringSubtypes(shadowMatch) || matchesTarget(shadowMatch, targetClass));
 		}
 	}
 

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

@@ -64,8 +64,8 @@ public static boolean makeAdvisorChainAspectJCapableIfNecessary(List<Advisor> ad
 	 */
 	private static boolean isAspectJAdvice(Advisor advisor) {
 		return (advisor instanceof InstantiationModelAwarePointcutAdvisor ||
-			   advisor.getAdvice() instanceof AbstractAspectJAdvice ||
-			   (advisor instanceof PointcutAdvisor &&
+				advisor.getAdvice() instanceof AbstractAspectJAdvice ||
+				(advisor instanceof PointcutAdvisor &&
 						 ((PointcutAdvisor) advisor).getPointcut() instanceof AspectJExpressionPointcut));
 	}
 

spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/InstantiationModelAwarePointcutAdvisorImpl.java

@@ -63,8 +63,8 @@ class InstantiationModelAwarePointcutAdvisorImpl
 	private Boolean isAfterAdvice;
 
 
-	public InstantiationModelAwarePointcutAdvisorImpl(AspectJAdvisorFactory af,  AspectJExpressionPointcut ajexp,
-			MetadataAwareAspectInstanceFactory aif,  Method method, int declarationOrderInAspect, String aspectName) {
+	public InstantiationModelAwarePointcutAdvisorImpl(AspectJAdvisorFactory af, AspectJExpressionPointcut ajexp,
+			MetadataAwareAspectInstanceFactory aif, Method method, int declarationOrderInAspect, String aspectName) {
 
 		this.declaredPointcut = ajexp;
 		this.method = method;

spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/AbstractAutoProxyCreator.java

@@ -152,11 +152,11 @@ public abstract class AbstractAutoProxyCreator extends ProxyConfig
 	 * @param order ordering value
 	 */
 	public final void setOrder(int order) {
-	  this.order = order;
+		this.order = order;
 	}
 
 	public final int getOrder() {
-	  return this.order;
+		return this.order;
 	}
 
 	/**

spring-aop/src/main/java/org/springframework/aop/support/DelegatingIntroductionInterceptor.java

@@ -95,7 +95,7 @@ private void init(Object delegate) {
 
 
 	/**
-	 * Subclasses may need to override this if they want to  perform custom
+	 * Subclasses may need to override this if they want to perform custom
 	 * behaviour in around advice. However, subclasses should invoke this
 	 * method, which handles introduced interfaces and forwarding to the target.
 	 */

spring-aop/src/test/java/org/springframework/aop/aspectj/MethodInvocationProceedingJoinPointTests.java

@@ -139,7 +139,7 @@ public void testCanGetSourceLocationFromJoinPoint() {
 			@Override
 			public void before(Method method, Object[] args, Object target) throws Throwable {
 				SourceLocation sloc = AbstractAspectJAdvice.currentJoinPoint().getSourceLocation();
-				assertEquals("Same source location must be returned on subsequent requests",  sloc, AbstractAspectJAdvice.currentJoinPoint().getSourceLocation());
+				assertEquals("Same source location must be returned on subsequent requests", sloc, AbstractAspectJAdvice.currentJoinPoint().getSourceLocation());
 				assertEquals(TestBean.class, sloc.getWithinType());
 				try {
 					sloc.getLine();
@@ -172,7 +172,7 @@ public void testCanGetStaticPartFromJoinPoint() {
 			@Override
 			public void before(Method method, Object[] args, Object target) throws Throwable {
 				StaticPart staticPart = AbstractAspectJAdvice.currentJoinPoint().getStaticPart();
-				assertEquals("Same static part must be returned on subsequent requests",  staticPart, AbstractAspectJAdvice.currentJoinPoint().getStaticPart());
+				assertEquals("Same static part must be returned on subsequent requests", staticPart, AbstractAspectJAdvice.currentJoinPoint().getStaticPart());
 				assertEquals(ProceedingJoinPoint.METHOD_EXECUTION, staticPart.getKind());
 				assertSame(AbstractAspectJAdvice.currentJoinPoint().getSignature(), staticPart.getSignature());
 				assertEquals(AbstractAspectJAdvice.currentJoinPoint().getSourceLocation(), staticPart.getSourceLocation());

spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/AbstractAspectJAdvisorFactoryTests.java

@@ -940,7 +940,7 @@ public void recordModificationIfSetterArgumentDiffersFromOldValue(JoinPoint jp,
 		}
 
 		// Find the current raw value, by invoking the corresponding setter
-		Method correspondingGetter =  getGetterFromSetter(((MethodSignature) jp.getSignature()).getMethod());
+		Method correspondingGetter = getGetterFromSetter(((MethodSignature) jp.getSignature()).getMethod());
 		boolean modified = true;
 		if (correspondingGetter != null) {
 			try {

spring-aop/src/test/java/org/springframework/aop/framework/AopProxyUtilsTests.java

@@ -137,4 +137,4 @@ public Object invoke(Object proxy, Method method, Object[] args) throws Throwabl
 		AopProxyUtils.proxiedUserInterfaces(proxy);
 	}
 
-}
+}

spring-aop/src/test/java/org/springframework/aop/framework/PrototypeTargetTests.java

@@ -63,7 +63,6 @@ public void testSingletonProxyWithPrototypeTarget() {
 		assertEquals(10, interceptor.invocationCount);
 	}
 
-
 	public static interface TestBean {
 		public void doSomething();
 	}

spring-aop/src/test/java/org/springframework/aop/interceptor/ExposeInvocationInterceptorTests.java

@@ -44,7 +44,7 @@ public void testXmlConfig() {
 		DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
 		new XmlBeanDefinitionReader(bf).loadBeanDefinitions(CONTEXT);
 		ITestBean tb = (ITestBean) bf.getBean("proxy");
-		String name= "tony";
+		String name = "tony";
 		tb.setName(name);
 		// Fires context checks
 		assertEquals(name, tb.getName());

spring-aop/src/test/java/org/springframework/tests/aop/advice/CountingAfterReturningAdvice.java

@@ -33,4 +33,4 @@ public void afterReturning(Object o, Method m, Object[] args, Object target) thr
 		count(m);
 	}
 
-}
+}

spring-aop/src/test/java/org/springframework/tests/aop/advice/MyThrowsHandler.java

@@ -24,4 +24,4 @@ public void afterThrowing(RemoteException ex) throws Throwable {
 	public void afterThrowing(Method m, Exception ex) throws Throwable {
 		throw new UnsupportedOperationException("Shouldn't be called");
 	}
-}
+}

spring-aop/src/test/java/test/annotation/EmptySpringAnnotation.java

@@ -25,4 +25,4 @@
 @Target(ElementType.TYPE)
 public @interface EmptySpringAnnotation {
 
-}
+}

spring-aop/src/test/java/test/aop/Lockable.java

@@ -30,4 +30,4 @@ public interface Lockable {
 	void unlock();
 
 	boolean locked();
-}
+}

spring-aop/src/test/java/test/aop/PerTargetAspect.java

@@ -33,4 +33,4 @@ public int getOrder() {
 	public void setOrder(int order) {
 		this.order = order;
 	}
-}
+}

spring-aop/src/test/java/test/aop/TwoAdviceAspect.java

@@ -34,4 +34,4 @@ public int returnCallCount(ProceedingJoinPoint pjp) throws Exception {
 	public void countSet(int newAge) throws Exception {
 		++totalCalls;
 	}
-}
+}

spring-aspects/src/main/java/org/springframework/context/annotation/aspectj/SpringConfiguredConfiguration.java

@@ -29,7 +29,7 @@
  * Configurable}.
  *
  * <p>This configuration class is automatically imported when using the @{@link
- * EnableSpringConfigured} annotation.  See {@code @EnableSpringConfigured} Javadoc for
+ * EnableSpringConfigured} annotation. See {@code @EnableSpringConfigured} Javadoc for
  * complete usage details.
  *
  * @author Chris Beams

spring-aspects/src/test/java/org/springframework/beans/factory/aspectj/SpringConfiguredWithAutoProxyingTests.java

@@ -30,4 +30,4 @@ protected void setUp() throws Exception {
 	public void testSpringConfiguredAndAutoProxyUsedTogether() {
 		; // set up is sufficient to trigger failure if this is going to fail...
 	}
-}
+}

spring-aspects/src/test/java/org/springframework/cache/config/AnnotatedClassCacheableService.java

@@ -135,4 +135,4 @@ public Object multiConditionalCacheAndEvict(Object arg1) {
 	public Object multiUpdate(Object arg1) {
 		return arg1;
 	}
-}
+}

spring-aspects/src/test/java/org/springframework/cache/config/CacheableService.java

@@ -67,4 +67,4 @@ public interface CacheableService<T> {
 	T multiConditionalCacheAndEvict(Object arg1);
 
 	T multiUpdate(Object arg1);
-}
+}

spring-beans/src/main/java/org/springframework/beans/BeanWrapperImpl.java

@@ -699,7 +699,7 @@ public Object getPropertyValue(String propertyName) throws BeansException {
 		return nestedBw.getPropertyValue(tokens);
 	}
 
-	private Object getPropertyValue(PropertyTokenHolder tokens) throws BeansException {
+    private Object getPropertyValue(PropertyTokenHolder tokens) throws BeansException {
 		String propertyName = tokens.canonicalName;
 		String actualName = tokens.actualName;
 		PropertyDescriptor pd = getCachedIntrospectionResults().getPropertyDescriptor(actualName);

spring-beans/src/main/java/org/springframework/beans/factory/Aware.java

@@ -19,7 +19,7 @@
 /**
  * Marker superinterface indicating that a bean is eligible to be
  * notified by the Spring container of a particular framework object
- * through a callback-style method.  Actual method signature is
+ * through a callback-style method. Actual method signature is
  * determined by individual subinterfaces, but should typically
  * consist of just one void-returning method that accepts a single
  * argument.

spring-beans/src/main/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessor.java

@@ -196,11 +196,11 @@ public void setRequiredParameterValue(boolean requiredParameterValue) {
 	}
 
 	public void setOrder(int order) {
-	  this.order = order;
+		this.order = order;
 	}
 
 	public int getOrder() {
-	  return this.order;
+		return this.order;
 	}
 
 	public void setBeanFactory(BeanFactory beanFactory) throws BeansException {

spring-beans/src/main/java/org/springframework/beans/factory/annotation/InitDestroyAnnotationBeanPostProcessor.java

@@ -109,11 +109,11 @@ public void setDestroyAnnotationType(Class<? extends Annotation> destroyAnnotati
 	}
 
 	public void setOrder(int order) {
-	  this.order = order;
+		this.order = order;
 	}
 
 	public int getOrder() {
-	  return this.order;
+		return this.order;
 	}
 
 

spring-beans/src/main/java/org/springframework/beans/factory/annotation/RequiredAnnotationBeanPostProcessor.java

@@ -123,11 +123,11 @@ public void setBeanFactory(BeanFactory beanFactory) {
 	}
 
 	public void setOrder(int order) {
-	  this.order = order;
+		this.order = order;
 	}
 
 	public int getOrder() {
-	  return this.order;
+		return this.order;
 	}
 
 

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

@@ -116,11 +116,11 @@ public class CustomEditorConfigurer implements BeanFactoryPostProcessor, BeanCla
 
 
 	public void setOrder(int order) {
-	  this.order = order;
+		this.order = order;
 	}
 
 	public int getOrder() {
-	  return this.order;
+		return this.order;
 	}
 
 	/**

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

@@ -80,7 +80,7 @@ public int hashCode() {
 
 	@Override
 	public String toString() {
-	   return '<' + getBeanName() + '>';
+		return '<' + getBeanName() + '>';
 	}
 
 }

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

@@ -107,7 +107,7 @@ public int hashCode() {
 
 	@Override
 	public String toString() {
-	   return '<' + getBeanName() + '>';
+		return '<' + getBeanName() + '>';
 	}
 
 }

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

@@ -30,7 +30,7 @@
  * @author Juergen Hoeller
  * @since 2.0
  */
-public class BeanDefinitionBuilder  {
+public class BeanDefinitionBuilder {
 
 	/**
 	 * Create a new {@code BeanDefinitionBuilder} used to construct a {@link GenericBeanDefinition}.

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

@@ -888,4 +888,4 @@ public static String[] evaluateAnnotation(Constructor<?> candidate, int paramCou
 			}
 		}
 	}
-}
+}

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

@@ -736,7 +736,7 @@ protected boolean allowAliasOverriding() {
 	//---------------------------------------------------------------------
 
 	public Object resolveDependency(DependencyDescriptor descriptor, String beanName,
-			Set<String> autowiredBeanNames, TypeConverter typeConverter) throws BeansException  {
+			Set<String> autowiredBeanNames, TypeConverter typeConverter) throws BeansException {
 
 		descriptor.initParameterNameDiscovery(getParameterNameDiscoverer());
 		if (descriptor.getDependencyType().equals(ObjectFactory.class)) {
@@ -751,7 +751,7 @@ else if (descriptor.getDependencyType().equals(javaxInjectProviderClass)) {
 	}
 
 	protected Object doResolveDependency(DependencyDescriptor descriptor, Class<?> type, String beanName,
-			Set<String> autowiredBeanNames, TypeConverter typeConverter) throws BeansException  {
+			Set<String> autowiredBeanNames, TypeConverter typeConverter) throws BeansException {
 
 		Object value = getAutowireCandidateResolver().getSuggestedValue(descriptor);
 		if (value != null) {

spring-beans/src/main/java/org/springframework/beans/factory/wiring/BeanConfigurerSupport.java

@@ -47,7 +47,7 @@
  * @see #setBeanWiringInfoResolver
  * @see ClassNameBeanWiringInfoResolver
  */
-public class BeanConfigurerSupport implements BeanFactoryAware, InitializingBean, DisposableBean  {
+public class BeanConfigurerSupport implements BeanFactoryAware, InitializingBean, DisposableBean {
 
 	/** Logger available to subclasses */
 	protected final Log logger = LogFactory.getLog(getClass());

spring-beans/src/main/java/org/springframework/beans/factory/xml/DelegatingEntityResolver.java

@@ -92,7 +92,7 @@ else if (systemId.endsWith(XSD_SUFFIX)) {
 	@Override
 	public String toString() {
 		return "EntityResolver delegating " + XSD_SUFFIX + " to " + this.schemaResolver +
-				" and " + DTD_SUFFIX +  " to " + this.dtdResolver;
+				" and " + DTD_SUFFIX + " to " + this.dtdResolver;
 	}
 
 }

spring-beans/src/main/java/org/springframework/beans/factory/xml/SimpleConstructorNamespaceHandler.java

@@ -148,4 +148,4 @@ private boolean checkName(String name, Collection<ValueHolder> values) {
 		}
 		return false;
 	}
-}
+}

spring-context-support/src/main/java/org/springframework/scheduling/quartz/SchedulerFactoryBean.java

@@ -173,7 +173,7 @@ public static DataSource getConfigTimeNonTransactionalDataSource() {
 	private DataSource nonTransactionalDataSource;
 
 
-	private Map schedulerContextMap;
+    private Map schedulerContextMap;
 
 	private ApplicationContext applicationContext;
 

spring-context/src/main/java/org/springframework/cache/interceptor/CacheAspectSupport.java

@@ -470,4 +470,4 @@ protected Collection<Cache> getCaches() {
 			return this.caches;
 		}
 	}
-}
+}

spring-context/src/main/java/org/springframework/cache/interceptor/ExpressionEvaluator.java

@@ -89,4 +89,4 @@ private String toString(Method method, String expression) {
 		sb.append(expression);
 		return sb.toString();
 	}
-}
+}

spring-context/src/main/java/org/springframework/cache/interceptor/LazyParamAwareEvaluationContext.java

@@ -117,4 +117,4 @@ private String toString(Method m) {
 		sb.append(m.toString());
 		return sb.toString();
 	}
-}
+}

spring-context/src/main/java/org/springframework/context/annotation/AdviceMode.java

@@ -29,4 +29,4 @@
 public enum AdviceMode {
 	PROXY,
 	ASPECTJ
-}
+}

spring-context/src/main/java/org/springframework/context/annotation/CommonAnnotationBeanPostProcessor.java

@@ -725,4 +725,4 @@ public Class<?> getDependencyType() {
 		}
 	}
 
-}
+}

spring-context/src/main/java/org/springframework/context/annotation/EnableAspectJAutoProxy.java

@@ -110,4 +110,4 @@
 	 */
 	boolean proxyTargetClass() default false;
 
-}
+}

spring-context/src/main/java/org/springframework/context/annotation/ImportBeanDefinitionRegistrar.java

@@ -60,4 +60,4 @@ public interface ImportBeanDefinitionRegistrar {
 	public void registerBeanDefinitions(
 			AnnotationMetadata importingClassMetadata, BeanDefinitionRegistry registry);
 
-}
+}

spring-context/src/main/java/org/springframework/context/config/PropertyOverrideBeanDefinitionParser.java

@@ -44,4 +44,4 @@ protected void doParse(Element element, BeanDefinitionBuilder builder) {
 
 	}
 
-}
+}