You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@groovy.apache.org by su...@apache.org on 2017/12/31 10:31:46 UTC
groovy git commit: Use UTF-8 as the default encoding
Repository: groovy
Updated Branches:
refs/heads/master 16f6083e9 -> 891edd7a4
Use UTF-8 as the default encoding
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/891edd7a
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/891edd7a
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/891edd7a
Branch: refs/heads/master
Commit: 891edd7a4738c950db940f73eddc3c9f0b8d6601
Parents: 16f6083
Author: sunlan <su...@apache.org>
Authored: Sun Dec 31 18:31:30 2017 +0800
Committer: sunlan <su...@apache.org>
Committed: Sun Dec 31 18:31:42 2017 +0800
----------------------------------------------------------------------
.../java/org/codehaus/groovy/control/CompilerConfiguration.java | 2 +-
.../org/codehaus/groovy/control/CompilerConfigurationTest.java | 2 +-
src/test/org/codehaus/groovy/runtime/InvokeMethodTest.java | 5 +++--
.../xml/streamingmarkupsupport/StreamingMarkupWriter.java | 3 ++-
4 files changed, 7 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/groovy/blob/891edd7a/src/main/java/org/codehaus/groovy/control/CompilerConfiguration.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/codehaus/groovy/control/CompilerConfiguration.java b/src/main/java/org/codehaus/groovy/control/CompilerConfiguration.java
index b6d9cdf..1dbb944 100644
--- a/src/main/java/org/codehaus/groovy/control/CompilerConfiguration.java
+++ b/src/main/java/org/codehaus/groovy/control/CompilerConfiguration.java
@@ -472,7 +472,7 @@ public class CompilerConfiguration {
//
text = configuration.getProperty("groovy.source.encoding");
if (text == null) {
- text = configuration.getProperty("file.encoding", "US-ASCII");
+ text = configuration.getProperty("file.encoding", DEFAULT_SOURCE_ENCODING);
}
setSourceEncoding(text);
http://git-wip-us.apache.org/repos/asf/groovy/blob/891edd7a/src/test/org/codehaus/groovy/control/CompilerConfigurationTest.java
----------------------------------------------------------------------
diff --git a/src/test/org/codehaus/groovy/control/CompilerConfigurationTest.java b/src/test/org/codehaus/groovy/control/CompilerConfigurationTest.java
index b378b7e..d1f7632 100644
--- a/src/test/org/codehaus/groovy/control/CompilerConfigurationTest.java
+++ b/src/test/org/codehaus/groovy/control/CompilerConfigurationTest.java
@@ -70,7 +70,7 @@ public class CompilerConfigurationTest extends GroovyTestCase {
}
private String getSystemEncoding() {
- return System.getProperty("file.encoding", "US-ASCII");
+ return System.getProperty("file.encoding", CompilerConfiguration.DEFAULT_SOURCE_ENCODING);
}
private static String getVMVersion() {
http://git-wip-us.apache.org/repos/asf/groovy/blob/891edd7a/src/test/org/codehaus/groovy/runtime/InvokeMethodTest.java
----------------------------------------------------------------------
diff --git a/src/test/org/codehaus/groovy/runtime/InvokeMethodTest.java b/src/test/org/codehaus/groovy/runtime/InvokeMethodTest.java
index 11cffe7..e5bdec5 100644
--- a/src/test/org/codehaus/groovy/runtime/InvokeMethodTest.java
+++ b/src/test/org/codehaus/groovy/runtime/InvokeMethodTest.java
@@ -23,6 +23,7 @@ import groovy.lang.GroovyRuntimeException;
import groovy.lang.IntRange;
import groovy.util.GroovyTestCase;
import junit.framework.AssertionFailedError;
+import org.codehaus.groovy.control.CompilerConfiguration;
import org.codehaus.groovy.runtime.typehandling.DefaultTypeTransformation;
import java.math.BigDecimal;
@@ -228,13 +229,13 @@ public class InvokeMethodTest extends GroovyTestCase {
}
public void testCoerceGStringToStringOnGetBytes() throws Throwable {
- GString param = new GString(new Object[]{"US-ASCII"}) {
+ GString param = new GString(new Object[]{CompilerConfiguration.DEFAULT_SOURCE_ENCODING}) {
public String[] getStrings() {
return new String[]{""};
}
};
Object value = invoke("test", "getBytes", new Object[]{param});
- assertEquals("converted GString to string", "test".getBytes("US-ASCII").getClass(), value.getClass());
+ assertEquals("converted GString to string", "test".getBytes(CompilerConfiguration.DEFAULT_SOURCE_ENCODING).getClass(), value.getClass());
}
public void testBadBDToDoubleCoerce() throws Throwable {
http://git-wip-us.apache.org/repos/asf/groovy/blob/891edd7a/subprojects/groovy-xml/src/main/java/groovy/xml/streamingmarkupsupport/StreamingMarkupWriter.java
----------------------------------------------------------------------
diff --git a/subprojects/groovy-xml/src/main/java/groovy/xml/streamingmarkupsupport/StreamingMarkupWriter.java b/subprojects/groovy-xml/src/main/java/groovy/xml/streamingmarkupsupport/StreamingMarkupWriter.java
index 21d467e..75c2189 100644
--- a/subprojects/groovy-xml/src/main/java/groovy/xml/streamingmarkupsupport/StreamingMarkupWriter.java
+++ b/subprojects/groovy-xml/src/main/java/groovy/xml/streamingmarkupsupport/StreamingMarkupWriter.java
@@ -19,6 +19,7 @@
package groovy.xml.streamingmarkupsupport;
import groovy.io.EncodingAwareBufferedWriter;
+import org.codehaus.groovy.control.CompilerConfiguration;
import java.io.IOException;
import java.io.OutputStreamWriter;
@@ -105,7 +106,7 @@ public class StreamingMarkupWriter extends Writer {
this.encoding = getNormalizedEncoding(((EncodingAwareBufferedWriter) writer).getEncoding());
this.encodingKnown = true;
} else {
- this.encoding = "US-ASCII";
+ this.encoding = CompilerConfiguration.DEFAULT_SOURCE_ENCODING;
this.encodingKnown = false;
}