637: Default generator should not be static

Change-Id: I3bb119f3f7debeb0d45ff81dc9154e26635f03bb
(cherry picked from commit 102cbbd)

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

Author: janssk1

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

@@ -81,7 +81,11 @@ public Response handle(Object reply) {
         }
     };
 
+<<<<<<< HEAD
     private final RpcClientReplyHandler _replyHandler;
+=======
+    private final Function<Object, Response> _replyHandler;
+>>>>>>> 102cbbde1... 637: Default generator should not be static
 
     /** Map from request correlation ID to continuation BlockingCell */
     private final Map<String, BlockingCell<Object>> _continuationMap = new HashMap<String, BlockingCell<Object>>();

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

@@ -52,7 +52,7 @@ public class RpcClientParams {
      */
     private RpcClient.RpcClientReplyHandler replyHandler = RpcClient.DEFAULT_REPLY_HANDLER;
 
-    private Supplier<String> correlationIdGenerator = RpcClient.DEFAULT_CORRELATION_ID_GENERATOR;
+    private Supplier<String> correlationIdGenerator = new IncrementingCorrelationIdGenerator("");
 
     /**
      * Set the channel to use for communication.