Merge pull request #1979 from rupertw

snicoll · snicoll · commit cb4fa3795a5e · 2018-10-05T09:21:23.000+02:00
* pr/1979:
  Fix formatting
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/NoUniqueBeanDefinitionException.java b/spring-beans/src/main/java/org/springframework/beans/factory/NoUniqueBeanDefinitionException.java
@@ -60,7 +60,7 @@ public NoUniqueBeanDefinitionException(Class<?> type, int numberOfBeansFound, St
 	public NoUniqueBeanDefinitionException(Class<?> type, Collection<String> beanNamesFound) {
 		super(type, "expected single matching bean but found " + beanNamesFound.size() + ": " +
 				StringUtils.collectionToCommaDelimitedString(beanNamesFound));
-		this.numberOfBeansFound =  beanNamesFound.size();
+		this.numberOfBeansFound = beanNamesFound.size();
 		this.beanNamesFound = beanNamesFound;
 	}
 
@@ -82,7 +82,7 @@ public NoUniqueBeanDefinitionException(Class<?> type, String... beanNamesFound)
 	public NoUniqueBeanDefinitionException(ResolvableType type, Collection<String> beanNamesFound) {
 		super(type, "expected single matching bean but found " + beanNamesFound.size() + ": " +
 				StringUtils.collectionToCommaDelimitedString(beanNamesFound));
-		this.numberOfBeansFound =  beanNamesFound.size();
+		this.numberOfBeansFound = beanNamesFound.size();
 		this.beanNamesFound = beanNamesFound;
 	}
 
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessor.java b/spring-beans/src/main/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessor.java
@@ -707,7 +707,7 @@ protected void inject(Object bean, @Nullable String beanName, @Nullable Property
 					ReflectionUtils.makeAccessible(method);
 					method.invoke(bean, arguments);
 				}
-				catch (InvocationTargetException ex){
+				catch (InvocationTargetException ex) {
 					throw ex.getTargetException();
 				}
 			}
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/BeanExpressionContext.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/BeanExpressionContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2017 the original author or authors.
+ * Copyright 2002-2018 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.
@@ -59,7 +59,7 @@ public Object getObject(String key) {
 		if (this.beanFactory.containsBean(key)) {
 			return this.beanFactory.getBean(key);
 		}
-		else if (this.scope != null){
+		else if (this.scope != null) {
 			return this.scope.resolveContextualObject(key);
 		}
 		else {
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/PreferencesPlaceholderConfigurer.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/PreferencesPlaceholderConfigurer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2017 the original author or authors.
+ * Copyright 2002-2018 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.
@@ -121,7 +121,7 @@ protected String resolvePlaceholder(String placeholder, Properties props) {
 	@Nullable
 	protected String resolvePlaceholder(@Nullable String path, String key, Preferences preferences) {
 		if (path != null) {
-			 // Do not create the node if it does not exist...
+			// Do not create the node if it does not exist...
 			try {
 				if (preferences.nodeExists(path)) {
 					return preferences.node(path).get(key, null);
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/PropertyOverrideConfigurer.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/PropertyOverrideConfigurer.java
@@ -132,7 +132,7 @@ protected void processKey(ConfigurableListableBeanFactory factory, String key, S
 					"': expected 'beanName" + this.beanNameSeparator + "property'");
 		}
 		String beanName = key.substring(0, separatorIndex);
-		String beanProperty = key.substring(separatorIndex+1);
+		String beanProperty = key.substring(separatorIndex + 1);
 		this.beanNames.add(beanName);
 		applyPropertyValue(factory, beanName, beanProperty, value);
 		if (logger.isDebugEnabled()) {
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractAutowireCapableBeanFactory.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractAutowireCapableBeanFactory.java
@@ -1122,7 +1122,7 @@ protected BeanWrapper createBeanInstance(String beanName, RootBeanDefinition mbd
 			return obtainFromSupplier(instanceSupplier, beanName);
 		}
 
-		if (mbd.getFactoryMethodName() != null)  {
+		if (mbd.getFactoryMethodName() != null) {
 			return instantiateUsingFactoryMethod(beanName, mbd, args);
 		}
 
@@ -1149,7 +1149,7 @@ protected BeanWrapper createBeanInstance(String beanName, RootBeanDefinition mbd
 		// Candidate constructors for autowiring?
 		Constructor<?>[] ctors = determineConstructorsFromBeanPostProcessors(beanClass, beanName);
 		if (ctors != null || mbd.getResolvedAutowireMode() == AUTOWIRE_CONSTRUCTOR ||
-				mbd.hasConstructorArgumentValues() || !ObjectUtils.isEmpty(args))  {
+				mbd.hasConstructorArgumentValues() || !ObjectUtils.isEmpty(args)) {
 			return autowireConstructor(beanName, mbd, ctors, args);
 		}
 
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/DefaultListableBeanFactory.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/DefaultListableBeanFactory.java
@@ -661,7 +661,7 @@ public Map<String, Object> getBeansWithAnnotation(Class<? extends Annotation> an
 	@Override
 	@Nullable
 	public <A extends Annotation> A findAnnotationOnBean(String beanName, Class<A> annotationType)
-			throws NoSuchBeanDefinitionException{
+			throws NoSuchBeanDefinitionException {
 
 		A ann = null;
 		Class<?> beanType = getType(beanName);
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/PropertiesBeanDefinitionReader.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/PropertiesBeanDefinitionReader.java
@@ -510,7 +510,7 @@ else if (property.endsWith(REF_SUFFIX)) {
 	 * Reads the value of the entry. Correctly interprets bean references for
 	 * values that are prefixed with an asterisk.
 	 */
-	private Object readValue(Map.Entry<? ,?> entry) {
+	private Object readValue(Map.Entry<?, ?> entry) {
 		Object val = entry.getValue();
 		if (val instanceof String) {
 			String strVal = (String) val;
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/SimpleInstantiationStrategy.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/SimpleInstantiationStrategy.java
@@ -75,7 +75,7 @@ public Object instantiate(RootBeanDefinition bd, @Nullable String beanName, Bean
 									(PrivilegedExceptionAction<Constructor<?>>) clazz::getDeclaredConstructor);
 						}
 						else {
-							constructorToUse =	clazz.getDeclaredConstructor();
+							constructorToUse = clazz.getDeclaredConstructor();
 						}
 						bd.resolvedConstructorOrFactoryMethod = constructorToUse;
 					}
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/StaticListableBeanFactory.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/StaticListableBeanFactory.java
@@ -432,7 +432,7 @@ public Map<String, Object> getBeansWithAnnotation(Class<? extends Annotation> an
 	@Override
 	@Nullable
 	public <A extends Annotation> A findAnnotationOnBean(String beanName, Class<A> annotationType)
-			throws NoSuchBeanDefinitionException{
+			throws NoSuchBeanDefinitionException {
 
 		Class<?> beanType = getType(beanName);
 		return (beanType != null ? AnnotationUtils.findAnnotation(beanType, annotationType) : null);
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/xml/SimpleConstructorNamespaceHandler.java b/spring-beans/src/main/java/org/springframework/beans/factory/xml/SimpleConstructorNamespaceHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2017 the original author or authors.
+ * Copyright 2002-2018 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.
@@ -118,7 +118,7 @@ public BeanDefinitionHolder decorate(Node node, BeanDefinitionHolder definition,
 								"Constructor argument '" + argName + "' specifies a negative index", attr);
 					}
 
-					if (cvs.hasIndexedArgumentValue(index)){
+					if (cvs.hasIndexedArgumentValue(index)) {
 						parserContext.getReaderContext().error(
 								"Constructor argument '" + argName + "' with index "+ index+" already defined using <constructor-arg>." +
 								" Only one approach may be used per argument.", attr);
@@ -130,7 +130,7 @@ public BeanDefinitionHolder decorate(Node node, BeanDefinitionHolder definition,
 			// no escaping -> ctr name
 			else {
 				String name = Conventions.attributeNameToPropertyName(argName);
-				if (containsArgWithName(name, cvs)){
+				if (containsArgWithName(name, cvs)) {
 					parserContext.getReaderContext().error(
 							"Constructor argument '" + argName + "' already defined using <constructor-arg>." +
 							" Only one approach may be used per argument.", attr);
diff --git a/spring-core/src/main/java/org/springframework/core/AttributeAccessor.java b/spring-core/src/main/java/org/springframework/core/AttributeAccessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2018 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.
@@ -28,7 +28,7 @@
 public interface AttributeAccessor {
 
 	/**
-	 * Set the attribute defined by {@code name} to the supplied	{@code value}.
+	 * Set the attribute defined by {@code name} to the supplied {@code value}.
 	 * If {@code value} is {@code null}, the attribute is {@link #removeAttribute removed}.
 	 * <p>In general, users should take care to prevent overlaps with other
 	 * metadata attributes by using fully-qualified names, perhaps using
diff --git a/spring-core/src/main/java/org/springframework/util/ObjectUtils.java b/spring-core/src/main/java/org/springframework/util/ObjectUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2017 the original author or authors.
+ * Copyright 2002-2018 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.
@@ -251,7 +251,7 @@ public static <E extends Enum<?>> E caseInsensitiveValueOf(E[] enumValues, Strin
 	 * @param obj the object to append
 	 * @return the new array (of the same component type; never {@code null})
 	 */
-	public static <A, O extends A>  A[] addObjectToArray(@Nullable A[] array, @Nullable O obj) {
+	public static <A, O extends A> A[] addObjectToArray(@Nullable A[] array, @Nullable O obj) {
 		Class<?> compType = Object.class;
 		if (array != null) {
 			compType = array.getClass().getComponentType();
diff --git a/spring-core/src/main/java/org/springframework/util/UpdateMessageDigestInputStream.java b/spring-core/src/main/java/org/springframework/util/UpdateMessageDigestInputStream.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2015 the original author or authors.
+ * Copyright 2002-2018 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.
@@ -38,7 +38,7 @@ abstract class UpdateMessageDigestInputStream extends InputStream {
 	 */
 	public void updateMessageDigest(MessageDigest messageDigest) throws IOException {
 		int data;
-		while ((data = read()) != -1){
+		while ((data = read()) != -1) {
 			messageDigest.update((byte) data);
 		}
 	}
@@ -54,7 +54,7 @@ public void updateMessageDigest(MessageDigest messageDigest) throws IOException
 	public void updateMessageDigest(MessageDigest messageDigest, int len) throws IOException {
 		int data;
 		int bytesRead = 0;
-		while (bytesRead < len && (data = read()) != -1){
+		while (bytesRead < len && (data = read()) != -1) {
 			messageDigest.update((byte) data);
 			bytesRead++;
 		}

Original file line number	Diff line number	Diff line change
`@@ -707,7 +707,7 @@ protected void inject(Object bean, @Nullable String beanName, @Nullable Property`
`707`	`707`	`ReflectionUtils.makeAccessible(method);`
`708`	`708`	`method.invoke(bean, arguments);`
`709`	`709`	`}`
`710`		`- catch (InvocationTargetException ex){`
	`710`	`+ catch (InvocationTargetException ex) {`
`711`	`711`	`throw ex.getTargetException();`
`712`	`712`	`}`
`713`	`713`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright 2002-2017 the original author or authors.`
	`2`	`+ * Copyright 2002-2018 the original author or authors.`
`3`	`3`	`*`
`4`	`4`	`* Licensed under the Apache License, Version 2.0 (the "License");`
`5`	`5`	`* you may not use this file except in compliance with the License.`
`@@ -59,7 +59,7 @@ public Object getObject(String key) {`
`59`	`59`	`if (this.beanFactory.containsBean(key)) {`
`60`	`60`	`return this.beanFactory.getBean(key);`
`61`	`61`	`}`
`62`		`- else if (this.scope != null){`
	`62`	`+ else if (this.scope != null) {`
`63`	`63`	`return this.scope.resolveContextualObject(key);`
`64`	`64`	`}`
`65`	`65`	`else {`
Original file line number	Diff line number	Diff line change
`@@ -132,7 +132,7 @@ protected void processKey(ConfigurableListableBeanFactory factory, String key, S`
`132`	`132`	`"': expected 'beanName" + this.beanNameSeparator + "property'");`
`133`	`133`	`}`
`134`	`134`	`String beanName = key.substring(0, separatorIndex);`
`135`		`- String beanProperty = key.substring(separatorIndex+1);`
	`135`	`+ String beanProperty = key.substring(separatorIndex + 1);`
`136`	`136`	`this.beanNames.add(beanName);`
`137`	`137`	`applyPropertyValue(factory, beanName, beanProperty, value);`
`138`	`138`	`if (logger.isDebugEnabled()) {`
Original file line number	Diff line number	Diff line change
`@@ -1122,7 +1122,7 @@ protected BeanWrapper createBeanInstance(String beanName, RootBeanDefinition mbd`
`1122`	`1122`	`return obtainFromSupplier(instanceSupplier, beanName);`
`1123`	`1123`	`}`
`1124`	`1124`
`1125`		`- if (mbd.getFactoryMethodName() != null) {`
	`1125`	`+ if (mbd.getFactoryMethodName() != null) {`
`1126`	`1126`	`return instantiateUsingFactoryMethod(beanName, mbd, args);`
`1127`	`1127`	`}`
`1128`	`1128`
`@@ -1149,7 +1149,7 @@ protected BeanWrapper createBeanInstance(String beanName, RootBeanDefinition mbd`
`1149`	`1149`	`// Candidate constructors for autowiring?`
`1150`	`1150`	`Constructor<?>[] ctors = determineConstructorsFromBeanPostProcessors(beanClass, beanName);`
`1151`	`1151`	`if (ctors != null \|\| mbd.getResolvedAutowireMode() == AUTOWIRE_CONSTRUCTOR \|\|`
`1152`		`- mbd.hasConstructorArgumentValues() \|\| !ObjectUtils.isEmpty(args)) {`
	`1152`	`+ mbd.hasConstructorArgumentValues() \|\| !ObjectUtils.isEmpty(args)) {`
`1153`	`1153`	`return autowireConstructor(beanName, mbd, ctors, args);`
`1154`	`1154`	`}`
`1155`	`1155`
Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ public Object instantiate(RootBeanDefinition bd, @Nullable String beanName, Bean`
`75`	`75`	`(PrivilegedExceptionAction<Constructor<?>>) clazz::getDeclaredConstructor);`
`76`	`76`	`}`
`77`	`77`	`else {`
`78`		`- constructorToUse = clazz.getDeclaredConstructor();`
	`78`	`+ constructorToUse = clazz.getDeclaredConstructor();`
`79`	`79`	`}`
`80`	`80`	`bd.resolvedConstructorOrFactoryMethod = constructorToUse;`
`81`	`81`	`}`