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 @@ public class AspectJExpressionPointcut extends AbstractExpressionPointcut
 			return false;
 		}
 		else {
-		  // the maybe case
+			// the maybe case
-		  return (beanHasIntroductions || matchesIgnoringSubtypes(shadowMatch) || matchesTarget(shadowMatch, targetClass));
+			return (beanHasIntroductions || matchesIgnoringSubtypes(shadowMatch) || matchesTarget(shadowMatch, targetClass));
 		}
 	}
 

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

@@ -64,8 +64,8 @@ public abstract class AspectJProxyUtils {
 	 */
 	private static boolean isAspectJAdvice(Advisor advisor) {
 		return (advisor instanceof InstantiationModelAwarePointcutAdvisor ||
-			   advisor.getAdvice() instanceof AbstractAspectJAdvice ||
+				advisor.getAdvice() instanceof AbstractAspectJAdvice ||
-			   (advisor instanceof PointcutAdvisor &&
+				(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,
+	public InstantiationModelAwarePointcutAdvisorImpl(AspectJAdvisorFactory af, AspectJExpressionPointcut ajexp,
-			MetadataAwareAspectInstanceFactory aif,  Method method, int declarationOrderInAspect, String aspectName) {
+			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 @@ public class DelegatingIntroductionInterceptor extends IntroductionInfoSupport
 
 
 	/**
-	 * 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 final class MethodInvocationProceedingJoinPointTests {
 			@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 final class MethodInvocationProceedingJoinPointTests {
 			@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 @@ abstract class AbstractMakeModifiable {
 		}
 
 		// 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/PrototypeTargetTests.java

@@ -63,7 +63,6 @@ public final class PrototypeTargetTests {
 		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 final class ExposeInvocationInterceptorTests {
 		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-aspects/src/main/java/org/springframework/context/annotation/aspectj/SpringConfiguredConfiguration.java

@@ -29,7 +29,7 @@ import org.springframework.context.annotation.Role;
  * 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-beans/src/main/java/org/springframework/beans/BeanWrapperImpl.java

@@ -699,7 +699,7 @@ public class BeanWrapperImpl extends AbstractPropertyAccessor implements BeanWra
 		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 @@ package org.springframework.beans.factory;
 /**
  * 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 class AutowiredAnnotationBeanPostProcessor extends InstantiationAwareBean
 	}
 
 	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 class InitDestroyAnnotationBeanPostProcessor
 	}
 
 	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 class RequiredAnnotationBeanPostProcessor extends InstantiationAwareBeanP
 	}
 
 	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 class RuntimeBeanNameReference implements BeanReference {
 
 	@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 class RuntimeBeanReference implements BeanReference {
 
 	@Override
 	public String toString() {
-	   return '<' + getBeanName() + '>';
+		return '<' + getBeanName() + '>';
 	}
 
 }

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

@@ -30,7 +30,7 @@ import org.springframework.util.ObjectUtils;
  * @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/DefaultListableBeanFactory.java

@@ -736,7 +736,7 @@ public class DefaultListableBeanFactory extends AbstractAutowireCapableBeanFacto
 	//---------------------------------------------------------------------
 
 	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 @@ public class DefaultListableBeanFactory extends AbstractAutowireCapableBeanFacto
 	}
 
 	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 @@ import org.springframework.util.ClassUtils;
  * @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 @@ public class DelegatingEntityResolver implements EntityResolver {
 	@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-context-support/src/main/java/org/springframework/scheduling/quartz/SchedulerFactoryBean.java

@@ -173,7 +173,7 @@ public class SchedulerFactoryBean extends SchedulerAccessor implements FactoryBe
 	private DataSource nonTransactionalDataSource;
 
 
-	private Map schedulerContextMap;
+    private Map schedulerContextMap;
 
 	private ApplicationContext applicationContext;
 

spring-context/src/main/java/org/springframework/context/support/ResourceBundleMessageSource.java

@@ -135,7 +135,7 @@ public class ResourceBundleMessageSource extends AbstractMessageSource implement
 	 * @see #setBasename
 	 * @see java.util.ResourceBundle#getBundle(String)
 	 */
-	public void setBasenames(String... basenames)  {
+	public void setBasenames(String... basenames) {
 		if (basenames != null) {
 			this.basenames = new String[basenames.length];
 			for (int i = 0; i < basenames.length; i++) {

spring-context/src/main/java/org/springframework/ejb/access/SimpleRemoteSlsbInvokerInterceptor.java

@@ -110,7 +110,7 @@ public class SimpleRemoteSlsbInvokerInterceptor extends AbstractRemoteSlsbInvoke
 			}
 			else if (targetEx instanceof CreateException) {
 				throw RmiClientInterceptorUtils.convertRmiAccessException(
-				    invocation.getMethod(), targetEx, "Could not create remote EJB [" + getJndiName() + "]");
+					invocation.getMethod(), targetEx, "Could not create remote EJB [" + getJndiName() + "]");
 			}
 			throw targetEx;
 		}

spring-context/src/main/java/org/springframework/format/support/FormattingConversionService.java

@@ -195,7 +195,7 @@ public class FormattingConversionService extends GenericConversionService
 
 		private Class<? extends Annotation> annotationType;
 
-		private AnnotationFormatterFactory annotationFormatterFactory;
+        private AnnotationFormatterFactory annotationFormatterFactory;
 
 		private Class<?> fieldType;
 

spring-context/src/main/java/org/springframework/format/support/FormattingConversionServiceFactoryBean.java

@@ -116,7 +116,7 @@ public class FormattingConversionServiceFactoryBean
 	/**
 	 * Indicate whether default formatters should be registered or not.
 	 * <p>By default, built-in formatters are registered. This flag can be used
-	 * to  turn that off and rely on explicitly registered formatters only.
+	 * to turn that off and rely on explicitly registered formatters only.
 	 * @see #setFormatters(Set)
 	 * @see #setFormatterRegistrars(Set)
 	 */

spring-context/src/main/java/org/springframework/instrument/classloading/SimpleInstrumentableClassLoader.java

@@ -29,7 +29,7 @@ import org.springframework.core.OverridingClassLoader;
  * @author Costin Leau
  * @since 2.0
  */
-public class SimpleInstrumentableClassLoader extends OverridingClassLoader  {
+public class SimpleInstrumentableClassLoader extends OverridingClassLoader {
 
 	private final WeavingTransformer weavingTransformer;
 

spring-context/src/main/java/org/springframework/instrument/classloading/oc4j/OC4JLoadTimeWeaver.java

@@ -76,5 +76,4 @@ public class OC4JLoadTimeWeaver implements LoadTimeWeaver {
 	public ClassLoader getThrowawayClassLoader() {
 		return this.classLoader.getThrowawayClassLoader();
 	}
-
 }

spring-context/src/main/java/org/springframework/jmx/export/SpringModelMBean.java

@@ -58,7 +58,7 @@ public class SpringModelMBean extends RequiredModelMBean {
 	 * Construct a new SpringModelMBean instance with the given {@link ModelMBeanInfo}.
 	 * @see javax.management.modelmbean.RequiredModelMBean#RequiredModelMBean(ModelMBeanInfo)
 	 */
-	public SpringModelMBean(ModelMBeanInfo mbi) throws MBeanException, RuntimeOperationsException  {
+	public SpringModelMBean(ModelMBeanInfo mbi) throws MBeanException, RuntimeOperationsException {
 		super(mbi);
 	}
 

spring-context/src/main/java/org/springframework/remoting/rmi/RmiClientInterceptor.java

@@ -345,7 +345,7 @@ public class RmiClientInterceptor extends RemoteInvocationBasedAccessor
 			}
 			catch (RemoteException ex) {
 				throw RmiClientInterceptorUtils.convertRmiAccessException(
-				    invocation.getMethod(), ex, isConnectFailure(ex), getServiceUrl());
+					invocation.getMethod(), ex, isConnectFailure(ex), getServiceUrl());
 			}
 			catch (InvocationTargetException ex) {
 				Throwable exToThrow = ex.getTargetException();
@@ -389,7 +389,7 @@ public class RmiClientInterceptor extends RemoteInvocationBasedAccessor
 	 * @see org.springframework.remoting.support.RemoteInvocation
 	 */
 	protected Object doInvoke(MethodInvocation methodInvocation, RmiInvocationHandler invocationHandler)
-	    throws RemoteException, NoSuchMethodException, IllegalAccessException, InvocationTargetException {
+		throws RemoteException, NoSuchMethodException, IllegalAccessException, InvocationTargetException {
 
 		if (AopUtils.isToStringMethod(methodInvocation.getMethod())) {
 			return "RMI invoker proxy for service URL [" + getServiceUrl() + "]";

spring-context/src/main/java/org/springframework/scripting/jruby/JRubyScriptUtils.java

@@ -81,7 +81,7 @@ public abstract class JRubyScriptUtils {
 
 		Node scriptRootNode = ruby.parseEval(scriptSource, "", null, 0);
 		// keep using the deprecated runNormally variant for JRuby 1.1/1.2 compatibility...
-		IRubyObject rubyObject = ruby.runNormally(scriptRootNode, false);
+        IRubyObject rubyObject = ruby.runNormally(scriptRootNode, false);
 
 		if (rubyObject instanceof RubyNil) {
 			String className = findClassName(scriptRootNode);

spring-expression/src/main/java/org/springframework/expression/spel/ast/CompoundExpression.java

@@ -36,6 +36,7 @@ public class CompoundExpression extends SpelNodeImpl {
 		}
 	}
 
+
 	@Override
 	protected ValueRef getValueRef(ExpressionState state) throws EvaluationException {
 		if (getChildCount()==1) {

spring-expression/src/main/java/org/springframework/expression/spel/ast/Projection.java

@@ -70,7 +70,7 @@ public class Projection extends SpelNodeImpl {
 		if (operand instanceof Map) {
 			Map<?, ?> mapData = (Map<?, ?>) operand;
 			List<Object> result = new ArrayList<Object>();
-			for (Map.Entry<?,?> entry : mapData.entrySet()) {
+			for (Map.Entry<?, ?> entry : mapData.entrySet()) {
 				try {
 					state.pushActiveContextObject(new TypedValue(entry));
 					result.add(this.children[0].getValueInternal(state).getValue());

spring-expression/src/main/java/org/springframework/expression/spel/ast/Selection.java

@@ -73,9 +73,9 @@ public class Selection extends SpelNodeImpl {
 		if (operand instanceof Map) {
 			Map<?, ?> mapdata = (Map<?, ?>) operand;
 			// TODO don't lose generic info for the new map
-			Map<Object,Object> result = new HashMap<Object,Object>();
+			Map<Object, Object> result = new HashMap<Object, Object>();
 			Object lastKey = null;
-			for (Map.Entry<?,?> entry : mapdata.entrySet()) {
+			for (Map.Entry<?, ?> entry : mapdata.entrySet()) {
 				try {
 					TypedValue kvpair = new TypedValue(entry);
 					state.pushActiveContextObject(kvpair);
@@ -101,7 +101,7 @@ public class Selection extends SpelNodeImpl {
 				return new ValueRef.TypedValueHolderValueRef(new TypedValue(null),this);
 			}
 			if (variant == LAST) {
-				Map<Object,Object> resultMap = new HashMap<Object,Object>();
+				Map<Object, Object> resultMap = new HashMap<Object, Object>();
 				Object lastValue = result.get(lastKey);
 				resultMap.put(lastKey,lastValue);
 				return new ValueRef.TypedValueHolderValueRef(new TypedValue(resultMap),this);

spring-expression/src/main/java/org/springframework/expression/spel/ast/SpelNodeImpl.java

@@ -149,5 +149,4 @@ public abstract class SpelNodeImpl implements SpelNode {
 	protected ValueRef getValueRef(ExpressionState state) throws EvaluationException {
 		throw new SpelEvaluationException(pos,SpelMessage.NOT_ASSIGNABLE,toStringAST());
 	}
-
 }

spring-web/src/main/java/org/springframework/http/converter/feed/RssChannelHttpMessageConverter.java

@@ -43,5 +43,4 @@ public class RssChannelHttpMessageConverter extends AbstractWireFeedHttpMessageC
 		return Channel.class.isAssignableFrom(clazz);
 	}
 
-
 }