[camel] 01/02: (chores) camel-test-infra-kafka: defaults to running the tests with Kafka 3.x

[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

commit 93d4bde995ab4d9cb13efc1bbd546bd7a793677b
Author: Otavio Rodolfo Piske <angusyo...@gmail.com>
AuthorDate: Fri Aug 5 11:14:56 2022 +0200

    (chores) camel-test-infra-kafka: defaults to running the tests with Kafka 
3.x
---
 .../camel/test/infra/kafka/services/KafkaServiceFactory.java      | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

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 ceb5c6d42f9..8018c5b3bb1 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
@@ -57,10 +57,11 @@ public final class KafkaServiceFactory {
     public static KafkaService createService() {
         SimpleTestServiceBuilder<KafkaService> builder = new 
SimpleTestServiceBuilder<>("kafka");
 
-        return builder.addLocalMapping(ContainerLocalKafkaService::new)
+        return 
builder.addLocalMapping(ContainerLocalKafkaService::kafka3Container)
                 .addMapping("local-strimzi-container", StrimziService::new)
                 .addRemoteMapping(RemoteKafkaService::new)
                 .addMapping("local-kafka3-container", 
ContainerLocalKafkaService::kafka3Container)
+                .addMapping("local-kafka2-container", 
ContainerLocalKafkaService::new)
                 .build();
     }
 
@@ -69,10 +70,13 @@ public final class KafkaServiceFactory {
             if (instance == null) {
                 instance = builder();
 
-                instance.addLocalMapping(() -> new SingletonKafkaService(new 
ContainerLocalKafkaService(), "kafka"))
+                instance.addLocalMapping(
+                        () -> new 
SingletonKafkaService(ContainerLocalKafkaService.kafka3Container(), "kafka"))
                         .addRemoteMapping(RemoteKafkaService::new)
                         .addMapping("local-kafka3-container",
                                 () -> new 
SingletonKafkaService(ContainerLocalKafkaService.kafka3Container(), "kafka3"))
+                        .addMapping("local-kafka2-container",
+                                () -> new SingletonKafkaService(new 
ContainerLocalKafkaService(), "kafka2"))
                         .addMapping("local-strimzi-container",
                                 () -> new SingletonKafkaService(new 
StrimziService(), "strimzi"));