Skip notification emails if no-one subscribing

1 files changed, 7 insertions, 4 deletions

diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/notification/Notifier.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/notification/Notifier.java
index b0b43866fae..f27e69c4636 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/notification/Notifier.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/notification/Notifier.java
@@ -101,10 +101,13 @@ public class Notifier {
             log.fine(() -> "Sending notification " + notification + " to " +
                     contacts.stream().map(c -> c.email().getEmailAddress()).toList());
             var content = formatter.format(notification);
-            mailer.send(mailOf(content, contacts.stream()
-                    .filter(c -> c.email().isVerified())
-                    .map(c -> c.email().getEmailAddress())
-                    .toList()));
+            var verifiedContacts = contacts.stream()
+                    .filter(c -> c.email().isVerified()).map(c -> c.email().getEmailAddress()).toList();
+            if (verifiedContacts.isEmpty()) {
+                log.fine(() -> "None of the %d contact(s) are verified - skipping delivery of %s".formatted(contacts.size(), notification));
+                return;
+            }
+            mailer.send(mailOf(content, verifiedContacts));
         } catch (MailerException e) {
             log.log(Level.SEVERE, "Failed sending email", e);
         } catch (MissingOptionalException e) {