Consistent formatting

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2015 the original author or authors.
+ * Copyright 2002-2016 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.
@@ -101,7 +101,7 @@ private boolean matchesReturnValue(Class<?> type, Method method, Object returnVa
 		else if (Object.class == type && void.class == method.getReturnType()) {
 			return true;
 		}
-		else{
+		else {
 			return ClassUtils.isAssignable(type, method.getReturnType());
 		}
 	}

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

@@ -307,7 +307,8 @@ protected void assertException(Method m, String pointcut, String returning, Stri
 		try {
 			discoverer.getParameterNames(m);
 			fail("Expecting " + exceptionType.getName() + " with message '" + message + "'");
-		} catch (RuntimeException expected) {
+		}
+		catch (RuntimeException expected) {
 			assertEquals("Expecting exception of type " + exceptionType.getName(),
 					exceptionType, expected.getClass());
 			assertEquals("Exception message does not match expected", message, expected.getMessage());

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

@@ -215,7 +215,8 @@ public void before(Method method, Object[] args, Object target) throws Throwable
 		itb.setSpouse(new TestBean());
 		try {
 			itb.unreliableFileOperation();
-		} catch (IOException ex) {
+		}
+		catch (IOException ex) {
 			// we don't realy care...
 		}
 	}

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

@@ -1,3 +1,19 @@
+/*
+ * Copyright 2002-2016 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.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package org.springframework.aop.aspectj;
 
 import java.lang.annotation.Documented;
@@ -97,12 +113,14 @@ private void testAdvice(Advisor advisor, LogUserAdvice logAdvice, TestService ta
 		try {
 			bean.sayHello();
 			fail("Expected exception");
-		} catch (TestException e) {
-			assertEquals(message, e.getMessage());
+		}
+		catch (TestException ex) {
+			assertEquals(message, ex.getMessage());
 		}
 		assertEquals(1, logAdvice.getCountThrows());
 	}
 
+
 	public static class SimpleThrowawayClassLoader extends OverridingClassLoader {
 
 		/**
@@ -115,34 +133,40 @@ public SimpleThrowawayClassLoader(ClassLoader parent) {
 
 	}
 
+
 	@SuppressWarnings("serial")
 	public static class TestException extends RuntimeException {
 
 		public TestException(String string) {
 			super(string);
 		}
-
 	}
 
+
 	@Target({ ElementType.METHOD, ElementType.TYPE })
 	@Retention(RetentionPolicy.RUNTIME)
 	@Documented
 	@Inherited
 	public static @interface Log {
 	}
 
+
 	public static interface TestService {
+
 		public String sayHello();
 	}
 
+
 	@Log
 	public static class TestServiceImpl implements TestService {
+
 		@Override
 		public String sayHello() {
 			throw new TestException("TestServiceImpl");
 		}
 	}
 
+
 	public class LogUserAdvice implements MethodBeforeAdvice, ThrowsAdvice {
 
 		private int countBefore = 0;
@@ -154,9 +178,9 @@ public void before(Method method, Object[] objects, Object o) throws Throwable {
 			countBefore++;
 		}
 
-		public void afterThrowing(Exception e) throws Throwable {
+		public void afterThrowing(Exception ex) throws Throwable {
 			countThrows++;
-			throw e;
+			throw ex;
 		}
 
 		public int getCountBefore() {
@@ -171,7 +195,6 @@ public void reset() {
 			countThrows = 0;
 			countBefore = 0;
 		}
-
 	}
 
 }

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

@@ -61,7 +61,8 @@ public void testExceptionPathStillLogsCorrectly() throws Throwable {
 		try {
 			interceptor.invoke(methodInvocation);
 			fail("Must have propagated the IllegalArgumentException.");
-		} catch (IllegalArgumentException expected) {
+		}
+		catch (IllegalArgumentException expected) {
 		}
 		checkCallCountTotal(interceptor);
 

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

@@ -60,7 +60,8 @@ public void testExceptionPathStillLogsCorrectly() throws Throwable {
 		try {
 			interceptor.invokeUnderTrace(mi, log);
 			fail("Must have propagated the IllegalArgumentException.");
-		} catch (IllegalArgumentException expected) {
+		}
+		catch (IllegalArgumentException expected) {
 		}
 
 		verify(log).trace(anyString());

spring-aop/src/test/java/org/springframework/aop/target/ThreadLocalTargetSourceTests.java

@@ -154,7 +154,8 @@ public void testReuseDestroyedTarget() {
 		// try second time
 		try {
 			source.getTarget();
-		} catch(NullPointerException ex) {
+		}
+		catch (NullPointerException ex) {
 			fail("Should not throw NPE");
 		}
 	}

spring-aspects/src/test/java/org/springframework/scheduling/aspectj/AnnotationAsyncExecutionAspectTests.java

@@ -210,7 +210,8 @@ public <T> Future<T> submit(Callable<T> task) {
 		public synchronized void waitForCompletion() {
 			try {
 				wait(WAIT_TIME);
-			} catch (InterruptedException e) {
+			}
+			catch (InterruptedException ex) {
 				fail("Didn't finish the async job in " + WAIT_TIME + " milliseconds");
 			}
 		}

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2016 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.
@@ -204,7 +204,7 @@ public Object getObject() throws IllegalAccessException {
 			// instance field
 			return this.fieldObject.get(this.targetObject);
 		}
-		else{
+		else {
 			// class field
 			return this.fieldObject.get(null);
 		}

spring-beans/src/test/java/org/springframework/beans/factory/config/ServiceLocatorFactoryBeanTests.java

@@ -81,19 +81,22 @@ public void testErrorOnTooManyOrTooFew() throws Exception {
 			TestServiceLocator factory = (TestServiceLocator) bf.getBean("factory");
 			factory.getTestService();
 			fail("Must fail on more than one matching type");
-		} catch (NoSuchBeanDefinitionException ex) { /* expected */ }
+		}
+		catch (NoSuchBeanDefinitionException ex) { /* expected */ }
 
 		try {
 			TestServiceLocator2 factory = (TestServiceLocator2) bf.getBean("factory2");
 			factory.getTestService(null);
 			fail("Must fail on more than one matching type");
-		} catch (NoSuchBeanDefinitionException ex) { /* expected */ }
+		}
+		catch (NoSuchBeanDefinitionException ex) { /* expected */ }
 
 		try {
 			TestService2Locator factory = (TestService2Locator) bf.getBean("factory3");
 			factory.getTestService();
 			fail("Must fail on no matching types");
-		} catch (NoSuchBeanDefinitionException ex) { /* expected */ }
+		}
+		catch (NoSuchBeanDefinitionException ex) { /* expected */ }
 	}
 
 	@Test
