You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2018/11/08 08:39:48 UTC
[camel] 06/11: Removed original Synchronization class and corrected
test.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 2e98f129a96028e32b38bfb5bf3725a984e033bb
Author: mionker <mi...@icloud.com>
AuthorDate: Wed Nov 7 21:02:34 2018 +0100
Removed original Synchronization class and corrected test.
---
.../apache/camel/component/nsq/NsqConsumer.java | 22 ------------
.../camel/component/nsq/NsqProducerTest.java | 2 +-
.../apache/camel/component/nsq/NsqTestSupport.java | 42 +++++++---------------
3 files changed, 13 insertions(+), 53 deletions(-)
diff --git a/components/camel-nsq/src/main/java/org/apache/camel/component/nsq/NsqConsumer.java b/components/camel-nsq/src/main/java/org/apache/camel/component/nsq/NsqConsumer.java
index 68faf37..2beaa96 100644
--- a/components/camel-nsq/src/main/java/org/apache/camel/component/nsq/NsqConsumer.java
+++ b/components/camel-nsq/src/main/java/org/apache/camel/component/nsq/NsqConsumer.java
@@ -10,7 +10,6 @@ import org.apache.camel.Exchange;
import org.apache.camel.ExchangePattern;
import org.apache.camel.Processor;
import org.apache.camel.impl.DefaultConsumer;
-import org.apache.camel.spi.Synchronization;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -106,25 +105,4 @@ public class NsqConsumer extends DefaultConsumer {
}
}
}
-
- class Sync implements Synchronization {
-
- @Override
- public void onComplete(final Exchange exchange) {
- try {
- //msg.finished();
- } catch (Exception e) {
- LOG.error(String.format("Could not run completion of exchange %s", exchange), e);
- }
- }
-
- @Override
- public void onFailure(final Exchange exchange) {
- try {
- //msg.requeue((int) config.getRequeueInterval());
- } catch (Exception e) {
- LOG.error(String.format("Could not run failure of exchange %s", exchange), e);
- }
- }
- }
}
diff --git a/components/camel-nsq/src/test/java/org/apache/camel/component/nsq/NsqProducerTest.java b/components/camel-nsq/src/test/java/org/apache/camel/component/nsq/NsqProducerTest.java
index 7623474..32175fe 100644
--- a/components/camel-nsq/src/test/java/org/apache/camel/component/nsq/NsqProducerTest.java
+++ b/components/camel-nsq/src/test/java/org/apache/camel/component/nsq/NsqProducerTest.java
@@ -46,7 +46,7 @@ public class NsqProducerTest extends NsqTestSupport {
counter.incrementAndGet();
message.finished();
lock.countDown();
- assertTrue(new String(message.getMessage()) == TEST_MESSAGE);
+ assertTrue(new String(message.getMessage()).equals(TEST_MESSAGE));
});
consumer.start();
diff --git a/components/camel-nsq/src/test/java/org/apache/camel/component/nsq/NsqTestSupport.java b/components/camel-nsq/src/test/java/org/apache/camel/component/nsq/NsqTestSupport.java
index e210529..2219397 100644
--- a/components/camel-nsq/src/test/java/org/apache/camel/component/nsq/NsqTestSupport.java
+++ b/components/camel-nsq/src/test/java/org/apache/camel/component/nsq/NsqTestSupport.java
@@ -17,58 +17,40 @@ public class NsqTestSupport extends ContainerAwareTestSupport {
public static final String CONTAINER_NSQD_IMAGE = "nsqio/nsq";
public static final String CONTAINER_NSQD_NAME = "nsqd";
- Network network = Network.newNetwork();
+ Network network;
@Override
protected List<GenericContainer<?>> createContainers() {
+ network = Network.newNetwork();
return new ArrayList<GenericContainer<?>>(
Arrays.asList(
- new FixedHostPortGenericContainer<>(CONTAINER_NSQLOOKUPD_IMAGE)
- .withFixedExposedPort(4160, 4160)
- .withFixedExposedPort(4161, 4161)
- .withNetworkAliases(CONTAINER_NSQLOOKUPD_NAME)
- .withCommand("/nsqlookupd").withNetwork(network),
- new FixedHostPortGenericContainer<>(CONTAINER_NSQD_IMAGE)
- .withFixedExposedPort(4150, 4150)
- .withFixedExposedPort(4151, 4151)
- .withNetworkAliases(CONTAINER_NSQD_NAME)
- .withCommand(String.format("/nsqd --broadcast-address=%s --lookupd-tcp-address=%s:4160",
- "localhost", CONTAINER_NSQLOOKUPD_NAME)).withNetwork(network)
+ nsqlookupdContainer(network),
+ nsqdContainer(network)
));
}
- public static GenericContainer<?> nsqlookupdContainer() {
- return new FixedHostPortGenericContainer(CONTAINER_NSQLOOKUPD_IMAGE)
+ public static GenericContainer<?> nsqlookupdContainer(Network network) {
+ return new FixedHostPortGenericContainer<>(CONTAINER_NSQLOOKUPD_IMAGE)
.withFixedExposedPort(4160, 4160)
.withFixedExposedPort(4161, 4161)
.withNetworkAliases(CONTAINER_NSQLOOKUPD_NAME)
- .withCommand("/nsqlookupd");
+ .withCommand("/nsqlookupd").withNetwork(network);
}
- public static GenericContainer<?> nsqdContainer() {
- return new FixedHostPortGenericContainer(CONTAINER_NSQD_IMAGE)
+ public static GenericContainer<?> nsqdContainer(Network network) {
+ return new FixedHostPortGenericContainer<>(CONTAINER_NSQD_IMAGE)
.withFixedExposedPort(4150, 4150)
.withFixedExposedPort(4151, 4151)
.withNetworkAliases(CONTAINER_NSQD_NAME)
.withCommand(String.format("/nsqd --broadcast-address=%s --lookupd-tcp-address=%s:4160",
- "localhost", CONTAINER_NSQLOOKUPD_NAME));
+ "localhost", CONTAINER_NSQLOOKUPD_NAME)).withNetwork(network);
}
public String getNsqConsumerUrl() {
- String format = String.format(
- "%s:%d", "localhost", 4161
- //getContainerHost(CONTAINER_NSQLOOKUPD_NAME),
- //getContainerPort(CONTAINER_NSQLOOKUPD_NAME, NsqConstants.NSQ_DEFAULT_LOOKUP_PORT_HTTP)
- );
- return format;
+ return String.format("%s:%d", "localhost", 4161);
}
public String getNsqProducerUrl() {
- String format = String.format(
- "%s:%d", "localhost", 4150
- //getContainerHost(CONTAINER_NSQD_NAME),
- //getContainerPort(CONTAINER_NSQD_NAME, NsqConstants.NSQ_DEFAULT_PORT)
- );
- return format;
+ return String.format("%s:%d", "localhost", 4150);
}
}