Revert "Remove deprecated methods and unnecessary compatibility code"

1 files changed, 9 insertions, 2 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 63a163135db..5b76163e97f 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<Group> groupId;
     private final Version vespaVersion;
-    private final boolean exclusive;
+    private boolean exclusive;
     private final Optional<Id> combinedId;
     private final Optional<DockerImage> dockerImageRepo;
 
@@ -109,7 +109,7 @@ public final class ClusterSpec {
 
         public ClusterSpec build() {
             if (specification) {
-                if (groupId.isEmpty()) throw new IllegalArgumentException("groupId is required to be set when creating a ClusterSpec with specification()");
+                if (groupId.isEmpty()) throw new IllegalArgumentException("groupIs 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,6 +141,13 @@ public final class ClusterSpec {
             return this;
         }
 
+        @Deprecated
+        // TODO: Remove after 7.208 is oldest version in use
+        public Builder dockerImageRepo(Optional<String> dockerImageRepo) {
+            this.dockerImageRepo = dockerImageRepo.map(DockerImage::fromString);
+            return this;
+        }
+
         public Builder dockerImageRepository(Optional<DockerImage> dockerImageRepo) {
             this.dockerImageRepo = dockerImageRepo;
             return this;