Merge pull request #22142 from vespa-engine/bjorncs/jetty-threadpool

Improve class names for the container threadpools

5 files changed, 23 insertions, 22 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerThreadpool.java b/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerThreadpool.java
index 7111a88fc01..489e4cc135a 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerThreadpool.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerThreadpool.java
@@ -4,7 +4,7 @@ package com.yahoo.vespa.model.container;
 import com.yahoo.container.bundle.BundleInstantiationSpecification;
 import com.yahoo.container.handler.threadpool.ContainerThreadPool;
 import com.yahoo.container.handler.threadpool.ContainerThreadpoolConfig;
-import com.yahoo.container.handler.threadpool.DefaultContainerThreadpool;
+import com.yahoo.container.handler.threadpool.ContainerThreadpoolImpl;
 import com.yahoo.osgi.provider.model.ComponentModel;
 import com.yahoo.text.XML;
 import com.yahoo.vespa.model.container.component.SimpleComponent;
@@ -26,7 +26,7 @@ public class ContainerThreadpool extends SimpleComponent implements ContainerThr
         super(new ComponentModel(
                 BundleInstantiationSpecification.getFromStrings(
                         "threadpool@" + name,
-                        DefaultContainerThreadpool.class.getName(),
+                        ContainerThreadpoolImpl.class.getName(),
                         null)));
         this.name = name;
         this.userOptions = userOptions;
diff --git a/container-core/src/main/java/com/yahoo/container/handler/ThreadPoolProvider.java b/container-core/src/main/java/com/yahoo/container/handler/ThreadPoolProvider.java
index bc3c35cb78e..1818a3d97b4 100644
--- a/container-core/src/main/java/com/yahoo/container/handler/ThreadPoolProvider.java
+++ b/container-core/src/main/java/com/yahoo/container/handler/ThreadPoolProvider.java
@@ -6,15 +6,16 @@ import com.yahoo.component.AbstractComponent;
 import com.yahoo.container.di.componentgraph.Provider;
 import com.yahoo.container.handler.threadpool.ContainerThreadPool;
 import com.yahoo.container.handler.threadpool.ContainerThreadpoolConfig;
-import com.yahoo.container.handler.threadpool.DefaultContainerThreadpool;
+import com.yahoo.container.handler.threadpool.ContainerThreadpoolImpl;
 import com.yahoo.container.protect.ProcessTerminator;
 import com.yahoo.jdisc.Metric;
 
 import java.util.concurrent.Executor;
 
 /**
- * A configurable thread pool provider. This provides the worker threads used for normal request processing.
- * Request an Executor injected in your component constructor if you want to use it.
+ * A configurable thread pool provider for the jdisc default threadpool.
+ * This provides the worker threads used for normal request processing.
+ * Request an {@link Executor} injected in your component constructor if you want to use it.
  *
  * @author Steinar Knutsen
  * @author baldersheim
@@ -26,11 +27,11 @@ public class ThreadPoolProvider extends AbstractComponent implements Provider<Ex
 
     @Inject
     public ThreadPoolProvider(ThreadpoolConfig config, Metric metric) {
-        this.threadpool = new DefaultContainerThreadpool(translateConfig(config), metric);
+        this.threadpool = new ContainerThreadpoolImpl(translateConfig(config), metric);
     }
 
     public ThreadPoolProvider(ThreadpoolConfig config, Metric metric, ProcessTerminator processTerminator) {
-        this.threadpool = new DefaultContainerThreadpool(translateConfig(config), metric, processTerminator);
+        this.threadpool = new ContainerThreadpoolImpl(translateConfig(config), metric, processTerminator);
     }
 
     /**
diff --git a/container-core/src/main/java/com/yahoo/container/handler/threadpool/DefaultContainerThreadpool.java b/container-core/src/main/java/com/yahoo/container/handler/threadpool/ContainerThreadpoolImpl.java
index 638336e51d8..73845c13fe8 100644
--- a/container-core/src/main/java/com/yahoo/container/handler/threadpool/DefaultContainerThreadpool.java
+++ b/container-core/src/main/java/com/yahoo/container/handler/threadpool/ContainerThreadpoolImpl.java
@@ -22,25 +22,25 @@ import java.util.logging.Logger;
  * @author bratseth
  * @author bjorncs
  */
