From b5680b35b95a7325e10346694994f10a13f5b836 Mon Sep 17 00:00:00 2001
From: cezary-witkowski <cezary.witkowski@hyland.com>
Date: Fri, 25 Jul 2025 15:03:48 +0200
Subject: [PATCH] [ACS-9839] Additional logging (#1124)

* [ACS-9839] Additional logging

* [ACS-9839] Now its as clear as it can be
---
 .../transformer/messaging/MessagingInfo.java  | 22 ++++++++++++++++++-
 .../src/main/resources/application.yaml       |  1 +
 .../base/messaging/MessagingInfo.java         | 22 ++++++++++++++++++-
 .../base/src/main/resources/application.yaml  |  1 +
 4 files changed, 44 insertions(+), 2 deletions(-)

diff --git a/deprecated/alfresco-transformer-base/src/main/java/org/alfresco/transformer/messaging/MessagingInfo.java b/deprecated/alfresco-transformer-base/src/main/java/org/alfresco/transformer/messaging/MessagingInfo.java
index c625589d..4498bbe2 100644
--- a/deprecated/alfresco-transformer-base/src/main/java/org/alfresco/transformer/messaging/MessagingInfo.java
+++ b/deprecated/alfresco-transformer-base/src/main/java/org/alfresco/transformer/messaging/MessagingInfo.java
@@ -49,6 +49,12 @@ public class MessagingInfo
     @Value("${activemq.url:}")
     private String activemqUrl;
 
+    @Value("${spring.activemq.broker-url}")
+    private String activemqBrokerUrl;
+
+    @Value("${activemq.url.params}")
+    private String activemqUrlParams;
+
     @PostConstruct
     public void init()
     {
@@ -59,7 +65,7 @@ public class MessagingInfo
         // If this needs to be fully overridden then it would require explicitly setting both "spring.activemq.broker-url"
         // *and* "activemq.url" (latter to non-false value). ACTIVEMQ_URL_PARAMS value will be ignored in that case.
 
-        if ((activemqUrl != null) && (!activemqUrl.equals("false")))
+        if (isSet(activemqUrl))
         {
             logger.info("JMS client is ENABLED - ACTIVEMQ_URL ='{}'", activemqUrl);
         }
@@ -67,5 +73,19 @@ public class MessagingInfo
         {
             logger.info("JMS client is DISABLED - ACTIVEMQ_URL is not set");
         }
+        if (isSet(activemqUrlParams))
+        {
+            logger.info("ACTIVEMQ_URL_PARAMS ='{}'", activemqUrlParams);
+        }
+        else
+        {
+            logger.info("ACTIVEMQ_URL_PARAMS is not set");
+        }
+        logger.info("spring.activemq.broker-url='{}'", activemqBrokerUrl);
+    }
+
+    private boolean isSet(String value)
+    {
+        return !"false".equals(value);
     }
 }
diff --git a/deprecated/alfresco-transformer-base/src/main/resources/application.yaml b/deprecated/alfresco-transformer-base/src/main/resources/application.yaml
index 0fbc18f4..45ab6d42 100644
--- a/deprecated/alfresco-transformer-base/src/main/resources/application.yaml
+++ b/deprecated/alfresco-transformer-base/src/main/resources/application.yaml
@@ -16,6 +16,7 @@ spring:
 
 activemq:
   url: ${ACTIVEMQ_URL:false}
+  url.params: ${ACTIVEMQ_URL_PARAMS:false}
 
 server:
   port: ${SERVER_PORT:8090}
diff --git a/engines/base/src/main/java/org/alfresco/transform/base/messaging/MessagingInfo.java b/engines/base/src/main/java/org/alfresco/transform/base/messaging/MessagingInfo.java
index f445aeef..21ff5657 100644
--- a/engines/base/src/main/java/org/alfresco/transform/base/messaging/MessagingInfo.java
+++ b/engines/base/src/main/java/org/alfresco/transform/base/messaging/MessagingInfo.java
@@ -46,6 +46,12 @@ public class MessagingInfo
     @Value("${activemq.url:}")
     private String activemqUrl;
 
+    @Value("${spring.activemq.broker-url}")
+    private String activemqBrokerUrl;
+
+    @Value("${activemq.url.params}")
+    private String activemqUrlParams;
+
     @PostConstruct
     public void init()
     {
@@ -56,7 +62,7 @@ public class MessagingInfo
         // If this needs to be fully overridden then it would require explicitly setting both "spring.activemq.broker-url"
         // *and* "activemq.url" (latter to non-false value). ACTIVEMQ_URL_PARAMS value will be ignored in that case.
 
-        if ((activemqUrl != null) && (!activemqUrl.equals("false")))
+        if (isSet(activemqUrl))
         {
             logger.info("JMS client is ENABLED - ACTIVEMQ_URL ='{}'", activemqUrl);
         }
@@ -64,5 +70,19 @@ public class MessagingInfo
         {
             logger.info("JMS client is DISABLED - ACTIVEMQ_URL is not set");
         }
+        if (isSet(activemqUrlParams))
+        {
+            logger.info("ACTIVEMQ_URL_PARAMS ='{}'", activemqUrlParams);
+        }
+        else
+        {
+            logger.info("ACTIVEMQ_URL_PARAMS is not set");
+        }
+        logger.info("spring.activemq.broker-url='{}'", activemqBrokerUrl);
+    }
+
+    private boolean isSet(String value)
+    {
+        return !"false".equals(value);
     }
 }
diff --git a/engines/base/src/main/resources/application.yaml b/engines/base/src/main/resources/application.yaml
index d08eb436..95a45302 100644
--- a/engines/base/src/main/resources/application.yaml
+++ b/engines/base/src/main/resources/application.yaml
@@ -16,6 +16,7 @@ spring:
 
 activemq:
   url: ${ACTIVEMQ_URL:false}
+  url.params: ${ACTIVEMQ_URL_PARAMS:false}
 
 server:
   port: ${SERVER_PORT:8090}