diff options
author | Martin Polden <mpolden@mpolden.no> | 2019-06-14 14:44:01 +0200 |
---|---|---|
committer | Martin Polden <mpolden@mpolden.no> | 2019-06-14 14:47:17 +0200 |
commit | ec99c240f12313e86f39790af8ca3d5463cd2173 (patch) | |
tree | be81fb8e90eb30cba695fcc024c381ea676bc67f | |
parent | 37375dfc85cf8f54272a0b1e2278032b50e1b034 (diff) |
Simplify
3 files changed, 6 insertions, 4 deletions
diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/SystemName.java b/config-provisioning/src/main/java/com/yahoo/config/provision/SystemName.java index 0f6a87020da..29e48ae0316 100644 --- a/config-provisioning/src/main/java/com/yahoo/config/provision/SystemName.java +++ b/config-provisioning/src/main/java/com/yahoo/config/provision/SystemName.java @@ -72,6 +72,7 @@ public enum SystemName { public static Set<SystemName> all() { return EnumSet.allOf(SystemName.class); } public static Set<SystemName> allOf(Predicate<SystemName> predicate) { - return Stream.of(values()).filter(predicate::test).collect(Collectors.toSet()); + return Stream.of(values()).filter(predicate).collect(Collectors.toUnmodifiableSet()); } + } diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ContactInformationMaintainer.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ContactInformationMaintainer.java index 7dfbc135df9..0080d7c23c2 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ContactInformationMaintainer.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ContactInformationMaintainer.java @@ -11,9 +11,9 @@ import com.yahoo.vespa.hosted.controller.tenant.Tenant; import com.yahoo.yolean.Exceptions; import java.time.Duration; -import java.util.EnumSet; import java.util.Objects; import java.util.Optional; +import java.util.function.Predicate; import java.util.logging.Logger; /** @@ -28,7 +28,7 @@ public class ContactInformationMaintainer extends Maintainer { private final ContactRetriever contactRetriever; public ContactInformationMaintainer(Controller controller, Duration interval, JobControl jobControl, ContactRetriever contactRetriever) { - super(controller, interval, jobControl, null, EnumSet.of(SystemName.cd, SystemName.main)); + super(controller, interval, jobControl, null, SystemName.allOf(Predicate.not(SystemName::isPublic))); this.contactRetriever = Objects.requireNonNull(contactRetriever, "organization must be non-null"); } diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ResourceMeterMaintainer.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ResourceMeterMaintainer.java index a0520f324be..9302ecbe738 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ResourceMeterMaintainer.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ResourceMeterMaintainer.java @@ -18,6 +18,7 @@ import java.time.Clock; import java.time.Duration; import java.time.Instant; import java.util.*; +import java.util.function.Predicate; import java.util.stream.Collectors; import static com.yahoo.yolean.Exceptions.uncheck; @@ -46,7 +47,7 @@ public class ResourceMeterMaintainer extends Maintainer { Clock clock, Metric metric, ResourceSnapshotConsumer resourceSnapshotConsumer) { - super(controller, interval, jobControl, ResourceMeterMaintainer.class.getSimpleName(), Set.of(SystemName.cd, SystemName.main)); + super(controller, interval, jobControl, null, SystemName.allOf(Predicate.not(SystemName::isPublic))); this.clock = clock; this.nodeRepository = nodeRepository; this.metric = metric; |