fix(transcoding): test

pom.xml

@@ -198,6 +198,7 @@
 
   <modules>
     <module>vertx-grpc-common</module>
+    <module>vertx-grpc-transcoding</module>
     <module>vertx-grpc-server</module>
     <module>vertx-grpc-client</module>
     <module>vertx-grpcio-common</module>
@@ -271,4 +272,4 @@
     </plugins>
   </build>
 
-</project>
+</project>

vertx-grpc-common/src/main/java/io/vertx/grpc/common/ServiceMethod.java

@@ -29,8 +29,6 @@ public String methodName() {
         return methodName;
       }
       @Override
-      public ServiceTranscodingOptions transcodingOptions() {return null;}
-      @Override
       public GrpcMessageDecoder<Resp> decoder() {
         return decoder;
       }
@@ -42,10 +40,6 @@ public GrpcMessageEncoder<Req> encoder() {
   }
 
   static <Req, Resp> ServiceMethod<Req, Resp> server(ServiceName serviceName, String methodName, GrpcMessageEncoder<Resp> encoder, GrpcMessageDecoder<Req> decoder) {
-    return server(serviceName, methodName, null, encoder, decoder);
-  }
-
-  static <Req, Resp> ServiceMethod<Req, Resp> server(ServiceName serviceName, String methodName, ServiceTranscodingOptions transcodingOptions, GrpcMessageEncoder<Resp> encoder, GrpcMessageDecoder<Req> decoder) {
     return new ServiceMethod<>() {
       @Override
       public ServiceName serviceName() {
@@ -56,10 +50,6 @@ public String methodName() {
         return methodName;
       }
       @Override
-      public ServiceTranscodingOptions transcodingOptions() {
-        return transcodingOptions;
-      }
-      @Override
       public GrpcMessageDecoder<Req> decoder() {
         return decoder;
       }
@@ -84,11 +74,6 @@ default String fullMethodName() {
     return serviceName().fullyQualifiedName() + "/" + methodName();
   }
 
-  /**
-   * @return the transcoding options
-   */
-  ServiceTranscodingOptions transcodingOptions();
-
   /**
    * @return the message decoder
    */

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

@@ -10,9 +10,8 @@
   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;
+  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;
-    exports io.vertx.grpc.common.transcoding;
-    provides VertxServiceProvider with io.vertx.grpc.common.impl.GrpcRequestLocalRegistration;
+  provides VertxServiceProvider with io.vertx.grpc.common.impl.GrpcRequestLocalRegistration;
 }

vertx-grpc-docs/src/main/java/examples/VertxGreeterGrpcServer.java

@@ -14,7 +14,7 @@
 import io.vertx.grpc.common.GrpcWriteStream;
 import io.vertx.grpc.common.GrpcMessageDecoder;
 import io.vertx.grpc.common.GrpcMessageEncoder;
-import io.vertx.grpc.common.ServiceTranscodingOptions;
+import io.vertx.grpc.transcoding.ServiceTranscodingOptions;
 import io.vertx.grpc.server.GrpcServerResponse;
 import io.vertx.grpc.server.GrpcServer;
 

vertx-grpc-docs/src/main/java/examples/VertxStreamingGrpcServer.java

@@ -14,7 +14,7 @@
 import io.vertx.grpc.common.GrpcWriteStream;
 import io.vertx.grpc.common.GrpcMessageDecoder;
 import io.vertx.grpc.common.GrpcMessageEncoder;
-import io.vertx.grpc.common.ServiceTranscodingOptions;
+import io.vertx.grpc.transcoding.ServiceTranscodingOptions;
 import io.vertx.grpc.server.GrpcServerResponse;
 import io.vertx.grpc.server.GrpcServer;
 

vertx-grpc-protoc-plugin2/src/main/resources/server.mustache

@@ -16,7 +16,7 @@ import io.vertx.grpc.common.GrpcReadStream;
 import io.vertx.grpc.common.GrpcWriteStream;
 import io.vertx.grpc.common.GrpcMessageDecoder;
 import io.vertx.grpc.common.GrpcMessageEncoder;
-import io.vertx.grpc.common.ServiceTranscodingOptions;
+import io.vertx.grpc.transcoding.ServiceTranscodingOptions;
 import io.vertx.grpc.server.GrpcServerResponse;
 import io.vertx.grpc.server.GrpcServer;
 

vertx-grpc-server/pom.xml

@@ -34,6 +34,11 @@
       <groupId>io.vertx</groupId>
       <artifactId>vertx-grpc-common</artifactId>
     </dependency>
+    <dependency>
+      <groupId>io.vertx</groupId>
+      <artifactId>vertx-grpc-transcoding</artifactId>
+      <version>${project.version}</version>
+    </dependency>
 
     <dependency>
       <groupId>io.vertx</groupId>
@@ -42,6 +47,13 @@
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>io.vertx</groupId>
+      <artifactId>vertx-grpc-transcoding</artifactId>
+      <version>${project.version}</version>
+      <type>test-jar</type>
+      <scope>test</scope>
+    </dependency>
     <!-- Self signed certificate generation -->
     <dependency>
       <groupId>org.bouncycastle</groupId>

vertx-grpc-server/src/main/java/io/vertx/grpc/server/GrpcServer.java

@@ -18,8 +18,8 @@
 import io.vertx.core.buffer.Buffer;
 import io.vertx.core.http.HttpServerRequest;
 import io.vertx.grpc.common.ServiceMethod;
-import io.vertx.grpc.common.ServiceTranscodingOptions;
 import io.vertx.grpc.server.impl.GrpcServerImpl;
+import io.vertx.grpc.transcoding.ServiceTranscodingOptions;
 
 /**
  * <p>A gRPC server based on Vert.x HTTP server.</p>

vertx-grpc-server/src/main/java/io/vertx/grpc/server/impl/GrpcServerImpl.java

@@ -21,9 +21,10 @@
 import io.vertx.core.spi.context.storage.AccessMode;
 import io.vertx.grpc.common.*;
 import io.vertx.grpc.common.impl.GrpcMethodCall;
-import io.vertx.grpc.common.transcoding.PathMatcherBuilderImpl;
-import io.vertx.grpc.common.transcoding.PathMatcherImpl;
-import io.vertx.grpc.common.transcoding.PathMatcherUtility;
+import io.vertx.grpc.transcoding.*;
+import io.vertx.grpc.transcoding.impl.PathMatcherBuilderImpl;
+import io.vertx.grpc.transcoding.impl.PathMatcherImpl;
+import io.vertx.grpc.transcoding.impl.PathMatcherUtility;
 import io.vertx.grpc.server.GrpcProtocol;
 import io.vertx.grpc.server.GrpcServer;
 import io.vertx.grpc.server.GrpcServerOptions;

vertx-grpc-server/src/main/java/io/vertx/grpc/server/impl/GrpcServerRequestImpl.java

@@ -30,6 +30,7 @@
 import io.vertx.grpc.server.GrpcProtocol;
 import io.vertx.grpc.server.GrpcServerRequest;
 import io.vertx.grpc.server.GrpcServerResponse;
+import io.vertx.grpc.transcoding.HttpVariableBinding;
 
 import java.nio.charset.StandardCharsets;
 import java.util.HashMap;

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

@@ -1,12 +1,11 @@
 module io.vertx.grpc.server {
-  requires io.netty.buffer;
-  requires io.netty.codec;
   requires io.vertx.core.logging;
   requires transitive 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.protobuf.util;
-    exports io.vertx.grpc.server;
+  requires io.vertx.grpc.transcoding;
+  requires io.vertx.codegen.api;
+  requires io.netty.codec;
+  requires io.netty.buffer;
+  exports io.vertx.grpc.server;
 }

vertx-grpc-server/src/test/java/io/vertx/tests/server/ServerTranscodingTest.java

@@ -24,6 +24,7 @@
 import io.vertx.grpc.server.GrpcServer;
 import io.vertx.grpc.server.GrpcServerOptions;
 import io.vertx.grpc.server.GrpcServerResponse;
+import io.vertx.grpc.transcoding.ServiceTranscodingOptions;
 import io.vertx.grpcweb.GrpcWebTesting.*;
 import io.vertx.tests.common.GrpcTestBase;
 import org.junit.Test;

vertx-grpc-server/src/test/java/io/vertx/tests/server/transcoding/TranscodingTest.java

@@ -26,6 +26,7 @@
 import io.vertx.grpc.server.GrpcServer;
 import io.vertx.grpc.server.GrpcServerOptions;
 import io.vertx.grpc.server.GrpcServerResponse;
+import io.vertx.grpc.transcoding.ServiceTranscodingOptions;
 import io.vertx.grpcweb.GrpcWebTesting.*;
 import io.vertx.tests.common.GrpcTestBase;
 import org.junit.Test;

vertx-grpc-server/src/test/java/module-info.java

@@ -1,16 +1,15 @@
 open module io.vertx.tests.server {
-  requires com.google.protobuf;
-  requires com.google.common;
-  requires io.grpc;
+    requires io.grpc;
   requires io.grpc.stub;
   requires io.grpc.util;
   requires io.grpc.protobuf;
-  requires io.vertx.core;
-  requires io.vertx.grpc.common;
+    requires io.vertx.grpc.common;
   requires io.vertx.grpc.server;
   requires io.vertx.testing.unit;
   requires io.vertx.tests.common;
   requires junit;
   requires testcontainers;
-    requires com.google.protobuf.util;
+    requires io.vertx.grpc.transcoding;
+  requires com.google.protobuf.util;
+  requires com.google.protobuf;
 }