diff options
author | Martin Polden <mpolden@mpolden.no> | 2022-10-25 09:57:20 +0200 |
---|---|---|
committer | Martin Polden <mpolden@mpolden.no> | 2022-10-28 11:18:32 +0200 |
commit | c7caa094988600fa95727195bd4a99ce8d64d12f (patch) | |
tree | f9461668599fae19ddce693be70a366ff79f746a /node-repository | |
parent | b7f2bb194faa7d52042c3acbd0dc0bbc64908c82 (diff) |
Simplify
Diffstat (limited to 'node-repository')
3 files changed, 31 insertions, 37 deletions
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/CuratorDatabaseClient.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/CuratorDatabaseClient.java index a5ebc6b3efc..e5f02b38d29 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/CuratorDatabaseClient.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/CuratorDatabaseClient.java @@ -87,7 +87,7 @@ public class CuratorDatabaseClient { } public List<String> cluster() { - return db.cluster().stream().map(HostName::value).collect(Collectors.toUnmodifiableList()); + return db.cluster().stream().map(HostName::value).toList(); } private void initZK() { @@ -162,7 +162,7 @@ public class CuratorDatabaseClient { } /** - * Writes the given nodes to the given state (whether or not they are already in this state or another), + * Writes the given nodes to the given state (whether they are already in this state or another), * and returns a copy of the incoming nodes in their persisted state. * * @param toState the state to write the nodes to @@ -305,19 +305,18 @@ public class CuratorDatabaseClient { } private String toDir(Node.State state) { - switch (state) { - case active: return "allocated"; // legacy name - case dirty: return "dirty"; - case failed: return "failed"; - case inactive: return "deallocated"; // legacy name - case parked : return "parked"; - case provisioned: return "provisioned"; - case ready: return "ready"; - case reserved: return "reserved"; - case deprovisioned: return "deprovisioned"; - case breakfixed: return "breakfixed"; - default: throw new RuntimeException("Node state " + state + " does not map to a directory name"); - } + return switch (state) { + case active -> "allocated"; // legacy name + case dirty -> "dirty"; + case failed -> "failed"; + case inactive -> "deallocated"; // legacy name + case parked -> "parked"; + case provisioned -> "provisioned"; + case ready -> "ready"; + case reserved -> "reserved"; + case deprovisioned -> "deprovisioned"; + case breakfixed -> "breakfixed"; + }; } /** Acquires the single cluster-global, reentrant lock for all non-active nodes */ @@ -513,7 +512,7 @@ public class CuratorDatabaseClient { return db.getChildren(loadBalancersPath).stream() .map(LoadBalancerId::fromSerializedForm) .filter(predicate) - .collect(Collectors.toUnmodifiableList()); + .toList(); } /** Returns a given number of unique provision indices */ @@ -524,7 +523,7 @@ public class CuratorDatabaseClient { int firstIndex = (int) provisionIndexCounter.add(count) - count; return IntStream.range(0, count) .mapToObj(i -> firstIndex + i) - .collect(Collectors.toList()); + .toList(); } public CacheStats cacheStats() { diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/LoadBalancerSerializer.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/LoadBalancerSerializer.java index cfc918ce57b..92b492df86f 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/LoadBalancerSerializer.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/LoadBalancerSerializer.java @@ -120,22 +120,21 @@ public class LoadBalancerSerializer { } private static String asString(LoadBalancer.State state) { - switch (state) { - case active: return "active"; - case inactive: return "inactive"; - case reserved: return "reserved"; - default: throw new IllegalArgumentException("No serialization defined for state enum '" + state + "'"); - } + return switch (state) { + case active -> "active"; + case inactive -> "inactive"; + case reserved -> "reserved"; + }; } private static LoadBalancer.State stateFromString(String state) { - switch (state) { - case "active": return LoadBalancer.State.active; - case "inactive": return LoadBalancer.State.inactive; - case "reserved": return LoadBalancer.State.reserved; - case "removable": return LoadBalancer.State.inactive; // Read future value - default: throw new IllegalArgumentException("No serialization defined for state string '" + state + "'"); - } + return switch (state) { + case "active" -> LoadBalancer.State.active; + case "inactive" -> LoadBalancer.State.inactive; + case "reserved" -> LoadBalancer.State.reserved; + case "removable" -> LoadBalancer.State.inactive; // Read future value + default -> throw new IllegalArgumentException("No serialization defined for state string '" + state + "'"); + }; } } diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/LoadBalancerProvisioner.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/LoadBalancerProvisioner.java index 15c9134d10f..1eb8df0ca2b 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/LoadBalancerProvisioner.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/LoadBalancerProvisioner.java @@ -161,7 +161,7 @@ public class LoadBalancerProvisioner { return db.readLoadBalancerIds().stream() .filter(id -> id.application().tenant().equals(tenant) && id.application().application().equals(application)) - .collect(Collectors.toUnmodifiableList()); + .toList(); } /** Require that load balancer IDs do not clash. This prevents name clashing when compacting endpoint DNS names */ @@ -293,12 +293,8 @@ public class LoadBalancerProvisioner { Set<String> reachable = new LinkedHashSet<>(node.ipConfig().primary()); // Remove addresses unreachable by the load balancer service switch (service.protocol()) { - case ipv4: - reachable.removeIf(IP::isV6); - break; - case ipv6: - reachable.removeIf(IP::isV4); - break; + case ipv4 -> reachable.removeIf(IP::isV6); + case ipv6 -> reachable.removeIf(IP::isV4); } return reachable; } |