Consistent bracket alignment

Author: jhoeller

buildSrc/src/main/groovy/org/springframework/build/gradle/MergePlugin.groovy

@@ -21,13 +21,10 @@ import org.gradle.api.artifacts.Configuration
 import org.gradle.api.artifacts.ProjectDependency;
 import org.gradle.api.artifacts.maven.Conf2ScopeMapping
 import org.gradle.api.plugins.MavenPlugin
-import org.gradle.api.tasks.*
 import org.gradle.plugins.ide.eclipse.EclipsePlugin
-import org.gradle.plugins.ide.eclipse.model.EclipseClasspath;
 import org.gradle.plugins.ide.idea.IdeaPlugin
 import org.gradle.api.invocation.*
 
-
 /**
  * Gradle plugin that allows projects to merged together. Primarily developed to
  * allow Spring to support multiple incompatible versions of third-party
@@ -76,13 +73,13 @@ class MergePlugin implements Plugin<Project> {
 
 		// Hook to perform the actual merge logic
 		project.afterEvaluate{
-			if(it.merge.into != null) {
+			if (it.merge.into != null) {
 				setup(it)
 			}
 		}
 
 		// Hook to build runtimeMerge dependencies
-		if(!attachedProjectsEvaluated) {
+		if (!attachedProjectsEvaluated) {
 			project.gradle.projectsEvaluated{
 				postProcessProjects(it)
 			}
@@ -102,7 +99,7 @@ class MergePlugin implements Plugin<Project> {
 		// invoking a task will invoke the task with the same name on 'into' project
 		["sourcesJar", "jar", "javadocJar", "javadoc", "install", "artifactoryPublish"].each {
 			def task = project.tasks.findByPath(it)
-			if(task) {
+			if (task) {
 				task.enabled = false
 				task.dependsOn(project.merge.into.tasks.findByPath(it))
 			}
@@ -120,7 +117,7 @@ class MergePlugin implements Plugin<Project> {
 	private void setupMaven(Project project) {
 		project.configurations.each { configuration ->
 			Conf2ScopeMapping mapping = project.conf2ScopeMappings.getMapping([configuration])
-			if(mapping.scope) {
+			if (mapping.scope) {
 				Configuration intoConfiguration = project.merge.into.configurations.create(
 					project.name + "-" + configuration.name)
 				configuration.excludeRules.each {
@@ -131,7 +128,7 @@ class MergePlugin implements Plugin<Project> {
 				configuration.dependencies.each {
 					def intoCompile = project.merge.into.configurations.getByName("compile")
 					// Protect against changing a compile scope dependency (SPR-10218)
-					if(!intoCompile.dependencies.contains(it)) {
+					if (!intoCompile.dependencies.contains(it)) {
 						intoConfiguration.dependencies.add(it)
 					}
 				}

buildSrc/src/main/groovy/org/springframework/build/gradle/TestSourceSetDependenciesPlugin.groovy

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2014 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.
@@ -21,7 +21,6 @@ import org.gradle.api.Project
 import org.gradle.api.artifacts.Configuration;
 import org.gradle.api.artifacts.ProjectDependency;
 
-
 /**
  * Gradle plugin that automatically updates testCompile dependencies to include
  * the test source sets of project dependencies.
@@ -43,9 +42,9 @@ class TestSourceSetDependenciesPlugin implements Plugin<Project> {
 
 	private void collectProjectDependencies(Set<ProjectDependency> projectDependencies,
 			Project project) {
-		for(def configurationName in ["compile", "optional", "provided", "testCompile"]) {
+		for (def configurationName in ["compile", "optional", "provided", "testCompile"]) {
 			Configuration configuration = project.getConfigurations().findByName(configurationName)
-			if(configuration) {
+			if (configuration) {
 				configuration.dependencies.findAll { it instanceof ProjectDependency }.each {
 					projectDependencies.add(it)
 					collectProjectDependencies(projectDependencies, it.dependencyProject)

spring-aop/src/main/java/org/springframework/aop/framework/JdkDynamicAopProxy.java

@@ -215,8 +215,10 @@ public Object invoke(Object proxy, Method method, Object[] args) throws Throwabl
 				// is type-compatible. Note that we can't help if the target sets
 				// a reference to itself in another returned object.
 				retVal = proxy;
-			} else if (retVal == null && returnType != Void.TYPE && returnType.isPrimitive()) {
-				throw new AopInvocationException("Null return value from advice does not match primitive return type for: " + method);
+			}
+			else if (retVal == null && returnType != Void.TYPE && returnType.isPrimitive()) {
+				throw new AopInvocationException(
+						"Null return value from advice does not match primitive return type for: " + method);
 			}
 			return retVal;
 		}

spring-aop/src/main/java/org/springframework/aop/interceptor/CustomizableTraceInterceptor.java

@@ -258,7 +258,7 @@ protected Object invokeUnderTrace(MethodInvocation invocation, Log logger) throw
 			return returnValue;
 		}
 		catch (Throwable ex) {
-			if(stopWatch.isRunning()) {
+			if (stopWatch.isRunning()) {
 				stopWatch.stop();
 			}
 			exitThroughException = true;
@@ -268,7 +268,7 @@ protected Object invokeUnderTrace(MethodInvocation invocation, Log logger) throw
 		}
 		finally {
 			if (!exitThroughException) {
-				if(stopWatch.isRunning()) {
+				if (stopWatch.isRunning()) {
 					stopWatch.stop();
 				}
 				writeToLog(logger,

spring-aspects/src/main/java/org/springframework/beans/factory/aspectj/AbstractDependencyInjectionAspect.aj

@@ -46,15 +46,15 @@ public abstract aspect AbstractDependencyInjectionAspect {
 	 * Select join points in beans to be configured prior to construction?
 	 * By default, use post-construction injection matching the default in the Configurable annotation.
 	 */
