Add RpcClient doCall/responseCall/primitiveCall overloads which include timeout

There will be use cases where a single shared timeout specified in the constructor
of the RpcClient will not match up with the expected timeout for different rpc calls
made using the rpc client. It's then convenient to be able to specifiy the timeout value
on a per method call basis. Otherwise the user of RpcClient would have to create
multiple instances of RpcClient, incurring the startup cost and having redundant
consumers of the response queue.

Author: Andreas Presthammer

src/main/java/com/rabbitmq/client/RpcClient.java

@@ -209,6 +209,11 @@ public void publish(AMQP.BasicProperties props, byte[] message)
     }
 
     public Response doCall(AMQP.BasicProperties props, byte[] message)
+        throws IOException, TimeoutException {
+        return doCall(props, message, _timeout);
+    }
+
+    public Response doCall(AMQP.BasicProperties props, byte[] message, int timeout)
         throws IOException, ShutdownSignalException, TimeoutException {
         checkConsumer();
         BlockingCell<Object> k = new BlockingCell<Object>();
@@ -220,7 +225,7 @@ public Response doCall(AMQP.BasicProperties props, byte[] message)
             _continuationMap.put(replyId, k);
         }
         publish(props, message);
-        Object reply = k.uninterruptibleGet(_timeout);
+        Object reply = k.uninterruptibleGet(timeout);
         if (reply instanceof ShutdownSignalException) {
             ShutdownSignalException sig = (ShutdownSignalException) reply;
             ShutdownSignalException wrapper =
@@ -238,7 +243,13 @@ public Response doCall(AMQP.BasicProperties props, byte[] message)
     public byte[] primitiveCall(AMQP.BasicProperties props, byte[] message)
         throws IOException, ShutdownSignalException, TimeoutException
     {
-        return doCall(props, message).getBody();
+        return primitiveCall(props, message, _timeout);
+    }
+
+    public byte[] primitiveCall(AMQP.BasicProperties props, byte[] message, int timeout)
+        throws IOException, ShutdownSignalException, TimeoutException
+    {
+        return doCall(props, message, timeout).getBody();
     }
 
     /**
@@ -266,7 +277,23 @@ public byte[] primitiveCall(byte[] message)
      * @throws TimeoutException if a response is not received within the configured timeout
      */
     public Response responseCall(byte[] message) throws IOException, ShutdownSignalException, TimeoutException {
-        return doCall(null, message);
+        return responseCall(message, _timeout);
+    }
+
+    /**
+     * Perform a simple byte-array-based RPC roundtrip
+     *
+     * Useful if you need to get at more than just the body of the message
+     *
+     * @param message the byte array request message to send
+     * @param timeout milliseconds before timing out on wait for response
+     * @return The response object is an envelope that contains all of the data provided to the `handleDelivery` consumer
+     * @throws ShutdownSignalException if the connection dies during our wait
+     * @throws IOException if an error is encountered
+     * @throws TimeoutException if a response is not received within the configured timeout
+     */
+    public Response responseCall(byte[] message, int timeout) throws IOException, ShutdownSignalException, TimeoutException {
+        return doCall(null, message, timeout);
     }
 
     /**