From 1b8d041225df99041b92f2e82a35e0960b87095f Mon Sep 17 00:00:00 2001 From: Jakub Bednar Date: Fri, 14 Jan 2022 08:59:00 +0100 Subject: [PATCH 01/21] fix: transient dependency of `okhttp`, `retrofit` and `rxjava` --- client/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/pom.xml b/client/pom.xml index 563b36a1d75..e970ad455c7 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -171,7 +171,7 @@ toml4j test - + \ No newline at end of file From f1226103501b8df6cf943fc2b0dff9237fc4f0c6 Mon Sep 17 00:00:00 2001 From: Robert Hajek Date: Tue, 18 Jan 2022 11:07:19 +0100 Subject: [PATCH 02/21] feat: updating dependencies --- pom.xml | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/pom.xml b/pom.xml index 8011dc8df08..daef8d6fd9b 100644 --- a/pom.xml +++ b/pom.xml @@ -109,8 +109,10 @@ UTF-8 2.9.0 - 4.7.2 - 2.8.8 + 4.9.3 + 2.10.0 + 2.8.9 + 2.2.21 3.0.0-M5 3.2.0 @@ -119,7 +121,7 @@ 3.9.0 3.4.4 - 1.5.10 + 1.6.10 4.2.11 5.8.2 @@ -534,7 +536,7 @@ com.squareup.okio okio - 2.6.0 + ${dependency.com.squareup.okio} @@ -558,25 +560,25 @@ io.swagger swagger-annotations - 1.6.1 + 1.6.4 io.gsonfire gson-fire - 1.8.4 + 1.8.5 io.reactivex.rxjava2 rxjava - 2.2.19 + ${dependency.io.reactivex.rxjava2} org.apache.commons commons-csv - 1.8 + 1.9.0 @@ -588,7 +590,7 @@ org.json json - 20200518 + 20211205 @@ -612,19 +614,19 @@ org.mockito mockito-core - 3.9.0 + 3.12.4 org.mockito mockito-junit-jupiter - 3.9.0 + 3.11.2 org.assertj assertj-core - 3.16.1 + 3.22.0 @@ -648,7 +650,7 @@ org.jetbrains.kotlinx kotlinx-coroutines-core - 1.3.7 + 1.6.0 From cadf72fe52c975041fdcd468d32cadd55e3ea807 Mon Sep 17 00:00:00 2001 From: Jakub Bednar Date: Tue, 18 Jan 2022 13:00:12 +0100 Subject: [PATCH 03/21] feat: add enforce plugin into CI pipeline --- .circleci/config.yml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index c123ec3f82c..da2c2f1b8f9 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -151,6 +151,19 @@ jobs: chmod +x ./codecov ./codecov + check-dependencies: + parameters: + maven-image: + type: string + default: *default-maven-image + docker: + - image: << parameters.maven-image >> + steps: + - checkout + - run: + name: "Check dependency rules" + command: mvn enforcer:enforce -Drules=banDuplicatePomDependencyVersions,dependencyConvergence + deploy-snapshot: docker: - image: *default-maven-image @@ -193,6 +206,7 @@ workflows: version: 2 build: jobs: + - check-dependencies - tests-java: name: jdk-8 - tests-java: @@ -209,8 +223,10 @@ workflows: junit-tests: "-DclientBenchmark=true -Dit.test=com.influxdb.client.ITBenchmarkTest -DfailIfNoTests=false -Dtest=ignore -DwildcardSuites=ignore" - deploy-snapshot: requires: + - check-dependencies - jdk-8 - jdk-11 + - jdk-17 - jdk-8-nightly filters: branches: From 50959ffcbbca5371749d9a5f1a7d8f7b365257a9 Mon Sep 17 00:00:00 2001 From: Jakub Bednar Date: Tue, 18 Jan 2022 13:03:13 +0100 Subject: [PATCH 04/21] feat: add cache to check-dependencies --- .circleci/config.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index da2c2f1b8f9..95f8f2ace92 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -160,6 +160,10 @@ jobs: - image: << parameters.maven-image >> steps: - checkout + - restore_cache: + name: Restoring Maven Cache + keys: + - maven-cache_v3-<< parameters.maven-image >>- - run: name: "Check dependency rules" command: mvn enforcer:enforce -Drules=banDuplicatePomDependencyVersions,dependencyConvergence From fca3ccb1e36ed1e9799c784574f82d72da65f075 Mon Sep 17 00:00:00 2001 From: Robert Hajek Date: Tue, 18 Jan 2022 16:26:40 +0100 Subject: [PATCH 05/21] feat: fixing dependencies --- client-core/pom.xml | 10 +++++++ client-kotlin/pom.xml | 12 +++++++- client-osgi/pom.xml | 8 ++++- client-reactive/pom.xml | 2 +- .../client/reactive/WriteOptionsReactive.java | 4 +-- .../internal/WriteReactiveApiImpl.java | 2 +- client-scala/cross/2.12/pom.xml | 30 +++++++++++++++++++ client-scala/cross/2.13/pom.xml | 24 +++++++++++++++ client-test/pom.xml | 17 +++++++++++ client/pom.xml | 2 +- .../influxdb/client/service/WriteService.java | 2 +- .../com/influxdb/client/WriteOptions.java | 7 +++-- .../client/internal/AbstractWriteClient.java | 20 ++++++------- .../client/internal/WriteApiImpl.java | 4 +-- pom.xml | 11 +++---- 15 files changed, 127 insertions(+), 28 deletions(-) diff --git a/client-core/pom.xml b/client-core/pom.xml index 032fc99e626..89320b1d3c8 100644 --- a/client-core/pom.xml +++ b/client-core/pom.xml @@ -98,6 +98,16 @@ com.squareup.okio okio + + + org.jetbrains.kotlin + kotlin-stdlib + + + org.jetbrains.kotlin + kotlin-stdlib-common + + diff --git a/client-kotlin/pom.xml b/client-kotlin/pom.xml index e8f2b596add..1678ac40710 100644 --- a/client-kotlin/pom.xml +++ b/client-kotlin/pom.xml @@ -179,14 +179,24 @@ org.jetbrains.kotlinx kotlinx-coroutines-core + + + org.jetbrains.kotlinx + kotlinx-coroutines-core-jvm + + com.willowtreeapps.assertk assertk-jvm - 0.22 + 0.25 test + + org.jetbrains.kotlin + kotlin-stdlib-common + org.jetbrains.kotlin kotlin-stdlib-jdk8 diff --git a/client-osgi/pom.xml b/client-osgi/pom.xml index 3f7f138eaa3..76c0e0b4555 100644 --- a/client-osgi/pom.xml +++ b/client-osgi/pom.xml @@ -151,7 +151,7 @@ org.slf4j slf4j-api - 1.7.30 + 1.7.32 provided @@ -193,6 +193,12 @@ logback-classic 1.2.3 test + + + org.slf4j + slf4j-api + + diff --git a/client-reactive/pom.xml b/client-reactive/pom.xml index fbc7c7d7be0..e0f57aad265 100644 --- a/client-reactive/pom.xml +++ b/client-reactive/pom.xml @@ -100,7 +100,7 @@ com.squareup.retrofit2 - adapter-rxjava2 + adapter-rxjava3 com.squareup.okhttp3 diff --git a/client-reactive/src/main/java/com/influxdb/client/reactive/WriteOptionsReactive.java b/client-reactive/src/main/java/com/influxdb/client/reactive/WriteOptionsReactive.java index 38087c10fb1..46f1b60fada 100644 --- a/client-reactive/src/main/java/com/influxdb/client/reactive/WriteOptionsReactive.java +++ b/client-reactive/src/main/java/com/influxdb/client/reactive/WriteOptionsReactive.java @@ -28,8 +28,8 @@ import com.influxdb.client.WriteApi; import com.influxdb.utils.Arguments; -import io.reactivex.Scheduler; -import io.reactivex.schedulers.Schedulers; +import io.reactivex.rxjava3.core.Scheduler; +import io.reactivex.rxjava3.schedulers.Schedulers; import static com.influxdb.client.WriteOptions.DEFAULT_BATCH_SIZE; import static com.influxdb.client.WriteOptions.DEFAULT_EXPONENTIAL_BASE; diff --git a/client-reactive/src/main/java/com/influxdb/client/reactive/internal/WriteReactiveApiImpl.java b/client-reactive/src/main/java/com/influxdb/client/reactive/internal/WriteReactiveApiImpl.java index 5fdae81d0ed..e155ed2a297 100644 --- a/client-reactive/src/main/java/com/influxdb/client/reactive/internal/WriteReactiveApiImpl.java +++ b/client-reactive/src/main/java/com/influxdb/client/reactive/internal/WriteReactiveApiImpl.java @@ -45,7 +45,7 @@ import com.influxdb.internal.AbstractRestClient; import com.influxdb.utils.Arguments; -import io.reactivex.Flowable; +import io.reactivex.rxjava3.core.Flowable; import org.reactivestreams.Publisher; import retrofit2.HttpException; diff --git a/client-scala/cross/2.12/pom.xml b/client-scala/cross/2.12/pom.xml index 38fc142d9fa..1db4755eefa 100644 --- a/client-scala/cross/2.12/pom.xml +++ b/client-scala/cross/2.12/pom.xml @@ -165,12 +165,24 @@ org.scala-lang.modules scala-collection-compat_2.12 2.4.2 + + + org.scala-lang + scala-library + + com.typesafe.akka akka-stream_2.12 ${akka.version} + + + org.scala-lang + scala-library + + @@ -178,6 +190,12 @@ akka-testkit_2.12 ${akka.version} test + + + org.scala-lang + scala-library + + @@ -185,6 +203,12 @@ akka-stream-testkit_2.12 ${akka.version} test + + + org.scala-lang + scala-library + + @@ -198,6 +222,12 @@ scalatest_2.12 3.2.0 test + + + org.scala-lang + scala-library + + diff --git a/client-scala/cross/2.13/pom.xml b/client-scala/cross/2.13/pom.xml index 399e0e4be3a..373d8914be0 100644 --- a/client-scala/cross/2.13/pom.xml +++ b/client-scala/cross/2.13/pom.xml @@ -207,6 +207,12 @@ com.typesafe.akka akka-stream_2.13 ${akka.version} + + + org.scala-lang + scala-library + + @@ -214,6 +220,12 @@ akka-testkit_2.13 ${akka.version} test + + + org.scala-lang + scala-library + + @@ -221,6 +233,12 @@ akka-stream-testkit_2.13 ${akka.version} test + + + org.scala-lang + scala-library + + @@ -234,6 +252,12 @@ scalatest_2.13 3.2.0 test + + + org.scala-lang + scala-library + + diff --git a/client-test/pom.xml b/client-test/pom.xml index 1e7392df72c..6f0ae419f9b 100644 --- a/client-test/pom.xml +++ b/client-test/pom.xml @@ -105,6 +105,23 @@ com.squareup.okhttp3 mockwebserver + + + com.squareup.okhttp3 + okhttp + + + + + + com.squareup.okhttp3 + okhttp + + + org.jetbrains.kotlin + kotlin-stdlib-common + + diff --git a/client/pom.xml b/client/pom.xml index e970ad455c7..c3cefa897d3 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -123,7 +123,7 @@ - io.reactivex.rxjava2 + io.reactivex.rxjava3 rxjava diff --git a/client/src/generated/java/com/influxdb/client/service/WriteService.java b/client/src/generated/java/com/influxdb/client/service/WriteService.java index efbf89790c2..ce078367da8 100644 --- a/client/src/generated/java/com/influxdb/client/service/WriteService.java +++ b/client/src/generated/java/com/influxdb/client/service/WriteService.java @@ -11,7 +11,7 @@ import com.influxdb.client.domain.LineProtocolError; import com.influxdb.client.domain.LineProtocolLengthError; import com.influxdb.client.domain.WritePrecision; -import io.reactivex.Single; +import io.reactivex.rxjava3.core.Single; import retrofit2.Response; import java.util.ArrayList; diff --git a/client/src/main/java/com/influxdb/client/WriteOptions.java b/client/src/main/java/com/influxdb/client/WriteOptions.java index 63615d5e762..cd05b18bb71 100644 --- a/client/src/main/java/com/influxdb/client/WriteOptions.java +++ b/client/src/main/java/com/influxdb/client/WriteOptions.java @@ -27,9 +27,10 @@ import com.influxdb.utils.Arguments; -import io.reactivex.BackpressureOverflowStrategy; -import io.reactivex.Scheduler; -import io.reactivex.schedulers.Schedulers; +import io.reactivex.rxjava3.core.BackpressureOverflowStrategy; +import io.reactivex.rxjava3.core.Scheduler; +import io.reactivex.rxjava3.schedulers.Schedulers; + /** * WriteOptions are used to configure writes the data point into InfluxDB 2.0. diff --git a/client/src/main/java/com/influxdb/client/internal/AbstractWriteClient.java b/client/src/main/java/com/influxdb/client/internal/AbstractWriteClient.java index 336dd5bf98e..08d477ad8f6 100644 --- a/client/src/main/java/com/influxdb/client/internal/AbstractWriteClient.java +++ b/client/src/main/java/com/influxdb/client/internal/AbstractWriteClient.java @@ -48,15 +48,15 @@ import com.influxdb.internal.AbstractRestClient; import com.influxdb.utils.Arguments; -import io.reactivex.Flowable; -import io.reactivex.FlowableTransformer; -import io.reactivex.Maybe; -import io.reactivex.Notification; -import io.reactivex.Observable; -import io.reactivex.Scheduler; -import io.reactivex.functions.Function; -import io.reactivex.processors.PublishProcessor; -import io.reactivex.subjects.PublishSubject; +import io.reactivex.rxjava3.core.Flowable; +import io.reactivex.rxjava3.core.FlowableTransformer; +import io.reactivex.rxjava3.core.Maybe; +import io.reactivex.rxjava3.core.Notification; +import io.reactivex.rxjava3.core.Observable; +import io.reactivex.rxjava3.core.Scheduler; +import io.reactivex.rxjava3.functions.Function; +import io.reactivex.rxjava3.processors.PublishProcessor; +import io.reactivex.rxjava3.subjects.PublishSubject; import org.reactivestreams.Publisher; import retrofit2.HttpException; import retrofit2.Response; @@ -75,7 +75,7 @@ public abstract class AbstractWriteClient extends AbstractRestClient implements private final WriteOptions writeOptions; protected final InfluxDBClientOptions options; - private final PublishProcessor processor; + private final PublishProcessor processor; private final PublishProcessor> flushPublisher; private final PublishSubject eventPublisher; diff --git a/client/src/main/java/com/influxdb/client/internal/WriteApiImpl.java b/client/src/main/java/com/influxdb/client/internal/WriteApiImpl.java index 6a0e6bb00c3..fe6a003644b 100644 --- a/client/src/main/java/com/influxdb/client/internal/WriteApiImpl.java +++ b/client/src/main/java/com/influxdb/client/internal/WriteApiImpl.java @@ -38,9 +38,9 @@ import com.influxdb.client.write.events.EventListener; import com.influxdb.client.write.events.ListenerRegistration; import com.influxdb.utils.Arguments; +import io.reactivex.rxjava3.core.Flowable; +import io.reactivex.rxjava3.disposables.Disposable; -import io.reactivex.Flowable; -import io.reactivex.disposables.Disposable; /** * @author Jakub Bednar (bednar@github) (15/10/2018 09:42) diff --git a/pom.xml b/pom.xml index daef8d6fd9b..7021691d48a 100644 --- a/pom.xml +++ b/pom.xml @@ -112,7 +112,8 @@ 4.9.3 2.10.0 2.8.9 - 2.2.21 + + 3.0.0 3.0.0-M5 3.2.0 @@ -529,7 +530,7 @@ com.squareup.retrofit2 - adapter-rxjava2 + adapter-rxjava3 ${dependency.retrofit.version} @@ -570,9 +571,9 @@ - io.reactivex.rxjava2 + io.reactivex.rxjava3 rxjava - ${dependency.io.reactivex.rxjava2} + ${dependency.io.reactivex.rxjava3} @@ -602,7 +603,7 @@ org.junit.platform junit-platform-runner - 1.6.2 + 1.7.2 From d8d6a34a63801b0333cee1dfd39229120a032c05 Mon Sep 17 00:00:00 2001 From: Robert Hajek Date: Wed, 19 Jan 2022 09:21:23 +0100 Subject: [PATCH 06/21] feat: fixing dependencies --- client-kotlin/pom.xml | 1 + .../client/kotlin/ITQueryKotlinApi.kt | 3 +- .../reactive/InfluxDBClientReactive.java | 2 +- .../internal/InfluxDBClientReactiveImpl.java | 6 ++-- .../internal/QueryReactiveApiImpl.java | 8 +++--- .../reactive/ITInfluxDBReactiveClient.java | 2 +- .../reactive/ITWriteQueryReactiveApi.java | 10 ++++--- .../reactive/WriteOptionsReactiveTest.java | 2 +- .../client/reactive/WriteReactiveApiTest.java | 28 +++++++++---------- .../client/internal/AbstractWriteClient.java | 2 +- .../client/internal/WriteApiImpl.java | 1 + .../com/influxdb/client/WriteApiTest.java | 2 +- .../com/influxdb/client/WriteOptionsTest.java | 4 +-- .../example/InfluxDB2ReactiveExample.java | 2 +- .../example/InfluxDB2ReactiveExampleDSL.java | 2 +- .../example/InfluxDB2ReactiveExamplePojo.java | 2 +- .../example/InfluxDB2ReactiveExampleRaw.java | 2 +- ...B2ReactiveExampleWriteEveryTenSeconds.java | 4 +-- .../main/java/example/PlatformExample.java | 2 +- 19 files changed, 44 insertions(+), 41 deletions(-) diff --git a/client-kotlin/pom.xml b/client-kotlin/pom.xml index 1678ac40710..2edb8a4707f 100644 --- a/client-kotlin/pom.xml +++ b/client-kotlin/pom.xml @@ -179,6 +179,7 @@ org.jetbrains.kotlinx kotlinx-coroutines-core + 1.6.0 org.jetbrains.kotlinx diff --git a/client-kotlin/src/test/kotlin/com/influxdb/client/kotlin/ITQueryKotlinApi.kt b/client-kotlin/src/test/kotlin/com/influxdb/client/kotlin/ITQueryKotlinApi.kt index 7034f526b90..0335a220b42 100644 --- a/client-kotlin/src/test/kotlin/com/influxdb/client/kotlin/ITQueryKotlinApi.kt +++ b/client-kotlin/src/test/kotlin/com/influxdb/client/kotlin/ITQueryKotlinApi.kt @@ -42,7 +42,6 @@ import com.influxdb.client.domain.PermissionResource import com.influxdb.client.domain.Query import com.influxdb.client.domain.WritePrecision import com.influxdb.client.internal.AbstractInfluxDBClient -import kotlinx.coroutines.channels.map import kotlinx.coroutines.channels.toList import kotlinx.coroutines.runBlocking import org.junit.jupiter.api.BeforeEach @@ -236,7 +235,7 @@ internal class ITQueryKotlinApi : AbstractITInfluxDBClientKotlin() { val records = queryKotlinApi.query(flux, organization.id) - val values = records.map { it.value }.toList() + val values = records.toList().map { it.value } assertThat(values).hasSize(2) assertThat(values).containsExactly(10L, 11L) diff --git a/client-reactive/src/main/java/com/influxdb/client/reactive/InfluxDBClientReactive.java b/client-reactive/src/main/java/com/influxdb/client/reactive/InfluxDBClientReactive.java index c6fa3995378..1901d57219e 100644 --- a/client-reactive/src/main/java/com/influxdb/client/reactive/InfluxDBClientReactive.java +++ b/client-reactive/src/main/java/com/influxdb/client/reactive/InfluxDBClientReactive.java @@ -27,7 +27,7 @@ import com.influxdb.client.InfluxDBClient; import com.influxdb.client.domain.HealthCheck; -import io.reactivex.Single; +import io.reactivex.rxjava3.core.Single; /** * The reference RxJava client for the InfluxDB 2.0 diff --git a/client-reactive/src/main/java/com/influxdb/client/reactive/internal/InfluxDBClientReactiveImpl.java b/client-reactive/src/main/java/com/influxdb/client/reactive/internal/InfluxDBClientReactiveImpl.java index a82ae279a10..f8aae95865d 100644 --- a/client-reactive/src/main/java/com/influxdb/client/reactive/internal/InfluxDBClientReactiveImpl.java +++ b/client-reactive/src/main/java/com/influxdb/client/reactive/internal/InfluxDBClientReactiveImpl.java @@ -36,8 +36,8 @@ import com.influxdb.client.service.WriteService; import com.influxdb.utils.Arguments; -import io.reactivex.Single; -import retrofit2.adapter.rxjava2.RxJava2CallAdapterFactory; +import io.reactivex.rxjava3.core.Single; +import retrofit2.adapter.rxjava3.RxJava3CallAdapterFactory; /** * @author Jakub Bednar (bednar@github) (20/11/2018 07:12) @@ -46,7 +46,7 @@ public class InfluxDBClientReactiveImpl extends AbstractInfluxDBClient implements InfluxDBClientReactive { public InfluxDBClientReactiveImpl(@Nonnull final InfluxDBClientOptions options) { - super(options, "java", Collections.singletonList(RxJava2CallAdapterFactory.create())); + super(options, "java", Collections.singletonList(RxJava3CallAdapterFactory.create())); } @Nonnull diff --git a/client-reactive/src/main/java/com/influxdb/client/reactive/internal/QueryReactiveApiImpl.java b/client-reactive/src/main/java/com/influxdb/client/reactive/internal/QueryReactiveApiImpl.java index 0d506db536f..773f058de92 100644 --- a/client-reactive/src/main/java/com/influxdb/client/reactive/internal/QueryReactiveApiImpl.java +++ b/client-reactive/src/main/java/com/influxdb/client/reactive/internal/QueryReactiveApiImpl.java @@ -40,10 +40,10 @@ import com.influxdb.query.internal.FluxCsvParser; import com.influxdb.utils.Arguments; -import io.reactivex.BackpressureStrategy; -import io.reactivex.Flowable; -import io.reactivex.Observable; -import io.reactivex.ObservableEmitter; +import io.reactivex.rxjava3.core.BackpressureStrategy; +import io.reactivex.rxjava3.core.Flowable; +import io.reactivex.rxjava3.core.Observable; +import io.reactivex.rxjava3.core.ObservableEmitter; import org.jetbrains.annotations.NotNull; import org.reactivestreams.Publisher; diff --git a/client-reactive/src/test/java/com/influxdb/client/reactive/ITInfluxDBReactiveClient.java b/client-reactive/src/test/java/com/influxdb/client/reactive/ITInfluxDBReactiveClient.java index ef8a979c02c..5d8d094c6f0 100644 --- a/client-reactive/src/test/java/com/influxdb/client/reactive/ITInfluxDBReactiveClient.java +++ b/client-reactive/src/test/java/com/influxdb/client/reactive/ITInfluxDBReactiveClient.java @@ -24,7 +24,7 @@ import com.influxdb.LogLevel; import com.influxdb.client.domain.HealthCheck; -import io.reactivex.Single; +import io.reactivex.rxjava3.core.Single; import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.platform.runner.JUnitPlatform; diff --git a/client-reactive/src/test/java/com/influxdb/client/reactive/ITWriteQueryReactiveApi.java b/client-reactive/src/test/java/com/influxdb/client/reactive/ITWriteQueryReactiveApi.java index f0633102ffd..028dceb3f9d 100644 --- a/client-reactive/src/test/java/com/influxdb/client/reactive/ITWriteQueryReactiveApi.java +++ b/client-reactive/src/test/java/com/influxdb/client/reactive/ITWriteQueryReactiveApi.java @@ -41,8 +41,10 @@ import com.influxdb.exceptions.BadRequestException; import com.influxdb.query.FluxRecord; -import io.reactivex.Flowable; -import io.reactivex.schedulers.Schedulers; + +import io.reactivex.rxjava3.core.Flowable; +import io.reactivex.rxjava3.schedulers.Schedulers; + import org.assertj.core.api.Assertions; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; @@ -398,8 +400,8 @@ public void subscribeOn() { .subscribeOn(Schedulers.newThread()) .test() .awaitCount(1) - .assertValueCount(1) - .assertSubscribed(); + .assertValueCount(1); +// .assertSubscribed(); } @Test diff --git a/client-reactive/src/test/java/com/influxdb/client/reactive/WriteOptionsReactiveTest.java b/client-reactive/src/test/java/com/influxdb/client/reactive/WriteOptionsReactiveTest.java index 83ac1ffc9f2..6975e734dcb 100644 --- a/client-reactive/src/test/java/com/influxdb/client/reactive/WriteOptionsReactiveTest.java +++ b/client-reactive/src/test/java/com/influxdb/client/reactive/WriteOptionsReactiveTest.java @@ -21,7 +21,7 @@ */ package com.influxdb.client.reactive; -import io.reactivex.schedulers.Schedulers; +import io.reactivex.rxjava3.schedulers.Schedulers; import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.platform.runner.JUnitPlatform; diff --git a/client-reactive/src/test/java/com/influxdb/client/reactive/WriteReactiveApiTest.java b/client-reactive/src/test/java/com/influxdb/client/reactive/WriteReactiveApiTest.java index 40a2883a37b..31e8fd12d91 100644 --- a/client-reactive/src/test/java/com/influxdb/client/reactive/WriteReactiveApiTest.java +++ b/client-reactive/src/test/java/com/influxdb/client/reactive/WriteReactiveApiTest.java @@ -32,10 +32,10 @@ import com.influxdb.exceptions.InfluxException; import com.influxdb.test.AbstractMockServerTest; -import io.reactivex.Flowable; -import io.reactivex.plugins.RxJavaPlugins; -import io.reactivex.schedulers.TestScheduler; -import io.reactivex.subscribers.TestSubscriber; +import io.reactivex.rxjava3.core.Flowable; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.schedulers.TestScheduler; +import io.reactivex.rxjava3.subscribers.TestSubscriber; import okhttp3.mockwebserver.MockResponse; import org.assertj.core.api.Assertions; import org.junit.jupiter.api.AfterEach; @@ -228,8 +228,8 @@ public void maxRetryTime() { Assertions.assertThat(throwable).hasMessage("Max retry time exceeded."); Assertions.assertThat(throwable).hasCauseInstanceOf(TimeoutException.class); return true; - }) - .assertTerminated(); + }); +// .assertTerminated(); } @Test @@ -251,8 +251,8 @@ void networkError() throws IOException { Assertions.assertThat(throwable).isInstanceOf(InfluxException.class); Assertions.assertThat(throwable).hasCauseInstanceOf(IOException.class); return true; - }) - .assertTerminated(); + }); +// .assertTerminated(); } @Test @@ -273,8 +273,8 @@ void customBatching() { Flowable.fromPublisher(successFlowable) .test() .awaitCount(3) - .assertValueCount(3) - .assertTerminated(); + .assertValueCount(3); +// .assertTerminated(); Assertions.assertThat(mockServer.getRequestCount()).isEqualTo(3); @@ -310,8 +310,8 @@ void disableRetry() { Assertions.assertThat(throwable).isInstanceOf(InfluxException.class); Assertions.assertThat(throwable).hasMessage("token is temporarily over quota"); return true; - }) - .assertTerminated(); + }); +// .assertTerminated(); Assertions.assertThat(mockServer.getRequestCount()).isEqualTo(1); @@ -336,8 +336,8 @@ void pointsPrecision() { Flowable.fromPublisher(success) .test() .awaitCount(1) - .assertValueCount(1) - .assertTerminated(); + .assertValueCount(1); +// .assertTerminated(); Assertions.assertThat(mockServer.getRequestCount()).isEqualTo(1); diff --git a/client/src/main/java/com/influxdb/client/internal/AbstractWriteClient.java b/client/src/main/java/com/influxdb/client/internal/AbstractWriteClient.java index 08d477ad8f6..ccf0d246308 100644 --- a/client/src/main/java/com/influxdb/client/internal/AbstractWriteClient.java +++ b/client/src/main/java/com/influxdb/client/internal/AbstractWriteClient.java @@ -120,7 +120,7 @@ public AbstractWriteClient(@Nonnull final WriteOptions writeOptions, .publish(connectedSource -> { return connectedSource - .window(() -> tempBoundary) + .window(tempBoundary) .mergeWith(Flowable.defer(() -> { connectedSource // Buffering diff --git a/client/src/main/java/com/influxdb/client/internal/WriteApiImpl.java b/client/src/main/java/com/influxdb/client/internal/WriteApiImpl.java index fe6a003644b..5ea189d25b7 100644 --- a/client/src/main/java/com/influxdb/client/internal/WriteApiImpl.java +++ b/client/src/main/java/com/influxdb/client/internal/WriteApiImpl.java @@ -38,6 +38,7 @@ import com.influxdb.client.write.events.EventListener; import com.influxdb.client.write.events.ListenerRegistration; import com.influxdb.utils.Arguments; + import io.reactivex.rxjava3.core.Flowable; import io.reactivex.rxjava3.disposables.Disposable; diff --git a/client/src/test/java/com/influxdb/client/WriteApiTest.java b/client/src/test/java/com/influxdb/client/WriteApiTest.java index 10e6d88f1e0..bc59d26c8eb 100644 --- a/client/src/test/java/com/influxdb/client/WriteApiTest.java +++ b/client/src/test/java/com/influxdb/client/WriteApiTest.java @@ -47,7 +47,7 @@ import com.influxdb.query.FluxRecord; import com.influxdb.query.FluxTable; -import io.reactivex.schedulers.TestScheduler; +import io.reactivex.rxjava3.schedulers.TestScheduler; import okhttp3.mockwebserver.MockResponse; import okhttp3.mockwebserver.MockWebServer; import okhttp3.mockwebserver.RecordedRequest; diff --git a/client/src/test/java/com/influxdb/client/WriteOptionsTest.java b/client/src/test/java/com/influxdb/client/WriteOptionsTest.java index 5ba625cbe99..90a60e2b5db 100644 --- a/client/src/test/java/com/influxdb/client/WriteOptionsTest.java +++ b/client/src/test/java/com/influxdb/client/WriteOptionsTest.java @@ -21,8 +21,8 @@ */ package com.influxdb.client; -import io.reactivex.BackpressureOverflowStrategy; -import io.reactivex.schedulers.Schedulers; +import io.reactivex.rxjava3.core.BackpressureOverflowStrategy; +import io.reactivex.rxjava3.schedulers.Schedulers; import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.platform.runner.JUnitPlatform; diff --git a/examples/src/main/java/example/InfluxDB2ReactiveExample.java b/examples/src/main/java/example/InfluxDB2ReactiveExample.java index 57b682042e7..2d2f4586543 100644 --- a/examples/src/main/java/example/InfluxDB2ReactiveExample.java +++ b/examples/src/main/java/example/InfluxDB2ReactiveExample.java @@ -25,7 +25,7 @@ import com.influxdb.client.reactive.InfluxDBClientReactiveFactory; import com.influxdb.client.reactive.QueryReactiveApi; -import io.reactivex.Flowable; +import io.reactivex.rxjava3.core.Flowable; public class InfluxDB2ReactiveExample { diff --git a/examples/src/main/java/example/InfluxDB2ReactiveExampleDSL.java b/examples/src/main/java/example/InfluxDB2ReactiveExampleDSL.java index 7e69bd9a4b2..fab29a3e8ca 100644 --- a/examples/src/main/java/example/InfluxDB2ReactiveExampleDSL.java +++ b/examples/src/main/java/example/InfluxDB2ReactiveExampleDSL.java @@ -29,7 +29,7 @@ import com.influxdb.query.dsl.Flux; import com.influxdb.query.dsl.functions.restriction.Restrictions; -import io.reactivex.Flowable; +import io.reactivex.rxjava3.core.Flowable; public class InfluxDB2ReactiveExampleDSL { diff --git a/examples/src/main/java/example/InfluxDB2ReactiveExamplePojo.java b/examples/src/main/java/example/InfluxDB2ReactiveExamplePojo.java index d163894066e..3cc69b9089b 100644 --- a/examples/src/main/java/example/InfluxDB2ReactiveExamplePojo.java +++ b/examples/src/main/java/example/InfluxDB2ReactiveExamplePojo.java @@ -29,7 +29,7 @@ import com.influxdb.client.reactive.InfluxDBClientReactiveFactory; import com.influxdb.client.reactive.QueryReactiveApi; -import io.reactivex.Flowable; +import io.reactivex.rxjava3.core.Flowable; import org.reactivestreams.Publisher; public class InfluxDB2ReactiveExamplePojo { diff --git a/examples/src/main/java/example/InfluxDB2ReactiveExampleRaw.java b/examples/src/main/java/example/InfluxDB2ReactiveExampleRaw.java index 174141dd58b..47ee10311b1 100644 --- a/examples/src/main/java/example/InfluxDB2ReactiveExampleRaw.java +++ b/examples/src/main/java/example/InfluxDB2ReactiveExampleRaw.java @@ -25,7 +25,7 @@ import com.influxdb.client.reactive.InfluxDBClientReactiveFactory; import com.influxdb.client.reactive.QueryReactiveApi; -import io.reactivex.Flowable; +import io.reactivex.rxjava3.core.Flowable; public class InfluxDB2ReactiveExampleRaw { diff --git a/examples/src/main/java/example/InfluxDB2ReactiveExampleWriteEveryTenSeconds.java b/examples/src/main/java/example/InfluxDB2ReactiveExampleWriteEveryTenSeconds.java index e5f8a4c7872..63741d45dd7 100644 --- a/examples/src/main/java/example/InfluxDB2ReactiveExampleWriteEveryTenSeconds.java +++ b/examples/src/main/java/example/InfluxDB2ReactiveExampleWriteEveryTenSeconds.java @@ -32,8 +32,8 @@ import com.influxdb.client.reactive.InfluxDBClientReactiveFactory; import com.influxdb.client.reactive.WriteReactiveApi; -import io.reactivex.Flowable; -import io.reactivex.disposables.Disposable; +import io.reactivex.rxjava3.core.Flowable; +import io.reactivex.rxjava3.disposables.Disposable; import org.reactivestreams.Publisher; public class InfluxDB2ReactiveExampleWriteEveryTenSeconds { diff --git a/examples/src/main/java/example/PlatformExample.java b/examples/src/main/java/example/PlatformExample.java index ae5bd677333..2f791fa4967 100644 --- a/examples/src/main/java/example/PlatformExample.java +++ b/examples/src/main/java/example/PlatformExample.java @@ -44,7 +44,7 @@ import com.influxdb.query.FluxRecord; import com.influxdb.query.FluxTable; -import io.reactivex.BackpressureOverflowStrategy; +import io.reactivex.rxjava3.core.BackpressureOverflowStrategy; /* InfluxDB 2.0 onboarding tasks (create default user, organization and bucket) : From 707a27a7c5dc114f43b02b9f48b589de32b465de Mon Sep 17 00:00:00 2001 From: Robert Hajek Date: Wed, 19 Jan 2022 16:58:05 +0100 Subject: [PATCH 07/21] feat: fixing kotlinx coroutines deps, rxjava3 tests --- client-kotlin/pom.xml | 12 ++++++++++++ .../reactive/ITWriteQueryReactiveApi.java | 18 ++++++++++++++---- .../client/reactive/WriteReactiveApiTest.java | 2 ++ 3 files changed, 28 insertions(+), 4 deletions(-) diff --git a/client-kotlin/pom.xml b/client-kotlin/pom.xml index 2edb8a4707f..45854e98bb0 100644 --- a/client-kotlin/pom.xml +++ b/client-kotlin/pom.xml @@ -176,6 +176,18 @@ kotlin-stdlib + + org.jetbrains.kotlinx + kotlinx-coroutines-core-jvm + 1.4.3 + + + org.jetbrains.kotlin + kotlin-stdlib-common + + + + org.jetbrains.kotlinx kotlinx-coroutines-core diff --git a/client-reactive/src/test/java/com/influxdb/client/reactive/ITWriteQueryReactiveApi.java b/client-reactive/src/test/java/com/influxdb/client/reactive/ITWriteQueryReactiveApi.java index 028dceb3f9d..0a12f29b682 100644 --- a/client-reactive/src/test/java/com/influxdb/client/reactive/ITWriteQueryReactiveApi.java +++ b/client-reactive/src/test/java/com/influxdb/client/reactive/ITWriteQueryReactiveApi.java @@ -23,6 +23,7 @@ import java.time.Instant; import java.util.Arrays; +import java.util.concurrent.TimeUnit; import com.influxdb.annotations.Column; import com.influxdb.annotations.Measurement; @@ -124,6 +125,7 @@ void writeRecord() { Publisher success = writeClient.writeRecord(WritePrecision.NS, lineProtocol); Flowable.fromPublisher(success) .test() + .awaitDone(1, TimeUnit.SECONDS) .assertValueCount(1); Publisher result = queryClient.query("from(bucket:\"" + bucketName + "\") |> range(start: 1970-01-01T00:00:00.000000001Z)", organization.getId()); @@ -163,6 +165,7 @@ void writeRecords() { Publisher success = writeClient.writeRecords(WritePrecision.S, records); Flowable.fromPublisher(success) .test() + .awaitDone(1, TimeUnit.SECONDS) .assertValueCount(2); Publisher results = queryClient.query("from(bucket:\"" + bucket.getName() + "\") |> range(start: 1970-01-01T00:00:00.000000001Z)"); @@ -199,6 +202,7 @@ void writePoint() { Publisher success = writeClient.writePoint(WritePrecision.MS, point); Flowable.fromPublisher(success) .test() + .awaitDone(1, TimeUnit.SECONDS) .assertValueCount(1); Publisher result = queryClient.query("from(bucket:\"" + bucket.getName() + "\") |> range(start: 1970-01-01T00:00:00.000000001Z) |> last()"); @@ -229,6 +233,7 @@ void writePoints() { Publisher success = writeClient.writePoints(WritePrecision.S, Flowable.just(point1, point2)); Flowable.fromPublisher(success) .test() + .awaitDone(1, TimeUnit.SECONDS) .assertValueCount(1); Publisher result = queryClient.query("from(bucket:\"" + bucket.getName() + "\") |> range(start: 1970-01-01T00:00:00.000000001Z)"); @@ -249,6 +254,7 @@ void writeMeasurement() { Publisher success = writeClient.writeMeasurement(WritePrecision.NS, measurement); Flowable.fromPublisher(success) .test() + .awaitCount(1) .assertValueCount(1); Publisher measurements = queryClient.query("from(bucket:\"" + bucket.getName() + "\") |> range(start: 1970-01-01T00:00:00.000000001Z) |> last() |> rename(columns:{_value: \"water_level\"})", H2O.class); @@ -285,6 +291,7 @@ void writeMeasurements() { Publisher success = writeClient.writeMeasurements(WritePrecision.NS, Flowable.just(measurement1, measurement2)); Flowable.fromPublisher(success) .test() + .awaitCount(1) .assertValueCount(1); Publisher measurements = queryClient.query("from(bucket:\"" + bucket.getName() + "\") |> range(start: 1970-01-01T00:00:00.000000001Z) |> sort(desc: false, columns:[\"_time\"]) |>rename(columns:{_value: \"water_level\"})", H2O.class); @@ -317,8 +324,8 @@ void queryRaw() { Publisher success = writeClient.writeRecord(WritePrecision.NS, "h2o_feet,location=coyote_creek level\\ water_level=1.0 1"); Flowable.fromPublisher(success) - .test() - .assertValueCount(1); + .test() + .awaitDone(1, TimeUnit.SECONDS); Publisher result = queryClient.queryRaw("from(bucket:\"" + bucket.getName() + "\") |> range(start: 1970-01-01T00:00:00.000000001Z)"); @@ -344,12 +351,14 @@ void queryRawDialect() { Publisher success = writeClient.writeRecord(WritePrecision.NS, "h2o_feet,location=coyote_creek level\\ water_level=1.0 1"); Flowable.fromPublisher(success) .test() + .awaitDone(1, TimeUnit.SECONDS) .assertValueCount(1); Publisher result = queryClient.queryRaw("from(bucket:\"" + bucket.getName() + "\") |> range(start: 1970-01-01T00:00:00.000000001Z)", (Dialect) null); Flowable.fromPublisher(result) .test() + .awaitCount(3) .assertValueCount(3) .assertValueAt(0, ",result,table,_start,_stop,_time,_value,_field,_measurement,location") .assertValueAt(1, value -> { @@ -399,9 +408,8 @@ public void subscribeOn() { Flowable.fromPublisher(success) .subscribeOn(Schedulers.newThread()) .test() - .awaitCount(1) + .awaitDone(1, TimeUnit.SECONDS) .assertValueCount(1); -// .assertSubscribed(); } @Test @@ -414,6 +422,7 @@ public void defaultOrgBucket() { Publisher success = writeApi.writeRecord(bucket.getId(), organization.getName(), WritePrecision.NS, "h2o,location=north water_level=60.0 1"); Flowable.fromPublisher(success) .test() + .awaitDone(1, TimeUnit.SECONDS) .assertValueCount(1); QueryReactiveApi queryApi = client.getQueryReactiveApi(); @@ -482,6 +491,7 @@ public void propagateError() { Publisher success = writeClient.writeRecord(bucket.getName(), organization.getId(), WritePrecision.S, "not.valid.lp"); Flowable.fromPublisher(success) .test() + .awaitDone(1, TimeUnit.SECONDS) .assertError(throwable -> { Assertions.assertThat(throwable).isInstanceOf(BadRequestException.class); Assertions.assertThat(throwable).hasMessageContaining("unable to parse"); diff --git a/client-reactive/src/test/java/com/influxdb/client/reactive/WriteReactiveApiTest.java b/client-reactive/src/test/java/com/influxdb/client/reactive/WriteReactiveApiTest.java index 31e8fd12d91..246b9bf1f7d 100644 --- a/client-reactive/src/test/java/com/influxdb/client/reactive/WriteReactiveApiTest.java +++ b/client-reactive/src/test/java/com/influxdb/client/reactive/WriteReactiveApiTest.java @@ -26,6 +26,7 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; +import com.influxdb.LogLevel; import com.influxdb.client.domain.WritePrecision; import com.influxdb.client.internal.RetryAttempt; import com.influxdb.client.write.Point; @@ -59,6 +60,7 @@ class WriteReactiveApiTest extends AbstractMockServerTest { void setUp() { influxDBClient = InfluxDBClientReactiveFactory.create(startMockServer()); + influxDBClient.setLogLevel(LogLevel.BASIC); testScheduler = new TestScheduler(); RxJavaPlugins.setComputationSchedulerHandler(scheduler -> testScheduler); From 33ad3f748ef55b438fa56d04e09fb4cf97bf6c4d Mon Sep 17 00:00:00 2001 From: Jakub Bednar Date: Thu, 20 Jan 2022 11:38:24 +0100 Subject: [PATCH 08/21] fix: RxJava3 Retrofit has to use synchronous observables because we want to keep order of requests - https://github.com/square/retrofit/blob/9b32c965ef31275627e35a862f584bcc7b9fa4e5/retrofit-adapters/rxjava3/src/main/java/retrofit2/adapter/rxjava3/RxJava3CallAdapterFactory.java#L71 - https://github.com/square/retrofit/blob/9b32c965ef31275627e35a862f584bcc7b9fa4e5/retrofit-adapters/rxjava2/src/main/java/retrofit2/adapter/rxjava2/RxJava2CallAdapterFactory.java#L62 --- .../internal/InfluxDBClientReactiveImpl.java | 2 +- .../reactive/ITWriteQueryReactiveApi.java | 20 ++++------------ .../client/reactive/WriteReactiveApiTest.java | 24 +++++++++---------- 3 files changed, 18 insertions(+), 28 deletions(-) diff --git a/client-reactive/src/main/java/com/influxdb/client/reactive/internal/InfluxDBClientReactiveImpl.java b/client-reactive/src/main/java/com/influxdb/client/reactive/internal/InfluxDBClientReactiveImpl.java index f8aae95865d..461d1cf0184 100644 --- a/client-reactive/src/main/java/com/influxdb/client/reactive/internal/InfluxDBClientReactiveImpl.java +++ b/client-reactive/src/main/java/com/influxdb/client/reactive/internal/InfluxDBClientReactiveImpl.java @@ -46,7 +46,7 @@ public class InfluxDBClientReactiveImpl extends AbstractInfluxDBClient implements InfluxDBClientReactive { public InfluxDBClientReactiveImpl(@Nonnull final InfluxDBClientOptions options) { - super(options, "java", Collections.singletonList(RxJava3CallAdapterFactory.create())); + super(options, "java", Collections.singletonList(RxJava3CallAdapterFactory.createSynchronous())); } @Nonnull diff --git a/client-reactive/src/test/java/com/influxdb/client/reactive/ITWriteQueryReactiveApi.java b/client-reactive/src/test/java/com/influxdb/client/reactive/ITWriteQueryReactiveApi.java index 0a12f29b682..1402a7f153c 100644 --- a/client-reactive/src/test/java/com/influxdb/client/reactive/ITWriteQueryReactiveApi.java +++ b/client-reactive/src/test/java/com/influxdb/client/reactive/ITWriteQueryReactiveApi.java @@ -23,7 +23,6 @@ import java.time.Instant; import java.util.Arrays; -import java.util.concurrent.TimeUnit; import com.influxdb.annotations.Column; import com.influxdb.annotations.Measurement; @@ -125,7 +124,6 @@ void writeRecord() { Publisher success = writeClient.writeRecord(WritePrecision.NS, lineProtocol); Flowable.fromPublisher(success) .test() - .awaitDone(1, TimeUnit.SECONDS) .assertValueCount(1); Publisher result = queryClient.query("from(bucket:\"" + bucketName + "\") |> range(start: 1970-01-01T00:00:00.000000001Z)", organization.getId()); @@ -165,7 +163,6 @@ void writeRecords() { Publisher success = writeClient.writeRecords(WritePrecision.S, records); Flowable.fromPublisher(success) .test() - .awaitDone(1, TimeUnit.SECONDS) .assertValueCount(2); Publisher results = queryClient.query("from(bucket:\"" + bucket.getName() + "\") |> range(start: 1970-01-01T00:00:00.000000001Z)"); @@ -202,7 +199,6 @@ void writePoint() { Publisher success = writeClient.writePoint(WritePrecision.MS, point); Flowable.fromPublisher(success) .test() - .awaitDone(1, TimeUnit.SECONDS) .assertValueCount(1); Publisher result = queryClient.query("from(bucket:\"" + bucket.getName() + "\") |> range(start: 1970-01-01T00:00:00.000000001Z) |> last()"); @@ -233,7 +229,6 @@ void writePoints() { Publisher success = writeClient.writePoints(WritePrecision.S, Flowable.just(point1, point2)); Flowable.fromPublisher(success) .test() - .awaitDone(1, TimeUnit.SECONDS) .assertValueCount(1); Publisher result = queryClient.query("from(bucket:\"" + bucket.getName() + "\") |> range(start: 1970-01-01T00:00:00.000000001Z)"); @@ -254,7 +249,6 @@ void writeMeasurement() { Publisher success = writeClient.writeMeasurement(WritePrecision.NS, measurement); Flowable.fromPublisher(success) .test() - .awaitCount(1) .assertValueCount(1); Publisher measurements = queryClient.query("from(bucket:\"" + bucket.getName() + "\") |> range(start: 1970-01-01T00:00:00.000000001Z) |> last() |> rename(columns:{_value: \"water_level\"})", H2O.class); @@ -291,7 +285,6 @@ void writeMeasurements() { Publisher success = writeClient.writeMeasurements(WritePrecision.NS, Flowable.just(measurement1, measurement2)); Flowable.fromPublisher(success) .test() - .awaitCount(1) .assertValueCount(1); Publisher measurements = queryClient.query("from(bucket:\"" + bucket.getName() + "\") |> range(start: 1970-01-01T00:00:00.000000001Z) |> sort(desc: false, columns:[\"_time\"]) |>rename(columns:{_value: \"water_level\"})", H2O.class); @@ -324,8 +317,8 @@ void queryRaw() { Publisher success = writeClient.writeRecord(WritePrecision.NS, "h2o_feet,location=coyote_creek level\\ water_level=1.0 1"); Flowable.fromPublisher(success) - .test() - .awaitDone(1, TimeUnit.SECONDS); + .test() + .assertValueCount(1); Publisher result = queryClient.queryRaw("from(bucket:\"" + bucket.getName() + "\") |> range(start: 1970-01-01T00:00:00.000000001Z)"); @@ -351,14 +344,12 @@ void queryRawDialect() { Publisher success = writeClient.writeRecord(WritePrecision.NS, "h2o_feet,location=coyote_creek level\\ water_level=1.0 1"); Flowable.fromPublisher(success) .test() - .awaitDone(1, TimeUnit.SECONDS) .assertValueCount(1); Publisher result = queryClient.queryRaw("from(bucket:\"" + bucket.getName() + "\") |> range(start: 1970-01-01T00:00:00.000000001Z)", (Dialect) null); Flowable.fromPublisher(result) .test() - .awaitCount(3) .assertValueCount(3) .assertValueAt(0, ",result,table,_start,_stop,_time,_value,_field,_measurement,location") .assertValueAt(1, value -> { @@ -408,8 +399,9 @@ public void subscribeOn() { Flowable.fromPublisher(success) .subscribeOn(Schedulers.newThread()) .test() - .awaitDone(1, TimeUnit.SECONDS) - .assertValueCount(1); + .awaitCount(1) + .assertValueCount(1) + .assertComplete(); } @Test @@ -422,7 +414,6 @@ public void defaultOrgBucket() { Publisher success = writeApi.writeRecord(bucket.getId(), organization.getName(), WritePrecision.NS, "h2o,location=north water_level=60.0 1"); Flowable.fromPublisher(success) .test() - .awaitDone(1, TimeUnit.SECONDS) .assertValueCount(1); QueryReactiveApi queryApi = client.getQueryReactiveApi(); @@ -491,7 +482,6 @@ public void propagateError() { Publisher success = writeClient.writeRecord(bucket.getName(), organization.getId(), WritePrecision.S, "not.valid.lp"); Flowable.fromPublisher(success) .test() - .awaitDone(1, TimeUnit.SECONDS) .assertError(throwable -> { Assertions.assertThat(throwable).isInstanceOf(BadRequestException.class); Assertions.assertThat(throwable).hasMessageContaining("unable to parse"); diff --git a/client-reactive/src/test/java/com/influxdb/client/reactive/WriteReactiveApiTest.java b/client-reactive/src/test/java/com/influxdb/client/reactive/WriteReactiveApiTest.java index 246b9bf1f7d..08d44e651c8 100644 --- a/client-reactive/src/test/java/com/influxdb/client/reactive/WriteReactiveApiTest.java +++ b/client-reactive/src/test/java/com/influxdb/client/reactive/WriteReactiveApiTest.java @@ -26,7 +26,6 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; -import com.influxdb.LogLevel; import com.influxdb.client.domain.WritePrecision; import com.influxdb.client.internal.RetryAttempt; import com.influxdb.client.write.Point; @@ -60,7 +59,6 @@ class WriteReactiveApiTest extends AbstractMockServerTest { void setUp() { influxDBClient = InfluxDBClientReactiveFactory.create(startMockServer()); - influxDBClient.setLogLevel(LogLevel.BASIC); testScheduler = new TestScheduler(); RxJavaPlugins.setComputationSchedulerHandler(scheduler -> testScheduler); @@ -230,8 +228,8 @@ public void maxRetryTime() { Assertions.assertThat(throwable).hasMessage("Max retry time exceeded."); Assertions.assertThat(throwable).hasCauseInstanceOf(TimeoutException.class); return true; - }); -// .assertTerminated(); + }) + .assertNotComplete(); } @Test @@ -253,8 +251,8 @@ void networkError() throws IOException { Assertions.assertThat(throwable).isInstanceOf(InfluxException.class); Assertions.assertThat(throwable).hasCauseInstanceOf(IOException.class); return true; - }); -// .assertTerminated(); + }) + .assertNotComplete(); } @Test @@ -275,8 +273,9 @@ void customBatching() { Flowable.fromPublisher(successFlowable) .test() .awaitCount(3) - .assertValueCount(3); -// .assertTerminated(); + .assertValueCount(3) + .assertNoErrors() + .assertComplete(); Assertions.assertThat(mockServer.getRequestCount()).isEqualTo(3); @@ -312,8 +311,8 @@ void disableRetry() { Assertions.assertThat(throwable).isInstanceOf(InfluxException.class); Assertions.assertThat(throwable).hasMessage("token is temporarily over quota"); return true; - }); -// .assertTerminated(); + }) + .assertNotComplete(); Assertions.assertThat(mockServer.getRequestCount()).isEqualTo(1); @@ -338,8 +337,9 @@ void pointsPrecision() { Flowable.fromPublisher(success) .test() .awaitCount(1) - .assertValueCount(1); -// .assertTerminated(); + .assertValueCount(1) + .assertNoErrors() + .assertComplete(); Assertions.assertThat(mockServer.getRequestCount()).isEqualTo(1); From e8e0502484f3b96cf39d4dbeba68d2a7dcf1c47c Mon Sep 17 00:00:00 2001 From: Jakub Bednar Date: Mon, 31 Jan 2022 12:32:38 +0100 Subject: [PATCH 09/21] fix: use native support for Rx request instead blocking emitter --- client-reactive/pom.xml | 19 ------------------- client/pom.xml | 19 +++++++++++++++++++ .../internal/AbstractInfluxDBClient.java | 3 ++- pom.xml | 3 +-- 4 files changed, 22 insertions(+), 22 deletions(-) diff --git a/client-reactive/pom.xml b/client-reactive/pom.xml index e0f57aad265..56d9c812d74 100644 --- a/client-reactive/pom.xml +++ b/client-reactive/pom.xml @@ -98,25 +98,6 @@ influxdb-client-java - - com.squareup.retrofit2 - adapter-rxjava3 - - - com.squareup.okhttp3 - okhttp - - - com.squareup.retrofit2 - retrofit - - - io.reactivex.rxjava2 - rxjava - - - - com.influxdb influxdb-client-test diff --git a/client/pom.xml b/client/pom.xml index c3cefa897d3..76b8b4a1835 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -166,6 +166,25 @@ converter-gson + + com.squareup.retrofit2 + adapter-rxjava3 + + + com.squareup.okhttp3 + okhttp + + + com.squareup.retrofit2 + retrofit + + + io.reactivex.rxjava2 + rxjava + + + + com.moandjiezana.toml toml4j diff --git a/client/src/main/java/com/influxdb/client/internal/AbstractInfluxDBClient.java b/client/src/main/java/com/influxdb/client/internal/AbstractInfluxDBClient.java index ca52a0c9c02..dd2580cf439 100644 --- a/client/src/main/java/com/influxdb/client/internal/AbstractInfluxDBClient.java +++ b/client/src/main/java/com/influxdb/client/internal/AbstractInfluxDBClient.java @@ -46,6 +46,7 @@ import retrofit2.Call; import retrofit2.CallAdapter; import retrofit2.Retrofit; +import retrofit2.adapter.rxjava3.RxJava3CallAdapterFactory; import retrofit2.converter.gson.GsonConverterFactory; import retrofit2.converter.scalars.ScalarsConverterFactory; @@ -75,7 +76,7 @@ public abstract class AbstractInfluxDBClient extends AbstractRestClient { protected final Collection autoCloseables = new CopyOnWriteArrayList<>(); public AbstractInfluxDBClient(@Nonnull final InfluxDBClientOptions options, @Nonnull final String clientType) { - this(options, clientType, Collections.emptyList()); + this(options, clientType, Collections.singletonList(RxJava3CallAdapterFactory.createSynchronous())); } public AbstractInfluxDBClient(@Nonnull final InfluxDBClientOptions options, diff --git a/pom.xml b/pom.xml index 7021691d48a..3973c916ca9 100644 --- a/pom.xml +++ b/pom.xml @@ -112,8 +112,7 @@ 4.9.3 2.10.0 2.8.9 - - 3.0.0 + 3.1.3 3.0.0-M5 3.2.0 From b36a97598ac457c0362a559c34937d12b07ba86e Mon Sep 17 00:00:00 2001 From: Jakub Bednar Date: Mon, 31 Jan 2022 13:36:23 +0100 Subject: [PATCH 10/21] chore: fix configuration for versions plugin --- karaf/karaf-assembly/pom.xml | 14 ++++++++++++++ karaf/karaf-features/pom.xml | 14 ++++++++++++++ karaf/karaf-kar/pom.xml | 14 ++++++++++++++ karaf/pom.xml | 19 +++++++++++++++++++ 4 files changed, 61 insertions(+) diff --git a/karaf/karaf-assembly/pom.xml b/karaf/karaf-assembly/pom.xml index 47a163301f5..64d18d29267 100644 --- a/karaf/karaf-assembly/pom.xml +++ b/karaf/karaf-assembly/pom.xml @@ -78,6 +78,20 @@ + + com.mycila + license-maven-plugin + +
../../scripts/license_header.txt
+ + + + org.codehaus.mojo + versions-maven-plugin + + file://${project.basedir}/../../scripts/maven-version-rules.xml + + diff --git a/karaf/karaf-features/pom.xml b/karaf/karaf-features/pom.xml index 71f0c963dd6..0c983b2f3c1 100644 --- a/karaf/karaf-features/pom.xml +++ b/karaf/karaf-features/pom.xml @@ -74,6 +74,20 @@ + + com.mycila + license-maven-plugin + +
../../scripts/license_header.txt
+ + + + org.codehaus.mojo + versions-maven-plugin + + file://${project.basedir}/../../scripts/maven-version-rules.xml + + \ No newline at end of file diff --git a/karaf/karaf-kar/pom.xml b/karaf/karaf-kar/pom.xml index 55607299e03..7da9e902e96 100644 --- a/karaf/karaf-kar/pom.xml +++ b/karaf/karaf-kar/pom.xml @@ -54,6 +54,20 @@ true + + com.mycila + license-maven-plugin + +
../../scripts/license_header.txt
+ + + + org.codehaus.mojo + versions-maven-plugin + + file://${project.basedir}/../../scripts/maven-version-rules.xml + + diff --git a/karaf/pom.xml b/karaf/pom.xml index 305cdf7e3c8..0bebbe3fadf 100644 --- a/karaf/pom.xml +++ b/karaf/pom.xml @@ -70,6 +70,25 @@ HEAD + + + + com.mycila + license-maven-plugin + +
../scripts/license_header.txt
+ + + + org.codehaus.mojo + versions-maven-plugin + + file://${project.basedir}/../scripts/maven-version-rules.xml + + + + + org.apache.karaf.features From dc9166f6c419b78a3d03bad6335f6b5218e8642e Mon Sep 17 00:00:00 2001 From: Robert Hajek Date: Mon, 31 Jan 2022 16:10:32 +0100 Subject: [PATCH 11/21] feat: upgraded dependencies --- .gitignore | 6 +++++- client-core/pom.xml | 2 +- client-kotlin/pom.xml | 5 ++--- client-legacy/pom.xml | 2 +- client-osgi/pom.xml | 18 +++++++++--------- client-reactive/pom.xml | 2 +- client-scala/cross/2.12/pom.xml | 10 +++++----- client-scala/cross/2.13/pom.xml | 8 ++++---- client-test/pom.xml | 2 +- client-utils/pom.xml | 2 +- client/pom.xml | 2 +- examples/pom.xml | 6 +++--- flux-dsl/pom.xml | 2 +- karaf/pom.xml | 2 +- spring/pom.xml | 10 +++++----- 15 files changed, 41 insertions(+), 38 deletions(-) diff --git a/.gitignore b/.gitignore index b324aa74b31..8316a5289b6 100644 --- a/.gitignore +++ b/.gitignore @@ -15,4 +15,8 @@ tree.txt **/.openapi-generator* **/swagger2.yml **/response.json -**/test.txt \ No newline at end of file +**/test.txt + +# Mac OS +.DS_Store +client/.DS_Store \ No newline at end of file diff --git a/client-core/pom.xml b/client-core/pom.xml index 89320b1d3c8..0d91c6c8256 100644 --- a/client-core/pom.xml +++ b/client-core/pom.xml @@ -65,7 +65,7 @@ scm:git:git@github.com:influxdata/influxdb-client-java.git scm:git:git@github.com:influxdata/influxdb-client-java.git - http://github.com/influxdata/influxdb-client-java/tree/master + https://github.com/influxdata/influxdb-client-java/tree/master HEAD diff --git a/client-kotlin/pom.xml b/client-kotlin/pom.xml index 45854e98bb0..3ae6f18663c 100644 --- a/client-kotlin/pom.xml +++ b/client-kotlin/pom.xml @@ -71,7 +71,7 @@ scm:git:git@github.com:influxdata/influxdb-client-java.git scm:git:git@github.com:influxdata/influxdb-client-java.git - http://github.com/influxdata/influxdb-client-java/tree/master + https://github.com/influxdata/influxdb-client-java/tree/master HEAD @@ -179,7 +179,7 @@ org.jetbrains.kotlinx kotlinx-coroutines-core-jvm - 1.4.3 + 1.6.0 org.jetbrains.kotlin @@ -191,7 +191,6 @@ org.jetbrains.kotlinx kotlinx-coroutines-core - 1.6.0 org.jetbrains.kotlinx diff --git a/client-legacy/pom.xml b/client-legacy/pom.xml index 9b2fa6b4146..fec65b99d91 100644 --- a/client-legacy/pom.xml +++ b/client-legacy/pom.xml @@ -65,7 +65,7 @@ scm:git:git@github.com:influxdata/influxdb-client-java.git scm:git:git@github.com:influxdata/influxdb-client-java.git - http://github.com/influxdata/influxdb-client-java/tree/master + https://github.com/influxdata/influxdb-client-java/tree/master HEAD diff --git a/client-osgi/pom.xml b/client-osgi/pom.xml index 76c0e0b4555..cc4dca7cf57 100644 --- a/client-osgi/pom.xml +++ b/client-osgi/pom.xml @@ -53,7 +53,7 @@ József Börcsök borcsokj@gmail.com - http://www.github.com/borcsokj + https://www.github.com/borcsokj @@ -64,7 +64,7 @@ scm:git:git@github.com:influxdata/influxdb-client-java.git scm:git:git@github.com:influxdata/influxdb-client-java.git - http://github.com/influxdata/influxdb-client-java/tree/master + https://github.com/influxdata/influxdb-client-java/tree/master HEAD @@ -144,41 +144,41 @@ org.projectlombok lombok - 1.18.20 + 1.18.22 provided org.slf4j slf4j-api - 1.7.32 + 1.7.35 provided org.osgi osgi.core - 6.0.0 + 8.0.0 provided org.osgi osgi.cmpn - 6.0.0 + 7.0.0 provided org.osgi org.osgi.service.component.annotations - 1.3.0 + 1.5.0 provided org.osgi org.osgi.service.metatype.annotations - 1.3.0 + 1.4.1 provided @@ -191,7 +191,7 @@ ch.qos.logback logback-classic - 1.2.3 + 1.2.10 test diff --git a/client-reactive/pom.xml b/client-reactive/pom.xml index 56d9c812d74..48f51c44fa2 100644 --- a/client-reactive/pom.xml +++ b/client-reactive/pom.xml @@ -67,7 +67,7 @@ scm:git:git@github.com:influxdata/influxdb-client-java.git scm:git:git@github.com:influxdata/influxdb-client-java.git - http://github.com/influxdata/influxdb-client-java/tree/master + https://github.com/influxdata/influxdb-client-java/tree/master HEAD diff --git a/client-scala/cross/2.12/pom.xml b/client-scala/cross/2.12/pom.xml index 1db4755eefa..2eee07cc020 100644 --- a/client-scala/cross/2.12/pom.xml +++ b/client-scala/cross/2.12/pom.xml @@ -67,13 +67,13 @@ scm:git:git@github.com:influxdata/influxdb-client-java.git scm:git:git@github.com:influxdata/influxdb-client-java.git - http://github.com/influxdata/influxdb-client-java/tree/master + https://github.com/influxdata/influxdb-client-java/tree/master HEAD - 2.12.13 - 2.6.6 + 2.12.15 + 2.6.18 @@ -164,7 +164,7 @@ org.scala-lang.modules scala-collection-compat_2.12 - 2.4.2 + 2.6.0 org.scala-lang @@ -220,7 +220,7 @@ org.scalatest scalatest_2.12 - 3.2.0 + 3.2.11 test diff --git a/client-scala/cross/2.13/pom.xml b/client-scala/cross/2.13/pom.xml index 373d8914be0..86e992f0c45 100644 --- a/client-scala/cross/2.13/pom.xml +++ b/client-scala/cross/2.13/pom.xml @@ -67,14 +67,14 @@ scm:git:git@github.com:influxdata/influxdb-client-java.git scm:git:git@github.com:influxdata/influxdb-client-java.git - http://github.com/influxdata/influxdb-client-java/tree/master + https://github.com/influxdata/influxdb-client-java/tree/master HEAD 1.4.1 - 2.13.5 - 2.6.6 + 2.13.8 + 2.6.18 @@ -250,7 +250,7 @@ org.scalatest scalatest_2.13 - 3.2.0 + 3.2.11 test diff --git a/client-test/pom.xml b/client-test/pom.xml index 6f0ae419f9b..cfbd05c90d9 100644 --- a/client-test/pom.xml +++ b/client-test/pom.xml @@ -67,7 +67,7 @@ scm:git:git@github.com:influxdata/influxdb-client-java.git scm:git:git@github.com:influxdata/influxdb-client-java.git - http://github.com/influxdata/influxdb-client-java/tree/master + https://github.com/influxdata/influxdb-client-java/tree/master HEAD diff --git a/client-utils/pom.xml b/client-utils/pom.xml index c01fed75c98..83fa3d5e996 100644 --- a/client-utils/pom.xml +++ b/client-utils/pom.xml @@ -65,7 +65,7 @@ scm:git:git@github.com:influxdata/influxdb-client-java.git scm:git:git@github.com:influxdata/influxdb-client-java.git - http://github.com/influxdata/influxdb-client-java/tree/master + https://github.com/influxdata/influxdb-client-java/tree/master HEAD diff --git a/client/pom.xml b/client/pom.xml index 76b8b4a1835..9cc746ced88 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -67,7 +67,7 @@ scm:git:git@github.com:influxdata/influxdb-client-java.git scm:git:git@github.com:influxdata/influxdb-client-java.git - http://github.com/influxdata/influxdb-client-java/tree/master + https://github.com/influxdata/influxdb-client-java/tree/master HEAD diff --git a/examples/pom.xml b/examples/pom.xml index 9b147e67508..7d4a39a2d7a 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -117,7 +117,7 @@ org.apache.commons commons-lang3 - 3.10 + 3.12.0 compile @@ -158,12 +158,12 @@ commons-io commons-io - 2.7 + 2.11.0 commons-cli commons-cli - 1.4 + 1.5.0 diff --git a/flux-dsl/pom.xml b/flux-dsl/pom.xml index 7b215eff091..b7bd245a24f 100644 --- a/flux-dsl/pom.xml +++ b/flux-dsl/pom.xml @@ -65,7 +65,7 @@ scm:git:git@github.com:influxdata/influxdb-client-java.git scm:git:git@github.com:influxdata/influxdb-client-java.git - http://github.com/influxdata/influxdb-client-java/tree/master + https://github.com/influxdata/influxdb-client-java/tree/master HEAD diff --git a/karaf/pom.xml b/karaf/pom.xml index 0bebbe3fadf..0829543cfe0 100644 --- a/karaf/pom.xml +++ b/karaf/pom.xml @@ -66,7 +66,7 @@ scm:git:git@github.com:influxdata/influxdb-client-java.git scm:git:git@github.com:influxdata/influxdb-client-java.git - http://github.com/influxdata/influxdb-client-java/tree/master + https://github.com/influxdata/influxdb-client-java/tree/master HEAD diff --git a/spring/pom.xml b/spring/pom.xml index db4289c89b2..dc576e8f243 100644 --- a/spring/pom.xml +++ b/spring/pom.xml @@ -67,15 +67,15 @@ scm:git:git@github.com:influxdata/influxdb-client-java.git scm:git:git@github.com:influxdata/influxdb-client-java.git - http://github.com/influxdata/influxdb-client-java/tree/master + https://github.com/influxdata/influxdb-client-java/tree/master HEAD - 1.7.0 - 2.4.6 - 5.3.7 - 2.25.1 + 1.8.2 + 2.6.3 + 5.3.15 + 4.3.1 From 419f89a4e51092468601053538722c28143ed31a Mon Sep 17 00:00:00 2001 From: Robert Hajek Date: Mon, 31 Jan 2022 16:36:13 +0100 Subject: [PATCH 12/21] feat: upgraded dependencies --- client-core/pom.xml | 6 ++++++ client-kotlin/pom.xml | 2 +- client-test/pom.xml | 4 ++++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/client-core/pom.xml b/client-core/pom.xml index 0d91c6c8256..7a31f32cd5a 100644 --- a/client-core/pom.xml +++ b/client-core/pom.xml @@ -162,6 +162,12 @@ com.squareup.okhttp3 mockwebserver + + + junit + junit + + test diff --git a/client-kotlin/pom.xml b/client-kotlin/pom.xml index 3ae6f18663c..c83980c533b 100644 --- a/client-kotlin/pom.xml +++ b/client-kotlin/pom.xml @@ -179,7 +179,7 @@ org.jetbrains.kotlinx kotlinx-coroutines-core-jvm - 1.6.0 + 1.4.3 org.jetbrains.kotlin diff --git a/client-test/pom.xml b/client-test/pom.xml index cfbd05c90d9..1c377a8b2bc 100644 --- a/client-test/pom.xml +++ b/client-test/pom.xml @@ -106,6 +106,10 @@ com.squareup.okhttp3 mockwebserver + + junit + junit + com.squareup.okhttp3 okhttp From 8e958530eb276573bd5dd32ca5224bed61088f44 Mon Sep 17 00:00:00 2001 From: Robert Hajek Date: Thu, 31 Mar 2022 10:50:30 +0200 Subject: [PATCH 13/21] feat: rebase and fixing rxjava3 tests --- .../client/reactive/QueryReactiveApiTest.java | 2 +- client/pom.xml | 21 +------------------ .../client/internal/InfluxDBClientImpl.java | 4 +--- 3 files changed, 3 insertions(+), 24 deletions(-) diff --git a/client-reactive/src/test/java/com/influxdb/client/reactive/QueryReactiveApiTest.java b/client-reactive/src/test/java/com/influxdb/client/reactive/QueryReactiveApiTest.java index 90a65f7c0e1..c59a32c88ca 100644 --- a/client-reactive/src/test/java/com/influxdb/client/reactive/QueryReactiveApiTest.java +++ b/client-reactive/src/test/java/com/influxdb/client/reactive/QueryReactiveApiTest.java @@ -28,7 +28,7 @@ import com.influxdb.test.AbstractMockServerTest; -import io.reactivex.Flowable; +import io.reactivex.rxjava3.core.Flowable; import org.assertj.core.api.Assertions; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; diff --git a/client/pom.xml b/client/pom.xml index 9cc746ced88..99fa653623c 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -129,7 +129,7 @@ com.squareup.retrofit2 - adapter-rxjava2 + adapter-rxjava3 com.squareup.okhttp3 @@ -166,25 +166,6 @@ converter-gson - - com.squareup.retrofit2 - adapter-rxjava3 - - - com.squareup.okhttp3 - okhttp - - - com.squareup.retrofit2 - retrofit - - - io.reactivex.rxjava2 - rxjava - - - - com.moandjiezana.toml toml4j diff --git a/client/src/main/java/com/influxdb/client/internal/InfluxDBClientImpl.java b/client/src/main/java/com/influxdb/client/internal/InfluxDBClientImpl.java index c74934cb58f..9d617a49ff1 100644 --- a/client/src/main/java/com/influxdb/client/internal/InfluxDBClientImpl.java +++ b/client/src/main/java/com/influxdb/client/internal/InfluxDBClientImpl.java @@ -21,7 +21,6 @@ */ package com.influxdb.client.internal; -import java.util.Collections; import java.util.logging.Level; import java.util.logging.Logger; import javax.annotation.Nonnull; @@ -82,7 +81,6 @@ import org.jetbrains.annotations.NotNull; import retrofit2.Call; -import retrofit2.adapter.rxjava2.RxJava2CallAdapterFactory; /** * @author Jakub Bednar (bednar@github) (11/10/2018 09:36) @@ -97,7 +95,7 @@ public final class InfluxDBClientImpl extends AbstractInfluxDBClient implements public InfluxDBClientImpl(@Nonnull final InfluxDBClientOptions options) { - super(options, "java", Collections.singletonList(RxJava2CallAdapterFactory.create())); + super(options, "java"); setupService = retrofit.create(SetupService.class); readyService = retrofit.create(ReadyService.class); From 940f43a914a105895e4020302238fd5ed76d2d7a Mon Sep 17 00:00:00 2001 From: Robert Hajek Date: Thu, 31 Mar 2022 10:56:08 +0200 Subject: [PATCH 14/21] feat: rebase and fixing rxjava3 tests --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 3973c916ca9..b26ec33962b 100644 --- a/pom.xml +++ b/pom.xml @@ -602,7 +602,7 @@ org.junit.platform junit-platform-runner - 1.7.2 + 1.8.2 @@ -620,7 +620,7 @@ org.mockito mockito-junit-jupiter - 3.11.2 + 4.4.0 From e400fc2e76acbffbd35a6dfee7978b0798792e90 Mon Sep 17 00:00:00 2001 From: Robert Hajek Date: Thu, 31 Mar 2022 13:56:09 +0200 Subject: [PATCH 15/21] feat: upgrade dependencies --- client-osgi/pom.xml | 4 ++-- client-scala/cross/2.12/pom.xml | 4 ++-- client-scala/cross/2.13/pom.xml | 2 +- pom.xml | 12 ++++++------ spring/pom.xml | 6 +++--- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/client-osgi/pom.xml b/client-osgi/pom.xml index cc4dca7cf57..6ef4c06206a 100644 --- a/client-osgi/pom.xml +++ b/client-osgi/pom.xml @@ -151,7 +151,7 @@ org.slf4j slf4j-api - 1.7.35 + 1.7.36 provided @@ -191,7 +191,7 @@ ch.qos.logback logback-classic - 1.2.10 + 1.2.11 test diff --git a/client-scala/cross/2.12/pom.xml b/client-scala/cross/2.12/pom.xml index 2eee07cc020..b319cd8d8a7 100644 --- a/client-scala/cross/2.12/pom.xml +++ b/client-scala/cross/2.12/pom.xml @@ -73,7 +73,7 @@ 2.12.15 - 2.6.18 + 2.6.19 @@ -164,7 +164,7 @@ org.scala-lang.modules scala-collection-compat_2.12 - 2.6.0 + 2.7.0 org.scala-lang diff --git a/client-scala/cross/2.13/pom.xml b/client-scala/cross/2.13/pom.xml index 86e992f0c45..9a68eb80bb3 100644 --- a/client-scala/cross/2.13/pom.xml +++ b/client-scala/cross/2.13/pom.xml @@ -74,7 +74,7 @@ 1.4.1 2.13.8 - 2.6.18 + 2.6.19 diff --git a/pom.xml b/pom.xml index b26ec33962b..723ace642c0 100644 --- a/pom.xml +++ b/pom.xml @@ -111,8 +111,8 @@ 2.9.0 4.9.3 2.10.0 - 2.8.9 - 3.1.3 + 2.9.0 + 3.1.4 3.0.0-M5 3.2.0 @@ -122,7 +122,7 @@ 3.4.4 1.6.10 - 4.2.11 + 4.3.6 5.8.2 @@ -560,7 +560,7 @@ io.swagger swagger-annotations - 1.6.4 + 1.6.5 @@ -590,7 +590,7 @@ org.json json - 20211205 + 20220320 @@ -614,7 +614,7 @@ org.mockito mockito-core - 3.12.4 + 4.4.0 diff --git a/spring/pom.xml b/spring/pom.xml index dc576e8f243..8422a9e67c7 100644 --- a/spring/pom.xml +++ b/spring/pom.xml @@ -73,9 +73,9 @@ 1.8.2 - 2.6.3 - 5.3.15 - 4.3.1 + 2.6.5 + 5.3.18 + 4.4.0 From 7a6d40ac4a0709b10bc35306a199153dc3c107d2 Mon Sep 17 00:00:00 2001 From: Robert Hajek Date: Thu, 31 Mar 2022 16:04:51 +0200 Subject: [PATCH 16/21] feat: upgrade dependencies --- client-scala/cross/2.12/pom.xml | 4 ++++ client-scala/cross/2.13/pom.xml | 4 ++++ spring/pom.xml | 2 +- 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/client-scala/cross/2.12/pom.xml b/client-scala/cross/2.12/pom.xml index b319cd8d8a7..16c172a9d9b 100644 --- a/client-scala/cross/2.12/pom.xml +++ b/client-scala/cross/2.12/pom.xml @@ -178,6 +178,10 @@ akka-stream_2.12 ${akka.version} + + com.typesafe + ssl-config-core_2.12 + org.scala-lang scala-library diff --git a/client-scala/cross/2.13/pom.xml b/client-scala/cross/2.13/pom.xml index 9a68eb80bb3..f4ed9d1ee49 100644 --- a/client-scala/cross/2.13/pom.xml +++ b/client-scala/cross/2.13/pom.xml @@ -208,6 +208,10 @@ akka-stream_2.13 ${akka.version} + + com.typesafe + ssl-config-core_2.13 + org.scala-lang scala-library diff --git a/spring/pom.xml b/spring/pom.xml index 8422a9e67c7..91ef8e37037 100644 --- a/spring/pom.xml +++ b/spring/pom.xml @@ -74,7 +74,7 @@ 1.8.2 2.6.5 - 5.3.18 + 5.3.17 4.4.0 From 966bbb26fdab16ff7c308d46069bc04b096114f2 Mon Sep 17 00:00:00 2001 From: Robert Hajek Date: Fri, 1 Apr 2022 08:21:43 +0200 Subject: [PATCH 17/21] feat: upgrade dependencies --- .../reactive/InfluxDBClientReactive.java | 4 +-- .../internal/InfluxDBClientReactiveImpl.java | 7 ++--- .../reactive/ITInfluxDBReactiveClient.java | 27 ++++++++++--------- 3 files changed, 20 insertions(+), 18 deletions(-) diff --git a/client-reactive/src/main/java/com/influxdb/client/reactive/InfluxDBClientReactive.java b/client-reactive/src/main/java/com/influxdb/client/reactive/InfluxDBClientReactive.java index 1901d57219e..7d7cafbad87 100644 --- a/client-reactive/src/main/java/com/influxdb/client/reactive/InfluxDBClientReactive.java +++ b/client-reactive/src/main/java/com/influxdb/client/reactive/InfluxDBClientReactive.java @@ -27,7 +27,7 @@ import com.influxdb.client.InfluxDBClient; import com.influxdb.client.domain.HealthCheck; -import io.reactivex.rxjava3.core.Single; +import org.reactivestreams.Publisher; /** * The reference RxJava client for the InfluxDB 2.0 @@ -68,7 +68,7 @@ public interface InfluxDBClientReactive extends AutoCloseable { * @return health of an instance */ @Nonnull - Single health(); + Publisher health(); /** * @return the {@link LogLevel} that is used for logging requests and responses diff --git a/client-reactive/src/main/java/com/influxdb/client/reactive/internal/InfluxDBClientReactiveImpl.java b/client-reactive/src/main/java/com/influxdb/client/reactive/internal/InfluxDBClientReactiveImpl.java index 461d1cf0184..a54ebf3411b 100644 --- a/client-reactive/src/main/java/com/influxdb/client/reactive/internal/InfluxDBClientReactiveImpl.java +++ b/client-reactive/src/main/java/com/influxdb/client/reactive/internal/InfluxDBClientReactiveImpl.java @@ -36,7 +36,8 @@ import com.influxdb.client.service.WriteService; import com.influxdb.utils.Arguments; -import io.reactivex.rxjava3.core.Single; +import io.reactivex.rxjava3.core.Flowable; +import org.reactivestreams.Publisher; import retrofit2.adapter.rxjava3.RxJava3CallAdapterFactory; /** @@ -72,9 +73,9 @@ public WriteReactiveApi getWriteReactiveApi(@Nonnull final WriteOptionsReactive @Nonnull @Override - public Single health() { + public Publisher health() { - return Single.fromCallable(() -> health(healthService.getHealth(null))); + return Flowable.fromCallable(() -> health(healthService.getHealth(null))); } @Nonnull diff --git a/client-reactive/src/test/java/com/influxdb/client/reactive/ITInfluxDBReactiveClient.java b/client-reactive/src/test/java/com/influxdb/client/reactive/ITInfluxDBReactiveClient.java index 5d8d094c6f0..c6ad71c3650 100644 --- a/client-reactive/src/test/java/com/influxdb/client/reactive/ITInfluxDBReactiveClient.java +++ b/client-reactive/src/test/java/com/influxdb/client/reactive/ITInfluxDBReactiveClient.java @@ -29,6 +29,7 @@ import org.junit.jupiter.api.Test; import org.junit.platform.runner.JUnitPlatform; import org.junit.runner.RunWith; +import org.reactivestreams.Publisher; /** * @author Jakub Bednar (bednar@github) (20/11/2018 08:06) @@ -51,9 +52,9 @@ void writeClient() { @Test void health() { - Single check = influxDBClient.health(); + Publisher check = influxDBClient.health(); - check + Single.fromPublisher(check) .test() .assertNoErrors() .assertValue(it -> { @@ -67,22 +68,22 @@ void health() { } @Test - void healthNotRunningInstance() throws Exception { + void healthNotRunningInstance() { InfluxDBClientReactive clientNotRunning = InfluxDBClientReactiveFactory.create("http://localhost:8099"); - Single health = clientNotRunning.health(); + Publisher health = clientNotRunning.health(); - health - .test() - .assertNoErrors() - .assertValue(it -> { + Single.fromPublisher(health) + .test() + .assertNoErrors() + .assertValue(it -> { - Assertions.assertThat(it).isNotNull(); - Assertions.assertThat(it.getStatus()).isEqualTo(HealthCheck.StatusEnum.FAIL); - Assertions.assertThat(it.getMessage()).startsWith("Failed to connect to"); + Assertions.assertThat(it).isNotNull(); + Assertions.assertThat(it.getStatus()).isEqualTo(HealthCheck.StatusEnum.FAIL); + Assertions.assertThat(it.getMessage()).startsWith("Failed to connect to"); - return true; - }); + return true; + }); clientNotRunning.close(); } From 0c9ef2ef30ea2a9d2ab3e5b3dcd55ce4c8711511 Mon Sep 17 00:00:00 2001 From: Robert Hajek Date: Mon, 4 Apr 2022 15:43:26 +0200 Subject: [PATCH 18/21] feat: upgrade dependencies and CHANGELOG.md --- CHANGELOG.md | 48 +++++++++++++++++++++++++++++++++++++++++++++++- pom.xml | 8 +------- spring/pom.xml | 4 ++-- 3 files changed, 50 insertions(+), 10 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 80fd07e7432..3ab3a676dae 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,9 +1,55 @@ ## 5.1.0 [unreleased] +### Migration Notice +:warning: The InfluxDB Client Library uses internally `RxJava` to support write with batching, retry and backpressure. + The underlying outdated `RxJava2` library was upgraded to the latest `RxJava3`. + +- see [What is different in RxJava3](https://github.com/ReactiveX/RxJava/wiki/What's-different-in-3.0) + + +### Changes in public API + + - `WriteService` imports: + - `io.reactivex.Single` is refactored to `io.reactivex.rxjava3.core.Single` + - `WriteOptions` imports: + - `io.reactivex.BackpressureOverflowStrategy` -> `io.reactivex.rxjava3.core.BackpressureOverflowStrategy` + - `io.reactivex.Scheduler` -> `io.reactivex.rxjava3.core.Scheduler` + - `io.reactivex.schedulers.Schedulers` -> `io.reactivex.rxjava3.schedulers.Schedulers` + - `InfluxDBClientReactive`: + - `Single health()` -> `Publisher health()` + - `WriteOptionsReactive` + - `io.reactivex.Scheduler` -> `io.reactivex.rxjava3.core.Scheduler` + - `io.reactivex.schedulers.Schedulers` -> `io.reactivex.rxjava3.schedulers.Schedulers` + + +### List of updated dependencies: + - Core: + - com.squareup.okhttp3:okhttp:jar:4.9.3 + - com.squareup.okio:okio:jar:2.10.0 + - com.google.code.gson:gson:jar:2.9.0 + - io.reactivex.rxjava3:rxjava:jar:3.1.4 + - org.apache.commons:commons-csv:jar 1.9.0 + - io.gsonfire:gson-fire:1.8.5 + - Kotlin + - org.jetbrains.kotlin:kotlin-stdlib:1.6.20 + - org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.4.3 + - org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.0 + - Karaf + - karaf 4.3.6 + - gson-fire 1.8.5 + - Micrometer + - micrometer 1.8.4 + - OSGi + - org.osgi:osgi.core:8.0.0 + - Spring integration + - org.springframework.boot:spring-boot:jar:2.6.6 + - org.springframework:spring-core:jar:5.3.17 + ### Features +1. [#289](https://github.com/influxdata/influxdb-client-java/pull/298): Upgrade `RxJava2` -> `RxJava3`, update outdated dependencies 1. [#316](https://github.com/influxdata/influxdb-client-java/pull/316): Add `InvocableScriptsApi` to create, update, list, delete and invoke scripts by seamless way 1. [#315](https://github.com/influxdata/influxdb-client-java/pull/315): Add support for timezones [FluxDSL] -1. [#317](https://github.com/influxdata/influxdb-client-java/pull/317): Gets HTTP headers from the unsuccessful HTTP request +1. [#317](https://github.com/influxdata/influxdb-client-java/pull/317): Gets HTTP headers from the unsuccessful HTTP reques ### Bug Fixes 1. [#313](https://github.com/influxdata/influxdb-client-java/pull/313): Do not deliver `exception` when the consumer is already disposed [influxdb-client-reactive] diff --git a/pom.xml b/pom.xml index 723ace642c0..76534784465 100644 --- a/pom.xml +++ b/pom.xml @@ -121,7 +121,7 @@ 3.9.0 3.4.4 - 1.6.10 + 1.6.20 4.3.6 5.8.2 @@ -587,12 +587,6 @@ 3.0.2 - - org.json - json - 20220320 - - org.junit.jupiter junit-jupiter-engine diff --git a/spring/pom.xml b/spring/pom.xml index 91ef8e37037..413a0451f77 100644 --- a/spring/pom.xml +++ b/spring/pom.xml @@ -72,8 +72,8 @@ - 1.8.2 - 2.6.5 + 1.8.4 + 2.6.6 5.3.17 4.4.0 From 4a3eb538edbb43998cedce4a46a88ce323493779 Mon Sep 17 00:00:00 2001 From: rhajek Date: Mon, 4 Apr 2022 15:53:08 +0200 Subject: [PATCH 19/21] feat: fix spring dependencies --- spring/pom.xml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/spring/pom.xml b/spring/pom.xml index 413a0451f77..4771d900b24 100644 --- a/spring/pom.xml +++ b/spring/pom.xml @@ -74,7 +74,7 @@ 1.8.4 2.6.6 - 5.3.17 + 5.3.18 4.4.0 @@ -125,6 +125,12 @@ spring-boot-actuator-autoconfigure ${spring-boot.version} true + + + com.fasterxml.jackson.core + jackson-databind + + From 2453128639394b16986a70f3aee87ac69363d245 Mon Sep 17 00:00:00 2001 From: rhajek Date: Mon, 4 Apr 2022 16:37:13 +0200 Subject: [PATCH 20/21] feat: updated major version --- CHANGELOG.md | 2 +- client-core/pom.xml | 2 +- client-kotlin/pom.xml | 2 +- client-legacy/pom.xml | 2 +- client-osgi/pom.xml | 2 +- client-reactive/pom.xml | 2 +- client-scala/cross/2.12/pom.xml | 2 +- client-scala/cross/2.13/pom.xml | 2 +- client-test/pom.xml | 2 +- client-utils/pom.xml | 2 +- client/pom.xml | 2 +- examples/pom.xml | 4 ++-- flux-dsl/pom.xml | 2 +- karaf/karaf-assembly/pom.xml | 2 +- karaf/karaf-features/pom.xml | 2 +- karaf/karaf-kar/pom.xml | 4 ++-- karaf/pom.xml | 2 +- pom.xml | 14 +++++++------- spring/pom.xml | 4 ++-- 19 files changed, 28 insertions(+), 28 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3ab3a676dae..35859f02e3f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -## 5.1.0 [unreleased] +## 6.0.0 [unreleased] ### Migration Notice :warning: The InfluxDB Client Library uses internally `RxJava` to support write with batching, retry and backpressure. diff --git a/client-core/pom.xml b/client-core/pom.xml index 7a31f32cd5a..9ec9a612149 100644 --- a/client-core/pom.xml +++ b/client-core/pom.xml @@ -28,7 +28,7 @@ influxdb-client com.influxdb - 5.1.0-SNAPSHOT + 6.0.0-SNAPSHOT influxdb-client-core diff --git a/client-kotlin/pom.xml b/client-kotlin/pom.xml index c83980c533b..e4a0ae9b02a 100644 --- a/client-kotlin/pom.xml +++ b/client-kotlin/pom.xml @@ -26,7 +26,7 @@ influxdb-client com.influxdb - 5.1.0-SNAPSHOT + 6.0.0-SNAPSHOT 4.0.0 diff --git a/client-legacy/pom.xml b/client-legacy/pom.xml index fec65b99d91..bba3a928d3b 100644 --- a/client-legacy/pom.xml +++ b/client-legacy/pom.xml @@ -28,7 +28,7 @@ com.influxdb influxdb-client - 5.1.0-SNAPSHOT + 6.0.0-SNAPSHOT influxdb-client-flux diff --git a/client-osgi/pom.xml b/client-osgi/pom.xml index 6ef4c06206a..44b1fa8bc63 100644 --- a/client-osgi/pom.xml +++ b/client-osgi/pom.xml @@ -28,7 +28,7 @@ influxdb-client com.influxdb - 5.1.0-SNAPSHOT + 6.0.0-SNAPSHOT influxdb-client-osgi diff --git a/client-reactive/pom.xml b/client-reactive/pom.xml index 48f51c44fa2..90bb768bb29 100644 --- a/client-reactive/pom.xml +++ b/client-reactive/pom.xml @@ -26,7 +26,7 @@ influxdb-client com.influxdb - 5.1.0-SNAPSHOT + 6.0.0-SNAPSHOT 4.0.0 diff --git a/client-scala/cross/2.12/pom.xml b/client-scala/cross/2.12/pom.xml index 16c172a9d9b..f01e1d092e3 100644 --- a/client-scala/cross/2.12/pom.xml +++ b/client-scala/cross/2.12/pom.xml @@ -26,7 +26,7 @@ influxdb-client com.influxdb - 5.1.0-SNAPSHOT + 6.0.0-SNAPSHOT ../../../pom.xml 4.0.0 diff --git a/client-scala/cross/2.13/pom.xml b/client-scala/cross/2.13/pom.xml index f4ed9d1ee49..faad9b7952b 100644 --- a/client-scala/cross/2.13/pom.xml +++ b/client-scala/cross/2.13/pom.xml @@ -26,7 +26,7 @@ influxdb-client com.influxdb - 5.1.0-SNAPSHOT + 6.0.0-SNAPSHOT ../../../pom.xml 4.0.0 diff --git a/client-test/pom.xml b/client-test/pom.xml index 1c377a8b2bc..5fe7036685d 100644 --- a/client-test/pom.xml +++ b/client-test/pom.xml @@ -28,7 +28,7 @@ influxdb-client com.influxdb - 5.1.0-SNAPSHOT + 6.0.0-SNAPSHOT influxdb-client-test diff --git a/client-utils/pom.xml b/client-utils/pom.xml index 83fa3d5e996..3fbe7ad47ba 100644 --- a/client-utils/pom.xml +++ b/client-utils/pom.xml @@ -28,7 +28,7 @@ influxdb-client com.influxdb - 5.1.0-SNAPSHOT + 6.0.0-SNAPSHOT influxdb-client-utils diff --git a/client/pom.xml b/client/pom.xml index 99fa653623c..b0f1f16769a 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -26,7 +26,7 @@ influxdb-client com.influxdb - 5.1.0-SNAPSHOT + 6.0.0-SNAPSHOT 4.0.0 diff --git a/examples/pom.xml b/examples/pom.xml index 7d4a39a2d7a..5de342d0372 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -27,12 +27,12 @@ influxdb-client com.influxdb - 5.1.0-SNAPSHOT + 6.0.0-SNAPSHOT true - 5.1.0-SNAPSHOT + 6.0.0-SNAPSHOT 4.0.0 diff --git a/flux-dsl/pom.xml b/flux-dsl/pom.xml index b7bd245a24f..08ac06c5b19 100644 --- a/flux-dsl/pom.xml +++ b/flux-dsl/pom.xml @@ -28,7 +28,7 @@ influxdb-client com.influxdb - 5.1.0-SNAPSHOT + 6.0.0-SNAPSHOT flux-dsl diff --git a/karaf/karaf-assembly/pom.xml b/karaf/karaf-assembly/pom.xml index 64d18d29267..7908564a106 100644 --- a/karaf/karaf-assembly/pom.xml +++ b/karaf/karaf-assembly/pom.xml @@ -28,7 +28,7 @@ influxdb-karaf com.influxdb - 5.1.0-SNAPSHOT + 6.0.0-SNAPSHOT influxdb-karaf-assembly diff --git a/karaf/karaf-features/pom.xml b/karaf/karaf-features/pom.xml index 0c983b2f3c1..5a299c6d315 100644 --- a/karaf/karaf-features/pom.xml +++ b/karaf/karaf-features/pom.xml @@ -28,7 +28,7 @@ influxdb-karaf com.influxdb - 5.1.0-SNAPSHOT + 6.0.0-SNAPSHOT influxdb-karaf-features diff --git a/karaf/karaf-kar/pom.xml b/karaf/karaf-kar/pom.xml index 7da9e902e96..d3aedac3ce2 100644 --- a/karaf/karaf-kar/pom.xml +++ b/karaf/karaf-kar/pom.xml @@ -28,7 +28,7 @@ influxdb-karaf com.influxdb - 5.1.0-SNAPSHOT + 6.0.0-SNAPSHOT influxdb-karaf-kar @@ -75,7 +75,7 @@ ${project.groupId} influxdb-karaf-features - 5.1.0-SNAPSHOT + 6.0.0-SNAPSHOT features xml diff --git a/karaf/pom.xml b/karaf/pom.xml index 0829543cfe0..21629767977 100644 --- a/karaf/pom.xml +++ b/karaf/pom.xml @@ -28,7 +28,7 @@ influxdb-client com.influxdb - 5.1.0-SNAPSHOT + 6.0.0-SNAPSHOT influxdb-karaf diff --git a/pom.xml b/pom.xml index 76534784465..5f4fa7ffa12 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ com.influxdb influxdb-client - 5.1.0-SNAPSHOT + 6.0.0-SNAPSHOT pom @@ -475,38 +475,38 @@ com.influxdb influxdb-client-test - 5.1.0-SNAPSHOT + 6.0.0-SNAPSHOT test com.influxdb influxdb-client-core - 5.1.0-SNAPSHOT + 6.0.0-SNAPSHOT com.influxdb influxdb-client-utils - 5.1.0-SNAPSHOT + 6.0.0-SNAPSHOT com.influxdb influxdb-client-java - 5.1.0-SNAPSHOT + 6.0.0-SNAPSHOT com.influxdb influxdb-client-reactive - 5.1.0-SNAPSHOT + 6.0.0-SNAPSHOT com.influxdb influxdb-client-flux - 5.1.0-SNAPSHOT + 6.0.0-SNAPSHOT diff --git a/spring/pom.xml b/spring/pom.xml index 4771d900b24..472f11b5a16 100644 --- a/spring/pom.xml +++ b/spring/pom.xml @@ -26,12 +26,12 @@ influxdb-client com.influxdb - 5.1.0-SNAPSHOT + 6.0.0-SNAPSHOT 4.0.0 influxdb-spring - 5.1.0-SNAPSHOT + 6.0.0-SNAPSHOT jar Spring Integration for InfluxDB 2.0 From 28627430227d239b48addfd5e9afd0aaf822f47f Mon Sep 17 00:00:00 2001 From: rhajek Date: Mon, 4 Apr 2022 16:45:54 +0200 Subject: [PATCH 21/21] feat: updated major version --- client/src/test/java/com/influxdb/client/WriteApiTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/src/test/java/com/influxdb/client/WriteApiTest.java b/client/src/test/java/com/influxdb/client/WriteApiTest.java index bc59d26c8eb..2f6a09fbc70 100644 --- a/client/src/test/java/com/influxdb/client/WriteApiTest.java +++ b/client/src/test/java/com/influxdb/client/WriteApiTest.java @@ -1017,7 +1017,7 @@ void userAgent() throws InterruptedException { String userAgent = recordedRequest.getHeader("User-Agent"); - Assertions.assertThat(userAgent).startsWith("influxdb-client-java/5."); + Assertions.assertThat(userAgent).startsWith("influxdb-client-java/6."); } public abstract class Metric {