diff options
author | Martin Polden <mpolden@mpolden.no> | 2019-06-07 12:57:34 +0200 |
---|---|---|
committer | Martin Polden <mpolden@mpolden.no> | 2019-06-07 13:12:42 +0200 |
commit | 3bb4e64b105a3f1e1bed478d5cceab99a4323926 (patch) | |
tree | d7b898aa7c9d34c137fce1745a4e0a876a328a69 /config-provisioning | |
parent | bdcbcbdde005d44ec502a2b7c5a77dd62d3bc2eb (diff) |
Remove support for <rotations> element
Diffstat (limited to 'config-provisioning')
-rw-r--r-- | config-provisioning/src/main/java/com/yahoo/config/provision/ClusterSpec.java | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/ClusterSpec.java b/config-provisioning/src/main/java/com/yahoo/config/provision/ClusterSpec.java index bd03949191e..35ee538178a 100644 --- a/config-provisioning/src/main/java/com/yahoo/config/provision/ClusterSpec.java +++ b/config-provisioning/src/main/java/com/yahoo/config/provision/ClusterSpec.java @@ -4,7 +4,6 @@ package com.yahoo.config.provision; import com.google.common.collect.ImmutableSortedSet; import com.yahoo.component.Version; -import java.util.Collections; import java.util.Objects; import java.util.Optional; import java.util.Set; @@ -71,20 +70,20 @@ public final class ClusterSpec { return new ClusterSpec(type, id, groupId, vespaVersion, exclusive, rotations); } - // TODO: Remove when versions <= 7.6 are gone public static ClusterSpec request(Type type, Id id, Version vespaVersion, boolean exclusive) { - return new ClusterSpec(type, id, Optional.empty(), vespaVersion, exclusive, Collections.emptySet()); + return new ClusterSpec(type, id, Optional.empty(), vespaVersion, exclusive, Set.of()); } + // TODO: Remove after June 2019 public static ClusterSpec request(Type type, Id id, Version vespaVersion, boolean exclusive, Set<RotationName> rotations) { return new ClusterSpec(type, id, Optional.empty(), vespaVersion, exclusive, rotations); } - // TODO: Remove when versions <= 7.6 are gone public static ClusterSpec from(Type type, Id id, Group groupId, Version vespaVersion, boolean exclusive) { - return from(type, id, groupId, vespaVersion, exclusive, Collections.emptySet()); + return new ClusterSpec(type, id, Optional.of(groupId), vespaVersion, exclusive, Set.of()); } + // TODO: Remove after June 2019 public static ClusterSpec from(Type type, Id id, Group groupId, Version vespaVersion, boolean exclusive, Set<RotationName> rotations) { return new ClusterSpec(type, id, Optional.of(groupId), vespaVersion, exclusive, rotations); } |