(camel) branch main updated: CAMEL-22980 - fix "specify custom port" in infra for Zookeeper

[apupier]

This is an automated email from the ASF dual-hosted git repository.

apupier 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 3f485f55533b CAMEL-22980 - fix "specify custom port" in infra for 
Zookeeper
3f485f55533b is described below

commit 3f485f55533b038211ffbd3c24d5afaa107f49e9
Author: Aurélien Pupier <apup...@ibm.com>
AuthorDate: Tue Feb 10 17:07:59 2026 +0100

    CAMEL-22980 - fix "specify custom port" in infra for Zookeeper
    
    Signed-off-by: Aurélien Pupier <apup...@ibm.com>
---
 .../camel/test/infra/zookeeper/services/ZooKeeperContainer.java    | 7 +++++--
 .../zookeeper/services/ZooKeeperLocalContainerInfraService.java    | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git 
a/test-infra/camel-test-infra-zookeeper/src/main/java/org/apache/camel/test/infra/zookeeper/services/ZooKeeperContainer.java
 
b/test-infra/camel-test-infra-zookeeper/src/main/java/org/apache/camel/test/infra/zookeeper/services/ZooKeeperContainer.java
index 1fe98abf2132..02fe5436b444 100644
--- 
a/test-infra/camel-test-infra-zookeeper/src/main/java/org/apache/camel/test/infra/zookeeper/services/ZooKeeperContainer.java
+++ 
b/test-infra/camel-test-infra-zookeeper/src/main/java/org/apache/camel/test/infra/zookeeper/services/ZooKeeperContainer.java
@@ -16,7 +16,6 @@
  */
 package org.apache.camel.test.infra.zookeeper.services;
 
-import org.apache.camel.test.infra.common.services.ContainerEnvironmentUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.testcontainers.containers.GenericContainer;
@@ -55,7 +54,11 @@ public class ZooKeeperContainer extends 
GenericContainer<ZooKeeperContainer> {
         withNetworkAliases(name)
                 .withLogConsumer(new Slf4jLogConsumer(LOGGER));
 
-        ContainerEnvironmentUtil.configurePort(this, clientPort > 0, 
CLIENT_PORT);
+        if (clientPort > 0) {
+            addFixedExposedPort(clientPort, CLIENT_PORT);
+        } else {
+            withExposedPorts(CLIENT_PORT);
+        }
     }
 
     public String getConnectionString() {
diff --git 
a/test-infra/camel-test-infra-zookeeper/src/main/java/org/apache/camel/test/infra/zookeeper/services/ZooKeeperLocalContainerInfraService.java
 
b/test-infra/camel-test-infra-zookeeper/src/main/java/org/apache/camel/test/infra/zookeeper/services/ZooKeeperLocalContainerInfraService.java
index 29f9cf31bbab..aedf28abeb98 100644
--- 
a/test-infra/camel-test-infra-zookeeper/src/main/java/org/apache/camel/test/infra/zookeeper/services/ZooKeeperLocalContainerInfraService.java
+++ 
b/test-infra/camel-test-infra-zookeeper/src/main/java/org/apache/camel/test/infra/zookeeper/services/ZooKeeperLocalContainerInfraService.java
@@ -51,7 +51,7 @@ public class ZooKeeperLocalContainerInfraService implements 
ZooKeeperInfraServic
 
     protected ZooKeeperContainer initContainer(String imageName) {
         int clientPort = ContainerEnvironmentUtil.isFixedPort(this.getClass())
-                ? ZooKeeperContainer.CLIENT_PORT
+                ? 
ContainerEnvironmentUtil.getConfiguredPort(ZooKeeperContainer.CLIENT_PORT)
                 : -1;
         if (imageName == null) {
             return new ZooKeeperContainer(ZooKeeperContainer.CONTAINER_NAME, 
clientPort);