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

Simplified AbstractHandlerEndpointParser and renamed AbstractEndpoint's setMessageSelector to setSelector (for consistency with setSource, setTarget, etc).

Browse Source
This commit is contained in:
Mark Fisher
2008-07-30 14:06:37 +00:00
parent 1c55cd53f6
commit f30c1b73b2
5 changed files with 77 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
org.springframework.integration/src/test/java/org/springframework/integration/dispatcher/SimpleDispatcherTests.java
View File

@@ -76,9 +76,9 @@ public class SimpleDispatcherTests {
HandlerEndpoint endpoint1 = createEndpoint(TestHandlers.countingCountDownHandler(counter1, latch));
HandlerEndpoint endpoint2 = createEndpoint(TestHandlers.countingCountDownHandler(counter2, latch));
HandlerEndpoint endpoint3 = createEndpoint(TestHandlers.countingCountDownHandler(counter3, latch));
endpoint1.setMessageSelector(new TestMessageSelector(selectorCounter, false));
endpoint2.setMessageSelector(new TestMessageSelector(selectorCounter, false));
endpoint3.setMessageSelector(new TestMessageSelector(selectorCounter, true));
endpoint1.setSelector(new TestMessageSelector(selectorCounter, false));
endpoint2.setSelector(new TestMessageSelector(selectorCounter, false));
endpoint3.setSelector(new TestMessageSelector(selectorCounter, true));
dispatcher.addTarget(endpoint1);
dispatcher.addTarget(endpoint2);
dispatcher.addTarget(endpoint3);
@@ -103,9 +103,9 @@ public class SimpleDispatcherTests {
HandlerEndpoint endpoint1 = createEndpoint(TestHandlers.countingCountDownHandler(counter1, latch));
HandlerEndpoint endpoint2 = createEndpoint(TestHandlers.countingCountDownHandler(counter2, latch));
HandlerEndpoint endpoint3 = createEndpoint(TestHandlers.countingCountDownHandler(counter3, latch));
endpoint1.setMessageSelector(new TestMessageSelector(selectorCounter, false));
endpoint2.setMessageSelector(new TestMessageSelector(selectorCounter, false));
endpoint3.setMessageSelector(new TestMessageSelector(selectorCounter, false));
endpoint1.setSelector(new TestMessageSelector(selectorCounter, false));
endpoint2.setSelector(new TestMessageSelector(selectorCounter, false));
endpoint3.setSelector(new TestMessageSelector(selectorCounter, false));
dispatcher.addTarget(endpoint1);
dispatcher.addTarget(endpoint2);
dispatcher.addTarget(endpoint3);

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

@@ -158,7 +158,7 @@ public class HandlerEndpointTests {
@Test(expected=MessageRejectedException.class)
public void testEndpointWithSelectorRejecting() {
HandlerEndpoint endpoint = new HandlerEndpoint(TestHandlers.nullHandler());
endpoint.setMessageSelector(new MessageSelector() {
endpoint.setSelector(new MessageSelector() {
public boolean accept(Message<?> message) {
return false;
}
@@ -170,7 +170,7 @@ public class HandlerEndpointTests {
public void testEndpointWithSelectorAccepting() throws InterruptedException {
CountDownLatch latch = new CountDownLatch(1);
HandlerEndpoint endpoint = new HandlerEndpoint(TestHandlers.countDownHandler(latch));
endpoint.setMessageSelector(new MessageSelector() {
endpoint.setSelector(new MessageSelector() {
public boolean accept(Message<?> message) {
return true;
}
@@ -197,7 +197,7 @@ public class HandlerEndpointTests {
return true;
}
});
endpoint.setMessageSelector(selectorChain);
endpoint.setSelector(selectorChain);
boolean exceptionWasThrown = false;
try {
endpoint.send(new StringMessage("test"));
@@ -227,7 +227,7 @@ public class HandlerEndpointTests {
return false;
}
});
endpoint.setMessageSelector(selectorChain);
endpoint.setSelector(selectorChain);
boolean exceptionWasThrown = false;
try {
endpoint.send(new StringMessage("test"));
@@ -257,7 +257,7 @@ public class HandlerEndpointTests {
return true;
}
});
endpoint.setMessageSelector(selectorChain);
endpoint.setSelector(selectorChain);
assertTrue(endpoint.send(new StringMessage("test")));
assertEquals("both selectors and handler should have been invoked", 3, counter.get());
}