From 35e37f6b60c7ad3b212b959a8257538accbe6272 Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Mon, 20 Feb 2017 23:15:05 +0100 Subject: [PATCH] Polishing --- .../concurrent/SettableListenableFuture.java | 5 ++- .../web/filter/ShallowEtagHeaderFilter.java | 31 +++++++++++-------- ...etResponseMethodArgumentResolverTests.java | 15 ++++----- 3 files changed, 28 insertions(+), 23 deletions(-) diff --git a/spring-core/src/main/java/org/springframework/util/concurrent/SettableListenableFuture.java b/spring-core/src/main/java/org/springframework/util/concurrent/SettableListenableFuture.java index 5f8b29cfe7..411419f6c9 100644 --- a/spring-core/src/main/java/org/springframework/util/concurrent/SettableListenableFuture.java +++ b/spring-core/src/main/java/org/springframework/util/concurrent/SettableListenableFuture.java @@ -24,9 +24,8 @@ import java.util.concurrent.TimeoutException; import org.springframework.util.Assert; /** - * A {@link org.springframework.util.concurrent.ListenableFuture ListenableFuture} - * whose value can be set via {@link #set(T)} or {@link #setException(Throwable)}. - * It may also be cancelled. + * A {@link ListenableFuture} whose value can be set via {@link #set(Object)} + * or {@link #setException(Throwable)}. It may also get cancelled. * *

Inspired by {@code com.google.common.util.concurrent.SettableFuture}. * diff --git a/spring-web/src/main/java/org/springframework/web/filter/ShallowEtagHeaderFilter.java b/spring-web/src/main/java/org/springframework/web/filter/ShallowEtagHeaderFilter.java index 50f061af73..9aea5252a3 100644 --- a/spring-web/src/main/java/org/springframework/web/filter/ShallowEtagHeaderFilter.java +++ b/spring-web/src/main/java/org/springframework/web/filter/ShallowEtagHeaderFilter.java @@ -19,7 +19,6 @@ package org.springframework.web.filter; import java.io.IOException; import java.io.InputStream; import java.io.PrintWriter; - import javax.servlet.FilterChain; import javax.servlet.ServletException; import javax.servlet.ServletOutputStream; @@ -46,6 +45,7 @@ import org.springframework.web.util.WebUtils; * * @author Arjen Poutsma * @author Rossen Stoyanchev + * @author Brian Clozel * @author Juergen Hoeller * @since 3.0 */ @@ -61,32 +61,37 @@ public class ShallowEtagHeaderFilter extends OncePerRequestFilter { private static final String STREAMING_ATTRIBUTE = ShallowEtagHeaderFilter.class.getName() + ".STREAMING"; + /** Checking for Servlet 3.0+ HttpServletResponse.getHeader(String) */ private static final boolean servlet3Present = ClassUtils.hasMethod(HttpServletResponse.class, "getHeader", String.class); private boolean writeWeakETag = false; - /** - * Set whether the ETag value written to the response should be weak, as per rfc7232. - *

Should be configured using an {@code } for parameter name - * "writeWeakETag" in the filter definition in {@code web.xml}. - * @see rfc7232 section-2.3 - */ - public boolean isWriteWeakETag() { - return writeWeakETag; - } /** - * Return whether the ETag value written to the response should be weak, as per rfc7232. + * Set whether the ETag value written to the response should be weak, as per RFC 7232. + *

Should be configured using an {@code } for parameter name + * "writeWeakETag" in the filter definition in {@code web.xml}. + * @since 4.3 + * @see RFC 7232 section 2.3 */ public void setWriteWeakETag(boolean writeWeakETag) { this.writeWeakETag = writeWeakETag; } /** - * The default value is "false" so that the filter may delay the generation of - * an ETag until the last asynchronously dispatched thread. + * Return whether the ETag value written to the response should be weak, as per RFC 7232. + * @since 4.3 + */ + public boolean isWriteWeakETag() { + return this.writeWeakETag; + } + + + /** + * The default value is {@code false} so that the filter may delay the generation + * of an ETag until the last asynchronously dispatched thread. */ @Override protected boolean shouldNotFilterAsyncDispatch() { diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletResponseMethodArgumentResolverTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletResponseMethodArgumentResolverTests.java index 5fa371217f..0304387b2a 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletResponseMethodArgumentResolverTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletResponseMethodArgumentResolverTests.java @@ -41,22 +41,23 @@ public class ServletResponseMethodArgumentResolverTests { private ServletResponseMethodArgumentResolver resolver; - private Method method; - private ModelAndViewContainer mavContainer; - private ServletWebRequest webRequest; - private MockHttpServletResponse servletResponse; + private ServletWebRequest webRequest; + + private Method method; + @Before - public void setUp() throws Exception { + public void setup() throws Exception { resolver = new ServletResponseMethodArgumentResolver(); - method = getClass().getMethod("supportedParams", ServletResponse.class, OutputStream.class, Writer.class); - servletResponse = new MockHttpServletResponse(); mavContainer = new ModelAndViewContainer(); + servletResponse = new MockHttpServletResponse(); webRequest = new ServletWebRequest(new MockHttpServletRequest(), servletResponse); + + method = getClass().getMethod("supportedParams", ServletResponse.class, OutputStream.class, Writer.class); }