Merge pull request #3838 from vespa-engine/hakonhall/remove-status-type-parameter-in-application-model-classes

Remove status type parameter in application model classes

2 files changed, 22 insertions, 22 deletions

diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/NodeFailer.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/NodeFailer.java
index d90b558a6eb..2dc9f515e7e 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/NodeFailer.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/NodeFailer.java
@@ -10,6 +10,7 @@ import com.yahoo.transaction.Mutex;
 import com.yahoo.vespa.applicationmodel.ApplicationInstance;
 import com.yahoo.vespa.applicationmodel.ServiceCluster;
 import com.yahoo.vespa.applicationmodel.ServiceInstance;
+import com.yahoo.vespa.applicationmodel.ServiceStatus;
 import com.yahoo.vespa.hosted.provision.Node;
 import com.yahoo.vespa.hosted.provision.NodeRepository;
 import com.yahoo.vespa.hosted.provision.node.Agent;
@@ -18,7 +19,6 @@ import com.yahoo.vespa.orchestrator.ApplicationIdNotFoundException;
 import com.yahoo.vespa.orchestrator.Orchestrator;
 import com.yahoo.vespa.orchestrator.status.ApplicationInstanceStatus;
 import com.yahoo.vespa.service.monitor.ServiceMonitor;
-import com.yahoo.vespa.service.monitor.ServiceMonitorStatus;
 
 import java.time.Clock;
 import java.time.Duration;
@@ -187,15 +187,15 @@ public class NodeFailer extends Maintainer {
      */
     private List<Node> determineActiveNodeDownStatus() {
         List<Node> downNodes = new ArrayList<>();
-        for (ApplicationInstance<ServiceMonitorStatus> application : serviceMonitor.queryStatusOfAllApplicationInstances().values()) {
-            for (ServiceCluster<ServiceMonitorStatus> cluster : application.serviceClusters()) {
-                for (ServiceInstance<ServiceMonitorStatus> service : cluster.serviceInstances()) {
+        for (ApplicationInstance application : serviceMonitor.queryStatusOfAllApplicationInstances().values()) {
+            for (ServiceCluster cluster : application.serviceClusters()) {
+                for (ServiceInstance service : cluster.serviceInstances()) {
                     Optional<Node> node = nodeRepository().getNode(service.hostName().s(), Node.State.active);
                     if ( ! node.isPresent()) continue; // we also get status from infrastructure nodes, which are not in the repo. TODO: remove when proxy nodes are in node repo everywhere
 
-                    if (service.serviceStatus().equals(ServiceMonitorStatus.DOWN))
+                    if (service.serviceStatus().equals(ServiceStatus.DOWN))
                         downNodes.add(recordAsDown(node.get()));
-                    else if (service.serviceStatus().equals(ServiceMonitorStatus.UP))
+                    else if (service.serviceStatus().equals(ServiceStatus.UP))
                         clearDownRecord(node.get());
                     // else: we don't know current status; don't take any action until we have positive information
                 }
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/testutils/ServiceMonitorStub.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/testutils/ServiceMonitorStub.java
index e38802234bf..2a00724de28 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/testutils/ServiceMonitorStub.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/testutils/ServiceMonitorStub.java
@@ -11,12 +11,12 @@ import com.yahoo.vespa.applicationmodel.ConfigId;
 import com.yahoo.vespa.applicationmodel.HostName;
 import com.yahoo.vespa.applicationmodel.ServiceCluster;
 import com.yahoo.vespa.applicationmodel.ServiceInstance;
+import com.yahoo.vespa.applicationmodel.ServiceStatus;
 import com.yahoo.vespa.applicationmodel.ServiceType;
 import com.yahoo.vespa.applicationmodel.TenantId;
 import com.yahoo.vespa.hosted.provision.Node;
 import com.yahoo.vespa.hosted.provision.NodeRepository;
 import com.yahoo.vespa.service.monitor.ServiceMonitor;
-import com.yahoo.vespa.service.monitor.ServiceMonitorStatus;
 
 import java.util.Collections;
 import java.util.HashMap;
@@ -60,31 +60,31 @@ public class ServiceMonitorStub implements ServiceMonitor {
         this.statusIsKnown = statusIsKnown;
     }
 
-    private ServiceMonitorStatus getHostStatus(String hostname) {
-        if (!statusIsKnown) return ServiceMonitorStatus.NOT_CHECKED;
-        if (downHosts.contains(hostname)) return ServiceMonitorStatus.DOWN;
-        return ServiceMonitorStatus.UP;
+    private ServiceStatus getHostStatus(String hostname) {
+        if (!statusIsKnown) return ServiceStatus.NOT_CHECKED;
+        if (downHosts.contains(hostname)) return ServiceStatus.DOWN;
+        return ServiceStatus.UP;
     }
 
     @Override
-    public Map<ApplicationInstanceReference, ApplicationInstance<ServiceMonitorStatus>> queryStatusOfAllApplicationInstances() {
+    public Map<ApplicationInstanceReference, ApplicationInstance> queryStatusOfAllApplicationInstances() {
         // Convert apps information to the response payload to return
-        Map<ApplicationInstanceReference, ApplicationInstance<ServiceMonitorStatus>> status = new HashMap<>();
+        Map<ApplicationInstanceReference, ApplicationInstance> status = new HashMap<>();
         for (Map.Entry<ApplicationId, MockDeployer.ApplicationContext> app : apps.entrySet()) {
-            Set<ServiceInstance<ServiceMonitorStatus>> serviceInstances = new HashSet<>();
+            Set<ServiceInstance> serviceInstances = new HashSet<>();
             for (Node node : nodeRepository.getNodes(app.getValue().id(), Node.State.active)) {
-                serviceInstances.add(new ServiceInstance<>(new ConfigId("configid"),
-                                                           new HostName(node.hostname()),
-                                                           getHostStatus(node.hostname())));
+                serviceInstances.add(new ServiceInstance(new ConfigId("configid"),
+							 new HostName(node.hostname()),
+							 getHostStatus(node.hostname())));
             }
-            Set<ServiceCluster<ServiceMonitorStatus>> serviceClusters = new HashSet<>();
-            serviceClusters.add(new ServiceCluster<>(new ClusterId(app.getValue().clusterContexts().get(0).cluster().id().value()),
-                                                     new ServiceType("serviceType"),
-                                                     serviceInstances));
+            Set<ServiceCluster> serviceClusters = new HashSet<>();
+            serviceClusters.add(new ServiceCluster(new ClusterId(app.getValue().clusterContexts().get(0).cluster().id().value()),
+						   new ServiceType("serviceType"),
+						   serviceInstances));
             TenantId tenantId = new TenantId(app.getKey().tenant().value());
             ApplicationInstanceId applicationInstanceId = new ApplicationInstanceId(app.getKey().application().value());
             status.put(new ApplicationInstanceReference(tenantId, applicationInstanceId),
-                       new ApplicationInstance<>(tenantId, applicationInstanceId, serviceClusters));
+                       new ApplicationInstance(tenantId, applicationInstanceId, serviceClusters));
         }
         return status;
     }