Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/main/java/org/apache/maven/shared/utils/Os.java
Original file line number Diff line number Diff line change
Expand Up @@ -300,12 +300,12 @@ private static boolean isOs(String family, String name, String arch, String vers
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)) {
Expand Down
26 changes: 13 additions & 13 deletions src/main/java/org/apache/maven/shared/utils/StringUtils.java
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ public StringUtils() {}
*/
@Deprecated
public static String clean(String str) {
return (str == null ? "" : str.trim());
return str == null ? "" : str.trim();
}

/**
Expand All @@ -84,7 +84,7 @@ public static String clean(String str) {
* @see java.lang.String#trim()
*/
public static String trim(String str) {
return (str == null ? null : str.trim());
return str == null ? null : str.trim();
}

/**
Expand Down Expand Up @@ -115,7 +115,7 @@ public static String deleteWhitespace(String str) {
* @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);
}

/**
Expand All @@ -130,7 +130,7 @@ public static boolean isNotEmpty(String str) {
* length zero once trimmed
*/
public static boolean isEmpty(String str) {
return ((str == null) || (str.trim().length() == 0));
return (str == null) || (str.trim().length() == 0);
}

/**
Expand Down Expand Up @@ -203,7 +203,7 @@ public static boolean isNotBlank(String str) {
*/
@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);
}

/**
Expand All @@ -220,7 +220,7 @@ public static boolean equals(String str1, String str2) {
* @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);
}

/**
Expand Down Expand Up @@ -252,7 +252,7 @@ public static int indexOfAny(String str, String... searchStrs) {
}
}

return (ret == Integer.MAX_VALUE) ? -1 : ret;
return ret == Integer.MAX_VALUE ? -1 : ret;
}

/**
Expand Down Expand Up @@ -569,7 +569,7 @@ public static String join(Object[] array, String separator) {
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++) {
Expand Down Expand Up @@ -714,7 +714,8 @@ public static String replace(String text, String repl, String with, int max) {
}

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();
Expand Down Expand Up @@ -785,8 +786,7 @@ public static String center(String str, int size, String delim) {
return str;
}
str = leftPad(str, sz + p / 2, delim);
str = rightPad(str, size, delim);
return str;
return rightPad(str, size, delim);
}

// Chomping
Expand Down Expand Up @@ -1558,7 +1558,7 @@ public static boolean isWhitespace(String str) {
}
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;
}
}
Expand Down Expand Up @@ -1690,7 +1690,7 @@ public static String defaultString(Object obj) {
*/
@Deprecated
public static String defaultString(Object obj, String defaultString) {
return (obj == null) ? defaultString : obj.toString();
return obj == null ? defaultString : obj.toString();
}

// Reversing
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
import java.util.StringTokenizer;
import java.util.concurrent.TimeUnit;

import org.apache.maven.shared.utils.Os;

Check warning on line 32 in src/main/java/org/apache/maven/shared/utils/cli/CommandLineUtils.java

View workflow job for this annotation

GitHub Actions / Verify / ubuntu-26.04 jdk-17-zulu 3.10.1

org.apache.maven.shared.utils.Os in org.apache.maven.shared.utils has been deprecated

Check warning on line 32 in src/main/java/org/apache/maven/shared/utils/cli/CommandLineUtils.java

View workflow job for this annotation

GitHub Actions / Verify / macos-latest jdk-25-zulu 4.0.0-rc-7

org.apache.maven.shared.utils.Os in org.apache.maven.shared.utils has been deprecated

Check warning on line 32 in src/main/java/org/apache/maven/shared/utils/cli/CommandLineUtils.java

View workflow job for this annotation

GitHub Actions / Verify / macos-latest jdk-25-zulu 3.10.1

org.apache.maven.shared.utils.Os in org.apache.maven.shared.utils has been deprecated

Check warning on line 32 in src/main/java/org/apache/maven/shared/utils/cli/CommandLineUtils.java

View workflow job for this annotation

GitHub Actions / Verify / ubuntu-26.04 jdk-8-zulu 3.10.1

org.apache.maven.shared.utils.Os in org.apache.maven.shared.utils has been deprecated

