Adapt JSON RPC support to Java 6

References #378

Author: acogoluegnes

src/main/java/com/rabbitmq/tools/jsonrpc/JacksonJsonRpcMapper.java

@@ -57,9 +57,11 @@ public JacksonJsonRpcMapper() {
     public JsonRpcRequest parse(String requestBody, ServiceDescription description) {
         JsonFactory jsonFactory = new MappingJsonFactory();
         String method = null, version = null;
-        final List<TreeNode> parameters = new ArrayList<>();
+        final List<TreeNode> parameters = new ArrayList<TreeNode>();
         Object id = null;
-        try (JsonParser parser = jsonFactory.createParser(requestBody)) {
+        JsonParser parser = null;
+        try {
+            parser = jsonFactory.createParser(requestBody);
             while (parser.nextToken() != null) {
                 JsonToken token = parser.currentToken();
                 if (token == JsonToken.FIELD_NAME) {
@@ -98,17 +100,25 @@ public JsonRpcRequest parse(String requestBody, ServiceDescription description)
             }
         } catch (IOException e) {
             throw new JsonRpcMappingException("Error during JSON parsing", e);
+        } finally {
+            if (parser != null) {
+                try {
+                    parser.close();
+                } catch (IOException e) {
+                    throw new JsonRpcMappingException("Error while closing JSON parser", e);
+                }
+            }
         }
 
         if (method == null) {
             throw new IllegalArgumentException("Could not find method to invoke in request");
         }
 
-        List<Object> convertedParameters = new ArrayList<>(parameters.size());
+        List<Object> convertedParameters = new ArrayList<Object>(parameters.size());
         if (!parameters.isEmpty()) {
             ProcedureDescription proc = description.getProcedure(method, parameters.size());
             Method internalMethod = proc.internal_getMethod();
-            for (int i = 0; i < internalMethod.getParameterCount(); i++) {
+            for (int i = 0; i < internalMethod.getParameterTypes().length; i++) {
                 TreeNode parameterNode = parameters.get(i);
                 try {
                     Class<?> parameterType = internalMethod.getParameterTypes()[i];
@@ -132,7 +142,9 @@ public JsonRpcResponse parse(String responseBody, Class<?> expectedReturnType) {
         Object result = null;
         JsonRpcException exception = null;
         Map<String, Object> errorMap = null;
-        try (JsonParser parser = jsonFactory.createParser(responseBody)) {
+        JsonParser parser = null;
+        try {
+            parser = jsonFactory.createParser(responseBody);
             while (parser.nextToken() != null) {
                 JsonToken token = parser.currentToken();
                 if (token == JsonToken.FIELD_NAME) {
@@ -158,6 +170,14 @@ public JsonRpcResponse parse(String responseBody, Class<?> expectedReturnType) {
             }
         } catch (IOException e) {
             throw new JsonRpcMappingException("Error during JSON parsing", e);
+        } finally {
+            if (parser != null) {
+                try {
+                    parser.close();
+                } catch (IOException e) {
+                    throw new JsonRpcMappingException("Error while closing JSON parser", e);
+                }
+            }
         }
         return new JsonRpcResponse(result, errorMap, exception);
     }

src/main/java/com/rabbitmq/tools/jsonrpc/ServiceDescription.java

@@ -48,7 +48,7 @@ public ServiceDescription(Map<String, Object> rawServiceDescription) {
     }
 
     public ServiceDescription(Class<?> klass) {
-        this.procedures = new HashMap<>();
+        this.procedures = new HashMap<String, ProcedureDescription>();
         for (Method m: klass.getMethods()) {
             ProcedureDescription proc = new ProcedureDescription(m);
             addProcedure(proc);
@@ -66,7 +66,7 @@ public Collection<ProcedureDescription> getProcs() {
 
     /** Private API - used via reflection during parsing/loading */
     public void setProcs(Collection<Map<String, Object>> p) {
-        procedures = new HashMap<>();
+        procedures = new HashMap<String, ProcedureDescription>();
         for (Map<String, Object> pm: p) {
             ProcedureDescription proc = new ProcedureDescription(pm);
             addProcedure(proc);

src/test/java/com/rabbitmq/client/AbstractJsonRpcTest.java

@@ -43,11 +43,14 @@ public void init() throws Exception {
         serverChannel = serverConnection.createChannel();
         serverChannel.queueDeclare(queue, false, false, false, null);
         server = new JsonRpcServer(serverChannel, queue, RpcService.class, new DefaultRpcservice(), createMapper());
-        new Thread(() -> {
-            try {
-                server.mainloop();
-            } catch (Exception e) {
-                // safe to ignore when loops ends/server is canceled
+        new Thread(new Runnable() {
+            @Override
+            public void run() {
+                try {
+                    server.mainloop();
+                } catch (Exception e) {
+                    // safe to ignore when loops ends/server is canceled
+                }
             }
         }).start();
         client = new JsonRpcClient(clientChannel, "", queue, 1000, createMapper());

src/test/java/com/rabbitmq/client/test/GeneratedClassesTest.java

@@ -45,7 +45,7 @@ public void amqpPropertiesEqualsHashCode() {
         checkEquals(
             new AMQP.BasicProperties.Builder()
                 .deliveryMode(1)
-                .headers(singletonMap("one", "two"))
+                .headers(singletonMap("one", (Object) "two"))
                 .correlationId("123")
                 .expiration("later")
                 .priority(10)
@@ -61,7 +61,7 @@ public void amqpPropertiesEqualsHashCode() {
                 .build(),
             new AMQP.BasicProperties.Builder()
                 .deliveryMode(1)
-                .headers(singletonMap("one", "two"))
+                .headers(singletonMap("one",  (Object) "two"))
                 .correlationId("123")
                 .expiration("later")
                 .priority(10)
@@ -79,7 +79,7 @@ public void amqpPropertiesEqualsHashCode() {
         checkNotEquals(
             new AMQP.BasicProperties.Builder()
                 .deliveryMode(1)
-                .headers(singletonMap("one", "two"))
+                .headers(singletonMap("one",  (Object) "two"))
                 .correlationId("123")
                 .expiration("later")
                 .priority(10)
@@ -95,7 +95,7 @@ public void amqpPropertiesEqualsHashCode() {
                 .build(),
             new AMQP.BasicProperties.Builder()
                 .deliveryMode(2)
-                .headers(singletonMap("one", "two"))
+                .headers(singletonMap("one",  (Object) "two"))
                 .correlationId("123")
                 .expiration("later")
                 .priority(10)