(commons-scxml) branch master updated: Use constant instead of magic string

[ggregory]

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-scxml.git


The following commit(s) were added to refs/heads/master by this push:
     new 071b2591 Use constant instead of magic string
071b2591 is described below

commit 071b2591a21b1377ef0c992527c8f301105c4d15
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Sun Dec 10 13:01:08 2023 -0500

    Use constant instead of magic string
---
 src/main/java/org/apache/commons/scxml2/io/SCXMLReader.java | 13 +++++++------
 src/main/java/org/apache/commons/scxml2/io/SCXMLWriter.java |  3 ++-
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/main/java/org/apache/commons/scxml2/io/SCXMLReader.java 
b/src/main/java/org/apache/commons/scxml2/io/SCXMLReader.java
index 21dfe9bc..8fc55dd2 100644
--- a/src/main/java/org/apache/commons/scxml2/io/SCXMLReader.java
+++ b/src/main/java/org/apache/commons/scxml2/io/SCXMLReader.java
@@ -23,6 +23,7 @@ import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.net.URL;
 import java.net.URLConnection;
+import java.nio.charset.StandardCharsets;
 import java.text.MessageFormat;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -67,10 +68,6 @@ import org.apache.commons.scxml2.model.Else;
 import org.apache.commons.scxml2.model.ElseIf;
 import org.apache.commons.scxml2.model.EnterableState;
 import org.apache.commons.scxml2.model.Executable;
-import org.apache.commons.scxml2.model.JsonValue;
-import org.apache.commons.scxml2.model.NodeListValue;
-import org.apache.commons.scxml2.model.NodeValue;
-import org.apache.commons.scxml2.model.ParsedValueContainer;
 import org.apache.commons.scxml2.model.Final;
 import org.apache.commons.scxml2.model.Finalize;
 import org.apache.commons.scxml2.model.Foreach;
@@ -78,13 +75,18 @@ import org.apache.commons.scxml2.model.History;
 import org.apache.commons.scxml2.model.If;
 import org.apache.commons.scxml2.model.Initial;
 import org.apache.commons.scxml2.model.Invoke;
+import org.apache.commons.scxml2.model.JsonValue;
 import org.apache.commons.scxml2.model.Log;
 import org.apache.commons.scxml2.model.ModelException;
+import org.apache.commons.scxml2.model.NodeListValue;
+import org.apache.commons.scxml2.model.NodeTextValue;
+import org.apache.commons.scxml2.model.NodeValue;
 import org.apache.commons.scxml2.model.OnEntry;
 import org.apache.commons.scxml2.model.OnExit;
 import org.apache.commons.scxml2.model.Parallel;
 import org.apache.commons.scxml2.model.Param;
 import org.apache.commons.scxml2.model.ParamsContainer;
+import org.apache.commons.scxml2.model.ParsedValueContainer;
 import org.apache.commons.scxml2.model.Raise;
 import org.apache.commons.scxml2.model.SCXML;
 import org.apache.commons.scxml2.model.Script;
@@ -96,7 +98,6 @@ import org.apache.commons.scxml2.model.Transition;
 import org.apache.commons.scxml2.model.TransitionType;
 import org.apache.commons.scxml2.model.TransitionalState;
 import org.apache.commons.scxml2.model.Var;
-import org.apache.commons.scxml2.model.NodeTextValue;
 import org.w3c.dom.Attr;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
@@ -2312,7 +2313,7 @@ public final class SCXMLReader {
                 resolvedSrc = 
configuration.pathResolver.resolvePath(resolvedSrc);
             }
             try (InputStream in = new URL(resolvedSrc).openStream()){
-                script.setScript(IOUtils.toString(in, "UTF-8"));
+                script.setScript(IOUtils.toString(in, StandardCharsets.UTF_8));
             }
             catch (final IOException e) {
                 throw new ModelException(e);
diff --git a/src/main/java/org/apache/commons/scxml2/io/SCXMLWriter.java 
b/src/main/java/org/apache/commons/scxml2/io/SCXMLWriter.java
index 399381ad..d61d6730 100644
--- a/src/main/java/org/apache/commons/scxml2/io/SCXMLWriter.java
+++ b/src/main/java/org/apache/commons/scxml2/io/SCXMLWriter.java
@@ -21,6 +21,7 @@ import java.io.OutputStream;
 import java.io.StringReader;
 import java.io.StringWriter;
 import java.io.Writer;
+import java.nio.charset.StandardCharsets;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -664,7 +665,7 @@ public class SCXMLWriter {
                                       final SCXML scxml)
             throws XMLStreamException {
 
-        String encoding = "UTF-8";
+        String encoding = StandardCharsets.UTF_8.name();
         if (configuration.encoding != null) {
             encoding = configuration.encoding;
         }