Check warning on line 32 in src/main/java/org/apache/maven/shared/utils/cli/CommandLineUtils.java

View workflow job for this annotation

GitHub Actions / Verify / ubuntu-26.04 jdk-25-zulu 4.0.0-rc-7

org.apache.maven.shared.utils.Os in org.apache.maven.shared.utils has been deprecated

Check warning on line 32 in src/main/java/org/apache/maven/shared/utils/cli/CommandLineUtils.java

View workflow job for this annotation

GitHub Actions / Verify / ubuntu-26.04 jdk-25-zulu 3.10.1

org.apache.maven.shared.utils.Os in org.apache.maven.shared.utils has been deprecated

Check warning on line 32 in src/main/java/org/apache/maven/shared/utils/cli/CommandLineUtils.java

View workflow job for this annotation

GitHub Actions / Verify / ubuntu-26.04 jdk-21-zulu 3.10.1

org.apache.maven.shared.utils.Os in org.apache.maven.shared.utils has been deprecated

Check warning on line 32 in src/main/java/org/apache/maven/shared/utils/cli/CommandLineUtils.java

View workflow job for this annotation

GitHub Actions / Verify / ubuntu-26.04 jdk-21-zulu 4.0.0-rc-7

org.apache.maven.shared.utils.Os in org.apache.maven.shared.utils has been deprecated
import org.apache.maven.shared.utils.StringUtils;

