Merge remote-tracking branch 'origin/grpc-web-it' into grpc-web-it

eclipse-vertx · Jan 23, 2025 · 20fed56 · 20fed56
2 parents f4aa5c5 + e3002a9
commit 20fed56
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 4 deletions.
diff --git a/vertx-grpc-common/src/main/java/io/vertx/grpc/common/GrpcMessageDecoder.java b/vertx-grpc-common/src/main/java/io/vertx/grpc/common/GrpcMessageDecoder.java
@@ -19,8 +19,8 @@
 import io.vertx.core.buffer.Buffer;
 import io.vertx.core.json.DecodeException;
 import io.vertx.core.json.Json;
-import io.vertx.core.json.JsonObject;
 import io.vertx.core.json.JsonArray;
+import io.vertx.core.json.JsonObject;
 
 import java.nio.charset.StandardCharsets;
 import java.util.function.Supplier;

diff --git a/vertx-grpc-common/src/main/java/io/vertx/grpc/common/impl/GrpcMessageImpl.java b/vertx-grpc-common/src/main/java/io/vertx/grpc/common/impl/GrpcMessageImpl.java
@@ -12,8 +12,8 @@
 
 import io.vertx.core.buffer.Buffer;
 import io.vertx.core.internal.buffer.BufferInternal;
-import io.vertx.grpc.common.WireFormat;
 import io.vertx.grpc.common.GrpcMessage;
+import io.vertx.grpc.common.WireFormat;
 
 import java.util.Objects;
 

diff --git a/vertx-grpc-common/src/main/java/io/vertx/grpc/common/impl/GrpcWriteStreamBase.java b/vertx-grpc-common/src/main/java/io/vertx/grpc/common/impl/GrpcWriteStreamBase.java
@@ -256,6 +256,7 @@ private Future<Void> writeMessage(GrpcMessage message, boolean end) {
             break;
         }
       }
+
       sendHeaders(contentType, headers, end);
     }
     if (end) {

diff --git a/vertx-grpc-common/src/main/java/io/vertx/grpc/common/impl/WriteStreamAdapter.java b/vertx-grpc-common/src/main/java/io/vertx/grpc/common/impl/WriteStreamAdapter.java
@@ -10,8 +10,8 @@
  */
 package io.vertx.grpc.common.impl;
 
-import io.vertx.grpc.common.GrpcWriteStream;
 import io.vertx.grpc.common.GrpcMessageEncoder;
+import io.vertx.grpc.common.GrpcWriteStream;
 
 /**
  * An adapter between gRPC and Vert.x back-pressure.

diff --git a/vertx-grpc-common/src/main/java/module-info.java b/vertx-grpc-common/src/main/java/module-info.java
@@ -10,6 +10,7 @@
   requires com.google.protobuf.util;
   requires transitive io.vertx.core;
   requires static io.vertx.codegen.api;
+  requires com.google.common;
   exports io.vertx.grpc.common;
   exports io.vertx.grpc.common.impl to io.vertx.tests.common, io.vertx.grpc.server, io.vertx.grpc.client, io.vertx.tests.server, io.vertx.tests.client;
   provides VertxServiceProvider with io.vertx.grpc.common.impl.GrpcRequestLocalRegistration;

diff --git a/vertx-grpc-common/src/test/java/module-info.java b/vertx-grpc-common/src/test/java/module-info.java
@@ -3,5 +3,6 @@
   requires io.vertx.grpc.common;
   requires io.vertx.testing.unit;
   requires junit;
-  exports io.vertx.tests.common;
+    requires io.netty.codec.http;
+    exports io.vertx.tests.common;
 }
-Original file line number
+Diff line change
@@ Expand Up @@
                 break;
             }
           }
           sendHeaders(contentType, headers, end);
         }
         if (end) {
@@ Expand Down @@