-public class DefaultContainerThreadpool extends AbstractComponent implements AutoCloseable, ContainerThreadPool {
+public class ContainerThreadpoolImpl extends AbstractComponent implements AutoCloseable, ContainerThreadPool {
 
-    private static final Logger log = Logger.getLogger(DefaultContainerThreadpool.class.getName());
+    private static final Logger log = Logger.getLogger(ContainerThreadpoolImpl.class.getName());
     private static final int MIN_QUEUE_SIZE = 650;
     private static final int MIN_THREADS_WHEN_SCALE_FACTOR = 8;
 
     private final ExecutorServiceWrapper threadpool;
 
     @Inject
-    public DefaultContainerThreadpool(ContainerThreadpoolConfig config, Metric metric) {
+    public ContainerThreadpoolImpl(ContainerThreadpoolConfig config, Metric metric) {
         this(config, metric, new ProcessTerminator());
     }
 
-    public DefaultContainerThreadpool(ContainerThreadpoolConfig config, Metric metric, ProcessTerminator processTerminator) {
+    public ContainerThreadpoolImpl(ContainerThreadpoolConfig config, Metric metric, ProcessTerminator processTerminator) {
         this(config, metric, processTerminator, Runtime.getRuntime().availableProcessors());
     }
 
-    DefaultContainerThreadpool(ContainerThreadpoolConfig config, Metric metric, ProcessTerminator processTerminator,
-                               int cpus) {
+    ContainerThreadpoolImpl(ContainerThreadpoolConfig config, Metric metric, ProcessTerminator processTerminator,
+                            int cpus) {
         String name = config.name();
         int maxThreads = maxThreads(config, cpus);
         int minThreads = minThreads(config, maxThreads, cpus);
diff --git a/container-core/src/test/java/com/yahoo/container/handler/threadpool/DefaultContainerThreadPoolTest.java b/container-core/src/test/java/com/yahoo/container/handler/threadpool/ContainerThreadPoolImplTest.java
index b56d89cafb3..536f7f599f2 100644
--- a/container-core/src/test/java/com/yahoo/container/handler/threadpool/DefaultContainerThreadPoolTest.java
+++ b/container-core/src/test/java/com/yahoo/container/handler/threadpool/ContainerThreadPoolImplTest.java
@@ -20,7 +20,7 @@ import static org.junit.Assert.fail;
  * @author Steinar Knutsen
  * @author bjorncs
  */
-public class DefaultContainerThreadPoolTest {
+public class ContainerThreadPoolImplTest {
 
     private static final int CPUS = 16;
 
@@ -28,7 +28,7 @@ public class DefaultContainerThreadPoolTest {
     public final void testThreadPool() throws InterruptedException {
         Metric metrics = new MetricMock();
         ContainerThreadpoolConfig config = new ContainerThreadpoolConfig(new ContainerThreadpoolConfig.Builder().maxThreads(1));
-        ContainerThreadPool threadPool = new DefaultContainerThreadpool(config, metrics);
+        ContainerThreadPool threadPool = new ContainerThreadpoolImpl(config, metrics);
         Executor exec = threadPool.executor();
         Tuple2<Receiver.MessageState, Boolean> reply;
         FlipIt command = new FlipIt();
@@ -66,7 +66,7 @@ public class DefaultContainerThreadPoolTest {
                 .maxThreads(maxThreads)
                 .minThreads(maxThreads)
                 .queueSize(queueSize));
-        ContainerThreadPool threadPool = new DefaultContainerThreadpool(
+        ContainerThreadPool threadPool = new ContainerThreadpoolImpl(
                 config, metric, new MockProcessTerminator(), CPUS);
         ExecutorServiceWrapper wrapper = (ExecutorServiceWrapper) threadPool.executor();
         WorkerCompletionTimingThreadPoolExecutor executor = (WorkerCompletionTimingThreadPoolExecutor)wrapper.delegate();
@@ -128,7 +128,7 @@ public class DefaultContainerThreadPoolTest {
                         .maxThreadExecutionTimeSeconds(1));
         MockProcessTerminator terminator = new MockProcessTerminator();
         Metric metrics = new MetricMock();
-        ContainerThreadPool threadPool = new DefaultContainerThreadpool(config, metrics, terminator);
+        ContainerThreadPool threadPool = new ContainerThreadpoolImpl(config, metrics, terminator);
 
         // No dying when threads hang shorter than max thread execution time
         threadPool.executor().execute(new Hang(500));
diff --git a/searchlib/abi-spec.json b/searchlib/abi-spec.json
index 5a534562d32..3081c88ec99 100644
--- a/searchlib/abi-spec.json
+++ b/searchlib/abi-spec.json
@@ -353,12 +353,9 @@
       "public"
     ],
     "methods": [
-      "public static com.yahoo.searchlib.rankingexpression.Reference fromIdentifier(java.lang.String)",
       "public void <init>(java.lang.String, com.yahoo.searchlib.rankingexpression.rule.Arguments, java.lang.String)",
       "public com.yahoo.searchlib.rankingexpression.rule.Arguments arguments()",
       "public java.lang.String output()",
-      "public static com.yahoo.searchlib.rankingexpression.Reference simple(java.lang.String, java.lang.String)",
-      "public static java.util.Optional simple(java.lang.String)",
       "public boolean isIdentifier()",
       "public boolean isSimple()",
       "public java.util.Optional simpleArgument()",
@@ -369,6 +366,9 @@
       "public java.lang.String toString()",
       "public java.lang.StringBuilder toString(java.lang.StringBuilder, com.yahoo.searchlib.rankingexpression.rule.SerializationContext, java.util.Deque, com.yahoo.searchlib.rankingexpression.rule.CompositeNode)",
       "public int compareTo(com.yahoo.searchlib.rankingexpression.Reference)",
+      "public static com.yahoo.searchlib.rankingexpression.Reference fromIdentifier(java.lang.String)",
+      "public static com.yahoo.searchlib.rankingexpression.Reference simple(java.lang.String, java.lang.String)",
+      "public static java.util.Optional simple(java.lang.String)",
       "public bridge synthetic int compareTo(java.lang.Object)"
     ],
     "fields": []
@@ -1598,7 +1598,6 @@
       "public void <init>(java.lang.String, java.util.List, java.lang.String)",
       "public void <init>(com.yahoo.searchlib.rankingexpression.Reference)",
       "public java.lang.String getName()",
-      "public int hashCode()",
       "public com.yahoo.searchlib.rankingexpression.rule.Arguments getArguments()",
       "public com.yahoo.searchlib.rankingexpression.rule.ReferenceNode setArguments(java.util.List)",
       "public java.lang.String getOutput()",
@@ -1608,7 +1607,8 @@
       "public com.yahoo.searchlib.rankingexpression.Reference reference()",
       "public com.yahoo.tensor.TensorType type(com.yahoo.tensor.evaluation.TypeContext)",
       "public com.yahoo.searchlib.rankingexpression.evaluation.Value evaluate(com.yahoo.searchlib.rankingexpression.evaluation.Context)",
-      "public com.yahoo.searchlib.rankingexpression.rule.CompositeNode setChildren(java.util.List)"
+      "public com.yahoo.searchlib.rankingexpression.rule.CompositeNode setChildren(java.util.List)",
+      "public int hashCode()"
     ],
     "fields": []
   },