/**
Expand Down Expand Up @@ -508,7 +508,7 @@
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;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
import java.util.Properties;
import java.util.Vector;

import org.apache.maven.shared.utils.Os;

Check warning on line 32 in src/main/java/org/apache/maven/shared/utils/cli/Commandline.java

View workflow job for this annotation

GitHub Actions / Verify / ubuntu-26.04 jdk-17-zulu 3.10.1

org.apache.maven.shared.utils.Os in org.apache.maven.shared.utils has been deprecated

Check warning on line 32 in src/main/java/org/apache/maven/shared/utils/cli/Commandline.java

View workflow job for this annotation

GitHub Actions / Verify / macos-latest jdk-25-zulu 4.0.0-rc-7

org.apache.maven.shared.utils.Os in org.apache.maven.shared.utils has been deprecated

Check warning on line 32 in src/main/java/org/apache/maven/shared/utils/cli/Commandline.java

View workflow job for this annotation

GitHub Actions / Verify / macos-latest jdk-25-zulu 3.10.1

org.apache.maven.shared.utils.Os in org.apache.maven.shared.utils has been deprecated

Check warning on line 32 in src/main/java/org/apache/maven/shared/utils/cli/Commandline.java

View workflow job for this annotation

GitHub Actions / Verify / ubuntu-26.04 jdk-8-zulu 3.10.1

org.apache.maven.shared.utils.Os in org.apache.maven.shared.utils has been deprecated

Check warning on line 32 in src/main/java/org/apache/maven/shared/utils/cli/Commandline.java

View workflow job for this annotation

GitHub Actions / Verify / ubuntu-26.04 jdk-25-zulu 4.0.0-rc-7

org.apache.maven.shared.utils.Os in org.apache.maven.shared.utils has been deprecated

Check warning on line 32 in src/main/java/org/apache/maven/shared/utils/cli/Commandline.java

View workflow job for this annotation

GitHub Actions / Verify / ubuntu-26.04 jdk-25-zulu 3.10.1

org.apache.maven.shared.utils.Os in org.apache.maven.shared.utils has been deprecated

Check warning on line 32 in src/main/java/org/apache/maven/shared/utils/cli/Commandline.java

View workflow job for this annotation

GitHub Actions / Verify / ubuntu-26.04 jdk-21-zulu 3.10.1

org.apache.maven.shared.utils.Os in org.apache.maven.shared.utils has been deprecated

Check warning on line 32 in src/main/java/org/apache/maven/shared/utils/cli/Commandline.java

View workflow job for this annotation

GitHub Actions / Verify / ubuntu-26.04 jdk-21-zulu 4.0.0-rc-7

org.apache.maven.shared.utils.Os in org.apache.maven.shared.utils has been deprecated
import org.apache.maven.shared.utils.StringUtils;
import org.apache.maven.shared.utils.cli.shell.BourneShell;
import org.apache.maven.shared.utils.cli.shell.CmdShell;
Expand Down Expand Up @@ -90,7 +90,7 @@
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]);
Expand All @@ -112,7 +112,7 @@
*/
private void setDefaultShell() {
// If this is windows set the shell to command.com or cmd.exe with correct arguments.
if (Os.isFamily(Os.FAMILY_WINDOWS)) {

Check warning on line 115 in src/main/java/org/apache/maven/shared/utils/cli/Commandline.java

View workflow job for this annotation

GitHub Actions / Verify / ubuntu-26.04 jdk-17-zulu 3.10.1

org.apache.maven.shared.utils.Os in org.apache.maven.shared.utils has been deprecated

Check warning on line 115 in src/main/java/org/apache/maven/shared/utils/cli/Commandline.java

View workflow job for this annotation

GitHub Actions / Verify / ubuntu-26.04 jdk-17-zulu 3.10.1

org.apache.maven.shared.utils.Os in org.apache.maven.shared.utils has been deprecated

Check warning on line 115 in src/main/java/org/apache/maven/shared/utils/cli/Commandline.java

View workflow job for this annotation

GitHub Actions / Verify / macos-latest jdk-25-zulu 4.0.0-rc-7

org.apache.maven.shared.utils.Os in org.apache.maven.shared.utils has been deprecated

Check warning on line 115 in src/main/java/org/apache/maven/shared/utils/cli/Commandline.java

View workflow job for this annotation

GitHub Actions / Verify / macos-latest jdk-25-zulu 4.0.0-rc-7

org.apache.maven.shared.utils.Os in org.apache.maven.shared.utils has been deprecated

Check warning on line 115 in src/main/java/org/apache/maven/shared/utils/cli/Commandline.java

View workflow job for this annotation

GitHub Actions / Verify / macos-latest jdk-25-zulu 3.10.1

org.apache.maven.shared.utils.Os in org.apache.maven.shared.utils has been deprecated

Check warning on line 115 in src/main/java/org/apache/maven/shared/utils/cli/Commandline.java

View workflow job for this annotation

GitHub Actions / Verify / macos-latest jdk-25-zulu 3.10.1

org.apache.maven.shared.utils.Os in org.apache.maven.shared.utils has been deprecated

Check warning on line 115 in src/main/java/org/apache/maven/shared/utils/cli/Commandline.java

View workflow job for this annotation

GitHub Actions / Verify / ubuntu-26.04 jdk-8-zulu 3.10.1

org.apache.maven.shared.utils.Os in org.apache.maven.shared.utils has been deprecated

Check warning on line 115 in src/main/java/org/apache/maven/shared/utils/cli/Commandline.java

View workflow job for this annotation

GitHub Actions / Verify / ubuntu-26.04 jdk-8-zulu 3.10.1

org.apache.maven.shared.utils.Os in org.apache.maven.shared.utils has been deprecated

Check warning on line 115 in src/main/java/org/apache/maven/shared/utils/cli/Commandline.java

View workflow job for this annotation

GitHub Actions / Verify / ubuntu-26.04 jdk-25-zulu 4.0.0-rc-7

org.apache.maven.shared.utils.Os in org.apache.maven.shared.utils has been deprecated

Check warning on line 115 in src/main/java/org/apache/maven/shared/utils/cli/Commandline.java

View workflow job for this annotation

GitHub Actions / Verify / ubuntu-26.04 jdk-25-zulu 4.0.0-rc-7

org.apache.maven.shared.utils.Os in org.apache.maven.shared.utils has been deprecated

Check warning on line 115 in src/main/java/org/apache/maven/shared/utils/cli/Commandline.java

View workflow job for this annotation

GitHub Actions / Verify / ubuntu-26.04 jdk-25-zulu 3.10.1

org.apache.maven.shared.utils.Os in org.apache.maven.shared.utils has been deprecated

Check warning on line 115 in src/main/java/org/apache/maven/shared/utils/cli/Commandline.java

View workflow job for this annotation

GitHub Actions / Verify / ubuntu-26.04 jdk-25-zulu 3.10.1

org.apache.maven.shared.utils.Os in org.apache.maven.shared.utils has been deprecated

Check warning on line 115 in src/main/java/org/apache/maven/shared/utils/cli/Commandline.java

View workflow job for this annotation

GitHub Actions / Verify / ubuntu-26.04 jdk-21-zulu 3.10.1

org.apache.maven.shared.utils.Os in org.apache.maven.shared.utils has been deprecated

Check warning on line 115 in src/main/java/org/apache/maven/shared/utils/cli/Commandline.java

View workflow job for this annotation

GitHub Actions / Verify / ubuntu-26.04 jdk-21-zulu 3.10.1

org.apache.maven.shared.utils.Os in org.apache.maven.shared.utils has been deprecated

Check warning on line 115 in src/main/java/org/apache/maven/shared/utils/cli/Commandline.java

View workflow job for this annotation

GitHub Actions / Verify / ubuntu-26.04 jdk-21-zulu 4.0.0-rc-7

org.apache.maven.shared.utils.Os in org.apache.maven.shared.utils has been deprecated

Check warning on line 115 in src/main/java/org/apache/maven/shared/utils/cli/Commandline.java

View workflow job for this annotation

GitHub Actions / Verify / ubuntu-26.04 jdk-21-zulu 4.0.0-rc-7

org.apache.maven.shared.utils.Os in org.apache.maven.shared.utils has been deprecated
setShell(new CmdShell());
} else {
setShell(new BourneShell());
Expand Down Expand Up @@ -190,7 +190,7 @@
public void addSystemEnvironment() {}

private void copySystemEnvironment() {
Properties systemEnvVars = CommandLineUtils.getSystemEnvVars();

Check warning on line 193 in src/main/java/org/apache/maven/shared/utils/cli/Commandline.java

View workflow job for this annotation

GitHub Actions / Verify / ubuntu-26.04 jdk-17-zulu 3.10.1

getSystemEnvVars() in org.apache.maven.shared.utils.cli.CommandLineUtils has been deprecated

Check warning on line 193 in src/main/java/org/apache/maven/shared/utils/cli/Commandline.java

View workflow job for this annotation

GitHub Actions / Verify / macos-latest jdk-25-zulu 4.0.0-rc-7

getSystemEnvVars() in org.apache.maven.shared.utils.cli.CommandLineUtils has been deprecated

Check warning on line 193 in src/main/java/org/apache/maven/shared/utils/cli/Commandline.java

View workflow job for this annotation

GitHub Actions / Verify / macos-latest jdk-25-zulu 3.10.1

getSystemEnvVars() in org.apache.maven.shared.utils.cli.CommandLineUtils has been deprecated

Check warning on line 193 in src/main/java/org/apache/maven/shared/utils/cli/Commandline.java

View workflow job for this annotation

GitHub Actions / Verify / ubuntu-26.04 jdk-8-zulu 3.10.1

getSystemEnvVars() in org.apache.maven.shared.utils.cli.CommandLineUtils has been deprecated

Check warning on line 193 in src/main/java/org/apache/maven/shared/utils/cli/Commandline.java

View workflow job for this annotation

GitHub Actions / Verify / ubuntu-26.04 jdk-25-zulu 4.0.0-rc-7

getSystemEnvVars() in org.apache.maven.shared.utils.cli.CommandLineUtils has been deprecated

Check warning on line 193 in src/main/java/org/apache/maven/shared/utils/cli/Commandline.java

View workflow job for this annotation

GitHub Actions / Verify / ubuntu-26.04 jdk-25-zulu 3.10.1

getSystemEnvVars() in org.apache.maven.shared.utils.cli.CommandLineUtils has been deprecated

Check warning on line 193 in src/main/java/org/apache/maven/shared/utils/cli/Commandline.java

View workflow job for this annotation

GitHub Actions / Verify / ubuntu-26.04 jdk-21-zulu 3.10.1

getSystemEnvVars() in org.apache.maven.shared.utils.cli.CommandLineUtils has been deprecated

Check warning on line 193 in src/main/java/org/apache/maven/shared/utils/cli/Commandline.java

View workflow job for this annotation

GitHub Actions / Verify / ubuntu-26.04 jdk-21-zulu 4.0.0-rc-7

getSystemEnvVars() in org.apache.maven.shared.utils.cli.CommandLineUtils has been deprecated

for (Object o : systemEnvVars.keySet()) {
String key = (String) o;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
import java.lang.reflect.Method;
import java.util.Map;

import org.apache.maven.shared.utils.Os;

Check warning on line 27 in src/main/java/org/apache/maven/shared/utils/cli/javatool/AbstractJavaTool.java

View workflow job for this annotation

GitHub Actions / Verify / ubuntu-26.04 jdk-17-zulu 3.10.1

org.apache.maven.shared.utils.Os in org.apache.maven.shared.utils has been deprecated

Check warning on line 27 in src/main/java/org/apache/maven/shared/utils/cli/javatool/AbstractJavaTool.java

View workflow job for this annotation

GitHub Actions / Verify / macos-latest jdk-25-zulu 4.0.0-rc-7

org.apache.maven.shared.utils.Os in org.apache.maven.shared.utils has been deprecated

Check warning on line 27 in src/main/java/org/apache/maven/shared/utils/cli/javatool/AbstractJavaTool.java

View workflow job for this annotation

GitHub Actions / Verify / macos-latest jdk-25-zulu 3.10.1

org.apache.maven.shared.utils.Os in org.apache.maven.shared.utils has been deprecated

Check warning on line 27 in src/main/java/org/apache/maven/shared/utils/cli/javatool/AbstractJavaTool.java

View workflow job for this annotation

GitHub Actions / Verify / ubuntu-26.04 jdk-8-zulu 3.10.1

org.apache.maven.shared.utils.Os in org.apache.maven.shared.utils has been deprecated

Check warning on line 27 in src/main/java/org/apache/maven/shared/utils/cli/javatool/AbstractJavaTool.java

View workflow job for this annotation

GitHub Actions / Verify / ubuntu-26.04 jdk-25-zulu 4.0.0-rc-7

org.apache.maven.shared.utils.Os in org.apache.maven.shared.utils has been deprecated

Check warning on line 27 in src/main/java/org/apache/maven/shared/utils/cli/javatool/AbstractJavaTool.java

View workflow job for this annotation

GitHub Actions / Verify / ubuntu-26.04 jdk-25-zulu 3.10.1

org.apache.maven.shared.utils.Os in org.apache.maven.shared.utils has been deprecated

Check warning on line 27 in src/main/java/org/apache/maven/shared/utils/cli/javatool/AbstractJavaTool.java

View workflow job for this annotation

GitHub Actions / Verify / ubuntu-26.04 jdk-21-zulu 3.10.1

org.apache.maven.shared.utils.Os in org.apache.maven.shared.utils has been deprecated

Check warning on line 27 in src/main/java/org/apache/maven/shared/utils/cli/javatool/AbstractJavaTool.java

View workflow job for this annotation

GitHub Actions / Verify / ubuntu-26.04 jdk-21-zulu 4.0.0-rc-7

org.apache.maven.shared.utils.Os in org.apache.maven.shared.utils has been deprecated
import org.apache.maven.shared.utils.StringUtils;
import org.apache.maven.shared.utils.cli.CommandLineException;
import org.apache.maven.shared.utils.cli.CommandLineUtils;
Expand Down Expand Up @@ -114,17 +114,15 @@
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}
Expand All @@ -133,7 +131,6 @@
return -1;
}
};
return systemIn;
}

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
* {@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];
Expand Down
8 changes: 4 additions & 4 deletions src/main/java/org/apache/maven/shared/utils/io/FileUtils.java
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
import java.util.Random;

