ThrottlePolicyOverride -> ThrottlePolicy

5 files changed, 12 insertions, 20 deletions

diff --git a/documentapi/abi-spec.json b/documentapi/abi-spec.json
index 1a2afa3621f..20043450501 100644
--- a/documentapi/abi-spec.json
+++ b/documentapi/abi-spec.json
@@ -271,7 +271,9 @@
       "public"
     ],
     "methods": [
-      "public void <init>()"
+      "public void <init>()",
+      "public void setThrottlePolicy(com.yahoo.messagebus.ThrottlePolicy)",
+      "public com.yahoo.messagebus.ThrottlePolicy getThrottlePolicy()"
     ],
     "fields": []
   },
@@ -926,8 +928,6 @@
       "public void setTraceLevel(int)",
       "public int getTraceLevel()",
       "public void setPriority(com.yahoo.documentapi.messagebus.protocol.DocumentProtocol$Priority)",
-      "public com.yahoo.messagebus.ThrottlePolicy getThrottlePolicy()",
-      "public void setThrottlePolicy(com.yahoo.messagebus.ThrottlePolicy)",
       "public void setLoadType(com.yahoo.documentapi.messagebus.loadtypes.LoadType)",
       "public com.yahoo.documentapi.messagebus.loadtypes.LoadType getLoadType()",
       "public boolean skipBucketsOnFatalErrors()",
diff --git a/documentapi/src/main/java/com/yahoo/documentapi/Parameters.java b/documentapi/src/main/java/com/yahoo/documentapi/Parameters.java
index 35a62650037..376794be60e 100644
--- a/documentapi/src/main/java/com/yahoo/documentapi/Parameters.java
+++ b/documentapi/src/main/java/com/yahoo/documentapi/Parameters.java
@@ -13,12 +13,12 @@ import java.util.Optional;
  * @author bratseth
  */
 public class Parameters {
-    ThrottlePolicy throttlePolicyOverride;
-    public void setThrottlePolicyOverride(ThrottlePolicy throttlePolicyOverride) {
-        this.throttlePolicyOverride = throttlePolicyOverride;
+    ThrottlePolicy throttlePolicy;
+    public void setThrottlePolicy(ThrottlePolicy throttlePolicy) {
+        this.throttlePolicy = throttlePolicy;
     }
 
-    public Optional<ThrottlePolicy> getThrottlePolicyOverride() {
-        return Optional.ofNullable(throttlePolicyOverride);
+    public ThrottlePolicy getThrottlePolicy() {
+        return throttlePolicy;
     }
 }
diff --git a/documentapi/src/main/java/com/yahoo/documentapi/VisitorParameters.java b/documentapi/src/main/java/com/yahoo/documentapi/VisitorParameters.java
index 7446c681dec..d030c8d0f04 100644
--- a/documentapi/src/main/java/com/yahoo/documentapi/VisitorParameters.java
+++ b/documentapi/src/main/java/com/yahoo/documentapi/VisitorParameters.java
@@ -4,7 +4,6 @@ package com.yahoo.documentapi;
 import com.yahoo.document.BucketId;
 import com.yahoo.document.FixedBucketSpaces;
 import com.yahoo.document.fieldset.AllFields;
-import com.yahoo.document.fieldset.DocumentOnly;
 import com.yahoo.documentapi.messagebus.loadtypes.LoadType;
 import com.yahoo.documentapi.messagebus.protocol.DocumentProtocol;
 import com.yahoo.messagebus.ThrottlePolicy;
@@ -51,7 +50,6 @@ public class VisitorParameters extends Parameters {
     private LoadType loadType = LoadType.DEFAULT; // TODO: Remove on Vespa 8
     private DocumentProtocol.Priority priority = null;
     private int traceLevel = 0;
-    private ThrottlePolicy throttlePolicy = null;
     private boolean skipBucketsOnFatalErrors = false;
     private int slices = 1;
     private int sliceId = 0;
@@ -325,14 +323,6 @@ public class VisitorParameters extends Parameters {
         this.priority = priority;
     }
 
-    public ThrottlePolicy getThrottlePolicy() {
-        return throttlePolicy;
-    }
-
-    public void setThrottlePolicy(ThrottlePolicy policy) {
-        throttlePolicy = policy;
-    }
-
     /**
      * @deprecated load types are deprecated
      */
diff --git a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/MessageBusAsyncSession.java b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/MessageBusAsyncSession.java
index d50d38e7e8b..279e04c43b4 100644
--- a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/MessageBusAsyncSession.java
+++ b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/MessageBusAsyncSession.java
@@ -96,7 +96,9 @@ public class MessageBusAsyncSession implements MessageBusSession, AsyncSession {
         routeForGet = mbusParams.getRouteForGet();
         traceLevel = mbusParams.getTraceLevel();
         SourceSessionParams sourceSessionParams = new SourceSessionParams(mbusParams.getSourceSessionParams());
-        asyncParams.getThrottlePolicyOverride().ifPresent(policy -> sourceSessionParams.setThrottlePolicy(policy));
+        if (asyncParams.getThrottlePolicy() != null) {
+            sourceSessionParams.setThrottlePolicy(asyncParams.getThrottlePolicy());
+        }
         sourceSessionParams.setReplyHandler((handler != null) ? handler : new MyReplyHandler(asyncParams.getResponseHandler(), responses));
         session = bus.createSourceSession(sourceSessionParams);
     }
diff --git a/documentapi/src/test/java/com/yahoo/documentapi/messagebus/MessageBusDocumentApiTestCase.java b/documentapi/src/test/java/com/yahoo/documentapi/messagebus/MessageBusDocumentApiTestCase.java
index 261546a328b..db7ab0ea238 100644
--- a/documentapi/src/test/java/com/yahoo/documentapi/messagebus/MessageBusDocumentApiTestCase.java
+++ b/documentapi/src/test/java/com/yahoo/documentapi/messagebus/MessageBusDocumentApiTestCase.java
@@ -147,7 +147,7 @@ public class MessageBusDocumentApiTestCase extends AbstractDocumentApiTestCase {
     public void requireThatThrottlePolicyCanBeConfigured() {
         var asyncParams = new AsyncParameters();
         ThrottlePolicy allPass = new AllPassThrottlePolicy();
-        asyncParams.setThrottlePolicyOverride(allPass);
+        asyncParams.setThrottlePolicy(allPass);
         MessageBusAsyncSession mbusSession = (MessageBusAsyncSession) access().createAsyncSession(asyncParams);
         assertSame(allPass, mbusSession.getThrottlePolicy());
         mbusSession.destroy();