Remove status message support from HTTP client

NikhilCollooru · NikhilCollooru · commit 3bff49bcb06e · 2024-07-30T16:18:13.000-07:00
Messages are not in HTTP/2 and are poorly supported in servlets.
diff --git a/event/src/main/java/com/facebook/airlift/event/client/HttpEventClient.java b/event/src/main/java/com/facebook/airlift/event/client/HttpEventClient.java
@@ -169,13 +169,12 @@ public Void handle(Request request, Response response)
             try {
                 InputStream inputStream = response.getInputStream();
                 String responseBody = CharStreams.toString(new InputStreamReader(inputStream));
-                log.debug("Posting event to %s failed: status_code=%d status_line=%s body=%s", request.getUri(), statusCode, response.getStatusMessage(), responseBody);
+                log.debug("Posting event to %s failed: status_code=%d body=%s", request.getUri(), statusCode, responseBody);
             }
             catch (IOException bodyError) {
-                log.debug("Posting event to %s failed: status_code=%d status_line=%s error=%s",
+                log.debug("Posting event to %s failed: status_code=%d error=%s",
                         request.getUri(),
                         statusCode,
-                        response.getStatusMessage(),
                         bodyError.getMessage());
             }
             return null;
diff --git a/http-client/src/main/java/com/facebook/airlift/http/client/FullJsonResponseHandler.java b/http-client/src/main/java/com/facebook/airlift/http/client/FullJsonResponseHandler.java
@@ -64,9 +64,9 @@ public JsonResponse<T> handle(Request request, Response response)
         byte[] bytes = readResponseBytes(response);
         String contentType = response.getHeader(CONTENT_TYPE);
         if ((contentType == null) || !MediaType.parse(contentType).is(MEDIA_TYPE_JSON)) {
-            return new JsonResponse<>(response.getStatusCode(), response.getStatusMessage(), response.getHeaders(), bytes);
+            return new JsonResponse<>(response.getStatusCode(), response.getHeaders(), bytes);
         }
-        return new JsonResponse<>(response.getStatusCode(), response.getStatusMessage(), response.getHeaders(), jsonCodec, bytes);
+        return new JsonResponse<>(response.getStatusCode(), response.getHeaders(), jsonCodec, bytes);
     }
 
     private static byte[] readResponseBytes(Response response)