import org.apache.commons.io.IOUtils;
import org.apache.maven.shared.utils.Os;

Check warning on line 52 in src/main/java/org/apache/maven/shared/utils/io/FileUtils.java

View workflow job for this annotation

GitHub Actions / Verify / ubuntu-26.04 jdk-17-zulu 3.10.1

org.apache.maven.shared.utils.Os in org.apache.maven.shared.utils has been deprecated

Check warning on line 52 in src/main/java/org/apache/maven/shared/utils/io/FileUtils.java

View workflow job for this annotation

GitHub Actions / Verify / macos-latest jdk-25-zulu 4.0.0-rc-7

org.apache.maven.shared.utils.Os in org.apache.maven.shared.utils has been deprecated

Check warning on line 52 in src/main/java/org/apache/maven/shared/utils/io/FileUtils.java

View workflow job for this annotation

GitHub Actions / Verify / macos-latest jdk-25-zulu 3.10.1

org.apache.maven.shared.utils.Os in org.apache.maven.shared.utils has been deprecated

Check warning on line 52 in src/main/java/org/apache/maven/shared/utils/io/FileUtils.java

View workflow job for this annotation

GitHub Actions / Verify / ubuntu-26.04 jdk-8-zulu 3.10.1

org.apache.maven.shared.utils.Os in org.apache.maven.shared.utils has been deprecated

