Use separate non-public config definition for ContainerThreadPool

2 files changed, 10 insertions, 9 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/ThreadPoolExecutorComponent.java b/config-model/src/main/java/com/yahoo/vespa/model/container/ThreadPoolExecutorComponent.java
index aac73ce7636..9d59941f603 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/ThreadPoolExecutorComponent.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/ThreadPoolExecutorComponent.java
@@ -2,8 +2,8 @@
 package com.yahoo.vespa.model.container;
 
 import com.yahoo.container.bundle.BundleInstantiationSpecification;
-import com.yahoo.container.handler.ThreadpoolConfig;
 import com.yahoo.container.handler.threadpool.ContainerThreadPool;
+import com.yahoo.container.handler.threadpool.ContainerThreadpoolConfig;
 import com.yahoo.osgi.provider.model.ComponentModel;
 import com.yahoo.vespa.model.container.component.SimpleComponent;
 
@@ -14,7 +14,7 @@ import java.time.Duration;
  *
  * @author bjorncs
  */
-public class ThreadPoolExecutorComponent extends SimpleComponent implements ThreadpoolConfig.Producer {
+public class ThreadPoolExecutorComponent extends SimpleComponent implements ContainerThreadpoolConfig.Producer {
 
     private final String name;
     private final Integer maxPoolSize;
@@ -38,10 +38,10 @@ public class ThreadPoolExecutorComponent extends SimpleComponent implements Thre
     }
 
     @Override
-    public void getConfig(ThreadpoolConfig.Builder builder) {
+    public void getConfig(ContainerThreadpoolConfig.Builder builder) {
         builder.name(this.name);
-        if (maxPoolSize != null) builder.maxthreads(maxPoolSize);
-        if (corePoolSize != null) builder.corePoolSize(corePoolSize);
+        if (maxPoolSize != null) builder.maxThreads(maxPoolSize);
+        if (corePoolSize != null) builder.minThreads(corePoolSize);
         if (keepAliveTime != null) builder.keepAliveTime(keepAliveTime.toMillis() / 1000D);
         if (queueSize != null) builder.queueSize(queueSize);
         if (maxThreadExecutionTime != null) builder.maxThreadExecutionTimeSeconds((int)maxThreadExecutionTime.toMillis() / 1000);
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerDocumentApiBuilderTest.java b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerDocumentApiBuilderTest.java
index ab73309bb7d..93117821c5a 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerDocumentApiBuilderTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerDocumentApiBuilderTest.java
@@ -12,7 +12,7 @@ import com.yahoo.config.provision.ClusterSpec;
 import com.yahoo.config.provision.HostSpec;
 import com.yahoo.config.provision.NodeResources;
 import com.yahoo.config.provision.ProvisionLogger;
-import com.yahoo.container.handler.ThreadpoolConfig;
+import com.yahoo.container.handler.threadpool.ContainerThreadpoolConfig;
 import com.yahoo.net.HostName;
 import com.yahoo.vespa.model.container.ContainerCluster;
 import com.yahoo.vespa.model.container.component.Handler;
@@ -115,9 +115,10 @@ public class ContainerDocumentApiBuilderTest extends ContainerModelBuilderTestBa
         Set<String> injectedComponentIds = feedApiHandler.getInjectedComponentIds();
         assertThat(injectedComponentIds, hasItem("threadpool@feedapi-handler"));
 
-        ThreadpoolConfig config = root.getConfig(ThreadpoolConfig.class, "cluster1/component/com.yahoo.vespa.http.server.FeedHandler/threadpool@feedapi-handler");
-        assertEquals(16, config.maxthreads());
-        assertEquals(8, config.corePoolSize());
+        ContainerThreadpoolConfig config = root.getConfig(
+                ContainerThreadpoolConfig.class, "cluster1/component/com.yahoo.vespa.http.server.FeedHandler/threadpool@feedapi-handler");
+        assertEquals(16, config.maxThreads());
+        assertEquals(8, config.minThreads());
     }
 
     private static class HostProvisionerWithCustomRealResource implements HostProvisioner {