fix: 🐛 replace accept-encoding application/json to null on all clients

- this header is not used for influx 2.0 server because it always send back CSV data - this header blocks the accept-encoding gzip header from the BridgeInterceptor
influxdata · Mar 12, 2021 · efa46cf · efa46cf
1 parent c6aaa57
commit efa46cf
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,8 @@
 ## 2.1.0 [unreleased]
 
+### Bug Fixes
+1. [#205](https://github.com/influxdata/influxdb-client-java/pull/205): Fix GZIP issue for query executed from all clients [see issue comments](https://github.com/influxdata/influxdb-client-java/issues/50#issuecomment-796896401)
+
 ## 2.0.0 [2021-03-05]
 
 ### API

diff --git a/client-kotlin/src/main/kotlin/com/influxdb/client/kotlin/internal/QueryKotlinApiImpl.kt b/client-kotlin/src/main/kotlin/com/influxdb/client/kotlin/internal/QueryKotlinApiImpl.kt
@@ -167,7 +167,7 @@ internal class QueryKotlinApiImpl(private val service: QueryService, private val
 
         val channel = Channel<String>()
 
-        val queryCall = service.postQueryResponseBody(null,  "application/json",
+        val queryCall = service.postQueryResponseBody(null,  null,
                 null, org, null, query)
 
         val consumer = BiConsumer { cancellable: Cancellable, line: String ->
@@ -194,7 +194,7 @@ internal class QueryKotlinApiImpl(private val service: QueryService, private val
 
         val channel = Channel<T>()
 
-        val queryCall = service.postQueryResponseBody(null, "application/json",
+        val queryCall = service.postQueryResponseBody(null, null,
                 null, org, null, query)
 
         val responseConsumer = object : FluxResponseConsumer {

diff --git a/...nt-reactive/src/main/java/com/influxdb/client/reactive/internal/QueryReactiveApiImpl.java b/...nt-reactive/src/main/java/com/influxdb/client/reactive/internal/QueryReactiveApiImpl.java
@@ -118,7 +118,7 @@ public Flowable<FluxRecord> query(@Nonnull final Publisher<String> queryStream,
 
         return Flowable
                 .fromPublisher(queryStream)
-                .map(it -> service.postQueryResponseBody(null, "application/json",
+                .map(it -> service.postQueryResponseBody(null, null,
                         null, org, null, new Query().query(it).dialect(AbstractInfluxDBClient.DEFAULT_DIALECT)))
                 .flatMap(queryCall -> {
 
@@ -256,7 +256,7 @@ public Flowable<String> queryRaw(@Nonnull final Publisher<String> queryStream,
 
         return Flowable
                 .fromPublisher(queryStream)
-                .map(it -> service.postQueryResponseBody(null, "application/json",
+                .map(it -> service.postQueryResponseBody(null, null,
                         null, org, null, new Query().query(it).dialect(dialect)))
                 .flatMap(queryCall -> {
 

diff --git a/client-scala/src/main/scala/com/influxdb/client/scala/internal/QueryScalaApiImpl.scala b/client-scala/src/main/scala/com/influxdb/client/scala/internal/QueryScalaApiImpl.scala
@@ -102,7 +102,7 @@ class QueryScalaApiImpl(@Nonnull service: QueryService, @Nonnull options: Influx
 
     Source.unfoldResource[FluxRecord, AbstractQueryApi#FluxRecordIterator](
       () => {
-        val call = service.postQueryResponseBody(null, "application/json", null, org, null, query)
+        val call = service.postQueryResponseBody(null, null, null, org, null, query)
 
         queryIterator(call)
 
@@ -277,7 +277,7 @@ class QueryScalaApiImpl(@Nonnull service: QueryService, @Nonnull options: Influx
 
     Source.unfoldResource[String, AbstractQueryApi#RawIterator](
       () => {
-        val call = service.postQueryResponseBody(null, "application/json", null, org, null, query)
+        val call = service.postQueryResponseBody(null, null, null, org, null, query)
 
         queryRawIterator(call)
 

diff --git a/client/src/main/java/com/influxdb/client/internal/QueryApiImpl.java b/client/src/main/java/com/influxdb/client/internal/QueryApiImpl.java
@@ -793,8 +793,7 @@ private void query(@Nonnull final Query query,
                        @Nonnull final Boolean asynchronously) {
 
         Call<ResponseBody> queryCall = service
-                .postQueryResponseBody(null, "application/json",
-                        null, org, null, query);
+                .postQueryResponseBody(null, null, null, org, null, query);
 
 
         LOG.log(Level.FINEST, "Prepare query \"{0}\" with dialect \"{1}\" on organization \"{2}\".",
@@ -811,7 +810,7 @@ private void queryRaw(@Nonnull final Query query,
                           @Nonnull final Boolean asynchronously) {
 
         Call<ResponseBody> queryCall = service
-                .postQueryResponseBody(null, "application/json", null, org, null, query);
+                .postQueryResponseBody(null, null, null, org, null, query);
 
         LOG.log(Level.FINEST, "Prepare raw query \"{0}\" with dialect \"{1}\" on organization \"{2}\".",
                 new Object[]{query, query.getDialect(), org});