Polishing

(cherry picked from commit eafaaa5)

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2014 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.
@@ -43,8 +43,7 @@ import org.springframework.util.Assert;
  * @since 3.1
  */
 @SuppressWarnings("serial")
-public class AnnotationCacheOperationSource extends AbstractFallbackCacheOperationSource
+public class AnnotationCacheOperationSource extends AbstractFallbackCacheOperationSource implements Serializable {
-		implements Serializable {
 
 	private final boolean publicMethodsOnly;
 
@@ -177,6 +176,7 @@ public class AnnotationCacheOperationSource extends AbstractFallbackCacheOperati
 		return this.annotationParsers.hashCode();
 	}
 
+
 	/**
 	 * Callback interface providing {@link CacheOperation} instance(s) based on
 	 * a given {@link CacheAnnotationParser}.
@@ -184,10 +184,9 @@ public class AnnotationCacheOperationSource extends AbstractFallbackCacheOperati
 	protected interface CacheOperationProvider {
 
 		/**
-		 * Returns the {@link CacheOperation} instance(s) provided by the specified parser.
+		 * Return the {@link CacheOperation} instance(s) provided by the specified parser.
-		 *
 		 * @param parser the parser to use
-		 * @return the cache operations or {@code null} if none is found
+		 * @return the cache operations, or {@code null} if none found
 		 */
 		Collection<CacheOperation> getCacheOperations(CacheAnnotationParser parser);
 	}

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 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.
@@ -25,19 +25,20 @@ import java.lang.annotation.Target;
 
 /**
  * Indicates that a bean should be given preference when multiple candidates
- * are qualified to autowire a single-valued dependency. If exactly one 'primary'
+ * are qualified to autowire a single-valued dependency. If exactly one
- * bean exists among the candidates, it will be the autowired value. This annotation
+ * 'primary' bean exists among the candidates, it will be the autowired value.
- * is semantically equivalent to the {@code <bean>} element's {@code primary} attribute
- * in Spring XML.
  *
- * <p>May be used on any class directly or indirectly annotated with @{@link
+ * <p>This annotation is semantically equivalent to the {@code <bean>} element's
- * org.springframework.stereotype.Component Component} or on methods annotated
+ * {@code primary} attribute in Spring XML.
- * with @{@link Bean}.
+ *
+ * <p>May be used on any class directly or indirectly annotated with
+ * {@code @Component} or on methods annotated with @{@link Bean}.
  *
  * <h2>Example</h2>
  * <pre class="code">
  * &#064;Component
  * public class FooService {
+ *
  *     private FooRepository fooRepository;
  *
  *     &#064;Autowired
@@ -48,6 +49,7 @@ import java.lang.annotation.Target;
  *
  * &#064;Component
  * public class JdbcFooRepository {
+ *
  *     public JdbcFooService(DataSource dataSource) {
  *         // ...
  *     }
@@ -56,20 +58,21 @@ import java.lang.annotation.Target;
  * &#064;Primary
  * &#064;Component
  * public class HibernateFooRepository {
+ *
  *     public HibernateFooService(SessionFactory sessionFactory) {
  *         // ...
  *     }
  * }
  * </pre>
  *
- * <p>Because {@code HibernateFooRepository} is marked with {@code @Primary}, it will
+ * <p>Because {@code HibernateFooRepository} is marked with {@code @Primary},
- * be injected preferentially over the jdbc-based variant assuming both are present as
+ * it will be injected preferentially over the jdbc-based variant assuming both
- * beans within the same Spring application context, which is often the case when
+ * are present as beans within the same Spring application context, which is
- * component-scanning is applied liberally.
+ * often the case when component-scanning is applied liberally.
  *
  * <p>Note that using {@code @Primary} at the class level has no effect unless
- * component-scanning is being used. If a {@code @Primary}-annotated class is declared via
+ * component-scanning is being used. If a {@code @Primary}-annotated class is
- * XML, {@code @Primary} annotation metadata is ignored, and
+ * declared via XML, {@code @Primary} annotation metadata is ignored, and
  * {@code <bean primary="true|false"/>} is respected instead.
  *
  * @author Chris Beams

spring-messaging/src/main/java/org/springframework/messaging/support/MessageHeaderAccessor.java

@@ -566,7 +566,7 @@ public class MessageHeaderAccessor {
 	 * of the given {@code Message}, or {@code null} if that's not available or if
 	 * its type does not match the required type.
 	 * <p>This is for cases where the existence of an accessor is strongly expected
-	 * (to be followed up with an assertion) or will created if not provided.
+	 * (followed up with an assertion) or where an accessor will be created otherwise.
 	 * @return an accessor instance of the specified type, or {@code null} if none
 	 * @since 4.1
 	 */

spring-tx/src/main/java/org/springframework/transaction/annotation/JtaTransactionAnnotationParser.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.
@@ -39,7 +39,8 @@ public class JtaTransactionAnnotationParser implements TransactionAnnotationPars
 
 	@Override
 	public TransactionAttribute parseTransactionAnnotation(AnnotatedElement ae) {
-		AnnotationAttributes attributes = AnnotatedElementUtils.getMergedAnnotationAttributes(ae, javax.transaction.Transactional.class);
+		AnnotationAttributes attributes =
+				AnnotatedElementUtils.getMergedAnnotationAttributes(ae, javax.transaction.Transactional.class);
 		if (attributes != null) {
 			return parseTransactionAnnotation(attributes);
 		}