Skip to content

Commit bf9ec78

Browse files
sbrannensbrannen
committed
Polish spring-messsaging
- Removed unused imports - Organized imports - Discontinued use of deprecated junit.framework.Assert class - Suppressed warnings where appropriate - Added missing generics to return type for getMappingComparator() in SimpAnnotationMethodMessageHandler
1 parent 4043b1d commit bf9ec78

File tree

9 files changed

+58
-59
lines changed

9 files changed

+58
-59
lines changed

‎spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/support/AnnotationExceptionHandlerMethodResolver.java

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,16 @@
1717
package org.springframework.messaging.handler.annotation.support;
1818

1919
import java.lang.reflect.Method;
20-
import java.util.*;
21-
import java.util.concurrent.ConcurrentHashMap;
20+
import java.util.ArrayList;
21+
import java.util.Arrays;
22+
import java.util.HashMap;
23+
import java.util.List;
24+
import java.util.Map;
2225

23-
import org.springframework.core.ExceptionDepthComparator;
2426
import org.springframework.core.annotation.AnnotationUtils;
2527
import org.springframework.messaging.handler.annotation.MessageExceptionHandler;
2628
import org.springframework.messaging.handler.method.AbstractExceptionHandlerMethodResolver;
2729
import org.springframework.messaging.handler.method.HandlerMethodSelector;
28-
import org.springframework.util.Assert;
29-
import org.springframework.util.ClassUtils;
3030
import org.springframework.util.ReflectionUtils.MethodFilter;
3131

3232

