diff options
Diffstat (limited to 'config-provisioning/src/main/java/com/yahoo')
-rw-r--r-- | config-provisioning/src/main/java/com/yahoo/config/provision/Flavor.java | 7 | ||||
-rw-r--r-- | config-provisioning/src/main/java/com/yahoo/config/provision/NodeFlavors.java | 7 |
2 files changed, 3 insertions, 11 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()); } |