Wrap protobuf in Response object

Author: jlisam

plugin/src/main/java/com/flit/protoc/gen/server/jaxrs/RpcGenerator.java

@@ -56,16 +56,16 @@ private void addHandleMethod(MethodDescriptorProto mdp) {
             .addMember("value", "$S", "/" + mdp.getName())
             .build())
         .addAnnotation(AnnotationSpec.builder(PRODUCES)
-            .addMember("value", "$S", "application/protobuf")
+            .addMember("value", "$S", "application/x-protobuf")
             .addMember("value", "$S", "application/json")
             .build())
         .addAnnotation(AnnotationSpec.builder(CONSUMES)
-            .addMember("value", "$S", "application/protobuf")
+            .addMember("value", "$S", "application/x-protobuf")
             .addMember("value", "$S", "application/json")
             .build())
         .addParameter(inputType, "request")
-        .addStatement("return service.handle$L(request)", mdp.getName())
-        .returns(outputType)
+        .addStatement("return Response.ok(service.handle$L(request)).build()", mdp.getName())
+        .returns(ClassName.bestGuess("javax.ws.rs.core.Response"))
         .build());
   }
 

plugin/src/test/java/com/flit/protoc/gen/server/jaxrs/HelloworldGeneratorTest.java

@@ -22,7 +22,6 @@ public void test_Generate() throws Exception {
 
     assertNotNull(response);
     assertEquals(2, response.getFileCount());
-    System.out.println(response.getFile(0).getContent());
     assertEquals(response.getFile(0).getName(), "com/example/helloworld/RpcHelloWorld.java");
     assertEquals(response.getFile(1).getName(), "com/example/helloworld/RpcHelloWorldResource.java");
 

plugin/src/test/java/com/flit/protoc/gen/server/jaxrs/HelloworldGeneratorTest.test_Generate.approved.txt

@@ -12,6 +12,7 @@ import javax.ws.rs.Consumes;
 import javax.ws.rs.POST;
 import javax.ws.rs.Path;
 import javax.ws.rs.Produces;
+import javax.ws.rs.core.Response;
 
 @Path("/twirp/com.example.helloworld.HelloWorld")
 public class RpcHelloWorldResource {
@@ -24,29 +25,29 @@ public class RpcHelloWorldResource {
   @POST
   @Path("/Hello")
   @Produces({
-      "application/protobuf",
+      "application/x-protobuf",
       "application/json"
   })
   @Consumes({
-      "application/protobuf",
+      "application/x-protobuf",
       "application/json"
   })
-  public Helloworld.HelloResp handleHello(Helloworld.HelloReq request) {
-    return service.handleHello(request);
+  public Response handleHello(Helloworld.HelloReq request) {
+    return Response.ok(service.handleHello(request)).build();
   }
 
   @POST
   @Path("/HelloAgain")
   @Produces({
-      "application/protobuf",
+      "application/x-protobuf",
       "application/json"
   })
   @Consumes({
-      "application/protobuf",
+      "application/x-protobuf",
       "application/json"
   })
-  public Helloworld.HelloResp handleHelloAgain(Helloworld.HelloReq request) {
-    return service.handleHelloAgain(request);
+  public Response handleHelloAgain(Helloworld.HelloReq request) {
+    return Response.ok(service.handleHelloAgain(request)).build();
   }
 }
 

plugin/src/test/java/com/flit/protoc/gen/server/jaxrs/StatusGeneratorTest.test_Generate.approved.txt

@@ -10,6 +10,7 @@ import javax.ws.rs.Consumes;
 import javax.ws.rs.POST;
 import javax.ws.rs.Path;
 import javax.ws.rs.Produces;
+import javax.ws.rs.core.Response;
 
 @Path("/twirp/com.example.helloworld.Status")
 public class RpcStatusResource {
@@ -22,15 +23,15 @@ public class RpcStatusResource {
   @POST
   @Path("/GetStatus")
   @Produces({
-      "application/protobuf",
+      "application/x-protobuf",
       "application/json"
   })
   @Consumes({
-      "application/protobuf",
+      "application/x-protobuf",
       "application/json"
   })
-  public StatusOuterClass.StatusResponse handleGetStatus(Core.Empty request) {
-    return service.handleGetStatus(request);
+  public Response handleGetStatus(Core.Empty request) {
+    return Response.ok(service.handleGetStatus(request)).build();
   }
 }