You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2023/12/23 16:13:50 UTC
(commons-configuration) branch master updated: Use StandardCharsets
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-configuration.git
The following commit(s) were added to refs/heads/master by this push:
new 111e1f4b Use StandardCharsets
111e1f4b is described below
commit 111e1f4b3ff76e0d476d7b733ec762d97fc13003
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sat Dec 23 11:13:45 2023 -0500
Use StandardCharsets
---
.../org/apache/commons/configuration2/PropertiesConfiguration.java | 3 ++-
.../java/org/apache/commons/configuration2/TestXMLConfiguration.java | 2 +-
.../commons/configuration2/builder/TestFileBasedBuilderParameters.java | 2 +-
3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/apache/commons/configuration2/PropertiesConfiguration.java b/src/main/java/org/apache/commons/configuration2/PropertiesConfiguration.java
index 7df8c981..3084ae76 100644
--- a/src/main/java/org/apache/commons/configuration2/PropertiesConfiguration.java
+++ b/src/main/java/org/apache/commons/configuration2/PropertiesConfiguration.java
@@ -24,6 +24,7 @@ import java.io.LineNumberReader;
import java.io.Reader;
import java.io.Writer;
import java.net.URL;
+import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
@@ -995,7 +996,7 @@ public class PropertiesConfiguration extends BaseConfiguration implements FileBa
/**
* The default encoding (ISO-8859-1 as specified by https://docs.oracle.com/javase/8/docs/api/java/util/Properties.html)
*/
- public static final String DEFAULT_ENCODING = "ISO-8859-1";
+ public static final String DEFAULT_ENCODING = StandardCharsets.ISO_8859_1.name();
/** Constant for the supported comment characters. */
static final String COMMENT_CHARS = "#!";
diff --git a/src/test/java/org/apache/commons/configuration2/TestXMLConfiguration.java b/src/test/java/org/apache/commons/configuration2/TestXMLConfiguration.java
index 952fecc8..01ba754d 100644
--- a/src/test/java/org/apache/commons/configuration2/TestXMLConfiguration.java
+++ b/src/test/java/org/apache/commons/configuration2/TestXMLConfiguration.java
@@ -92,7 +92,7 @@ public class TestXMLConfiguration {
private static final String CATALOG_FILES = ConfigurationAssert.getTestFile("catalog.xml").getAbsolutePath();
/** Constant for the used encoding. */
- static final String ENCODING = "ISO-8859-1";
+ static final String ENCODING = StandardCharsets.ISO_8859_1.name();
/** Constant for the test system ID. */
static final String SYSTEM_ID = "properties.dtd";
diff --git a/src/test/java/org/apache/commons/configuration2/builder/TestFileBasedBuilderParameters.java b/src/test/java/org/apache/commons/configuration2/builder/TestFileBasedBuilderParameters.java
index 50ef47c3..764b27e0 100644
--- a/src/test/java/org/apache/commons/configuration2/builder/TestFileBasedBuilderParameters.java
+++ b/src/test/java/org/apache/commons/configuration2/builder/TestFileBasedBuilderParameters.java
@@ -242,7 +242,7 @@ public class TestFileBasedBuilderParameters {
*/
@Test
public void testSetEncoding() {
- final String enc = "ISO-8859-1";
+ final String enc = StandardCharsets.ISO_8859_1.name();
final FileBasedBuilderParametersImpl params = new FileBasedBuilderParametersImpl();
assertSame(params, params.setEncoding(enc));
assertSame(enc, params.getFileHandler().getEncoding());