Add test to verify default threadpool for custom handlers.

+ Move custom handler tests to separate class.

2 files changed, 118 insertions, 82 deletions

diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilderTest.java b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilderTest.java
index 3a241d9607f..834ae04771d 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilderTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilderTest.java
@@ -21,7 +21,6 @@ import com.yahoo.config.provision.Flavor;
 import com.yahoo.config.provision.RegionName;
 import com.yahoo.config.provision.Zone;
 import com.yahoo.config.provisioning.FlavorsConfig;
-import com.yahoo.container.ComponentsConfig;
 import com.yahoo.container.QrConfig;
 import com.yahoo.container.core.ChainsConfig;
 import com.yahoo.container.core.VipStatusConfig;
@@ -60,19 +59,14 @@ import java.util.stream.Collectors;
 import static com.yahoo.config.model.test.TestUtil.joinLines;
 import static com.yahoo.test.LinePatternMatcher.containsLineWithPattern;
 import static com.yahoo.vespa.defaults.Defaults.getDefaults;
-import static com.yahoo.vespa.model.container.ContainerCluster.ROOT_HANDLER_BINDING;
-import static com.yahoo.vespa.model.container.ContainerCluster.STATE_HANDLER_BINDING_1;
-import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.not;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.contains;
 import static org.hamcrest.Matchers.containsString;
-import static org.hamcrest.Matchers.hasItem;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotEquals;
 import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
@@ -216,68 +210,6 @@ public class ContainerModelBuilderTest extends ContainerModelBuilderTestBase {
     }
 
     @Test
