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/10 16:10:06 UTC
(commons-scxml) branch master updated (af2e59af -> 09bf96f8)
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/commons-scxml.git
from af2e59af Replace internal StringBuffer with StringBuilder
new 2ee7be45 Use constant instead of magic string
new 09bf96f8 Use constant instead of magic string
The 2 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.
Summary of changes:
.../java/org/apache/commons/scxml2/env/javascript/JSEvaluator.java | 6 +++---
src/main/java/org/apache/commons/scxml2/io/ContentParser.java | 3 ++-
2 files changed, 5 insertions(+), 4 deletions(-)
(commons-scxml) 02/02: Use constant instead of magic string
Posted by gg...@apache.org.
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
commit 09bf96f8561db65280b62d8635499af72ece85a0
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sun Dec 10 11:10:02 2023 -0500
Use constant instead of magic string
---
src/main/java/org/apache/commons/scxml2/io/ContentParser.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/main/java/org/apache/commons/scxml2/io/ContentParser.java b/src/main/java/org/apache/commons/scxml2/io/ContentParser.java
index 87863b75..938742d0 100644
--- a/src/main/java/org/apache/commons/scxml2/io/ContentParser.java
+++ b/src/main/java/org/apache/commons/scxml2/io/ContentParser.java
@@ -20,6 +20,7 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.StringWriter;
import java.net.URL;
+import java.nio.charset.StandardCharsets;
import java.util.Properties;
import javax.xml.parsers.DocumentBuilderFactory;
@@ -199,7 +200,7 @@ public class ContentParser {
*/
public ParsedValue parseResource(final String resourceURL) throws IOException {
try (InputStream in = new URL(resourceURL).openStream()) {
- final String content = IOUtils.toString(in, "UTF-8");
+ final String content = IOUtils.toString(in, StandardCharsets.UTF_8);
return parseContent(content);
}
}
(commons-scxml) 01/02: Use constant instead of magic string
Posted by gg...@apache.org.
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
commit 2ee7be458e8728d9a3dba98b1948171fefaea308
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sun Dec 10 11:09:42 2023 -0500
Use constant instead of magic string
---
.../java/org/apache/commons/scxml2/env/javascript/JSEvaluator.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/apache/commons/scxml2/env/javascript/JSEvaluator.java b/src/main/java/org/apache/commons/scxml2/env/javascript/JSEvaluator.java
index 6cc982bf..073fceb1 100644
--- a/src/main/java/org/apache/commons/scxml2/env/javascript/JSEvaluator.java
+++ b/src/main/java/org/apache/commons/scxml2/env/javascript/JSEvaluator.java
@@ -19,6 +19,7 @@ package org.apache.commons.scxml2.env.javascript;
import java.io.IOException;
import java.io.UncheckedIOException;
+import java.nio.charset.StandardCharsets;
import java.util.List;
import javax.script.Bindings;
@@ -263,9 +264,8 @@ public class JSEvaluator extends AbstractBaseEvaluator {
engine = new ScriptEngineManager().getEngineByName("JavaScript");
if (initGlobalsScript == null) {
try {
- initGlobalsScript = IOUtils.toString(JSEvaluator.class.getResourceAsStream("init_global.js"), "UTF-8");
- }
- catch (final IOException ioe) {
+ initGlobalsScript = IOUtils.toString(JSEvaluator.class.getResourceAsStream("init_global.js"), StandardCharsets.UTF_8);
+ } catch (final IOException ioe) {
throw new UncheckedIOException("Failed to load init_global.js from classpath", ioe);
}
}