Add constructor with RpcClientParams to JsonRpcClient

[#161476914]

References #417

(cherry picked from commit 9993273)

Author: acogoluegnes

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

@@ -17,6 +17,7 @@
 
 import com.rabbitmq.client.Channel;
 import com.rabbitmq.client.RpcClient;
+import com.rabbitmq.client.RpcClientParams;
 import com.rabbitmq.client.ShutdownSignalException;
 import com.rabbitmq.tools.json.JSONReader;
 import org.slf4j.Logger;
@@ -67,6 +68,25 @@ public class JsonRpcClient extends RpcClient implements InvocationHandler {
      */
     private ServiceDescription serviceDescription;
 
+    /**
+     * Construct a new {@link JsonRpcClient}, passing the {@link RpcClientParams} through {@link RpcClient}'s constructor.
+     * <p>
+     * The service description record is
+     * retrieved from the server during construction.
+     *
+     * @param rpcClientParams
+     * @param mapper
+     * @throws IOException
+     * @throws JsonRpcException
+     * @throws TimeoutException
+     */
+    public JsonRpcClient(RpcClientParams rpcClientParams, JsonRpcMapper mapper)
+            throws IOException, JsonRpcException, TimeoutException {
+        super(rpcClientParams);
+        this.mapper = mapper;
+        retrieveServiceDescription();
+    }
+
     /**
      * Construct a new JsonRpcClient, passing the parameters through
      * to RpcClient's constructor. The service description record is
@@ -76,7 +96,12 @@ public class JsonRpcClient extends RpcClient implements InvocationHandler {
      */
     public JsonRpcClient(Channel channel, String exchange, String routingKey, int timeout, JsonRpcMapper mapper)
         throws IOException, JsonRpcException, TimeoutException {
-        super(channel, exchange, routingKey, timeout);
+        super(new RpcClientParams()
+                .channel(channel)
+                .exchange(exchange)
+                .routingKey(routingKey)
+                .timeout(timeout)
+        );
         this.mapper = mapper;
         retrieveServiceDescription();
     }

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

@@ -50,7 +50,10 @@ public void init() throws Exception {
                 // safe to ignore when loops ends/server is canceled
             }
         }).start();
-        client = new JsonRpcClient(clientChannel, "", queue, 1000, createMapper());
+        client = new JsonRpcClient(
+                    new RpcClientParams().channel(clientChannel).exchange("").routingKey(queue).timeout(1000),
+                    createMapper()
+        );
         service = client.createProxy(RpcService.class);
     }