diff options
| author | Jon Marius Venstad <jvenstad@yahoo-inc.com> | 2019-01-04 13:22:21 +0100 |
|---|---|---|
| committer | Jon Marius Venstad <jvenstad@yahoo-inc.com> | 2019-01-04 13:22:21 +0100 |
| commit | 1088503c2b5fc5187f22469c01093ce8d212b2ec (patch) | |
| tree | c38d3730dd18bf58217361234bdc3b2f2ce65664 /config-model-api | |
| parent | eba2eb41fa3cc8ee07f7790bbc7978ea1a2b30d1 (diff) | |
Deep check for emptiness
Diffstat (limited to 'config-model-api')
2 files changed, 3 insertions, 3 deletions
diff --git a/config-model-api/src/main/java/com/yahoo/config/application/api/Notifications.java b/config-model-api/src/main/java/com/yahoo/config/application/api/Notifications.java index dfd64fd951b..55269088196 100644 --- a/config-model-api/src/main/java/com/yahoo/config/application/api/Notifications.java +++ b/config-model-api/src/main/java/com/yahoo/config/application/api/Notifications.java @@ -11,7 +11,6 @@ import java.util.Map; import java.util.Set; import static java.util.Collections.emptyList; -import static java.util.stream.Collectors.toMap; /** * Configuration of notifications for deployment jobs. @@ -45,7 +44,8 @@ public class Notifications { * @return The Notifications as specified. */ public static Notifications of(Map<When, List<String>> emailAddressesByWhen, Map<When, List<Role>> emailRolesByWhen) { - if (emailAddressesByWhen.isEmpty() && emailRolesByWhen.isEmpty()) + if ( emailAddressesByWhen.values().stream().allMatch(List::isEmpty) + && emailRolesByWhen.values().stream().allMatch(List::isEmpty)) return none; ImmutableMap.Builder<When, List<String>> emailAddresses = ImmutableMap.builder(); diff --git a/config-model-api/src/main/java/com/yahoo/config/application/api/xml/DeploymentSpecXmlReader.java b/config-model-api/src/main/java/com/yahoo/config/application/api/xml/DeploymentSpecXmlReader.java index 970abd971af..084779d2147 100644 --- a/config-model-api/src/main/java/com/yahoo/config/application/api/xml/DeploymentSpecXmlReader.java +++ b/config-model-api/src/main/java/com/yahoo/config/application/api/xml/DeploymentSpecXmlReader.java @@ -128,7 +128,7 @@ public class DeploymentSpecXmlReader { Map<When, List<Role>> emailRoles = new HashMap<>(); for (When when : When.values()) { emailAddresses.put(when, new ArrayList<>()); - emailRoles.putIfAbsent(when, new ArrayList<>()); + emailRoles.put(when, new ArrayList<>()); } for (Element emailElement : XML.getChildren(notificationsElement, "email")) { |