Remove threadpool configuration for restapi handler

3 files changed, 2 insertions, 8 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/clients/ContainerDocumentApi.java b/config-model/src/main/java/com/yahoo/vespa/model/clients/ContainerDocumentApi.java
index c6f035b2885..6ad81c90107 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/clients/ContainerDocumentApi.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/clients/ContainerDocumentApi.java
@@ -48,7 +48,7 @@ public class ContainerDocumentApi {
         String bindingSuffix = "/document/v1/*";
         var oldHandler = newVespaClientHandler(oldHandlerName, options.useNewRestapiHandler ? null : bindingSuffix, options);
         cluster.addComponent(oldHandler);
-        var executor = new Threadpool("restapi-handler", cluster, options.restApiThreadpoolOptions);
+        var executor = new Threadpool("restapi-handler", cluster, /*userOptions*/null);
         oldHandler.inject(executor);
         oldHandler.addComponent(executor);
 
@@ -83,16 +83,13 @@ public class ContainerDocumentApi {
 
     public static final class Options {
         private final Collection<String> bindings;
-        private final ContainerThreadpool.UserOptions restApiThreadpoolOptions;
         private final ContainerThreadpool.UserOptions feedApiThreadpoolOptions;
         private final boolean useNewRestapiHandler;
 
         public Options(Collection<String> bindings,
-                       ContainerThreadpool.UserOptions restApiThreadpoolOptions,
                        ContainerThreadpool.UserOptions feedApiThreadpoolOptions,
                        boolean useNewRestapiHandler) {
             this.bindings = Collections.unmodifiableCollection(bindings);
-            this.restApiThreadpoolOptions = restApiThreadpoolOptions;
             this.feedApiThreadpoolOptions = feedApiThreadpoolOptions;
             this.useNewRestapiHandler = useNewRestapiHandler;
         }
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/DocumentApiOptionsBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/DocumentApiOptionsBuilder.java
index 2a64a194d37..b5f77157be1 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/DocumentApiOptionsBuilder.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/DocumentApiOptionsBuilder.java
@@ -23,7 +23,6 @@ public class DocumentApiOptionsBuilder {
     public static ContainerDocumentApi.Options build(DeployState deployState, Element spec) {
         return new ContainerDocumentApi.Options(
                 getBindings(spec),
-                threadpoolOptions(spec, "rest-api"),
                 threadpoolOptions(spec, "http-client-api"),
                 deployState.getProperties().useNewRestapiHandler());
     }
diff --git a/config-model/src/main/resources/schema/containercluster.rnc b/config-model/src/main/resources/schema/containercluster.rnc
index 98ea696ceef..66438570d2f 100644
--- a/config-model/src/main/resources/schema/containercluster.rnc
+++ b/config-model/src/main/resources/schema/containercluster.rnc
@@ -219,9 +219,7 @@ DocumentApi = element document-api {
    HttpClientApi?
 }
 
-DocumentRestApi = element rest-api {
-    Threadpool?
-}
+DocumentRestApi = element rest-api { empty }
 
 HttpClientApi = element http-client-api {
     Threadpool?