From 838a3dd769fb0317c173260ffb78c42f03495871 Mon Sep 17 00:00:00 2001 From: NguyenHoangSon96 Date: Tue, 18 Feb 2025 18:48:03 +0700 Subject: [PATCH 01/10] feat: unique interceptors for okhttp --- .../internal/AbstractInfluxDBClient.java | 32 +++++++++++++------ 1 file changed, 22 insertions(+), 10 deletions(-) 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 def96dd34a0..453323b0d1f 100644 --- a/client/src/main/java/com/influxdb/client/internal/AbstractInfluxDBClient.java +++ b/client/src/main/java/com/influxdb/client/internal/AbstractInfluxDBClient.java @@ -21,15 +21,6 @@ */ package com.influxdb.client.internal; -import java.io.IOException; -import java.util.Collection; -import java.util.Collections; -import java.util.Objects; -import java.util.concurrent.CopyOnWriteArrayList; -import java.util.logging.Level; -import java.util.logging.Logger; -import javax.annotation.Nonnull; - import com.influxdb.client.InfluxDBClientOptions; import com.influxdb.client.JSON; import com.influxdb.client.domain.Dialect; @@ -40,7 +31,7 @@ import com.influxdb.internal.AbstractRestClient; import com.influxdb.internal.UserAgentInterceptor; import com.influxdb.utils.Arguments; - +import okhttp3.Interceptor; import okhttp3.OkHttpClient; import okhttp3.logging.HttpLoggingInterceptor; import retrofit2.Call; @@ -50,6 +41,16 @@ import retrofit2.converter.gson.GsonConverterFactory; import retrofit2.converter.scalars.ScalarsConverterFactory; +import javax.annotation.Nonnull; +import java.io.IOException; +import java.util.Collection; +import java.util.Collections; +import java.util.List; +import java.util.Objects; +import java.util.concurrent.CopyOnWriteArrayList; +import java.util.logging.Level; +import java.util.logging.Logger; + /** * @author Jakub Bednar (bednar@github) (20/11/2018 07:13) */ @@ -94,6 +95,17 @@ public AbstractInfluxDBClient(@Nonnull final InfluxDBClientOptions options, this.authenticateInterceptor = new AuthenticateInterceptor(options); this.gzipInterceptor = new GzipInterceptor(); + // These Interceptors are the default for OkHttpClient. It must be unique for every OkHttpClient + List> excludeInterceptorClasses = List.of( + UserAgentInterceptor.class, + AuthenticateInterceptor.class, + HttpLoggingInterceptor.class, + GzipInterceptor.class + ); + options.getOkHttpClient() + .interceptors() + .removeIf(interceptor -> excludeInterceptorClasses.contains(interceptor.getClass())); + String customClientType = options.getClientType() != null ? options.getClientType() : clientType; this.okHttpClient = options.getOkHttpClient() // From d5edc2fce27ee7d6db4b02b6fdf7a3e70ff1bf51 Mon Sep 17 00:00:00 2001 From: NguyenHoangSon96 Date: Tue, 18 Feb 2025 19:14:38 +0700 Subject: [PATCH 02/10] feat: add test case for interceptors --- .../influxdb/client/InfluxDBClientTest.java | 78 ++++++++++++------- 1 file changed, 50 insertions(+), 28 deletions(-) diff --git a/client/src/test/java/com/influxdb/client/InfluxDBClientTest.java b/client/src/test/java/com/influxdb/client/InfluxDBClientTest.java index c3a53bb238c..756759a813e 100644 --- a/client/src/test/java/com/influxdb/client/InfluxDBClientTest.java +++ b/client/src/test/java/com/influxdb/client/InfluxDBClientTest.java @@ -21,36 +21,11 @@ */ package com.influxdb.client; -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.io.OutputStream; -import java.net.InetSocketAddress; -import java.net.Proxy; -import java.util.List; -import java.util.Objects; -import java.util.logging.Level; -import java.util.logging.LogRecord; -import java.util.logging.Logger; -import javax.annotation.Nonnull; - -import com.influxdb.client.domain.InfluxQLQuery; -import com.influxdb.client.service.InfluxQLQueryService; -import com.sun.net.httpserver.HttpExchange; -import com.sun.net.httpserver.HttpServer; -import com.sun.net.httpserver.HttpHandler; import com.influxdb.LogLevel; -import com.influxdb.client.domain.Authorization; -import com.influxdb.client.domain.Run; -import com.influxdb.client.domain.WriteConsistency; -import com.influxdb.client.domain.WritePrecision; +import com.influxdb.client.domain.*; import com.influxdb.client.internal.AbstractInfluxDBClientTest; - -import okhttp3.HttpUrl; -import okhttp3.Interceptor; -import okhttp3.OkHttpClient; -import okhttp3.Request; -import okhttp3.Response; -import okhttp3.ResponseBody; +import com.influxdb.client.service.InfluxQLQueryService; +import okhttp3.*; import okhttp3.mockwebserver.Dispatcher; import okhttp3.mockwebserver.MockResponse; import okhttp3.mockwebserver.MockWebServer; @@ -59,6 +34,16 @@ import org.junit.jupiter.api.Test; import retrofit2.Call; +import javax.annotation.Nonnull; +import java.io.IOException; +import java.net.InetSocketAddress; +import java.net.Proxy; +import java.util.List; +import java.util.Objects; +import java.util.logging.Level; +import java.util.logging.LogRecord; +import java.util.logging.Logger; + /** * @author Jakub Bednar (bednar@github) (05/09/2018 14:00) */ @@ -500,6 +485,43 @@ public void redactedAuthorizationHeader() { Assertions.assertThat(authorizationLog.getMessage()).isEqualTo("Authorization: ██"); } + @Test + void testDefaultInterceptors() { + String url = "http://localhost:8086"; + InfluxDBClientOptions options = new InfluxDBClientOptions.Builder() + .url(url) + .build(); + + InfluxDBClient client = InfluxDBClientFactory.create(options); + List interceptors = options.getOkHttpClient().interceptors(); + Assertions.assertThat(interceptors.size()).isEqualTo(4); + client.close(); + + InfluxDBClient client1 = InfluxDBClientFactory.create(options); + interceptors = options.getOkHttpClient().interceptors(); + Assertions.assertThat(interceptors.size()).isEqualTo(4); + client1.close(); + + // okHttpBuilder with additional Interceptors + OkHttpClient.Builder okHttpBuilder = new OkHttpClient.Builder(); + okHttpBuilder.addInterceptor(chain -> chain.proceed(chain.request())); + okHttpBuilder.addInterceptor(chain -> chain.proceed(chain.request())); + + InfluxDBClientOptions options1 = new InfluxDBClientOptions.Builder() + .url(url) + .okHttpClient(okHttpBuilder) + .build(); + client = InfluxDBClientFactory.create(options1); + interceptors = options1.getOkHttpClient().interceptors(); + Assertions.assertThat(interceptors.size()).isEqualTo(6); + client.close(); + + client1 = InfluxDBClientFactory.create(options1); + interceptors = options1.getOkHttpClient().interceptors(); + Assertions.assertThat(interceptors.size()).isEqualTo(6); + client1.close(); + } + private void queryAndTest(final String expected) throws InterruptedException { RecordedRequest request = takeRequest(); Assertions.assertThat(request).isNotNull(); From c3f90afe510f0004ae1eb959019c1c02f7770ec0 Mon Sep 17 00:00:00 2001 From: NguyenHoangSon96 Date: Tue, 18 Feb 2025 19:23:22 +0700 Subject: [PATCH 03/10] chore: CHANGELOG.md --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 921759e2fd1..5ed29ed9a63 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ ## 7.3.0 [unreleased] +### Features + +- [#821](https://github.com/influxdata/influxdb-client-java/pull/821): Prevent duplicate interceptors in OkHttpClient builder + ### Dependencies ⚠️ Important Notice: Starting from this release, we won’t be listing every dependency change in our changelog. This helps us maintain the project faster and focus on important features for our InfluxDB client. From 518da6a56a77642f32dd631b2f92fc972f3f6d96 Mon Sep 17 00:00:00 2001 From: NguyenHoangSon96 Date: Tue, 18 Feb 2025 19:38:20 +0700 Subject: [PATCH 04/10] fix: check style --- .../influxdb/client/InfluxDBClientTest.java | 79 +++++++++++-------- 1 file changed, 48 insertions(+), 31 deletions(-) diff --git a/client/src/test/java/com/influxdb/client/InfluxDBClientTest.java b/client/src/test/java/com/influxdb/client/InfluxDBClientTest.java index 756759a813e..0a374291015 100644 --- a/client/src/test/java/com/influxdb/client/InfluxDBClientTest.java +++ b/client/src/test/java/com/influxdb/client/InfluxDBClientTest.java @@ -21,11 +21,29 @@ */ package com.influxdb.client; +import javax.annotation.Nonnull; +import java.io.IOException; +import java.net.InetSocketAddress; +import java.net.Proxy; +import java.util.List; +import java.util.Objects; +import java.util.logging.Level; +import java.util.logging.LogRecord; +import java.util.logging.Logger; import com.influxdb.LogLevel; -import com.influxdb.client.domain.*; +import com.influxdb.client.domain.Authorization; +import com.influxdb.client.domain.InfluxQLQuery; +import com.influxdb.client.domain.Run; +import com.influxdb.client.domain.WriteConsistency; +import com.influxdb.client.domain.WritePrecision; import com.influxdb.client.internal.AbstractInfluxDBClientTest; import com.influxdb.client.service.InfluxQLQueryService; -import okhttp3.*; +import okhttp3.HttpUrl; +import okhttp3.Interceptor; +import okhttp3.OkHttpClient; +import okhttp3.Request; +import okhttp3.Response; +import okhttp3.ResponseBody; import okhttp3.mockwebserver.Dispatcher; import okhttp3.mockwebserver.MockResponse; import okhttp3.mockwebserver.MockWebServer; @@ -34,16 +52,6 @@ import org.junit.jupiter.api.Test; import retrofit2.Call; -import javax.annotation.Nonnull; -import java.io.IOException; -import java.net.InetSocketAddress; -import java.net.Proxy; -import java.util.List; -import java.util.Objects; -import java.util.logging.Level; -import java.util.logging.LogRecord; -import java.util.logging.Logger; - /** * @author Jakub Bednar (bednar@github) (05/09/2018 14:00) */ @@ -115,10 +123,10 @@ public void createNotificationRulesApi() { public void serviceHeaderDefault() { InfluxQLQueryService service = influxDBClient.getService(InfluxQLQueryService.class); Call call = service.query("SELECT * FROM cpu", "test_db", - null, - null, - null, - InfluxQLQuery.AcceptHeader.JSON.getVal()); + null, + null, + null, + InfluxQLQuery.AcceptHeader.JSON.getVal()); Assertions.assertThat(call.request().header("Accept")).isEqualTo("application/json"); } @@ -126,10 +134,10 @@ public void serviceHeaderDefault() { public void serviceHeaderChange() { InfluxQLQueryService service = influxDBClient.getService(InfluxQLQueryService.class); Call call = service.query("SELECT * FROM cpu", "test_db", - null, - null, - null, - InfluxQLQuery.AcceptHeader.CSV.getVal()); + null, + null, + null, + InfluxQLQuery.AcceptHeader.CSV.getVal()); Assertions.assertThat(call.request().header("accept")).isEqualTo("application/csv"); } @@ -206,7 +214,8 @@ void parseUnknownEnumAsNull() { @Test void parseDateTime() { - mockServer.enqueue(new MockResponse().setBody("{\"id\":\"runID\",\"taskID\":\"taskID\",\"startedAt\":\"2019-03-11T11:57:30.830995162Z\"}")); + mockServer.enqueue(new MockResponse().setBody( + "{\"id\":\"runID\",\"taskID\":\"taskID\",\"startedAt\":\"2019-03-11T11:57:30.830995162Z\"}")); Run run = influxDBClient.getTasksApi().getRun("taskID", "runID"); @@ -230,19 +239,23 @@ public void trailingSlashInUrl() throws InterruptedException { InfluxDBClient influxDBClient = InfluxDBClientFactory .create(path, "my-token".toCharArray()); - influxDBClient.getWriteApiBlocking().writeRecord("my-bucket", "my-org", WritePrecision.NS, "record,tag=a value=1"); + influxDBClient.getWriteApiBlocking() + .writeRecord("my-bucket", "my-org", WritePrecision.NS, "record,tag=a value=1"); RecordedRequest request = mockServer.takeRequest(); - Assertions.assertThat(request.getRequestUrl().toString()).isEqualTo(path + "api/v2/write?org=my-org&bucket=my-bucket&precision=ns"); + Assertions.assertThat(request.getRequestUrl().toString()) + .isEqualTo(path + "api/v2/write?org=my-org&bucket=my-bucket&precision=ns"); influxDBClient.close(); influxDBClient = InfluxDBClientFactory .create(path.substring(0, path.length() - 1), "my-token".toCharArray()); - influxDBClient.getWriteApiBlocking().writeRecord("my-bucket", "my-org", WritePrecision.NS, "record,tag=a value=1"); + influxDBClient.getWriteApiBlocking() + .writeRecord("my-bucket", "my-org", WritePrecision.NS, "record,tag=a value=1"); request = mockServer.takeRequest(); - Assertions.assertThat(request.getRequestUrl().toString()).isEqualTo(path + "api/v2/write?org=my-org&bucket=my-bucket&precision=ns"); + Assertions.assertThat(request.getRequestUrl().toString()) + .isEqualTo(path + "api/v2/write?org=my-org&bucket=my-bucket&precision=ns"); influxDBClient.close(); } @@ -262,9 +275,11 @@ void customPath() throws InterruptedException { // http://localhost:8086 -> http://localhost:8086/api/v2/query {serverURL, serverURL + "/api/v2/query"}, // http://localhost:8086?readTimeout=1000&writeTimeout=3000&connectTimeout=2000&logLevel=HEADERS" -> http://localhost:8086/api/v2/query - {serverURL + "?readTimeout=1000&writeTimeout=3000&connectTimeout=2000&logLevel=HEADERS", serverURL + "/api/v2/query"}, + {serverURL + "?readTimeout=1000&writeTimeout=3000&connectTimeout=2000&logLevel=HEADERS", + serverURL + "/api/v2/query"}, // http://localhost:8086/influx?readTimeout=1000&writeTimeout=3000&connectTimeout=2000&logLevel=HEADERS" -> http://localhost:8086/influx/api/v2/query - {serverURL + "/influx?readTimeout=1000&writeTimeout=3000&connectTimeout=2000&logLevel=HEADERS", serverURL + "/influx/api/v2/query"} + {serverURL + "/influx?readTimeout=1000&writeTimeout=3000&connectTimeout=2000&logLevel=HEADERS", + serverURL + "/influx/api/v2/query"} }; for (String[] connectionString : connectionStrings) { @@ -409,14 +424,14 @@ public void connectionStringPrecision() { InfluxDBClientOptions options = InfluxDBClientOptions.builder() .connectionString("https://us-west-2-1.aws.cloud2.influxdata.com?precision=US") .build(); - + Assertions.assertThat(options.getPrecision()).isEqualTo(WritePrecision.US); } @Test public void propertiesPrecision() { InfluxDBClientOptions options = InfluxDBClientOptions.builder().loadProperties().build(); - + Assertions.assertThat(options.getPrecision()).isEqualTo(WritePrecision.US); } @@ -453,7 +468,8 @@ public void customClientType() throws InterruptedException { .writeRecord("my-bucket", "my-org", WritePrecision.NS, "record,tag=a value=1"); RecordedRequest request = mockServer.takeRequest(); - Assertions.assertThat(request.getHeaders().get("User-Agent")).startsWith("influxdb-client-awesome-service/"); + Assertions.assertThat(request.getHeaders().get("User-Agent")) + .startsWith("influxdb-client-awesome-service/"); } } @@ -467,7 +483,8 @@ public void redactedAuthorizationHeader() { final Logger logger = Logger.getLogger("okhttp3.OkHttpClient"); logger.addHandler(handler); - try (InfluxDBClient client = InfluxDBClientFactory.create(mockServer.url("/").toString(), "my-token".toCharArray())) { + try (InfluxDBClient client = InfluxDBClientFactory.create(mockServer.url("/").toString(), + "my-token".toCharArray())) { client.setLogLevel(LogLevel.HEADERS); client .getWriteApiBlocking() From 309528cbfb809fd864d0b125e18320020840cae7 Mon Sep 17 00:00:00 2001 From: NguyenHoangSon96 Date: Tue, 18 Feb 2025 19:38:36 +0700 Subject: [PATCH 05/10] fix: check style --- .../internal/AbstractInfluxDBClient.java | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) 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 453323b0d1f..f8a23f80eaa 100644 --- a/client/src/main/java/com/influxdb/client/internal/AbstractInfluxDBClient.java +++ b/client/src/main/java/com/influxdb/client/internal/AbstractInfluxDBClient.java @@ -21,6 +21,15 @@ */ package com.influxdb.client.internal; +import javax.annotation.Nonnull; +import java.io.IOException; +import java.util.Collection; +import java.util.Collections; +import java.util.List; +import java.util.Objects; +import java.util.concurrent.CopyOnWriteArrayList; +import java.util.logging.Level; +import java.util.logging.Logger; import com.influxdb.client.InfluxDBClientOptions; import com.influxdb.client.JSON; import com.influxdb.client.domain.Dialect; @@ -41,16 +50,6 @@ import retrofit2.converter.gson.GsonConverterFactory; import retrofit2.converter.scalars.ScalarsConverterFactory; -import javax.annotation.Nonnull; -import java.io.IOException; -import java.util.Collection; -import java.util.Collections; -import java.util.List; -import java.util.Objects; -import java.util.concurrent.CopyOnWriteArrayList; -import java.util.logging.Level; -import java.util.logging.Logger; - /** * @author Jakub Bednar (bednar@github) (20/11/2018 07:13) */ From 05a941bf1f73cb290499df50e80f292b463d0360 Mon Sep 17 00:00:00 2001 From: NguyenHoangSon96 Date: Tue, 18 Feb 2025 19:42:22 +0700 Subject: [PATCH 06/10] fix: check style --- .../java/com/influxdb/client/InfluxDBClientOptions.java | 8 +++----- .../com/influxdb/client/internal/InfluxDBClientImpl.java | 6 ++---- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/client/src/main/java/com/influxdb/client/InfluxDBClientOptions.java b/client/src/main/java/com/influxdb/client/InfluxDBClientOptions.java index 528f5418dd9..e8d2f751a9c 100644 --- a/client/src/main/java/com/influxdb/client/InfluxDBClientOptions.java +++ b/client/src/main/java/com/influxdb/client/InfluxDBClientOptions.java @@ -21,6 +21,9 @@ */ package com.influxdb.client; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; +import javax.annotation.concurrent.NotThreadSafe; import java.io.IOException; import java.io.InputStream; import java.time.Duration; @@ -29,10 +32,6 @@ import java.util.Properties; import java.util.regex.Matcher; import java.util.regex.Pattern; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; -import javax.annotation.concurrent.NotThreadSafe; - import com.influxdb.LogLevel; import com.influxdb.client.domain.WriteConsistency; import com.influxdb.client.domain.WritePrecision; @@ -40,7 +39,6 @@ import com.influxdb.client.write.WriteParameters; import com.influxdb.exceptions.InfluxException; import com.influxdb.utils.Arguments; - import okhttp3.HttpUrl; import okhttp3.OkHttpClient; import okhttp3.Protocol; 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 016be470c03..0a122a56538 100644 --- a/client/src/main/java/com/influxdb/client/internal/InfluxDBClientImpl.java +++ b/client/src/main/java/com/influxdb/client/internal/InfluxDBClientImpl.java @@ -21,11 +21,10 @@ */ package com.influxdb.client.internal; -import java.util.logging.Level; -import java.util.logging.Logger; import javax.annotation.Nonnull; import javax.annotation.Nullable; - +import java.util.logging.Level; +import java.util.logging.Logger; import com.influxdb.LogLevel; import com.influxdb.client.AuthorizationsApi; import com.influxdb.client.BucketsApi; @@ -80,7 +79,6 @@ import com.influxdb.exceptions.InfluxException; import com.influxdb.exceptions.UnprocessableEntityException; import com.influxdb.utils.Arguments; - import retrofit2.Call; /** From 9dfc4a452d40070057f547e0cd8956568c20090c Mon Sep 17 00:00:00 2001 From: NguyenHoangSon96 Date: Tue, 18 Feb 2025 19:49:46 +0700 Subject: [PATCH 07/10] fix: check style --- .../internal/AbstractInfluxDBClient.java | 22 ++++++++++--------- .../client/internal/InfluxDBClientImpl.java | 8 ++++--- .../influxdb/client/InfluxDBClientTest.java | 20 +++++++++-------- 3 files changed, 28 insertions(+), 22 deletions(-) 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 f8a23f80eaa..d3fb34cabcc 100644 --- a/client/src/main/java/com/influxdb/client/internal/AbstractInfluxDBClient.java +++ b/client/src/main/java/com/influxdb/client/internal/AbstractInfluxDBClient.java @@ -21,7 +21,6 @@ */ package com.influxdb.client.internal; -import javax.annotation.Nonnull; import java.io.IOException; import java.util.Collection; import java.util.Collections; @@ -30,6 +29,18 @@ import java.util.concurrent.CopyOnWriteArrayList; import java.util.logging.Level; import java.util.logging.Logger; +import javax.annotation.Nonnull; + +import okhttp3.Interceptor; +import okhttp3.OkHttpClient; +import okhttp3.logging.HttpLoggingInterceptor; +import retrofit2.Call; +import retrofit2.CallAdapter; +import retrofit2.Retrofit; +import retrofit2.adapter.rxjava3.RxJava3CallAdapterFactory; +import retrofit2.converter.gson.GsonConverterFactory; +import retrofit2.converter.scalars.ScalarsConverterFactory; + import com.influxdb.client.InfluxDBClientOptions; import com.influxdb.client.JSON; import com.influxdb.client.domain.Dialect; @@ -40,15 +51,6 @@ import com.influxdb.internal.AbstractRestClient; import com.influxdb.internal.UserAgentInterceptor; import com.influxdb.utils.Arguments; -import okhttp3.Interceptor; -import okhttp3.OkHttpClient; -import okhttp3.logging.HttpLoggingInterceptor; -import retrofit2.Call; -import retrofit2.CallAdapter; -import retrofit2.Retrofit; -import retrofit2.adapter.rxjava3.RxJava3CallAdapterFactory; -import retrofit2.converter.gson.GsonConverterFactory; -import retrofit2.converter.scalars.ScalarsConverterFactory; /** * @author Jakub Bednar (bednar@github) (20/11/2018 07:13) 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 0a122a56538..96bf9cd2039 100644 --- a/client/src/main/java/com/influxdb/client/internal/InfluxDBClientImpl.java +++ b/client/src/main/java/com/influxdb/client/internal/InfluxDBClientImpl.java @@ -21,10 +21,13 @@ */ package com.influxdb.client.internal; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; import java.util.logging.Level; import java.util.logging.Logger; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; + +import retrofit2.Call; + import com.influxdb.LogLevel; import com.influxdb.client.AuthorizationsApi; import com.influxdb.client.BucketsApi; @@ -79,7 +82,6 @@ import com.influxdb.exceptions.InfluxException; import com.influxdb.exceptions.UnprocessableEntityException; import com.influxdb.utils.Arguments; -import retrofit2.Call; /** * @author Jakub Bednar (bednar@github) (11/10/2018 09:36) diff --git a/client/src/test/java/com/influxdb/client/InfluxDBClientTest.java b/client/src/test/java/com/influxdb/client/InfluxDBClientTest.java index 0a374291015..d706e4d9e3b 100644 --- a/client/src/test/java/com/influxdb/client/InfluxDBClientTest.java +++ b/client/src/test/java/com/influxdb/client/InfluxDBClientTest.java @@ -21,7 +21,6 @@ */ package com.influxdb.client; -import javax.annotation.Nonnull; import java.io.IOException; import java.net.InetSocketAddress; import java.net.Proxy; @@ -30,14 +29,8 @@ import java.util.logging.Level; import java.util.logging.LogRecord; import java.util.logging.Logger; -import com.influxdb.LogLevel; -import com.influxdb.client.domain.Authorization; -import com.influxdb.client.domain.InfluxQLQuery; -import com.influxdb.client.domain.Run; -import com.influxdb.client.domain.WriteConsistency; -import com.influxdb.client.domain.WritePrecision; -import com.influxdb.client.internal.AbstractInfluxDBClientTest; -import com.influxdb.client.service.InfluxQLQueryService; +import javax.annotation.Nonnull; + import okhttp3.HttpUrl; import okhttp3.Interceptor; import okhttp3.OkHttpClient; @@ -52,6 +45,15 @@ import org.junit.jupiter.api.Test; import retrofit2.Call; +import com.influxdb.LogLevel; +import com.influxdb.client.domain.Authorization; +import com.influxdb.client.domain.InfluxQLQuery; +import com.influxdb.client.domain.Run; +import com.influxdb.client.domain.WriteConsistency; +import com.influxdb.client.domain.WritePrecision; +import com.influxdb.client.internal.AbstractInfluxDBClientTest; +import com.influxdb.client.service.InfluxQLQueryService; + /** * @author Jakub Bednar (bednar@github) (05/09/2018 14:00) */ From db41de3b60ed6fc905e50dbc25e46cbcc2205c0e Mon Sep 17 00:00:00 2001 From: NguyenHoangSon96 Date: Mon, 24 Feb 2025 14:40:22 +0700 Subject: [PATCH 08/10] fix: check style --- .../com/influxdb/client/InfluxDBClientOptions.java | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/client/src/main/java/com/influxdb/client/InfluxDBClientOptions.java b/client/src/main/java/com/influxdb/client/InfluxDBClientOptions.java index e8d2f751a9c..abbaa608ae1 100644 --- a/client/src/main/java/com/influxdb/client/InfluxDBClientOptions.java +++ b/client/src/main/java/com/influxdb/client/InfluxDBClientOptions.java @@ -21,9 +21,6 @@ */ package com.influxdb.client; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; -import javax.annotation.concurrent.NotThreadSafe; import java.io.IOException; import java.io.InputStream; import java.time.Duration; @@ -32,6 +29,14 @@ import java.util.Properties; import java.util.regex.Matcher; import java.util.regex.Pattern; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; +import javax.annotation.concurrent.NotThreadSafe; + +import okhttp3.HttpUrl; +import okhttp3.OkHttpClient; +import okhttp3.Protocol; + import com.influxdb.LogLevel; import com.influxdb.client.domain.WriteConsistency; import com.influxdb.client.domain.WritePrecision; @@ -39,9 +44,6 @@ import com.influxdb.client.write.WriteParameters; import com.influxdb.exceptions.InfluxException; import com.influxdb.utils.Arguments; -import okhttp3.HttpUrl; -import okhttp3.OkHttpClient; -import okhttp3.Protocol; /** * InfluxDBClientOptions are used to configure theInfluxDB 2.x connections. From 008fae6cdb71953a254cebdd7df9e31d17606b5f Mon Sep 17 00:00:00 2001 From: NguyenHoangSon96 Date: Mon, 24 Feb 2025 15:05:11 +0700 Subject: [PATCH 09/10] fix: check style --- .../com/influxdb/client/InfluxDBClientOptions.java | 12 ++++++------ .../influxdb/client/internal/InfluxDBClientImpl.java | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/client/src/main/java/com/influxdb/client/InfluxDBClientOptions.java b/client/src/main/java/com/influxdb/client/InfluxDBClientOptions.java index abbaa608ae1..6ae4e0746a2 100644 --- a/client/src/main/java/com/influxdb/client/InfluxDBClientOptions.java +++ b/client/src/main/java/com/influxdb/client/InfluxDBClientOptions.java @@ -33,10 +33,6 @@ import javax.annotation.Nullable; import javax.annotation.concurrent.NotThreadSafe; -import okhttp3.HttpUrl; -import okhttp3.OkHttpClient; -import okhttp3.Protocol; - import com.influxdb.LogLevel; import com.influxdb.client.domain.WriteConsistency; import com.influxdb.client.domain.WritePrecision; @@ -45,6 +41,10 @@ import com.influxdb.exceptions.InfluxException; import com.influxdb.utils.Arguments; +import okhttp3.HttpUrl; +import okhttp3.OkHttpClient; +import okhttp3.Protocol; + /** * InfluxDBClientOptions are used to configure theInfluxDB 2.x connections. * @@ -699,8 +699,8 @@ private ParsedUrl(@Nonnull final String connectionString) { String urlWithoutParams = url.scheme() + "://" + host + ":" + url.port() + url.encodedPath(); this.urlWithoutParams = urlWithoutParams.endsWith("/") - ? urlWithoutParams - : urlWithoutParams + "/"; + ? urlWithoutParams + : urlWithoutParams + "/"; } } } 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 96bf9cd2039..016be470c03 100644 --- a/client/src/main/java/com/influxdb/client/internal/InfluxDBClientImpl.java +++ b/client/src/main/java/com/influxdb/client/internal/InfluxDBClientImpl.java @@ -26,8 +26,6 @@ import javax.annotation.Nonnull; import javax.annotation.Nullable; -import retrofit2.Call; - import com.influxdb.LogLevel; import com.influxdb.client.AuthorizationsApi; import com.influxdb.client.BucketsApi; @@ -83,6 +81,8 @@ import com.influxdb.exceptions.UnprocessableEntityException; import com.influxdb.utils.Arguments; +import retrofit2.Call; + /** * @author Jakub Bednar (bednar@github) (11/10/2018 09:36) */ From 7fe8bdc1b7ebe5dbd0b0662560aa90a22371f4ef Mon Sep 17 00:00:00 2001 From: NguyenHoangSon96 Date: Mon, 24 Feb 2025 15:09:58 +0700 Subject: [PATCH 10/10] fix: check style --- .../internal/AbstractInfluxDBClient.java | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) 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 d3fb34cabcc..a55f8495d2c 100644 --- a/client/src/main/java/com/influxdb/client/internal/AbstractInfluxDBClient.java +++ b/client/src/main/java/com/influxdb/client/internal/AbstractInfluxDBClient.java @@ -31,16 +31,6 @@ import java.util.logging.Logger; import javax.annotation.Nonnull; -import okhttp3.Interceptor; -import okhttp3.OkHttpClient; -import okhttp3.logging.HttpLoggingInterceptor; -import retrofit2.Call; -import retrofit2.CallAdapter; -import retrofit2.Retrofit; -import retrofit2.adapter.rxjava3.RxJava3CallAdapterFactory; -import retrofit2.converter.gson.GsonConverterFactory; -import retrofit2.converter.scalars.ScalarsConverterFactory; - import com.influxdb.client.InfluxDBClientOptions; import com.influxdb.client.JSON; import com.influxdb.client.domain.Dialect; @@ -52,6 +42,16 @@ import com.influxdb.internal.UserAgentInterceptor; import com.influxdb.utils.Arguments; +import okhttp3.Interceptor; +import okhttp3.OkHttpClient; +import okhttp3.logging.HttpLoggingInterceptor; +import retrofit2.Call; +import retrofit2.CallAdapter; +import retrofit2.Retrofit; +import retrofit2.adapter.rxjava3.RxJava3CallAdapterFactory; +import retrofit2.converter.gson.GsonConverterFactory; +import retrofit2.converter.scalars.ScalarsConverterFactory; + /** * @author Jakub Bednar (bednar@github) (20/11/2018 07:13) */