Rename class to 'ContainerThreadpool'

3 files changed, 9 insertions, 9 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 ecf05d97fa7..a43941f20d0 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
@@ -6,7 +6,7 @@ import com.yahoo.container.bundle.BundleInstantiationSpecification;
 import com.yahoo.container.handler.threadpool.ContainerThreadpoolConfig;
 import com.yahoo.osgi.provider.model.ComponentModel;
 import com.yahoo.vespa.model.container.ContainerCluster;
-import com.yahoo.vespa.model.container.ContainerThreadpoolComponent;
+import com.yahoo.vespa.model.container.ContainerThreadpool;
 import com.yahoo.vespa.model.container.component.Handler;
 import com.yahoo.vespa.model.container.component.SystemBindingPattern;
 import com.yahoo.vespa.model.container.component.UserBindingPattern;
@@ -33,7 +33,7 @@ public class ContainerDocumentApi {
         var handler = newVespaClientHandler(
                 "com.yahoo.vespa.http.server.FeedHandler", bindingSuffix, options);
         cluster.addComponent(handler);
-        var executor = new ThreadpoolComponent("feedapi-handler", cluster, options);
+        var executor = new Threadpool("feedapi-handler", cluster, options);
         handler.inject(executor);
         handler.addComponent(executor);
     }
@@ -43,7 +43,7 @@ public class ContainerDocumentApi {
         var handler = newVespaClientHandler(
                 "com.yahoo.document.restapi.resource.RestApi", "/document/v1/*", options);
         cluster.addComponent(handler);
-        var executor = new ThreadpoolComponent("restapi-handler", cluster, options);
+        var executor = new Threadpool("restapi-handler", cluster, options);
         handler.inject(executor);
         handler.addComponent(executor);
     }
@@ -79,12 +79,12 @@ public class ContainerDocumentApi {
         }
     }
 
-    private static class ThreadpoolComponent extends ContainerThreadpoolComponent {
+    private static class Threadpool extends ContainerThreadpool {
 
         private final ContainerCluster<?> cluster;
         private final Options options;
 
-        ThreadpoolComponent(String name, ContainerCluster<?> cluster, Options options) {
+        Threadpool(String name, ContainerCluster<?> cluster, Options options) {
             super(name);
             this.cluster = cluster;
             this.options = options;
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerThreadpoolComponent.java b/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerThreadpool.java
index 648dce95a59..6e4514c31b4 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerThreadpoolComponent.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerThreadpool.java
@@ -15,11 +15,11 @@ import java.util.stream.Collectors;
  *
  * @author bjorncs
  */
-public class ContainerThreadpoolComponent extends SimpleComponent implements ContainerThreadpoolConfig.Producer {
+public class ContainerThreadpool extends SimpleComponent implements ContainerThreadpoolConfig.Producer {
 
     private final String name;
 
-    public ContainerThreadpoolComponent(String name) {
+    public ContainerThreadpool(String name) {
         super(new ComponentModel(
                 BundleInstantiationSpecification.getFromStrings(
                         "threadpool@" + name,
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/SearchHandler.java b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/SearchHandler.java
index 62b447a7139..81681f6bc52 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/SearchHandler.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/SearchHandler.java
@@ -4,7 +4,7 @@ package com.yahoo.vespa.model.container.xml;
 import com.yahoo.config.model.deploy.DeployState;
 import com.yahoo.container.handler.threadpool.ContainerThreadpoolConfig;
 import com.yahoo.vespa.model.container.ApplicationContainerCluster;
-import com.yahoo.vespa.model.container.ContainerThreadpoolComponent;
+import com.yahoo.vespa.model.container.ContainerThreadpool;
 import com.yahoo.vespa.model.container.component.BindingPattern;
 import com.yahoo.vespa.model.container.component.SystemBindingPattern;
 import com.yahoo.vespa.model.container.component.chain.ProcessingHandler;
@@ -33,7 +33,7 @@ class SearchHandler extends ProcessingHandler<SearchChains> {
         addComponent(threadpool);
     }
 
-    private static class Threadpool extends ContainerThreadpoolComponent {
+    private static class Threadpool extends ContainerThreadpool {
         private final ApplicationContainerCluster cluster;
         private final DeployState deployState;