From bf93f0c5e95e1835d6266190e02d87b1da5c8d21 Mon Sep 17 00:00:00 2001 From: Sam Brannen Date: Mon, 22 Sep 2014 14:29:21 +0200 Subject: [PATCH] Clean up warnings in spring-messaging --- .../core/AbstractMessageReceivingTemplate.java | 1 - .../invocation/AbstractMethodMessageHandler.java | 1 - .../messaging/simp/SimpMessageHeaderAccessor.java | 2 +- .../messaging/simp/SimpMessagingTemplate.java | 1 - .../config/AbstractMessageBrokerConfiguration.java | 1 - .../simp/stomp/StompBrokerRelayMessageHandler.java | 2 +- .../messaging/support/MessageHeaderAccessor.java | 1 - .../messaging/tcp/reactor/Reactor11TcpClient.java | 1 + .../messaging/converter/MessageConverterTests.java | 10 +--------- .../handler/invocation/MethodMessageHandlerTests.java | 3 +++ .../messaging/simp/SimpSessionScopeTests.java | 1 + .../support/SendToMethodReturnValueHandlerTests.java | 1 - .../SimpAnnotationMethodMessageHandlerTests.java | 1 + .../SubscriptionMethodReturnValueHandlerTests.java | 2 +- ...StompBrokerRelayMessageHandlerIntegrationTests.java | 3 ++- .../support/ExecutorSubscribableChannelTests.java | 2 ++ .../messaging/support/MessageBuilderTests.java | 2 +- .../support/NativeMessageHeaderAccessorTests.java | 1 - 18 files changed, 15 insertions(+), 21 deletions(-) diff --git a/spring-messaging/src/main/java/org/springframework/messaging/core/AbstractMessageReceivingTemplate.java b/spring-messaging/src/main/java/org/springframework/messaging/core/AbstractMessageReceivingTemplate.java index a0f1d6d561..56e85c9925 100644 --- a/spring-messaging/src/main/java/org/springframework/messaging/core/AbstractMessageReceivingTemplate.java +++ b/spring-messaging/src/main/java/org/springframework/messaging/core/AbstractMessageReceivingTemplate.java @@ -56,7 +56,6 @@ public abstract class AbstractMessageReceivingTemplate extends AbstractMessag return receiveAndConvert(getRequiredDefaultDestination(), targetClass); } - @SuppressWarnings("unchecked") @Override public T receiveAndConvert(D destination, Class targetClass) { Message message = doReceive(destination); diff --git a/spring-messaging/src/main/java/org/springframework/messaging/handler/invocation/AbstractMethodMessageHandler.java b/spring-messaging/src/main/java/org/springframework/messaging/handler/invocation/AbstractMethodMessageHandler.java index 6fb0b3c3d0..63705fe870 100644 --- a/spring-messaging/src/main/java/org/springframework/messaging/handler/invocation/AbstractMethodMessageHandler.java +++ b/spring-messaging/src/main/java/org/springframework/messaging/handler/invocation/AbstractMethodMessageHandler.java @@ -43,7 +43,6 @@ import org.springframework.messaging.handler.HandlerMethod; import org.springframework.messaging.handler.HandlerMethodSelector; import org.springframework.messaging.support.MessageBuilder; import org.springframework.messaging.support.MessageHeaderAccessor; -import org.springframework.util.Assert; import org.springframework.util.ClassUtils; import org.springframework.util.CollectionUtils; import org.springframework.util.LinkedMultiValueMap; diff --git a/spring-messaging/src/main/java/org/springframework/messaging/simp/SimpMessageHeaderAccessor.java b/spring-messaging/src/main/java/org/springframework/messaging/simp/SimpMessageHeaderAccessor.java index 067cb960b5..8c72328d7f 100644 --- a/spring-messaging/src/main/java/org/springframework/messaging/simp/SimpMessageHeaderAccessor.java +++ b/spring-messaging/src/main/java/org/springframework/messaging/simp/SimpMessageHeaderAccessor.java @@ -189,7 +189,7 @@ public class SimpMessageHeaderAccessor extends NativeMessageHeaderAccessor { sb.append(" attributes=").append(getSessionAttributes()); } if (!CollectionUtils.isEmpty((Map>) getHeader(NATIVE_HEADERS))) { - sb.append(" nativeHeaders=").append((Map>) getHeader(NATIVE_HEADERS)); + sb.append(" nativeHeaders=").append(getHeader(NATIVE_HEADERS)); } sb.append(getDetailedPayloadLogMessage(payload)); return sb.toString(); diff --git a/spring-messaging/src/main/java/org/springframework/messaging/simp/SimpMessagingTemplate.java b/spring-messaging/src/main/java/org/springframework/messaging/simp/SimpMessagingTemplate.java index caab70e767..a0e7b09e5f 100644 --- a/spring-messaging/src/main/java/org/springframework/messaging/simp/SimpMessagingTemplate.java +++ b/spring-messaging/src/main/java/org/springframework/messaging/simp/SimpMessagingTemplate.java @@ -144,7 +144,6 @@ public class SimpMessagingTemplate extends AbstractMessageSendingTemplate message) { Assert.notNull(destination, "Destination must not be null"); diff --git a/spring-messaging/src/main/java/org/springframework/messaging/simp/config/AbstractMessageBrokerConfiguration.java b/spring-messaging/src/main/java/org/springframework/messaging/simp/config/AbstractMessageBrokerConfiguration.java index be198b1b83..56c4a1c25d 100644 --- a/spring-messaging/src/main/java/org/springframework/messaging/simp/config/AbstractMessageBrokerConfiguration.java +++ b/spring-messaging/src/main/java/org/springframework/messaging/simp/config/AbstractMessageBrokerConfiguration.java @@ -42,7 +42,6 @@ import org.springframework.messaging.support.AbstractSubscribableChannel; import org.springframework.messaging.support.ExecutorSubscribableChannel; import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; import org.springframework.util.ClassUtils; -import org.springframework.util.CollectionUtils; import org.springframework.util.MimeTypeUtils; import org.springframework.util.PathMatcher; import org.springframework.validation.Errors; diff --git a/spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompBrokerRelayMessageHandler.java b/spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompBrokerRelayMessageHandler.java index fb211b5854..6ea47a793b 100644 --- a/spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompBrokerRelayMessageHandler.java +++ b/spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompBrokerRelayMessageHandler.java @@ -733,7 +733,7 @@ public class StompBrokerRelayMessageHandler extends AbstractBrokerMessageHandler if (this.isRemoteClientSession) { if (logger.isDebugEnabled()) { logger.debug("TCP connection closed already, ignoring " + - accessor.getShortLogMessage((byte[]) message.getPayload())); + accessor.getShortLogMessage(message.getPayload())); } return EMPTY_TASK; } diff --git a/spring-messaging/src/main/java/org/springframework/messaging/support/MessageHeaderAccessor.java b/spring-messaging/src/main/java/org/springframework/messaging/support/MessageHeaderAccessor.java index 1cbeb20c3e..094b2162fa 100644 --- a/spring-messaging/src/main/java/org/springframework/messaging/support/MessageHeaderAccessor.java +++ b/spring-messaging/src/main/java/org/springframework/messaging/support/MessageHeaderAccessor.java @@ -555,7 +555,6 @@ public class MessageHeaderAccessor { * @return an accessor instance of the specified type, or {@code null} if none * @since 4.1 */ - @SuppressWarnings("unchecked") public static T getAccessor(Message message, Class requiredType) { return getAccessor(message.getHeaders(), requiredType); } diff --git a/spring-messaging/src/main/java/org/springframework/messaging/tcp/reactor/Reactor11TcpClient.java b/spring-messaging/src/main/java/org/springframework/messaging/tcp/reactor/Reactor11TcpClient.java index c27d55105b..291de4adf4 100644 --- a/spring-messaging/src/main/java/org/springframework/messaging/tcp/reactor/Reactor11TcpClient.java +++ b/spring-messaging/src/main/java/org/springframework/messaging/tcp/reactor/Reactor11TcpClient.java @@ -57,6 +57,7 @@ import reactor.tuple.Tuple2; */ public class Reactor11TcpClient

implements TcpOperations

{ + @SuppressWarnings("rawtypes") public static final Class REACTOR_TCP_CLIENT_TYPE = NettyTcpClient.class; diff --git a/spring-messaging/src/test/java/org/springframework/messaging/converter/MessageConverterTests.java b/spring-messaging/src/test/java/org/springframework/messaging/converter/MessageConverterTests.java index 5375d27d59..5db5967900 100644 --- a/spring-messaging/src/test/java/org/springframework/messaging/converter/MessageConverterTests.java +++ b/spring-messaging/src/test/java/org/springframework/messaging/converter/MessageConverterTests.java @@ -22,7 +22,6 @@ import java.util.Collections; import java.util.HashMap; import java.util.Map; -import org.junit.Before; import org.junit.Test; import org.springframework.messaging.Message; import org.springframework.messaging.MessageHeaders; @@ -42,13 +41,7 @@ import static org.junit.Assert.*; */ public class MessageConverterTests { - private TestMessageConverter converter; - - - @Before - public void setup() { - this.converter = new TestMessageConverter(); - } + private TestMessageConverter converter = new TestMessageConverter(); @Test public void supportsTargetClass() { @@ -105,7 +98,6 @@ public class MessageConverterTests { @Test(expected = IllegalArgumentException.class) public void setStrictContentTypeMatchWithNoSupportedMimeTypes() { - Message message = MessageBuilder.withPayload("ABC").build(); this.converter = new TestMessageConverter(Collections.emptyList()); this.converter.setStrictContentTypeMatch(true); } diff --git a/spring-messaging/src/test/java/org/springframework/messaging/handler/invocation/MethodMessageHandlerTests.java b/spring-messaging/src/test/java/org/springframework/messaging/handler/invocation/MethodMessageHandlerTests.java index 10f8f42338..a72f4c6e55 100644 --- a/spring-messaging/src/test/java/org/springframework/messaging/handler/invocation/MethodMessageHandlerTests.java +++ b/spring-messaging/src/test/java/org/springframework/messaging/handler/invocation/MethodMessageHandlerTests.java @@ -130,6 +130,7 @@ public class MethodMessageHandlerTests { } + @SuppressWarnings("unused") private static class TestController { public String method; @@ -140,6 +141,7 @@ public class MethodMessageHandlerTests { this.method = "pathMatchWildcard"; } + @SuppressWarnings("rawtypes") public void handlerArgumentResolver(Message message) { this.method = "handlerArgumentResolver"; this.arguments.put("message", message); @@ -164,6 +166,7 @@ public class MethodMessageHandlerTests { } + @SuppressWarnings("unused") private static class DuplicateMappingsController { public void handlerFoo() { } diff --git a/spring-messaging/src/test/java/org/springframework/messaging/simp/SimpSessionScopeTests.java b/spring-messaging/src/test/java/org/springframework/messaging/simp/SimpSessionScopeTests.java index dec5f11b3a..46409bec21 100644 --- a/spring-messaging/src/test/java/org/springframework/messaging/simp/SimpSessionScopeTests.java +++ b/spring-messaging/src/test/java/org/springframework/messaging/simp/SimpSessionScopeTests.java @@ -39,6 +39,7 @@ public class SimpSessionScopeTests { private SimpSessionScope scope; + @SuppressWarnings("rawtypes") private ObjectFactory objectFactory; private SimpAttributes simpAttributes; diff --git a/spring-messaging/src/test/java/org/springframework/messaging/simp/annotation/support/SendToMethodReturnValueHandlerTests.java b/spring-messaging/src/test/java/org/springframework/messaging/simp/annotation/support/SendToMethodReturnValueHandlerTests.java index f74ab19983..a03470c0a4 100644 --- a/spring-messaging/src/test/java/org/springframework/messaging/simp/annotation/support/SendToMethodReturnValueHandlerTests.java +++ b/spring-messaging/src/test/java/org/springframework/messaging/simp/annotation/support/SendToMethodReturnValueHandlerTests.java @@ -78,7 +78,6 @@ public class SendToMethodReturnValueHandlerTests { @Before - @SuppressWarnings({ "unchecked", "rawtypes" }) public void setup() throws Exception { MockitoAnnotations.initMocks(this); diff --git a/spring-messaging/src/test/java/org/springframework/messaging/simp/annotation/support/SimpAnnotationMethodMessageHandlerTests.java b/spring-messaging/src/test/java/org/springframework/messaging/simp/annotation/support/SimpAnnotationMethodMessageHandlerTests.java index 5c1366bdd0..536ba7be24 100644 --- a/spring-messaging/src/test/java/org/springframework/messaging/simp/annotation/support/SimpAnnotationMethodMessageHandlerTests.java +++ b/spring-messaging/src/test/java/org/springframework/messaging/simp/annotation/support/SimpAnnotationMethodMessageHandlerTests.java @@ -87,6 +87,7 @@ public class SimpAnnotationMethodMessageHandlerTests { @Test + @SuppressWarnings("unchecked") public void headerArgumentResolution() { SimpMessageHeaderAccessor headers = SimpMessageHeaderAccessor.create(); headers.setSessionId("session1"); diff --git a/spring-messaging/src/test/java/org/springframework/messaging/simp/annotation/support/SubscriptionMethodReturnValueHandlerTests.java b/spring-messaging/src/test/java/org/springframework/messaging/simp/annotation/support/SubscriptionMethodReturnValueHandlerTests.java index 424af87ffa..1cccb9d7a8 100644 --- a/spring-messaging/src/test/java/org/springframework/messaging/simp/annotation/support/SubscriptionMethodReturnValueHandlerTests.java +++ b/spring-messaging/src/test/java/org/springframework/messaging/simp/annotation/support/SubscriptionMethodReturnValueHandlerTests.java @@ -124,8 +124,8 @@ public class SubscriptionMethodReturnValueHandlerTests { assertEquals(MIME_TYPE, headerAccessor.getContentType()); } - @SuppressWarnings("unchecked") @Test + @SuppressWarnings({ "unchecked", "rawtypes" }) public void testHeadersPassedToMessagingTemplate() throws Exception { String sessionId = "sess1"; diff --git a/spring-messaging/src/test/java/org/springframework/messaging/simp/stomp/StompBrokerRelayMessageHandlerIntegrationTests.java b/spring-messaging/src/test/java/org/springframework/messaging/simp/stomp/StompBrokerRelayMessageHandlerIntegrationTests.java index 52e82e64ac..b099b72ac9 100644 --- a/spring-messaging/src/test/java/org/springframework/messaging/simp/stomp/StompBrokerRelayMessageHandlerIntegrationTests.java +++ b/spring-messaging/src/test/java/org/springframework/messaging/simp/stomp/StompBrokerRelayMessageHandlerIntegrationTests.java @@ -32,7 +32,6 @@ import org.junit.After; import org.junit.Before; import org.junit.Rule; import org.junit.Test; - import org.junit.rules.TestName; import org.springframework.context.ApplicationEvent; import org.springframework.context.ApplicationEventPublisher; @@ -386,6 +385,8 @@ public class StompBrokerRelayMessageHandlerIntegrationTests { return builder; } + // TODO Determine why connectWithError() is unused. + @SuppressWarnings("unused") public static MessageExchangeBuilder connectWithError(String sessionId) { StompHeaderAccessor headers = StompHeaderAccessor.create(StompCommand.CONNECT); headers.setSessionId(sessionId); diff --git a/spring-messaging/src/test/java/org/springframework/messaging/support/ExecutorSubscribableChannelTests.java b/spring-messaging/src/test/java/org/springframework/messaging/support/ExecutorSubscribableChannelTests.java index f2eeb094b1..d68fb63861 100644 --- a/spring-messaging/src/test/java/org/springframework/messaging/support/ExecutorSubscribableChannelTests.java +++ b/spring-messaging/src/test/java/org/springframework/messaging/support/ExecutorSubscribableChannelTests.java @@ -225,6 +225,8 @@ public class ExecutorSubscribableChannelTests { this.messageToReturn = messageToReturn; } + // TODO Determine why setExceptionToRaise() is unused. + @SuppressWarnings("unused") public void setExceptionToRaise(RuntimeException exception) { this.exceptionToRaise = exception; } diff --git a/spring-messaging/src/test/java/org/springframework/messaging/support/MessageBuilderTests.java b/spring-messaging/src/test/java/org/springframework/messaging/support/MessageBuilderTests.java index 2cef1a3669..848dcf9274 100644 --- a/spring-messaging/src/test/java/org/springframework/messaging/support/MessageBuilderTests.java +++ b/spring-messaging/src/test/java/org/springframework/messaging/support/MessageBuilderTests.java @@ -215,7 +215,7 @@ public class MessageBuilderTests { @Test public void testBuildMultipleMessages() { MessageHeaderAccessor headerAccessor = new MessageHeaderAccessor(); - MessageBuilder messageBuilder = MessageBuilder.withPayload("payload").setHeaders(headerAccessor); + MessageBuilder messageBuilder = MessageBuilder.withPayload("payload").setHeaders(headerAccessor); headerAccessor.setHeader("foo", "bar1"); Message message1 = messageBuilder.build(); diff --git a/spring-messaging/src/test/java/org/springframework/messaging/support/NativeMessageHeaderAccessorTests.java b/spring-messaging/src/test/java/org/springframework/messaging/support/NativeMessageHeaderAccessorTests.java index a4df3d65af..fa243bf317 100644 --- a/spring-messaging/src/test/java/org/springframework/messaging/support/NativeMessageHeaderAccessorTests.java +++ b/spring-messaging/src/test/java/org/springframework/messaging/support/NativeMessageHeaderAccessorTests.java @@ -85,7 +85,6 @@ public class NativeMessageHeaderAccessorTests { Map actual = headerAccessor.toMap(); assertEquals(0, actual.size()); - @SuppressWarnings("unchecked") Map> actualNativeHeaders = headerAccessor.toNativeHeaderMap(); assertEquals(Collections.emptyMap(), actualNativeHeaders); }