You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by db...@apache.org on 2016/05/02 04:33:40 UTC
cassandra git commit: use standard utf-8 charset constants
Repository: cassandra
Updated Branches:
refs/heads/trunk 7b42636a7 -> 68b915644
use standard utf-8 charset constants
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/68b91564
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/68b91564
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/68b91564
Branch: refs/heads/trunk
Commit: 68b915644a70aea5064c3294d30ae939f3a248e6
Parents: 7b42636
Author: Dave Brosius <db...@mebigfatguy.com>
Authored: Sun May 1 22:33:14 2016 -0400
Committer: Dave Brosius <db...@mebigfatguy.com>
Committed: Sun May 1 22:33:14 2016 -0400
----------------------------------------------------------------------
src/java/org/apache/cassandra/tools/JsonTransformer.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/68b91564/src/java/org/apache/cassandra/tools/JsonTransformer.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/tools/JsonTransformer.java b/src/java/org/apache/cassandra/tools/JsonTransformer.java
index 5747089..8e81121 100644
--- a/src/java/org/apache/cassandra/tools/JsonTransformer.java
+++ b/src/java/org/apache/cassandra/tools/JsonTransformer.java
@@ -4,6 +4,7 @@ import java.io.IOException;
import java.io.OutputStream;
import java.io.OutputStreamWriter;
import java.nio.ByteBuffer;
+import java.nio.charset.StandardCharsets;
import java.time.Instant;
import java.util.List;
import java.util.concurrent.TimeUnit;
@@ -71,7 +72,7 @@ public final class JsonTransformer
public static void toJson(ISSTableScanner currentScanner, Stream<UnfilteredRowIterator> partitions, boolean rawTime, CFMetaData metadata, OutputStream out)
throws IOException
{
- try (JsonGenerator json = jsonFactory.createJsonGenerator(new OutputStreamWriter(out, "UTF-8")))
+ try (JsonGenerator json = jsonFactory.createJsonGenerator(new OutputStreamWriter(out, StandardCharsets.UTF_8)))
{
JsonTransformer transformer = new JsonTransformer(json, currentScanner, rawTime, metadata);
json.writeStartArray();
@@ -82,7 +83,7 @@ public final class JsonTransformer
public static void keysToJson(ISSTableScanner currentScanner, Stream<DecoratedKey> keys, boolean rawTime, CFMetaData metadata, OutputStream out) throws IOException
{
- try (JsonGenerator json = jsonFactory.createJsonGenerator(new OutputStreamWriter(out, "UTF-8")))
+ try (JsonGenerator json = jsonFactory.createJsonGenerator(new OutputStreamWriter(out, StandardCharsets.UTF_8)))
{
JsonTransformer transformer = new JsonTransformer(json, currentScanner, rawTime, metadata);
json.writeStartArray();