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

Moved the ID from Message to MessageHeaders.

Browse Source
This commit is contained in:
Mark Fisher
2008-08-11 15:30:37 +00:00
parent e6c63cfb0b
commit 6f930ff27b
19 changed files with 54 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
org.springframework.integration/src/test/java/org/springframework/integration/channel/interceptor/WireTapTests.java
View File

@@ -88,9 +88,9 @@ public class WireTapTests {
mainChannel.send(new StringMessage("testing"));
Message<?> original = mainChannel.receive(0);
Message<?> duplicate = secondaryChannel.receive(0);
Object duplicateId = duplicate.getId();
Object duplicateId = duplicate.getHeaders().getId();
assertNotNull(duplicateId);
assertFalse("message ids should not match", original.getId().equals(duplicateId));
assertFalse("message ids should not match", original.getHeaders().getId().equals(duplicateId));
}
@Test
@@ -103,7 +103,7 @@ public class WireTapTests {
Message<?> duplicate = secondaryChannel.receive(0);
Object originalIdAttribute = duplicate.getHeaders().get(WireTap.ORIGINAL_MESSAGE_ID_KEY);
assertNotNull(originalIdAttribute);
assertEquals(original.getId(), originalIdAttribute);
assertEquals(original.getHeaders().getId(), originalIdAttribute);
}
@Test

4
org.springframework.integration/src/test/java/org/springframework/integration/endpoint/HandlerEndpointTests.java
View File

@@ -273,7 +273,7 @@ public class HandlerEndpointTests {
.setReturnAddress(replyChannel).build();
endpoint.send(message);
Message<?> reply = replyChannel.receive(500);
assertEquals(message.getId(), reply.getHeaders().getCorrelationId());
assertEquals(message.getHeaders().getId(), reply.getHeaders().getCorrelationId());
}
@Test
@@ -290,7 +290,7 @@ public class HandlerEndpointTests {
endpoint.send(message);
Message<?> reply = replyChannel.receive(500);
Object correlationId = reply.getHeaders().getCorrelationId();
assertFalse(message.getId().equals(correlationId));
assertFalse(message.getHeaders().getId().equals(correlationId));
assertEquals("ABC-123", correlationId);
}

4
org.springframework.integration/src/test/java/org/springframework/integration/gateway/SimpleMessagingGatewayTests.java
View File

@@ -161,7 +161,7 @@ public class SimpleMessagingGatewayTests {
expect(replyChannel.getName()).andReturn("replyChannel").anyTimes();
expect(messageMock.getHeaders()).andReturn(messageHeadersMock);
expect(requestChannel.send(messageMock)).andReturn(true);
expect(messageMock.getId()).andReturn(1);
expect(messageHeadersMock.getId()).andReturn(1);
//play scenario
replay(allmocks);
@@ -198,7 +198,7 @@ public class SimpleMessagingGatewayTests {
expect(messageMock.getHeaders()).andReturn(messageHeadersMock);
expect(messageHeadersMock.getReturnAddress()).andReturn(replyChannel);
expect(requestChannel.send(messageMock)).andReturn(true);
expect(messageMock.getId()).andReturn(1);
expect(messageHeadersMock.getId()).andReturn(1);
replay(allmocks);
this.simpleMessagingGateway.sendAndReceiveMessage(messageMock);

2
org.springframework.integration/src/test/java/org/springframework/integration/gateway/config/GatewayParserTests.java
View File

@@ -95,7 +95,7 @@ public class GatewayParserTests {
public void run() {
Message<?> request = requestChannel.receive();
Message<String> reply = MessageBuilder.fromPayload(request.getPayload() + "bar")
.setCorrelationId(request.getId()).build();
.setCorrelationId(request.getHeaders().getId()).build();
replyChannel.send(reply);
}
});

6
org.springframework.integration/src/test/java/org/springframework/integration/handler/CorrelationIdTests.java
View File

@@ -56,7 +56,7 @@ public class CorrelationIdTests {
adapter.setMethodName("upperCase");
adapter.afterPropertiesSet();
Message<?> reply = adapter.handle(message);
assertEquals(message.getId(), reply.getHeaders().getCorrelationId());
assertEquals(message.getHeaders().getId(), reply.getHeaders().getCorrelationId());
}
@Test
@@ -127,8 +127,8 @@ public class CorrelationIdTests {
splitter.handle(message);
Message<?> reply1 = testChannel.receive(100);
Message<?> reply2 = testChannel.receive(100);
assertEquals(message.getId(), reply1.getHeaders().getCorrelationId());
assertEquals(message.getId(), reply2.getHeaders().getCorrelationId());
assertEquals(message.getHeaders().getId(), reply1.getHeaders().getCorrelationId());
assertEquals(message.getHeaders().getId(), reply2.getHeaders().getCorrelationId());
}

8
org.springframework.integration/src/test/java/org/springframework/integration/router/SplitterMessageHandlerAdapterTests.java
View File

@@ -225,12 +225,12 @@ public class SplitterMessageHandlerAdapterTests {
assertNotNull(reply1);
assertEquals(new Integer(2), reply1.getHeaders().getSequenceSize());
assertEquals(new Integer(1), reply1.getHeaders().getSequenceNumber());
assertEquals(message.getId(), reply1.getHeaders().getCorrelationId());
assertEquals(message.getHeaders().getId(), reply1.getHeaders().getCorrelationId());
Message<?> reply2 = testChannel.receive(0);
assertNotNull(reply2);
assertEquals(new Integer(2), reply2.getHeaders().getSequenceSize());
assertEquals(new Integer(2), reply2.getHeaders().getSequenceNumber());
assertEquals(message.getId(), reply2.getHeaders().getCorrelationId());
assertEquals(message.getHeaders().getId(), reply2.getHeaders().getCorrelationId());
}
@Test
@@ -242,12 +242,12 @@ public class SplitterMessageHandlerAdapterTests {
assertNotNull(reply1);
assertEquals(new Integer(2), reply1.getHeaders().getSequenceSize());
assertEquals(new Integer(1), reply1.getHeaders().getSequenceNumber());
assertEquals(message.getId(), reply1.getHeaders().getCorrelationId());
assertEquals(message.getHeaders().getId(), reply1.getHeaders().getCorrelationId());
Message<?> reply2 = testChannel.receive(0);
assertNotNull(reply2);
assertEquals(new Integer(2), reply2.getHeaders().getSequenceSize());
assertEquals(new Integer(2), reply2.getHeaders().getSequenceNumber());
assertEquals(message.getId(), reply2.getHeaders().getCorrelationId());
assertEquals(message.getHeaders().getId(), reply2.getHeaders().getCorrelationId());
}