diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/channel/interceptor/WireTap.java b/org.springframework.integration/src/main/java/org/springframework/integration/channel/interceptor/WireTap.java index 34b47fe2a7..885fe3d5b9 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/channel/interceptor/WireTap.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/channel/interceptor/WireTap.java @@ -23,7 +23,6 @@ import org.springframework.context.Lifecycle; import org.springframework.integration.channel.BlockingChannel; import org.springframework.integration.channel.ChannelInterceptor; import org.springframework.integration.channel.MessageChannel; -import org.springframework.integration.message.BlockingTarget; import org.springframework.integration.message.Message; import org.springframework.integration.message.selector.MessageSelector; import org.springframework.util.Assert; diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/message/BlockingTarget.java b/org.springframework.integration/src/main/java/org/springframework/integration/message/BlockingTarget.java deleted file mode 100644 index d14b0d0c23..0000000000 --- a/org.springframework.integration/src/main/java/org/springframework/integration/message/BlockingTarget.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Copyright 2002-2008 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.springframework.integration.message; - -/** - * Extends {@link MessageTarget} and provides a timeout-aware send method. - * - * @author Mark Fisher - */ -public interface BlockingTarget extends MessageTarget { - - - -} diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/aggregator/ResequencerEndpointTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/aggregator/ResequencerEndpointTests.java index ff4bed5400..32796fff19 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/aggregator/ResequencerEndpointTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/aggregator/ResequencerEndpointTests.java @@ -16,9 +16,6 @@ package org.springframework.integration.aggregator; -import java.util.concurrent.CountDownLatch; -import java.util.concurrent.TimeUnit; - import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; @@ -44,14 +41,12 @@ public class ResequencerEndpointTests { Message message1 = createMessage("123", "ABC", 3, 3, replyChannel); Message message2 = createMessage("456", "ABC", 3, 1, replyChannel); Message message3 = createMessage("789", "ABC", 3, 2, replyChannel); - CountDownLatch latch = new CountDownLatch(3); resequencer.handle(message1); resequencer.handle(message3); resequencer.handle(message2); - latch.await(1000, TimeUnit.MILLISECONDS); - Message reply1 = replyChannel.receive(500); - Message reply2 = replyChannel.receive(500); - Message reply3 = replyChannel.receive(500); + Message reply1 = replyChannel.receive(0); + Message reply2 = replyChannel.receive(0); + Message reply3 = replyChannel.receive(0); assertNotNull(reply1); assertEquals(new Integer(1), reply1.getHeaders().getSequenceNumber()); assertNotNull(reply2); @@ -69,26 +64,22 @@ public class ResequencerEndpointTests { Message message2 = createMessage("456", "ABC", 4, 1, replyChannel); Message message3 = createMessage("789", "ABC", 4, 4, replyChannel); Message message4 = createMessage("XYZ", "ABC", 4, 3, replyChannel); - CountDownLatch latch = new CountDownLatch(3); resequencer.handle(message1); resequencer.handle(message2); resequencer.handle(message3); - latch.await(1000, TimeUnit.MILLISECONDS); - Message reply1 = replyChannel.receive(500); - Message reply2 = replyChannel.receive(500); - Message reply3 = replyChannel.receive(500); - // only messages 1 and 2 must have been received by now + Message reply1 = replyChannel.receive(0); + Message reply2 = replyChannel.receive(0); + Message reply3 = replyChannel.receive(0); + // only messages 1 and 2 should have been received by now assertNotNull(reply1); assertEquals(new Integer(1), reply1.getHeaders().getSequenceNumber()); assertNotNull(reply2); assertEquals(new Integer(2), reply2.getHeaders().getSequenceNumber()); assertNull(reply3); // when sending the last message, the whole sequence must have been sent - latch = new CountDownLatch(1); resequencer.handle(message4); - latch.await(1000, TimeUnit.MILLISECONDS); - reply3 = replyChannel.receive(500); - Message reply4 = replyChannel.receive(500); + reply3 = replyChannel.receive(0); + Message reply4 = replyChannel.receive(0); assertNotNull(reply3); assertEquals(new Integer(3), reply3.getHeaders().getSequenceNumber()); assertNotNull(reply4); @@ -105,26 +96,22 @@ public class ResequencerEndpointTests { Message message2 = createMessage("456", "ABC", 4, 1, replyChannel); Message message3 = createMessage("789", "ABC", 4, 4, replyChannel); Message message4 = createMessage("XYZ", "ABC", 4, 3, replyChannel); - CountDownLatch latch = new CountDownLatch(3); resequencer.handle(message1); resequencer.handle(message2); resequencer.handle(message3); - latch.await(1000, TimeUnit.MILLISECONDS); - Message reply1 = replyChannel.receive(500); - Message reply2 = replyChannel.receive(500); - Message reply3 = replyChannel.receive(500); - // no message must have been received by now + Message reply1 = replyChannel.receive(0); + Message reply2 = replyChannel.receive(0); + Message reply3 = replyChannel.receive(0); + // no messages should have been received yet assertNull(reply1); assertNull(reply2); assertNull(reply3); - // when sending the last message, the whole sequence must have been sent - latch = new CountDownLatch(1); + // after sending the last message, the whole sequence should have been sent resequencer.handle(message4); - latch.await(1000, TimeUnit.MILLISECONDS); - reply1 = replyChannel.receive(500); - reply2 = replyChannel.receive(500); - reply3 = replyChannel.receive(500); - Message reply4 = replyChannel.receive(500); + reply1 = replyChannel.receive(0); + reply2 = replyChannel.receive(0); + reply3 = replyChannel.receive(0); + Message reply4 = replyChannel.receive(0); assertNotNull(reply1); assertEquals(new Integer(1), reply1.getHeaders().getSequenceNumber()); assertNotNull(reply2);