tests: add test of QueryOptions.clone and comparison.

Author: karel-rehor

src/main/java/com/influxdb/v3/client/query/QueryOptions.java

@@ -29,8 +29,6 @@
 import javax.annotation.Nullable;
 import javax.annotation.concurrent.ThreadSafe;
 
-import io.grpc.Deadline;
-
 import com.influxdb.v3.client.config.ClientConfig;
 import com.influxdb.v3.client.internal.Arguments;
 import com.influxdb.v3.client.internal.GrpcCallOptions;
@@ -211,9 +209,7 @@ protected QueryOptions clone() {
         if (this.grpcCallOptions != null) {
             GrpcCallOptions.Builder grpcOptsBuilder = new  GrpcCallOptions.Builder();
             if (this.grpcCallOptions.getDeadline() != null) {
-                grpcOptsBuilder.withDeadline(Deadline.after(this.grpcCallOptions
-                    .getDeadline()
-                    .timeRemaining(TimeUnit.MILLISECONDS), TimeUnit.MILLISECONDS));
+                grpcOptsBuilder.withDeadline(this.grpcCallOptions.getDeadline().offset(0, TimeUnit.MILLISECONDS));
             }
             grpcOptsBuilder.withExecutor(this.grpcCallOptions.getExecutor());
             grpcOptsBuilder.withCompressorName(this.grpcCallOptions.getCompressorName());

src/test/java/com/influxdb/v3/client/query/QueryOptionsTest.java

@@ -25,6 +25,7 @@
 import java.net.ServerSocket;
 import java.net.URI;
 import java.time.Duration;
+import java.util.Map;
 import java.util.concurrent.Executor;
 import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
@@ -248,6 +249,30 @@ void grpcCallOptions() {
         Assertions.assertThat(stubCallOptions.getDeadline()).isEqualTo(grpcCallOption.getDeadline());
     }
 
+    @Test
+    public void queryOptionsCloneTest() {
+
+        GrpcCallOptions grpcCallOption = new GrpcCallOptions.Builder()
+            .withMaxInboundMessageSize(1024 * 1024 * 1024)
+            .withMaxOutboundMessageSize(1024 * 1024 * 1024)
+            .withDeadline(Deadline.after(2, TimeUnit.MINUTES))
+            .build();
+
+        Map<String, String> headers = Map.of("k1", "v1", "k2", "v2", "k3", "v3");
+
+        QueryOptions queryOptions = new QueryOptions("myQueryOptions", QueryType.SQL, headers);
+        queryOptions.setGrpcCallOptions(grpcCallOption);
+
+        QueryOptions clone = queryOptions.clone();
+        Assertions.assertThat(clone).isEqualTo(queryOptions);
+        // not the same object
+        Assertions.assertThat(queryOptions == clone).isFalse();
+        // deep copy grpc options
+        Assertions.assertThat(queryOptions.grpcCallOptions() == clone.grpcCallOptions()).isFalse();
+        // deep copy headers
+        Assertions.assertThat(queryOptions.headersSafe() == clone.headersSafe()).isFalse();
+    }
+
     @Test
     public void queryOptionsUnchangedByCall() throws IOException {
         int freePort = findFreePort();
@@ -276,6 +301,8 @@ public void queryOptionsUnchangedByCall() throws IOException {
             queryOptions.setGrpcCallOptions(grpcCallOption);
             QueryOptions originalQueryOptions = queryOptions.clone();
             Assertions.assertThat(originalQueryOptions).isEqualTo(queryOptions);
+            System.out.println("DEBUG queryOptions.grpcOptions " + queryOptions.grpcCallOptions());
+            System.out.println("DEBUG originalQueryOptions.grpcOptions " + originalQueryOptions.grpcCallOptions());
 
             try (InfluxDBClient influxDBClient = InfluxDBClient.getInstance(clientConfig)) {
                 Assertions.assertThatNoException().isThrownBy(() -> {