This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new ed5cf044fcf7 CAMEL-23214: Migrate AvailablePortFinder in camel-grpc
tests (#22123)
ed5cf044fcf7 is described below
commit ed5cf044fcf70cf49ae5b1e1e319fd210d3ada95
Author: Guillaume Nodet <[email protected]>
AuthorDate: Fri Mar 20 09:12:56 2026 +0100
CAMEL-23214: Migrate AvailablePortFinder in camel-grpc tests (#22123)
Co-authored-by: Claude Opus 4.6 <[email protected]>
---
.../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");
}
