From 16f037a1c13f5150360791271671fa4156e6a5d5 Mon Sep 17 00:00:00 2001 From: "Gerlach, Winfried" Date: Thu, 12 Jun 2025 09:15:50 +0200 Subject: [PATCH 1/2] fix parameter check in Kafka cluster examples --- .../example/kafkacluster/ApacheKafkaContainerCluster.java | 8 ++++---- .../kafkacluster/ConfluentKafkaContainerCluster.java | 8 ++++---- .../com/example/kafkacluster/KafkaContainerCluster.java | 6 +++--- .../example/kafkacluster/KafkaContainerKraftCluster.java | 8 ++++---- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/examples/kafka-cluster/src/test/java/com/example/kafkacluster/ApacheKafkaContainerCluster.java b/examples/kafka-cluster/src/test/java/com/example/kafkacluster/ApacheKafkaContainerCluster.java index a8616d2d4bb..e3fc01390a2 100644 --- a/examples/kafka-cluster/src/test/java/com/example/kafkacluster/ApacheKafkaContainerCluster.java +++ b/examples/kafka-cluster/src/test/java/com/example/kafkacluster/ApacheKafkaContainerCluster.java @@ -25,12 +25,12 @@ public class ApacheKafkaContainerCluster implements Startable { private final Collection brokers; public ApacheKafkaContainerCluster(String version, int brokersNum, int internalTopicsRf) { - if (brokersNum < 0) { + if (brokersNum <= 0) { throw new IllegalArgumentException("brokersNum '" + brokersNum + "' must be greater than 0"); } - if (internalTopicsRf < 0 || internalTopicsRf > brokersNum) { + if (internalTopicsRf <= 0 || internalTopicsRf > brokersNum) { throw new IllegalArgumentException( - "internalTopicsRf '" + internalTopicsRf + "' must be less than brokersNum and greater than 0" + "internalTopicsRf '" + internalTopicsRf + "' must be less than or equal to brokersNum and greater than 0" ); } @@ -99,6 +99,6 @@ public void start() { @Override public void stop() { - this.brokers.stream().parallel().forEach(GenericContainer::stop); + this.brokers.parallelStream().forEach(GenericContainer::stop); } } diff --git a/examples/kafka-cluster/src/test/java/com/example/kafkacluster/ConfluentKafkaContainerCluster.java b/examples/kafka-cluster/src/test/java/com/example/kafkacluster/ConfluentKafkaContainerCluster.java index 222050c76c0..7abd27a35ab 100644 --- a/examples/kafka-cluster/src/test/java/com/example/kafkacluster/ConfluentKafkaContainerCluster.java +++ b/examples/kafka-cluster/src/test/java/com/example/kafkacluster/ConfluentKafkaContainerCluster.java @@ -25,12 +25,12 @@ public class ConfluentKafkaContainerCluster implements Startable { private final Collection brokers; public ConfluentKafkaContainerCluster(String confluentPlatformVersion, int brokersNum, int internalTopicsRf) { - if (brokersNum < 0) { + if (brokersNum <= 0) { throw new IllegalArgumentException("brokersNum '" + brokersNum + "' must be greater than 0"); } - if (internalTopicsRf < 0 || internalTopicsRf > brokersNum) { + if (internalTopicsRf <= 0 || internalTopicsRf > brokersNum) { throw new IllegalArgumentException( - "internalTopicsRf '" + internalTopicsRf + "' must be less than brokersNum and greater than 0" + "internalTopicsRf '" + internalTopicsRf + "' must be less than or equal to brokersNum and greater than 0" ); } @@ -100,6 +100,6 @@ public void start() { @Override public void stop() { - this.brokers.stream().parallel().forEach(GenericContainer::stop); + this.brokers.parallelStream().forEach(GenericContainer::stop); } } diff --git a/examples/kafka-cluster/src/test/java/com/example/kafkacluster/KafkaContainerCluster.java b/examples/kafka-cluster/src/test/java/com/example/kafkacluster/KafkaContainerCluster.java index 403d087af3e..c60e22d0723 100644 --- a/examples/kafka-cluster/src/test/java/com/example/kafkacluster/KafkaContainerCluster.java +++ b/examples/kafka-cluster/src/test/java/com/example/kafkacluster/KafkaContainerCluster.java @@ -31,12 +31,12 @@ public class KafkaContainerCluster implements Startable { private final Collection brokers; public KafkaContainerCluster(String confluentPlatformVersion, int brokersNum, int internalTopicsRf) { - if (brokersNum < 0) { + if (brokersNum <= 0) { throw new IllegalArgumentException("brokersNum '" + brokersNum + "' must be greater than 0"); } - if (internalTopicsRf < 0 || internalTopicsRf > brokersNum) { + if (internalTopicsRf <= 0 || internalTopicsRf > brokersNum) { throw new IllegalArgumentException( - "internalTopicsRf '" + internalTopicsRf + "' must be less than brokersNum and greater than 0" + "internalTopicsRf '" + internalTopicsRf + "' must be less than or equal to brokersNum and greater than 0" ); } diff --git a/examples/kafka-cluster/src/test/java/com/example/kafkacluster/KafkaContainerKraftCluster.java b/examples/kafka-cluster/src/test/java/com/example/kafkacluster/KafkaContainerKraftCluster.java index f42e3c5b1ba..cee2f007f43 100644 --- a/examples/kafka-cluster/src/test/java/com/example/kafkacluster/KafkaContainerKraftCluster.java +++ b/examples/kafka-cluster/src/test/java/com/example/kafkacluster/KafkaContainerKraftCluster.java @@ -25,12 +25,12 @@ public class KafkaContainerKraftCluster implements Startable { private final Collection brokers; public KafkaContainerKraftCluster(String confluentPlatformVersion, int brokersNum, int internalTopicsRf) { - if (brokersNum < 0) { + if (brokersNum <= 0) { throw new IllegalArgumentException("brokersNum '" + brokersNum + "' must be greater than 0"); } - if (internalTopicsRf < 0 || internalTopicsRf > brokersNum) { + if (internalTopicsRf <= 0 || internalTopicsRf > brokersNum) { throw new IllegalArgumentException( - "internalTopicsRf '" + internalTopicsRf + "' must be less than brokersNum and greater than 0" + "internalTopicsRf '" + internalTopicsRf + "' must be less than or equal to brokersNum and greater than 0" ); } @@ -101,6 +101,6 @@ public void start() { @Override public void stop() { - this.brokers.stream().parallel().forEach(GenericContainer::stop); + this.brokers.parallelStream().forEach(GenericContainer::stop); } } From b0d69e2e4752f9c12eec184440d44cf513fdea61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= Date: Tue, 12 Aug 2025 15:28:34 -0600 Subject: [PATCH 2/2] Fix format --- .../com/example/kafkacluster/ApacheKafkaContainerCluster.java | 4 +++- .../example/kafkacluster/ConfluentKafkaContainerCluster.java | 4 +++- .../java/com/example/kafkacluster/KafkaContainerCluster.java | 4 +++- .../com/example/kafkacluster/KafkaContainerKraftCluster.java | 4 +++- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/examples/kafka-cluster/src/test/java/com/example/kafkacluster/ApacheKafkaContainerCluster.java b/examples/kafka-cluster/src/test/java/com/example/kafkacluster/ApacheKafkaContainerCluster.java index e3fc01390a2..0e56bd9d758 100644 --- a/examples/kafka-cluster/src/test/java/com/example/kafkacluster/ApacheKafkaContainerCluster.java +++ b/examples/kafka-cluster/src/test/java/com/example/kafkacluster/ApacheKafkaContainerCluster.java @@ -30,7 +30,9 @@ public ApacheKafkaContainerCluster(String version, int brokersNum, int internalT } if (internalTopicsRf <= 0 || internalTopicsRf > brokersNum) { throw new IllegalArgumentException( - "internalTopicsRf '" + internalTopicsRf + "' must be less than or equal to brokersNum and greater than 0" + "internalTopicsRf '" + + internalTopicsRf + + "' must be less than or equal to brokersNum and greater than 0" ); } diff --git a/examples/kafka-cluster/src/test/java/com/example/kafkacluster/ConfluentKafkaContainerCluster.java b/examples/kafka-cluster/src/test/java/com/example/kafkacluster/ConfluentKafkaContainerCluster.java index 7abd27a35ab..f09c3072ea3 100644 --- a/examples/kafka-cluster/src/test/java/com/example/kafkacluster/ConfluentKafkaContainerCluster.java +++ b/examples/kafka-cluster/src/test/java/com/example/kafkacluster/ConfluentKafkaContainerCluster.java @@ -30,7 +30,9 @@ public ConfluentKafkaContainerCluster(String confluentPlatformVersion, int broke } if (internalTopicsRf <= 0 || internalTopicsRf > brokersNum) { throw new IllegalArgumentException( - "internalTopicsRf '" + internalTopicsRf + "' must be less than or equal to brokersNum and greater than 0" + "internalTopicsRf '" + + internalTopicsRf + + "' must be less than or equal to brokersNum and greater than 0" ); } diff --git a/examples/kafka-cluster/src/test/java/com/example/kafkacluster/KafkaContainerCluster.java b/examples/kafka-cluster/src/test/java/com/example/kafkacluster/KafkaContainerCluster.java index c60e22d0723..aa22cceadb0 100644 --- a/examples/kafka-cluster/src/test/java/com/example/kafkacluster/KafkaContainerCluster.java +++ b/examples/kafka-cluster/src/test/java/com/example/kafkacluster/KafkaContainerCluster.java @@ -36,7 +36,9 @@ public KafkaContainerCluster(String confluentPlatformVersion, int brokersNum, in } if (internalTopicsRf <= 0 || internalTopicsRf > brokersNum) { throw new IllegalArgumentException( - "internalTopicsRf '" + internalTopicsRf + "' must be less than or equal to brokersNum and greater than 0" + "internalTopicsRf '" + + internalTopicsRf + + "' must be less than or equal to brokersNum and greater than 0" ); } diff --git a/examples/kafka-cluster/src/test/java/com/example/kafkacluster/KafkaContainerKraftCluster.java b/examples/kafka-cluster/src/test/java/com/example/kafkacluster/KafkaContainerKraftCluster.java index cee2f007f43..264f751ecc6 100644 --- a/examples/kafka-cluster/src/test/java/com/example/kafkacluster/KafkaContainerKraftCluster.java +++ b/examples/kafka-cluster/src/test/java/com/example/kafkacluster/KafkaContainerKraftCluster.java @@ -30,7 +30,9 @@ public KafkaContainerKraftCluster(String confluentPlatformVersion, int brokersNu } if (internalTopicsRf <= 0 || internalTopicsRf > brokersNum) { throw new IllegalArgumentException( - "internalTopicsRf '" + internalTopicsRf + "' must be less than or equal to brokersNum and greater than 0" + "internalTopicsRf '" + + internalTopicsRf + + "' must be less than or equal to brokersNum and greater than 0" ); }