Merge pull request briandilley#175 from im-scooter/master

Fixes for issue briandilley#174

Author: gaborbernat

src/main/java/com/googlecode/jsonrpc4j/DefaultExceptionResolver.java

@@ -89,12 +89,13 @@ private Throwable createThrowable(String typeName, String message) throws Illega
 	}
 
 	/**
-	 * Resolves original exception type name into an actual {@link Class<?>}.
+	 * Resolves original exception type name into an actual {@link Class}.
 	 * Override this, if you want custom behaviour for handling exceptions,
 	 * i.e.: Default to RuntimeException.
 	 *
 	 * @param typeName Original exception type name thrown on the server.
-	 * @throws ClassNotFoundException
+     * @return the resolved throwable
+	 * @throws ClassNotFoundException - if throwable class has not been found
 	 */
 	protected Class<? extends Throwable> resolveThrowableClass(String typeName) throws ClassNotFoundException {
 		Class<?> clazz;

src/main/java/com/googlecode/jsonrpc4j/JsonRpcBasicServer.java

@@ -496,11 +496,11 @@ private JsonNode invoke(Object target, Method method, List<JsonNode> params) thr
 
         if (method.getGenericParameterTypes().length == 1 && method.isVarArgs()) {
             convertedParams = new Object[params.size()];
-            ObjectMapper mapper = new ObjectMapper();
+            // ObjectMapper mapper = new ObjectMapper();
 
             for (int i = 0; i < params.size(); i++) {
                 JsonNode jsonNode = params.get(i);
-                Class type = getJavaTypeForJsonType(jsonNode.getNodeType());
+                Class<?> type = getJavaTypeForJsonType(jsonNode.getNodeType());
                 Object object = mapper.convertValue(jsonNode, type);
                 logger.debug(String.format("[%s] param: %s -> %s", method.getName(), i, type.getName()));
                 convertedParams[i] = object;

src/main/java/com/googlecode/jsonrpc4j/spring/rest/JsonRpcResponseErrorHandler.java

@@ -17,12 +17,16 @@
 import java.nio.charset.Charset;
 import java.util.HashSet;
 import java.util.Set;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
-public enum JsonRpcResponseErrorHandler
+public class JsonRpcResponseErrorHandler
 		implements ResponseErrorHandler {
 
-	INSTANCE;
+	public static final JsonRpcResponseErrorHandler INSTANCE =  new JsonRpcResponseErrorHandler();
 
+    private  final Logger logger = LoggerFactory.getLogger(this.getClass());
+    
 	/**
 	 * for supported codes see {@link com.googlecode.jsonrpc4j.DefaultHttpStatusCodeProvider}
 	 */
@@ -45,7 +49,7 @@ public boolean hasError(ClientHttpResponse response)
 			// Checks the content type. If application/json-rpc then allow handler to read message
 			final MediaType contentType = response.getHeaders().getContentType();
 			if (MappingJacksonRPC2HttpMessageConverter.APPLICATION_JSON_RPC.isCompatibleWith(contentType))
-				return true;
+				return false;
 		}
 
 		return
@@ -89,15 +93,16 @@ private byte[] getResponseBody(ClientHttpResponse response) {
 				return FileCopyUtils.copyToByteArray(responseBody);
 			}
 		} catch (IOException ex) {
-			throw new RuntimeException(ex.getMessage(), ex);
+            // No body in response 401 for example
+            logger.debug("Can not read resonse body", ex);
 		}
 		return new byte[0];
 	}
 
 	private Charset getCharset(ClientHttpResponse response) {
 		HttpHeaders headers = response.getHeaders();
 		MediaType contentType = headers.getContentType();
-		return contentType != null ? contentType.getCharSet() : null;
+		return contentType != null ? contentType.getCharset() : null;
 	}
 
 }

src/main/java/com/googlecode/jsonrpc4j/spring/rest/JsonRpcRestClient.java

@@ -26,6 +26,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicReference;
+import org.springframework.web.client.ResponseErrorHandler;
 
 @SuppressWarnings({"unused", "WeakerAccess"})
 public class JsonRpcRestClient extends JsonRpcClient implements IJsonRpcClient {
@@ -87,8 +88,8 @@ private void initRestTemplate() {
 			this.restTemplate.setMessageConverters(restMessageConverters);
 		}
 
-		// use specific JSON-RPC erro handler
-		if (!(restTemplate.getErrorHandler() instanceof JsonRpcResponseErrorHandler))
+		// use specific JSON-RPC error handler if it has not been changed to custom 
+		if (restTemplate.getErrorHandler() instanceof org.springframework.web.client.DefaultResponseErrorHandler)
 			restTemplate.setErrorHandler(JsonRpcResponseErrorHandler.INSTANCE);
 	}
 

src/main/java/com/googlecode/jsonrpc4j/spring/rest/MappingJacksonRPC2HttpMessageConverter.java

@@ -171,8 +171,8 @@ protected void writeInternal(Object object, HttpOutputMessage outputMessage)
 	 * @return the JSON encoding to use (never <code>null</code>)
 	 */
 	private JsonEncoding getJsonEncoding(MediaType contentType) {
-		if (contentType != null && contentType.getCharSet() != null) {
-			Charset charset = contentType.getCharSet();
+		if (contentType != null && contentType.getCharset() != null) {
+			Charset charset = contentType.getCharset();
 			for (JsonEncoding encoding : JsonEncoding.values()) {
 				if (charset.name().equals(encoding.getJavaName())) {
 					return encoding;