Check warning on line 52 in src/main/java/org/apache/maven/shared/utils/io/FileUtils.java

View workflow job for this annotation

GitHub Actions / Verify / ubuntu-26.04 jdk-25-zulu 4.0.0-rc-7

org.apache.maven.shared.utils.Os in org.apache.maven.shared.utils has been deprecated

Check warning on line 52 in src/main/java/org/apache/maven/shared/utils/io/FileUtils.java

View workflow job for this annotation

GitHub Actions / Verify / ubuntu-26.04 jdk-25-zulu 3.10.1

org.apache.maven.shared.utils.Os in org.apache.maven.shared.utils has been deprecated

Check warning on line 52 in src/main/java/org/apache/maven/shared/utils/io/FileUtils.java

View workflow job for this annotation

GitHub Actions / Verify / ubuntu-26.04 jdk-21-zulu 3.10.1

org.apache.maven.shared.utils.Os in org.apache.maven.shared.utils has been deprecated

Check warning on line 52 in src/main/java/org/apache/maven/shared/utils/io/FileUtils.java

View workflow job for this annotation

GitHub Actions / Verify / ubuntu-26.04 jdk-21-zulu 4.0.0-rc-7

org.apache.maven.shared.utils.Os in org.apache.maven.shared.utils has been deprecated
import org.apache.maven.shared.utils.StringUtils;

