From 762a63b12fb5a316806a00467cf16733a22b7723 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Fri, 15 Sep 2023 05:19:51 -0700
Subject: [PATCH] Flipped String equals to avoid potential null pointer
 exception

---
 src/main/java/rife/bld/dependencies/Dependency.java       | 2 +-
 .../java/rife/bld/dependencies/DependencyExclusion.java   | 8 ++++----
 src/main/java/rife/bld/dependencies/Xml2MavenPom.java     | 8 ++++----
 src/main/java/rife/bld/operations/JUnitOperation.java     | 6 +++---
 src/main/java/rife/bld/publish/PomBuilder.java            | 2 +-
 src/main/java/rife/bld/wrapper/Wrapper.java               | 2 +-
 6 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/main/java/rife/bld/dependencies/Dependency.java b/src/main/java/rife/bld/dependencies/Dependency.java
index 48fbe0f..8939c18 100644
--- a/src/main/java/rife/bld/dependencies/Dependency.java
+++ b/src/main/java/rife/bld/dependencies/Dependency.java
@@ -147,7 +147,7 @@ public record Dependency(String groupId, String artifactId, VersionNumber versio
         if (!classifier.isEmpty()) {
             result.append(":").append(classifier);
         }
-        if (!type.isEmpty() && !type.equals("jar")) {
+        if (!type.isEmpty() && !"jar".equals(type)) {
             result.append("@").append(type);
         }
         return result.toString();
diff --git a/src/main/java/rife/bld/dependencies/DependencyExclusion.java b/src/main/java/rife/bld/dependencies/DependencyExclusion.java
index 23bb3b3..f9a7d7e 100644
--- a/src/main/java/rife/bld/dependencies/DependencyExclusion.java
+++ b/src/main/java/rife/bld/dependencies/DependencyExclusion.java
@@ -25,10 +25,10 @@ public record DependencyExclusion(String groupId, String artifactId) {
     }
 
     boolean matches(PomDependency dependency) {
-        return (groupId().equals("*") && artifactId().equals("*")) ||
-               (groupId().equals("*") && artifactId().equals(dependency.artifactId())) ||
-               (groupId().equals(dependency.groupId()) && artifactId().equals("*")) ||
-               (groupId().equals(dependency.groupId()) && artifactId().equals(dependency.artifactId()));
+        return ("*".equals(groupId()) && "*".equals(artifactId())) ||
+               ("*".equals(groupId()) && artifactId().equals(dependency.artifactId())) ||
+               (groupId().equals(dependency.groupId()) && "*".equals(artifactId())) ||
+               (groupId().equals(dependency.groupId()) && dependency.artifactId().equals(artifactId()));
 
     }
 }
diff --git a/src/main/java/rife/bld/dependencies/Xml2MavenPom.java b/src/main/java/rife/bld/dependencies/Xml2MavenPom.java
index fd3e46e..03d5c82 100644
--- a/src/main/java/rife/bld/dependencies/Xml2MavenPom.java
+++ b/src/main/java/rife/bld/dependencies/Xml2MavenPom.java
@@ -287,19 +287,19 @@ class Xml2MavenPom extends Xml2Data {
     }
 
     private boolean isChildOfProject() {
-        return elementStack_.peek().equals("project");
+        return "project".equals(elementStack_.peek());
     }
 
     private boolean isChildOfParent() {
-        return elementStack_.peek().equals("parent");
+        return "parent".equals(elementStack_.peek());
     }
 
     private boolean isChildOfDependency() {
-        return elementStack_.peek().equals("dependency");
+        return "dependency".equals(elementStack_.peek());
     }
 
     private boolean isChildOfExclusion() {
-        return elementStack_.peek().equals("exclusion");
+        return "exclusion".equals(elementStack_.peek());
     }
 
     private void addProjectProperty(String name) {
diff --git a/src/main/java/rife/bld/operations/JUnitOperation.java b/src/main/java/rife/bld/operations/JUnitOperation.java
index f79a6f3..c13b3f0 100644
--- a/src/main/java/rife/bld/operations/JUnitOperation.java
+++ b/src/main/java/rife/bld/operations/JUnitOperation.java
@@ -34,7 +34,7 @@ public class JUnitOperation extends TestOperation<JUnitOperation, JUnitOptions>
         }
 
         // add the default JUnit options if none were specified
-        if (testToolOptions().isEmpty() && mainClass().equals(DEFAULT_TEST_TOOL_JUNIT5)) {
+        if (testToolOptions().isEmpty() && DEFAULT_TEST_TOOL_JUNIT5.equals(mainClass())) {
             testToolOptions().defaultOptions();
         }
 
@@ -45,9 +45,9 @@ public class JUnitOperation extends TestOperation<JUnitOperation, JUnitOptions>
             var argument = arguments.get(0);
             if (argument.startsWith("-")) {
                 arguments.remove(0);
-                if (argument.equals("--junit-help")) {
+                if ("--junit-help".equals(argument)) {
                     testToolOptions().add("--help");
-                } else if (argument.equals("--junit-clear")) {
+                } else if ("--junit-clear".equals(argument)) {
                     testToolOptions().clear();
                 } else {
                     testToolOptions().add(argument);
diff --git a/src/main/java/rife/bld/publish/PomBuilder.java b/src/main/java/rife/bld/publish/PomBuilder.java
index 9e2540b..8df677b 100644
--- a/src/main/java/rife/bld/publish/PomBuilder.java
+++ b/src/main/java/rife/bld/publish/PomBuilder.java
@@ -151,7 +151,7 @@ public class PomBuilder {
 
                 t.blankValue("dependency-type");
                 t.blankValue("dependency-type-tag");
-                if (!dependency.type().equals("jar")) {
+                if (!"jar".equals(dependency.type())) {
                     t.setValueEncoded("dependency-type", dependency.type());
                     t.setBlock("dependency-type-tag");
                 }
diff --git a/src/main/java/rife/bld/wrapper/Wrapper.java b/src/main/java/rife/bld/wrapper/Wrapper.java
index aa73412..19c2d1c 100644
--- a/src/main/java/rife/bld/wrapper/Wrapper.java
+++ b/src/main/java/rife/bld/wrapper/Wrapper.java
@@ -496,7 +496,7 @@ public class Wrapper {
 
     private int launchMain(File jarFile, List<String> arguments)
     throws IOException, InterruptedException, FileUtilsErrorException {
-        if (arguments.isEmpty() || !arguments.get(0).equals("--build")) {
+        if (arguments.isEmpty() || !"--build".equals(arguments.get(0))) {
             return launchMainCli(jarFile, arguments);
         }
         return launchMainBuild(jarFile, arguments);