From 0417e471ac13a1faa84b998ce33eff50d10b4c23 Mon Sep 17 00:00:00 2001 From: "francesco.mangiacrapa" Date: Mon, 15 Apr 2024 17:01:56 +0200 Subject: [PATCH] updated toString ItemObserved --- catalogue-binding-plugin/.classpath | 7 ++++++- .../CatalogueBindingPlugin.java | 5 ++++- .../cms/plugins/events/ItemObserved.java | 20 +++++++++++++++++++ .../notifications/NotificationsPlugin.java | 2 +- 4 files changed, 31 insertions(+), 3 deletions(-) diff --git a/catalogue-binding-plugin/.classpath b/catalogue-binding-plugin/.classpath index 2b1b042..2734d4b 100644 --- a/catalogue-binding-plugin/.classpath +++ b/catalogue-binding-plugin/.classpath @@ -23,6 +23,11 @@ - + + + + + + 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 438bcba..9c43918 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 @@ -14,6 +14,7 @@ import org.gcube.application.cms.plugins.events.EventManager; import org.gcube.application.cms.plugins.events.EventManager.Event; import org.gcube.application.cms.plugins.events.ItemObserved; import org.gcube.application.cms.plugins.faults.InitializationException; +import org.gcube.application.cms.plugins.faults.InvalidProfileException; import org.gcube.application.cms.plugins.faults.MaterializationException; import org.gcube.application.cms.plugins.faults.ShutDownException; import org.gcube.application.cms.plugins.implementations.AbstractPlugin; @@ -248,7 +249,9 @@ public class CatalogueBindingPlugin extends AbstractPlugin implements EventListe log.info("Events subscribed read from config {} ", eventsSubscrInTheUCD); } - + } catch (InvalidProfileException e) { + log.warn("Unable to read configuration for {} in the UCD {}", CatalogueBindingPlugin.PLUGIN_ID, + useCaseDescriptor.getId()); } catch (Exception e) { log.error("Unable to read configuration ", e); } catch (Throwable t) { diff --git a/cms-plugin-framework/src/main/java/org/gcube/application/cms/plugins/events/ItemObserved.java b/cms-plugin-framework/src/main/java/org/gcube/application/cms/plugins/events/ItemObserved.java index 4ff8c13..87d0e67 100644 --- a/cms-plugin-framework/src/main/java/org/gcube/application/cms/plugins/events/ItemObserved.java +++ b/cms-plugin-framework/src/main/java/org/gcube/application/cms/plugins/events/ItemObserved.java @@ -82,4 +82,24 @@ public class ItemObserved implements ItemObservable { } return null; } + + @Override + public String toString() { + StringBuilder builder = new StringBuilder(); + builder.append("ItemObserved [userCaller="); + builder.append(userCaller); + builder.append(", context="); + builder.append(context); + builder.append(", useCaseDescriptor id="); + builder.append(useCaseDescriptor!=null?useCaseDescriptor.getId():null); + builder.append(", project id="); + builder.append(project!=null?project.getId():null); + builder.append(", event="); + builder.append(event); + builder.append(", optional="); + builder.append(optional); + builder.append("]"); + return builder.toString(); + } + } 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 f77a2b6..6dbdacf 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 @@ -332,7 +332,7 @@ public class NotificationsPlugin extends AbstractPlugin implements EventListener } } catch (InvalidProfileException e) { - log.warn("Unable to read configuration for {} in the UCD {}" + NotificationsPlugin.PLUGIN_ID, + log.warn("Unable to read configuration for {} in the UCD {}", NotificationsPlugin.PLUGIN_ID, useCaseDescriptor.getId()); } catch (Exception e) { log.error("Unable to read configuration for " + NotificationsPlugin.PLUGIN_ID, e);