Update aggregation

RedHatInsights · Nov 28, 2024 · 3daa786 · 3daa786
1 parent 55e2d43
commit 3daa786
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/.../cloud/notifications/connector/drawer/recipients/RecipientsResolverResponseProcessor.java b/.../cloud/notifications/connector/drawer/recipients/RecipientsResolverResponseProcessor.java
@@ -32,7 +32,7 @@ public void process(final Exchange exchange) throws JsonProcessingException {
 
         exchange.setProperty(ExchangeProperty.RESOLVED_RECIPIENT_LIST, recipientsList.stream()
             .map(DrawerUser::getUsername)
-            .filter(userName -> userName != null && !userName.trim().isEmpty())
+            .filter(userName -> userName != null && !userName.isBlank())
             .collect(Collectors.toSet()));
     }
 }
diff --git a/...ifications/connector/email/processors/recipients/RecipientsResolverResponseProcessor.java b/...ifications/connector/email/processors/recipients/RecipientsResolverResponseProcessor.java
@@ -38,7 +38,7 @@ public class RecipientsResolverResponseProcessor implements Processor {
     public void process(final Exchange exchange) throws JsonProcessingException {
         final String body = exchange.getMessage().getBody(String.class);
         final Set<String> recipientsList = Arrays.asList(this.objectMapper.readValue(body, User[].class))
-            .stream().map(User::getEmail).filter(email -> email != null && !email.trim().isEmpty()).collect(toSet());
+            .stream().map(User::getEmail).filter(email -> email != null && !email.isBlank()).collect(toSet());
 
         Set<String> emails = exchange.getProperty(ExchangeProperty.EMAIL_RECIPIENTS, Set.class);
         if (emailConnectorConfig.isEmailsInternalOnlyEnabled()) {

diff --git a/engine/src/main/java/com/redhat/cloud/notifications/processors/email/EmailAggregator.java b/engine/src/main/java/com/redhat/cloud/notifications/processors/email/EmailAggregator.java
@@ -161,7 +161,7 @@ private void aggregationBasedOnEmailAggregation(EmailAggregationKey aggregationK
                     unsubscribers,
                     eventType.isSubscribedByDefault(),
                     externalAuthorizationCriteria
-                );
+                ).stream().filter(user -> user.getEmail() != null && !user.getEmail().isBlank()).collect(toSet());
 
                 /*
                  * We now have the final recipients list.
@@ -224,7 +224,7 @@ private void aggregationBasedOnEvent(EventAggregationCriteria eventAggregationCr
                     unsubscribers,
                     eventType.isSubscribedByDefault(),
                     externalAuthorizationCriterion
-                );
+                ).stream().filter(user -> user.getEmail() != null && !user.getEmail().isBlank()).collect(toSet());
 
                 /*
                  * We now have the final recipients list.