Polishing

(cherry picked from commit ce4e795)

Author: jhoeller

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2015 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.
@@ -200,8 +200,7 @@ private PointcutExpression buildPointcutExpression(ClassLoader classLoader) {
 			pointcutParameters[i] = parser.createPointcutParameter(
 					this.pointcutParameterNames[i], this.pointcutParameterTypes[i]);
 		}
-		return parser.parsePointcutExpression(
-				replaceBooleanOperators(getExpression()),
+		return parser.parsePointcutExpression(replaceBooleanOperators(getExpression()),
 				this.pointcutDeclarationScope, pointcutParameters);
 	}
 

spring-context/src/main/java/org/springframework/cache/Cache.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2015 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.
@@ -17,7 +17,7 @@
 package org.springframework.cache;
 
 /**
- * Interface that defines the common cache operations.
+ * Interface that defines common cache operations.
  *
  * <b>Note:</b> Due to the generic use of caching, it is recommended that
  * implementations allow storage of <tt>null</tt> values (for example to

spring-context/src/main/java/org/springframework/cache/annotation/EnableCaching.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2015 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.
@@ -151,13 +151,12 @@
 	 * Indicate whether subclass-based (CGLIB) proxies are to be created as opposed
 	 * to standard Java interface-based proxies. The default is {@code false}. <strong>
 	 * Applicable only if {@link #mode()} is set to {@link AdviceMode#PROXY}</strong>.
-	 *
 	 * <p>Note that setting this attribute to {@code true} will affect <em>all</em>
-	 * Spring-managed beans requiring proxying, not just those marked with
-	 * {@code @Cacheable}. For example, other beans marked with Spring's
-	 * {@code @Transactional} annotation will be upgraded to subclass proxying at the same
-	 * time. This approach has no negative impact in practice unless one is explicitly
-	 * expecting one type of proxy vs another, e.g. in tests.
+	 * Spring-managed beans requiring proxying, not just those marked with {@code @Cacheable}.
+	 * For example, other beans marked with Spring's {@code @Transactional} annotation will
+	 * be upgraded to subclass proxying at the same time. This approach has no negative
+	 * impact in practice unless one is explicitly expecting one type of proxy vs another,
+	 * e.g. in tests.
 	 */
 	boolean proxyTargetClass() default false;
 
@@ -174,4 +173,5 @@
 	 * The default is {@link Ordered#LOWEST_PRECEDENCE}.
 	 */
 	int order() default Ordered.LOWEST_PRECEDENCE;
+
 }

spring-context/src/main/java/org/springframework/scripting/groovy/GroovyScriptFactory.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2015 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.
@@ -24,7 +24,6 @@
 import groovy.lang.Script;
 import org.codehaus.groovy.control.CompilationFailedException;
 
-import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.BeanClassLoaderAware;
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.BeanFactoryAware;
@@ -99,7 +98,7 @@ public GroovyScriptFactory(String scriptSourceLocator, GroovyObjectCustomizer gr
 	}
 
 
