refactor: change class name

Author: NguyenHoangSon96

src/main/java/com/influxdb/v3/client/internal/FlightSqlClient.java

@@ -110,7 +110,7 @@ Stream<VectorSchemaRoot> execute(@Nonnull final String query,
                                      @Nonnull final QueryType queryType,
                                      @Nonnull final Map<String, Object> queryParameters,
                                      @Nonnull final Map<String, String> headers,
-                                     final CallOption... callOption) {
+                                     final CallOption... callOptions) {
 
         Map<String, Object> ticketData = new HashMap<>() {{
             put("database", database);
@@ -130,10 +130,10 @@ Stream<VectorSchemaRoot> execute(@Nonnull final String query,
         }
 
         HeaderCallOption headerCallOption = metadataHeader(headers);
-        CallOption[] callOptions = concatCallOptions(callOption, headerCallOption);
+        CallOption[] callOptionArray = concatCallOptions(callOptions, headerCallOption);
 
         Ticket ticket = new Ticket(json.getBytes(StandardCharsets.UTF_8));
-        FlightStream stream = client.getStream(ticket, callOptions);
+        FlightStream stream = client.getStream(ticket, callOptionArray);
         FlightSqlIterator iterator = new FlightSqlIterator(stream);
 
         Spliterator<VectorSchemaRoot> spliterator = Spliterators.spliteratorUnknownSize(iterator, Spliterator.NONNULL);

…b/v3/client/internal/GrpcCallOption.java …/v3/client/internal/GrpcCallOptions.javasrc/main/java/com/influxdb/v3/client/internal/GrpcCallOption.java renamed to src/main/java/com/influxdb/v3/client/internal/GrpcCallOptions.java src/main/java/com/influxdb/v3/client/internal/GrpcCallOption.java renamed to src/main/java/com/influxdb/v3/client/internal/GrpcCallOptions.java

@@ -37,24 +37,24 @@
 /**
  * The collection of runtime options for a new RPC call.
  */
-public final class GrpcCallOption {
+public final class GrpcCallOptions {
 
     private final Deadline deadline;
     private final Executor executor;
     private final String compressorName;
     private final Boolean waitForReady;
     private final Integer maxInboundMessageSize;
     private final Integer maxOutboundMessageSize;
-    private final CallOption[] callOptionCallback;
+    private final CallOption[] callOptions;
 
-    private GrpcCallOption(@Nonnull final Builder builder) {
+    private GrpcCallOptions(@Nonnull final Builder builder) {
         this.deadline = builder.deadline;
         this.executor = builder.executor;
         this.compressorName = builder.compressorName;
         this.waitForReady = builder.waitForReady;
         this.maxInboundMessageSize = builder.maxInboundMessageSize;
         this.maxOutboundMessageSize = builder.maxOutboundMessageSize;
-        this.callOptionCallback = builder.callOptions.toArray(new CallOption[0]);
+        this.callOptions = builder.callOptions.toArray(new CallOption[0]);
     }
 
     /**
@@ -124,16 +124,16 @@ public Integer getMaxOutboundMessageSize() {
      * @return the CallOption list
      */
     @Nonnull
-    public CallOption[] getCallOptionCallback() {
-        return callOptionCallback;
+    public CallOption[] getCallOptions() {
+        return callOptions;
     }
 
     @Override
     public boolean equals(final Object o) {
         if (o == null || getClass() != o.getClass()) {
             return false;
         }
-        GrpcCallOption that = (GrpcCallOption) o;
+        GrpcCallOptions that = (GrpcCallOptions) o;
         return Objects.equals(deadline, that.deadline)
                 && Objects.equals(executor, that.executor)
                 && Objects.equals(compressorName, that.compressorName)
@@ -174,7 +174,7 @@ public static final class Builder {
         private Executor executor;
         private String compressorName;
         private Boolean waitForReady;
-        private Integer maxInboundMessageSize;
+        private Integer maxInboundMessageSize = Integer.MAX_VALUE;
         private Integer maxOutboundMessageSize;
         private final List<CallOption> callOptions = new ArrayList<>();
 
@@ -184,14 +184,7 @@ public static final class Builder {
          * @return this
          */
         public Builder withDeadline(final @Nonnull Deadline deadline) {
-            var callOption = new org.apache.arrow.flight.CallOptions.GrpcCallOption() {
-                @Override
-                public <T extends AbstractStub<T>> T wrapStub(final T stub) {
-                    return stub.withDeadline(deadline);
-                }
-            };
             this.deadline = deadline;
-            callOptions.add(callOption);
             return this;
         }
 
@@ -202,14 +195,7 @@ public <T extends AbstractStub<T>> T wrapStub(final T stub) {
          * @return this
          */
         public Builder withExecutor(@Nonnull final Executor executor) {
-            var callOption = new org.apache.arrow.flight.CallOptions.GrpcCallOption() {
-                @Override
-                public <T extends AbstractStub<T>> T wrapStub(final T stub) {
-                    return stub.withExecutor(executor);
-                }
-            };
             this.executor = executor;
-            callOptions.add(callOption);
             return this;
         }
 
@@ -224,14 +210,7 @@ public <T extends AbstractStub<T>> T wrapStub(final T stub) {
          * @return this
          */
         public Builder withCompressorName(@Nonnull final String compressorName) {
-            var callOption = new org.apache.arrow.flight.CallOptions.GrpcCallOption() {
-                @Override
-                public <T extends AbstractStub<T>> T wrapStub(final T stub) {
-                    return stub.withCompression(compressorName);
-                }
-            };
             this.compressorName = compressorName;
-            callOptions.add(callOption);
             return this;
         }
 
@@ -244,14 +223,7 @@ public <T extends AbstractStub<T>> T wrapStub(final T stub) {
          * @return this
          */
         public Builder withWaitForReady() {
-            var callOption = new org.apache.arrow.flight.CallOptions.GrpcCallOption() {
-                @Override
-                public <T extends AbstractStub<T>> T wrapStub(final T stub) {
-                    return stub.withWaitForReady();
-                }
-            };
             this.waitForReady = true;
-            callOptions.add(callOption);
             return this;
         }
 
@@ -262,14 +234,7 @@ public <T extends AbstractStub<T>> T wrapStub(final T stub) {
          * @return this
          */
         public Builder withMaxInboundMessageSize(@Nonnull final Integer maxInboundMessageSize) {
-            var callOption = new org.apache.arrow.flight.CallOptions.GrpcCallOption() {
-                @Override
-                public <T extends AbstractStub<T>> T wrapStub(final T stub) {
-                    return stub.withMaxInboundMessageSize(maxInboundMessageSize);
-                }
-            };
             this.maxInboundMessageSize = maxInboundMessageSize;
-            callOptions.add(callOption);
             return this;
         }
 
@@ -279,24 +244,106 @@ public <T extends AbstractStub<T>> T wrapStub(final T stub) {
          * @return this
          */
         public Builder withMaxOutboundMessageSize(@Nonnull final Integer maxOutboundMessageSize) {
-            var callOption = new org.apache.arrow.flight.CallOptions.GrpcCallOption() {
+            this.maxOutboundMessageSize = maxOutboundMessageSize;
+            return this;
+        }
+
+        private org.apache.arrow.flight.CallOptions.GrpcCallOption createDeadlineCallOption(
+                final Deadline deadline) {
+            return new org.apache.arrow.flight.CallOptions.GrpcCallOption() {
+                @Override
+                public <T extends AbstractStub<T>> T wrapStub(final T stub) {
+                    return stub.withDeadline(deadline);
+                }
+            };
+        }
+
+        private org.apache.arrow.flight.CallOptions.GrpcCallOption createExecutorCallOption(
+                final Executor executor) {
+            return new org.apache.arrow.flight.CallOptions.GrpcCallOption() {
+                @Override
+                public <T extends AbstractStub<T>> T wrapStub(final T stub) {
+                    return stub.withExecutor(executor);
+                }
+            };
+        }
+
+        private org.apache.arrow.flight.CallOptions.GrpcCallOption createCompressionCallOption(
+                final String compressorName) {
+            return new org.apache.arrow.flight.CallOptions.GrpcCallOption() {
+                @Override
+                public <T extends AbstractStub<T>> T wrapStub(final T stub) {
+                    return stub.withCompression(compressorName);
+                }
+            };
+        }
+
+        private org.apache.arrow.flight.CallOptions.GrpcCallOption createWaitForReadyCallOption() {
+            return new org.apache.arrow.flight.CallOptions.GrpcCallOption() {
+                @Override
+                public <T extends AbstractStub<T>> T wrapStub(final T stub) {
+                    return stub.withWaitForReady();
+                }
+            };
+        }
+
+        private org.apache.arrow.flight.CallOptions.GrpcCallOption createMaxInboundMessageSizeCallOption(
+                final Integer maxInboundMessageSize) {
+            return new org.apache.arrow.flight.CallOptions.GrpcCallOption() {
+                @Override
+                public <T extends AbstractStub<T>> T wrapStub(final T stub) {
+                    return stub.withMaxInboundMessageSize(maxInboundMessageSize);
+                }
+            };
+        }
+
+        private org.apache.arrow.flight.CallOptions.GrpcCallOption createMaxOutboundMessageSizeCallOption(
+                final Integer maxOutboundMessageSize) {
+            return new org.apache.arrow.flight.CallOptions.GrpcCallOption() {
                 @Override
                 public <T extends AbstractStub<T>> T wrapStub(final T stub) {
                     return stub.withMaxOutboundMessageSize(maxOutboundMessageSize);
                 }
             };
-            this.maxOutboundMessageSize = maxOutboundMessageSize;
-            callOptions.add(callOption);
-            return this;
         }
 
         /**
-         * Build an instance of GrpcCallOption.
+         * Build an instance of GrpcCallOptions.
          *
-         * @return the GrpcCallOption instance
+         * @return the GrpcCallOptions instance
          */
-        public GrpcCallOption build() {
-            return new GrpcCallOption(this);
+        public GrpcCallOptions build() {
+            if (deadline != null) {
+                var callOption = createDeadlineCallOption(deadline);
+                callOptions.add(callOption);
+            }
+
+            if (executor != null) {
+                var callOption = createExecutorCallOption(executor);
+                callOptions.add(callOption);
+            }
+
+            if (compressorName != null) {
+                var callOption = createCompressionCallOption(compressorName);
+                callOptions.add(callOption);
+            }
+
+            if (waitForReady != null) {
+                var callOption = createWaitForReadyCallOption();
+                callOptions.add(callOption);
+            }
+
+            if (maxInboundMessageSize != null) {
+                var callOption = createMaxInboundMessageSizeCallOption(maxInboundMessageSize);
+                callOptions.add(callOption);
+            }
+
+            if (maxOutboundMessageSize != null) {
+                var callOption = createMaxOutboundMessageSizeCallOption(maxOutboundMessageSize);
+                callOptions.add(callOption);
+            }
+
+            return new GrpcCallOptions(this);
         }
     }
 }

src/main/java/com/influxdb/v3/client/internal/InfluxDBClientImpl.java

@@ -342,8 +342,8 @@ private Stream<VectorSchemaRoot> queryData(@Nonnull final String query,
             }
         });
 
-        GrpcCallOption grpcCallOption = options.grpcCallOption();
-        CallOption[] callOptions = grpcCallOption != null ? grpcCallOption.getCallOptionCallback() : null;
+        GrpcCallOptions grpcCallOption = options.grpcCallOption();
+        CallOption[] callOptions = grpcCallOption != null ? grpcCallOption.getCallOptions() : null;
         return flightSqlClient.execute(
                 query,
                 database,

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

@@ -28,7 +28,7 @@
 
 import com.influxdb.v3.client.config.ClientConfig;
 import com.influxdb.v3.client.internal.Arguments;
-import com.influxdb.v3.client.internal.GrpcCallOption;
+import com.influxdb.v3.client.internal.GrpcCallOptions;
 
 /**
  * Query API options.
@@ -62,7 +62,7 @@ public final class QueryOptions {
     private final String database;
     private final QueryType queryType;
     private final Map<String, String> headers;
-    private GrpcCallOption grpcCallOption;
+    private GrpcCallOptions grpcCallOption;
 
     /**
      * Construct QueryAPI options. The query type is set to SQL.
@@ -147,57 +147,18 @@ public Map<String, String> headersSafe() {
     }
 
     /**
-     * The grpcCallOption pass to this function will be merged with the default grpcCallOption.
+     * Sets the GrpcCallOptions object.
      * @param grpcCallOption the grpcCallOption
      */
-    public void setGrpcCallOption(@Nonnull final GrpcCallOption grpcCallOption) {
-        GrpcCallOption.Builder builder = getDefaultGrpcCallOptsBuilder(grpcCallOption);
-
-        if (grpcCallOption.getMaxOutboundMessageSize() != null) {
-            builder.withMaxOutboundMessageSize(grpcCallOption.getMaxOutboundMessageSize());
-        }
-
-        if (grpcCallOption.getExecutor() != null) {
-            builder.withExecutor(grpcCallOption.getExecutor());
-        }
-
-        if (grpcCallOption.getWaitForReady() != null) {
-            builder.withWaitForReady();
-        }
-
-        if (grpcCallOption.getDeadline() != null) {
-            builder.withDeadline(grpcCallOption.getDeadline());
-        }
-
-        if (grpcCallOption.getCompressorName() != null) {
-            builder.withCompressorName(grpcCallOption.getCompressorName());
-        }
-
-        this.grpcCallOption = builder.build();
-    }
-
-    /**
-     * @param grpcCallOption the grpcCallOption.
-     * @return the default grpc builder with some default options
-     */
-    @Nonnull
-    private static GrpcCallOption.Builder getDefaultGrpcCallOptsBuilder(@Nonnull final GrpcCallOption grpcCallOption) {
-        GrpcCallOption.Builder builder = new GrpcCallOption.Builder();
-        if (grpcCallOption.getMaxInboundMessageSize() != null) {
-            builder.withMaxInboundMessageSize(grpcCallOption.getMaxInboundMessageSize());
-        } else {
-            // Set this for backward compatibility
-            builder.withMaxInboundMessageSize(Integer.MAX_VALUE);
-        }
-
-        return builder;
+    public void setGrpcCallOption(@Nonnull final GrpcCallOptions grpcCallOption) {
+        this.grpcCallOption = grpcCallOption;
     }
 
     /**
-     * @return grpc call options with some default options
+     * @return the GrpcCallOptions object.
      */
     @Nullable
-    public GrpcCallOption grpcCallOption() {
+    public GrpcCallOptions grpcCallOption() {
         return grpcCallOption;
     }
 

src/test/java/com/influxdb/v3/client/internal/FlightSqlClientTest.java

@@ -352,14 +352,15 @@ void concatCallOptions() throws Exception {
             Assertions.assertThat(callOptions).isNotNull();
             Assertions.assertThat(callOptions.length).isEqualTo(1);
 
-            GrpcCallOption grpcCallOption = new GrpcCallOption.Builder()
+            GrpcCallOptions grpcCallOption = new GrpcCallOptions.Builder()
                     .withMaxOutboundMessageSize(1)
                     .withCompressorName("gzip")
                     .build();
 
-            callOptions = flightSqlClient.concatCallOptions(grpcCallOption.getCallOptionCallback(), headerCallOption);
+            callOptions = flightSqlClient.concatCallOptions(grpcCallOption.getCallOptions(), headerCallOption);
             Assertions.assertThat(callOptions).isNotNull();
-            Assertions.assertThat(callOptions.length).isEqualTo(3);
+            // This equals to 4 because we always have a default maxInboundMessageSize
+            Assertions.assertThat(callOptions.length).isEqualTo(4);
         }
     }