This is an automated email from the ASF dual-hosted git repository.
davsclaus 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 48bf8e81579 CAMEL-22265 camel-jbang infra run: Set the container name
to a fixed name (#18702)
48bf8e81579 is described below
commit 48bf8e81579b605aa266c6fe9655b4284a466b68
Author: Claudio Miranda <[email protected]>
AuthorDate: Wed Jul 23 19:01:07 2025 +0100
CAMEL-22265 camel-jbang infra run: Set the container name to a fixed name
(#18702)
https://issues.apache.org/jira/browse/CAMEL-22265
---
.../camel/dsl/jbang/core/commands/infra/InfraRun.java | 2 +-
.../services/ArangoDBLocalContainerInfraService.java | 1 +
.../infra/artemis/services/ArtemisAllInfraService.java | 2 ++
.../aws2/services/AWSLocalContainerInfraService.java | 3 ++-
.../azure/common/services/AzureStorageInfraService.java | 1 +
.../infra/azure/common/services/AzuriteContainer.java | 8 --------
.../services/CassandraLocalContainerInfraService.java | 6 ++++--
.../services/ChatScriptLocalContainerInfraService.java | 2 ++
.../infra/common/services/ContainerEnvironmentUtil.java | 13 ++++++++++++-
.../services/CouchbaseLocalContainerInfraService.java | 2 ++
.../services/CouchDbLocalContainerInfraService.java | 11 ++++++-----
.../ElasticSearchLocalContainerInfraService.java | 1 +
.../fhir/services/FhirLocalContainerInfraService.java | 11 ++++++-----
.../services/GooglePubSubLocalContainerInfraService.java | 1 +
.../HashicorpVaultLocalContainerInfraService.java | 9 +++++----
.../hivemq/services/AbstractLocalHiveMQService.java | 4 +++-
.../infra/hivemq/services/LocalHiveMQInfraService.java | 6 ++++--
.../services/LocalHiveMQSparkplugTCKInfraService.java | 2 +-
.../services/InfinispanLocalContainerInfraService.java | 9 +++++----
.../kafka/services/ContainerLocalKafkaInfraService.java | 1 +
.../test/infra/kafka/services/RedpandaInfraService.java | 3 +++
.../test/infra/kafka/services/StrimziContainer.java | 1 -
.../test/infra/kafka/services/StrimziInfraService.java | 3 +++
.../camel/test/infra/kafka/services/container.properties | 1 +
.../MicroprofileLRALocalContainerInfraService.java | 11 ++++++-----
.../services/MilvusLocalContainerInfraService.java | 1 +
.../minio/services/MinioLocalContainerInfraService.java | 11 ++++++-----
.../services/MongoDBLocalContainerInfraService.java | 12 ++----------
.../services/MosquittoLocalContainerInfraService.java | 16 ++++++++--------
.../nats/services/NatsLocalContainerInfraService.java | 9 +++++----
.../services/OllamaLocalContainerInfraService.java | 3 ++-
.../services/OpenldapLocalContainerInfraService.java | 1 +
.../services/PostgresLocalContainerInfraService.java | 11 ++++++-----
.../services/PulsarLocalContainerInfraService.java | 1 +
.../services/QdrantLocalContainerInfraService.java | 1 +
.../services/RabbitMQLocalContainerInfraService.java | 1 +
.../redis/services/RedisLocalContainerInfraService.java | 2 ++
.../infra/rocketmq/services/RocketMQBrokerContainer.java | 1 -
.../rocketmq/services/RocketMQContainerInfraService.java | 2 ++
.../smb/services/SmbLocalContainerInfraService.java | 1 +
.../solr/services/SolrLocalContainerInfraService.java | 1 +
.../services/TorchServeLocalContainerInfraService.java | 1 +
.../xmpp/services/XmppLocalContainerInfraService.java | 1 +
.../services/ZooKeeperLocalContainerInfraService.java | 2 ++
44 files changed, 117 insertions(+), 75 deletions(-)
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/infra/InfraRun.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/infra/InfraRun.java
index ee22b4f6a2b..3d93c284505 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/infra/InfraRun.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/infra/InfraRun.java
@@ -110,7 +110,7 @@ public class InfraRun extends InfraBaseCommand {
printer().println("Starting service " + testService + prefix);
}
- Object actualService = cl.loadClass(serviceImpl).newInstance();
+ Object actualService =
cl.loadClass(serviceImpl).getDeclaredConstructor().newInstance();
// Make sure the actualService can be run with initialize method
boolean actualServiceIsAnInfrastructureService = false;
diff --git
a/test-infra/camel-test-infra-arangodb/src/main/java/org/apache/camel/test/infra/arangodb/services/ArangoDBLocalContainerInfraService.java
b/test-infra/camel-test-infra-arangodb/src/main/java/org/apache/camel/test/infra/arangodb/services/ArangoDBLocalContainerInfraService.java
index 94ae09edbd5..c79bde88d12 100644
---
a/test-infra/camel-test-infra-arangodb/src/main/java/org/apache/camel/test/infra/arangodb/services/ArangoDBLocalContainerInfraService.java
+++
b/test-infra/camel-test-infra-arangodb/src/main/java/org/apache/camel/test/infra/arangodb/services/ArangoDBLocalContainerInfraService.java
@@ -39,6 +39,7 @@ public class ArangoDBLocalContainerInfraService implements
ArangoDBInfraService,
public ArangoDBLocalContainerInfraService(String imageName) {
container = initContainer(imageName);
+ container.withCreateContainerCmdModifier(cmd ->
cmd.withName(ContainerEnvironmentUtil.containerName(this.getClass())));
}
public ArangoDBLocalContainerInfraService(ArangoDbContainer container) {
diff --git
a/test-infra/camel-test-infra-artemis/src/main/java/org/apache/camel/test/infra/artemis/services/ArtemisAllInfraService.java
b/test-infra/camel-test-infra-artemis/src/main/java/org/apache/camel/test/infra/artemis/services/ArtemisAllInfraService.java
index ceb6ff9e06c..62ac4f3bbee 100644
---
a/test-infra/camel-test-infra-artemis/src/main/java/org/apache/camel/test/infra/artemis/services/ArtemisAllInfraService.java
+++
b/test-infra/camel-test-infra-artemis/src/main/java/org/apache/camel/test/infra/artemis/services/ArtemisAllInfraService.java
@@ -18,6 +18,7 @@ package org.apache.camel.test.infra.artemis.services;
import org.apache.activemq.artemis.core.server.QueueQueryResult;
import org.apache.camel.spi.annotations.InfraService;
+import org.apache.camel.test.infra.common.services.ContainerEnvironmentUtil;
import org.apache.camel.test.infra.common.services.ContainerService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -32,6 +33,7 @@ public class ArtemisAllInfraService implements
ArtemisInfraService, ContainerSer
public ArtemisAllInfraService() {
container = initContainer();
+ container.withCreateContainerCmdModifier(cmd ->
cmd.withName(ContainerEnvironmentUtil.containerName(this.getClass())));
}
protected ArtemisContainer initContainer() {
diff --git
a/test-infra/camel-test-infra-aws-v2/src/main/java/org/apache/camel/test/infra/aws2/services/AWSLocalContainerInfraService.java
b/test-infra/camel-test-infra-aws-v2/src/main/java/org/apache/camel/test/infra/aws2/services/AWSLocalContainerInfraService.java
index 9b5960917cf..353e9fbee27 100644
---
a/test-infra/camel-test-infra-aws-v2/src/main/java/org/apache/camel/test/infra/aws2/services/AWSLocalContainerInfraService.java
+++
b/test-infra/camel-test-infra-aws-v2/src/main/java/org/apache/camel/test/infra/aws2/services/AWSLocalContainerInfraService.java
@@ -24,6 +24,7 @@ import org.apache.camel.test.infra.aws.common.AWSConfigs;
import org.apache.camel.test.infra.aws.common.AWSProperties;
import org.apache.camel.test.infra.aws.common.services.AWSInfraService;
import org.apache.camel.test.infra.common.LocalPropertyResolver;
+import org.apache.camel.test.infra.common.services.ContainerEnvironmentUtil;
import org.apache.camel.test.infra.common.services.ContainerService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -44,7 +45,7 @@ public abstract class AWSLocalContainerInfraService
implements AWSInfraService,
public AWSLocalContainerInfraService(String imageName, Service...
services) {
container = initContainer(imageName);
-
+ container.withCreateContainerCmdModifier(cmd ->
cmd.withName(ContainerEnvironmentUtil.containerName(this.getClass())));
container.setupServices(services);
}
diff --git
a/test-infra/camel-test-infra-azure-common/src/main/java/org/apache/camel/test/infra/azure/common/services/AzureStorageInfraService.java
b/test-infra/camel-test-infra-azure-common/src/main/java/org/apache/camel/test/infra/azure/common/services/AzureStorageInfraService.java
index 734c08a6711..08ae7417beb 100644
---
a/test-infra/camel-test-infra-azure-common/src/main/java/org/apache/camel/test/infra/azure/common/services/AzureStorageInfraService.java
+++
b/test-infra/camel-test-infra-azure-common/src/main/java/org/apache/camel/test/infra/azure/common/services/AzureStorageInfraService.java
@@ -35,6 +35,7 @@ public abstract class AzureStorageInfraService implements
AzureInfraService, Con
public AzureStorageInfraService(String imageName) {
this.container = initContainer(imageName);
+ container.withCreateContainerCmdModifier(cmd ->
cmd.withName(ContainerEnvironmentUtil.containerName(this.getClass())));
}
public AzureStorageInfraService(AzuriteContainer container) {
diff --git
a/test-infra/camel-test-infra-azure-common/src/main/java/org/apache/camel/test/infra/azure/common/services/AzuriteContainer.java
b/test-infra/camel-test-infra-azure-common/src/main/java/org/apache/camel/test/infra/azure/common/services/AzuriteContainer.java
index db835b84d1e..4c3bfe6fe5d 100644
---
a/test-infra/camel-test-infra-azure-common/src/main/java/org/apache/camel/test/infra/azure/common/services/AzuriteContainer.java
+++
b/test-infra/camel-test-infra-azure-common/src/main/java/org/apache/camel/test/infra/azure/common/services/AzuriteContainer.java
@@ -18,8 +18,6 @@
package org.apache.camel.test.infra.azure.common.services;
import org.apache.camel.test.infra.azure.common.AzureCredentialsHolder;
-import org.apache.camel.test.infra.azure.common.AzureProperties;
-import org.apache.camel.test.infra.common.LocalPropertyResolver;
import org.testcontainers.containers.GenericContainer;
import org.testcontainers.containers.wait.strategy.Wait;
@@ -28,12 +26,6 @@ public class AzuriteContainer extends
GenericContainer<AzuriteContainer> {
public static final String DEFAULT_ACCOUNT_KEY
=
"Eby8vdM02xNOcqFlqUwJPLlmEtlCDXJ1OUzFT50uSRZ6IFsuFq2UVErCz4I6tq/K1SZFPTOtr/KBHBeksoGMGw==";
- public AzuriteContainer() {
- LocalPropertyResolver.getProperty(
- AzuriteContainer.class,
- AzureProperties.AZURE_CONTAINER);
- }
-
public AzuriteContainer(String containerName, boolean fixedPort) {
super(containerName);
diff --git
a/test-infra/camel-test-infra-cassandra/src/main/java/org/apache/camel/test/infra/cassandra/services/CassandraLocalContainerInfraService.java
b/test-infra/camel-test-infra-cassandra/src/main/java/org/apache/camel/test/infra/cassandra/services/CassandraLocalContainerInfraService.java
index 3ea58423dc7..24379c608a4 100644
---
a/test-infra/camel-test-infra-cassandra/src/main/java/org/apache/camel/test/infra/cassandra/services/CassandraLocalContainerInfraService.java
+++
b/test-infra/camel-test-infra-cassandra/src/main/java/org/apache/camel/test/infra/cassandra/services/CassandraLocalContainerInfraService.java
@@ -19,10 +19,11 @@ package org.apache.camel.test.infra.cassandra.services;
import org.apache.camel.spi.annotations.InfraService;
import org.apache.camel.test.infra.cassandra.common.CassandraProperties;
import org.apache.camel.test.infra.common.LocalPropertyResolver;
+import org.apache.camel.test.infra.common.services.ContainerEnvironmentUtil;
import org.apache.camel.test.infra.common.services.ContainerService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.testcontainers.containers.CassandraContainer;
+import org.testcontainers.cassandra.CassandraContainer;
import org.testcontainers.utility.DockerImageName;
/**
@@ -44,6 +45,7 @@ public class CassandraLocalContainerInfraService implements
CassandraInfraServic
public CassandraLocalContainerInfraService(String imageName) {
container = initContainer(imageName);
+ container.withCreateContainerCmdModifier(cmd ->
cmd.withName(ContainerEnvironmentUtil.containerName(this.getClass())));
}
public CassandraLocalContainerInfraService(CassandraContainer container) {
@@ -71,7 +73,7 @@ public class CassandraLocalContainerInfraService implements
CassandraInfraServic
@Override
public int port() {
- return container.getMappedPort(CassandraContainer.CQL_PORT);
+ return container.getContactPoint().getPort();
}
@Override
diff --git
a/test-infra/camel-test-infra-chatscript/src/main/java/org/apache/camel/test/infra/chatscript/services/ChatScriptLocalContainerInfraService.java
b/test-infra/camel-test-infra-chatscript/src/main/java/org/apache/camel/test/infra/chatscript/services/ChatScriptLocalContainerInfraService.java
index f799c222440..c5ec45d6946 100644
---
a/test-infra/camel-test-infra-chatscript/src/main/java/org/apache/camel/test/infra/chatscript/services/ChatScriptLocalContainerInfraService.java
+++
b/test-infra/camel-test-infra-chatscript/src/main/java/org/apache/camel/test/infra/chatscript/services/ChatScriptLocalContainerInfraService.java
@@ -19,6 +19,7 @@ package org.apache.camel.test.infra.chatscript.services;
import org.apache.camel.spi.annotations.InfraService;
import org.apache.camel.test.infra.chatscript.common.ChatScriptProperties;
import org.apache.camel.test.infra.common.LocalPropertyResolver;
+import org.apache.camel.test.infra.common.services.ContainerEnvironmentUtil;
import org.apache.camel.test.infra.common.services.ContainerService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -39,6 +40,7 @@ public class ChatScriptLocalContainerInfraService implements
ChatScriptInfraServ
container = new GenericContainer<>(containerName)
.withExposedPorts(SERVICE_PORT)
+ .withCreateContainerCmdModifier(cmd ->
cmd.withName(ContainerEnvironmentUtil.containerName(this.getClass())))
.withCreateContainerCmdModifier(createContainerCmd ->
createContainerCmd.withTty(true));
}
diff --git
a/test-infra/camel-test-infra-common/src/main/java/org/apache/camel/test/infra/common/services/ContainerEnvironmentUtil.java
b/test-infra/camel-test-infra-common/src/main/java/org/apache/camel/test/infra/common/services/ContainerEnvironmentUtil.java
index b5b79920c32..c604b83d123 100644
---
a/test-infra/camel-test-infra-common/src/main/java/org/apache/camel/test/infra/common/services/ContainerEnvironmentUtil.java
+++
b/test-infra/camel-test-infra-common/src/main/java/org/apache/camel/test/infra/common/services/ContainerEnvironmentUtil.java
@@ -17,6 +17,7 @@
package org.apache.camel.test.infra.common.services;
+import org.apache.camel.spi.annotations.InfraService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.testcontainers.DockerClientFactory;
@@ -57,7 +58,7 @@ public final class ContainerEnvironmentUtil {
container.setStartupAttempts(startupAttempts);
}
- public static boolean isFixedPort(Class cls) {
+ public static boolean isFixedPort(@SuppressWarnings("rawtypes") Class cls)
{
for (Class<?> i : cls.getInterfaces()) {
if (i.getName().contains("InfraService")) {
return true;
@@ -66,4 +67,14 @@ public final class ContainerEnvironmentUtil {
return false;
}
+
+ @SuppressWarnings("unchecked")
+ public static String containerName(Class cls) {
+ InfraService annotation = (InfraService)
cls.getAnnotation(InfraService.class);
+ String name = "camel-" + annotation.serviceAlias()[0];
+ if (annotation.serviceImplementationAlias().length > 0) {
+ name += "-" + annotation.serviceImplementationAlias()[0];
+ }
+ return name;
+ }
}
diff --git
a/test-infra/camel-test-infra-couchbase/src/main/java/org/apache/camel/test/infra/couchbase/services/CouchbaseLocalContainerInfraService.java
b/test-infra/camel-test-infra-couchbase/src/main/java/org/apache/camel/test/infra/couchbase/services/CouchbaseLocalContainerInfraService.java
index f49b258cbe8..ab31e031feb 100644
---
a/test-infra/camel-test-infra-couchbase/src/main/java/org/apache/camel/test/infra/couchbase/services/CouchbaseLocalContainerInfraService.java
+++
b/test-infra/camel-test-infra-couchbase/src/main/java/org/apache/camel/test/infra/couchbase/services/CouchbaseLocalContainerInfraService.java
@@ -27,6 +27,7 @@ import com.couchbase.client.java.manager.view.View;
import com.couchbase.client.java.view.DesignDocumentNamespace;
import org.apache.camel.spi.annotations.InfraService;
import org.apache.camel.test.infra.common.LocalPropertyResolver;
+import org.apache.camel.test.infra.common.services.ContainerEnvironmentUtil;
import org.apache.camel.test.infra.common.services.ContainerService;
import org.apache.camel.test.infra.couchbase.common.CouchbaseProperties;
import org.slf4j.Logger;
@@ -77,6 +78,7 @@ public class CouchbaseLocalContainerInfraService implements
CouchbaseInfraServic
public CouchbaseLocalContainerInfraService(String imageName) {
container = initContainer(imageName);
+ container.withCreateContainerCmdModifier(cmd ->
cmd.withName(ContainerEnvironmentUtil.containerName(this.getClass())));
}
public CouchbaseLocalContainerInfraService(CouchbaseContainer container) {
diff --git
a/test-infra/camel-test-infra-couchdb/src/main/java/org/apache/camel/test/infra/couchdb/services/CouchDbLocalContainerInfraService.java
b/test-infra/camel-test-infra-couchdb/src/main/java/org/apache/camel/test/infra/couchdb/services/CouchDbLocalContainerInfraService.java
index fc0445a6b26..4c2c5378b60 100644
---
a/test-infra/camel-test-infra-couchdb/src/main/java/org/apache/camel/test/infra/couchdb/services/CouchDbLocalContainerInfraService.java
+++
b/test-infra/camel-test-infra-couchdb/src/main/java/org/apache/camel/test/infra/couchdb/services/CouchDbLocalContainerInfraService.java
@@ -30,12 +30,12 @@ import org.testcontainers.utility.DockerImageName;
@InfraService(service = CouchDbInfraService.class,
description = "SQL Clustered database CouchDB",
serviceAlias = { "couchdb" })
-public class CouchDbLocalContainerInfraService implements CouchDbInfraService,
ContainerService<GenericContainer> {
+public class CouchDbLocalContainerInfraService implements CouchDbInfraService,
ContainerService<GenericContainer<?>> {
public static final String CONTAINER_NAME = "couchdb";
private static final Logger LOG =
LoggerFactory.getLogger(CouchDbLocalContainerInfraService.class);
- private final GenericContainer container;
+ private final GenericContainer<?> container;
public CouchDbLocalContainerInfraService() {
this(LocalPropertyResolver.getProperty(
@@ -45,13 +45,14 @@ public class CouchDbLocalContainerInfraService implements
CouchDbInfraService, C
public CouchDbLocalContainerInfraService(String imageName) {
container = initContainer(imageName, CONTAINER_NAME);
+ container.withCreateContainerCmdModifier(cmd ->
cmd.withName(ContainerEnvironmentUtil.containerName(this.getClass())));
}
- public CouchDbLocalContainerInfraService(GenericContainer container) {
+ public CouchDbLocalContainerInfraService(GenericContainer<?> container) {
this.container = container;
}
- protected GenericContainer initContainer(String imageName, String
containerName) {
+ protected GenericContainer<?> initContainer(String imageName, String
containerName) {
class CouchDBContainer extends GenericContainer<CouchDBContainer> {
public CouchDBContainer(boolean fixedPort) {
super(DockerImageName.parse(imageName));
@@ -92,7 +93,7 @@ public class CouchDbLocalContainerInfraService implements
CouchDbInfraService, C
}
@Override
- public GenericContainer getContainer() {
+ public GenericContainer<?> getContainer() {
return container;
}
diff --git
a/test-infra/camel-test-infra-elasticsearch/src/main/java/org/apache/camel/test/infra/elasticsearch/services/ElasticSearchLocalContainerInfraService.java
b/test-infra/camel-test-infra-elasticsearch/src/main/java/org/apache/camel/test/infra/elasticsearch/services/ElasticSearchLocalContainerInfraService.java
index 7c06c159579..258b58e3a24 100644
---
a/test-infra/camel-test-infra-elasticsearch/src/main/java/org/apache/camel/test/infra/elasticsearch/services/ElasticSearchLocalContainerInfraService.java
+++
b/test-infra/camel-test-infra-elasticsearch/src/main/java/org/apache/camel/test/infra/elasticsearch/services/ElasticSearchLocalContainerInfraService.java
@@ -58,6 +58,7 @@ public class ElasticSearchLocalContainerInfraService
public ElasticSearchLocalContainerInfraService(String imageName) {
container = initContainer(imageName);
+ container.withCreateContainerCmdModifier(cmd ->
cmd.withName(ContainerEnvironmentUtil.containerName(this.getClass())));
}
public ElasticSearchLocalContainerInfraService(ElasticsearchContainer
container) {
diff --git
a/test-infra/camel-test-infra-fhir/src/main/java/org/apache/camel/test/infra/fhir/services/FhirLocalContainerInfraService.java
b/test-infra/camel-test-infra-fhir/src/main/java/org/apache/camel/test/infra/fhir/services/FhirLocalContainerInfraService.java
index cc235f46fcd..353733fb48b 100644
---
a/test-infra/camel-test-infra-fhir/src/main/java/org/apache/camel/test/infra/fhir/services/FhirLocalContainerInfraService.java
+++
b/test-infra/camel-test-infra-fhir/src/main/java/org/apache/camel/test/infra/fhir/services/FhirLocalContainerInfraService.java
@@ -31,13 +31,13 @@ import org.testcontainers.containers.wait.strategy.Wait;
@InfraService(service = FhirInfraService.class,
description = "HAPI FHIR RESTful test server",
serviceAlias = { "fhir" })
-public class FhirLocalContainerInfraService implements FhirInfraService,
ContainerService<GenericContainer> {
+public class FhirLocalContainerInfraService implements FhirInfraService,
ContainerService<GenericContainer<?>> {
// needs
https://github.com/hapifhir/hapi-fhir-jpaserver-starter/commit/54120f374eea5084634830d34c99a9137b22a310
public static final String CONTAINER_NAME = "fhir";
private static final Logger LOG =
LoggerFactory.getLogger(FhirLocalContainerInfraService.class);
- private final GenericContainer container;
+ private final GenericContainer<?> container;
public FhirLocalContainerInfraService() {
this(LocalPropertyResolver.getProperty(
@@ -47,13 +47,14 @@ public class FhirLocalContainerInfraService implements
FhirInfraService, Contain
public FhirLocalContainerInfraService(String imageName) {
container = initContainer(imageName, CONTAINER_NAME);
+ container.withCreateContainerCmdModifier(cmd ->
cmd.withName(ContainerEnvironmentUtil.containerName(this.getClass())));
}
- public FhirLocalContainerInfraService(GenericContainer container) {
+ public FhirLocalContainerInfraService(GenericContainer<?> container) {
this.container = container;
}
- protected GenericContainer initContainer(String imageName, String
containerName) {
+ protected GenericContainer<?> initContainer(String imageName, String
containerName) {
class FhirContainer extends GenericContainer<FhirContainer> {
public FhirContainer(boolean fixedPort) {
super(imageName);
@@ -99,7 +100,7 @@ public class FhirLocalContainerInfraService implements
FhirInfraService, Contain
}
@Override
- public GenericContainer getContainer() {
+ public GenericContainer<?> getContainer() {
return container;
}
diff --git
a/test-infra/camel-test-infra-google-pubsub/src/main/java/org/apache/camel/test/infra/google/pubsub/services/GooglePubSubLocalContainerInfraService.java
b/test-infra/camel-test-infra-google-pubsub/src/main/java/org/apache/camel/test/infra/google/pubsub/services/GooglePubSubLocalContainerInfraService.java
index 9d51f4e8c03..ef170efa5d6 100644
---
a/test-infra/camel-test-infra-google-pubsub/src/main/java/org/apache/camel/test/infra/google/pubsub/services/GooglePubSubLocalContainerInfraService.java
+++
b/test-infra/camel-test-infra-google-pubsub/src/main/java/org/apache/camel/test/infra/google/pubsub/services/GooglePubSubLocalContainerInfraService.java
@@ -52,6 +52,7 @@ public class GooglePubSubLocalContainerInfraService
public GooglePubSubLocalContainerInfraService(String imageName) {
container = initContainer(imageName);
+ container.withCreateContainerCmdModifier(cmd ->
cmd.withName(ContainerEnvironmentUtil.containerName(this.getClass())));
}
public GooglePubSubLocalContainerInfraService(PubSubEmulatorContainer
container) {
diff --git
a/test-infra/camel-test-infra-hashicorp-vault/src/main/java/org/apache/camel/test/infra/hashicorp/vault/services/HashicorpVaultLocalContainerInfraService.java
b/test-infra/camel-test-infra-hashicorp-vault/src/main/java/org/apache/camel/test/infra/hashicorp/vault/services/HashicorpVaultLocalContainerInfraService.java
index ec1cb7c24a3..04bd9230346 100644
---
a/test-infra/camel-test-infra-hashicorp-vault/src/main/java/org/apache/camel/test/infra/hashicorp/vault/services/HashicorpVaultLocalContainerInfraService.java
+++
b/test-infra/camel-test-infra-hashicorp-vault/src/main/java/org/apache/camel/test/infra/hashicorp/vault/services/HashicorpVaultLocalContainerInfraService.java
@@ -58,7 +58,7 @@ public class HashicorpVaultLocalContainerInfraService
private static final Logger LOG =
LoggerFactory.getLogger(HashicorpVaultLocalContainerInfraService.class);
- private final GenericContainer container;
+ private final GenericContainer<?> container;
public HashicorpVaultLocalContainerInfraService() {
this(LocalPropertyResolver.getProperty(
@@ -68,13 +68,14 @@ public class HashicorpVaultLocalContainerInfraService
public HashicorpVaultLocalContainerInfraService(String containerImage) {
container = initContainer(containerImage, CONTAINER_NAME);
+ container.withCreateContainerCmdModifier(cmd ->
cmd.withName(ContainerEnvironmentUtil.containerName(this.getClass())));
}
- public HashicorpVaultLocalContainerInfraService(GenericContainer
container) {
+ public HashicorpVaultLocalContainerInfraService(GenericContainer<?>
container) {
this.container = container;
}
- protected GenericContainer initContainer(String imageName, String
containerName) {
+ protected GenericContainer<?> initContainer(String imageName, String
containerName) {
final Logger containerLog = LoggerFactory.getLogger("container." +
containerName);
final Consumer<OutputFrame> logConsumer = new
Slf4jLogConsumer(containerLog);
@@ -127,7 +128,7 @@ public class HashicorpVaultLocalContainerInfraService
}
@Override
- public GenericContainer getContainer() {
+ public GenericContainer<?> getContainer() {
return container;
}
diff --git
a/test-infra/camel-test-infra-hivemq/src/main/java/org/apache/camel/test/infra/hivemq/services/AbstractLocalHiveMQService.java
b/test-infra/camel-test-infra-hivemq/src/main/java/org/apache/camel/test/infra/hivemq/services/AbstractLocalHiveMQService.java
index 3c26b81665f..270238881f5 100644
---
a/test-infra/camel-test-infra-hivemq/src/main/java/org/apache/camel/test/infra/hivemq/services/AbstractLocalHiveMQService.java
+++
b/test-infra/camel-test-infra-hivemq/src/main/java/org/apache/camel/test/infra/hivemq/services/AbstractLocalHiveMQService.java
@@ -16,6 +16,7 @@
*/
package org.apache.camel.test.infra.hivemq.services;
+import org.apache.camel.test.infra.common.services.ContainerEnvironmentUtil;
import org.apache.camel.test.infra.common.services.ContainerService;
import org.apache.camel.test.infra.hivemq.common.HiveMQProperties;
import org.slf4j.Logger;
@@ -38,7 +39,8 @@ public abstract class AbstractLocalHiveMQService<T extends
AbstractLocalHiveMQSe
protected AbstractLocalHiveMQService(String imageName) {
container = initContainer(imageName)
.withExposedPorts(MQTT_PORT_DEFAULT, WEBSOCKET_PORT_DEFAULT)
- .waitingFor(Wait.forListeningPort());
+ .waitingFor(Wait.forListeningPort())
+ .withCreateContainerCmdModifier(cmd ->
cmd.withName(ContainerEnvironmentUtil.containerName(this.getClass())));
}
@Override
diff --git
a/test-infra/camel-test-infra-hivemq/src/main/java/org/apache/camel/test/infra/hivemq/services/LocalHiveMQInfraService.java
b/test-infra/camel-test-infra-hivemq/src/main/java/org/apache/camel/test/infra/hivemq/services/LocalHiveMQInfraService.java
index 8901f311aed..7a5e818c74d 100644
---
a/test-infra/camel-test-infra-hivemq/src/main/java/org/apache/camel/test/infra/hivemq/services/LocalHiveMQInfraService.java
+++
b/test-infra/camel-test-infra-hivemq/src/main/java/org/apache/camel/test/infra/hivemq/services/LocalHiveMQInfraService.java
@@ -27,11 +27,13 @@ import org.testcontainers.utility.DockerImageName;
serviceAlias = "hive-mq")
public class LocalHiveMQInfraService extends
AbstractLocalHiveMQService<LocalHiveMQInfraService> {
- LocalHiveMQInfraService() {
+ public LocalHiveMQInfraService() {
super(LocalPropertyResolver.getProperty(LocalHiveMQInfraService.class,
HiveMQProperties.HIVEMQ_CONTAINER));
}
protected HiveMQContainer initContainer(String imageName) {
- return new HiveMQContainer(DockerImageName.parse(imageName));
+ return new HiveMQContainer(
+ DockerImageName.parse(imageName)
+ .asCompatibleSubstituteFor("hivemq/hivemq-ce"));
}
}
diff --git
a/test-infra/camel-test-infra-hivemq/src/main/java/org/apache/camel/test/infra/hivemq/services/LocalHiveMQSparkplugTCKInfraService.java
b/test-infra/camel-test-infra-hivemq/src/main/java/org/apache/camel/test/infra/hivemq/services/LocalHiveMQSparkplugTCKInfraService.java
index f441e77c397..f00eae2e4c9 100644
---
a/test-infra/camel-test-infra-hivemq/src/main/java/org/apache/camel/test/infra/hivemq/services/LocalHiveMQSparkplugTCKInfraService.java
+++
b/test-infra/camel-test-infra-hivemq/src/main/java/org/apache/camel/test/infra/hivemq/services/LocalHiveMQSparkplugTCKInfraService.java
@@ -30,7 +30,7 @@ import org.testcontainers.utility.DockerImageName;
serviceImplementationAlias = "sparkplug")
public class LocalHiveMQSparkplugTCKInfraService extends
AbstractLocalHiveMQService<LocalHiveMQSparkplugTCKInfraService> {
- LocalHiveMQSparkplugTCKInfraService() {
+ public LocalHiveMQSparkplugTCKInfraService() {
super(LocalPropertyResolver.getProperty(LocalHiveMQSparkplugTCKInfraService.class,
HiveMQProperties.HIVEMQ_SPARKPLUG_CONTAINER));
}
diff --git
a/test-infra/camel-test-infra-infinispan/src/main/java/org/apache/camel/test/infra/infinispan/services/InfinispanLocalContainerInfraService.java
b/test-infra/camel-test-infra-infinispan/src/main/java/org/apache/camel/test/infra/infinispan/services/InfinispanLocalContainerInfraService.java
index 036d6cf21be..5ff7205cba9 100644
---
a/test-infra/camel-test-infra-infinispan/src/main/java/org/apache/camel/test/infra/infinispan/services/InfinispanLocalContainerInfraService.java
+++
b/test-infra/camel-test-infra-infinispan/src/main/java/org/apache/camel/test/infra/infinispan/services/InfinispanLocalContainerInfraService.java
@@ -41,7 +41,7 @@ public class InfinispanLocalContainerInfraService implements
InfinispanInfraServ
private static final Logger LOG =
LoggerFactory.getLogger(InfinispanLocalContainerInfraService.class);
- private final GenericContainer container;
+ private final GenericContainer<?> container;
private final boolean isNetworkHost;
public InfinispanLocalContainerInfraService() {
@@ -53,14 +53,15 @@ public class InfinispanLocalContainerInfraService
implements InfinispanInfraServ
public InfinispanLocalContainerInfraService(String containerImage) {
isNetworkHost = isHostNetworkMode();
container = initContainer(containerImage, CONTAINER_NAME);
+ container.withCreateContainerCmdModifier(cmd ->
cmd.withName(ContainerEnvironmentUtil.containerName(this.getClass())));
}
- public InfinispanLocalContainerInfraService(GenericContainer container) {
+ public InfinispanLocalContainerInfraService(GenericContainer<?> container)
{
isNetworkHost = isHostNetworkMode();
this.container = container;
}
- protected GenericContainer initContainer(String imageName, String
containerName) {
+ protected GenericContainer<?> initContainer(String imageName, String
containerName) {
final Logger containerLog = LoggerFactory.getLogger("container." +
containerName);
final Consumer<OutputFrame> logConsumer = new
Slf4jLogConsumer(containerLog);
@@ -122,7 +123,7 @@ public class InfinispanLocalContainerInfraService
implements InfinispanInfraServ
}
@Override
- public GenericContainer getContainer() {
+ public GenericContainer<?> getContainer() {
return container;
}
diff --git
a/test-infra/camel-test-infra-kafka/src/main/java/org/apache/camel/test/infra/kafka/services/ContainerLocalKafkaInfraService.java
b/test-infra/camel-test-infra-kafka/src/main/java/org/apache/camel/test/infra/kafka/services/ContainerLocalKafkaInfraService.java
index 3a36e8144cd..8d8f5894b1d 100644
---
a/test-infra/camel-test-infra-kafka/src/main/java/org/apache/camel/test/infra/kafka/services/ContainerLocalKafkaInfraService.java
+++
b/test-infra/camel-test-infra-kafka/src/main/java/org/apache/camel/test/infra/kafka/services/ContainerLocalKafkaInfraService.java
@@ -40,6 +40,7 @@ public class ContainerLocalKafkaInfraService implements
KafkaInfraService, Conta
public ContainerLocalKafkaInfraService() {
kafka = initContainer();
+ kafka.withCreateContainerCmdModifier(cmd ->
cmd.withName(ContainerEnvironmentUtil.containerName(this.getClass())));
}
public ContainerLocalKafkaInfraService(KafkaContainer kafka) {
diff --git
a/test-infra/camel-test-infra-kafka/src/main/java/org/apache/camel/test/infra/kafka/services/RedpandaInfraService.java
b/test-infra/camel-test-infra-kafka/src/main/java/org/apache/camel/test/infra/kafka/services/RedpandaInfraService.java
index 1ca326f61ef..a9190491b80 100644
---
a/test-infra/camel-test-infra-kafka/src/main/java/org/apache/camel/test/infra/kafka/services/RedpandaInfraService.java
+++
b/test-infra/camel-test-infra-kafka/src/main/java/org/apache/camel/test/infra/kafka/services/RedpandaInfraService.java
@@ -18,6 +18,7 @@ package org.apache.camel.test.infra.kafka.services;
import org.apache.camel.spi.annotations.InfraService;
import org.apache.camel.test.infra.common.TestUtils;
+import org.apache.camel.test.infra.common.services.ContainerEnvironmentUtil;
import org.apache.camel.test.infra.common.services.ContainerService;
import org.apache.camel.test.infra.kafka.common.KafkaProperties;
import org.slf4j.Logger;
@@ -41,6 +42,8 @@ public class RedpandaInfraService implements
KafkaInfraService, ContainerService
Network network = Network.newNetwork();
redpandaContainer = initRedpandaContainer(network,
redpandaInstanceName);
+ redpandaContainer
+ .withCreateContainerCmdModifier(cmd ->
cmd.withName(ContainerEnvironmentUtil.containerName(this.getClass())));
}
public RedpandaInfraService(RedpandaContainer redpandaContainer) {
diff --git
a/test-infra/camel-test-infra-kafka/src/main/java/org/apache/camel/test/infra/kafka/services/StrimziContainer.java
b/test-infra/camel-test-infra-kafka/src/main/java/org/apache/camel/test/infra/kafka/services/StrimziContainer.java
index 11264409726..a0f7036ac20 100644
---
a/test-infra/camel-test-infra-kafka/src/main/java/org/apache/camel/test/infra/kafka/services/StrimziContainer.java
+++
b/test-infra/camel-test-infra-kafka/src/main/java/org/apache/camel/test/infra/kafka/services/StrimziContainer.java
@@ -54,7 +54,6 @@ public class StrimziContainer extends
GenericContainer<StrimziContainer> {
private void setupContainer(String name, CreateContainerCmd
createContainerCmd) {
createContainerCmd.withHostName(name);
- createContainerCmd.withName(name);
}
public int getKafkaPort() {
diff --git
a/test-infra/camel-test-infra-kafka/src/main/java/org/apache/camel/test/infra/kafka/services/StrimziInfraService.java
b/test-infra/camel-test-infra-kafka/src/main/java/org/apache/camel/test/infra/kafka/services/StrimziInfraService.java
index 9f22324a928..c69e2b8817c 100644
---
a/test-infra/camel-test-infra-kafka/src/main/java/org/apache/camel/test/infra/kafka/services/StrimziInfraService.java
+++
b/test-infra/camel-test-infra-kafka/src/main/java/org/apache/camel/test/infra/kafka/services/StrimziInfraService.java
@@ -19,6 +19,7 @@ package org.apache.camel.test.infra.kafka.services;
import org.apache.camel.spi.annotations.InfraService;
import org.apache.camel.test.infra.common.TestUtils;
+import org.apache.camel.test.infra.common.services.ContainerEnvironmentUtil;
import org.apache.camel.test.infra.common.services.ContainerService;
import org.apache.camel.test.infra.kafka.common.KafkaProperties;
import org.slf4j.Logger;
@@ -44,6 +45,8 @@ public class StrimziInfraService implements
KafkaInfraService, ContainerService<
zookeeperContainer = initZookeeperContainer(network,
zookeeperInstanceName);
strimziContainer = initStrimziContainer(network, strimziInstanceName,
zookeeperInstanceName);
+ strimziContainer
+ .withCreateContainerCmdModifier(cmd ->
cmd.withName(ContainerEnvironmentUtil.containerName(this.getClass())));
}
public StrimziInfraService(ZookeeperContainer zookeeperContainer,
StrimziContainer strimziContainer) {
diff --git
a/test-infra/camel-test-infra-kafka/src/main/resources/org/apache/camel/test/infra/kafka/services/container.properties
b/test-infra/camel-test-infra-kafka/src/main/resources/org/apache/camel/test/infra/kafka/services/container.properties
index 03d3d6aa4e8..fc557bb64e2 100644
---
a/test-infra/camel-test-infra-kafka/src/main/resources/org/apache/camel/test/infra/kafka/services/container.properties
+++
b/test-infra/camel-test-infra-kafka/src/main/resources/org/apache/camel/test/infra/kafka/services/container.properties
@@ -17,3 +17,4 @@
kafka3.container=mirror.gcr.io/apache/kafka:3.9.1
redpanda.container.image=mirror.gcr.io/redpandadata/redpanda:v24.1.16
strimzi.container.image=quay.io/strimzi/kafka:latest-kafka-3.9.1
+confluent.container.image=mirror.gcr.io/confluentinc/cp-kafka:7.9.2
\ No newline at end of file
diff --git
a/test-infra/camel-test-infra-microprofile-lra/src/main/java/org/apache/camel/test/infra/microprofile/lra/services/MicroprofileLRALocalContainerInfraService.java
b/test-infra/camel-test-infra-microprofile-lra/src/main/java/org/apache/camel/test/infra/microprofile/lra/services/MicroprofileLRALocalContainerInfraService.java
index 725a268b61e..a40d8d5142a 100644
---
a/test-infra/camel-test-infra-microprofile-lra/src/main/java/org/apache/camel/test/infra/microprofile/lra/services/MicroprofileLRALocalContainerInfraService.java
+++
b/test-infra/camel-test-infra-microprofile-lra/src/main/java/org/apache/camel/test/infra/microprofile/lra/services/MicroprofileLRALocalContainerInfraService.java
@@ -35,12 +35,12 @@ import org.testcontainers.utility.DockerImageName;
serviceAlias = { "microprofile" },
serviceImplementationAlias = "lra")
public class MicroprofileLRALocalContainerInfraService
- implements MicroprofileLRAInfraService,
ContainerService<GenericContainer> {
+ implements MicroprofileLRAInfraService,
ContainerService<GenericContainer<?>> {
public static final String CONTAINER_NAME = "microprofile-lra";
private static final Logger LOG =
LoggerFactory.getLogger(MicroprofileLRALocalContainerInfraService.class);
- private final GenericContainer container;
+ private final GenericContainer<?> container;
public MicroprofileLRALocalContainerInfraService() {
this(LocalPropertyResolver.getProperty(
@@ -50,13 +50,14 @@ public class MicroprofileLRALocalContainerInfraService
public MicroprofileLRALocalContainerInfraService(String imageName) {
container = initContainer(imageName, CONTAINER_NAME);
+ container.withCreateContainerCmdModifier(cmd ->
cmd.withName(ContainerEnvironmentUtil.containerName(this.getClass())));
}
- public MicroprofileLRALocalContainerInfraService(GenericContainer
container) {
+ public MicroprofileLRALocalContainerInfraService(GenericContainer<?>
container) {
this.container = container;
}
- public GenericContainer initContainer(String imageName, String
networkAlias) {
+ public GenericContainer<?> initContainer(String imageName, String
networkAlias) {
class MicroprofileLRAContainer extends
GenericContainer<MicroprofileLRAContainer> {
public MicroprofileLRAContainer(boolean fixedPort) {
super(DockerImageName.parse(imageName));
@@ -99,7 +100,7 @@ public class MicroprofileLRALocalContainerInfraService
}
@Override
- public GenericContainer getContainer() {
+ public GenericContainer<?> getContainer() {
return container;
}
diff --git
a/test-infra/camel-test-infra-milvus/src/main/java/org/apache/camel/test/infra/milvus/services/MilvusLocalContainerInfraService.java
b/test-infra/camel-test-infra-milvus/src/main/java/org/apache/camel/test/infra/milvus/services/MilvusLocalContainerInfraService.java
index 6afc5270b24..b468c6f283f 100644
---
a/test-infra/camel-test-infra-milvus/src/main/java/org/apache/camel/test/infra/milvus/services/MilvusLocalContainerInfraService.java
+++
b/test-infra/camel-test-infra-milvus/src/main/java/org/apache/camel/test/infra/milvus/services/MilvusLocalContainerInfraService.java
@@ -45,6 +45,7 @@ public class MilvusLocalContainerInfraService implements
MilvusInfraService, Con
public MilvusLocalContainerInfraService(String imageName) {
container = initContainer(imageName);
+ container.withCreateContainerCmdModifier(cmd ->
cmd.withName(ContainerEnvironmentUtil.containerName(this.getClass())));
}
public MilvusLocalContainerInfraService(MilvusContainer container) {
diff --git
a/test-infra/camel-test-infra-minio/src/main/java/org/apache/camel/test/infra/minio/services/MinioLocalContainerInfraService.java
b/test-infra/camel-test-infra-minio/src/main/java/org/apache/camel/test/infra/minio/services/MinioLocalContainerInfraService.java
index 8e2b4e0f1d8..3ba7ec88ac2 100644
---
a/test-infra/camel-test-infra-minio/src/main/java/org/apache/camel/test/infra/minio/services/MinioLocalContainerInfraService.java
+++
b/test-infra/camel-test-infra-minio/src/main/java/org/apache/camel/test/infra/minio/services/MinioLocalContainerInfraService.java
@@ -31,7 +31,7 @@ import
org.testcontainers.containers.wait.strategy.HttpWaitStrategy;
@InfraService(service = MinioInfraService.class,
description = "MinIO Object Storage, S3 compatible",
serviceAlias = { "minio" })
-public class MinioLocalContainerInfraService implements MinioInfraService,
ContainerService<GenericContainer> {
+public class MinioLocalContainerInfraService implements MinioInfraService,
ContainerService<GenericContainer<?>> {
public static final String CONTAINER_NAME = "minio";
private static final String ACCESS_KEY;
private static final String SECRET_KEY;
@@ -44,7 +44,7 @@ public class MinioLocalContainerInfraService implements
MinioInfraService, Conta
SECRET_KEY = System.getProperty(MinioProperties.SECRET_KEY,
"testSecretKey");
}
- private final GenericContainer container;
+ private final GenericContainer<?> container;
public MinioLocalContainerInfraService() {
this(LocalPropertyResolver.getProperty(MinioLocalContainerInfraService.class,
MinioProperties.MINIO_CONTAINER));
@@ -52,13 +52,14 @@ public class MinioLocalContainerInfraService implements
MinioInfraService, Conta
public MinioLocalContainerInfraService(String containerName) {
container = initContainer(containerName, CONTAINER_NAME);
+ container.withCreateContainerCmdModifier(cmd ->
cmd.withName(ContainerEnvironmentUtil.containerName(this.getClass())));
}
- public MinioLocalContainerInfraService(GenericContainer container) {
+ public MinioLocalContainerInfraService(GenericContainer<?> container) {
this.container = container;
}
- protected GenericContainer initContainer(String imageName, String
containerName) {
+ protected GenericContainer<?> initContainer(String imageName, String
containerName) {
class MinioContainer extends GenericContainer<MinioContainer> {
public MinioContainer(boolean fixedPort) {
@@ -108,7 +109,7 @@ public class MinioLocalContainerInfraService implements
MinioInfraService, Conta
}
@Override
- public GenericContainer getContainer() {
+ public GenericContainer<?> getContainer() {
return container;
}
diff --git
a/test-infra/camel-test-infra-mongodb/src/main/java/org/apache/camel/test/infra/mongodb/services/MongoDBLocalContainerInfraService.java
b/test-infra/camel-test-infra-mongodb/src/main/java/org/apache/camel/test/infra/mongodb/services/MongoDBLocalContainerInfraService.java
index 4d656dbaa45..9f573fb6c40 100644
---
a/test-infra/camel-test-infra-mongodb/src/main/java/org/apache/camel/test/infra/mongodb/services/MongoDBLocalContainerInfraService.java
+++
b/test-infra/camel-test-infra-mongodb/src/main/java/org/apache/camel/test/infra/mongodb/services/MongoDBLocalContainerInfraService.java
@@ -41,6 +41,7 @@ public class MongoDBLocalContainerInfraService implements
MongoDBInfraService, C
public MongoDBLocalContainerInfraService(String imageName) {
container = initContainer(imageName);
+ container.withCreateContainerCmdModifier(cmd ->
cmd.withName(ContainerEnvironmentUtil.containerName(this.getClass())));
}
public MongoDBLocalContainerInfraService(MongoDBContainer container) {
@@ -50,10 +51,6 @@ public class MongoDBLocalContainerInfraService implements
MongoDBInfraService, C
protected MongoDBContainer initContainer(String imageName) {
class TestInfraMongoDBContainer extends MongoDBContainer {
- public TestInfraMongoDBContainer(boolean fixedPort) {
- super();
- addPort(fixedPort);
- }
public TestInfraMongoDBContainer(boolean fixedPort, String
imageName) {
super(DockerImageName.parse(imageName).asCompatibleSubstituteFor("mongo"));
@@ -68,12 +65,7 @@ public class MongoDBLocalContainerInfraService implements
MongoDBInfraService, C
}
}
}
-
- if (imageName == null || imageName.isEmpty()) {
- return new
TestInfraMongoDBContainer(ContainerEnvironmentUtil.isFixedPort(this.getClass()));
- } else {
- return new
TestInfraMongoDBContainer(ContainerEnvironmentUtil.isFixedPort(this.getClass()),
imageName);
- }
+ return new
TestInfraMongoDBContainer(ContainerEnvironmentUtil.isFixedPort(this.getClass()),
imageName);
}
@Override
diff --git
a/test-infra/camel-test-infra-mosquitto/src/main/java/org/apache/camel/test/infra/mosquitto/services/MosquittoLocalContainerInfraService.java
b/test-infra/camel-test-infra-mosquitto/src/main/java/org/apache/camel/test/infra/mosquitto/services/MosquittoLocalContainerInfraService.java
index 1659dd1532b..b3e23d3f12a 100644
---
a/test-infra/camel-test-infra-mosquitto/src/main/java/org/apache/camel/test/infra/mosquitto/services/MosquittoLocalContainerInfraService.java
+++
b/test-infra/camel-test-infra-mosquitto/src/main/java/org/apache/camel/test/infra/mosquitto/services/MosquittoLocalContainerInfraService.java
@@ -31,13 +31,13 @@ import org.testcontainers.containers.wait.strategy.Wait;
@InfraService(service = MosquittoInfraService.class,
description = "Mosquitto is a message broker that implements
MQTT protocol",
serviceAlias = { "mosquitto" })
-public class MosquittoLocalContainerInfraService implements
MosquittoInfraService, ContainerService<GenericContainer> {
+public class MosquittoLocalContainerInfraService implements
MosquittoInfraService, ContainerService<GenericContainer<?>> {
public static final String CONTAINER_NAME = "mosquitto";
public static final int CONTAINER_PORT = 1883;
private static final Logger LOG =
LoggerFactory.getLogger(MosquittoLocalContainerInfraService.class);
- private final GenericContainer container;
+ private final GenericContainer<?> container;
public MosquittoLocalContainerInfraService() {
this(LocalPropertyResolver.getProperty(MosquittoLocalContainerInfraService.class,
@@ -60,19 +60,19 @@ public class MosquittoLocalContainerInfraService implements
MosquittoInfraServic
}
}
- public MosquittoLocalContainerInfraService(GenericContainer container) {
+ public MosquittoLocalContainerInfraService(GenericContainer<?> container) {
this.container = container;
}
- protected GenericContainer initContainer(String imageName, Integer port) {
- GenericContainer ret;
+ protected GenericContainer<?> initContainer(String imageName, Integer
port) {
+ GenericContainer<?> ret;
if (port == null) {
ret = new GenericContainer(imageName)
.withExposedPorts(CONTAINER_PORT);
} else {
@SuppressWarnings("deprecation")
- GenericContainer fixedPortContainer = new
FixedHostPortGenericContainer(imageName)
+ GenericContainer<?> fixedPortContainer = new
FixedHostPortGenericContainer(imageName)
.withFixedExposedPort(port, CONTAINER_PORT);
ret = fixedPortContainer;
}
@@ -81,7 +81,7 @@ public class MosquittoLocalContainerInfraService implements
MosquittoInfraServic
.withClasspathResourceMapping("mosquitto.conf",
"/mosquitto/config/mosquitto.conf", BindMode.READ_ONLY)
.waitingFor(Wait.forLogMessage(".* mosquitto version .*
running", 1))
.waitingFor(Wait.forListeningPort());
-
+ ret.withCreateContainerCmdModifier(cmd ->
cmd.withName(ContainerEnvironmentUtil.containerName(this.getClass())));
return ret;
}
@@ -106,7 +106,7 @@ public class MosquittoLocalContainerInfraService implements
MosquittoInfraServic
}
@Override
- public GenericContainer getContainer() {
+ public GenericContainer<?> getContainer() {
return container;
}
diff --git
a/test-infra/camel-test-infra-nats/src/main/java/org/apache/camel/test/infra/nats/services/NatsLocalContainerInfraService.java
b/test-infra/camel-test-infra-nats/src/main/java/org/apache/camel/test/infra/nats/services/NatsLocalContainerInfraService.java
index 1c0a4799057..38e375b71b5 100644
---
a/test-infra/camel-test-infra-nats/src/main/java/org/apache/camel/test/infra/nats/services/NatsLocalContainerInfraService.java
+++
b/test-infra/camel-test-infra-nats/src/main/java/org/apache/camel/test/infra/nats/services/NatsLocalContainerInfraService.java
@@ -29,12 +29,12 @@ import org.testcontainers.containers.wait.strategy.Wait;
@InfraService(service = NatsInfraService.class,
description = "Messaging Platform NATS",
serviceAlias = { "nats" })
-public class NatsLocalContainerInfraService implements NatsInfraService,
ContainerService<GenericContainer> {
+public class NatsLocalContainerInfraService implements NatsInfraService,
ContainerService<GenericContainer<?>> {
public static final String CONTAINER_NAME = "nats";
private static final int PORT = 4222;
private static final Logger LOG =
LoggerFactory.getLogger(NatsLocalContainerInfraService.class);
- private final GenericContainer container;
+ private final GenericContainer<?> container;
public NatsLocalContainerInfraService() {
this(LocalPropertyResolver.getProperty(NatsLocalContainerInfraService.class,
NatsProperties.NATS_CONTAINER));
@@ -42,9 +42,10 @@ public class NatsLocalContainerInfraService implements
NatsInfraService, Contain
public NatsLocalContainerInfraService(String imageName) {
container = initContainer(imageName, CONTAINER_NAME);
+ container.withCreateContainerCmdModifier(cmd ->
cmd.withName(ContainerEnvironmentUtil.containerName(this.getClass())));
}
- protected GenericContainer initContainer(String imageName, String
containerName) {
+ protected GenericContainer<?> initContainer(String imageName, String
containerName) {
class NatsContainer extends GenericContainer<NatsContainer> {
public NatsContainer(boolean fixedPort) {
super(imageName);
@@ -84,7 +85,7 @@ public class NatsLocalContainerInfraService implements
NatsInfraService, Contain
}
@Override
- public GenericContainer getContainer() {
+ public GenericContainer<?> getContainer() {
return container;
}
diff --git
a/test-infra/camel-test-infra-ollama/src/main/java/org/apache/camel/test/infra/ollama/services/OllamaLocalContainerInfraService.java
b/test-infra/camel-test-infra-ollama/src/main/java/org/apache/camel/test/infra/ollama/services/OllamaLocalContainerInfraService.java
index fc2ed90fb89..5862e6b907a 100644
---
a/test-infra/camel-test-infra-ollama/src/main/java/org/apache/camel/test/infra/ollama/services/OllamaLocalContainerInfraService.java
+++
b/test-infra/camel-test-infra-ollama/src/main/java/org/apache/camel/test/infra/ollama/services/OllamaLocalContainerInfraService.java
@@ -50,7 +50,6 @@ public class OllamaLocalContainerInfraService implements
OllamaInfraService, Con
public OllamaLocalContainerInfraService() {
container = initContainer();
-
configuration = new DefaultServiceConfiguration();
}
@@ -68,6 +67,8 @@ public class OllamaLocalContainerInfraService implements
OllamaInfraService, Con
if (fixedPort) {
addFixedExposedPort(11434, 11434);
}
+ withCreateContainerCmdModifier(cmd -> cmd
+
.withName(ContainerEnvironmentUtil.containerName(OllamaLocalContainerInfraService.this.getClass())));
}
}
diff --git
a/test-infra/camel-test-infra-openldap/src/main/java/org/apache/camel/test/infra/openldap/services/OpenldapLocalContainerInfraService.java
b/test-infra/camel-test-infra-openldap/src/main/java/org/apache/camel/test/infra/openldap/services/OpenldapLocalContainerInfraService.java
index 67fe021b743..606685ce1fa 100644
---
a/test-infra/camel-test-infra-openldap/src/main/java/org/apache/camel/test/infra/openldap/services/OpenldapLocalContainerInfraService.java
+++
b/test-infra/camel-test-infra-openldap/src/main/java/org/apache/camel/test/infra/openldap/services/OpenldapLocalContainerInfraService.java
@@ -36,6 +36,7 @@ public class OpenldapLocalContainerInfraService implements
OpenldapInfraService,
public OpenldapLocalContainerInfraService() {
container = new
OpenLdapContainer(ContainerEnvironmentUtil.isFixedPort(this.getClass()));
+ container.withCreateContainerCmdModifier(cmd ->
cmd.withName(ContainerEnvironmentUtil.containerName(this.getClass())));
}
@Override
diff --git
a/test-infra/camel-test-infra-postgres/src/main/java/org/apache/camel/test/infra/postgres/services/PostgresLocalContainerInfraService.java
b/test-infra/camel-test-infra-postgres/src/main/java/org/apache/camel/test/infra/postgres/services/PostgresLocalContainerInfraService.java
index 1fb3d2f4556..a889b64a74e 100644
---
a/test-infra/camel-test-infra-postgres/src/main/java/org/apache/camel/test/infra/postgres/services/PostgresLocalContainerInfraService.java
+++
b/test-infra/camel-test-infra-postgres/src/main/java/org/apache/camel/test/infra/postgres/services/PostgresLocalContainerInfraService.java
@@ -29,12 +29,12 @@ import org.testcontainers.utility.DockerImageName;
@InfraService(service = PostgresInfraService.class,
description = "Postgres SQL Database",
serviceAlias = { "postgres" })
-public class PostgresLocalContainerInfraService implements
PostgresInfraService, ContainerService<PostgreSQLContainer> {
+public class PostgresLocalContainerInfraService implements
PostgresInfraService, ContainerService<PostgreSQLContainer<?>> {
public static final String DEFAULT_POSTGRES_CONTAINER
=
LocalPropertyResolver.getProperty(PostgresLocalContainerInfraService.class,
PostgresProperties.POSTGRES_CONTAINER);
private static final Logger LOG =
LoggerFactory.getLogger(PostgresLocalContainerInfraService.class);
- private final PostgreSQLContainer container;
+ private final PostgreSQLContainer<?> container;
public PostgresLocalContainerInfraService() {
this(DEFAULT_POSTGRES_CONTAINER);
@@ -42,13 +42,14 @@ public class PostgresLocalContainerInfraService implements
PostgresInfraService,
public PostgresLocalContainerInfraService(String imageName) {
container = initContainer(imageName);
+ container.withCreateContainerCmdModifier(cmd ->
cmd.withName(ContainerEnvironmentUtil.containerName(this.getClass())));
}
- public PostgresLocalContainerInfraService(PostgreSQLContainer container) {
+ public PostgresLocalContainerInfraService(PostgreSQLContainer<?>
container) {
this.container = container;
}
- protected PostgreSQLContainer initContainer(String imageName) {
+ protected PostgreSQLContainer<?> initContainer(String imageName) {
class TestInfraPostgreSQLContainer extends PostgreSQLContainer {
public TestInfraPostgreSQLContainer(boolean fixedPort) {
super(DockerImageName.parse(imageName)
@@ -88,7 +89,7 @@ public class PostgresLocalContainerInfraService implements
PostgresInfraService,
}
@Override
- public PostgreSQLContainer getContainer() {
+ public PostgreSQLContainer<?> getContainer() {
return container;
}
diff --git
a/test-infra/camel-test-infra-pulsar/src/main/java/org/apache/camel/test/infra/pulsar/services/PulsarLocalContainerInfraService.java
b/test-infra/camel-test-infra-pulsar/src/main/java/org/apache/camel/test/infra/pulsar/services/PulsarLocalContainerInfraService.java
index c209526e638..bfc8fb72d26 100644
---
a/test-infra/camel-test-infra-pulsar/src/main/java/org/apache/camel/test/infra/pulsar/services/PulsarLocalContainerInfraService.java
+++
b/test-infra/camel-test-infra-pulsar/src/main/java/org/apache/camel/test/infra/pulsar/services/PulsarLocalContainerInfraService.java
@@ -43,6 +43,7 @@ public class PulsarLocalContainerInfraService implements
PulsarInfraService, Con
public PulsarLocalContainerInfraService(String imageName) {
container = initContainer(imageName);
+ container.withCreateContainerCmdModifier(cmd ->
cmd.withName(ContainerEnvironmentUtil.containerName(this.getClass())));
}
public PulsarLocalContainerInfraService(PulsarContainer container) {
diff --git
a/test-infra/camel-test-infra-qdrant/src/main/java/org/apache/camel/test/infra/qdrant/services/QdrantLocalContainerInfraService.java
b/test-infra/camel-test-infra-qdrant/src/main/java/org/apache/camel/test/infra/qdrant/services/QdrantLocalContainerInfraService.java
index e11caf42cbd..8fa71461c22 100644
---
a/test-infra/camel-test-infra-qdrant/src/main/java/org/apache/camel/test/infra/qdrant/services/QdrantLocalContainerInfraService.java
+++
b/test-infra/camel-test-infra-qdrant/src/main/java/org/apache/camel/test/infra/qdrant/services/QdrantLocalContainerInfraService.java
@@ -44,6 +44,7 @@ public class QdrantLocalContainerInfraService implements
QdrantInfraService, Con
public QdrantLocalContainerInfraService(String imageName) {
this.container = initContainer(imageName,
ContainerEnvironmentUtil.isFixedPort(this.getClass()));
+ container.withCreateContainerCmdModifier(cmd ->
cmd.withName(ContainerEnvironmentUtil.containerName(this.getClass())));
}
public QdrantLocalContainerInfraService(QdrantContainer container) {
diff --git
a/test-infra/camel-test-infra-rabbitmq/src/main/java/org/apache/camel/test/infra/rabbitmq/services/RabbitMQLocalContainerInfraService.java
b/test-infra/camel-test-infra-rabbitmq/src/main/java/org/apache/camel/test/infra/rabbitmq/services/RabbitMQLocalContainerInfraService.java
index bb0fedeebb2..487c7f947ff 100644
---
a/test-infra/camel-test-infra-rabbitmq/src/main/java/org/apache/camel/test/infra/rabbitmq/services/RabbitMQLocalContainerInfraService.java
+++
b/test-infra/camel-test-infra-rabbitmq/src/main/java/org/apache/camel/test/infra/rabbitmq/services/RabbitMQLocalContainerInfraService.java
@@ -42,6 +42,7 @@ public class RabbitMQLocalContainerInfraService implements
RabbitMQInfraService,
public RabbitMQLocalContainerInfraService(String imageName) {
container = initContainer(imageName);
+ container.withCreateContainerCmdModifier(cmd ->
cmd.withName(ContainerEnvironmentUtil.containerName(this.getClass())));
}
public RabbitMQLocalContainerInfraService(RabbitMQContainer container) {
diff --git
a/test-infra/camel-test-infra-redis/src/main/java/org/apache/camel/test/infra/redis/services/RedisLocalContainerInfraService.java
b/test-infra/camel-test-infra-redis/src/main/java/org/apache/camel/test/infra/redis/services/RedisLocalContainerInfraService.java
index cb4bf601024..a4ad8078c62 100644
---
a/test-infra/camel-test-infra-redis/src/main/java/org/apache/camel/test/infra/redis/services/RedisLocalContainerInfraService.java
+++
b/test-infra/camel-test-infra-redis/src/main/java/org/apache/camel/test/infra/redis/services/RedisLocalContainerInfraService.java
@@ -33,11 +33,13 @@ public class RedisLocalContainerInfraService implements
RedisInfraService, Conta
public RedisLocalContainerInfraService() {
container = new RedisContainer();
+ container.withCreateContainerCmdModifier(cmd ->
cmd.withName(ContainerEnvironmentUtil.containerName(this.getClass())));
}
public RedisLocalContainerInfraService(String imageName) {
container = RedisContainer.initContainer(imageName,
RedisContainer.CONTAINER_NAME,
ContainerEnvironmentUtil.isFixedPort(this.getClass()));
+ container.withCreateContainerCmdModifier(cmd ->
cmd.withName(ContainerEnvironmentUtil.containerName(this.getClass())));
}
@Override
diff --git
a/test-infra/camel-test-infra-rocketmq/src/main/java/org/apache/camel/test/infra/rocketmq/services/RocketMQBrokerContainer.java
b/test-infra/camel-test-infra-rocketmq/src/main/java/org/apache/camel/test/infra/rocketmq/services/RocketMQBrokerContainer.java
index 6cbbe0ee2a6..6ede4e105a6 100644
---
a/test-infra/camel-test-infra-rocketmq/src/main/java/org/apache/camel/test/infra/rocketmq/services/RocketMQBrokerContainer.java
+++
b/test-infra/camel-test-infra-rocketmq/src/main/java/org/apache/camel/test/infra/rocketmq/services/RocketMQBrokerContainer.java
@@ -50,6 +50,5 @@ public class RocketMQBrokerContainer extends
GenericContainer<RocketMQBrokerCont
"-c", "/opt/rocketmq-" +
RocketMQContainerInfraService.ROCKETMQ_VERSION + "/conf/broker.conf");
waitingFor(Wait.forListeningPort());
- withCreateContainerCmdModifier(cmd -> cmd.withName(confName));
}
}
diff --git
a/test-infra/camel-test-infra-rocketmq/src/main/java/org/apache/camel/test/infra/rocketmq/services/RocketMQContainerInfraService.java
b/test-infra/camel-test-infra-rocketmq/src/main/java/org/apache/camel/test/infra/rocketmq/services/RocketMQContainerInfraService.java
index 8b6c5898506..e5365b8c35e 100644
---
a/test-infra/camel-test-infra-rocketmq/src/main/java/org/apache/camel/test/infra/rocketmq/services/RocketMQContainerInfraService.java
+++
b/test-infra/camel-test-infra-rocketmq/src/main/java/org/apache/camel/test/infra/rocketmq/services/RocketMQContainerInfraService.java
@@ -52,6 +52,8 @@ public class RocketMQContainerInfraService implements
RocketMQInfraService, Cont
brokerContainer1
= new RocketMQBrokerContainer(network, "broker1",
ContainerEnvironmentUtil.isFixedPort(this.getClass()));
+ brokerContainer1
+ .withCreateContainerCmdModifier(cmd ->
cmd.withName(ContainerEnvironmentUtil.containerName(this.getClass())));
}
@Override
diff --git
a/test-infra/camel-test-infra-smb/src/main/java/org/apache/camel/test/infra/smb/services/SmbLocalContainerInfraService.java
b/test-infra/camel-test-infra-smb/src/main/java/org/apache/camel/test/infra/smb/services/SmbLocalContainerInfraService.java
index c27aed19408..606a2105daf 100644
---
a/test-infra/camel-test-infra-smb/src/main/java/org/apache/camel/test/infra/smb/services/SmbLocalContainerInfraService.java
+++
b/test-infra/camel-test-infra-smb/src/main/java/org/apache/camel/test/infra/smb/services/SmbLocalContainerInfraService.java
@@ -30,6 +30,7 @@ public class SmbLocalContainerInfraService implements
SmbInfraService {
protected final SmbContainer container = new
SmbContainer(ContainerEnvironmentUtil.isFixedPort(this.getClass()));
public SmbLocalContainerInfraService() {
+ container.withCreateContainerCmdModifier(cmd ->
cmd.withName(ContainerEnvironmentUtil.containerName(this.getClass())));
}
@Override
diff --git
a/test-infra/camel-test-infra-solr/src/main/java/org/apache/camel/test/infra/solr/services/SolrLocalContainerInfraService.java
b/test-infra/camel-test-infra-solr/src/main/java/org/apache/camel/test/infra/solr/services/SolrLocalContainerInfraService.java
index aaa642fd682..01fc801c092 100644
---
a/test-infra/camel-test-infra-solr/src/main/java/org/apache/camel/test/infra/solr/services/SolrLocalContainerInfraService.java
+++
b/test-infra/camel-test-infra-solr/src/main/java/org/apache/camel/test/infra/solr/services/SolrLocalContainerInfraService.java
@@ -34,6 +34,7 @@ public class SolrLocalContainerInfraService implements
SolrInfraService, Contain
public SolrLocalContainerInfraService() {
container = SolrContainer.initContainer(SolrContainer.CONTAINER_NAME,
ContainerEnvironmentUtil.isFixedPort(this.getClass()));
+ container.withCreateContainerCmdModifier(cmd ->
cmd.withName(ContainerEnvironmentUtil.containerName(this.getClass())));
}
@Override
diff --git
a/test-infra/camel-test-infra-torchserve/src/main/java/org/apache/camel/test/infra/torchserve/services/TorchServeLocalContainerInfraService.java
b/test-infra/camel-test-infra-torchserve/src/main/java/org/apache/camel/test/infra/torchserve/services/TorchServeLocalContainerInfraService.java
index 3ea667651c7..4d6e96dcace 100644
---
a/test-infra/camel-test-infra-torchserve/src/main/java/org/apache/camel/test/infra/torchserve/services/TorchServeLocalContainerInfraService.java
+++
b/test-infra/camel-test-infra-torchserve/src/main/java/org/apache/camel/test/infra/torchserve/services/TorchServeLocalContainerInfraService.java
@@ -49,6 +49,7 @@ public class TorchServeLocalContainerInfraService implements
TorchServeInfraServ
TorchServeProperties.TORCHSERVE_CONTAINER);
container = initContainer(imageName);
+ container.withCreateContainerCmdModifier(cmd ->
cmd.withName(ContainerEnvironmentUtil.containerName(this.getClass())));
}
@SuppressWarnings("resource")
diff --git
a/test-infra/camel-test-infra-xmpp/src/main/java/org/apache/camel/test/infra/xmpp/services/XmppLocalContainerInfraService.java
b/test-infra/camel-test-infra-xmpp/src/main/java/org/apache/camel/test/infra/xmpp/services/XmppLocalContainerInfraService.java
index 01785fe9273..383837b9dda 100644
---
a/test-infra/camel-test-infra-xmpp/src/main/java/org/apache/camel/test/infra/xmpp/services/XmppLocalContainerInfraService.java
+++
b/test-infra/camel-test-infra-xmpp/src/main/java/org/apache/camel/test/infra/xmpp/services/XmppLocalContainerInfraService.java
@@ -38,6 +38,7 @@ public class XmppLocalContainerInfraService implements
XmppInfraService, Contain
public XmppLocalContainerInfraService(String imageName) {
container = initContainer(imageName);
+ container.withCreateContainerCmdModifier(cmd ->
cmd.withName(ContainerEnvironmentUtil.containerName(this.getClass())));
}
public XmppLocalContainerInfraService(XmppServerContainer container) {
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 7b89060a265..13e520b2d3b 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
@@ -18,6 +18,7 @@ package org.apache.camel.test.infra.zookeeper.services;
import org.apache.camel.spi.annotations.InfraService;
import org.apache.camel.test.infra.common.LocalPropertyResolver;
+import org.apache.camel.test.infra.common.services.ContainerEnvironmentUtil;
import org.apache.camel.test.infra.common.services.ContainerService;
import org.apache.camel.test.infra.zookeeper.common.ZooKeeperProperties;
import org.slf4j.Logger;
@@ -38,6 +39,7 @@ public class ZooKeeperLocalContainerInfraService implements
ZooKeeperInfraServic
public ZooKeeperLocalContainerInfraService(String imageName) {
container = initContainer(imageName);
+ container.withCreateContainerCmdModifier(cmd ->
cmd.withName(ContainerEnvironmentUtil.containerName(this.getClass())));
}
public ZooKeeperLocalContainerInfraService(ZooKeeperContainer container) {
