Adding realtime event notification implementation

wso2 · Nov 4, 2024 · 605849f · 605849f
1 parent 05b0bdb
commit 605849f
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 67 deletions.
diff --git a/...ancial/services/accelerator/event/notifications/service/dao/EventSubscriptionDAOImpl.java b/...ancial/services/accelerator/event/notifications/service/dao/EventSubscriptionDAOImpl.java
@@ -126,9 +126,7 @@ public EventSubscription getEventSubscriptionBySubscriptionId(Connection connect
                             eventTypes.add(eventType);
                         }
                     }
-                    if (!eventTypes.isEmpty()) {
-                        retrievedSubscription.setEventTypes(eventTypes);
-                    }
+                    retrievedSubscription.setEventTypes(eventTypes);
                 } else {
                     log.error("No event notification subscription found for the given subscription id.");
                     throw new FSEventNotificationException(
@@ -171,9 +169,7 @@ public List<EventSubscription> getEventSubscriptionsByClientId(Connection connec
                                 break;
                             }
                         }
-                        if (!eventTypes.isEmpty()) {
-                            eventSubscription.setEventTypes(eventTypes);
-                        }
+                        eventSubscription.setEventTypes(eventTypes);
                         retrievedSubscriptions.add(eventSubscription);
                     }
                     log.debug("Retrieved the event notification subscriptions successfully.");
@@ -216,9 +212,7 @@ public List<EventSubscription> getEventSubscriptionsByEventType(Connection conne
                                 break;
                             }
                         }
-                        if (!eventTypes.isEmpty()) {
-                            eventSubscription.setEventTypes(eventTypes);
-                        }
+                        eventSubscription.setEventTypes(eventTypes);
                         retrievedSubscriptions.add(eventSubscription);
                     }
                     log.debug("Retrieved the event notification subscriptions successfully.");

diff --git a/...services/accelerator/event/notifications/service/internal/EventNotificationComponent.java b/...services/accelerator/event/notifications/service/internal/EventNotificationComponent.java
@@ -23,12 +23,7 @@
 import org.osgi.service.component.ComponentContext;
 import org.osgi.service.component.annotations.Activate;
 import org.osgi.service.component.annotations.Component;
-import org.osgi.service.component.annotations.Reference;
-import org.osgi.service.component.annotations.ReferenceCardinality;
-import org.osgi.service.component.annotations.ReferencePolicy;
-import org.wso2.carbon.identity.oauth2.OAuth2Service;
 import org.wso2.financial.services.accelerator.common.config.FinancialServicesConfigParser;
-import org.wso2.financial.services.accelerator.common.config.FinancialServicesConfigurationService;
 import org.wso2.financial.services.accelerator.event.notifications.service.realtime.service.RealtimeEventNotificationLoaderService;
 import org.wso2.financial.services.accelerator.event.notifications.service.realtime.util.activator.PeriodicalEventNotificationConsumerJobActivator;
 
@@ -58,44 +53,4 @@ protected void activate(ComponentContext context) {
             new PeriodicalEventNotificationConsumerJobActivator().activate();
         }
     }
-
-    /**
-     * Setters for the descendent OSGI services of the EventNotificationComponent.
-     * This is added to run the EventNotification OSGI component after the Common module
-     * @param configService OpenBankingConfigurationService
-     */
-    @Reference(
-            service = FinancialServicesConfigurationService.class,
-            cardinality = ReferenceCardinality.MANDATORY,
-            policy = ReferencePolicy.DYNAMIC,
-            unbind = "unsetConfigService"
-    )
-    public void setConfigService(FinancialServicesConfigurationService configService) {
-        EventNotificationDataHolder.getInstance().setFinancialServicesConfigurationService(configService);
-    }
-
-    public void unsetConfigService(FinancialServicesConfigurationService configService) {
-        EventNotificationDataHolder.getInstance().setFinancialServicesConfigurationService(null);
-    }
-
-    /**
-     * Setters for the descendent OSGI services of the EventNotificationComponent.
-     * This is added to run the EventNotification OSGI component after the OAuth2Service
-     */
-    @Reference(
-            service = OAuth2Service.class,
-            cardinality = ReferenceCardinality.MANDATORY,
-            policy = ReferencePolicy.DYNAMIC,
-            unbind = "unsetOAuth2Service"
-    )
-
-    /**
-     * Setters for the descendent OSGI services of the EventNotificationComponent.
-     * @param oAuth2Service OAuth2Service
-     */
-    public void setOAuth2Service(OAuth2Service oAuth2Service) {
-    }
-
-    public void unsetOAuth2Service(OAuth2Service oAuth2Service) {
-    }
 }
diff --git a/...ervices/accelerator/event/notifications/service/internal/EventNotificationDataHolder.java b/...ervices/accelerator/event/notifications/service/internal/EventNotificationDataHolder.java
@@ -20,7 +20,6 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.wso2.financial.services.accelerator.common.config.FinancialServicesConfigurationService;
 import org.wso2.financial.services.accelerator.event.notifications.service.model.RealtimeEventNotification;
 
 import java.util.concurrent.LinkedBlockingQueue;
@@ -32,7 +31,6 @@ public class EventNotificationDataHolder {
     private static Log log = LogFactory.getLog(EventNotificationDataHolder.class);
     private static volatile EventNotificationDataHolder instance;
     private volatile LinkedBlockingQueue<RealtimeEventNotification> realtimeEventNotificationQueue;
-    private FinancialServicesConfigurationService configService;
 
     private EventNotificationDataHolder() {
         this.realtimeEventNotificationQueue = new LinkedBlockingQueue<>();
@@ -58,17 +56,6 @@ public LinkedBlockingQueue<RealtimeEventNotification> getRealtimeEventNotificati
         return realtimeEventNotificationQueue;
     }
 
-    public FinancialServicesConfigurationService getFinancialServicesConfigurationService() {
-
-        return configService;
-    }
-
-    public void setFinancialServicesConfigurationService(
-            FinancialServicesConfigurationService configService) {
-
-        this.configService = configService;
-    }
-
     public void setRealtimeEventNotificationQueue(LinkedBlockingQueue<RealtimeEventNotification> queue) {
         this.realtimeEventNotificationQueue = queue;
     }

diff --git a/...erator/event/notifications/service/realtime/service/EventNotificationProducerService.java b/...erator/event/notifications/service/realtime/service/EventNotificationProducerService.java
@@ -75,6 +75,11 @@ public void run() {
                         allowedEvents.add(notificationEvent);
                     }
                 });
+
+                if (allowedEvents.isEmpty()) {
+                    continue;
+                }
+
                 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
@@ -74,6 +74,10 @@ public void run() {
                         }
                     });
 
+                    if (allowedEvents.isEmpty()) {
+                        continue;
+                    }
+
                     NotificationResponse responseNotification = eventNotificationGenerator.
                             generateEventNotificationBody(notification, allowedEvents);
                     RealtimeEventNotification realtimeEventNotification = new RealtimeEventNotification();