Simplify by removing the not-so-useful generic param for Handler

- Uust declare it as a Component with other Components as children.

6 files changed, 17 insertions, 17 deletions

diff --git a/config-model/src/test/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainerClusterTest.java b/config-model/src/test/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainerClusterTest.java
index 7bf08461df7..d50aedeafa0 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainerClusterTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainerClusterTest.java
@@ -70,7 +70,7 @@ public class MetricsProxyContainerClusterTest {
     @Test
     public void http_handlers_are_set_up() {
         VespaModel model = getModel(servicesWithAdminOnly(), self_hosted);
-        Collection<Handler<?>> handlers = model.getAdmin().getMetricsProxyCluster().getHandlers();
+        Collection<Handler> handlers = model.getAdmin().getMetricsProxyCluster().getHandlers();
         Collection<ComponentSpecification> handlerClasses = handlers.stream().map(Component::getClassId).collect(toList());
 
         assertTrue(handlerClasses.contains(ComponentSpecification.fromString(MetricsV1Handler.class.getName())));
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerDocumentApiBuilderTest.java b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerDocumentApiBuilderTest.java
index 61e0a9e15a4..4a9d44ea2f8 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerDocumentApiBuilderTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerDocumentApiBuilderTest.java
@@ -30,11 +30,11 @@ import static org.junit.Assert.assertTrue;
  */
 public class ContainerDocumentApiBuilderTest extends ContainerModelBuilderTestBase {
 
-    private Map<String, Handler<?>> getHandlers(String clusterName) {
+    private Map<String, Handler> getHandlers(String clusterName) {
         ContainerCluster<?> cluster = (ContainerCluster<?>) root.getChildren().get(clusterName);
-        Map<String, Handler<?>> handlerMap = new HashMap<>();
-        Collection<Handler<?>> handlers = cluster.getHandlers();
-        for (Handler<?> handler : handlers) {
+        Map<String, Handler> handlerMap = new HashMap<>();
+        Collection<Handler> handlers = cluster.getHandlers();
+        for (Handler handler : handlers) {
             assertFalse(handlerMap.containsKey(handler.getComponentId().toString()));  //die on overwrites
             handlerMap.put(handler.getComponentId().toString(), handler);
         }
@@ -56,7 +56,7 @@ public class ContainerDocumentApiBuilderTest extends ContainerModelBuilderTestBa
     }
 
     private void verifyCustomBindings(String id) {
-        Handler<?> handler = getHandlers("cluster1").get(id);
+        Handler handler = getHandlers("cluster1").get(id);
 
         assertTrue(handler.getServerBindings().contains(UserBindingPattern.fromHttpPath("/document-api/reserved-for-internal-use/feedapi")));
         assertTrue(handler.getServerBindings().contains(UserBindingPattern.fromHttpPath("/document-api/reserved-for-internal-use/feedapi/")));
@@ -73,7 +73,7 @@ public class ContainerDocumentApiBuilderTest extends ContainerModelBuilderTestBa
                 "</container>");
         createModel(root, elem);
 
-        Map<String, Handler<?>> handlerMap = getHandlers("cluster1");
+        Map<String, Handler> handlerMap = getHandlers("cluster1");
 
         assertNotNull(handlerMap.get("com.yahoo.container.handler.VipStatusHandler"));
         assertNotNull(handlerMap.get("com.yahoo.container.handler.observability.ApplicationStatusHandler"));
@@ -112,8 +112,8 @@ public class ContainerDocumentApiBuilderTest extends ContainerModelBuilderTestBa
                 "</container>");
         root = new MockRoot("root", new MockApplicationPackage.Builder().build());
         createModel(root, elem);
-        Map<String, Handler<?>> handlers = getHandlers("cluster1");
-        Handler<?> feedApiHandler = handlers.get("com.yahoo.vespa.http.server.FeedHandler");
+        Map<String, Handler> handlers = getHandlers("cluster1");
+        Handler feedApiHandler = handlers.get("com.yahoo.vespa.http.server.FeedHandler");
         Set<String> injectedComponentIds = feedApiHandler.getInjectedComponentIds();
         assertTrue(injectedComponentIds.contains("threadpool@feedapi-handler"));
 
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 fd08ae00caf..1d43c031a1b 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
@@ -198,10 +198,10 @@ public class ContainerModelBuilderTest extends ContainerModelBuilderTestBase {
     public void builtin_handlers_get_default_threadpool() {
         createBasicContainerModel();
 
-        Handler<?> h1 = getHandler("default", ApplicationStatusHandler.class.getName());
+        Handler h1 = getHandler("default", ApplicationStatusHandler.class.getName());
         assertTrue(h1.getInjectedComponentIds().contains("threadpool@default-handler-common"));
 
-        Handler<?> h2 = getHandler("default", BindingsOverviewHandler.class.getName());
+        Handler h2 = getHandler("default", BindingsOverviewHandler.class.getName());
         assertTrue(h2.getInjectedComponentIds().contains("threadpool@default-handler-common"));
     }
 
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 aaab9118356..dc831ef863d 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
@@ -112,11 +112,11 @@ public abstract class ContainerModelBuilderTestBase {
                 ComponentId.fromString(componentId));
     }
 
-    public Handler<?> getHandler(String clusterId, String componentId) {
+    public Handler getHandler(String clusterId, String componentId) {
         Component<?,?> component = getComponent(clusterId, componentId);
-        if (! (component instanceof Handler<?>))
+        if (! (component instanceof Handler))
             throw new RuntimeException("Component is not a handler: " + componentId);
-        return (Handler<?>) component;
+        return (Handler) component;
     }
 
     void assertComponentConfigured(ApplicationContainerCluster cluster, String componentId) {
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 d450c9600ba..42cda0d8034 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
@@ -96,7 +96,7 @@ public class HandlerBuilderTest extends ContainerModelBuilderTestBase {
     public void custom_handler_gets_default_threadpool() {
         createClusterWithJDiscHandler();
         ApplicationContainerCluster cluster = (ApplicationContainerCluster)root.getChildren().get("default");
-        Handler<?> handler = cluster.getHandlers().stream()
+        Handler handler = cluster.getHandlers().stream()
                 .filter(h -> h.getComponentId().toString().equals("discHandler"))
                 .findAny().orElseThrow();
 
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 a842431ff8b..c41373b9f85 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
@@ -53,7 +53,7 @@ public class SearchBuilderTest extends ContainerModelBuilderTestBase {
         ApplicationContainerCluster cluster = (ApplicationContainerCluster)root.getChildren().get("default");
 
         GUIHandler guiHandler = null;
-        for (Handler<?> handler : cluster.getHandlers()) {
+        for (Handler handler : cluster.getHandlers()) {
             if (handler instanceof GUIHandler) {
                 guiHandler = (GUIHandler) handler;
             }
@@ -230,7 +230,7 @@ public class SearchBuilderTest extends ContainerModelBuilderTestBase {
 
         createModel(root, clusterElem);
 
-        Handler<?> searchHandler = getHandler("default", SearchHandler.HANDLER_CLASS);
+        Handler searchHandler = getHandler("default", SearchHandler.HANDLER_CLASS);
         assertTrue(searchHandler.getInjectedComponentIds().contains("threadpool@search-handler"));
 
         ContainerThreadpoolConfig config = root.getConfig(