Convenience fixup

5 files changed, 19 insertions, 15 deletions

diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/AccessLogTest.java b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/AccessLogTest.java
index 81b6de8f2ee..d9659cf92d4 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/AccessLogTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/AccessLogTest.java
@@ -89,7 +89,7 @@ public class AccessLogTest extends ContainerModelBuilderTestBase {
         assertNotNull(getVespaAccessLog("default"));
 
         { // vespa
-            Component<?, ?> accessLogComponent = getContainerComponent("default", VespaAccessLog.class.getName());
+            Component<?, ?> accessLogComponent = getComponent("default", VespaAccessLog.class.getName());
             assertNotNull(accessLogComponent);
             assertEquals(VespaAccessLog.class.getName(), accessLogComponent.getClassId().getName(), VespaAccessLog.class.getName());
             AccessLogConfig config = root.getConfig(AccessLogConfig.class, "default/component/com.yahoo.container.logging.VespaAccessLog");
@@ -101,7 +101,7 @@ public class AccessLogTest extends ContainerModelBuilderTestBase {
         }
 
         { // json
-            Component<?, ?> accessLogComponent = getContainerComponent("default", JSONAccessLog.class.getName());
+            Component<?, ?> accessLogComponent = getComponent("default", JSONAccessLog.class.getName());
             assertNotNull(accessLogComponent);
             assertEquals(JSONAccessLog.class.getName(), accessLogComponent.getClassId().getName(), JSONAccessLog.class.getName());
             AccessLogConfig config = root.getConfig(AccessLogConfig.class, "default/component/com.yahoo.container.logging.JSONAccessLog");
@@ -124,7 +124,7 @@ public class AccessLogTest extends ContainerModelBuilderTestBase {
                 nodesXml,
                 "</container>" );
         createModel(root, clusterElem);
-        Component<?, ?> connectionLogComponent = getContainerComponent("default", FileConnectionLog.class.getName());
+        Component<?, ?> connectionLogComponent = getComponent("default", FileConnectionLog.class.getName());
         assertNotNull(connectionLogComponent);
         ConnectionLogConfig config = root.getConfig(ConnectionLogConfig.class, "default/component/com.yahoo.container.logging.FileConnectionLog");
         assertEquals("default", config.cluster());
@@ -140,7 +140,7 @@ public class AccessLogTest extends ContainerModelBuilderTestBase {
                 nodesXml,
                 "</container>" );
         createModel(root, clusterElem);
-        Component<?, ?> fileConnectionLogComponent = getContainerComponent("default", FileConnectionLog.class.getName());
+        Component<?, ?> fileConnectionLogComponent = getComponent("default", FileConnectionLog.class.getName());
         assertNull(fileConnectionLogComponent);
     }
 
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 531877a086f..7042e5f3c88 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,6 +21,7 @@ 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;
@@ -266,7 +267,7 @@ public class ContainerModelBuilderTest extends ContainerModelBuilderTestBase {
     @Test
     public void processingHandler_is_instantiated_from_the_default_bundle() {
         createClusterWithProcessingAndSearchChains();
-        ComponentsConfig.Components config = getComponent(componentsConfig(), PROCESSING_HANDLER_CLASS);
+        ComponentsConfig.Components config = getComponentInConfig(componentsConfig(), PROCESSING_HANDLER_CLASS);
         assertEquals(PROCESSING_HANDLER_CLASS, config.bundle());
     }
 
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilderTestBase.java b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilderTestBase.java
index 3d7b17d37e0..aaab9118356 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilderTestBase.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilderTestBase.java
@@ -13,6 +13,7 @@ import com.yahoo.vespa.model.container.ApplicationContainerCluster;
 import com.yahoo.vespa.model.container.ContainerCluster;
 import com.yahoo.vespa.model.container.ContainerModel;
 import com.yahoo.vespa.model.container.component.Component;
+import com.yahoo.vespa.model.container.component.Handler;
 import com.yahoo.vespa.model.container.search.ContainerSearch;
 import org.junit.Before;
 import org.w3c.dom.Element;
@@ -94,7 +95,7 @@ public abstract class ContainerModelBuilderTestBase {
         return root.getConfig(ComponentsConfig.class, "default");
     }
 
-    protected ComponentsConfig.Components getComponent(ComponentsConfig componentsConfig, String id) {
+    protected ComponentsConfig.Components getComponentInConfig(ComponentsConfig componentsConfig, String id) {
         for (ComponentsConfig.Components component : componentsConfig.components()) {
             if (component.id().equals(id))
                 return component;
@@ -106,11 +107,18 @@ public abstract class ContainerModelBuilderTestBase {
         return (ApplicationContainerCluster) root.getChildren().get(clusterId);
     }
 
-    public Component<?, ?> getContainerComponent(String clusterId, String componentId) {
+    public Component<?, ?> getComponent(String clusterId, String componentId) {
         return getContainerCluster(clusterId).getComponentsMap().get(
                 ComponentId.fromString(componentId));
     }
 
+    public Handler<?> getHandler(String clusterId, String componentId) {
+        Component<?,?> component = getComponent(clusterId, componentId);
+        if (! (component instanceof Handler<?>))
+            throw new RuntimeException("Component is not a handler: " + componentId);
+        return (Handler<?>) component;
+    }
+
     void assertComponentConfigured(ApplicationContainerCluster cluster, String componentId) {
         Component<?, ?> component = cluster.getComponentsMap().get(ComponentId.fromString(componentId));
         assertNotNull(component);
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
index d212aaa84e2..d450c9600ba 100644
--- 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
@@ -52,7 +52,7 @@ public class HandlerBuilderTest extends ContainerModelBuilderTestBase {
                 "</container>");
 
         createModel(root, clusterElem);
-        Component<?,?> handler = getContainerComponent("default", "myHandler");
+        Component<?,?> handler = getComponent("default", "myHandler");
         assertThat(handler.getInjectedComponentIds(), hasItem("injected@myHandler"));
     }
 
@@ -67,7 +67,7 @@ public class HandlerBuilderTest extends ContainerModelBuilderTestBase {
         createModel(root, clusterElem);
 
         // The handler is still set up.
-        ComponentsConfig.Components userRootHandler = getComponent(componentsConfig(), BindingsOverviewHandler.class.getName());
+        ComponentsConfig.Components userRootHandler = getComponentInConfig(componentsConfig(), BindingsOverviewHandler.class.getName());
         assertNotNull(userRootHandler);
 
         // .. but it has no bindings
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/SearchBuilderTest.java b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/SearchBuilderTest.java
index 1b53fc8869d..a842431ff8b 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/SearchBuilderTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/SearchBuilderTest.java
@@ -230,12 +230,7 @@ public class SearchBuilderTest extends ContainerModelBuilderTestBase {
 
         createModel(root, clusterElem);
 
-        ApplicationContainerCluster cluster = (ApplicationContainerCluster)root.getChildren().get("default");
-        Handler<?> searchHandler = cluster.getHandlers().stream()
-                .filter(h -> h.getComponentId().toString().equals(SearchHandler.HANDLER_CLASS))
-                .findAny()
-                .get();
-
+        Handler<?> searchHandler = getHandler("default", SearchHandler.HANDLER_CLASS);
         assertTrue(searchHandler.getInjectedComponentIds().contains("threadpool@search-handler"));
 
         ContainerThreadpoolConfig config = root.getConfig(