Fix spotbugs

Signed-off-by: Jakub Stejskal <xstejs24@gmail.com>
strimzi · May 23, 2024 · 99b94a4 · 99b94a4
1 parent 5402f55
commit 99b94a4
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/systemtest/src/main/java/io/strimzi/systemtest/resources/imageBuild/ImageBuild.java b/systemtest/src/main/java/io/strimzi/systemtest/resources/imageBuild/ImageBuild.java
@@ -27,6 +27,7 @@
 import org.apache.logging.log4j.Logger;
 
 import java.io.IOException;
+import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Paths;
 
@@ -120,7 +121,7 @@ public static void buildImageKaniko(String name, String namespace, String docker
      * @throws IOException
      */
     public static void buildImageOpenshift(String name, String namespace, String dockerfilePath, String imageTag, String baseImage) throws IOException {
-        String dockerfileContent = new String(Files.readAllBytes(Paths.get(dockerfilePath)));
+        String dockerfileContent = Files.readString(Paths.get(dockerfilePath), StandardCharsets.UTF_8);
 
         BuildConfig buildConfig = new BuildConfigBuilder()
             .withNewMetadata()
@@ -176,7 +177,7 @@ public static void buildImageOpenshift(String name, String namespace, String doc
      * @throws IOException
      */
     private static void createDockerfileConfigMap(String namespace, String configMapName, String dockerfilePath) throws IOException {
-        String dockerfileContent = new String(Files.readAllBytes(Paths.get(dockerfilePath)));
+        String dockerfileContent = Files.readString(Paths.get(dockerfilePath), StandardCharsets.UTF_8);
 
         ConfigMap configMap = new ConfigMapBuilder()
                 .withNewMetadata()

diff --git a/systemtest/src/test/java/io/strimzi/systemtest/kafka/TieredStorageST.java b/systemtest/src/test/java/io/strimzi/systemtest/kafka/TieredStorageST.java
@@ -125,14 +125,18 @@ void testTieredStorageWithAivenPlugin() {
             .build());
 
         final KafkaClients clients = ClientUtils.getInstantPlainClientBuilder(testStorage)
-            .withMessageCount(10000000)
+            .withMessageCount(10000)
             .withDelayMs(1)
             .withMessage(String.join("", Collections.nCopies(5000, "#")))
             .build();
 
         resourceManager.createResourceWithWait(clients.producerStrimzi());
 
         SetupMinio.waitForDataInMinio(testStorage.getNamespaceName(), BUCKET_NAME);
+        ClientUtils.waitForInstantProducerClientSuccess(testStorage);
+
+        resourceManager.createResourceWithWait(clients.consumerStrimzi());
+        ClientUtils.waitForInstantConsumerClientSuccess(testStorage);
     }
 
     @BeforeAll