Polishing

(cherry picked from commit 27c2e8c8)

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

@@ -195,7 +195,7 @@ public class SpringCacheAnnotationParser implements CacheAnnotationParser, Seria
 	}
 
 	private <A extends Annotation> Collection<A> getAnnotations(AnnotatedElement ae, Class<A> annotationType) {
-		Collection<A> anns = new ArrayList<A>(2);
+		Collection<A> anns = new ArrayList<A>(1);
 
 		// look at raw annotation
 		A ann = ae.getAnnotation(annotationType);
@@ -211,7 +211,7 @@ public class SpringCacheAnnotationParser implements CacheAnnotationParser, Seria
 			}
 		}
 
-		return (anns.isEmpty() ? null : anns);
+		return (!anns.isEmpty() ? anns : null);
 	}
 
 	/**

spring-context/src/main/java/org/springframework/context/annotation/BeanAnnotationHelper.java

 /*
- * Copyright 2002-2011 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.
@@ -29,17 +29,18 @@ import org.springframework.core.annotation.AnnotationUtils;
 class BeanAnnotationHelper {
 
 	/**
-	 * Return whether the given method is annotated directly or indirectly with @Bean.
+	 * Return whether the given method is directly or indirectly annotated with
+	 * the {@link Bean} annotation.
 	 */
 	public static boolean isBeanAnnotated(Method method) {
-		return AnnotationUtils.findAnnotation(method, Bean.class) != null;
+		return (AnnotationUtils.findAnnotation(method, Bean.class) != null);
 	}
 
 	public static String determineBeanNameFor(Method beanMethod) {
-		// by default the bean name is the name of the @Bean-annotated method
+		// By default, the bean name is the name of the @Bean-annotated method
 		String beanName = beanMethod.getName();
 
-		// check to see if the user has explicitly set the bean name
+		// Check to see if the user has explicitly set a custom bean name...
 		Bean bean = AnnotationUtils.findAnnotation(beanMethod, Bean.class);
 		if (bean != null && bean.name().length > 0) {
 			beanName = bean.name()[0];

spring-context/src/test/java/org/springframework/context/annotation/ComponentScanAnnotationIntegrationTests.java

@@ -147,7 +147,7 @@ public class ComponentScanAnnotationIntegrationTests {
 	@Test
 	public void withCustomBeanNameGenerator() {
 		AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext();
-		ctx.register(ComponentScanWithBeanNameGenenerator.class);
+		ctx.register(ComponentScanWithBeanNameGenerator.class);
 		ctx.refresh();
 		assertThat(ctx.containsBean("custom_fooServiceImpl"), is(true));
 		assertThat(ctx.containsBean("fooServiceImpl"), is(false));
@@ -241,7 +241,8 @@ public class ComponentScanAnnotationIntegrationTests {
 	@ComponentScan
 	@Retention(RetentionPolicy.RUNTIME)
 	@Target(ElementType.TYPE)
-	public static @interface ComposedConfiguration {
+	public @interface ComposedConfiguration {
+
 		String[] basePackages() default {};
 	}
 
@@ -253,8 +254,9 @@ public class ComponentScanAnnotationIntegrationTests {
 
 
 @Configuration
-@ComponentScan(basePackageClasses=example.scannable._package.class)
+@ComponentScan(basePackageClasses = example.scannable._package.class)
 class ComponentScanAnnotatedConfig {
+
 	@Bean
 	public TestBean testBean() {
 		return new TestBean();
@@ -264,6 +266,7 @@ class ComponentScanAnnotatedConfig {
 @Configuration
 @ComponentScan("example.scannable")
 class ComponentScanAnnotatedConfig_WithValueAttribute {
+
 	@Bean
 	public TestBean testBean() {
 		return new TestBean();
@@ -272,13 +275,16 @@ class ComponentScanAnnotatedConfig_WithValueAttribute {
 
 @Configuration
 @ComponentScan
-class ComponentScanWithNoPackagesConfig {}
+class ComponentScanWithNoPackagesConfig {
+}
 
 @Configuration
-@ComponentScan(basePackages="example.scannable", nameGenerator=MyBeanNameGenerator.class)
-class ComponentScanWithBeanNameGenenerator {}
+@ComponentScan(basePackages = "example.scannable", nameGenerator = MyBeanNameGenerator.class)
+class ComponentScanWithBeanNameGenerator {
+}
 
 class MyBeanNameGenerator extends AnnotationBeanNameGenerator {
+
 	@Override
 	public String generateBeanName(BeanDefinition definition, BeanDefinitionRegistry registry) {
 		return "custom_" + super.generateBeanName(definition, registry);
@@ -286,10 +292,12 @@ class MyBeanNameGenerator extends AnnotationBeanNameGenerator {
 }
 
 @Configuration
-@ComponentScan(basePackages="example.scannable_scoped", scopeResolver=MyScopeMetadataResolver.class)
-class ComponentScanWithScopeResolver {}
+@ComponentScan(basePackages = "example.scannable_scoped", scopeResolver = MyScopeMetadataResolver.class)
+class ComponentScanWithScopeResolver {
+}
 
 class MyScopeMetadataResolver extends AnnotationScopeMetadataResolver {
+
 	MyScopeMetadataResolver() {
 		this.scopeAnnotationType = MyScope.class;
 	}
@@ -297,13 +305,14 @@ class MyScopeMetadataResolver extends AnnotationScopeMetadataResolver {
 
 @Configuration
 @ComponentScan(
-		basePackages="org.springframework.context.annotation",
-		useDefaultFilters=false,
+		basePackages = "org.springframework.context.annotation",
+		useDefaultFilters = false,
 		includeFilters = @Filter(type = FilterType.CUSTOM, classes = ComponentScanParserTests.CustomTypeFilter.class),
 		// exclude this class from scanning since it's in the scanned package
 		excludeFilters = @Filter(type = FilterType.ASSIGNABLE_TYPE, classes = ComponentScanWithCustomTypeFilter.class),
 		lazyInit = true)
 class ComponentScanWithCustomTypeFilter {
+
 	@Bean
 	@SuppressWarnings({ "rawtypes", "serial", "unchecked" })
 	public static CustomAutowireConfigurer customAutowireConfigurer() {
@@ -318,30 +327,30 @@ class ComponentScanWithCustomTypeFilter {
 }
 
 @Configuration
-@ComponentScan(basePackages="example.scannable",
-		scopedProxy=ScopedProxyMode.INTERFACES,
-		useDefaultFilters=false,
+@ComponentScan(basePackages = "example.scannable",
+		scopedProxy = ScopedProxyMode.INTERFACES,
+		useDefaultFilters = false,
 		includeFilters = @Filter(type = FilterType.ASSIGNABLE_TYPE, classes = ScopedProxyTestBean.class))
 class ComponentScanWithScopedProxy {}
 
 @Configuration
-@ComponentScan(basePackages="example.scannable",
-		scopedProxy=ScopedProxyMode.INTERFACES,
-		useDefaultFilters=false,
-		includeFilters=@Filter(type=FilterType.REGEX, pattern ="((?:[a-z.]+))ScopedProxyTestBean"))
+@ComponentScan(basePackages = "example.scannable",
+		scopedProxy = ScopedProxyMode.INTERFACES,
+		useDefaultFilters = false,
+		includeFilters = @Filter(type=FilterType.REGEX, pattern = "((?:[a-z.]+))ScopedProxyTestBean"))
 class ComponentScanWithScopedProxyThroughRegex {}
 
 @Configuration
-@ComponentScan(basePackages="example.scannable",
-		scopedProxy=ScopedProxyMode.INTERFACES,
-		useDefaultFilters=false,
-		includeFilters=@Filter(type=FilterType.ASPECTJ, pattern ="*..ScopedProxyTestBean"))
+@ComponentScan(basePackages = "example.scannable",
+		scopedProxy = ScopedProxyMode.INTERFACES,
+		useDefaultFilters = false,
+		includeFilters = @Filter(type=FilterType.ASPECTJ, pattern = "*..ScopedProxyTestBean"))
 class ComponentScanWithScopedProxyThroughAspectJPattern {}
 
 @Configuration
-@ComponentScan(basePackages="example.scannable",
-		useDefaultFilters=false,
-		includeFilters={
+@ComponentScan(basePackages = "example.scannable",
+		useDefaultFilters = false,
+		includeFilters = {
 			@Filter(CustomStereotype.class),
 			@Filter(CustomComponent.class)
 		}
@@ -349,15 +358,15 @@ class ComponentScanWithScopedProxyThroughAspectJPattern {}
 class ComponentScanWithMultipleAnnotationIncludeFilters1 {}
 
 @Configuration
-@ComponentScan(basePackages="example.scannable",
-		useDefaultFilters=false,
-		includeFilters=@Filter({CustomStereotype.class, CustomComponent.class})
+@ComponentScan(basePackages = "example.scannable",
+		useDefaultFilters = false,
+		includeFilters = @Filter({CustomStereotype.class, CustomComponent.class})
 	)
 class ComponentScanWithMultipleAnnotationIncludeFilters2 {}
 
 @Configuration
 @ComponentScan(
-		value="example.scannable",
-		basePackages="example.scannable",
-		basePackageClasses=example.scannable._package.class)
+		value = "example.scannable",
+		basePackages = "example.scannable",
+		basePackageClasses = example.scannable._package.class)
 class ComponentScanWithBasePackagesAndValueAlias {}

spring-context/src/test/java/org/springframework/context/annotation/ComponentScanAnnotationTests.java

 /*
- * Copyright 2002-2014 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.
@@ -44,7 +44,7 @@ public class ComponentScanAnnotationTests {
 
 @Configuration
 @ComponentScan(
-	basePackageClasses={TestBean.class},
+	basePackageClasses = TestBean.class,
 	nameGenerator = DefaultBeanNameGenerator.class,
 	scopedProxy = ScopedProxyMode.NO,
 	scopeResolver = AnnotationScopeMetadataResolver.class,
@@ -61,6 +61,6 @@ public class ComponentScanAnnotationTests {
 class MyConfig {
 }
 
-@ComponentScan(basePackageClasses=example.scannable.NamedComponent.class)
+@ComponentScan(basePackageClasses = example.scannable.NamedComponent.class)
 class SimpleConfig {
 }

spring-context/src/test/java/org/springframework/context/annotation/ComponentScanParserBeanDefinitionDefaultsTests.java

 /*
- * 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.
@@ -122,7 +122,7 @@ public class ComponentScanParserBeanDefinitionDefaultsTests {
 			context.refresh();
 			fail("expected exception due to multiple matches for byType autowiring");
 		}
-		catch (UnsatisfiedDependencyException e) {
+		catch (UnsatisfiedDependencyException ex) {
 			// expected
 		}
 	}
@@ -161,7 +161,7 @@ public class ComponentScanParserBeanDefinitionDefaultsTests {
 			context.refresh();
 			fail("expected exception due to dependency check");
 		}
-		catch (UnsatisfiedDependencyException e) {
+		catch (UnsatisfiedDependencyException ex) {
 			// expected
 		}
 	}
@@ -230,7 +230,6 @@ public class ComponentScanParserBeanDefinitionDefaultsTests {
 
 		private boolean destroyed;
 
-
 		public DefaultsTestBean() {
 			INIT_COUNT++;
 		}

spring-context/src/test/java/org/springframework/context/annotation/ComponentScanParserScopedProxyTests.java

@@ -42,11 +42,13 @@ public class ComponentScanParserScopedProxyTests {
 	@Rule
 	public final ExpectedException exception = ExpectedException.none();
 
+
 	@Test
 	public void testDefaultScopedProxy() {
 		ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext(
 				"org/springframework/context/annotation/scopedProxyDefaultTests.xml");
 		context.getBeanFactory().registerScope("myScope", new SimpleMapScope());
+
 		ScopedProxyTestBean bean = (ScopedProxyTestBean) context.getBean("scopedProxyTestBean");
 		// should not be a proxy
 		assertFalse(AopUtils.isAopProxy(bean));
@@ -58,6 +60,7 @@ public class ComponentScanParserScopedProxyTests {
 		ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext(
 				"org/springframework/context/annotation/scopedProxyNoTests.xml");
 		context.getBeanFactory().registerScope("myScope", new SimpleMapScope());
+
 		ScopedProxyTestBean bean = (ScopedProxyTestBean) context.getBean("scopedProxyTestBean");
 		// should not be a proxy
 		assertFalse(AopUtils.isAopProxy(bean));
@@ -69,6 +72,7 @@ public class ComponentScanParserScopedProxyTests {
 		ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext(
 				"org/springframework/context/annotation/scopedProxyInterfacesTests.xml");
 		context.getBeanFactory().registerScope("myScope", new SimpleMapScope());
+
 		// should cast to the interface
 		FooService bean = (FooService) context.getBean("scopedProxyTestBean");
 		// should be dynamic proxy
@@ -86,6 +90,7 @@ public class ComponentScanParserScopedProxyTests {
 		ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext(
 				"org/springframework/context/annotation/scopedProxyTargetClassTests.xml");
 		context.getBeanFactory().registerScope("myScope", new SimpleMapScope());
+
 		ScopedProxyTestBean bean = (ScopedProxyTestBean) context.getBean("scopedProxyTestBean");
 		// should be a class-based proxy
 		assertTrue(AopUtils.isCglibProxy(bean));
@@ -103,6 +108,7 @@ public class ComponentScanParserScopedProxyTests {
 		exception.expect(BeanDefinitionParsingException.class);
 		exception.expectMessage(containsString("Cannot define both 'scope-resolver' and 'scoped-proxy' on <component-scan> tag"));
 		exception.expectMessage(containsString("Offending resource: class path resource [org/springframework/context/annotation/scopedProxyInvalidConfigTests.xml]"));
+
 		new ClassPathXmlApplicationContext("org/springframework/context/annotation/scopedProxyInvalidConfigTests.xml");
 	}
 

spring-context/src/test/java/org/springframework/context/annotation/ComponentScanParserTests.java

 /*
- * Copyright 2002-2014 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.
@@ -145,9 +145,9 @@ public class ComponentScanParserTests {
 	}
 
 
-	@Target({ ElementType.TYPE, ElementType.FIELD })
+	@Target({ElementType.TYPE, ElementType.FIELD})
 	@Retention(RetentionPolicy.RUNTIME)
-	public static @interface CustomAnnotation {
+	public @interface CustomAnnotation {
 	}
 
 

spring-context/src/test/java/org/springframework/context/annotation/ComponentScanParserWithUserDefinedStrategiesTests.java

 /*
- * 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.
@@ -53,7 +53,7 @@ public class ComponentScanParserWithUserDefinedStrategiesTests {
 					"org/springframework/context/annotation/invalidConstructorNameGeneratorTests.xml");
 			fail("should have failed: no-arg constructor is required");
 		}
-		catch (BeansException e) {
+		catch (BeansException ex) {
 			// expected
 		}
 	}
@@ -65,9 +65,9 @@ public class ComponentScanParserWithUserDefinedStrategiesTests {
 					"org/springframework/context/annotation/invalidClassNameScopeResolverTests.xml");
 			fail("should have failed: no such class");
 		}
-		catch (BeansException e) {
+		catch (BeansException ex) {
 			// expected
 		}
 	}
 
-}
\ No newline at end of file
+}

spring-core/src/main/java/org/springframework/core/annotation/SynthesizedAnnotationInvocationHandler.java

@@ -60,6 +60,7 @@ class SynthesizedAnnotationInvocationHandler implements InvocationHandler {
 		this.attributeExtractor = attributeExtractor;
 	}
 
+
 	@Override
 	public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
 		if (isEqualsMethod(method)) {
@@ -75,8 +76,8 @@ class SynthesizedAnnotationInvocationHandler implements InvocationHandler {
 			return annotationType();
 		}
 		if (!isAttributeMethod(method)) {
-			String msg = String.format("Method [%s] is unsupported for synthesized annotation type [%s]", method,
-				annotationType());
+			String msg = String.format("Method [%s] is unsupported for synthesized annotation type [%s]",
+					method, annotationType());
 			throw new AnnotationConfigurationException(msg);
 		}
 		return getAttributeValue(method);
@@ -92,9 +93,9 @@ class SynthesizedAnnotationInvocationHandler implements InvocationHandler {
 		if (value == null) {
 			value = this.attributeExtractor.getAttributeValue(attributeMethod);
 			if (value == null) {
-				throw new IllegalStateException(String.format(
-					"%s returned null for attribute name [%s] from attribute source [%s]",
-					this.attributeExtractor.getClass().getName(), attributeName, this.attributeExtractor.getSource()));
+				String msg = String.format("%s returned null for attribute name [%s] from attribute source [%s]",
+						this.attributeExtractor.getClass().getName(), attributeName, this.attributeExtractor.getSource());
+				throw new IllegalStateException(msg);
 			}
 
 			// Synthesize nested annotations before returning them.
@@ -200,7 +201,6 @@ class SynthesizedAnnotationInvocationHandler implements InvocationHandler {
 	 * in Spring's {@link ObjectUtils} because those hash code generation
 	 * algorithms do not comply with the requirements specified in
 	 * {@link Annotation#hashCode()}.
-	 *
 	 * @param array the array to compute the hash code for
 	 */
 	private int hashCodeForArray(Object array) {