Adding realtime notification fixes

wso2 · Dec 9, 2024 · ba4ed70 · ba4ed70
1 parent e406966
commit ba4ed70
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git a/...or/components/org.wso2.financial.services.accelerator.event.notifications.service/pom.xml b/...or/components/org.wso2.financial.services.accelerator.event.notifications.service/pom.xml
@@ -197,18 +197,14 @@
                             org.apache.commons.lang3;version="${commons-lang3.version}",
                             org.apache.commons.logging;version="${commons.logging.version}",
                             org.json;version="${org.json.version}",
-<!--                            org.quartz.*;version="${quartz.version}",-->
-<!--                            com.nimbusds.jose;version="${org.wso2.orbit.nimbus.version.range}",-->
                             com.fasterxml.jackson.annotation;version="${jackson.databinding.version}",
                             com.fasterxml.jackson.databind;version="${jackson.databinding.version}",
                             com.nimbusds.jose;version="${org.wso2.orbit.nimbus.version.range}",
                             org.wso2.carbon.identity.application.common.*;version="${carbon.identity.framework.version.range}",
                             org.wso2.carbon.identity.oauth2.*;version="${identity.inbound.auth.oauth.version.range}",
                             org.wso2.financial.services.accelerator.common.*;version="${project.version}",
                             org.wso2.financial.services.accelerator.consent.mgt.dao.*;version="${project.version}",
-                            org.wso2.financial.services.accelerator.consent.mgt.service.*;version="${project.version}",
-<!--                            org.apache.commons.collections4;version="${commons-collections.version}",-->
-<!--                            org.apache.http.*;version="${orbit.httpcore.version}"-->
+                            org.wso2.financial.services.accelerator.consent.mgt.service.*;version="${project.version}"
                         </Import-Package>
                         <DynamicImport-Package>*</DynamicImport-Package>
                         <Export-Package>

diff --git a/...erator/event/notifications/service/realtime/service/EventNotificationProducerService.java b/...erator/event/notifications/service/realtime/service/EventNotificationProducerService.java
@@ -20,6 +20,7 @@
 
 import com.nimbusds.jose.JOSEException;
 import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.wso2.carbon.identity.oauth2.IdentityOAuth2Exception;
@@ -78,7 +79,7 @@ public void run() {
                     }
                 });
 
-                if (!allowedEvents.isEmpty()) {
+                if (!allowedEvents.isEmpty() && StringUtils.isNotEmpty(subscription.getCallbackUrl())) {
                     RealtimeEventNotification realtimeEventNotification = new RealtimeEventNotification();
                     realtimeEventNotification.setNotification(notification);
                     realtimeEventNotification.setCallbackUrl(subscription.getCallbackUrl());

diff --git a/.../event/notifications/service/realtime/service/RealtimeEventNotificationLoaderService.java b/.../event/notifications/service/realtime/service/RealtimeEventNotificationLoaderService.java
@@ -10,6 +10,7 @@
 package org.wso2.financial.services.accelerator.event.notifications.service.realtime.service;
 
 import com.nimbusds.jose.JOSEException;
+import org.apache.commons.lang.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.wso2.carbon.identity.oauth2.IdentityOAuth2Exception;
@@ -71,7 +72,7 @@ public void run() {
                         }
                     });
 
-                    if (!allowedEvents.isEmpty()) {
+                    if (!allowedEvents.isEmpty() && StringUtils.isNotEmpty(subscription.getCallbackUrl())) {
                         NotificationResponse responseNotification = eventNotificationGenerator.
                                 generateEventNotificationBody(notification, allowedEvents);
                         RealtimeEventNotification realtimeEventNotification = new RealtimeEventNotification();