feat: rebase and fixing rxjava3 tests

Author: rhajek

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;

client/pom.xml

@@ -129,7 +129,7 @@
 
         <dependency>
             <groupId>com.squareup.retrofit2</groupId>
-            <artifactId>adapter-rxjava2</artifactId>
+            <artifactId>adapter-rxjava3</artifactId>
             <exclusions>
                 <exclusion>
                     <groupId>com.squareup.okhttp3</groupId>
@@ -166,25 +166,6 @@
             <artifactId>converter-gson</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>com.squareup.retrofit2</groupId>
-            <artifactId>adapter-rxjava3</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>com.squareup.okhttp3</groupId>
-                    <artifactId>okhttp</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>com.squareup.retrofit2</groupId>
-                    <artifactId>retrofit</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>io.reactivex.rxjava2</groupId>
-                    <artifactId>rxjava</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
         <dependency>
             <groupId>com.moandjiezana.toml</groupId>
             <artifactId>toml4j</artifactId>

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);