Extract to constants

Author: jlisam

runtime/jaxrs/src/main/java/com/flit/runtime/jaxrs/ProtobufMessageProvider.java

@@ -22,23 +22,26 @@
 public class ProtobufMessageProvider implements MessageBodyWriter<Message>,
     MessageBodyReader<Message> {
 
+  private static final String JSON = "json";
+  private static final String PROTOBUF = "protobuf";
+
   @Override
   public boolean isWriteable(Class<?> type, Type genericType,
       Annotation[] annotations, MediaType mediaType) {
     return Message.class.isAssignableFrom(type) && (
-        "json".equals(mediaType.getSubtype()) || "protobuf".equals(mediaType.getSubtype()));
+        JSON.equals(mediaType.getSubtype()) || PROTOBUF.equals(mediaType.getSubtype()));
   }
 
   @Override
-  public long getSize(Message t, Class<?> type,
+  public long getSize(Message message, Class<?> type,
       Type genericType, Annotation[] annotations,
       MediaType mediaType) {
-    if (t == null) {
+    if (message == null) {
       return -1;
     }
     ByteArrayOutputStream out = new java.io.ByteArrayOutputStream();
     try {
-      writeTo(t, type, genericType, annotations, mediaType, null, out);
+      writeTo(message, type, genericType, annotations, mediaType, null, out);
     } catch (java.io.IOException e) {
       return -1;
     }
@@ -53,10 +56,10 @@ public void writeTo(Message t, Class<?> type,
       OutputStream entityStream)
       throws IOException, WebApplicationException {
     switch (mediaType.getSubtype()) {
-      case "protobuf":
+      case PROTOBUF:
         t.writeTo(entityStream);
         break;
-      case "json":
+      case JSON:
         entityStream
             .write(JsonFormat.printer().print(t).getBytes(StandardCharsets.UTF_8));
         break;
@@ -69,7 +72,7 @@ public void writeTo(Message t, Class<?> type,
   public boolean isReadable(Class<?> type, Type genericType,
       Annotation[] annotations, MediaType mediaType) {
     return Message.class.isAssignableFrom(type) && (
-        "json".equals(mediaType.getSubtype()) || "protobuf".equals(mediaType.getSubtype()));
+        JSON.equals(mediaType.getSubtype()) || PROTOBUF.equals(mediaType.getSubtype()));
   }
 
   @Override
@@ -78,10 +81,10 @@ public Message readFrom(Class<Message> type, Type genericType, Annotation[] anno
       throws WebApplicationException {
     try {
       switch (mediaType.getSubtype()) {
-        case "protobuf":
+        case PROTOBUF:
           Method m = type.getMethod("parseFrom", InputStream.class);
           return (Message) m.invoke(null, entityStream);
-        case "json":
+        case JSON:
           Message.Builder msg = (Message.Builder) type
               .getMethod("newBuilder").invoke(null);
           JsonFormat.parser()

runtime/jaxrs/src/test/java/com/flit/runtime/jaxrs/FlitExceptionMapperTest.java

@@ -8,6 +8,7 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
+import javax.ws.rs.core.Response.Status;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.InjectMocks;
@@ -35,7 +36,7 @@ public void testToResponse() {
         .withMessage("with this message")
         .build();
     Response response = flitExceptionMapper.toResponse(flit);
-    assertEquals(response.getStatus(), 500);
+    assertEquals(response.getStatus(), Status.INTERNAL_SERVER_ERROR.getStatusCode());
     Map<String, Object> expectedResult = Map.of("msg", "with this message", "code", "internal");
     assertEquals(response.getEntity(), expectedResult);
     assertEquals(response.getMediaType(), MediaType.APPLICATION_JSON_TYPE);