Merge pull request #192 from SolaceProducts/moodiRealist/DATAGO-80317…

…-optional-bean

[DATAGO-80317] fix issues blocking standalone mode from executing.

service/application/src/main/java/com/solace/maas/ep/event/management/agent/processor/CommandLogStreamingProcessor.java

@@ -32,7 +32,7 @@
 
 @Component
 @Slf4j
-@ConditionalOnExpression("${event-portal.gateway.messaging.standalone:false}== false && ${event-portal.managed:false} == false")
+@ConditionalOnExpression("${event-portal.gateway.messaging.standalone:true}== false && ${event-portal.managed:false} == false")
 public class CommandLogStreamingProcessor {
 
     public static final String ANY = "*";

service/application/src/main/java/com/solace/maas/ep/event/management/agent/scanManager/ScanManager.java

@@ -26,6 +26,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
+import java.util.Optional;
 import java.util.Set;
 import java.util.UUID;
 import java.util.stream.Collectors;
@@ -39,16 +40,18 @@ public class ScanManager {
     private final ScanService scanService;
     private final String runtimeAgentId;
     private final String orgId;
-    private final ScanStatusPublisher scanStatusPublisher;
+    // This is an optional dependency since it is not available in standalone mode.
+    // If the bean is not present, the publisher will not be used.
+    private final Optional<ScanStatusPublisher> scanStatusPublisherOpt;
 
     @Autowired
     public ScanManager(MessagingServiceDelegateServiceImpl messagingServiceDelegateService,
                        ScanService scanService,
                        EventPortalProperties eventPortalProperties,
-                       ScanStatusPublisher scanStatusPublisher) {
+                       Optional<ScanStatusPublisher> scanStatusPublisher) {
         this.messagingServiceDelegateService = messagingServiceDelegateService;
         this.scanService = scanService;
-        this.scanStatusPublisher = scanStatusPublisher;
+        this.scanStatusPublisherOpt = scanStatusPublisher;
         runtimeAgentId = eventPortalProperties.getRuntimeAgentId();
         orgId = eventPortalProperties.getOrganizationId();
     }
@@ -116,6 +119,11 @@ public String scan(ScanRequestBO scanRequestBO) {
 
     public void handleError(Exception e, ScanCommandMessage message){
 
+        if( scanStatusPublisherOpt.isEmpty()){
+            return;
+        }
+        ScanStatusPublisher scanStatusPublisher = scanStatusPublisherOpt.get();
+
         List<String> scanTypeNames = message.getScanTypes().stream().map(ScanType::name).toList();
 
         ScanStatusMessage response = new ScanStatusMessage(

service/application/src/main/java/com/solace/maas/ep/event/management/agent/subscriber/CommandMessageHandler.java

@@ -9,7 +9,7 @@
 
 @Slf4j
 @Component
-@ConditionalOnExpression("${event-portal.gateway.messaging.standalone:false}== false && ${event-portal.managed:false} == false")
+@ConditionalOnExpression("${event-portal.gateway.messaging.standalone:true}== false && ${event-portal.managed:false} == false")
 public class CommandMessageHandler extends SolaceDirectMessageHandler<CommandMessage> {
 
     private final CommandMessageProcessor commandMessageProcessor;

service/application/src/main/java/com/solace/maas/ep/event/management/agent/subscriber/DiscoveryMessageHandler.java

@@ -9,7 +9,7 @@
 
 @Slf4j
 @Component
-@ConditionalOnExpression("${event-portal.gateway.messaging.standalone:false}== false && ${event-portal.managed:false} == false")
+@ConditionalOnExpression("${event-portal.gateway.messaging.standalone:true}== false && ${event-portal.managed:false} == false")
 public class DiscoveryMessageHandler extends SolaceDirectMessageHandler<MOPMessage> {
 
     public DiscoveryMessageHandler(

service/application/src/main/java/com/solace/maas/ep/event/management/agent/subscriber/ScanCommandMessageHandler.java

@@ -10,7 +10,7 @@
 
 @Slf4j
 @Component
-@ConditionalOnExpression("${event-portal.gateway.messaging.standalone:false}== false && ${event-portal.managed:false} == false")
+@ConditionalOnExpression("${event-portal.gateway.messaging.standalone:true}== false && ${event-portal.managed:false} == false")
 public class ScanCommandMessageHandler extends SolaceDirectMessageHandler<ScanCommandMessage> {
 
     private final ScanCommandMessageProcessor scanCommandMessageProcessor;

service/application/src/main/java/com/solace/maas/ep/event/management/agent/subscriber/SolacePersistentMessageHandler.java

@@ -24,7 +24,7 @@
 
 @Slf4j
 @Service
-@ConditionalOnExpression("${event-portal.gateway.messaging.standalone:false}== false && ${event-portal.managed:false} == true")
+@ConditionalOnExpression("${event-portal.gateway.messaging.standalone:true}== false && ${event-portal.managed:false} == true")
 public class SolacePersistentMessageHandler extends BaseSolaceMessageHandler implements MessageReceiver.MessageHandler,
         ApplicationListener<ApplicationReadyEvent> {
     private final Map<String, Class> cachedJSONDecoders = new HashMap();

service/application/src/main/java/com/solace/maas/ep/event/management/agent/subscriber/StartImportScanCommandMessageHandler.java

@@ -19,7 +19,7 @@
 
 @Slf4j
 @Component
-@ConditionalOnExpression("${event-portal.gateway.messaging.standalone:false}== false && ${event-portal.managed:false} == false")
+@ConditionalOnExpression("${event-portal.gateway.messaging.standalone:true}== false && ${event-portal.managed:false} == false")
 public class StartImportScanCommandMessageHandler extends SolaceDirectMessageHandler<ScanDataImportMessage> {
 
     private final ProducerTemplate producerTemplate;

service/application/src/test/java/com/solace/maas/ep/event/management/agent/scanManager/ScanManagerHandleErrorTest.java

@@ -14,7 +14,9 @@
 import org.springframework.test.context.ActiveProfiles;
 
 import java.util.List;
+import java.util.Optional;
 
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
@@ -37,7 +39,7 @@ class ScanManagerHandleErrorTest {
     private ScanStatusPublisher scanStatusPublisher;
 
     @Test
-    void testScanManagerHandleError(){
+    void testScanManagerConnectedHandleError(){
         when(eventPortalProperties.getOrganizationId()).thenReturn("orgId");
         when(eventPortalProperties.getRuntimeAgentId()).thenReturn("runtimeAgentId");
 
@@ -47,13 +49,30 @@ void testScanManagerHandleError(){
                 messagingServiceDelegateService,
                 scanService,
                 eventPortalProperties,
-                scanStatusPublisher
+                Optional.of(scanStatusPublisher)
         );
         scanManagerUnderTest.handleError(mockEx,createScanCommandMessage());
         verify(scanStatusPublisher, times(1)).sendOverallScanStatus(any(),any());
     }
 
+    @Test
+    void testScanManagerStandaloneHandleError(){
+        when(eventPortalProperties.getOrganizationId()).thenReturn("orgId");
+        when(eventPortalProperties.getRuntimeAgentId()).thenReturn("runtimeAgentId");
+
+        RuntimeException mockEx = new RuntimeException("Mock Exception");
+
+        ScanManager scanManagerUnderTest = new ScanManager(
+                messagingServiceDelegateService,
+                scanService,
+                eventPortalProperties,
+                Optional.empty()
+        );
+        // should just do "nothing" and not throw an exception when scanStatusPublisher is not present
+        assertDoesNotThrow(() ->
+            scanManagerUnderTest.handleError(mockEx, createScanCommandMessage()));
 
+    }
 
     private ScanCommandMessage createScanCommandMessage(){
         return new ScanCommandMessage(