Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: 🐛 replace accept-encoding application/json to null for all clients #205

Merged
merged 1 commit into from
Mar 15, 2021
Merged

fix: 🐛 replace accept-encoding application/json to null for all clients #205

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions client-kotlin/src/main/kotlin/com/influxdb/client/kotlin/internal/QueryKotlinApiImpl.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 ->
Expand All @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions ...nt-reactive/src/main/java/com/influxdb/client/reactive/internal/QueryReactiveApiImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 -> {

Expand Down Expand Up @@ -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 -> {

Expand Down
4 changes: 2 additions & 2 deletions client-scala/src/main/scala/com/influxdb/client/scala/internal/QueryScalaApiImpl.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down Expand Up @@ -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)

Expand Down
5 changes: 2 additions & 3 deletions client/src/main/java/com/influxdb/client/internal/QueryApiImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}\".",
Expand All @@ -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});
Expand Down