diff options
author | Harald Musum <musum@verizonmedia.com> | 2020-03-13 12:44:02 +0100 |
---|---|---|
committer | Harald Musum <musum@verizonmedia.com> | 2020-03-13 12:44:02 +0100 |
commit | a3132e89fe3f1f12366bf5ca15786f1e71d31849 (patch) | |
tree | ec1753534873f518bca551a8e50f9b6656475e03 | |
parent | b6013526a78ca1ec9eb2da973b5cb34827c2be70 (diff) |
Remove unused methods
4 files changed, 5 insertions, 15 deletions
diff --git a/config-provisioning/abi-spec.json b/config-provisioning/abi-spec.json index fa7773a54f1..9d09ea10c2c 100644 --- a/config-provisioning/abi-spec.json +++ b/config-provisioning/abi-spec.json @@ -275,9 +275,7 @@ "public boolean isExclusive()", "public com.yahoo.config.provision.ClusterSpec with(java.util.Optional)", "public com.yahoo.config.provision.ClusterSpec exclusive(boolean)", - "public static com.yahoo.config.provision.ClusterSpec request(com.yahoo.config.provision.ClusterSpec$Type, com.yahoo.config.provision.ClusterSpec$Id, com.yahoo.component.Version, boolean)", "public static com.yahoo.config.provision.ClusterSpec request(com.yahoo.config.provision.ClusterSpec$Type, com.yahoo.config.provision.ClusterSpec$Id, com.yahoo.component.Version, boolean, java.util.Optional)", - "public static com.yahoo.config.provision.ClusterSpec from(com.yahoo.config.provision.ClusterSpec$Type, com.yahoo.config.provision.ClusterSpec$Id, com.yahoo.config.provision.ClusterSpec$Group, com.yahoo.component.Version, boolean)", "public static com.yahoo.config.provision.ClusterSpec from(com.yahoo.config.provision.ClusterSpec$Type, com.yahoo.config.provision.ClusterSpec$Id, com.yahoo.config.provision.ClusterSpec$Group, com.yahoo.component.Version, boolean, java.util.Optional)", "public java.lang.String toString()", "public int hashCode()", 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 ea4411c03ab..afdae0023bc 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 @@ -68,20 +68,10 @@ public final class ClusterSpec { return new ClusterSpec(type, id, groupId, vespaVersion, exclusive, combinedId); } - // TODO(mpolden): Remove after April 2020 - public static ClusterSpec request(Type type, Id id, Version vespaVersion, boolean exclusive) { - return request(type, id, vespaVersion, exclusive, Optional.empty()); - } - public static ClusterSpec request(Type type, Id id, Version vespaVersion, boolean exclusive, Optional<Id> combinedId) { return new ClusterSpec(type, id, Optional.empty(), vespaVersion, exclusive, combinedId); } - // TODO(mpolden): Remove after April 2020 - public static ClusterSpec from(Type type, Id id, Group groupId, Version vespaVersion, boolean exclusive) { - return new ClusterSpec(type, id, Optional.of(groupId), vespaVersion, exclusive, Optional.empty()); - } - public static ClusterSpec from(Type type, Id id, Group groupId, Version vespaVersion, boolean exclusive, Optional<Id> combinedId) { return new ClusterSpec(type, id, Optional.of(groupId), vespaVersion, exclusive, combinedId); } diff --git a/config-provisioning/src/test/java/com/yahoo/config/provision/ClusterMembershipTest.java b/config-provisioning/src/test/java/com/yahoo/config/provision/ClusterMembershipTest.java index aa22747c165..4418b5c85ca 100644 --- a/config-provisioning/src/test/java/com/yahoo/config/provision/ClusterMembershipTest.java +++ b/config-provisioning/src/test/java/com/yahoo/config/provision/ClusterMembershipTest.java @@ -59,7 +59,7 @@ public class ClusterMembershipTest { @Test public void testServiceInstanceWithGroup() { ClusterSpec cluster = ClusterSpec.from(ClusterSpec.Type.content, ClusterSpec.Id.from("id1"), - ClusterSpec.Group.from(4), Version.fromString("6.42"), false); + ClusterSpec.Group.from(4), Version.fromString("6.42"), false, Optional.empty()); assertContentServiceWithGroup(ClusterMembership.from(cluster, 37)); } @@ -77,7 +77,7 @@ public class ClusterMembershipTest { @Test public void testServiceInstanceWithGroupAndRetire() { ClusterSpec cluster = ClusterSpec.from(ClusterSpec.Type.content, ClusterSpec.Id.from("id1"), - ClusterSpec.Group.from(4), Version.fromString("6.42"), false); + ClusterSpec.Group.from(4), Version.fromString("6.42"), false, Optional.empty()); assertContentServiceWithGroupAndRetire(ClusterMembership.retiredFrom(cluster, 37)); } diff --git a/config-provisioning/src/test/java/com/yahoo/config/provision/ClusterSpecTest.java b/config-provisioning/src/test/java/com/yahoo/config/provision/ClusterSpecTest.java index db90b0ebff9..7f8e41116a6 100644 --- a/config-provisioning/src/test/java/com/yahoo/config/provision/ClusterSpecTest.java +++ b/config-provisioning/src/test/java/com/yahoo/config/provision/ClusterSpecTest.java @@ -7,6 +7,7 @@ import org.junit.Test; import java.util.List; import java.util.Map; +import java.util.Optional; import static org.junit.Assert.assertEquals; @@ -52,7 +53,8 @@ public class ClusterSpecTest { } private static ClusterSpec spec(ClusterSpec.Type type, String id) { - return ClusterSpec.from(type, ClusterSpec.Id.from(id), ClusterSpec.Group.from(1), Version.emptyVersion, false); + return ClusterSpec.from(type, ClusterSpec.Id.from(id), ClusterSpec.Group.from(1), Version.emptyVersion, + false, Optional.empty()); } } |