Revert "Inject default threadpool to handlers [run-systemtest]"

1 files changed, 4 insertions, 6 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 fbd7bc9fe56..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
@@ -17,7 +17,7 @@ import java.util.Optional;
  *
  * @author bjorncs
  */
-public abstract class ContainerThreadpool extends SimpleComponent implements ContainerThreadpoolConfig.Producer {
+public class ContainerThreadpool extends SimpleComponent implements ContainerThreadpoolConfig.Producer {
 
     private final String name;
     private final UserOptions userOptions;
@@ -32,13 +32,8 @@ public abstract class ContainerThreadpool extends SimpleComponent implements Con
         this.userOptions = userOptions;
     }
 
-    // Must be implemented by subclasses to set values that may be overridden by user options.
-    protected abstract void setDefaultConfigValues(ContainerThreadpoolConfig.Builder builder);
-
     @Override
     public void getConfig(ContainerThreadpoolConfig.Builder builder) {
-        setDefaultConfigValues(builder);
-
         builder.name(this.name);
         if (userOptions != null) {
             builder.maxThreads(userOptions.maxThreads);
@@ -47,6 +42,9 @@ public abstract class ContainerThreadpool extends SimpleComponent implements Con
         }
     }
 
+    protected Optional<UserOptions> userOptions() { return Optional.ofNullable(userOptions); }
+    protected boolean hasUserOptions() { return userOptions().isPresent(); }
+
     public static class UserOptions {
         private final int maxThreads;
         private final int minThreads;