This is an automated email from the ASF dual-hosted git repository. elharo pushed a commit to branch line in repository https://gitbox.apache.org/repos/asf/maven-enforcer.git
commit 78dd34464077e1fc2450704d19660484410ad684 Author: Elliotte Rusty Harold <elh...@ibiblio.org> AuthorDate: Thu Jan 9 06:50:20 2025 -0500 Make exception messages platform independent --- .../apache/maven/enforcer/rules/files/AbstractRequireFiles.java | 6 +++--- .../apache/maven/enforcer/rules/files/RequireFilesDontExist.java | 2 +- .../org/apache/maven/enforcer/rules/files/RequireFilesExist.java | 9 ++++----- .../org/apache/maven/enforcer/rules/files/RequireFilesSize.java | 2 +- 4 files changed, 9 insertions(+), 10 deletions(-) diff --git a/enforcer-rules/src/main/java/org/apache/maven/enforcer/rules/files/AbstractRequireFiles.java b/enforcer-rules/src/main/java/org/apache/maven/enforcer/rules/files/AbstractRequireFiles.java index da9019f..159366b 100644 --- a/enforcer-rules/src/main/java/org/apache/maven/enforcer/rules/files/AbstractRequireFiles.java +++ b/enforcer-rules/src/main/java/org/apache/maven/enforcer/rules/files/AbstractRequireFiles.java @@ -93,15 +93,15 @@ abstract class AbstractRequireFiles extends AbstractStandardEnforcerRule { StringBuilder buf = new StringBuilder(); if (message != null) { - buf.append(message + System.lineSeparator()); + buf.append(message + '\n'); } buf.append(getErrorMsg()); for (File file : failures) { if (file != null) { - buf.append(file.getAbsolutePath() + System.lineSeparator()); + buf.append(file.getAbsolutePath() + '\n'); } else { - buf.append("(an empty filename was given and allowNulls is false)" + System.lineSeparator()); + buf.append("(an empty filename was given and allowNulls is false)\n"); } } diff --git a/enforcer-rules/src/main/java/org/apache/maven/enforcer/rules/files/RequireFilesDontExist.java b/enforcer-rules/src/main/java/org/apache/maven/enforcer/rules/files/RequireFilesDontExist.java index 116dd04..38d2b09 100644 --- a/enforcer-rules/src/main/java/org/apache/maven/enforcer/rules/files/RequireFilesDontExist.java +++ b/enforcer-rules/src/main/java/org/apache/maven/enforcer/rules/files/RequireFilesDontExist.java @@ -35,6 +35,6 @@ public final class RequireFilesDontExist extends AbstractRequireFiles { @Override String getErrorMsg() { - return "Some files should not exist:" + System.lineSeparator(); + return "Some files should not exist:\n"; } } diff --git a/enforcer-rules/src/main/java/org/apache/maven/enforcer/rules/files/RequireFilesExist.java b/enforcer-rules/src/main/java/org/apache/maven/enforcer/rules/files/RequireFilesExist.java index 9318dbc..bcdb9e2 100644 --- a/enforcer-rules/src/main/java/org/apache/maven/enforcer/rules/files/RequireFilesExist.java +++ b/enforcer-rules/src/main/java/org/apache/maven/enforcer/rules/files/RequireFilesExist.java @@ -36,17 +36,16 @@ public final class RequireFilesExist extends AbstractRequireFiles { @Override String getErrorMsg() { - return "Some required files are missing:" + System.lineSeparator(); + return "Some required files are missing:\n"; } /** - * OSes like Windows are case insensitive, so this method will compare the file path with the actual path. A simple + * OSes like Windows are case-insensitive, so this method will compare the file path with the actual path. A simple * {@link File#exists()} is not enough for such OS. * * @param file the file to verify - * @param defaultValue value to return in case an IO exception occurs, should never happen as the file already - * exists - * @return + * @param defaultValue value to return in case an IO exception occurs. Should never happen as the file already + * exists. */ private boolean osIndependentNameMatch(File file, boolean defaultValue) { try { diff --git a/enforcer-rules/src/main/java/org/apache/maven/enforcer/rules/files/RequireFilesSize.java b/enforcer-rules/src/main/java/org/apache/maven/enforcer/rules/files/RequireFilesSize.java index d032c0d..d3a4b0a 100644 --- a/enforcer-rules/src/main/java/org/apache/maven/enforcer/rules/files/RequireFilesSize.java +++ b/enforcer-rules/src/main/java/org/apache/maven/enforcer/rules/files/RequireFilesSize.java @@ -98,7 +98,7 @@ public final class RequireFilesSize extends AbstractRequireFiles { + (minsize == maxsize || minsize == 0 ? ("max. " + maxsize) : ("between " + minsize + " and " + maxsize)) - + " byte)."); + + " bytes)."); return true; }