Fix issue of connecting to influxdb without username/password on okht…

…tp 4.x.x (#644) * Fix issue of connecting InfluxDB without username / password in OkHttp 4+ Add BasicAuthInterceptor to OkHttpClient.Builder only when username and password are not nul * Use InfluxDB instead of InfluxDBImpl * Fix import style and remove redundant casting * Add test case to cover the condition check for adding BasicAuthInterceptor into OkHttp client * Remove the condition check for adding BasicAuthInterceptor in the internal constructor used by test.
influxdata · Dec 22, 2019 · d944e96 · d944e96
1 parent 8090798
commit d944e96
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 13 deletions.
diff --git a/pom.xml b/pom.xml
@@ -280,12 +280,12 @@
     <dependency>
       <groupId>com.squareup.okhttp3</groupId>
       <artifactId>okhttp</artifactId>
-      <version>3.14.4</version>
+      <version>4.2.2</version>
     </dependency>
     <dependency>
       <groupId>com.squareup.okhttp3</groupId>
       <artifactId>logging-interceptor</artifactId>
-      <version>3.14.4</version>
+      <version>4.2.2</version>
     </dependency>
   </dependencies>
   <profiles>

diff --git a/src/main/java/org/influxdb/impl/BatchProcessor.java b/src/main/java/org/influxdb/impl/BatchProcessor.java
@@ -35,7 +35,7 @@ public final class BatchProcessor {
   protected final BlockingQueue<AbstractBatchEntry> queue;
   private final ScheduledExecutorService scheduler;
   private final BiConsumer<Iterable<Point>, Throwable> exceptionHandler;
-  final InfluxDBImpl influxDB;
+  final InfluxDB influxDB;
   final int actions;
   private final TimeUnit flushIntervalUnit;
   private final int flushInterval;
@@ -48,7 +48,7 @@ public final class BatchProcessor {
    * The Builder to create a BatchProcessor instance.
    */
   public static final class Builder {
-    private final InfluxDBImpl influxDB;
+    private final InfluxDB influxDB;
     private ThreadFactory threadFactory = Executors.defaultThreadFactory();
     private int actions;
     private TimeUnit flushIntervalUnit;
@@ -77,7 +77,7 @@ public Builder threadFactory(final ThreadFactory threadFactory) {
      *            is mandatory.
      */
     public Builder(final InfluxDB influxDB) {
-      this.influxDB = (InfluxDBImpl) influxDB;
+      this.influxDB = influxDB;
     }
 
     /**
@@ -259,7 +259,7 @@ public static Builder builder(final InfluxDB influxDB) {
     return new Builder(influxDB);
   }
 
-  BatchProcessor(final InfluxDBImpl influxDB, final BatchWriter batchWriter, final ThreadFactory threadFactory,
+  BatchProcessor(final InfluxDB influxDB, final BatchWriter batchWriter, final ThreadFactory threadFactory,
                  final int actions, final TimeUnit flushIntervalUnit, final int flushInterval, final int jitterInterval,
                  final BiConsumer<Iterable<Point>, Throwable> exceptionHandler,
                  final ConsistencyLevel consistencyLevel, final TimeUnit precision) {

diff --git a/src/main/java/org/influxdb/impl/InfluxDBImpl.java b/src/main/java/org/influxdb/impl/InfluxDBImpl.java
@@ -147,9 +147,12 @@ public InfluxDBImpl(final String url, final String username, final String passwo
     setLogLevel(LOG_LEVEL);
 
     this.gzipRequestInterceptor = new GzipRequestInterceptor();
-    OkHttpClient.Builder clonedOkHttpBuilder = okHttpBuilder.build().newBuilder();
-    clonedOkHttpBuilder.addInterceptor(loggingInterceptor).addInterceptor(gzipRequestInterceptor).
-      addInterceptor(new BasicAuthInterceptor(username, password));
+    OkHttpClient.Builder clonedOkHttpBuilder = okHttpBuilder.build().newBuilder()
+            .addInterceptor(loggingInterceptor)
+            .addInterceptor(gzipRequestInterceptor);
+    if (username != null && password != null) {
+      clonedOkHttpBuilder.addInterceptor(new BasicAuthInterceptor(username, password));
+    }
     Factory converterFactory = null;
     switch (responseFormat) {
     case MSGPACK:
@@ -195,9 +198,11 @@ public InfluxDBImpl(final String url, final String username, final String passwo
     setLogLevel(LOG_LEVEL);
 
     this.gzipRequestInterceptor = new GzipRequestInterceptor();
-    OkHttpClient.Builder clonedBuilder = client.build().newBuilder();
-    this.client = clonedBuilder.addInterceptor(loggingInterceptor).addInterceptor(gzipRequestInterceptor).
-        addInterceptor(new BasicAuthInterceptor(username, password)).build();
+    OkHttpClient.Builder clonedBuilder = client.build().newBuilder()
+            .addInterceptor(loggingInterceptor)
+            .addInterceptor(gzipRequestInterceptor)
+            .addInterceptor(new BasicAuthInterceptor(username, password));
+    this.client = clonedBuilder.build();
     this.retrofit = new Retrofit.Builder().baseUrl(url)
         .client(this.client)
         .addConverterFactory(MoshiConverterFactory.create()).build();

diff --git a/src/test/java/org/influxdb/InfluxDBFactoryTest.java b/src/test/java/org/influxdb/InfluxDBFactoryTest.java
@@ -21,11 +21,17 @@ public class InfluxDBFactoryTest {
 	 * Test for a {@link InfluxDBFactory #connect(String)}.
 	 */
 	@Test
-	public void testCreateInfluxDBInstanceWithoutUserNameAndPassword() {
+	public void testShouldNotUseBasicAuthWhenCreateInfluxDBInstanceWithoutUserNameAndPassword() {
 		InfluxDB influxDB = InfluxDBFactory.connect("http://" + TestUtils.getInfluxIP() + ":" + TestUtils.getInfluxPORT(true));
 		verifyInfluxDBInstance(influxDB);
 	}
 
+	@Test
+	public void testShouldNotUseBasicAuthWhenCreateInfluxDBInstanceWithUserNameAndWithoutPassword() {
+		InfluxDB influxDB = InfluxDBFactory.connect("http://" + TestUtils.getInfluxIP() + ":" + TestUtils.getInfluxPORT(true), "admin", null);
+		verifyInfluxDBInstance(influxDB);
+	}
+
 	private void verifyInfluxDBInstance(InfluxDB influxDB) {
 		Assertions.assertNotNull(influxDB);
 		Pong pong = influxDB.ping();