Browse Source

Remove unused imports

pull/617/head
Stephane Nicoll 12 years ago
parent
commit
3da68cfe21
  1. 1
      spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/AbstractAutoProxyCreator.java
  2. 1
      spring-beans/src/test/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessorTests.java
  3. 2
      spring-beans/src/test/java/org/springframework/beans/factory/support/FactoryAwareOrderProviderTests.java
  4. 1
      spring-context/src/main/java/org/springframework/scheduling/annotation/AsyncConfigurationSelector.java
  5. 1
      spring-context/src/main/java/org/springframework/scheduling/concurrent/ScheduledExecutorFactoryBean.java
  6. 4
      spring-context/src/test/java/org/springframework/cache/interceptor/CacheErrorHandlerTests.java
  7. 1
      spring-jms/src/main/java/org/springframework/jms/listener/AbstractPollingMessageListenerContainer.java
  8. 1
      spring-jms/src/test/java/org/springframework/jms/config/MethodJmsListenerEndpointTests.java
  9. 1
      spring-jms/src/test/java/org/springframework/jms/support/converter/MessagingMessageConverterTests.java
  10. 2
      spring-messaging/src/main/java/org/springframework/messaging/core/AbstractMessagingTemplate.java
  11. 1
      spring-messaging/src/main/java/org/springframework/messaging/handler/DestinationPatternsMessageCondition.java
  12. 3
      spring-messaging/src/main/java/org/springframework/messaging/simp/annotation/SendToUser.java
  13. 1
      spring-messaging/src/main/java/org/springframework/messaging/simp/annotation/support/SendToMethodReturnValueHandler.java
  14. 1
      spring-messaging/src/main/java/org/springframework/messaging/simp/config/MessageBrokerRegistry.java
  15. 3
      spring-messaging/src/test/java/org/springframework/messaging/simp/SimpSessionScopeTests.java
  16. 2
      spring-messaging/src/test/java/org/springframework/messaging/simp/config/MessageBrokerConfigurationTests.java
  17. 1
      spring-messaging/src/test/java/org/springframework/messaging/simp/stomp/StompHeaderAccessorTests.java
  18. 1
      spring-messaging/src/test/java/org/springframework/messaging/support/MessageHeaderAccessorTests.java
  19. 1
      spring-test/src/test/java/org/springframework/test/context/jdbc/SqlScriptsTestExecutionListenerTests.java
  20. 1
      spring-web/src/test/java/org/springframework/http/HttpHeadersTests.java
  21. 2
      spring-web/src/test/java/org/springframework/http/RequestEntityTests.java
  22. 1
      spring-web/src/test/java/org/springframework/http/converter/json/MappingJackson2HttpMessageConverterTests.java
  23. 1
      spring-web/src/test/java/org/springframework/web/method/annotation/RequestParamMethodArgumentResolverTests.java
  24. 1
      spring-webmvc/src/main/java/org/springframework/web/servlet/config/AnnotationDrivenBeanDefinitionParser.java
  25. 1
      spring-webmvc/src/main/java/org/springframework/web/servlet/config/TilesConfigurerBeanDefinitionParser.java
  26. 1
      spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/BeanTypeNotPresentCondition.java
  27. 2
      spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/ResourceHandlerRegistry.java
  28. 2
      spring-webmvc/src/main/java/org/springframework/web/servlet/handler/HandlerMethodMappingNamingStrategy.java
  29. 2
      spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/RequestMappingInfoHandlerMethodMappingNamingStrategy.java
  30. 1
      spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/HttpEntityMethodProcessor.java
  31. 2
      spring-webmvc/src/main/java/org/springframework/web/servlet/resource/PathResourceResolver.java
  32. 1
      spring-webmvc/src/main/java/org/springframework/web/servlet/resource/ResourceTransformer.java
  33. 1
      spring-webmvc/src/main/java/org/springframework/web/servlet/resource/ResourceTransformerChain.java
  34. 2
      spring-webmvc/src/test/java/org/springframework/web/servlet/config/MvcNamespaceTests.java
  35. 1
      spring-websocket/src/main/java/org/springframework/web/socket/client/WebSocketConnectionManager.java
  36. 2
      spring-websocket/src/main/java/org/springframework/web/socket/sockjs/client/TransportRequest.java
  37. 3
      spring-websocket/src/main/java/org/springframework/web/socket/sockjs/client/XhrTransport.java
  38. 2
      spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/TransportHandlingSockJsService.java
  39. 1
      spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/handler/SockJsWebSocketHandler.java
  40. 3
      spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/session/PollingSockJsSession.java
  41. 4
      spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/session/StreamingSockJsSession.java
  42. 1
      spring-websocket/src/test/java/org/springframework/web/socket/WebSocketIntegrationTests.java
  43. 1
      spring-websocket/src/test/java/org/springframework/web/socket/adapter/jetty/JettyWebSocketSessionTests.java
  44. 1
      spring-websocket/src/test/java/org/springframework/web/socket/adapter/standard/StandardWebSocketSessionTests.java
  45. 2
      spring-websocket/src/test/java/org/springframework/web/socket/config/HandlersBeanDefinitionParserTests.java
  46. 2
      spring-websocket/src/test/java/org/springframework/web/socket/config/annotation/WebMvcStompWebSocketEndpointRegistrationTests.java
  47. 4
      spring-websocket/src/test/java/org/springframework/web/socket/config/annotation/WebSocketMessageBrokerConfigurationSupportTests.java
  48. 4
      spring-websocket/src/test/java/org/springframework/web/socket/sockjs/client/JettySockJsIntegrationTests.java
  49. 2
      spring-websocket/src/test/java/org/springframework/web/socket/sockjs/client/RestTemplateXhrTransportTests.java
  50. 2
      spring-websocket/src/test/java/org/springframework/web/socket/sockjs/client/SockJsUrlInfoTests.java
  51. 1
      spring-websocket/src/test/java/org/springframework/web/socket/sockjs/client/XhrTransportTests.java

