fix: influxdb-client-utils uses different package then `influxdb-cl…

…ient-core` (#276)

CHANGELOG.md

@@ -1,4 +1,8 @@
-## 3.5.0 [unreleased]
+## 4.0.0 [unreleased]
+
+### Breaking Changes
+
+The `Arguments` helper moved from package `com.influxdb` to package `com.influxdb.utils`.
 
 ### Deprecates
 - `InfluxDBClient.health()`: instead use `InfluxDBClient.ping()`
@@ -13,6 +17,9 @@
 ### Bug Fixes
 1. [#279](https://github.com/influxdata/influxdb-client-java/pull/279): Session authentication for InfluxDB `2.1`
 
+### Bug Fixes
+1. [#276](https://github.com/influxdata/influxdb-client-java/pull/276): `influxdb-client-utils` uses different package then `influxdb-client-core`[java module system]
+
 ### CI
 1. [#275](https://github.com/influxdata/influxdb-client-java/pull/275): Deploy `influxdb-client-test` package into Maven repository
 

client-core/pom.xml

@@ -28,7 +28,7 @@
     <parent>
         <artifactId>influxdb-client</artifactId>
         <groupId>com.influxdb</groupId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>influxdb-client-core</artifactId>

client-core/src/main/java/com/influxdb/internal/AbstractQueryApi.java

@@ -36,12 +36,12 @@
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
-import com.influxdb.Arguments;
 import com.influxdb.Cancellable;
 import com.influxdb.exceptions.InfluxException;
 import com.influxdb.query.FluxRecord;
 import com.influxdb.query.internal.FluxCsvParser;
 import com.influxdb.query.internal.FluxResultMapper;
+import com.influxdb.utils.Arguments;
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;

client-core/src/main/java/com/influxdb/internal/AbstractRestClient.java

@@ -28,7 +28,6 @@
 import java.util.logging.Logger;
 import javax.annotation.Nonnull;
 
-import com.influxdb.Arguments;
 import com.influxdb.LogLevel;
 import com.influxdb.exceptions.BadGatewayException;
 import com.influxdb.exceptions.BadRequestException;
@@ -46,6 +45,7 @@
 import com.influxdb.exceptions.ServiceUnavailableException;
 import com.influxdb.exceptions.UnauthorizedException;
 import com.influxdb.exceptions.UnprocessableEntityException;
+import com.influxdb.utils.Arguments;
 
 import okhttp3.MediaType;
 import okhttp3.RequestBody;

client-core/src/main/java/com/influxdb/internal/UserAgentInterceptor.java

@@ -24,7 +24,7 @@
 import java.io.IOException;
 import javax.annotation.Nonnull;
 
-import com.influxdb.Arguments;
+import com.influxdb.utils.Arguments;
 
 import okhttp3.Interceptor;
 import okhttp3.Request;

client-core/src/main/java/com/influxdb/query/FluxRecord.java

@@ -30,7 +30,7 @@
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
-import com.influxdb.Arguments;
+import com.influxdb.utils.Arguments;
 
 
 /**

client-core/src/main/java/com/influxdb/query/internal/FluxCsvParser.java

@@ -35,13 +35,13 @@
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
-import com.influxdb.Arguments;
 import com.influxdb.Cancellable;
 import com.influxdb.query.FluxColumn;
 import com.influxdb.query.FluxRecord;
 import com.influxdb.query.FluxTable;
 import com.influxdb.query.exceptions.FluxCsvParserException;
 import com.influxdb.query.exceptions.FluxQueryException;
+import com.influxdb.utils.Arguments;
 
 import okio.BufferedSource;
 import org.apache.commons.csv.CSVFormat;

client-kotlin/pom.xml

@@ -26,7 +26,7 @@
     <parent>
         <artifactId>influxdb-client</artifactId>
         <groupId>com.influxdb</groupId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

client-kotlin/src/main/kotlin/com/influxdb/client/kotlin/InfluxDBClientKotlinFactory.kt

@@ -21,9 +21,9 @@
  */
 package com.influxdb.client.kotlin
 
-import com.influxdb.Arguments
 import com.influxdb.client.InfluxDBClientOptions
 import com.influxdb.client.kotlin.internal.InfluxDBClientKotlinImpl
+import com.influxdb.utils.Arguments
 
 /**
  * The Factory that creates an instance of a Flux client.

client-kotlin/src/main/kotlin/com/influxdb/client/kotlin/internal/QueryKotlinApiImpl.kt

@@ -21,7 +21,6 @@
  */
 package com.influxdb.client.kotlin.internal
 
-import com.influxdb.Arguments
 import com.influxdb.Cancellable
 import com.influxdb.client.InfluxDBClientOptions
 import com.influxdb.client.domain.Dialect
@@ -33,6 +32,7 @@ import com.influxdb.internal.AbstractQueryApi
 import com.influxdb.query.FluxRecord
 import com.influxdb.query.FluxTable
 import com.influxdb.query.internal.FluxCsvParser.FluxResponseConsumer
+import com.influxdb.utils.Arguments
 import kotlinx.coroutines.channels.Channel
 import kotlinx.coroutines.runBlocking
 import java.util.function.BiConsumer

client-legacy/pom.xml

@@ -28,7 +28,7 @@
     <parent>
         <groupId>com.influxdb</groupId>
         <artifactId>influxdb-client</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>influxdb-client-flux</artifactId>

client-legacy/src/main/java/com/influxdb/client/flux/FluxClientFactory.java

@@ -23,8 +23,8 @@
 
 import javax.annotation.Nonnull;
 
-import com.influxdb.Arguments;
 import com.influxdb.client.flux.internal.FluxApiImpl;
+import com.influxdb.utils.Arguments;
 
 /**
  * The Factory that creates an instance of a Flux client.

client-legacy/src/main/java/com/influxdb/client/flux/FluxConnectionOptions.java

@@ -31,8 +31,8 @@
 import javax.annotation.concurrent.NotThreadSafe;
 import javax.annotation.concurrent.ThreadSafe;
 
-import com.influxdb.Arguments;
 import com.influxdb.exceptions.InfluxException;
+import com.influxdb.utils.Arguments;
 
 import okhttp3.HttpUrl;
 import okhttp3.OkHttpClient;

client-legacy/src/main/java/com/influxdb/client/flux/internal/FluxApiImpl.java

@@ -28,7 +28,6 @@
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
-import com.influxdb.Arguments;
 import com.influxdb.Cancellable;
 import com.influxdb.LogLevel;
 import com.influxdb.client.flux.FluxClient;
@@ -39,6 +38,7 @@
 import com.influxdb.query.FluxTable;
 import com.influxdb.query.internal.FluxCsvParser.FluxResponseConsumer;
 import com.influxdb.query.internal.FluxCsvParser.FluxResponseConsumerTable;
+import com.influxdb.utils.Arguments;
 
 import okhttp3.OkHttpClient;
 import okhttp3.ResponseBody;

client-osgi/pom.xml

@@ -28,7 +28,7 @@
     <parent>
         <artifactId>influxdb-client</artifactId>
         <groupId>com.influxdb</groupId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>influxdb-client-osgi</artifactId>

client-reactive/pom.xml

@@ -26,7 +26,7 @@
     <parent>
         <artifactId>influxdb-client</artifactId>
         <groupId>com.influxdb</groupId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

client-reactive/src/main/java/com/influxdb/client/reactive/InfluxDBClientReactiveFactory.java

@@ -24,9 +24,9 @@
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
-import com.influxdb.Arguments;
 import com.influxdb.client.InfluxDBClientOptions;
 import com.influxdb.client.reactive.internal.InfluxDBClientReactiveImpl;
+import com.influxdb.utils.Arguments;
 
 /**
  * The Factory that create an instance of a InfluxDB reactive client.

client-reactive/src/main/java/com/influxdb/client/reactive/internal/InfluxDBClientReactiveImpl.java

@@ -23,7 +23,6 @@
 
 import javax.annotation.Nonnull;
 
-import com.influxdb.Arguments;
 import com.influxdb.LogLevel;
 import com.influxdb.client.InfluxDBClientOptions;
 import com.influxdb.client.WriteOptions;
@@ -34,6 +33,7 @@
 import com.influxdb.client.reactive.WriteReactiveApi;
 import com.influxdb.client.service.QueryService;
 import com.influxdb.client.service.WriteService;
+import com.influxdb.utils.Arguments;
 
 import io.reactivex.Single;
 

client-reactive/src/main/java/com/influxdb/client/reactive/internal/QueryReactiveApiImpl.java

@@ -25,7 +25,6 @@
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
-import com.influxdb.Arguments;
 import com.influxdb.Cancellable;
 import com.influxdb.client.InfluxDBClientOptions;
 import com.influxdb.client.domain.Dialect;
@@ -37,6 +36,7 @@
 import com.influxdb.query.FluxRecord;
 import com.influxdb.query.FluxTable;
 import com.influxdb.query.internal.FluxCsvParser;
+import com.influxdb.utils.Arguments;
 
 import io.reactivex.BackpressureStrategy;
 import io.reactivex.Flowable;

client-reactive/src/main/java/com/influxdb/client/reactive/internal/WriteReactiveApiImpl.java

@@ -25,7 +25,6 @@
 import java.util.Objects;
 import javax.annotation.Nonnull;
 
-import com.influxdb.Arguments;
 import com.influxdb.client.InfluxDBClientOptions;
 import com.influxdb.client.WriteOptions;
 import com.influxdb.client.domain.WritePrecision;
@@ -34,6 +33,7 @@
 import com.influxdb.client.service.WriteService;
 import com.influxdb.client.write.Point;
 import com.influxdb.client.write.events.AbstractWriteEvent;
+import com.influxdb.utils.Arguments;
 
 import io.reactivex.Flowable;
 import io.reactivex.Maybe;

client-scala/cross/2.12/pom.xml

@@ -26,7 +26,7 @@
   <parent>
     <artifactId>influxdb-client</artifactId>
     <groupId>com.influxdb</groupId>
-    <version>3.5.0-SNAPSHOT</version>
+    <version>4.0.0-SNAPSHOT</version>
     <relativePath>../../../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>

client-scala/cross/2.13/pom.xml

@@ -26,7 +26,7 @@
   <parent>
     <artifactId>influxdb-client</artifactId>
     <groupId>com.influxdb</groupId>
-    <version>3.5.0-SNAPSHOT</version>
+    <version>4.0.0-SNAPSHOT</version>
     <relativePath>../../../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>

client-scala/src/main/scala/com/influxdb/client/scala/InfluxDBClientScalaFactory.scala

@@ -21,9 +21,9 @@
  */
 package com.influxdb.client.scala
 
-import com.influxdb.Arguments
 import com.influxdb.client.InfluxDBClientOptions
 import com.influxdb.client.scala.internal.InfluxDBClientScalaImpl
+import com.influxdb.utils.Arguments
 
 import javax.annotation.Nonnull
 

client-scala/src/main/scala/com/influxdb/client/scala/internal/QueryScalaApiImpl.scala

@@ -23,14 +23,14 @@ package com.influxdb.client.scala.internal
 
 import akka.NotUsed
 import akka.stream.scaladsl.Source
-import com.influxdb.Arguments
 import com.influxdb.client.InfluxDBClientOptions
 import com.influxdb.client.domain.{Dialect, Query}
 import com.influxdb.client.internal.AbstractInfluxDBClient
 import com.influxdb.client.scala.QueryScalaApi
 import com.influxdb.client.service.QueryService
 import com.influxdb.internal.AbstractQueryApi
 import com.influxdb.query.FluxRecord
+import com.influxdb.utils.Arguments
 
 import javax.annotation.Nonnull
 

client-test/pom.xml

@@ -28,7 +28,7 @@
     <parent>
         <artifactId>influxdb-client</artifactId>
         <groupId>com.influxdb</groupId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>influxdb-client-test</artifactId>

client-utils/pom.xml

@@ -28,7 +28,7 @@
     <parent>
         <artifactId>influxdb-client</artifactId>
         <groupId>com.influxdb</groupId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>influxdb-client-utils</artifactId>

client-utils/src/main/java/com/influxdb/Arguments.java → client-utils/src/main/java/com/influxdb/utils/Arguments.java

@@ -19,7 +19,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package com.influxdb;
+package com.influxdb.utils;
 
 import java.time.temporal.ChronoUnit;
 import java.util.EnumSet;

client-utils/src/test/java/com/influxdb/ArgumentsDurationTest.java → client-utils/src/test/java/com/influxdb/utils/ArgumentsDurationTest.java

@@ -19,7 +19,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package com.influxdb;
+package com.influxdb.utils;
 
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;

client-utils/src/test/java/com/influxdb/ArgumentsTest.java → client-utils/src/test/java/com/influxdb/utils/ArgumentsTest.java

@@ -19,7 +19,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package com.influxdb;
+package com.influxdb.utils;
 
 import java.time.temporal.ChronoUnit;
 

client/pom.xml

@@ -26,7 +26,7 @@
     <parent>
         <artifactId>influxdb-client</artifactId>
         <groupId>com.influxdb</groupId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

client/src/main/java/com/influxdb/client/InfluxDBClientFactory.java

@@ -24,10 +24,10 @@
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
-import com.influxdb.Arguments;
 import com.influxdb.client.domain.OnboardingRequest;
 import com.influxdb.client.domain.OnboardingResponse;
 import com.influxdb.client.internal.InfluxDBClientImpl;
+import com.influxdb.utils.Arguments;
 
 /**
  * The Factory that create an instance of a InfluxDB 2.0 client.

client/src/main/java/com/influxdb/client/InfluxDBClientOptions.java

@@ -33,10 +33,10 @@
 import javax.annotation.Nullable;
 import javax.annotation.concurrent.NotThreadSafe;
 
-import com.influxdb.Arguments;
 import com.influxdb.LogLevel;
 import com.influxdb.client.write.PointSettings;
 import com.influxdb.exceptions.InfluxException;
+import com.influxdb.utils.Arguments;
 
 import okhttp3.HttpUrl;
 import okhttp3.OkHttpClient;

client/src/main/java/com/influxdb/client/WriteOptions.java

@@ -25,7 +25,7 @@
 import javax.annotation.concurrent.NotThreadSafe;
 import javax.annotation.concurrent.ThreadSafe;
 
-import com.influxdb.Arguments;
+import com.influxdb.utils.Arguments;
 
 import io.reactivex.BackpressureOverflowStrategy;
 import io.reactivex.Scheduler;

client/src/main/java/com/influxdb/client/internal/AbstractInfluxDBClient.java

@@ -29,7 +29,6 @@
 import java.util.logging.Logger;
 import javax.annotation.Nonnull;
 
-import com.influxdb.Arguments;
 import com.influxdb.client.InfluxDBClientOptions;
 import com.influxdb.client.JSON;
 import com.influxdb.client.domain.Dialect;
@@ -39,6 +38,7 @@
 import com.influxdb.exceptions.InfluxException;
 import com.influxdb.internal.AbstractRestClient;
 import com.influxdb.internal.UserAgentInterceptor;
+import com.influxdb.utils.Arguments;
 
 import okhttp3.OkHttpClient;
 import okhttp3.logging.HttpLoggingInterceptor;