From 06db5aa43fbbaa95031ee74fef4cd523a97a11fe Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Thu, 24 Mar 2016 15:34:17 +0100 Subject: [PATCH] Polishing --- .../org/springframework/web/cors/CorsConfigurationTests.java | 5 +---- .../web/servlet/support/WebContentGenerator.java | 3 +-- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/spring-web/src/test/java/org/springframework/web/cors/CorsConfigurationTests.java b/spring-web/src/test/java/org/springframework/web/cors/CorsConfigurationTests.java index f777f6c6e2..32f68af3d3 100644 --- a/spring-web/src/test/java/org/springframework/web/cors/CorsConfigurationTests.java +++ b/spring-web/src/test/java/org/springframework/web/cors/CorsConfigurationTests.java @@ -24,10 +24,7 @@ import org.junit.Test; import org.springframework.http.HttpMethod; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; +import static org.junit.Assert.*; /** * Unit tests for {@link CorsConfiguration}. diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/support/WebContentGenerator.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/support/WebContentGenerator.java index c774d62ec4..98606fbca7 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/support/WebContentGenerator.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/support/WebContentGenerator.java @@ -263,8 +263,7 @@ public abstract class WebContentGenerator extends WebApplicationObjectSupport { * subject to content negotiation and variances based on the value of the * given request headers. The configured request header names are added only * if not already present in the response "Vary" header. - * - *

Note: this property is only supported on Servlet 3.0+ + *

Note: This property is only supported on Servlet 3.0+ * which allows checking existing response header values. * @param varyByRequestHeaders one or more request header names * @since 4.3