-    public void default_root_handler_binding_can_be_stolen_by_user_configured_handler() {
-        Element clusterElem = DomBuilderTest.parse(
-                "<container id='default' version='1.0'>" +
-                        "  <handler id='userRootHandler'>" +
-                        "    <binding>" + ROOT_HANDLER_BINDING.patternString() + "</binding>" +
-                        "  </handler>" +
-                        "</container>");
-        createModel(root, clusterElem);
-
-        // The handler is still set up.
-        ComponentsConfig.Components userRootHandler = getComponent(componentsConfig(), BindingsOverviewHandler.class.getName());
-        assertNotNull(userRootHandler);
-
-        // .. but it has no bindings
-        var discBindingsConfig = root.getConfig(JdiscBindingsConfig.class, "default");
-        assertNull(discBindingsConfig.handlers(BindingsOverviewHandler.class.getName()));
-    }
-
-    @Test
-    public void reserved_binding_cannot_be_stolen_by_user_configured_handler() {
-        Element clusterElem = DomBuilderTest.parse(
-                "<container id='default' version='1.0'>" +
-                        "  <handler id='userHandler'>" +
-                        "    <binding>" + STATE_HANDLER_BINDING_1.patternString() + "</binding>" +
-                        "  </handler>" +
-                        "</container>");
-        try {
-            createModel(root, clusterElem);
-            fail("Expected exception when stealing a reserved binding.");
-        } catch (IllegalArgumentException e) {
-            assertThat(e.getMessage(), is("Binding 'http://*/state/v1' is a reserved Vespa binding " +
-                                                  "and cannot be used by handler: userHandler"));
-        }
-    }
-
-    @Test
-    public void handler_bindings_are_included_in_discBindings_config() {
-        createClusterWithJDiscHandler();
-        String discBindingsConfig = root.getConfig(JdiscBindingsConfig.class, "default").toString();
-        assertThat(discBindingsConfig, containsString(".serverBindings[0] \"http://*/binding0\""));
-        assertThat(discBindingsConfig, containsString(".serverBindings[1] \"http://*/binding1\""));
-    }
-
-    @Test
-    public void handlers_are_included_in_components_config() {
-        createClusterWithJDiscHandler();
-        assertThat(componentsConfig().toString(), containsString(".id \"discHandler\""));
-    }
-
-    private void createClusterWithJDiscHandler() {
-        Element clusterElem = DomBuilderTest.parse(
-                "<container id='default' version='1.0'>",
-                "  <handler id='discHandler'>",
-                "    <binding>http://*/binding0</binding>",
-                "    <binding>http://*/binding1</binding>",
-                "  </handler>",
-                "</container>");
-
-        createModel(root, clusterElem);
-    }
-
-    @Test
     public void processing_handler_bindings_can_be_overridden() {
         Element clusterElem = DomBuilderTest.parse(
                 "<container id='default' version='1.0'>",
@@ -375,20 +307,6 @@ public class ContainerModelBuilderTest extends ContainerModelBuilderTestBase {
     }
 
     @Test
-    public void nested_components_are_injected_to_handlers() {
-        Element clusterElem = DomBuilderTest.parse(
-                "<container id='default' version='1.0'>",
-                "  <handler id='myHandler'>",
-                "    <component id='injected' />",
-                "  </handler>",
-                "</container>");
-
-        createModel(root, clusterElem);
-        Component<?,?> handler = getContainerComponent("default", "myHandler");
-        assertThat(handler.getInjectedComponentIds(), hasItem("injected@myHandler"));
-    }
-
-    @Test
     public void component_includes_are_added() {
         VespaModelCreatorWithFilePkg creator = new VespaModelCreatorWithFilePkg("src/test/cfg/application/include_dirs");
         VespaModel model = creator.create(true);
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/HandlerBuilderTest.java b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/HandlerBuilderTest.java
new file mode 100644
index 00000000000..d212aaa84e2
--- /dev/null
+++ b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/HandlerBuilderTest.java
@@ -0,0 +1,118 @@
+package com.yahoo.vespa.model.container.xml;
+
+import com.yahoo.config.model.builder.xml.test.DomBuilderTest;
+import com.yahoo.container.ComponentsConfig;
+import com.yahoo.container.jdisc.JdiscBindingsConfig;
+import com.yahoo.container.usability.BindingsOverviewHandler;
+import com.yahoo.vespa.model.container.ApplicationContainerCluster;
+import com.yahoo.vespa.model.container.component.Component;
+import com.yahoo.vespa.model.container.component.Handler;
+import org.junit.Test;
+import org.w3c.dom.Element;
+
+import static com.yahoo.vespa.model.container.ContainerCluster.ROOT_HANDLER_BINDING;
+import static com.yahoo.vespa.model.container.ContainerCluster.STATE_HANDLER_BINDING_1;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.containsString;
+import static org.hamcrest.Matchers.hasItem;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+/**
+ * Tests for container model building with custom handlers.
+ *
+ * @author gjoranv
+ */
+public class HandlerBuilderTest extends ContainerModelBuilderTestBase {
+
+    @Test
+    public void handlers_are_included_in_components_config() {
+        createClusterWithJDiscHandler();
+        assertThat(componentsConfig().toString(), containsString(".id \"discHandler\""));
+    }
+
+    @Test
+    public void handler_bindings_are_included_in_discBindings_config() {
+        createClusterWithJDiscHandler();
+        String discBindingsConfig = root.getConfig(JdiscBindingsConfig.class, "default").toString();
+        assertThat(discBindingsConfig, containsString(".serverBindings[0] \"http://*/binding0\""));
+        assertThat(discBindingsConfig, containsString(".serverBindings[1] \"http://*/binding1\""));
+    }
+
+    @Test
+    public void nested_components_are_injected_to_handlers() {
+        Element clusterElem = DomBuilderTest.parse(
+                "<container id='default' version='1.0'>",
+                "  <handler id='myHandler'>",
+                "    <component id='injected' />",
+                "  </handler>",
+                "</container>");
+
+        createModel(root, clusterElem);
+        Component<?,?> handler = getContainerComponent("default", "myHandler");
+        assertThat(handler.getInjectedComponentIds(), hasItem("injected@myHandler"));
+    }
+
+    @Test
+    public void default_root_handler_binding_can_be_stolen_by_user_configured_handler() {
+        Element clusterElem = DomBuilderTest.parse(
+                "<container id='default' version='1.0'>" +
+                        "  <handler id='userRootHandler'>" +
+                        "    <binding>" + ROOT_HANDLER_BINDING.patternString() + "</binding>" +
+                        "  </handler>" +
+                        "</container>");
+        createModel(root, clusterElem);
+
+        // The handler is still set up.
+        ComponentsConfig.Components userRootHandler = getComponent(componentsConfig(), BindingsOverviewHandler.class.getName());
+        assertNotNull(userRootHandler);
+
+        // .. but it has no bindings
+        var discBindingsConfig = root.getConfig(JdiscBindingsConfig.class, "default");
+        assertNull(discBindingsConfig.handlers(BindingsOverviewHandler.class.getName()));
+    }
+
+    @Test
+    public void reserved_binding_cannot_be_stolen_by_user_configured_handler() {
+        Element clusterElem = DomBuilderTest.parse(
+                "<container id='default' version='1.0'>" +
+                        "  <handler id='userHandler'>" +
+                        "    <binding>" + STATE_HANDLER_BINDING_1.patternString() + "</binding>" +
+                        "  </handler>" +
+                        "</container>");
+        try {
+            createModel(root, clusterElem);
+            fail("Expected exception when stealing a reserved binding.");
+        } catch (IllegalArgumentException e) {
+            assertThat(e.getMessage(), is("Binding 'http://*/state/v1' is a reserved Vespa binding " +
+                                                  "and cannot be used by handler: userHandler"));
+        }
+    }
+
+    @Test
+    public void custom_handler_gets_default_threadpool() {
+        createClusterWithJDiscHandler();
+        ApplicationContainerCluster cluster = (ApplicationContainerCluster)root.getChildren().get("default");
+        Handler<?> handler = cluster.getHandlers().stream()
+                .filter(h -> h.getComponentId().toString().equals("discHandler"))
+                .findAny().orElseThrow();
+
+        assertTrue(handler.getInjectedComponentIds().contains("threadpool@default-handler-common"));
+    }
+
+    private void createClusterWithJDiscHandler() {
+        Element clusterElem = DomBuilderTest.parse(
+                "<container id='default' version='1.0'>",
+                "  <handler id='discHandler'>",
+                "    <binding>http://*/binding0</binding>",
+                "    <binding>http://*/binding1</binding>",
+                "  </handler>",
+                "</container>");
+
+        createModel(root, clusterElem);
+    }
+
+}