From 5b3edcd9f9292cc3175b47bd94dc03ef43f8fc2a Mon Sep 17 00:00:00 2001 From: Sam Brannen Date: Thu, 17 Dec 2015 20:27:33 +0100 Subject: [PATCH] Spring Cleaning in December - Delete unused imports - Delete unused code - Clean up warnings --- .../aspectj/AbstractAsyncExecutionAspect.aj | 2 -- .../factory/support/MethodOverrides.java | 1 - .../datetime/standard/PeriodFormatter.java | 1 - .../ExpressionCachingIntegrationTests.java | 2 ++ ...AbstractApplicationEventListenerTests.java | 2 +- .../support/ObjectToObjectConverter.java | 4 +-- .../DefaultConversionServiceTests.java | 4 +-- .../util/xml/AbstractStaxHandlerTestCase.java | 2 +- .../jdbc/support/lob/DefaultLobHandler.java | 1 - ...tenerContainerFactoryIntegrationTests.java | 1 - .../MappingJackson2MessageConverter.java | 3 +- .../AsyncHandlerMethodReturnValueHandler.java | 1 - .../orm/hibernate3/HibernateTemplate.java | 1 - .../HibernateTransactionManager.java | 2 -- .../hibernate3/LocalSessionFactoryBean.java | 4 --- .../orm/hibernate3/SessionFactoryUtils.java | 1 - .../IdTransferringMergeEventListener.java | 2 +- .../HibernateTransactionManagerTests.java | 2 +- .../EnableTransactionManagementTests.java | 1 + .../AbstractJackson2HttpMessageConverter.java | 2 -- .../client/HttpMessageConverterExtractor.java | 2 +- .../web/cors/DefaultCorsProcessor.java | 1 + .../springframework/web/util/UriUtils.java | 31 ++--------------- .../CommonsPortletMultipartResolver.java | 1 - .../ServletWrappingPortletContext.java | 3 -- .../CallableMethodReturnValueHandler.java | 1 - ...eferredResultMethodReturnValueHandler.java | 1 - .../handler/MappedInterceptorTests.java | 9 ++--- ...nnotationControllerHandlerMethodTests.java | 1 - .../WebJarsResourceResolverTests.java | 4 --- .../json/MappingJackson2JsonViewTests.java | 33 +++++++++---------- .../view/script/ScriptTemplateViewTests.java | 3 +- .../UndertowRequestUpgradeStrategy.java | 17 +++++----- .../AbstractHttpSendingTransportHandler.java | 1 - .../jetty/JettyWebSocketSessionTests.java | 20 +++++------ .../StandardWebSocketSessionTests.java | 22 +++++-------- 36 files changed, 61 insertions(+), 128 deletions(-) diff --git a/spring-aspects/src/main/java/org/springframework/scheduling/aspectj/AbstractAsyncExecutionAspect.aj b/spring-aspects/src/main/java/org/springframework/scheduling/aspectj/AbstractAsyncExecutionAspect.aj index 684eaf9e1ce..f11400f05ee 100644 --- a/spring-aspects/src/main/java/org/springframework/scheduling/aspectj/AbstractAsyncExecutionAspect.aj +++ b/spring-aspects/src/main/java/org/springframework/scheduling/aspectj/AbstractAsyncExecutionAspect.aj @@ -24,9 +24,7 @@ import org.aspectj.lang.annotation.SuppressAjWarnings; import org.aspectj.lang.reflect.MethodSignature; import org.springframework.aop.interceptor.AsyncExecutionAspectSupport; -import org.springframework.core.task.AsyncListenableTaskExecutor; import org.springframework.core.task.AsyncTaskExecutor; -import org.springframework.util.concurrent.ListenableFuture; /** * Abstract aspect that routes selected methods asynchronously. diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/MethodOverrides.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/MethodOverrides.java index 6df31aff789..05159bd78dd 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/support/MethodOverrides.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/MethodOverrides.java @@ -17,7 +17,6 @@ package org.springframework.beans.factory.support; import java.lang.reflect.Method; -import java.util.HashSet; import java.util.LinkedHashSet; import java.util.Set; diff --git a/spring-context/src/main/java/org/springframework/format/datetime/standard/PeriodFormatter.java b/spring-context/src/main/java/org/springframework/format/datetime/standard/PeriodFormatter.java index 5ac4fbff32a..8b13574af5e 100644 --- a/spring-context/src/main/java/org/springframework/format/datetime/standard/PeriodFormatter.java +++ b/spring-context/src/main/java/org/springframework/format/datetime/standard/PeriodFormatter.java @@ -17,7 +17,6 @@ package org.springframework.format.datetime.standard; import java.text.ParseException; -import java.time.Instant; import java.time.Period; import java.util.Locale; diff --git a/spring-context/src/test/java/org/springframework/cache/config/ExpressionCachingIntegrationTests.java b/spring-context/src/test/java/org/springframework/cache/config/ExpressionCachingIntegrationTests.java index 3f1f5a9b46f..f00ddde35d8 100644 --- a/spring-context/src/test/java/org/springframework/cache/config/ExpressionCachingIntegrationTests.java +++ b/spring-context/src/test/java/org/springframework/cache/config/ExpressionCachingIntegrationTests.java @@ -92,6 +92,7 @@ public class ExpressionCachingIntegrationTests { this.id = id; } + @SuppressWarnings("unused") public String getId() { return id; } @@ -104,6 +105,7 @@ public class ExpressionCachingIntegrationTests { this.id = id; } + @SuppressWarnings("unused") public String getId() { return id; } diff --git a/spring-context/src/test/java/org/springframework/context/event/AbstractApplicationEventListenerTests.java b/spring-context/src/test/java/org/springframework/context/event/AbstractApplicationEventListenerTests.java index 72a2561b5c5..a0784d03e8d 100644 --- a/spring-context/src/test/java/org/springframework/context/event/AbstractApplicationEventListenerTests.java +++ b/spring-context/src/test/java/org/springframework/context/event/AbstractApplicationEventListenerTests.java @@ -117,13 +117,13 @@ public abstract class AbstractApplicationEventListenerTests { } } + @SuppressWarnings("rawtypes") static class RawApplicationListener implements ApplicationListener { @Override public void onApplicationEvent(ApplicationEvent event) { } } - @SuppressWarnings("unused") static class TestEvents { public ApplicationEvent applicationEvent; diff --git a/spring-core/src/main/java/org/springframework/core/convert/support/ObjectToObjectConverter.java b/spring-core/src/main/java/org/springframework/core/convert/support/ObjectToObjectConverter.java index b46512419d5..b3183c6e17f 100644 --- a/spring-core/src/main/java/org/springframework/core/convert/support/ObjectToObjectConverter.java +++ b/spring-core/src/main/java/org/springframework/core/convert/support/ObjectToObjectConverter.java @@ -101,7 +101,7 @@ final class ObjectToObjectConverter implements ConditionalGenericConverter { } } else if (member instanceof Constructor) { - Constructor ctor = (Constructor) member; + Constructor ctor = (Constructor) member; return ctor.newInstance(source); } } @@ -155,7 +155,7 @@ final class ObjectToObjectConverter implements ConditionalGenericConverter { method.getParameterTypes()[0] == sourceClass); } else if (member instanceof Constructor) { - Constructor ctor = (Constructor) member; + Constructor ctor = (Constructor) member; return (ctor.getParameterTypes()[0] == sourceClass); } else { diff --git a/spring-core/src/test/java/org/springframework/core/convert/support/DefaultConversionServiceTests.java b/spring-core/src/test/java/org/springframework/core/convert/support/DefaultConversionServiceTests.java index 5059738caba..92d1d0d777b 100644 --- a/spring-core/src/test/java/org/springframework/core/convert/support/DefaultConversionServiceTests.java +++ b/spring-core/src/test/java/org/springframework/core/convert/support/DefaultConversionServiceTests.java @@ -561,9 +561,9 @@ public class DefaultConversionServiceTests { } @Test - @SuppressWarnings("unchecked") + @SuppressWarnings("rawtypes") public void convertObjectToCollection() { - List result = (List) conversionService.convert(3L, List.class); + List result = conversionService.convert(3L, List.class); assertEquals(1, result.size()); assertEquals(3L, result.get(0)); } diff --git a/spring-core/src/test/java/org/springframework/util/xml/AbstractStaxHandlerTestCase.java b/spring-core/src/test/java/org/springframework/util/xml/AbstractStaxHandlerTestCase.java index 8dd8243077b..e23c92cc0e2 100644 --- a/spring-core/src/test/java/org/springframework/util/xml/AbstractStaxHandlerTestCase.java +++ b/spring-core/src/test/java/org/springframework/util/xml/AbstractStaxHandlerTestCase.java @@ -82,7 +82,7 @@ public abstract class AbstractStaxHandlerTestCase { private static boolean wwwSpringframeworkOrgIsAccessible() { try { - new Socket("www.springframework.org", 80); + new Socket("www.springframework.org", 80).close(); } catch (Exception e) { return false; diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/DefaultLobHandler.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/DefaultLobHandler.java index 57aad967a23..b63c4e2b9e3 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/DefaultLobHandler.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/DefaultLobHandler.java @@ -207,7 +207,6 @@ public class DefaultLobHandler extends AbstractLobHandler { } @Override - @SuppressWarnings("resource") public LobCreator getLobCreator() { return (this.createTemporaryLob ? new TemporaryLobCreator() : new DefaultLobCreator()); } diff --git a/spring-jms/src/test/java/org/springframework/jms/config/JmsListenerContainerFactoryIntegrationTests.java b/spring-jms/src/test/java/org/springframework/jms/config/JmsListenerContainerFactoryIntegrationTests.java index da2a90c1462..33247a7be58 100644 --- a/spring-jms/src/test/java/org/springframework/jms/config/JmsListenerContainerFactoryIntegrationTests.java +++ b/spring-jms/src/test/java/org/springframework/jms/config/JmsListenerContainerFactoryIntegrationTests.java @@ -17,7 +17,6 @@ package org.springframework.jms.config; import java.lang.reflect.Method; -import java.util.Arrays; import java.util.HashMap; import java.util.Map; import javax.jms.JMSException; diff --git a/spring-messaging/src/main/java/org/springframework/messaging/converter/MappingJackson2MessageConverter.java b/spring-messaging/src/main/java/org/springframework/messaging/converter/MappingJackson2MessageConverter.java index 30a1612cff8..0a34986896f 100644 --- a/spring-messaging/src/main/java/org/springframework/messaging/converter/MappingJackson2MessageConverter.java +++ b/spring-messaging/src/main/java/org/springframework/messaging/converter/MappingJackson2MessageConverter.java @@ -38,7 +38,6 @@ import org.springframework.core.MethodParameter; import org.springframework.messaging.Message; import org.springframework.messaging.MessageHeaders; import org.springframework.util.Assert; -import org.springframework.util.ClassUtils; import org.springframework.util.MimeType; /** @@ -271,7 +270,7 @@ public class MappingJackson2MessageConverter extends AbstractMessageConverter { return extractViewClass((JsonView) conversionHint, conversionHint); } else if (conversionHint instanceof Class) { - return (Class) conversionHint; + return (Class) conversionHint; } // No JSON view specified... diff --git a/spring-messaging/src/main/java/org/springframework/messaging/handler/invocation/AsyncHandlerMethodReturnValueHandler.java b/spring-messaging/src/main/java/org/springframework/messaging/handler/invocation/AsyncHandlerMethodReturnValueHandler.java index 9dda4d014d1..5da73ba3f6e 100644 --- a/spring-messaging/src/main/java/org/springframework/messaging/handler/invocation/AsyncHandlerMethodReturnValueHandler.java +++ b/spring-messaging/src/main/java/org/springframework/messaging/handler/invocation/AsyncHandlerMethodReturnValueHandler.java @@ -17,7 +17,6 @@ package org.springframework.messaging.handler.invocation; import org.springframework.core.MethodParameter; -import org.springframework.messaging.Message; import org.springframework.util.concurrent.ListenableFuture; /** diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateTemplate.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateTemplate.java index 146b19ec9af..1c1d0ad5629 100644 --- a/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateTemplate.java +++ b/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateTemplate.java @@ -107,7 +107,6 @@ import org.springframework.util.Assert; * @deprecated as of Spring 4.3, in favor of Hibernate 4.x/5.x */ @Deprecated -@SuppressWarnings("deprecation") public class HibernateTemplate extends HibernateAccessor implements HibernateOperations { private boolean allowCreate = true; diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateTransactionManager.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateTransactionManager.java index 9eb58527eea..c6f802e6f6c 100644 --- a/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateTransactionManager.java +++ b/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateTransactionManager.java @@ -477,7 +477,6 @@ public class HibernateTransactionManager extends AbstractPlatformTransactionMana } @Override - @SuppressWarnings("deprecation") protected void doBegin(Object transaction, TransactionDefinition definition) { HibernateTransactionObject txObject = (HibernateTransactionObject) transaction; @@ -710,7 +709,6 @@ public class HibernateTransactionManager extends AbstractPlatformTransactionMana } @Override - @SuppressWarnings("deprecation") protected void doCleanupAfterCompletion(Object transaction) { HibernateTransactionObject txObject = (HibernateTransactionObject) transaction; diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate3/LocalSessionFactoryBean.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/LocalSessionFactoryBean.java index 0197fdfd0e6..404f93e1fb6 100644 --- a/spring-orm/src/main/java/org/springframework/orm/hibernate3/LocalSessionFactoryBean.java +++ b/spring-orm/src/main/java/org/springframework/orm/hibernate3/LocalSessionFactoryBean.java @@ -873,7 +873,6 @@ public class LocalSessionFactoryBean extends AbstractSessionFactoryBean implemen new HibernateCallback() { @Override public Object doInHibernate(Session session) throws HibernateException, SQLException { - @SuppressWarnings("deprecation") Connection con = session.connection(); DatabaseMetadata metadata = new DatabaseMetadata(con, dialect); String[] sql = getConfiguration().generateSchemaUpdateScript(dialect, metadata); @@ -919,7 +918,6 @@ public class LocalSessionFactoryBean extends AbstractSessionFactoryBean implemen new HibernateCallback() { @Override public Object doInHibernate(Session session) throws HibernateException, SQLException { - @SuppressWarnings("deprecation") Connection con = session.connection(); DatabaseMetadata metadata = new DatabaseMetadata(con, dialect, false); getConfiguration().validateSchema(dialect, metadata); @@ -957,7 +955,6 @@ public class LocalSessionFactoryBean extends AbstractSessionFactoryBean implemen new HibernateCallback() { @Override public Object doInHibernate(Session session) throws HibernateException, SQLException { - @SuppressWarnings("deprecation") Connection con = session.connection(); String[] sql = getConfiguration().generateDropSchemaScript(dialect); executeSchemaScript(con, sql); @@ -995,7 +992,6 @@ public class LocalSessionFactoryBean extends AbstractSessionFactoryBean implemen new HibernateCallback() { @Override public Object doInHibernate(Session session) throws HibernateException, SQLException { - @SuppressWarnings("deprecation") Connection con = session.connection(); String[] sql = getConfiguration().generateSchemaCreationScript(dialect); executeSchemaScript(con, sql); diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate3/SessionFactoryUtils.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/SessionFactoryUtils.java index 88b89b9dd01..2286a904c3a 100644 --- a/spring-orm/src/main/java/org/springframework/orm/hibernate3/SessionFactoryUtils.java +++ b/spring-orm/src/main/java/org/springframework/orm/hibernate3/SessionFactoryUtils.java @@ -513,7 +513,6 @@ public abstract class SessionFactoryUtils { * @param entityInterceptor Hibernate entity interceptor, or {@code null} if none * @return the new Session */ - @SuppressWarnings("deprecation") public static Session getNewSession(SessionFactory sessionFactory, Interceptor entityInterceptor) { Assert.notNull(sessionFactory, "No SessionFactory specified"); diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/IdTransferringMergeEventListener.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/IdTransferringMergeEventListener.java index b48d6be5e1e..646c973a39d 100644 --- a/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/IdTransferringMergeEventListener.java +++ b/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/IdTransferringMergeEventListener.java @@ -51,7 +51,7 @@ import org.hibernate.persister.entity.EntityPersister; * @deprecated as of Spring 4.3, in favor of Hibernate 4.x/5.x */ @Deprecated -@SuppressWarnings({"serial", "rawtypes", "deprecation"}) +@SuppressWarnings({"serial", "rawtypes"}) public class IdTransferringMergeEventListener extends DefaultMergeEventListener { /** diff --git a/spring-orm/src/test/java/org/springframework/orm/hibernate3/HibernateTransactionManagerTests.java b/spring-orm/src/test/java/org/springframework/orm/hibernate3/HibernateTransactionManagerTests.java index 9acc23cf336..22dbecc4c1c 100644 --- a/spring-orm/src/test/java/org/springframework/orm/hibernate3/HibernateTransactionManagerTests.java +++ b/spring-orm/src/test/java/org/springframework/orm/hibernate3/HibernateTransactionManagerTests.java @@ -68,7 +68,7 @@ import static org.mockito.BDDMockito.*; * @deprecated as of Spring 4.3, in favor of Hibernate 4.x/5.x */ @Deprecated -@SuppressWarnings({"rawtypes", "unchecked", "deprecation"}) +@SuppressWarnings({"rawtypes", "unchecked"}) public class HibernateTransactionManagerTests { @After diff --git a/spring-tx/src/test/java/org/springframework/transaction/annotation/EnableTransactionManagementTests.java b/spring-tx/src/test/java/org/springframework/transaction/annotation/EnableTransactionManagementTests.java index d413269df84..4c301feaacd 100644 --- a/spring-tx/src/test/java/org/springframework/transaction/annotation/EnableTransactionManagementTests.java +++ b/spring-tx/src/test/java/org/springframework/transaction/annotation/EnableTransactionManagementTests.java @@ -94,6 +94,7 @@ public class EnableTransactionManagementTests { * get loaded -- or in this case, attempted to be loaded at which point the test fails. */ @Test + @SuppressWarnings("resource") public void proxyTypeAspectJCausesRegistrationOfAnnotationTransactionAspect() { try { new AnnotationConfigApplicationContext(EnableAspectJTxConfig.class, TxManagerConfig.class); diff --git a/spring-web/src/main/java/org/springframework/http/converter/json/AbstractJackson2HttpMessageConverter.java b/spring-web/src/main/java/org/springframework/http/converter/json/AbstractJackson2HttpMessageConverter.java index c85dda4af09..fb0bbc67a4f 100644 --- a/spring-web/src/main/java/org/springframework/http/converter/json/AbstractJackson2HttpMessageConverter.java +++ b/spring-web/src/main/java/org/springframework/http/converter/json/AbstractJackson2HttpMessageConverter.java @@ -24,7 +24,6 @@ import java.util.concurrent.atomic.AtomicReference; import com.fasterxml.jackson.core.JsonEncoding; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.core.PrettyPrinter; import com.fasterxml.jackson.core.util.DefaultPrettyPrinter; import com.fasterxml.jackson.databind.JavaType; import com.fasterxml.jackson.databind.ObjectMapper; @@ -41,7 +40,6 @@ import org.springframework.http.converter.HttpMessageConverter; import org.springframework.http.converter.HttpMessageNotReadableException; import org.springframework.http.converter.HttpMessageNotWritableException; import org.springframework.util.Assert; -import org.springframework.util.ClassUtils; import org.springframework.util.TypeUtils; /** diff --git a/spring-web/src/main/java/org/springframework/web/client/HttpMessageConverterExtractor.java b/spring-web/src/main/java/org/springframework/web/client/HttpMessageConverterExtractor.java index 7eada90cec6..2f03908c8ee 100644 --- a/spring-web/src/main/java/org/springframework/web/client/HttpMessageConverterExtractor.java +++ b/spring-web/src/main/java/org/springframework/web/client/HttpMessageConverterExtractor.java @@ -76,7 +76,7 @@ public class HttpMessageConverterExtractor implements ResponseExtractor { @Override - @SuppressWarnings({"unchecked", "rawtypes"}) + @SuppressWarnings({"unchecked", "rawtypes", "resource"}) public T extractData(ClientHttpResponse response) throws IOException { MessageBodyClientHttpResponseWrapper responseWrapper = new MessageBodyClientHttpResponseWrapper(response); if (!responseWrapper.hasMessageBody() || responseWrapper.hasEmptyMessageBody()) { diff --git a/spring-web/src/main/java/org/springframework/web/cors/DefaultCorsProcessor.java b/spring-web/src/main/java/org/springframework/web/cors/DefaultCorsProcessor.java index 72445bb11cf..caaeff5a9a4 100644 --- a/spring-web/src/main/java/org/springframework/web/cors/DefaultCorsProcessor.java +++ b/spring-web/src/main/java/org/springframework/web/cors/DefaultCorsProcessor.java @@ -58,6 +58,7 @@ public class DefaultCorsProcessor implements CorsProcessor { @Override + @SuppressWarnings("resource") public boolean processRequest(CorsConfiguration config, HttpServletRequest request, HttpServletResponse response) throws IOException { diff --git a/spring-web/src/main/java/org/springframework/web/util/UriUtils.java b/spring-web/src/main/java/org/springframework/web/util/UriUtils.java index 050cc2ee952..c68092971fa 100644 --- a/spring-web/src/main/java/org/springframework/web/util/UriUtils.java +++ b/spring-web/src/main/java/org/springframework/web/util/UriUtils.java @@ -18,7 +18,6 @@ package org.springframework.web.util; import java.io.ByteArrayOutputStream; import java.io.UnsupportedEncodingException; -import java.util.regex.Pattern; import org.springframework.util.Assert; @@ -26,11 +25,11 @@ import org.springframework.util.Assert; * Utility class for URI encoding and decoding based on RFC 3986. * Offers encoding methods for the various URI components. * - *

All {@code encode*(String, String} methods in this class operate in a similar way: + *

All {@code encode*(String, String)} methods in this class operate in a similar way: *

    *
  • Valid characters for the specific URI component as defined in RFC 3986 stay the same.
    • *
  • All other characters are converted into one or more bytes in the given encoding scheme. - * Each of the resulting bytes is written as a hexadecimal string in the "{@code %xy}" + * Each of the resulting bytes is written as a hexadecimal string in the "%xy" * format.
    • *
* @@ -40,32 +39,6 @@ import org.springframework.util.Assert; */ public abstract class UriUtils { - private static final String SCHEME_PATTERN = "([^:/?#]+):"; - - private static final String HTTP_PATTERN = "(http|https):"; - - private static final String USERINFO_PATTERN = "([^@/]*)"; - - private static final String HOST_PATTERN = "([^/?#:]*)"; - - private static final String PORT_PATTERN = "(\\d*)"; - - private static final String PATH_PATTERN = "([^?#]*)"; - - private static final String QUERY_PATTERN = "([^#]*)"; - - private static final String LAST_PATTERN = "(.*)"; - - // Regex patterns that matches URIs. See RFC 3986, appendix B - private static final Pattern URI_PATTERN = Pattern.compile( - "^(" + SCHEME_PATTERN + ")?" + "(//(" + USERINFO_PATTERN + "@)?" + HOST_PATTERN + "(:" + PORT_PATTERN + - ")?" + ")?" + PATH_PATTERN + "(\\?" + QUERY_PATTERN + ")?" + "(#" + LAST_PATTERN + ")?"); - - private static final Pattern HTTP_URL_PATTERN = Pattern.compile( - "^" + HTTP_PATTERN + "(//(" + USERINFO_PATTERN + "@)?" + HOST_PATTERN + "(:" + PORT_PATTERN + ")?" + ")?" + - PATH_PATTERN + "(\\?" + LAST_PATTERN + ")?"); - - /** * Encodes the given URI scheme with the given encoding. * @param scheme the scheme to be encoded diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/multipart/CommonsPortletMultipartResolver.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/multipart/CommonsPortletMultipartResolver.java index aa17131413a..2644f2c8450 100644 --- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/multipart/CommonsPortletMultipartResolver.java +++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/multipart/CommonsPortletMultipartResolver.java @@ -146,7 +146,6 @@ public class CommonsPortletMultipartResolver extends CommonsFileUploadSupport * @return the parsing result * @throws MultipartException if multipart resolution failed. */ - @SuppressWarnings("unchecked") protected MultipartParsingResult parseRequest(ActionRequest request) throws MultipartException { String encoding = determineEncoding(request); FileUpload fileUpload = prepareFileUpload(encoding); diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/ServletWrappingPortletContext.java b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/ServletWrappingPortletContext.java index 8a7150757a5..545f159e281 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/ServletWrappingPortletContext.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/ServletWrappingPortletContext.java @@ -100,7 +100,6 @@ public class ServletWrappingPortletContext implements PortletContext { } @Override - @SuppressWarnings("unchecked") public Set getResourcePaths(String path) { return this.servletContext.getResourcePaths(path); } @@ -116,7 +115,6 @@ public class ServletWrappingPortletContext implements PortletContext { } @Override - @SuppressWarnings("unchecked") public Enumeration getAttributeNames() { return this.servletContext.getAttributeNames(); } @@ -127,7 +125,6 @@ public class ServletWrappingPortletContext implements PortletContext { } @Override - @SuppressWarnings("unchecked") public Enumeration getInitParameterNames() { return this.servletContext.getInitParameterNames(); } diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/CallableMethodReturnValueHandler.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/CallableMethodReturnValueHandler.java index dbb46cc799f..cfd5dade842 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/CallableMethodReturnValueHandler.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/CallableMethodReturnValueHandler.java @@ -22,7 +22,6 @@ import org.springframework.core.MethodParameter; import org.springframework.web.context.request.NativeWebRequest; import org.springframework.web.context.request.async.WebAsyncUtils; import org.springframework.web.method.support.AsyncHandlerMethodReturnValueHandler; -import org.springframework.web.method.support.HandlerMethodReturnValueHandler; import org.springframework.web.method.support.ModelAndViewContainer; /** diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/DeferredResultMethodReturnValueHandler.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/DeferredResultMethodReturnValueHandler.java index 620b9654e2f..147e6afff8e 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/DeferredResultMethodReturnValueHandler.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/DeferredResultMethodReturnValueHandler.java @@ -21,7 +21,6 @@ import org.springframework.web.context.request.NativeWebRequest; import org.springframework.web.context.request.async.DeferredResult; import org.springframework.web.context.request.async.WebAsyncUtils; import org.springframework.web.method.support.AsyncHandlerMethodReturnValueHandler; -import org.springframework.web.method.support.HandlerMethodReturnValueHandler; import org.springframework.web.method.support.ModelAndViewContainer; /** diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/handler/MappedInterceptorTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/handler/MappedInterceptorTests.java index 6c25c27cda9..49c71b565f4 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/handler/MappedInterceptorTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/handler/MappedInterceptorTests.java @@ -15,14 +15,8 @@ */ package org.springframework.web.servlet.handler; -import static org.junit.Assert.*; -import static org.mockito.BDDMockito.any; -import static org.mockito.BDDMockito.*; -import static org.mockito.Mockito.mock; - import java.util.Comparator; import java.util.Map; - import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -35,6 +29,9 @@ import org.springframework.web.servlet.HandlerInterceptor; import org.springframework.web.servlet.ModelAndView; import org.springframework.web.servlet.i18n.LocaleChangeInterceptor; +import static org.junit.Assert.*; +import static org.mockito.BDDMockito.*; + /** * Test fixture for {@link MappedInterceptor} tests. * diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletAnnotationControllerHandlerMethodTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletAnnotationControllerHandlerMethodTests.java index 6635463875a..32bf6882e5f 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletAnnotationControllerHandlerMethodTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletAnnotationControllerHandlerMethodTests.java @@ -106,7 +106,6 @@ import org.springframework.validation.BindingResult; import org.springframework.validation.Errors; import org.springframework.validation.FieldError; import org.springframework.validation.beanvalidation.LocalValidatorFactoryBean; -import org.springframework.web.accept.ContentNegotiationManager; import org.springframework.web.accept.ContentNegotiationManagerFactoryBean; import org.springframework.web.bind.WebDataBinder; import org.springframework.web.bind.annotation.CookieValue; diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/resource/WebJarsResourceResolverTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/resource/WebJarsResourceResolverTests.java index 71d932de111..5fcb4b499a5 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/resource/WebJarsResourceResolverTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/resource/WebJarsResourceResolverTests.java @@ -29,10 +29,6 @@ import org.springframework.mock.web.test.MockHttpServletRequest; import static org.junit.Assert.*; import static org.mockito.BDDMockito.*; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.never; -import static org.mockito.Mockito.times; -import static org.mockito.Mockito.verify; /** * Unit tests for diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/json/MappingJackson2JsonViewTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/json/MappingJackson2JsonViewTests.java index e36d211be23..4e062b2a005 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/json/MappingJackson2JsonViewTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/json/MappingJackson2JsonViewTests.java @@ -17,14 +17,27 @@ package org.springframework.web.servlet.view.json; import java.io.IOException; -import java.util.Arrays; import java.util.Date; import java.util.HashMap; import java.util.HashSet; -import java.util.LinkedHashSet; import java.util.Map; import java.util.Set; +import org.junit.Before; +import org.junit.Test; + +import org.mozilla.javascript.Context; +import org.mozilla.javascript.ContextFactory; +import org.mozilla.javascript.ScriptableObject; + +import org.springframework.beans.DirectFieldAccessor; +import org.springframework.http.MediaType; +import org.springframework.mock.web.test.MockHttpServletRequest; +import org.springframework.mock.web.test.MockHttpServletResponse; +import org.springframework.ui.ModelMap; +import org.springframework.validation.BindingResult; +import org.springframework.web.servlet.View; + import com.fasterxml.jackson.annotation.JsonFilter; import com.fasterxml.jackson.annotation.JsonView; import com.fasterxml.jackson.core.JsonGenerator; @@ -40,22 +53,8 @@ import com.fasterxml.jackson.databind.ser.FilterProvider; import com.fasterxml.jackson.databind.ser.SerializerFactory; import com.fasterxml.jackson.databind.ser.impl.SimpleBeanPropertyFilter; import com.fasterxml.jackson.databind.ser.impl.SimpleFilterProvider; -import static org.hamcrest.CoreMatchers.containsString; -import static org.hamcrest.CoreMatchers.not; -import org.junit.Before; -import org.junit.Test; -import org.mozilla.javascript.Context; -import org.mozilla.javascript.ContextFactory; -import org.mozilla.javascript.ScriptableObject; - -import org.springframework.beans.DirectFieldAccessor; -import org.springframework.http.MediaType; -import org.springframework.mock.web.test.MockHttpServletRequest; -import org.springframework.mock.web.test.MockHttpServletResponse; -import org.springframework.ui.ModelMap; -import org.springframework.validation.BindingResult; -import org.springframework.web.servlet.View; +import static org.hamcrest.CoreMatchers.*; import static org.junit.Assert.*; import static org.mockito.Mockito.*; diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/script/ScriptTemplateViewTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/script/ScriptTemplateViewTests.java index e08605b99b4..a727c1c1bd6 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/script/ScriptTemplateViewTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/script/ScriptTemplateViewTests.java @@ -30,6 +30,7 @@ import javax.script.Invocable; import javax.script.ScriptEngine; import org.hamcrest.Matchers; + import org.junit.Before; import org.junit.Test; @@ -47,7 +48,6 @@ import org.springframework.web.servlet.DispatcherServlet; import static org.hamcrest.Matchers.*; import static org.junit.Assert.*; import static org.mockito.BDDMockito.*; -import static org.mockito.Mockito.mock; /** * Unit tests for {@link ScriptTemplateView}. @@ -212,6 +212,7 @@ public class ScriptTemplateViewTests { } @Test + @SuppressWarnings("resource") public void parentLoader() { this.view.setEngine(mock(InvocableScriptEngine.class)); this.view.setRenderFunction("render"); diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/server/standard/UndertowRequestUpgradeStrategy.java b/spring-websocket/src/main/java/org/springframework/web/socket/server/standard/UndertowRequestUpgradeStrategy.java index ec2bc3f4a3a..9d50b1ecba6 100644 --- a/spring-websocket/src/main/java/org/springframework/web/socket/server/standard/UndertowRequestUpgradeStrategy.java +++ b/spring-websocket/src/main/java/org/springframework/web/socket/server/standard/UndertowRequestUpgradeStrategy.java @@ -17,9 +17,7 @@ package org.springframework.web.socket.server.standard; import java.lang.reflect.Constructor; -import java.lang.reflect.InvocationHandler; import java.lang.reflect.Method; -import java.lang.reflect.Proxy; import java.util.Arrays; import java.util.Collections; import java.util.List; @@ -33,6 +31,14 @@ import javax.websocket.Endpoint; import javax.websocket.Extension; import javax.websocket.server.ServerEndpointConfig; +import org.springframework.http.server.ServerHttpRequest; +import org.springframework.http.server.ServerHttpResponse; +import org.springframework.util.ClassUtils; +import org.springframework.util.ReflectionUtils; +import org.springframework.web.socket.server.HandshakeFailureException; + +import org.xnio.StreamConnection; + import io.undertow.server.HttpServerExchange; import io.undertow.server.HttpUpgradeListener; import io.undertow.servlet.api.InstanceFactory; @@ -52,13 +58,6 @@ import io.undertow.websockets.jsr.handshake.JsrHybi07Handshake; import io.undertow.websockets.jsr.handshake.JsrHybi08Handshake; import io.undertow.websockets.jsr.handshake.JsrHybi13Handshake; import io.undertow.websockets.spi.WebSocketHttpExchange; -import org.xnio.StreamConnection; - -import org.springframework.http.server.ServerHttpRequest; -import org.springframework.http.server.ServerHttpResponse; -import org.springframework.util.ClassUtils; -import org.springframework.util.ReflectionUtils; -import org.springframework.web.socket.server.HandshakeFailureException; /** * A WebSocket {@code RequestUpgradeStrategy} for use with WildFly and its diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/handler/AbstractHttpSendingTransportHandler.java b/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/handler/AbstractHttpSendingTransportHandler.java index e4df40bf66c..87659d7c1f4 100644 --- a/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/handler/AbstractHttpSendingTransportHandler.java +++ b/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/handler/AbstractHttpSendingTransportHandler.java @@ -23,7 +23,6 @@ import java.util.regex.Pattern; import org.springframework.http.MediaType; import org.springframework.http.server.ServerHttpRequest; import org.springframework.http.server.ServerHttpResponse; -import org.springframework.util.Assert; import org.springframework.util.MultiValueMap; import org.springframework.util.StringUtils; import org.springframework.web.socket.WebSocketHandler; diff --git a/spring-websocket/src/test/java/org/springframework/web/socket/adapter/jetty/JettyWebSocketSessionTests.java b/spring-websocket/src/test/java/org/springframework/web/socket/adapter/jetty/JettyWebSocketSessionTests.java index 594f0828505..a83775214ef 100644 --- a/spring-websocket/src/test/java/org/springframework/web/socket/adapter/jetty/JettyWebSocketSessionTests.java +++ b/spring-websocket/src/test/java/org/springframework/web/socket/adapter/jetty/JettyWebSocketSessionTests.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. @@ -22,8 +22,9 @@ import java.util.Map; import org.eclipse.jetty.websocket.api.Session; import org.eclipse.jetty.websocket.api.UpgradeRequest; import org.eclipse.jetty.websocket.api.UpgradeResponse; -import org.junit.Before; + import org.junit.Test; + import org.mockito.Mockito; import org.springframework.web.socket.handler.TestPrincipal; @@ -38,16 +39,11 @@ import static org.mockito.BDDMockito.*; */ public class JettyWebSocketSessionTests { - private Map attributes; - - - @Before - public void setup() { - this.attributes = new HashMap<>(); - } + private final Map attributes = new HashMap<>(); @Test + @SuppressWarnings("resource") public void getPrincipalWithConstructorArg() { TestPrincipal user = new TestPrincipal("joe"); JettyWebSocketSession session = new JettyWebSocketSession(attributes, user); @@ -56,8 +52,8 @@ public class JettyWebSocketSessionTests { } @Test + @SuppressWarnings("resource") public void getPrincipalFromNativeSession() { - TestPrincipal user = new TestPrincipal("joe"); UpgradeRequest request = Mockito.mock(UpgradeRequest.class); @@ -80,8 +76,8 @@ public class JettyWebSocketSessionTests { } @Test + @SuppressWarnings("resource") public void getPrincipalNotAvailable() { - UpgradeRequest request = Mockito.mock(UpgradeRequest.class); given(request.getUserPrincipal()).willReturn(null); @@ -102,8 +98,8 @@ public class JettyWebSocketSessionTests { } @Test + @SuppressWarnings("resource") public void getAcceptedProtocol() { - String protocol = "foo"; UpgradeRequest request = Mockito.mock(UpgradeRequest.class); diff --git a/spring-websocket/src/test/java/org/springframework/web/socket/adapter/standard/StandardWebSocketSessionTests.java b/spring-websocket/src/test/java/org/springframework/web/socket/adapter/standard/StandardWebSocketSessionTests.java index edd17640a65..8c832aad453 100644 --- a/spring-websocket/src/test/java/org/springframework/web/socket/adapter/standard/StandardWebSocketSessionTests.java +++ b/spring-websocket/src/test/java/org/springframework/web/socket/adapter/standard/StandardWebSocketSessionTests.java @@ -1,4 +1,4 @@ -/* 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. @@ -19,8 +19,8 @@ import java.util.HashMap; import java.util.Map; import javax.websocket.Session; -import org.junit.Before; import org.junit.Test; + import org.mockito.Mockito; import org.springframework.http.HttpHeaders; @@ -36,19 +36,13 @@ import static org.mockito.BDDMockito.*; */ public class StandardWebSocketSessionTests { - private HttpHeaders headers; - - private Map attributes; + private final HttpHeaders headers = new HttpHeaders(); - - @Before - public void setup() { - this.headers = new HttpHeaders(); - this.attributes = new HashMap<>(); - } + private final Map attributes = new HashMap<>(); @Test + @SuppressWarnings("resource") public void getPrincipalWithConstructorArg() { TestPrincipal user = new TestPrincipal("joe"); StandardWebSocketSession session = new StandardWebSocketSession(this.headers, this.attributes, null, null, user); @@ -57,8 +51,8 @@ public class StandardWebSocketSessionTests { } @Test + @SuppressWarnings("resource") public void getPrincipalWithNativeSession() { - TestPrincipal user = new TestPrincipal("joe"); Session nativeSession = Mockito.mock(Session.class); @@ -71,8 +65,8 @@ public class StandardWebSocketSessionTests { } @Test + @SuppressWarnings("resource") public void getPrincipalNone() { - Session nativeSession = Mockito.mock(Session.class); given(nativeSession.getUserPrincipal()).willReturn(null); @@ -86,8 +80,8 @@ public class StandardWebSocketSessionTests { } @Test + @SuppressWarnings("resource") public void getAcceptedProtocol() { - String protocol = "foo"; Session nativeSession = Mockito.mock(Session.class);