Refactor media type to use guava's MediaType constants

jlisam · jlisam · commit 43f8b7875a3c · 2020-08-21T12:21:26.000-07:00
diff --git a/plugin/src/main/java/com/flit/protoc/gen/server/jaxrs/RpcGenerator.java b/plugin/src/main/java/com/flit/protoc/gen/server/jaxrs/RpcGenerator.java
@@ -2,6 +2,7 @@
 
 import com.flit.protoc.gen.server.BaseGenerator;
 import com.flit.protoc.gen.server.TypeMapper;
+import com.google.common.net.MediaType;
 import com.google.protobuf.DescriptorProtos;
 import com.google.protobuf.DescriptorProtos.MethodDescriptorProto;
 import com.google.protobuf.compiler.PluginProtos.CodeGeneratorResponse.File;
@@ -55,12 +56,12 @@ private void addHandleMethod(MethodDescriptorProto mdp) {
             .addMember("value", "$S", "/" + mdp.getName())
             .build())
         .addAnnotation(AnnotationSpec.builder(PRODUCES)
-            .addMember("value", "$S", "application/protobuf")
-            .addMember("value", "$S", "application/json")
+            .addMember("value", "$S", MediaType.PROTOBUF.toString())
+            .addMember("value", "$S", MediaType.JSON_UTF_8.toString())
             .build())
         .addAnnotation(AnnotationSpec.builder(CONSUMES)
-            .addMember("value", "$S", "application/protobuf")
-            .addMember("value", "$S", "application/json")
+            .addMember("value", "$S", MediaType.PROTOBUF.toString())
+            .addMember("value", "$S", MediaType.JSON_UTF_8.toString())
             .build())
         .addParameter(inputType, "request")
         .addStatement("return Response.ok(service.handle$L(request)).build()", mdp.getName())
diff --git a/plugin/src/main/java/com/flit/protoc/gen/server/spring/RpcGenerator.java b/plugin/src/main/java/com/flit/protoc/gen/server/spring/RpcGenerator.java
@@ -3,6 +3,7 @@
 import com.flit.protoc.gen.server.BaseGenerator;
 import com.flit.protoc.gen.server.TypeMapper;
 import com.flit.protoc.gen.server.Types;
+import com.google.common.net.MediaType;
 import com.google.protobuf.DescriptorProtos;
 import com.google.protobuf.compiler.PluginProtos;
 import com.squareup.javapoet.*;