/**
Expand Down Expand Up @@ -159,7 +159,7 @@
@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) : "";
}

/**
Expand All @@ -172,7 +172,7 @@
@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;
}

/**
Expand Down Expand Up @@ -924,7 +924,7 @@
}

// 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 {
Expand Down Expand Up @@ -960,7 +960,7 @@
filenm = sb.toString();

// must be relative
File file = (new File(baseFile, filenm)).getAbsoluteFile();
File file = new File(baseFile, filenm).getAbsoluteFile();

try {
file = file.getCanonicalFile();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
* @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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
* @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) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -279,8 +279,8 @@ private static boolean matchAntPathPattern(String pattern, String str, boolean i
}
// 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++) {
Expand Down Expand Up @@ -441,8 +441,8 @@ public static boolean match(String pattern, String str, boolean isCaseSensitive)
}
// 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++) {
Expand Down Expand Up @@ -632,8 +632,8 @@ static boolean matchAntPathPattern(String[] patDirs, String[] strDirs, boolean i
}
// 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++) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ public XmlStreamReader(InputStream is, String httpContentType) throws IOExceptio
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);
}

/**
Expand Down
11 changes: 5 additions & 6 deletions src/main/java/org/apache/maven/shared/utils/xml/Xpp3Dom.java
Original file line number Diff line number Diff line change
Expand Up @@ -327,10 +327,10 @@ public boolean equals(Object obj) {

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));
}

/**
Expand All @@ -341,8 +341,7 @@ public int hashCode() {
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);
}

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ private static Map<String, Iterator<Xpp3Dom>> getCommonChildren(Xpp3Dom dominant

for (String childName : recessive.childMap.keySet()) {
List<Xpp3Dom> dominantChildren = dominant.getChildrenList(childName);
if (dominantChildren.size() > 0) {
if (!dominantChildren.isEmpty()) {
commonChildren.put(childName, dominantChildren.iterator());
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,8 @@ private static void createFile(File file, long size) throws IOException {
* 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) {
Expand Down
Loading