From 845125fb3aa0d0a438db1aa4b1d120040b1da0f9 Mon Sep 17 00:00:00 2001 From: Jon Bratseth Date: Wed, 14 Aug 2019 15:43:42 +0200 Subject: Remove flavor retired concept --- .../java/com/yahoo/config/provision/NodeFlavors.java | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) (limited to 'config-provisioning/src/main/java/com/yahoo/config/provision/NodeFlavors.java') 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 a76c50702c6..48133ade4e0 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 @@ -63,24 +63,7 @@ public class NodeFlavors { } private static Collection toFlavors(FlavorsConfig config) { - Map flavors = new HashMap<>(); - // First pass, create all flavors, but do not include flavorReplacesConfig. - for (FlavorsConfig.Flavor flavorConfig : config.flavor()) { - flavors.put(flavorConfig.name(), new Flavor(flavorConfig)); - } - - // Ensure that retired flavors have a replacement - for (Flavor flavor : flavors.values()) { - if (flavor.isRetired() && !hasReplacement(flavors.values(), flavor)) - throw new IllegalStateException(String.format("Flavor '%s' is retired, but has no replacement", flavor.name())); - } - return flavors.values(); - } - - private static boolean hasReplacement(Collection flavors, Flavor flavor) { - return flavors.stream() - .filter(f -> !f.equals(flavor)) - .anyMatch(f -> f.satisfies(flavor)); + return config.flavor().stream().map(Flavor::new).collect(Collectors.toList()); } } -- cgit v1.2.3