This is an automated email from the ASF dual-hosted git repository. aldettinger pushed a commit to branch camel-master in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 9ccb7aebf5a8b6d6ddd699211c063616aa7e74a2 Author: aldettinger <[email protected]> AuthorDate: Tue Nov 24 09:54:20 2020 +0100 Revert "nats: enabled connections fine grained tracing to capture more information on next occurence of issue #1978" This reverts commit c8a07f7207c0ead64b3d3fbe2299aaf6d00ff794. --- .../camel/quarkus/component/nats/it/NatsRoutes.java | 17 ++++++++--------- .../camel/quarkus/component/nats/it/NatsTest.java | 15 +++++++-------- 2 files changed, 15 insertions(+), 17 deletions(-) diff --git a/integration-tests/nats/src/main/java/org/apache/camel/quarkus/component/nats/it/NatsRoutes.java b/integration-tests/nats/src/main/java/org/apache/camel/quarkus/component/nats/it/NatsRoutes.java index e830ab2..592c918 100644 --- a/integration-tests/nats/src/main/java/org/apache/camel/quarkus/component/nats/it/NatsRoutes.java +++ b/integration-tests/nats/src/main/java/org/apache/camel/quarkus/component/nats/it/NatsRoutes.java @@ -34,20 +34,19 @@ public class NatsRoutes extends RouteBuilder { @Override public void configure() { - from("natsBasicAuth:test?traceConnection=true").routeId("basic-auth").bean(natsResource, "storeMessage"); - from("natsNoAuth:test?traceConnection=true").routeId("no-auth").bean(natsResource, "storeMessage"); - from("natsTokenAuth:test?traceConnection=true").routeId("token-auth").bean(natsResource, "storeMessage"); - from("natsTlsAuth:test?sslContextParameters=#ssl&secure=true&traceConnection=true").routeId("tls-auth") - .bean(natsResource, "storeMessage"); + from("natsBasicAuth:test").routeId("basic-auth").bean(natsResource, "storeMessage"); + from("natsNoAuth:test").routeId("no-auth").bean(natsResource, "storeMessage"); + from("natsTokenAuth:test").routeId("token-auth").bean(natsResource, "storeMessage"); + from("natsTlsAuth:test?sslContextParameters=#ssl&secure=true").routeId("tls-auth").bean(natsResource, "storeMessage"); - from("natsNoAuth:max?maxMessages=2&traceConnection=true").routeId("2-msg-max").bean(natsResource, "storeMessage"); + from("natsNoAuth:max?maxMessages=2").routeId("2-msg-max").bean(natsResource, "storeMessage"); - String maxMsgUriPattern = "natsNoAuth:qmax?maxMessages=%s&queueName=q&traceConnection=true"; + String maxMsgUriPattern = "natsNoAuth:qmax?maxMessages=%s&queueName=q"; fromF(maxMsgUriPattern, 3).routeId("3-qmsg-max").bean(natsResource, "storeMessage"); fromF(maxMsgUriPattern, 8).routeId("8-qmsg-max").bean(natsResource, "storeMessage"); - from("natsNoAuth:request-reply?traceConnection=true").setBody().simple("${body} => Reply"); - from("natsNoAuth:reply?traceConnection=true").routeId("reply").bean(natsResource, "storeMessage"); + from("natsNoAuth:request-reply").setBody().simple("${body} => Reply"); + from("natsNoAuth:reply").routeId("reply").bean(natsResource, "storeMessage"); } @Named("ssl") diff --git a/integration-tests/nats/src/test/java/org/apache/camel/quarkus/component/nats/it/NatsTest.java b/integration-tests/nats/src/test/java/org/apache/camel/quarkus/component/nats/it/NatsTest.java index 1c9d57d..177848f 100644 --- a/integration-tests/nats/src/test/java/org/apache/camel/quarkus/component/nats/it/NatsTest.java +++ b/integration-tests/nats/src/test/java/org/apache/camel/quarkus/component/nats/it/NatsTest.java @@ -33,7 +33,7 @@ class NatsTest { @Test void basicAuthProduceConsumeRoundTripShouldSucceed() { - Header header = new Header("sendToEndpointUri", "natsBasicAuth:test?traceConnection=true"); + Header header = new Header("sendToEndpointUri", "natsBasicAuth:test"); given().when().header(header).body("basic-auth-msg").post("/nats/send").then().statusCode(204); await().atMost(10L, TimeUnit.SECONDS).until(() -> { @@ -47,7 +47,7 @@ class NatsTest { @Test void noAuthProduceConsumeRoundTripShouldSucceed() { - Header header = new Header("sendToEndpointUri", "natsNoAuth:test?traceConnection=true"); + Header header = new Header("sendToEndpointUri", "natsNoAuth:test"); given().when().header(header).body("no-auth-msg").post("/nats/send").then().statusCode(204); await().atMost(10L, TimeUnit.SECONDS).until(() -> { @@ -61,8 +61,7 @@ class NatsTest { @Test void tlsAuthProduceConsumeRoundTripShouldSucceed() { - Header header = new Header("sendToEndpointUri", - "natsTlsAuth:test?sslContextParameters=#ssl&secure=true&traceConnection=true"); + Header header = new Header("sendToEndpointUri", "natsTlsAuth:test?sslContextParameters=#ssl&secure=true"); given().when().header(header).body("tls-auth-msg").post("/nats/send").then().statusCode(204); await().atMost(10L, TimeUnit.SECONDS).until(() -> { @@ -76,7 +75,7 @@ class NatsTest { @Test void tokenAuthProduceConsumeRoundTripShouldSucceed() { - Header header = new Header("sendToEndpointUri", "natsTokenAuth:test?traceConnection=true"); + Header header = new Header("sendToEndpointUri", "natsTokenAuth:test"); given().when().header(header).body("token-auth-msg").post("/nats/send").then().statusCode(204); await().atMost(10L, TimeUnit.SECONDS).until(() -> { @@ -90,7 +89,7 @@ class NatsTest { @Test void consumeMaxMessagesShouldRetainFirstTwoMessages() { - Header header = new Header("sendToEndpointUri", "natsNoAuth:max?traceConnection=true"); + Header header = new Header("sendToEndpointUri", "natsNoAuth:max"); for (int msgNumber = 1; msgNumber <= 10; msgNumber++) { given().when().header(header).body("msg " + msgNumber).post("/nats/send").then().statusCode(204); } @@ -107,7 +106,7 @@ class NatsTest { @Test void consumeMaxQueueMessagesShouldRetainRightNumberOfMessages() { - Header header = new Header("sendToEndpointUri", "natsNoAuth:qmax?traceConnection=true"); + Header header = new Header("sendToEndpointUri", "natsNoAuth:qmax"); for (int msgNumber = 1; msgNumber <= 20; msgNumber++) { given().when().header(header).body("qmsg " + msgNumber).post("/nats/send").then().statusCode(204); } @@ -120,7 +119,7 @@ class NatsTest { @Test void requestReplyShouldSucceed() { - Header header = new Header("sendToEndpointUri", "natsNoAuth:request-reply?replySubject=reply&traceConnection=true"); + Header header = new Header("sendToEndpointUri", "natsNoAuth:request-reply?replySubject=reply"); given().when().header(header).body("Request").post("/nats/send").then().statusCode(204); await().atMost(10L, TimeUnit.SECONDS).until(() -> {
