Remove status type parameter in application model classes

4 files changed, 27 insertions, 24 deletions

diff --git a/service-monitor/src/test/java/com/yahoo/vespa/service/monitor/ConfigServerApplicationTest.java b/service-monitor/src/test/java/com/yahoo/vespa/service/monitor/ConfigServerApplicationTest.java
index fb123da2603..8eebdbb611b 100644
--- a/service-monitor/src/test/java/com/yahoo/vespa/service/monitor/ConfigServerApplicationTest.java
+++ b/service-monitor/src/test/java/com/yahoo/vespa/service/monitor/ConfigServerApplicationTest.java
@@ -2,6 +2,7 @@
 package com.yahoo.vespa.service.monitor;
 
 import com.yahoo.vespa.applicationmodel.ApplicationInstance;
+import com.yahoo.vespa.applicationmodel.ServiceStatus;
 import org.junit.Test;
 
 import java.util.List;
@@ -23,7 +24,7 @@ public class ConfigServerApplicationTest {
     @Test
     public void toApplicationInstance() throws Exception {
         ConfigServerApplication application = new ConfigServerApplication();
-        ApplicationInstance<ServiceMonitorStatus> applicationInstance =
+        ApplicationInstance applicationInstance =
                 application.toApplicationInstance(configServerList);
 
         assertEquals(
@@ -43,7 +44,7 @@ public class ConfigServerApplicationTest {
                 applicationInstance.serviceClusters().iterator().next().clusterId());
 
         assertEquals(
-                ServiceMonitorStatus.NOT_CHECKED,
+                ServiceStatus.NOT_CHECKED,
                 applicationInstance
                         .serviceClusters().iterator().next()
                         .serviceInstances().iterator().next()
diff --git a/service-monitor/src/test/java/com/yahoo/vespa/service/monitor/ModelGeneratorTest.java b/service-monitor/src/test/java/com/yahoo/vespa/service/monitor/ModelGeneratorTest.java
index 4b82286235e..3ac8c20fcab 100644
--- a/service-monitor/src/test/java/com/yahoo/vespa/service/monitor/ModelGeneratorTest.java
+++ b/service-monitor/src/test/java/com/yahoo/vespa/service/monitor/ModelGeneratorTest.java
@@ -9,6 +9,7 @@ import com.yahoo.vespa.applicationmodel.ApplicationInstance;
 import com.yahoo.vespa.applicationmodel.ApplicationInstanceReference;
 import com.yahoo.vespa.applicationmodel.ServiceCluster;
 import com.yahoo.vespa.applicationmodel.ServiceInstance;
+import com.yahoo.vespa.applicationmodel.ServiceStatus;
 import org.junit.Test;
 
 import java.util.Collections;
@@ -43,7 +44,7 @@ public class ModelGeneratorTest {
 
         SlobrokMonitorManager slobrokMonitorManager = mock(SlobrokMonitorManager.class);
         when(slobrokMonitorManager.getStatus(any(), any(), any()))
-                .thenReturn(ServiceMonitorStatus.UP);
+                .thenReturn(ServiceStatus.UP);
 
         ServiceModel serviceModel =
                 modelGenerator.toServiceModel(
@@ -53,17 +54,17 @@ public class ModelGeneratorTest {
                         slobrokMonitorManager);
 
         Map<ApplicationInstanceReference,
-                ApplicationInstance<ServiceMonitorStatus>> applicationInstances =
+                ApplicationInstance> applicationInstances =
                 serviceModel.getAllApplicationInstances();
 
         assertEquals(2, applicationInstances.size());
 
         Iterator<Map.Entry<ApplicationInstanceReference,
-                ApplicationInstance<ServiceMonitorStatus>>> iterator =
+                ApplicationInstance>> iterator =
                 applicationInstances.entrySet().iterator();
 
-        ApplicationInstance<ServiceMonitorStatus> applicationInstance1 = iterator.next().getValue();
-        ApplicationInstance<ServiceMonitorStatus> applicationInstance2 = iterator.next().getValue();
+        ApplicationInstance applicationInstance1 = iterator.next().getValue();
+        ApplicationInstance applicationInstance2 = iterator.next().getValue();
 
         if (applicationInstance1.applicationInstanceId().equals(
                 ConfigServerApplication.APPLICATION_INSTANCE_ID)) {
@@ -87,7 +88,7 @@ public class ModelGeneratorTest {
 
         SlobrokMonitorManager slobrokMonitorManager = mock(SlobrokMonitorManager.class);
         when(slobrokMonitorManager.getStatus(any(), any(), any()))
-                .thenReturn(ServiceMonitorStatus.UP);
+                .thenReturn(ServiceStatus.UP);
 
         ServiceModel serviceModel =
                 modelGenerator.toServiceModel(
@@ -97,14 +98,14 @@ public class ModelGeneratorTest {
                         slobrokMonitorManager);
 
         Map<ApplicationInstanceReference,
-                ApplicationInstance<ServiceMonitorStatus>> applicationInstances =
+                ApplicationInstance> applicationInstances =
                 serviceModel.getAllApplicationInstances();
 
         assertEquals(1, applicationInstances.size());
         verifyOtherApplication(applicationInstances.values().iterator().next());
     }
 
-    private void verifyOtherApplication(ApplicationInstance<ServiceMonitorStatus> applicationInstance) {
+    private void verifyOtherApplication(ApplicationInstance applicationInstance) {
         assertEquals(String.format("%s:%s:%s:%s:%s",
                 ExampleModel.TENANT,
                 ExampleModel.APPLICATION_NAME,
@@ -114,25 +115,25 @@ public class ModelGeneratorTest {
                 applicationInstance.reference().toString());
 
         assertEquals(ExampleModel.TENANT, applicationInstance.tenantId().toString());
-        Set<ServiceCluster<ServiceMonitorStatus>> serviceClusters =
+        Set<ServiceCluster> serviceClusters =
                 applicationInstance.serviceClusters();
         assertEquals(1, serviceClusters.size());
-        ServiceCluster<ServiceMonitorStatus> serviceCluster = serviceClusters.iterator().next();
+        ServiceCluster serviceCluster = serviceClusters.iterator().next();
         assertEquals(ExampleModel.CLUSTER_ID, serviceCluster.clusterId().toString());
         assertEquals(ExampleModel.SERVICE_TYPE, serviceCluster.serviceType().toString());
-        Set<ServiceInstance<ServiceMonitorStatus>> serviceInstances =
+        Set<ServiceInstance> serviceInstances =
                 serviceCluster.serviceInstances();
         assertEquals(1, serviceClusters.size());
-        ServiceInstance<ServiceMonitorStatus> serviceInstance = serviceInstances.iterator().next();
+        ServiceInstance serviceInstance = serviceInstances.iterator().next();
         assertEquals(HOSTNAME, serviceInstance.hostName().toString());
         assertEquals(ExampleModel.CONFIG_ID, serviceInstance.configId().toString());
-        assertEquals(ServiceMonitorStatus.UP, serviceInstance.serviceStatus());
+        assertEquals(ServiceStatus.UP, serviceInstance.serviceStatus());
     }
 
     private void verifyConfigServerApplication(
-            ApplicationInstance<ServiceMonitorStatus> applicationInstance) {
+            ApplicationInstance applicationInstance) {
         assertEquals(ConfigServerApplication.APPLICATION_INSTANCE_ID,
                 applicationInstance.applicationInstanceId());
     }
 
-}
\ No newline at end of file
+}
diff --git a/service-monitor/src/test/java/com/yahoo/vespa/service/monitor/SlobrokMonitor2Test.java b/service-monitor/src/test/java/com/yahoo/vespa/service/monitor/SlobrokMonitor2Test.java
index 7be63e527cf..8ef21c21c4c 100644
--- a/service-monitor/src/test/java/com/yahoo/vespa/service/monitor/SlobrokMonitor2Test.java
+++ b/service-monitor/src/test/java/com/yahoo/vespa/service/monitor/SlobrokMonitor2Test.java
@@ -33,4 +33,4 @@ public class SlobrokMonitor2Test {
         String[] expectedSpecs = new String[] {"tcp/" + hostname + ":" + port};
         verify(slobrokList).setup(expectedSpecs); */
     }
-}
\ No newline at end of file
+}
diff --git a/service-monitor/src/test/java/com/yahoo/vespa/service/monitor/SlobrokMonitorManagerTest.java b/service-monitor/src/test/java/com/yahoo/vespa/service/monitor/SlobrokMonitorManagerTest.java
index f34dd91181c..9c101694244 100644
--- a/service-monitor/src/test/java/com/yahoo/vespa/service/monitor/SlobrokMonitorManagerTest.java
+++ b/service-monitor/src/test/java/com/yahoo/vespa/service/monitor/SlobrokMonitorManagerTest.java
@@ -4,6 +4,7 @@ package com.yahoo.vespa.service.monitor;
 import com.yahoo.config.model.api.ApplicationInfo;
 import com.yahoo.config.model.api.SuperModel;
 import com.yahoo.vespa.applicationmodel.ConfigId;
+import com.yahoo.vespa.applicationmodel.ServiceStatus;
 import com.yahoo.vespa.applicationmodel.ServiceType;
 import org.junit.Before;
 import org.junit.Test;
@@ -43,30 +44,30 @@ public class SlobrokMonitorManagerTest {
     @Test
     public void testGetStatus_ApplicationNotInSlobrok() {
         when(slobrokMonitor.registeredInSlobrok("config.id")).thenReturn(true);
-        assertEquals(ServiceMonitorStatus.DOWN, getStatus("topleveldispatch"));
+        assertEquals(ServiceStatus.DOWN, getStatus("topleveldispatch"));
     }
 
     @Test
     public void testGetStatus_ApplicationInSlobrok() {
         slobrokMonitorManager.applicationActivated(superModel, application);
         when(slobrokMonitor.registeredInSlobrok("config.id")).thenReturn(true);
-        assertEquals(ServiceMonitorStatus.UP, getStatus("topleveldispatch"));
+        assertEquals(ServiceStatus.UP, getStatus("topleveldispatch"));
     }
 
     @Test
     public void testGetStatus_ServiceNotInSlobrok() {
         slobrokMonitorManager.applicationActivated(superModel, application);
         when(slobrokMonitor.registeredInSlobrok("config.id")).thenReturn(false);
-        assertEquals(ServiceMonitorStatus.DOWN, getStatus("topleveldispatch"));
+        assertEquals(ServiceStatus.DOWN, getStatus("topleveldispatch"));
     }
 
     @Test
     public void testGetStatus_NotChecked() {
-        assertEquals(ServiceMonitorStatus.NOT_CHECKED, getStatus("slobrok"));
+        assertEquals(ServiceStatus.NOT_CHECKED, getStatus("slobrok"));
         verify(slobrokMonitor, times(0)).registeredInSlobrok(any());
     }
 
-    private ServiceMonitorStatus getStatus(String serviceType) {
+    private ServiceStatus getStatus(String serviceType) {
         return slobrokMonitorManager.getStatus(
                 application.getApplicationId(),
                 new ServiceType(serviceType),
@@ -89,4 +90,4 @@ public class SlobrokMonitorManagerTest {
                 new ServiceType(serviceType),
                 new ConfigId(configId));
     }
-}
\ No newline at end of file
+}