diff options
author | Håkon Hallingstad <hakon@oath.com> | 2017-09-29 15:32:05 +0200 |
---|---|---|
committer | Håkon Hallingstad <hakon@oath.com> | 2017-09-29 15:32:05 +0200 |
commit | 78bfe08c79ba5576bb978fafe0deb69e97aaed3e (patch) | |
tree | 16d87780de2825d933d2a2d56300edb9e72d5ec9 /orchestrator | |
parent | 5689a9c7039a8fcd31a1d6980c9004a98bc2aed3 (diff) |
Depend on ServiceMonitor interface instead of impl
Diffstat (limited to 'orchestrator')
-rw-r--r-- | orchestrator/src/main/java/com/yahoo/vespa/orchestrator/ServiceMonitorInstanceLookupService.java | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/ServiceMonitorInstanceLookupService.java b/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/ServiceMonitorInstanceLookupService.java index b7f1ec56541..31f4f1430d3 100644 --- a/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/ServiceMonitorInstanceLookupService.java +++ b/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/ServiceMonitorInstanceLookupService.java @@ -2,11 +2,11 @@ package com.yahoo.vespa.orchestrator; import com.google.inject.Inject; -import com.yahoo.vespa.applicationmodel.ApplicationInstanceReference; import com.yahoo.vespa.applicationmodel.ApplicationInstance; +import com.yahoo.vespa.applicationmodel.ApplicationInstanceReference; import com.yahoo.vespa.applicationmodel.HostName; +import com.yahoo.vespa.service.monitor.ServiceMonitor; import com.yahoo.vespa.service.monitor.ServiceMonitorStatus; -import com.yahoo.vespa.service.monitor.SlobrokAndConfigIntersector; import java.util.List; import java.util.Map; @@ -21,24 +21,24 @@ import java.util.stream.Collectors; */ public class ServiceMonitorInstanceLookupService implements InstanceLookupService { - private final SlobrokAndConfigIntersector slobrokAndConfigIntersector; + private final ServiceMonitor serviceMonitor; @Inject - public ServiceMonitorInstanceLookupService(SlobrokAndConfigIntersector slobrokAndConfigIntersector) { - this.slobrokAndConfigIntersector = slobrokAndConfigIntersector; + public ServiceMonitorInstanceLookupService(ServiceMonitor serviceMonitor) { + this.serviceMonitor = serviceMonitor; } @Override public Optional<ApplicationInstance<ServiceMonitorStatus>> findInstanceById(ApplicationInstanceReference applicationInstanceReference) { Map<ApplicationInstanceReference, ApplicationInstance<ServiceMonitorStatus>> instanceMap - = slobrokAndConfigIntersector.queryStatusOfAllApplicationInstances(); + = serviceMonitor.queryStatusOfAllApplicationInstances(); return Optional.ofNullable(instanceMap.get(applicationInstanceReference)); } @Override public Optional<ApplicationInstance<ServiceMonitorStatus>> findInstanceByHost(HostName hostName) { Map<ApplicationInstanceReference, ApplicationInstance<ServiceMonitorStatus>> instanceMap - = slobrokAndConfigIntersector.queryStatusOfAllApplicationInstances(); + = serviceMonitor.queryStatusOfAllApplicationInstances(); List<ApplicationInstance<ServiceMonitorStatus>> applicationInstancesUsingHost = instanceMap.entrySet().stream() .filter(entry -> applicationInstanceUsesHost(entry.getValue(), hostName)) .map(Map.Entry::getValue) @@ -56,7 +56,7 @@ public class ServiceMonitorInstanceLookupService implements InstanceLookupServic @Override public Set<ApplicationInstanceReference> knownInstances() { - return slobrokAndConfigIntersector.queryStatusOfAllApplicationInstances().keySet(); + return serviceMonitor.queryStatusOfAllApplicationInstances().keySet(); } private static boolean applicationInstanceUsesHost(ApplicationInstance<ServiceMonitorStatus> applicationInstance, |