-	public void setBeanFactory(BeanFactory beanFactory) throws BeansException {
+	public void setBeanFactory(BeanFactory beanFactory) {
 		if (beanFactory instanceof ConfigurableListableBeanFactory) {
 			((ConfigurableListableBeanFactory) beanFactory).ignoreDependencyType(MetaClass.class);
 		}

spring-context/src/main/java/org/springframework/scripting/support/ScriptFactoryPostProcessor.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2015 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.
@@ -94,7 +94,7 @@
  *   <property name="message" value="Hello World!"/>
  * </bean>
  *
- * <bean id="groovyMessenger" class="org.springframework.scripting.bsh.GroovyScriptFactory">
+ * <bean id="groovyMessenger" class="org.springframework.scripting.groovy.GroovyScriptFactory">
  *   <constructor-arg value="classpath:mypackage/Messenger.groovy"/>
  *   <property name="message" value="Hello World!"/>
  * &lt;/bean&gt;</pre>
@@ -325,7 +325,7 @@ public Object postProcessBeforeInstantiation(Class<?> beanClass, String beanName
 			if (proxyTargetClass && (language == null || !language.equals("groovy"))) {
 				throw new BeanDefinitionValidationException(
 						"Cannot use proxyTargetClass=true with script beans where language is not 'groovy': '" +
-								language + "'");
+						language + "'");
 			}
 			ts.setRefreshCheckDelay(refreshCheckDelay);
 			return createRefreshableProxy(ts, interfaces, proxyTargetClass);
@@ -346,17 +346,16 @@ public Object postProcessBeforeInstantiation(Class<?> beanClass, String beanName
 	 * @param scriptedObjectBeanName the name of the internal scripted object bean
 	 */
 	protected void prepareScriptBeans(BeanDefinition bd, String scriptFactoryBeanName, String scriptedObjectBeanName) {
-
 		// Avoid recreation of the script bean definition in case of a prototype.
 		synchronized (this.scriptBeanFactory) {
 			if (!this.scriptBeanFactory.containsBeanDefinition(scriptedObjectBeanName)) {
 
-				this.scriptBeanFactory.registerBeanDefinition(scriptFactoryBeanName,
-						createScriptFactoryBeanDefinition(bd));
-				ScriptFactory scriptFactory = this.scriptBeanFactory
-						.getBean(scriptFactoryBeanName, ScriptFactory.class);
-				ScriptSource scriptSource = getScriptSource(scriptFactoryBeanName,
-						scriptFactory.getScriptSourceLocator());
+				this.scriptBeanFactory.registerBeanDefinition(
+						scriptFactoryBeanName, createScriptFactoryBeanDefinition(bd));
+				ScriptFactory scriptFactory =
+						this.scriptBeanFactory.getBean(scriptFactoryBeanName, ScriptFactory.class);
+				ScriptSource scriptSource =
+						getScriptSource(scriptFactoryBeanName, scriptFactory.getScriptSourceLocator());
 				Class<?>[] interfaces = scriptFactory.getScriptInterfaces();
 
 				Class<?>[] scriptedInterfaces = interfaces;
@@ -365,8 +364,8 @@ protected void prepareScriptBeans(BeanDefinition bd, String scriptFactoryBeanNam
 					scriptedInterfaces = ObjectUtils.addObjectToArray(interfaces, configInterface);
 				}
 
-				BeanDefinition objectBd = createScriptedObjectBeanDefinition(bd, scriptFactoryBeanName, scriptSource,
-						scriptedInterfaces);
+				BeanDefinition objectBd = createScriptedObjectBeanDefinition(
+						bd, scriptFactoryBeanName, scriptSource, scriptedInterfaces);
 				long refreshCheckDelay = resolveRefreshCheckDelay(bd);
 				if (refreshCheckDelay >= 0) {
 					objectBd.setScope(BeanDefinition.SCOPE_PROTOTYPE);
@@ -569,7 +568,7 @@ protected Object createRefreshableProxy(TargetSource ts, Class<?>[] interfaces,
 		proxyFactory.setInterfaces(interfaces);
 		if (proxyTargetClass) {
 			classLoader = null;  // force use of Class.getClassLoader()
-			proxyFactory.setProxyTargetClass(proxyTargetClass);
+			proxyFactory.setProxyTargetClass(true);
 		}
 
 		DelegatingIntroductionInterceptor introduction = new DelegatingIntroductionInterceptor(ts);

spring-context/src/test/java/org/springframework/beans/factory/support/InjectAnnotationAutowireContextTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2015 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.
@@ -24,7 +24,6 @@
 import javax.inject.Named;
 import javax.inject.Qualifier;
 
-import static org.junit.Assert.*;
 import org.junit.Test;
 
 import org.springframework.aop.scope.ScopedProxyUtils;
@@ -36,6 +35,8 @@
 import org.springframework.context.annotation.AnnotationConfigUtils;
 import org.springframework.context.support.GenericApplicationContext;
 
+import static org.junit.Assert.*;
+
 /**
  * Integration tests for handling JSR-303 {@link javax.inject.Qualifier} annotations.
  *
@@ -666,27 +667,27 @@ public QualifiedPerson(String name) {
 	@Target({ElementType.FIELD, ElementType.PARAMETER, ElementType.TYPE})
 	@Retention(RetentionPolicy.RUNTIME)
 	@Qualifier
-	public static @interface TestQualifier {
+	public @interface TestQualifier {
 	}
 
 
 	@Target(ElementType.FIELD)
 	@Retention(RetentionPolicy.RUNTIME)
 	@Qualifier
-	public static @interface TestQualifierWithDefaultValue {
+	public @interface TestQualifierWithDefaultValue {
 
-		public abstract String value() default "default";
+		String value() default "default";
 	}
 
 
 	@Target(ElementType.FIELD)
 	@Retention(RetentionPolicy.RUNTIME)
 	@Qualifier
-	public static @interface TestQualifierWithMultipleAttributes {
+	public @interface TestQualifierWithMultipleAttributes {
 
-		public abstract String value() default "default";
+		String value() default "default";
 
-		public abstract int number();
+		int number();
 	}
 
 }

spring-core/src/main/java/org/springframework/util/ReflectionUtils.java

@@ -91,7 +91,8 @@ public static Field findField(Class<?> clazz, String name, Class<?> type) {
 		while (!Object.class.equals(searchType) && searchType != null) {
 			Field[] fields = searchType.getDeclaredFields();
 			for (Field field : fields) {
-				if ((name == null || name.equals(field.getName())) && (type == null || type.equals(field.getType()))) {
+				if ((name == null || name.equals(field.getName())) &&
+						(type == null || type.equals(field.getType()))) {
 					return field;
 				}
 			}
@@ -424,7 +425,8 @@ public static boolean isCglibRenamedMethod(Method renamedMethod) {
 	 * @see java.lang.reflect.Field#setAccessible
 	 */
 	public static void makeAccessible(Field field) {
-		if ((!Modifier.isPublic(field.getModifiers()) || !Modifier.isPublic(field.getDeclaringClass().getModifiers()) ||
+		if ((!Modifier.isPublic(field.getModifiers()) ||
+				!Modifier.isPublic(field.getDeclaringClass().getModifiers()) ||
 				Modifier.isFinal(field.getModifiers())) && !field.isAccessible()) {
 			field.setAccessible(true);
 		}

spring-core/src/test/java/org/springframework/core/GenericTypeResolverTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2015 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.
@@ -165,11 +165,11 @@ public void getGenericsOnArrayFromParamCannotBeResolved() throws Exception {
 	public void getGenericsOnArrayFromReturnCannotBeResolved() throws Exception {
 		// SPR-11044
 		Class<?> resolved = GenericTypeResolver.resolveReturnType(
-				WithArrayBase.class.getDeclaredMethod("array", Object[].class),
-				WithArray.class);
+				WithArrayBase.class.getDeclaredMethod("array", Object[].class), WithArray.class);
 		assertThat(resolved, equalTo((Class) Object[].class));
 	}
 
+
 	public interface MyInterfaceType<T> {
 	}
 

spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/CallMetaDataProviderFactory.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2015 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.
@@ -20,7 +20,6 @@
 import java.sql.SQLException;
 import java.util.Arrays;
 import java.util.List;
-
 import javax.sql.DataSource;
 
 import org.apache.commons.logging.Log;
@@ -32,16 +31,14 @@
 import org.springframework.jdbc.support.MetaDataAccessException;
 
 /**
- * Factory used to create a {@link CallMetaDataProvider} implementation based on the type of databse being used.
+ * Factory used to create a {@link CallMetaDataProvider} implementation
+ * based on the type of database being used.
  *
  * @author Thomas Risberg
  * @since 2.5
  */
 public class CallMetaDataProviderFactory {
 
-	/** Logger */
-	private static final Log logger = LogFactory.getLog(CallMetaDataProviderFactory.class);
-
 	/** List of supported database products for procedure calls */
 	public static final List<String> supportedDatabaseProductsForProcedures = Arrays.asList(
 			"Apache Derby",
@@ -52,6 +49,7 @@ public class CallMetaDataProviderFactory {
 			"PostgreSQL",
 			"Sybase"
 		);
+
 	/** List of supported database products for function calls */
 	public static final List<String> supportedDatabaseProductsForFunctions = Arrays.asList(
 			"MySQL",
@@ -60,10 +58,13 @@ public class CallMetaDataProviderFactory {
 			"PostgreSQL"
 		);
 
+	private static final Log logger = LogFactory.getLog(CallMetaDataProviderFactory.class);
+
+
 	/**
-	 * Create a CallMetaDataProvider based on the database metedata
-	 * @param dataSource used to retrieve metedata
-	 * @param context the class that holds configuration and metedata
+	 * Create a CallMetaDataProvider based on the database metadata
+	 * @param dataSource used to retrieve metadata
+	 * @param context the class that holds configuration and metadata
 	 * @return instance of the CallMetaDataProvider implementation to be used
 	 */
 	static public CallMetaDataProvider createMetaDataProvider(DataSource dataSource, final CallMetaDataContext context) {
@@ -124,17 +125,16 @@ else if ("Microsoft SQL Server".equals(databaseProductName)) {
 					}
 					provider.initializeWithMetaData(databaseMetaData);
 					if (accessProcedureColumnMetaData) {
-						provider.initializeWithProcedureColumnMetaData(
-								databaseMetaData, context.getCatalogName(), context.getSchemaName(), context.getProcedureName());
+						provider.initializeWithProcedureColumnMetaData(databaseMetaData,
+								context.getCatalogName(), context.getSchemaName(), context.getProcedureName());
 					}
 					return provider;
 				}
 			});
 		}
 		catch (MetaDataAccessException ex) {
-			throw new DataAccessResourceFailureException("Error retreiving database metadata", ex);
+			throw new DataAccessResourceFailureException("Error retrieving database metadata", ex);
 		}
-
 	}
 
 }