diff options
author | Jon Bratseth <bratseth@verizonmedia.com> | 2019-08-14 15:43:42 +0200 |
---|---|---|
committer | Jon Bratseth <bratseth@verizonmedia.com> | 2019-08-14 15:43:42 +0200 |
commit | 845125fb3aa0d0a438db1aa4b1d120040b1da0f9 (patch) | |
tree | 1904a90230dff8c5cae42a44feca9df8c596b986 /config-provisioning/src/main/java/com/yahoo/config/provision/NodeFlavors.java | |
parent | ad63cdbbb7386d867dfeeeea40f3432ff1cef0d0 (diff) |
Remove flavor retired concept
Diffstat (limited to 'config-provisioning/src/main/java/com/yahoo/config/provision/NodeFlavors.java')
-rw-r--r-- | config-provisioning/src/main/java/com/yahoo/config/provision/NodeFlavors.java | 19 |
1 files changed, 1 insertions, 18 deletions
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<Flavor> toFlavors(FlavorsConfig config) { - Map<String, Flavor> 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<Flavor> 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()); } } |