@@ -138,7 +141,8 @@ public void testErrorOnTooManyOrTooFewWithCustomServiceLocatorException() {
 			TestService2Locator factory3 = (TestService2Locator) bf.getBean("factory3");
 			factory3.getTestService();
 			fail("Must fail on no matching type");
-		} catch (CustomServiceLocatorException3 ex) { /* expected */ }
+		}
+		catch (CustomServiceLocatorException3 ex) { /* expected */ }
 	}
 
 	@Test
@@ -160,7 +164,8 @@ public void testStringArgGetter() throws Exception {
 		try {
 			factory.getTestService("bogusTestService");
 			fail("Illegal operation allowed");
-		} catch (NoSuchBeanDefinitionException ex) { /* expected */ }
+		}
+		catch (NoSuchBeanDefinitionException ex) { /* expected */ }
 	}
 
 	@Ignore @Test // worked when using an ApplicationContext (see commented), fails when using BeanFactory
@@ -275,7 +280,8 @@ public void testRequiresListableBeanFactoryAndChokesOnAnythingElse() throws Exce
 		try {
 			ServiceLocatorFactoryBean factory = new ServiceLocatorFactoryBean();
 			factory.setBeanFactory(beanFactory);
-		} catch (FatalBeanException ex) {
+		}
+		catch (FatalBeanException ex) {
 			// expected
 		}
 	}

spring-beans/src/test/java/org/springframework/beans/factory/support/security/CallbacksSecurityTests.java

@@ -324,7 +324,8 @@ public void testSecuritySanity() throws Exception {
 		try {
 			acc.checkPermission(new PropertyPermission("*", "read"));
 			fail("Acc should not have any permissions");
-		} catch (SecurityException se) {
+		}
+		catch (SecurityException se) {
 			// expected
 		}
 
@@ -342,7 +343,8 @@ public Object run() throws Exception {
 				}
 			}, acc);
 			fail("expected security exception");
-		} catch (Exception ex) {
+		}
+		catch (Exception ex) {
 		}
 
 		final Class<ConstructorBean> cl = ConstructorBean.class;
@@ -356,7 +358,8 @@ public Object run() throws Exception {
 						}
 					}, acc);
 			fail("expected security exception");
-		} catch (Exception ex) {
+		}
+		catch (Exception ex) {
 		}
 	}
 
