unnecessary comments removal

Signed-off-by: hzrncik <[email protected]>
strimzi · Feb 8, 2024 · 2f85c9a · 2f85c9a
1 parent b87cd70
commit 2f85c9a
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 13 deletions.
diff --git a/systemtest/src/main/java/io/strimzi/systemtest/storage/TestStorage.java b/systemtest/src/main/java/io/strimzi/systemtest/storage/TestStorage.java
@@ -297,8 +297,4 @@ public KafkaTracingClients getTracingClients() {
     public String getScraperPodName() {
         return extensionContext.getStore(ExtensionContext.Namespace.GLOBAL).get(TestConstants.SCRAPER_POD_KEY).toString();
     }
-
-    private String getValueFromGlobalStore(String key) {
-        return extensionContext.getStore(ExtensionContext.Namespace.GLOBAL).get(key).toString();
-    }
 }
diff --git a/systemtest/src/test/java/io/strimzi/systemtest/security/SecurityST.java b/systemtest/src/test/java/io/strimzi/systemtest/security/SecurityST.java
@@ -317,7 +317,6 @@ void autoRenewSomeCaCertsTriggeredByAnno(
 
         kafkaClients = new KafkaClientsBuilder(kafkaClients)
             .withConsumerGroup(ClientUtils.generateRandomConsumerGroup())
-            //.withBootstrapAddress(KafkaResources.tlsBootstrapAddress(testStorage.getClusterName()))
             .withUsername(bobUserName)
             .build();
 
@@ -513,7 +512,6 @@ void autoReplaceSomeKeysTriggeredByAnno(ExtensionContext extensionContext,
 
         kafkaClients = new KafkaClientsBuilder(kafkaClients)
             .withConsumerGroup(ClientUtils.generateRandomConsumerGroup())
-            //.withBootstrapAddress(KafkaResources.tlsBootstrapAddress(testStorage.getClusterName()))
             .withUsername(bobUserName)
             .build();
 
@@ -1078,12 +1076,9 @@ void testCaRenewalBreakInMiddle(ExtensionContext extensionContext) {
                 .build()
         );
 
-        // Configuration `acks=all` paired with Kafka's `min.insync.replicas=2` enforces there are at least 2 replicas with all produced data before test continues.
-        // TODO String producerAdditionConfiguration = "acks=all\n";
         KafkaClients kafkaClients = ClientUtils.getDefaultBasicClientBuilder(testStorage)
             .withBootstrapAddress(KafkaResources.tlsBootstrapAddress(testStorage.getClusterName()))
             .build();
-
         resourceManager.createResourceWithWait(extensionContext, kafkaClients.producerTlsStrimzi(testStorage.getClusterName()), kafkaClients.consumerTlsStrimzi(testStorage.getClusterName()));
         ClientUtils.waitForClientsSuccess(testStorage);
 

diff --git a/systemtest/src/test/java/io/strimzi/systemtest/specific/DrainCleanerST.java b/systemtest/src/test/java/io/strimzi/systemtest/specific/DrainCleanerST.java
@@ -76,13 +76,13 @@ void testDrainCleanerWithComponents(ExtensionContext extensionContext) {
         resourceManager.createResourceWithWait(extensionContext, KafkaTopicTemplates.topic(testStorage.getClusterName(), testStorage.getContinuousTopicName(), TestConstants.DRAIN_CLEANER_NAMESPACE).build());
         drainCleaner.createDrainCleaner(extensionContext);
 
-        KafkaClients kafkaBasicExampleClients = ClientUtils.getDefaultContinuousClientBuilder(testStorage)
+        KafkaClients continuousClients = ClientUtils.getDefaultContinuousClientBuilder(testStorage)
             .withNamespaceName(TestConstants.DRAIN_CLEANER_NAMESPACE)
             .build();
 
         resourceManager.createResourceWithWait(extensionContext,
-            kafkaBasicExampleClients.producerStrimzi(),
-            kafkaBasicExampleClients.consumerStrimzi());
+            continuousClients.producerStrimzi(),
+            continuousClients.consumerStrimzi());
 
         for (int i = 0; i < replicas; i++) {
             String zkPodName = KafkaResources.zookeeperPodName(testStorage.getClusterName(), i);
@@ -109,7 +109,7 @@ void testDrainCleanerWithComponents(ExtensionContext extensionContext) {
             RollingUpdateUtils.waitTillComponentHasRolledAndPodsReady(TestConstants.DRAIN_CLEANER_NAMESPACE, testStorage.getKafkaSelector(), replicas, kafkaPod);
         }
 
-        ClientUtils.waitForClientsSuccess(testStorage.getProducerName(), testStorage.getConsumerName(), TestConstants.DRAIN_CLEANER_NAMESPACE, 300);
+        ClientUtils.waitForClientsSuccess(testStorage.getContinuousProducerName(), testStorage.getContinuousConsumerName(), TestConstants.DRAIN_CLEANER_NAMESPACE, testStorage.getContinuousMessageCount());
     }
 
     @AfterEach