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 96b4ba92abd0 CAMEL-23214: Migrate AvailablePortFinder in camel-mllp
tests (#22121)
96b4ba92abd0 is described below
commit 96b4ba92abd05e2d9d346e41f7f5ea775612d8d1
Author: Guillaume Nodet <[email protected]>
AuthorDate: Fri Mar 20 09:12:49 2026 +0100
CAMEL-23214: Migrate AvailablePortFinder in camel-mllp tests (#22121)
Co-authored-by: Claude Opus 4.6 <[email protected]>
---
.../apache/camel/MllpTcpServerConsumerLenientBindTest.java | 5 ++++-
.../java/org/apache/camel/component/mllp/LogPhiTest.java | 5 ++++-
.../MllpGlobalAndExplicitSSLContextParametersTest.java | 5 ++++-
.../camel/component/mllp/MllpIdleTimeoutStrategyTest.java | 5 ++++-
.../component/mllp/MllpMaxConcurrentConsumersTest.java | 10 ++++++++--
.../mllp/MllpMutualTlsConnectionAndHeaderBase.java | 5 ++++-
.../mllp/MllpProducerConsumerLoopbackInOnlyTest.java | 6 +++++-
.../component/mllp/MllpProducerConsumerLoopbackTest.java | 10 +++++++---
.../camel/component/mllp/MllpSSLContextParametersTest.java | 5 ++++-
.../mllp/MllpTcpClientProducerConnectionErrorTest.java | 5 ++++-
.../MllpTcpClientProducerIdleConnectionTimeoutTest.java | 5 ++++-
.../camel/component/mllp/MllpTcpServerCharsetTest.java | 5 ++++-
.../mllp/MllpTcpServerConsumerBindTimeoutTest.java | 5 ++++-
.../mllp/MllpTcpServerConsumerConnectionTest.java | 5 ++++-
.../mllp/MllpTcpServerConsumerMessageHeadersTest.java | 5 ++++-
.../mllp/MllpTcpServerConsumerMulitpleTcpPacketTest.java | 5 ++++-
.../mllp/MllpTcpServerConsumerThreadPoolTest.java | 14 ++++++--------
.../mllp/MllpTcpServerConsumerTransactionTest.java | 5 ++++-
...TcpClientProducerEndOfDataAndValidationTestSupport.java | 5 ++++-
.../mllp/TcpServerConsumerAcknowledgementTestSupport.java | 5 ++++-
...TcpServerConsumerEndOfDataAndValidationTestSupport.java | 5 ++++-
21 files changed, 94 insertions(+), 31 deletions(-)
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
