From eafaaa5cb81dcf13daf102d5ba1bde73c4875f4d Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Wed, 12 Oct 2016 17:11:04 +0200 Subject: [PATCH] Polishing --- .../cache/annotation/AnnotationCacheOperationSource.java | 9 ++++----- .../messaging/support/MessageHeaderAccessor.java | 2 +- .../annotation/JtaTransactionAnnotationParser.java | 3 ++- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/spring-context/src/main/java/org/springframework/cache/annotation/AnnotationCacheOperationSource.java b/spring-context/src/main/java/org/springframework/cache/annotation/AnnotationCacheOperationSource.java index f685cc2b67..cbb4570f62 100644 --- a/spring-context/src/main/java/org/springframework/cache/annotation/AnnotationCacheOperationSource.java +++ b/spring-context/src/main/java/org/springframework/cache/annotation/AnnotationCacheOperationSource.java @@ -43,8 +43,7 @@ import org.springframework.util.Assert; * @since 3.1 */ @SuppressWarnings("serial") -public class AnnotationCacheOperationSource extends AbstractFallbackCacheOperationSource - implements Serializable { +public class AnnotationCacheOperationSource extends AbstractFallbackCacheOperationSource 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}. @@ -185,10 +185,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 getCacheOperations(CacheAnnotationParser parser); } diff --git a/spring-messaging/src/main/java/org/springframework/messaging/support/MessageHeaderAccessor.java b/spring-messaging/src/main/java/org/springframework/messaging/support/MessageHeaderAccessor.java index b67cae665b..9a4fac0165 100644 --- a/spring-messaging/src/main/java/org/springframework/messaging/support/MessageHeaderAccessor.java +++ b/spring-messaging/src/main/java/org/springframework/messaging/support/MessageHeaderAccessor.java @@ -567,7 +567,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. *

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 */ diff --git a/spring-tx/src/main/java/org/springframework/transaction/annotation/JtaTransactionAnnotationParser.java b/spring-tx/src/main/java/org/springframework/transaction/annotation/JtaTransactionAnnotationParser.java index 5c667b967b..9cb041b272 100644 --- a/spring-tx/src/main/java/org/springframework/transaction/annotation/JtaTransactionAnnotationParser.java +++ b/spring-tx/src/main/java/org/springframework/transaction/annotation/JtaTransactionAnnotationParser.java @@ -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); }