build: Fix some issues identified by Sonar

jreleaser · Apr 25, 2024 · 43444f0 · 43444f0
1 parent 37893b2
commit 43444f0
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 14 deletions.
diff --git a/api/jreleaser-utils/src/main/java/org/jreleaser/util/FileUtils.java b/api/jreleaser-utils/src/main/java/org/jreleaser/util/FileUtils.java
@@ -36,7 +36,7 @@
 import org.apache.commons.compress.compressors.xz.XZCompressorOutputStream;
 import org.apache.commons.compress.compressors.zstandard.ZstdCompressorInputStream;
 import org.apache.commons.compress.compressors.zstandard.ZstdCompressorOutputStream;
-import org.apache.commons.compress.utils.IOUtils;
+import org.apache.commons.io.IOUtils;
 import org.jreleaser.bundle.RB;
 import org.jreleaser.logging.JReleaserLogger;
 
@@ -408,7 +408,7 @@ public static void unpackArchive(Path src, Path dest, boolean removeRootEntry, b
 
         String rootEntryName = resolveRootEntryName(src);
         if (filename.endsWith(ZIP.extension())) {
-            try (ZipFile zipFile = new ZipFile(src.toFile())) {
+            try (ZipFile zipFile = ZipFile.builder().setFile(src.toFile()).get()) {
                 unpackArchive(removeRootEntry ? rootEntryName + "/" : "", destinationDir, zipFile);
             }
             return;

diff --git a/core/jreleaser-engine/src/main/java/org/jreleaser/assemblers/JpackageAssemblerProcessor.java b/core/jreleaser-engine/src/main/java/org/jreleaser/assemblers/JpackageAssemblerProcessor.java
@@ -17,7 +17,7 @@
  */
 package org.jreleaser.assemblers;
 
-import org.apache.commons.compress.utils.IOUtils;
+import org.apache.commons.io.IOUtils;
 import org.jreleaser.bundle.RB;
 import org.jreleaser.model.Constants;
 import org.jreleaser.model.internal.JReleaserContext;

diff --git a/...-plugin/src/main/java/org/jreleaser/maven/plugin/internal/MavenJReleaserModelPrinter.java b/...-plugin/src/main/java/org/jreleaser/maven/plugin/internal/MavenJReleaserModelPrinter.java
@@ -58,38 +58,38 @@ protected String color(String color, String input) {
     }
 
     private String black(CharSequence s) {
-        return buffer().a(!isColorEnabled() ? s : "\u001B[30m" + s + "\u001b[0m").toString();
+        return buffer().a(!isColorEnabled() ? s : "\u001B[30m" + s + "\u001b[0m").build();
     }
 
     private String red(CharSequence s) {
-        return buffer().a(!isColorEnabled() ? s : "\u001B[31m" + s + "\u001b[0m").toString();
+        return buffer().a(!isColorEnabled() ? s : "\u001B[31m" + s + "\u001b[0m").build();
     }
 
     private String green(CharSequence s) {
-        return buffer().a(!isColorEnabled() ? s : "\u001B[32m" + s + "\u001b[0m").toString();
+        return buffer().a(!isColorEnabled() ? s : "\u001B[32m" + s + "\u001b[0m").build();
     }
 
     private String yellow(CharSequence s) {
-        return buffer().a(!isColorEnabled() ? s : "\u001B[33m" + s + "\u001b[0m").toString();
+        return buffer().a(!isColorEnabled() ? s : "\u001B[33m" + s + "\u001b[0m").build();
     }
 
     private String blue(CharSequence s) {
-        return buffer().a(!isColorEnabled() ? s : "\u001B[34m" + s + "\u001b[0m").toString();
+        return buffer().a(!isColorEnabled() ? s : "\u001B[34m" + s + "\u001b[0m").build();
     }
 
     private String magenta(CharSequence s) {
-        return buffer().a(!isColorEnabled() ? s : "\u001B[35m" + s + "\u001b[0m").toString();
+        return buffer().a(!isColorEnabled() ? s : "\u001B[35m" + s + "\u001b[0m").build();
     }
 
     private String cyan(CharSequence s) {
-        return buffer().a(!isColorEnabled() ? s : "\u001B[36m" + s + "\u001b[0m").toString();
+        return buffer().a(!isColorEnabled() ? s : "\u001B[36m" + s + "\u001b[0m").build();
     }
 
     private String white(CharSequence s) {
-        return buffer().a(!isColorEnabled() ? s : "\u001B[37m" + s + "\u001b[0m").toString();
+        return buffer().a(!isColorEnabled() ? s : "\u001B[37m" + s + "\u001b[0m").build();
     }
 
     private String erase(CharSequence s) {
-        return buffer().a(!isColorEnabled() ? s : "\u001b[2K" + s).toString();
+        return buffer().a(!isColorEnabled() ? s : "\u001b[2K" + s).build();
     }
 }
diff --git a/sdks/jreleaser-java-sdk-commons/src/main/java/org/jreleaser/sdk/commons/Links.java b/sdks/jreleaser-java-sdk-commons/src/main/java/org/jreleaser/sdk/commons/Links.java
@@ -112,12 +112,11 @@ public String last() {
 
     @Override
     public String toString() {
-        String sb = "Links[" + "first='" + first + '\'' +
+        return "Links[" + "first='" + first + '\'' +
             ", next='" + next + '\'' +
             ", prev='" + prev + '\'' +
             ", last='" + last + '\'' +
             ']';
-        return sb;
     }
 
     public static Links of(String input) {