-	public pointcut preConstructionConfiguration() : if(false);
+	public pointcut preConstructionConfiguration() : if (false);
 
 	/**
 	 * Select the most-specific initialization join point
 	 * (most concrete class) for the initialization of an instance.
 	 */
 	@CodeGenerationHint(ifNameSuffix="6f1")
 	public pointcut mostSpecificSubTypeConstruction() :
-		if(thisJoinPoint.getSignature().getDeclaringType() == thisJoinPoint.getThis().getClass());
+		if (thisJoinPoint.getSignature().getDeclaringType() == thisJoinPoint.getThis().getClass());
 
 	/**
 	 * Select least specific super type that is marked for DI (so that injection occurs only once with pre-construction inejection

spring-aspects/src/main/java/org/springframework/beans/factory/aspectj/AnnotationBeanConfigurerAspect.aj

@@ -79,7 +79,7 @@ public aspect AnnotationBeanConfigurerAspect
 	 * An intermediary to match preConstructionConfiguration signature (that doesn't expose the annotation object)
 	 */
 	@CodeGenerationHint(ifNameSuffix="bb0")
-	private pointcut preConstructionConfigurationSupport(Configurable c) : @this(c) && if(c.preConstruction());
+	private pointcut preConstructionConfigurationSupport(Configurable c) : @this(c) && if (c.preConstruction());
 
 	/*
 	 * This declaration shouldn't be needed,

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

@@ -55,7 +55,8 @@ public aspect JCacheCacheAspect extends JCacheAspectSupport {
 			public Object invoke() {
 				try {
 					return proceed(cachedObject);
-				} catch (Throwable ex) {
+				}
+				catch (Throwable ex) {
 					throw new ThrowableWrapper(ex);
 				}
 			}
@@ -120,4 +121,4 @@ public aspect JCacheCacheAspect extends JCacheAspectSupport {
 		}
 	}
 
-}
+}

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

@@ -378,7 +378,8 @@ public TypeDescriptor getPropertyTypeDescriptor(String propertyName) throws Bean
 					if (pd.getReadMethod() != null || pd.getWriteMethod() != null) {
 						return TypeDescriptor.nested(property(pd), tokens.keys.length);
 					}
-				} else {
+				}
+				else {
 					if (pd.getReadMethod() != null || pd.getWriteMethod() != null) {
 						return new TypeDescriptor(property(pd));
 					}

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

@@ -34,7 +34,7 @@
  * {@link PropertyAccessor} implementation that directly accesses instance fields.
  * Allows for direct binding to fields instead of going through JavaBean setters.
  *
- * <p>Since 4.1 this implementation supports nested fields traversing.
+ * <p>As of Spring 4.1, this implementation supports nested field traversal.
  *
  * <p>A DirectFieldAccessor's default for the "extractOldValueForEditor" setting
  * is "true", since a field can always be read without side effects.
@@ -188,7 +188,6 @@ private FieldAccessor doGetFieldAccessor(String propertyPath, Class<?> targetCla
 
 	/**
 	 * Create a root {@link FieldAccessor}.
-	 *
 	 * @param canonicalName the full expression for the field to access
 	 * @param actualName the name of the local (root) property
 	 * @param field the field accessing the property
@@ -212,13 +211,13 @@ private class FieldAccessor {
 		private final Field field;
 
 		/**
-		 * Create a new instance.
+		 * Create a new FieldAccessor instance.
 		 * @param parent the parent accessor, if any
 		 * @param canonicalName the full expression for the field to access
 		 * @param actualName the name of the partial expression for this property
 		 * @param field the field accessing the property
 		 */
