diff options
author | Harald Musum <musum@verizonmedia.com> | 2020-03-27 11:18:30 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-03-27 11:18:30 +0100 |
commit | c4076a872aea98849a3d67b236dc45322060165b (patch) | |
tree | 5465077cd5c82111bf5ad1f9781fc3dc78678ab5 /config-provisioning | |
parent | 6d42296f3deb119135a3bc9f046298035db54f11 (diff) |
Revert "Remove dead code, add TODOs for code to be removed later"
Diffstat (limited to 'config-provisioning')
-rw-r--r-- | config-provisioning/src/main/java/com/yahoo/config/provision/ClusterMembership.java | 6 | ||||
-rw-r--r-- | config-provisioning/src/main/java/com/yahoo/config/provision/ClusterSpec.java | 18 |
2 files changed, 22 insertions, 2 deletions
diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/ClusterMembership.java b/config-provisioning/src/main/java/com/yahoo/config/provision/ClusterMembership.java index 6c1d2da4af0..b777a13af7c 100644 --- a/config-provisioning/src/main/java/com/yahoo/config/provision/ClusterMembership.java +++ b/config-provisioning/src/main/java/com/yahoo/config/provision/ClusterMembership.java @@ -110,6 +110,12 @@ public class ClusterMembership { @Override public String toString() { return stringValue(); } + // TODO: Remove when when 7.195 is oldest model version in use + @Deprecated + public static ClusterMembership from(String stringValue, Version vespaVersion) { + return new ClusterMembership(stringValue, vespaVersion, Optional.empty()); + } + public static ClusterMembership from(String stringValue, Version vespaVersion, Optional<String> dockerImageRepo) { return new ClusterMembership(stringValue, vespaVersion, dockerImageRepo); } 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 147066b82e7..66a2ff411fe 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 @@ -77,13 +77,27 @@ public final class ClusterSpec { return new ClusterSpec(type, id, groupId, vespaVersion, exclusive, combinedId, dockerImageRepo); } - // TODO: Remove when when 7.200 is oldest model version in use + // TODO: Remove when when 7.195 is oldest model version in use + // TODO: Add @Deprecated when internal repo has been updated to not use this method + // @Deprecated + public static ClusterSpec request(Type type, Id id, Version vespaVersion, boolean exclusive, + Optional<Id> combinedId) { + return request(type, id, vespaVersion, exclusive, combinedId, Optional.empty()); + } + public static ClusterSpec request(Type type, Id id, Version vespaVersion, boolean exclusive, Optional<Id> combinedId, Optional<String> dockerImageRepo) { return new ClusterSpec(type, id, Optional.empty(), vespaVersion, exclusive, combinedId, dockerImageRepo); } - // TODO: Remove when when 7.200 is oldest model version in use + // TODO: Remove when when 7.195 is oldest model version in use + // TODO: Add @Deprecated when internal repo has been updated to not use this method + // @Deprecated + public static ClusterSpec from(Type type, Id id, Group groupId, Version vespaVersion, boolean exclusive, + Optional<Id> combinedId) { + return from(type, id, groupId, vespaVersion, exclusive, combinedId, Optional.empty()); + } + public static ClusterSpec from(Type type, Id id, Group groupId, Version vespaVersion, boolean exclusive, Optional<Id> combinedId, Optional<String> dockerImageRepo) { return new ClusterSpec(type, id, Optional.of(groupId), vespaVersion, exclusive, combinedId, dockerImageRepo); |