@@ -41,7 +41,6 @@
4141
*/
4242
public class AnnotationExceptionHandlerMethodResolver extends AbstractExceptionHandlerMethodResolver {
4343

44-
4544
/**
4645
* A constructor that finds {@link MessageExceptionHandler} methods in the given type.
4746
* @param handlerType the type to introspect

‎spring-messaging/src/main/java/org/springframework/messaging/handler/condition/AbstractMessageCondition.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@
1616

1717
package org.springframework.messaging.handler.condition;
1818

19-
import org.springframework.web.servlet.mvc.condition.RequestCondition;
20-
2119
import java.util.Collection;
2220
import java.util.Iterator;
2321

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

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,22 @@
1616

1717
package org.springframework.messaging.handler.condition;
1818

19+
import java.util.ArrayList;
20+
import java.util.Arrays;
21+
import java.util.Collection;
22+
import java.util.Collections;
23+
import java.util.Comparator;
24+
import java.util.Iterator;
25+
import java.util.LinkedHashSet;
26+
import java.util.List;
27+
import java.util.Set;
28+
1929
import org.springframework.messaging.Message;
2030
import org.springframework.messaging.handler.method.AbstractMethodMessageHandler;
2131
import org.springframework.util.AntPathMatcher;
22-
import org.springframework.util.Assert;
2332
import org.springframework.util.PathMatcher;
2433
import org.springframework.util.StringUtils;
2534

26-
import java.util.*;
27-
2835
/**
2936
* A {@link MessageCondition} for matching the destination of a Message against one or
3037
* more destination patterns using a {@link PathMatcher}.

‎spring-messaging/src/main/java/org/springframework/messaging/simp/handler/SimpAnnotationMethodMessageHandler.java

Lines changed: 20 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,13 @@
1717
package org.springframework.messaging.simp.handler;
1818

1919
import java.lang.reflect.Method;
20-
import java.util.*;
20+
import java.util.ArrayList;
21+
import java.util.Collection;
22+
import java.util.Comparator;
23+
import java.util.LinkedHashSet;
24+
import java.util.List;
25+
import java.util.Map;
26+
import java.util.Set;
2127

2228
import org.springframework.beans.factory.config.ConfigurableBeanFactory;
2329
import org.springframework.context.ConfigurableApplicationContext;
@@ -28,9 +34,18 @@
2834
import org.springframework.messaging.MessageChannel;
2935
import org.springframework.messaging.core.AbstractMessageSendingTemplate;
3036
import org.springframework.messaging.handler.annotation.MessageMapping;
31-
import org.springframework.messaging.handler.annotation.support.*;
37+
import org.springframework.messaging.handler.annotation.support.AnnotationExceptionHandlerMethodResolver;
38+
import org.springframework.messaging.handler.annotation.support.HeaderMethodArgumentResolver;
39+
import org.springframework.messaging.handler.annotation.support.HeadersMethodArgumentResolver;
40+
import org.springframework.messaging.handler.annotation.support.MessageMethodArgumentResolver;
41+
import org.springframework.messaging.handler.annotation.support.PathVariableMethodArgumentResolver;
42+
import org.springframework.messaging.handler.annotation.support.PayloadArgumentResolver;
3243
import org.springframework.messaging.handler.condition.DestinationPatternsMessageCondition;
33-
import org.springframework.messaging.handler.method.*;
44+
import org.springframework.messaging.handler.method.AbstractExceptionHandlerMethodResolver;
45+
import org.springframework.messaging.handler.method.AbstractMethodMessageHandler;
46+
import org.springframework.messaging.handler.method.HandlerMethod;
47+
import org.springframework.messaging.handler.method.HandlerMethodArgumentResolver;
48+
import org.springframework.messaging.handler.method.HandlerMethodReturnValueHandler;
3449
import org.springframework.messaging.simp.SimpMessageHeaderAccessor;
3550
import org.springframework.messaging.simp.SimpMessageSendingOperations;
3651
import org.springframework.messaging.simp.SimpMessagingTemplate;
@@ -255,7 +270,7 @@ protected SimpMessageMappingInfo getMatchingMapping(SimpMessageMappingInfo mappi
255270
}
256271

257272
@Override
258-
protected Comparator getMappingComparator(final Message<?> message) {
273+
protected Comparator<SimpMessageMappingInfo> getMappingComparator(final Message<?> message) {
259274
return new Comparator<SimpMessageMappingInfo>() {
260275
@Override
261276
public int compare(SimpMessageMappingInfo info1, SimpMessageMappingInfo info2) {
@@ -292,4 +307,4 @@ protected AbstractExceptionHandlerMethodResolver createExceptionHandlerMethodRes
292307
return new AnnotationExceptionHandlerMethodResolver(beanType);
293308
}
294309

295-
}
310+
}

‎spring-messaging/src/main/java/org/springframework/messaging/support/tcp/ReactorTcpConnection.java

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,20 +16,10 @@
1616

1717
package org.springframework.messaging.support.tcp;
1818

19-
import java.util.concurrent.ExecutionException;
20-
import java.util.concurrent.TimeUnit;
21-
import java.util.concurrent.TimeoutException;
22-
2319
import org.springframework.messaging.Message;
2420
import org.springframework.util.concurrent.ListenableFuture;
25-
import org.springframework.util.concurrent.ListenableFutureCallback;
26-
import org.springframework.util.concurrent.ListenableFutureCallbackRegistry;
2721

28-
import reactor.core.composable.Deferred;
2922
import reactor.core.composable.Promise;
30-
import reactor.core.composable.spec.DeferredPromiseSpec;
31-
import reactor.function.Consumer;
32-
3323

3424
public class ReactorTcpConnection<P> implements TcpConnection<P> {
3525

‎spring-messaging/src/test/java/org/springframework/messaging/handler/annotation/support/PathVariableMethodArgumentResolverTests.java

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
import org.springframework.core.convert.support.DefaultConversionService;
2929
import org.springframework.messaging.Message;
3030
import org.springframework.messaging.handler.annotation.PathVariable;
31-
import org.springframework.messaging.simp.handler.SimpAnnotationMethodMessageHandler;
3231
import org.springframework.messaging.support.MessageBuilder;
3332

3433
import static org.junit.Assert.*;
@@ -45,12 +44,12 @@ public class PathVariableMethodArgumentResolverTests {
4544
private MethodParameter paramAnnotatedValue;
4645
private MethodParameter paramNotAnnotated;
4746

47+
4848
@Before
4949
public void setup() throws Exception {
5050
this.resolver = new PathVariableMethodArgumentResolver(new DefaultConversionService());
5151

52-
Method method = getClass().getDeclaredMethod("handleMessage",
53-
String.class, String.class, String.class);
52+
Method method = getClass().getDeclaredMethod("handleMessage", String.class, String.class, String.class);
5453
this.paramAnnotated = new MethodParameter(method, 0);
5554
this.paramAnnotatedValue = new MethodParameter(method, 1);
5655
this.paramNotAnnotated = new MethodParameter(method, 2);
@@ -70,15 +69,15 @@ public void supportsParameter() {
7069

7170
@Test
7271
public void resolveArgument() throws Exception {
73-
Map<String,Object> pathParams = new HashMap<String,Object>();
74-
pathParams.put("foo","bar");
75-
pathParams.put("name","value");
76-
Message<byte[]> message = MessageBuilder.withPayload(new byte[0])
77-
.setHeader(PathVariableMethodArgumentResolver.PATH_TEMPLATE_VARIABLES_HEADER, pathParams).build();
72+
Map<String, Object> pathParams = new HashMap<String, Object>();
73+
pathParams.put("foo", "bar");
74+
pathParams.put("name", "value");
75+
Message<byte[]> message = MessageBuilder.withPayload(new byte[0]).setHeader(
76+
PathVariableMethodArgumentResolver.PATH_TEMPLATE_VARIABLES_HEADER, pathParams).build();
7877
Object result = this.resolver.resolveArgument(this.paramAnnotated, message);
79-
assertEquals("bar",result);
78+
assertEquals("bar", result);
8079
result = this.resolver.resolveArgument(this.paramAnnotatedValue, message);
81-
assertEquals("value",result);
80+
assertEquals("value", result);
8281
}
8382

8483
@Test(expected = MessageHandlingException.class)
@@ -88,9 +87,6 @@ public void resolveArgumentNotFound() throws Exception {
8887
}
8988

9089
@SuppressWarnings("unused")
91-
private void handleMessage(
92-
@PathVariable String foo,
93-
@PathVariable(value = "name") String param1,
94-
String param3) {
90+
private void handleMessage(@PathVariable String foo, @PathVariable(value = "name") String param1, String param3) {
9591
}
9692
}

‎spring-messaging/src/test/java/org/springframework/messaging/simp/handler/SimpMessageTypeMessageConditionTests.java

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,13 @@
1616

1717
package org.springframework.messaging.simp.handler;
1818

19-
2019
import org.junit.Test;
2120
import org.springframework.messaging.Message;
22-
import org.springframework.messaging.handler.condition.DestinationPatternsMessageCondition;
2321
import org.springframework.messaging.simp.SimpMessageHeaderAccessor;
2422
import org.springframework.messaging.simp.SimpMessageType;
2523
import org.springframework.messaging.support.MessageBuilder;
2624

27-
import static junit.framework.Assert.assertNotNull;
28-
import static junit.framework.Assert.assertNull;
29-
import static org.junit.Assert.assertEquals;
25+
import static org.junit.Assert.*;
3026

3127
/**
3228
* Unit tests for SimpMessageTypeMessageCondition.
@@ -35,7 +31,6 @@
3531
*/
3632
public class SimpMessageTypeMessageConditionTests {
3733

38-
3934
@Test
4035
public void combineEmptySets() {
4136
SimpMessageTypeMessageCondition c1 = condition();
@@ -85,7 +80,6 @@ public void compareTo() {
8580
assertEquals(0, condition(SimpMessageType.MESSAGE).compareTo(condition(SimpMessageType.MESSAGE), message));
8681
}
8782

88-
8983
private Message<byte[]> message(SimpMessageType messageType) {
9084
MessageBuilder<byte[]> builder = MessageBuilder.withPayload(new byte[0]);
9185
if (messageType != null) {

‎spring-messaging/src/test/java/org/springframework/messaging/simp/stomp/StompBrokerRelayMessageHandlerTests.java

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,27 +15,26 @@
1515
*/
1616
package org.springframework.messaging.simp.stomp;
1717

18+
import java.util.ArrayList;
19+
import java.util.Arrays;
20+
import java.util.List;
21+
import java.util.concurrent.Callable;
22+
1823
import org.junit.Before;
1924
import org.junit.Test;
20-
import org.springframework.messaging.*;
25+
import org.springframework.messaging.Message;
26+
import org.springframework.messaging.MessageChannel;
2127
import org.springframework.messaging.simp.SimpMessageHeaderAccessor;
2228
import org.springframework.messaging.simp.SimpMessageType;
2329
import org.springframework.messaging.support.MessageBuilder;
24-
import org.springframework.messaging.support.channel.ExecutorSubscribableChannel;
2530
import org.springframework.messaging.support.tcp.ReconnectStrategy;
2631
import org.springframework.messaging.support.tcp.TcpConnection;
2732
import org.springframework.messaging.support.tcp.TcpConnectionHandler;
2833
import org.springframework.messaging.support.tcp.TcpOperations;
2934
import org.springframework.util.concurrent.ListenableFuture;
30-
import org.springframework.util.concurrent.ListenableFutureAdapter;
3135
import org.springframework.util.concurrent.ListenableFutureTask;
3236

33-
import java.util.ArrayList;
34-
import java.util.Arrays;
35-
import java.util.List;
36-
import java.util.concurrent.Callable;
37-
38-
import static org.junit.Assert.assertEquals;
37+
import static org.junit.Assert.*;
3938

4039
/**
4140
* Unit tests for StompBrokerRelayMessageHandler.
@@ -169,12 +168,14 @@ private static class StubMessageChannel implements MessageChannel {
169168

170169

171170
@Override
171+
@SuppressWarnings("unchecked")
172172
public boolean send(Message<?> message) {
173173
this.messages.add((Message<byte[]>) message);
174174
return true;
175175
}
176176

177177
@Override
178+
@SuppressWarnings("unchecked")
178179
public boolean send(Message<?> message, long timeout) {
179180
this.messages.add((Message<byte[]>) message);
180181
return true;

‎spring-messaging/src/test/java/org/springframework/messaging/support/channel/PublishSubscibeChannelTests.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434
import static org.hamcrest.Matchers.*;
3535
import static org.junit.Assert.*;
3636
import static org.mockito.BDDMockito.*;
37-
import static org.mockito.Mockito.*;
3837

3938
/**
4039
* Tests for {@link ExecutorSubscribableChannel}.
@@ -46,7 +45,6 @@ public class PublishSubscibeChannelTests {
4645
@Rule
4746
public ExpectedException thrown = ExpectedException.none();
4847

49-
5048
private ExecutorSubscribableChannel channel = new ExecutorSubscribableChannel();
5149

5250
@Mock
@@ -118,7 +116,7 @@ public void failurePropagates() throws Exception {
118116
try {
119117
this.channel.send(message);
120118
}
121-
catch(MessageDeliveryException actualException) {
119+
catch (MessageDeliveryException actualException) {
122120
assertThat((RuntimeException) actualException.getCause(), equalTo(ex));
123121
}
124122
verifyZeroInteractions(secondHandler);
@@ -127,6 +125,7 @@ public void failurePropagates() throws Exception {
127125
@Test
128126
public void concurrentModification() throws Exception {
129127
this.channel.subscribe(new MessageHandler() {
128+
130129
@Override
131130
public void handleMessage(Message<?> message) throws MessagingException {
132131
channel.unsubscribe(handler);

0 commit comments

Comments
 (0)