@@ -82,18 +82,16 @@ private static byte[] readResponseBytes(Response response)
     public static class JsonResponse<T>
     {
         private final int statusCode;
-        private final String statusMessage;
         private final ListMultimap<HeaderName, String> headers;
         private final boolean hasValue;
         private final byte[] jsonBytes;
         private final byte[] responseBytes;
         private final T value;
         private final IllegalArgumentException exception;
 
-        public JsonResponse(int statusCode, String statusMessage, ListMultimap<HeaderName, String> headers, byte[] responseBytes)
+        public JsonResponse(int statusCode, ListMultimap<HeaderName, String> headers, byte[] responseBytes)
         {
             this.statusCode = statusCode;
-            this.statusMessage = statusMessage;
             this.headers = ImmutableListMultimap.copyOf(headers);
 
             this.hasValue = false;
@@ -104,10 +102,9 @@ public JsonResponse(int statusCode, String statusMessage, ListMultimap<HeaderNam
         }
 
         @SuppressWarnings("ThrowableInstanceNeverThrown")
-        public JsonResponse(int statusCode, String statusMessage, ListMultimap<HeaderName, String> headers, JsonCodec<T> jsonCodec, byte[] jsonBytes)
+        public JsonResponse(int statusCode, ListMultimap<HeaderName, String> headers, JsonCodec<T> jsonCodec, byte[] jsonBytes)
         {
             this.statusCode = statusCode;
-            this.statusMessage = statusMessage;
             this.headers = ImmutableListMultimap.copyOf(headers);
 
             this.jsonBytes = requireNonNull(jsonBytes, "jsonBytes is null");
@@ -131,11 +128,6 @@ public int getStatusCode()
             return statusCode;
         }
 
-        public String getStatusMessage()
-        {
-            return statusMessage;
-        }
-
         @Nullable
         public String getHeader(String name)
         {
@@ -201,7 +193,6 @@ public String toString()
         {
             return toStringHelper(this)
                     .add("statusCode", statusCode)
-                    .add("statusMessage", statusMessage)
                     .add("headers", headers)
                     .add("hasValue", hasValue)
                     .add("value", value)
diff --git a/http-client/src/main/java/com/facebook/airlift/http/client/JsonResponseHandler.java b/http-client/src/main/java/com/facebook/airlift/http/client/JsonResponseHandler.java
@@ -68,7 +68,7 @@ public T handle(Request request, Response response)
     {
         if (!successfulResponseCodes.contains(response.getStatusCode())) {
             throw new UnexpectedResponseException(
-                    String.format("Expected response code to be %s, but was %d: %s", successfulResponseCodes, response.getStatusCode(), response.getStatusMessage()),
+                    String.format("Expected response code to be %s, but was %d", successfulResponseCodes, response.getStatusCode()),
                     request,
                     response);
         }
diff --git a/http-client/src/main/java/com/facebook/airlift/http/client/Response.java b/http-client/src/main/java/com/facebook/airlift/http/client/Response.java
@@ -29,8 +29,6 @@ public interface Response
 {
     int getStatusCode();
 
-    String getStatusMessage();
-
     @Nullable
     default String getHeader(String name)
     {
diff --git a/http-client/src/main/java/com/facebook/airlift/http/client/StatusResponseHandler.java b/http-client/src/main/java/com/facebook/airlift/http/client/StatusResponseHandler.java
@@ -48,19 +48,17 @@ public StatusResponse handleException(Request request, Exception exception)
     @Override
     public StatusResponse handle(Request request, Response response)
     {
-        return new StatusResponse(response.getStatusCode(), response.getStatusMessage(), response.getHeaders());
+        return new StatusResponse(response.getStatusCode(), response.getHeaders());
     }
 
     public static class StatusResponse
     {
         private final int statusCode;
-        private final String statusMessage;
         private final ListMultimap<HeaderName, String> headers;
 
-        public StatusResponse(int statusCode, String statusMessage, ListMultimap<HeaderName, String> headers)
+        public StatusResponse(int statusCode, ListMultimap<HeaderName, String> headers)
         {
             this.statusCode = statusCode;
-            this.statusMessage = statusMessage;
             this.headers = ImmutableListMultimap.copyOf(headers);
         }
 
@@ -69,11 +67,6 @@ public int getStatusCode()
             return statusCode;
         }
 
-        public String getStatusMessage()
-        {
-            return statusMessage;
-        }
-
         @Nullable
         public String getHeader(String name)
         {
diff --git a/http-client/src/main/java/com/facebook/airlift/http/client/StringResponseHandler.java b/http-client/src/main/java/com/facebook/airlift/http/client/StringResponseHandler.java
@@ -61,14 +61,12 @@ public StringResponse handle(Request request, Response response)
                 MediaType mediaType = MediaType.parse(contentType);
                 return new StringResponse(
                         response.getStatusCode(),
-                        response.getStatusMessage(),
                         response.getHeaders(),
                         new String(ByteStreams.toByteArray(response.getInputStream()), mediaType.charset().or(UTF_8)));
             }
 
             return new StringResponse(
                     response.getStatusCode(),
-                    response.getStatusMessage(),
                     response.getHeaders(),
                     new String(ByteStreams.toByteArray(response.getInputStream()), UTF_8));
         }
@@ -80,14 +78,12 @@ public StringResponse handle(Request request, Response response)
     public static class StringResponse
     {
         private final int statusCode;
-        private final String statusMessage;
         private final ListMultimap<HeaderName, String> headers;
         private final String body;
 
-        public StringResponse(int statusCode, String statusMessage, ListMultimap<HeaderName, String> headers, String body)
+        public StringResponse(int statusCode, ListMultimap<HeaderName, String> headers, String body)
         {
             this.statusCode = statusCode;
-            this.statusMessage = statusMessage;
             this.headers = ImmutableListMultimap.copyOf(headers);
             this.body = body;
         }
@@ -97,11 +93,6 @@ public int getStatusCode()
             return statusCode;
         }
 
-        public String getStatusMessage()
-        {
-            return statusMessage;
-        }
-
         public String getBody()
         {
             return body;
diff --git a/http-client/src/main/java/com/facebook/airlift/http/client/UnexpectedResponseException.java b/http-client/src/main/java/com/facebook/airlift/http/client/UnexpectedResponseException.java
@@ -31,15 +31,13 @@ public class UnexpectedResponseException
 {
     private final Request request;
     private final int statusCode;
-    private final String statusMessage;
     private final ListMultimap<HeaderName, String> headers;
 
     public UnexpectedResponseException(Request request, Response response)
     {
-        this(String.format("%d: %s", response.getStatusCode(), response.getStatusMessage()),
+        this(String.format("%d", response.getStatusCode()),
                 request,
                 response.getStatusCode(),
-                response.getStatusMessage(),
                 ImmutableListMultimap.copyOf(response.getHeaders()));
     }
 
@@ -48,16 +46,14 @@ public UnexpectedResponseException(String message, Request request, Response res
         this(message,
                 request,
                 response.getStatusCode(),
-                response.getStatusMessage(),
                 ImmutableListMultimap.copyOf(response.getHeaders()));
     }
 
-    public UnexpectedResponseException(String message, Request request, int statusCode, String statusMessage, ListMultimap<HeaderName, String> headers)
+    public UnexpectedResponseException(String message, Request request, int statusCode, ListMultimap<HeaderName, String> headers)
     {
         super(message);
         this.request = request;
         this.statusCode = statusCode;
-        this.statusMessage = statusMessage;
         this.headers = ImmutableListMultimap.copyOf(headers);
     }
 
@@ -66,11 +62,6 @@ public int getStatusCode()
         return statusCode;
     }
 
-    public String getStatusMessage()
-    {
-        return statusMessage;
-    }
-
     @Nullable
     public String getHeader(String name)
     {
@@ -94,7 +85,6 @@ public String toString()
         return toStringHelper(this)
                 .add("request", request)
                 .add("statusCode", statusCode)
-                .add("statusMessage", statusMessage)
                 .add("headers", headers)
                 .toString();
     }
diff --git a/http-client/src/main/java/com/facebook/airlift/http/client/jetty/JettyResponse.java b/http-client/src/main/java/com/facebook/airlift/http/client/jetty/JettyResponse.java
@@ -31,12 +31,6 @@ public int getStatusCode()
         return response.getStatus();
     }
 
-    @Override
-    public String getStatusMessage()
-    {
-        return response.getReason();
-    }
-
     @Override
     public ListMultimap<HeaderName, String> getHeaders()
     {
@@ -60,7 +54,6 @@ public String toString()
     {
         return toStringHelper(this)
                 .add("statusCode", getStatusCode())
-                .add("statusMessage", getStatusMessage())
                 .add("headers", getHeaders())
                 .toString();
     }
diff --git a/http-client/src/main/java/com/facebook/airlift/http/client/testing/TestingResponse.java b/http-client/src/main/java/com/facebook/airlift/http/client/testing/TestingResponse.java
@@ -43,12 +43,6 @@ public int getStatusCode()
         return status.code();
     }
 
-    @Override
-    public String getStatusMessage()
-    {
-        return status.reason();
-    }
-
     @Override
     public ListMultimap<HeaderName, String> getHeaders()
     {
@@ -73,7 +67,6 @@ public String toString()
     {
         return toStringHelper(this)
                 .add("statusCode", getStatusCode())
-                .add("statusMessage", getStatusMessage())
                 .add("headers", getHeaders())
                 .toString();
     }
diff --git a/http-client/src/main/java/com/facebook/airlift/http/client/thrift/ThriftResponse.java b/http-client/src/main/java/com/facebook/airlift/http/client/thrift/ThriftResponse.java
@@ -8,27 +8,22 @@
 
 import java.util.List;
 
-import static java.util.Objects.requireNonNull;
-
 public class ThriftResponse<T>
 {
     private final int statusCode;
-    private final String statusMessage;
     private final String errorMessage;
     private final ListMultimap<HeaderName, String> headers;
     private final T value;
     private final IllegalArgumentException exception;
 
     ThriftResponse(
             int statusCode,
-            String statusMessage,
             String errorMessage,
             ListMultimap<HeaderName, String> headers,
             T value,
             IllegalArgumentException exception)
     {
         this.statusCode = statusCode;
-        this.statusMessage = requireNonNull(statusMessage, "statusMessage is null");
         this.errorMessage = errorMessage;
         this.headers = headers != null ? ImmutableListMultimap.copyOf(headers) : null;
         this.value = value;
@@ -40,11 +35,6 @@ public int getStatusCode()
         return statusCode;
     }
 
-    public String getStatusMessage()
-    {
-        return statusMessage;
-    }
-
     public String getErrorMessage()
     {
         return errorMessage;
diff --git a/http-client/src/main/java/com/facebook/airlift/http/client/thrift/ThriftResponseHandler.java b/http-client/src/main/java/com/facebook/airlift/http/client/thrift/ThriftResponseHandler.java
@@ -69,7 +69,7 @@ public ThriftResponse<T> handle(Request request, Response response)
         catch (Exception e) {
             exception = new IllegalArgumentException("Unable to create " + thriftCodec.getType() + " from THRIFT response", e);
         }
-        return new ThriftResponse<>(response.getStatusCode(), response.getStatusMessage(), null, response.getHeaders(), value, exception);
+        return new ThriftResponse<>(response.getStatusCode(), null, response.getHeaders(), value, exception);
     }
 
     private ThriftResponse<T> createErrorResponse(Response response)
@@ -83,7 +83,7 @@ public InputStream openStream() throws IOException
         };
         try {
             String errorMessage = byteSource.asCharSource(StandardCharsets.UTF_8).read();
-            return new ThriftResponse<>(response.getStatusCode(), response.getStatusMessage(), errorMessage, response.getHeaders(), null, null);
+            return new ThriftResponse<>(response.getStatusCode(), errorMessage, response.getHeaders(), null, null);
         }
         catch (IOException e) {
             throw new UncheckedIOException(e);
diff --git a/http-client/src/test/java/com/facebook/airlift/http/client/AbstractHttpClientTest.java b/http-client/src/test/java/com/facebook/airlift/http/client/AbstractHttpClientTest.java
@@ -621,27 +621,6 @@ public void testResponseStatusCode()
         assertEquals(statusCode, 543);
     }
 
-    @Test
-    public void testResponseStatusMessage()
-            throws Exception
-    {
-        servlet.setResponseStatusMessage("message");
-
-        Request request = prepareGet()
-                .setUri(baseURI)
-                .build();
-
-        String statusMessage = executeRequest(request, createStatusResponseHandler()).getStatusMessage();
-
-        if (createClientConfig().isHttp2Enabled()) {
-            // reason phrases are not supported in HTTP/2
-            assertNull(statusMessage);
-        }
-        else {
-            assertEquals(statusMessage, "message");
-        }
-    }
-
     @Test
     public void testRequestHeaders()
             throws Exception
diff --git a/http-client/src/test/java/com/facebook/airlift/http/client/EchoServlet.java b/http-client/src/test/java/com/facebook/airlift/http/client/EchoServlet.java
@@ -42,7 +42,6 @@ public final class EchoServlet
     private byte[] requestBytes;
 
     private int responseStatusCode = 200;
-    private String responseStatusMessage;
     private final ListMultimap<String, String> responseHeaders = ArrayListMultimap.create();
     private String responseBody;
 
@@ -63,12 +62,8 @@ protected void service(HttpServletRequest request, HttpServletResponse response)
 
         requestBytes = ByteStreams.toByteArray(request.getInputStream());
 
-        if (responseStatusMessage != null) {
-            response.sendError(responseStatusCode, responseStatusMessage);
-        }
-        else {
-            response.setStatus(responseStatusCode);
-        }
+        response.setStatus(responseStatusCode);
+
         for (Map.Entry<String, String> entry : responseHeaders.entries()) {
             response.addHeader(entry.getKey(), entry.getValue());
         }
@@ -126,11 +121,6 @@ public void setResponseStatusCode(int responseStatusCode)
         this.responseStatusCode = responseStatusCode;
     }
 
-    public void setResponseStatusMessage(String responseStatusMessage)
-    {
-        this.responseStatusMessage = responseStatusMessage;
-    }
-
     public void addResponseHeader(String name, String value)
     {
         this.responseHeaders.put(name, value);
diff --git a/http-server/src/test/java/com/facebook/airlift/http/server/DummyFilter.java b/http-server/src/test/java/com/facebook/airlift/http/server/DummyFilter.java
diff --git a/http-server/src/test/java/com/facebook/airlift/http/server/TestHttpServerModule.java b/http-server/src/test/java/com/facebook/airlift/http/server/TestHttpServerModule.java
diff --git a/http-server/src/test/java/com/facebook/airlift/http/server/TestHttpServerProvider.java b/http-server/src/test/java/com/facebook/airlift/http/server/TestHttpServerProvider.java

Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ public T handle(Request request, Response response)`
`68`	`68`	`{`
`69`	`69`	`if (!successfulResponseCodes.contains(response.getStatusCode())) {`
`70`	`70`	`throw new UnexpectedResponseException(`
`71`		`- String.format("Expected response code to be %s, but was %d: %s", successfulResponseCodes, response.getStatusCode(), response.getStatusMessage()),`
	`71`	`+ String.format("Expected response code to be %s, but was %d", successfulResponseCodes, response.getStatusCode()),`
`72`	`72`	`request,`
`73`	`73`	`response);`
`74`	`74`	`}`
Original file line number	Diff line number	Diff line change
`@@ -29,8 +29,6 @@ public interface Response`
`29`	`29`	`{`
`30`	`30`	`int getStatusCode();`
`31`	`31`
`32`		`- String getStatusMessage();`
`33`		`-`
`34`	`32`	`@Nullable`
`35`	`33`	`default String getHeader(String name)`
`36`	`34`	`{`
Original file line number	Diff line number	Diff line change
`@@ -48,19 +48,17 @@ public StatusResponse handleException(Request request, Exception exception)`
`48`	`48`	`@Override`
`49`	`49`	`public StatusResponse handle(Request request, Response response)`
`50`	`50`	`{`
`51`		`- return new StatusResponse(response.getStatusCode(), response.getStatusMessage(), response.getHeaders());`
	`51`	`+ return new StatusResponse(response.getStatusCode(), response.getHeaders());`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`public static class StatusResponse`
`55`	`55`	`{`
`56`	`56`	`private final int statusCode;`
`57`		`- private final String statusMessage;`
`58`	`57`	`private final ListMultimap<HeaderName, String> headers;`
`59`	`58`
`60`		`- public StatusResponse(int statusCode, String statusMessage, ListMultimap<HeaderName, String> headers)`
	`59`	`+ public StatusResponse(int statusCode, ListMultimap<HeaderName, String> headers)`
`61`	`60`	`{`
`62`	`61`	`this.statusCode = statusCode;`
`63`		`- this.statusMessage = statusMessage;`
`64`	`62`	`this.headers = ImmutableListMultimap.copyOf(headers);`
`65`	`63`	`}`
`66`	`64`
`@@ -69,11 +67,6 @@ public int getStatusCode()`
`69`	`67`	`return statusCode;`
`70`	`68`	`}`
`71`	`69`
`72`		`- public String getStatusMessage()`
`73`		`- {`
`74`		`- return statusMessage;`
`75`		`- }`
`76`		`-`
`77`	`70`	`@Nullable`
`78`	`71`	`public String getHeader(String name)`
`79`	`72`	`{`
Original file line number	Diff line number	Diff line change
`@@ -61,14 +61,12 @@ public StringResponse handle(Request request, Response response)`
`61`	`61`	`MediaType mediaType = MediaType.parse(contentType);`
`62`	`62`	`return new StringResponse(`
`63`	`63`	`response.getStatusCode(),`
`64`		`- response.getStatusMessage(),`
`65`	`64`	`response.getHeaders(),`
`66`	`65`	`new String(ByteStreams.toByteArray(response.getInputStream()), mediaType.charset().or(UTF_8)));`
`67`	`66`	`}`
`68`	`67`
`69`	`68`	`return new StringResponse(`
`70`	`69`	`response.getStatusCode(),`
`71`		`- response.getStatusMessage(),`
`72`	`70`	`response.getHeaders(),`
`73`	`71`	`new String(ByteStreams.toByteArray(response.getInputStream()), UTF_8));`
`74`	`72`	`}`
`@@ -80,14 +78,12 @@ public StringResponse handle(Request request, Response response)`
`80`	`78`	`public static class StringResponse`
`81`	`79`	`{`
`82`	`80`	`private final int statusCode;`
`83`		`- private final String statusMessage;`
`84`	`81`	`private final ListMultimap<HeaderName, String> headers;`
`85`	`82`	`private final String body;`
`86`	`83`
`87`		`- public StringResponse(int statusCode, String statusMessage, ListMultimap<HeaderName, String> headers, String body)`
	`84`	`+ public StringResponse(int statusCode, ListMultimap<HeaderName, String> headers, String body)`
`88`	`85`	`{`
`89`	`86`	`this.statusCode = statusCode;`
`90`		`- this.statusMessage = statusMessage;`
`91`	`87`	`this.headers = ImmutableListMultimap.copyOf(headers);`
`92`	`88`	`this.body = body;`
`93`	`89`	`}`
`@@ -97,11 +93,6 @@ public int getStatusCode()`
`97`	`93`	`return statusCode;`
`98`	`94`	`}`
`99`	`95`
`100`		`- public String getStatusMessage()`
`101`		`- {`
`102`		`- return statusMessage;`
`103`		`- }`
`104`		`-`
`105`	`96`	`public String getBody()`
`106`	`97`	`{`
`107`	`98`	`return body;`
Original file line number	Diff line number	Diff line change
`@@ -31,15 +31,13 @@ public class UnexpectedResponseException`
`31`	`31`	`{`
`32`	`32`	`private final Request request;`
`33`	`33`	`private final int statusCode;`
`34`		`- private final String statusMessage;`
`35`	`34`	`private final ListMultimap<HeaderName, String> headers;`
`36`	`35`
`37`	`36`	`public UnexpectedResponseException(Request request, Response response)`
`38`	`37`	`{`
`39`		`- this(String.format("%d: %s", response.getStatusCode(), response.getStatusMessage()),`
	`38`	`+ this(String.format("%d", response.getStatusCode()),`
`40`	`39`	`request,`
`41`	`40`	`response.getStatusCode(),`
`42`		`- response.getStatusMessage(),`
`43`	`41`	`ImmutableListMultimap.copyOf(response.getHeaders()));`
`44`	`42`	`}`
`45`	`43`
`@@ -48,16 +46,14 @@ public UnexpectedResponseException(String message, Request request, Response res`
`48`	`46`	`this(message,`
`49`	`47`	`request,`
`50`	`48`	`response.getStatusCode(),`
`51`		`- response.getStatusMessage(),`
`52`	`49`	`ImmutableListMultimap.copyOf(response.getHeaders()));`
`53`	`50`	`}`
`54`	`51`
`55`		`- public UnexpectedResponseException(String message, Request request, int statusCode, String statusMessage, ListMultimap<HeaderName, String> headers)`
	`52`	`+ public UnexpectedResponseException(String message, Request request, int statusCode, ListMultimap<HeaderName, String> headers)`
`56`	`53`	`{`
`57`	`54`	`super(message);`
`58`	`55`	`this.request = request;`
`59`	`56`	`this.statusCode = statusCode;`
`60`		`- this.statusMessage = statusMessage;`
`61`	`57`	`this.headers = ImmutableListMultimap.copyOf(headers);`
`62`	`58`	`}`
`63`	`59`
`@@ -66,11 +62,6 @@ public int getStatusCode()`
`66`	`62`	`return statusCode;`
`67`	`63`	`}`
`68`	`64`
`69`		`- public String getStatusMessage()`
`70`		`- {`
`71`		`- return statusMessage;`
`72`		`- }`
`73`		`-`
`74`	`65`	`@Nullable`
`75`	`66`	`public String getHeader(String name)`
`76`	`67`	`{`
`@@ -94,7 +85,6 @@ public String toString()`
`94`	`85`	`return toStringHelper(this)`
`95`	`86`	`.add("request", request)`
`96`	`87`	`.add("statusCode", statusCode)`
`97`		`- .add("statusMessage", statusMessage)`
`98`	`88`	`.add("headers", headers)`
`99`	`89`	`.toString();`
`100`	`90`	`}`
Original file line number	Diff line number	Diff line change
`@@ -31,12 +31,6 @@ public int getStatusCode()`
`31`	`31`	`return response.getStatus();`
`32`	`32`	`}`
`33`	`33`
`34`		`- @Override`
`35`		`- public String getStatusMessage()`
`36`		`- {`
`37`		`- return response.getReason();`
`38`		`- }`
`39`		`-`
`40`	`34`	`@Override`
`41`	`35`	`public ListMultimap<HeaderName, String> getHeaders()`
`42`	`36`	`{`
`@@ -60,7 +54,6 @@ public String toString()`
`60`	`54`	`{`
`61`	`55`	`return toStringHelper(this)`
`62`	`56`	`.add("statusCode", getStatusCode())`
`63`		`- .add("statusMessage", getStatusMessage())`
`64`	`57`	`.add("headers", getHeaders())`
`65`	`58`	`.toString();`
`66`	`59`	`}`
Original file line number	Diff line number	Diff line change
`@@ -43,12 +43,6 @@ public int getStatusCode()`
`43`	`43`	`return status.code();`
`44`	`44`	`}`
`45`	`45`
`46`		`- @Override`
`47`		`- public String getStatusMessage()`
`48`		`- {`
`49`		`- return status.reason();`
`50`		`- }`
`51`		`-`
`52`	`46`	`@Override`
`53`	`47`	`public ListMultimap<HeaderName, String> getHeaders()`
`54`	`48`	`{`
`@@ -73,7 +67,6 @@ public String toString()`
`73`	`67`	`{`
`74`	`68`	`return toStringHelper(this)`
`75`	`69`	`.add("statusCode", getStatusCode())`
`76`		`- .add("statusMessage", getStatusMessage())`
`77`	`70`	`.add("headers", getHeaders())`
`78`	`71`	`.toString();`
`79`	`72`	`}`
Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ public ThriftResponse<T> handle(Request request, Response response)`
`69`	`69`	`catch (Exception e) {`
`70`	`70`	`exception = new IllegalArgumentException("Unable to create " + thriftCodec.getType() + " from THRIFT response", e);`
`71`	`71`	`}`
`72`		`- return new ThriftResponse<>(response.getStatusCode(), response.getStatusMessage(), null, response.getHeaders(), value, exception);`
	`72`	`+ return new ThriftResponse<>(response.getStatusCode(), null, response.getHeaders(), value, exception);`
`73`	`73`	`}`
`74`	`74`
`75`	`75`	`private ThriftResponse<T> createErrorResponse(Response response)`
`@@ -83,7 +83,7 @@ public InputStream openStream() throws IOException`
`83`	`83`	`};`
`84`	`84`	`try {`
`85`	`85`	`String errorMessage = byteSource.asCharSource(StandardCharsets.UTF_8).read();`
`86`		`- return new ThriftResponse<>(response.getStatusCode(), response.getStatusMessage(), errorMessage, response.getHeaders(), null, null);`
	`86`	`+ return new ThriftResponse<>(response.getStatusCode(), errorMessage, response.getHeaders(), null, null);`
`87`	`87`	`}`
`88`	`88`	`catch (IOException e) {`
`89`	`89`	`throw new UncheckedIOException(e);`