@@ -47,7 +48,7 @@ private void addHandleMethod(DescriptorProtos.MethodDescriptorProto m) {
       .addAnnotation(AnnotationSpec.builder(PostMapping).addMember("value", "$S", route).build())
       .addStatement("boolean json = false")
       .addStatement("final $T data", inputType)
-      .beginControlFlow("if (request.getContentType().equals($S))", "application/protobuf")
+      .beginControlFlow("if (request.getContentType().equals($S))", MediaType.PROTOBUF.toString())
       .addStatement("data = $T.parseFrom(request.getInputStream())", inputType)
       .nextControlFlow("else if (request.getContentType().startsWith($S))", "application/json")
       .addStatement("json = true")
@@ -66,12 +67,12 @@ private void addHandleMethod(DescriptorProtos.MethodDescriptorProto m) {
       .addStatement("response.setStatus(200)")
       // send the response
       .beginControlFlow("if (json)")
-      .addStatement("response.setContentType($S)", "application/json;charset=UTF-8")
+      .addStatement("response.setContentType($S)", MediaType.JSON_UTF_8.toString())
       .addStatement("response.getOutputStream().write($T.printer().omittingInsignificantWhitespace().print(retval).getBytes($T.UTF_8))",
         Types.JsonFormat,
         Types.StandardCharsets)
       .nextControlFlow("else")
-      .addStatement("response.setContentType($S)", "application/protobuf")
+      .addStatement("response.setContentType($S)", MediaType.PROTOBUF.toString())
       .addStatement("retval.writeTo(response.getOutputStream())")
       .endControlFlow()
       .build());
diff --git a/plugin/src/main/java/com/flit/protoc/gen/server/undertow/RpcGenerator.java b/plugin/src/main/java/com/flit/protoc/gen/server/undertow/RpcGenerator.java
@@ -3,6 +3,7 @@
 import com.flit.protoc.gen.server.BaseGenerator;
 import com.flit.protoc.gen.server.TypeMapper;
 import com.flit.protoc.gen.server.Types;
+import com.google.common.net.MediaType;
 import com.google.protobuf.DescriptorProtos;
 import com.google.protobuf.compiler.PluginProtos;
 import com.squareup.javapoet.*;
@@ -110,7 +111,7 @@ private void writeHandleMethod(DescriptorProtos.MethodDescriptorProto m) {
       .addStatement("boolean json = false")
       .addStatement("final $T data", inputType)
       .addStatement("final String contentType = exchange.getRequestHeaders().get($T.CONTENT_TYPE).getFirst()", Headers)
-      .beginControlFlow("if (contentType.equals($S))", "application/protobuf")
+      .beginControlFlow("if (contentType.equals($S))", MediaType.PROTOBUF.toString())
       .addStatement("data = $T.parseFrom(exchange.getInputStream())", inputType)
       .nextControlFlow("else if (contentType.startsWith($S))", "application/json")
       .addStatement("json = true")
@@ -126,10 +127,10 @@ private void writeHandleMethod(DescriptorProtos.MethodDescriptorProto m) {
       .addStatement("exchange.setStatusCode(200)")
       // put the result on the wire
       .beginControlFlow("if (json)")
-      .addStatement("exchange.getResponseHeaders().put($T.CONTENT_TYPE, $S)", Headers, "application/json;charset=UTF-8")
+      .addStatement("exchange.getResponseHeaders().put($T.CONTENT_TYPE, $S)", Headers, MediaType.JSON_UTF_8.toString())
       .addStatement("exchange.getResponseSender().send($T.printer().omittingInsignificantWhitespace().print(response))", JsonFormat)
       .nextControlFlow("else")
-      .addStatement("exchange.getResponseHeaders().put($T.CONTENT_TYPE, $S)", Headers, "application/protobuf")
+      .addStatement("exchange.getResponseHeaders().put($T.CONTENT_TYPE, $S)", Headers, MediaType.PROTOBUF.toString())
       .addStatement("response.writeTo(exchange.getOutputStream())")
       .endControlFlow()
       .build());
diff --git a/plugin/src/test/java/com/flit/protoc/gen/server/jaxrs/HelloworldGeneratorTest.test_Generate.approved.txt b/plugin/src/test/java/com/flit/protoc/gen/server/jaxrs/HelloworldGeneratorTest.test_Generate.approved.txt
@@ -26,11 +26,11 @@ public class RpcHelloWorldResource {
   @Path("/Hello")
   @Produces({
       "application/protobuf",
-      "application/json"
+      "application/json; charset=utf-8"
   })
   @Consumes({
       "application/protobuf",
-      "application/json"
+      "application/json; charset=utf-8"
   })
   public Response handleHello(Helloworld.HelloReq request) {
     return Response.ok(service.handleHello(request)).build();
@@ -40,11 +40,11 @@ public class RpcHelloWorldResource {
   @Path("/HelloAgain")
   @Produces({
       "application/protobuf",
-      "application/json"
+      "application/json; charset=utf-8"
   })
   @Consumes({
       "application/protobuf",
-      "application/json"
+      "application/json; charset=utf-8"
   })
   public Response handleHelloAgain(Helloworld.HelloReq request) {
     return Response.ok(service.handleHelloAgain(request)).build();
diff --git a/plugin/src/test/java/com/flit/protoc/gen/server/jaxrs/StatusGeneratorTest.test_Generate.approved.txt b/plugin/src/test/java/com/flit/protoc/gen/server/jaxrs/StatusGeneratorTest.test_Generate.approved.txt
@@ -24,11 +24,11 @@ public class RpcStatusResource {
   @Path("/GetStatus")
   @Produces({
       "application/protobuf",
-      "application/json"
+      "application/json; charset=utf-8"
   })
   @Consumes({
       "application/protobuf",
-      "application/json"
+      "application/json; charset=utf-8"
   })
   public Response handleGetStatus(Core.Empty request) {
     return Response.ok(service.handleGetStatus(request)).build();
diff --git a/plugin/src/test/java/com/flit/protoc/gen/server/spring/HelloworldGeneratorTest.test_Generate.approved.txt b/plugin/src/test/java/com/flit/protoc/gen/server/spring/HelloworldGeneratorTest.test_Generate.approved.txt
@@ -42,7 +42,7 @@ public class RpcHelloWorldController {
     Helloworld.HelloResp retval = service.handleHello(data);
     response.setStatus(200);
     if (json) {
-      response.setContentType("application/json;charset=UTF-8");
+      response.setContentType("application/json; charset=utf-8");
       response.getOutputStream().write(JsonFormat.printer().omittingInsignificantWhitespace().print(retval).getBytes(StandardCharsets.UTF_8));
     } else {
       response.setContentType("application/protobuf");
@@ -69,7 +69,7 @@ public class RpcHelloWorldController {
     Helloworld.HelloResp retval = service.handleHelloAgain(data);
     response.setStatus(200);
     if (json) {
-      response.setContentType("application/json;charset=UTF-8");
+      response.setContentType("application/json; charset=utf-8");
       response.getOutputStream().write(JsonFormat.printer().omittingInsignificantWhitespace().print(retval).getBytes(StandardCharsets.UTF_8));
     } else {
       response.setContentType("application/protobuf");
diff --git a/plugin/src/test/java/com/flit/protoc/gen/server/spring/StatusGeneratorTest.test_Generate.approved.txt b/plugin/src/test/java/com/flit/protoc/gen/server/spring/StatusGeneratorTest.test_Generate.approved.txt
@@ -40,7 +40,7 @@ public class RpcStatusController {
     StatusOuterClass.StatusResponse retval = service.handleGetStatus(data);
     response.setStatus(200);
     if (json) {
-      response.setContentType("application/json;charset=UTF-8");
+      response.setContentType("application/json; charset=utf-8");
       response.getOutputStream().write(JsonFormat.printer().omittingInsignificantWhitespace().print(retval).getBytes(StandardCharsets.UTF_8));
     } else {
       response.setContentType("application/protobuf");
diff --git a/plugin/src/test/java/com/flit/protoc/gen/server/undertow/HelloworldGeneratorTest.test_Generate.approved.txt b/plugin/src/test/java/com/flit/protoc/gen/server/undertow/HelloworldGeneratorTest.test_Generate.approved.txt
@@ -78,7 +78,7 @@ public class RpcHelloWorldHandler implements HttpHandler {
     Helloworld.HelloResp response = service.handleHello(data);
     exchange.setStatusCode(200);
     if (json) {
-      exchange.getResponseHeaders().put(Headers.CONTENT_TYPE, "application/json;charset=UTF-8");
+      exchange.getResponseHeaders().put(Headers.CONTENT_TYPE, "application/json; charset=utf-8");
       exchange.getResponseSender().send(JsonFormat.printer().omittingInsignificantWhitespace().print(response));
     } else {
       exchange.getResponseHeaders().put(Headers.CONTENT_TYPE, "application/protobuf");
@@ -104,7 +104,7 @@ public class RpcHelloWorldHandler implements HttpHandler {
     Helloworld.HelloResp response = service.handleHelloAgain(data);
     exchange.setStatusCode(200);
     if (json) {
-      exchange.getResponseHeaders().put(Headers.CONTENT_TYPE, "application/json;charset=UTF-8");
+      exchange.getResponseHeaders().put(Headers.CONTENT_TYPE, "application/json; charset=utf-8");
       exchange.getResponseSender().send(JsonFormat.printer().omittingInsignificantWhitespace().print(response));
     } else {
       exchange.getResponseHeaders().put(Headers.CONTENT_TYPE, "application/protobuf");
diff --git a/plugin/src/test/java/com/flit/protoc/gen/server/undertow/StatusGeneratorTest.test_Generate.approved.txt b/plugin/src/test/java/com/flit/protoc/gen/server/undertow/StatusGeneratorTest.test_Generate.approved.txt
@@ -75,7 +75,7 @@ public class RpcStatusHandler implements HttpHandler {
     StatusOuterClass.StatusResponse response = service.handleGetStatus(data);
     exchange.setStatusCode(200);
     if (json) {
-      exchange.getResponseHeaders().put(Headers.CONTENT_TYPE, "application/json;charset=UTF-8");
+      exchange.getResponseHeaders().put(Headers.CONTENT_TYPE, "application/json; charset=utf-8");
       exchange.getResponseSender().send(JsonFormat.printer().omittingInsignificantWhitespace().print(response));
     } else {
       exchange.getResponseHeaders().put(Headers.CONTENT_TYPE, "application/protobuf");