-		private FieldAccessor(FieldAccessor parent, String canonicalName, String actualName, Field field) {
+		public FieldAccessor(FieldAccessor parent, String canonicalName, String actualName, Field field) {
 			Assert.notNull(canonicalName, "Expression must no be null");
 			Assert.notNull(field, "Field must no be null");
 			this.parents = buildParents(parent);
@@ -229,7 +228,6 @@ private FieldAccessor(FieldAccessor parent, String canonicalName, String actualN
 
 		/**
 		 * Create a child instance.
-		 *
 		 * @param actualName the name of the child property
 		 * @param field the field accessing the child property
 		 */
@@ -238,7 +236,7 @@ public FieldAccessor child(String actualName, Field field) {
 		}
 
 		public Field getField() {
-			return field;
+			return this.field;
 		}
 
 		public Object getValue() {
@@ -252,9 +250,8 @@ public void setValue(Object value) {
 			try {
 				this.field.set(localTarget, value);
 			}
-			catch (IllegalAccessException e) {
-				throw new InvalidPropertyException(localTarget.getClass(), canonicalName,
-						"Field is not accessible", e);
+			catch (IllegalAccessException ex) {
+				throw new InvalidPropertyException(localTarget.getClass(), canonicalName, "Field is not accessible", ex);
 			}
 		}
 
@@ -275,8 +272,8 @@ private Object getLocalTarget(Object rootTarget) {
 				localTarget = autoGrowIfNecessary(parent, parent.getParentValue(localTarget));
 				if (localTarget == null) { // Could not traverse the graph any further
 					throw new NullValueInNestedPathException(getRootClass(), parent.actualName,
-							"Cannot access indexed value of property referenced in indexed " +
-									"property path '" + getField().getName() + "': returned null");
+							"Cannot access indexed value of property referenced in indexed property path '" +
+									getField().getName() + "': returned null");
 				}
 			}
 			return localTarget;
@@ -287,10 +284,10 @@ private Object newValue() {
 			try {
 				return type.newInstance();
 			}
-			catch (Exception e) {
+			catch (Exception ex) {
 				throw new NullValueInNestedPathException(getRootClass(), this.actualName,
-						"Could not instantiate property type [" + type.getName() + "] to " +
-								"auto-grow nested property path: " + e);
+						"Could not instantiate property type [" + type.getName() +
+								"] to auto-grow nested property path: " + ex);
 			}
 		}
 
@@ -311,7 +308,6 @@ private List<FieldAccessor> buildParents(FieldAccessor parent) {
 			}
 			return parents;
 		}
-
 	}
 
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 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.
@@ -172,7 +172,8 @@ private int calculateStringDistance(String s1, String s2) {
 				char t_j = s2.charAt(j - 1);
 				if (s_i == t_j) {
 					cost = 0;
-				} else {
+				}
+				else {
 					cost = 1;
 				}
 				d[i][j] = Math.min(Math.min(d[i - 1][j] + 1, d[i][j - 1] + 1),