From ea10fd012f8e1788f72f0554d758d9571d7241b8 Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Mon, 24 Mar 2025 17:42:46 -0700 Subject: [PATCH] Disable cleanPath() for testing --- .../rife/bld/extension/DetektOperation.java | 50 ++++++------------- 1 file changed, 14 insertions(+), 36 deletions(-) diff --git a/src/main/java/rife/bld/extension/DetektOperation.java b/src/main/java/rife/bld/extension/DetektOperation.java index 8e3213e..2bb17a1 100644 --- a/src/main/java/rife/bld/extension/DetektOperation.java +++ b/src/main/java/rife/bld/extension/DetektOperation.java @@ -28,7 +28,6 @@ import java.nio.file.Path; import java.util.ArrayList; import java.util.Collection; import java.util.List; -import java.util.Locale; import java.util.logging.Level; import java.util.logging.Logger; @@ -52,12 +51,11 @@ public class DetektOperation extends AbstractProcessOperation { "kotlinx-coroutines-", "kotlinx-html-jvm-", "kotlinx-serialization-", + "poko-annotations-jvm-", "sarif4k-jvm-", "snakeyaml-engine-", "trove4j-"); private static final Logger LOGGER = Logger.getLogger(DetektOperation.class.getName()); - private static final String OS_NAME = - System.getProperty("os.name") != null ? System.getProperty("os.name").toLowerCase(Locale.US) : null; private final Collection classpath_ = new ArrayList<>(); private final Collection config_ = new ArrayList<>(); private final Collection excludes_ = new ArrayList<>(); @@ -293,17 +291,6 @@ public class DetektOperation extends AbstractProcessOperation { return classPath(paths.stream().map(File::new).toList()); } - private String cleanPath(File path) { - return cleanPath(path.getAbsolutePath()); - } - - private String cleanPath(String path) { - if (isWindows()) { - return path.replaceAll("\\\\", "\\\\\\\\"); - } - return path; - } - /** * Paths to the config files ({@code path/to/config.yml}). * @@ -538,13 +525,13 @@ public class DetektOperation extends AbstractProcessOperation { // base-path if (isNotBlank(basePath_)) { args.add("--base-path"); - args.add(cleanPath(basePath_)); + args.add(basePath_); } // baseline if (isNotBlank(baseline_)) { args.add("--baseline"); - args.add(cleanPath(baseline_)); + args.add(baseline_); } // build-upon-default-config @@ -555,19 +542,19 @@ public class DetektOperation extends AbstractProcessOperation { // classpath if (!classpath_.isEmpty()) { args.add("--classpath"); - args.add(String.join(File.pathSeparator, classpath_.stream().map(this::cleanPath).toList())); + args.add(String.join(File.pathSeparator, classpath_.stream().map(File::getAbsolutePath).toList())); } // config if (!config_.isEmpty()) { args.add("-config"); - args.add(String.join(";", config_.stream().map(this::cleanPath).toList())); + args.add(String.join(";", config_.stream().map(File::getAbsolutePath).toList())); } // config-resource if (isNotBlank(configResource_)) { args.add("--config-resource"); - args.add(cleanPath(configResource_)); + args.add(configResource_); } // create-baseline @@ -588,7 +575,7 @@ public class DetektOperation extends AbstractProcessOperation { // excludes if (!excludes_.isEmpty()) { args.add("--excludes"); - args.add(String.join(",", excludes_.stream().map(this::cleanPath).toList())); + args.add(String.join(",", excludes_)); } // generate-config @@ -599,19 +586,19 @@ public class DetektOperation extends AbstractProcessOperation { // includes if (!includes_.isEmpty()) { args.add("--includes"); - args.add(String.join(",", includes_.stream().map(this::cleanPath).toList())); + args.add(String.join(",", includes_)); } // input if (!input_.isEmpty()) { args.add("--input"); - args.add(String.join(",", input_.stream().map(this::cleanPath).toList())); + args.add(String.join(",", input_.stream().map(File::getAbsolutePath).toList())); } // jdk-home if (isNotBlank(jdkHome_)) { args.add("--jdk-home"); - args.add(cleanPath(jdkHome_)); + args.add(jdkHome_); } // jvm-target @@ -640,14 +627,14 @@ public class DetektOperation extends AbstractProcessOperation { // plugins if (!plugins_.isEmpty()) { args.add("--plugins"); - args.add(String.join(",", plugins_.stream().map(this::cleanPath).toList())); + args.add(String.join(",", plugins_.stream().map(File::getAbsolutePath).toList())); } // report if (!report_.isEmpty()) { report_.forEach(it -> { args.add("--report"); - args.add(it.id().name().toLowerCase() + ":" + cleanPath(it.path())); + args.add(it.id().name().toLowerCase() + ":" + it.path()); }); } @@ -706,7 +693,7 @@ public class DetektOperation extends AbstractProcessOperation { if (!f.getName().endsWith("-sources.jar") && !f.getName().endsWith("-javadoc.jar")) { for (var m : DETEKT_JARS) { if (f.getName().startsWith(m)) { - jars.add(cleanPath(f)); + jars.add(f.getAbsolutePath()); break; } } @@ -714,7 +701,7 @@ public class DetektOperation extends AbstractProcessOperation { } } } - return String.join(":", jars); + return String.join(File.pathSeparator, jars); } /** @@ -832,15 +819,6 @@ public class DetektOperation extends AbstractProcessOperation { return s != null && !s.isBlank(); } - /** - * Determines if the current operating system is Windows. - * - * @return true if the operating system is Windows, false otherwise. - */ - private boolean isWindows() { - return OS_NAME != null && OS_NAME.contains("win"); - } - /** * EXPERIMENTAL: Use a custom JDK home directory to include into the * classpath.