From 97f779674f282225ab102501e690e765b382c735 Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Wed, 25 Mar 2015 15:28:30 +0100 Subject: [PATCH] Polishing --- .../support/DefaultListableBeanFactory.java | 2 +- .../cache/interceptor/CacheResolver.java | 7 +++---- .../annotation/HttpEntityMethodProcessor.java | 14 ++++++++------ 3 files changed, 12 insertions(+), 11 deletions(-) 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 index 9f71c788cb..838eeb0284 100644 --- 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 @@ -813,7 +813,7 @@ public class DefaultListableBeanFactory extends AbstractAutowireCapableBeanFacto // e.g. was ROLE_APPLICATION, now overriding with ROLE_SUPPORT or ROLE_INFRASTRUCTURE if (this.logger.isWarnEnabled()) { this.logger.warn("Overriding user-defined bean definition for bean '" + beanName + - " with a framework-generated bean definition ': replacing [" + + "' with a framework-generated bean definition: replacing [" + oldBeanDefinition + "] with [" + beanDefinition + "]"); } } diff --git a/spring-context/src/main/java/org/springframework/cache/interceptor/CacheResolver.java b/spring-context/src/main/java/org/springframework/cache/interceptor/CacheResolver.java index 55534e888e..4bf2fd02e6 100644 --- a/spring-context/src/main/java/org/springframework/cache/interceptor/CacheResolver.java +++ b/spring-context/src/main/java/org/springframework/cache/interceptor/CacheResolver.java @@ -1,5 +1,5 @@ /* - * 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. @@ -23,7 +23,7 @@ import org.springframework.cache.Cache; /** * Determine the {@link Cache} instance(s) to use for an intercepted method invocation. * - *

Implementations MUST be thread-safe. + *

Implementations must be thread-safe. * * @author Stephane Nicoll * @since 4.1 @@ -32,9 +32,8 @@ public interface CacheResolver { /** * Return the cache(s) to use for the specified invocation. - * * @param context the context of the particular invocation - * @return the cache(s) to use (never null) + * @return the cache(s) to use (never {@code null}) */ Collection resolveCaches(CacheOperationInvocationContext context); diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/HttpEntityMethodProcessor.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/HttpEntityMethodProcessor.java index 27989f45a3..26d06eff99 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/HttpEntityMethodProcessor.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/HttpEntityMethodProcessor.java @@ -1,5 +1,5 @@ /* - * 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. @@ -58,25 +58,27 @@ public class HttpEntityMethodProcessor extends AbstractMessageConverterMethodPro public HttpEntityMethodProcessor(List> messageConverters, ContentNegotiationManager contentNegotiationManager) { + super(messageConverters, contentNegotiationManager); } public HttpEntityMethodProcessor(List> messageConverters, ContentNegotiationManager contentNegotiationManager, List responseBodyAdvice) { + super(messageConverters, contentNegotiationManager, responseBodyAdvice); } @Override public boolean supportsParameter(MethodParameter parameter) { - return HttpEntity.class.equals(parameter.getParameterType()) || - RequestEntity.class.equals(parameter.getParameterType()); + return (HttpEntity.class.equals(parameter.getParameterType()) || + RequestEntity.class.equals(parameter.getParameterType())); } @Override public boolean supportsReturnType(MethodParameter returnType) { - return HttpEntity.class.isAssignableFrom(returnType.getParameterType()) && - !RequestEntity.class.isAssignableFrom(returnType.getParameterType()); + return (HttpEntity.class.isAssignableFrom(returnType.getParameterType()) && + !RequestEntity.class.isAssignableFrom(returnType.getParameterType())); } @Override @@ -143,7 +145,7 @@ public class HttpEntityMethodProcessor extends AbstractMessageConverterMethodPro // Try even with null body. ResponseBodyAdvice could get involved. writeWithMessageConverters(body, returnType, inputMessage, outputMessage); - // Ensure headers are flushed even if no body was written + // Ensure headers are flushed even if no body was written. outputMessage.getBody(); }