@@ -365,7 +368,8 @@ public void testSpringInitBean() throws Exception {
 		try {
 			beanFactory.getBean("spring-init");
 			fail("expected security exception");
-		} catch (BeanCreationException ex) {
+		}
+		catch (BeanCreationException ex) {
 			assertTrue(ex.getCause() instanceof SecurityException);
 		}
 	}
@@ -375,7 +379,8 @@ public void testCustomInitBean() throws Exception {
 		try {
 			beanFactory.getBean("custom-init");
 			fail("expected security exception");
-		} catch (BeanCreationException ex) {
+		}
+		catch (BeanCreationException ex) {
 			assertTrue(ex.getCause() instanceof SecurityException);
 		}
 	}
@@ -399,7 +404,8 @@ public void testCustomFactoryObject() throws Exception {
 		try {
 			beanFactory.getBean("spring-factory");
 			fail("expected security exception");
-		} catch (BeanCreationException ex) {
+		}
+		catch (BeanCreationException ex) {
 			assertTrue(ex.getCause() instanceof SecurityException);
 		}
 
@@ -416,7 +422,8 @@ public void testCustomStaticFactoryMethod() throws Exception {
 		try {
 			beanFactory.getBean("custom-static-factory-method");
 			fail("expected security exception");
-		} catch (BeanCreationException ex) {
+		}
+		catch (BeanCreationException ex) {
 			assertTrue(ex.getMostSpecificCause() instanceof SecurityException);
 		}
 	}
@@ -426,7 +433,8 @@ public void testCustomInstanceFactoryMethod() throws Exception {
 		try {
 			beanFactory.getBean("custom-factory-method");
 			fail("expected security exception");
-		} catch (BeanCreationException ex) {
+		}
+		catch (BeanCreationException ex) {
 			assertTrue(ex.getMostSpecificCause() instanceof SecurityException);
 		}
 	}
@@ -436,7 +444,8 @@ public void testTrustedFactoryMethod() throws Exception {
 		try {
 			beanFactory.getBean("privileged-static-factory-method");
 			fail("expected security exception");
-		} catch (BeanCreationException ex) {
+		}
+		catch (BeanCreationException ex) {
 			assertTrue(ex.getMostSpecificCause() instanceof SecurityException);
 		}
 	}
@@ -446,7 +455,8 @@ public void testConstructor() throws Exception {
 		try {
 			beanFactory.getBean("constructor");
 			fail("expected security exception");
-		} catch (BeanCreationException ex) {
+		}
+		catch (BeanCreationException ex) {
 			// expected
 			assertTrue(ex.getMostSpecificCause() instanceof SecurityException);
 		}
@@ -472,7 +482,8 @@ public void testPropertyInjection() throws Exception {
 		try {
 			beanFactory.getBean("property-injection");
 			fail("expected security exception");
-		} catch (BeanCreationException ex) {
+		}
+		catch (BeanCreationException ex) {
 			assertTrue(ex.getMessage().contains("security"));
 		}
 

spring-beans/src/test/java/org/springframework/beans/factory/xml/DuplicateBeanIdTests.java

@@ -48,7 +48,8 @@ public void duplicateBeanIdsWithinSameNestingLevelRaisesError() {
 		try {
 			reader.loadBeanDefinitions(new ClassPathResource("DuplicateBeanIdTests-sameLevel-context.xml", this.getClass()));
 			fail("expected parsing exception due to duplicate ids in same nesting level");
-		} catch (Exception ex) {
+		}
+		catch (Exception ex) {
 			// expected
 		}
 	}

spring-beans/src/test/java/org/springframework/beans/propertyeditors/CustomEditorTests.java

@@ -485,7 +485,8 @@ public void testParseShortGreaterThanMaxValueWithoutNumberFormat() {
 			CustomNumberEditor editor = new CustomNumberEditor(Short.class, true);
 			editor.setAsText(String.valueOf(Short.MAX_VALUE + 1));
 			fail(Short.MAX_VALUE + 1 + " is greater than max value");
-		} catch (NumberFormatException ex) {
+		}
+		catch (NumberFormatException ex) {
 			// expected
 		}
 	}

spring-beans/src/test/java/org/springframework/tests/beans/CollectingReaderEventListener.java

@@ -70,7 +70,7 @@ public ComponentDefinition[] getComponentDefinitions() {
 	@Override
 	public void aliasRegistered(AliasDefinition aliasDefinition) {
 		List aliases = (List) this.aliasMap.get(aliasDefinition.getBeanName());
-		if(aliases == null) {
+		if (aliases == null) {
 			aliases = new ArrayList();
 			this.aliasMap.put(aliasDefinition.getBeanName(), aliases);
 		}