You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by gn...@apache.org on 2026/03/19 11:20:39 UTC
(camel) branch CAMEL-23214-port-migration created (now 19668338eae4)
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a change to branch CAMEL-23214-port-migration
in repository https://gitbox.apache.org/repos/asf/camel.git
at 19668338eae4 CAMEL-23214: Migrate AvailablePortFinder.getNextAvailable() to @RegisterExtension (batch 4)
This branch includes the following new commits:
new 61c555fcaffe CAMEL-23214: Migrate AvailablePortFinder.getNextAvailable() to @RegisterExtension (batch 1)
new d3ca7ac5b77e CAMEL-23214: Migrate AvailablePortFinder.getNextAvailable() to @RegisterExtension (batch 2)
new bfbd1aa0a9fb CAMEL-23214: Migrate AvailablePortFinder.getNextAvailable() to @RegisterExtension (batch 3)
new 19668338eae4 CAMEL-23214: Migrate AvailablePortFinder.getNextAvailable() to @RegisterExtension (batch 4)
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
(camel) 04/04: CAMEL-23214: Migrate AvailablePortFinder.getNextAvailable() to @RegisterExtension (batch 4)
Posted by gn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch CAMEL-23214-port-migration
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 19668338eae43642deab47a91adef9c1c0d61f43
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Thu Mar 19 12:17:01 2026 +0100
CAMEL-23214: Migrate AvailablePortFinder.getNextAvailable() to @RegisterExtension (batch 4)
Migrate 14 grpc test files.
Co-Authored-By: Claude Opus 4.6 <no...@anthropic.com>
---
.../grpc/GrpcConsumerAggregationTest.java | 16 +++++++++------
.../component/grpc/GrpcConsumerConcurrentTest.java | 16 +++++++++------
.../component/grpc/GrpcConsumerExceptionTest.java | 9 +++++---
.../grpc/GrpcConsumerPropagationTest.java | 16 +++++++++------
.../component/grpc/GrpcConsumerSecurityTest.java | 24 ++++++++++++++--------
.../grpc/GrpcConsumerServerInterceptorTest.java | 16 +++++++++------
.../grpc/GrpcProducerClientInterceptorTest.java | 15 ++++++++------
.../component/grpc/GrpcProducerSecurityTest.java | 21 +++++++++++--------
.../component/grpc/GrpcProducerStreamingTest.java | 10 +++++----
.../camel/component/grpc/GrpcProducerSyncTest.java | 14 +++++++------
.../component/grpc/GrpcProxyAsyncAsyncTest.java | 17 ++++++++-------
.../component/grpc/GrpcProxyAsyncSyncTest.java | 17 ++++++++-------
.../component/grpc/GrpcProxySyncAsyncTest.java | 17 ++++++++-------
.../grpc/RouteControlledStreamObserverTest.java | 18 +++++++++-------
14 files changed, 137 insertions(+), 89 deletions(-)
diff --git a/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcConsumerAggregationTest.java b/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcConsumerAggregationTest.java
index 38725b548d02..76bedb6ca4a5 100644
--- a/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcConsumerAggregationTest.java
+++ b/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcConsumerAggregationTest.java
@@ -30,6 +30,7 @@ import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -41,8 +42,10 @@ public class GrpcConsumerAggregationTest extends CamelTestSupport {
private static final Logger LOG = LoggerFactory.getLogger(GrpcConsumerAggregationTest.class);
- private static final int GRPC_SYNC_REQUEST_TEST_PORT = AvailablePortFinder.getNextAvailable();
- private static final int GRPC_ASYNC_REQUEST_TEST_PORT = AvailablePortFinder.getNextAvailable();
+ @RegisterExtension
+ static AvailablePortFinder.Port grpcSyncRequestTestPort = AvailablePortFinder.find();
+ @RegisterExtension
+ static AvailablePortFinder.Port grpcAsyncRequestTestPort = AvailablePortFinder.find();
private static final int GRPC_TEST_PING_ID = 1;
private static final String GRPC_TEST_PING_VALUE = "PING";
private static final String GRPC_TEST_PONG_VALUE = "PONG";
@@ -55,9 +58,10 @@ public class GrpcConsumerAggregationTest extends CamelTestSupport {
@BeforeEach
public void startGrpcChannels() {
- syncRequestChannel = ManagedChannelBuilder.forAddress("localhost", GRPC_SYNC_REQUEST_TEST_PORT).usePlaintext().build();
+ syncRequestChannel
+ = ManagedChannelBuilder.forAddress("localhost", grpcSyncRequestTestPort.getPort()).usePlaintext().build();
asyncRequestChannel
- = ManagedChannelBuilder.forAddress("localhost", GRPC_ASYNC_REQUEST_TEST_PORT).usePlaintext().build();
+ = ManagedChannelBuilder.forAddress("localhost", grpcAsyncRequestTestPort.getPort()).usePlaintext().build();
blockingStub = PingPongGrpc.newBlockingStub(syncRequestChannel);
nonBlockingStub = PingPongGrpc.newStub(syncRequestChannel);
asyncNonBlockingStub = PingPongGrpc.newStub(asyncRequestChannel);
@@ -182,11 +186,11 @@ public class GrpcConsumerAggregationTest extends CamelTestSupport {
return new RouteBuilder() {
@Override
public void configure() {
- from("grpc://localhost:" + GRPC_SYNC_REQUEST_TEST_PORT
+ from("grpc://localhost:" + grpcSyncRequestTestPort.getPort()
+ "/org.apache.camel.component.grpc.PingPong?synchronous=true&consumerStrategy=AGGREGATION")
.bean(new GrpcMessageBuilder(), "buildPongResponse");
- from("grpc://localhost:" + GRPC_ASYNC_REQUEST_TEST_PORT
+ from("grpc://localhost:" + grpcAsyncRequestTestPort.getPort()
+ "/org.apache.camel.component.grpc.PingPong?synchronous=true&consumerStrategy=AGGREGATION")
.bean(new GrpcMessageBuilder(), "buildAsyncPongResponse");
}
diff --git a/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcConsumerConcurrentTest.java b/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcConsumerConcurrentTest.java
index 3aced7006cb7..9d9e2a802dac 100644
--- a/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcConsumerConcurrentTest.java
+++ b/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcConsumerConcurrentTest.java
@@ -32,6 +32,7 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.test.AvailablePortFinder;
import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -42,8 +43,10 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
public class GrpcConsumerConcurrentTest extends CamelTestSupport {
private static final Logger LOG = LoggerFactory.getLogger(GrpcConsumerConcurrentTest.class);
- private static final int GRPC_ASYNC_REQUEST_TEST_PORT = AvailablePortFinder.getNextAvailable();
- private static final int GRPC_HEADERS_TEST_PORT = AvailablePortFinder.getNextAvailable();
+ @RegisterExtension
+ static AvailablePortFinder.Port grpcAsyncRequestTestPort = AvailablePortFinder.find();
+ @RegisterExtension
+ static AvailablePortFinder.Port grpcHeadersTestPort = AvailablePortFinder.find();
private static final int CONCURRENT_THREAD_COUNT = 30;
private static final int ROUNDS_PER_THREAD_COUNT = 10;
private static final String GRPC_TEST_PING_VALUE = "PING";
@@ -67,7 +70,8 @@ public class GrpcConsumerConcurrentTest extends CamelTestSupport {
public void run() {
final CountDownLatch latch = new CountDownLatch(1);
ManagedChannel asyncRequestChannel
- = NettyChannelBuilder.forAddress("localhost", GRPC_ASYNC_REQUEST_TEST_PORT).usePlaintext().build();
+ = NettyChannelBuilder.forAddress("localhost", grpcAsyncRequestTestPort.getPort()).usePlaintext()
+ .build();
PingPongGrpc.PingPongStub asyncNonBlockingStub = PingPongGrpc.newStub(asyncRequestChannel);
PongResponseStreamObserver responseObserver = new PongResponseStreamObserver(latch);
@@ -107,7 +111,7 @@ public class GrpcConsumerConcurrentTest extends CamelTestSupport {
public void run() {
int instanceId = createId();
final CountDownLatch latch = new CountDownLatch(1);
- ManagedChannel asyncRequestChannel = NettyChannelBuilder.forAddress("localhost", GRPC_HEADERS_TEST_PORT)
+ ManagedChannel asyncRequestChannel = NettyChannelBuilder.forAddress("localhost", grpcHeadersTestPort.getPort())
.userAgent(GRPC_USER_AGENT_PREFIX + instanceId)
.usePlaintext().build();
PingPongGrpc.PingPongStub asyncNonBlockingStub = PingPongGrpc.newStub(asyncRequestChannel);
@@ -145,11 +149,11 @@ public class GrpcConsumerConcurrentTest extends CamelTestSupport {
return new RouteBuilder() {
@Override
public void configure() {
- from("grpc://localhost:" + GRPC_ASYNC_REQUEST_TEST_PORT
+ from("grpc://localhost:" + grpcAsyncRequestTestPort.getPort()
+ "/org.apache.camel.component.grpc.PingPong?synchronous=true&consumerStrategy=AGGREGATION")
.bean(new GrpcMessageBuilder(), "buildAsyncPongResponse");
- from("grpc://localhost:" + GRPC_HEADERS_TEST_PORT
+ from("grpc://localhost:" + grpcHeadersTestPort.getPort()
+ "/org.apache.camel.component.grpc.PingPong?synchronous=true&consumerStrategy=AGGREGATION")
.process(new HeaderExchangeProcessor());
}
diff --git a/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcConsumerExceptionTest.java b/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcConsumerExceptionTest.java
index 8cc7728b39dc..9733eccb51b9 100644
--- a/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcConsumerExceptionTest.java
+++ b/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcConsumerExceptionTest.java
@@ -30,6 +30,7 @@ import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -42,7 +43,8 @@ public class GrpcConsumerExceptionTest extends CamelTestSupport {
private static final Logger LOG = LoggerFactory.getLogger(GrpcConsumerExceptionTest.class);
- private static final int GRPC_SYNC_REQUEST_TEST_PORT = AvailablePortFinder.getNextAvailable();
+ @RegisterExtension
+ static AvailablePortFinder.Port grpcSyncRequestTestPort = AvailablePortFinder.find();
private static final int GRPC_TEST_PING_ID = 1;
private static final String GRPC_TEST_PING_VALUE = "PING";
@@ -52,7 +54,8 @@ public class GrpcConsumerExceptionTest extends CamelTestSupport {
@BeforeEach
public void startGrpcChannels() {
- syncRequestChannel = ManagedChannelBuilder.forAddress("localhost", GRPC_SYNC_REQUEST_TEST_PORT).usePlaintext().build();
+ syncRequestChannel
+ = ManagedChannelBuilder.forAddress("localhost", grpcSyncRequestTestPort.getPort()).usePlaintext().build();
blockingStub = PingPongGrpc.newBlockingStub(syncRequestChannel);
nonBlockingStub = PingPongGrpc.newStub(syncRequestChannel);
}
@@ -93,7 +96,7 @@ public class GrpcConsumerExceptionTest extends CamelTestSupport {
return new RouteBuilder() {
@Override
public void configure() {
- from("grpc://localhost:" + GRPC_SYNC_REQUEST_TEST_PORT
+ from("grpc://localhost:" + grpcSyncRequestTestPort.getPort()
+ "/org.apache.camel.component.grpc.PingPong?synchronous=true")
.throwException(CamelException.class, "GRPC Camel exception message");
diff --git a/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcConsumerPropagationTest.java b/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcConsumerPropagationTest.java
index 476d39caa761..7792b2509690 100644
--- a/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcConsumerPropagationTest.java
+++ b/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcConsumerPropagationTest.java
@@ -29,6 +29,7 @@ import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -40,8 +41,10 @@ public class GrpcConsumerPropagationTest extends CamelTestSupport {
private static final Logger LOG = LoggerFactory.getLogger(GrpcConsumerPropagationTest.class);
- private static final int GRPC_ASYNC_NEXT_REQUEST_TEST_PORT = AvailablePortFinder.getNextAvailable();
- private static final int GRPC_ASYNC_COMPLETED_REQUEST_TEST_PORT = AvailablePortFinder.getNextAvailable();
+ @RegisterExtension
+ static AvailablePortFinder.Port grpcAsyncNextRequestTestPort = AvailablePortFinder.find();
+ @RegisterExtension
+ static AvailablePortFinder.Port grpcAsyncCompletedRequestTestPort = AvailablePortFinder.find();
private static final int GRPC_TEST_PING_ID = 1;
private static final String GRPC_TEST_PING_VALUE = "PING";
private static final String GRPC_TEST_PONG_VALUE = "PONG";
@@ -54,9 +57,10 @@ public class GrpcConsumerPropagationTest extends CamelTestSupport {
@BeforeEach
public void startGrpcChannels() {
asyncOnNextChannel
- = ManagedChannelBuilder.forAddress("localhost", GRPC_ASYNC_NEXT_REQUEST_TEST_PORT).usePlaintext().build();
+ = ManagedChannelBuilder.forAddress("localhost", grpcAsyncNextRequestTestPort.getPort()).usePlaintext().build();
asyncOnCompletedChannel
- = ManagedChannelBuilder.forAddress("localhost", GRPC_ASYNC_COMPLETED_REQUEST_TEST_PORT).usePlaintext().build();
+ = ManagedChannelBuilder.forAddress("localhost", grpcAsyncCompletedRequestTestPort.getPort()).usePlaintext()
+ .build();
asyncOnNextStub = PingPongGrpc.newStub(asyncOnNextChannel);
asyncOnCompletedStub = PingPongGrpc.newStub(asyncOnCompletedChannel);
}
@@ -122,12 +126,12 @@ public class GrpcConsumerPropagationTest extends CamelTestSupport {
@Override
public void configure() {
- from("grpc://localhost:" + GRPC_ASYNC_NEXT_REQUEST_TEST_PORT
+ from("grpc://localhost:" + grpcAsyncNextRequestTestPort.getPort()
+ "/org.apache.camel.component.grpc.PingPong?consumerStrategy=PROPAGATION")
.to("mock:async-on-next-propagation")
.bean(new GrpcMessageBuilder(), "buildAsyncPongResponse");
- from("grpc://localhost:" + GRPC_ASYNC_COMPLETED_REQUEST_TEST_PORT
+ from("grpc://localhost:" + grpcAsyncCompletedRequestTestPort.getPort()
+ "/org.apache.camel.component.grpc.PingPong?consumerStrategy=PROPAGATION&forwardOnCompleted=true")
.to("mock:async-on-completed-propagation");
}
diff --git a/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcConsumerSecurityTest.java b/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcConsumerSecurityTest.java
index 1d1319d764d4..802ba2069bf8 100644
--- a/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcConsumerSecurityTest.java
+++ b/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcConsumerSecurityTest.java
@@ -40,6 +40,7 @@ import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Assumptions;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -51,9 +52,12 @@ public class GrpcConsumerSecurityTest extends CamelTestSupport {
private static final Logger LOG = LoggerFactory.getLogger(GrpcConsumerSecurityTest.class);
- private static final int GRPC_TLS_TEST_PORT = AvailablePortFinder.getNextAvailable();
- private static final int GRPC_JWT_CORRECT_TEST_PORT = AvailablePortFinder.getNextAvailable();
- private static final int GRPC_JWT_INCORRECT_TEST_PORT = AvailablePortFinder.getNextAvailable();
+ @RegisterExtension
+ static AvailablePortFinder.Port grpcTlsTestPort = AvailablePortFinder.find();
+ @RegisterExtension
+ static AvailablePortFinder.Port grpcJwtCorrectTestPort = AvailablePortFinder.find();
+ @RegisterExtension
+ static AvailablePortFinder.Port grpcJwtIncorrectTestPort = AvailablePortFinder.find();
private static final int GRPC_TEST_PING_ID = 1;
private static final String GRPC_TEST_PING_VALUE = "PING";
private static final String GRPC_TEST_PONG_VALUE = "PONG";
@@ -81,12 +85,14 @@ public class GrpcConsumerSecurityTest extends CamelTestSupport {
Assumptions.assumeTrue(sslContext instanceof OpenSslClientContext || sslContext instanceof JdkSslContext);
- tlsChannel = NettyChannelBuilder.forAddress("localhost", GRPC_TLS_TEST_PORT)
+ tlsChannel = NettyChannelBuilder.forAddress("localhost", grpcTlsTestPort.getPort())
.sslContext(sslContext)
.build();
- jwtCorrectChannel = NettyChannelBuilder.forAddress("localhost", GRPC_JWT_CORRECT_TEST_PORT).usePlaintext().build();
- jwtIncorrectChannel = NettyChannelBuilder.forAddress("localhost", GRPC_JWT_INCORRECT_TEST_PORT).usePlaintext().build();
+ jwtCorrectChannel
+ = NettyChannelBuilder.forAddress("localhost", grpcJwtCorrectTestPort.getPort()).usePlaintext().build();
+ jwtIncorrectChannel
+ = NettyChannelBuilder.forAddress("localhost", grpcJwtIncorrectTestPort.getPort()).usePlaintext().build();
tlsAsyncStub = PingPongGrpc.newStub(tlsChannel);
jwtCorrectAsyncStub
@@ -187,20 +193,20 @@ public class GrpcConsumerSecurityTest extends CamelTestSupport {
@Override
public void configure() {
- from("grpc://localhost:" + GRPC_TLS_TEST_PORT
+ from("grpc://localhost:" + grpcTlsTestPort.getPort()
+ "/org.apache.camel.component.grpc.PingPong?consumerStrategy=PROPAGATION&"
+ "negotiationType=TLS&keyCertChainResource=file:src/test/resources/certs/server.pem&"
+ "keyResource=file:src/test/resources/certs/server.key&trustCertCollectionResource=file:src/test/resources/certs/ca.pem")
.to("mock:tls-enable")
.bean(new GrpcMessageBuilder(), "buildAsyncPongResponse");
- from("grpc://localhost:" + GRPC_JWT_CORRECT_TEST_PORT
+ from("grpc://localhost:" + grpcJwtCorrectTestPort.getPort()
+ "/org.apache.camel.component.grpc.PingPong?consumerStrategy=PROPAGATION&"
+ "authenticationType=JWT&jwtSecret=" + GRPC_JWT_CORRECT_SECRET)
.to("mock:jwt-correct-secret")
.bean(new GrpcMessageBuilder(), "buildAsyncPongResponse");
- from("grpc://localhost:" + GRPC_JWT_INCORRECT_TEST_PORT
+ from("grpc://localhost:" + grpcJwtIncorrectTestPort.getPort()
+ "/org.apache.camel.component.grpc.PingPong?consumerStrategy=PROPAGATION&"
+ "authenticationType=JWT&jwtSecret=" + GRPC_JWT_CORRECT_SECRET)
.to("mock:jwt-incorrect-secret")
diff --git a/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcConsumerServerInterceptorTest.java b/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcConsumerServerInterceptorTest.java
index ce6ddf0197df..94f7fcd5a2e9 100644
--- a/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcConsumerServerInterceptorTest.java
+++ b/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcConsumerServerInterceptorTest.java
@@ -27,6 +27,7 @@ import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -42,8 +43,10 @@ public class GrpcConsumerServerInterceptorTest extends CamelTestSupport {
private static final Logger LOG = LoggerFactory.getLogger(GrpcConsumerServerInterceptorTest.class);
- private static final int GRPC_REQUEST_INTERCEPT_TEST_PORT = AvailablePortFinder.getNextAvailable();
- private static final int GRPC_REQUEST_NO_INTERCEPT_TEST_PORT = AvailablePortFinder.getNextAvailable();
+ @RegisterExtension
+ static AvailablePortFinder.Port grpcRequestInterceptTestPort = AvailablePortFinder.find();
+ @RegisterExtension
+ static AvailablePortFinder.Port grpcRequestNoInterceptTestPort = AvailablePortFinder.find();
private static final int GRPC_TEST_PING_ID = 1;
private static final String GRPC_TEST_PING_VALUE = "PING";
private static final String GRPC_TEST_PONG_VALUE = "PONG";
@@ -60,9 +63,10 @@ public class GrpcConsumerServerInterceptorTest extends CamelTestSupport {
@BeforeEach
public void startGrpcChannels() {
interceptRequestChannel
- = ManagedChannelBuilder.forAddress("localhost", GRPC_REQUEST_INTERCEPT_TEST_PORT).usePlaintext().build();
+ = ManagedChannelBuilder.forAddress("localhost", grpcRequestInterceptTestPort.getPort()).usePlaintext().build();
nointerceptRequestChannel
- = ManagedChannelBuilder.forAddress("localhost", GRPC_REQUEST_NO_INTERCEPT_TEST_PORT).usePlaintext().build();
+ = ManagedChannelBuilder.forAddress("localhost", grpcRequestNoInterceptTestPort.getPort()).usePlaintext()
+ .build();
interceptBlockingStub = PingPongGrpc.newBlockingStub(interceptRequestChannel);
nointerceptBlockingStub = PingPongGrpc.newBlockingStub(nointerceptRequestChannel);
}
@@ -112,11 +116,11 @@ public class GrpcConsumerServerInterceptorTest extends CamelTestSupport {
return new RouteBuilder() {
@Override
public void configure() {
- from("grpc://localhost:" + GRPC_REQUEST_INTERCEPT_TEST_PORT
+ from("grpc://localhost:" + grpcRequestInterceptTestPort.getPort()
+ "/org.apache.camel.component.grpc.PingPong?synchronous=true&consumerStrategy=AGGREGATION")
.bean(new GrpcMessageBuilder(), "buildPongResponse");
- from("grpc://localhost:" + GRPC_REQUEST_NO_INTERCEPT_TEST_PORT
+ from("grpc://localhost:" + grpcRequestNoInterceptTestPort.getPort()
+ "/org.apache.camel.component.grpc.PingPong?synchronous=true&consumerStrategy=AGGREGATION"
+ "&autoDiscoverServerInterceptors=false")
.bean(new GrpcMessageBuilder(), "buildPongResponse");
diff --git a/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcProducerClientInterceptorTest.java b/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcProducerClientInterceptorTest.java
index be515532e7e5..af77a8aec401 100644
--- a/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcProducerClientInterceptorTest.java
+++ b/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcProducerClientInterceptorTest.java
@@ -25,6 +25,7 @@ import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -40,7 +41,8 @@ public class GrpcProducerClientInterceptorTest extends CamelTestSupport {
private static final Logger LOG = LoggerFactory.getLogger(GrpcProducerClientInterceptorTest.class);
- private static final int GRPC_TEST_PORT = AvailablePortFinder.getNextAvailable();
+ @RegisterExtension
+ static AvailablePortFinder.Port grpcTestPort = AvailablePortFinder.find();
private static final int GRPC_TEST_PING_ID = 1;
private static final String GRPC_TEST_PING_VALUE = "PING";
private static final String GRPC_TEST_PONG_VALUE = "PONG";
@@ -51,9 +53,10 @@ public class GrpcProducerClientInterceptorTest extends CamelTestSupport {
@BeforeAll
public static void startGrpcServer() throws Exception {
- grpcServer = ServerBuilder.forPort(GRPC_TEST_PORT).addService(new GrpcProducerClientInterceptorTest.PingPongImpl())
- .build().start();
- LOG.info("gRPC server started on port {}", GRPC_TEST_PORT);
+ grpcServer
+ = ServerBuilder.forPort(grpcTestPort.getPort()).addService(new GrpcProducerClientInterceptorTest.PingPongImpl())
+ .build().start();
+ LOG.info("gRPC server started on port {}", grpcTestPort.getPort());
}
@AfterAll
@@ -80,7 +83,7 @@ public class GrpcProducerClientInterceptorTest extends CamelTestSupport {
@Test
public void testNoAutoDiscover() throws Exception {
GrpcComponent component = context.getComponent("grpc", GrpcComponent.class);
- GrpcEndpoint endpoint = (GrpcEndpoint) component.createEndpoint("grpc://localhost:" + GRPC_TEST_PORT
+ GrpcEndpoint endpoint = (GrpcEndpoint) component.createEndpoint("grpc://localhost:" + grpcTestPort.getPort()
+ "/org.apache.camel.component.grpc"
+ ".PingPong?method=pingSyncSync&autoDiscoverClientInterceptors=false");
@@ -98,7 +101,7 @@ public class GrpcProducerClientInterceptorTest extends CamelTestSupport {
@Override
public void configure() {
from("direct:grpc-interceptor")
- .to("grpc://localhost:" + GRPC_TEST_PORT
+ .to("grpc://localhost:" + grpcTestPort.getPort()
+ "/org.apache.camel.component.grpc"
+ ".PingPong?method=pingSyncSync");
}
diff --git a/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcProducerSecurityTest.java b/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcProducerSecurityTest.java
index 91c229f05b10..7eaebc51d8e2 100644
--- a/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcProducerSecurityTest.java
+++ b/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcProducerSecurityTest.java
@@ -36,6 +36,7 @@ import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.Assumptions;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -47,8 +48,10 @@ public class GrpcProducerSecurityTest extends CamelTestSupport {
private static final Logger LOG = LoggerFactory.getLogger(GrpcProducerSecurityTest.class);
- private static final int GRPC_TLS_TEST_PORT = AvailablePortFinder.getNextAvailable();
- private static final int GRPC_JWT_TEST_PORT = AvailablePortFinder.getNextAvailable();
+ @RegisterExtension
+ static AvailablePortFinder.Port grpcTlsTestPort = AvailablePortFinder.find();
+ @RegisterExtension
+ static AvailablePortFinder.Port grpcJwtTestPort = AvailablePortFinder.find();
private static final int GRPC_TEST_PING_ID = 1;
private static final int GRPC_TEST_PONG_ID01 = 1;
private static final int GRPC_TEST_PONG_ID02 = 2;
@@ -71,18 +74,18 @@ public class GrpcProducerSecurityTest extends CamelTestSupport {
Assumptions.assumeTrue(sslContext instanceof OpenSslClientContext || sslContext instanceof JdkSslContext);
- grpcServerWithTLS = NettyServerBuilder.forPort(GRPC_TLS_TEST_PORT)
+ grpcServerWithTLS = NettyServerBuilder.forPort(grpcTlsTestPort.getPort())
.sslContext(sslContext)
.addService(new PingPongImpl()).build().start();
- grpcServerWithJWT = NettyServerBuilder.forPort(GRPC_JWT_TEST_PORT)
+ grpcServerWithJWT = NettyServerBuilder.forPort(grpcJwtTestPort.getPort())
.addService(new PingPongImpl())
.intercept(new JwtServerInterceptor(JwtAlgorithm.HMAC256, GRPC_JWT_CORRECT_SECRET, null, null))
.build()
.start();
- LOG.info("gRPC server with TLS started on port {}", GRPC_TLS_TEST_PORT);
- LOG.info("gRPC server with the JWT auth started on port {}", GRPC_JWT_TEST_PORT);
+ LOG.info("gRPC server with TLS started on port {}", grpcTlsTestPort.getPort());
+ LOG.info("gRPC server with the JWT auth started on port {}", grpcJwtTestPort.getPort());
}
@AfterAll
@@ -150,18 +153,18 @@ public class GrpcProducerSecurityTest extends CamelTestSupport {
@Override
public void configure() {
from("direct:grpc-tls")
- .to("grpc://localhost:" + GRPC_TLS_TEST_PORT
+ .to("grpc://localhost:" + grpcTlsTestPort.getPort()
+ "/org.apache.camel.component.grpc.PingPong?method=pingSyncSync&synchronous=true&"
+ "negotiationType=TLS&keyCertChainResource=file:src/test/resources/certs/client.pem&"
+ "keyResource=file:src/test/resources/certs/client.key&trustCertCollectionResource=file:src/test/resources/certs/ca.pem");
from("direct:grpc-correct-jwt")
- .to("grpc://localhost:" + GRPC_JWT_TEST_PORT
+ .to("grpc://localhost:" + grpcJwtTestPort.getPort()
+ "/org.apache.camel.component.grpc.PingPong?method=pingSyncSync&synchronous=true&"
+ "authenticationType=JWT&jwtSecret=" + GRPC_JWT_CORRECT_SECRET);
from("direct:grpc-incorrect-jwt")
- .to("grpc://localhost:" + GRPC_JWT_TEST_PORT
+ .to("grpc://localhost:" + grpcJwtTestPort.getPort()
+ "/org.apache.camel.component.grpc.PingPong?method=pingSyncSync&synchronous=true&"
+ "authenticationType=JWT&jwtSecret=" + GRPC_JWT_INCORRECT_SECRET);
}
diff --git a/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcProducerStreamingTest.java b/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcProducerStreamingTest.java
index 5fe989855a24..24884ff1c77f 100644
--- a/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcProducerStreamingTest.java
+++ b/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcProducerStreamingTest.java
@@ -32,6 +32,7 @@ import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
+import org.junit.jupiter.api.extension.RegisterExtension;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -44,7 +45,8 @@ public class GrpcProducerStreamingTest extends CamelTestSupport {
private static final Logger LOG = LoggerFactory.getLogger(GrpcProducerStreamingTest.class);
- private static final int GRPC_TEST_PORT = AvailablePortFinder.getNextAvailable();
+ @RegisterExtension
+ static AvailablePortFinder.Port grpcTestPort = AvailablePortFinder.find();
private static Server grpcServer;
private static PingPongImpl pingPongServer;
@@ -52,8 +54,8 @@ public class GrpcProducerStreamingTest extends CamelTestSupport {
@BeforeEach
public void startGrpcServer() throws Exception {
pingPongServer = new PingPongImpl();
- grpcServer = ServerBuilder.forPort(GRPC_TEST_PORT).addService(pingPongServer).build().start();
- LOG.info("gRPC server started on port {}", GRPC_TEST_PORT);
+ grpcServer = ServerBuilder.forPort(grpcTestPort.getPort()).addService(pingPongServer).build().start();
+ LOG.info("gRPC server started on port {}", grpcTestPort.getPort());
}
@AfterEach
@@ -123,7 +125,7 @@ public class GrpcProducerStreamingTest extends CamelTestSupport {
@Override
public void configure() {
from("direct:grpc-stream-async-async-route")
- .to("grpc://localhost:" + GRPC_TEST_PORT
+ .to("grpc://localhost:" + grpcTestPort.getPort()
+ "/org.apache.camel.component.grpc.PingPong?producerStrategy=STREAMING&streamRepliesTo=direct:grpc-replies&method=pingAsyncAsync");
from("direct:grpc-replies")
diff --git a/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcProducerSyncTest.java b/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcProducerSyncTest.java
index 4e14eb8ecc5a..1525b119ed74 100644
--- a/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcProducerSyncTest.java
+++ b/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcProducerSyncTest.java
@@ -28,6 +28,7 @@ import org.apache.camel.util.StopWatch;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -39,7 +40,8 @@ public class GrpcProducerSyncTest extends CamelTestSupport {
private static final Logger LOG = LoggerFactory.getLogger(GrpcProducerSyncTest.class);
- private static final int GRPC_TEST_PORT = AvailablePortFinder.getNextAvailable();
+ @RegisterExtension
+ static AvailablePortFinder.Port grpcTestPort = AvailablePortFinder.find();
private static final int GRPC_TEST_PING_ID = 1;
private static final int GRPC_TEST_PONG_ID01 = 1;
private static final int GRPC_TEST_PONG_ID02 = 2;
@@ -51,8 +53,8 @@ public class GrpcProducerSyncTest extends CamelTestSupport {
@BeforeAll
public static void startGrpcServer() throws Exception {
- grpcServer = ServerBuilder.forPort(GRPC_TEST_PORT).addService(new PingPongImpl()).build().start();
- LOG.info("gRPC server started on port {}", GRPC_TEST_PORT);
+ grpcServer = ServerBuilder.forPort(grpcTestPort.getPort()).addService(new PingPongImpl()).build().start();
+ LOG.info("gRPC server started on port {}", grpcTestPort.getPort());
}
@AfterAll
@@ -118,13 +120,13 @@ public class GrpcProducerSyncTest extends CamelTestSupport {
@Override
public void configure() {
from("direct:grpc-sync-sync")
- .to("grpc://localhost:" + GRPC_TEST_PORT
+ .to("grpc://localhost:" + grpcTestPort.getPort()
+ "/org.apache.camel.component.grpc.PingPong?method=pingSyncSync&synchronous=true");
from("direct:grpc-sync-proto-method-name")
- .to("grpc://localhost:" + GRPC_TEST_PORT
+ .to("grpc://localhost:" + grpcTestPort.getPort()
+ "/org.apache.camel.component.grpc.PingPong?method=PingSyncSync&synchronous=true");
from("direct:grpc-sync-async")
- .to("grpc://localhost:" + GRPC_TEST_PORT
+ .to("grpc://localhost:" + grpcTestPort.getPort()
+ "/org.apache.camel.component.grpc.PingPong?method=pingSyncAsync&synchronous=true");
}
};
diff --git a/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcProxyAsyncAsyncTest.java b/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcProxyAsyncAsyncTest.java
index 92d969f9e6be..2cf98a824d12 100644
--- a/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcProxyAsyncAsyncTest.java
+++ b/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcProxyAsyncAsyncTest.java
@@ -32,6 +32,7 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.test.AvailablePortFinder;
import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.*;
+import org.junit.jupiter.api.extension.RegisterExtension;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -41,8 +42,10 @@ public class GrpcProxyAsyncAsyncTest extends CamelTestSupport {
private static final Logger LOG = LoggerFactory.getLogger(GrpcProxyAsyncAsyncTest.class);
- private static final int GRPC_STUB_PORT = AvailablePortFinder.getNextAvailable();
- private static final int GRPC_ROUTE_PORT = AvailablePortFinder.getNextAvailable();
+ @RegisterExtension
+ static AvailablePortFinder.Port grpcStubPort = AvailablePortFinder.find();
+ @RegisterExtension
+ static AvailablePortFinder.Port grpcRoutePort = AvailablePortFinder.find();
private static Server grpcServer;
private ManagedChannel channel;
@@ -51,8 +54,8 @@ public class GrpcProxyAsyncAsyncTest extends CamelTestSupport {
@BeforeAll
public static void beforeAll() throws Exception {
- grpcServer = ServerBuilder.forPort(GRPC_STUB_PORT).addService(new PingPongImpl()).build().start();
- LOG.info("gRPC server started on port {}", GRPC_STUB_PORT);
+ grpcServer = ServerBuilder.forPort(grpcStubPort.getPort()).addService(new PingPongImpl()).build().start();
+ LOG.info("gRPC server started on port {}", grpcStubPort.getPort());
}
@AfterAll
@@ -65,7 +68,7 @@ public class GrpcProxyAsyncAsyncTest extends CamelTestSupport {
@BeforeEach
public void beforeEach() {
- channel = ManagedChannelBuilder.forAddress("localhost", GRPC_ROUTE_PORT).usePlaintext().build();
+ channel = ManagedChannelBuilder.forAddress("localhost", grpcRoutePort.getPort()).usePlaintext().build();
stub = PingPongGrpc.newStub(channel);
}
@@ -117,13 +120,13 @@ public class GrpcProxyAsyncAsyncTest extends CamelTestSupport {
@Override
public void configure() throws Exception {
onException(Exception.class).process(e -> routeHasException.set(true));
- from("grpc://localhost:" + GRPC_ROUTE_PORT +
+ from("grpc://localhost:" + grpcRoutePort.getPort() +
"/org.apache.camel.component.grpc.PingPong" +
"?routeControlledStreamObserver=true" +
"&consumerStrategy=DELEGATION" +
"&forwardOnError=true" +
"&forwardOnCompleted=true")
- .toD("grpc://localhost:" + GRPC_STUB_PORT +
+ .toD("grpc://localhost:" + grpcStubPort.getPort() +
"/org.apache.camel.component.grpc.PingPong" +
"?method=${header.CamelGrpcMethodName}" +
"&producerStrategy=STREAMING" +
diff --git a/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcProxyAsyncSyncTest.java b/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcProxyAsyncSyncTest.java
index 98a99f291502..067a079e9c9e 100644
--- a/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcProxyAsyncSyncTest.java
+++ b/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcProxyAsyncSyncTest.java
@@ -32,6 +32,7 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.test.AvailablePortFinder;
import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.*;
+import org.junit.jupiter.api.extension.RegisterExtension;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -41,8 +42,10 @@ public class GrpcProxyAsyncSyncTest extends CamelTestSupport {
private static final Logger LOG = LoggerFactory.getLogger(GrpcProxyAsyncSyncTest.class);
- private static final int GRPC_STUB_PORT = AvailablePortFinder.getNextAvailable();
- private static final int GRPC_ROUTE_PORT = AvailablePortFinder.getNextAvailable();
+ @RegisterExtension
+ static AvailablePortFinder.Port grpcStubPort = AvailablePortFinder.find();
+ @RegisterExtension
+ static AvailablePortFinder.Port grpcRoutePort = AvailablePortFinder.find();
private static Server grpcServer;
private ManagedChannel channel;
@@ -51,8 +54,8 @@ public class GrpcProxyAsyncSyncTest extends CamelTestSupport {
@BeforeAll
public static void beforeAll() throws Exception {
- grpcServer = ServerBuilder.forPort(GRPC_STUB_PORT).addService(new PingPongImpl()).build().start();
- LOG.info("gRPC server started on port {}", GRPC_STUB_PORT);
+ grpcServer = ServerBuilder.forPort(grpcStubPort.getPort()).addService(new PingPongImpl()).build().start();
+ LOG.info("gRPC server started on port {}", grpcStubPort.getPort());
}
@AfterAll
@@ -65,7 +68,7 @@ public class GrpcProxyAsyncSyncTest extends CamelTestSupport {
@BeforeEach
public void beforeEach() {
- channel = ManagedChannelBuilder.forAddress("localhost", GRPC_ROUTE_PORT).usePlaintext().build();
+ channel = ManagedChannelBuilder.forAddress("localhost", grpcRoutePort.getPort()).usePlaintext().build();
stub = PingPongGrpc.newStub(channel);
}
@@ -115,13 +118,13 @@ public class GrpcProxyAsyncSyncTest extends CamelTestSupport {
@Override
public void configure() throws Exception {
onException(Exception.class).process(e -> routeHasException.set(true));
- from("grpc://localhost:" + GRPC_ROUTE_PORT +
+ from("grpc://localhost:" + grpcRoutePort.getPort() +
"/org.apache.camel.component.grpc.PingPong" +
"?routeControlledStreamObserver=true" +
"&consumerStrategy=DELEGATION" +
"&forwardOnError=true" +
"&forwardOnCompleted=true")
- .toD("grpc://localhost:" + GRPC_STUB_PORT +
+ .toD("grpc://localhost:" + grpcStubPort.getPort() +
"/org.apache.camel.component.grpc.PingPong" +
"?method=${header.CamelGrpcMethodName}" +
"&producerStrategy=STREAMING" +
diff --git a/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcProxySyncAsyncTest.java b/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcProxySyncAsyncTest.java
index 26b50e91b645..5058a6d5b104 100644
--- a/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcProxySyncAsyncTest.java
+++ b/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcProxySyncAsyncTest.java
@@ -32,6 +32,7 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.test.AvailablePortFinder;
import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.*;
+import org.junit.jupiter.api.extension.RegisterExtension;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -41,8 +42,10 @@ public class GrpcProxySyncAsyncTest extends CamelTestSupport {
private static final Logger LOG = LoggerFactory.getLogger(GrpcProxySyncAsyncTest.class);
- private static final int GRPC_STUB_PORT = AvailablePortFinder.getNextAvailable();
- private static final int GRPC_ROUTE_PORT = AvailablePortFinder.getNextAvailable();
+ @RegisterExtension
+ static AvailablePortFinder.Port grpcStubPort = AvailablePortFinder.find();
+ @RegisterExtension
+ static AvailablePortFinder.Port grpcRoutePort = AvailablePortFinder.find();
private static Server grpcServer;
private ManagedChannel channel;
@@ -51,8 +54,8 @@ public class GrpcProxySyncAsyncTest extends CamelTestSupport {
@BeforeAll
public static void beforeAll() throws Exception {
- grpcServer = ServerBuilder.forPort(GRPC_STUB_PORT).addService(new PingPongImpl()).build().start();
- LOG.info("gRPC server started on port {}", GRPC_STUB_PORT);
+ grpcServer = ServerBuilder.forPort(grpcStubPort.getPort()).addService(new PingPongImpl()).build().start();
+ LOG.info("gRPC server started on port {}", grpcStubPort.getPort());
}
@AfterAll
@@ -65,7 +68,7 @@ public class GrpcProxySyncAsyncTest extends CamelTestSupport {
@BeforeEach
public void beforeEach() {
- channel = ManagedChannelBuilder.forAddress("localhost", GRPC_ROUTE_PORT).usePlaintext().build();
+ channel = ManagedChannelBuilder.forAddress("localhost", grpcRoutePort.getPort()).usePlaintext().build();
stub = PingPongGrpc.newStub(channel);
}
@@ -113,10 +116,10 @@ public class GrpcProxySyncAsyncTest extends CamelTestSupport {
@Override
public void configure() throws Exception {
onException(Exception.class).process(e -> routeHasException.set(true));
- from("grpc://localhost:" + GRPC_ROUTE_PORT +
+ from("grpc://localhost:" + grpcRoutePort.getPort() +
"/org.apache.camel.component.grpc.PingPong" +
"?routeControlledStreamObserver=true")
- .toD("grpc://localhost:" + GRPC_STUB_PORT +
+ .toD("grpc://localhost:" + grpcStubPort.getPort() +
"/org.apache.camel.component.grpc.PingPong" +
"?method=${header.CamelGrpcMethodName}" +
"&streamRepliesTo=direct:next" +
diff --git a/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/RouteControlledStreamObserverTest.java b/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/RouteControlledStreamObserverTest.java
index 6f39fea80f3b..e8ddea17d883 100644
--- a/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/RouteControlledStreamObserverTest.java
+++ b/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/RouteControlledStreamObserverTest.java
@@ -34,6 +34,7 @@ import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -43,8 +44,10 @@ public class RouteControlledStreamObserverTest extends CamelTestSupport {
private static final Logger LOG = LoggerFactory.getLogger(GrpcConsumerAggregationTest.class);
- private static final int GRPC_SYNC_REQUEST_TEST_PORT = AvailablePortFinder.getNextAvailable();
- private static final int GRPC_ASYNC_REQUEST_TEST_PORT = AvailablePortFinder.getNextAvailable();
+ @RegisterExtension
+ static AvailablePortFinder.Port grpcSyncRequestTestPort = AvailablePortFinder.find();
+ @RegisterExtension
+ static AvailablePortFinder.Port grpcAsyncRequestTestPort = AvailablePortFinder.find();
private static final int GRPC_TEST_PING_ID = 1;
private static final String GRPC_TEST_PING_VALUE = "PING";
private static final String GRPC_TEST_PONG_VALUE = "PONG";
@@ -57,9 +60,10 @@ public class RouteControlledStreamObserverTest extends CamelTestSupport {
@BeforeEach
public void startGrpcChannels() {
- syncRequestChannel = ManagedChannelBuilder.forAddress("localhost", GRPC_SYNC_REQUEST_TEST_PORT).usePlaintext().build();
+ syncRequestChannel
+ = ManagedChannelBuilder.forAddress("localhost", grpcSyncRequestTestPort.getPort()).usePlaintext().build();
asyncRequestChannel
- = ManagedChannelBuilder.forAddress("localhost", GRPC_ASYNC_REQUEST_TEST_PORT).usePlaintext().build();
+ = ManagedChannelBuilder.forAddress("localhost", grpcAsyncRequestTestPort.getPort()).usePlaintext().build();
blockingStub = PingPongGrpc.newBlockingStub(syncRequestChannel);
nonBlockingStub = PingPongGrpc.newStub(syncRequestChannel);
asyncNonBlockingStub = PingPongGrpc.newStub(asyncRequestChannel);
@@ -185,7 +189,7 @@ public class RouteControlledStreamObserverTest extends CamelTestSupport {
camelContext.addRoutes(new RouteBuilder() {
@Override
public void configure() {
- from("grpc://localhost:" + GRPC_SYNC_REQUEST_TEST_PORT
+ from("grpc://localhost:" + grpcSyncRequestTestPort.getPort()
+ "/org.apache.camel.component.grpc.PingPong?synchronous=true&consumerStrategy=AGGREGATION" +
"&routeControlledStreamObserver=true").to("log:foo");
}
@@ -212,11 +216,11 @@ public class RouteControlledStreamObserverTest extends CamelTestSupport {
@Override
public void configure() {
- from("grpc://localhost:" + GRPC_SYNC_REQUEST_TEST_PORT
+ from("grpc://localhost:" + grpcSyncRequestTestPort.getPort()
+ "/org.apache.camel.component.grpc.PingPong?synchronous=true&consumerStrategy=PROPAGATION&routeControlledStreamObserver=true")
.process(this::process);
- from("grpc://localhost:" + GRPC_ASYNC_REQUEST_TEST_PORT
+ from("grpc://localhost:" + grpcAsyncRequestTestPort.getPort()
+ "/org.apache.camel.component.grpc.PingPong?synchronous=true&consumerStrategy=AGGREGATION")
.bean(new GrpcMessageBuilder(), "buildAsyncPongResponse");
}
(camel) 03/04: CAMEL-23214: Migrate AvailablePortFinder.getNextAvailable() to @RegisterExtension (batch 3)
Posted by gn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch CAMEL-23214-port-migration
in repository https://gitbox.apache.org/repos/asf/camel.git
commit bfbd1aa0a9fb31c1f19a9f5716d50ef5dfb458b4
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Thu Mar 19 12:05:18 2026 +0100
CAMEL-23214: Migrate AvailablePortFinder.getNextAvailable() to @RegisterExtension (batch 3)
Migrate RunCommandOnMqttITCase in camel-jbang-it.
Co-Authored-By: Claude Opus 4.6 <no...@anthropic.com>
---
.../java/org/apache/camel/dsl/jbang/it/RunCommandOnMqttITCase.java | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/dsl/camel-jbang/camel-jbang-it/src/test/java/org/apache/camel/dsl/jbang/it/RunCommandOnMqttITCase.java b/dsl/camel-jbang/camel-jbang-it/src/test/java/org/apache/camel/dsl/jbang/it/RunCommandOnMqttITCase.java
index 26d0107f8529..c3e46d8f7ec5 100644
--- a/dsl/camel-jbang/camel-jbang-it/src/test/java/org/apache/camel/dsl/jbang/it/RunCommandOnMqttITCase.java
+++ b/dsl/camel-jbang/camel-jbang-it/src/test/java/org/apache/camel/dsl/jbang/it/RunCommandOnMqttITCase.java
@@ -26,17 +26,19 @@ import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import org.testcontainers.containers.GenericContainer;
@Tag("container-only")
public class RunCommandOnMqttITCase extends JBangTestSupport {
- private static int mqttPort = AvailablePortFinder.getNextAvailable();
+ @RegisterExtension
+ static AvailablePortFinder.Port mqttPort = AvailablePortFinder.find();
private static MosquittoLocalContainerService service;
@BeforeAll
public static void init() {
- service = new MosquittoLocalContainerService(mqttPort);
+ service = new MosquittoLocalContainerService(mqttPort.getPort());
service.initialize();
}
(camel) 02/04: CAMEL-23214: Migrate AvailablePortFinder.getNextAvailable() to @RegisterExtension (batch 2)
Posted by gn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch CAMEL-23214-port-migration
in repository https://gitbox.apache.org/repos/asf/camel.git
commit d3ca7ac5b77e0b42ea71b5f282823683e9d91fa0
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Thu Mar 19 12:01:24 2026 +0100
CAMEL-23214: Migrate AvailablePortFinder.getNextAvailable() to @RegisterExtension (batch 2)
Migrate 108 additional test files across grpc, cxf, netty, vertx,
http, undertow, mina, milo, ssh, ftp, hl7, itest, and many other
components from the deprecated getNextAvailable() pattern to the
@RegisterExtension AvailablePortFinder.Port pattern.
Co-Authored-By: Claude Opus 4.6 <no...@anthropic.com>
---
.../as2/api/AS2AsyncMDNServerConnectionTest.java | 4 +-
.../component/as2/api/AS2MessageTestBase.java | 12 ++--
.../websocket/WebsocketCamelRouterTestSupport.java | 6 +-
...bsocketCamelRouterWithInitParamTestSupport.java | 6 +-
.../camel/component/avro/AvroTestSupport.java | 4 +-
.../component/clickup/ClickUpWebhookCallTest.java | 2 -
.../component/clickup/util/ClickUpTestSupport.java | 10 +--
.../camel/coap/CoAPComponentTLSTestBase.java | 72 +++++++++++++---------
.../org/apache/camel/coap/CoAPComponentTest.java | 8 ++-
.../camel/coap/CoAPRestComponentTestBase.java | 16 ++---
.../org/apache/camel/coap/CoAPTestSupport.java | 6 +-
.../cxf/jaxrs/CxfRsProducerStreamCacheTest.java | 9 +--
.../cxf/jaxws/CxfConsumerPayloadXPathTest.java | 9 +--
.../cxf/jaxws/CxfPayLoadBareSoapTest.java | 8 ++-
.../cxf/jaxws/CxfProducerProtocalHeaderTest.java | 8 ++-
.../cxf/jaxws/CxfProducerSoapActionTest.java | 6 +-
.../camel/component/cxf/jaxws/CxfProducerTest.java | 4 +-
.../component/cxf/jaxws/FailOverFeatureTest.java | 6 +-
.../camel/component/cxf/CxfMulticastTest.java | 6 +-
.../cxf/CxfPayloadRouterContentLengthTest.java | 10 +--
.../camel/component/cxf/CxfRecipientListTest.java | 11 ++--
.../cxf/CxfRecipientListWithUrlParamsTest.java | 23 ++++---
.../camel/component/elytron/BaseElytronTest.java | 7 ++-
.../file/remote/FromFtpClientSoTimeoutTest.java | 6 +-
.../SftpSimpleConsumeThroughProxyIT.java | 9 ++-
.../SftpSimpleProduceThroughProxyIT.java | 9 ++-
.../apache/camel/component/hl7/HL7TestSupport.java | 12 ++--
.../http/HttpCustomComponentNameTest.java | 8 ++-
.../component/http/HttpProducerSessionTest.java | 7 ++-
...psTwoComponentsSslContextParametersGetTest.java | 8 +--
.../integration/WatsonxAiWebSocketStreamingIT.java | 20 +++---
.../camel/component/iec60870/ConnectionTest.java | 22 +++----
...tReplyTemporaryRefreshFailureOnStartupTest.java | 8 ++-
.../apache/camel/component/jmx/JMXRemoteTest.java | 9 ++-
.../jmx/JMXRobustRemoteConnectionTest.java | 2 -
.../camel/component/scp/ScpServerTestSupport.java | 12 ++--
.../camel/jsonpath/JsonPathPlatformHttpTest.java | 8 ++-
.../component/knative/http/KnativeHttpServer.java | 8 +--
.../component/knative/http/KnativeHttpTest.java | 6 +-
.../component/knative/http/KnativeHttpsServer.java | 8 +--
.../camel/service/lra/AbstractLRATestSupport.java | 4 +-
.../component/milo/AbstractMiloServerTest.java | 4 +-
.../component/milo/server/ServerLocalTest.java | 6 +-
.../apache/camel/component/mina/BaseMinaTest.java | 16 +++--
.../http/NettyHttpEndpointUriFactoryTest.java | 6 +-
.../http/NettyHttpGetWithInvalidMessageTest.java | 12 ++--
.../netty/http/NettyHttpProducerHeadersTest.java | 20 +++---
.../netty/http/NettyHttpProducerProxyModeTest.java | 6 +-
.../component/netty/http/ProxyProtocolTest.java | 54 ++++++++--------
.../netty/NettyEndpointUriFactoryTest.java | 6 +-
.../component/netty/ObjectSerializationTest.java | 17 +++--
.../camel/oaipmh/utils/MockOaipmhServer.java | 9 ++-
.../olingo2/AbstractOlingo2AppAPITestSupport.java | 8 ++-
.../mqtt5/PahoMqtt5ReconnectAfterFailureIT.java | 16 +++--
.../paho/PahoReconnectAfterFailureIT.java | 12 ++--
.../http/main/MainHttpServerRouteTest.java | 8 ++-
.../http/main/ManagementHttpServerTest.java | 8 ++-
.../platform/http/AbstractPlatformHttpTest.java | 3 -
.../camel/component/pubnub/PubNubTestBase.java | 8 ++-
.../apache/camel/maven/HttpProxyMojoManualIT.java | 2 -
.../servlet/ServletCamelRouterTestSupport.java | 4 +-
.../camel/component/slack/SlackProducerTest.java | 9 ++-
.../smpp/integration/SmppTRXProducerIT.java | 13 ++--
...mppTRXProducerSupervisingRouteControllerIT.java | 9 +--
.../org/apache/camel/component/snmp/TrapTest.java | 26 ++++----
.../AbstractSpringSecurityBearerTokenTest.java | 2 -
.../component/ssh/SshAlgorithmParametersTest.java | 30 +++++----
.../component/ssh/SshComponentTestSupport.java | 4 +-
.../camel/component/ssh/SshIdleTimeoutTest.java | 10 +--
.../camel/component/stomp/StompBaseTest.java | 14 +++--
.../telegram/TelegramWebhookCallTest.java | 2 -
.../telegram/util/TelegramTestSupport.java | 12 ++--
.../camel/component/undertow/BaseUndertowTest.java | 30 ++++-----
.../undertow/UndertowHttpProducerSessionTest.java | 12 ++--
.../vertx/http/VertxHttpBridgeEndpointTest.java | 12 ++--
.../vertx/http/VertxHttpProxyServerTest.java | 10 +--
.../component/vertx/http/VertxHttpTestSupport.java | 10 +--
.../vertx/websocket/VertxWebSocketTestSupport.java | 11 ++--
.../VertxWebsocketEndpointConfigurationTest.java | 8 ++-
.../vertx/websocket/VertxWebsocketOriginTest.java | 14 +++--
.../component/vertx/VertxBaseTestSupport.java | 12 ++--
.../camel/component/webhook/WebhookTestBase.java | 10 +--
.../component/whatsapp/WhatsAppWebhookTest.java | 2 -
.../builder/endpoint/EndpointQueryParamTest.java | 11 ++--
.../apache/camel/builder/endpoint/RestDslTest.java | 7 ++-
.../java/org/apache/camel/itest/ITestSupport.java | 22 +++++--
...ipientListInterceptSendToEndpointIssueTest.java | 2 -
.../camel/itest/greeter/CxfToJmsInOutTest.java | 5 +-
.../greeter/JettyRecipientListCxfIssueTest.java | 20 +++---
.../camel/itest/greeter/JmsToCxfInOutTest.java | 5 +-
.../apache/camel/itest/http/HttpTestServer.java | 8 ++-
.../camel/itest/jetty/JettyFreemarkerTest.java | 2 -
.../itest/jetty/JettyGroovySetHeaderTest.java | 2 -
.../camel/itest/jetty/JettyJmsShutdownTest.java | 11 ++--
.../itest/jetty/JettyMulticastJmsFileTest.java | 7 ++-
.../jetty/JettySimulateFailoverRoundRobinTest.java | 34 ++++++----
.../camel/itest/jetty/JettyVelocityTest.java | 2 -
.../org/apache/camel/itest/jms/JmsHttpJmsTest.java | 2 -
.../camel/itest/jms/JmsHttpPostIssueTest.java | 2 -
.../itest/jms/JmsHttpPostIssueWithMockTest.java | 2 -
.../apache/camel/itest/jms/JmsJettyAsyncTest.java | 2 -
.../itest/netty/NettyAsyncRequestReplyTest.java | 2 -
.../org/apache/camel/itest/tx/JmsToHttpRoute.java | 4 +-
...ndNoTransactionErrorHandlerConfiguredRoute.java | 4 +-
.../itest/tx/JmsToHttpWithOnExceptionRoute.java | 4 +-
.../camel/itest/tx/JmsToHttpWithRollbackRoute.java | 4 +-
.../utils/extensions/FtpServiceExtension.java | 8 ++-
.../utils/extensions/GreeterServiceExtension.java | 4 +-
108 files changed, 614 insertions(+), 468 deletions(-)
diff --git a/components/camel-as2/camel-as2-api/src/test/java/org/apache/camel/component/as2/api/AS2AsyncMDNServerConnectionTest.java b/components/camel-as2/camel-as2-api/src/test/java/org/apache/camel/component/as2/api/AS2AsyncMDNServerConnectionTest.java
index 1314f648f3d6..3a67480c9ec3 100644
--- a/components/camel-as2/camel-as2-api/src/test/java/org/apache/camel/component/as2/api/AS2AsyncMDNServerConnectionTest.java
+++ b/components/camel-as2/camel-as2-api/src/test/java/org/apache/camel/component/as2/api/AS2AsyncMDNServerConnectionTest.java
@@ -38,7 +38,9 @@ class AS2AsyncMDNServerConnectionTest {
@BeforeEach
void setUp() throws Exception {
- port = AvailablePortFinder.getNextAvailable();
+ try (AvailablePortFinder.Port p = AvailablePortFinder.find()) {
+ port = p.getPort();
+ }
connection = new AS2AsyncMDNServerConnection(port, null);
}
diff --git a/components/camel-as2/camel-as2-api/src/test/java/org/apache/camel/component/as2/api/AS2MessageTestBase.java b/components/camel-as2/camel-as2-api/src/test/java/org/apache/camel/component/as2/api/AS2MessageTestBase.java
index 91fb6bb46914..c61beded20bc 100644
--- a/components/camel-as2/camel-as2-api/src/test/java/org/apache/camel/component/as2/api/AS2MessageTestBase.java
+++ b/components/camel-as2/camel-as2-api/src/test/java/org/apache/camel/component/as2/api/AS2MessageTestBase.java
@@ -48,6 +48,7 @@ import org.apache.hc.core5.http.protocol.HttpDateGenerator;
import org.bouncycastle.jce.provider.BouncyCastleProvider;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.extension.RegisterExtension;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -85,13 +86,14 @@ public class AS2MessageTestBase {
protected static final String METHOD = "POST";
protected static final String TARGET_HOST = "localhost";
- protected static final int TARGET_PORT = AvailablePortFinder.getNextAvailable();
+ @RegisterExtension
+ protected static AvailablePortFinder.Port TARGET_PORT = AvailablePortFinder.find();
protected static final Duration HTTP_SOCKET_TIMEOUT = Duration.ofSeconds(5);
protected static final Duration HTTP_CONNECTION_TIMEOUT = Duration.ofSeconds(5);
protected static final Integer HTTP_CONNECTION_POOL_SIZE = 5;
protected static final Duration HTTP_CONNECTION_POOL_TTL = Duration.ofMinutes(15);
protected static final Certificate[] VALIDATE_SIGNING_CERTIFICATE_CHAIN = null;
- protected static final String RECIPIENT_DELIVERY_ADDRESS = "http://localhost:" + TARGET_PORT + "/handle-receipts";
+ protected static final String RECIPIENT_DELIVERY_ADDRESS = "http://localhost:" + TARGET_PORT.getPort() + "/handle-receipts";
protected static final String AS2_VERSION = "1.1";
protected static final String USER_AGENT = "Camel AS2 Endpoint";
protected static final String REQUEST_URI = "/";
@@ -172,7 +174,7 @@ public class AS2MessageTestBase {
aSettings.setSenderData(AS2_NAME, FROM, "openas2a_alias");
// Fixed receiver
- aSettings.setReceiverData(AS2_NAME, "openas2b_alias", "http://" + TARGET_HOST + ":" + TARGET_PORT + "/");
+ aSettings.setReceiverData(AS2_NAME, "openas2b_alias", "http://" + TARGET_HOST + ":" + TARGET_PORT.getPort() + "/");
aSettings.setReceiverCertificate(issueCert);
// AS2 stuff
@@ -218,7 +220,7 @@ public class AS2MessageTestBase {
aSettings.setSenderData(AS2_NAME, FROM, "openas2a_alias");
// Fixed receiver
- aSettings.setReceiverData(AS2_NAME, "openas2b_alias", "http://" + TARGET_HOST + ":" + TARGET_PORT + "/");
+ aSettings.setReceiverData(AS2_NAME, "openas2b_alias", "http://" + TARGET_HOST + ":" + TARGET_PORT.getPort() + "/");
aSettings.setReceiverCertificate(issueCert);
// AS2 stuff
@@ -253,7 +255,7 @@ public class AS2MessageTestBase {
protected AS2ClientManager createDefaultClientManager() throws IOException {
AS2ClientConnection clientConnection = new AS2ClientConnection(
AS2_VERSION, USER_AGENT, CLIENT_FQDN,
- TARGET_HOST, TARGET_PORT, HTTP_SOCKET_TIMEOUT, HTTP_CONNECTION_TIMEOUT, HTTP_CONNECTION_POOL_SIZE,
+ TARGET_HOST, TARGET_PORT.getPort(), HTTP_SOCKET_TIMEOUT, HTTP_CONNECTION_TIMEOUT, HTTP_CONNECTION_POOL_SIZE,
HTTP_CONNECTION_POOL_TTL, null, null);
return new AS2ClientManager(clientConnection);
}
diff --git a/components/camel-atmosphere-websocket/src/test/java/org/apache/camel/component/atmosphere/websocket/WebsocketCamelRouterTestSupport.java b/components/camel-atmosphere-websocket/src/test/java/org/apache/camel/component/atmosphere/websocket/WebsocketCamelRouterTestSupport.java
index ab94dca517f2..b29e5c159b3b 100644
--- a/components/camel-atmosphere-websocket/src/test/java/org/apache/camel/component/atmosphere/websocket/WebsocketCamelRouterTestSupport.java
+++ b/components/camel-atmosphere-websocket/src/test/java/org/apache/camel/component/atmosphere/websocket/WebsocketCamelRouterTestSupport.java
@@ -23,9 +23,11 @@ import org.apache.camel.test.infra.jetty.services.JettyEmbeddedService;
import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.extension.RegisterExtension;
public abstract class WebsocketCamelRouterTestSupport extends CamelTestSupport {
- protected static final int PORT = AvailablePortFinder.getNextAvailable();
+ @RegisterExtension
+ protected static AvailablePortFinder.Port PORT = AvailablePortFinder.find();
// This test needs to run with its own lifecycle management, so we cannot use extensions
private JettyEmbeddedService service;
@@ -34,7 +36,7 @@ public abstract class WebsocketCamelRouterTestSupport extends CamelTestSupport {
void setupJetty() {
final JettyConfiguration jettyConfiguration = JettyConfigurationBuilder
.emptyTemplate()
- .withPort(PORT)
+ .withPort(PORT.getPort())
.withContextPath(JettyConfiguration.ROOT_CONTEXT_PATH)
.withWebSocketConfiguration()
.addServletConfiguration(new JettyConfiguration.WebSocketContextHandlerConfiguration.ServletConfiguration<>(
diff --git a/components/camel-atmosphere-websocket/src/test/java/org/apache/camel/component/atmosphere/websocket/WebsocketCamelRouterWithInitParamTestSupport.java b/components/camel-atmosphere-websocket/src/test/java/org/apache/camel/component/atmosphere/websocket/WebsocketCamelRouterWithInitParamTestSupport.java
index 0e6670cbe0ce..a00a6c901e2b 100644
--- a/components/camel-atmosphere-websocket/src/test/java/org/apache/camel/component/atmosphere/websocket/WebsocketCamelRouterWithInitParamTestSupport.java
+++ b/components/camel-atmosphere-websocket/src/test/java/org/apache/camel/component/atmosphere/websocket/WebsocketCamelRouterWithInitParamTestSupport.java
@@ -23,9 +23,11 @@ import org.apache.camel.test.infra.jetty.services.JettyEmbeddedService;
import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.extension.RegisterExtension;
public abstract class WebsocketCamelRouterWithInitParamTestSupport extends CamelTestSupport {
- protected static final int PORT = AvailablePortFinder.getNextAvailable();
+ @RegisterExtension
+ protected static AvailablePortFinder.Port PORT = AvailablePortFinder.find();
// This test needs to run with its own lifecycle management, so we cannot use extensions
protected JettyEmbeddedService service;
@@ -42,7 +44,7 @@ public abstract class WebsocketCamelRouterWithInitParamTestSupport extends Camel
final JettyConfiguration jettyConfiguration = JettyConfigurationBuilder
.emptyTemplate()
- .withPort(PORT)
+ .withPort(PORT.getPort())
.withContextPath(JettyConfiguration.ROOT_CONTEXT_PATH)
.withWebSocketConfiguration().addServletConfiguration(servletConfiguration).build()
.build();
diff --git a/components/camel-avro-rpc/camel-avro-rpc-component/src/test/java/org/apache/camel/component/avro/AvroTestSupport.java b/components/camel-avro-rpc/camel-avro-rpc-component/src/test/java/org/apache/camel/component/avro/AvroTestSupport.java
index 89eb4e9698f7..69f80301ad12 100644
--- a/components/camel-avro-rpc/camel-avro-rpc-component/src/test/java/org/apache/camel/component/avro/AvroTestSupport.java
+++ b/components/camel-avro-rpc/camel-avro-rpc-component/src/test/java/org/apache/camel/component/avro/AvroTestSupport.java
@@ -26,7 +26,9 @@ public class AvroTestSupport extends CamelTestSupport {
protected int avroPortReflection = setupFreePort("avroPortReflection");
public int setupFreePort(String name) {
- port = AvailablePortFinder.getNextAvailable();
+ try (AvailablePortFinder.Port p = AvailablePortFinder.find()) {
+ port = p.getPort();
+ }
System.setProperty(name, String.valueOf(port));
return port;
}
diff --git a/components/camel-clickup/src/test/java/org/apache/camel/component/clickup/ClickUpWebhookCallTest.java b/components/camel-clickup/src/test/java/org/apache/camel/component/clickup/ClickUpWebhookCallTest.java
index 15bacaed2fcf..dfe74b37ee10 100644
--- a/components/camel-clickup/src/test/java/org/apache/camel/component/clickup/ClickUpWebhookCallTest.java
+++ b/components/camel-clickup/src/test/java/org/apache/camel/component/clickup/ClickUpWebhookCallTest.java
@@ -27,7 +27,6 @@ import org.apache.camel.component.clickup.util.ClickUpTestSupport;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.component.webhook.WebhookConfiguration;
import org.apache.camel.component.webhook.WebhookEndpoint;
-import org.apache.camel.test.AvailablePortFinder;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
@@ -50,7 +49,6 @@ public class ClickUpWebhookCallTest extends ClickUpTestSupport {
@BeforeAll
public static void initPort() {
- port = AvailablePortFinder.getNextAvailable();
}
@Test
diff --git a/components/camel-clickup/src/test/java/org/apache/camel/component/clickup/util/ClickUpTestSupport.java b/components/camel-clickup/src/test/java/org/apache/camel/component/clickup/util/ClickUpTestSupport.java
index c68c3bde21aa..74a7eed848ee 100644
--- a/components/camel-clickup/src/test/java/org/apache/camel/component/clickup/util/ClickUpTestSupport.java
+++ b/components/camel-clickup/src/test/java/org/apache/camel/component/clickup/util/ClickUpTestSupport.java
@@ -24,22 +24,18 @@ import org.apache.camel.CamelContext;
import org.apache.camel.component.clickup.ClickUpComponent;
import org.apache.camel.test.AvailablePortFinder;
import org.apache.camel.test.junit6.CamelTestSupport;
-import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.extension.RegisterExtension;
/**
* A support test class for ClickUp tests.
*/
public class ClickUpTestSupport extends CamelTestSupport {
- protected static volatile int port;
+ @RegisterExtension
+ static AvailablePortFinder.Port port = AvailablePortFinder.find();
private ClickUpMockRoutes mockRoutes;
- @BeforeAll
- public static void initPort() {
- port = AvailablePortFinder.getNextAvailable();
- }
-
/**
* Retrieves a response from a JSON file on classpath.
*
diff --git a/components/camel-coap/src/test/java/org/apache/camel/coap/CoAPComponentTLSTestBase.java b/components/camel-coap/src/test/java/org/apache/camel/coap/CoAPComponentTLSTestBase.java
index f7479a21747b..17de5e952920 100644
--- a/components/camel-coap/src/test/java/org/apache/camel/coap/CoAPComponentTLSTestBase.java
+++ b/components/camel-coap/src/test/java/org/apache/camel/coap/CoAPComponentTLSTestBase.java
@@ -45,19 +45,28 @@ import org.eclipse.californium.scandium.dtls.x509.NewAdvancedCertificateVerifier
import org.eclipse.californium.scandium.dtls.x509.StaticNewAdvancedCertificateVerifier;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.ValueSource;
abstract class CoAPComponentTLSTestBase extends CamelTestSupport {
- private static final int PORT = AvailablePortFinder.getNextAvailable();
- private static final int PORT2 = AvailablePortFinder.getNextAvailable();
- private static final int PORT3 = AvailablePortFinder.getNextAvailable();
- private static final int PORT4 = AvailablePortFinder.getNextAvailable();
- private static final int PORT5 = AvailablePortFinder.getNextAvailable();
- private static final int PORT6 = AvailablePortFinder.getNextAvailable();
- private static final int PORT7 = AvailablePortFinder.getNextAvailable();
- private static final int PORT8 = AvailablePortFinder.getNextAvailable();
+ @RegisterExtension
+ static AvailablePortFinder.Port PORT = AvailablePortFinder.find();
+ @RegisterExtension
+ static AvailablePortFinder.Port PORT2 = AvailablePortFinder.find();
+ @RegisterExtension
+ static AvailablePortFinder.Port PORT3 = AvailablePortFinder.find();
+ @RegisterExtension
+ static AvailablePortFinder.Port PORT4 = AvailablePortFinder.find();
+ @RegisterExtension
+ static AvailablePortFinder.Port PORT5 = AvailablePortFinder.find();
+ @RegisterExtension
+ static AvailablePortFinder.Port PORT6 = AvailablePortFinder.find();
+ @RegisterExtension
+ static AvailablePortFinder.Port PORT7 = AvailablePortFinder.find();
+ @RegisterExtension
+ static AvailablePortFinder.Port PORT8 = AvailablePortFinder.find();
@ParameterizedTest
@ValueSource(strings = { "direct:start", "direct:selfsigned", /*"direct:clientauth",*/ "direct:ciphersuites" })
@@ -200,68 +209,74 @@ abstract class CoAPComponentTLSTestBase extends CamelTestSupport {
@Override
public void configure() {
- fromF(getProtocol() + "://localhost:%d/TestResource?sslContextParameters=#serviceSSLContextParameters", PORT)
+ fromF(getProtocol() + "://localhost:%d/TestResource?sslContextParameters=#serviceSSLContextParameters",
+ PORT.getPort())
.transform(body().prepend("Hello "));
fromF(getProtocol()
+ "://localhost:%d/TestResource?alias=selfsigned&sslContextParameters=#selfSignedServiceSSLContextParameters",
- PORT2)
+ PORT2.getPort())
.transform(body().prepend("Hello "));
fromF(getProtocol()
+ "://localhost:%d/TestResource?sslContextParameters=#serviceSSLContextParameters&cipherSuites=TLS_ECDHE_ECDSA_WITH_AES_128_CCM_8",
- PORT4)
+ PORT4.getPort())
.transform(body().prepend("Hello "));
from("direct:start")
.toF(getProtocol() + "://localhost:%d/TestResource?sslContextParameters=#clientSSLContextParameters",
- PORT)
+ PORT.getPort())
.to("mock:result");
- from("direct:notruststore").toF(getProtocol() + "://localhost:%d/TestResource", PORT).to("mock:result");
+ from("direct:notruststore").toF(getProtocol() + "://localhost:%d/TestResource", PORT.getPort())
+ .to("mock:result");
from("direct:failedtrust")
.toF(getProtocol() + "://localhost:%d/TestResource?sslContextParameters=#clientSSLContextParameters2",
- PORT)
+ PORT.getPort())
.to("mock:result");
from("direct:selfsigned")
.toF(getProtocol()
- + "://localhost:%d/TestResource?sslContextParameters=#selfSignedClientSSLContextParameters", PORT2)
+ + "://localhost:%d/TestResource?sslContextParameters=#selfSignedClientSSLContextParameters",
+ PORT2.getPort())
.to("mock:result");
from("direct:clientauth")
.toF(getProtocol()
- + "://localhost:%d/TestResource?sslContextParameters=#clientAuthClientSSLContextParameters", PORT3)
+ + "://localhost:%d/TestResource?sslContextParameters=#clientAuthClientSSLContextParameters",
+ PORT3.getPort())
.to("mock:result");
from("direct:failedclientauth")
.toF(getProtocol()
+ "://localhost:%d/TestResource?sslContextParameters=#clientAuthClientSSLContextParameters2",
- PORT3)
+ PORT3.getPort())
.to("mock:result");
from("direct:ciphersuites")
.toF(getProtocol()
+ "://localhost:%d/TestResource?sslContextParameters=#clientSSLContextParameters&cipherSuites=TLS_ECDHE_ECDSA_WITH_AES_128_CCM_8",
- PORT4)
+ PORT4.getPort())
.to("mock:result");
if (isRPKSupported()) {
- fromF(getProtocol() + "://localhost:%d/TestResource?privateKey=#privateKey&publicKey=#publicKey", PORT5)
+ fromF(getProtocol() + "://localhost:%d/TestResource?privateKey=#privateKey&publicKey=#publicKey",
+ PORT5.getPort())
.transform(body().prepend("Hello "));
fromF(getProtocol()
+ "://localhost:%d/TestResource?privateKey=#privateKey&publicKey=#publicKey&clientAuthentication=NEEDED&advancedCertificateVerifier=#advancedCertificateVerifier",
- PORT6).transform(body().prepend("Hello "));
+ PORT6.getPort()).transform(body().prepend("Hello "));
from("direct:rpk")
.toF(getProtocol()
+ "://localhost:%d/TestResource?advancedCertificateVerifier=#advancedCertificateVerifier",
- PORT5)
+ PORT5.getPort())
.to("mock:result");
- from("direct:rpknotruststore").toF(getProtocol() + "://localhost:%d/TestResource", PORT5).to("mock:result");
+ from("direct:rpknotruststore").toF(getProtocol() + "://localhost:%d/TestResource", PORT5.getPort())
+ .to("mock:result");
// from("direct:rpkfailedtrust")
// .toF(getProtocol()
@@ -272,33 +287,34 @@ abstract class CoAPComponentTLSTestBase extends CamelTestSupport {
from("direct:rpkclientauth")
.toF(getProtocol()
+ "://localhost:%d/TestResource?advancedCertificateVerifier=#advancedCertificateVerifier&privateKey=#privateKey&publicKey=#publicKey",
- PORT6)
+ PORT6.getPort())
.to("mock:result");
}
if (isPSKSupported()) {
- fromF(getProtocol() + "://localhost:%d/TestResource?advancedPskStore=#advancedPskStore", PORT7)
+ fromF(getProtocol() + "://localhost:%d/TestResource?advancedPskStore=#advancedPskStore", PORT7.getPort())
.transform(body().prepend("Hello "));
fromF(getProtocol()
+ "://localhost:%d/TestResource?sslContextParameters=#serviceSSLContextParameters&advancedPskStore=#advancedPskStore",
- PORT8)
+ PORT8.getPort())
.transform(body().prepend("Hello "));
from("direct:psk")
- .toF(getProtocol() + "://localhost:%d/TestResource?advancedPskStore=#advancedPskStore", PORT7)
+ .toF(getProtocol() + "://localhost:%d/TestResource?advancedPskStore=#advancedPskStore",
+ PORT7.getPort())
.to("mock:result");
from("direct:pskciphersuite")
.toF(getProtocol()
+ "://localhost:%d/TestResource?advancedPskStore=#advancedPskStore&cipherSuites=TLS_PSK_WITH_AES_128_GCM_SHA256",
- PORT7)
+ PORT7.getPort())
.to("mock:result");
from("direct:pskx509")
.toF(getProtocol()
+ "://localhost:%d/TestResource?advancedPskStore=#advancedPskStore&sslContextParameters=#clientSSLContextParameters",
- PORT8)
+ PORT8.getPort())
.to("mock:result");
}
diff --git a/components/camel-coap/src/test/java/org/apache/camel/coap/CoAPComponentTest.java b/components/camel-coap/src/test/java/org/apache/camel/coap/CoAPComponentTest.java
index 7e1c268a5643..275395d13fe7 100644
--- a/components/camel-coap/src/test/java/org/apache/camel/coap/CoAPComponentTest.java
+++ b/components/camel-coap/src/test/java/org/apache/camel/coap/CoAPComponentTest.java
@@ -26,12 +26,14 @@ import org.eclipse.californium.core.CoapResponse;
import org.eclipse.californium.core.coap.CoAP;
import org.eclipse.californium.core.coap.MediaTypeRegistry;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import static org.junit.jupiter.api.Assertions.assertEquals;
public class CoAPComponentTest extends CoAPTestSupport {
- protected static final int TCP_PORT = AvailablePortFinder.getNextAvailable();
+ @RegisterExtension
+ static AvailablePortFinder.Port TCP_PORT = AvailablePortFinder.find();
@Produce("direct:start")
protected ProducerTemplate sender;
@@ -74,12 +76,12 @@ public class CoAPComponentTest extends CoAPTestSupport {
public void configure() {
fromF("coap://localhost:%d/TestResource", PORT).convertBodyTo(String.class).transform(body().prepend("Hello "));
- fromF("coap+tcp://localhost:%d/TestResource", TCP_PORT).convertBodyTo(String.class)
+ fromF("coap+tcp://localhost:%d/TestResource", TCP_PORT.getPort()).convertBodyTo(String.class)
.transform(body().prepend("Hello "));
from("direct:start").toF("coap://localhost:%d/TestResource", PORT).to("mock:result");
- from("direct:starttcp").toF("coap+tcp://localhost:%d/TestResource", TCP_PORT).to("mock:result");
+ from("direct:starttcp").toF("coap+tcp://localhost:%d/TestResource", TCP_PORT.getPort()).to("mock:result");
}
};
}
diff --git a/components/camel-coap/src/test/java/org/apache/camel/coap/CoAPRestComponentTestBase.java b/components/camel-coap/src/test/java/org/apache/camel/coap/CoAPRestComponentTestBase.java
index c0748812a51a..8e2b22c3b968 100644
--- a/components/camel-coap/src/test/java/org/apache/camel/coap/CoAPRestComponentTestBase.java
+++ b/components/camel-coap/src/test/java/org/apache/camel/coap/CoAPRestComponentTestBase.java
@@ -33,11 +33,13 @@ import org.eclipse.californium.core.coap.CoAP.ResponseCode;
import org.eclipse.californium.core.coap.MediaTypeRegistry;
import org.eclipse.californium.elements.config.Configuration;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import static org.junit.jupiter.api.Assertions.assertEquals;
abstract class CoAPRestComponentTestBase extends CamelTestSupport {
- static int coapport = AvailablePortFinder.getNextAvailable();
+ @RegisterExtension
+ static AvailablePortFinder.Port coapport = AvailablePortFinder.find();
@Produce("direct:start")
protected ProducerTemplate sender;
@@ -48,7 +50,7 @@ abstract class CoAPRestComponentTestBase extends CamelTestSupport {
CoapClient client;
CoapResponse rsp;
- client = new CoapClient(getProtocol() + "://localhost:" + coapport + "/TestResource/Ducky");
+ client = new CoapClient(getProtocol() + "://localhost:" + coapport.getPort() + "/TestResource/Ducky");
decorateClient(client);
rsp = client.get();
assertEquals(ResponseCode.CONTENT, rsp.getCode());
@@ -57,7 +59,7 @@ abstract class CoAPRestComponentTestBase extends CamelTestSupport {
assertEquals(ResponseCode.CONTENT, rsp.getCode());
assertEquals("Hello Ducky: data", rsp.getResponseText());
- client = new CoapClient(getProtocol() + "://localhost:" + coapport + "/TestParams?id=Ducky");
+ client = new CoapClient(getProtocol() + "://localhost:" + coapport.getPort() + "/TestParams?id=Ducky");
decorateClient(client);
client.setTimeout(1000000L);
rsp = client.get();
@@ -72,7 +74,7 @@ abstract class CoAPRestComponentTestBase extends CamelTestSupport {
@Test
void testCoAPMethodNotAllowedResponse() throws Exception {
Configuration.createStandardWithoutFile();
- CoapClient client = new CoapClient(getProtocol() + "://localhost:" + coapport + "/TestResource/Ducky");
+ CoapClient client = new CoapClient(getProtocol() + "://localhost:" + coapport.getPort() + "/TestResource/Ducky");
decorateClient(client);
client.setTimeout(1000000L);
CoapResponse rsp = client.delete();
@@ -82,7 +84,7 @@ abstract class CoAPRestComponentTestBase extends CamelTestSupport {
@Test
void testCoAPNotFoundResponse() throws Exception {
Configuration.createStandardWithoutFile();
- CoapClient client = new CoapClient(getProtocol() + "://localhost:" + coapport + "/foo/bar/cheese");
+ CoapClient client = new CoapClient(getProtocol() + "://localhost:" + coapport.getPort() + "/foo/bar/cheese");
decorateClient(client);
client.setTimeout(1000000L);
CoapResponse rsp = client.get();
@@ -125,7 +127,7 @@ abstract class CoAPRestComponentTestBase extends CamelTestSupport {
@Override
public void configure() {
RestConfigurationDefinition restConfig
- = restConfiguration().scheme(getProtocol()).host("localhost").port(coapport);
+ = restConfiguration().scheme(getProtocol()).host("localhost").port(coapport.getPort());
decorateRestConfiguration(restConfig);
rest("/TestParams").get().to("direct:get1").post().to("direct:post1");
@@ -144,7 +146,7 @@ abstract class CoAPRestComponentTestBase extends CamelTestSupport {
exchange.getMessage().setHeader(CoAPConstants.CONTENT_TYPE, ct);
});
- from("direct:start").toF(getClientURI(), coapport).to("mock:result");
+ from("direct:start").toF(getClientURI(), coapport.getPort()).to("mock:result");
}
};
}
diff --git a/components/camel-coap/src/test/java/org/apache/camel/coap/CoAPTestSupport.java b/components/camel-coap/src/test/java/org/apache/camel/coap/CoAPTestSupport.java
index bf7a692e1c99..3862c91976c6 100644
--- a/components/camel-coap/src/test/java/org/apache/camel/coap/CoAPTestSupport.java
+++ b/components/camel-coap/src/test/java/org/apache/camel/coap/CoAPTestSupport.java
@@ -21,10 +21,12 @@ import org.apache.camel.test.junit6.CamelTestSupport;
import org.apache.camel.util.FileUtil;
import org.eclipse.californium.core.CoapClient;
import org.eclipse.californium.elements.config.Configuration;
+import org.junit.jupiter.api.extension.RegisterExtension;
public class CoAPTestSupport extends CamelTestSupport {
- protected static final int PORT = AvailablePortFinder.getNextAvailable();
+ @RegisterExtension
+ static AvailablePortFinder.Port PORT = AvailablePortFinder.find();
@Override
public void doPostSetup() {
@@ -32,7 +34,7 @@ public class CoAPTestSupport extends CamelTestSupport {
}
protected CoapClient createClient(String path) {
- return createClient(path, PORT);
+ return createClient(path, PORT.getPort());
}
protected CoapClient createClient(String path, int port) {
diff --git a/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducerStreamCacheTest.java b/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducerStreamCacheTest.java
index b4a1c334d375..f97a34da5ce0 100644
--- a/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducerStreamCacheTest.java
+++ b/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducerStreamCacheTest.java
@@ -37,12 +37,14 @@ import org.apache.cxf.endpoint.Server;
import org.apache.cxf.jaxrs.JAXRSServerFactoryBean;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import static org.junit.jupiter.api.Assertions.assertEquals;
public class CxfRsProducerStreamCacheTest extends CamelTestSupport {
- private int port;
+ @RegisterExtension
+ AvailablePortFinder.Port port = AvailablePortFinder.find();
private Server rsServer;
@Override
@@ -54,7 +56,6 @@ public class CxfRsProducerStreamCacheTest extends CamelTestSupport {
@Override
@Deprecated
protected void doPreSetup() throws Exception {
- port = AvailablePortFinder.getNextAvailable();
startRsEchoServer();
}
@@ -68,7 +69,7 @@ public class CxfRsProducerStreamCacheTest extends CamelTestSupport {
private void startRsEchoServer() {
JAXRSServerFactoryBean sf = new JAXRSServerFactoryBean();
- sf.setAddress("http://localhost:" + port + "/rs");
+ sf.setAddress("http://localhost:" + port.getPort() + "/rs");
sf.setServiceBeans(Collections.singletonList(new EchoResource()));
rsServer = sf.create();
rsServer.start();
@@ -87,7 +88,7 @@ public class CxfRsProducerStreamCacheTest extends CamelTestSupport {
@Override
protected RouteBuilder createRouteBuilder() {
- final String cxfrsUri = "cxfrs://http://localhost:" + port + "/rs"
+ final String cxfrsUri = "cxfrs://http://localhost:" + port.getPort() + "/rs"
+ "?httpClientAPI=true"
+ "&throwExceptionOnFailure=false";
diff --git a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfConsumerPayloadXPathTest.java b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfConsumerPayloadXPathTest.java
index 662a079d6e1e..b3492c1ca4d3 100644
--- a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfConsumerPayloadXPathTest.java
+++ b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfConsumerPayloadXPathTest.java
@@ -242,10 +242,11 @@ public class CxfConsumerPayloadXPathTest extends CamelTestSupport {
}
private String getAvailableUrl(String pathEnd) {
- int availablePort = AvailablePortFinder.getNextAvailable();
- String url = "http://localhost:" + availablePort
- + "/" + getClass().getSimpleName();
- return url + "/" + pathEnd;
+ try (AvailablePortFinder.Port p = AvailablePortFinder.find()) {
+ String url = "http://localhost:" + p.getPort()
+ + "/" + getClass().getSimpleName();
+ return url + "/" + pathEnd;
+ }
}
private String constructSoapMessage(String content) {
diff --git a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfPayLoadBareSoapTest.java b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfPayLoadBareSoapTest.java
index 7fcd6558923d..0974ef494bbe 100644
--- a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfPayLoadBareSoapTest.java
+++ b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfPayLoadBareSoapTest.java
@@ -29,14 +29,16 @@ import org.apache.cxf.BusFactory;
import org.apache.cxf.jaxws.JaxWsProxyFactoryBean;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import static org.junit.jupiter.api.Assertions.assertEquals;
public class CxfPayLoadBareSoapTest extends CamelTestSupport {
- private static final int PORT = AvailablePortFinder.getNextAvailable();
- private static final String ORIGINAL_URL = String.format("http://localhost:%s/original/Service", PORT);
- private static final String PROXY_URL = String.format("http://localhost:%s/proxy/Service", PORT);
+ @RegisterExtension
+ static AvailablePortFinder.Port PORT = AvailablePortFinder.find();
+ private static final String ORIGINAL_URL = String.format("http://localhost:%s/original/Service", PORT.getPort());
+ private static final String PROXY_URL = String.format("http://localhost:%s/proxy/Service", PORT.getPort());
private static final BareSoapServiceImpl IMPLEMENTATION = new BareSoapServiceImpl();
@BeforeAll
diff --git a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfProducerProtocalHeaderTest.java b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfProducerProtocalHeaderTest.java
index d82e72e93f08..28ea95472c9f 100644
--- a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfProducerProtocalHeaderTest.java
+++ b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfProducerProtocalHeaderTest.java
@@ -26,12 +26,14 @@ import org.apache.camel.component.cxf.common.message.CxfConstants;
import org.apache.camel.test.AvailablePortFinder;
import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNull;
public class CxfProducerProtocalHeaderTest extends CamelTestSupport {
- private static int port = AvailablePortFinder.getNextAvailable();
+ @RegisterExtension
+ static AvailablePortFinder.Port port = AvailablePortFinder.find();
private static final String RESPONSE = "<soap:Envelope xmlns:soap=\"http://schemas.xmlsoap.org/soap/envelope/\">"
+ "<soap:Body><ns1:echoResponse xmlns:ns1=\"http://jaxws.cxf.component.camel.apache.org/\">"
+ "<return xmlns=\"http://jaxws.cxf.component.camel.apache.org/\">echo Hello World!</return>"
@@ -41,7 +43,7 @@ public class CxfProducerProtocalHeaderTest extends CamelTestSupport {
protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
public void configure() {
- from("undertow:http://localhost:" + port + "/CxfProducerProtocalHeaderTest/user")
+ from("undertow:http://localhost:" + port.getPort() + "/CxfProducerProtocalHeaderTest/user")
.process(new Processor() {
public void process(Exchange exchange) throws Exception {
@@ -77,7 +79,7 @@ public class CxfProducerProtocalHeaderTest extends CamelTestSupport {
@Test
public void testSendMessage() {
- Exchange exchange = sendSimpleMessage("cxf://http://localhost:" + port
+ Exchange exchange = sendSimpleMessage("cxf://http://localhost:" + port.getPort()
+ "/CxfProducerProtocalHeaderTest/user"
+ "?serviceClass=org.apache.camel.component.cxf.jaxws.HelloService");
org.apache.camel.Message out = exchange.getMessage();
diff --git a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfProducerSoapActionTest.java b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfProducerSoapActionTest.java
index b60e4746846d..b0a26aa05fc5 100644
--- a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfProducerSoapActionTest.java
+++ b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfProducerSoapActionTest.java
@@ -27,19 +27,21 @@ import org.apache.camel.test.AvailablePortFinder;
import org.apache.camel.test.junit6.CamelTestSupport;
import org.apache.cxf.binding.soap.SoapBindingConstants;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
import static org.junit.jupiter.api.Assertions.assertEquals;
public class CxfProducerSoapActionTest extends CamelTestSupport {
- private static int port = AvailablePortFinder.getNextAvailable();
+ @RegisterExtension
+ static AvailablePortFinder.Port port = AvailablePortFinder.find();
private static final String SOAP_ACTION = "http://camel.apache.org/order/Order";
private static final String OPERATION_NAMESPACE = "http://camel.apache.org/order";
private static final String OPERATION_NAME = "order";
private static final String DIRECT_START = "direct:start";
private static final String CXF_ENDPOINT
- = "cxf:http://localhost:" + port + "/order?wsdlURL=classpath:order.wsdl&loggingFeatureEnabled=true";
+ = "cxf:http://localhost:" + port.getPort() + "/order?wsdlURL=classpath:order.wsdl&loggingFeatureEnabled=true";
private static final String REQUEST_MESSAGE = "<Envelope xmlns=\"http://schemas.xmlsoap.org/soap/envelope/\">"
+ "<Body/>" + "</Envelope>";
diff --git a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfProducerTest.java b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfProducerTest.java
index 11a06858fa9d..0e30eb1b3113 100644
--- a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfProducerTest.java
+++ b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfProducerTest.java
@@ -74,7 +74,9 @@ public class CxfProducerTest {
protected String getWrongServerAddress() {
// Avoiding the test error on camel-cxf module
- return "http://localhost:" + AvailablePortFinder.getNextAvailable() + "/" + getClass().getSimpleName() + "/test";
+ try (AvailablePortFinder.Port p = AvailablePortFinder.find()) {
+ return "http://localhost:" + p.getPort() + "/" + getClass().getSimpleName() + "/test";
+ }
}
@BeforeEach
diff --git a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/FailOverFeatureTest.java b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/FailOverFeatureTest.java
index f7237abb3fad..5937d53c9428 100644
--- a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/FailOverFeatureTest.java
+++ b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/FailOverFeatureTest.java
@@ -33,6 +33,7 @@ import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -41,12 +42,13 @@ public class FailOverFeatureTest {
private static int port1 = CXFTestSupport.getPort1();
private static int port2 = CXFTestSupport.getPort2();
private static int port3 = CXFTestSupport.getPort3();
- private static int port4 = AvailablePortFinder.getNextAvailable();
+ @RegisterExtension
+ static AvailablePortFinder.Port port4 = AvailablePortFinder.find();
private static final String SERVICE_ADDRESS = "http://localhost:" + port1 + "/FailOverFeatureTest";
private static final String PAYLOAD_PROXY_ADDRESS = "http://localhost:" + port2 + "/FailOverFeatureTest/proxy";
private static final String POJO_PROXY_ADDRESS = "http://localhost:" + port3 + "/FailOverFeatureTest/proxy";
- private static final String NONE_EXIST_ADDRESS = "http://localhost:" + port4 + "/FailOverFeatureTest";
+ private static final String NONE_EXIST_ADDRESS = "http://localhost:" + port4.getPort() + "/FailOverFeatureTest";
private static Server server;
private DefaultCamelContext context1;
private DefaultCamelContext context2;
diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfMulticastTest.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfMulticastTest.java
index 8628c6829026..3fa35d0e500e 100644
--- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfMulticastTest.java
+++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfMulticastTest.java
@@ -22,17 +22,19 @@ import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.AvailablePortFinder;
import org.apache.camel.test.spring.junit6.CamelSpringTestSupport;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import org.springframework.context.support.AbstractApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
import static org.junit.jupiter.api.Assertions.assertEquals;
public class CxfMulticastTest extends CamelSpringTestSupport {
- private static int port = AvailablePortFinder.getNextAvailable();
+ @RegisterExtension
+ static AvailablePortFinder.Port port = AvailablePortFinder.find();
static {
//set them as system properties so Spring can use the property placeholder
//things to set them into the URL's in the spring contexts
- System.setProperty("CxfMulticastTest.port", Integer.toString(port));
+ System.setProperty("CxfMulticastTest.port", Integer.toString(port.getPort()));
}
@EndpointInject("mock:reply")
diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfPayloadRouterContentLengthTest.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfPayloadRouterContentLengthTest.java
index 8f247771e3c3..0ffc07345add 100644
--- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfPayloadRouterContentLengthTest.java
+++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfPayloadRouterContentLengthTest.java
@@ -36,6 +36,7 @@ import org.apache.hc.core5.http.HttpEntity;
import org.apache.hc.core5.http.io.entity.EntityUtils;
import org.apache.hc.core5.http.io.entity.StringEntity;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.context.support.AbstractApplicationContext;
@@ -69,12 +70,13 @@ public class CxfPayloadRouterContentLengthTest extends CamelSpringTestSupport {
+ "</s:Body></s:Envelope>";
// The Camel-Test with CXF will re-use undertow instances, so the ports1 to 6 are already blocked
- private static final int UNDERTOW_PORT = AvailablePortFinder.getNextAvailable();
+ @RegisterExtension
+ static AvailablePortFinder.Port UNDERTOW_PORT = AvailablePortFinder.find();
private Undertow server;
static {
- System.setProperty("CXFTestSupport.undertowPort", Integer.toString(UNDERTOW_PORT));
+ System.setProperty("CXFTestSupport.undertowPort", Integer.toString(UNDERTOW_PORT.getPort()));
}
@Override
@@ -84,9 +86,9 @@ public class CxfPayloadRouterContentLengthTest extends CamelSpringTestSupport {
* the response. The response must contain only a Content-Type and a
* Content-Length but no other header
*/
- LOG.info("Starting undertow server at port {}", UNDERTOW_PORT);
+ LOG.info("Starting undertow server at port {}", UNDERTOW_PORT.getPort());
server = Undertow.builder()
- .addHttpListener(UNDERTOW_PORT, "localhost")
+ .addHttpListener(UNDERTOW_PORT.getPort(), "localhost")
.setHandler(new HttpHandler() {
@Override
public void handleRequest(HttpServerExchange httpServerExchange) throws Exception {
diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfRecipientListTest.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfRecipientListTest.java
index d1401d8702ac..2266d986f261 100644
--- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfRecipientListTest.java
+++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfRecipientListTest.java
@@ -25,6 +25,7 @@ import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.AvailablePortFinder;
import org.apache.camel.test.spring.junit6.CamelSpringTestSupport;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import org.springframework.context.support.AbstractApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
@@ -32,13 +33,15 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
public class CxfRecipientListTest extends CamelSpringTestSupport {
- private static int port1 = AvailablePortFinder.getNextAvailable();
- private static int port2 = AvailablePortFinder.getNextAvailable();
+ @RegisterExtension
+ static AvailablePortFinder.Port port1 = AvailablePortFinder.find();
+ @RegisterExtension
+ static AvailablePortFinder.Port port2 = AvailablePortFinder.find();
static {
//set them as system properties so Spring can use the property placeholder
//things to set them into the URL's in the spring contexts
- System.setProperty("CxfRecipientListTest.port1", Integer.toString(port1));
- System.setProperty("CxfRecipientListTest.port2", Integer.toString(port2));
+ System.setProperty("CxfRecipientListTest.port1.getPort()", Integer.toString(port1.getPort()));
+ System.setProperty("CxfRecipientListTest.port2.getPort()", Integer.toString(port2.getPort()));
}
@EndpointInject("mock:reply")
diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfRecipientListWithUrlParamsTest.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfRecipientListWithUrlParamsTest.java
index df02e141fcdd..49919dc787b4 100644
--- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfRecipientListWithUrlParamsTest.java
+++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfRecipientListWithUrlParamsTest.java
@@ -25,6 +25,7 @@ import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.AvailablePortFinder;
import org.apache.camel.test.spring.junit6.CamelSpringTestSupport;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import org.springframework.context.support.AbstractApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
@@ -32,13 +33,15 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
public class CxfRecipientListWithUrlParamsTest extends CamelSpringTestSupport {
- private static int port1 = AvailablePortFinder.getNextAvailable();
- private static int port2 = AvailablePortFinder.getNextAvailable();
+ @RegisterExtension
+ static AvailablePortFinder.Port port1 = AvailablePortFinder.find();
+ @RegisterExtension
+ static AvailablePortFinder.Port port2 = AvailablePortFinder.find();
static {
//set them as system properties so Spring can use the property placeholder
//things to set them into the URL's in the spring contexts
- System.setProperty("CxfRecipientListWithUrlParams.port1", Integer.toString(port1));
- System.setProperty("CxfRecipientListWithUrlParams.port2", Integer.toString(port2));
+ System.setProperty("CxfRecipientListWithUrlParams.port1.getPort()", Integer.toString(port1.getPort()));
+ System.setProperty("CxfRecipientListWithUrlParams.port2.getPort()", Integer.toString(port2.getPort()));
}
@EndpointInject("mock:reply")
@@ -63,14 +66,14 @@ public class CxfRecipientListWithUrlParamsTest extends CamelSpringTestSupport {
Map<String, Object> headers = new HashMap<>();
headers.put(CxfConstants.OPERATION_NAME, "greetMe");
- headers.put("foo", "cxf:bean:clientEndpoint?address=http://localhost:" + port1 + "/SoapContext/SoapPort");
+ headers.put("foo", "cxf:bean:clientEndpoint?address=http://localhost:" + port1.getPort() + "/SoapContext/SoapPort");
// returns the last message from the recipient list
Object out = template.requestBodyAndHeaders("direct:start", "Willem", headers, String.class);
assertEquals("Hello Willem", out);
// change foo headers
- headers.put("foo", "cxf:bean:clientEndpoint?address=http://localhost:" + port2 + "/SoapContext/SoapPort");
+ headers.put("foo", "cxf:bean:clientEndpoint?address=http://localhost:" + port2.getPort() + "/SoapContext/SoapPort");
// call again to ensure that works also
// returns the last message from the recipient list
@@ -78,8 +81,8 @@ public class CxfRecipientListWithUrlParamsTest extends CamelSpringTestSupport {
assertEquals("Bye Claus", out2);
// change foo headers again
- headers.put("foo", "cxf:bean:clientEndpoint?address=http://localhost:" + port1 + "/SoapContext/SoapPort"
- + ",cxf:bean:clientEndpoint?address=http://localhost:" + port2 + "/SoapContext/SoapPort");
+ headers.put("foo", "cxf:bean:clientEndpoint?address=http://localhost:" + port1.getPort() + "/SoapContext/SoapPort"
+ + ",cxf:bean:clientEndpoint?address=http://localhost:" + port2.getPort() + "/SoapContext/SoapPort");
// and call again to ensure that it really works also
// returns the last message from the recipient list
@@ -87,8 +90,8 @@ public class CxfRecipientListWithUrlParamsTest extends CamelSpringTestSupport {
assertEquals("Bye Jonathan", out3);
// change foo headers again
- headers.put("foo", "cxf:bean:clientEndpoint?address=http://localhost:" + port2 + "/SoapContext/SoapPort"
- + ",cxf:bean:clientEndpoint?address=http://localhost:" + port1 + "/SoapContext/SoapPort");
+ headers.put("foo", "cxf:bean:clientEndpoint?address=http://localhost:" + port2.getPort() + "/SoapContext/SoapPort"
+ + ",cxf:bean:clientEndpoint?address=http://localhost:" + port1.getPort() + "/SoapContext/SoapPort");
// and call again to ensure that it really works also
// returns the last message from the recipient list
diff --git a/components/camel-elytron/src/test/java/org/apache/camel/component/elytron/BaseElytronTest.java b/components/camel-elytron/src/test/java/org/apache/camel/component/elytron/BaseElytronTest.java
index 583c0b4e4f85..a0373ec0c7d8 100644
--- a/components/camel-elytron/src/test/java/org/apache/camel/component/elytron/BaseElytronTest.java
+++ b/components/camel-elytron/src/test/java/org/apache/camel/component/elytron/BaseElytronTest.java
@@ -33,6 +33,7 @@ import org.apache.camel.component.undertow.spi.UndertowSecurityProvider;
import org.apache.camel.test.AvailablePortFinder;
import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.extension.RegisterExtension;
import org.wildfly.security.WildFlyElytronBaseProvider;
import org.wildfly.security.auth.permission.LoginPermission;
import org.wildfly.security.auth.realm.token.TokenSecurityRealm;
@@ -46,7 +47,8 @@ import org.wildfly.security.permission.PermissionVerifier;
*/
public abstract class BaseElytronTest extends CamelTestSupport {
- private static volatile int port;
+ @RegisterExtension
+ static AvailablePortFinder.Port port = AvailablePortFinder.find();
private static KeyPair keyPair;
private final AtomicInteger counter = new AtomicInteger(1);
@@ -59,7 +61,6 @@ public abstract class BaseElytronTest extends CamelTestSupport {
@BeforeAll
public static void initPort() throws Exception {
- port = AvailablePortFinder.getNextAvailable();
keyPair = null;
URL location = ElytronSecurityProvider.class.getProtectionDomain().getCodeSource().getLocation();
@@ -74,7 +75,7 @@ public abstract class BaseElytronTest extends CamelTestSupport {
}
protected static int getPort() {
- return port;
+ return port.getPort();
}
@BindToRegistry("prop")
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpClientSoTimeoutTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpClientSoTimeoutTest.java
index 60143cdd1aa1..89660e324499 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpClientSoTimeoutTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpClientSoTimeoutTest.java
@@ -24,6 +24,7 @@ import org.apache.camel.test.AvailablePortFinder;
import org.apache.camel.test.junit6.CamelTestSupport;
import org.apache.commons.net.ftp.FTPFile;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -34,10 +35,11 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
*/
public class FromFtpClientSoTimeoutTest extends CamelTestSupport {
- int port = AvailablePortFinder.getNextAvailable();
+ @RegisterExtension
+ AvailablePortFinder.Port port = AvailablePortFinder.find();
private String getFtpUrl() {
- return "ftp://admin@localhost:" + port + "/timeout/?soTimeout=5000";
+ return "ftp://admin@localhost:" + port.getPort() + "/timeout/?soTimeout=5000";
}
@Test
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/integration/SftpSimpleConsumeThroughProxyIT.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/integration/SftpSimpleConsumeThroughProxyIT.java
index be31a5c86ec4..f3d0472ce423 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/integration/SftpSimpleConsumeThroughProxyIT.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/integration/SftpSimpleConsumeThroughProxyIT.java
@@ -27,6 +27,7 @@ import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestInstance;
import org.junit.jupiter.api.condition.EnabledIf;
+import org.junit.jupiter.api.extension.RegisterExtension;
import org.littleshoot.proxy.HttpProxyServer;
import org.littleshoot.proxy.ProxyAuthenticator;
import org.littleshoot.proxy.impl.DefaultHttpProxyServer;
@@ -35,12 +36,14 @@ import org.littleshoot.proxy.impl.DefaultHttpProxyServer;
@EnabledIf(value = "org.apache.camel.test.infra.ftp.services.embedded.SftpUtil#hasRequiredAlgorithms('src/test/resources/hostkey.pem')")
public class SftpSimpleConsumeThroughProxyIT extends SftpServerTestSupport {
private static HttpProxyServer proxyServer;
- private final int proxyPort = AvailablePortFinder.getNextAvailable();
+ @RegisterExtension
+
+ AvailablePortFinder.Port proxyPort = AvailablePortFinder.find();
@BeforeAll
public void setupProxy() {
proxyServer = DefaultHttpProxyServer.bootstrap()
- .withPort(proxyPort)
+ .withPort(proxyPort.getPort())
.withProxyAuthenticator(new ProxyAuthenticator() {
@Override
public boolean authenticate(String userName, String password) {
@@ -92,7 +95,7 @@ public class SftpSimpleConsumeThroughProxyIT extends SftpServerTestSupport {
@BindToRegistry("proxy")
public ProxyHTTP createProxy() {
- final ProxyHTTP proxyHTTP = new ProxyHTTP("localhost", proxyPort);
+ final ProxyHTTP proxyHTTP = new ProxyHTTP("localhost", proxyPort.getPort());
proxyHTTP.setUserPasswd("user", "password");
return proxyHTTP;
}
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/integration/SftpSimpleProduceThroughProxyIT.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/integration/SftpSimpleProduceThroughProxyIT.java
index 9dccdfbf44f5..123a6e8c9612 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/integration/SftpSimpleProduceThroughProxyIT.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/integration/SftpSimpleProduceThroughProxyIT.java
@@ -26,6 +26,7 @@ import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.condition.EnabledIf;
+import org.junit.jupiter.api.extension.RegisterExtension;
import org.littleshoot.proxy.HttpProxyServer;
import org.littleshoot.proxy.ProxyAuthenticator;
import org.littleshoot.proxy.impl.DefaultHttpProxyServer;
@@ -37,12 +38,14 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
public class SftpSimpleProduceThroughProxyIT extends SftpServerTestSupport {
private static HttpProxyServer proxyServer;
- private final int proxyPort = AvailablePortFinder.getNextAvailable();
+ @RegisterExtension
+
+ AvailablePortFinder.Port proxyPort = AvailablePortFinder.find();
@BeforeEach
public void setupProxy() {
proxyServer = DefaultHttpProxyServer.bootstrap()
- .withPort(proxyPort)
+ .withPort(proxyPort.getPort())
.withProxyAuthenticator(new ProxyAuthenticator() {
@Override
public boolean authenticate(String userName, String password) {
@@ -104,7 +107,7 @@ public class SftpSimpleProduceThroughProxyIT extends SftpServerTestSupport {
@BindToRegistry("proxy")
public ProxyHTTP createProxy() {
- final ProxyHTTP proxyHTTP = new ProxyHTTP("localhost", proxyPort);
+ final ProxyHTTP proxyHTTP = new ProxyHTTP("localhost", proxyPort.getPort());
proxyHTTP.setUserPasswd("user", "password");
return proxyHTTP;
}
diff --git a/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7TestSupport.java b/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7TestSupport.java
index e4fcad2e7532..7d70fee609f0 100644
--- a/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7TestSupport.java
+++ b/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7TestSupport.java
@@ -18,19 +18,15 @@ package org.apache.camel.component.hl7;
import org.apache.camel.test.AvailablePortFinder;
import org.apache.camel.test.junit6.CamelTestSupport;
-import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.extension.RegisterExtension;
public abstract class HL7TestSupport extends CamelTestSupport {
- private static int port;
-
- @BeforeAll
- public static void initPort() {
- port = AvailablePortFinder.getNextAvailable();
- }
+ @RegisterExtension
+ static AvailablePortFinder.Port port = AvailablePortFinder.find();
protected static int getPort() {
- return port;
+ return port.getPort();
}
}
diff --git a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpCustomComponentNameTest.java b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpCustomComponentNameTest.java
index 7e33555160b7..04589f2e6c9b 100644
--- a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpCustomComponentNameTest.java
+++ b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpCustomComponentNameTest.java
@@ -22,12 +22,16 @@ import org.apache.camel.support.service.ServiceHelper;
import org.apache.camel.test.AvailablePortFinder;
import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
public class HttpCustomComponentNameTest extends CamelTestSupport {
+ @RegisterExtension
+ AvailablePortFinder.Port port = AvailablePortFinder.find();
+
@Override
public boolean isUseRouteBuilder() {
return false;
@@ -37,13 +41,11 @@ public class HttpCustomComponentNameTest extends CamelTestSupport {
public void testCustomName() {
context.start();
- int port = AvailablePortFinder.getNextAvailable();
-
Component custom = new HttpComponent();
context.addComponent("http-foo", custom);
ServiceHelper.startService(custom);
- String uri = "http-foo://www.somewhere.com:" + port + "?q=Camel";
+ String uri = "http-foo://www.somewhere.com:" + port.getPort() + "?q=Camel";
Endpoint endpoint = context.getEndpoint(uri);
assertNotNull(endpoint);
// the endpoint uri should use the custom component name as scheme
diff --git a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpProducerSessionTest.java b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpProducerSessionTest.java
index 024b3e97b73d..9953f0c3cfc5 100644
--- a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpProducerSessionTest.java
+++ b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpProducerSessionTest.java
@@ -33,11 +33,12 @@ import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.RegisterExtension;
public class HttpProducerSessionTest extends CamelTestSupport {
- private static final int PORT = AvailablePortFinder.getNextAvailable();
+ @RegisterExtension
+ static AvailablePortFinder.Port PORT = AvailablePortFinder.find();
private final JettyConfiguration jettyConfiguration = JettyConfigurationBuilder
.emptyTemplate()
- .withPort(PORT)
+ .withPort(PORT.getPort())
.withContextPath("/session")
.withContextHandlerConfiguration()
.withCustomizer(HttpProducerSessionTest::customizer)
@@ -88,7 +89,7 @@ public class HttpProducerSessionTest extends CamelTestSupport {
private String getTestServerEndpointSessionUrl() {
// session handling will not work for localhost
- return "http://localhost:" + PORT + "/session/";
+ return "http://localhost:" + PORT.getPort() + "/session/";
}
@Override
diff --git a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpsTwoComponentsSslContextParametersGetTest.java b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpsTwoComponentsSslContextParametersGetTest.java
index 29491d73556b..41e630c6abbe 100644
--- a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpsTwoComponentsSslContextParametersGetTest.java
+++ b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpsTwoComponentsSslContextParametersGetTest.java
@@ -29,12 +29,14 @@ import org.apache.hc.core5.http.impl.routing.RequestRouter;
import org.apache.hc.core5.http.protocol.UriPatternType;
import org.apache.hc.core5.net.URIAuthority;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
public class HttpsTwoComponentsSslContextParametersGetTest extends BaseHttpsTest {
- private int port2;
+ @RegisterExtension
+ AvailablePortFinder.Port port2 = AvailablePortFinder.find();
private HttpServer localServer;
@BindToRegistry("x509HostnameVerifier")
@@ -88,14 +90,12 @@ public class HttpsTwoComponentsSslContextParametersGetTest extends BaseHttpsTest
context.addRoutes(new RouteBuilder() {
@Override
public void configure() {
- port2 = AvailablePortFinder.getNextAvailable();
-
from("direct:foo")
.to("https-foo://localhost:" + localServer.getLocalPort()
+ "/mail?x509HostnameVerifier=#x509HostnameVerifier&sslContextParameters=#sslContextParameters");
from("direct:bar")
- .to("https-bar://localhost:" + port2
+ .to("https-bar://localhost:" + port2.getPort()
+ "/mail?x509HostnameVerifier=#x509HostnameVerifier&sslContextParameters=#sslContextParameters2");
}
});
diff --git a/components/camel-ibm/camel-ibm-watsonx-ai/src/test/java/org/apache/camel/component/ibm/watsonx/ai/integration/WatsonxAiWebSocketStreamingIT.java b/components/camel-ibm/camel-ibm-watsonx-ai/src/test/java/org/apache/camel/component/ibm/watsonx/ai/integration/WatsonxAiWebSocketStreamingIT.java
index fa28ec52916d..dd6d6d8c62a7 100644
--- a/components/camel-ibm/camel-ibm-watsonx-ai/src/test/java/org/apache/camel/component/ibm/watsonx/ai/integration/WatsonxAiWebSocketStreamingIT.java
+++ b/components/camel-ibm/camel-ibm-watsonx-ai/src/test/java/org/apache/camel/component/ibm/watsonx/ai/integration/WatsonxAiWebSocketStreamingIT.java
@@ -35,6 +35,7 @@ import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.condition.EnabledIfSystemProperties;
import org.junit.jupiter.api.condition.EnabledIfSystemProperty;
+import org.junit.jupiter.api.extension.RegisterExtension;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -66,7 +67,8 @@ public class WatsonxAiWebSocketStreamingIT extends WatsonxAiTestSupport {
private static final String MODEL_ID = "ibm/granite-4-h-small";
- private final int port = AvailablePortFinder.getNextAvailable();
+ @RegisterExtension
+ AvailablePortFinder.Port port = AvailablePortFinder.find();
private Vertx vertx;
@AfterEach
@@ -96,7 +98,7 @@ public class WatsonxAiWebSocketStreamingIT extends WatsonxAiTestSupport {
context.addRoutes(new RouteBuilder() {
@Override
public void configure() {
- fromF("vertx-websocket:localhost:%d/chat", port)
+ fromF("vertx-websocket:localhost:%d/chat", port.getPort())
.routeId("websocket-chat-stream")
// Store connection key for sending responses back to this specific client
.setProperty("connectionKey", header(VertxWebsocketConstants.CONNECTION_KEY))
@@ -107,7 +109,7 @@ public class WatsonxAiWebSocketStreamingIT extends WatsonxAiTestSupport {
// Stream consumer that sends each token as a WebSocket message
Consumer<String> streamHandler = chunk -> {
producer.sendBodyAndHeader(
- "vertx-websocket:localhost:" + port + "/chat",
+ "vertx-websocket:localhost:" + port.getPort() + "/chat",
chunk,
VertxWebsocketConstants.CONNECTION_KEY, connectionKey);
};
@@ -124,7 +126,7 @@ public class WatsonxAiWebSocketStreamingIT extends WatsonxAiTestSupport {
String connectionKey = exchange.getProperty("connectionKey", String.class);
ProducerTemplate producer = exchange.getContext().createProducerTemplate();
producer.sendBodyAndHeader(
- "vertx-websocket:localhost:" + port + "/chat",
+ "vertx-websocket:localhost:" + port.getPort() + "/chat",
"[DONE]",
VertxWebsocketConstants.CONNECTION_KEY, connectionKey);
});
@@ -137,7 +139,7 @@ public class WatsonxAiWebSocketStreamingIT extends WatsonxAiTestSupport {
List<String> receivedMessages = new CopyOnWriteArrayList<>();
CountDownLatch doneLatch = new CountDownLatch(1);
- WebSocket webSocket = openWebSocketConnection("localhost", port, "/chat", message -> {
+ WebSocket webSocket = openWebSocketConnection("localhost", port.getPort(), "/chat", message -> {
LOG.info("Received WebSocket message: {}", message);
receivedMessages.add(message);
if ("[DONE]".equals(message)) {
@@ -170,7 +172,7 @@ public class WatsonxAiWebSocketStreamingIT extends WatsonxAiTestSupport {
context.addRoutes(new RouteBuilder() {
@Override
public void configure() {
- fromF("vertx-websocket:localhost:%d/explain", port)
+ fromF("vertx-websocket:localhost:%d/explain", port.getPort())
.routeId("websocket-explain-stream")
.setProperty("connectionKey", header(VertxWebsocketConstants.CONNECTION_KEY))
.process(exchange -> {
@@ -179,7 +181,7 @@ public class WatsonxAiWebSocketStreamingIT extends WatsonxAiTestSupport {
Consumer<String> streamHandler = chunk -> {
producer.sendBodyAndHeader(
- "vertx-websocket:localhost:" + port + "/explain",
+ "vertx-websocket:localhost:" + port.getPort() + "/explain",
chunk,
VertxWebsocketConstants.CONNECTION_KEY, connectionKey);
};
@@ -193,7 +195,7 @@ public class WatsonxAiWebSocketStreamingIT extends WatsonxAiTestSupport {
String connectionKey = exchange.getProperty("connectionKey", String.class);
ProducerTemplate producer = exchange.getContext().createProducerTemplate();
producer.sendBodyAndHeader(
- "vertx-websocket:localhost:" + port + "/explain",
+ "vertx-websocket:localhost:" + port.getPort() + "/explain",
"[DONE]",
VertxWebsocketConstants.CONNECTION_KEY, connectionKey);
});
@@ -205,7 +207,7 @@ public class WatsonxAiWebSocketStreamingIT extends WatsonxAiTestSupport {
List<String> receivedMessages = new CopyOnWriteArrayList<>();
CountDownLatch doneLatch = new CountDownLatch(1);
- WebSocket webSocket = openWebSocketConnection("localhost", port, "/explain", message -> {
+ WebSocket webSocket = openWebSocketConnection("localhost", port.getPort(), "/explain", message -> {
LOG.info("Received: {}", message);
receivedMessages.add(message);
if ("[DONE]".equals(message)) {
diff --git a/components/camel-iec60870/src/test/java/org/apache/camel/component/iec60870/ConnectionTest.java b/components/camel-iec60870/src/test/java/org/apache/camel/component/iec60870/ConnectionTest.java
index af4ba0db6227..7423031345ea 100644
--- a/components/camel-iec60870/src/test/java/org/apache/camel/component/iec60870/ConnectionTest.java
+++ b/components/camel-iec60870/src/test/java/org/apache/camel/component/iec60870/ConnectionTest.java
@@ -33,6 +33,7 @@ import org.eclipse.neoscada.protocol.iec60870.asdu.types.Value;
import org.eclipse.neoscada.protocol.iec60870.client.AutoConnectClient.State;
import org.eclipse.neoscada.protocol.iec60870.server.data.model.WriteModel.Request;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -85,33 +86,32 @@ public class ConnectionTest extends CamelTestSupport {
@EndpointInject(MOCK_SERVER_1)
protected MockEndpoint testServer1Endpoint;
- private int testPort;
+ @RegisterExtension
+ AvailablePortFinder.Port testPort = AvailablePortFinder.find();
@Override
protected RoutesBuilder createRouteBuilder() {
- testPort = AvailablePortFinder.getNextAvailable();
-
return new RouteBuilder() {
@Override
public void configure() {
- from(DIRECT_SEND_S_1).toF("iec60870-server:localhost:%s/00-00-00-00-01", testPort);
- fromF("iec60870-client:localhost:%s/00-00-00-00-01", testPort).to(MOCK_CLIENT_1);
- fromF("iec60870-client:localhost:%s/00-00-00-00-02", testPort).to(MOCK_CLIENT_2);
+ from(DIRECT_SEND_S_1).toF("iec60870-server:localhost:%s/00-00-00-00-01", testPort.getPort());
+ fromF("iec60870-client:localhost:%s/00-00-00-00-01", testPort.getPort()).to(MOCK_CLIENT_1);
+ fromF("iec60870-client:localhost:%s/00-00-00-00-02", testPort.getPort()).to(MOCK_CLIENT_2);
- from(DIRECT_SEND_C_1).toF("iec60870-client:localhost:%s/00-00-00-01-01", testPort);
- fromF("iec60870-server:localhost:%s/00-00-00-01-01", testPort).to(MOCK_SERVER_1);
+ from(DIRECT_SEND_C_1).toF("iec60870-client:localhost:%s/00-00-00-01-01", testPort.getPort());
+ fromF("iec60870-server:localhost:%s/00-00-00-01-01", testPort.getPort()).to(MOCK_SERVER_1);
// Route for interrogation command
- from(DIRECT_INTERROGATION).toF("iec60870-client:localhost:%s/00-00-00-00-01", testPort);
+ from(DIRECT_INTERROGATION).toF("iec60870-client:localhost:%s/00-00-00-00-01", testPort.getPort());
// Route for read command
- from(DIRECT_READ).toF("iec60870-client:localhost:%s/00-00-00-00-01", testPort);
+ from(DIRECT_READ).toF("iec60870-client:localhost:%s/00-00-00-00-01", testPort.getPort());
// Route for status command - gets connection state without sending protocol commands
from(DIRECT_STATUS)
.setHeader(Constants.IEC60870_COMMAND_TYPE, constant(Constants.COMMAND_TYPE_STATUS))
- .toF("iec60870-client:localhost:%s/00-00-00-00-01", testPort);
+ .toF("iec60870-client:localhost:%s/00-00-00-00-01", testPort.getPort());
}
};
}
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/temp/JmsRequestReplyTemporaryRefreshFailureOnStartupTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/temp/JmsRequestReplyTemporaryRefreshFailureOnStartupTest.java
index 70c3bd840c7c..0ba19e7e4bbc 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/temp/JmsRequestReplyTemporaryRefreshFailureOnStartupTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/temp/JmsRequestReplyTemporaryRefreshFailureOnStartupTest.java
@@ -38,6 +38,7 @@ import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.Tags;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestMethodOrder;
+import org.junit.jupiter.api.extension.RegisterExtension;
import static org.apache.camel.component.jms.JmsComponent.jmsComponentAutoAcknowledge;
@@ -45,8 +46,9 @@ import static org.apache.camel.component.jms.JmsComponent.jmsComponentAutoAcknow
@Tags({ @Tag("exclusive") })
public final class JmsRequestReplyTemporaryRefreshFailureOnStartupTest extends CamelTestSupport {
- private static final int PORT = AvailablePortFinder.getNextAvailable();
- public static ArtemisService service = new ArtemisVMService.ReusableArtemisVMService(PORT);
+ @RegisterExtension
+ static AvailablePortFinder.Port PORT = AvailablePortFinder.find();
+ public static ArtemisService service = new ArtemisVMService.ReusableArtemisVMService(PORT.getPort());
private final Long recoveryInterval = 1000L;
@@ -69,7 +71,7 @@ public final class JmsRequestReplyTemporaryRefreshFailureOnStartupTest extends C
}
private static void createBroker() {
- service = new ArtemisVMService.ReusableArtemisVMService(PORT);
+ service = new ArtemisVMService.ReusableArtemisVMService(PORT.getPort());
service.initialize();
}
diff --git a/components/camel-jmx/src/test/java/org/apache/camel/component/jmx/JMXRemoteTest.java b/components/camel-jmx/src/test/java/org/apache/camel/component/jmx/JMXRemoteTest.java
index 73586b06423b..996df760d67d 100644
--- a/components/camel-jmx/src/test/java/org/apache/camel/component/jmx/JMXRemoteTest.java
+++ b/components/camel-jmx/src/test/java/org/apache/camel/component/jmx/JMXRemoteTest.java
@@ -29,6 +29,7 @@ import javax.management.remote.JMXServiceURL;
import org.apache.camel.test.AvailablePortFinder;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
/**
* Tests against a "remote" JMX server. Creates an RMI Registry on or near port 39000 and registers the simple mbean
@@ -51,10 +52,12 @@ public class JMXRemoteTest extends SimpleBeanFixture {
@Override
protected void initServer() throws Exception {
- int port = AvailablePortFinder.getNextAvailable();
- registry = LocateRegistry.createRegistry(port);
+ @RegisterExtension
- url = new JMXServiceURL("service:jmx:rmi:///jndi/rmi://localhost:" + port + "/" + DOMAIN);
+ AvailablePortFinder.Port port = AvailablePortFinder.find();
+ registry = LocateRegistry.createRegistry(port.getPort());
+
+ url = new JMXServiceURL("service:jmx:rmi:///jndi/rmi://localhost:" + port.getPort() + "/" + DOMAIN);
// create MBean server
server = MBeanServerFactory.createMBeanServer(DOMAIN);
// create JMXConnectorServer MBean
diff --git a/components/camel-jmx/src/test/java/org/apache/camel/component/jmx/JMXRobustRemoteConnectionTest.java b/components/camel-jmx/src/test/java/org/apache/camel/component/jmx/JMXRobustRemoteConnectionTest.java
index 860121a530ee..7d20972c0457 100644
--- a/components/camel-jmx/src/test/java/org/apache/camel/component/jmx/JMXRobustRemoteConnectionTest.java
+++ b/components/camel-jmx/src/test/java/org/apache/camel/component/jmx/JMXRobustRemoteConnectionTest.java
@@ -26,7 +26,6 @@ import javax.management.remote.JMXConnectorServer;
import javax.management.remote.JMXConnectorServerFactory;
import javax.management.remote.JMXServiceURL;
-import org.apache.camel.test.AvailablePortFinder;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -54,7 +53,6 @@ public class JMXRobustRemoteConnectionTest extends SimpleBeanFixture {
@BeforeEach
@Override
public void setUp() throws Exception {
- port = AvailablePortFinder.getNextAvailable();
url = new JMXServiceURL("service:jmx:rmi:///jndi/rmi://localhost:" + port + "/" + DOMAIN);
initContext();
diff --git a/components/camel-jsch/src/test/java/org/apache/camel/component/scp/ScpServerTestSupport.java b/components/camel-jsch/src/test/java/org/apache/camel/component/scp/ScpServerTestSupport.java
index 42f4d1b58c6b..2e534a4e9b79 100644
--- a/components/camel-jsch/src/test/java/org/apache/camel/component/scp/ScpServerTestSupport.java
+++ b/components/camel-jsch/src/test/java/org/apache/camel/component/scp/ScpServerTestSupport.java
@@ -44,8 +44,8 @@ import org.apache.sshd.server.auth.password.PasswordAuthenticator;
import org.apache.sshd.server.auth.pubkey.PublickeyAuthenticator;
import org.apache.sshd.server.session.ServerSession;
import org.apache.sshd.sftp.server.SftpSubsystemFactory;
-import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.extension.RegisterExtension;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -56,7 +56,8 @@ public abstract class ScpServerTestSupport extends CamelTestSupport {
protected static final Logger LOG = LoggerFactory.getLogger(ScpServerTestSupport.class);
protected static final String SCP_ROOT_DIR = "target/test-classes/scp";
protected static final String KNOWN_HOSTS = "known_hosts";
- protected static int port;
+ @RegisterExtension
+ protected static AvailablePortFinder.Port port = AvailablePortFinder.find();
protected Consumer<SshServer> serverConfigurer;
@@ -75,18 +76,13 @@ public abstract class ScpServerTestSupport extends CamelTestSupport {
}
protected int getPort() {
- return port;
+ return port.getPort();
}
protected SshServer getSshd() {
return sshd;
}
- @BeforeAll
- public static void initPort() {
- port = AvailablePortFinder.getNextAvailable();
- }
-
@Override
@BeforeEach
public void doPreSetup() throws Exception {
diff --git a/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathPlatformHttpTest.java b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathPlatformHttpTest.java
index ee81bec58900..a83af808f7df 100644
--- a/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathPlatformHttpTest.java
+++ b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathPlatformHttpTest.java
@@ -26,6 +26,7 @@ import org.apache.camel.model.ProcessorDefinition;
import org.apache.camel.test.AvailablePortFinder;
import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -35,12 +36,13 @@ class JsonPathPlatformHttpTest extends CamelTestSupport {
public static final String JSON_PATH = "$.room[?(@.temperature > 20)]";
public static final String RESULT = "HOT";
- private static final int PORT = AvailablePortFinder.getNextAvailable();
+ @RegisterExtension
+ static AvailablePortFinder.Port PORT = AvailablePortFinder.find();
@Test
public void testWithPlatformHttp() {
String result = RestAssured.given()
- .port(PORT)
+ .port(PORT.getPort())
.contentType(ContentType.JSON)
.body(BODY)
.post("/getTemperature")
@@ -63,7 +65,7 @@ class JsonPathPlatformHttpTest extends CamelTestSupport {
CamelContext context = super.createCamelContext();
VertxPlatformHttpServerConfiguration conf = new VertxPlatformHttpServerConfiguration();
- conf.setBindPort(PORT);
+ conf.setBindPort(PORT.getPort());
context.addService(new VertxPlatformHttpServer(conf));
diff --git a/components/camel-knative/camel-knative-http/src/test/java/org/apache/camel/component/knative/http/KnativeHttpServer.java b/components/camel-knative/camel-knative-http/src/test/java/org/apache/camel/component/knative/http/KnativeHttpServer.java
index 66d71b124b72..37ffb6d903f5 100644
--- a/components/camel-knative/camel-knative-http/src/test/java/org/apache/camel/component/knative/http/KnativeHttpServer.java
+++ b/components/camel-knative/camel-knative-http/src/test/java/org/apache/camel/component/knative/http/KnativeHttpServer.java
@@ -56,7 +56,7 @@ public class KnativeHttpServer extends ServiceSupport {
private HttpServer server;
public KnativeHttpServer(CamelContext context) {
- this(context, "localhost", AvailablePortFinder.getNextAvailable(), "/", null);
+ this(context, "localhost", AvailablePortFinder.find().getPort(), "/", null);
}
public KnativeHttpServer(CamelContext context, int port) {
@@ -68,7 +68,7 @@ public class KnativeHttpServer extends ServiceSupport {
}
public KnativeHttpServer(CamelContext context, Handler<RoutingContext> handler) {
- this(context, "localhost", AvailablePortFinder.getNextAvailable(), "/", handler);
+ this(context, "localhost", AvailablePortFinder.find().getPort(), "/", handler);
}
public KnativeHttpServer(CamelContext context, String host, int port, String path) {
@@ -76,11 +76,11 @@ public class KnativeHttpServer extends ServiceSupport {
}
public KnativeHttpServer(CamelContext context, String host, String path) {
- this(context, host, AvailablePortFinder.getNextAvailable(), path, null);
+ this(context, host, AvailablePortFinder.find().getPort(), path, null);
}
public KnativeHttpServer(CamelContext context, String host, String path, Handler<RoutingContext> handler) {
- this(context, host, AvailablePortFinder.getNextAvailable(), path, handler);
+ this(context, host, AvailablePortFinder.find().getPort(), path, handler);
}
public KnativeHttpServer(CamelContext context, String host, int port, String path, Handler<RoutingContext> handler) {
diff --git a/components/camel-knative/camel-knative-http/src/test/java/org/apache/camel/component/knative/http/KnativeHttpTest.java b/components/camel-knative/camel-knative-http/src/test/java/org/apache/camel/component/knative/http/KnativeHttpTest.java
index 103845a526c4..6cdd820881d2 100644
--- a/components/camel-knative/camel-knative-http/src/test/java/org/apache/camel/component/knative/http/KnativeHttpTest.java
+++ b/components/camel-knative/camel-knative-http/src/test/java/org/apache/camel/component/knative/http/KnativeHttpTest.java
@@ -53,6 +53,7 @@ import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.extension.RegisterExtension;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.EnumSource;
@@ -72,6 +73,8 @@ public class KnativeHttpTest {
private CamelContext context;
private ProducerTemplate template;
+ @RegisterExtension
+ AvailablePortFinder.Port platformHttpPortExt = AvailablePortFinder.find();
private int platformHttpPort;
private String platformHttpHost;
@@ -91,7 +94,7 @@ public class KnativeHttpTest {
this.context = new DefaultCamelContext();
this.template = this.context.createProducerTemplate();
this.platformHttpHost = "localhost";
- this.platformHttpPort = AvailablePortFinder.getNextAvailable();
+ this.platformHttpPort = platformHttpPortExt.getPort();
configurePlatformHttpComponent(context, this.platformHttpPort);
@@ -1356,7 +1359,6 @@ public class KnativeHttpTest {
@ParameterizedTest
@EnumSource(CloudEvents.class)
void testHeaders(CloudEvent ce) throws Exception {
- final int port = AvailablePortFinder.getNextAvailable();
final KnativeHttpServer server = new KnativeHttpServer(context);
configureKnativeComponent(
diff --git a/components/camel-knative/camel-knative-http/src/test/java/org/apache/camel/component/knative/http/KnativeHttpsServer.java b/components/camel-knative/camel-knative-http/src/test/java/org/apache/camel/component/knative/http/KnativeHttpsServer.java
index 6a56aed70db0..5291cc07c0b4 100644
--- a/components/camel-knative/camel-knative-http/src/test/java/org/apache/camel/component/knative/http/KnativeHttpsServer.java
+++ b/components/camel-knative/camel-knative-http/src/test/java/org/apache/camel/component/knative/http/KnativeHttpsServer.java
@@ -27,7 +27,7 @@ import org.apache.camel.test.AvailablePortFinder;
public class KnativeHttpsServer extends KnativeHttpServer {
public KnativeHttpsServer(CamelContext context) {
- super(context, "localhost", AvailablePortFinder.getNextAvailable(), "/", null);
+ super(context, "localhost", AvailablePortFinder.find().getPort(), "/", null);
}
public KnativeHttpsServer(CamelContext context, int port) {
@@ -39,7 +39,7 @@ public class KnativeHttpsServer extends KnativeHttpServer {
}
public KnativeHttpsServer(CamelContext context, Handler<RoutingContext> handler) {
- super(context, "localhost", AvailablePortFinder.getNextAvailable(), "/", handler);
+ super(context, "localhost", AvailablePortFinder.find().getPort(), "/", handler);
}
public KnativeHttpsServer(CamelContext context, String host, int port, String path) {
@@ -47,11 +47,11 @@ public class KnativeHttpsServer extends KnativeHttpServer {
}
public KnativeHttpsServer(CamelContext context, String host, String path) {
- super(context, host, AvailablePortFinder.getNextAvailable(), path, null);
+ super(context, host, AvailablePortFinder.find().getPort(), path, null);
}
public KnativeHttpsServer(CamelContext context, String host, String path, Handler<RoutingContext> handler) {
- super(context, host, AvailablePortFinder.getNextAvailable(), path, handler);
+ super(context, host, AvailablePortFinder.find().getPort(), path, handler);
}
@Override
diff --git a/components/camel-lra/src/test/java/org/apache/camel/service/lra/AbstractLRATestSupport.java b/components/camel-lra/src/test/java/org/apache/camel/service/lra/AbstractLRATestSupport.java
index 7f9c352f31b9..f5030cf5eabe 100644
--- a/components/camel-lra/src/test/java/org/apache/camel/service/lra/AbstractLRATestSupport.java
+++ b/components/camel-lra/src/test/java/org/apache/camel/service/lra/AbstractLRATestSupport.java
@@ -107,7 +107,9 @@ public abstract class AbstractLRATestSupport extends CamelTestSupport {
protected int getServerPort() {
if (serverPort == null) {
- serverPort = AvailablePortFinder.getNextAvailable();
+ try (AvailablePortFinder.Port p = AvailablePortFinder.find()) {
+ serverPort = p.getPort();
+ }
}
return serverPort;
}
diff --git a/components/camel-milo/src/test/java/org/apache/camel/component/milo/AbstractMiloServerTest.java b/components/camel-milo/src/test/java/org/apache/camel/component/milo/AbstractMiloServerTest.java
index 753c3521d994..119df3efc6fb 100644
--- a/components/camel-milo/src/test/java/org/apache/camel/component/milo/AbstractMiloServerTest.java
+++ b/components/camel-milo/src/test/java/org/apache/camel/component/milo/AbstractMiloServerTest.java
@@ -47,7 +47,9 @@ public abstract class AbstractMiloServerTest extends CamelTestSupport {
@Override
protected void doPreSetup() throws Exception {
- this.serverPort = AvailablePortFinder.getNextAvailable();
+ try (AvailablePortFinder.Port port = AvailablePortFinder.find()) {
+ this.serverPort = port.getPort();
+ }
}
public int getServerPort() {
diff --git a/components/camel-milo/src/test/java/org/apache/camel/component/milo/server/ServerLocalTest.java b/components/camel-milo/src/test/java/org/apache/camel/component/milo/server/ServerLocalTest.java
index 3651bc02ec7d..c84603e5ed3c 100644
--- a/components/camel-milo/src/test/java/org/apache/camel/component/milo/server/ServerLocalTest.java
+++ b/components/camel-milo/src/test/java/org/apache/camel/component/milo/server/ServerLocalTest.java
@@ -29,6 +29,7 @@ import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestInfo;
+import org.junit.jupiter.api.extension.RegisterExtension;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -43,6 +44,9 @@ public class ServerLocalTest extends CamelTestSupport {
private static final Logger LOG = LoggerFactory.getLogger(ConverterTest.class);
+ @RegisterExtension
+ AvailablePortFinder.Port port = AvailablePortFinder.find();
+
@EndpointInject(MOCK_TEST)
protected MockEndpoint testEndpoint;
@@ -53,7 +57,7 @@ public class ServerLocalTest extends CamelTestSupport {
LOG.info(displayName);
LOG.info("********************************************************************************");
final MiloServerComponent component = context().getComponent("milo-server", MiloServerComponent.class);
- component.setPort(AvailablePortFinder.getNextAvailable());
+ component.setPort(port.getPort());
}
@Override
diff --git a/components/camel-mina/src/test/java/org/apache/camel/component/mina/BaseMinaTest.java b/components/camel-mina/src/test/java/org/apache/camel/component/mina/BaseMinaTest.java
index 5434e2fbcad5..8a7244003d10 100644
--- a/components/camel-mina/src/test/java/org/apache/camel/component/mina/BaseMinaTest.java
+++ b/components/camel-mina/src/test/java/org/apache/camel/component/mina/BaseMinaTest.java
@@ -28,25 +28,23 @@ import org.apache.camel.support.jsse.SecureSocketProtocolsParameters;
import org.apache.camel.support.jsse.TrustManagersParameters;
import org.apache.camel.test.AvailablePortFinder;
import org.apache.camel.test.junit6.CamelTestSupport;
-import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.extension.RegisterExtension;
public abstract class BaseMinaTest extends CamelTestSupport {
protected static final String KEY_STORE_PASSWORD = "changeit";
- private static volatile int port;
-
- @BeforeAll
- public static void initPort() {
- port = AvailablePortFinder.getNextAvailable();
- }
+ @RegisterExtension
+ AvailablePortFinder.Port port = AvailablePortFinder.find();
protected int getNextPort() {
- return AvailablePortFinder.getNextAvailable();
+ try (AvailablePortFinder.Port p = AvailablePortFinder.find()) {
+ return p.getPort();
+ }
}
protected int getPort() {
- return port;
+ return port.getPort();
}
protected boolean isUseSslContext() {
diff --git a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpEndpointUriFactoryTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpEndpointUriFactoryTest.java
index 30f8fe68fb4f..81e0c614aefe 100644
--- a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpEndpointUriFactoryTest.java
+++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpEndpointUriFactoryTest.java
@@ -21,9 +21,13 @@ import java.util.Map;
import org.apache.camel.test.AvailablePortFinder;
import org.apache.camel.test.junit6.EndpointUriFactoryTestSupport;
+import org.junit.jupiter.api.extension.RegisterExtension;
public class NettyHttpEndpointUriFactoryTest extends EndpointUriFactoryTestSupport {
+ @RegisterExtension
+ AvailablePortFinder.Port port = AvailablePortFinder.find();
+
@Override
protected String scheme() {
return "netty-http";
@@ -34,7 +38,7 @@ public class NettyHttpEndpointUriFactoryTest extends EndpointUriFactoryTestSuppo
Map<String, Object> params = new HashMap<>();
params.put("protocol", "http");
params.put("host", "localhost");
- params.put("port", AvailablePortFinder.getNextAvailable());
+ params.put("port", port.getPort());
params.put("path", "test");
return params;
}
diff --git a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpGetWithInvalidMessageTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpGetWithInvalidMessageTest.java
index bb7972a95542..86552d30afdd 100644
--- a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpGetWithInvalidMessageTest.java
+++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpGetWithInvalidMessageTest.java
@@ -29,6 +29,7 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.test.AvailablePortFinder;
import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -40,7 +41,8 @@ public class NettyHttpGetWithInvalidMessageTest extends CamelTestSupport {
another: value
Host: localhost
""";
- private int port1;
+ @RegisterExtension
+ AvailablePortFinder.Port port1 = AvailablePortFinder.find();
@BindToRegistry("string-decoder")
private final StringDecoder stringDecoder = new StringDecoder();
@@ -68,12 +70,12 @@ public class NettyHttpGetWithInvalidMessageTest extends CamelTestSupport {
@Test
public void testNettyHttpServer() {
- invokeService(port1);
+ invokeService(port1.getPort());
}
//@Test
public void testJettyHttpServer() {
- invokeService(port1);
+ invokeService(port1.getPort());
}
private void invokeService(int port) {
@@ -97,10 +99,8 @@ public class NettyHttpGetWithInvalidMessageTest extends CamelTestSupport {
return new RouteBuilder() {
@Override
public void configure() {
- port1 = AvailablePortFinder.getNextAvailable();
-
// set up a netty http proxy
- from("netty-http:http://localhost:" + port1 + "/test")
+ from("netty-http:http://localhost:" + port1.getPort() + "/test")
.transform().simple("Bye ${header.user}.");
}
diff --git a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpProducerHeadersTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpProducerHeadersTest.java
index 7ba15c811a1e..f1e671c3b47b 100644
--- a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpProducerHeadersTest.java
+++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpProducerHeadersTest.java
@@ -24,19 +24,22 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.test.AvailablePortFinder;
import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import static org.junit.jupiter.api.Assertions.assertEquals;
public class NettyHttpProducerHeadersTest extends CamelTestSupport {
- private int port;
+ @RegisterExtension
+ AvailablePortFinder.Port port = AvailablePortFinder.find();
@Test
public void testWithEmptyPath() {
Map<String, Object> headers = new HashMap<>();
headers.put(Exchange.HTTP_METHOD, "GET");
headers.put(Exchange.HTTP_QUERY, "hi=hello");
- String result = template.requestBodyAndHeaders("netty-http:http://localhost:" + port, "", headers, String.class);
+ String result
+ = template.requestBodyAndHeaders("netty-http:http://localhost:" + port.getPort(), "", headers, String.class);
assertEquals("/", result);
}
@@ -46,7 +49,8 @@ public class NettyHttpProducerHeadersTest extends CamelTestSupport {
headers.put(Exchange.HTTP_METHOD, "GET");
headers.put(Exchange.HTTP_PATH, "/");
headers.put(Exchange.HTTP_QUERY, "hi=hello");
- String result = template.requestBodyAndHeaders("netty-http:http://localhost:" + port, "", headers, String.class);
+ String result
+ = template.requestBodyAndHeaders("netty-http:http://localhost:" + port.getPort(), "", headers, String.class);
assertEquals("/", result);
}
@@ -56,7 +60,8 @@ public class NettyHttpProducerHeadersTest extends CamelTestSupport {
headers.put(Exchange.HTTP_METHOD, "GET");
headers.put(Exchange.HTTP_PATH, "some-path");
headers.put(Exchange.HTTP_QUERY, "hi=hello");
- String result = template.requestBodyAndHeaders("netty-http:http://localhost:" + port, "", headers, String.class);
+ String result
+ = template.requestBodyAndHeaders("netty-http:http://localhost:" + port.getPort(), "", headers, String.class);
assertEquals("/some-path", result);
}
@@ -64,7 +69,8 @@ public class NettyHttpProducerHeadersTest extends CamelTestSupport {
public void testWithNoQuery() {
Map<String, Object> headers = new HashMap<>();
headers.put(Exchange.HTTP_METHOD, "GET");
- String result = template.requestBodyAndHeaders("netty-http:http://localhost:" + port, "", headers, String.class);
+ String result
+ = template.requestBodyAndHeaders("netty-http:http://localhost:" + port.getPort(), "", headers, String.class);
assertEquals("/", result);
}
@@ -73,9 +79,7 @@ public class NettyHttpProducerHeadersTest extends CamelTestSupport {
return new RouteBuilder() {
@Override
public void configure() {
- port = AvailablePortFinder.getNextAvailable();
-
- from("netty-http:http://localhost:" + port + "?matchOnUriPrefix=true")
+ from("netty-http:http://localhost:" + port.getPort() + "?matchOnUriPrefix=true")
.setBody(simple("${header." + Exchange.HTTP_URI + "}"));
}
};
diff --git a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpProducerProxyModeTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpProducerProxyModeTest.java
index 137349c50f6f..f4e9ffa30abd 100644
--- a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpProducerProxyModeTest.java
+++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpProducerProxyModeTest.java
@@ -21,6 +21,7 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.test.AvailablePortFinder;
import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import static org.apache.camel.component.netty.http.NettyHttpEndpoint.PROXY_NOT_SUPPORTED_MESSAGE;
import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -34,7 +35,8 @@ public class NettyHttpProducerProxyModeTest extends CamelTestSupport {
return false;
}
- private static final int port = AvailablePortFinder.getNextAvailable();
+ @RegisterExtension
+ AvailablePortFinder.Port port = AvailablePortFinder.find();
@Test
public void testProxyNotSupported() throws Exception {
@@ -45,7 +47,7 @@ public class NettyHttpProducerProxyModeTest extends CamelTestSupport {
public void configure() {
from("direct:start")
.routeId("proxy-producer")
- .to("netty-http:proxy://localhost:" + port + "/foo");
+ .to("netty-http:proxy://localhost:" + port.getPort() + "/foo");
}
});
diff --git a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/ProxyProtocolTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/ProxyProtocolTest.java
index 7da6ebc74f64..31c031ae59dd 100644
--- a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/ProxyProtocolTest.java
+++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/ProxyProtocolTest.java
@@ -48,6 +48,7 @@ import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.extension.RegisterExtension;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.MethodSource;
import org.slf4j.Logger;
@@ -62,9 +63,11 @@ public class ProxyProtocolTest {
private static final Logger LOG = LoggerFactory.getLogger(ProxyProtocolTest.class);
- private static final int ORIGIN_PORT = AvailablePortFinder.getNextAvailable();
+ @RegisterExtension
+ static AvailablePortFinder.Port originPort = AvailablePortFinder.find();
- private static final int PROXY_PORT = AvailablePortFinder.getNextAvailable();
+ @RegisterExtension
+ static AvailablePortFinder.Port proxyPort = AvailablePortFinder.find();
private DefaultCamelContext context;
@@ -84,7 +87,7 @@ public class ProxyProtocolTest {
// origin service that serves `"origin server"` on
// http://localhost:originPort/path
- from("netty-http:http://localhost:" + ORIGIN_PORT + "/path")
+ from("netty-http:http://localhost:" + originPort.getPort() + "/path")
.process(ProxyProtocolTest::origin);
}
});
@@ -160,29 +163,32 @@ public class ProxyProtocolTest {
}
public static Iterable<Object[]> routeOptions() {
- final Function<RouteBuilder, RouteDefinition> single = r -> r.from("netty-http:proxy://localhost:" + PROXY_PORT)
- .process(ProxyProtocolTest::uppercase)
- .to("netty-http:http://localhost:" + ORIGIN_PORT)
- .process(ProxyProtocolTest::uppercase);
-
- final Function<RouteBuilder, RouteDefinition> dynamicPath = r -> r.from("netty-http:proxy://localhost:" + PROXY_PORT)
- .process(ProxyProtocolTest::uppercase)
- .toD("netty-http:http://localhost:" + ORIGIN_PORT + "/${headers." + Exchange.HTTP_PATH + "}")
- .process(ProxyProtocolTest::uppercase);
-
- final Function<RouteBuilder, RouteDefinition> dynamicUrl = r -> r.from("netty-http:proxy://localhost:" + PROXY_PORT)
- .process(ProxyProtocolTest::uppercase)
- .toD("netty-http:"
- + "${headers." + Exchange.HTTP_SCHEME + "}://"
- + "${headers." + Exchange.HTTP_HOST + "}:"
- + "${headers." + Exchange.HTTP_PORT + "}/"
- + "${headers." + Exchange.HTTP_PATH + "}")
- .process(ProxyProtocolTest::uppercase);
+ final Function<RouteBuilder, RouteDefinition> single
+ = r -> r.from("netty-http:proxy://localhost:" + proxyPort.getPort())
+ .process(ProxyProtocolTest::uppercase)
+ .to("netty-http:http://localhost:" + originPort.getPort())
+ .process(ProxyProtocolTest::uppercase);
+
+ final Function<RouteBuilder, RouteDefinition> dynamicPath
+ = r -> r.from("netty-http:proxy://localhost:" + proxyPort.getPort())
+ .process(ProxyProtocolTest::uppercase)
+ .toD("netty-http:http://localhost:" + originPort.getPort() + "/${headers." + Exchange.HTTP_PATH + "}")
+ .process(ProxyProtocolTest::uppercase);
+
+ final Function<RouteBuilder, RouteDefinition> dynamicUrl
+ = r -> r.from("netty-http:proxy://localhost:" + proxyPort.getPort())
+ .process(ProxyProtocolTest::uppercase)
+ .toD("netty-http:"
+ + "${headers." + Exchange.HTTP_SCHEME + "}://"
+ + "${headers." + Exchange.HTTP_HOST + "}:"
+ + "${headers." + Exchange.HTTP_PORT + "}/"
+ + "${headers." + Exchange.HTTP_PATH + "}")
+ .process(ProxyProtocolTest::uppercase);
return Arrays.asList(
new Object[] { single, "http://test/path" },
new Object[] { dynamicPath, "http://test/path" },
- new Object[] { dynamicUrl, "http://localhost:" + ORIGIN_PORT + "/path" });
+ new Object[] { dynamicUrl, "http://localhost:" + originPort.getPort() + "/path" });
}
@BeforeAll
@@ -232,7 +238,7 @@ public class ProxyProtocolTest {
}
private static InputStream request(final String url) throws IOException {
- final Proxy proxy = new Proxy(Proxy.Type.HTTP, new InetSocketAddress("localhost", PROXY_PORT));
+ final Proxy proxy = new Proxy(Proxy.Type.HTTP, new InetSocketAddress("localhost", proxyPort.getPort()));
final HttpURLConnection connection = (HttpURLConnection) new URL(url).openConnection(proxy);
// when debugging comment out the following two lines otherwise
@@ -246,7 +252,7 @@ public class ProxyProtocolTest {
private static InputStream request(final String url, final String payload, final String contentType)
throws IOException {
- final Proxy proxy = new Proxy(Proxy.Type.HTTP, new InetSocketAddress("localhost", PROXY_PORT));
+ final Proxy proxy = new Proxy(Proxy.Type.HTTP, new InetSocketAddress("localhost", proxyPort.getPort()));
final HttpURLConnection connection = (HttpURLConnection) new URL(url).openConnection(proxy);
connection.addRequestProperty("Content-Type", contentType);
diff --git a/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyEndpointUriFactoryTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyEndpointUriFactoryTest.java
index f60d15298bd9..3003f2ac1d51 100644
--- a/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyEndpointUriFactoryTest.java
+++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyEndpointUriFactoryTest.java
@@ -21,9 +21,13 @@ import java.util.Map;
import org.apache.camel.test.AvailablePortFinder;
import org.apache.camel.test.junit6.EndpointUriFactoryTestSupport;
+import org.junit.jupiter.api.extension.RegisterExtension;
public class NettyEndpointUriFactoryTest extends EndpointUriFactoryTestSupport {
+ @RegisterExtension
+ AvailablePortFinder.Port port = AvailablePortFinder.find();
+
@Override
protected String scheme() {
return "netty";
@@ -34,7 +38,7 @@ public class NettyEndpointUriFactoryTest extends EndpointUriFactoryTestSupport {
Map<String, Object> params = new HashMap<>();
params.put("protocol", "tcp");
params.put("host", "localhost");
- params.put("port", AvailablePortFinder.getNextAvailable());
+ params.put("port", port.getPort());
return params;
}
}
diff --git a/components/camel-netty/src/test/java/org/apache/camel/component/netty/ObjectSerializationTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty/ObjectSerializationTest.java
index 636991037f6f..427575ce1fc5 100644
--- a/components/camel-netty/src/test/java/org/apache/camel/component/netty/ObjectSerializationTest.java
+++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty/ObjectSerializationTest.java
@@ -29,8 +29,8 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.netty.codec.ObjectDecoder;
import org.apache.camel.component.netty.codec.ObjectEncoder;
import org.apache.camel.test.AvailablePortFinder;
-import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertThrows;
@@ -40,12 +40,8 @@ import static org.junit.jupiter.api.Assertions.assertThrows;
*/
public class ObjectSerializationTest extends BaseNettyTest {
- private static volatile int port2;
-
- @BeforeAll
- public static void initPort2() {
- port2 = AvailablePortFinder.getNextAvailable();
- }
+ @RegisterExtension
+ AvailablePortFinder.Port port2 = AvailablePortFinder.find();
@Test
public void testObjectSerializationFailureByDefault() {
@@ -59,7 +55,8 @@ public class ObjectSerializationTest extends BaseNettyTest {
public void testObjectSerializationAllowedViaDecoder() {
Date date = new Date();
Date receivedDate = template
- .requestBody("netty:tcp://localhost:{{port2}}?sync=true&encoders=#encoder&decoders=#decoder", date, Date.class);
+ .requestBody("netty:tcp://localhost:{{port2.getPort()}}?sync=true&encoders=#encoder&decoders=#decoder", date,
+ Date.class);
assertEquals(date, receivedDate);
}
@@ -69,7 +66,7 @@ public class ObjectSerializationTest extends BaseNettyTest {
Properties prop = new Properties();
prop.setProperty("port", Integer.toString(getPort()));
- prop.setProperty("port2", Integer.toString(port2));
+ prop.setProperty("port2", Integer.toString(port2.getPort()));
return prop;
}
@@ -102,7 +99,7 @@ public class ObjectSerializationTest extends BaseNettyTest {
}
});
- from("netty:tcp://localhost:{{port2}}?sync=true&decoders=#decoder&encoders=#encoder")
+ from("netty:tcp://localhost:{{port2.getPort()}}?sync=true&decoders=#decoder&encoders=#encoder")
.process(new Processor() {
public void process(Exchange exchange) {
Object obj = exchange.getIn().getBody();
diff --git a/components/camel-oaipmh/src/test/java/org/apache/camel/oaipmh/utils/MockOaipmhServer.java b/components/camel-oaipmh/src/test/java/org/apache/camel/oaipmh/utils/MockOaipmhServer.java
index cee9b14cd36c..7088043972ca 100644
--- a/components/camel-oaipmh/src/test/java/org/apache/camel/oaipmh/utils/MockOaipmhServer.java
+++ b/components/camel-oaipmh/src/test/java/org/apache/camel/oaipmh/utils/MockOaipmhServer.java
@@ -55,8 +55,13 @@ public final class MockOaipmhServer {
}
public static MockOaipmhServer create() {
- int httpPort = AvailablePortFinder.getNextAvailable();
- int httpsPort = AvailablePortFinder.getNextAvailable();
+ int httpPort;
+ int httpsPort;
+ try (AvailablePortFinder.Port p1 = AvailablePortFinder.find();
+ AvailablePortFinder.Port p2 = AvailablePortFinder.find()) {
+ httpPort = p1.getPort();
+ httpsPort = p2.getPort();
+ }
MockOaipmhServer server = new MockOaipmhServer(httpPort, httpsPort);
return server;
}
diff --git a/components/camel-olingo2/camel-olingo2-component/src/test/java/org/apache/camel/component/olingo2/AbstractOlingo2AppAPITestSupport.java b/components/camel-olingo2/camel-olingo2-component/src/test/java/org/apache/camel/component/olingo2/AbstractOlingo2AppAPITestSupport.java
index 3cea8d5a3883..e55daba32ede 100644
--- a/components/camel-olingo2/camel-olingo2-component/src/test/java/org/apache/camel/component/olingo2/AbstractOlingo2AppAPITestSupport.java
+++ b/components/camel-olingo2/camel-olingo2-component/src/test/java/org/apache/camel/component/olingo2/AbstractOlingo2AppAPITestSupport.java
@@ -34,6 +34,7 @@ import org.apache.http.entity.ContentType;
import org.apache.olingo.odata2.api.ep.entry.ODataEntry;
import org.apache.olingo.odata2.api.ep.feed.ODataDeltaFeed;
import org.apache.olingo.odata2.api.ep.feed.ODataFeed;
+import org.junit.jupiter.api.extension.RegisterExtension;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -44,7 +45,8 @@ public class AbstractOlingo2AppAPITestSupport {
protected static final String SERVICE_NAME = "MyFormula.svc";
protected static final Logger LOG = LoggerFactory.getLogger(AbstractOlingo2AppAPITestSupport.class);
- protected static final int PORT = AvailablePortFinder.getNextAvailable();
+ @RegisterExtension
+ protected static AvailablePortFinder.Port PORT = AvailablePortFinder.find();
protected static final long TIMEOUT = 100000;
protected static final String MANUFACTURERS = "Manufacturers";
protected static final String FQN_MANUFACTURERS = "DefaultContainer.Manufacturers";
@@ -65,7 +67,7 @@ public class AbstractOlingo2AppAPITestSupport {
protected static final String TEST_MANUFACTURER_LINKS_CARS = "Manufacturers('1')/$links/Cars";
protected static final String TEST_CAR_LINK_MANUFACTURER = "Cars('1')/$links/Manufacturer";
protected static final String COUNT_OPTION = "/$count";
- protected static final String TEST_SERVICE_URL = "http://localhost:" + PORT + "/" + SERVICE_NAME;
+ protected static final String TEST_SERVICE_URL = "http://localhost:" + PORT.getPort() + "/" + SERVICE_NAME;
protected static final ContentType TEST_FORMAT = ContentType.APPLICATION_JSON;
protected static final String TEST_FORMAT_STRING = TEST_FORMAT.toString();
protected static final String ID_PROPERTY = "Id";
@@ -142,7 +144,7 @@ public class AbstractOlingo2AppAPITestSupport {
}
protected static JettyConfiguration createConfiguration() {
- return createConfiguration(PORT);
+ return createConfiguration(PORT.getPort());
}
protected static JettyConfiguration createConfiguration(int port) {
diff --git a/components/camel-paho-mqtt5/src/test/java/org/apache/camel/component/paho/mqtt5/PahoMqtt5ReconnectAfterFailureIT.java b/components/camel-paho-mqtt5/src/test/java/org/apache/camel/component/paho/mqtt5/PahoMqtt5ReconnectAfterFailureIT.java
index 5849361d3035..fae10b1a8fd2 100644
--- a/components/camel-paho-mqtt5/src/test/java/org/apache/camel/component/paho/mqtt5/PahoMqtt5ReconnectAfterFailureIT.java
+++ b/components/camel-paho-mqtt5/src/test/java/org/apache/camel/component/paho/mqtt5/PahoMqtt5ReconnectAfterFailureIT.java
@@ -35,6 +35,7 @@ import org.apache.camel.test.infra.mosquitto.services.MosquittoService;
import org.apache.camel.test.infra.mosquitto.services.MosquittoServiceFactory;
import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotEquals;
@@ -43,7 +44,9 @@ import static org.junit.jupiter.api.Assertions.fail;
public class PahoMqtt5ReconnectAfterFailureIT extends CamelTestSupport {
public static final String TESTING_ROUTE_ID = "testingRoute";
- private static int mqttPort = AvailablePortFinder.getNextAvailable();
+ @RegisterExtension
+
+ static AvailablePortFinder.Port mqttPort = AvailablePortFinder.find();
MosquittoService service;
CountDownLatch routeStartedLatch = new CountDownLatch(1);
@@ -52,11 +55,11 @@ public class PahoMqtt5ReconnectAfterFailureIT extends CamelTestSupport {
MockEndpoint mock;
private static MosquittoService createLocalService() {
- return new MosquittoLocalContainerService(mqttPort);
+ return new MosquittoLocalContainerService(mqttPort.getPort());
}
private static MosquittoService createRemoteService() {
- return new MosquittoRemoteService(mqttPort);
+ return new MosquittoRemoteService(mqttPort.getPort());
}
@Override
@@ -94,8 +97,9 @@ public class PahoMqtt5ReconnectAfterFailureIT extends CamelTestSupport {
@Override
public void configure() {
- from("direct:test").to("paho-mqtt5:queue?lazyStartProducer=true&brokerUrl=tcp://localhost:" + mqttPort);
- from("paho-mqtt5:queue?brokerUrl=tcp://localhost:" + mqttPort)
+ from("direct:test")
+ .to("paho-mqtt5:queue?lazyStartProducer=true&brokerUrl=tcp://localhost:" + mqttPort.getPort());
+ from("paho-mqtt5:queue?brokerUrl=tcp://localhost:" + mqttPort.getPort())
.id(TESTING_ROUTE_ID)
.routePolicy(new RoutePolicySupport() {
@Override
@@ -127,7 +131,7 @@ public class PahoMqtt5ReconnectAfterFailureIT extends CamelTestSupport {
mock.expectedBodiesReceived(msg);
// When
- template.sendBody("paho-mqtt5:queue?lazyStartProducer=true&brokerUrl=tcp://localhost:" + mqttPort, msg);
+ template.sendBody("paho-mqtt5:queue?lazyStartProducer=true&brokerUrl=tcp://localhost:" + mqttPort.getPort(), msg);
// Then
mock.assertIsSatisfied();
diff --git a/components/camel-paho/src/test/java/org/apache/camel/component/paho/PahoReconnectAfterFailureIT.java b/components/camel-paho/src/test/java/org/apache/camel/component/paho/PahoReconnectAfterFailureIT.java
index b9058d04c6c7..251952458cb4 100644
--- a/components/camel-paho/src/test/java/org/apache/camel/component/paho/PahoReconnectAfterFailureIT.java
+++ b/components/camel-paho/src/test/java/org/apache/camel/component/paho/PahoReconnectAfterFailureIT.java
@@ -58,7 +58,9 @@ public class PahoReconnectAfterFailureIT implements ConfigurableRoute, Configura
ArtemisMQTTService broker;
CountDownLatch routeStartedLatch = new CountDownLatch(1);
- int port = AvailablePortFinder.getNextAvailable();
+ @RegisterExtension
+
+ AvailablePortFinder.Port port = AvailablePortFinder.find();
@EndpointInject("mock:test")
MockEndpoint mock;
@@ -95,8 +97,8 @@ public class PahoReconnectAfterFailureIT implements ConfigurableRoute, Configura
@Override
public void configure() {
- from("direct:test").to("paho:queue?lazyStartProducer=true&brokerUrl=tcp://localhost:" + port);
- from("paho:queue?brokerUrl=tcp://localhost:" + port)
+ from("direct:test").to("paho:queue?lazyStartProducer=true&brokerUrl=tcp://localhost:" + port.getPort());
+ from("paho:queue?brokerUrl=tcp://localhost:" + port.getPort())
.id(TESTING_ROUTE_ID)
.routePolicy(new RoutePolicySupport() {
@Override
@@ -133,7 +135,7 @@ public class PahoReconnectAfterFailureIT implements ConfigurableRoute, Configura
// When
ProducerTemplate template = camelContextExtension.getProducerTemplate();
- template.sendBody("paho:queue?lazyStartProducer=true&brokerUrl=tcp://localhost:" + port, msg);
+ template.sendBody("paho:queue?lazyStartProducer=true&brokerUrl=tcp://localhost:" + port.getPort(), msg);
// Then
mock.assertIsSatisfied();
@@ -161,7 +163,7 @@ public class PahoReconnectAfterFailureIT implements ConfigurableRoute, Configura
}
private void startBroker() {
- broker = new ArtemisMQTTService(port);
+ broker = new ArtemisMQTTService(port.getPort());
broker.initialize();
}
diff --git a/components/camel-platform-http-main/src/test/java/org/apache/camel/component/platform/http/main/MainHttpServerRouteTest.java b/components/camel-platform-http-main/src/test/java/org/apache/camel/component/platform/http/main/MainHttpServerRouteTest.java
index 2998a7b3bca5..7e351f5174d6 100644
--- a/components/camel-platform-http-main/src/test/java/org/apache/camel/component/platform/http/main/MainHttpServerRouteTest.java
+++ b/components/camel-platform-http-main/src/test/java/org/apache/camel/component/platform/http/main/MainHttpServerRouteTest.java
@@ -28,12 +28,14 @@ import org.apache.camel.test.AvailablePortFinder;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import static org.junit.jupiter.api.Assertions.assertEquals;
class MainHttpServerRouteTest {
- private static final int port = AvailablePortFinder.getNextAvailable();
+ @RegisterExtension
+ static AvailablePortFinder.Port port = AvailablePortFinder.find();
private static CamelContext camelContext;
@@ -52,7 +54,7 @@ class MainHttpServerRouteTest {
// MainHttpServer needs to get registered/started explicitly
// https://issues.apache.org/jira/browse/CAMEL-21741
MainHttpServer httpServer = new MainHttpServer();
- httpServer.setPort(port);
+ httpServer.setPort(port.getPort());
camelContext.addService(httpServer);
camelContext.start();
@@ -69,7 +71,7 @@ class MainHttpServerRouteTest {
public void routeStatusOk() throws Exception {
HttpRequest request = HttpRequest.newBuilder()
- .uri(URI.create("http://localhost:" + port + "/hello"))
+ .uri(URI.create("http://localhost:" + port.getPort() + "/hello"))
.build();
HttpResponse<String> response = HttpClient.newBuilder().build()
diff --git a/components/camel-platform-http-main/src/test/java/org/apache/camel/component/platform/http/main/ManagementHttpServerTest.java b/components/camel-platform-http-main/src/test/java/org/apache/camel/component/platform/http/main/ManagementHttpServerTest.java
index 46600a4aeae0..7d451dab1238 100644
--- a/components/camel-platform-http-main/src/test/java/org/apache/camel/component/platform/http/main/ManagementHttpServerTest.java
+++ b/components/camel-platform-http-main/src/test/java/org/apache/camel/component/platform/http/main/ManagementHttpServerTest.java
@@ -26,6 +26,7 @@ import org.apache.camel.CamelContext;
import org.apache.camel.impl.DefaultCamelContext;
import org.apache.camel.test.AvailablePortFinder;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -33,7 +34,8 @@ class ManagementHttpServerTest {
private CamelContext camelContext;
- private final int port = AvailablePortFinder.getNextAvailable();
+ @RegisterExtension
+ AvailablePortFinder.Port port = AvailablePortFinder.find();
@Test
public void statusIsNotSatisfied() throws IOException, InterruptedException {
@@ -45,7 +47,7 @@ class ManagementHttpServerTest {
camelContext.getRegistry().bind("fake", new MainHttpFakeHealthCheck());
server.setHost("0.0.0.0");
- server.setPort(port);
+ server.setPort(port.getPort());
server.setPath("/");
server.setHealthCheckEnabled(true);
@@ -53,7 +55,7 @@ class ManagementHttpServerTest {
server.start();
HttpRequest request = HttpRequest.newBuilder()
- .uri(URI.create("http://localhost:" + port + "/q/health/ready"))
+ .uri(URI.create("http://localhost:" + port.getPort() + "/q/health/ready"))
.build();
HttpResponse<String> response = HttpClient.newBuilder().build().send(request, HttpResponse.BodyHandlers.ofString());
diff --git a/components/camel-platform-http/src/test/java/org/apache/camel/component/platform/http/AbstractPlatformHttpTest.java b/components/camel-platform-http/src/test/java/org/apache/camel/component/platform/http/AbstractPlatformHttpTest.java
index 065ee0955626..5df9d2aeec12 100644
--- a/components/camel-platform-http/src/test/java/org/apache/camel/component/platform/http/AbstractPlatformHttpTest.java
+++ b/components/camel-platform-http/src/test/java/org/apache/camel/component/platform/http/AbstractPlatformHttpTest.java
@@ -20,7 +20,6 @@ import io.restassured.RestAssured;
import org.apache.camel.CamelContext;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.impl.DefaultCamelContext;
-import org.apache.camel.test.AvailablePortFinder;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeEach;
@@ -36,8 +35,6 @@ abstract class AbstractPlatformHttpTest {
if (ctx == null) {
ctx = new DefaultCamelContext();
ctx.getRegistry().bind(PlatformHttpConstants.PLATFORM_HTTP_ENGINE_FACTORY, new JettyCustomPlatformHttpEngine());
-
- port = AvailablePortFinder.getNextAvailable();
server = new JettyEmbeddedServer(port);
ctx.getRegistry().bind(JettyEmbeddedServer.JETTY_SERVER_NAME, server);
diff --git a/components/camel-pubnub/src/test/java/org/apache/camel/component/pubnub/PubNubTestBase.java b/components/camel-pubnub/src/test/java/org/apache/camel/component/pubnub/PubNubTestBase.java
index 6278f23862d8..1f0158bd4be3 100644
--- a/components/camel-pubnub/src/test/java/org/apache/camel/component/pubnub/PubNubTestBase.java
+++ b/components/camel-pubnub/src/test/java/org/apache/camel/component/pubnub/PubNubTestBase.java
@@ -26,18 +26,20 @@ import com.pubnub.internal.java.PubNubForJavaImpl;
import org.apache.camel.BindToRegistry;
import org.apache.camel.test.AvailablePortFinder;
import org.apache.camel.test.junit6.CamelTestSupport;
+import org.junit.jupiter.api.extension.RegisterExtension;
import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.options;
import static com.pubnub.api.enums.PNHeartbeatNotificationOptions.NONE;
public class PubNubTestBase extends CamelTestSupport {
- private final int port = AvailablePortFinder.getNextAvailable();
+ @RegisterExtension
+ AvailablePortFinder.Port port = AvailablePortFinder.find();
@BindToRegistry("pubnub")
private PubNub pubnub = createPubNubInstance();
- private WireMockServer wireMockServer = new WireMockServer(options().port(port));
+ private WireMockServer wireMockServer = new WireMockServer(options().port(port.getPort()));
@Override
protected void setupResources() {
@@ -61,7 +63,7 @@ public class PubNubTestBase extends CamelTestSupport {
config = PNConfiguration.builder(new UserId("myUUID"), "mySubscribeKey")
.publishKey("myPublishKey")
.secure(false)
- .origin("localhost" + ":" + port)
+ .origin("localhost" + ":" + port.getPort())
.logVerbosity(PNLogVerbosity.NONE)
.heartbeatNotificationOptions(NONE)
.build();
diff --git a/components/camel-salesforce/camel-salesforce-maven-plugin/src/test/java/org/apache/camel/maven/HttpProxyMojoManualIT.java b/components/camel-salesforce/camel-salesforce-maven-plugin/src/test/java/org/apache/camel/maven/HttpProxyMojoManualIT.java
index 0cdefe1d3ca4..e8ed7636b150 100644
--- a/components/camel-salesforce/camel-salesforce-maven-plugin/src/test/java/org/apache/camel/maven/HttpProxyMojoManualIT.java
+++ b/components/camel-salesforce/camel-salesforce-maven-plugin/src/test/java/org/apache/camel/maven/HttpProxyMojoManualIT.java
@@ -19,7 +19,6 @@ package org.apache.camel.maven;
import java.io.IOException;
import java.util.HashMap;
-import org.apache.camel.test.AvailablePortFinder;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.littleshoot.proxy.HttpProxyServer;
@@ -40,7 +39,6 @@ public class HttpProxyMojoManualIT extends CamelSalesforceMojoManualIT {
@BeforeEach
public void startProxy() {
- httpProxyPort = AvailablePortFinder.getNextAvailable();
proxy = DefaultHttpProxyServer.bootstrap().withPort(httpProxyPort).withProxyAuthenticator(new ProxyAuthenticator() {
@Override
diff --git a/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/ServletCamelRouterTestSupport.java b/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/ServletCamelRouterTestSupport.java
index 60d66d1d4d89..0561e712a405 100644
--- a/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/ServletCamelRouterTestSupport.java
+++ b/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/ServletCamelRouterTestSupport.java
@@ -51,7 +51,9 @@ public class ServletCamelRouterTestSupport extends CamelTestSupport {
@Override
public void setupResources() throws Exception {
- port = AvailablePortFinder.getNextAvailable();
+ try (AvailablePortFinder.Port p = AvailablePortFinder.find()) {
+ port = p.getPort();
+ }
DeploymentInfo servletBuilder = getDeploymentInfo();
manager = Servlets.newContainer().addDeployment(servletBuilder);
manager.deploy();
diff --git a/components/camel-slack/src/test/java/org/apache/camel/component/slack/SlackProducerTest.java b/components/camel-slack/src/test/java/org/apache/camel/component/slack/SlackProducerTest.java
index 6ff6acb03248..8f2b636a35ec 100644
--- a/components/camel-slack/src/test/java/org/apache/camel/component/slack/SlackProducerTest.java
+++ b/components/camel-slack/src/test/java/org/apache/camel/component/slack/SlackProducerTest.java
@@ -28,10 +28,12 @@ import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.AvailablePortFinder;
import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
public class SlackProducerTest extends CamelTestSupport {
- protected static final int UNDERTOW_PORT = AvailablePortFinder.getNextAvailable();
+ @RegisterExtension
+ static AvailablePortFinder.Port UNDERTOW_PORT = AvailablePortFinder.find();
@EndpointInject("mock:errors")
MockEndpoint errors;
@@ -72,13 +74,14 @@ public class SlackProducerTest extends CamelTestSupport {
@Override
public void configure() {
SlackComponent slack = new SlackComponent();
- slack.setWebhookUrl("http://localhost:" + UNDERTOW_PORT + "/slack/webhook");
+ slack.setWebhookUrl("http://localhost:" + UNDERTOW_PORT.getPort() + "/slack/webhook");
context.addComponent("slack", slack);
onException(Exception.class).handled(true).to(errors);
final String slackUser = System.getProperty("SLACK_USER", "CamelTest");
- from("undertow:http://localhost:" + UNDERTOW_PORT + "/slack/webhook").setBody(constant("{\"ok\": true}"));
+ from("undertow:http://localhost:" + UNDERTOW_PORT.getPort() + "/slack/webhook")
+ .setBody(constant("{\"ok\": true}"));
from(test).to(String.format("slack:#general?iconEmoji=:camel:&username=%s", slackUser));
}
diff --git a/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/integration/SmppTRXProducerIT.java b/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/integration/SmppTRXProducerIT.java
index 5fc529f51f8c..83458c1ab894 100644
--- a/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/integration/SmppTRXProducerIT.java
+++ b/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/integration/SmppTRXProducerIT.java
@@ -32,6 +32,7 @@ import org.jsmpp.examples.SMPPServerSimulator;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -40,9 +41,10 @@ import static org.junit.jupiter.api.Assertions.fail;
class SmppTRXProducerIT extends CamelTestSupport {
- private static int PORT = 8200; // use private port to avoid reusing from previous tests
+ @RegisterExtension
+ static AvailablePortFinder.Port PORT = AvailablePortFinder.find();
private static final Thread SMPP_SERVER_SIMULATOR = new Thread(() -> {
- System.setProperty("jsmpp.simulator.port", "" + PORT);
+ System.setProperty("jsmpp.simulator.port", "" + PORT.getPort());
SMPPServerSimulator.main(null);
});
@@ -60,7 +62,6 @@ class SmppTRXProducerIT extends CamelTestSupport {
@BeforeAll
public static void runSMPPServerSimulator() {
- PORT = AvailablePortFinder.getNextAvailable(8200, 9999);
SMPP_SERVER_SIMULATOR.start();
}
@@ -100,7 +101,7 @@ class SmppTRXProducerIT extends CamelTestSupport {
@Override
public void configure() {
from("direct:start2")
- .to("smpp://j@localhost:" + PORT + "?password=jpwd&systemType=producer" +
+ .to("smpp://j@localhost:" + PORT.getPort() + "?password=jpwd&systemType=producer" +
"&messageReceiverRouteId=TYPO_IN_MessageReceiverRouteId");
}
});
@@ -122,7 +123,7 @@ class SmppTRXProducerIT extends CamelTestSupport {
@Override
public void configure() {
from("direct:start2")
- .to("smpp://j@localhost:" + PORT + "?password=jpwd&systemType=producer" +
+ .to("smpp://j@localhost:" + PORT.getPort() + "?password=jpwd&systemType=producer" +
"&messageReceiverRouteId=testMessageReceiverRouteId2");
}
});
@@ -141,7 +142,7 @@ class SmppTRXProducerIT extends CamelTestSupport {
@Override
public void configure() {
from("direct:start")
- .to("smpp://j@localhost:" + PORT + "?password=jpwd&systemType=producer" +
+ .to("smpp://j@localhost:" + PORT.getPort() + "?password=jpwd&systemType=producer" +
"&messageReceiverRouteId=testMessageReceiverRouteId");
from("direct:messageReceiver").id("testMessageReceiverRouteId")
diff --git a/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/integration/SmppTRXProducerSupervisingRouteControllerIT.java b/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/integration/SmppTRXProducerSupervisingRouteControllerIT.java
index 237cce240625..77c2b94a0afd 100644
--- a/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/integration/SmppTRXProducerSupervisingRouteControllerIT.java
+++ b/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/integration/SmppTRXProducerSupervisingRouteControllerIT.java
@@ -40,6 +40,7 @@ import org.jsmpp.examples.SMPPServerSimulator;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import org.junit.jupiter.api.parallel.Isolated;
import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -49,7 +50,8 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
@Isolated
class SmppTRXProducerSupervisingRouteControllerIT extends CamelTestSupport {
- private static int PORT = 8100; // use private port to avoid reusing from previous tests
+ @RegisterExtension
+ static AvailablePortFinder.Port PORT = AvailablePortFinder.find();
private static final CountDownLatch LATCH = new CountDownLatch(1);
private static final Thread SMPP_SERVER_SIMULATOR = new Thread(() -> {
try {
@@ -58,7 +60,7 @@ class SmppTRXProducerSupervisingRouteControllerIT extends CamelTestSupport {
} catch (Exception e) {
// ignore
}
- System.setProperty("jsmpp.simulator.port", "" + PORT);
+ System.setProperty("jsmpp.simulator.port", "" + PORT.getPort());
SMPPServerSimulator.main(null);
});
@@ -95,7 +97,6 @@ class SmppTRXProducerSupervisingRouteControllerIT extends CamelTestSupport {
@BeforeAll
public static void runSMPPServerSimulator() {
- PORT = AvailablePortFinder.getNextAvailable(8100, 9999);
SMPP_SERVER_SIMULATOR.start();
}
@@ -137,7 +138,7 @@ class SmppTRXProducerSupervisingRouteControllerIT extends CamelTestSupport {
@Override
public void configure() {
from("direct:start")
- .to("smpp://j@localhost:" + PORT + "?password=jpwd&systemType=producer" +
+ .to("smpp://j@localhost:" + PORT.getPort() + "?password=jpwd&systemType=producer" +
"&messageReceiverRouteId=testMessageReceiverRouteId");
from("direct:messageReceiver").id("testMessageReceiverRouteId")
diff --git a/components/camel-snmp/src/test/java/org/apache/camel/component/snmp/TrapTest.java b/components/camel-snmp/src/test/java/org/apache/camel/component/snmp/TrapTest.java
index 44921d6e5392..723dc468cc36 100644
--- a/components/camel-snmp/src/test/java/org/apache/camel/component/snmp/TrapTest.java
+++ b/components/camel-snmp/src/test/java/org/apache/camel/component/snmp/TrapTest.java
@@ -28,6 +28,7 @@ import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.AvailablePortFinder;
import org.awaitility.Awaitility;
import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.extension.RegisterExtension;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.MethodSource;
import org.slf4j.Logger;
@@ -44,6 +45,13 @@ import org.snmp4j.smi.VariableBinding;
public class TrapTest extends SnmpTestSupport {
private static final Logger LOG = LoggerFactory.getLogger(TrapTest.class);
+ @RegisterExtension
+ AvailablePortFinder.Port portV0 = AvailablePortFinder.find();
+ @RegisterExtension
+ AvailablePortFinder.Port portV1 = AvailablePortFinder.find();
+ @RegisterExtension
+ AvailablePortFinder.Port portV3 = AvailablePortFinder.find();
+
@ParameterizedTest
@MethodSource("supportedVersions")
public void testSendReceiveTraps(int version) throws Exception {
@@ -93,31 +101,27 @@ public class TrapTest extends SnmpTestSupport {
protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
public void configure() {
- //genrate ports for trap consumers/producers
- int portV0 = AvailablePortFinder.getNextAvailable();
- int portV1 = AvailablePortFinder.getNextAvailable();
- int portV3 = AvailablePortFinder.getNextAvailable();
-
from("direct:snmptrapV0")
.log(LoggingLevel.INFO, "Sending Trap pdu ${body}")
- .to("snmp:127.0.0.1:" + portV0 + "?protocol=udp&type=TRAP&snmpVersion=0");
+ .to("snmp:127.0.0.1:" + portV0.getPort() + "?protocol=udp&type=TRAP&snmpVersion=0");
- from("snmp:0.0.0.0:" + portV0 + "?protocol=udp&type=TRAP&snmpVersion=0")
+ from("snmp:0.0.0.0:" + portV0.getPort() + "?protocol=udp&type=TRAP&snmpVersion=0")
.to("mock:resultV0");
from("direct:snmptrapV1")
.log(LoggingLevel.INFO, "Sending Trap pdu ${body}")
- .to("snmp:127.0.0.1:" + portV1 + "?protocol=udp&type=TRAP&snmpVersion=1");
+ .to("snmp:127.0.0.1:" + portV1.getPort() + "?protocol=udp&type=TRAP&snmpVersion=1");
- from("snmp:0.0.0.0:" + portV1 + "?protocol=udp&type=TRAP&snmpVersion=1")
+ from("snmp:0.0.0.0:" + portV1.getPort() + "?protocol=udp&type=TRAP&snmpVersion=1")
.to("mock:resultV1");
from("direct:snmptrapV3")
.log(LoggingLevel.INFO, "Sending Trap pdu ${body}")
- .to("snmp:127.0.0.1:" + portV3
+ .to("snmp:127.0.0.1:" + portV3.getPort()
+ "?securityName=test&securityLevel=1&protocol=udp&type=TRAP&snmpVersion=3");
- from("snmp:0.0.0.0:" + portV3 + "?securityName=test&securityLevel=1&protocol=udp&type=TRAP&snmpVersion=3")
+ from("snmp:0.0.0.0:" + portV3.getPort()
+ + "?securityName=test&securityLevel=1&protocol=udp&type=TRAP&snmpVersion=3")
.to("mock:resultV3");
}
};
diff --git a/components/camel-spring-parent/camel-undertow-spring-security/src/test/java/org/apache/camel/component/spring/security/AbstractSpringSecurityBearerTokenTest.java b/components/camel-spring-parent/camel-undertow-spring-security/src/test/java/org/apache/camel/component/spring/security/AbstractSpringSecurityBearerTokenTest.java
index ce4199c581bb..0355337c4c2d 100644
--- a/components/camel-spring-parent/camel-undertow-spring-security/src/test/java/org/apache/camel/component/spring/security/AbstractSpringSecurityBearerTokenTest.java
+++ b/components/camel-spring-parent/camel-undertow-spring-security/src/test/java/org/apache/camel/component/spring/security/AbstractSpringSecurityBearerTokenTest.java
@@ -32,7 +32,6 @@ import org.apache.camel.CamelContext;
import org.apache.camel.component.spring.security.keycloak.KeycloakRealmRoleConverter;
import org.apache.camel.component.spring.security.keycloak.KeycloakUsernameSubClaimAdapter;
import org.apache.camel.component.undertow.UndertowComponent;
-import org.apache.camel.test.AvailablePortFinder;
import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.BeforeAll;
import org.springframework.security.oauth2.jwt.Jwt;
@@ -49,7 +48,6 @@ public abstract class AbstractSpringSecurityBearerTokenTest extends CamelTestSup
@BeforeAll
public static void initPort() {
- port = AvailablePortFinder.getNextAvailable();
}
protected static int getPort() {
diff --git a/components/camel-ssh/src/test/java/org/apache/camel/component/ssh/SshAlgorithmParametersTest.java b/components/camel-ssh/src/test/java/org/apache/camel/component/ssh/SshAlgorithmParametersTest.java
index a7beaf27b446..7d985493a6a5 100644
--- a/components/camel-ssh/src/test/java/org/apache/camel/component/ssh/SshAlgorithmParametersTest.java
+++ b/components/camel-ssh/src/test/java/org/apache/camel/component/ssh/SshAlgorithmParametersTest.java
@@ -39,19 +39,25 @@ import org.apache.sshd.common.signature.BuiltinSignatures;
import org.apache.sshd.common.signature.Signature;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
public class SshAlgorithmParametersTest extends CamelTestSupport {
- private int port = AvailablePortFinder.getNextAvailable();
+ @RegisterExtension
+ AvailablePortFinder.Port port = AvailablePortFinder.find();
- private String sshEndpointURI = "ssh://smx:smx@localhost:" + port + "?timeout=3000" +
- "&ciphers=aes192-ctr" +
- "&macs=hmac-sha1-etm@openssh.com,hmac-sha2-256,hmac-sha1" +
- "&kex=ecdh-sha2-nistp521" +
- "&signatures=rsa-sha2-512,ssh-rsa-cert-v01@openssh.com" +
- "&compressions=zlib,none";
+ private String getSshEndpointURI() {
+ return "ssh://smx:smx@localhost:" + port.getPort() + "?timeout=3000" +
+ "&ciphers=aes192-ctr" +
+ "&macs=hmac-sha1-etm@openssh.com,hmac-sha2-256,hmac-sha1" +
+ "&kex=ecdh-sha2-nistp521" +
+ "&signatures=rsa-sha2-512,ssh-rsa-cert-v01@openssh.com" +
+ "&compressions=zlib,none";
+ }
- private String customClientSshEndpointURI = "ssh://smx:smx@localhost:" + port + "?timeout=3000&clientBuilder=#myClient";
+ private String getCustomClientSshEndpointURI() {
+ return "ssh://smx:smx@localhost:" + port.getPort() + "?timeout=3000&clientBuilder=#myClient";
+ }
@Override
protected void bindToRegistry(Registry registry) throws Exception {
@@ -86,7 +92,7 @@ public class SshAlgorithmParametersTest extends CamelTestSupport {
@Test
public void producerCiphersParameterTest() throws Exception {
context.getComponent("ssh", SshComponent.class);
- SshEndpoint endpoint = context.getEndpoint(sshEndpointURI, SshEndpoint.class);
+ SshEndpoint endpoint = context.getEndpoint(getSshEndpointURI(), SshEndpoint.class);
SshProducer producer = (SshProducer) endpoint.createProducer();
producer.start();
SshClient client = (SshClient) FieldUtils.readField(producer, "client", true);
@@ -96,7 +102,7 @@ public class SshAlgorithmParametersTest extends CamelTestSupport {
@Test
public void consumerCiphersParameterTest() throws Exception {
context.getComponent("ssh", SshComponent.class);
- SshEndpoint endpoint = context.getEndpoint(sshEndpointURI, SshEndpoint.class);
+ SshEndpoint endpoint = context.getEndpoint(getSshEndpointURI(), SshEndpoint.class);
SshConsumer consumer = (SshConsumer) endpoint.createConsumer(x -> {
});
consumer.start();
@@ -107,7 +113,7 @@ public class SshAlgorithmParametersTest extends CamelTestSupport {
@Test
public void consumerCustomClientParameterTest() throws Exception {
context.getComponent("ssh", SshComponent.class);
- SshEndpoint endpoint = context.getEndpoint(customClientSshEndpointURI, SshEndpoint.class);
+ SshEndpoint endpoint = context.getEndpoint(getCustomClientSshEndpointURI(), SshEndpoint.class);
SshConsumer consumer = (SshConsumer) endpoint.createConsumer(x -> {
});
consumer.start();
@@ -118,7 +124,7 @@ public class SshAlgorithmParametersTest extends CamelTestSupport {
@Test
public void producerCustomClientParameterTest() throws Exception {
context.getComponent("ssh", SshComponent.class);
- SshEndpoint endpoint = context.getEndpoint(customClientSshEndpointURI, SshEndpoint.class);
+ SshEndpoint endpoint = context.getEndpoint(getCustomClientSshEndpointURI(), SshEndpoint.class);
SshProducer producer = (SshProducer) endpoint.createProducer();
producer.start();
SshClient client = (SshClient) FieldUtils.readField(producer, "client", true);
diff --git a/components/camel-ssh/src/test/java/org/apache/camel/component/ssh/SshComponentTestSupport.java b/components/camel-ssh/src/test/java/org/apache/camel/component/ssh/SshComponentTestSupport.java
index 29e0e604efd6..8eaaeeee6123 100644
--- a/components/camel-ssh/src/test/java/org/apache/camel/component/ssh/SshComponentTestSupport.java
+++ b/components/camel-ssh/src/test/java/org/apache/camel/component/ssh/SshComponentTestSupport.java
@@ -30,7 +30,9 @@ public class SshComponentTestSupport extends CamelTestSupport {
@Override
public void doPreSetup() throws Exception {
- port = AvailablePortFinder.getNextAvailable();
+ try (AvailablePortFinder.Port p = AvailablePortFinder.find()) {
+ port = p.getPort();
+ }
sshd = SshServer.setUpDefaultServer();
sshd.setPort(port);
diff --git a/components/camel-ssh/src/test/java/org/apache/camel/component/ssh/SshIdleTimeoutTest.java b/components/camel-ssh/src/test/java/org/apache/camel/component/ssh/SshIdleTimeoutTest.java
index 2ac79edd7b08..54eb355a4b44 100644
--- a/components/camel-ssh/src/test/java/org/apache/camel/component/ssh/SshIdleTimeoutTest.java
+++ b/components/camel-ssh/src/test/java/org/apache/camel/component/ssh/SshIdleTimeoutTest.java
@@ -32,10 +32,12 @@ import org.apache.sshd.server.SshServer;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
public class SshIdleTimeoutTest extends SshComponentTestSupport {
- private int delayedPort = AvailablePortFinder.getNextAvailable();
+ @RegisterExtension
+ AvailablePortFinder.Port delayedPort = AvailablePortFinder.find();
private SshServer delayedSshd;
@AfterEach
@@ -102,7 +104,7 @@ public class SshIdleTimeoutTest extends SshComponentTestSupport {
private void startDelayedServer() throws Exception {
delayedSshd = SshServer.setUpDefaultServer();
- delayedSshd.setPort(delayedPort);
+ delayedSshd.setPort(delayedPort.getPort());
delayedSshd.setKeyPairProvider(new FileKeyPairProvider(Paths.get("src/test/resources/hostkey.pem")));
delayedSshd.setCommandFactory(new DelayedEchoCommandFactory(1000));
delayedSshd.setPasswordAuthenticator((username, password, session) -> true);
@@ -150,9 +152,9 @@ public class SshIdleTimeoutTest extends SshComponentTestSupport {
.to("mock:result");
from("direct:sshWithShortIdleTimeout")
- .to("ssh://smx:smx@localhost:" + delayedPort + "?timeout=5000&idleTimeout=500");
+ .to("ssh://smx:smx@localhost:" + delayedPort.getPort() + "?timeout=5000&idleTimeout=500");
from("direct:sshWithLongIdleTimeout")
- .to("ssh://smx:smx@localhost:" + delayedPort + "?timeout=5000&idleTimeout=5000");
+ .to("ssh://smx:smx@localhost:" + delayedPort.getPort() + "?timeout=5000&idleTimeout=5000");
}
};
}
diff --git a/components/camel-stomp/src/test/java/org/apache/camel/component/stomp/StompBaseTest.java b/components/camel-stomp/src/test/java/org/apache/camel/component/stomp/StompBaseTest.java
index 9cf7cadd4708..9bfdbc2b5990 100644
--- a/components/camel-stomp/src/test/java/org/apache/camel/component/stomp/StompBaseTest.java
+++ b/components/camel-stomp/src/test/java/org/apache/camel/component/stomp/StompBaseTest.java
@@ -35,8 +35,10 @@ import org.junit.jupiter.api.extension.RegisterExtension;
public abstract class StompBaseTest extends CamelTestSupport {
protected int numberOfMessages = 100;
- static int sslServicePort = AvailablePortFinder.getNextAvailable();
- static int servicePort = AvailablePortFinder.getNextAvailable();
+ @RegisterExtension
+ static AvailablePortFinder.Port sslServicePort = AvailablePortFinder.find();
+ @RegisterExtension
+ static AvailablePortFinder.Port servicePort = AvailablePortFinder.find();
@RegisterExtension
public static ArtemisService service = new ArtemisEmbeddedServiceBuilder()
@@ -50,11 +52,11 @@ public abstract class StompBaseTest extends CamelTestSupport {
"keyStorePath=jsse/server-side-keystore.jks;" +
"keyStorePassword=password;" +
"protocols=STOMP",
- sslServicePort));
+ sslServicePort.getPort()));
configuration.addAcceptorConfiguration("stomp-tcp-acceptor",
String.format("tcp://0.0.0.0:%s?protocols=STOMP",
- servicePort));
+ servicePort.getPort()));
} catch (Exception e) {
throw new RuntimeException(e);
}
@@ -84,10 +86,10 @@ public abstract class StompBaseTest extends CamelTestSupport {
Stomp stomp;
if (isUseSsl()) {
- stomp = new Stomp("ssl://localhost:" + sslServicePort);
+ stomp = new Stomp("ssl://localhost:" + sslServicePort.getPort());
stomp.setSslContext(getClientSSLContext());
} else {
- stomp = new Stomp("tcp://localhost:" + servicePort);
+ stomp = new Stomp("tcp://localhost:" + servicePort.getPort());
}
return stomp;
diff --git a/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramWebhookCallTest.java b/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramWebhookCallTest.java
index da43e2747376..172d7534b031 100644
--- a/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramWebhookCallTest.java
+++ b/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramWebhookCallTest.java
@@ -25,7 +25,6 @@ import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.component.telegram.util.TelegramTestSupport;
import org.apache.camel.component.webhook.WebhookConfiguration;
import org.apache.camel.component.webhook.WebhookEndpoint;
-import org.apache.camel.test.AvailablePortFinder;
import org.junit.jupiter.api.Test;
/**
@@ -53,7 +52,6 @@ public class TelegramWebhookCallTest extends TelegramTestSupport {
@Override
protected void doPreSetup() {
- port = AvailablePortFinder.getNextAvailable();
}
@Override
diff --git a/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/util/TelegramTestSupport.java b/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/util/TelegramTestSupport.java
index 955437ea1fb7..06f4433ee6fc 100644
--- a/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/util/TelegramTestSupport.java
+++ b/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/util/TelegramTestSupport.java
@@ -28,23 +28,19 @@ import org.apache.camel.component.telegram.model.OutgoingTextMessage;
import org.apache.camel.component.telegram.model.ReplyKeyboardMarkup;
import org.apache.camel.test.AvailablePortFinder;
import org.apache.camel.test.junit6.CamelTestSupport;
-import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.extension.RegisterExtension;
/**
* A support test class for Telegram tests.
*/
public class TelegramTestSupport extends CamelTestSupport {
- protected static volatile int port;
+ @RegisterExtension
+ static AvailablePortFinder.Port port = AvailablePortFinder.find();
protected String chatId;
private TelegramMockRoutes mockRoutes;
- @BeforeAll
- public static void initPort() {
- port = AvailablePortFinder.getNextAvailable();
- }
-
/**
* Construct an inline keyboard sample to be used with an OutgoingTextMessage.
*
@@ -107,7 +103,7 @@ public class TelegramTestSupport extends CamelTestSupport {
}
protected TelegramApiConfig getTelegramApiConfig() {
- return TelegramApiConfig.mock(port);
+ return TelegramApiConfig.mock(port.getPort());
}
protected TelegramMockRoutes getMockRoutes() {
diff --git a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/BaseUndertowTest.java b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/BaseUndertowTest.java
index 07b49090ebcb..bdfacce0e34d 100644
--- a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/BaseUndertowTest.java
+++ b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/BaseUndertowTest.java
@@ -23,29 +23,25 @@ import org.apache.camel.BindToRegistry;
import org.apache.camel.CamelContext;
import org.apache.camel.test.AvailablePortFinder;
import org.apache.camel.test.junit6.CamelTestSupport;
-import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.extension.RegisterExtension;
/**
* Base class of tests which allocates ports
*/
public abstract class BaseUndertowTest extends CamelTestSupport {
- private static volatile int port;
- private static volatile int port2;
+ @RegisterExtension
+ AvailablePortFinder.Port port = AvailablePortFinder.find();
+ @RegisterExtension
+ AvailablePortFinder.Port port2 = AvailablePortFinder.find();
private final AtomicInteger counter = new AtomicInteger(1);
- @BeforeAll
- public static void initPort() {
- port = AvailablePortFinder.getNextAvailable();
- port2 = AvailablePortFinder.getNextAvailable();
+ protected int getPort() {
+ return port.getPort();
}
- protected static int getPort() {
- return port;
- }
-
- protected static int getPort2() {
- return port2;
+ protected int getPort2() {
+ return port2.getPort();
}
@Override
@@ -65,10 +61,14 @@ public abstract class BaseUndertowTest extends CamelTestSupport {
}
protected int getNextPort() {
- return AvailablePortFinder.getNextAvailable();
+ try (AvailablePortFinder.Port p = AvailablePortFinder.find()) {
+ return p.getPort();
+ }
}
protected int getNextPort(int startWithPort) {
- return AvailablePortFinder.getNextAvailable();
+ try (AvailablePortFinder.Port p = AvailablePortFinder.find()) {
+ return p.getPort();
+ }
}
}
diff --git a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowHttpProducerSessionTest.java b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowHttpProducerSessionTest.java
index d5852263aa3c..7338c3ce7cdf 100644
--- a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowHttpProducerSessionTest.java
+++ b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowHttpProducerSessionTest.java
@@ -26,11 +26,12 @@ import org.apache.camel.http.base.cookie.ExchangeCookieHandler;
import org.apache.camel.http.base.cookie.InstanceCookieHandler;
import org.apache.camel.test.AvailablePortFinder;
import org.apache.camel.test.junit6.CamelTestSupport;
-import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
public class UndertowHttpProducerSessionTest extends CamelTestSupport {
- private static volatile int port;
+ @RegisterExtension
+ AvailablePortFinder.Port port = AvailablePortFinder.find();
@BindToRegistry("instanceCookieHandler")
private InstanceCookieHandler instanceCookieHandler = new InstanceCookieHandler();
@@ -38,11 +39,6 @@ public class UndertowHttpProducerSessionTest extends CamelTestSupport {
@BindToRegistry("exchangeCookieHandler")
private ExchangeCookieHandler exchangeCookieHandler = new ExchangeCookieHandler();
- @BeforeAll
- public static void initPort() {
- port = AvailablePortFinder.getNextAvailable();
- }
-
@Test
public void testNoSession() throws Exception {
getMockEndpoint("mock:result").expectedBodiesReceived("New New World", "New New World");
@@ -69,7 +65,7 @@ public class UndertowHttpProducerSessionTest extends CamelTestSupport {
private String getTestServerEndpointSessionUrl() {
// session handling will not work for localhost
- return "http://127.0.0.1:" + port + "/session";
+ return "http://127.0.0.1:" + port.getPort() + "/session";
}
private String getTestServerEndpointSessionUri() {
diff --git a/components/camel-vertx/camel-vertx-http/src/test/java/org/apache/camel/component/vertx/http/VertxHttpBridgeEndpointTest.java b/components/camel-vertx/camel-vertx-http/src/test/java/org/apache/camel/component/vertx/http/VertxHttpBridgeEndpointTest.java
index 7503bd495697..123fbafb41d4 100644
--- a/components/camel-vertx/camel-vertx-http/src/test/java/org/apache/camel/component/vertx/http/VertxHttpBridgeEndpointTest.java
+++ b/components/camel-vertx/camel-vertx-http/src/test/java/org/apache/camel/component/vertx/http/VertxHttpBridgeEndpointTest.java
@@ -26,12 +26,14 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.AvailablePortFinder;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertInstanceOf;
class VertxHttpBridgeEndpointTest extends VertxHttpTestSupport {
- private static final int PORT = AvailablePortFinder.getNextAvailable();
+ @RegisterExtension
+ static AvailablePortFinder.Port PORT = AvailablePortFinder.find();
@Test
void bridgeEndpointWithQueryStringDoesNotDuplicateHeaders() throws Exception {
@@ -89,15 +91,15 @@ class VertxHttpBridgeEndpointTest extends VertxHttpTestSupport {
@Override
public void configure() throws Exception {
from(getTestServerUri() + "/upstream")
- .toF("vertx-http:http://localhost:%d/downstream?bridgeEndpoint=true", PORT);
+ .toF("vertx-http:http://localhost:%d/downstream?bridgeEndpoint=true", PORT.getPort());
from(getTestServerUri() + "/upstream/prefix?matchOnUriPrefix=true")
- .toF("vertx-http:http://localhost:%d/downstream?bridgeEndpoint=true", PORT);
+ .toF("vertx-http:http://localhost:%d/downstream?bridgeEndpoint=true", PORT.getPort());
- fromF("undertow:http://localhost:%d/downstream", PORT)
+ fromF("undertow:http://localhost:%d/downstream", PORT.getPort())
.to("mock:result");
- fromF("undertow:http://localhost:%d/downstream/test", PORT)
+ fromF("undertow:http://localhost:%d/downstream/test", PORT.getPort())
.to("mock:result");
}
};
diff --git a/components/camel-vertx/camel-vertx-http/src/test/java/org/apache/camel/component/vertx/http/VertxHttpProxyServerTest.java b/components/camel-vertx/camel-vertx-http/src/test/java/org/apache/camel/component/vertx/http/VertxHttpProxyServerTest.java
index 2583178994f1..09c861a449d1 100644
--- a/components/camel-vertx/camel-vertx-http/src/test/java/org/apache/camel/component/vertx/http/VertxHttpProxyServerTest.java
+++ b/components/camel-vertx/camel-vertx-http/src/test/java/org/apache/camel/component/vertx/http/VertxHttpProxyServerTest.java
@@ -21,17 +21,19 @@ import org.apache.camel.RoutesBuilder;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.test.AvailablePortFinder;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import static org.junit.jupiter.api.Assertions.assertEquals;
public class VertxHttpProxyServerTest extends VertxHttpTestSupport {
- private final int port2 = AvailablePortFinder.getNextAvailable();
+ @RegisterExtension
+ AvailablePortFinder.Port port2 = AvailablePortFinder.find();
@Test
public void testProxyConfiguration() {
String result = template.requestBody(getProducerUri() + "?proxyHost=localhost&proxyPort="
- + port2 + "&proxyUsername=foo"
+ + port2.getPort() + "&proxyUsername=foo"
+ "&proxyPassword=bar&proxyType=HTTP",
null, String.class);
assertEquals("Hello Proxied World", result);
@@ -41,7 +43,7 @@ public class VertxHttpProxyServerTest extends VertxHttpTestSupport {
public void testProxyComponent() {
VertxHttpComponent comp = context.getComponent("vertx-http", VertxHttpComponent.class);
comp.setProxyHost("localhost");
- comp.setProxyPort(port2);
+ comp.setProxyPort(port2.getPort());
comp.setProxyUsername("foo");
comp.setProxyPassword("bar");
comp.setProxyType(ProxyType.HTTP);
@@ -64,7 +66,7 @@ public class VertxHttpProxyServerTest extends VertxHttpTestSupport {
from(getTestServerUri())
.setBody(constant("Hello Proxied World"));
- fromF("undertow:http://localhost:%d", port2)
+ fromF("undertow:http://localhost:%d", port2.getPort())
.to(getTestServerUri());
}
};
diff --git a/components/camel-vertx/camel-vertx-http/src/test/java/org/apache/camel/component/vertx/http/VertxHttpTestSupport.java b/components/camel-vertx/camel-vertx-http/src/test/java/org/apache/camel/component/vertx/http/VertxHttpTestSupport.java
index 96ca3b78525c..3407fcdbc358 100644
--- a/components/camel-vertx/camel-vertx-http/src/test/java/org/apache/camel/component/vertx/http/VertxHttpTestSupport.java
+++ b/components/camel-vertx/camel-vertx-http/src/test/java/org/apache/camel/component/vertx/http/VertxHttpTestSupport.java
@@ -26,13 +26,15 @@ import io.vertx.core.impl.VertxInternal;
import io.vertx.core.impl.btc.BlockedThreadEvent;
import org.apache.camel.test.AvailablePortFinder;
import org.apache.camel.test.junit6.CamelTestSupport;
+import org.junit.jupiter.api.extension.RegisterExtension;
public class VertxHttpTestSupport extends CamelTestSupport {
- protected final int port = AvailablePortFinder.getNextAvailable();
+ @RegisterExtension
+ AvailablePortFinder.Port port = AvailablePortFinder.find();
protected String getTestServerUrl() {
- return String.format("http://localhost:%d", port);
+ return String.format("http://localhost:%d", port.getPort());
}
protected String getTestServerUri() {
@@ -40,11 +42,11 @@ public class VertxHttpTestSupport extends CamelTestSupport {
}
protected String getProducerUri() {
- return String.format("vertx-http:http://localhost:%d", port);
+ return String.format("vertx-http:http://localhost:%d", port.getPort());
}
protected int getPort() {
- return port;
+ return port.getPort();
}
protected Vertx createVertxWithThreadBlockedHandler(Handler<BlockedThreadEvent> handler) {
diff --git a/components/camel-vertx/camel-vertx-websocket/src/test/java/org/apache/camel/component/vertx/websocket/VertxWebSocketTestSupport.java b/components/camel-vertx/camel-vertx-websocket/src/test/java/org/apache/camel/component/vertx/websocket/VertxWebSocketTestSupport.java
index 9d18c6a59393..5778d3acaa2e 100644
--- a/components/camel-vertx/camel-vertx-websocket/src/test/java/org/apache/camel/component/vertx/websocket/VertxWebSocketTestSupport.java
+++ b/components/camel-vertx/camel-vertx-websocket/src/test/java/org/apache/camel/component/vertx/websocket/VertxWebSocketTestSupport.java
@@ -35,11 +35,14 @@ import io.vertx.ext.web.Router;
import io.vertx.ext.web.RoutingContext;
import org.apache.camel.test.AvailablePortFinder;
import org.apache.camel.test.junit6.CamelTestSupport;
+import org.junit.jupiter.api.extension.RegisterExtension;
public class VertxWebSocketTestSupport extends CamelTestSupport {
- protected final int port = AvailablePortFinder.getNextAvailable();
- protected final int port2 = AvailablePortFinder.getNextAvailable();
+ @RegisterExtension
+ AvailablePortFinder.Port port = AvailablePortFinder.find();
+ @RegisterExtension
+ AvailablePortFinder.Port port2 = AvailablePortFinder.find();
/**
* Returns the randomized port used for the Vert.x server if no port was provided to the consumer.
@@ -49,8 +52,8 @@ public class VertxWebSocketTestSupport extends CamelTestSupport {
Map<VertxWebsocketHostKey, VertxWebsocketHost> registry = component.getVertxHostRegistry();
return registry.values()
.stream()
- .filter(wsHost -> wsHost.getPort() != port)
- .filter(wsHost -> wsHost.getPort() != port2)
+ .filter(wsHost -> wsHost.getPort() != port.getPort())
+ .filter(wsHost -> wsHost.getPort() != port2.getPort())
.findFirst()
.get()
.getPort();
diff --git a/components/camel-vertx/camel-vertx-websocket/src/test/java/org/apache/camel/component/vertx/websocket/VertxWebsocketEndpointConfigurationTest.java b/components/camel-vertx/camel-vertx-websocket/src/test/java/org/apache/camel/component/vertx/websocket/VertxWebsocketEndpointConfigurationTest.java
index cd467566de17..6b86db813fe7 100644
--- a/components/camel-vertx/camel-vertx-websocket/src/test/java/org/apache/camel/component/vertx/websocket/VertxWebsocketEndpointConfigurationTest.java
+++ b/components/camel-vertx/camel-vertx-websocket/src/test/java/org/apache/camel/component/vertx/websocket/VertxWebsocketEndpointConfigurationTest.java
@@ -28,6 +28,7 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.AvailablePortFinder;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import static org.apache.camel.component.vertx.websocket.VertxWebsocketConstants.ORIGIN_HTTP_HEADER_NAME;
import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -38,7 +39,8 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
public class VertxWebsocketEndpointConfigurationTest extends VertxWebSocketTestSupport {
- private static final int PORT = AvailablePortFinder.getNextAvailable();
+ @RegisterExtension
+ static AvailablePortFinder.Port PORT = AvailablePortFinder.find();
@BindToRegistry("clientOptions")
HttpClientOptions clientOptions = new HttpClientOptions();
@@ -49,7 +51,7 @@ public class VertxWebsocketEndpointConfigurationTest extends VertxWebSocketTestS
@Test
public void testHttpClientOptions() {
VertxWebsocketEndpoint endpoint = context
- .getEndpoint("vertx-websocket:localhost:" + PORT + "/options/client?clientOptions=#clientOptions",
+ .getEndpoint("vertx-websocket:localhost:" + PORT.getPort() + "/options/client?clientOptions=#clientOptions",
VertxWebsocketEndpoint.class);
assertSame(clientOptions, endpoint.getConfiguration().getClientOptions());
@@ -58,7 +60,7 @@ public class VertxWebsocketEndpointConfigurationTest extends VertxWebSocketTestS
@Test
public void testHttpServerOptions() {
VertxWebsocketEndpoint endpoint = context
- .getEndpoint("vertx-websocket:localhost:" + PORT + "/options/server?serverOptions=#serverOptions",
+ .getEndpoint("vertx-websocket:localhost:" + PORT.getPort() + "/options/server?serverOptions=#serverOptions",
VertxWebsocketEndpoint.class);
assertSame(serverOptions, endpoint.getConfiguration().getServerOptions());
diff --git a/components/camel-vertx/camel-vertx-websocket/src/test/java/org/apache/camel/component/vertx/websocket/VertxWebsocketOriginTest.java b/components/camel-vertx/camel-vertx-websocket/src/test/java/org/apache/camel/component/vertx/websocket/VertxWebsocketOriginTest.java
index ef29adbb4065..568867d39191 100644
--- a/components/camel-vertx/camel-vertx-websocket/src/test/java/org/apache/camel/component/vertx/websocket/VertxWebsocketOriginTest.java
+++ b/components/camel-vertx/camel-vertx-websocket/src/test/java/org/apache/camel/component/vertx/websocket/VertxWebsocketOriginTest.java
@@ -25,6 +25,7 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.AvailablePortFinder;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -32,7 +33,8 @@ import static org.junit.jupiter.api.Assertions.assertThrows;
public class VertxWebsocketOriginTest extends VertxWebSocketTestSupport {
- private static final int PORT2 = AvailablePortFinder.getNextAvailable();
+ @RegisterExtension
+ static AvailablePortFinder.Port PORT2 = AvailablePortFinder.find();
@Test
public void testValidOrigin() throws InterruptedException {
@@ -45,7 +47,7 @@ public class VertxWebsocketOriginTest extends VertxWebSocketTestSupport {
@Test
public void testInvalidOrigin() {
CamelExecutionException e = assertThrows(CamelExecutionException.class, () -> {
- template.sendBody("vertx-websocket:localhost:" + PORT2 + "/test", "world");
+ template.sendBody("vertx-websocket:localhost:" + PORT2.getPort() + "/test", "world");
});
UpgradeRejectedException upgradeRejectedException = unwrapException(e);
@@ -55,10 +57,10 @@ public class VertxWebsocketOriginTest extends VertxWebSocketTestSupport {
@Test
public void testCustomOrigin() throws InterruptedException {
- String originUrl = "http://foohost:" + PORT2;
+ String originUrl = "http://foohost:" + PORT2.getPort();
MockEndpoint mockEndpoint = getMockEndpoint("mock:result");
mockEndpoint.expectedBodiesReceived("Hello world");
- template.sendBody("vertx-websocket:localhost:" + PORT2 + "/test?originHeaderUrl=" + originUrl, "world");
+ template.sendBody("vertx-websocket:localhost:" + PORT2.getPort() + "/test?originHeaderUrl=" + originUrl, "world");
mockEndpoint.assertIsSatisfied();
}
@@ -66,7 +68,7 @@ public class VertxWebsocketOriginTest extends VertxWebSocketTestSupport {
public void testOriginDisabled() throws InterruptedException {
MockEndpoint mockEndpoint = getMockEndpoint("mock:result");
mockEndpoint.expectedBodiesReceived("Hello world");
- template.sendBody("vertx-websocket:localhost:" + PORT2 + "/test?allowOriginHeader=false", "world");
+ template.sendBody("vertx-websocket:localhost:" + PORT2.getPort() + "/test?allowOriginHeader=false", "world");
mockEndpoint.assertIsSatisfied();
}
@@ -90,7 +92,7 @@ public class VertxWebsocketOriginTest extends VertxWebSocketTestSupport {
.setBody(simple("Hello ${body}"))
.to("mock:result");
- fromF("vertx-websocket:localhost:%d/test?allowedOriginPattern=.*foohost.*", PORT2)
+ fromF("vertx-websocket:localhost:%d/test?allowedOriginPattern=.*foohost.*", PORT2.getPort())
.setBody(simple("Hello ${body}"))
.to("mock:result");
}
diff --git a/components/camel-vertx/camel-vertx/src/test/java/org/apache/camel/component/vertx/VertxBaseTestSupport.java b/components/camel-vertx/camel-vertx/src/test/java/org/apache/camel/component/vertx/VertxBaseTestSupport.java
index ca76adcbd99e..cdf648f1aa49 100644
--- a/components/camel-vertx/camel-vertx/src/test/java/org/apache/camel/component/vertx/VertxBaseTestSupport.java
+++ b/components/camel-vertx/camel-vertx/src/test/java/org/apache/camel/component/vertx/VertxBaseTestSupport.java
@@ -18,23 +18,19 @@ package org.apache.camel.component.vertx;
import org.apache.camel.test.AvailablePortFinder;
import org.apache.camel.test.junit6.CamelTestSupport;
-import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.extension.RegisterExtension;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class VertxBaseTestSupport extends CamelTestSupport {
- protected static int port;
+ @RegisterExtension
+ static AvailablePortFinder.Port port = AvailablePortFinder.find();
protected final Logger log = LoggerFactory.getLogger(getClass());
- @BeforeAll
- public static void initPort() {
- port = AvailablePortFinder.getNextAvailable();
- }
-
protected int getPort() {
- return port;
+ return port.getPort();
}
}
diff --git a/components/camel-webhook/src/test/java/org/apache/camel/component/webhook/WebhookTestBase.java b/components/camel-webhook/src/test/java/org/apache/camel/component/webhook/WebhookTestBase.java
index f33fd4e26195..c5cc1ae561fb 100644
--- a/components/camel-webhook/src/test/java/org/apache/camel/component/webhook/WebhookTestBase.java
+++ b/components/camel-webhook/src/test/java/org/apache/camel/component/webhook/WebhookTestBase.java
@@ -18,15 +18,11 @@ package org.apache.camel.component.webhook;
import org.apache.camel.test.AvailablePortFinder;
import org.apache.camel.test.junit6.CamelTestSupport;
-import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.extension.RegisterExtension;
public class WebhookTestBase extends CamelTestSupport {
- protected static int port;
-
- @BeforeAll
- public static void initPort() {
- port = AvailablePortFinder.getNextAvailable();
- }
+ @RegisterExtension
+ static AvailablePortFinder.Port port = AvailablePortFinder.find();
}
diff --git a/components/camel-whatsapp/src/test/java/org/apache/camel/component/whatsapp/WhatsAppWebhookTest.java b/components/camel-whatsapp/src/test/java/org/apache/camel/component/whatsapp/WhatsAppWebhookTest.java
index c7d03aac6a23..073f7f74e0f1 100644
--- a/components/camel-whatsapp/src/test/java/org/apache/camel/component/whatsapp/WhatsAppWebhookTest.java
+++ b/components/camel-whatsapp/src/test/java/org/apache/camel/component/whatsapp/WhatsAppWebhookTest.java
@@ -24,7 +24,6 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.component.webhook.WebhookConfiguration;
import org.apache.camel.component.webhook.WebhookEndpoint;
-import org.apache.camel.test.AvailablePortFinder;
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.Test;
@@ -87,7 +86,6 @@ public class WhatsAppWebhookTest extends WhatsAppTestSupport {
@Override
protected void doPreSetup() {
- port = AvailablePortFinder.getNextAvailable();
}
protected WhatsAppApiConfig getWhatsAppApiConfig() {
diff --git a/dsl/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/EndpointQueryParamTest.java b/dsl/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/EndpointQueryParamTest.java
index e19a182e123d..ddfaa2eae142 100644
--- a/dsl/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/EndpointQueryParamTest.java
+++ b/dsl/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/EndpointQueryParamTest.java
@@ -20,6 +20,7 @@ import org.apache.camel.RoutesBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.AvailablePortFinder;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
class EndpointQueryParamTest extends BaseEndpointDslTest {
@Override
@@ -27,14 +28,16 @@ class EndpointQueryParamTest extends BaseEndpointDslTest {
return new EndpointRouteBuilder() {
@Override
public void configure() {
- int port = AvailablePortFinder.getNextAvailable();
- restConfiguration().component("jetty").host("localhost").port(port);
+ @RegisterExtension
+
+ AvailablePortFinder.Port port = AvailablePortFinder.find();
+ restConfiguration().component("jetty").host("localhost").port(port.getPort());
rest().get("path/xyz")
.to("mock:result");
from(direct("test"))
- .to(http(String.format("localhost:%d/path/xyz?param1=1¶m2=2", port)).httpMethod("GET"));
+ .to(http(String.format("localhost:%d/path/xyz?param1=1¶m2=2", port.getPort())).httpMethod("GET"));
from(direct("test2"))
- .toF("http://localhost:%d/path/xyz?param1=1¶m2=2&httpMethod=GET", port);
+ .toF("http://localhost:%d/path/xyz?param1=1¶m2=2&httpMethod=GET", port.getPort());
}
};
}
diff --git a/dsl/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/RestDslTest.java b/dsl/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/RestDslTest.java
index 72d8f8293a1a..7579dcfa5e23 100644
--- a/dsl/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/RestDslTest.java
+++ b/dsl/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/RestDslTest.java
@@ -21,14 +21,17 @@ import org.apache.camel.component.platform.http.vertx.VertxPlatformHttpServer;
import org.apache.camel.component.platform.http.vertx.VertxPlatformHttpServerConfiguration;
import org.apache.camel.test.AvailablePortFinder;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
public class RestDslTest extends BaseEndpointDslTest {
@Override
protected CamelContext createCamelContext() throws Exception {
- int port = AvailablePortFinder.getNextAvailable();
+ @RegisterExtension
+
+ AvailablePortFinder.Port port = AvailablePortFinder.find();
VertxPlatformHttpServerConfiguration conf = new VertxPlatformHttpServerConfiguration();
- conf.setBindPort(port);
+ conf.setBindPort(port.getPort());
CamelContext context = super.createCamelContext();
context.addService(new VertxPlatformHttpServer(conf));
diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/ITestSupport.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/ITestSupport.java
index 6bea04d1c9d3..6ff3db62463e 100644
--- a/tests/camel-itest/src/test/java/org/apache/camel/itest/ITestSupport.java
+++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/ITestSupport.java
@@ -24,12 +24,21 @@ import org.apache.camel.test.AvailablePortFinder;
*/
public final class ITestSupport {
- static final int PORT1 = AvailablePortFinder.getNextAvailable();
- static final int PORT2 = AvailablePortFinder.getNextAvailable();
- static final int PORT3 = AvailablePortFinder.getNextAvailable();
- static final int PORT4 = AvailablePortFinder.getNextAvailable();
+ static final int PORT1;
+ static final int PORT2;
+ static final int PORT3;
+ static final int PORT4;
static {
+ try (AvailablePortFinder.Port p1 = AvailablePortFinder.find();
+ AvailablePortFinder.Port p2 = AvailablePortFinder.find();
+ AvailablePortFinder.Port p3 = AvailablePortFinder.find();
+ AvailablePortFinder.Port p4 = AvailablePortFinder.find()) {
+ PORT1 = p1.getPort();
+ PORT2 = p2.getPort();
+ PORT3 = p3.getPort();
+ PORT4 = p4.getPort();
+ }
//set them as system properties so Spring can use the property placeholder
//things to set them into the URL's in the spring contexts
System.setProperty("ITestSupport.port1", Integer.toString(PORT1));
@@ -42,7 +51,10 @@ public final class ITestSupport {
}
public static int getPort(String name) {
- int port = AvailablePortFinder.getNextAvailable();
+ int port;
+ try (AvailablePortFinder.Port p = AvailablePortFinder.find()) {
+ port = p.getPort();
+ }
System.setProperty(name, Integer.toString(port));
return port;
}
diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/ftp/FtpAndHttpRecipientListInterceptSendToEndpointIssueTest.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/ftp/FtpAndHttpRecipientListInterceptSendToEndpointIssueTest.java
index 16f1f97420f5..a7a0f3dd8fec 100644
--- a/tests/camel-itest/src/test/java/org/apache/camel/itest/ftp/FtpAndHttpRecipientListInterceptSendToEndpointIssueTest.java
+++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/ftp/FtpAndHttpRecipientListInterceptSendToEndpointIssueTest.java
@@ -19,7 +19,6 @@ package org.apache.camel.itest.ftp;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.itest.utils.extensions.FtpServiceExtension;
-import org.apache.camel.test.AvailablePortFinder;
import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
@@ -33,7 +32,6 @@ public class FtpAndHttpRecipientListInterceptSendToEndpointIssueTest extends Cam
@BeforeAll
public static void initPort() throws Exception {
- httpPort = AvailablePortFinder.getNextAvailable();
}
@Test
diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/CxfToJmsInOutTest.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/CxfToJmsInOutTest.java
index 1918ac5918ad..b3a0f2d2cb0e 100644
--- a/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/CxfToJmsInOutTest.java
+++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/CxfToJmsInOutTest.java
@@ -41,11 +41,12 @@ public class CxfToJmsInOutTest {
@RegisterExtension
public static JmsServiceExtension jmsServiceExtension = JmsServiceExtension.createExtension();
- private static int port = AvailablePortFinder.getNextAvailable();
+ @RegisterExtension
+ static AvailablePortFinder.Port port = AvailablePortFinder.find();
static {
//set them as system properties so Spring can use the property place holder
//things to set them into the URL's in the spring contexts
- System.setProperty("CxfToJmsInOutTest.port", Integer.toString(port));
+ System.setProperty("CxfToJmsInOutTest.port", Integer.toString(port.getPort()));
}
@Autowired
diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/JettyRecipientListCxfIssueTest.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/JettyRecipientListCxfIssueTest.java
index 2e3cdbbc556b..495808cf066a 100644
--- a/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/JettyRecipientListCxfIssueTest.java
+++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/JettyRecipientListCxfIssueTest.java
@@ -22,6 +22,7 @@ import org.apache.camel.Exchange;
import org.apache.camel.test.AvailablePortFinder;
import org.apache.camel.test.spring.junit6.CamelSpringTestSupport;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.context.support.AbstractApplicationContext;
@@ -34,15 +35,20 @@ public class JettyRecipientListCxfIssueTest extends CamelSpringTestSupport {
private static final Logger LOG = LoggerFactory.getLogger(JettyRecipientListCxfIssueTest.class);
- private static int port1 = AvailablePortFinder.getNextAvailable();
- private static int port2 = AvailablePortFinder.getNextAvailable();
- private static int port3 = AvailablePortFinder.getNextAvailable();
+ @RegisterExtension
+ static AvailablePortFinder.Port port1 = AvailablePortFinder.find();
+ @RegisterExtension
+
+ static AvailablePortFinder.Port port2 = AvailablePortFinder.find();
+ @RegisterExtension
+
+ static AvailablePortFinder.Port port3 = AvailablePortFinder.find();
static {
//set them as system properties so Spring can use the property placeholder
//things to set them into the URL's in the spring contexts
- System.setProperty("RecipientListCxfTest.port1", Integer.toString(port1));
- System.setProperty("RecipientListCxfTest.port2", Integer.toString(port2));
- System.setProperty("RecipientListCxfTest.port3", Integer.toString(port3));
+ System.setProperty("RecipientListCxfTest.port1.getPort()", Integer.toString(port1.getPort()));
+ System.setProperty("RecipientListCxfTest.port2.getPort()", Integer.toString(port2.getPort()));
+ System.setProperty("RecipientListCxfTest.port3.getPort()", Integer.toString(port3.getPort()));
}
@Override
@@ -56,7 +62,7 @@ public class JettyRecipientListCxfIssueTest extends CamelSpringTestSupport {
assertNotNull(request);
// send a message to jetty
- Exchange out = template.request("http://0.0.0.0:{{RecipientListCxfTest.port3}}/myapp", exchange -> {
+ Exchange out = template.request("http://0.0.0.0:{{RecipientListCxfTest.port3.getPort()}}/myapp", exchange -> {
exchange.getIn().setHeader("operationName", "greetMe");
exchange.getIn().setBody(request);
});
diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/JmsToCxfInOutTest.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/JmsToCxfInOutTest.java
index ac4fc23771c9..4bc25d7c7c9f 100644
--- a/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/JmsToCxfInOutTest.java
+++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/JmsToCxfInOutTest.java
@@ -37,11 +37,12 @@ public class JmsToCxfInOutTest {
@RegisterExtension
public static JmsServiceExtension jmsServiceExtension = JmsServiceExtension.createExtension();
- private static int port = AvailablePortFinder.getNextAvailable();
+ @RegisterExtension
+ static AvailablePortFinder.Port port = AvailablePortFinder.find();
static {
//set them as system properties so Spring can use the property place holder
//things to set them into the URL's in the spring contexts
- System.setProperty("JmsToCxfInOutTest.port", Integer.toString(port));
+ System.setProperty("JmsToCxfInOutTest.port", Integer.toString(port.getPort()));
}
@Autowired
diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/http/HttpTestServer.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/http/HttpTestServer.java
index ba78d1decaee..cefde3094afc 100644
--- a/tests/camel-itest/src/test/java/org/apache/camel/itest/http/HttpTestServer.java
+++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/http/HttpTestServer.java
@@ -26,13 +26,15 @@ import org.apache.hc.core5.http.impl.bootstrap.ServerBootstrap;
import org.apache.hc.core5.http.io.HttpRequestHandler;
import org.apache.hc.core5.http.io.SocketConfig;
import org.apache.hc.core5.util.Timeout;
+import org.junit.jupiter.api.extension.RegisterExtension;
/**
* Copy of org.apache.http.localserver.LocalTestServer to use a specific port.
*/
public class HttpTestServer {
- public static final int PORT = AvailablePortFinder.getNextAvailable();
+ @RegisterExtension
+ public static AvailablePortFinder.Port PORT = AvailablePortFinder.find();
/** The request handler registry. */
private final ServerBootstrap bootstrap;
@@ -42,7 +44,7 @@ public class HttpTestServer {
static {
//set them as system properties so Spring can use the property placeholder
//things to set them into the URL's in the spring contexts
- System.setProperty("HttpTestServer.Port", Integer.toString(PORT));
+ System.setProperty("HttpTestServer.Port", Integer.toString(PORT.getPort()));
}
/**
@@ -57,7 +59,7 @@ public class HttpTestServer {
.setTcpNoDelay(true)
.build();
this.bootstrap = ServerBootstrap.bootstrap()
- .setListenerPort(PORT)
+ .setListenerPort(PORT.getPort())
.setConnectionReuseStrategy(newConnectionReuseStrategy())
.setSocketConfig(socketConfig);
}
diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyFreemarkerTest.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyFreemarkerTest.java
index fe5ae05a52fd..2aae9a3d2bc7 100644
--- a/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyFreemarkerTest.java
+++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyFreemarkerTest.java
@@ -24,7 +24,6 @@ import org.apache.camel.Exchange;
import org.apache.camel.ResolveEndpointFailedException;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.support.ResourceHelper;
-import org.apache.camel.test.AvailablePortFinder;
import org.apache.camel.test.junit6.CamelTestSupport;
import org.apache.camel.util.ObjectHelper;
import org.junit.jupiter.api.Test;
@@ -77,7 +76,6 @@ public class JettyFreemarkerTest extends CamelTestSupport {
@Override
protected RouteBuilder createRouteBuilder() {
- port = AvailablePortFinder.getNextAvailable();
return new RouteBuilder() {
public void configure() {
diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyGroovySetHeaderTest.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyGroovySetHeaderTest.java
index 24af88e28e6e..8f118e49c7ab 100644
--- a/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyGroovySetHeaderTest.java
+++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyGroovySetHeaderTest.java
@@ -18,7 +18,6 @@ package org.apache.camel.itest.jetty;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.AvailablePortFinder;
import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.Test;
@@ -45,7 +44,6 @@ public class JettyGroovySetHeaderTest extends CamelTestSupport {
@Override
protected RouteBuilder createRouteBuilder() {
- port = AvailablePortFinder.getNextAvailable();
return new RouteBuilder() {
@Override
diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyJmsShutdownTest.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyJmsShutdownTest.java
index 11144e1d6125..8163f9656a85 100644
--- a/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyJmsShutdownTest.java
+++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyJmsShutdownTest.java
@@ -41,12 +41,13 @@ public class JettyJmsShutdownTest {
private static final String URL;
static {
- int port = AvailablePortFinder.getNextAvailable();
- URL = "http://localhost:" + port + "/JettyJmsShutdownTest";
+ try (AvailablePortFinder.Port port = AvailablePortFinder.find()) {
+ URL = "http://localhost:" + port.getPort() + "/JettyJmsShutdownTest";
- //set them as system properties so Spring can use the property placeholder
- //things to set them into the URL's in the spring contexts
- System.setProperty("JettyJmsShutdownTest.port", Integer.toString(port));
+ //set them as system properties so Spring can use the property placeholder
+ //things to set them into the URL's in the spring contexts
+ System.setProperty("JettyJmsShutdownTest.port", Integer.toString(port.getPort()));
+ }
}
@Autowired
diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyMulticastJmsFileTest.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyMulticastJmsFileTest.java
index f21126a7e8b0..4caaf105cb0b 100644
--- a/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyMulticastJmsFileTest.java
+++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyMulticastJmsFileTest.java
@@ -38,12 +38,13 @@ public class JettyMulticastJmsFileTest {
@RegisterExtension
public static JmsServiceExtension jmsServiceExtension = JmsServiceExtension.createExtension();
- private static int port = AvailablePortFinder.getNextAvailable();
- private static final String URL = "http://localhost:" + port + "/JettyMulticastJmsFileTest";
+ @RegisterExtension
+ static AvailablePortFinder.Port port = AvailablePortFinder.find();
+ private static final String URL = "http://localhost:" + port.getPort() + "/JettyMulticastJmsFileTest";
static {
//set them as system properties so Spring can use the property placeholder
//things to set them into the URL's in the spring contexts
- System.setProperty("JettyMulticastJmsFileTest.port", Integer.toString(port));
+ System.setProperty("JettyMulticastJmsFileTest.port", Integer.toString(port.getPort()));
}
@Autowired
diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettySimulateFailoverRoundRobinTest.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettySimulateFailoverRoundRobinTest.java
index 9d62bdeccd1e..e711a7a24b8f 100644
--- a/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettySimulateFailoverRoundRobinTest.java
+++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettySimulateFailoverRoundRobinTest.java
@@ -28,24 +28,32 @@ import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.AvailablePortFinder;
import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import static org.junit.jupiter.api.Assertions.assertEquals;
public class JettySimulateFailoverRoundRobinTest extends CamelTestSupport {
- private static int port1 = AvailablePortFinder.getNextAvailable();
- private static int port2 = AvailablePortFinder.getNextAvailable();
- private static int port3 = AvailablePortFinder.getNextAvailable();
- private static int port4 = AvailablePortFinder.getNextAvailable();
-
- private String bad = "jetty:http://localhost:" + port1 + "/bad";
- private String bad2 = "jetty:http://localhost:" + port2 + "/bad2";
- private String good = "jetty:http://localhost:" + port3 + "/good";
- private String good2 = "jetty:http://localhost:" + port4 + "/good2";
- private String hbad = "http://localhost:" + port1 + "/bad";
- private String hbad2 = "http://localhost:" + port2 + "/bad2";
- private String hgood = "http://localhost:" + port3 + "/good";
- private String hgood2 = "http://localhost:" + port4 + "/good2";
+ @RegisterExtension
+ static AvailablePortFinder.Port port1 = AvailablePortFinder.find();
+ @RegisterExtension
+
+ static AvailablePortFinder.Port port2 = AvailablePortFinder.find();
+ @RegisterExtension
+
+ static AvailablePortFinder.Port port3 = AvailablePortFinder.find();
+ @RegisterExtension
+
+ static AvailablePortFinder.Port port4 = AvailablePortFinder.find();
+
+ private String bad = "jetty:http://localhost:" + port1.getPort() + "/bad";
+ private String bad2 = "jetty:http://localhost:" + port2.getPort() + "/bad2";
+ private String good = "jetty:http://localhost:" + port3.getPort() + "/good";
+ private String good2 = "jetty:http://localhost:" + port4.getPort() + "/good2";
+ private String hbad = "http://localhost:" + port1.getPort() + "/bad";
+ private String hbad2 = "http://localhost:" + port2.getPort() + "/bad2";
+ private String hgood = "http://localhost:" + port3.getPort() + "/good";
+ private String hgood2 = "http://localhost:" + port4.getPort() + "/good2";
@Test
void testJettySimulateFailoverRoundRobin() throws Exception {
diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyVelocityTest.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyVelocityTest.java
index f69880d1e84a..e04973ad3e83 100644
--- a/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyVelocityTest.java
+++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyVelocityTest.java
@@ -24,7 +24,6 @@ import org.apache.camel.Exchange;
import org.apache.camel.ResolveEndpointFailedException;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.support.ResourceHelper;
-import org.apache.camel.test.AvailablePortFinder;
import org.apache.camel.test.junit6.CamelTestSupport;
import org.apache.camel.util.ObjectHelper;
import org.junit.jupiter.api.Test;
@@ -77,7 +76,6 @@ public class JettyVelocityTest extends CamelTestSupport {
@Override
protected RouteBuilder createRouteBuilder() {
- port = AvailablePortFinder.getNextAvailable();
return new RouteBuilder() {
public void configure() {
diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsHttpJmsTest.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsHttpJmsTest.java
index 54b0e5dbc19b..f9ba75eb73ef 100644
--- a/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsHttpJmsTest.java
+++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsHttpJmsTest.java
@@ -23,7 +23,6 @@ import org.apache.camel.component.jms.JmsComponent;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.itest.utils.extensions.JmsServiceExtension;
import org.apache.camel.spi.Registry;
-import org.apache.camel.test.AvailablePortFinder;
import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.Timeout;
@@ -67,7 +66,6 @@ public class JmsHttpJmsTest extends CamelTestSupport {
@Override
protected RouteBuilder createRouteBuilder() {
- port = AvailablePortFinder.getNextAvailable();
return new RouteBuilder() {
public void configure() {
diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsHttpPostIssueTest.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsHttpPostIssueTest.java
index 91ba8cda10a1..e97d1d7da30e 100644
--- a/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsHttpPostIssueTest.java
+++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsHttpPostIssueTest.java
@@ -21,7 +21,6 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.jms.JmsComponent;
import org.apache.camel.itest.utils.extensions.JmsServiceExtension;
import org.apache.camel.spi.Registry;
-import org.apache.camel.test.AvailablePortFinder;
import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.Timeout;
@@ -61,7 +60,6 @@ public class JmsHttpPostIssueTest extends CamelTestSupport {
@Override
protected RouteBuilder createRouteBuilder() {
- port = AvailablePortFinder.getNextAvailable();
return new RouteBuilder() {
public void configure() {
diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsHttpPostIssueWithMockTest.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsHttpPostIssueWithMockTest.java
index 9a93a8a86f3d..c4eac7e47831 100644
--- a/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsHttpPostIssueWithMockTest.java
+++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsHttpPostIssueWithMockTest.java
@@ -21,7 +21,6 @@ import org.apache.camel.component.jms.JmsComponent;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.itest.utils.extensions.JmsServiceExtension;
import org.apache.camel.spi.Registry;
-import org.apache.camel.test.AvailablePortFinder;
import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.Timeout;
@@ -64,7 +63,6 @@ public class JmsHttpPostIssueWithMockTest extends CamelTestSupport {
@Override
protected RouteBuilder createRouteBuilder() {
- port = AvailablePortFinder.getNextAvailable();
return new RouteBuilder() {
public void configure() {
diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsJettyAsyncTest.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsJettyAsyncTest.java
index 526213ce6ffd..2029b595b0ec 100644
--- a/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsJettyAsyncTest.java
+++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsJettyAsyncTest.java
@@ -23,7 +23,6 @@ import org.apache.camel.component.jms.JmsComponent;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.itest.utils.extensions.JmsServiceExtension;
import org.apache.camel.spi.Registry;
-import org.apache.camel.test.AvailablePortFinder;
import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.Timeout;
@@ -53,7 +52,6 @@ public class JmsJettyAsyncTest extends CamelTestSupport {
@Override
protected RouteBuilder createRouteBuilder() {
- port = AvailablePortFinder.getNextAvailable();
return new RouteBuilder() {
@Override
diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/netty/NettyAsyncRequestReplyTest.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/netty/NettyAsyncRequestReplyTest.java
index b0a06f9eacdb..847326734cdc 100644
--- a/tests/camel-itest/src/test/java/org/apache/camel/itest/netty/NettyAsyncRequestReplyTest.java
+++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/netty/NettyAsyncRequestReplyTest.java
@@ -29,7 +29,6 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.jms.JmsComponent;
import org.apache.camel.itest.utils.extensions.JmsServiceExtension;
import org.apache.camel.spi.Registry;
-import org.apache.camel.test.AvailablePortFinder;
import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
@@ -101,7 +100,6 @@ public class NettyAsyncRequestReplyTest extends CamelTestSupport {
return new RouteBuilder() {
@Override
public void configure() {
- port = AvailablePortFinder.getNextAvailable();
from("netty:tcp://localhost:" + port + "?textline=true&sync=true&reuseAddress=true&synchronous=false")
.to("activemq:queue:NettyAsyncRequestReplyTest")
diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/tx/JmsToHttpRoute.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/tx/JmsToHttpRoute.java
index 7f77c1249dce..97f5b4e98d02 100644
--- a/tests/camel-itest/src/test/java/org/apache/camel/itest/tx/JmsToHttpRoute.java
+++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/tx/JmsToHttpRoute.java
@@ -46,7 +46,9 @@ public class JmsToHttpRoute extends RouteBuilder {
@Override
public void configure() {
- port = AvailablePortFinder.getNextAvailable();
+ try (AvailablePortFinder.Port p = AvailablePortFinder.find()) {
+ port = p.getPort();
+ }
// configure a global transacted error handler
errorHandler(transactionErrorHandler(required));
diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/tx/JmsToHttpWithOnExceptionAndNoTransactionErrorHandlerConfiguredRoute.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/tx/JmsToHttpWithOnExceptionAndNoTransactionErrorHandlerConfiguredRoute.java
index 3ff925f8acc8..e438cb81c01f 100644
--- a/tests/camel-itest/src/test/java/org/apache/camel/itest/tx/JmsToHttpWithOnExceptionAndNoTransactionErrorHandlerConfiguredRoute.java
+++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/tx/JmsToHttpWithOnExceptionAndNoTransactionErrorHandlerConfiguredRoute.java
@@ -30,7 +30,9 @@ public class JmsToHttpWithOnExceptionAndNoTransactionErrorHandlerConfiguredRoute
@Override
public void configure() {
- port = AvailablePortFinder.getNextAvailable();
+ try (AvailablePortFinder.Port p = AvailablePortFinder.find()) {
+ port = p.getPort();
+ }
// if its a 404 then regard it as handled
onException(HttpOperationFailedException.class).onWhen(exchange -> {
diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/tx/JmsToHttpWithOnExceptionRoute.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/tx/JmsToHttpWithOnExceptionRoute.java
index 91a5eede0183..98d6784baba7 100644
--- a/tests/camel-itest/src/test/java/org/apache/camel/itest/tx/JmsToHttpWithOnExceptionRoute.java
+++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/tx/JmsToHttpWithOnExceptionRoute.java
@@ -45,7 +45,9 @@ public class JmsToHttpWithOnExceptionRoute extends RouteBuilder {
@Override
public void configure() {
- port = AvailablePortFinder.getNextAvailable();
+ try (AvailablePortFinder.Port p = AvailablePortFinder.find()) {
+ port = p.getPort();
+ }
// configure a global transacted error handler
errorHandler(transactionErrorHandler(required));
diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/tx/JmsToHttpWithRollbackRoute.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/tx/JmsToHttpWithRollbackRoute.java
index 82ae446d7a30..6816699e2fed 100644
--- a/tests/camel-itest/src/test/java/org/apache/camel/itest/tx/JmsToHttpWithRollbackRoute.java
+++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/tx/JmsToHttpWithRollbackRoute.java
@@ -46,7 +46,9 @@ public class JmsToHttpWithRollbackRoute extends RouteBuilder {
@Override
public void configure() {
- port = AvailablePortFinder.getNextAvailable();
+ try (AvailablePortFinder.Port p = AvailablePortFinder.find()) {
+ port = p.getPort();
+ }
// configure a global transacted error handler
errorHandler(transactionErrorHandler(required));
diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/utils/extensions/FtpServiceExtension.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/utils/extensions/FtpServiceExtension.java
index f96bd98adba0..2e7427852e9e 100644
--- a/tests/camel-itest/src/test/java/org/apache/camel/itest/utils/extensions/FtpServiceExtension.java
+++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/utils/extensions/FtpServiceExtension.java
@@ -37,13 +37,17 @@ public class FtpServiceExtension implements BeforeAllCallback, AfterAllCallback
public FtpServiceExtension() {
if (ftpPort == 0) {
- ftpPort = AvailablePortFinder.getNextAvailable();
+ try (AvailablePortFinder.Port p = AvailablePortFinder.find()) {
+ ftpPort = p.getPort();
+ }
}
}
public FtpServiceExtension(String property) {
if (ftpPort == 0) {
- ftpPort = AvailablePortFinder.getNextAvailable();
+ try (AvailablePortFinder.Port p = AvailablePortFinder.find()) {
+ ftpPort = p.getPort();
+ }
}
//set them as system properties so Spring can use the property placeholder
diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/utils/extensions/GreeterServiceExtension.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/utils/extensions/GreeterServiceExtension.java
index 7885649ede42..e8615b42f48b 100644
--- a/tests/camel-itest/src/test/java/org/apache/camel/itest/utils/extensions/GreeterServiceExtension.java
+++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/utils/extensions/GreeterServiceExtension.java
@@ -34,7 +34,9 @@ public class GreeterServiceExtension implements BeforeAllCallback, AfterAllCallb
private static final int PORT;
static {
- PORT = AvailablePortFinder.getNextAvailable();
+ try (AvailablePortFinder.Port p = AvailablePortFinder.find()) {
+ PORT = p.getPort();
+ }
GREETER = new GreeterImpl();
ADDRESS = "http://localhost:" + PORT + "/SoapContext/SoapPort";
(camel) 01/04: CAMEL-23214: Migrate AvailablePortFinder.getNextAvailable() to @RegisterExtension (batch 1)
Posted by gn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch CAMEL-23214-port-migration
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 61c555fcaffefe53e72a421ce40a8f4cb71421e2
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Thu Mar 19 11:55:15 2026 +0100
CAMEL-23214: Migrate AvailablePortFinder.getNextAvailable() to @RegisterExtension (batch 1)
Migrate 87 test files across camel-mllp, camel-platform-http-vertx,
camel-cometd, camel-thrift, camel-syslog, camel-jetty, camel-as2,
and camel-lumberjack from the deprecated getNextAvailable() pattern
to the @RegisterExtension AvailablePortFinder.Port pattern for
proper port lifecycle management.
Co-Authored-By: Claude Opus 4.6 <no...@anthropic.com>
---
.../component/as2/AS2AsyncMDNServerManagerIT.java | 58 ++++++-----
.../as2/AS2AsyncMdnBasicAuthHeaderTest.java | 36 ++++---
.../as2/AS2AsyncMdnTokenAuthHeaderTest.java | 29 +++---
.../component/as2/AS2BasicAuthHeaderTest.java | 24 ++---
.../camel/component/as2/AS2ClientManagerIT.java | 34 +++---
.../as2/AS2ServerBasicAuthHeaderTest.java | 15 +--
.../as2/AS2ServerBearerAuthHeaderTest.java | 15 +--
.../component/as2/AS2ServerManagerEncryptedIT.java | 6 +-
.../camel/component/as2/AS2ServerManagerIT.java | 12 +--
.../component/as2/AS2ServerManagerITBase.java | 8 +-
.../camel/component/as2/AS2ServerSecTestBase.java | 8 +-
.../component/as2/AS2TokenAuthHeaderTest.java | 24 ++---
.../CometdProducerConsumerAuthenticatedTest.java | 9 +-
.../CometdProducerConsumerExtensionTest.java | 18 ++--
.../cometd/CometdProducerConsumerInOutTest.java | 18 ++--
.../CometdProducerConsumerInteractiveTest.java | 14 +--
.../cometd/CometdProducerConsumerTest.java | 9 +-
.../cometd/MultipCometdProducerConsumerTest.java | 13 +--
.../cometd/SslCometdProducerConsumerTest.java | 7 +-
...ontextParametersCometdProducerConsumerTest.java | 7 +-
...tParametersInUriCometdProducerConsumerTest.java | 7 +-
...ontextParametersCometdProducerConsumerTest.java | 7 +-
.../jetty/JettyBridgeHostHeaderIssueTest.java | 58 ++++++-----
.../component/jetty/JettyValidatorStreamTest.java | 10 +-
...alidatorStreamWithStreamCachingEnabledTest.java | 10 +-
.../camel/component/jetty/JettyValidatorTest.java | 12 +--
.../component/jetty/JettyXsltHttpTemplateTest.java | 10 +-
.../camel/component/jetty/JettyXsltTest.java | 10 +-
.../jetty/SpringFailoverRoundRobinTest.java | 28 ++---
.../jetty/rest/RestJettyRedirectTest.java | 12 ++-
.../LumberjackComponentGlobalSSLTest.java | 15 ++-
.../lumberjack/LumberjackComponentSSLTest.java | 14 +--
.../lumberjack/LumberjackComponentTest.java | 14 +--
.../lumberjack/LumberjackDisconnectionTest.java | 14 +--
.../lumberjack/LumberjackMultiThreadIT.java | 8 +-
.../MllpTcpServerConsumerLenientBindTest.java | 5 +-
.../apache/camel/component/mllp/LogPhiTest.java | 5 +-
...pGlobalAndExplicitSSLContextParametersTest.java | 5 +-
.../mllp/MllpIdleTimeoutStrategyTest.java | 5 +-
.../mllp/MllpMaxConcurrentConsumersTest.java | 10 +-
.../mllp/MllpMutualTlsConnectionAndHeaderBase.java | 5 +-
.../MllpProducerConsumerLoopbackInOnlyTest.java | 6 +-
.../mllp/MllpProducerConsumerLoopbackTest.java | 10 +-
.../mllp/MllpSSLContextParametersTest.java | 5 +-
.../MllpTcpClientProducerConnectionErrorTest.java | 5 +-
...TcpClientProducerIdleConnectionTimeoutTest.java | 5 +-
.../component/mllp/MllpTcpServerCharsetTest.java | 5 +-
.../mllp/MllpTcpServerConsumerBindTimeoutTest.java | 5 +-
.../mllp/MllpTcpServerConsumerConnectionTest.java | 5 +-
.../MllpTcpServerConsumerMessageHeadersTest.java | 5 +-
...MllpTcpServerConsumerMulitpleTcpPacketTest.java | 5 +-
.../mllp/MllpTcpServerConsumerThreadPoolTest.java | 14 ++-
.../mllp/MllpTcpServerConsumerTransactionTest.java | 5 +-
...tProducerEndOfDataAndValidationTestSupport.java | 5 +-
...cpServerConsumerAcknowledgementTestSupport.java | 5 +-
...rConsumerEndOfDataAndValidationTestSupport.java | 5 +-
.../RestOpenApiCodeFirstOnExceptionIssueTest.java | 8 +-
...stOpenApiContractFirstOnExceptionIssueTest.java | 8 +-
.../vertx/VertxPlatformHttpAuthenticationTest.java | 8 +-
.../http/vertx/VertxPlatformHttpCookieTest.java | 10 +-
.../http/vertx/VertxPlatformHttpEngineTest.java | 115 +++++++++++----------
.../vertx/VertxPlatformHttpNoBodyHandlerTest.java | 8 +-
.../vertx/VertxPlatformHttpPooledExchangeTest.java | 12 ++-
.../http/vertx/VertxPlatformHttpProxyTest.java | 8 +-
.../http/vertx/VertxPlatformHttpSessionTest.java | 15 +--
.../vertx/VertxPlatformHttpSharedVertxTest.java | 6 +-
.../http/vertx/VertxPlatformHttpsProxyTest.java | 19 ++--
.../VertxPlatformMultipleContentTypeTest.java | 13 ++-
.../component/syslog/AutomatedConversionTest.java | 16 ++-
.../camel/component/syslog/MinaDataFormatTest.java | 14 +--
.../component/syslog/MinaManyUDPMessagesTest.java | 14 +--
.../component/syslog/NettyDataFormatTest.java | 18 ++--
.../component/syslog/NettyManyUDPMessagesTest.java | 15 ++-
.../syslog/NettyRfc5425LongMessageTest.java | 14 +--
.../camel/component/syslog/NettyRfc5425Test.java | 18 ++--
.../component/syslog/SyslogSpringMinaTest.java | 18 ++--
.../component/syslog/SyslogSpringNettyTest.java | 18 ++--
.../component/thrift/ThriftConsumerAsyncTest.java | 13 ++-
.../thrift/ThriftConsumerConcurrentTest.java | 15 +--
.../thrift/ThriftConsumerSecurityTest.java | 13 ++-
.../component/thrift/ThriftConsumerSyncTest.java | 12 ++-
.../thrift/ThriftConsumerZlibCompressionTest.java | 12 ++-
.../component/thrift/ThriftProducerBaseTest.java | 24 +++--
.../thrift/ThriftProducerSecurityTest.java | 36 ++++---
.../component/thrift/ThriftProducerSyncTest.java | 12 +--
.../thrift/ThriftProducerZlibCompressionTest.java | 30 +++---
.../thrift/local/ThriftThreadPoolServerTest.java | 20 ++--
87 files changed, 699 insertions(+), 581 deletions(-)
diff --git a/components/camel-as2/camel-as2-component/src/test/java/org/apache/camel/component/as2/AS2AsyncMDNServerManagerIT.java b/components/camel-as2/camel-as2-component/src/test/java/org/apache/camel/component/as2/AS2AsyncMDNServerManagerIT.java
index 63040ab478dc..95fbe11d7799 100644
--- a/components/camel-as2/camel-as2-component/src/test/java/org/apache/camel/component/as2/AS2AsyncMDNServerManagerIT.java
+++ b/components/camel-as2/camel-as2-component/src/test/java/org/apache/camel/component/as2/AS2AsyncMDNServerManagerIT.java
@@ -56,9 +56,8 @@ import org.apache.hc.core5.http.HttpResponse;
import org.apache.hc.core5.http.io.HttpRequestHandler;
import org.apache.hc.core5.http.protocol.HttpContext;
import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
@@ -110,29 +109,33 @@ public class AS2AsyncMDNServerManagerIT extends AbstractAS2ITSupport {
""";
private static final String EDI_MESSAGE_CONTENT_TRANSFER_ENCODING = "7bit";
- private static final int PARTNER_TARGET_PORT = AvailablePortFinder.getNextAvailable();
-
- private static final int RECEIPT_SERVER_PORT = AvailablePortFinder.getNextAvailable();
- private static final int RECEIPT_SERVER_PORT2 = AvailablePortFinder.getNextAvailable();
- private static final int RECEIPT_SERVER_PORT3 = AvailablePortFinder.getNextAvailable();
- private static final int RECEIPT_SERVER_PORT4 = AvailablePortFinder.getNextAvailable();
-
- private static AS2ServerConnection serverConnection;
- private static RequestHandler requestHandler;
+ @RegisterExtension
+ AvailablePortFinder.Port partnerTargetPort = AvailablePortFinder.find();
+ @RegisterExtension
+ AvailablePortFinder.Port receiptServerPort = AvailablePortFinder.find();
+ @RegisterExtension
+ AvailablePortFinder.Port receiptServerPort2 = AvailablePortFinder.find();
+ @RegisterExtension
+ AvailablePortFinder.Port receiptServerPort3 = AvailablePortFinder.find();
+ @RegisterExtension
+ AvailablePortFinder.Port receiptServerPort4 = AvailablePortFinder.find();
+
+ private AS2ServerConnection serverConnection;
+ private RequestHandler requestHandler;
private static final String SIGNED_RECEIPT_MIC_ALGORITHMS = "sha1,md5";
private static KeyPair serverKP;
private static X509Certificate serverCert;
private static KeyPair clientKeyPair;
private static X509Certificate clientCert;
- @BeforeAll
- public static void setupTest() throws Exception {
+ @Override
+ public void doPostSetup() throws Exception {
setupKeysAndCertificates();
receiveTestMessages();
}
- @AfterAll
- public static void teardownTest() {
+ @Override
+ public void doPostTearDown() {
if (serverConnection != null) {
serverConnection.close();
}
@@ -140,7 +143,7 @@ public class AS2AsyncMDNServerManagerIT extends AbstractAS2ITSupport {
@Override
protected void customizeConfiguration(AS2Configuration configuration) {
- configuration.setTargetPortNumber(PARTNER_TARGET_PORT);
+ configuration.setTargetPortNumber(partnerTargetPort.getPort());
}
// Verify the MDN is receipt returned asynchronously from the server when the request headers includes the
@@ -148,7 +151,7 @@ public class AS2AsyncMDNServerManagerIT extends AbstractAS2ITSupport {
@Test
public void deliveryHeaderMultipartReportTest() throws Exception {
DispositionNotificationMultipartReportEntity reportEntity
- = executeRequestWithAsyncResponseHeader("direct://SEND", RECEIPT_SERVER_PORT, "mock:as2RcvRcptMsgs");
+ = executeRequestWithAsyncResponseHeader("direct://SEND", receiptServerPort.getPort(), "mock:as2RcvRcptMsgs");
verifyMultiPartReportParts(reportEntity);
verifyMultiPartReportEntity(reportEntity);
}
@@ -168,7 +171,8 @@ public class AS2AsyncMDNServerManagerIT extends AbstractAS2ITSupport {
@Test
public void deliveryHeaderMultipartSignedEntityTest() throws Exception {
MultipartSignedEntity responseSignedEntity
- = executeRequestWithSignedAsyncResponseHeader("direct://SEND", RECEIPT_SERVER_PORT2, "mock:as2RcvRcptMsgs2");
+ = executeRequestWithSignedAsyncResponseHeader("direct://SEND", receiptServerPort2.getPort(),
+ "mock:as2RcvRcptMsgs2");
MimeEntity responseSignedDataEntity = responseSignedEntity.getSignedDataEntity();
assertTrue(responseSignedDataEntity instanceof DispositionNotificationMultipartReportEntity,
@@ -390,27 +394,29 @@ public class AS2AsyncMDNServerManagerIT extends AbstractAS2ITSupport {
// with option for asynchronous receipt specified as path-param
from("direct://SEND3")
.toF("as2://client/send?inBody=ediMessage&httpSocketTimeout=5m&httpConnectionTimeout=5m"
- + "&receiptDeliveryOption=%s", "http://localhost:" + RECEIPT_SERVER_PORT3 + "/handle-receipts");
+ + "&receiptDeliveryOption=%s",
+ "http://localhost:" + receiptServerPort3.getPort() + "/handle-receipts");
from("direct://SEND4")
.toF("as2://client/send?inBody=ediMessage&httpSocketTimeout=5m&httpConnectionTimeout=5m"
- + "&receiptDeliveryOption=%s", "http://localhost:" + RECEIPT_SERVER_PORT4 + "/handle-receipts");
+ + "&receiptDeliveryOption=%s",
+ "http://localhost:" + receiptServerPort4.getPort() + "/handle-receipts");
// asynchronous AS2-MDN (receipt) server instance
fromF("as2://receipt/receive?requestUriPattern=/handle-receipts&asyncMdnPortNumber=%s",
- RECEIPT_SERVER_PORT)
+ receiptServerPort.getPort())
.to("mock:as2RcvRcptMsgs");
fromF("as2://receipt/receive?requestUriPattern=/handle-receipts&asyncMdnPortNumber=%s",
- RECEIPT_SERVER_PORT2)
+ receiptServerPort2.getPort())
.to("mock:as2RcvRcptMsgs2");
fromF("as2://receipt/receive?requestUriPattern=/handle-receipts&asyncMdnPortNumber=%s",
- RECEIPT_SERVER_PORT3)
+ receiptServerPort3.getPort())
.to("mock:as2RcvRcptMsgs3");
fromF("as2://receipt/receive?requestUriPattern=/handle-receipts&asyncMdnPortNumber=%s",
- RECEIPT_SERVER_PORT4)
+ receiptServerPort4.getPort())
.to("mock:as2RcvRcptMsgs4");
}
};
@@ -438,10 +444,10 @@ public class AS2AsyncMDNServerManagerIT extends AbstractAS2ITSupport {
}
}
- private static void receiveTestMessages() throws IOException {
+ private void receiveTestMessages() throws IOException {
serverConnection = new AS2ServerConnection(
AS2_VERSION, ORIGIN_SERVER_NAME,
- SERVER_FQDN, PARTNER_TARGET_PORT, AS2SignatureAlgorithm.SHA256WITHRSA,
+ SERVER_FQDN, partnerTargetPort.getPort(), AS2SignatureAlgorithm.SHA256WITHRSA,
new Certificate[] { serverCert }, serverKP.getPrivate(), null,
MDN_MESSAGE_TEMPLATE, new Certificate[] { clientCert }, null, null, null, null);
requestHandler = new RequestHandler();
diff --git a/components/camel-as2/camel-as2-component/src/test/java/org/apache/camel/component/as2/AS2AsyncMdnBasicAuthHeaderTest.java b/components/camel-as2/camel-as2-component/src/test/java/org/apache/camel/component/as2/AS2AsyncMdnBasicAuthHeaderTest.java
index 28311799b012..99cf6dd8de4e 100644
--- a/components/camel-as2/camel-as2-component/src/test/java/org/apache/camel/component/as2/AS2AsyncMdnBasicAuthHeaderTest.java
+++ b/components/camel-as2/camel-as2-component/src/test/java/org/apache/camel/component/as2/AS2AsyncMdnBasicAuthHeaderTest.java
@@ -35,9 +35,8 @@ import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.http.common.HttpMessage;
import org.apache.camel.test.AvailablePortFinder;
import org.apache.hc.core5.http.ContentType;
-import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
@@ -53,9 +52,12 @@ public class AS2AsyncMdnBasicAuthHeaderTest extends AbstractAS2ITSupport {
private static final String MDN_USER_NAME = "camel";
private static final String MDN_PASSWORD = "rider";
private static final String MDN_ACCESS_TOKEN = "MTQ0NjJkZmQ5OTM2NDE1ZTZjNGZmZjI3";
- private static final int TARGET_PORT = AvailablePortFinder.getNextAvailable();
- private static final int RECEIPT_SERVER_PORT = AvailablePortFinder.getNextAvailable();
- private static final int JETTY_PORT = AvailablePortFinder.getNextAvailable();
+ @RegisterExtension
+ AvailablePortFinder.Port targetPort = AvailablePortFinder.find();
+ @RegisterExtension
+ AvailablePortFinder.Port receiptServerPort = AvailablePortFinder.find();
+ @RegisterExtension
+ AvailablePortFinder.Port jettyPort = AvailablePortFinder.find();
private static final String EDI_MESSAGE = """
UNB+UNOA:1+005435656:1+006415160:1+060515:1434+00000000000778'
UNH+00000000000117+INVOIC:D:97B:UN'
@@ -85,15 +87,15 @@ public class AS2AsyncMdnBasicAuthHeaderTest extends AbstractAS2ITSupport {
UNZ+1+00000000000778'
""";
- private static AS2ServerConnection serverConnection;
+ private AS2ServerConnection serverConnection;
- @BeforeAll
- public static void setupTest() throws Exception {
+ @Override
+ public void doPostSetup() throws Exception {
receiveTestMessages();
}
- @AfterAll
- public static void tearDownTest() {
+ @Override
+ public void doPostTearDown() {
if (serverConnection != null) {
serverConnection.close();
}
@@ -102,7 +104,7 @@ public class AS2AsyncMdnBasicAuthHeaderTest extends AbstractAS2ITSupport {
@Test
public void asyncMdnHasBasicAuthHeader() throws Exception {
requestBodyAndHeaders("direct://SEND", EDI_MESSAGE,
- getAS2Headers("http://localhost:" + JETTY_PORT + "/handle-receipts"));
+ getAS2Headers("http://localhost:" + jettyPort.getPort() + "/handle-receipts"));
MockEndpoint mockEndpoint = getMockEndpoint("mock:as2RcvRcptMsgs");
mockEndpoint.expectedMinimumMessageCount(1);
@@ -114,7 +116,7 @@ public class AS2AsyncMdnBasicAuthHeaderTest extends AbstractAS2ITSupport {
@Test
public void asyncMdnHasExpectedParts() throws Exception {
requestBodyAndHeaders("direct://SEND", EDI_MESSAGE,
- getAS2Headers("http://localhost:" + RECEIPT_SERVER_PORT + "/handle-receipts"));
+ getAS2Headers("http://localhost:" + receiptServerPort.getPort() + "/handle-receipts"));
MockEndpoint mockEndpoint = getMockEndpoint("mock:as2RcvRcptMsgs2");
mockEndpoint.expectedMinimumMessageCount(1);
@@ -171,12 +173,12 @@ public class AS2AsyncMdnBasicAuthHeaderTest extends AbstractAS2ITSupport {
from("direct://SEND")
.to("as2://client/send?inBody=ediMessage&httpSocketTimeout=5m&httpConnectionTimeout=5m");
- from("jetty:http://localhost:" + JETTY_PORT + "/handle-receipts")
+ from("jetty:http://localhost:" + jettyPort.getPort() + "/handle-receipts")
.process(proc)
.to("mock:as2RcvRcptMsgs");
fromF("as2://receipt/receive?requestUriPattern=/handle-receipts&asyncMdnPortNumber=%s",
- RECEIPT_SERVER_PORT)
+ receiptServerPort.getPort())
.to("mock:as2RcvRcptMsgs2");
}
};
@@ -184,14 +186,14 @@ public class AS2AsyncMdnBasicAuthHeaderTest extends AbstractAS2ITSupport {
@Override
protected void customizeConfiguration(AS2Configuration configuration) {
- configuration.setTargetPortNumber(TARGET_PORT);
+ configuration.setTargetPortNumber(targetPort.getPort());
}
// AS2 server adds Authorization header to MDN returned asynchronously
- private static void receiveTestMessages() throws IOException {
+ private void receiveTestMessages() throws IOException {
serverConnection = new AS2ServerConnection(
"1.1", "AS2ClientManagerIntegrationTest Server",
- "server.example.com", TARGET_PORT, AS2SignatureAlgorithm.SHA256WITHRSA,
+ "server.example.com", targetPort.getPort(), AS2SignatureAlgorithm.SHA256WITHRSA,
null, null, null,
"TBD", null, null,
// server authorization config
diff --git a/components/camel-as2/camel-as2-component/src/test/java/org/apache/camel/component/as2/AS2AsyncMdnTokenAuthHeaderTest.java b/components/camel-as2/camel-as2-component/src/test/java/org/apache/camel/component/as2/AS2AsyncMdnTokenAuthHeaderTest.java
index 152aef0bd191..e5fc468eef15 100644
--- a/components/camel-as2/camel-as2-component/src/test/java/org/apache/camel/component/as2/AS2AsyncMdnTokenAuthHeaderTest.java
+++ b/components/camel-as2/camel-as2-component/src/test/java/org/apache/camel/component/as2/AS2AsyncMdnTokenAuthHeaderTest.java
@@ -30,9 +30,8 @@ import org.apache.camel.component.as2.api.AS2SignatureAlgorithm;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.http.common.HttpMessage;
import org.apache.camel.test.AvailablePortFinder;
-import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -43,8 +42,10 @@ import static org.junit.jupiter.api.Assertions.assertNotNull;
public class AS2AsyncMdnTokenAuthHeaderTest extends AbstractAS2ITSupport {
private static final String MDN_ACCESS_TOKEN = "MTQ0NjJkZmQ5OTM2NDE1ZTZjNGZmZjI3";
- private static final int TARGET_PORT = AvailablePortFinder.getNextAvailable();
- private static final int RECEIPT_SERVER_PORT = AvailablePortFinder.getNextAvailable();
+ @RegisterExtension
+ AvailablePortFinder.Port targetPort = AvailablePortFinder.find();
+ @RegisterExtension
+ AvailablePortFinder.Port receiptServerPort = AvailablePortFinder.find();
private static final String EDI_MESSAGE = """
UNB+UNOA:1+005435656:1+006415160:1+060515:1434+00000000000778'
UNH+00000000000117+INVOIC:D:97B:UN'
@@ -74,15 +75,15 @@ public class AS2AsyncMdnTokenAuthHeaderTest extends AbstractAS2ITSupport {
UNZ+1+00000000000778'
""";
- private static AS2ServerConnection serverConnection;
+ private AS2ServerConnection serverConnection;
- @BeforeAll
- public static void setupTest() throws Exception {
+ @Override
+ public void doPostSetup() throws Exception {
receiveTestMessages();
}
- @AfterAll
- public static void tearDownTest() {
+ @Override
+ public void doPostTearDown() {
if (serverConnection != null) {
serverConnection.close();
}
@@ -91,7 +92,7 @@ public class AS2AsyncMdnTokenAuthHeaderTest extends AbstractAS2ITSupport {
@Test
public void asyncMdnHasTokenAuthHeader() throws Exception {
requestBodyAndHeaders("direct://SEND", EDI_MESSAGE,
- getAS2Headers("http://localhost:" + RECEIPT_SERVER_PORT + "/handle-receipts"));
+ getAS2Headers("http://localhost:" + receiptServerPort.getPort() + "/handle-receipts"));
MockEndpoint mockEndpoint = getMockEndpoint("mock:as2RcvRcptMsgs");
mockEndpoint.expectedMinimumMessageCount(1);
@@ -128,7 +129,7 @@ public class AS2AsyncMdnTokenAuthHeaderTest extends AbstractAS2ITSupport {
from("direct://SEND")
.to("as2://client/send?inBody=ediMessage&httpSocketTimeout=5m&httpConnectionTimeout=5m");
- from("jetty:http://localhost:" + RECEIPT_SERVER_PORT + "/handle-receipts").process(proc)
+ from("jetty:http://localhost:" + receiptServerPort.getPort() + "/handle-receipts").process(proc)
.to("mock:as2RcvRcptMsgs");
}
};
@@ -136,14 +137,14 @@ public class AS2AsyncMdnTokenAuthHeaderTest extends AbstractAS2ITSupport {
@Override
protected void customizeConfiguration(AS2Configuration configuration) {
- configuration.setTargetPortNumber(TARGET_PORT);
+ configuration.setTargetPortNumber(targetPort.getPort());
}
// AS2 server adds Authorization header to MDN returned asynchronously
- private static void receiveTestMessages() throws IOException {
+ private void receiveTestMessages() throws IOException {
serverConnection = new AS2ServerConnection(
"1.1", "AS2ClientManagerIntegrationTest Server",
- "server.example.com", TARGET_PORT, AS2SignatureAlgorithm.SHA256WITHRSA,
+ "server.example.com", targetPort.getPort(), AS2SignatureAlgorithm.SHA256WITHRSA,
null, null, null,
"TBD", null, null,
// server authorization config
diff --git a/components/camel-as2/camel-as2-component/src/test/java/org/apache/camel/component/as2/AS2BasicAuthHeaderTest.java b/components/camel-as2/camel-as2-component/src/test/java/org/apache/camel/component/as2/AS2BasicAuthHeaderTest.java
index fa75386921fc..6cff020a33b1 100644
--- a/components/camel-as2/camel-as2-component/src/test/java/org/apache/camel/component/as2/AS2BasicAuthHeaderTest.java
+++ b/components/camel-as2/camel-as2-component/src/test/java/org/apache/camel/component/as2/AS2BasicAuthHeaderTest.java
@@ -32,9 +32,8 @@ import org.apache.hc.core5.http.ClassicHttpRequest;
import org.apache.hc.core5.http.ContentType;
import org.apache.hc.core5.http.HttpEntity;
import org.apache.hc.core5.http.HttpRequest;
-import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertInstanceOf;
@@ -45,7 +44,8 @@ import static org.junit.jupiter.api.Assertions.assertNotNull;
*/
public class AS2BasicAuthHeaderTest extends AbstractAS2ITSupport {
- private static final int TARGET_PORT = AvailablePortFinder.getNextAvailable();
+ @RegisterExtension
+ AvailablePortFinder.Port targetPort = AvailablePortFinder.find();
// Basic Auth takes precedence when auth token also provided
private static final String USER_NAME = "camel";
private static final String PASSWORD = "rider";
@@ -79,16 +79,16 @@ public class AS2BasicAuthHeaderTest extends AbstractAS2ITSupport {
UNZ+1+00000000000778'
""";
- private static AS2ServerConnection serverConnection;
- private static AS2ClientManagerIT.RequestHandler requestHandler;
+ private AS2ServerConnection serverConnection;
+ private AS2ClientManagerIT.RequestHandler requestHandler;
- @BeforeAll
- public static void setupTest() throws Exception {
+ @Override
+ public void doPostSetup() throws Exception {
receiveTestMessages();
}
- @AfterAll
- public static void tearDownTest() {
+ @Override
+ public void doPostTearDown() {
if (serverConnection != null) {
serverConnection.close();
}
@@ -193,13 +193,13 @@ public class AS2BasicAuthHeaderTest extends AbstractAS2ITSupport {
@Override
protected void customizeConfiguration(AS2Configuration configuration) {
- configuration.setTargetPortNumber(TARGET_PORT);
+ configuration.setTargetPortNumber(targetPort.getPort());
}
- private static void receiveTestMessages() throws IOException {
+ private void receiveTestMessages() throws IOException {
serverConnection = new AS2ServerConnection(
"1.1", "AS2ClientManagerIntegrationTest Server",
- "server.example.com", TARGET_PORT, AS2SignatureAlgorithm.SHA256WITHRSA,
+ "server.example.com", targetPort.getPort(), AS2SignatureAlgorithm.SHA256WITHRSA,
null, null, null,
"TBD", null, null, null, null, null);
requestHandler = new AS2ClientManagerIT.RequestHandler();
diff --git a/components/camel-as2/camel-as2-component/src/test/java/org/apache/camel/component/as2/AS2ClientManagerIT.java b/components/camel-as2/camel-as2-component/src/test/java/org/apache/camel/component/as2/AS2ClientManagerIT.java
index 9bb7c3891da3..31933b764c9a 100644
--- a/components/camel-as2/camel-as2-component/src/test/java/org/apache/camel/component/as2/AS2ClientManagerIT.java
+++ b/components/camel-as2/camel-as2-component/src/test/java/org/apache/camel/component/as2/AS2ClientManagerIT.java
@@ -81,9 +81,8 @@ import org.apache.hc.core5.http.protocol.HttpCoreContext;
import org.apache.hc.core5.http.protocol.HttpDateGenerator;
import org.bouncycastle.cms.jcajce.ZlibExpanderProvider;
import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -150,15 +149,16 @@ public class AS2ClientManagerIT extends AbstractAS2ITSupport {
private static final String SIGNED_RECEIPT_MIC_ALGORITHMS = "sha1,md5";
private static final String DISPOSITION_NOTIFICATION_OPTIONS
= "signed-receipt-protocol=optional,pkcs7-signature; signed-receipt-micalg=optional,sha1";
- private static final int PARTNER_TARGET_PORT = AvailablePortFinder.getNextAvailable();
- private static final int MDN_TARGET_PORT = AvailablePortFinder.getNextAvailable();
- private static final String RECIPIENT_DELIVERY_ADDRESS = "http://localhost:" + MDN_TARGET_PORT + "/handle-receipts";
+ @RegisterExtension
+ AvailablePortFinder.Port partnerTargetPort = AvailablePortFinder.find();
+ @RegisterExtension
+ AvailablePortFinder.Port mdnTargetPort = AvailablePortFinder.find();
private static final String REPORTING_UA = "Server Responding with MDN";
- private static AS2ServerConnection serverConnection;
+ private AS2ServerConnection serverConnection;
private static KeyPair serverKP;
private static X509Certificate serverCert;
- private static RequestHandler requestHandler;
+ private RequestHandler requestHandler;
private static final HttpDateGenerator DATE_GENERATOR = HttpDateGenerator.INSTANCE;
@@ -167,7 +167,7 @@ public class AS2ClientManagerIT extends AbstractAS2ITSupport {
@Override
protected void customizeConfiguration(AS2Configuration configuration) {
- configuration.setTargetPortNumber(PARTNER_TARGET_PORT);
+ configuration.setTargetPortNumber(partnerTargetPort.getPort());
}
@Test
@@ -891,18 +891,20 @@ public class AS2ClientManagerIT extends AbstractAS2ITSupport {
// Send MDN
@SuppressWarnings("unused")
- HttpCoreContext httpContext = mdnManager.send(mdn, mdn.getMainMessageContentType(), RECIPIENT_DELIVERY_ADDRESS);
+ HttpCoreContext httpContext
+ = mdnManager.send(mdn, mdn.getMainMessageContentType(),
+ "http://localhost:" + mdnTargetPort.getPort() + "/handle-receipts");
}
- @BeforeAll
- public static void setupTest() throws Exception {
+ @Override
+ public void doPostSetup() throws Exception {
setupServerKeysAndCertificates();
setupClientKeysAndCertificates();
receiveTestMessages();
}
- @AfterAll
- public static void teardownTest() throws Exception {
+ @Override
+ public void doPostTearDown() {
if (serverConnection != null) {
serverConnection.close();
}
@@ -967,7 +969,7 @@ public class AS2ClientManagerIT extends AbstractAS2ITSupport {
AS2_NAME,
AS2_NAME);
- from("jetty:http://localhost:" + MDN_TARGET_PORT + "/handle-receipts").process(proc);
+ from("jetty:http://localhost:" + mdnTargetPort.getPort() + "/handle-receipts").process(proc);
}
};
@@ -994,10 +996,10 @@ public class AS2ClientManagerIT extends AbstractAS2ITSupport {
serverCert = Utils.makeCertificate(serverKP, signingDN, issueKP, issueDN);
}
- private static void receiveTestMessages() throws IOException {
+ private void receiveTestMessages() throws IOException {
serverConnection = new AS2ServerConnection(
AS2_VERSION, ORIGIN_SERVER_NAME,
- SERVER_FQDN, PARTNER_TARGET_PORT, AS2SignatureAlgorithm.SHA256WITHRSA,
+ SERVER_FQDN, partnerTargetPort.getPort(), AS2SignatureAlgorithm.SHA256WITHRSA,
new Certificate[] { serverCert }, serverKP.getPrivate(), null,
MDN_MESSAGE_TEMPLATE, null, null, null, null, null);
requestHandler = new RequestHandler();
diff --git a/components/camel-as2/camel-as2-component/src/test/java/org/apache/camel/component/as2/AS2ServerBasicAuthHeaderTest.java b/components/camel-as2/camel-as2-component/src/test/java/org/apache/camel/component/as2/AS2ServerBasicAuthHeaderTest.java
index 62d99d7caab6..3c414991de16 100644
--- a/components/camel-as2/camel-as2-component/src/test/java/org/apache/camel/component/as2/AS2ServerBasicAuthHeaderTest.java
+++ b/components/camel-as2/camel-as2-component/src/test/java/org/apache/camel/component/as2/AS2ServerBasicAuthHeaderTest.java
@@ -31,6 +31,7 @@ import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.http.common.HttpMessage;
import org.apache.camel.test.AvailablePortFinder;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -42,8 +43,10 @@ public class AS2ServerBasicAuthHeaderTest extends AbstractAS2ITSupport {
private static final String MDN_USER_NAME = "camel";
private static final String MDN_PASSWORD = "rider";
- private static final int TARGET_PORT = AvailablePortFinder.getNextAvailable();
- private static final int JETTY_PORT = AvailablePortFinder.getNextAvailable();
+ @RegisterExtension
+ AvailablePortFinder.Port targetPort = AvailablePortFinder.find();
+ @RegisterExtension
+ AvailablePortFinder.Port jettyPort = AvailablePortFinder.find();
private static final String EDI_MESSAGE = """
UNB+UNOA:1+005435656:1+006415160:1+060515:1434+00000000000778'
UNH+00000000000117+INVOIC:D:97B:UN'
@@ -76,7 +79,7 @@ public class AS2ServerBasicAuthHeaderTest extends AbstractAS2ITSupport {
// verify that the jetty server receives a Basic Auth header
@Test
public void serverRouteWithBasicAuthConfig() throws Exception {
- clientSend("/basic", "http://localhost:" + JETTY_PORT + "/receiptsWithBasicAuth");
+ clientSend("/basic", "http://localhost:" + jettyPort.getPort() + "/receiptsWithBasicAuth");
MockEndpoint mockEndpoint = getMockEndpoint("mock:as2RcvRcptMsgs");
mockEndpoint.expectedMinimumMessageCount(1);
@@ -100,7 +103,7 @@ public class AS2ServerBasicAuthHeaderTest extends AbstractAS2ITSupport {
MDN_USER_NAME, MDN_PASSWORD))
.to("mock:as2RcvMsgs");
- from("jetty:http://localhost:" + JETTY_PORT + "/receiptsWithBasicAuth")
+ from("jetty:http://localhost:" + jettyPort.getPort() + "/receiptsWithBasicAuth")
.process(basicHeaderProc)
.to("mock:as2RcvRcptMsgs");
}
@@ -118,12 +121,12 @@ public class AS2ServerBasicAuthHeaderTest extends AbstractAS2ITSupport {
private AS2ClientConnection getAs2ClientConnection() throws IOException {
return new AS2ClientConnection(
- "1.1", "Camel AS2 Endpoint", "example.org", "localhost", TARGET_PORT, Duration.ofSeconds(5),
+ "1.1", "Camel AS2 Endpoint", "example.org", "localhost", targetPort.getPort(), Duration.ofSeconds(5),
Duration.ofSeconds(5), 5, Duration.ofMinutes(15), null, null);
}
@Override
protected void customizeConfiguration(AS2Configuration configuration) {
- configuration.setServerPortNumber(TARGET_PORT);
+ configuration.setServerPortNumber(targetPort.getPort());
}
}
diff --git a/components/camel-as2/camel-as2-component/src/test/java/org/apache/camel/component/as2/AS2ServerBearerAuthHeaderTest.java b/components/camel-as2/camel-as2-component/src/test/java/org/apache/camel/component/as2/AS2ServerBearerAuthHeaderTest.java
index 6033e621f080..9ae4ea3a704e 100644
--- a/components/camel-as2/camel-as2-component/src/test/java/org/apache/camel/component/as2/AS2ServerBearerAuthHeaderTest.java
+++ b/components/camel-as2/camel-as2-component/src/test/java/org/apache/camel/component/as2/AS2ServerBearerAuthHeaderTest.java
@@ -30,6 +30,7 @@ import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.http.common.HttpMessage;
import org.apache.camel.test.AvailablePortFinder;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -40,8 +41,10 @@ import static org.junit.jupiter.api.Assertions.assertNotNull;
public class AS2ServerBearerAuthHeaderTest extends AbstractAS2ITSupport {
private static final String MDN_ACCESS_TOKEN = "MTQ0NjJkZmQ5OTM2NDE1ZTZjNGZmZjI3";
- private static final int TARGET_PORT = AvailablePortFinder.getNextAvailable();
- private static final int JETTY_PORT = AvailablePortFinder.getNextAvailable();
+ @RegisterExtension
+ AvailablePortFinder.Port targetPort = AvailablePortFinder.find();
+ @RegisterExtension
+ AvailablePortFinder.Port jettyPort = AvailablePortFinder.find();
private static final String EDI_MESSAGE = """
UNB+UNOA:1+005435656:1+006415160:1+060515:1434+00000000000778'
UNH+00000000000117+INVOIC:D:97B:UN'
@@ -74,7 +77,7 @@ public class AS2ServerBearerAuthHeaderTest extends AbstractAS2ITSupport {
// verify that the jetty server receives a Bearer Auth header
@Test
public void serverRouteWithBearerAuthConfig() throws Exception {
- clientSend("/bearer", "http://localhost:" + JETTY_PORT + "/receiptsWithBearerAuth");
+ clientSend("/bearer", "http://localhost:" + jettyPort.getPort() + "/receiptsWithBearerAuth");
MockEndpoint mockEndpoint = getMockEndpoint("mock:as2RcvRcptMsgs2");
mockEndpoint.expectedMinimumMessageCount(1);
@@ -97,7 +100,7 @@ public class AS2ServerBearerAuthHeaderTest extends AbstractAS2ITSupport {
MDN_ACCESS_TOKEN))
.to("mock:as2RcvMsgs");
- from("jetty:http://localhost:" + JETTY_PORT + "/receiptsWithBearerAuth")
+ from("jetty:http://localhost:" + jettyPort.getPort() + "/receiptsWithBearerAuth")
.process(tokenHeaderProc)
.to("mock:as2RcvRcptMsgs2");
}
@@ -115,12 +118,12 @@ public class AS2ServerBearerAuthHeaderTest extends AbstractAS2ITSupport {
private AS2ClientConnection getAs2ClientConnection() throws IOException {
return new AS2ClientConnection(
- "1.1", "Camel AS2 Endpoint", "example.org", "localhost", TARGET_PORT, Duration.ofSeconds(5),
+ "1.1", "Camel AS2 Endpoint", "example.org", "localhost", targetPort.getPort(), Duration.ofSeconds(5),
Duration.ofSeconds(5), 5, Duration.ofMinutes(15), null, null);
}
@Override
protected void customizeConfiguration(AS2Configuration configuration) {
- configuration.setServerPortNumber(TARGET_PORT);
+ configuration.setServerPortNumber(targetPort.getPort());
}
}
diff --git a/components/camel-as2/camel-as2-component/src/test/java/org/apache/camel/component/as2/AS2ServerManagerEncryptedIT.java b/components/camel-as2/camel-as2-component/src/test/java/org/apache/camel/component/as2/AS2ServerManagerEncryptedIT.java
index 9a06e650ce9b..09e415d54007 100644
--- a/components/camel-as2/camel-as2-component/src/test/java/org/apache/camel/component/as2/AS2ServerManagerEncryptedIT.java
+++ b/components/camel-as2/camel-as2-component/src/test/java/org/apache/camel/component/as2/AS2ServerManagerEncryptedIT.java
@@ -60,7 +60,7 @@ public class AS2ServerManagerEncryptedIT extends AS2ServerManagerITBase {
public void receiveEnvelopedMessageTest() throws Exception {
AS2ClientConnection clientConnection
= new AS2ClientConnection(
- AS2_VERSION, USER_AGENT, CLIENT_FQDN, TARGET_HOST, TARGET_PORT, HTTP_SOCKET_TIMEOUT,
+ AS2_VERSION, USER_AGENT, CLIENT_FQDN, TARGET_HOST, targetPort.getPort(), HTTP_SOCKET_TIMEOUT,
HTTP_CONNECTION_TIMEOUT, HTTP_CONNECTION_POOL_SIZE, HTTP_CONNECTION_POOL_TTL, clientSslContext,
null);
AS2ClientManager clientManager = new AS2ClientManager(clientConnection);
@@ -96,7 +96,7 @@ public class AS2ServerManagerEncryptedIT extends AS2ServerManagerITBase {
assertEquals(AS2_NAME, request.getFirstHeader(AS2Header.AS2_TO).getValue(), "Unexpected AS2 to value");
assertTrue(request.getFirstHeader(AS2Header.MESSAGE_ID).getValue().endsWith(CLIENT_FQDN + ">"),
"Unexpected message id value");
- assertEquals(TARGET_HOST + ":" + TARGET_PORT, request.getFirstHeader(AS2Header.TARGET_HOST).getValue(),
+ assertEquals(TARGET_HOST + ":" + targetPort.getPort(), request.getFirstHeader(AS2Header.TARGET_HOST).getValue(),
"Unexpected target host value");
assertEquals(USER_AGENT, request.getFirstHeader(AS2Header.USER_AGENT).getValue(), "Unexpected user agent value");
assertNotNull(request.getFirstHeader(AS2Header.DATE), "Date value missing");
@@ -133,7 +133,7 @@ public class AS2ServerManagerEncryptedIT extends AS2ServerManagerITBase {
public void receiveEnvelopedCompressedAndSignedMessageTest() throws Exception {
AS2ClientConnection clientConnection
= new AS2ClientConnection(
- AS2_VERSION, USER_AGENT, CLIENT_FQDN, TARGET_HOST, TARGET_PORT, HTTP_SOCKET_TIMEOUT,
+ AS2_VERSION, USER_AGENT, CLIENT_FQDN, TARGET_HOST, targetPort.getPort(), HTTP_SOCKET_TIMEOUT,
HTTP_CONNECTION_TIMEOUT, HTTP_CONNECTION_POOL_SIZE, HTTP_CONNECTION_POOL_TTL, clientSslContext,
null);
AS2ClientManager clientManager = new AS2ClientManager(clientConnection);
diff --git a/components/camel-as2/camel-as2-component/src/test/java/org/apache/camel/component/as2/AS2ServerManagerIT.java b/components/camel-as2/camel-as2-component/src/test/java/org/apache/camel/component/as2/AS2ServerManagerIT.java
index 0cd5981efc9b..0460a8de85f3 100644
--- a/components/camel-as2/camel-as2-component/src/test/java/org/apache/camel/component/as2/AS2ServerManagerIT.java
+++ b/components/camel-as2/camel-as2-component/src/test/java/org/apache/camel/component/as2/AS2ServerManagerIT.java
@@ -127,7 +127,7 @@ public class AS2ServerManagerIT extends AS2ServerManagerITBase {
assertEquals(AS2_NAME, request.getFirstHeader(AS2Header.AS2_TO).getValue(), "Unexpected AS2 to value");
assertTrue(request.getFirstHeader(AS2Header.MESSAGE_ID).getValue().endsWith(CLIENT_FQDN + ">"),
"Unexpected message id value");
- assertEquals(TARGET_HOST + ":" + TARGET_PORT, request.getFirstHeader(AS2Header.TARGET_HOST).getValue(),
+ assertEquals(TARGET_HOST + ":" + targetPort.getPort(), request.getFirstHeader(AS2Header.TARGET_HOST).getValue(),
"Unexpected target host value");
assertEquals(USER_AGENT, request.getFirstHeader(AS2Header.USER_AGENT).getValue(), "Unexpected user agent value");
assertNotNull(request.getFirstHeader(AS2Header.DATE), "Date value missing");
@@ -204,7 +204,7 @@ public class AS2ServerManagerIT extends AS2ServerManagerITBase {
assertEquals(AS2_NAME, request.getFirstHeader(AS2Header.AS2_TO).getValue(), "Unexpected AS2 to value");
assertTrue(request.getFirstHeader(AS2Header.MESSAGE_ID).getValue().endsWith(CLIENT_FQDN + ">"),
"Unexpected message id value");
- assertEquals(TARGET_HOST + ":" + TARGET_PORT, request.getFirstHeader(AS2Header.TARGET_HOST).getValue(),
+ assertEquals(TARGET_HOST + ":" + targetPort.getPort(), request.getFirstHeader(AS2Header.TARGET_HOST).getValue(),
"Unexpected target host value");
assertEquals(USER_AGENT, request.getFirstHeader(AS2Header.USER_AGENT).getValue(), "Unexpected user agent value");
assertNotNull(request.getFirstHeader(AS2Header.DATE), "Date value missing");
@@ -242,7 +242,7 @@ public class AS2ServerManagerIT extends AS2ServerManagerITBase {
private static AS2ClientConnection getAs2ClientConnection() throws IOException {
AS2ClientConnection clientConnection
= new AS2ClientConnection(
- AS2_VERSION, USER_AGENT, CLIENT_FQDN, TARGET_HOST, TARGET_PORT, HTTP_SOCKET_TIMEOUT,
+ AS2_VERSION, USER_AGENT, CLIENT_FQDN, TARGET_HOST, targetPort.getPort(), HTTP_SOCKET_TIMEOUT,
HTTP_CONNECTION_TIMEOUT, HTTP_CONNECTION_POOL_SIZE, HTTP_CONNECTION_POOL_TTL, clientSslContext,
null);
return clientConnection;
@@ -303,7 +303,7 @@ public class AS2ServerManagerIT extends AS2ServerManagerITBase {
assertEquals(AS2_NAME, request.getFirstHeader(AS2Header.AS2_TO).getValue(), "Unexpected AS2 to value");
assertTrue(request.getFirstHeader(AS2Header.MESSAGE_ID).getValue().endsWith(CLIENT_FQDN + ">"),
"Unexpected message id value");
- assertEquals(TARGET_HOST + ":" + TARGET_PORT, request.getFirstHeader(AS2Header.TARGET_HOST).getValue(),
+ assertEquals(TARGET_HOST + ":" + targetPort.getPort(), request.getFirstHeader(AS2Header.TARGET_HOST).getValue(),
"Unexpected target host value");
assertEquals(USER_AGENT, request.getFirstHeader(AS2Header.USER_AGENT).getValue(), "Unexpected user agent value");
assertNotNull(request.getFirstHeader(AS2Header.DATE), "Date value missing");
@@ -382,7 +382,7 @@ public class AS2ServerManagerIT extends AS2ServerManagerITBase {
assertEquals(AS2_NAME, request.getFirstHeader(AS2Header.AS2_TO).getValue(), "Unexpected AS2 to value");
assertTrue(request.getFirstHeader(AS2Header.MESSAGE_ID).getValue().endsWith(CLIENT_FQDN + ">"),
"Unexpected message id value");
- assertEquals(TARGET_HOST + ":" + TARGET_PORT, request.getFirstHeader(AS2Header.TARGET_HOST).getValue(),
+ assertEquals(TARGET_HOST + ":" + targetPort.getPort(), request.getFirstHeader(AS2Header.TARGET_HOST).getValue(),
"Unexpected target host value");
assertEquals(USER_AGENT, request.getFirstHeader(AS2Header.USER_AGENT).getValue(), "Unexpected user agent value");
assertNotNull(request.getFirstHeader(AS2Header.DATE), "Date value missing");
@@ -473,7 +473,7 @@ public class AS2ServerManagerIT extends AS2ServerManagerITBase {
assertEquals(AS2_NAME, request.getFirstHeader(AS2Header.AS2_TO).getValue(), "Unexpected AS2 to value");
assertTrue(request.getFirstHeader(AS2Header.MESSAGE_ID).getValue().endsWith(CLIENT_FQDN + ">"),
"Unexpected message id value");
- assertEquals(TARGET_HOST + ":" + TARGET_PORT, request.getFirstHeader(AS2Header.TARGET_HOST).getValue(),
+ assertEquals(TARGET_HOST + ":" + targetPort.getPort(), request.getFirstHeader(AS2Header.TARGET_HOST).getValue(),
"Unexpected target host value");
assertEquals(USER_AGENT, request.getFirstHeader(AS2Header.USER_AGENT).getValue(), "Unexpected user agent value");
assertNotNull(request.getFirstHeader(AS2Header.DATE), "Date value missing");
diff --git a/components/camel-as2/camel-as2-component/src/test/java/org/apache/camel/component/as2/AS2ServerManagerITBase.java b/components/camel-as2/camel-as2-component/src/test/java/org/apache/camel/component/as2/AS2ServerManagerITBase.java
index 0a25a56f6b94..624f6f5d0980 100644
--- a/components/camel-as2/camel-as2-component/src/test/java/org/apache/camel/component/as2/AS2ServerManagerITBase.java
+++ b/components/camel-as2/camel-as2-component/src/test/java/org/apache/camel/component/as2/AS2ServerManagerITBase.java
@@ -68,6 +68,7 @@ import org.bouncycastle.cert.jcajce.JcaCertStore;
import org.bouncycastle.cms.jcajce.ZlibExpanderProvider;
import org.bouncycastle.jce.provider.BouncyCastleProvider;
import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.extension.RegisterExtension;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
@@ -83,7 +84,8 @@ public class AS2ServerManagerITBase extends AbstractAS2ITSupport {
protected static final String METHOD = "POST";
protected static final String TARGET_HOST = "localhost";
- protected static final int TARGET_PORT = AvailablePortFinder.getNextAvailable();
+ @RegisterExtension
+ protected AvailablePortFinder.Port targetPort = AvailablePortFinder.find();
protected static final Duration HTTP_SOCKET_TIMEOUT = Duration.ofSeconds(5);
protected static final Duration HTTP_CONNECTION_TIMEOUT = Duration.ofSeconds(5);
protected static final Integer HTTP_CONNECTION_POOL_SIZE = 5;
@@ -142,7 +144,7 @@ public class AS2ServerManagerITBase extends AbstractAS2ITSupport {
@Override
protected void customizeConfiguration(AS2Configuration configuration) {
- configuration.setServerPortNumber(TARGET_PORT);
+ configuration.setServerPortNumber(targetPort.getPort());
}
@Override
@@ -289,7 +291,7 @@ public class AS2ServerManagerITBase extends AbstractAS2ITSupport {
assertEquals(AS2_NAME, request.getFirstHeader(AS2Header.AS2_TO).getValue(), "Unexpected AS2 to value");
assertTrue(request.getFirstHeader(AS2Header.MESSAGE_ID).getValue().endsWith(CLIENT_FQDN + ">"),
"Unexpected message id value");
- assertEquals(TARGET_HOST + ":" + TARGET_PORT, request.getFirstHeader(AS2Header.TARGET_HOST).getValue(),
+ assertEquals(TARGET_HOST + ":" + targetPort.getPort(), request.getFirstHeader(AS2Header.TARGET_HOST).getValue(),
"Unexpected target host value");
assertEquals(USER_AGENT, request.getFirstHeader(AS2Header.USER_AGENT).getValue(), "Unexpected user agent value");
assertNotNull(request.getFirstHeader(AS2Header.DATE), "Date value missing");
diff --git a/components/camel-as2/camel-as2-component/src/test/java/org/apache/camel/component/as2/AS2ServerSecTestBase.java b/components/camel-as2/camel-as2-component/src/test/java/org/apache/camel/component/as2/AS2ServerSecTestBase.java
index 7d7d9dc6ba66..e3acd5d538eb 100644
--- a/components/camel-as2/camel-as2-component/src/test/java/org/apache/camel/component/as2/AS2ServerSecTestBase.java
+++ b/components/camel-as2/camel-as2-component/src/test/java/org/apache/camel/component/as2/AS2ServerSecTestBase.java
@@ -49,6 +49,7 @@ import org.apache.hc.core5.http.HttpResponse;
import org.apache.hc.core5.http.protocol.HttpCoreContext;
import org.bouncycastle.jce.provider.BouncyCastleProvider;
import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.extension.RegisterExtension;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -58,7 +59,8 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
public class AS2ServerSecTestBase extends AbstractAS2ITSupport {
protected static final String TARGET_HOST = "localhost";
- protected static final int TARGET_PORT = AvailablePortFinder.getNextAvailable();
+ @RegisterExtension
+ protected AvailablePortFinder.Port targetPort = AvailablePortFinder.find();
protected static final Duration HTTP_SOCKET_TIMEOUT = Duration.ofSeconds(5);
protected static final Duration HTTP_CONNECTION_TIMEOUT = Duration.ofSeconds(5);
protected static final Integer HTTP_CONNECTION_POOL_SIZE = 5;
@@ -112,7 +114,7 @@ public class AS2ServerSecTestBase extends AbstractAS2ITSupport {
@Override
protected void customizeConfiguration(AS2Configuration configuration) {
- configuration.setServerPortNumber(TARGET_PORT);
+ configuration.setServerPortNumber(targetPort.getPort());
}
@Override
@@ -231,7 +233,7 @@ public class AS2ServerSecTestBase extends AbstractAS2ITSupport {
protected AS2ClientManager clientConnection() throws IOException {
AS2ClientConnection clientConnection
= new AS2ClientConnection(
- AS2_VERSION, USER_AGENT, CLIENT_FQDN, TARGET_HOST, TARGET_PORT, HTTP_SOCKET_TIMEOUT,
+ AS2_VERSION, USER_AGENT, CLIENT_FQDN, TARGET_HOST, targetPort.getPort(), HTTP_SOCKET_TIMEOUT,
HTTP_CONNECTION_TIMEOUT, HTTP_CONNECTION_POOL_SIZE, HTTP_CONNECTION_POOL_TTL, null,
null);
return new AS2ClientManager(clientConnection);
diff --git a/components/camel-as2/camel-as2-component/src/test/java/org/apache/camel/component/as2/AS2TokenAuthHeaderTest.java b/components/camel-as2/camel-as2-component/src/test/java/org/apache/camel/component/as2/AS2TokenAuthHeaderTest.java
index f3e606eec44f..2edfe840fc65 100644
--- a/components/camel-as2/camel-as2-component/src/test/java/org/apache/camel/component/as2/AS2TokenAuthHeaderTest.java
+++ b/components/camel-as2/camel-as2-component/src/test/java/org/apache/camel/component/as2/AS2TokenAuthHeaderTest.java
@@ -27,9 +27,8 @@ import org.apache.camel.component.as2.api.AS2ServerConnection;
import org.apache.camel.component.as2.api.AS2SignatureAlgorithm;
import org.apache.camel.test.AvailablePortFinder;
import org.apache.hc.core5.http.HttpRequest;
-import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -39,7 +38,8 @@ import static org.junit.jupiter.api.Assertions.assertNotNull;
*/
public class AS2TokenAuthHeaderTest extends AbstractAS2ITSupport {
- private static final int TARGET_PORT = AvailablePortFinder.getNextAvailable();
+ @RegisterExtension
+ AvailablePortFinder.Port targetPort = AvailablePortFinder.find();
private static final String ACCESS_TOKEN = "MTQ0NjJkZmQ5OTM2NDE1ZTZjNGZmZjI3";
private static final String EDI_MESSAGE = """
UNB+UNOA:1+005435656:1+006415160:1+060515:1434+00000000000778'
@@ -70,16 +70,16 @@ public class AS2TokenAuthHeaderTest extends AbstractAS2ITSupport {
UNZ+1+00000000000778'
""";
- private static AS2ServerConnection serverConnection;
- private static AS2ClientManagerIT.RequestHandler requestHandler;
+ private AS2ServerConnection serverConnection;
+ private AS2ClientManagerIT.RequestHandler requestHandler;
- @BeforeAll
- public static void setupTest() throws Exception {
+ @Override
+ public void doPostSetup() throws Exception {
receiveTestMessages();
}
- @AfterAll
- public static void tearDownTest() {
+ @Override
+ public void doPostTearDown() {
if (serverConnection != null) {
serverConnection.close();
}
@@ -139,13 +139,13 @@ public class AS2TokenAuthHeaderTest extends AbstractAS2ITSupport {
@Override
protected void customizeConfiguration(AS2Configuration configuration) {
- configuration.setTargetPortNumber(TARGET_PORT);
+ configuration.setTargetPortNumber(targetPort.getPort());
}
- private static void receiveTestMessages() throws IOException {
+ private void receiveTestMessages() throws IOException {
serverConnection = new AS2ServerConnection(
"1.1", "AS2ClientManagerIntegrationTest Server",
- "server.example.com", TARGET_PORT, AS2SignatureAlgorithm.SHA256WITHRSA,
+ "server.example.com", targetPort.getPort(), AS2SignatureAlgorithm.SHA256WITHRSA,
null, null, null,
"TBD", null, null, null, null, null);
requestHandler = new AS2ClientManagerIT.RequestHandler();
diff --git a/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/CometdProducerConsumerAuthenticatedTest.java b/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/CometdProducerConsumerAuthenticatedTest.java
index 741fc5b70c7a..a652ca09534c 100644
--- a/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/CometdProducerConsumerAuthenticatedTest.java
+++ b/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/CometdProducerConsumerAuthenticatedTest.java
@@ -34,13 +34,15 @@ import org.cometd.client.http.jetty.JettyHttpClientTransport;
import org.cometd.server.DefaultSecurityPolicy;
import org.eclipse.jetty.client.HttpClient;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;
public class CometdProducerConsumerAuthenticatedTest extends CamelTestSupport {
- private int port;
+ @RegisterExtension
+ AvailablePortFinder.Port port = AvailablePortFinder.find();
private String uri;
@Test
@@ -90,7 +92,7 @@ public class CometdProducerConsumerAuthenticatedTest extends CamelTestSupport {
}
private BayeuxClient createRemoteClient(HttpClient httpClient, String user, String credentials) {
- String url = "http://127.0.0.1:" + port + "/cometd";
+ String url = "http://127.0.0.1:" + port.getPort() + "/cometd";
BayeuxClient client = new BayeuxClient(url, new JettyHttpClientTransport(null, httpClient));
client.addExtension(new ClientSession.Extension() {
@Override
@@ -110,8 +112,7 @@ public class CometdProducerConsumerAuthenticatedTest extends CamelTestSupport {
@Override
public void setupResources() {
- port = AvailablePortFinder.getNextAvailable();
- uri = "cometd://127.0.0.1:" + port + "/service/test?baseResource=file:./target/test-classes/webapp&"
+ uri = "cometd://127.0.0.1:" + port.getPort() + "/service/test?baseResource=file:./target/test-classes/webapp&"
+ "timeout=240000&interval=0&maxInterval=30000&multiFrameInterval=1500&jsonCommented=true&logLevel=2";
}
diff --git a/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/CometdProducerConsumerExtensionTest.java b/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/CometdProducerConsumerExtensionTest.java
index dae16aab5d14..416eb4b24327 100644
--- a/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/CometdProducerConsumerExtensionTest.java
+++ b/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/CometdProducerConsumerExtensionTest.java
@@ -37,16 +37,18 @@ import org.cometd.client.http.jetty.JettyHttpClientTransport;
import org.eclipse.jetty.client.HttpClient;
import org.eclipse.jetty.util.ssl.SslContextFactory;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
public class CometdProducerConsumerExtensionTest extends CamelTestSupport {
- private int port;
+ @RegisterExtension
+ AvailablePortFinder.Port port = AvailablePortFinder.find();
+ @RegisterExtension
+ AvailablePortFinder.Port portSSL = AvailablePortFinder.find();
private String uri;
-
- private int portSSL;
private String uriSSL;
private String pwd = "changeit";
@@ -60,7 +62,7 @@ public class CometdProducerConsumerExtensionTest extends CamelTestSupport {
httpClient.start();
try {
BayeuxClient client = new BayeuxClient(
- "http://127.0.0.1:" + port + "/cometd", new JettyHttpClientTransport(null, httpClient));
+ "http://127.0.0.1:" + port.getPort() + "/cometd", new JettyHttpClientTransport(null, httpClient));
client.handshake();
assertTrue(client.waitFor(5000, BayeuxClient.State.CONNECTED));
@@ -105,7 +107,7 @@ public class CometdProducerConsumerExtensionTest extends CamelTestSupport {
httpClient.start();
try {
BayeuxClient client = new BayeuxClient(
- "https://localhost:" + portSSL + "/cometd", new JettyHttpClientTransport(null, httpClient));
+ "https://localhost:" + portSSL.getPort() + "/cometd", new JettyHttpClientTransport(null, httpClient));
client.handshake();
assertTrue(client.waitFor(5000, BayeuxClient.State.CONNECTED));
@@ -135,12 +137,10 @@ public class CometdProducerConsumerExtensionTest extends CamelTestSupport {
@Override
public void setupResources() {
- port = AvailablePortFinder.getNextAvailable();
- uri = "cometd://127.0.0.1:" + port + "/channel/test?baseResource=file:./target/test-classes/webapp&"
+ uri = "cometd://127.0.0.1:" + port.getPort() + "/channel/test?baseResource=file:./target/test-classes/webapp&"
+ "timeout=240000&interval=0&maxInterval=30000&multiFrameInterval=1500&jsonCommented=true&logLevel=2";
- portSSL = AvailablePortFinder.getNextAvailable();
- uriSSL = "cometds://127.0.0.1:" + portSSL + "/channel/test?baseResource=file:./target/test-classes/webapp&"
+ uriSSL = "cometds://127.0.0.1:" + portSSL.getPort() + "/channel/test?baseResource=file:./target/test-classes/webapp&"
+ "timeout=240000&interval=0&maxInterval=30000&multiFrameInterval=1500&jsonCommented=true&logLevel=2";
}
diff --git a/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/CometdProducerConsumerInOutTest.java b/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/CometdProducerConsumerInOutTest.java
index eacad4dbd6cf..017d74fc6525 100644
--- a/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/CometdProducerConsumerInOutTest.java
+++ b/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/CometdProducerConsumerInOutTest.java
@@ -32,16 +32,18 @@ import org.cometd.client.http.jetty.JettyHttpClientTransport;
import org.eclipse.jetty.client.HttpClient;
import org.eclipse.jetty.util.ssl.SslContextFactory;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
public class CometdProducerConsumerInOutTest extends CamelTestSupport {
- private int port;
+ @RegisterExtension
+ AvailablePortFinder.Port port = AvailablePortFinder.find();
+ @RegisterExtension
+ AvailablePortFinder.Port portSSL = AvailablePortFinder.find();
private String uri;
-
- private int portSSL;
private String uriSSL;
private String pwd = "changeit";
@@ -54,7 +56,7 @@ public class CometdProducerConsumerInOutTest extends CamelTestSupport {
HttpClient httpClient = new HttpClient();
httpClient.start();
try {
- String bayeuxUrl = "http://127.0.0.1:" + port + "/cometd";
+ String bayeuxUrl = "http://127.0.0.1:" + port.getPort() + "/cometd";
BayeuxClient client = new BayeuxClient(bayeuxUrl, new JettyHttpClientTransport(null, httpClient));
client.handshake();
assertTrue(client.waitFor(5000, BayeuxClient.State.CONNECTED));
@@ -91,7 +93,7 @@ public class CometdProducerConsumerInOutTest extends CamelTestSupport {
httpClient.start();
try {
// Use localhost to match the CN in localhost.p12 and endpoint is still /cometd as this is the only path added to servlet
- String bayeuxUrl = "https://localhost:" + portSSL + "/cometd";
+ String bayeuxUrl = "https://localhost:" + portSSL.getPort() + "/cometd";
BayeuxClient client = new BayeuxClient(bayeuxUrl, new JettyHttpClientTransport(null, httpClient));
client.handshake();
assertTrue(client.waitFor(5000, BayeuxClient.State.CONNECTED));
@@ -115,13 +117,11 @@ public class CometdProducerConsumerInOutTest extends CamelTestSupport {
@Override
public void setupResources() {
- port = AvailablePortFinder.getNextAvailable();
- uri = "cometd://127.0.0.1:" + port + "/service/test?baseResource=file:./target/test-classes/webapp&"
+ uri = "cometd://127.0.0.1:" + port.getPort() + "/service/test?baseResource=file:./target/test-classes/webapp&"
+ "timeout=240000&interval=0&maxInterval=30000&multiFrameInterval=1500&jsonCommented=true&logLevel=2";
- portSSL = AvailablePortFinder.getNextAvailable();
//cometds protocal to start getSslSocketConnector
- uriSSL = "cometds://127.0.0.1:" + portSSL + "/service/test?baseResource=file:./target/test-classes/webapp&"
+ uriSSL = "cometds://127.0.0.1:" + portSSL.getPort() + "/service/test?baseResource=file:./target/test-classes/webapp&"
+ "timeout=240000&interval=0&maxInterval=30000&multiFrameInterval=1500&jsonCommented=true&logLevel=2";
}
diff --git a/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/CometdProducerConsumerInteractiveTest.java b/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/CometdProducerConsumerInteractiveTest.java
index ce3cab6da861..9fd63f96d266 100644
--- a/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/CometdProducerConsumerInteractiveTest.java
+++ b/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/CometdProducerConsumerInteractiveTest.java
@@ -23,13 +23,15 @@ import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.AvailablePortFinder;
import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
public class CometdProducerConsumerInteractiveTest extends CamelTestSupport {
- private int port;
+ @RegisterExtension
+ AvailablePortFinder.Port port = AvailablePortFinder.find();
+ @RegisterExtension
+ AvailablePortFinder.Port portSSL = AvailablePortFinder.find();
private String uri;
-
- private int portSSL;
private String uriSSL;
private final String pwd = "changeit";
@@ -44,12 +46,10 @@ public class CometdProducerConsumerInteractiveTest extends CamelTestSupport {
@Override
public void setupResources() {
- port = AvailablePortFinder.getNextAvailable();
- uri = "cometd://127.0.0.1:" + port + "/channel/test?baseResource=file:./src/test/resources/webapp&"
+ uri = "cometd://127.0.0.1:" + port.getPort() + "/channel/test?baseResource=file:./src/test/resources/webapp&"
+ "timeout=240000&interval=0&maxInterval=30000&multiFrameInterval=1500&jsonCommented=true&logLevel=2";
- portSSL = AvailablePortFinder.getNextAvailable();
- uriSSL = "cometds://127.0.0.1:" + portSSL + "/channel/test?baseResource=file:./src/test/resources/webapp&"
+ uriSSL = "cometds://127.0.0.1:" + portSSL.getPort() + "/channel/test?baseResource=file:./src/test/resources/webapp&"
+ "timeout=240000&interval=0&maxInterval=30000&multiFrameInterval=1500&jsonCommented=true&logLevel=2";
}
diff --git a/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/CometdProducerConsumerTest.java b/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/CometdProducerConsumerTest.java
index a746a792c8d3..0bb4aa11445a 100644
--- a/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/CometdProducerConsumerTest.java
+++ b/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/CometdProducerConsumerTest.java
@@ -31,6 +31,7 @@ import org.cometd.bayeux.server.ServerChannel;
import org.cometd.bayeux.server.ServerMessage;
import org.cometd.bayeux.server.ServerSession;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -42,7 +43,8 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
public class CometdProducerConsumerTest extends CamelTestSupport {
private static final String SHOOKHANDS_SESSION_HEADER = "Shookhands";
- private int port;
+ @RegisterExtension
+ AvailablePortFinder.Port portField = AvailablePortFinder.find();
private String uri;
@Test
@@ -90,7 +92,7 @@ public class CometdProducerConsumerTest extends CamelTestSupport {
// act
Endpoint result = component
.createEndpoint("cometd://127.0.0.1:"
- + port
+ + portField.getPort()
+ "/service/testArgs?baseResource=file:./target/test-classes/webapp&"
+ "timeout=240000&interval=0&maxInterval=30000&multiFrameInterval=1500&jsonCommented=true&sessionHeadersEnabled=true&logLevel=2");
@@ -117,8 +119,7 @@ public class CometdProducerConsumerTest extends CamelTestSupport {
@Override
public void doPreSetup() {
- port = AvailablePortFinder.getNextAvailable();
- uri = "cometd://127.0.0.1:" + port + "/service/test?baseResource=file:./target/test-classes/webapp&"
+ uri = "cometd://127.0.0.1:" + portField.getPort() + "/service/test?baseResource=file:./target/test-classes/webapp&"
+ "timeout=240000&interval=0&maxInterval=30000&multiFrameInterval=1500&jsonCommented=true&sessionHeadersEnabled=true&logLevel=2";
}
diff --git a/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/MultipCometdProducerConsumerTest.java b/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/MultipCometdProducerConsumerTest.java
index 64b9458c3339..aad20e04d7f5 100644
--- a/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/MultipCometdProducerConsumerTest.java
+++ b/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/MultipCometdProducerConsumerTest.java
@@ -21,15 +21,18 @@ import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.AvailablePortFinder;
import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
/**
* Unit testing for using a CometdProducer and a CometdConsumer
*/
public class MultipCometdProducerConsumerTest extends CamelTestSupport {
- private int port1;
+ @RegisterExtension
+ AvailablePortFinder.Port port1 = AvailablePortFinder.find();
+ @RegisterExtension
+ AvailablePortFinder.Port port2 = AvailablePortFinder.find();
private String uri1;
- private int port2;
private String uri2;
@Test
@@ -48,12 +51,10 @@ public class MultipCometdProducerConsumerTest extends CamelTestSupport {
@Override
public void doPreSetup() {
- port1 = AvailablePortFinder.getNextAvailable();
- port2 = AvailablePortFinder.getNextAvailable();
- uri1 = "cometd://127.0.0.1:" + port1 + "/service/test?baseResource=file:./target/test-classes/webapp&"
+ uri1 = "cometd://127.0.0.1:" + port1.getPort() + "/service/test?baseResource=file:./target/test-classes/webapp&"
+ "timeout=240000&interval=0&maxInterval=30000&multiFrameInterval=1500&jsonCommented=true&logLevel=2";
- uri2 = "cometd://127.0.0.1:" + port2 + "/service/test?baseResource=file:./target/test-classes/webapp&"
+ uri2 = "cometd://127.0.0.1:" + port2.getPort() + "/service/test?baseResource=file:./target/test-classes/webapp&"
+ "timeout=240000&interval=0&maxInterval=30000&multiFrameInterval=1500&jsonCommented=true&logLevel=2";
}
diff --git a/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/SslCometdProducerConsumerTest.java b/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/SslCometdProducerConsumerTest.java
index a3e02aa5442c..fc61172d1ef1 100644
--- a/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/SslCometdProducerConsumerTest.java
+++ b/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/SslCometdProducerConsumerTest.java
@@ -25,6 +25,7 @@ import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.AvailablePortFinder;
import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -33,7 +34,8 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
*/
public class SslCometdProducerConsumerTest extends CamelTestSupport {
- private int port;
+ @RegisterExtension
+ AvailablePortFinder.Port port = AvailablePortFinder.find();
private String uri;
private String pwd = "changeit";
@@ -52,8 +54,7 @@ public class SslCometdProducerConsumerTest extends CamelTestSupport {
@Override
public void doPreSetup() {
- port = AvailablePortFinder.getNextAvailable();
- uri = "cometds://127.0.0.1:" + port + "/service/test?baseResource=file:./target/test-classes/webapp&"
+ uri = "cometds://127.0.0.1:" + port.getPort() + "/service/test?baseResource=file:./target/test-classes/webapp&"
+ "timeout=240000&interval=0&maxInterval=30000&multiFrameInterval=1500&jsonCommented=true&logLevel=2";
}
diff --git a/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/SslContextParametersCometdProducerConsumerTest.java b/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/SslContextParametersCometdProducerConsumerTest.java
index 524fea203cf2..93fbe86ae1cc 100644
--- a/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/SslContextParametersCometdProducerConsumerTest.java
+++ b/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/SslContextParametersCometdProducerConsumerTest.java
@@ -28,6 +28,7 @@ import org.apache.camel.support.jsse.TrustManagersParameters;
import org.apache.camel.test.AvailablePortFinder;
import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -36,7 +37,8 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
*/
public class SslContextParametersCometdProducerConsumerTest extends CamelTestSupport {
- private int port;
+ @RegisterExtension
+ AvailablePortFinder.Port port = AvailablePortFinder.find();
private String uri;
@Test
@@ -54,8 +56,7 @@ public class SslContextParametersCometdProducerConsumerTest extends CamelTestSup
@Override
public void doPreSetup() {
- port = AvailablePortFinder.getNextAvailable();
- uri = "cometds://127.0.0.1:" + port + "/service/test?baseResource=file:./target/test-classes/webapp&"
+ uri = "cometds://127.0.0.1:" + port.getPort() + "/service/test?baseResource=file:./target/test-classes/webapp&"
+ "timeout=240000&interval=0&maxInterval=30000&multiFrameInterval=1500&jsonCommented=true&logLevel=2";
}
diff --git a/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/SslContextParametersInUriCometdProducerConsumerTest.java b/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/SslContextParametersInUriCometdProducerConsumerTest.java
index 3aebac0889a4..45fb7d3bf987 100644
--- a/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/SslContextParametersInUriCometdProducerConsumerTest.java
+++ b/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/SslContextParametersInUriCometdProducerConsumerTest.java
@@ -29,6 +29,7 @@ import org.apache.camel.support.jsse.TrustManagersParameters;
import org.apache.camel.test.AvailablePortFinder;
import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -37,7 +38,8 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
*/
public class SslContextParametersInUriCometdProducerConsumerTest extends CamelTestSupport {
- private int port;
+ @RegisterExtension
+ AvailablePortFinder.Port port = AvailablePortFinder.find();
private String uri;
@BindToRegistry("sslContextParameters")
@@ -75,8 +77,7 @@ public class SslContextParametersInUriCometdProducerConsumerTest extends CamelTe
@Override
public void doPreSetup() {
- port = AvailablePortFinder.getNextAvailable();
- uri = "cometds://127.0.0.1:" + port + "/service/test?baseResource=file:./target/test-classes/webapp&"
+ uri = "cometds://127.0.0.1:" + port.getPort() + "/service/test?baseResource=file:./target/test-classes/webapp&"
+ "timeout=240000&interval=0&maxInterval=30000&multiFrameInterval=1500&jsonCommented=true&logLevel=2";
}
diff --git a/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/SslGlobalContextParametersCometdProducerConsumerTest.java b/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/SslGlobalContextParametersCometdProducerConsumerTest.java
index 958aedbc31ca..9031abe75567 100644
--- a/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/SslGlobalContextParametersCometdProducerConsumerTest.java
+++ b/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/SslGlobalContextParametersCometdProducerConsumerTest.java
@@ -30,6 +30,7 @@ import org.apache.camel.support.jsse.TrustManagersParameters;
import org.apache.camel.test.AvailablePortFinder;
import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -38,7 +39,8 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
*/
public class SslGlobalContextParametersCometdProducerConsumerTest extends CamelTestSupport {
- private int port;
+ @RegisterExtension
+ AvailablePortFinder.Port port = AvailablePortFinder.find();
private String uri;
@Test
@@ -56,8 +58,7 @@ public class SslGlobalContextParametersCometdProducerConsumerTest extends CamelT
@Override
public void doPreSetup() {
- port = AvailablePortFinder.getNextAvailable();
- uri = "cometds://127.0.0.1:" + port + "/service/test?baseResource=file:./target/test-classes/webapp&"
+ uri = "cometds://127.0.0.1:" + port.getPort() + "/service/test?baseResource=file:./target/test-classes/webapp&"
+ "timeout=240000&interval=0&maxInterval=30000&multiFrameInterval=1500&jsonCommented=true&logLevel=2";
}
diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyBridgeHostHeaderIssueTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyBridgeHostHeaderIssueTest.java
index 958552c9e71f..226e8f32f966 100644
--- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyBridgeHostHeaderIssueTest.java
+++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyBridgeHostHeaderIssueTest.java
@@ -21,17 +21,23 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.test.AvailablePortFinder;
import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
public class JettyBridgeHostHeaderIssueTest extends CamelTestSupport {
- private int port;
- private int port2;
- private int port3;
- private int port4;
- private int port5;
+ @RegisterExtension
+ AvailablePortFinder.Port port = AvailablePortFinder.find();
+ @RegisterExtension
+ AvailablePortFinder.Port port2 = AvailablePortFinder.find();
+ @RegisterExtension
+ AvailablePortFinder.Port port3 = AvailablePortFinder.find();
+ @RegisterExtension
+ AvailablePortFinder.Port port4 = AvailablePortFinder.find();
+ @RegisterExtension
+ AvailablePortFinder.Port port5 = AvailablePortFinder.find();
private String receivedHostHeaderEndpoint1;
private String receivedHostHeaderEndpoint2;
private String receivedHostHeaderEndpoint3;
@@ -45,75 +51,71 @@ public class JettyBridgeHostHeaderIssueTest extends CamelTestSupport {
//The first call to our service will hit the first destination in the round robin load balancer
//this destination has the preserveProxyHeader parameter set to true, so we verify the Host header
//received by our downstream instance matches the address and port of the proxied service
- Exchange reply = template.request("http:localhost:" + port + "/myapp",
+ Exchange reply = template.request("http:localhost:" + port.getPort() + "/myapp",
exchange -> exchange.getIn().setBody("Hello World"));
assertNotNull(reply);
assertEquals("foo", reply.getMessage().getBody(String.class));
//assert the received Host header is localhost:port (where port matches the /myapp port)
- assertEquals("localhost:" + port, receivedHostHeaderEndpoint1);
+ assertEquals("localhost:" + port.getPort(), receivedHostHeaderEndpoint1);
//The second call to our service will hit the second destination in the round robin load balancer
//this destination does not have the preserveProxyHeader, so we expect the Host header received by the destination
//to match the url of the destination service itself
- Exchange reply2 = template.request("http:localhost:" + port + "/myapp",
+ Exchange reply2 = template.request("http:localhost:" + port.getPort() + "/myapp",
exchange -> exchange.getIn().setBody("Bye World"));
assertNotNull(reply2);
assertEquals("bar", reply2.getMessage().getBody(String.class));
//assert the received Host header is localhost:port3 (where port3 matches the /bar destination server)
- assertEquals("localhost:" + port3, receivedHostHeaderEndpoint2);
+ assertEquals("localhost:" + port3.getPort(), receivedHostHeaderEndpoint2);
//The next two calls will use/test the jetty producers in the round robin load balancer
//The first has the preserveHostHeader option set to true, so we would expect to receive a Host header matching the /myapp proxied service
- Exchange reply3 = template.request("http:localhost:" + port + "/myapp",
+ Exchange reply3 = template.request("http:localhost:" + port.getPort() + "/myapp",
exchange -> exchange.getIn().setBody("Bye JWorld"));
assertNotNull(reply3);
assertEquals("jbar", reply3.getMessage().getBody(String.class));
//assert the received Host header is localhost:port (where port matches the /myapp destination server)
- assertEquals("localhost:" + port, receivedHostHeaderEndpoint3);
+ assertEquals("localhost:" + port.getPort(), receivedHostHeaderEndpoint3);
//The second does not have a preserveHostHeader (preserveHostHeader=false), we would expect to see a Host header matching the destination service
- Exchange reply4 = template.request("http:localhost:" + port + "/myapp",
+ Exchange reply4 = template.request("http:localhost:" + port.getPort() + "/myapp",
exchange -> exchange.getIn().setBody("JAVA!!!!"));
assertNotNull(reply4);
assertEquals("java???", reply4.getMessage().getBody(String.class));
//assert the received Host header is localhost:port5 (where port3 matches the /jbarf destination server)
- assertEquals("localhost:" + port5, receivedHostHeaderEndpoint4);
+ assertEquals("localhost:" + port5.getPort(), receivedHostHeaderEndpoint4);
}
@Override
protected RouteBuilder createRouteBuilder() {
- port = AvailablePortFinder.getNextAvailable();
- port2 = AvailablePortFinder.getNextAvailable();
- port3 = AvailablePortFinder.getNextAvailable();
- port4 = AvailablePortFinder.getNextAvailable();
- port5 = AvailablePortFinder.getNextAvailable();
-
return new RouteBuilder() {
@Override
public void configure() {
- from("jetty:http://localhost:" + port + "/myapp?matchOnUriPrefix=true")
+ from("jetty:http://localhost:" + port.getPort() + "/myapp?matchOnUriPrefix=true")
.loadBalance().roundRobin()
- .to("http://localhost:" + port2
+ .to("http://localhost:" + port2.getPort()
+ "/foo?bridgeEndpoint=true&throwExceptionOnFailure=false&preserveHostHeader=true")
- .to("http://localhost:" + port3 + "/bar?bridgeEndpoint=true&throwExceptionOnFailure=false")
- .to("http://localhost:" + port4
+ .to("http://localhost:" + port3.getPort()
+ + "/bar?bridgeEndpoint=true&throwExceptionOnFailure=false")
+ .to("http://localhost:" + port4.getPort()
+ "/jbar?bridgeEndpoint=true&throwExceptionOnFailure=false&preserveHostHeader=true")
- .to("http://localhost:" + port5 + "/jbarf?bridgeEndpoint=true&throwExceptionOnFailure=false");
+ .to("http://localhost:" + port5.getPort()
+ + "/jbarf?bridgeEndpoint=true&throwExceptionOnFailure=false");
- from("jetty:http://localhost:" + port2 + "/foo")
+ from("jetty:http://localhost:" + port2.getPort() + "/foo")
.process(exchange -> receivedHostHeaderEndpoint1 = exchange.getIn().getHeader("Host", String.class))
.transform().constant("foo");
- from("jetty:http://localhost:" + port3 + "/bar")
+ from("jetty:http://localhost:" + port3.getPort() + "/bar")
.process(exchange -> receivedHostHeaderEndpoint2 = exchange.getIn().getHeader("Host", String.class))
.transform().constant("bar");
- from("jetty:http://localhost:" + port4 + "/jbar")
+ from("jetty:http://localhost:" + port4.getPort() + "/jbar")
.process(exchange -> receivedHostHeaderEndpoint3 = exchange.getIn().getHeader("Host", String.class))
.transform().constant("jbar");
- from("jetty:http://localhost:" + port5 + "/jbarf")
+ from("jetty:http://localhost:" + port5.getPort() + "/jbarf")
.process(exchange -> receivedHostHeaderEndpoint4 = exchange.getIn().getHeader("Host", String.class))
.transform().constant("java???");
}
diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyValidatorStreamTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyValidatorStreamTest.java
index 625f5cefb1ca..84495419659e 100644
--- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyValidatorStreamTest.java
+++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyValidatorStreamTest.java
@@ -22,31 +22,31 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.test.AvailablePortFinder;
import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
public class JettyValidatorStreamTest extends CamelTestSupport {
- private int port;
+ @RegisterExtension
+ AvailablePortFinder.Port port = AvailablePortFinder.find();
@Test
void testValideRequestAsStream() {
InputStream inputStream = this.getClass().getResourceAsStream("ValidRequest.xml");
assertNotNull(inputStream, "The inputStream should not be null");
- String response = template.requestBody("http://localhost:" + port + "/test", inputStream, String.class);
+ String response = template.requestBody("http://localhost:" + port.getPort() + "/test", inputStream, String.class);
assertEquals("<ok/>", response, "The response should be ok");
}
@Override
protected RouteBuilder createRouteBuilder() {
- port = AvailablePortFinder.getNextAvailable();
-
return new RouteBuilder() {
@Override
public void configure() {
- from("jetty:http://localhost:" + port + "/test")
+ from("jetty:http://localhost:" + port.getPort() + "/test")
.to("validator:OptimizationRequest.xsd")
.transform(constant("<ok/>"));
}
diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyValidatorStreamWithStreamCachingEnabledTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyValidatorStreamWithStreamCachingEnabledTest.java
index b2865afa73fa..42151c3bbc50 100644
--- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyValidatorStreamWithStreamCachingEnabledTest.java
+++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyValidatorStreamWithStreamCachingEnabledTest.java
@@ -22,33 +22,33 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.test.AvailablePortFinder;
import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
public class JettyValidatorStreamWithStreamCachingEnabledTest extends CamelTestSupport {
- private int port;
+ @RegisterExtension
+ AvailablePortFinder.Port port = AvailablePortFinder.find();
@Test
void testValideRequestAsStream() {
InputStream inputStream = this.getClass().getResourceAsStream("ValidRequest.xml");
assertNotNull(inputStream, "The inputStream should not be null");
- String response = template.requestBody("http://localhost:" + port + "/test", inputStream, String.class);
+ String response = template.requestBody("http://localhost:" + port.getPort() + "/test", inputStream, String.class);
assertEquals("<ok/>", response, "The response should be ok");
}
@Override
protected RouteBuilder createRouteBuilder() {
- port = AvailablePortFinder.getNextAvailable();
-
return new RouteBuilder() {
@Override
public void configure() {
context.setStreamCaching(true);
- from("jetty:http://localhost:" + port + "/test")
+ from("jetty:http://localhost:" + port.getPort() + "/test")
.to("validator:OptimizationRequest.xsd")
.transform(constant("<ok/>"));
}
diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyValidatorTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyValidatorTest.java
index aa39f8b365c2..e85325979949 100644
--- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyValidatorTest.java
+++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyValidatorTest.java
@@ -23,20 +23,22 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.test.AvailablePortFinder;
import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
public class JettyValidatorTest extends CamelTestSupport {
- private int port;
+ @RegisterExtension
+ AvailablePortFinder.Port port = AvailablePortFinder.find();
@Test
void testValidRequest() {
InputStream inputStream = this.getClass().getResourceAsStream("ValidRequest.xml");
assertNotNull(inputStream, "The inputStream should not be null");
- String response = template.requestBody("http://localhost:" + port + "/test", inputStream, String.class);
+ String response = template.requestBody("http://localhost:" + port.getPort() + "/test", inputStream, String.class);
assertEquals("<ok/>", response, "The response should be ok");
}
@@ -46,17 +48,15 @@ public class JettyValidatorTest extends CamelTestSupport {
InputStream inputStream = this.getClass().getResourceAsStream("InvalidRequest.xml");
assertNotNull(inputStream, "The inputStream should not be null");
- String response = template.requestBody("http://localhost:" + port + "/test", inputStream, String.class);
+ String response = template.requestBody("http://localhost:" + port.getPort() + "/test", inputStream, String.class);
assertEquals("<error/>", response, "The response should be error");
}
@Override
protected RouteBuilder createRouteBuilder() {
- port = AvailablePortFinder.getNextAvailable();
-
return new RouteBuilder() {
public void configure() {
- from("jetty:http://localhost:" + port + "/test")
+ from("jetty:http://localhost:" + port.getPort() + "/test")
.convertBodyTo(String.class)
.to("log:in")
.doTry()
diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyXsltHttpTemplateTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyXsltHttpTemplateTest.java
index 1bb49243c845..5499be9732be 100644
--- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyXsltHttpTemplateTest.java
+++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyXsltHttpTemplateTest.java
@@ -23,20 +23,22 @@ import org.apache.camel.test.AvailablePortFinder;
import org.apache.camel.test.junit6.CamelTestSupport;
import org.awaitility.Awaitility;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
public class JettyXsltHttpTemplateTest extends CamelTestSupport {
- private int port;
+ @RegisterExtension
+ AvailablePortFinder.Port port = AvailablePortFinder.find();
@Test
void testXsltHttpTemplate() throws Exception {
// give Jetty a bit of time to startup and be ready
Awaitility.await().atMost(1, TimeUnit.SECONDS).until(() -> context.isStarted());
- String xml = template.requestBody("xslt:http://0.0.0.0:" + port + "/myxslt",
+ String xml = template.requestBody("xslt:http://0.0.0.0:" + port.getPort() + "/myxslt",
"<mail><subject>Hey</subject><body>Hello world!</body></mail>", String.class);
assertNotNull(xml, "The transformed XML should not be null");
@@ -49,12 +51,10 @@ public class JettyXsltHttpTemplateTest extends CamelTestSupport {
@Override
protected RouteBuilder createRouteBuilder() {
- port = AvailablePortFinder.getNextAvailable();
-
return new RouteBuilder() {
@Override
public void configure() {
- from("jetty:http://0.0.0.0:" + port + "/myxslt")
+ from("jetty:http://0.0.0.0:" + port.getPort() + "/myxslt")
.pollEnrich(
"file://src/test/resources/org/apache/camel/component/jetty/?fileName=transform.xsl&noop=true&readLock=none",
2000)
diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyXsltTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyXsltTest.java
index 408d9115af60..44671ea2fef5 100644
--- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyXsltTest.java
+++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyXsltTest.java
@@ -26,6 +26,7 @@ import org.apache.camel.test.AvailablePortFinder;
import org.apache.camel.test.junit6.CamelTestSupport;
import org.apache.camel.util.ObjectHelper;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertThrows;
@@ -33,7 +34,8 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
public class JettyXsltTest extends CamelTestSupport {
- private int port;
+ @RegisterExtension
+ AvailablePortFinder.Port port = AvailablePortFinder.find();
@Test
void testClasspath() {
@@ -56,7 +58,7 @@ public class JettyXsltTest extends CamelTestSupport {
@Test
void testHttp() {
- String response = template.requestBody("xslt://http://localhost:" + port + "/test?name=greeting.xsl",
+ String response = template.requestBody("xslt://http://localhost:" + port.getPort() + "/test?name=greeting.xsl",
"<hello>Camel</hello>", String.class);
assertEquals("<?xml version=\"1.0\" encoding=\"UTF-8\"?><goodbye>Camel</goodbye>", response);
@@ -64,11 +66,9 @@ public class JettyXsltTest extends CamelTestSupport {
@Override
protected RouteBuilder createRouteBuilder() {
- port = AvailablePortFinder.getNextAvailable();
-
return new RouteBuilder() {
public void configure() {
- from("jetty:http://localhost:" + port + "/test")
+ from("jetty:http://localhost:" + port.getPort() + "/test")
.process(exchange -> {
String name = exchange.getIn().getHeader("name", String.class);
ObjectHelper.notNull(name, "name");
diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/SpringFailoverRoundRobinTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/SpringFailoverRoundRobinTest.java
index deccf1deb9a7..38ab1102a984 100644
--- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/SpringFailoverRoundRobinTest.java
+++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/SpringFailoverRoundRobinTest.java
@@ -20,6 +20,7 @@ import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.AvailablePortFinder;
import org.apache.camel.test.spring.junit6.CamelSpringTestSupport;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import org.springframework.context.support.AbstractXmlApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
@@ -27,22 +28,23 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
public class SpringFailoverRoundRobinTest extends CamelSpringTestSupport {
- private static int port1 = AvailablePortFinder.getNextAvailable();
- private static int port2 = AvailablePortFinder.getNextAvailable();
- private static int port3 = AvailablePortFinder.getNextAvailable();
- private static int port4 = AvailablePortFinder.getNextAvailable();
-
- static {
- //set them as system properties so Spring can use the property placeholder
- //things to set them into the URL's in the spring contexts
- System.setProperty("JettySpringFailoverRoundRobinTest.port1", Integer.toString(port1));
- System.setProperty("JettySpringFailoverRoundRobinTest.port2", Integer.toString(port2));
- System.setProperty("JettySpringFailoverRoundRobinTest.port3", Integer.toString(port3));
- System.setProperty("JettySpringFailoverRoundRobinTest.port4", Integer.toString(port4));
- }
+ @RegisterExtension
+ AvailablePortFinder.Port port1 = AvailablePortFinder.find();
+ @RegisterExtension
+ AvailablePortFinder.Port port2 = AvailablePortFinder.find();
+ @RegisterExtension
+ AvailablePortFinder.Port port3 = AvailablePortFinder.find();
+ @RegisterExtension
+ AvailablePortFinder.Port port4 = AvailablePortFinder.find();
@Override
protected AbstractXmlApplicationContext createApplicationContext() {
+ //set them as system properties so Spring can use the property placeholder
+ //things to set them into the URL's in the spring contexts
+ System.setProperty("JettySpringFailoverRoundRobinTest.port1", Integer.toString(port1.getPort()));
+ System.setProperty("JettySpringFailoverRoundRobinTest.port2", Integer.toString(port2.getPort()));
+ System.setProperty("JettySpringFailoverRoundRobinTest.port3", Integer.toString(port3.getPort()));
+ System.setProperty("JettySpringFailoverRoundRobinTest.port4", Integer.toString(port4.getPort()));
return new ClassPathXmlApplicationContext("/org/apache/camel/component/jetty/JettySpringFailoverRoundRobinTest.xml");
}
diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyRedirectTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyRedirectTest.java
index 4cad70b0e238..dc9e6b3ef807 100644
--- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyRedirectTest.java
+++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyRedirectTest.java
@@ -22,31 +22,33 @@ import org.apache.camel.component.http.HttpComponent;
import org.apache.camel.test.AvailablePortFinder;
import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import static org.junit.jupiter.api.Assertions.assertEquals;
public class RestJettyRedirectTest extends CamelTestSupport {
- private int port;
+ @RegisterExtension
+ AvailablePortFinder.Port port = AvailablePortFinder.find();
@Test
void testRedirectInvocation() {
- String response = template.requestBody("http://localhost:" + port + "/metadata/profile/tag", "<hello>Camel</hello>",
+ String response = template.requestBody("http://localhost:" + port.getPort() + "/metadata/profile/tag",
+ "<hello>Camel</hello>",
String.class);
assertEquals("Mock profile", response, "It should support the redirect out of box.");
}
@Override
protected RouteBuilder createRouteBuilder() {
- port = AvailablePortFinder.getNextAvailable();
-
return new RouteBuilder() {
public void configure() {
// enable follow redirects
HttpComponent http = context.getComponent("http", HttpComponent.class);
http.setFollowRedirects(true);
- restConfiguration().component("jetty").host("localhost").scheme("http").port(port).producerComponent("http");
+ restConfiguration().component("jetty").host("localhost").scheme("http").port(port.getPort())
+ .producerComponent("http");
rest("/metadata/profile")
.get("/{id}").to("direct:profileLookup")
.post("/tag").to("direct:tag");
diff --git a/components/camel-lumberjack/src/test/java/org/apache/camel/component/lumberjack/LumberjackComponentGlobalSSLTest.java b/components/camel-lumberjack/src/test/java/org/apache/camel/component/lumberjack/LumberjackComponentGlobalSSLTest.java
index 21a2546cf839..a6d9cd318b05 100644
--- a/components/camel-lumberjack/src/test/java/org/apache/camel/component/lumberjack/LumberjackComponentGlobalSSLTest.java
+++ b/components/camel-lumberjack/src/test/java/org/apache/camel/component/lumberjack/LumberjackComponentGlobalSSLTest.java
@@ -29,20 +29,16 @@ import org.apache.camel.support.jsse.SSLContextParameters;
import org.apache.camel.support.jsse.TrustManagersParameters;
import org.apache.camel.test.AvailablePortFinder;
import org.apache.camel.test.junit6.CamelTestSupport;
-import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import org.junit.jupiter.api.parallel.Isolated;
import static org.junit.jupiter.api.Assertions.assertEquals;
@Isolated
public class LumberjackComponentGlobalSSLTest extends CamelTestSupport {
- private static int port;
-
- @BeforeAll
- public static void beforeClass() {
- port = AvailablePortFinder.getNextAvailable();
- }
+ @RegisterExtension
+ AvailablePortFinder.Port port = AvailablePortFinder.find();
@Override
protected CamelContext createCamelContext() throws Exception {
@@ -59,7 +55,7 @@ public class LumberjackComponentGlobalSSLTest extends CamelTestSupport {
public void configure() {
// Lumberjack configured with SSL
- from("lumberjack:0.0.0.0:" + port).to("mock:output");
+ from("lumberjack:0.0.0.0:" + port.getPort()).to("mock:output");
}
};
}
@@ -75,7 +71,8 @@ public class LumberjackComponentGlobalSSLTest extends CamelTestSupport {
List<Integer> windows = Arrays.asList(15, 10, 15, 10, 10);
// When sending messages
- List<Integer> responses = LumberjackUtil.sendMessages(port, createClientSSLContextParameters(context), windows);
+ List<Integer> responses
+ = LumberjackUtil.sendMessages(port.getPort(), createClientSSLContextParameters(context), windows);
// Then we should have the messages we're expecting
mock.assertIsSatisfied();
diff --git a/components/camel-lumberjack/src/test/java/org/apache/camel/component/lumberjack/LumberjackComponentSSLTest.java b/components/camel-lumberjack/src/test/java/org/apache/camel/component/lumberjack/LumberjackComponentSSLTest.java
index 9fe5d7dd763d..39a982409851 100644
--- a/components/camel-lumberjack/src/test/java/org/apache/camel/component/lumberjack/LumberjackComponentSSLTest.java
+++ b/components/camel-lumberjack/src/test/java/org/apache/camel/component/lumberjack/LumberjackComponentSSLTest.java
@@ -29,20 +29,16 @@ import org.apache.camel.support.jsse.SSLContextParameters;
import org.apache.camel.support.jsse.TrustManagersParameters;
import org.apache.camel.test.AvailablePortFinder;
import org.apache.camel.test.junit6.CamelTestSupport;
-import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import org.junit.jupiter.api.parallel.Isolated;
import static org.junit.jupiter.api.Assertions.assertEquals;
@Isolated
public class LumberjackComponentSSLTest extends CamelTestSupport {
- private static int port;
-
- @BeforeAll
- public static void beforeClass() {
- port = AvailablePortFinder.getNextAvailable();
- }
+ @RegisterExtension
+ AvailablePortFinder.Port port = AvailablePortFinder.find();
@Override
protected RouteBuilder createRouteBuilder() {
@@ -52,7 +48,7 @@ public class LumberjackComponentSSLTest extends CamelTestSupport {
return new RouteBuilder() {
public void configure() {
// Lumberjack configured with SSL
- from("lumberjack:0.0.0.0:" + port + "?sslContextParameters=#ssl").to("mock:output");
+ from("lumberjack:0.0.0.0:" + port.getPort() + "?sslContextParameters=#ssl").to("mock:output");
}
};
}
@@ -66,7 +62,7 @@ public class LumberjackComponentSSLTest extends CamelTestSupport {
List<Integer> windows = Arrays.asList(15, 10, 15, 10, 10);
// When sending messages
- List<Integer> responses = LumberjackUtil.sendMessages(port, createClientSSLContextParameters(), windows);
+ List<Integer> responses = LumberjackUtil.sendMessages(port.getPort(), createClientSSLContextParameters(), windows);
// Then we should have the messages we're expecting
mock.assertIsSatisfied();
diff --git a/components/camel-lumberjack/src/test/java/org/apache/camel/component/lumberjack/LumberjackComponentTest.java b/components/camel-lumberjack/src/test/java/org/apache/camel/component/lumberjack/LumberjackComponentTest.java
index 45220b93ce99..f80a625d69d2 100644
--- a/components/camel-lumberjack/src/test/java/org/apache/camel/component/lumberjack/LumberjackComponentTest.java
+++ b/components/camel-lumberjack/src/test/java/org/apache/camel/component/lumberjack/LumberjackComponentTest.java
@@ -24,10 +24,10 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.AvailablePortFinder;
import org.apache.camel.test.junit6.CamelTestSupport;
-import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.condition.DisabledOnOs;
import org.junit.jupiter.api.condition.OS;
+import org.junit.jupiter.api.extension.RegisterExtension;
import org.junit.jupiter.api.parallel.Isolated;
import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -37,19 +37,15 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
disabledReason = "This test does not run reliably multiple platforms (see CAMEL-21438)")
@Isolated
public class LumberjackComponentTest extends CamelTestSupport {
- private static int port;
-
- @BeforeAll
- public static void beforeClass() {
- port = AvailablePortFinder.getNextAvailable();
- }
+ @RegisterExtension
+ AvailablePortFinder.Port port = AvailablePortFinder.find();
@Override
protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
public void configure() {
// Lumberjack configured with a specific port
- from("lumberjack:0.0.0.0:" + port).to("mock:output");
+ from("lumberjack:0.0.0.0:" + port.getPort()).to("mock:output");
}
};
}
@@ -64,7 +60,7 @@ public class LumberjackComponentTest extends CamelTestSupport {
List<Integer> windows = Arrays.asList(15, 10, 15, 10, 10);
// When sending messages
- List<Integer> responses = LumberjackUtil.sendMessages(port, null, windows);
+ List<Integer> responses = LumberjackUtil.sendMessages(port.getPort(), null, windows);
// Then we should have the messages we're expecting
mock.assertIsSatisfied();
diff --git a/components/camel-lumberjack/src/test/java/org/apache/camel/component/lumberjack/LumberjackDisconnectionTest.java b/components/camel-lumberjack/src/test/java/org/apache/camel/component/lumberjack/LumberjackDisconnectionTest.java
index e8b58b79eb2e..2a4ad96553ef 100644
--- a/components/camel-lumberjack/src/test/java/org/apache/camel/component/lumberjack/LumberjackDisconnectionTest.java
+++ b/components/camel-lumberjack/src/test/java/org/apache/camel/component/lumberjack/LumberjackDisconnectionTest.java
@@ -27,27 +27,23 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.AvailablePortFinder;
import org.apache.camel.test.junit6.CamelTestSupport;
-import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import org.junit.jupiter.api.parallel.Isolated;
import static org.apache.camel.test.junit6.TestSupport.assertCollectionSize;
@Isolated
public class LumberjackDisconnectionTest extends CamelTestSupport {
- private static int port;
-
- @BeforeAll
- public static void beforeClass() {
- port = AvailablePortFinder.getNextAvailable();
- }
+ @RegisterExtension
+ AvailablePortFinder.Port port = AvailablePortFinder.find();
@Override
protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
public void configure() {
// Lumberjack configured with something that throws an exception
- from("lumberjack:0.0.0.0:" + port).process(new ErrorProcessor()).to("mock:output");
+ from("lumberjack:0.0.0.0:" + port.getPort()).process(new ErrorProcessor()).to("mock:output");
}
};
}
@@ -63,7 +59,7 @@ public class LumberjackDisconnectionTest extends CamelTestSupport {
List<Integer> windows = Arrays.asList(15, 10);
// When sending messages
- List<Integer> responses = LumberjackUtil.sendMessages(port, null, windows, false);
+ List<Integer> responses = LumberjackUtil.sendMessages(port.getPort(), null, windows, false);
// Then we should have the messages we're expecting
mock.assertIsSatisfied();
diff --git a/components/camel-lumberjack/src/test/java/org/apache/camel/component/lumberjack/LumberjackMultiThreadIT.java b/components/camel-lumberjack/src/test/java/org/apache/camel/component/lumberjack/LumberjackMultiThreadIT.java
index 9fccdfd57db4..300ccf46d17a 100644
--- a/components/camel-lumberjack/src/test/java/org/apache/camel/component/lumberjack/LumberjackMultiThreadIT.java
+++ b/components/camel-lumberjack/src/test/java/org/apache/camel/component/lumberjack/LumberjackMultiThreadIT.java
@@ -33,6 +33,7 @@ import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.condition.DisabledOnOs;
import org.junit.jupiter.api.condition.OS;
+import org.junit.jupiter.api.extension.RegisterExtension;
import org.junit.jupiter.api.parallel.Isolated;
import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -44,7 +45,8 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
@Isolated
public class LumberjackMultiThreadIT extends CamelTestSupport {
- private static final int PORT = AvailablePortFinder.getNextAvailable();
+ @RegisterExtension
+ AvailablePortFinder.Port port = AvailablePortFinder.find();
private static final int CONCURRENCY_LEVEL = Math.min(Runtime.getRuntime().availableProcessors(), 4);
private CountDownLatch latch = new CountDownLatch(CONCURRENCY_LEVEL);
private volatile boolean interrupted;
@@ -57,7 +59,7 @@ public class LumberjackMultiThreadIT extends CamelTestSupport {
return new RouteBuilder() {
public void configure() {
// Lumberjack configured with a specific port
- from("lumberjack:0.0.0.0:" + PORT).to("mock:output");
+ from("lumberjack:0.0.0.0:" + port.getPort()).to("mock:output");
}
};
}
@@ -104,7 +106,7 @@ public class LumberjackMultiThreadIT extends CamelTestSupport {
@Override
public void run() {
try {
- this.responses = LumberjackUtil.sendMessages(PORT, null, Arrays.asList(15, 10));
+ this.responses = LumberjackUtil.sendMessages(port.getPort(), null, Arrays.asList(15, 10));
latch.countDown();
} catch (InterruptedException e) {
Thread.currentThread().interrupt();
diff --git a/components/camel-mllp/src/test/java/org/apache/camel/MllpTcpServerConsumerLenientBindTest.java b/components/camel-mllp/src/test/java/org/apache/camel/MllpTcpServerConsumerLenientBindTest.java
index 25c8f36f47cb..c6da50db22ea 100644
--- a/components/camel-mllp/src/test/java/org/apache/camel/MllpTcpServerConsumerLenientBindTest.java
+++ b/components/camel-mllp/src/test/java/org/apache/camel/MllpTcpServerConsumerLenientBindTest.java
@@ -40,6 +40,9 @@ public class MllpTcpServerConsumerLenientBindTest extends CamelTestSupport {
static final int RECEIVE_TIMEOUT = 1000;
static final int READ_TIMEOUT = 500;
+ @RegisterExtension
+ AvailablePortFinder.Port mllpClientPort = AvailablePortFinder.find();
+
@RegisterExtension
public MllpClientResource mllpClient = new MllpClientResource();
@@ -51,7 +54,7 @@ public class MllpTcpServerConsumerLenientBindTest extends CamelTestSupport {
@Override
protected void doPreSetup() throws Exception {
mllpClient.setMllpHost("localhost");
- mllpClient.setMllpPort(AvailablePortFinder.getNextAvailable());
+ mllpClient.setMllpPort(mllpClientPort.getPort());
portBlocker = new ServerSocket(mllpClient.getMllpPort());
diff --git a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/LogPhiTest.java b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/LogPhiTest.java
index 325f14f92d22..2c198bd5a22b 100644
--- a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/LogPhiTest.java
+++ b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/LogPhiTest.java
@@ -41,6 +41,9 @@ public class LogPhiTest extends CamelTestSupport {
static final int SERVER_ACKNOWLEDGEMENT_DELAY = 10000;
+ @RegisterExtension
+ AvailablePortFinder.Port mllpServerPort = AvailablePortFinder.find();
+
@RegisterExtension
public MllpServerResource mllpServer = new MllpServerResource();
@@ -56,7 +59,7 @@ public class LogPhiTest extends CamelTestSupport {
@Override
protected void doPreSetup() throws Exception {
mllpServer.setListenHost("localhost");
- mllpServer.setListenPort(AvailablePortFinder.getNextAvailable());
+ mllpServer.setListenPort(mllpServerPort.getPort());
mllpServer.setDelayDuringAcknowledgement(SERVER_ACKNOWLEDGEMENT_DELAY);
mllpServer.startup();
assertTrue(mllpServer.isActive());
diff --git a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpGlobalAndExplicitSSLContextParametersTest.java b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpGlobalAndExplicitSSLContextParametersTest.java
index 1b466a17fa63..20914abac52a 100644
--- a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpGlobalAndExplicitSSLContextParametersTest.java
+++ b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpGlobalAndExplicitSSLContextParametersTest.java
@@ -32,6 +32,9 @@ import org.junit.jupiter.api.extension.RegisterExtension;
public class MllpGlobalAndExplicitSSLContextParametersTest extends CamelTestSupport {
+ @RegisterExtension
+ AvailablePortFinder.Port mllpClientPort = AvailablePortFinder.find();
+
@RegisterExtension
public MllpClientResource mllpClient = new MllpClientResource();
@@ -80,7 +83,7 @@ public class MllpGlobalAndExplicitSSLContextParametersTest extends CamelTestSupp
protected CamelContext createCamelContext() throws Exception {
DefaultCamelContext context = (DefaultCamelContext) super.createCamelContext();
mllpClient.setMllpHost("localhost");
- mllpClient.setMllpPort(AvailablePortFinder.getNextAvailable());
+ mllpClient.setMllpPort(mllpClientPort.getPort());
// Set global SSLContextParameters
SSLContextParameters globalSslContextParameters = createGlobalSslContextParameters();
diff --git a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpIdleTimeoutStrategyTest.java b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpIdleTimeoutStrategyTest.java
index 843fac809c0b..2a7018c7129e 100644
--- a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpIdleTimeoutStrategyTest.java
+++ b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpIdleTimeoutStrategyTest.java
@@ -50,7 +50,10 @@ public class MllpIdleTimeoutStrategyTest extends CamelTestSupport {
static final int IDLE_TIMEOUT = 500;
@RegisterExtension
- public MllpServerResource mllpServer = new MllpServerResource("localhost", AvailablePortFinder.getNextAvailable());
+ AvailablePortFinder.Port mllpServerPort = AvailablePortFinder.find();
+
+ @RegisterExtension
+ public MllpServerResource mllpServer = new MllpServerResource("localhost", mllpServerPort.getPort());
@EndpointInject("direct://sourcedefault")
ProducerTemplate defaultStrategySource;
diff --git a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpMaxConcurrentConsumersTest.java b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpMaxConcurrentConsumersTest.java
index 725293401f32..d2d97173d3a9 100644
--- a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpMaxConcurrentConsumersTest.java
+++ b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpMaxConcurrentConsumersTest.java
@@ -38,6 +38,12 @@ import static org.junit.jupiter.api.Assertions.assertThrows;
*/
public class MllpMaxConcurrentConsumersTest extends CamelTestSupport {
+ @RegisterExtension
+ AvailablePortFinder.Port mllpClientPort1 = AvailablePortFinder.find();
+
+ @RegisterExtension
+ AvailablePortFinder.Port mllpClientPort2 = AvailablePortFinder.find();
+
@RegisterExtension
public MllpClientResource mllpClient = new MllpClientResource();
@@ -55,10 +61,10 @@ public class MllpMaxConcurrentConsumersTest extends CamelTestSupport {
@Override
protected void doPreSetup() throws Exception {
mllpClient.setMllpHost("localhost");
- mllpClient.setMllpPort(AvailablePortFinder.getNextAvailable());
+ mllpClient.setMllpPort(mllpClientPort1.getPort());
mllpClient2.setMllpHost("localhost");
- mllpClient2.setMllpPort(AvailablePortFinder.getNextAvailable());
+ mllpClient2.setMllpPort(mllpClientPort2.getPort());
}
@SuppressWarnings("deprecation")
diff --git a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpMutualTlsConnectionAndHeaderBase.java b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpMutualTlsConnectionAndHeaderBase.java
index b829c388a606..f27e4a356a10 100644
--- a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpMutualTlsConnectionAndHeaderBase.java
+++ b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpMutualTlsConnectionAndHeaderBase.java
@@ -59,6 +59,9 @@ public class MllpMutualTlsConnectionAndHeaderBase extends CamelTestSupport {
protected Date expectedCertNotBefore;
protected Date expectedCertNotAfter;
+ @RegisterExtension
+ AvailablePortFinder.Port mllpClientPort = AvailablePortFinder.find();
+
@RegisterExtension
public MllpClientResource mllpClient = new MllpClientResource();
@@ -177,7 +180,7 @@ public class MllpMutualTlsConnectionAndHeaderBase extends CamelTestSupport {
@Override
protected CamelContext createCamelContext() throws Exception {
mllpClient.setMllpHost("localhost");
- mllpClient.setMllpPort(AvailablePortFinder.getNextAvailable());
+ mllpClient.setMllpPort(mllpClientPort.getPort());
DefaultCamelContext context = (DefaultCamelContext) super.createCamelContext();
diff --git a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpProducerConsumerLoopbackInOnlyTest.java b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpProducerConsumerLoopbackInOnlyTest.java
index 52510ea0f269..8696c18497e3 100644
--- a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpProducerConsumerLoopbackInOnlyTest.java
+++ b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpProducerConsumerLoopbackInOnlyTest.java
@@ -29,11 +29,15 @@ import org.apache.camel.test.junit6.CamelTestSupport;
import org.apache.camel.test.mllp.Hl7TestMessageGenerator;
import org.hamcrest.CoreMatchers;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import static org.hamcrest.MatcherAssert.assertThat;
public class MllpProducerConsumerLoopbackInOnlyTest extends CamelTestSupport {
+ @RegisterExtension
+ AvailablePortFinder.Port mllpPortField = AvailablePortFinder.find();
+
@EndpointInject("direct://source")
ProducerTemplate source;
@@ -54,7 +58,7 @@ public class MllpProducerConsumerLoopbackInOnlyTest extends CamelTestSupport {
@Override
protected RouteBuilder[] createRouteBuilders() {
String mllpHost = "localhost";
- int mllpPort = AvailablePortFinder.getNextAvailable();
+ int mllpPort = mllpPortField.getPort();
return new RouteBuilder[] {
new RouteBuilder() {
diff --git a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpProducerConsumerLoopbackTest.java b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpProducerConsumerLoopbackTest.java
index 891658426070..108c4948786d 100644
--- a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpProducerConsumerLoopbackTest.java
+++ b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpProducerConsumerLoopbackTest.java
@@ -32,6 +32,7 @@ import org.apache.camel.test.mllp.PassthroughProcessor;
import org.hamcrest.CoreMatchers;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -41,7 +42,10 @@ import static org.junit.jupiter.api.Assumptions.assumeTrue;
public class MllpProducerConsumerLoopbackTest extends CamelTestSupport {
Logger log = LoggerFactory.getLogger(MllpProducerConsumerLoopbackTest.class);
- int mllpPort = AvailablePortFinder.getNextAvailable();
+
+ @RegisterExtension
+ AvailablePortFinder.Port mllpPortField = AvailablePortFinder.find();
+
String mllpHost = "localhost";
@EndpointInject("direct://source")
@@ -75,7 +79,7 @@ public class MllpProducerConsumerLoopbackTest extends CamelTestSupport {
String routeId = "mllp-receiver";
public void configure() {
- fromF("mllp://%s:%d?autoAck=true&readTimeout=5000", mllpHost, mllpPort).id(routeId)
+ fromF("mllp://%s:%d?autoAck=true&readTimeout=5000", mllpHost, mllpPortField.getPort()).id(routeId)
.convertBodyTo(String.class)
.to(acknowledged)
.process(new PassthroughProcessor("after send to result"))
@@ -89,7 +93,7 @@ public class MllpProducerConsumerLoopbackTest extends CamelTestSupport {
public void configure() {
from(source.getDefaultEndpoint()).routeId(routeId)
.log(LoggingLevel.DEBUG, routeId, "Sending: ${body}")
- .toF("mllp://%s:%d?readTimeout=5000", mllpHost, mllpPort)
+ .toF("mllp://%s:%d?readTimeout=5000", mllpHost, mllpPortField.getPort())
.setBody(header(MllpConstants.MLLP_ACKNOWLEDGEMENT));
}
};
diff --git a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpSSLContextParametersTest.java b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpSSLContextParametersTest.java
index bdaef687060f..0861744874a4 100644
--- a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpSSLContextParametersTest.java
+++ b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpSSLContextParametersTest.java
@@ -32,6 +32,9 @@ import org.junit.jupiter.api.extension.RegisterExtension;
public class MllpSSLContextParametersTest extends CamelTestSupport {
+ @RegisterExtension
+ AvailablePortFinder.Port mllpClientPort = AvailablePortFinder.find();
+
@RegisterExtension
public MllpClientResource mllpClient = new MllpClientResource();
@@ -61,7 +64,7 @@ public class MllpSSLContextParametersTest extends CamelTestSupport {
@Override
protected CamelContext createCamelContext() throws Exception {
mllpClient.setMllpHost("localhost");
- mllpClient.setMllpPort(AvailablePortFinder.getNextAvailable());
+ mllpClient.setMllpPort(mllpClientPort.getPort());
DefaultCamelContext context = (DefaultCamelContext) super.createCamelContext();
diff --git a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpClientProducerConnectionErrorTest.java b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpClientProducerConnectionErrorTest.java
index f2e4ff16a814..42d03daae748 100644
--- a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpClientProducerConnectionErrorTest.java
+++ b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpClientProducerConnectionErrorTest.java
@@ -42,7 +42,10 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
public class MllpTcpClientProducerConnectionErrorTest extends CamelTestSupport {
@RegisterExtension
- public MllpServerResource mllpServer = new MllpServerResource("localhost", AvailablePortFinder.getNextAvailable());
+ AvailablePortFinder.Port mllpServerPort = AvailablePortFinder.find();
+
+ @RegisterExtension
+ public MllpServerResource mllpServer = new MllpServerResource("localhost", mllpServerPort.getPort());
@EndpointInject("direct://source")
ProducerTemplate source;
diff --git a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpClientProducerIdleConnectionTimeoutTest.java b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpClientProducerIdleConnectionTimeoutTest.java
index 488a5111cb0b..a1b430987312 100644
--- a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpClientProducerIdleConnectionTimeoutTest.java
+++ b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpClientProducerIdleConnectionTimeoutTest.java
@@ -50,7 +50,10 @@ public class MllpTcpClientProducerIdleConnectionTimeoutTest extends CamelTestSup
Logger log = LoggerFactory.getLogger(MllpTcpClientProducerIdleConnectionTimeoutTest.class);
@RegisterExtension
- MllpServerResource mllpServer = new MllpServerResource("localhost", AvailablePortFinder.getNextAvailable());
+ AvailablePortFinder.Port mllpServerPort = AvailablePortFinder.find();
+
+ @RegisterExtension
+ MllpServerResource mllpServer = new MllpServerResource("localhost", mllpServerPort.getPort());
@EndpointInject("direct://source")
ProducerTemplate source;
diff --git a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerCharsetTest.java b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerCharsetTest.java
index c8ce20bef5c0..62da935c7a4d 100644
--- a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerCharsetTest.java
+++ b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerCharsetTest.java
@@ -49,6 +49,9 @@ public class MllpTcpServerCharsetTest extends CamelTestSupport {
static final String TARGET_URI = "mock://target";
+ @RegisterExtension
+ AvailablePortFinder.Port mllpClientPort = AvailablePortFinder.find();
+
@RegisterExtension
public MllpClientResource mllpClient = new MllpClientResource();
@@ -59,7 +62,7 @@ public class MllpTcpServerCharsetTest extends CamelTestSupport {
@Override
protected CamelContext createCamelContext() throws Exception {
mllpClient.setMllpHost("localhost");
- mllpClient.setMllpPort(AvailablePortFinder.getNextAvailable());
+ mllpClient.setMllpPort(mllpClientPort.getPort());
DefaultCamelContext context = (DefaultCamelContext) super.createCamelContext();
diff --git a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerConsumerBindTimeoutTest.java b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerConsumerBindTimeoutTest.java
index 78ff7bd8bb0d..b151ff23c923 100644
--- a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerConsumerBindTimeoutTest.java
+++ b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerConsumerBindTimeoutTest.java
@@ -35,6 +35,9 @@ import org.junit.jupiter.api.extension.RegisterExtension;
public class MllpTcpServerConsumerBindTimeoutTest extends CamelTestSupport {
+ @RegisterExtension
+ AvailablePortFinder.Port mllpClientPort = AvailablePortFinder.find();
+
@RegisterExtension
public MllpClientResource mllpClient = new MllpClientResource();
@@ -61,7 +64,7 @@ public class MllpTcpServerConsumerBindTimeoutTest extends CamelTestSupport {
protected RouteBuilder createRouteBuilder() {
mllpClient.setMllpHost("localhost");
- mllpClient.setMllpPort(AvailablePortFinder.getNextAvailable());
+ mllpClient.setMllpPort(mllpClientPort.getPort());
return new RouteBuilder() {
int connectTimeout = 500;
diff --git a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerConsumerConnectionTest.java b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerConsumerConnectionTest.java
index e4e1f8807f36..1f59015bb0e8 100644
--- a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerConsumerConnectionTest.java
+++ b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerConsumerConnectionTest.java
@@ -39,6 +39,9 @@ public class MllpTcpServerConsumerConnectionTest extends CamelTestSupport {
static final int RECEIVE_TIMEOUT = 1000;
static final int READ_TIMEOUT = 500;
+ @RegisterExtension
+ AvailablePortFinder.Port mllpClientPort = AvailablePortFinder.find();
+
@RegisterExtension
public MllpClientResource mllpClient = new MllpClientResource();
@@ -53,7 +56,7 @@ public class MllpTcpServerConsumerConnectionTest extends CamelTestSupport {
@Override
protected void doPreSetup() throws Exception {
mllpClient.setMllpHost("localhost");
- mllpClient.setMllpPort(AvailablePortFinder.getNextAvailable());
+ mllpClient.setMllpPort(mllpClientPort.getPort());
}
/**
diff --git a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerConsumerMessageHeadersTest.java b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerConsumerMessageHeadersTest.java
index 7afaabc1fc50..074a1580e40a 100644
--- a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerConsumerMessageHeadersTest.java
+++ b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerConsumerMessageHeadersTest.java
@@ -36,6 +36,9 @@ import static org.junit.jupiter.api.Assertions.assertNull;
public class MllpTcpServerConsumerMessageHeadersTest extends CamelTestSupport {
+ @RegisterExtension
+ AvailablePortFinder.Port mllpClientPort = AvailablePortFinder.find();
+
@RegisterExtension
public MllpClientResource mllpClient = new MllpClientResource();
@@ -53,7 +56,7 @@ public class MllpTcpServerConsumerMessageHeadersTest extends CamelTestSupport {
@Override
protected void doPreSetup() throws Exception {
mllpClient.setMllpHost("localhost");
- mllpClient.setMllpPort(AvailablePortFinder.getNextAvailable());
+ mllpClient.setMllpPort(mllpClientPort.getPort());
}
@SuppressWarnings("deprecation")
diff --git a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerConsumerMulitpleTcpPacketTest.java b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerConsumerMulitpleTcpPacketTest.java
index 23fa0cabfcfd..85b0d86306d4 100644
--- a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerConsumerMulitpleTcpPacketTest.java
+++ b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerConsumerMulitpleTcpPacketTest.java
@@ -36,6 +36,9 @@ import org.junit.jupiter.api.extension.RegisterExtension;
import static org.hamcrest.MatcherAssert.assertThat;
public class MllpTcpServerConsumerMulitpleTcpPacketTest extends CamelTestSupport {
+ @RegisterExtension
+ AvailablePortFinder.Port mllpClientPort = AvailablePortFinder.find();
+
@RegisterExtension
public MllpClientResource mllpClient = new MllpClientResource();
@@ -59,7 +62,7 @@ public class MllpTcpServerConsumerMulitpleTcpPacketTest extends CamelTestSupport
final boolean groupActiveOnly = false;
mllpClient.setMllpHost("localhost");
- mllpClient.setMllpPort(AvailablePortFinder.getNextAvailable());
+ mllpClient.setMllpPort(mllpClientPort.getPort());
return new RouteBuilder() {
String routeId = "mllp-receiver";
diff --git a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerConsumerThreadPoolTest.java b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerConsumerThreadPoolTest.java
index 24e939b8a572..aa8883ca9301 100644
--- a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerConsumerThreadPoolTest.java
+++ b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerConsumerThreadPoolTest.java
@@ -33,6 +33,7 @@ import org.apache.camel.test.junit6.CamelTestSupport;
import org.apache.camel.test.mllp.Hl7TestMessageGenerator;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
+import org.junit.jupiter.api.extension.RegisterExtension;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assertions.fail;
@@ -63,13 +64,10 @@ public class MllpTcpServerConsumerThreadPoolTest extends CamelTestSupport {
// to fail quickly if messages are stuck in queue
private static final int PRODUCER_TIMEOUT_MS = 5000;
- String mllpHost = "localhost";
- int mllpPort;
+ @RegisterExtension
+ AvailablePortFinder.Port mllpPortField = AvailablePortFinder.find();
- @Override
- protected void doPreSetup() throws Exception {
- mllpPort = AvailablePortFinder.getNextAvailable();
- }
+ String mllpHost = "localhost";
@SuppressWarnings("deprecation")
@Override
@@ -85,7 +83,7 @@ public class MllpTcpServerConsumerThreadPoolTest extends CamelTestSupport {
return new RouteBuilder() {
public void configure() {
// Includes processing delay to simulate real work
- fromF("mllp://%s:%d?validatePayload=true", mllpHost, mllpPort)
+ fromF("mllp://%s:%d?validatePayload=true", mllpHost, mllpPortField.getPort())
.routeId("mllp-consumer-route")
.delay(PROCESSING_DELAY_MS)
.convertBodyTo(String.class)
@@ -94,7 +92,7 @@ public class MllpTcpServerConsumerThreadPoolTest extends CamelTestSupport {
from("direct:sendMllp")
.routeId("mllp-producer-route")
.toF("mllp://%s:%d?receiveTimeout=%d&readTimeout=%d",
- mllpHost, mllpPort, PRODUCER_TIMEOUT_MS, PRODUCER_TIMEOUT_MS)
+ mllpHost, mllpPortField.getPort(), PRODUCER_TIMEOUT_MS, PRODUCER_TIMEOUT_MS)
.setBody(header(MllpConstants.MLLP_ACKNOWLEDGEMENT));
}
};
diff --git a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerConsumerTransactionTest.java b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerConsumerTransactionTest.java
index 33459788cac4..ee1ff2c71622 100644
--- a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerConsumerTransactionTest.java
+++ b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerConsumerTransactionTest.java
@@ -43,6 +43,9 @@ public class MllpTcpServerConsumerTransactionTest extends CamelTestSupport {
@RegisterExtension
public static ArtemisService service = ArtemisServiceFactory.createVMService();
+ @RegisterExtension
+ AvailablePortFinder.Port mllpClientPort = AvailablePortFinder.find();
+
@RegisterExtension
public MllpClientResource mllpClient = new MllpClientResource();
@@ -79,7 +82,7 @@ public class MllpTcpServerConsumerTransactionTest extends CamelTestSupport {
protected RouteBuilder createRouteBuilder() {
mllpClient.setMllpHost("localhost");
- mllpClient.setMllpPort(AvailablePortFinder.getNextAvailable());
+ mllpClient.setMllpPort(mllpClientPort.getPort());
return new RouteBuilder() {
int connectTimeout = 500;
diff --git a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/TcpClientProducerEndOfDataAndValidationTestSupport.java b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/TcpClientProducerEndOfDataAndValidationTestSupport.java
index e5deb6575abf..984dc3943d70 100644
--- a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/TcpClientProducerEndOfDataAndValidationTestSupport.java
+++ b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/TcpClientProducerEndOfDataAndValidationTestSupport.java
@@ -68,7 +68,10 @@ public abstract class TcpClientProducerEndOfDataAndValidationTestSupport extends
+ '\n';
@RegisterExtension
- public MllpServerResource mllpServer = new MllpServerResource("localhost", AvailablePortFinder.getNextAvailable());
+ AvailablePortFinder.Port mllpServerPort = AvailablePortFinder.find();
+
+ @RegisterExtension
+ public MllpServerResource mllpServer = new MllpServerResource("localhost", mllpServerPort.getPort());
@EndpointInject("direct://source")
protected ProducerTemplate source;
diff --git a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/TcpServerConsumerAcknowledgementTestSupport.java b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/TcpServerConsumerAcknowledgementTestSupport.java
index 9cab30ff6b7d..846a5361d0c2 100644
--- a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/TcpServerConsumerAcknowledgementTestSupport.java
+++ b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/TcpServerConsumerAcknowledgementTestSupport.java
@@ -41,6 +41,9 @@ public abstract class TcpServerConsumerAcknowledgementTestSupport extends CamelT
static final String EXPECTED_ACKNOWLEDGEMENT = "MSH|^~\\&|^org^sys||APP_A|FAC_A|||ACK^A04^ACK|||2.6" + '\r'
+ "MSA|AA|" + '\r';
+ @RegisterExtension
+ AvailablePortFinder.Port mllpClientPort = AvailablePortFinder.find();
+
@RegisterExtension
public MllpClientResource mllpClient = new MllpClientResource();
@@ -82,7 +85,7 @@ public abstract class TcpServerConsumerAcknowledgementTestSupport extends CamelT
@Override
protected RouteBuilder createRouteBuilder() {
mllpClient.setMllpHost("localhost");
- mllpClient.setMllpPort(AvailablePortFinder.getNextAvailable());
+ mllpClient.setMllpPort(mllpClientPort.getPort());
return new RouteBuilder() {
int connectTimeout = 500;
diff --git a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/TcpServerConsumerEndOfDataAndValidationTestSupport.java b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/TcpServerConsumerEndOfDataAndValidationTestSupport.java
index d05258a5cd32..7caf70688046 100644
--- a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/TcpServerConsumerEndOfDataAndValidationTestSupport.java
+++ b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/TcpServerConsumerEndOfDataAndValidationTestSupport.java
@@ -53,6 +53,9 @@ public abstract class TcpServerConsumerEndOfDataAndValidationTestSupport extends
Logger log = LoggerFactory.getLogger(TcpServerConsumerEndOfDataAndValidationTestSupport.class);
+ @RegisterExtension
+ AvailablePortFinder.Port mllpClientPort = AvailablePortFinder.find();
+
@RegisterExtension
MllpClientResource mllpClient = new MllpClientResource();
@@ -83,7 +86,7 @@ public abstract class TcpServerConsumerEndOfDataAndValidationTestSupport extends
protected RouteBuilder createRouteBuilder() {
mllpClient.setMllpHost("localhost");
- mllpClient.setMllpPort(AvailablePortFinder.getNextAvailable());
+ mllpClient.setMllpPort(mllpClientPort.getPort());
return new RouteBuilder() {
@Override
diff --git a/components/camel-platform-http-vertx/src/test/java/org/apache/camel/component/platform/http/vertx/RestOpenApiCodeFirstOnExceptionIssueTest.java b/components/camel-platform-http-vertx/src/test/java/org/apache/camel/component/platform/http/vertx/RestOpenApiCodeFirstOnExceptionIssueTest.java
index 520a484c4160..2420fd576deb 100644
--- a/components/camel-platform-http-vertx/src/test/java/org/apache/camel/component/platform/http/vertx/RestOpenApiCodeFirstOnExceptionIssueTest.java
+++ b/components/camel-platform-http-vertx/src/test/java/org/apache/camel/component/platform/http/vertx/RestOpenApiCodeFirstOnExceptionIssueTest.java
@@ -24,10 +24,13 @@ import org.apache.camel.impl.DefaultCamelContext;
import org.apache.camel.test.AvailablePortFinder;
import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import static io.restassured.RestAssured.given;
public class RestOpenApiCodeFirstOnExceptionIssueTest extends CamelTestSupport {
+ @RegisterExtension
+ AvailablePortFinder.Port port = AvailablePortFinder.find();
@Override
protected boolean useJmx() {
@@ -110,11 +113,10 @@ public class RestOpenApiCodeFirstOnExceptionIssueTest extends CamelTestSupport {
@Override
public CamelContext createCamelContext() throws Exception {
- int port = AvailablePortFinder.getNextAvailable();
VertxPlatformHttpServerConfiguration conf = new VertxPlatformHttpServerConfiguration();
- conf.setBindPort(port);
+ conf.setBindPort(port.getPort());
- RestAssured.port = port;
+ RestAssured.port = port.getPort();
CamelContext context = new DefaultCamelContext();
context.addService(new VertxPlatformHttpServer(conf));
diff --git a/components/camel-platform-http-vertx/src/test/java/org/apache/camel/component/platform/http/vertx/RestOpenApiContractFirstOnExceptionIssueTest.java b/components/camel-platform-http-vertx/src/test/java/org/apache/camel/component/platform/http/vertx/RestOpenApiContractFirstOnExceptionIssueTest.java
index df56c22a13cf..498927848c23 100644
--- a/components/camel-platform-http-vertx/src/test/java/org/apache/camel/component/platform/http/vertx/RestOpenApiContractFirstOnExceptionIssueTest.java
+++ b/components/camel-platform-http-vertx/src/test/java/org/apache/camel/component/platform/http/vertx/RestOpenApiContractFirstOnExceptionIssueTest.java
@@ -24,10 +24,13 @@ import org.apache.camel.impl.DefaultCamelContext;
import org.apache.camel.test.AvailablePortFinder;
import org.apache.camel.test.junit6.CamelTestSupport;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import static io.restassured.RestAssured.given;
public class RestOpenApiContractFirstOnExceptionIssueTest extends CamelTestSupport {
+ @RegisterExtension
+ AvailablePortFinder.Port port = AvailablePortFinder.find();
@Override
protected boolean useJmx() {
@@ -102,11 +105,10 @@ public class RestOpenApiContractFirstOnExceptionIssueTest extends CamelTestSuppo
@Override
public CamelContext createCamelContext() throws Exception {
- int port = AvailablePortFinder.getNextAvailable();
VertxPlatformHttpServerConfiguration conf = new VertxPlatformHttpServerConfiguration();
- conf.setBindPort(port);
+ conf.setBindPort(port.getPort());
- RestAssured.port = port;
+ RestAssured.port = port.getPort();
CamelContext context = new DefaultCamelContext();
context.addService(new VertxPlatformHttpServer(conf));
diff --git a/components/camel-platform-http-vertx/src/test/java/org/apache/camel/component/platform/http/vertx/VertxPlatformHttpAuthenticationTest.java b/components/camel-platform-http-vertx/src/test/java/org/apache/camel/component/platform/http/vertx/VertxPlatformHttpAuthenticationTest.java
index fa63c984af93..8f2c54a7beb6 100644
--- a/components/camel-platform-http-vertx/src/test/java/org/apache/camel/component/platform/http/vertx/VertxPlatformHttpAuthenticationTest.java
+++ b/components/camel-platform-http-vertx/src/test/java/org/apache/camel/component/platform/http/vertx/VertxPlatformHttpAuthenticationTest.java
@@ -32,11 +32,14 @@ import org.apache.camel.component.platform.http.vertx.auth.AuthenticationConfig.
import org.apache.camel.impl.DefaultCamelContext;
import org.apache.camel.test.AvailablePortFinder;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import static io.restassured.RestAssured.given;
import static org.hamcrest.Matchers.equalTo;
public class VertxPlatformHttpAuthenticationTest {
+ @RegisterExtension
+ AvailablePortFinder.Port port = AvailablePortFinder.find();
@Test
public void testAuthenticationDisabled() throws Exception {
@@ -287,9 +290,8 @@ public class VertxPlatformHttpAuthenticationTest {
private CamelContext createCamelContext(AuthenticationConfigCustomizer customizer)
throws Exception {
- int bindPort = AvailablePortFinder.getNextAvailable();
- RestAssured.port = bindPort;
- return createCamelContext(bindPort, customizer);
+ RestAssured.port = port.getPort();
+ return createCamelContext(port.getPort(), customizer);
}
private CamelContext createCamelContext(int bindPort, AuthenticationConfigCustomizer customizer)
diff --git a/components/camel-platform-http-vertx/src/test/java/org/apache/camel/component/platform/http/vertx/VertxPlatformHttpCookieTest.java b/components/camel-platform-http-vertx/src/test/java/org/apache/camel/component/platform/http/vertx/VertxPlatformHttpCookieTest.java
index b042fed5094f..6a1e5b27332c 100644
--- a/components/camel-platform-http-vertx/src/test/java/org/apache/camel/component/platform/http/vertx/VertxPlatformHttpCookieTest.java
+++ b/components/camel-platform-http-vertx/src/test/java/org/apache/camel/component/platform/http/vertx/VertxPlatformHttpCookieTest.java
@@ -25,6 +25,7 @@ import org.apache.camel.component.platform.http.cookie.CookieHandler;
import org.apache.camel.impl.DefaultCamelContext;
import org.apache.camel.test.AvailablePortFinder;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import static io.restassured.RestAssured.given;
import static io.restassured.matcher.RestAssuredMatchers.detailedCookie;
@@ -32,6 +33,8 @@ import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.notNullValue;
public class VertxPlatformHttpCookieTest {
+ @RegisterExtension
+ AvailablePortFinder.Port port = AvailablePortFinder.find();
// add a cookie using the default cookie configuration
@Test
@@ -250,12 +253,11 @@ public class VertxPlatformHttpCookieTest {
return exchange.getProperty(Exchange.COOKIE_HANDLER, CookieHandler.class);
}
- static CamelContext createCamelContext() throws Exception {
- int port = AvailablePortFinder.getNextAvailable();
+ CamelContext createCamelContext() throws Exception {
VertxPlatformHttpServerConfiguration conf = new VertxPlatformHttpServerConfiguration();
- conf.setBindPort(port);
+ conf.setBindPort(port.getPort());
- RestAssured.port = port;
+ RestAssured.port = port.getPort();
CamelContext context = new DefaultCamelContext();
context.addService(new VertxPlatformHttpServer(conf));
diff --git a/components/camel-platform-http-vertx/src/test/java/org/apache/camel/component/platform/http/vertx/VertxPlatformHttpEngineTest.java b/components/camel-platform-http-vertx/src/test/java/org/apache/camel/component/platform/http/vertx/VertxPlatformHttpEngineTest.java
index 249d624e5796..a49e136363fe 100644
--- a/components/camel-platform-http-vertx/src/test/java/org/apache/camel/component/platform/http/vertx/VertxPlatformHttpEngineTest.java
+++ b/components/camel-platform-http-vertx/src/test/java/org/apache/camel/component/platform/http/vertx/VertxPlatformHttpEngineTest.java
@@ -65,6 +65,7 @@ import org.apache.camel.test.AvailablePortFinder;
import org.apache.hc.client5.http.utils.Base64;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import static io.restassured.RestAssured.get;
import static io.restassured.RestAssured.given;
@@ -82,6 +83,13 @@ import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertNull;
public class VertxPlatformHttpEngineTest {
+ @RegisterExtension
+ AvailablePortFinder.Port port = AvailablePortFinder.find();
+ @RegisterExtension
+ AvailablePortFinder.Port port2 = AvailablePortFinder.find();
+ @RegisterExtension
+ AvailablePortFinder.Port port3 = AvailablePortFinder.find();
+
public static SSLContextParameters serverSSLParameters;
public static SSLContextParameters clientSSLParameters;
@@ -123,7 +131,7 @@ public class VertxPlatformHttpEngineTest {
@Test
public void testEngineSetup() throws Exception {
- final CamelContext context = createCamelContext();
+ final CamelContext context = createCamelContextForTest();
try {
context.start();
@@ -140,7 +148,7 @@ public class VertxPlatformHttpEngineTest {
@Test
public void testEngine() throws Exception {
- final CamelContext context = createCamelContext();
+ final CamelContext context = createCamelContextForTest();
VertxPlatformHttpServer platformHttpServer;
try {
@@ -197,7 +205,7 @@ public class VertxPlatformHttpEngineTest {
@Test
public void testSlowConsumer() throws Exception {
- final CamelContext context = createCamelContext();
+ final CamelContext context = createCamelContextForTest();
try {
context.getRegistry().bind(
@@ -232,7 +240,7 @@ public class VertxPlatformHttpEngineTest {
@Test
public void testSlowConsumerWithTimeout() throws Exception {
- final CamelContext context = createCamelContext();
+ final CamelContext context = createCamelContextForTest();
try {
context.getRegistry().bind(
@@ -266,7 +274,7 @@ public class VertxPlatformHttpEngineTest {
@Test
public void testTimeoutNotExceeded() throws Exception {
- final CamelContext context = createCamelContext();
+ final CamelContext context = createCamelContextForTest();
String response = "Request did not time out";
try {
@@ -295,7 +303,7 @@ public class VertxPlatformHttpEngineTest {
@Test
public void testFailingConsumer() throws Exception {
- final CamelContext context = createCamelContext();
+ final CamelContext context = createCamelContextForTest();
try {
context.addRoutes(new RouteBuilder() {
@@ -325,7 +333,7 @@ public class VertxPlatformHttpEngineTest {
@Test
public void testEngineSSL() throws Exception {
final CamelContext context
- = createCamelContext(configuration -> configuration.setSslContextParameters(serverSSLParameters));
+ = createCamelContextForTest(configuration -> configuration.setSslContextParameters(serverSSLParameters));
try {
context.getRegistry().bind("clientSSLContextParameters", clientSSLParameters);
@@ -352,7 +360,8 @@ public class VertxPlatformHttpEngineTest {
@Test
public void testEngineGlobalSSL() throws Exception {
- final CamelContext context = createCamelContext(configuration -> configuration.setUseGlobalSslContextParameters(true));
+ final CamelContext context
+ = createCamelContextForTest(configuration -> configuration.setUseGlobalSslContextParameters(true));
try {
context.setSSLContextParameters(serverSSLParameters);
@@ -381,7 +390,7 @@ public class VertxPlatformHttpEngineTest {
@Test
public void testEngineCORS() throws Exception {
- final CamelContext context = createCamelContext(configuration -> {
+ final CamelContext context = createCamelContextForTest(configuration -> {
configuration.getCors().setEnabled(true);
configuration.getCors().setMethods(Arrays.asList("GET", "POST"));
});
@@ -419,7 +428,7 @@ public class VertxPlatformHttpEngineTest {
@Test
public void testMatchOnUriPrefix() throws Exception {
- final CamelContext context = createCamelContext();
+ final CamelContext context = createCamelContextForTest();
try {
final String greeting = "Hello Camel";
context.addRoutes(new RouteBuilder() {
@@ -476,7 +485,7 @@ public class VertxPlatformHttpEngineTest {
Files.write(tempFile.toPath(), fileContent.getBytes(StandardCharsets.UTF_8));
}
- final CamelContext context = createCamelContext(configuration -> {
+ final CamelContext context = createCamelContextForTest(configuration -> {
VertxPlatformHttpServerConfiguration.BodyHandler bodyHandler
= new VertxPlatformHttpServerConfiguration.BodyHandler();
// turn on file uploads
@@ -528,7 +537,7 @@ public class VertxPlatformHttpEngineTest {
final String attachmentId = "myTestFile";
final String fileContent = "Test multipart upload content";
final File tempFile = File.createTempFile("platform-http", ".txt");
- final CamelContext context = createCamelContext(configuration -> {
+ final CamelContext context = createCamelContextForTest(configuration -> {
VertxPlatformHttpServerConfiguration.BodyHandler bodyHandler
= new VertxPlatformHttpServerConfiguration.BodyHandler();
// turn on file uploads
@@ -573,7 +582,7 @@ public class VertxPlatformHttpEngineTest {
@Test
public void testFormPost() throws Exception {
- final CamelContext context = createCamelContext();
+ final CamelContext context = createCamelContextForTest();
try {
context.addRoutes(new RouteBuilder() {
@@ -601,7 +610,7 @@ public class VertxPlatformHttpEngineTest {
@Test
public void testTextContentPost() throws Exception {
- final CamelContext context = createCamelContext();
+ final CamelContext context = createCamelContextForTest();
try {
context.addRoutes(new RouteBuilder() {
@@ -630,7 +639,7 @@ public class VertxPlatformHttpEngineTest {
@Test
public void testRestCORSWitchConsumes() throws Exception {
- final CamelContext context = createCamelContext();
+ final CamelContext context = createCamelContextForTest();
try {
context.addRoutes(new RouteBuilder() {
@@ -670,7 +679,7 @@ public class VertxPlatformHttpEngineTest {
@Test
public void testBodyClientRequestValidation() throws Exception {
- final CamelContext context = createCamelContext();
+ final CamelContext context = createCamelContextForTest();
try {
context.addRoutes(new RouteBuilder() {
@@ -723,7 +732,7 @@ public class VertxPlatformHttpEngineTest {
AuthenticationProvider authProvider = PropertyFileAuthentication.create(vertx, "authentication/auth.properties");
BasicAuthHandler basicAuthHandler = BasicAuthHandler.create(authProvider);
- CamelContext context = createCamelContext();
+ CamelContext context = createCamelContextForTest();
context.addRoutes(new RouteBuilder() {
@Override
public void configure() {
@@ -772,7 +781,7 @@ public class VertxPlatformHttpEngineTest {
@Test
public void testRequestBodyAllowed() throws Exception {
- final CamelContext context = createCamelContext();
+ final CamelContext context = createCamelContextForTest();
try {
context.addRoutes(new RouteBuilder() {
@@ -810,7 +819,7 @@ public class VertxPlatformHttpEngineTest {
public void testRequestBodyAllowedFormUrlEncoded() throws Exception {
// Methods that are allowed a request body by Vert.x web for application/x-www-form-urlencoded
final List<Method> methodsWithBodyAllowed = List.of(Method.POST, Method.PUT, Method.PATCH, Method.DELETE);
- final CamelContext context = createCamelContext();
+ final CamelContext context = createCamelContextForTest();
try {
context.addRoutes(new RouteBuilder() {
@@ -848,7 +857,7 @@ public class VertxPlatformHttpEngineTest {
@Test
public void responseHeaders() throws Exception {
- final CamelContext context = createCamelContext();
+ final CamelContext context = createCamelContextForTest();
try {
context.addRoutes(new RouteBuilder() {
@@ -881,7 +890,7 @@ public class VertxPlatformHttpEngineTest {
@Test
public void responseMultipleHeaders() throws Exception {
- final CamelContext context = createCamelContext();
+ final CamelContext context = createCamelContextForTest();
try {
context.addRoutes(new RouteBuilder() {
@@ -911,7 +920,7 @@ public class VertxPlatformHttpEngineTest {
@Test
public void testConsumerSuspended() throws Exception {
- final CamelContext context = createCamelContext();
+ final CamelContext context = createCamelContextForTest();
try {
context.addRoutes(new RouteBuilder() {
@@ -947,7 +956,7 @@ public class VertxPlatformHttpEngineTest {
@Test
public void testInvalidContentTypeClientRequestValidation() throws Exception {
- final CamelContext context = createCamelContext();
+ final CamelContext context = createCamelContextForTest();
try {
context.addRoutes(new RouteBuilder() {
@@ -982,7 +991,7 @@ public class VertxPlatformHttpEngineTest {
@Test
public void testLocalAddressHeader() throws Exception {
- final CamelContext context = createCamelContext();
+ final CamelContext context = createCamelContextForTest();
try {
context.addRoutes(new RouteBuilder() {
@@ -1011,7 +1020,7 @@ public class VertxPlatformHttpEngineTest {
@Test
public void testRemoteAddressHeader() throws Exception {
- final CamelContext context = createCamelContext();
+ final CamelContext context = createCamelContextForTest();
try {
context.addRoutes(new RouteBuilder() {
@@ -1040,7 +1049,7 @@ public class VertxPlatformHttpEngineTest {
@Test
public void testVertxRequestResponseObjects() throws Exception {
- final CamelContext context = createCamelContext();
+ final CamelContext context = createCamelContextForTest();
try {
context.addRoutes(new RouteBuilder() {
@@ -1070,7 +1079,7 @@ public class VertxPlatformHttpEngineTest {
@Test
public void testAddCookie() throws Exception {
- final CamelContext context = createCamelContext();
+ final CamelContext context = createCamelContextForTest();
try {
context.addRoutes(new RouteBuilder() {
@@ -1103,7 +1112,7 @@ public class VertxPlatformHttpEngineTest {
@Test
public void testRemoveCookie() throws Exception {
- final CamelContext context = createCamelContext();
+ final CamelContext context = createCamelContextForTest();
try {
context.addRoutes(new RouteBuilder() {
@@ -1139,7 +1148,7 @@ public class VertxPlatformHttpEngineTest {
@Test
public void testReplaceCookie() throws Exception {
- final CamelContext context = createCamelContext();
+ final CamelContext context = createCamelContextForTest();
try {
context.addRoutes(new RouteBuilder() {
@@ -1177,7 +1186,7 @@ public class VertxPlatformHttpEngineTest {
@Test
public void testResponseTypeConversionErrorHandled() throws Exception {
- final CamelContext context = createCamelContext();
+ final CamelContext context = createCamelContextForTest();
try {
context.addRoutes(new RouteBuilder() {
@@ -1201,7 +1210,7 @@ public class VertxPlatformHttpEngineTest {
@Test
public void testResponseBadQueryParamErrorHandled() throws Exception {
- final CamelContext context = createCamelContext();
+ final CamelContext context = createCamelContextForTest();
try {
context.addRoutes(new RouteBuilder() {
@@ -1228,8 +1237,8 @@ public class VertxPlatformHttpEngineTest {
// This test simulates CAMEL-22937: when both main server and management server are running,
// findSingleByType returns null because there are multiple instances of VertxPlatformHttpServer.
// The engine should prefer the main server (SERVER_TYPE_SERVER) over the management server.
- int mainPort = AvailablePortFinder.getNextAvailable();
- int managementPort = AvailablePortFinder.getNextAvailable();
+ int mainPort = port2.getPort();
+ int managementPort = port3.getPort();
VertxPlatformHttpServerConfiguration mainConf = new VertxPlatformHttpServerConfiguration();
mainConf.setBindPort(mainPort);
@@ -1285,16 +1294,8 @@ public class VertxPlatformHttpEngineTest {
// camel.server.port = 8084
// camel.management.port = 8083
// The engine should always prefer the main server port.
- int serverPort = 8084;
- int managementPort = 8083;
-
- // Check if ports are available, otherwise use dynamic ports
- if (!isPortAvailable(serverPort)) {
- serverPort = AvailablePortFinder.getNextAvailable();
- }
- if (!isPortAvailable(managementPort)) {
- managementPort = AvailablePortFinder.getNextAvailable();
- }
+ int serverPort = port2.getPort();
+ int managementPort = port3.getPort();
VertxPlatformHttpServerConfiguration mainConf = new VertxPlatformHttpServerConfiguration();
mainConf.setBindPort(serverPort);
@@ -1343,21 +1344,27 @@ public class VertxPlatformHttpEngineTest {
}
}
- private boolean isPortAvailable(int port) {
- try (java.net.ServerSocket socket = new java.net.ServerSocket(port)) {
- socket.setReuseAddress(true);
- return true;
- } catch (java.io.IOException e) {
- return false;
- }
- }
-
static CamelContext createCamelContext() throws Exception {
- return createCamelContext(null);
+ return createCamelContext(AvailablePortFinder.find().getPort(), null);
}
static CamelContext createCamelContext(ServerConfigurationCustomizer customizer) throws Exception {
- int port = AvailablePortFinder.getNextAvailable();
+ return createCamelContext(AvailablePortFinder.find().getPort(), customizer);
+ }
+
+ CamelContext createCamelContextForTest() throws Exception {
+ return createCamelContext(port.getPort(), null);
+ }
+
+ CamelContext createCamelContextForTest(ServerConfigurationCustomizer customizer) throws Exception {
+ return createCamelContext(port.getPort(), customizer);
+ }
+
+ static CamelContext createCamelContext(int port) throws Exception {
+ return createCamelContext(port, null);
+ }
+
+ static CamelContext createCamelContext(int port, ServerConfigurationCustomizer customizer) throws Exception {
VertxPlatformHttpServerConfiguration conf = new VertxPlatformHttpServerConfiguration();
conf.setBindPort(port);
diff --git a/components/camel-platform-http-vertx/src/test/java/org/apache/camel/component/platform/http/vertx/VertxPlatformHttpNoBodyHandlerTest.java b/components/camel-platform-http-vertx/src/test/java/org/apache/camel/component/platform/http/vertx/VertxPlatformHttpNoBodyHandlerTest.java
index 48b23bd37d1a..216b1ed36ceb 100644
--- a/components/camel-platform-http-vertx/src/test/java/org/apache/camel/component/platform/http/vertx/VertxPlatformHttpNoBodyHandlerTest.java
+++ b/components/camel-platform-http-vertx/src/test/java/org/apache/camel/component/platform/http/vertx/VertxPlatformHttpNoBodyHandlerTest.java
@@ -24,6 +24,7 @@ import org.apache.camel.test.AvailablePortFinder;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
import static com.github.tomakehurst.wiremock.client.WireMock.containing;
@@ -34,11 +35,14 @@ import static io.restassured.RestAssured.given;
import static org.hamcrest.Matchers.is;
public class VertxPlatformHttpNoBodyHandlerTest {
- private final int port = AvailablePortFinder.getNextAvailable();
- private final WireMockServer wireMockServer = new WireMockServer(options().port(port));
+ @RegisterExtension
+ AvailablePortFinder.Port port = AvailablePortFinder.find();
+
+ private WireMockServer wireMockServer;
@BeforeEach
void before() {
+ wireMockServer = new WireMockServer(options().port(port.getPort()));
wireMockServer.stubFor(post(urlPathEqualTo("/test"))
.withRequestBody(containing("Hello World"))
.willReturn(aResponse()
diff --git a/components/camel-platform-http-vertx/src/test/java/org/apache/camel/component/platform/http/vertx/VertxPlatformHttpPooledExchangeTest.java b/components/camel-platform-http-vertx/src/test/java/org/apache/camel/component/platform/http/vertx/VertxPlatformHttpPooledExchangeTest.java
index 1ca531ce8781..392d91893d6c 100644
--- a/components/camel-platform-http-vertx/src/test/java/org/apache/camel/component/platform/http/vertx/VertxPlatformHttpPooledExchangeTest.java
+++ b/components/camel-platform-http-vertx/src/test/java/org/apache/camel/component/platform/http/vertx/VertxPlatformHttpPooledExchangeTest.java
@@ -31,6 +31,7 @@ import org.apache.camel.spi.PooledObjectFactory;
import org.apache.camel.test.AvailablePortFinder;
import org.awaitility.Awaitility;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import static io.restassured.RestAssured.get;
import static org.assertj.core.api.Assertions.assertThat;
@@ -38,6 +39,8 @@ import static org.hamcrest.Matchers.is;
import static org.junit.jupiter.api.Assertions.assertEquals;
public class VertxPlatformHttpPooledExchangeTest {
+ @RegisterExtension
+ AvailablePortFinder.Port port = AvailablePortFinder.find();
@Test
public void testEngineSetup() throws Exception {
@@ -93,16 +96,15 @@ public class VertxPlatformHttpPooledExchangeTest {
}
}
- static CamelContext createCamelContext() throws Exception {
+ CamelContext createCamelContext() throws Exception {
return createCamelContext(null);
}
- private static CamelContext createCamelContext(ServerConfigurationCustomizer customizer) throws Exception {
- int port = AvailablePortFinder.getNextAvailable();
+ private CamelContext createCamelContext(ServerConfigurationCustomizer customizer) throws Exception {
VertxPlatformHttpServerConfiguration conf = new VertxPlatformHttpServerConfiguration();
- conf.setBindPort(port);
+ conf.setBindPort(port.getPort());
- RestAssured.port = port;
+ RestAssured.port = port.getPort();
if (customizer != null) {
customizer.customize(conf);
diff --git a/components/camel-platform-http-vertx/src/test/java/org/apache/camel/component/platform/http/vertx/VertxPlatformHttpProxyTest.java b/components/camel-platform-http-vertx/src/test/java/org/apache/camel/component/platform/http/vertx/VertxPlatformHttpProxyTest.java
index b393b4dd7f09..e2a3083be4bc 100644
--- a/components/camel-platform-http-vertx/src/test/java/org/apache/camel/component/platform/http/vertx/VertxPlatformHttpProxyTest.java
+++ b/components/camel-platform-http-vertx/src/test/java/org/apache/camel/component/platform/http/vertx/VertxPlatformHttpProxyTest.java
@@ -25,6 +25,7 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.test.AvailablePortFinder;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.extension.RegisterExtension;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.ValueSource;
@@ -36,11 +37,14 @@ import static io.restassured.RestAssured.given;
import static org.hamcrest.Matchers.containsString;
public class VertxPlatformHttpProxyTest {
- private final int port = AvailablePortFinder.getNextAvailable();
- private final WireMockServer wireMockServer = new WireMockServer(options().port(port));
+ @RegisterExtension
+ AvailablePortFinder.Port port = AvailablePortFinder.find();
+
+ private WireMockServer wireMockServer;
@BeforeEach
void before() {
+ wireMockServer = new WireMockServer(options().port(port.getPort()));
wireMockServer.stubFor(get(urlPathEqualTo("/"))
.willReturn(aResponse()
.withBody(
diff --git a/components/camel-platform-http-vertx/src/test/java/org/apache/camel/component/platform/http/vertx/VertxPlatformHttpSessionTest.java b/components/camel-platform-http-vertx/src/test/java/org/apache/camel/component/platform/http/vertx/VertxPlatformHttpSessionTest.java
index 8f6dd316ff09..77bd6da80f21 100644
--- a/components/camel-platform-http-vertx/src/test/java/org/apache/camel/component/platform/http/vertx/VertxPlatformHttpSessionTest.java
+++ b/components/camel-platform-http-vertx/src/test/java/org/apache/camel/component/platform/http/vertx/VertxPlatformHttpSessionTest.java
@@ -34,6 +34,7 @@ import org.apache.camel.http.base.cookie.InstanceCookieHandler;
import org.apache.camel.impl.DefaultCamelContext;
import org.apache.camel.test.AvailablePortFinder;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import static io.restassured.RestAssured.given;
import static io.restassured.matcher.RestAssuredMatchers.detailedCookie;
@@ -43,6 +44,10 @@ import static org.hamcrest.Matchers.nullValue;
import static org.junit.jupiter.api.Assertions.*;
public class VertxPlatformHttpSessionTest {
+ @RegisterExtension
+ AvailablePortFinder.Port port = AvailablePortFinder.find();
+ @RegisterExtension
+ AvailablePortFinder.Port sessionPort = AvailablePortFinder.find();
@Test
public void testSessionDisabled() throws Exception {
@@ -160,8 +165,7 @@ public class VertxPlatformHttpSessionTest {
@Test
public void testSessionHandling() throws Exception {
- int port = AvailablePortFinder.getNextAvailable();
- CamelContext context = createCamelContext(port,
+ CamelContext context = createCamelContext(sessionPort.getPort(),
sessionConfig -> {
sessionConfig.setEnabled(true);
});
@@ -177,7 +181,7 @@ public class VertxPlatformHttpSessionTest {
from("direct:session")
.toF("http://localhost:%d/session?cookieHandler=#instanceCookieHander",
- port);
+ sessionPort.getPort());
}
});
@@ -211,9 +215,8 @@ public class VertxPlatformHttpSessionTest {
private CamelContext createCamelContext(SessionConfigCustomizer customizer)
throws Exception {
- int bindPort = AvailablePortFinder.getNextAvailable();
- RestAssured.port = bindPort;
- return createCamelContext(bindPort, customizer);
+ RestAssured.port = port.getPort();
+ return createCamelContext(port.getPort(), customizer);
}
private CamelContext createCamelContext(int bindPort, SessionConfigCustomizer customizer)
diff --git a/components/camel-platform-http-vertx/src/test/java/org/apache/camel/component/platform/http/vertx/VertxPlatformHttpSharedVertxTest.java b/components/camel-platform-http-vertx/src/test/java/org/apache/camel/component/platform/http/vertx/VertxPlatformHttpSharedVertxTest.java
index 4fc124b33ed5..0a5d1ea6ae5e 100644
--- a/components/camel-platform-http-vertx/src/test/java/org/apache/camel/component/platform/http/vertx/VertxPlatformHttpSharedVertxTest.java
+++ b/components/camel-platform-http-vertx/src/test/java/org/apache/camel/component/platform/http/vertx/VertxPlatformHttpSharedVertxTest.java
@@ -26,10 +26,14 @@ import org.apache.camel.impl.DefaultCamelContext;
import org.apache.camel.test.AvailablePortFinder;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import static org.junit.jupiter.api.Assertions.assertTrue;
class VertxPlatformHttpSharedVertxTest {
+ @RegisterExtension
+ AvailablePortFinder.Port port = AvailablePortFinder.find();
+
private static final Vertx vertx = Vertx.vertx();
@AfterAll
@@ -43,7 +47,7 @@ class VertxPlatformHttpSharedVertxTest {
void sharedVertxInstanceNotClosed() throws Exception {
try (CamelContext context = new DefaultCamelContext()) {
VertxPlatformHttpServerConfiguration configuration = new VertxPlatformHttpServerConfiguration();
- configuration.setBindPort(AvailablePortFinder.getNextAvailable());
+ configuration.setBindPort(port.getPort());
context.getRegistry().bind("vertx", vertx);
context.addService(new VertxPlatformHttpServer(configuration));
diff --git a/components/camel-platform-http-vertx/src/test/java/org/apache/camel/component/platform/http/vertx/VertxPlatformHttpsProxyTest.java b/components/camel-platform-http-vertx/src/test/java/org/apache/camel/component/platform/http/vertx/VertxPlatformHttpsProxyTest.java
index b904706c09a4..7f77878ef0af 100644
--- a/components/camel-platform-http-vertx/src/test/java/org/apache/camel/component/platform/http/vertx/VertxPlatformHttpsProxyTest.java
+++ b/components/camel-platform-http-vertx/src/test/java/org/apache/camel/component/platform/http/vertx/VertxPlatformHttpsProxyTest.java
@@ -31,6 +31,7 @@ import org.apache.http.conn.ssl.NoopHostnameVerifier;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
import static com.github.tomakehurst.wiremock.client.WireMock.get;
@@ -40,17 +41,19 @@ import static io.restassured.RestAssured.given;
import static org.hamcrest.Matchers.containsString;
public class VertxPlatformHttpsProxyTest {
+ @RegisterExtension
+ AvailablePortFinder.Port port = AvailablePortFinder.find();
- private final int port = AvailablePortFinder.getNextAvailable();
- private final WireMockServer wireMockServer = new WireMockServer(
- options().httpsPort(port)
- .httpDisabled(true)
- .keystorePath("proxy/keystore.p12")
- .keystorePassword("changeit")
- .keyManagerPassword("changeit"));
+ private WireMockServer wireMockServer;
@BeforeEach
void before() {
+ wireMockServer = new WireMockServer(
+ options().httpsPort(port.getPort())
+ .httpDisabled(true)
+ .keystorePath("proxy/keystore.p12")
+ .keystorePassword("changeit")
+ .keyManagerPassword("changeit"));
wireMockServer.stubFor(get(urlPathEqualTo("/"))
.willReturn(aResponse()
.withBody(
@@ -91,7 +94,7 @@ public class VertxPlatformHttpsProxyTest {
// In order to make sure that RestAssured don't perform a CONNECT instead of a GET, we do trick with http
// if we want to do test manually from a terminal we use the real HTTPS address
- final var originURI = "http://localhost:" + port;
+ final var originURI = "http://localhost:" + port.getPort();
given()
.proxy(proxyURI)
diff --git a/components/camel-platform-http-vertx/src/test/java/org/apache/camel/component/platform/http/vertx/VertxPlatformMultipleContentTypeTest.java b/components/camel-platform-http-vertx/src/test/java/org/apache/camel/component/platform/http/vertx/VertxPlatformMultipleContentTypeTest.java
index 2b7055897c62..7f4ba2040c62 100644
--- a/components/camel-platform-http-vertx/src/test/java/org/apache/camel/component/platform/http/vertx/VertxPlatformMultipleContentTypeTest.java
+++ b/components/camel-platform-http-vertx/src/test/java/org/apache/camel/component/platform/http/vertx/VertxPlatformMultipleContentTypeTest.java
@@ -30,10 +30,14 @@ import org.apache.camel.support.jsse.TrustManagersParameters;
import org.apache.camel.test.AvailablePortFinder;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import static org.hamcrest.Matchers.is;
public class VertxPlatformMultipleContentTypeTest {
+ @RegisterExtension
+ AvailablePortFinder.Port port = AvailablePortFinder.find();
+
public static SSLContextParameters serverSSLParameters;
public static SSLContextParameters clientSSLParameters;
@@ -179,16 +183,15 @@ public class VertxPlatformMultipleContentTypeTest {
}
}
- static CamelContext createCamelContext() throws Exception {
+ CamelContext createCamelContext() throws Exception {
return createCamelContext(null);
}
- private static CamelContext createCamelContext(ServerConfigurationCustomizer customizer) throws Exception {
- int port = AvailablePortFinder.getNextAvailable();
+ private CamelContext createCamelContext(ServerConfigurationCustomizer customizer) throws Exception {
VertxPlatformHttpServerConfiguration conf = new VertxPlatformHttpServerConfiguration();
- conf.setBindPort(port);
+ conf.setBindPort(port.getPort());
- RestAssured.port = port;
+ RestAssured.port = port.getPort();
if (customizer != null) {
customizer.customize(conf);
diff --git a/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/AutomatedConversionTest.java b/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/AutomatedConversionTest.java
index 83470c21bd99..06f732b60a77 100644
--- a/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/AutomatedConversionTest.java
+++ b/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/AutomatedConversionTest.java
@@ -27,14 +27,15 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.AvailablePortFinder;
import org.apache.camel.test.junit6.CamelTestSupport;
-import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import static org.junit.jupiter.api.Assertions.assertTrue;
public class AutomatedConversionTest extends CamelTestSupport {
- private static int serverPort;
+ @RegisterExtension
+ AvailablePortFinder.Port serverPort = AvailablePortFinder.find();
private final int messageCount = 1;
private final String rfc3164Message
= "<165>Aug 4 05:34:00 mymachine myproc[10]: %% It's\n time to make the do-nuts. %% Ingredients: Mix=OK, Jelly=OK #\n"
@@ -43,11 +44,6 @@ public class AutomatedConversionTest extends CamelTestSupport {
private final String rfc5424Message
= "<34>1 2003-10-11T22:14:15.003Z mymachine.example.com su - ID47 - BOM'su root' failed for lonvick on /dev/pts/8";
- @BeforeAll
- public static void initPort() {
- serverPort = AvailablePortFinder.getNextAvailable();
- }
-
@Test
public void testSendingRawUDP() throws IOException, InterruptedException {
@@ -62,13 +58,13 @@ public class AutomatedConversionTest extends CamelTestSupport {
InetAddress address = InetAddress.getByName("127.0.0.1");
for (int i = 0; i < messageCount; i++) {
byte[] data = rfc3164Message.getBytes();
- DatagramPacket packet = new DatagramPacket(data, data.length, address, serverPort);
+ DatagramPacket packet = new DatagramPacket(data, data.length, address, serverPort.getPort());
socket.send(packet);
Thread.sleep(100);
}
for (int i = 0; i < messageCount; i++) {
byte[] data = rfc5424Message.getBytes();
- DatagramPacket packet = new DatagramPacket(data, data.length, address, serverPort);
+ DatagramPacket packet = new DatagramPacket(data, data.length, address, serverPort.getPort());
socket.send(packet);
Thread.sleep(100);
}
@@ -85,7 +81,7 @@ public class AutomatedConversionTest extends CamelTestSupport {
@Override
public void configure() {
// we setup a Syslog listener on a random port.
- from("mina:udp://127.0.0.1:" + serverPort).unmarshal().syslog().process(new Processor() {
+ from("mina:udp://127.0.0.1:" + serverPort.getPort()).unmarshal().syslog().process(new Processor() {
@Override
public void process(Exchange ex) {
assertTrue(ex.getIn().getBody() instanceof SyslogMessage);
diff --git a/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/MinaDataFormatTest.java b/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/MinaDataFormatTest.java
index 2f8af0c01623..837a010eed8b 100644
--- a/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/MinaDataFormatTest.java
+++ b/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/MinaDataFormatTest.java
@@ -28,25 +28,21 @@ import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.spi.DataFormat;
import org.apache.camel.test.AvailablePortFinder;
import org.apache.camel.test.junit6.CamelTestSupport;
-import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import static org.junit.jupiter.api.Assertions.assertTrue;
public class MinaDataFormatTest extends CamelTestSupport {
- private static int serverPort;
+ @RegisterExtension
+ AvailablePortFinder.Port serverPort = AvailablePortFinder.find();
private final int messageCount = 1;
private final String message
= "<165>Aug 4 05:34:00 mymachine myproc[10]: %% It's\n time to make the do-nuts. %% Ingredients: Mix=OK, Jelly=OK #\n"
+ " Devices: Mixer=OK, Jelly_Injector=OK, Frier=OK # Transport:\n"
+ " Conveyer1=OK, Conveyer2=OK # %%";
- @BeforeAll
- public static void initPort() {
- serverPort = AvailablePortFinder.getNextAvailable();
- }
-
@Test
public void testSendingRawUDP() throws IOException, InterruptedException {
@@ -63,7 +59,7 @@ public class MinaDataFormatTest extends CamelTestSupport {
byte[] data = message.getBytes();
- DatagramPacket packet = new DatagramPacket(data, data.length, address, serverPort);
+ DatagramPacket packet = new DatagramPacket(data, data.length, address, serverPort.getPort());
socket.send(packet);
Thread.sleep(100);
}
@@ -83,7 +79,7 @@ public class MinaDataFormatTest extends CamelTestSupport {
DataFormat syslogDataFormat = new SyslogDataFormat();
// we setup a Syslog listener on a random port.
- from("mina:udp://127.0.0.1:" + serverPort).unmarshal(syslogDataFormat).process(new Processor() {
+ from("mina:udp://127.0.0.1:" + serverPort.getPort()).unmarshal(syslogDataFormat).process(new Processor() {
public void process(Exchange ex) {
assertTrue(ex.getIn().getBody() instanceof SyslogMessage);
}
diff --git a/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/MinaManyUDPMessagesTest.java b/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/MinaManyUDPMessagesTest.java
index d95b211ebd63..b30d6dab44a2 100644
--- a/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/MinaManyUDPMessagesTest.java
+++ b/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/MinaManyUDPMessagesTest.java
@@ -27,25 +27,21 @@ import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.spi.DataFormat;
import org.apache.camel.test.AvailablePortFinder;
import org.apache.camel.test.junit6.CamelTestSupport;
-import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import static org.junit.jupiter.api.Assertions.assertTrue;
public class MinaManyUDPMessagesTest extends CamelTestSupport {
- private static int serverPort;
+ @RegisterExtension
+ AvailablePortFinder.Port serverPort = AvailablePortFinder.find();
private final int messageCount = 100;
private final String message
= "<165>Aug 4 05:34:00 mymachine myproc[10]: %% It's\n time to make the do-nuts. %% Ingredients: Mix=OK, Jelly=OK #\n"
+ " Devices: Mixer=OK, Jelly_Injector=OK, Frier=OK # Transport:\n"
+ " Conveyer1=OK, Conveyer2=OK # %%";
- @BeforeAll
- public static void initPort() {
- serverPort = AvailablePortFinder.getNextAvailable();
- }
-
@Test
public void testSendingManyMessages() throws Exception {
MockEndpoint stop1 = getMockEndpoint("mock:stop1");
@@ -60,7 +56,7 @@ public class MinaManyUDPMessagesTest extends CamelTestSupport {
byte[] data = message.getBytes();
- DatagramPacket packet = new DatagramPacket(data, data.length, address, serverPort);
+ DatagramPacket packet = new DatagramPacket(data, data.length, address, serverPort.getPort());
socket.send(packet);
Thread.sleep(100);
}
@@ -80,7 +76,7 @@ public class MinaManyUDPMessagesTest extends CamelTestSupport {
DataFormat syslogDataFormat = new SyslogDataFormat();
// we setup a Syslog listener on a random port.
- from("mina:udp://127.0.0.1:" + serverPort).unmarshal(syslogDataFormat).process(new Processor() {
+ from("mina:udp://127.0.0.1:" + serverPort.getPort()).unmarshal(syslogDataFormat).process(new Processor() {
public void process(Exchange ex) {
assertTrue(ex.getIn().getBody() instanceof SyslogMessage);
}
diff --git a/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/NettyDataFormatTest.java b/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/NettyDataFormatTest.java
index ea26bc6c41d7..3d04a96466af 100644
--- a/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/NettyDataFormatTest.java
+++ b/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/NettyDataFormatTest.java
@@ -28,25 +28,21 @@ import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.spi.DataFormat;
import org.apache.camel.test.AvailablePortFinder;
import org.apache.camel.test.junit6.CamelTestSupport;
-import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import static org.junit.jupiter.api.Assertions.assertTrue;
public class NettyDataFormatTest extends CamelTestSupport {
- private static int serverPort;
+ @RegisterExtension
+ AvailablePortFinder.Port serverPort = AvailablePortFinder.find();
private final int messageCount = 1;
private final String message
= "<165>Aug 4 05:34:00 mymachine myproc[10]: %% It's\n time to make the do-nuts. %% Ingredients: Mix=OK, Jelly=OK #\n"
+ " Devices: Mixer=OK, Jelly_Injector=OK, Frier=OK # Transport:\n"
+ " Conveyer1=OK, Conveyer2=OK # %%";
- @BeforeAll
- public static void initPort() {
- serverPort = AvailablePortFinder.getNextAvailable();
- }
-
@Test
public void testSendingRawUDP() throws IOException, InterruptedException {
@@ -63,7 +59,7 @@ public class NettyDataFormatTest extends CamelTestSupport {
byte[] data = message.getBytes();
- DatagramPacket packet = new DatagramPacket(data, data.length, address, serverPort);
+ DatagramPacket packet = new DatagramPacket(data, data.length, address, serverPort.getPort());
socket.send(packet);
Thread.sleep(100);
}
@@ -83,7 +79,8 @@ public class NettyDataFormatTest extends CamelTestSupport {
mock2.expectedMessageCount(1);
mock2.expectedBodiesReceived(message);
- template.sendBody("netty:udp://127.0.0.1:" + serverPort + "?sync=false&allowDefaultCodec=false&useByteBuf=true",
+ template.sendBody(
+ "netty:udp://127.0.0.1:" + serverPort.getPort() + "?sync=false&allowDefaultCodec=false&useByteBuf=true",
message);
MockEndpoint.assertIsSatisfied(context);
@@ -98,7 +95,8 @@ public class NettyDataFormatTest extends CamelTestSupport {
DataFormat syslogDataFormat = new SyslogDataFormat();
// we setup a Syslog listener on a random port.
- from("netty:udp://127.0.0.1:" + serverPort + "?sync=false&allowDefaultCodec=false").unmarshal(syslogDataFormat)
+ from("netty:udp://127.0.0.1:" + serverPort.getPort() + "?sync=false&allowDefaultCodec=false")
+ .unmarshal(syslogDataFormat)
.process(new Processor() {
public void process(Exchange ex) {
assertTrue(ex.getIn().getBody() instanceof SyslogMessage);
diff --git a/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/NettyManyUDPMessagesTest.java b/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/NettyManyUDPMessagesTest.java
index 09bbb6b45955..084d4d962be2 100644
--- a/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/NettyManyUDPMessagesTest.java
+++ b/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/NettyManyUDPMessagesTest.java
@@ -27,25 +27,21 @@ import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.spi.DataFormat;
import org.apache.camel.test.AvailablePortFinder;
import org.apache.camel.test.junit6.CamelTestSupport;
-import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import static org.junit.jupiter.api.Assertions.assertTrue;
public class NettyManyUDPMessagesTest extends CamelTestSupport {
- private static int serverPort;
+ @RegisterExtension
+ AvailablePortFinder.Port serverPort = AvailablePortFinder.find();
private final int messageCount = 100;
private final String message
= "<165>Aug 4 05:34:00 mymachine myproc[10]: %% It's\n time to make the do-nuts. %% Ingredients: Mix=OK, Jelly=OK #\n"
+ " Devices: Mixer=OK, Jelly_Injector=OK, Frier=OK # Transport:\n"
+ " Conveyer1=OK, Conveyer2=OK # %%";
- @BeforeAll
- public static void initPort() {
- serverPort = AvailablePortFinder.getNextAvailable();
- }
-
@Test
public void testSendingManyMessages() throws Exception {
MockEndpoint stop1 = getMockEndpoint("mock:stop1");
@@ -60,7 +56,7 @@ public class NettyManyUDPMessagesTest extends CamelTestSupport {
byte[] data = message.getBytes();
- DatagramPacket packet = new DatagramPacket(data, data.length, address, serverPort);
+ DatagramPacket packet = new DatagramPacket(data, data.length, address, serverPort.getPort());
socket.send(packet);
Thread.sleep(100);
}
@@ -80,7 +76,8 @@ public class NettyManyUDPMessagesTest extends CamelTestSupport {
DataFormat syslogDataFormat = new SyslogDataFormat();
// we setup a Syslog listener on a random port.
- from("netty:udp://127.0.0.1:" + serverPort + "?sync=false&allowDefaultCodec=false").unmarshal(syslogDataFormat)
+ from("netty:udp://127.0.0.1:" + serverPort.getPort() + "?sync=false&allowDefaultCodec=false")
+ .unmarshal(syslogDataFormat)
.process(new Processor() {
public void process(Exchange ex) {
assertTrue(ex.getIn().getBody() instanceof SyslogMessage);
diff --git a/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/NettyRfc5425LongMessageTest.java b/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/NettyRfc5425LongMessageTest.java
index 1738732f8192..3cbbb7c55fb8 100644
--- a/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/NettyRfc5425LongMessageTest.java
+++ b/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/NettyRfc5425LongMessageTest.java
@@ -28,15 +28,15 @@ import org.apache.camel.spi.DataFormat;
import org.apache.camel.spi.Registry;
import org.apache.camel.test.AvailablePortFinder;
import org.apache.camel.test.junit6.CamelTestSupport;
-import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import static org.junit.jupiter.api.Assertions.assertTrue;
public class NettyRfc5425LongMessageTest extends CamelTestSupport {
- private static String uri;
- private static int serverPort;
+ @RegisterExtension
+ AvailablePortFinder.Port serverPort = AvailablePortFinder.find();
private static final String MESSAGE = "<34>1 2003-10-11T22:14:15.003Z mymachine.example.com su - ID47 - "
+ "Lorem ipsum dolor sit amet, tempor democritum vix ad, est partiendo laboramus ei. "
+ "Munere laudem commune vis ad, et qui altera singulis. Ut assum deleniti sit, vix constituto assueverit appellantur at, et meis voluptua usu. "
@@ -55,12 +55,6 @@ public class NettyRfc5425LongMessageTest extends CamelTestSupport {
@BindToRegistry("encoder")
private Rfc5425Encoder encoder = new Rfc5425Encoder();
- @BeforeAll
- public static void initPort() {
- serverPort = AvailablePortFinder.getNextAvailable();
- uri = "netty:tcp://localhost:" + serverPort + "?sync=false&allowDefaultCodec=false&decoders=#decoder&encoders=#encoder";
- }
-
@Test
public void testSendingCamel() throws Exception {
@@ -84,6 +78,8 @@ public class NettyRfc5425LongMessageTest extends CamelTestSupport {
public void configure() {
context.setTracing(true);
DataFormat syslogDataFormat = new SyslogDataFormat();
+ String uri = "netty:tcp://localhost:" + serverPort.getPort()
+ + "?sync=false&allowDefaultCodec=false&decoders=#decoder&encoders=#encoder";
// we setup a Syslog listener on a random port.
from(uri).unmarshal(syslogDataFormat).process(new Processor() {
diff --git a/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/NettyRfc5425Test.java b/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/NettyRfc5425Test.java
index b21b3826bc49..a2f92c7d43f6 100644
--- a/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/NettyRfc5425Test.java
+++ b/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/NettyRfc5425Test.java
@@ -27,17 +27,16 @@ import org.apache.camel.spi.DataFormat;
import org.apache.camel.spi.Registry;
import org.apache.camel.test.AvailablePortFinder;
import org.apache.camel.test.junit6.CamelTestSupport;
-import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
public class NettyRfc5425Test extends CamelTestSupport {
- private static String uri;
- private static String uriClient;
- private static int serverPort;
+ @RegisterExtension
+ AvailablePortFinder.Port serverPort = AvailablePortFinder.find();
private final String rfc3164Message
= "<165>Aug 4 05:34:00 mymachine myproc[10]: %% It's\n time to make the do-nuts. %% Ingredients: Mix=OK, Jelly=OK #\n"
+ " Devices: Mixer=OK, Jelly_Injector=OK, Frier=OK # Transport:\n"
@@ -52,13 +51,6 @@ public class NettyRfc5425Test extends CamelTestSupport {
@BindToRegistry("encoder")
private Rfc5425Encoder encoder = new Rfc5425Encoder();
- @BeforeAll
- public static void initPort() {
- serverPort = AvailablePortFinder.getNextAvailable();
- uri = "netty:tcp://localhost:" + serverPort + "?sync=false&allowDefaultCodec=false&decoders=#decoder&encoders=#encoder";
- uriClient = uri + "&useByteBuf=true";
- }
-
@Test
public void testSendingCamel() throws Exception {
@@ -68,6 +60,8 @@ public class NettyRfc5425Test extends CamelTestSupport {
mock2.expectedMessageCount(2);
mock2.expectedBodiesReceived(rfc3164Message, rfc5424Message);
+ String uriClient = "netty:tcp://localhost:" + serverPort.getPort()
+ + "?sync=false&allowDefaultCodec=false&decoders=#decoder&encoders=#encoder&useByteBuf=true";
template.sendBody(uriClient, rfc3164Message.getBytes("UTF8"));
template.sendBody(uriClient, rfc5424Message.getBytes("UTF8"));
@@ -91,6 +85,8 @@ public class NettyRfc5425Test extends CamelTestSupport {
public void configure() {
context.setTracing(true);
DataFormat syslogDataFormat = new SyslogDataFormat();
+ String uri = "netty:tcp://localhost:" + serverPort.getPort()
+ + "?sync=false&allowDefaultCodec=false&decoders=#decoder&encoders=#encoder";
// we setup a Syslog listener on a random port.
from(uri).unmarshal(syslogDataFormat).process(new Processor() {
diff --git a/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/SyslogSpringMinaTest.java b/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/SyslogSpringMinaTest.java
index 16c689c60924..f15a967db562 100644
--- a/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/SyslogSpringMinaTest.java
+++ b/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/SyslogSpringMinaTest.java
@@ -24,26 +24,26 @@ import java.net.InetAddress;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.AvailablePortFinder;
import org.apache.camel.test.spring.junit6.CamelSpringTestSupport;
-import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import org.springframework.context.support.AbstractXmlApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
public class SyslogSpringMinaTest extends CamelSpringTestSupport {
- private static int serverPort;
+ @RegisterExtension
+ AvailablePortFinder.Port serverPort = AvailablePortFinder.find();
+
+ {
+ System.setProperty("server-port", Integer.valueOf(serverPort.getPort()).toString());
+ }
+
private final int messageCount = 1;
private final String message
= "<165>Aug 4 05:34:00 mymachine myproc[10]: %% It's\n time to make the do-nuts. %% Ingredients: Mix=OK, Jelly=OK #\n"
+ " Devices: Mixer=OK, Jelly_Injector=OK, Frier=OK # Transport:\n"
+ " Conveyer1=OK, Conveyer2=OK # %%";
- @BeforeAll
- public static void initPort() {
- serverPort = AvailablePortFinder.getNextAvailable();
- System.setProperty("server-port", Integer.valueOf(serverPort).toString());
- }
-
@Override
protected AbstractXmlApplicationContext createApplicationContext() {
return new ClassPathXmlApplicationContext("org/apache/camel/component/syslog/applicationContext-Mina.xml");
@@ -65,7 +65,7 @@ public class SyslogSpringMinaTest extends CamelSpringTestSupport {
byte[] data = message.getBytes();
- DatagramPacket packet = new DatagramPacket(data, data.length, address, serverPort);
+ DatagramPacket packet = new DatagramPacket(data, data.length, address, serverPort.getPort());
socket.send(packet);
Thread.sleep(100);
}
diff --git a/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/SyslogSpringNettyTest.java b/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/SyslogSpringNettyTest.java
index d2c14af852c3..cf00633f609f 100644
--- a/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/SyslogSpringNettyTest.java
+++ b/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/SyslogSpringNettyTest.java
@@ -24,25 +24,25 @@ import java.net.InetAddress;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.AvailablePortFinder;
import org.apache.camel.test.spring.junit6.CamelSpringTestSupport;
-import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import org.springframework.context.support.AbstractXmlApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
public class SyslogSpringNettyTest extends CamelSpringTestSupport {
- private static int serverPort;
+ @RegisterExtension
+ AvailablePortFinder.Port serverPort = AvailablePortFinder.find();
+
+ {
+ System.setProperty("server-port", Integer.valueOf(serverPort.getPort()).toString());
+ }
+
private final int messageCount = 1;
private final String message
= "<165>Aug 4 05:34:00 mymachine myproc[10]: %% It's\n time to make the do-nuts. %% Ingredients: Mix=OK, Jelly=OK #\n"
+ " Devices: Mixer=OK, Jelly_Injector=OK, Frier=OK # Transport:\n"
+ " Conveyer1=OK, Conveyer2=OK # %%";
- @BeforeAll
- public static void initPort() {
- serverPort = AvailablePortFinder.getNextAvailable();
- System.setProperty("server-port", Integer.valueOf(serverPort).toString());
- }
-
@Override
protected AbstractXmlApplicationContext createApplicationContext() {
return new ClassPathXmlApplicationContext("org/apache/camel/component/syslog/applicationContext-Netty.xml");
@@ -64,7 +64,7 @@ public class SyslogSpringNettyTest extends CamelSpringTestSupport {
byte[] data = message.getBytes();
- DatagramPacket packet = new DatagramPacket(data, data.length, address, serverPort);
+ DatagramPacket packet = new DatagramPacket(data, data.length, address, serverPort.getPort());
socket.send(packet);
Thread.sleep(100);
}
diff --git a/components/camel-thrift/src/test/java/org/apache/camel/component/thrift/ThriftConsumerAsyncTest.java b/components/camel-thrift/src/test/java/org/apache/camel/component/thrift/ThriftConsumerAsyncTest.java
index 385193872e40..b07eab443493 100644
--- a/components/camel-thrift/src/test/java/org/apache/camel/component/thrift/ThriftConsumerAsyncTest.java
+++ b/components/camel-thrift/src/test/java/org/apache/camel/component/thrift/ThriftConsumerAsyncTest.java
@@ -40,6 +40,7 @@ import org.apache.thrift.transport.TTransportException;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -49,10 +50,11 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
public class ThriftConsumerAsyncTest extends CamelTestSupport {
private static final Logger LOG = LoggerFactory.getLogger(ThriftConsumerAsyncTest.class);
- private static final int THRIFT_TEST_PORT = AvailablePortFinder.getNextAvailable();
+ @RegisterExtension
+ AvailablePortFinder.Port thriftTestPort = AvailablePortFinder.find();
private static final int THRIFT_TEST_NUM1 = 12;
private static final int THRIFT_TEST_NUM2 = 13;
- private static Calculator.AsyncClient thriftClient;
+ private Calculator.AsyncClient thriftClient;
private TNonblockingTransport transport;
private int calculateResult;
@@ -64,8 +66,8 @@ public class ThriftConsumerAsyncTest extends CamelTestSupport {
@BeforeEach
public void startThriftClient() throws IOException, TTransportException {
if (transport == null) {
- LOG.info("Connecting to the Thrift server on port: {}", THRIFT_TEST_PORT);
- transport = new TNonblockingSocket("localhost", THRIFT_TEST_PORT);
+ LOG.info("Connecting to the Thrift server on port: {}", thriftTestPort.getPort());
+ transport = new TNonblockingSocket("localhost", thriftTestPort.getPort());
thriftClient = (new Calculator.AsyncClient.Factory(new TAsyncClientManager(), new TBinaryProtocol.Factory()))
.getAsyncClient(transport);
}
@@ -241,7 +243,8 @@ public class ThriftConsumerAsyncTest extends CamelTestSupport {
return new RouteBuilder() {
@Override
public void configure() {
- from("thrift://localhost:" + THRIFT_TEST_PORT + "/org.apache.camel.component.thrift.generated.Calculator")
+ from("thrift://localhost:" + thriftTestPort.getPort()
+ + "/org.apache.camel.component.thrift.generated.Calculator")
.to("mock:thrift-service").choice()
.when(header(ThriftConstants.THRIFT_METHOD_NAME_HEADER).isEqualTo("calculate"))
.setBody(simple(Integer.valueOf(THRIFT_TEST_NUM1 * THRIFT_TEST_NUM2).toString()))
diff --git a/components/camel-thrift/src/test/java/org/apache/camel/component/thrift/ThriftConsumerConcurrentTest.java b/components/camel-thrift/src/test/java/org/apache/camel/component/thrift/ThriftConsumerConcurrentTest.java
index 0ed09a8bf5ac..12ba89471b33 100644
--- a/components/camel-thrift/src/test/java/org/apache/camel/component/thrift/ThriftConsumerConcurrentTest.java
+++ b/components/camel-thrift/src/test/java/org/apache/camel/component/thrift/ThriftConsumerConcurrentTest.java
@@ -41,6 +41,7 @@ import org.apache.thrift.transport.TTransport;
import org.apache.thrift.transport.TTransportException;
import org.apache.thrift.transport.layered.TFramedTransport;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -50,8 +51,10 @@ import static org.junit.jupiter.api.Assertions.assertNotEquals;
public class ThriftConsumerConcurrentTest extends CamelTestSupport {
private static final Logger LOG = LoggerFactory.getLogger(ThriftConsumerConcurrentTest.class);
- private static final int THRIFT_SYNC_REQUEST_TEST_PORT = AvailablePortFinder.getNextAvailable();
- private static final int THRIFT_ASYNC_REQUEST_TEST_PORT = AvailablePortFinder.getNextAvailable();
+ @RegisterExtension
+ AvailablePortFinder.Port thriftSyncPort = AvailablePortFinder.find();
+ @RegisterExtension
+ AvailablePortFinder.Port thriftAsyncPort = AvailablePortFinder.find();
private static final int THRIFT_TEST_NUM1 = 12;
private static final int CONCURRENT_THREAD_COUNT = 30;
private static final int ROUNDS_PER_THREAD_COUNT = 10;
@@ -72,7 +75,7 @@ public class ThriftConsumerConcurrentTest extends CamelTestSupport {
@Override
public void run() throws TTransportException {
- TTransport transport = new TSocket("localhost", THRIFT_SYNC_REQUEST_TEST_PORT);
+ TTransport transport = new TSocket("localhost", thriftSyncPort.getPort());
transport.open();
TProtocol protocol = new TBinaryProtocol(new TFramedTransport(transport));
Calculator.Client client = (new Calculator.Client.Factory()).getClient(protocol);
@@ -105,7 +108,7 @@ public class ThriftConsumerConcurrentTest extends CamelTestSupport {
public void run() throws TTransportException, IOException, InterruptedException {
final CountDownLatch latch = new CountDownLatch(1);
- TNonblockingTransport transport = new TNonblockingSocket("localhost", THRIFT_ASYNC_REQUEST_TEST_PORT);
+ TNonblockingTransport transport = new TNonblockingSocket("localhost", thriftAsyncPort.getPort());
Calculator.AsyncClient client
= (new Calculator.AsyncClient.Factory(new TAsyncClientManager(), new TBinaryProtocol.Factory()))
.getAsyncClient(transport);
@@ -162,11 +165,11 @@ public class ThriftConsumerConcurrentTest extends CamelTestSupport {
@Override
public void configure() {
- from("thrift://localhost:" + THRIFT_SYNC_REQUEST_TEST_PORT
+ from("thrift://localhost:" + thriftSyncPort.getPort()
+ "/org.apache.camel.component.thrift.generated.Calculator?synchronous=true")
.setBody(simple("${body[1]}")).bean(new CalculatorMessageBuilder(), "multiply");
- from("thrift://localhost:" + THRIFT_ASYNC_REQUEST_TEST_PORT
+ from("thrift://localhost:" + thriftAsyncPort.getPort()
+ "/org.apache.camel.component.thrift.generated.Calculator")
.setBody(simple("${body[1]}")).bean(new CalculatorMessageBuilder(), "multiply");
}
diff --git a/components/camel-thrift/src/test/java/org/apache/camel/component/thrift/ThriftConsumerSecurityTest.java b/components/camel-thrift/src/test/java/org/apache/camel/component/thrift/ThriftConsumerSecurityTest.java
index 3f33e34a992f..f7cdd3fdd048 100644
--- a/components/camel-thrift/src/test/java/org/apache/camel/component/thrift/ThriftConsumerSecurityTest.java
+++ b/components/camel-thrift/src/test/java/org/apache/camel/component/thrift/ThriftConsumerSecurityTest.java
@@ -35,6 +35,7 @@ import org.apache.thrift.transport.TTransportException;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -44,7 +45,8 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
public class ThriftConsumerSecurityTest extends CamelTestSupport {
private static final Logger LOG = LoggerFactory.getLogger(ThriftConsumerSecurityTest.class);
- private static final int THRIFT_TEST_PORT = AvailablePortFinder.getNextAvailable();
+ @RegisterExtension
+ AvailablePortFinder.Port thriftTestPort = AvailablePortFinder.find();
private static final int THRIFT_TEST_NUM1 = 12;
private static final int THRIFT_TEST_NUM2 = 13;
private static final String TRUST_STORE_RESOURCE = "file:src/test/resources/certs/truststore.jks";
@@ -52,7 +54,7 @@ public class ThriftConsumerSecurityTest extends CamelTestSupport {
private static final String SECURITY_STORE_PASSWORD = "camelinaction";
private static final int THRIFT_CLIENT_TIMEOUT = 2000;
- private static Calculator.Client thriftClient;
+ private Calculator.Client thriftClient;
private TProtocol protocol;
private TTransport transport;
@@ -60,12 +62,13 @@ public class ThriftConsumerSecurityTest extends CamelTestSupport {
@BeforeEach
public void startThriftSecureClient() throws TTransportException {
if (transport == null) {
- LOG.info("Connecting to the secured Thrift server on port: {}", THRIFT_TEST_PORT);
+ LOG.info("Connecting to the secured Thrift server on port: {}", thriftTestPort.getPort());
TSSLTransportFactory.TSSLTransportParameters sslParams = new TSSLTransportFactory.TSSLTransportParameters();
sslParams.setTrustStore(TRUST_STORE_RESOURCE, SECURITY_STORE_PASSWORD);
- transport = TSSLTransportFactory.getClientSocket("localhost", THRIFT_TEST_PORT, THRIFT_CLIENT_TIMEOUT, sslParams);
+ transport = TSSLTransportFactory.getClientSocket("localhost", thriftTestPort.getPort(), THRIFT_CLIENT_TIMEOUT,
+ sslParams);
protocol = new TBinaryProtocol(transport);
thriftClient = new Calculator.Client(protocol);
@@ -137,7 +140,7 @@ public class ThriftConsumerSecurityTest extends CamelTestSupport {
@Override
public void configure() {
- from("thrift://localhost:" + THRIFT_TEST_PORT
+ from("thrift://localhost:" + thriftTestPort.getPort()
+ "/org.apache.camel.component.thrift.generated.Calculator?negotiationType=SSL&sslParameters=#sslParams&synchronous=true")
.to("mock:thrift-secure-service").choice()
.when(header(ThriftConstants.THRIFT_METHOD_NAME_HEADER).isEqualTo("calculate"))
diff --git a/components/camel-thrift/src/test/java/org/apache/camel/component/thrift/ThriftConsumerSyncTest.java b/components/camel-thrift/src/test/java/org/apache/camel/component/thrift/ThriftConsumerSyncTest.java
index d531b1e37e8b..3dd5d4575c2d 100644
--- a/components/camel-thrift/src/test/java/org/apache/camel/component/thrift/ThriftConsumerSyncTest.java
+++ b/components/camel-thrift/src/test/java/org/apache/camel/component/thrift/ThriftConsumerSyncTest.java
@@ -32,6 +32,7 @@ import org.apache.thrift.transport.layered.TFramedTransport;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -41,10 +42,11 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
public class ThriftConsumerSyncTest extends CamelTestSupport {
private static final Logger LOG = LoggerFactory.getLogger(ThriftConsumerSyncTest.class);
- private static final int THRIFT_TEST_PORT = AvailablePortFinder.getNextAvailable();
+ @RegisterExtension
+ AvailablePortFinder.Port thriftTestPort = AvailablePortFinder.find();
private static final int THRIFT_TEST_NUM1 = 12;
private static final int THRIFT_TEST_NUM2 = 13;
- private static Calculator.Client thriftClient;
+ private Calculator.Client thriftClient;
private TProtocol protocol;
private TTransport transport;
@@ -52,8 +54,8 @@ public class ThriftConsumerSyncTest extends CamelTestSupport {
@BeforeEach
public void startThriftClient() throws TTransportException {
if (transport == null) {
- LOG.info("Connecting to the Thrift server on port: {}", THRIFT_TEST_PORT);
- transport = new TSocket("localhost", THRIFT_TEST_PORT);
+ LOG.info("Connecting to the Thrift server on port: {}", thriftTestPort.getPort());
+ transport = new TSocket("localhost", thriftTestPort.getPort());
transport.open();
protocol = new TBinaryProtocol(new TFramedTransport(transport));
thriftClient = (new Calculator.Client.Factory()).getClient(protocol);
@@ -104,7 +106,7 @@ public class ThriftConsumerSyncTest extends CamelTestSupport {
@Override
public void configure() {
- from("thrift://localhost:" + THRIFT_TEST_PORT
+ from("thrift://localhost:" + thriftTestPort.getPort()
+ "/org.apache.camel.component.thrift.generated.Calculator?synchronous=true")
.to("mock:thrift-service").choice()
.when(header(ThriftConstants.THRIFT_METHOD_NAME_HEADER).isEqualTo("calculate"))
diff --git a/components/camel-thrift/src/test/java/org/apache/camel/component/thrift/ThriftConsumerZlibCompressionTest.java b/components/camel-thrift/src/test/java/org/apache/camel/component/thrift/ThriftConsumerZlibCompressionTest.java
index 89fbf97bb625..4db3c343583f 100644
--- a/components/camel-thrift/src/test/java/org/apache/camel/component/thrift/ThriftConsumerZlibCompressionTest.java
+++ b/components/camel-thrift/src/test/java/org/apache/camel/component/thrift/ThriftConsumerZlibCompressionTest.java
@@ -33,6 +33,7 @@ import org.apache.thrift.transport.TZlibTransport;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -42,12 +43,13 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
public class ThriftConsumerZlibCompressionTest extends CamelTestSupport {
private static final Logger LOG = LoggerFactory.getLogger(ThriftConsumerZlibCompressionTest.class);
- private static final int THRIFT_TEST_PORT = AvailablePortFinder.getNextAvailable();
+ @RegisterExtension
+ AvailablePortFinder.Port thriftTestPort = AvailablePortFinder.find();
private static final int THRIFT_TEST_NUM1 = 12;
private static final int THRIFT_TEST_NUM2 = 13;
private static final int THRIFT_CLIENT_TIMEOUT = 2000;
- private static Calculator.Client thriftClient;
+ private Calculator.Client thriftClient;
private TProtocol protocol;
private TTransport transport;
@@ -55,9 +57,9 @@ public class ThriftConsumerZlibCompressionTest extends CamelTestSupport {
@BeforeEach
public void startThriftZlibClient() throws TTransportException {
if (transport == null) {
- LOG.info("Connecting to the Thrift server with zlib compression on port: {}", THRIFT_TEST_PORT);
+ LOG.info("Connecting to the Thrift server with zlib compression on port: {}", thriftTestPort.getPort());
- transport = new TSocket(new TConfiguration(), "localhost", THRIFT_TEST_PORT, THRIFT_CLIENT_TIMEOUT);
+ transport = new TSocket(new TConfiguration(), "localhost", thriftTestPort.getPort(), THRIFT_CLIENT_TIMEOUT);
protocol = new TBinaryProtocol(new TZlibTransport(transport));
thriftClient = new Calculator.Client(protocol);
transport.open();
@@ -113,7 +115,7 @@ public class ThriftConsumerZlibCompressionTest extends CamelTestSupport {
@Override
public void configure() {
- from("thrift://localhost:" + THRIFT_TEST_PORT
+ from("thrift://localhost:" + thriftTestPort.getPort()
+ "/org.apache.camel.component.thrift.generated.Calculator?compressionType=ZLIB&synchronous=true")
.to("mock:thrift-secure-service").choice()
.when(header(ThriftConstants.THRIFT_METHOD_NAME_HEADER).isEqualTo("calculate"))
diff --git a/components/camel-thrift/src/test/java/org/apache/camel/component/thrift/ThriftProducerBaseTest.java b/components/camel-thrift/src/test/java/org/apache/camel/component/thrift/ThriftProducerBaseTest.java
index 3126ecb62ba9..d325b15efb92 100644
--- a/components/camel-thrift/src/test/java/org/apache/camel/component/thrift/ThriftProducerBaseTest.java
+++ b/components/camel-thrift/src/test/java/org/apache/camel/component/thrift/ThriftProducerBaseTest.java
@@ -24,39 +24,41 @@ import org.apache.thrift.server.THsHaServer;
import org.apache.thrift.server.THsHaServer.Args;
import org.apache.thrift.server.TServer;
import org.apache.thrift.transport.TNonblockingServerSocket;
-import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.extension.RegisterExtension;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public abstract class ThriftProducerBaseTest extends CamelTestSupport {
- protected static final int THRIFT_TEST_PORT = AvailablePortFinder.getNextAvailable();
+ @RegisterExtension
+ AvailablePortFinder.Port thriftTestPort = AvailablePortFinder.find();
protected static final int THRIFT_TEST_NUM1 = 12;
protected static final int THRIFT_TEST_NUM2 = 13;
@SuppressWarnings({ "rawtypes" })
protected static Calculator.Processor processor;
private static final Logger LOG = LoggerFactory.getLogger(ThriftProducerBaseTest.class);
- private static TNonblockingServerSocket serverTransport;
- private static TServer server;
+ private TNonblockingServerSocket serverTransport;
+ private TServer server;
- @BeforeAll
+ @BeforeEach
@SuppressWarnings({ "unchecked", "rawtypes" })
- public static void startThriftServer() throws Exception {
+ public void startThriftServer() throws Exception {
processor = new Calculator.Processor(new CalculatorSyncServerImpl());
- serverTransport = new TNonblockingServerSocket(THRIFT_TEST_PORT);
+ serverTransport = new TNonblockingServerSocket(thriftTestPort.getPort());
server = new THsHaServer(new Args(serverTransport).processor(processor));
Runnable simple = new Runnable() {
public void run() {
- LOG.info("Thrift server started on port: {}", THRIFT_TEST_PORT);
+ LOG.info("Thrift server started on port: {}", thriftTestPort.getPort());
server.serve();
}
};
new Thread(simple).start();
}
- @AfterAll
- public static void stopThriftServer() {
+ @AfterEach
+ public void stopThriftServer() {
if (server != null) {
server.stop();
serverTransport.close();
diff --git a/components/camel-thrift/src/test/java/org/apache/camel/component/thrift/ThriftProducerSecurityTest.java b/components/camel-thrift/src/test/java/org/apache/camel/component/thrift/ThriftProducerSecurityTest.java
index 19a3e83696e0..33b1fb673829 100644
--- a/components/camel-thrift/src/test/java/org/apache/camel/component/thrift/ThriftProducerSecurityTest.java
+++ b/components/camel-thrift/src/test/java/org/apache/camel/component/thrift/ThriftProducerSecurityTest.java
@@ -40,9 +40,10 @@ import org.apache.thrift.server.TServer;
import org.apache.thrift.server.TThreadPoolServer;
import org.apache.thrift.transport.TSSLTransportFactory;
import org.apache.thrift.transport.TServerSocket;
-import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -55,12 +56,13 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
public class ThriftProducerSecurityTest extends CamelTestSupport {
private static final Logger LOG = LoggerFactory.getLogger(ThriftProducerSecurityTest.class);
- private static TServerSocket serverTransport;
- private static TServer server;
+ private TServerSocket serverTransport;
+ private TServer server;
@SuppressWarnings({ "rawtypes" })
- private static Calculator.Processor processor;
+ private Calculator.Processor processor;
- private static final int THRIFT_TEST_PORT = AvailablePortFinder.getNextAvailable();
+ @RegisterExtension
+ AvailablePortFinder.Port thriftTestPort = AvailablePortFinder.find();
private static final int THRIFT_TEST_NUM1 = 12;
private static final int THRIFT_TEST_NUM2 = 13;
@@ -69,15 +71,15 @@ public class ThriftProducerSecurityTest extends CamelTestSupport {
private static final String SECURITY_STORE_PASSWORD = "camelinaction";
private static final int THRIFT_CLIENT_TIMEOUT = 2000;
- @BeforeAll
+ @BeforeEach
@SuppressWarnings({ "unchecked", "rawtypes" })
- public static void startThriftServer() throws Exception {
+ public void startThriftServer() throws Exception {
processor = new Calculator.Processor(new CalculatorSyncServerImpl());
TSSLTransportFactory.TSSLTransportParameters sslParams = new TSSLTransportFactory.TSSLTransportParameters();
sslParams.setKeyStore(KEY_STORE_SOURCE, SECURITY_STORE_PASSWORD);
- serverTransport = TSSLTransportFactory.getServerSocket(THRIFT_TEST_PORT, THRIFT_CLIENT_TIMEOUT,
+ serverTransport = TSSLTransportFactory.getServerSocket(thriftTestPort.getPort(), THRIFT_CLIENT_TIMEOUT,
InetAddress.getByName("localhost"), sslParams);
TThreadPoolServer.Args args = new TThreadPoolServer.Args(serverTransport);
args.processor(processor);
@@ -85,15 +87,15 @@ public class ThriftProducerSecurityTest extends CamelTestSupport {
Runnable simple = new Runnable() {
public void run() {
- LOG.info("Thrift secured server started on port: {}", THRIFT_TEST_PORT);
+ LOG.info("Thrift secured server started on port: {}", thriftTestPort.getPort());
server.serve();
}
};
new Thread(simple).start();
}
- @AfterAll
- public static void stopThriftServer() {
+ @AfterEach
+ public void stopThriftServer() {
if (server != null) {
server.stop();
serverTransport.close();
@@ -201,23 +203,23 @@ public class ThriftProducerSecurityTest extends CamelTestSupport {
@Override
public void configure() {
from("direct:thrift-secured-calculate")
- .to("thrift://localhost:" + THRIFT_TEST_PORT
+ .to("thrift://localhost:" + thriftTestPort.getPort()
+ "/org.apache.camel.component.thrift.generated.Calculator?"
+ "method=calculate&negotiationType=SSL&sslParameters=#sslParams&synchronous=true");
from("direct:thrift-secured-add")
- .to("thrift://localhost:" + THRIFT_TEST_PORT
+ .to("thrift://localhost:" + thriftTestPort.getPort()
+ "/org.apache.camel.component.thrift.generated.Calculator?"
+ "method=add&negotiationType=SSL&sslParameters=#sslParams&synchronous=true");
from("direct:thrift-secured-ping")
- .to("thrift://localhost:" + THRIFT_TEST_PORT
+ .to("thrift://localhost:" + thriftTestPort.getPort()
+ "/org.apache.camel.component.thrift.generated.Calculator?"
+ "method=ping&negotiationType=SSL&sslParameters=#sslParams&synchronous=true");
from("direct:thrift-secured-zip")
- .to("thrift://localhost:" + THRIFT_TEST_PORT
+ .to("thrift://localhost:" + thriftTestPort.getPort()
+ "/org.apache.camel.component.thrift.generated.Calculator?"
+ "method=zip&negotiationType=SSL&sslParameters=#sslParams&synchronous=true");
from("direct:thrift-secured-alltypes")
- .to("thrift://localhost:" + THRIFT_TEST_PORT
+ .to("thrift://localhost:" + thriftTestPort.getPort()
+ "/org.apache.camel.component.thrift.generated.Calculator?"
+ "method=alltypes&negotiationType=SSL&sslParameters=#sslParams&synchronous=true");
}
diff --git a/components/camel-thrift/src/test/java/org/apache/camel/component/thrift/ThriftProducerSyncTest.java b/components/camel-thrift/src/test/java/org/apache/camel/component/thrift/ThriftProducerSyncTest.java
index f05e5727b667..0d04cc18db12 100644
--- a/components/camel-thrift/src/test/java/org/apache/camel/component/thrift/ThriftProducerSyncTest.java
+++ b/components/camel-thrift/src/test/java/org/apache/camel/component/thrift/ThriftProducerSyncTest.java
@@ -158,22 +158,22 @@ public class ThriftProducerSyncTest extends ThriftProducerBaseTest {
@Override
public void configure() {
from("direct:thrift-calculate")
- .to("thrift://localhost:" + THRIFT_TEST_PORT
+ .to("thrift://localhost:" + thriftTestPort.getPort()
+ "/org.apache.camel.component.thrift.generated.Calculator?method=calculate&synchronous=true");
from("direct:thrift-add")
- .to("thrift://localhost:" + THRIFT_TEST_PORT
+ .to("thrift://localhost:" + thriftTestPort.getPort()
+ "/org.apache.camel.component.thrift.generated.Calculator?method=add&synchronous=true");
from("direct:thrift-ping")
- .to("thrift://localhost:" + THRIFT_TEST_PORT
+ .to("thrift://localhost:" + thriftTestPort.getPort()
+ "/org.apache.camel.component.thrift.generated.Calculator?method=ping&synchronous=true");
from("direct:thrift-zip")
- .to("thrift://localhost:" + THRIFT_TEST_PORT
+ .to("thrift://localhost:" + thriftTestPort.getPort()
+ "/org.apache.camel.component.thrift.generated.Calculator?method=zip&synchronous=true");
from("direct:thrift-alltypes")
- .to("thrift://localhost:" + THRIFT_TEST_PORT
+ .to("thrift://localhost:" + thriftTestPort.getPort()
+ "/org.apache.camel.component.thrift.generated.Calculator?method=alltypes&synchronous=true");
from("direct:thrift-echo")
- .to("thrift://localhost:" + THRIFT_TEST_PORT
+ .to("thrift://localhost:" + thriftTestPort.getPort()
+ "/org.apache.camel.component.thrift.generated.Calculator?method=echo&synchronous=true");
}
};
diff --git a/components/camel-thrift/src/test/java/org/apache/camel/component/thrift/ThriftProducerZlibCompressionTest.java b/components/camel-thrift/src/test/java/org/apache/camel/component/thrift/ThriftProducerZlibCompressionTest.java
index 6b1aa9b1673b..ade1ebefcd7b 100644
--- a/components/camel-thrift/src/test/java/org/apache/camel/component/thrift/ThriftProducerZlibCompressionTest.java
+++ b/components/camel-thrift/src/test/java/org/apache/camel/component/thrift/ThriftProducerZlibCompressionTest.java
@@ -33,9 +33,10 @@ import org.apache.thrift.server.TServer;
import org.apache.thrift.server.TThreadPoolServer;
import org.apache.thrift.transport.TServerSocket;
import org.apache.thrift.transport.TZlibTransport;
-import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -47,23 +48,24 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
public class ThriftProducerZlibCompressionTest extends CamelTestSupport {
private static final Logger LOG = LoggerFactory.getLogger(ThriftProducerZlibCompressionTest.class);
- private static TServerSocket serverTransport;
- private static TServer server;
+ private TServerSocket serverTransport;
+ private TServer server;
@SuppressWarnings({ "rawtypes" })
- private static Calculator.Processor processor;
+ private Calculator.Processor processor;
- private static final int THRIFT_TEST_PORT = AvailablePortFinder.getNextAvailable();
+ @RegisterExtension
+ AvailablePortFinder.Port thriftTestPort = AvailablePortFinder.find();
private static final int THRIFT_TEST_NUM1 = 12;
private static final int THRIFT_TEST_NUM2 = 13;
private static final int THRIFT_CLIENT_TIMEOUT = 2000;
- @BeforeAll
+ @BeforeEach
@SuppressWarnings({ "unchecked", "rawtypes" })
- public static void startThriftServer() throws Exception {
+ public void startThriftServer() throws Exception {
processor = new Calculator.Processor(new CalculatorSyncServerImpl());
serverTransport = new TServerSocket(
- new InetSocketAddress(InetAddress.getByName("localhost"), THRIFT_TEST_PORT), THRIFT_CLIENT_TIMEOUT);
+ new InetSocketAddress(InetAddress.getByName("localhost"), thriftTestPort.getPort()), THRIFT_CLIENT_TIMEOUT);
TThreadPoolServer.Args args = new TThreadPoolServer.Args(serverTransport);
args.processor(processor);
args.protocolFactory(new TBinaryProtocol.Factory());
@@ -72,15 +74,15 @@ public class ThriftProducerZlibCompressionTest extends CamelTestSupport {
Runnable simple = new Runnable() {
public void run() {
- LOG.info("Thrift server with zlib compression started on port: {}", THRIFT_TEST_PORT);
+ LOG.info("Thrift server with zlib compression started on port: {}", thriftTestPort.getPort());
server.serve();
}
};
new Thread(simple).start();
}
- @AfterAll
- public static void stopThriftServer() {
+ @AfterEach
+ public void stopThriftServer() {
if (server != null) {
server.stop();
serverTransport.close();
@@ -120,10 +122,10 @@ public class ThriftProducerZlibCompressionTest extends CamelTestSupport {
@Override
public void configure() {
from("direct:thrift-zlib-calculate")
- .to("thrift://localhost:" + THRIFT_TEST_PORT
+ .to("thrift://localhost:" + thriftTestPort.getPort()
+ "/org.apache.camel.component.thrift.generated.Calculator?method=calculate&compressionType=ZLIB&synchronous=true");
from("direct:thrift-zlib-ping")
- .to("thrift://localhost:" + THRIFT_TEST_PORT
+ .to("thrift://localhost:" + thriftTestPort.getPort()
+ "/org.apache.camel.component.thrift.generated.Calculator?method=ping&compressionType=ZLIB&synchronous=true");
}
};
diff --git a/components/camel-thrift/src/test/java/org/apache/camel/component/thrift/local/ThriftThreadPoolServerTest.java b/components/camel-thrift/src/test/java/org/apache/camel/component/thrift/local/ThriftThreadPoolServerTest.java
index 34a06ddbf515..3b221c914562 100644
--- a/components/camel-thrift/src/test/java/org/apache/camel/component/thrift/local/ThriftThreadPoolServerTest.java
+++ b/components/camel-thrift/src/test/java/org/apache/camel/component/thrift/local/ThriftThreadPoolServerTest.java
@@ -34,6 +34,7 @@ import org.apache.thrift.transport.TTransport;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -45,7 +46,8 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
public class ThriftThreadPoolServerTest extends CamelTestSupport {
private static final Logger LOG = LoggerFactory.getLogger(ThriftProducerSecurityTest.class);
- private static final int THRIFT_TEST_PORT = AvailablePortFinder.getNextAvailable();
+ @RegisterExtension
+ AvailablePortFinder.Port thriftTestPort = AvailablePortFinder.find();
private static final int THRIFT_TEST_NUM1 = 12;
private static final int THRIFT_TEST_NUM2 = 13;
@@ -54,12 +56,12 @@ public class ThriftThreadPoolServerTest extends CamelTestSupport {
private static final String SECURITY_STORE_PASSWORD = "camelinaction";
private static final int THRIFT_CLIENT_TIMEOUT = 2000;
- private static TServerSocket serverTransport;
- private static TTransport clientTransport;
- private static TServer server;
- private static TProtocol protocol;
+ private TServerSocket serverTransport;
+ private TTransport clientTransport;
+ private TServer server;
+ private TProtocol protocol;
@SuppressWarnings({ "rawtypes" })
- private static Calculator.Processor processor;
+ private Calculator.Processor processor;
@BeforeEach
@SuppressWarnings({ "unchecked", "rawtypes" })
@@ -69,7 +71,7 @@ public class ThriftThreadPoolServerTest extends CamelTestSupport {
TSSLTransportFactory.TSSLTransportParameters sslParams = new TSSLTransportFactory.TSSLTransportParameters();
sslParams.setKeyStore(KEY_STORE_PATH, SECURITY_STORE_PASSWORD);
- serverTransport = TSSLTransportFactory.getServerSocket(THRIFT_TEST_PORT, THRIFT_CLIENT_TIMEOUT,
+ serverTransport = TSSLTransportFactory.getServerSocket(thriftTestPort.getPort(), THRIFT_CLIENT_TIMEOUT,
InetAddress.getByName("localhost"), sslParams);
ThriftThreadPoolServer.Args args = new ThriftThreadPoolServer.Args(serverTransport);
@@ -80,7 +82,7 @@ public class ThriftThreadPoolServerTest extends CamelTestSupport {
server = new ThriftThreadPoolServer(args);
server.serve();
- LOG.info("Thrift secured server started on port: {}", THRIFT_TEST_PORT);
+ LOG.info("Thrift secured server started on port: {}", thriftTestPort.getPort());
}
@AfterEach
@@ -96,7 +98,7 @@ public class ThriftThreadPoolServerTest extends CamelTestSupport {
public void clientConnectionTest() throws TException {
TSSLTransportFactory.TSSLTransportParameters sslParams = new TSSLTransportFactory.TSSLTransportParameters();
sslParams.setTrustStore(TRUST_STORE_PATH, SECURITY_STORE_PASSWORD);
- clientTransport = TSSLTransportFactory.getClientSocket("localhost", THRIFT_TEST_PORT, 1000, sslParams);
+ clientTransport = TSSLTransportFactory.getClientSocket("localhost", thriftTestPort.getPort(), 1000, sslParams);
protocol = new TBinaryProtocol(clientTransport);
Calculator.Client client = new Calculator.Client(protocol);