This is an automated email from the ASF dual-hosted git repository.

slachiewicz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-shared-utils.git


The following commit(s) were added to refs/heads/master by this push:
     new 6995421  Apply OpenRewrite static analysis cleanups
6995421 is described below

commit 69954216a6239d8c2439d0605916f17c1254363e
Author: Sylwester Lachiewicz <[email protected]>
AuthorDate: Mon Nov 16 14:42:53 2026 +0000

    Apply OpenRewrite static analysis cleanups
---
 .../java/org/apache/maven/shared/utils/Os.java     |  4 ++--
 .../org/apache/maven/shared/utils/StringUtils.java | 26 +++++++++++-----------
 .../maven/shared/utils/cli/CommandLineUtils.java   |  2 +-
 .../apache/maven/shared/utils/cli/Commandline.java |  2 +-
 .../utils/cli/javatool/AbstractJavaTool.java       |  7 ++----
 .../introspection/ReflectionValueExtractor.java    |  2 +-
 .../apache/maven/shared/utils/io/FileUtils.java    |  8 +++----
 .../apache/maven/shared/utils/io/MatchPattern.java |  2 +-
 .../maven/shared/utils/io/MatchPatterns.java       |  2 +-
 .../maven/shared/utils/io/SelectorUtils.java       | 12 +++++-----
 .../maven/shared/utils/xml/XmlStreamReader.java    |  2 +-
 .../org/apache/maven/shared/utils/xml/Xpp3Dom.java | 11 +++++----
 .../maven/shared/utils/xml/Xpp3DomUtils.java       |  2 +-
 .../maven/shared/utils/io/FileUtilsTest.java       |  3 ++-
 14 files changed, 41 insertions(+), 44 deletions(-)

