Cleanup

1 files changed, 9 insertions, 9 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/Container.java b/config-model/src/main/java/com/yahoo/vespa/model/container/Container.java
index e8b56a6190a..6e470b24f9f 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/Container.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/Container.java
@@ -1,4 +1,4 @@
-// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright Verizon Media. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.model.container;
 
 import com.yahoo.component.ComponentId;
@@ -58,10 +58,10 @@ public abstract class Container extends AbstractService implements
     public static final int BASEPORT = Defaults.getDefaults().vespaWebServicePort();
     public static final String SINGLENODE_CONTAINER_SERVICESPEC = "default_singlenode_container";
 
-    /** The cluster this contasiner belongs to, or null if it is not added to any cluster */
-    private ContainerCluster owner = null;
+    /** The cluster this container belongs to, or null if it is not added to any cluster */
+    private ContainerCluster<?> owner = null;
 
-    protected final AbstractConfigProducer parent;
+    protected final AbstractConfigProducer<?> parent;
     private final String name;
     private boolean requireSpecificPorts = true;
 
@@ -78,11 +78,11 @@ public abstract class Container extends AbstractService implements
 
     private final JettyHttpServer defaultHttpServer;
 
-    protected Container(AbstractConfigProducer parent, String name, int index, boolean isHostedVespa) {
+    protected Container(AbstractConfigProducer<?> parent, String name, int index, boolean isHostedVespa) {
         this(parent, name, false, index, isHostedVespa);
     }
 
-    protected Container(AbstractConfigProducer parent, String name, boolean retired, int index, boolean isHostedVespa) {
+    protected Container(AbstractConfigProducer<?> parent, String name, boolean retired, int index, boolean isHostedVespa) {
         super(parent, name);
         this.name = name;
         this.parent = parent;
@@ -106,7 +106,7 @@ public abstract class Container extends AbstractService implements
         return handlers;
     }
 
-    public ComponentGroup getComponents() {
+    public ComponentGroup<?> getComponents() {
         return components;
     }
 
@@ -118,7 +118,7 @@ public abstract class Container extends AbstractService implements
         addComponent(new SimpleComponent(new ComponentModel(idSpec, classSpec, bundleSpec)));
     }
 
-    public final void addHandler(Handler h) {
+    public final void addHandler(Handler<?> h) {
         handlers.addComponent(h);
     }
     
@@ -133,7 +133,7 @@ public abstract class Container extends AbstractService implements
     }
 
     public Http getHttp() {
-        return (parent instanceof ContainerCluster) ? ((ContainerCluster) parent).getHttp() : null;
+        return (parent instanceof ContainerCluster) ? ((ContainerCluster<?>) parent).getHttp() : null;
     }
 
     public JettyHttpServer getDefaultHttpServer() {