Introduce GrpcCompressionOptions

Signed-off-by: Daniel Fiala <danfiala23@gmail.com>

Author: zZHorizonZz

vertx-grpc-client/src/main/java/io/vertx/grpc/client/GrpcClientCompressionOptions.java

@@ -0,0 +1,75 @@
+package io.vertx.grpc.client;
+
+import io.vertx.codegen.annotations.DataObject;
+import io.vertx.codegen.annotations.Unstable;
+import io.vertx.codegen.json.annotations.JsonGen;
+import io.vertx.core.json.JsonObject;
+import io.vertx.grpc.common.GrpcCompressionOptions;
+
+@Unstable
+@DataObject
+@JsonGen(publicConverter = false)
+public class GrpcClientCompressionOptions extends GrpcCompressionOptions {
+
+  /**
+   * The default compression algorithm accepted by the client = {@code gzip}
+   */
+  public static final String DEFAULT_COMPRESSION_ALGORITHM = "identity";
+
+  private String compressionAlgorithm;
+
+  /**
+   * Default options.
+   */
+  public GrpcClientCompressionOptions() {
+    this.compressionAlgorithm = DEFAULT_COMPRESSION_ALGORITHM;
+  }
+
+  /**
+   * Copy constructor.
+   */
+  public GrpcClientCompressionOptions(GrpcClientCompressionOptions other) {
+    super(other);
+    this.compressionAlgorithm = other.compressionAlgorithm;
+  }
+
+  /**
+   * Creates options from JSON.
+   */
+  public GrpcClientCompressionOptions(JsonObject json) {
+    this();
+    GrpcClientCompressionOptionsConverter.fromJson(json, this);
+  }
+
+  /**
+   * @return the compression algorithm accepted by the client
+   */
+  public String getCompressionAlgorithm() {
+    return compressionAlgorithm;
+  }
+
+  /**
+   * Set the compression algorithm accepted by the client.
+   *
+   * @param compressionAlgorithm the compression algorithm
+   * @return a reference to this, so the API can be used fluently
+   */
+  public GrpcClientCompressionOptions setCompressionAlgorithm(String compressionAlgorithm) {
+    this.compressionAlgorithm = compressionAlgorithm;
+    return this;
+  }
+
+  /**
+   * @return a JSON representation of options
+   */
+  public JsonObject toJson() {
+    JsonObject json = new JsonObject();
+    GrpcClientCompressionOptionsConverter.toJson(this, json);
+    return json;
+  }
+
+  @Override
+  public String toString() {
+    return toJson().encode();
+  }
+}

vertx-grpc-client/src/main/java/io/vertx/grpc/client/GrpcClientOptions.java

@@ -11,14 +11,19 @@
 package io.vertx.grpc.client;
 
 import io.vertx.codegen.annotations.DataObject;
+import io.vertx.codegen.annotations.Unstable;
+import io.vertx.codegen.json.annotations.JsonGen;
+import io.vertx.core.json.JsonObject;
 
 import java.util.Objects;
 import java.util.concurrent.TimeUnit;
 
 /**
  * Options configuring a gRPC client.
  */
+@Unstable
 @DataObject
