You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by el...@apache.org on 2025/02/26 14:46:47 UTC
(maven-shared-utils) branch prop created (now 31e9465)
This is an automated email from the ASF dual-hosted git repository.
elharo pushed a change to branch prop
in repository https://gitbox.apache.org/repos/asf/maven-shared-utils.git
at 31e9465 Use caching methods for system properties
This branch includes the following new commits:
new 31e9465 Use caching methods for system properties
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
(maven-shared-utils) 01/01: Use caching methods for system properties
Posted by el...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
elharo pushed a commit to branch prop
in repository https://gitbox.apache.org/repos/asf/maven-shared-utils.git
commit 31e946524311dc12e1282c86b41c37c80a925447
Author: Elliotte Rusty Harold <el...@ibiblio.org>
AuthorDate: Wed Feb 26 09:46:38 2025 -0500
Use caching methods for system properties
---
src/main/java/org/apache/maven/shared/utils/Os.java | 5 +++--
src/main/java/org/apache/maven/shared/utils/ReaderFactory.java | 3 ++-
src/main/java/org/apache/maven/shared/utils/StringUtils.java | 4 ++--
src/main/java/org/apache/maven/shared/utils/WriterFactory.java | 3 ++-
src/main/java/org/apache/maven/shared/utils/io/FileUtils.java | 5 +++--
.../org/apache/maven/shared/utils/logging/PlainMessageBuilder.java | 2 +-
src/main/java/org/apache/maven/shared/utils/xml/XmlWriterUtil.java | 2 +-
src/test/java/org/apache/maven/shared/utils/StringUtilsTest.java | 2 +-
8 files changed, 15 insertions(+), 11 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 eb48a46..56a6760 100644
--- a/src/main/java/org/apache/maven/shared/utils/Os.java
+++ b/src/main/java/org/apache/maven/shared/utils/Os.java
@@ -18,6 +18,7 @@
*/
package org.apache.maven.shared.utils;
+import java.io.File;
import java.util.Collections;
import java.util.HashSet;
import java.util.Locale;
@@ -61,12 +62,12 @@ public class Os {
/**
* The path separator.
*/
- public static final String PATH_SEP = System.getProperty("path.separator");
+ public static final String PATH_SEP = File.pathSeparator;
/**
* system line separator , e.g. "\n" on unixoid systems and "\r\n" on Windows
*/
- public static final String LINE_SEP = System.getProperty("line.separator");
+ public static final String LINE_SEP = System.lineSeparator();
/**
* OS Family
diff --git a/src/main/java/org/apache/maven/shared/utils/ReaderFactory.java b/src/main/java/org/apache/maven/shared/utils/ReaderFactory.java
index 7dfd8ef..cb0921c 100644
--- a/src/main/java/org/apache/maven/shared/utils/ReaderFactory.java
+++ b/src/main/java/org/apache/maven/shared/utils/ReaderFactory.java
@@ -30,6 +30,7 @@ import java.io.InputStreamReader;
import java.io.Reader;
import java.io.UnsupportedEncodingException;
import java.net.URL;
+import java.nio.charset.Charset;
import org.apache.commons.io.input.XmlStreamReader;
@@ -103,7 +104,7 @@ public class ReaderFactory {
* @deprecated use {@code java.nio.charset.Charset.getDefaultCharset()}
*/
@Deprecated
- public static final String FILE_ENCODING = System.getProperty("file.encoding");
+ public static final String FILE_ENCODING = Charset.defaultCharset().displayName();
/**
* Create a new Reader with XML encoding detection rules.
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 dff90cb..b5a4c02 100644
--- a/src/main/java/org/apache/maven/shared/utils/StringUtils.java
+++ b/src/main/java/org/apache/maven/shared/utils/StringUtils.java
@@ -2152,7 +2152,7 @@ public class StringUtils {
*/
@Deprecated
public static String unifyLineSeparators(@Nullable String s) {
- return unifyLineSeparators(s, System.getProperty("line.separator"));
+ return unifyLineSeparators(s, System.lineSeparator() );
}
/**
@@ -2171,7 +2171,7 @@ public class StringUtils {
}
if (ls == null) {
- ls = System.getProperty("line.separator");
+ ls = System.lineSeparator();
}
if (!(ls.equals("\n") || ls.equals("\r") || ls.equals("\r\n"))) {
diff --git a/src/main/java/org/apache/maven/shared/utils/WriterFactory.java b/src/main/java/org/apache/maven/shared/utils/WriterFactory.java
index a982cc0..5088914 100644
--- a/src/main/java/org/apache/maven/shared/utils/WriterFactory.java
+++ b/src/main/java/org/apache/maven/shared/utils/WriterFactory.java
@@ -29,6 +29,7 @@ import java.io.OutputStream;
import java.io.OutputStreamWriter;
import java.io.UnsupportedEncodingException;
import java.io.Writer;
+import java.nio.charset.Charset;
import org.apache.maven.shared.utils.xml.XmlStreamWriter;
@@ -102,7 +103,7 @@ public class WriterFactory {
* @deprecated use {@code java.nio.charset.Charset.getDefaultCharset()}
*/
@Deprecated
- public static final String FILE_ENCODING = System.getProperty("file.encoding");
+ public static final String FILE_ENCODING = Charset.defaultCharset().displayName();
/**
* Create a new Writer with XML encoding detection rules.
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 62c5bcb..b26f6ac 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
@@ -40,6 +40,7 @@ import java.nio.channels.FileChannel;
import java.nio.charset.Charset;
import java.nio.charset.CharsetEncoder;
import java.nio.charset.CoderResult;
+import java.nio.file.FileSystems;
import java.nio.file.Files;
import java.nio.file.Path;
import java.security.SecureRandom;
@@ -116,7 +117,7 @@ public class FileUtils {
/**
* The vm line separator
*/
- private static final String FS = System.getProperty("file.separator");
+ private static final String FS = FileSystems.getDefault().getSeparator();
/**
* Non-valid Characters for naming files, folders under Windows: <code>":", "*", "?", "\"", "<", ">", "|"</code>
@@ -469,7 +470,7 @@ public class FileUtils {
}
for (String unknownFile : unknownFiles) {
- String currentFileName = directory + System.getProperty("file.separator") + unknownFile;
+ String currentFileName = directory + FileSystems.getDefault().getSeparator() + unknownFile;
File currentFile = new File(currentFileName);
if (currentFile.isDirectory()) {
diff --git a/src/main/java/org/apache/maven/shared/utils/logging/PlainMessageBuilder.java b/src/main/java/org/apache/maven/shared/utils/logging/PlainMessageBuilder.java
index 86b3e2a..d2f8fca 100644
--- a/src/main/java/org/apache/maven/shared/utils/logging/PlainMessageBuilder.java
+++ b/src/main/java/org/apache/maven/shared/utils/logging/PlainMessageBuilder.java
@@ -102,7 +102,7 @@ class PlainMessageBuilder implements MessageBuilder, LoggerLevelRenderer {
}
public PlainMessageBuilder newline() {
- buffer.append(System.getProperty("line.separator"));
+ buffer.append( System.lineSeparator() );
return this;
}
diff --git a/src/main/java/org/apache/maven/shared/utils/xml/XmlWriterUtil.java b/src/main/java/org/apache/maven/shared/utils/xml/XmlWriterUtil.java
index e321772..7ead8dd 100644
--- a/src/main/java/org/apache/maven/shared/utils/xml/XmlWriterUtil.java
+++ b/src/main/java/org/apache/maven/shared/utils/xml/XmlWriterUtil.java
@@ -31,7 +31,7 @@ import org.apache.maven.shared.utils.StringUtils;
@Deprecated
public class XmlWriterUtil {
/** The vm line separator */
- public static final String LS = System.getProperty("line.separator");
+ public static final String LS = System.lineSeparator();
/** Platform independent line separator */
private static final String CRLF = "\r\n";
diff --git a/src/test/java/org/apache/maven/shared/utils/StringUtilsTest.java b/src/test/java/org/apache/maven/shared/utils/StringUtilsTest.java
index 3cd129a..670403c 100644
--- a/src/test/java/org/apache/maven/shared/utils/StringUtilsTest.java
+++ b/src/test/java/org/apache/maven/shared/utils/StringUtilsTest.java
@@ -1473,7 +1473,7 @@ public class StringUtilsTest {
@Test
public void testUnifyLineSeparators1() {
- String sls = System.getProperty("line.separator");
+ String sls = System.lineSeparator();
assertThat(StringUtils.unifyLineSeparators(null), nullValue());