1
spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/AbstractAutoProxyCreator.java

@ -45,7 +45,6 @@ import org.springframework.beans.factory.BeanFactoryAware; @@ -45,7 +45,6 @@ import org.springframework.beans.factory.BeanFactoryAware;
import org.springframework.beans.factory.config.ConfigurableBeanFactory;
import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
import org.springframework.beans.factory.config.SmartInstantiationAwareBeanPostProcessor;
import org.springframework.core.Ordered;
/**
* {@link org.springframework.beans.factory.config.BeanPostProcessor} implementation

1
spring-beans/src/test/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessorTests.java

@ -52,7 +52,6 @@ import org.springframework.tests.sample.beans.TestBean; @@ -52,7 +52,6 @@ import org.springframework.tests.sample.beans.TestBean;
import org.springframework.util.SerializationTestUtils;
import static org.junit.Assert.*;
import static org.mockito.Matchers.any;
import static org.mockito.Mockito.*;
/**

2
spring-beans/src/test/java/org/springframework/beans/factory/support/FactoryAwareOrderProviderTests.java

@ -18,8 +18,6 @@ package org.springframework.beans.factory.support; @@ -18,8 +18,6 @@ package org.springframework.beans.factory.support;
import static org.junit.Assert.*;
import static org.mockito.BDDMockito.*;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import java.lang.reflect.Method;
import java.util.HashMap;

1
spring-context/src/main/java/org/springframework/scheduling/annotation/AsyncConfigurationSelector.java

@ -18,7 +18,6 @@ package org.springframework.scheduling.annotation; @@ -18,7 +18,6 @@ package org.springframework.scheduling.annotation;
import org.springframework.context.annotation.AdviceMode;
import org.springframework.context.annotation.AdviceModeImportSelector;
import org.springframework.context.annotation.AnnotationConfigUtils;
/**
* Selects which implementation of {@link AbstractAsyncConfiguration} should be used based

1
spring-context/src/main/java/org/springframework/scheduling/concurrent/ScheduledExecutorFactoryBean.java

@ -28,7 +28,6 @@ import org.springframework.lang.UsesJava7; @@ -28,7 +28,6 @@ import org.springframework.lang.UsesJava7;
import org.springframework.scheduling.support.DelegatingErrorHandlingRunnable;
import org.springframework.scheduling.support.TaskUtils;
import org.springframework.util.Assert;
import org.springframework.util.ClassUtils;
import org.springframework.util.ObjectUtils;
/**

4
spring-context/src/test/java/org/springframework/cache/interceptor/CacheErrorHandlerTests.java vendored

@ -18,11 +18,7 @@ package org.springframework.cache.interceptor; @@ -18,11 +18,7 @@ package org.springframework.cache.interceptor;
import static org.hamcrest.CoreMatchers.*;
import static org.junit.Assert.*;
import static org.mockito.BDDMockito.doReturn;
import static org.mockito.BDDMockito.doThrow;
import static org.mockito.BDDMockito.*;
import static org.mockito.BDDMockito.verify;
import static org.mockito.Mockito.mock;
import java.util.Arrays;
import java.util.concurrent.atomic.AtomicLong;

1
spring-jms/src/main/java/org/springframework/jms/listener/AbstractPollingMessageListenerContainer.java

@ -22,7 +22,6 @@ import javax.jms.JMSException; @@ -22,7 +22,6 @@ import javax.jms.JMSException;
import javax.jms.Message;
import javax.jms.MessageConsumer;
import javax.jms.Session;
import javax.jms.Topic;
import org.springframework.jms.connection.ConnectionFactoryUtils;
import org.springframework.jms.connection.JmsResourceHolder;

1
spring-jms/src/test/java/org/springframework/jms/config/MethodJmsListenerEndpointTests.java

@ -64,7 +64,6 @@ import org.springframework.validation.annotation.Validated; @@ -64,7 +64,6 @@ import org.springframework.validation.annotation.Validated;
import static org.junit.Assert.*;
import static org.mockito.BDDMockito.*;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
/**
* @author Stephane Nicoll

1
spring-jms/src/test/java/org/springframework/jms/support/converter/MessagingMessageConverterTests.java

@ -19,7 +19,6 @@ package org.springframework.jms.support.converter; @@ -19,7 +19,6 @@ package org.springframework.jms.support.converter;
import static org.junit.Assert.*;
import static org.mockito.BDDMockito.*;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import java.io.Serializable;

2
spring-messaging/src/main/java/org/springframework/messaging/core/AbstractMessagingTemplate.java

@ -19,8 +19,6 @@ package org.springframework.messaging.core; @@ -19,8 +19,6 @@ package org.springframework.messaging.core;
import java.util.Map;
import org.springframework.messaging.Message;
import org.springframework.messaging.MessageHeaders;
import org.springframework.messaging.converter.MessageConversionException;
/**
* An extension of {@link AbstractMessageReceivingTemplate} that adds support for

1
spring-messaging/src/main/java/org/springframework/messaging/handler/DestinationPatternsMessageCondition.java

@ -21,7 +21,6 @@ import java.util.Arrays; @@ -21,7 +21,6 @@ import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.Comparator;
import java.util.HashSet;
import java.util.Iterator;
import java.util.LinkedHashSet;
import java.util.List;

3
spring-messaging/src/main/java/org/springframework/messaging/simp/annotation/SendToUser.java

@ -22,9 +22,6 @@ import java.lang.annotation.Retention; @@ -22,9 +22,6 @@ import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
import org.springframework.messaging.Message;
import org.springframework.messaging.simp.SimpMessageHeaderAccessor;
/**
* Annotation that indicates the return value of a message-handling method should
* be sent as a {@link org.springframework.messaging.Message} to the specified

1
spring-messaging/src/main/java/org/springframework/messaging/simp/annotation/support/SendToMethodReturnValueHandler.java

@ -32,7 +32,6 @@ import org.springframework.messaging.simp.user.DestinationUserNameProvider; @@ -32,7 +32,6 @@ import org.springframework.messaging.simp.user.DestinationUserNameProvider;
import org.springframework.messaging.support.MessageHeaderInitializer;
import org.springframework.util.Assert;
import org.springframework.util.ObjectUtils;
import org.springframework.util.StringUtils;
import java.lang.annotation.Annotation;
import java.security.Principal;

1
spring-messaging/src/main/java/org/springframework/messaging/simp/config/MessageBrokerRegistry.java

@ -23,7 +23,6 @@ import org.springframework.messaging.MessageChannel; @@ -23,7 +23,6 @@ import org.springframework.messaging.MessageChannel;
import org.springframework.messaging.SubscribableChannel;
import org.springframework.messaging.simp.broker.SimpleBrokerMessageHandler;
import org.springframework.messaging.simp.stomp.StompBrokerRelayMessageHandler;
import org.springframework.util.AntPathMatcher;
import org.springframework.util.Assert;
import org.springframework.util.PathMatcher;

3
spring-messaging/src/test/java/org/springframework/messaging/simp/SimpSessionScopeTests.java

@ -20,10 +20,9 @@ import org.junit.After; @@ -20,10 +20,9 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.mockito.Mockito;
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.ObjectFactory;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import static org.junit.Assert.assertThat;

2
spring-messaging/src/test/java/org/springframework/messaging/simp/config/MessageBrokerConfigurationTests.java

@ -27,7 +27,7 @@ import org.junit.Before; @@ -27,7 +27,7 @@ import org.junit.Before;
import org.junit.Test;
import org.mockito.Mockito;
import org.springframework.beans.DirectFieldAccessor;
import org.springframework.context.annotation.AnnotationConfigApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;

1
spring-messaging/src/test/java/org/springframework/messaging/simp/stomp/StompHeaderAccessorTests.java

@ -32,7 +32,6 @@ import org.springframework.messaging.support.MessageBuilder; @@ -32,7 +32,6 @@ import org.springframework.messaging.support.MessageBuilder;
import org.springframework.messaging.support.MessageHeaderAccessor;
import org.springframework.util.AlternativeJdkIdGenerator;
import org.springframework.util.LinkedMultiValueMap;
import org.springframework.util.MimeType;
import org.springframework.util.MimeTypeUtils;
import org.springframework.util.MultiValueMap;

1
spring-messaging/src/test/java/org/springframework/messaging/support/MessageHeaderAccessorTests.java

@ -23,7 +23,6 @@ import java.util.HashSet; @@ -23,7 +23,6 @@ import java.util.HashSet;
import java.util.Map;
import java.util.UUID;
import org.hamcrest.CoreMatchers;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.ExpectedException;

1
spring-test/src/test/java/org/springframework/test/context/jdbc/SqlScriptsTestExecutionListenerTests.java

@ -25,7 +25,6 @@ import org.springframework.test.context.TestContext; @@ -25,7 +25,6 @@ import org.springframework.test.context.TestContext;
import org.springframework.test.context.jdbc.SqlConfig.TransactionMode;
import static org.junit.Assert.*;
import static org.mockito.Matchers.*;
import static org.mockito.Mockito.*;
/**

1
spring-web/src/test/java/org/springframework/http/HttpHeadersTests.java

@ -27,7 +27,6 @@ import java.util.EnumSet; @@ -27,7 +27,6 @@ import java.util.EnumSet;
import java.util.GregorianCalendar;
import java.util.List;
import java.util.Locale;
import java.util.Set;
import java.util.TimeZone;
import org.hamcrest.Matchers;

2
spring-web/src/test/java/org/springframework/http/RequestEntityTests.java

@ -23,7 +23,7 @@ import java.util.HashMap; @@ -23,7 +23,7 @@ import java.util.HashMap;
import java.util.Map;
import static org.junit.Assert.*;
import static org.junit.Assert.assertEquals;
import org.junit.Test;

1
spring-web/src/test/java/org/springframework/http/converter/json/MappingJackson2HttpMessageConverterTests.java

@ -27,7 +27,6 @@ import java.util.Map; @@ -27,7 +27,6 @@ import java.util.Map;
import com.fasterxml.jackson.annotation.JsonView;
import com.fasterxml.jackson.databind.JavaType;
import com.fasterxml.jackson.databind.ObjectMapper;
import org.hamcrest.CoreMatchers;
import org.junit.Test;
import org.springframework.core.ParameterizedTypeReference;

1
spring-web/src/test/java/org/springframework/web/method/annotation/RequestParamMethodArgumentResolverTests.java

@ -23,7 +23,6 @@ import java.util.Map; @@ -23,7 +23,6 @@ import java.util.Map;
import java.util.Optional;
import javax.servlet.http.Part;
import javax.swing.text.html.Option;
import org.junit.Before;
import org.junit.Test;

1
spring-webmvc/src/main/java/org/springframework/web/servlet/config/AnnotationDrivenBeanDefinitionParser.java

@ -21,7 +21,6 @@ import java.util.Properties; @@ -21,7 +21,6 @@ import java.util.Properties;
import org.w3c.dom.Element;
import org.springframework.beans.BeanMetadataElement;
import org.springframework.beans.factory.FactoryBean;
import org.springframework.beans.factory.InitializingBean;
import org.springframework.beans.factory.config.BeanDefinition;

1
spring-webmvc/src/main/java/org/springframework/web/servlet/config/TilesConfigurerBeanDefinitionParser.java

@ -16,7 +16,6 @@ @@ -16,7 +16,6 @@
package org.springframework.web.servlet.config;
import org.springframework.beans.factory.BeanDefinitionStoreException;
import org.springframework.beans.factory.support.AbstractBeanDefinition;
import org.springframework.beans.factory.support.BeanDefinitionBuilder;
import org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser;

1
spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/BeanTypeNotPresentCondition.java

@ -20,7 +20,6 @@ import org.apache.commons.logging.Log; @@ -20,7 +20,6 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.beans.factory.BeanFactoryUtils;
import org.springframework.beans.factory.ListableBeanFactory;
import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
import org.springframework.context.annotation.ConditionContext;
import org.springframework.context.annotation.ConfigurationCondition;
import org.springframework.core.type.AnnotatedTypeMetadata;

2
spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/ResourceHandlerRegistry.java

@ -32,8 +32,6 @@ import org.springframework.web.servlet.HandlerMapping; @@ -32,8 +32,6 @@ import org.springframework.web.servlet.HandlerMapping;
import org.springframework.web.servlet.handler.AbstractHandlerMapping;
import org.springframework.web.servlet.handler.SimpleUrlHandlerMapping;
import org.springframework.web.servlet.resource.ResourceHttpRequestHandler;
import org.springframework.web.servlet.resource.ResourceResolver;
import org.springframework.web.servlet.resource.ResourceTransformer;
/**
* Stores registrations of resource handlers for serving static resources such as images, css files and others

2
spring-webmvc/src/main/java/org/springframework/web/servlet/handler/HandlerMethodMappingNamingStrategy.java

@ -18,8 +18,6 @@ package org.springframework.web.servlet.handler; @@ -18,8 +18,6 @@ package org.springframework.web.servlet.handler;
import org.springframework.web.method.HandlerMethod;
import java.lang.reflect.Method;
/**
* A strategy for assigning a name to a handler method's mapping.
*

2
spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/RequestMappingInfoHandlerMethodMappingNamingStrategy.java

@ -19,8 +19,6 @@ package org.springframework.web.servlet.mvc.method; @@ -19,8 +19,6 @@ package org.springframework.web.servlet.mvc.method;
import org.springframework.web.method.HandlerMethod;
import org.springframework.web.servlet.handler.HandlerMethodMappingNamingStrategy;
import java.lang.reflect.Method;
/**
* A {@link org.springframework.web.servlet.handler.HandlerMethodMappingNamingStrategy
* HandlerMethodMappingNamingStrategy} for {@code RequestMappingInfo}-based handler

1
spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/HttpEntityMethodProcessor.java

@ -24,7 +24,6 @@ import java.util.List; @@ -24,7 +24,6 @@ import java.util.List;
import org.springframework.core.MethodParameter;
import org.springframework.http.HttpEntity;
import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpInputMessage;
import org.springframework.http.RequestEntity;
import org.springframework.http.ResponseEntity;
import org.springframework.http.converter.HttpMessageConverter;

2
spring-webmvc/src/main/java/org/springframework/web/servlet/resource/PathResourceResolver.java

@ -21,8 +21,6 @@ import java.util.List; @@ -21,8 +21,6 @@ import java.util.List;
import javax.servlet.http.HttpServletRequest;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.core.io.Resource;
/**

1
spring-webmvc/src/main/java/org/springframework/web/servlet/resource/ResourceTransformer.java

@ -20,7 +20,6 @@ import org.springframework.core.io.Resource; @@ -20,7 +20,6 @@ import org.springframework.core.io.Resource;
import javax.servlet.http.HttpServletRequest;
import java.io.IOException;
import java.util.List;
/**
* An abstraction for transforming the content of a resource.

1
spring-webmvc/src/main/java/org/springframework/web/servlet/resource/ResourceTransformerChain.java

@ -20,7 +20,6 @@ import org.springframework.core.io.Resource; @@ -20,7 +20,6 @@ import org.springframework.core.io.Resource;
import javax.servlet.http.HttpServletRequest;
import java.io.IOException;
import java.util.List;
/**
* A contract for invoking a chain of {@link ResourceTransformer}s where each resolver

2
spring-webmvc/src/test/java/org/springframework/web/servlet/config/MvcNamespaceTests.java

@ -37,7 +37,6 @@ import org.springframework.core.io.ClassPathResource; @@ -37,7 +37,6 @@ import org.springframework.core.io.ClassPathResource;
import org.springframework.format.annotation.DateTimeFormat;
import org.springframework.format.annotation.DateTimeFormat.ISO;
import org.springframework.format.support.FormattingConversionServiceFactoryBean;
import org.springframework.http.HttpStatus;
import org.springframework.http.MediaType;
import org.springframework.http.converter.HttpMessageConverter;
import org.springframework.mock.web.test.MockHttpServletRequest;
@ -63,7 +62,6 @@ import org.springframework.web.context.request.async.CallableProcessingIntercept @@ -63,7 +62,6 @@ import org.springframework.web.context.request.async.CallableProcessingIntercept
import org.springframework.web.context.request.async.DeferredResultProcessingInterceptor;
import org.springframework.web.context.request.async.DeferredResultProcessingInterceptorAdapter;
import org.springframework.web.context.support.GenericWebApplicationContext;
import org.springframework.web.context.support.WebApplicationContextUtils;
import org.springframework.web.method.HandlerMethod;
import org.springframework.web.method.support.CompositeUriComponentsContributor;
import org.springframework.web.method.support.InvocableHandlerMethod;

1
spring-websocket/src/main/java/org/springframework/web/socket/client/WebSocketConnectionManager.java

@ -19,7 +19,6 @@ package org.springframework.web.socket.client; @@ -19,7 +19,6 @@ package org.springframework.web.socket.client;
import java.util.List;
import org.springframework.context.Lifecycle;
import org.springframework.context.SmartLifecycle;
import org.springframework.http.HttpHeaders;
import org.springframework.util.concurrent.ListenableFuture;
import org.springframework.util.concurrent.ListenableFutureCallback;

2
spring-websocket/src/main/java/org/springframework/web/socket/sockjs/client/TransportRequest.java

@ -1,9 +1,7 @@ @@ -1,9 +1,7 @@
package org.springframework.web.socket.sockjs.client;
import org.springframework.http.HttpHeaders;
import org.springframework.web.socket.WebSocketSession;
import org.springframework.web.socket.sockjs.frame.SockJsMessageCodec;
import org.springframework.web.socket.sockjs.transport.TransportType;
import java.net.URI;
import java.security.Principal;

3
spring-websocket/src/main/java/org/springframework/web/socket/sockjs/client/XhrTransport.java

@ -1,8 +1,5 @@ @@ -1,8 +1,5 @@
package org.springframework.web.socket.sockjs.client;
import org.springframework.http.HttpHeaders;
import org.springframework.http.ResponseEntity;
import org.springframework.web.socket.CloseStatus;
import org.springframework.web.socket.TextMessage;
import java.net.URI;

2
spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/TransportHandlingSockJsService.java

@ -27,8 +27,6 @@ import java.util.Map; @@ -27,8 +27,6 @@ import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ScheduledFuture;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.http.HttpMethod;
import org.springframework.http.HttpStatus;
import org.springframework.http.server.ServerHttpRequest;

1
spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/handler/SockJsWebSocketHandler.java

@ -17,7 +17,6 @@ @@ -17,7 +17,6 @@
package org.springframework.web.socket.sockjs.transport.handler;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.concurrent.atomic.AtomicInteger;

3
spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/session/PollingSockJsSession.java

@ -16,10 +16,7 @@ @@ -16,10 +16,7 @@
package org.springframework.web.socket.sockjs.transport.session;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.Queue;
import org.springframework.web.socket.WebSocketHandler;
import org.springframework.web.socket.sockjs.SockJsTransportFailureException;

4
spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/session/StreamingSockJsSession.java

@ -18,13 +18,9 @@ package org.springframework.web.socket.sockjs.transport.session; @@ -18,13 +18,9 @@ package org.springframework.web.socket.sockjs.transport.session;
import java.util.Map;
import org.springframework.http.server.ServerHttpRequest;
import org.springframework.http.server.ServerHttpResponse;
import org.springframework.web.socket.WebSocketHandler;
import org.springframework.web.socket.sockjs.SockJsException;
import org.springframework.web.socket.sockjs.SockJsTransportFailureException;
import org.springframework.web.socket.sockjs.frame.SockJsFrame;
import org.springframework.web.socket.sockjs.frame.SockJsFrameFormat;
import org.springframework.web.socket.sockjs.frame.SockJsMessageCodec;
import org.springframework.web.socket.sockjs.transport.SockJsServiceConfig;

1
spring-websocket/src/test/java/org/springframework/web/socket/WebSocketIntegrationTests.java

@ -32,7 +32,6 @@ import org.springframework.web.socket.client.standard.StandardWebSocketClient; @@ -32,7 +32,6 @@ import org.springframework.web.socket.client.standard.StandardWebSocketClient;
import org.springframework.web.socket.config.annotation.EnableWebSocket;
import org.springframework.web.socket.config.annotation.WebSocketConfigurer;
import org.springframework.web.socket.config.annotation.WebSocketHandlerRegistry;
import org.springframework.web.socket.handler.AbstractWebSocketHandler;
import org.springframework.web.socket.handler.TextWebSocketHandler;
import org.springframework.web.socket.server.support.DefaultHandshakeHandler;

1
spring-websocket/src/test/java/org/springframework/web/socket/adapter/jetty/JettyWebSocketSessionTests.java

@ -30,7 +30,6 @@ import java.util.Map; @@ -30,7 +30,6 @@ import java.util.Map;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertSame;
import static org.mockito.Mockito.reset;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyNoMoreInteractions;
import static org.mockito.Mockito.when;

1
spring-websocket/src/test/java/org/springframework/web/socket/adapter/standard/StandardWebSocketSessionTests.java

@ -29,7 +29,6 @@ import static org.junit.Assert.assertEquals; @@ -29,7 +29,6 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertSame;
import static org.mockito.Mockito.reset;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyNoMoreInteractions;
import static org.mockito.Mockito.when;

2
spring-websocket/src/test/java/org/springframework/web/socket/config/HandlersBeanDefinitionParserTests.java

@ -21,11 +21,9 @@ import java.util.List; @@ -21,11 +21,9 @@ import java.util.List;
import java.util.Map;
import java.util.concurrent.ScheduledFuture;
import org.hamcrest.Matchers;
import org.junit.Before;
import org.junit.Test;
import org.springframework.beans.DirectFieldAccessor;
import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
import org.springframework.core.io.ClassPathResource;
import org.springframework.http.server.ServerHttpRequest;

2
spring-websocket/src/test/java/org/springframework/web/socket/config/annotation/WebMvcStompWebSocketEndpointRegistrationTests.java

@ -29,7 +29,6 @@ import org.springframework.scheduling.TaskScheduler; @@ -29,7 +29,6 @@ import org.springframework.scheduling.TaskScheduler;
import org.springframework.util.MultiValueMap;
import org.springframework.web.HttpRequestHandler;
import org.springframework.web.socket.messaging.SubProtocolWebSocketHandler;
import org.springframework.web.socket.server.HandshakeInterceptor;
import org.springframework.web.socket.server.support.DefaultHandshakeHandler;
import org.springframework.web.socket.server.support.HttpSessionHandshakeInterceptor;
import org.springframework.web.socket.server.support.WebSocketHttpRequestHandler;
@ -40,7 +39,6 @@ import org.springframework.web.socket.sockjs.transport.handler.DefaultSockJsServ @@ -40,7 +39,6 @@ import org.springframework.web.socket.sockjs.transport.handler.DefaultSockJsServ
import org.springframework.web.socket.sockjs.transport.handler.WebSocketTransportHandler;
import static org.junit.Assert.*;
import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;
import static org.mockito.Mockito.mock;

4
spring-websocket/src/test/java/org/springframework/web/socket/config/annotation/WebSocketMessageBrokerConfigurationSupportTests.java

@ -22,10 +22,6 @@ import java.util.Map; @@ -22,10 +22,6 @@ import java.util.Map;
import java.util.Set;
import java.util.concurrent.ScheduledThreadPoolExecutor;
import org.hamcrest.Description;
import org.hamcrest.Matcher;
import org.hamcrest.Matchers;
import org.hamcrest.TypeSafeMatcher;
import org.junit.Before;
import org.junit.Test;

4
spring-websocket/src/test/java/org/springframework/web/socket/sockjs/client/JettySockJsIntegrationTests.java

@ -17,9 +17,7 @@ @@ -17,9 +17,7 @@
package org.springframework.web.socket.sockjs.client;
import org.eclipse.jetty.client.HttpClient;
import org.eclipse.jetty.websocket.client.WebSocketClient;
import org.junit.After;
import org.junit.Before;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.web.socket.JettyWebSocketTestServer;

2
spring-websocket/src/test/java/org/springframework/web/socket/sockjs/client/RestTemplateXhrTransportTests.java

@ -55,9 +55,7 @@ import java.util.Queue; @@ -55,9 +55,7 @@ import java.util.Queue;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.LinkedBlockingDeque;
import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.*;
import static org.mockito.Mockito.verifyNoMoreInteractions;
/**
* Unit tests for {@link RestTemplateXhrTransport}.

2
spring-websocket/src/test/java/org/springframework/web/socket/sockjs/client/SockJsUrlInfoTests.java

@ -18,7 +18,7 @@ package org.springframework.web.socket.sockjs.client; @@ -18,7 +18,7 @@ package org.springframework.web.socket.sockjs.client;
import org.junit.Assert;
import org.junit.Test;
import org.springframework.web.socket.sockjs.frame.Jackson2SockJsMessageCodec;
import org.springframework.web.socket.sockjs.transport.TransportType;
import java.net.URI;

1
spring-websocket/src/test/java/org/springframework/web/socket/sockjs/client/XhrTransportTests.java

@ -33,7 +33,6 @@ import java.net.URI; @@ -33,7 +33,6 @@ import java.net.URI;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import static org.mockito.Matchers.notNull;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyNoMoreInteractions;

Loading…
Cancel
Save