diff --git a/src/main/java/org/apache/maven/shared/utils/Os.java 
b/src/main/java/org/apache/maven/shared/utils/Os.java
index 121ec0f..44fec5d 100644
--- a/src/main/java/org/apache/maven/shared/utils/Os.java
+++ b/src/main/java/org/apache/maven/shared/utils/Os.java
@@ -300,12 +300,12 @@ public class Os {
                 boolean isNT = false;
                 if (isWindows) {
                     // there are only four 9x platforms that we look for
-                    is9x = (OS_NAME.contains("95")
+                    is9x = OS_NAME.contains("95")
                             || OS_NAME.contains("98")
                             || OS_NAME.contains("me")
                             // wince isn't really 9x, but crippled enough to
                             // be a muchness. Ant doesnt run on CE, anyway.
-                            || OS_NAME.contains("ce"));
+                            || OS_NAME.contains("ce");
                     isNT = !is9x;
                 }
                 if (family.equals(FAMILY_WINDOWS)) {
diff --git a/src/main/java/org/apache/maven/shared/utils/StringUtils.java 
b/src/main/java/org/apache/maven/shared/utils/StringUtils.java
index dabff60..83dcec9 100644
--- a/src/main/java/org/apache/maven/shared/utils/StringUtils.java
+++ b/src/main/java/org/apache/maven/shared/utils/StringUtils.java
@@ -71,7 +71,7 @@ public class StringUtils {
      */
     @Deprecated
     public static String clean(String str) {
-        return (str == null ? "" : str.trim());
+        return str == null ? "" : str.trim();
     }
 
     /**
@@ -84,7 +84,7 @@ public class StringUtils {
      * @see java.lang.String#trim()
      */
     public static String trim(String str) {
-        return (str == null ? null : str.trim());
+        return str == null ? null : str.trim();
     }
 
     /**
@@ -115,7 +115,7 @@ public class StringUtils {
      * @return true if the String is non-null, and not length zero
      */
     public static boolean isNotEmpty(String str) {
-        return ((str != null) && (str.length() > 0));
+        return (str != null) && (str.length() > 0);
     }
 
     /**
@@ -130,7 +130,7 @@ public class StringUtils {
      *         length zero once trimmed
      */
     public static boolean isEmpty(String str) {
-        return ((str == null) || (str.trim().length() == 0));
+        return (str == null) || (str.trim().length() == 0);
     }
 
     /**
@@ -203,7 +203,7 @@ public class StringUtils {
      */
     @Deprecated
     public static boolean equals(String str1, String str2) {
-        return (str1 == null ? str2 == null : str1.equals(str2));
+        return str1 == null ? str2 == null : str1.equals(str2);
     }
 
     /**
@@ -220,7 +220,7 @@ public class StringUtils {
      * @see java.lang.String#equalsIgnoreCase(String)
      */
     public static boolean equalsIgnoreCase(String str1, String str2) {
-        return (str1 == null ? str2 == null : str1.equalsIgnoreCase(str2));
+        return str1 == null ? str2 == null : str1.equalsIgnoreCase(str2);
     }
 
     /**
@@ -252,7 +252,7 @@ public class StringUtils {
             }
         }
 
-        return (ret == Integer.MAX_VALUE) ? -1 : ret;
+        return ret == Integer.MAX_VALUE ? -1 : ret;
     }
 
     /**
@@ -569,7 +569,7 @@ public class StringUtils {
             separator = "";
         }
         int arraySize = array.length;
-        int bufSize = (arraySize == 0 ? 0 : (array[0].toString().length() + 
separator.length()) * arraySize);
+        int bufSize = arraySize == 0 ? 0 : (array[0].toString().length() + 
separator.length()) * arraySize;
         StringBuilder buf = new StringBuilder(bufSize);
 
         for (int i = 0; i < arraySize; i++) {
@@ -714,7 +714,8 @@ public class StringUtils {
         }
 
         StringBuilder buf = new StringBuilder(text.length());
-        int start = 0, end;
+        int start = 0;
+        int end;
         while ((end = text.indexOf(repl, start)) != -1) {
             buf.append(text, start, end).append(with);
             start = end + repl.length();
@@ -785,8 +786,7 @@ public class StringUtils {
             return str;
         }
         str = leftPad(str, sz + p / 2, delim);
-        str = rightPad(str, size, delim);
-        return str;
+        return rightPad(str, size, delim);
     }
 
     // Chomping
@@ -1558,7 +1558,7 @@ public class StringUtils {
         }
         int sz = str.length();
         for (int i = 0; i < sz; i++) {
-            if ((!Character.isWhitespace(str.charAt(i)))) {
+            if (!Character.isWhitespace(str.charAt(i))) {
                 return false;
             }
         }
@@ -1690,7 +1690,7 @@ public class StringUtils {
      */
     @Deprecated
     public static String defaultString(Object obj, String defaultString) {
-        return (obj == null) ? defaultString : obj.toString();
+        return obj == null ? defaultString : obj.toString();
     }
 
     // Reversing
diff --git 
a/src/main/java/org/apache/maven/shared/utils/cli/CommandLineUtils.java 
b/src/main/java/org/apache/maven/shared/utils/cli/CommandLineUtils.java
index 25a41d9..64b5b09 100644
--- a/src/main/java/org/apache/maven/shared/utils/cli/CommandLineUtils.java
+++ b/src/main/java/org/apache/maven/shared/utils/cli/CommandLineUtils.java
@@ -508,7 +508,7 @@ public abstract class CommandLineUtils {
         Properties envVars = new Properties();
         for (Map.Entry<String, String> entry : envs.entrySet()) {
             envVars.put(
-                    !preserveKeyCase ? 
entry.getKey().toUpperCase(Locale.ENGLISH) : entry.getKey(), entry.getValue());
+                    preserveKeyCase ? entry.getKey() : 
entry.getKey().toUpperCase(Locale.ENGLISH), entry.getValue());
         }
         return envVars;
     }
diff --git a/src/main/java/org/apache/maven/shared/utils/cli/Commandline.java 
b/src/main/java/org/apache/maven/shared/utils/cli/Commandline.java
index c1f763e..9daf6e8 100644
--- a/src/main/java/org/apache/maven/shared/utils/cli/Commandline.java
+++ b/src/main/java/org/apache/maven/shared/utils/cli/Commandline.java
@@ -90,7 +90,7 @@ public class Commandline {
     public Commandline(String toProcess) throws CommandLineException {
         setDefaultShell();
         String[] tmp = CommandLineUtils.translateCommandline(toProcess);
-        if ((tmp.length > 0)) {
+        if (tmp.length > 0) {
             setExecutable(tmp[0]);
             for (int i = 1; i < tmp.length; i++) {
                 createArg().setValue(tmp[i]);
diff --git 
a/src/main/java/org/apache/maven/shared/utils/cli/javatool/AbstractJavaTool.java
 
b/src/main/java/org/apache/maven/shared/utils/cli/javatool/AbstractJavaTool.java
index 0d5c2e4..85beeac 100644
--- 
a/src/main/java/org/apache/maven/shared/utils/cli/javatool/AbstractJavaTool.java
+++ 
b/src/main/java/org/apache/maven/shared/utils/cli/javatool/AbstractJavaTool.java
@@ -114,17 +114,15 @@ public abstract class AbstractJavaTool<Request extends 
JavaToolRequest> implemen
         Commandline cli = createCommandLine(request, javaToolFile);
 
         // execute it
-        JavaToolResult result = executeCommandLine(cli, request);
-
         // return result
-        return result;
+        return executeCommandLine(cli, request);
     }
 
     /**
      * @return {@link InputStream}
      */
     protected InputStream createSystemInputStream() {
-        InputStream systemIn = new InputStream() {
+        return new InputStream() {
 
             /**
              * {@inheritDoc}
@@ -133,7 +131,6 @@ public abstract class AbstractJavaTool<Request extends 
JavaToolRequest> implemen
                 return -1;
             }
         };
-        return systemIn;
     }
 
     /**
diff --git 
a/src/main/java/org/apache/maven/shared/utils/introspection/ReflectionValueExtractor.java
 
b/src/main/java/org/apache/maven/shared/utils/introspection/ReflectionValueExtractor.java
index 527a7e6..bd437a4 100644
--- 
a/src/main/java/org/apache/maven/shared/utils/introspection/ReflectionValueExtractor.java
+++ 
b/src/main/java/org/apache/maven/shared/utils/introspection/ReflectionValueExtractor.java
@@ -43,7 +43,7 @@ import 
org.apache.maven.shared.utils.introspection.MethodMap.AmbiguousException;
  *             {@code throws Exception} instead of {@code 
IntrospectionException}.
  */
 @Deprecated
-public class ReflectionValueExtractor {
+public final class ReflectionValueExtractor {
     private static final Class<?>[] CLASS_ARGS = new Class[0];
 
     private static final Object[] OBJECT_ARGS = new Object[0];
diff --git a/src/main/java/org/apache/maven/shared/utils/io/FileUtils.java 
b/src/main/java/org/apache/maven/shared/utils/io/FileUtils.java
index c18182a..2c4b7dc 100644
--- a/src/main/java/org/apache/maven/shared/utils/io/FileUtils.java
+++ b/src/main/java/org/apache/maven/shared/utils/io/FileUtils.java
@@ -159,7 +159,7 @@ public class FileUtils {
     @Deprecated
     public static String dirname(String path) {
         int i = path.lastIndexOf(File.separator);
-        return (i >= 0 ? path.substring(0, i) : "");
+        return i >= 0 ? path.substring(0, i) : "";
     }
 
     /**
@@ -172,7 +172,7 @@ public class FileUtils {
     @Deprecated
     public static String filename(String path) {
         int i = path.lastIndexOf(File.separator);
-        return (i >= 0 ? path.substring(i + 1) : path);
+        return i >= 0 ? path.substring(i + 1) : path;
     }
 
     /**
@@ -924,7 +924,7 @@ public class FileUtils {
         }
 
         // deal with absolute files
-        if (filenm.startsWith(File.separator) || 
(Os.isFamily(Os.FAMILY_WINDOWS) && filenm.indexOf(":") > 0)) {
+        if (filenm.startsWith(File.separator) || 
(Os.isFamily(Os.FAMILY_WINDOWS) && filenm.indexOf(":") >= 1)) {
             File file = new File(filenm);
 
             try {
@@ -960,7 +960,7 @@ public class FileUtils {
         filenm = sb.toString();
 
         // must be relative
-        File file = (new File(baseFile, filenm)).getAbsoluteFile();
+        File file = new File(baseFile, filenm).getAbsoluteFile();
 
         try {
             file = file.getCanonicalFile();
diff --git a/src/main/java/org/apache/maven/shared/utils/io/MatchPattern.java 
b/src/main/java/org/apache/maven/shared/utils/io/MatchPattern.java
index 1c7dfa0..ae1ac02 100644
--- a/src/main/java/org/apache/maven/shared/utils/io/MatchPattern.java
+++ b/src/main/java/org/apache/maven/shared/utils/io/MatchPattern.java
@@ -33,7 +33,7 @@ import java.util.regex.Pattern;
  * @deprecated use {@code java.nio.file.DirectoryStream.Filter<T>} and related 
classes
  */
 @Deprecated
-public class MatchPattern {
+public final class MatchPattern {
     private final String source;
 
     private final String regexPattern;
diff --git a/src/main/java/org/apache/maven/shared/utils/io/MatchPatterns.java 
b/src/main/java/org/apache/maven/shared/utils/io/MatchPatterns.java
index 01d17a5..6b4cba3 100644
--- a/src/main/java/org/apache/maven/shared/utils/io/MatchPatterns.java
+++ b/src/main/java/org/apache/maven/shared/utils/io/MatchPatterns.java
@@ -27,7 +27,7 @@ import java.io.File;
  * @deprecated use {@code java.nio.file.DirectoryStream.Filter<T>} and related 
classes
  */
 @Deprecated
-public class MatchPatterns {
+public final class MatchPatterns {
     private final MatchPattern[] patterns;
 
     private MatchPatterns(MatchPattern... patterns) {
diff --git a/src/main/java/org/apache/maven/shared/utils/io/SelectorUtils.java 
b/src/main/java/org/apache/maven/shared/utils/io/SelectorUtils.java
index 8565b68..4bc565b 100644
--- a/src/main/java/org/apache/maven/shared/utils/io/SelectorUtils.java
+++ b/src/main/java/org/apache/maven/shared/utils/io/SelectorUtils.java
@@ -279,8 +279,8 @@ public final class SelectorUtils {
             }
             // Find the pattern between padIdxStart & padIdxTmp in str between
             // strIdxStart & strIdxEnd
-            int patLength = (patIdxTmp - patIdxStart - 1);
-            int strLength = (strIdxEnd - strIdxStart + 1);
+            int patLength = patIdxTmp - patIdxStart - 1;
+            int strLength = strIdxEnd - strIdxStart + 1;
             int foundIdx = -1;
             strLoop:
             for (int i = 0; i <= strLength - patLength; i++) {
@@ -441,8 +441,8 @@ public final class SelectorUtils {
             }
             // Find the pattern between padIdxStart & padIdxTmp in str between
             // strIdxStart & strIdxEnd
-            int patLength = (patIdxTmp - patIdxStart - 1);
-            int strLength = (strIdxEnd - strIdxStart + 1);
+            int patLength = patIdxTmp - patIdxStart - 1;
+            int strLength = strIdxEnd - strIdxStart + 1;
             int foundIdx = -1;
             strLoop:
             for (int i = 0; i <= strLength - patLength; i++) {
@@ -632,8 +632,8 @@ public final class SelectorUtils {
             }
             // Find the pattern between padIdxStart & padIdxTmp in str between
             // strIdxStart & strIdxEnd
-            int patLength = (patIdxTmp - patIdxStart - 1);
-            int strLength = (strIdxEnd - strIdxStart + 1);
+            int patLength = patIdxTmp - patIdxStart - 1;
+            int strLength = strIdxEnd - strIdxStart + 1;
             int foundIdx = -1;
             strLoop:
             for (int i = 0; i <= strLength - patLength; i++) {
diff --git 
a/src/main/java/org/apache/maven/shared/utils/xml/XmlStreamReader.java 
b/src/main/java/org/apache/maven/shared/utils/xml/XmlStreamReader.java
index 708ab08..fff26a0 100644
--- a/src/main/java/org/apache/maven/shared/utils/xml/XmlStreamReader.java
+++ b/src/main/java/org/apache/maven/shared/utils/xml/XmlStreamReader.java
@@ -110,7 +110,7 @@ public class XmlStreamReader extends Reader {
     public XmlStreamReader(InputStream is, String httpContentType, boolean 
lenient, String defaultEncoding)
             throws IOException {
         reader = new org.apache.commons.io.input.XmlStreamReader(
-                is, httpContentType, lenient, (defaultEncoding == null) ? 
staticDefaultEncoding : defaultEncoding);
+                is, httpContentType, lenient, defaultEncoding == null ? 
staticDefaultEncoding : defaultEncoding);
     }
 
     /**
diff --git a/src/main/java/org/apache/maven/shared/utils/xml/Xpp3Dom.java 
b/src/main/java/org/apache/maven/shared/utils/xml/Xpp3Dom.java
index b966f01..5fda854 100644
--- a/src/main/java/org/apache/maven/shared/utils/xml/Xpp3Dom.java
+++ b/src/main/java/org/apache/maven/shared/utils/xml/Xpp3Dom.java
@@ -327,10 +327,10 @@ public class Xpp3Dom implements Iterable<Xpp3Dom> {
 
         Xpp3Dom dom = (Xpp3Dom) obj;
 
-        return !(name == null ? dom.name != null : !name.equals(dom.name))
-                && !(value == null ? dom.value != null : 
!value.equals(dom.value))
-                && !(attributes == null ? dom.attributes != null : 
!attributes.equals(dom.attributes))
-                && !(childList == null ? dom.childList != null : 
!childList.equals(dom.childList));
+        return (name == null ? dom.name == null : name.equals(dom.name))
+                && (value == null ? dom.value == null : 
value.equals(dom.value))
+                && (attributes == null ? dom.attributes == null : 
attributes.equals(dom.attributes))
+                && (childList == null ? dom.childList == null : 
childList.equals(dom.childList));
     }
 
     /**
@@ -341,8 +341,7 @@ public class Xpp3Dom implements Iterable<Xpp3Dom> {
         result = 37 * result + (name != null ? name.hashCode() : 0);
         result = 37 * result + (value != null ? value.hashCode() : 0);
         result = 37 * result + (attributes != null ? attributes.hashCode() : 
0);
-        result = 37 * result + (childList != null ? childList.hashCode() : 0);
-        return result;
+        return 37 * result + (childList != null ? childList.hashCode() : 0);
     }
 
     /**
diff --git a/src/main/java/org/apache/maven/shared/utils/xml/Xpp3DomUtils.java 
b/src/main/java/org/apache/maven/shared/utils/xml/Xpp3DomUtils.java
index d09259c..5910aa3 100644
--- a/src/main/java/org/apache/maven/shared/utils/xml/Xpp3DomUtils.java
+++ b/src/main/java/org/apache/maven/shared/utils/xml/Xpp3DomUtils.java
@@ -102,7 +102,7 @@ public class Xpp3DomUtils {
 
         for (String childName : recessive.childMap.keySet()) {
             List<Xpp3Dom> dominantChildren = 
dominant.getChildrenList(childName);
-            if (dominantChildren.size() > 0) {
+            if (!dominantChildren.isEmpty()) {
                 commonChildren.put(childName, dominantChildren.iterator());
             }
         }
diff --git a/src/test/java/org/apache/maven/shared/utils/io/FileUtilsTest.java 
b/src/test/java/org/apache/maven/shared/utils/io/FileUtilsTest.java
index df16847..e081788 100644
--- a/src/test/java/org/apache/maven/shared/utils/io/FileUtilsTest.java
+++ b/src/test/java/org/apache/maven/shared/utils/io/FileUtilsTest.java
@@ -125,7 +125,8 @@ public class FileUtilsTest {
      * Assert that the content of a file is equal to that in a byte[].
      */
     private void assertEqualContent(byte[] b0, File file) throws IOException {
-        int count = 0, numRead = 0;
+        int count = 0;
+        int numRead = 0;
         byte[] b1 = new byte[b0.length];
         try (InputStream is = Files.newInputStream(file.toPath())) {
             while (count < b0.length && numRead >= 0) {

Reply via email to