Update error message handling.

gk-brown · gk-brown · commit b27ea190c8ef · 2021-03-05T17:00:00.000-05:00
diff --git a/README.md b/README.md
@@ -360,7 +360,7 @@ public interface ResponseHandler<T> {
 }
 ```
 
-If a service returns an error response, a `WebServiceException` will be thrown. If the content type of the response is "text/plain", the body of the response will be provided in the exception message.
+If a service returns an error response, a `WebServiceException` will be thrown. If the content type of the error response is "text/*", the deserialized response body will be provided in the exception message.
 
 The following code snippet demonstrates how `WebServiceProxy` might be used to access the operations of the simple math service discussed earlier. `listOf()`, `mapOf()`, and `entry()` are static utility methods provided by the `org.httprpc.util.Collections` class that can be used to declaratively create immutable collection instances:
 
diff --git a/build.gradle b/build.gradle
@@ -14,7 +14,7 @@
 
 subprojects {
     group = 'org.httprpc'    
-    version = '8.1'
+    version = '8.1.1'
 
     apply plugin: 'java-library'
     apply plugin: 'maven-publish'
diff --git a/httprpc-client/src/main/java/org/httprpc/WebServiceProxy.java b/httprpc-client/src/main/java/org/httprpc/WebServiceProxy.java
@@ -458,7 +458,7 @@ public <T> T invoke() throws IOException {
      * The result type.
      *
      * @param responseHandler
-     * The response handler, or <code>null</code> for no response handler.
+     * The response handler.
      *
      * @return
      * The result of the operation.
@@ -467,6 +467,10 @@ public <T> T invoke() throws IOException {
      * If an exception occurs while executing the operation.
      */
     public <T> T invoke(ResponseHandler<T> responseHandler) throws IOException {
+        if (responseHandler == null) {
+            throw new IllegalArgumentException();
+        }
+
         URL url;
         RequestHandler requestHandler;
         if (method.equalsIgnoreCase("POST") && body == null && this.requestHandler == null) {
@@ -588,7 +592,7 @@ public void encodeRequest(OutputStream outputStream) throws IOException {
 
         T result;
         if (responseCode / 100 == 2) {
-            if (responseCode % 100 < 4 && responseHandler != null) {
+            if (responseCode % 100 < 4) {
                 Map<String, String> headers = new HashMap<>();
 
                 for (Map.Entry<String, List<String>> entry : connection.getHeaderFields().entrySet()) {
@@ -611,16 +615,14 @@ public void encodeRequest(OutputStream outputStream) throws IOException {
             }
         } else {
             String message;
-            if (contentType != null && contentType.startsWith("text/plain")) {
+            if (contentType != null && contentType.startsWith("text/")) {
                 TextDecoder textDecoder = new TextDecoder();
 
                 try (InputStream inputStream = connection.getErrorStream()) {
                     message = textDecoder.read(inputStream);
                 }
             } else {
-                String responseMessage = connection.getResponseMessage();
-
-                message = (responseMessage == null || responseMessage.isEmpty()) ? String.valueOf(responseCode) : responseMessage;
+                message = null;
             }
 
             throw new WebServiceException(message, responseCode);

Original file line number	Diff line number	Diff line change
`@@ -360,7 +360,7 @@ public interface ResponseHandler<T> {`
`360`	`360`	`}`
`361`	`361`	```
`362`	`362`
`363`		-If a service returns an error response, a `WebServiceException` will be thrown. If the content type of the response is "text/plain", the body of the response will be provided in the exception message.
	`363`	+If a service returns an error response, a `WebServiceException` will be thrown. If the content type of the error response is "text/*", the deserialized response body will be provided in the exception message.
`364`	`364`
`365`	`365`	The following code snippet demonstrates how `WebServiceProxy` might be used to access the operations of the simple math service discussed earlier. `listOf()`, `mapOf()`, and `entry()` are static utility methods provided by the `org.httprpc.util.Collections` class that can be used to declaratively create immutable collection instances:
`366`	`366`