From 2e33f071c723741a0b14b891f76e565d2368f1b7 Mon Sep 17 00:00:00 2001
From: ThomasKasene <6691406+ThomasKasene@users.noreply.github.com>
Date: Thu, 2 Oct 2025 09:32:57 +0200
Subject: [PATCH] Fixed bug that allowed configs for Kafka listeners and
 advertised listeners to come out of sync

---
 .../org/testcontainers/kafka/ConfluentKafkaContainer.java   | 6 +++---
 .../main/java/org/testcontainers/kafka/KafkaContainer.java  | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/modules/kafka/src/main/java/org/testcontainers/kafka/ConfluentKafkaContainer.java b/modules/kafka/src/main/java/org/testcontainers/kafka/ConfluentKafkaContainer.java
index abbd2bfd908..381ba836715 100644
--- a/modules/kafka/src/main/java/org/testcontainers/kafka/ConfluentKafkaContainer.java
+++ b/modules/kafka/src/main/java/org/testcontainers/kafka/ConfluentKafkaContainer.java
@@ -6,7 +6,7 @@
 import org.testcontainers.utility.DockerImageName;
 
 import java.util.ArrayList;
-import java.util.HashSet;
+import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Set;
 import java.util.function.Supplier;
@@ -22,9 +22,9 @@ public class ConfluentKafkaContainer extends GenericContainer<ConfluentKafkaCont
 
     private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("confluentinc/cp-kafka");
 
-    private final Set<String> listeners = new HashSet<>();
+    private final Set<String> listeners = new LinkedHashSet<>();
 
-    private final Set<Supplier<String>> advertisedListeners = new HashSet<>();
+    private final Set<Supplier<String>> advertisedListeners = new LinkedHashSet<>();
 
     public ConfluentKafkaContainer(String imageName) {
         this(DockerImageName.parse(imageName));
diff --git a/modules/kafka/src/main/java/org/testcontainers/kafka/KafkaContainer.java b/modules/kafka/src/main/java/org/testcontainers/kafka/KafkaContainer.java
index e946e0a8992..375fd132f6c 100644
--- a/modules/kafka/src/main/java/org/testcontainers/kafka/KafkaContainer.java
+++ b/modules/kafka/src/main/java/org/testcontainers/kafka/KafkaContainer.java
@@ -6,7 +6,7 @@
 import org.testcontainers.utility.DockerImageName;
 
 import java.util.ArrayList;
-import java.util.HashSet;
+import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Set;
 import java.util.function.Supplier;
@@ -28,9 +28,9 @@ public class KafkaContainer extends GenericContainer<KafkaContainer> {
 
     private static final String STARTER_SCRIPT = "/tmp/testcontainers_start.sh";
 
-    private final Set<String> listeners = new HashSet<>();
+    private final Set<String> listeners = new LinkedHashSet<>();
 
-    private final Set<Supplier<String>> advertisedListeners = new HashSet<>();
+    private final Set<Supplier<String>> advertisedListeners = new LinkedHashSet<>();
 
     public KafkaContainer(String imageName) {
         this(DockerImageName.parse(imageName));