Fix configuration

opendatadiscovery · Jul 20, 2022 · 0c843eb · 0c843eb
1 parent f7aab1a
commit 0c843eb
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/...in/java/org/opendatadiscovery/oddplatform/notification/NotificationSubscriberStarter.java b/...in/java/org/opendatadiscovery/oddplatform/notification/NotificationSubscriberStarter.java
@@ -7,11 +7,13 @@
 import org.opendatadiscovery.oddplatform.notification.config.NotificationsProperties;
 import org.opendatadiscovery.oddplatform.notification.processor.AlertNotificationMessageProcessor;
 import org.opendatadiscovery.oddplatform.notification.wal.PostgresWALMessageDecoder;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.event.ApplicationReadyEvent;
 import org.springframework.context.event.EventListener;
 import org.springframework.stereotype.Component;
 
 @Component
+@ConditionalOnProperty(value = "notifications.enabled", havingValue = "true")
 @RequiredArgsConstructor
 @Slf4j
 public class NotificationSubscriberStarter {
@@ -26,12 +28,8 @@ public class NotificationSubscriberStarter {
 
     @EventListener(ApplicationReadyEvent.class)
     public void runLeaderElection() {
-        if (notificationsProperties.isEnabled()) {
-            log.debug("Notification subscription is enabled, starting WAL parser");
-            executorService.submit(new NotificationSubscriber(
-                notificationsProperties.getWal(), pgConnectionFactory, messageDecoder, messageProcessor));
-        }
-
-        log.debug("Notification subscription is disabled");
+        log.debug("Notification subscription is enabled, starting WAL parser");
+        executorService.submit(new NotificationSubscriber(
+            notificationsProperties.getWal(), pgConnectionFactory, messageDecoder, messageProcessor));
     }
 }
diff --git a/...endatadiscovery/oddplatform/notification/processor/AlertNotificationMessageProcessor.java b/...endatadiscovery/oddplatform/notification/processor/AlertNotificationMessageProcessor.java
@@ -8,9 +8,11 @@
 import org.opendatadiscovery.oddplatform.notification.exception.NotificationSenderException;
 import org.opendatadiscovery.oddplatform.notification.sender.NotificationSender;
 import org.opendatadiscovery.oddplatform.notification.translator.NotificationMessageTranslator;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.stereotype.Component;
 
 @Component
+@ConditionalOnProperty(value = "notifications.enabled", havingValue = "true")
 @RequiredArgsConstructor
 @Slf4j
 public class AlertNotificationMessageProcessor implements PostgresWALMessageProcessor {