fix: query response parser should use UTF-8 encoding (#164)

influxdata · Oct 16, 2020 · 21497dc · 21497dc
1 parent b791381
commit 21497dc
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,7 @@
 
 ### Bug Fixes
 1. [#161](https://github.com/influxdata/influxdb-client-java/pull/161): Offset param could be 0 - FluxDSL
+1. [#164](https://github.com/influxdata/influxdb-client-java/pull/164): Query response parser uses UTF-8 encoding
 
 ## 1.12.0 [2020-10-02]
 

diff --git a/client-core/src/main/java/com/influxdb/query/internal/FluxCsvParser.java b/client-core/src/main/java/com/influxdb/query/internal/FluxCsvParser.java
@@ -24,6 +24,7 @@
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.io.Reader;
+import java.nio.charset.StandardCharsets;
 import java.time.Duration;
 import java.time.Instant;
 import java.util.ArrayList;
@@ -116,7 +117,7 @@ public void parseFluxResponse(@Nonnull final BufferedSource bufferedSource,
 
         Arguments.checkNotNull(bufferedSource, "bufferedSource");
 
-        Reader reader = new InputStreamReader(bufferedSource.inputStream());
+        Reader reader = new InputStreamReader(bufferedSource.inputStream(), StandardCharsets.UTF_8);
 
         ParsingState parsingState = ParsingState.NORMAL;
 

diff --git a/client-core/src/test/java/com/influxdb/query/internal/FluxCsvParserTest.java b/client-core/src/test/java/com/influxdb/query/internal/FluxCsvParserTest.java
@@ -22,6 +22,8 @@
 package com.influxdb.query.internal;
 
 import java.io.IOException;
+import java.lang.reflect.Field;
+import java.nio.charset.Charset;
 import java.time.Duration;
 import java.time.Instant;
 import java.util.Base64;
@@ -468,7 +470,7 @@ void parsingWithoutTableDefinition() {
     @Test
     void multipleQueries() throws IOException {
 
-        String data ="#datatype,string,long,string,string,dateTime:RFC3339,dateTime:RFC3339,dateTime:RFC3339,double,string\n"
+        String data = "#datatype,string,long,string,string,dateTime:RFC3339,dateTime:RFC3339,dateTime:RFC3339,double,string\n"
                 + "#group,false,false,true,true,true,true,false,false,true\n"
                 + "#default,t1,,,,,,,,\n"
                 + ",result,table,_field,_measurement,_start,_stop,_time,_value,tag\n"
@@ -521,7 +523,7 @@ void multipleQueries() throws IOException {
     @Test
     void tableIndexNotStartAtZero() throws IOException {
 
-        String data ="#datatype,string,long,string,string,dateTime:RFC3339,dateTime:RFC3339,dateTime:RFC3339,double,string\n"
+        String data = "#datatype,string,long,string,string,dateTime:RFC3339,dateTime:RFC3339,dateTime:RFC3339,double,string\n"
                 + "#group,false,false,true,true,true,true,false,false,true\n"
                 + "#default,t1,,,,,,,,\n"
                 + ",result,table,_field,_measurement,_start,_stop,_time,_value,tag\n"
@@ -548,6 +550,28 @@ void tableIndexNotStartAtZero() throws IOException {
         Assertions.assertThat(tables.get(1).getRecords().get(0).getTable()).isEqualTo(1);
     }
 
+    @Test
+    public void responseIsInUTF8() throws IOException, IllegalAccessException, NoSuchFieldException {
+
+        String oldCharset = Charset.defaultCharset().toString();
+        setDefaultCharset("GBK");
+
+        try {
+            String data = "#datatype,string,long,string,string,dateTime:RFC3339,dateTime:RFC3339,dateTime:RFC3339,double,string\n"
+                    + "#group,false,false,true,true,true,true,false,false,true\n"
+                    + "#default,t1,,,,,,,,\n"
+                    + ",result,table,_field,_measurement,_start,_stop,_time,_value,tag\n"
+                    + ",,1,value,python_client_test,2010-02-27T04:48:32.752600083Z,2020-02-27T16:48:32.752600083Z,2020-02-27T16:20:00Z,2,ěščřĚŠČŘ Přerov 🍺\n";
+
+            List<FluxTable> tables = parseFluxResponse(data);
+            Assertions.assertThat(tables).hasSize(1);
+            Assertions.assertThat(tables.get(0).getRecords()).hasSize(1);
+            Assertions.assertThat(tables.get(0).getRecords().get(0).getValueByKey("tag")).isEqualTo("ěščřĚŠČŘ Přerov 🍺");
+        } finally {
+            setDefaultCharset(oldCharset);
+        }
+    }
+
     @Nonnull
     private List<FluxTable> parseFluxResponse(@Nonnull final String data) throws IOException {
 
@@ -561,8 +585,15 @@ private List<FluxTable> parseFluxResponse(@Nonnull final String data) throws IOE
         return consumer.getTables();
     }
 
+    private void setDefaultCharset(final String name) throws NoSuchFieldException, IllegalAccessException {
+
+        Field charset = Charset.class.getDeclaredField("defaultCharset");
+        charset.setAccessible(true);
+        charset.set(null, Charset.forName(name));
+    }
     private static class DefaultCancellable implements Cancellable {
 
+
         private boolean cancelled = false;
 
         @Override