Separate between ContainerCluster types.

- Add type parameter for ContainerCluster
- Add concrete type for app clusters (CCImpl) and
  clustercontroller clusters (ClusterControllerCC)

1 files changed, 3 insertions, 2 deletions

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 902a65462ad..524e98b3f6d 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
@@ -8,6 +8,7 @@ import com.yahoo.searchdefinition.parser.ParseException;
 import com.yahoo.vespa.model.VespaModel;
 import com.yahoo.vespa.model.container.Container;
 import com.yahoo.vespa.model.container.ContainerCluster;
+import com.yahoo.vespa.model.container.ContainerClusterImpl;
 import com.yahoo.vespa.model.container.component.Handler;
 import com.yahoo.vespa.model.container.search.GUIHandler;
 import com.yahoo.vespa.model.test.utils.ApplicationPackageUtils;
@@ -47,7 +48,7 @@ public class SearchBuilderTest extends ContainerModelBuilderTestBase {
         String discBindingsConfig = root.getConfig(JdiscBindingsConfig.class, "default").toString();
         assertThat(discBindingsConfig, containsString(GUIHandler.BINDING));
 
-        ContainerCluster cluster = (ContainerCluster)root.getChildren().get("default");
+        ContainerClusterImpl cluster = (ContainerClusterImpl)root.getChildren().get("default");
 
         GUIHandler guiHandler = null;
         for (Handler<?> handler : cluster.getHandlers()) {
@@ -99,7 +100,7 @@ public class SearchBuilderTest extends ContainerModelBuilderTestBase {
     @Test
     public void cluster_with_only_search_gets_qrserver_as_service_name() throws Exception {
         createClusterWithOnlyDefaultChains();
-        ContainerCluster cluster = (ContainerCluster)root.getChildren().get("default");
+        ContainerClusterImpl cluster = (ContainerClusterImpl)root.getChildren().get("default");
         assertThat(cluster.getContainers().get(0).getServiceName(), is(QRSERVER.serviceName));
     }