From f6e7fef236c3c8ec978a621704e4ba008795ecbc Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Sat, 19 Aug 2017 10:50:30 +0200 Subject: [PATCH] Polish --- .../remoting/support/RemoteInvocationResult.java | 1 - .../jdbc/config/SortedResourcesFactoryBean.java | 1 - .../org/springframework/messaging/simp/user/SimpSession.java | 2 -- .../messaging/simp/user/SimpSubscription.java | 2 -- .../http/server/reactive/AbstractServerHttpResponse.java | 1 - .../web/server/session/CookieWebSessionIdResolver.java | 1 - .../http/codec/json/Jackson2SmileEncoderTests.java | 5 ----- .../web/client/ExtractingResponseErrorHandlerTests.java | 1 - .../result/method/SyncHandlerMethodArgumentResolver.java | 2 -- .../annotation/RequestHeaderMethodArgumentResolver.java | 1 - .../annotation/SessionAttributeMethodArgumentResolver.java | 2 -- .../result/SimpleUrlHandlerMappingIntegrationTests.java | 1 - .../reactive/socket/AbstractWebSocketIntegrationTests.java | 1 - .../web/servlet/resource/CssLinkResourceTransformer.java | 2 -- .../annotation/RequestResponseBodyMethodProcessorTests.java | 1 - .../org/springframework/web/servlet/tags/UrlTagTests.java | 2 -- 16 files changed, 26 deletions(-) diff --git a/spring-context/src/main/java/org/springframework/remoting/support/RemoteInvocationResult.java b/spring-context/src/main/java/org/springframework/remoting/support/RemoteInvocationResult.java index c5bacdf28d..479acaae51 100644 --- a/spring-context/src/main/java/org/springframework/remoting/support/RemoteInvocationResult.java +++ b/spring-context/src/main/java/org/springframework/remoting/support/RemoteInvocationResult.java @@ -20,7 +20,6 @@ import java.io.Serializable; import java.lang.reflect.InvocationTargetException; import org.springframework.lang.Nullable; -import org.springframework.util.Assert; /** * Encapsulates a remote invocation result, holding a result value or an exception. diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/config/SortedResourcesFactoryBean.java b/spring-jdbc/src/main/java/org/springframework/jdbc/config/SortedResourcesFactoryBean.java index 8cd3b84803..bdee530cc4 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/config/SortedResourcesFactoryBean.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/config/SortedResourcesFactoryBean.java @@ -30,7 +30,6 @@ import org.springframework.core.io.ResourceLoader; import org.springframework.core.io.support.PathMatchingResourcePatternResolver; import org.springframework.core.io.support.ResourcePatternResolver; import org.springframework.core.io.support.ResourcePatternUtils; -import org.springframework.lang.Nullable; /** * {@link FactoryBean} implementation that takes a list of location Strings diff --git a/spring-messaging/src/main/java/org/springframework/messaging/simp/user/SimpSession.java b/spring-messaging/src/main/java/org/springframework/messaging/simp/user/SimpSession.java index d3b81c91da..7eb0006ead 100644 --- a/spring-messaging/src/main/java/org/springframework/messaging/simp/user/SimpSession.java +++ b/spring-messaging/src/main/java/org/springframework/messaging/simp/user/SimpSession.java @@ -18,8 +18,6 @@ package org.springframework.messaging.simp.user; import java.util.Set; -import org.springframework.lang.Nullable; - /** * Represents a session of connected user. * diff --git a/spring-messaging/src/main/java/org/springframework/messaging/simp/user/SimpSubscription.java b/spring-messaging/src/main/java/org/springframework/messaging/simp/user/SimpSubscription.java index 2df8b6a9b7..c5b9a46102 100644 --- a/spring-messaging/src/main/java/org/springframework/messaging/simp/user/SimpSubscription.java +++ b/spring-messaging/src/main/java/org/springframework/messaging/simp/user/SimpSubscription.java @@ -16,8 +16,6 @@ package org.springframework.messaging.simp.user; -import org.springframework.lang.Nullable; - /** * Represents a subscription within a user session. * diff --git a/spring-web/src/main/java/org/springframework/http/server/reactive/AbstractServerHttpResponse.java b/spring-web/src/main/java/org/springframework/http/server/reactive/AbstractServerHttpResponse.java index 435651fe2b..02b729fac3 100644 --- a/spring-web/src/main/java/org/springframework/http/server/reactive/AbstractServerHttpResponse.java +++ b/spring-web/src/main/java/org/springframework/http/server/reactive/AbstractServerHttpResponse.java @@ -39,7 +39,6 @@ import org.springframework.util.Assert; import org.springframework.util.CollectionUtils; import org.springframework.util.LinkedMultiValueMap; import org.springframework.util.MultiValueMap; -import org.springframework.util.StringUtils; /** * Base class for {@link ServerHttpResponse} implementations. diff --git a/spring-web/src/main/java/org/springframework/web/server/session/CookieWebSessionIdResolver.java b/spring-web/src/main/java/org/springframework/web/server/session/CookieWebSessionIdResolver.java index 738d07351b..2e491a20f7 100644 --- a/spring-web/src/main/java/org/springframework/web/server/session/CookieWebSessionIdResolver.java +++ b/spring-web/src/main/java/org/springframework/web/server/session/CookieWebSessionIdResolver.java @@ -24,7 +24,6 @@ import org.springframework.http.HttpCookie; import org.springframework.http.ResponseCookie; import org.springframework.util.Assert; import org.springframework.util.MultiValueMap; -import org.springframework.util.StringUtils; import org.springframework.web.server.ServerWebExchange; /** diff --git a/spring-web/src/test/java/org/springframework/http/codec/json/Jackson2SmileEncoderTests.java b/spring-web/src/test/java/org/springframework/http/codec/json/Jackson2SmileEncoderTests.java index 1533589c6f..be7cc1351a 100644 --- a/spring-web/src/test/java/org/springframework/http/codec/json/Jackson2SmileEncoderTests.java +++ b/spring-web/src/test/java/org/springframework/http/codec/json/Jackson2SmileEncoderTests.java @@ -18,16 +18,11 @@ package org.springframework.http.codec.json; import java.io.IOException; import java.io.UncheckedIOException; -import java.util.Arrays; import java.util.List; -import java.util.Map; -import com.fasterxml.jackson.annotation.JsonTypeInfo; -import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.databind.ObjectMapper; import org.junit.Test; import reactor.core.publisher.Flux; -import reactor.core.publisher.Mono; import reactor.test.StepVerifier; import org.springframework.core.ResolvableType; diff --git a/spring-web/src/test/java/org/springframework/web/client/ExtractingResponseErrorHandlerTests.java b/spring-web/src/test/java/org/springframework/web/client/ExtractingResponseErrorHandlerTests.java index 2573ebcbb3..bc7250f093 100644 --- a/spring-web/src/test/java/org/springframework/web/client/ExtractingResponseErrorHandlerTests.java +++ b/spring-web/src/test/java/org/springframework/web/client/ExtractingResponseErrorHandlerTests.java @@ -32,7 +32,6 @@ import org.springframework.http.converter.json.MappingJackson2HttpMessageConvert import static org.junit.Assert.*; import static org.mockito.BDDMockito.*; -import static org.mockito.Mockito.mock; /** * @author Arjen Poutsma diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/SyncHandlerMethodArgumentResolver.java b/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/SyncHandlerMethodArgumentResolver.java index 88c650d737..6c1a96a442 100644 --- a/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/SyncHandlerMethodArgumentResolver.java +++ b/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/SyncHandlerMethodArgumentResolver.java @@ -16,8 +16,6 @@ package org.springframework.web.reactive.result.method; -import java.util.Optional; - import reactor.core.publisher.Mono; import org.springframework.core.MethodParameter; diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/RequestHeaderMethodArgumentResolver.java b/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/RequestHeaderMethodArgumentResolver.java index 6319897e07..3e04eb6080 100644 --- a/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/RequestHeaderMethodArgumentResolver.java +++ b/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/RequestHeaderMethodArgumentResolver.java @@ -18,7 +18,6 @@ package org.springframework.web.reactive.result.method.annotation; import java.util.List; import java.util.Map; -import java.util.Optional; import org.springframework.beans.factory.config.ConfigurableBeanFactory; import org.springframework.core.MethodParameter; diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/SessionAttributeMethodArgumentResolver.java b/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/SessionAttributeMethodArgumentResolver.java index 46f2f91d1d..8d6ef8f75f 100644 --- a/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/SessionAttributeMethodArgumentResolver.java +++ b/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/SessionAttributeMethodArgumentResolver.java @@ -16,8 +16,6 @@ package org.springframework.web.reactive.result.method.annotation; -import java.util.Optional; - import reactor.core.publisher.Mono; import org.springframework.beans.factory.config.ConfigurableBeanFactory; diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/result/SimpleUrlHandlerMappingIntegrationTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/result/SimpleUrlHandlerMappingIntegrationTests.java index 0e1023ac2d..abdaf45bdb 100644 --- a/spring-webflux/src/test/java/org/springframework/web/reactive/result/SimpleUrlHandlerMappingIntegrationTests.java +++ b/spring-webflux/src/test/java/org/springframework/web/reactive/result/SimpleUrlHandlerMappingIntegrationTests.java @@ -18,7 +18,6 @@ package org.springframework.web.reactive.result; import java.net.URI; import java.nio.charset.StandardCharsets; -import java.util.Collections; import java.util.HashMap; import java.util.Map; diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/socket/AbstractWebSocketIntegrationTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/socket/AbstractWebSocketIntegrationTests.java index 410111754d..10fd9baa66 100644 --- a/spring-webflux/src/test/java/org/springframework/web/reactive/socket/AbstractWebSocketIntegrationTests.java +++ b/spring-webflux/src/test/java/org/springframework/web/reactive/socket/AbstractWebSocketIntegrationTests.java @@ -21,7 +21,6 @@ import java.io.IOException; import java.net.URI; import java.net.URISyntaxException; -import org.apache.tomcat.websocket.WsContainerProvider; import org.apache.tomcat.websocket.WsWebSocketContainer; import org.apache.tomcat.websocket.server.WsContextListener; import org.junit.After; diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/CssLinkResourceTransformer.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/CssLinkResourceTransformer.java index 8aa3002268..fcfc6ca76c 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/CssLinkResourceTransformer.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/CssLinkResourceTransformer.java @@ -21,9 +21,7 @@ import java.io.StringWriter; import java.nio.charset.Charset; import java.nio.charset.StandardCharsets; import java.util.ArrayList; -import java.util.Collections; import java.util.List; -import java.util.Set; import java.util.SortedSet; import java.util.TreeSet; import javax.servlet.http.HttpServletRequest; diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestResponseBodyMethodProcessorTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestResponseBodyMethodProcessorTests.java index cd84c9715c..76287842e2 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestResponseBodyMethodProcessorTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestResponseBodyMethodProcessorTests.java @@ -30,7 +30,6 @@ import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonView; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import org.springframework.aop.framework.ProxyFactory; diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/UrlTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/UrlTagTests.java index b53abd6486..f78243d6be 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/UrlTagTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/UrlTagTests.java @@ -16,7 +16,6 @@ package org.springframework.web.servlet.tags; -import java.lang.reflect.Method; import java.util.HashSet; import java.util.LinkedList; import java.util.List; @@ -30,7 +29,6 @@ import org.junit.Test; import org.springframework.mock.web.test.MockHttpServletRequest; import org.springframework.mock.web.test.MockPageContext; -import org.springframework.util.ReflectionUtils; import static org.hamcrest.Matchers.*; import static org.junit.Assert.*;