Pass AdminRequestHandler's custom payload at construction time

olim7t · olim7t · commit 7057301b5869 · 2018-03-13T14:24:13.000-07:00
This allows having a single start() method, which will simplify
throttling those requests.
diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/adminrequest/AdminRequestHandler.java b/core/src/main/java/com/datastax/oss/driver/internal/core/adminrequest/AdminRequestHandler.java
@@ -62,7 +62,8 @@ public static AdminRequestHandler query(
     if (!parameters.isEmpty()) {
       debugString += " with parameters " + parameters;
     }
-    return new AdminRequestHandler(channel, message, timeout, logPrefix, debugString);
+    return new AdminRequestHandler(
+        channel, message, Frame.NO_PAYLOAD, timeout, logPrefix, debugString);
   }
 
   public static AdminRequestHandler query(
@@ -72,6 +73,7 @@ public static AdminRequestHandler query(
 
   private final DriverChannel channel;
   private final Message message;
+  private final Map<String, ByteBuffer> customPayload;
   private final Duration timeout;
   private final String logPrefix;
   private final String debugString;
@@ -83,21 +85,19 @@ public static AdminRequestHandler query(
   public AdminRequestHandler(
       DriverChannel channel,
       Message message,
+      Map<String, ByteBuffer> customPayload,
       Duration timeout,
       String logPrefix,
       String debugString) {
     this.channel = channel;
     this.message = message;
+    this.customPayload = customPayload;
     this.timeout = timeout;
     this.logPrefix = logPrefix;
     this.debugString = debugString;
   }
 
   public CompletionStage<AdminResult> start() {
-    return start(Frame.NO_PAYLOAD);
-  }
-
-  public CompletionStage<AdminResult> start(Map<String, ByteBuffer> customPayload) {
     LOG.debug("[{}] Executing {}", logPrefix, this);
     channel.write(message, false, customPayload, this).addListener(this::onWriteComplete);
     return result;
@@ -158,7 +158,12 @@ private AdminRequestHandler copy(ByteBuffer pagingState) {
     QueryOptions newOptions =
         buildQueryOptions(currentOptions.pageSize, currentOptions.namedValues, pagingState);
     return new AdminRequestHandler(
-        channel, new Query(current.query, newOptions), timeout, logPrefix, debugString);
+        channel,
+        new Query(current.query, newOptions),
+        customPayload,
+        timeout,
+        logPrefix,
+        debugString);
   }
 
   private static QueryOptions buildQueryOptions(
diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/cql/CqlPrepareHandlerBase.java b/core/src/main/java/com/datastax/oss/driver/internal/core/cql/CqlPrepareHandlerBase.java
@@ -283,9 +283,11 @@ private CompletionStage<Void> prepareOnOtherNode(Node node) {
       return CompletableFuture.completedFuture(null);
     } else {
       AdminRequestHandler handler =
-          new AdminRequestHandler(channel, message, timeout, logPrefix, message.toString());
+          new AdminRequestHandler(
+              channel, message, request.getCustomPayload(), timeout, logPrefix, message.toString());
+
       return handler
-          .start(request.getCustomPayload())
+          .start()
           .handle(
               (result, error) -> {
                 if (error == null) {
diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/cql/CqlRequestHandlerBase.java b/core/src/main/java/com/datastax/oss/driver/internal/core/cql/CqlRequestHandlerBase.java
@@ -476,11 +476,12 @@ private void processErrorResponse(Error errorMessage) {
             new AdminRequestHandler(
                 channel,
                 reprepareMessage,
+                repreparePayload.customPayload,
                 timeout,
                 logPrefix,
                 "Reprepare " + reprepareMessage.toString());
         reprepareHandler
-            .start(repreparePayload.customPayload)
+            .start()
             .handle(
                 (result, exception) -> {
                   if (exception != null) {
diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/session/ReprepareOnUp.java b/core/src/main/java/com/datastax/oss/driver/internal/core/session/ReprepareOnUp.java
@@ -232,7 +232,7 @@ private void startWorker() {
   protected CompletionStage<AdminResult> queryAsync(
       Message message, Map<String, ByteBuffer> customPayload, String debugString) {
     AdminRequestHandler reprepareHandler =
-        new AdminRequestHandler(channel, message, timeout, logPrefix, debugString);
-    return reprepareHandler.start(customPayload);
+        new AdminRequestHandler(channel, message, customPayload, timeout, logPrefix, debugString);
+    return reprepareHandler.start();
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -232,7 +232,7 @@ private void startWorker() {`
`232`	`232`	`protected CompletionStage<AdminResult> queryAsync(`
`233`	`233`	`Message message, Map<String, ByteBuffer> customPayload, String debugString) {`
`234`	`234`	`AdminRequestHandler reprepareHandler =`
`235`		`- new AdminRequestHandler(channel, message, timeout, logPrefix, debugString);`
`236`		`- return reprepareHandler.start(customPayload);`
	`235`	`+ new AdminRequestHandler(channel, message, customPayload, timeout, logPrefix, debugString);`
	`236`	`+ return reprepareHandler.start();`
`237`	`237`	`}`
`238`	`238`	`}`