Fix building HttpResponseException when charset is malformed (#535)

* fix #323 IllegalCharsetNameException in HttpResponse getContentCharset() if charset is malformed

* add test case

* remove unused import

Author: ajaaym

google-http-client/src/main/java/com/google/api/client/http/HttpResponseException.java

@@ -179,6 +179,8 @@ public Builder(HttpResponse response) {
       } catch (IOException exception) {
         // it would be bad to throw an exception while throwing an exception
         exception.printStackTrace();
+      } catch (IllegalArgumentException exception) {
+        exception.printStackTrace();
       }
       // message
       StringBuilder builder = computeMessageBuffer(response);

google-http-client/src/test/java/com/google/api/client/http/HttpResponseExceptionTest.java

@@ -183,6 +183,62 @@ public LowLevelHttpResponse execute() throws IOException {
     }
   }
 
+  public void testInvalidCharset() throws Exception {
+    HttpTransport transport = new MockHttpTransport() {
+      @Override
+      public LowLevelHttpRequest buildRequest(String method, String url) throws IOException {
+        return new MockLowLevelHttpRequest() {
+          @Override
+          public LowLevelHttpResponse execute() throws IOException {
+            MockLowLevelHttpResponse result = new MockLowLevelHttpResponse();
+            result.setStatusCode(HttpStatusCodes.STATUS_CODE_NOT_FOUND);
+            result.setReasonPhrase("Not Found");
+            result.setContentType("text/plain; charset=");
+            result.setContent("Unable to find resource");
+            return result;
+          }
+        };
+      }
+    };
+    HttpRequest request =
+        transport.createRequestFactory().buildGetRequest(HttpTesting.SIMPLE_GENERIC_URL);
+    try {
+      request.execute();
+      fail();
+    } catch (HttpResponseException e) {
+      assertEquals(
+          "404 Not Found", e.getMessage());
+    }
+  }
+
+  public void testUnsupportedCharset() throws Exception {
+    HttpTransport transport = new MockHttpTransport() {
+      @Override
+      public LowLevelHttpRequest buildRequest(String method, String url) throws IOException {
+        return new MockLowLevelHttpRequest() {
+          @Override
+          public LowLevelHttpResponse execute() throws IOException {
+            MockLowLevelHttpResponse result = new MockLowLevelHttpResponse();
+            result.setStatusCode(HttpStatusCodes.STATUS_CODE_NOT_FOUND);
+            result.setReasonPhrase("Not Found");
+            result.setContentType("text/plain; charset=invalid-charset");
+            result.setContent("Unable to find resource");
+            return result;
+          }
+        };
+      }
+    };
+    HttpRequest request =
+        transport.createRequestFactory().buildGetRequest(HttpTesting.SIMPLE_GENERIC_URL);
+    try {
+      request.execute();
+      fail();
+    } catch (HttpResponseException e) {
+      assertEquals(
+          "404 Not Found", e.getMessage());
+    }
+  }
+
   public void testSerialization() throws Exception {
     HttpTransport transport = new MockHttpTransport();
     HttpRequest request =