added DefaultSolacePersistentMessageHandlerObserver to avoid redundan…

…t null checks
SolaceProducts · Oct 23, 2024 · 5fec064 · 5fec064
1 parent c6e9865
commit 5fec064
Show file tree

Hide file tree

Showing 2 changed files with 44 additions and 16 deletions.
diff --git a/...s/ep/event/management/agent/subscriber/DefaultSolacePersistentMessageHandlerObserver.java b/...s/ep/event/management/agent/subscriber/DefaultSolacePersistentMessageHandlerObserver.java
@@ -0,0 +1,31 @@
+package com.solace.maas.ep.event.management.agent.subscriber;
+
+import com.solace.messaging.receiver.InboundMessage;
+
+public class DefaultSolacePersistentMessageHandlerObserver implements SolacePersistentMessageHandlerObserver {
+
+    @Override
+    public void onMessageReceived(InboundMessage message) {
+        // Do nothing
+    }
+
+    @Override
+    public void onMessageProcessingInitiated(InboundMessage message) {
+        // Do nothing
+    }
+
+    @Override
+    public void onMessageProcessingCompleted(InboundMessage message) {
+        // Do nothing
+    }
+
+    @Override
+    public void onMessageProcessingAcknowledged(InboundMessage message) {
+        // Do nothing
+    }
+
+    @Override
+    public void onMessageProcessingFailed(InboundMessage message) {
+        // Do nothing
+    }
+}
diff --git a/.../com/solace/maas/ep/event/management/agent/subscriber/SolacePersistentMessageHandler.java b/.../com/solace/maas/ep/event/management/agent/subscriber/SolacePersistentMessageHandler.java
@@ -41,14 +41,14 @@ public class SolacePersistentMessageHandler extends BaseSolaceMessageHandler imp
     private PersistentMessageReceiver persistentMessageReceiver;
 
     // only used for testing
-    @Setter
     private SolacePersistentMessageHandlerObserver messageHandlerObserver;
 
     protected SolacePersistentMessageHandler(MessagingService messagingService,
                                              EventPortalProperties eventPortalProperties,
                                              List<MessageProcessor> messageProcessorList) {
 
         super();
+        this.messageHandlerObserver = new DefaultSolacePersistentMessageHandlerObserver();
         this.messagingService = messagingService;
         this.eventPortalProperties = eventPortalProperties;
         messageProcessorsByClassType = messageProcessorList.stream()
@@ -63,19 +63,22 @@ protected SolacePersistentMessageHandler(MessagingService messagingService,
     }
 
 
+    public void setMessageHandlerObserver(SolacePersistentMessageHandlerObserver observer) {
+        this.messageHandlerObserver = observer;
+        if (this.messageHandlerObserver==null){
+            this.messageHandlerObserver = new DefaultSolacePersistentMessageHandlerObserver();
+        }
+    }
+
     @Override
     public void onMessage(InboundMessage inboundMessage) {
-        if (messageHandlerObserver != null) {
-            messageHandlerObserver.onMessageReceived(inboundMessage);
-        }
+        messageHandlerObserver.onMessageReceived(inboundMessage);
         executor.submit(() -> processMessage(inboundMessage));
     }
 
 
     private void processMessage(InboundMessage inboundMessage) {
-        if (messageHandlerObserver != null) {
-            messageHandlerObserver.onMessageProcessingInitiated(inboundMessage);
-        }
+        messageHandlerObserver.onMessageProcessingInitiated(inboundMessage);
         String mopMessageSubclass = "";
         MessageProcessor processor = null;
         Object message = null;
@@ -91,19 +94,13 @@ private void processMessage(InboundMessage inboundMessage) {
             log.trace("onMessage: {}\n{}", messageClass, messageAsString);
             message = toMessage(messageAsString, messageClass);
             processor.processMessage(processor.castToMessageClass(message));
-            if (messageHandlerObserver != null) {
-                messageHandlerObserver.onMessageProcessingCompleted(inboundMessage);
-            }
+            messageHandlerObserver.onMessageProcessingCompleted(inboundMessage);
         } catch (Exception e) {
             handleProcessingError(mopMessageSubclass, processor, message, e);
-            if (messageHandlerObserver != null) {
-                messageHandlerObserver.onMessageProcessingFailed(inboundMessage);
-            }
+            messageHandlerObserver.onMessageProcessingFailed(inboundMessage);
         } finally {
             acknowledgeMessage(inboundMessage);
-            if (messageHandlerObserver != null) {
-                messageHandlerObserver.onMessageProcessingAcknowledged(inboundMessage);
-            }
+            messageHandlerObserver.onMessageProcessingAcknowledged(inboundMessage);
         }
     }