Skip to content

camel-rabbitmq: fixed deprecation warnings in test code #4157

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
davsclaus merged 1 commit into from
Sep 4, 2020
Merged

camel-rabbitmq: fixed deprecation warnings in test code #4157

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions ...q/src/test/java/org/apache/camel/component/rabbitmq/integration/RabbitMQInOutIntTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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 {
Expand Down Expand Up @@ -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"));
Expand Down
3 changes: 2 additions & 1 deletion ...mq/src/test/java/org/apache/camel/component/rabbitmq/integration/RabbitMQLoadIntTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);
}
Expand Down
3 changes: 2 additions & 1 deletion ...est/java/org/apache/camel/component/rabbitmq/integration/RabbitMQReConnectionIntTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);
}
};
Expand Down
5 changes: 3 additions & 2 deletions ...g/apache/camel/component/rabbitmq/integration/RabbitMQRequeueHandledExceptionIntTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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"));
}
};
Expand Down
6 changes: 4 additions & 2 deletions ...src/test/java/org/apache/camel/component/rabbitmq/integration/RabbitMQRequeueIntTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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"));
}
};
Expand Down
6 changes: 4 additions & 2 deletions ...apache/camel/component/rabbitmq/integration/RabbitMQRequeueUnhandledExceptionIntTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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"));
}
};
Expand Down