Polish JSON RPC support

References #378 (cherry picked from commit d79a8b0)
rabbitmq · Aug 16, 2018 · 6fecb1c · 6fecb1c
1 parent 06c5152
commit 6fecb1c
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 10 deletions.
diff --git a/src/main/java/com/rabbitmq/tools/json/JSONReader.java b/src/main/java/com/rabbitmq/tools/json/JSONReader.java
@@ -47,7 +47,7 @@
 /**
  * Will be removed in 6.0
  *
- * @deprecated Use a third-party JSON library, e.g. Jackson or GJSON
+ * @deprecated Use a third-party JSON library, e.g. Jackson or Gson
  */
 public class JSONReader {
 

diff --git a/src/main/java/com/rabbitmq/tools/json/JSONSerializable.java b/src/main/java/com/rabbitmq/tools/json/JSONSerializable.java
@@ -21,7 +21,7 @@
  *
  * Will be removed in 6.0
  *
- * @deprecated Use a third-party JSON library, e.g. Jackson or GJSON
+ * @deprecated Use a third-party JSON library, e.g. Jackson or Gson
  */
 public interface JSONSerializable {
     /**

diff --git a/src/main/java/com/rabbitmq/tools/json/JSONWriter.java b/src/main/java/com/rabbitmq/tools/json/JSONWriter.java
@@ -55,7 +55,7 @@
 
 /**
  * Will be removed in 6.0
- * @deprecated Use a third-party JSON library, e.g. Jackson or GJSON
+ * @deprecated Use a third-party JSON library, e.g. Jackson or Gson
  */
 public class JSONWriter {
     private boolean indentMode = false;

diff --git a/src/main/java/com/rabbitmq/tools/jsonrpc/DefaultJsonRpcMapper.java b/src/main/java/com/rabbitmq/tools/jsonrpc/DefaultJsonRpcMapper.java
@@ -38,6 +38,7 @@ public class DefaultJsonRpcMapper implements JsonRpcMapper {
 
     @Override
     public JsonRpcRequest parse(String requestBody, ServiceDescription description) {
+        @SuppressWarnings("unchecked")
         Map<String, Object> request = (Map<String, Object>) new JSONReader().read(requestBody);
         return new JsonRpcRequest(
             request.get("id"), request.get("version").toString(), request.get("method").toString(),
@@ -47,6 +48,7 @@ public JsonRpcRequest parse(String requestBody, ServiceDescription description)
 
     @Override
     public JsonRpcResponse parse(String responseBody, Class<?> expectedType) {
+        @SuppressWarnings("unchecked")
         Map<String, Object> map = (Map<String, Object>) (new JSONReader().read(responseBody));
         Map<String, Object> error;
         JsonRpcException exception = null;

diff --git a/src/test/java/com/rabbitmq/client/JacksonJsonRpcTest.java b/src/test/java/com/rabbitmq/client/JacksonJsonRpcTest.java
@@ -58,13 +58,6 @@ public void rpc() {
         Date returnedDate = service.procedureDateDate(date);
         assertEquals(date.getTime(), returnedDate.getTime());
 
-        try {
-            service.procedureException();
-            fail("Remote procedure throwing exception, an exception should have been thrown");
-        } catch (UndeclaredThrowableException e) {
-            assertTrue(e.getCause() instanceof JsonRpcException);
-        }
-
         Pojo pojo = new Pojo();
         pojo.setStringProperty("hello");
         assertEquals("hello", service.procedurePojoToString(pojo));