diff options
author | Harald Musum <musum@oath.com> | 2018-10-26 09:30:57 +0200 |
---|---|---|
committer | Harald Musum <musum@oath.com> | 2018-10-28 18:48:05 +0100 |
commit | 4d7d2269072a01be2e2dd448a2f550701c333b20 (patch) | |
tree | c4ba797e51671bc34b255409a853064c2d465f14 | |
parent | 57ba28e794416ae7cc6e14660249459dac7df937 (diff) |
Inject Zone and remove unused method
3 files changed, 3 insertions, 9 deletions
diff --git a/config-model-api/src/main/java/com/yahoo/config/model/api/SuperModel.java b/config-model-api/src/main/java/com/yahoo/config/model/api/SuperModel.java index 8e918392cb0..d03824120d8 100644 --- a/config-model-api/src/main/java/com/yahoo/config/model/api/SuperModel.java +++ b/config-model-api/src/main/java/com/yahoo/config/model/api/SuperModel.java @@ -9,7 +9,6 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Map; import java.util.Optional; -import java.util.Set; import java.util.stream.Collectors; public class SuperModel { @@ -31,11 +30,6 @@ public class SuperModel { return models; } - public Set<ApplicationId> getAllApplicationIds() { - return models.values().stream().flatMap(entry -> entry.keySet().stream()) - .collect(Collectors.toSet()); - } - public List<ApplicationInfo> getAllApplicationInfos() { return models.values().stream().flatMap(entry -> entry.values().stream()).collect(Collectors.toList()); } diff --git a/config-model-api/src/main/java/com/yahoo/config/model/api/SuperModelProvider.java b/config-model-api/src/main/java/com/yahoo/config/model/api/SuperModelProvider.java index 4c7f15143ec..36702f6e97c 100644 --- a/config-model-api/src/main/java/com/yahoo/config/model/api/SuperModelProvider.java +++ b/config-model-api/src/main/java/com/yahoo/config/model/api/SuperModelProvider.java @@ -13,6 +13,6 @@ public interface SuperModelProvider { */ SuperModel snapshot(SuperModelListener listener); - // TODO: Remove - clients of SuperModel should get zone from elsewhere. + // TODO: Remove when 6.306 is latest version in use Zone getZone(); } diff --git a/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/internal/ServiceMonitorImpl.java b/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/internal/ServiceMonitorImpl.java index bd8fd4a50e0..eb346cf40c1 100644 --- a/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/internal/ServiceMonitorImpl.java +++ b/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/internal/ServiceMonitorImpl.java @@ -25,8 +25,8 @@ public class ServiceMonitorImpl implements ServiceMonitor { SlobrokMonitorManagerImpl slobrokMonitorManager, HealthMonitorManager healthMonitorManager, Metric metric, - Timer timer) { - Zone zone = superModelProvider.getZone(); + Timer timer, + Zone zone) { ServiceMonitorMetrics metrics = new ServiceMonitorMetrics(metric, timer); DuperModel duperModel = new DuperModel(configserverConfig); |