Remove canonical flavor

3 files changed, 4 insertions, 40 deletions

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 0d67498bd6a..c6cfa8288f4 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
@@ -3,8 +3,6 @@ package com.yahoo.config.provision;
 
 import com.yahoo.config.provisioning.FlavorsConfig;
 
-import java.util.ArrayList;
-import java.util.List;
 import java.util.Objects;
 
 /**
@@ -83,9 +81,8 @@ public class Flavor {
     /** Convenience, returns getType() == Type.DOCKER_CONTAINER */
     public boolean isDocker() { return type == Type.DOCKER_CONTAINER; }
 
-    public String canonicalName() {
-        return name;
-    }
+    // TODO: Remove after August 2019
+    public String canonicalName() { return name; }
     
     /**
      * Returns whether this flavor satisfies the requested flavor
diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/NodeFlavors.java b/config-provisioning/src/main/java/com/yahoo/config/provision/NodeFlavors.java
index 48133ade4e0..a9f031cae70 100644
--- a/config-provisioning/src/main/java/com/yahoo/config/provision/NodeFlavors.java
+++ b/config-provisioning/src/main/java/com/yahoo/config/provision/NodeFlavors.java
@@ -49,8 +49,7 @@ public class NodeFlavors {
      * and cannot be created on the fly.
      */
     public Flavor getFlavorOrThrow(String flavorName) {
-        return getFlavor(flavorName).orElseThrow(() -> new IllegalArgumentException("Unknown flavor '" + flavorName +
-                                                                                    "'. Flavors are " + canonicalFlavorNames()));
+        return getFlavor(flavorName).orElseThrow(() -> new IllegalArgumentException("Unknown flavor '" + flavorName + "'"));
     }
 
     /** Returns true if this flavor is configured or can be created on the fly */
@@ -58,10 +57,6 @@ public class NodeFlavors {
         return getFlavor(flavorName).isPresent();
     }
 
-    private List<String> canonicalFlavorNames() {
-        return configuredFlavors.values().stream().map(Flavor::canonicalName).distinct().sorted().collect(Collectors.toList());
-    }
-
     private static Collection<Flavor> toFlavors(FlavorsConfig config) {
         return config.flavor().stream().map(Flavor::new).collect(Collectors.toList());
     }
diff --git a/config-provisioning/src/test/java/com/yahoo/config/provision/NodeFlavorsTest.java b/config-provisioning/src/test/java/com/yahoo/config/provision/NodeFlavorsTest.java
index 6e536745c33..ec3f73a8194 100644
--- a/config-provisioning/src/test/java/com/yahoo/config/provision/NodeFlavorsTest.java
+++ b/config-provisioning/src/test/java/com/yahoo/config/provision/NodeFlavorsTest.java
@@ -2,9 +2,7 @@
 package com.yahoo.config.provision;
 
 import com.yahoo.config.provisioning.FlavorsConfig;
-import org.junit.Rule;
 import org.junit.Test;
-import org.junit.rules.ExpectedException;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -13,18 +11,13 @@ import static org.junit.Assert.assertEquals;
 
 public class NodeFlavorsTest {
 
-    @Rule
-    public final ExpectedException exception = ExpectedException.none();
-
     @Test
     public void testConfigParsing() {
         FlavorsConfig.Builder builder = new FlavorsConfig.Builder();
         List<FlavorsConfig.Flavor.Builder> flavorBuilderList = new ArrayList<>();
         {
             FlavorsConfig.Flavor.Builder flavorBuilder = new FlavorsConfig.Flavor.Builder();
-            FlavorsConfig.Flavor.Replaces.Builder flavorReplacesBuilder = new FlavorsConfig.Flavor.Replaces.Builder();
-            flavorReplacesBuilder.name("banana");
-            flavorBuilder.name("strawberry").cost(2).replaces.add(flavorReplacesBuilder);
+            flavorBuilder.name("strawberry").cost(2);
             flavorBuilderList.add(flavorBuilder);
         }
         {
@@ -38,25 +31,4 @@ public class NodeFlavorsTest {
         assertEquals(3, nodeFlavors.getFlavor("banana").get().cost());
     }
 
-    @Test
-    public void testRetiredFlavorWithoutReplacement() {
-        FlavorsConfig.Builder builder = new FlavorsConfig.Builder();
-        List<FlavorsConfig.Flavor.Builder> flavorBuilderList = new ArrayList<>();
-        {
-            FlavorsConfig.Flavor.Builder flavorBuilder = new FlavorsConfig.Flavor.Builder();
-            flavorBuilder.name("retired").retired(true);
-            flavorBuilderList.add(flavorBuilder);
-        }
-        {
-            FlavorsConfig.Flavor.Builder flavorBuilder = new FlavorsConfig.Flavor.Builder();
-            flavorBuilder.name("chocolate");
-            flavorBuilderList.add(flavorBuilder);
-        }
-        builder.flavor(flavorBuilderList);
-        FlavorsConfig config = new FlavorsConfig(builder);
-        exception.expect(IllegalStateException.class);
-        exception.expectMessage("Flavor 'retired' is retired, but has no replacement");
-        new NodeFlavors(config);
-    }
-
 }