Remove unused methods and stop reading dockerImage from zk

5 files changed, 2 insertions, 62 deletions

diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/ApplicationId.java b/config-provisioning/src/main/java/com/yahoo/config/provision/ApplicationId.java
index e1f8ef9b672..efc012a0946 100644
--- a/config-provisioning/src/main/java/com/yahoo/config/provision/ApplicationId.java
+++ b/config-provisioning/src/main/java/com/yahoo/config/provision/ApplicationId.java
@@ -40,21 +40,6 @@ public final class ApplicationId implements Comparable<ApplicationId> {
         return new ApplicationId(TenantName.from(tenant), ApplicationName.from(application), InstanceName.from(instance));
     }
 
-    /** 
-     * Creates an application id from a string on the form application:environment:region:instance 
-     * 
-     * @deprecated don't pass TenantName
-     */
-    @Deprecated // TODO: Remove when no version older than 6.90 is in use
-    public static ApplicationId fromSerializedForm(TenantName tenant, String idString) {
-        String[] parts = idString.split(":");
-        if (parts.length < 3)
-            throw new IllegalArgumentException("Application ids must be on the form tenant:application:instance, but was " + idString);
-
-        return new Builder().tenant(parts[0]).applicationName(parts[1]).instanceName(parts[2]).build();
-    }
-
-    
     public static ApplicationId fromSerializedForm(String idString) {
         String[] parts = idString.split(":");
         if (parts.length < 3)
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 b78c4bb9f56..d777a96d97e 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
@@ -2,9 +2,6 @@
 package com.yahoo.config.provision;
 
 import com.yahoo.component.Version;
-import com.yahoo.component.Vtag;
-
-import java.util.Optional;
 
 /**
  * A node's membership in a cluster.
@@ -113,18 +110,6 @@ public class ClusterMembership {
     @Override
     public String toString() { return stringValue(); }
 
-    @Deprecated
-    // TODO: April 2017 - Remove this when no version older than 6.92 is in production
-    public static ClusterMembership from(String stringValue, Optional<String> dockerImage) {
-        return from(stringValue, dockerImage.map(DockerImage::new).map(DockerImage::tagAsVersion).orElse(Vtag.currentVersion));
-    }
-
-    @Deprecated
-    // TODO: April 2017 - Remove this when no version older than 6.97 is in production
-    public static ClusterMembership fromVersion(String stringValue, Optional<Version> vespaVersion) {
-        return new ClusterMembership(stringValue, vespaVersion.orElse(Vtag.currentVersion));
-    }
-
     public static ClusterMembership from(String stringValue, Version vespaVersion) {
         return new ClusterMembership(stringValue, vespaVersion);
     }
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 6a79f2f06ed..19fcce4b965 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
@@ -2,7 +2,6 @@
 package com.yahoo.config.provision;
 
 import com.yahoo.component.Version;
-import com.yahoo.component.Vtag;
 
 import java.util.Objects;
 import java.util.Optional;
@@ -47,29 +46,9 @@ public final class ClusterSpec {
 
     public ClusterSpec changeGroup(Optional<Group> newGroup) { return new ClusterSpec(type, id, newGroup, vespaVersion); }
 
-    /** Create a specification <b>requesting</b> a cluster with these attributes */
-    @Deprecated
-    // TODO: April 2017 - Remove this when no version older than 6.94 is used anywhere
-    public static ClusterSpec request(Type type, Id id, Optional<String> dockerImage) {
-        return requestVersion(type, id, dockerImage.map(DockerImage::new).map(DockerImage::tagAsVersion));
-    }
-
-    /** Create a specification <b>requesting</b> a cluster with these attributes */
-    // TODO: April 2017 - Remove this when no version older than 6.97 is used anywhere
-    public static ClusterSpec requestVersion(Type type, Id id, Optional<Version> vespaVersion) {
-        return new ClusterSpec(type, id, Optional.empty(), vespaVersion.orElse(Vtag.currentVersion));
-    }
-
     public static ClusterSpec request(Type type, Id id, Version vespaVersion) {
         return new ClusterSpec(type, id, Optional.empty(), vespaVersion);
     }
-
-    /** Create a specification <b>specifying</b> an existing cluster group having these attributes */
-    // TODO: April 2017 - Remove this when no version older than 6.97 is used anywhere
-    public static ClusterSpec from(Type type, Id id, Group groupId, Optional<Version> vespaVersion) {
-        return new ClusterSpec(type, id, Optional.of(groupId), vespaVersion.orElse(Vtag.currentVersion));
-    }
-
     public static ClusterSpec from(Type type, Id id, Group groupId, Version vespaVersion) {
         return new ClusterSpec(type, id, Optional.of(groupId), vespaVersion);
     }
diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/ProvisionInfo.java b/config-provisioning/src/main/java/com/yahoo/config/provision/ProvisionInfo.java
index d817dd4834c..40021eab88e 100644
--- a/config-provisioning/src/main/java/com/yahoo/config/provision/ProvisionInfo.java
+++ b/config-provisioning/src/main/java/com/yahoo/config/provision/ProvisionInfo.java
@@ -1,7 +1,6 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.config.provision;
 
-import com.yahoo.component.Vtag;
 import com.yahoo.slime.ArrayTraverser;
 import com.yahoo.slime.Cursor;
 import com.yahoo.slime.Inspector;
@@ -28,7 +27,6 @@ public class ProvisionInfo {
     private static final String hostSpecMembership = "membership";
     private static final String hostSpecFlavor = "flavor";
     private static final String hostSpecVespaVersion = "vespaVersion";
-    private static final String dockerImage = "dockerImage";
 
     private final Set<HostSpec> hosts = new LinkedHashSet<>();
 
@@ -84,11 +82,8 @@ public class ProvisionInfo {
     }
 
     private static ClusterMembership readMembership(Inspector object) {
-        // TODO: When no version older than 6.97 is present anywhere, remove the possibility of the version field missing (and hence also remove reading of dockerImage)
         return ClusterMembership.from(object.field(hostSpecMembership).asString(),
-                                      object.field(hostSpecVespaVersion).valid() ? 
-                                      com.yahoo.component.Version.fromString(object.field(hostSpecVespaVersion).asString()) :
-                                      ( object.field(dockerImage).valid() ? new DockerImage(object.field(dockerImage).asString()).tagAsVersion() : Vtag.currentVersion));
+                                      com.yahoo.component.Version.fromString(object.field(hostSpecVespaVersion).asString()));
     }
 
     private static Optional<Flavor> readFlavor(Inspector object, Optional<NodeFlavors> nodeFlavors) {
diff --git a/config-provisioning/src/test/java/com/yahoo/config/provision/ProvisionInfoTest.java b/config-provisioning/src/test/java/com/yahoo/config/provision/ProvisionInfoTest.java
index d54b76c1b65..bd691afaf55 100644
--- a/config-provisioning/src/test/java/com/yahoo/config/provision/ProvisionInfoTest.java
+++ b/config-provisioning/src/test/java/com/yahoo/config/provision/ProvisionInfoTest.java
@@ -21,7 +21,6 @@ public class ProvisionInfoTest {
     private final HostSpec h1 = new HostSpec("host1", Optional.empty());
     private final HostSpec h2 = new HostSpec("host2", Optional.empty());
     private final HostSpec h3 = new HostSpec("host3", Optional.of(ClusterMembership.from("container/test/0", com.yahoo.component.Version.fromString("6.73.1"))));
-    private final HostSpec h4 = new HostSpec("host4", Optional.of(ClusterMembership.from("container/test/1", Optional.of("docker-registry.ops.yahoo.com:4443/vespa/ci:6.42.1"))));
 
     @Test
     public void testProvisionInfoSerialization() throws IOException {
@@ -29,7 +28,6 @@ public class ProvisionInfoTest {
         hosts.add(h1);
         hosts.add(h2);
         hosts.add(h3);
-        hosts.add(h4);
         ProvisionInfo info = ProvisionInfo.withHosts(hosts);
         assertProvisionInfo(info);
     }
@@ -40,7 +38,6 @@ public class ProvisionInfoTest {
         Set<HostSpec> hostsB = new LinkedHashSet<>();
         hostsB.add(h2);
         hostsB.add(h3);
-        hostsB.add(h4);
 
         ProvisionInfo infoA = ProvisionInfo.withHosts(hostsA);
         ProvisionInfo infoB = ProvisionInfo.withHosts(hostsB);
@@ -54,11 +51,10 @@ public class ProvisionInfoTest {
         assertTrue(serializedInfo.getHosts().contains(h1));
         assertTrue(serializedInfo.getHosts().contains(h2));
         assertTrue(serializedInfo.getHosts().contains(h3));
-        assertTrue(serializedInfo.getHosts().contains(h4));
         assertTrue(!getHost(h1.hostname(), serializedInfo.getHosts()).membership().isPresent());
         assertEquals("container/test/0", getHost(h3.hostname(), serializedInfo.getHosts()).membership().get().stringValue());
         assertEquals(h3.membership().get().cluster().vespaVersion(), getHost(h3.hostname(), serializedInfo.getHosts()).membership().get().cluster().vespaVersion());
-        assertEquals("docker-registry.ops.yahoo.com:4443/vespa/ci:6.42.1", getHost(h4.hostname(), serializedInfo.getHosts()).membership().get().cluster().dockerImage());
+        assertEquals("docker-registry.ops.yahoo.com:4443/vespa/ci:6.73.1", getHost(h3.hostname(), serializedInfo.getHosts()).membership().get().cluster().dockerImage());
     }
 
     private HostSpec getHost(String hostname, Set<HostSpec> hosts) {