From a77975129bc22e45c62c2b965b3c023393644bd8 Mon Sep 17 00:00:00 2001 From: Harald Musum Date: Wed, 9 Sep 2020 06:59:27 +0200 Subject: Remove deprecated methods and unnecessary compatibility code --- .../src/main/java/com/yahoo/config/provision/ClusterSpec.java | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'config-provisioning/src/main/java/com/yahoo/config/provision/ClusterSpec.java') 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 5b76163e97f..63a163135db 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 @@ -20,7 +20,7 @@ public final class ClusterSpec { /** The group id of these hosts, or empty if this is represents a request for hosts */ private final Optional groupId; private final Version vespaVersion; - private boolean exclusive; + private final boolean exclusive; private final Optional combinedId; private final Optional dockerImageRepo; @@ -109,7 +109,7 @@ public final class ClusterSpec { public ClusterSpec build() { if (specification) { - if (groupId.isEmpty()) throw new IllegalArgumentException("groupIs is required to be set when creating a ClusterSpec with specification()"); + if (groupId.isEmpty()) throw new IllegalArgumentException("groupId is required to be set when creating a ClusterSpec with specification()"); if (vespaVersion == null) throw new IllegalArgumentException("vespaVersion is required to be set when creating a ClusterSpec with specification()"); } else if (groupId.isPresent()) throw new IllegalArgumentException("groupId is not allowed to be set when creating a ClusterSpec with request()"); @@ -141,13 +141,6 @@ public final class ClusterSpec { return this; } - @Deprecated - // TODO: Remove after 7.208 is oldest version in use - public Builder dockerImageRepo(Optional dockerImageRepo) { - this.dockerImageRepo = dockerImageRepo.map(DockerImage::fromString); - return this; - } - public Builder dockerImageRepository(Optional dockerImageRepo) { this.dockerImageRepo = dockerImageRepo; return this; -- cgit v1.2.3