Merge pull request #8 from wiremock/imported-proto-fix

imported proto fix

build.gradle

@@ -160,6 +160,13 @@ publishing {
   }
 }
 
+test {
+  testLogging {
+    events "PASSED", "FAILED", "SKIPPED"
+    exceptionFormat "full"
+  }
+}
+
 project.tasks.signMainPublication.dependsOn jar
 
 assemble.dependsOn clean, jar
@@ -192,6 +199,7 @@ protobuf {
     all().each { task ->
       task.generateDescriptorSet = true
       task.descriptorSetOptions.path = "$projectDir/src/test/resources/wiremock/grpc/services.dsc"
+      task.descriptorSetOptions.includeImports = true
     }
   }
 }

src/main/java/org/wiremock/grpc/internal/GrpcHttpServerFactory.java

@@ -76,7 +76,7 @@ protected void decorateMockServiceContextBeforeConfig(
                         Exceptions.uncheck(
                             () ->
                                 Descriptors.FileDescriptor.buildFrom(
-                                    fileDescriptorProto, new Descriptors.FileDescriptor[0]),
+                                    fileDescriptorProto, new Descriptors.FileDescriptor[0], true),
                             Descriptors.FileDescriptor.class))
                 .collect(Collectors.toUnmodifiableList());
 

src/test/java/org/wiremock/grpc/GrpcAcceptanceTest.java

@@ -27,6 +27,7 @@
 import com.example.grpc.HelloResponse;
 import com.github.tomakehurst.wiremock.client.WireMock;
 import com.github.tomakehurst.wiremock.junit5.WireMockExtension;
+import com.google.protobuf.Empty;
 import io.grpc.ManagedChannel;
 import io.grpc.ManagedChannelBuilder;
 import io.grpc.StatusRuntimeException;
@@ -48,10 +49,9 @@ public class GrpcAcceptanceTest {
       WireMockExtension.newInstance()
           .options(
               wireMockConfig()
-                      .dynamicPort()
-                      .withRootDirectory("src/test/resources/wiremock")
-                      .extensions(new GrpcExtensionFactory())
-              )
+                  .dynamicPort()
+                  .withRootDirectory("src/test/resources/wiremock")
+                  .extensions(new GrpcExtensionFactory()))
           .build();
 
   @BeforeEach
@@ -89,10 +89,7 @@ void shouldReturnGreetingBuiltViaTemplatedJson() {
     mockGreetingService.stubFor(
         method("greeting")
             .willReturn(
-                jsonTemplate(
-                    "{\n"
-                        + "    \"greeting\": \"Hello {{jsonPath request.body '$.name'}}\"\n"
-                        + "}")));
+                jsonTemplate("{ \"greeting\": \"Hello {{jsonPath request.body '$.name'}}\" }")));
 
     String greeting = greetingsClient.greet("Tom");
 
@@ -102,8 +99,7 @@ void shouldReturnGreetingBuiltViaTemplatedJson() {
   @Test
   void returnsResponseBuiltFromJson() {
     mockGreetingService.stubFor(
-        method("greeting")
-            .willReturn(json("{\n" + "    \"greeting\": \"Hi Tom from JSON\"\n" + "}")));
+        method("greeting").willReturn(json("{ \"greeting\": \"Hi Tom from JSON\" }")));
 
     String greeting = greetingsClient.greet("Whatever");
 
@@ -207,4 +203,12 @@ void returnsStreamedResponseToUnaryRequest() {
 
     assertThat(greetingsClient.oneGreetingManyReplies("Tom"), hasItem("Hi Tom"));
   }
+
+  @Test
+  void returnsResponseWithImportedType() {
+    mockGreetingService.stubFor(
+        method("oneGreetingEmptyReply").willReturn(message(Empty.newBuilder())));
+
+    assertThat(greetingsClient.oneGreetingEmptyReply("Tom"), is(true));
+  }
 }

src/test/java/org/wiremock/grpc/client/GreetingsClient.java

@@ -19,6 +19,7 @@
 import com.example.grpc.HelloRequest;
 import com.example.grpc.HelloResponse;
 import com.github.tomakehurst.wiremock.common.Exceptions;
+import com.google.protobuf.Empty;
 import io.grpc.Channel;
 import io.grpc.stub.StreamObserver;
 import java.util.ArrayList;
@@ -106,4 +107,10 @@ public void onCompleted() {
 
     return responseHolder.get().getGreeting();
   }
+
+  public boolean oneGreetingEmptyReply(String name) {
+    final Empty response =
+        stub.oneGreetingEmptyReply(HelloRequest.newBuilder().setName(name).build());
+    return response != null;
+  }
 }

src/test/proto/ExampleServices.proto

@@ -21,6 +21,8 @@ package com.example.grpc;
 
 option java_multiple_files = true;
 
+import "google/protobuf/empty.proto";
+
 enum Sentiment {
     HAPPY = 0;
     SLEEPY = 1;
@@ -44,4 +46,5 @@ service GreetingService {
     rpc greeting(HelloRequest) returns (HelloResponse);
     rpc manyGreetingsOneReply(stream HelloRequest) returns (HelloResponse);
     rpc oneGreetingManyReplies(HelloRequest) returns (stream HelloResponse);
+    rpc oneGreetingEmptyReply(HelloRequest) returns (google.protobuf.Empty);
 }