You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2020/09/04 04:20:46 UTC
[camel] branch master updated: camel-rabbitmq: fixed deprecation
warnings in test code (#4157)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new 3c1126e camel-rabbitmq: fixed deprecation warnings in test code (#4157)
3c1126e is described below
commit 3c1126ea8f202e14adc4f0ea0e2f4aac54952d08
Author: Otavio Rodolfo Piske <or...@users.noreply.github.com>
AuthorDate: Fri Sep 4 06:20:30 2020 +0200
camel-rabbitmq: fixed deprecation warnings in test code (#4157)
---
.../camel/component/rabbitmq/integration/RabbitMQInOutIntTest.java | 5 +++--
.../camel/component/rabbitmq/integration/RabbitMQLoadIntTest.java | 3 ++-
.../component/rabbitmq/integration/RabbitMQReConnectionIntTest.java | 3 ++-
.../integration/RabbitMQRequeueHandledExceptionIntTest.java | 5 +++--
.../component/rabbitmq/integration/RabbitMQRequeueIntTest.java | 6 ++++--
.../integration/RabbitMQRequeueUnhandledExceptionIntTest.java | 6 ++++--
6 files changed, 18 insertions(+), 10 deletions(-)
diff --git a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/RabbitMQInOutIntTest.java b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/RabbitMQInOutIntTest.java
index 1a62ce7..d5dd973 100644
--- a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/RabbitMQInOutIntTest.java
+++ b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/RabbitMQInOutIntTest.java
@@ -31,6 +31,7 @@ import org.apache.camel.CamelExecutionException;
import org.apache.camel.Endpoint;
import org.apache.camel.EndpointInject;
import org.apache.camel.Exchange;
+import org.apache.camel.ExchangePattern;
import org.apache.camel.Processor;
import org.apache.camel.Produce;
import org.apache.camel.ProducerTemplate;
@@ -99,7 +100,7 @@ public class RabbitMQInOutIntTest extends AbstractRabbitMQIntTest {
public void configure() throws Exception {
from("direct:rabbitMQ").id("producingRoute").setHeader("routeHeader", simple("routeHeader"))
- .inOut(rabbitMQEndpoint);
+ .to(ExchangePattern.InOut, rabbitMQEndpoint);
from(rabbitMQEndpoint).id("consumingRoute").log("Receiving message").process(new Processor() {
public void process(Exchange exchange) throws Exception {
@@ -132,7 +133,7 @@ public class RabbitMQInOutIntTest extends AbstractRabbitMQIntTest {
});
from("direct:rabbitMQNoAutoAck").id("producingRouteNoAutoAck").setHeader("routeHeader", simple("routeHeader"))
- .inOut(noAutoAckEndpoint);
+ .to(ExchangePattern.InOut, noAutoAckEndpoint);
from(noAutoAckEndpoint).id("consumingRouteNoAutoAck").to(resultEndpoint)
.throwException(new IllegalStateException("test exception"));
diff --git a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/RabbitMQLoadIntTest.java b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/RabbitMQLoadIntTest.java
index d725c1a..2923d15 100644
--- a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/RabbitMQLoadIntTest.java
+++ b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/RabbitMQLoadIntTest.java
@@ -25,6 +25,7 @@ import java.util.concurrent.TimeUnit;
import org.apache.camel.Endpoint;
import org.apache.camel.EndpointInject;
+import org.apache.camel.ExchangePattern;
import org.apache.camel.Produce;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
@@ -61,7 +62,7 @@ public class RabbitMQLoadIntTest extends AbstractRabbitMQIntTest {
@Override
public void configure() throws Exception {
- from("direct:rabbitMQ").id("producingRoute").log("Sending message").inOnly(rabbitMQEndpoint)
+ from("direct:rabbitMQ").id("producingRoute").log("Sending message").to(ExchangePattern.InOnly, rabbitMQEndpoint)
.to(producingMockEndpoint);
from(rabbitMQEndpoint).id("consumingRoute").log("Receiving message").to(consumingMockEndpoint);
}
diff --git a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/RabbitMQReConnectionIntTest.java b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/RabbitMQReConnectionIntTest.java
index 28bd816..536deee 100644
--- a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/RabbitMQReConnectionIntTest.java
+++ b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/RabbitMQReConnectionIntTest.java
@@ -23,6 +23,7 @@ import com.rabbitmq.client.AlreadyClosedException;
import org.apache.camel.CamelExecutionException;
import org.apache.camel.Endpoint;
import org.apache.camel.EndpointInject;
+import org.apache.camel.ExchangePattern;
import org.apache.camel.Produce;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
@@ -67,7 +68,7 @@ public class RabbitMQReConnectionIntTest extends AbstractRabbitMQIntTest {
public void configure() throws Exception {
from("direct:rabbitMQ").id("producingRoute").onException(AlreadyClosedException.class, ConnectException.class)
.maximumRedeliveries(10).redeliveryDelay(500L).end()
- .log("Sending message").inOnly(rabbitMQEndpoint).to(producingMockEndpoint);
+ .log("Sending message").to(ExchangePattern.InOnly, rabbitMQEndpoint).to(producingMockEndpoint);
from(rabbitMQEndpoint).id("consumingRoute").log("Receiving message").to(consumingMockEndpoint);
}
};
diff --git a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/RabbitMQRequeueHandledExceptionIntTest.java b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/RabbitMQRequeueHandledExceptionIntTest.java
index 7072c8e..658671a 100644
--- a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/RabbitMQRequeueHandledExceptionIntTest.java
+++ b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/RabbitMQRequeueHandledExceptionIntTest.java
@@ -18,6 +18,7 @@ package org.apache.camel.component.rabbitmq.integration;
import org.apache.camel.Endpoint;
import org.apache.camel.EndpointInject;
+import org.apache.camel.ExchangePattern;
import org.apache.camel.Produce;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
@@ -50,11 +51,11 @@ public class RabbitMQRequeueHandledExceptionIntTest extends AbstractRabbitMQIntT
@Override
public void configure() throws Exception {
- from("direct:rabbitMQ").id("producingRoute").log("Sending message").inOnly(rabbitMQEndpoint)
+ from("direct:rabbitMQ").id("producingRoute").log("Sending message").to(ExchangePattern.InOnly, rabbitMQEndpoint)
.to(producingMockEndpoint);
from(rabbitMQEndpoint).onException(Exception.class).handled(true).end().id("consumingRoute")
- .log("Receiving message").inOnly(consumingMockEndpoint)
+ .log("Receiving message").to(ExchangePattern.InOnly, consumingMockEndpoint)
.throwException(new Exception("Simulated handled exception"));
}
};
diff --git a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/RabbitMQRequeueIntTest.java b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/RabbitMQRequeueIntTest.java
index de09b6e..d9a731e 100644
--- a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/RabbitMQRequeueIntTest.java
+++ b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/RabbitMQRequeueIntTest.java
@@ -18,6 +18,7 @@ package org.apache.camel.component.rabbitmq.integration;
import org.apache.camel.Endpoint;
import org.apache.camel.EndpointInject;
+import org.apache.camel.ExchangePattern;
import org.apache.camel.Produce;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
@@ -83,10 +84,11 @@ public class RabbitMQRequeueIntTest extends AbstractRabbitMQIntTest {
@Override
public void configure() {
- from("direct:rabbitMQ").id("producingRoute").log("Sending message").inOnly(rabbitMQEndpoint)
+ from("direct:rabbitMQ").id("producingRoute").log("Sending message").to(ExchangePattern.InOnly, rabbitMQEndpoint)
.to(producingMockEndpoint);
- from(rabbitMQEndpoint).id("consumingRoute").log("Receiving message").inOnly(consumingMockEndpoint)
+ from(rabbitMQEndpoint).id("consumingRoute").log("Receiving message")
+ .to(ExchangePattern.InOnly, consumingMockEndpoint)
.throwException(new Exception("Simulated exception"));
}
};
diff --git a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/RabbitMQRequeueUnhandledExceptionIntTest.java b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/RabbitMQRequeueUnhandledExceptionIntTest.java
index 0d18823..cf0da70 100644
--- a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/RabbitMQRequeueUnhandledExceptionIntTest.java
+++ b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/RabbitMQRequeueUnhandledExceptionIntTest.java
@@ -18,6 +18,7 @@ package org.apache.camel.component.rabbitmq.integration;
import org.apache.camel.Endpoint;
import org.apache.camel.EndpointInject;
+import org.apache.camel.ExchangePattern;
import org.apache.camel.Produce;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
@@ -50,11 +51,12 @@ public class RabbitMQRequeueUnhandledExceptionIntTest extends AbstractRabbitMQIn
@Override
public void configure() throws Exception {
- from("direct:rabbitMQ").id("producingRoute").log("Sending message").inOnly(rabbitMQEndpoint)
+ from("direct:rabbitMQ").id("producingRoute").log("Sending message")
+ .to(ExchangePattern.InOnly, rabbitMQEndpoint)
.to(producingMockEndpoint);
from(rabbitMQEndpoint).onException(Exception.class).handled(false).end().id("consumingRoute")
- .log("Receiving message").inOnly(consumingMockEndpoint)
+ .log("Receiving message").to(ExchangePattern.InOnly, consumingMockEndpoint)
.throwException(new Exception("Simulated unhandled exception"));
}
};