[camel] branch main updated: (chores) camel-test-infra-kafka: do use Kafka 2.x when requested

[orpiske]

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

orpiske 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 e30d2eea47c (chores) camel-test-infra-kafka: do use Kafka 2.x when 
requested
e30d2eea47c is described below

commit e30d2eea47c5d602a9a2caceab2c46a54fe949e2
Author: Otavio Rodolfo Piske <angusyo...@gmail.com>
AuthorDate: Wed Apr 26 11:58:03 2023 +0200

    (chores) camel-test-infra-kafka: do use Kafka 2.x when requested
---
 .../camel/test/infra/kafka/services/ContainerLocalKafkaService.java | 6 +++++-
 .../apache/camel/test/infra/kafka/services/KafkaServiceFactory.java | 4 ++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git 
a/test-infra/camel-test-infra-kafka/src/test/java/org/apache/camel/test/infra/kafka/services/ContainerLocalKafkaService.java
 
b/test-infra/camel-test-infra-kafka/src/test/java/org/apache/camel/test/infra/kafka/services/ContainerLocalKafkaService.java
index 56047ce8ec8..8d0a531725f 100644
--- 
a/test-infra/camel-test-infra-kafka/src/test/java/org/apache/camel/test/infra/kafka/services/ContainerLocalKafkaService.java
+++ 
b/test-infra/camel-test-infra-kafka/src/test/java/org/apache/camel/test/infra/kafka/services/ContainerLocalKafkaService.java
@@ -26,6 +26,7 @@ import org.testcontainers.utility.DockerImageName;
 
 public class ContainerLocalKafkaService implements KafkaService, 
ContainerService<KafkaContainer> {
     public static final String KAFKA3_IMAGE_NAME = 
"confluentinc/cp-kafka:7.3.2";
+    public static final String KAFKA2_IMAGE_NAME = 
"confluentinc/cp-kafka:5.5.12";
 
     private static final Logger LOG = 
LoggerFactory.getLogger(ContainerLocalKafkaService.class);
     private final KafkaContainer kafka;
@@ -70,7 +71,10 @@ public class ContainerLocalKafkaService implements 
KafkaService, ContainerServic
     }
 
     public static ContainerLocalKafkaService kafka2Container() {
-        return new ContainerLocalKafkaService();
+        KafkaContainer container = new 
KafkaContainer(DockerImageName.parse(KAFKA2_IMAGE_NAME));
+        container = container.withEmbeddedZookeeper();
+
+        return new ContainerLocalKafkaService(container);
     }
 
     public static ContainerLocalKafkaService kafka3Container() {
diff --git 
a/test-infra/camel-test-infra-kafka/src/test/java/org/apache/camel/test/infra/kafka/services/KafkaServiceFactory.java
 
b/test-infra/camel-test-infra-kafka/src/test/java/org/apache/camel/test/infra/kafka/services/KafkaServiceFactory.java
index 377cd13b9fd..241362d68fd 100644
--- 
a/test-infra/camel-test-infra-kafka/src/test/java/org/apache/camel/test/infra/kafka/services/KafkaServiceFactory.java
+++ 
b/test-infra/camel-test-infra-kafka/src/test/java/org/apache/camel/test/infra/kafka/services/KafkaServiceFactory.java
@@ -61,7 +61,7 @@ public final class KafkaServiceFactory {
                 .addMapping("local-strimzi-container", StrimziService::new)
                 .addRemoteMapping(RemoteKafkaService::new)
                 .addMapping("local-kafka3-container", 
ContainerLocalKafkaService::kafka3Container)
-                .addMapping("local-kafka2-container", 
ContainerLocalKafkaService::new)
+                .addMapping("local-kafka2-container", 
ContainerLocalKafkaService::kafka2Container)
                 .addMapping("local-redpanda-container", RedpandaService::new)
                 .build();
     }
@@ -77,7 +77,7 @@ public final class KafkaServiceFactory {
                         .addMapping("local-kafka3-container",
                                 () -> new 
SingletonKafkaService(ContainerLocalKafkaService.kafka3Container(), "kafka3"))
                         .addMapping("local-kafka2-container",
-                                () -> new SingletonKafkaService(new 
ContainerLocalKafkaService(), "kafka2"))
+                                () -> new 
SingletonKafkaService(ContainerLocalKafkaService.kafka2Container(), "kafka2"))
                         .addMapping("local-strimzi-container",
                                 () -> new SingletonKafkaService(new 
StrimziService(), "strimzi"))
                         .addMapping("local-redpanda-container",