Fix TODOs

5 files changed, 1 insertions, 54 deletions

diff --git a/config-provisioning/abi-spec.json b/config-provisioning/abi-spec.json
index ed3d76353fa..b41bf96332d 100644
--- a/config-provisioning/abi-spec.json
+++ b/config-provisioning/abi-spec.json
@@ -393,7 +393,6 @@
       "public com.yahoo.config.provision.Flavor with(com.yahoo.config.provision.NodeResources)",
       "public java.lang.String name()",
       "public int cost()",
-      "public boolean isStock()",
       "public boolean isConfigured()",
       "public com.yahoo.config.provision.NodeResources resources()",
       "public java.util.Optional flavorOverrides()",
@@ -402,14 +401,8 @@
       "public boolean hasFastDisk()",
       "public double getBandwidthGbps()",
       "public double getMinCpuCores()",
-      "public boolean isRetired()",
       "public com.yahoo.config.provision.Flavor$Type getType()",
       "public boolean isDocker()",
-      "public java.lang.String canonicalName()",
-      "public boolean isCanonical()",
-      "public java.util.List replaces()",
-      "public boolean satisfies(com.yahoo.config.provision.Flavor)",
-      "public void freeze()",
       "public int hashCode()",
       "public boolean equals(java.lang.Object)",
       "public java.lang.String toString()"
@@ -625,8 +618,6 @@
       "public com.yahoo.config.provision.NodeResources withDiskSpeed(com.yahoo.config.provision.NodeResources$DiskSpeed)",
       "public com.yahoo.config.provision.NodeResources subtract(com.yahoo.config.provision.NodeResources)",
       "public com.yahoo.config.provision.NodeResources add(com.yahoo.config.provision.NodeResources)",
-      "public boolean allocateByLegacyName()",
-      "public java.util.Optional legacyName()",
       "public boolean equals(java.lang.Object)",
       "public int hashCode()",
       "public java.lang.String toString()",
diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/Flavor.java b/config-provisioning/src/main/java/com/yahoo/config/provision/Flavor.java
index e814c272aa0..e511e272497 100644
--- a/config-provisioning/src/main/java/com/yahoo/config/provision/Flavor.java
+++ b/config-provisioning/src/main/java/com/yahoo/config/provision/Flavor.java
@@ -118,27 +118,6 @@ public class Flavor {
     /** Convenience, returns getType() == Type.DOCKER_CONTAINER */
     public boolean isDocker() { return type == Type.DOCKER_CONTAINER; }
 
-    // TODO: Remove after August 2019
-    public String canonicalName() { return name; }
-
-    // TODO: Remove after August 2019
-    public boolean satisfies(Flavor flavor) { return this.equals(flavor); }
-
-    // TODO: Remove after August 2019
-    public boolean isStock() { return false; }
-
-    // TODO: Remove after August 2019
-    public boolean isRetired() { return false; }
-
-    // TODO: Remove after August 2019
-    public boolean isCanonical() { return false; }
-
-    // TODO: Remove after August 2019
-    public List<Flavor> replaces() { return Collections.emptyList(); }
-
-    // TODO: Remove after August 2019
-    public void freeze() {}
-
     @Override
     public int hashCode() { return Objects.hash(name, flavorOverrides); }
 
diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/NodeResources.java b/config-provisioning/src/main/java/com/yahoo/config/provision/NodeResources.java
index 89d497a3ab0..4469eef98cf 100644
--- a/config-provisioning/src/main/java/com/yahoo/config/provision/NodeResources.java
+++ b/config-provisioning/src/main/java/com/yahoo/config/provision/NodeResources.java
@@ -2,7 +2,6 @@
 package com.yahoo.config.provision;
 
 import java.util.Objects;
-import java.util.Optional;
 
 /**
  * The node resources required by an application cluster
@@ -94,14 +93,6 @@ public class NodeResources {
                                  combine(this.diskSpeed, other.diskSpeed));
     }
 
-    // TODO: Remove after August 2019
-    public Optional<String> legacyName() {
-        return Optional.of(toString());
-    }
-
-    // TODO: Remove after August 2019
-    public boolean allocateByLegacyName() { return false; }
-
     private boolean isInterchangeableWith(NodeResources other) {
         if (this.diskSpeed != DiskSpeed.any && other.diskSpeed != DiskSpeed.any && this.diskSpeed != other.diskSpeed)
             return false;
diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/serialization/AllocatedHostsSerializer.java b/config-provisioning/src/main/java/com/yahoo/config/provision/serialization/AllocatedHostsSerializer.java
index 95cf17c711c..a7ba286baa7 100644
--- a/config-provisioning/src/main/java/com/yahoo/config/provision/serialization/AllocatedHostsSerializer.java
+++ b/config-provisioning/src/main/java/com/yahoo/config/provision/serialization/AllocatedHostsSerializer.java
@@ -145,14 +145,10 @@ public class AllocatedHostsSerializer {
         }
         else if (object.field(resourcesKey).valid()) {
             Inspector resources = object.field(resourcesKey);
-            double bandwidth = Optional.of(resources.field(bandwidthKey))
-                    .filter(Inspector::valid)
-                    .map(Inspector::asDouble)
-                    .orElse(0.3);
             return Optional.of(new Flavor(new NodeResources(resources.field(vcpuKey).asDouble(),
                                                             resources.field(memoryKey).asDouble(),
                                                             resources.field(diskKey).asDouble(),
-                                                            bandwidth,
+                                                            resources.field(bandwidthKey).asDouble(),
                                                             diskSpeedFromSlime(resources.field(diskSpeedKey)))));
         }
         else {
diff --git a/config-provisioning/src/main/resources/configdefinitions/flavors.def b/config-provisioning/src/main/resources/configdefinitions/flavors.def
index 131c23054a2..59b6c852b0e 100644
--- a/config-provisioning/src/main/resources/configdefinitions/flavors.def
+++ b/config-provisioning/src/main/resources/configdefinitions/flavors.def
@@ -7,16 +7,10 @@ namespace=config.provisioning
 # If a certain flavor has no config it is not necessary to list it here to use it.
 flavor[].name string
 
-# NOT USED: TODO: Remove after August 2019
-flavor[].replaces[].name string
-
 # The monthly Total Cost of Ownership (TCO) in USD. Typically calculated as TCO divided by
 # the expected lifetime of the node (usually three years).
 flavor[].cost int default=0
 
-# NOT USED: TODO: Remove after August 2019
-flavor[].stock bool default=true
-
 # The type of node: BARE_METAL, VIRTUAL_MACHINE or DOCKER_CONTAINER
 flavor[].environment string default="undefined"
 
@@ -34,7 +28,3 @@ flavor[].fastDisk bool default=true
 
 # Expected network interface bandwidth available for this flavor, in Mbit/s.
 flavor[].bandwidth double default=0.0
-
-# NOT USED: TODO: Remove after August 2019
-flavor[].retired bool default=false
-