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 88be47be Use constant instead of magic string 88be47be is described below commit 88be47be247b31b1ea523b1b6a9ca582872a30ce Author: Gary Gregory <garydgreg...@gmail.com> AuthorDate: Sun Dec 10 12:55:22 2023 -0500 Use constant instead of magic string --- .../commons/configuration2/builder/TestDefaultParametersManager.java | 3 ++- .../configuration2/builder/TestFileBasedConfigurationBuilder.java | 3 ++- .../apache/commons/configuration2/builder/fluent/TestParameters.java | 3 ++- .../java/org/apache/commons/configuration2/io/TestFileHandler.java | 3 ++- .../commons/configuration2/plist/TestXMLPropertyListConfiguration.java | 3 ++- 5 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/test/java/org/apache/commons/configuration2/builder/TestDefaultParametersManager.java b/src/test/java/org/apache/commons/configuration2/builder/TestDefaultParametersManager.java index 17ee8714..f954c0a8 100644 --- a/src/test/java/org/apache/commons/configuration2/builder/TestDefaultParametersManager.java +++ b/src/test/java/org/apache/commons/configuration2/builder/TestDefaultParametersManager.java @@ -23,6 +23,7 @@ import static org.junit.jupiter.api.Assertions.assertSame; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.mockito.Mockito.mock; +import java.nio.charset.StandardCharsets; import java.util.Map; import org.apache.commons.configuration2.builder.fluent.FileBasedBuilderParameters; @@ -51,7 +52,7 @@ public class TestDefaultParametersManager { } /** Constant for the default encoding. */ - private static final String DEF_ENCODING = "UTF-8"; + private static final String DEF_ENCODING = StandardCharsets.UTF_8.name(); /** A test list delimiter handler. */ private static ListDelimiterHandler listHandler; diff --git a/src/test/java/org/apache/commons/configuration2/builder/TestFileBasedConfigurationBuilder.java b/src/test/java/org/apache/commons/configuration2/builder/TestFileBasedConfigurationBuilder.java index e01caaf4..ee531ea8 100644 --- a/src/test/java/org/apache/commons/configuration2/builder/TestFileBasedConfigurationBuilder.java +++ b/src/test/java/org/apache/commons/configuration2/builder/TestFileBasedConfigurationBuilder.java @@ -34,6 +34,7 @@ import java.io.IOException; import java.io.InputStream; import java.io.Writer; import java.net.URL; +import java.nio.charset.StandardCharsets; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; @@ -531,7 +532,7 @@ public class TestFileBasedConfigurationBuilder { */ @Test public void testSetDefaultEncodingNull() { - assertThrows(IllegalArgumentException.class, () -> FileBasedConfigurationBuilder.setDefaultEncoding(null, "UTF-8")); + assertThrows(IllegalArgumentException.class, () -> FileBasedConfigurationBuilder.setDefaultEncoding(null, StandardCharsets.UTF_8.name())); } /** diff --git a/src/test/java/org/apache/commons/configuration2/builder/fluent/TestParameters.java b/src/test/java/org/apache/commons/configuration2/builder/fluent/TestParameters.java index b34f5205..10031352 100644 --- a/src/test/java/org/apache/commons/configuration2/builder/fluent/TestParameters.java +++ b/src/test/java/org/apache/commons/configuration2/builder/fluent/TestParameters.java @@ -28,6 +28,7 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; +import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -53,7 +54,7 @@ import org.junit.jupiter.api.Test; */ public class TestParameters { /** A default encoding. */ - private static final String DEF_ENCODING = "UTF-8"; + private static final String DEF_ENCODING = StandardCharsets.UTF_8.name(); /** A test list delimiter handler. */ private static ListDelimiterHandler listHandler; diff --git a/src/test/java/org/apache/commons/configuration2/io/TestFileHandler.java b/src/test/java/org/apache/commons/configuration2/io/TestFileHandler.java index cd020e74..1fb1ee56 100644 --- a/src/test/java/org/apache/commons/configuration2/io/TestFileHandler.java +++ b/src/test/java/org/apache/commons/configuration2/io/TestFileHandler.java @@ -47,6 +47,7 @@ import java.io.StringWriter; import java.io.Writer; import java.net.MalformedURLException; import java.net.URL; +import java.nio.charset.StandardCharsets; import java.util.Arrays; import java.util.HashMap; import java.util.List; @@ -828,7 +829,7 @@ public class TestFileHandler { final FileHandler handler = new FileHandler(); final FileHandlerListenerTestImpl listener = new FileHandlerListenerTestImpl(handler); handler.addFileHandlerListener(listener); - handler.setEncoding("UTF-8"); + handler.setEncoding(StandardCharsets.UTF_8.name()); listener.checkMethods("locationChanged"); } diff --git a/src/test/java/org/apache/commons/configuration2/plist/TestXMLPropertyListConfiguration.java b/src/test/java/org/apache/commons/configuration2/plist/TestXMLPropertyListConfiguration.java index 7ce75d1a..2c63f14f 100644 --- a/src/test/java/org/apache/commons/configuration2/plist/TestXMLPropertyListConfiguration.java +++ b/src/test/java/org/apache/commons/configuration2/plist/TestXMLPropertyListConfiguration.java @@ -34,6 +34,7 @@ import java.io.FileWriter; import java.io.IOException; import java.io.StringWriter; import java.io.Writer; +import java.nio.charset.StandardCharsets; import java.util.Arrays; import java.util.Calendar; import java.util.Iterator; @@ -366,7 +367,7 @@ public class TestXMLPropertyListConfiguration { */ @Test public void testSaveWithEncoding() throws ConfigurationException { - final String encoding = "UTF-8"; + final String encoding = StandardCharsets.UTF_8.name(); final FileHandler handler = new FileHandler(config); handler.setEncoding(encoding); final StringWriter writer = new StringWriter();