From 62a4a78d4f2fba10e9bda5421ec6f772b158cc41 Mon Sep 17 00:00:00 2001 From: "francesco.mangiacrapa" Date: Mon, 15 Apr 2024 17:46:49 +0200 Subject: [PATCH] improved check events subscribed in the config --- .../cms/cataloguebinding/CatalogueBindingPlugin.java | 6 ++++++ .../cms/notifications/NotificationsPlugin.java | 9 +++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/catalogue-binding-plugin/src/main/java/org/gcube/application/cms/cataloguebinding/CatalogueBindingPlugin.java b/catalogue-binding-plugin/src/main/java/org/gcube/application/cms/cataloguebinding/CatalogueBindingPlugin.java index 9c43918..12bb171 100644 --- a/catalogue-binding-plugin/src/main/java/org/gcube/application/cms/cataloguebinding/CatalogueBindingPlugin.java +++ b/catalogue-binding-plugin/src/main/java/org/gcube/application/cms/cataloguebinding/CatalogueBindingPlugin.java @@ -275,6 +275,12 @@ public class CatalogueBindingPlugin extends AbstractPlugin implements EventListe List listEvents = eventsSub.getListEventSubscribed(); log.info("List events is {}", listEvents); + + if(listEvents==null) { + log.info("no event subscribed, returing false"); + return false; + } + if (listEvents.contains(observerd.getEvent())) { log.info("the event {} is subscribed from config ", observerd.getEvent()); return true; diff --git a/notifications-plugins/src/main/java/org/gcube/application/cms/notifications/NotificationsPlugin.java b/notifications-plugins/src/main/java/org/gcube/application/cms/notifications/NotificationsPlugin.java index 6dbdacf..a844b1c 100644 --- a/notifications-plugins/src/main/java/org/gcube/application/cms/notifications/NotificationsPlugin.java +++ b/notifications-plugins/src/main/java/org/gcube/application/cms/notifications/NotificationsPlugin.java @@ -201,8 +201,13 @@ public class NotificationsPlugin extends AbstractPlugin implements EventListener List listEvents = eventsSub.getListNotificationEventSubscribed(); log.info("List events is {}", listEvents); - if (listEvents != null - && listEvents.stream().anyMatch(sne -> sne.getEvent().equals(observerd.getEvent()))) { + + if(listEvents==null) { + log.info("no event subscribed, returning false"); + return false; + } + + if (listEvents.stream().anyMatch(sne -> sne.getEvent().equals(observerd.getEvent()))) { log.info("the event {} is subscribed from config ", observerd.getEvent()); return true; }