From 5c2c8c4f8c21782dd279c229ab05bed26e6b9412 Mon Sep 17 00:00:00 2001
From: Harald Musum <musum@verizonmedia.com>
Date: Fri, 17 Apr 2020 12:38:57 +0200
Subject: Use DockerImage instead of String, part 2

---
 .../main/java/com/yahoo/config/provision/ClusterMembership.java    | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'config-provisioning/src/main/java/com/yahoo/config/provision/ClusterMembership.java')

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 178bbac9e64..779b6854e21 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
@@ -20,7 +20,7 @@ public class ClusterMembership {
 
     protected ClusterMembership() {}
 
-    private ClusterMembership(String stringValue, Version vespaVersion, Optional<String> dockerImageRepo) {
+    private ClusterMembership(String stringValue, Version vespaVersion, Optional<DockerImage> dockerImageRepo) {
         String[] components = stringValue.split("/");
         if (components.length < 4)
             throw new RuntimeException("Could not parse '" + stringValue + "' to a cluster membership. " +
@@ -44,7 +44,7 @@ public class ClusterMembership {
                 .vespaVersion(vespaVersion)
                 .exclusive(exclusive)
                 .combinedId(combinedId.map(ClusterSpec.Id::from))
-                .dockerImageRepo(dockerImageRepo)
+                .dockerImageRepository(dockerImageRepo)
                 .build();
         this.index = Integer.parseInt(components[3]);
         this.stringValue = toStringValue();
@@ -110,11 +110,12 @@ public class ClusterMembership {
     @Override
     public String toString() { return stringValue(); }
 
+    // TODO: Remove when 7.208 is the latest model in use
     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) {
+    public static ClusterMembership from(String stringValue, Version vespaVersion, Optional<DockerImage> dockerImageRepo) {
         return new ClusterMembership(stringValue, vespaVersion, dockerImageRepo);
     }
 
-- 
cgit v1.2.3