Revert "Provide access to the status code returned by the most recent web service proxy invocation."

gk-brown · gk-brown · commit 71e205fbfa1c · 2021-03-24T06:47:06.000-04:00
This reverts commit 1689c6b.
diff --git a/httprpc-client/src/main/java/org/httprpc/WebServiceProxy.java b/httprpc-client/src/main/java/org/httprpc/WebServiceProxy.java
@@ -137,8 +137,6 @@ public interface ErrorHandler {
 
     private String multipartBoundary = UUID.randomUUID().toString();
 
-    private int statusCode = -1;
-
     private static final String UTF_8 = "UTF-8";
 
     private static final int EOF = -1;
@@ -591,13 +589,13 @@ public void encodeRequest(OutputStream outputStream) throws IOException {
         }
 
         // Read response
-        statusCode = connection.getResponseCode();
+        int responseCode = connection.getResponseCode();
 
         String contentType = connection.getContentType();
 
         T result;
-        if (statusCode / 100 == 2) {
-            if (statusCode % 100 < 4) {
+        if (responseCode / 100 == 2) {
+            if (responseCode % 100 < 4) {
                 try (InputStream inputStream = connection.getInputStream()) {
                     result = responseHandler.decodeResponse(inputStream, contentType);
                 }
@@ -612,7 +610,7 @@ public void encodeRequest(OutputStream outputStream) throws IOException {
             }
 
             try (InputStream inputStream = connection.getErrorStream()) {
-                errorHandler.handleResponse(inputStream, contentType, statusCode);
+                errorHandler.handleResponse(inputStream, contentType, responseCode);
             }
 
             return null;
@@ -727,17 +725,6 @@ private static Object getParameterValue(Object argument) {
         }
     }
 
-    /**
-     * Returns the status code produced by the most recent invocation.
-     *
-     * @return
-     * The status code produced by the most recent invocation, or
-     * <code>-1</code> if the proxy has never been invoked.
-     */
-    public int getStatusCode() {
-        return statusCode;
-    }
-
     /**
      * Creates a web service proxy representing a GET request.
      *
diff --git a/httprpc-test/src/test/java/org/httprpc/WebServiceProxyTest.java b/httprpc-test/src/test/java/org/httprpc/WebServiceProxyTest.java
@@ -411,8 +411,7 @@ public void testError() throws IOException {
 
             fail();
         } catch (WebServiceException exception) {
-            assertNotNull(exception.getMessage());
-            assertEquals(500, exception.getStatusCode());
+            assertTrue(true);
         }
     }
 
@@ -497,21 +496,13 @@ private List<Size> getCatalogSizes() throws IOException {
     }
 
     @Test
-    public void testCustomErrorHandler() throws IOException {
+    public void testCustomException() throws IOException {
         WebServiceProxy webServiceProxy = new WebServiceProxy("GET", new URL(baseURL, "test/error"));
 
         webServiceProxy.setErrorHandler((errorStream, contentType, statusCode) -> {
             throw new CustomException();
         });
 
         assertThrows(CustomException.class, webServiceProxy::invoke);
-
-        webServiceProxy.setErrorHandler((errorStream, contentType, statusCode) -> {
-            // No-op
-        });
-
-        webServiceProxy.invoke();
-
-        assertEquals(500, webServiceProxy.getStatusCode());
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -411,8 +411,7 @@ public void testError() throws IOException {`
`411`	`411`
`412`	`412`	`fail();`
`413`	`413`	`} catch (WebServiceException exception) {`
`414`		`- assertNotNull(exception.getMessage());`
`415`		`- assertEquals(500, exception.getStatusCode());`
	`414`	`+ assertTrue(true);`
`416`	`415`	`}`
`417`	`416`	`}`
`418`	`417`
`@@ -497,21 +496,13 @@ private List<Size> getCatalogSizes() throws IOException {`
`497`	`496`	`}`
`498`	`497`
`499`	`498`	`@Test`
`500`		`- public void testCustomErrorHandler() throws IOException {`
	`499`	`+ public void testCustomException() throws IOException {`
`501`	`500`	`WebServiceProxy webServiceProxy = new WebServiceProxy("GET", new URL(baseURL, "test/error"));`
`502`	`501`
`503`	`502`	`webServiceProxy.setErrorHandler((errorStream, contentType, statusCode) -> {`
`504`	`503`	`throw new CustomException();`
`505`	`504`	`});`
`506`	`505`
`507`	`506`	`assertThrows(CustomException.class, webServiceProxy::invoke);`
`508`		`-`
`509`		`- webServiceProxy.setErrorHandler((errorStream, contentType, statusCode) -> {`
`510`		`- // No-op`
`511`		`- });`
`512`		`-`
`513`		`- webServiceProxy.invoke();`
`514`		`-`
`515`		`- assertEquals(500, webServiceProxy.getStatusCode());`
`516`	`507`	`}`
`517`	`508`	`}`