Spring/spring-integration
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

INT-4057: Router: don't use convert for Class key

Browse Source 
JIRA: https://jira.spring.io/browse/INT-4057

When general router `channelKey` returns just a `Class<?>` result, we end up with the
`unsupported return type for router [class java.lang.Class]` and forced to to call its `getName()` in the target application code before returning to router.

* Change the `AbstractMappingMessageRouter` logic to treat `Class<?>` as a special String-aware case, use its `getName()` and don't go to the `ConversionService`
* Increase receive timeout for replies in the `TcpInboundGatewayTests`
This commit is contained in:
Artem Bilan
2016-06-15 19:37:00 -04:00
committed by Gary Russell
parent e90d74aefa
commit a7dc7c3912
3 changed files with 64 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/TcpInboundGatewayTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2015 the original author or authors.
* Copyright 2002-2016 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.
@@ -57,6 +57,10 @@ import org.springframework.messaging.core.DestinationResolver;
import org.springframework.messaging.support.GenericMessage;
import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler;
/**
* @author Gary Russell
* @since 2.0
*/
public class TcpInboundGatewayTests {
@Test
@@ -82,8 +86,8 @@ public class TcpInboundGatewayTests {
socket1.getOutputStream().write("Test1\r\n".getBytes());
Socket socket2 = SocketFactory.getDefault().createSocket("localhost", port);
socket2.getOutputStream().write("Test2\r\n".getBytes());
handler.handleMessage(channel.receive(1000));
handler.handleMessage(channel.receive(1000));
handler.handleMessage(channel.receive(10000));
handler.handleMessage(channel.receive(10000));
byte[] bytes = new byte[12];
readFully(socket1.getInputStream(), bytes);
assertEquals("Echo:Test1\r\n", new String(bytes));
@@ -275,24 +279,28 @@ public class TcpInboundGatewayTests {
}
private class Service {
@SuppressWarnings("unused")
public String serviceMethod(byte[] bytes) {
return "Echo:" + new String(bytes);
}
}
private class FailingService {
@SuppressWarnings("unused")
public String serviceMethod(byte[] bytes) {
throw new RuntimeException("Planned Failure For Tests");
}
}
private void readFully(InputStream is, byte[] buff) throws IOException {
for (int i = 0; i < buff.length; i++) {
buff[i] = (byte) is.read();
}
}
private class Service {
@SuppressWarnings("unused")
public String serviceMethod(byte[] bytes) {
return "Echo:" + new String(bytes);
}
}
private class FailingService {
@SuppressWarnings("unused")
public String serviceMethod(byte[] bytes) {
throw new RuntimeException("Planned Failure For Tests");
}
}
}