From 2a0441275b1f72f1e217aebe66d0eb16d4ed3de4 Mon Sep 17 00:00:00 2001 From: Otavio Rodolfo Piske Date: Thu, 3 Sep 2020 19:08:12 +0200 Subject: [PATCH] camel-rabbitmq: fixed deprecation warnings in test code --- .../rabbitmq/integration/RabbitMQInOutIntTest.java | 5 +++-- .../component/rabbitmq/integration/RabbitMQLoadIntTest.java | 3 ++- .../rabbitmq/integration/RabbitMQReConnectionIntTest.java | 3 ++- .../integration/RabbitMQRequeueHandledExceptionIntTest.java | 5 +++-- .../rabbitmq/integration/RabbitMQRequeueIntTest.java | 6 ++++-- .../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 1a62ce7001005..d5dd973e866ad 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.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 @@ protected RouteBuilder createRouteBuilder() throws Exception { 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 void process(Exchange exchange) throws Exception { }); 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 d725c1a51ce63..2923d15f6f39c 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 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 @@ protected RouteBuilder createRouteBuilder() throws Exception { @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 28bd81676a7cf..536deee99ea5d 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 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 @@ protected RouteBuilder createRouteBuilder() throws Exception { 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 7072c8ee66dcd..658671a81a0dd 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 @@ 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 @@ protected RouteBuilder createRouteBuilder() throws Exception { @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 de09b6e937d19..d9a731ee0d239 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 @@ 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 @@ protected RouteBuilder createRouteBuilder() { @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 0d1882328be3b..cf0da70e24a62 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 @@ 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 @@ protected RouteBuilder createRouteBuilder() throws Exception { @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")); } };