+@JsonGen(publicConverter = false)
 public class GrpcClientOptions {
 
   /**
@@ -42,25 +47,25 @@ public class GrpcClientOptions {
   public static final long DEFAULT_MAX_MESSAGE_SIZE = 256 * 1024;
 
   /**
-   * The default compression encoding = {@code "identity"} (no compression).
+   * The default compression options
    */
-  public static final String DEFAULT_COMPRESSION_ENCODING = "identity";
+  public static final GrpcClientCompressionOptions DEFAULT_COMPRESSION = new GrpcClientCompressionOptions();
 
   private boolean scheduleDeadlineAutomatically;
   private int timeout;
   private TimeUnit timeoutUnit;
   private long maxMessageSize;
-  private String compressionEncoding;
+  private GrpcClientCompressionOptions compression;
 
   /**
    * Default constructor.
    */
   public GrpcClientOptions() {
-    scheduleDeadlineAutomatically = DEFAULT_SCHEDULE_DEADLINE_AUTOMATICALLY;
-    timeout = DEFAULT_TIMEOUT;
-    timeoutUnit = DEFAULT_TIMEOUT_UNIT;
+    this.scheduleDeadlineAutomatically = DEFAULT_SCHEDULE_DEADLINE_AUTOMATICALLY;
+    this.timeout = DEFAULT_TIMEOUT;
+    this.timeoutUnit = DEFAULT_TIMEOUT_UNIT;
     this.maxMessageSize = DEFAULT_MAX_MESSAGE_SIZE;
-    this.compressionEncoding = DEFAULT_COMPRESSION_ENCODING;
+    this.compression = DEFAULT_COMPRESSION;
   }
 
   /**
@@ -69,11 +74,21 @@ public GrpcClientOptions() {
    * @param other the options to copy
    */
   public GrpcClientOptions(GrpcClientOptions other) {
-    scheduleDeadlineAutomatically = other.scheduleDeadlineAutomatically;
-    timeout = other.timeout;
-    timeoutUnit = other.timeoutUnit;
-    maxMessageSize = other.maxMessageSize;
-    compressionEncoding = other.compressionEncoding;
+    this.scheduleDeadlineAutomatically = other.scheduleDeadlineAutomatically;
+    this.timeout = other.timeout;
+    this.timeoutUnit = other.timeoutUnit;
+    this.maxMessageSize = other.maxMessageSize;
+    this.compression = new GrpcClientCompressionOptions(other.compression);
+  }
+
+  /**
+   * Create a client options from JSON.
+   *
+   * @param json the JSON
+   */
+  public GrpcClientOptions(JsonObject json) {
+    this();
+    GrpcClientOptionsConverter.fromJson(json, this);
   }
 
   /**
@@ -168,21 +183,34 @@ public GrpcClientOptions setMaxMessageSize(long maxMessageSize) {
   }
 
   /**
-   * @return the compression encoding used by the client
+   * @return the compression options
    */
-  public String getCompressionEncoding() {
-    return compressionEncoding;
+  public GrpcClientCompressionOptions getCompression() {
+    return compression;
   }
 
   /**
-   * Set the compression encoding to be used by the client.
-   * Supported values include "identity" (no compression), "gzip", and "snappy".
+   * Set the compression options.
    *
-   * @param compressionEncoding the compression encoding
+   * @param compression the compression options
    * @return a reference to this, so the API can be used fluently
    */
-  public GrpcClientOptions setCompressionEncoding(String compressionEncoding) {
-    this.compressionEncoding = Objects.requireNonNull(compressionEncoding, "Compression encoding cannot be null");
+  public GrpcClientOptions setCompression(GrpcClientCompressionOptions compression) {
+    this.compression = Objects.requireNonNull(compression);
     return this;
   }
+
+  /**
+   * @return a JSON representation of options
+   */
+  public JsonObject toJson() {
+    JsonObject json = new JsonObject();
+    GrpcClientOptionsConverter.toJson(this, json);
+    return json;
+  }
+
+  @Override
+  public String toString() {
+    return toJson().encode();
+  }
 }

vertx-grpc-client/src/main/java/io/vertx/grpc/client/impl/GrpcClientImpl.java

@@ -14,9 +14,7 @@
 import io.vertx.core.Vertx;
 import io.vertx.core.buffer.Buffer;
 import io.vertx.core.http.HttpClient;
-import io.vertx.core.http.HttpClientOptions;
 import io.vertx.core.http.HttpMethod;
-import io.vertx.core.http.HttpVersion;
 import io.vertx.core.http.RequestOptions;
 import io.vertx.core.internal.ContextInternal;
 import io.vertx.core.internal.VertxInternal;
@@ -28,7 +26,6 @@
 
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
-import java.util.stream.Collectors;
 
 /**
  * @author <a href="mailto:julien@julienviet.com">Julien Viet</a>
@@ -42,8 +39,8 @@ public class GrpcClientImpl implements GrpcClient {
   private final long maxMessageSize;
   private final int timeout;
   private final TimeUnit timeoutUnit;
-  private final String compressionEncoding;
 
+  private final String compressionAlgorithm;
   private final Map<String, GrpcCompressor> compressors;
   private final Map<String, GrpcDecompressor> decompressors;
 
@@ -58,11 +55,11 @@ protected GrpcClientImpl(Vertx vertx, GrpcClientOptions grpcOptions, HttpClient
     this.maxMessageSize = grpcOptions.getMaxMessageSize();
     this.timeout = grpcOptions.getTimeout();
     this.timeoutUnit = grpcOptions.getTimeoutUnit();
-    this.compressionEncoding = grpcOptions.getCompressionEncoding();
     this.closeClient = close;
 
-    this.compressors = GrpcCompressor.getDefaultCompressors().stream().collect(Collectors.toUnmodifiableMap(GrpcCompressor::encoding, c -> c));
-    this.decompressors = GrpcDecompressor.getDefaultDecompressors().stream().collect(Collectors.toUnmodifiableMap(GrpcDecompressor::encoding, d -> d));
+    this.compressionAlgorithm = grpcOptions.getCompression().getCompressionAlgorithm();
+    this.compressors = grpcOptions.getCompression().getCompressors();
+    this.decompressors = grpcOptions.getCompression().getDecompressors();
   }
 
   public Vertx vertx() {
@@ -82,7 +79,7 @@ public Future<GrpcClientRequest<Buffer, Buffer>> request(RequestOptions options)
           this.decompressors
         );
         grpcRequest.init();
-        grpcRequest.encoding(compressionEncoding);
+        grpcRequest.encoding(this.compressionAlgorithm);
         configureTimeout(grpcRequest);
         return grpcRequest;
       });
@@ -139,7 +136,7 @@ private <Req, Resp> Future<GrpcClientRequest<Req, Resp>> request(RequestOptions
           this.decompressors
         );
         call.init();
-        call.encoding(compressionEncoding);
+        call.encoding(this.compressionAlgorithm);
         call.serviceName(method.serviceName());
         call.methodName(method.methodName());
         configureTimeout(call);
@@ -152,7 +149,7 @@ public Future<Void> close() {
     if (closeClient) {
       return client.close();
     } else {
-      return ((VertxInternal)vertx).getOrCreateContext().succeededFuture();
+      return ((VertxInternal) vertx).getOrCreateContext().succeededFuture();
     }
   }
 }

vertx-grpc-client/src/main/java/module-info.java

@@ -1,15 +1,21 @@
 module io.vertx.grpc.client{
+
+  requires static io.vertx.docgen;
+  requires static io.vertx.codegen.api;
+  requires static io.vertx.codegen.json;
+
   requires io.netty.buffer;
   requires io.netty.codec.http;
   requires io.netty.codec;
   requires io.vertx.core.logging;
   requires io.vertx.core;
   requires io.vertx.grpc.common;
-  requires static io.vertx.docgen;
-  requires static io.vertx.codegen.api;
-  requires static io.vertx.codegen.json;
   requires com.google.protobuf;
   requires com.google.common;
+
+  uses io.vertx.grpc.common.GrpcCompressor;
+  uses io.vertx.grpc.common.GrpcDecompressor;
+
   exports io.vertx.grpc.client;
   exports io.vertx.grpc.client.impl to io.vertx.tests.client;
 }