diff options
author | Håkon Hallingstad <hakon@oath.com> | 2017-09-08 16:30:02 +0200 |
---|---|---|
committer | Håkon Hallingstad <hakon@oath.com> | 2017-09-08 16:30:02 +0200 |
commit | 6be842592dd6202a821d75ceb812edb0dcb4ba89 (patch) | |
tree | 16f28df37aa3f8f20e6cbc7b15137e55f7e91fb5 /service-monitor | |
parent | 991703cdd5846c0767a3c6bdb5d6bd300900b627 (diff) |
Review round 1 fixes
Diffstat (limited to 'service-monitor')
-rw-r--r-- | service-monitor/src/main/java/com/yahoo/vespa/service/monitor/SlobrokMonitor.java | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/SlobrokMonitor.java b/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/SlobrokMonitor.java index f1a8672e963..4154dd598a4 100644 --- a/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/SlobrokMonitor.java +++ b/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/SlobrokMonitor.java @@ -8,12 +8,12 @@ import com.yahoo.jrt.slobrok.api.Mirror; import com.yahoo.jrt.slobrok.api.SlobrokList; import java.util.Arrays; -import java.util.HashMap; +import java.util.Collections; import java.util.List; import java.util.Map; import java.util.stream.Collectors; -public class SlobrokMonitor { +class SlobrokMonitor { private final Supervisor supervisor = new Supervisor(new Transport()); private final SlobrokList slobrokList = new SlobrokList(); private final Mirror mirror = new Mirror(supervisor, slobrokList); @@ -24,11 +24,11 @@ public class SlobrokMonitor { Map<SlobrokServiceName, SlobrokServiceSpec> getRegisteredServices() { if (!mirror.ready()) { - return new HashMap<>(); + return Collections.emptyMap(); } Mirror.Entry[] mirrorEntries = mirror.lookup("**"); - return Arrays.asList(mirrorEntries).stream().collect(Collectors.toMap( + return Arrays.stream(mirrorEntries).collect(Collectors.toMap( entry -> new SlobrokServiceName(entry.getName()), entry -> new SlobrokServiceSpec(entry.getSpec()))); } @@ -41,7 +41,7 @@ public class SlobrokMonitor { mirror.shutdown(); } - public static class SlobrokServiceName { + static class SlobrokServiceName { private final String name; SlobrokServiceName(String name) { @@ -49,7 +49,7 @@ public class SlobrokMonitor { } // TODO: Fix spec - public String s() { + String s() { return name; } @@ -69,7 +69,7 @@ public class SlobrokMonitor { } } - public static class SlobrokServiceSpec { + static class SlobrokServiceSpec { private final String spec; SlobrokServiceSpec(String spec) { @@ -77,7 +77,7 @@ public class SlobrokMonitor { } // TODO: Fix name - public String s() { + String s() { return spec; } |