From 8b3e451b44a4226ebdb0ebd0190f4b33c5746d01 Mon Sep 17 00:00:00 2001
From: "Cezar.Leahu" <cezar.leahu@ness.com>
Date: Tue, 9 Jul 2019 01:43:10 +0300
Subject: [PATCH] ATS-467 : Disable JMS Config beans on missing "activemq.url"
 property

---
 .../transformer/messaging/MessagingConfig.java        |  6 ++++++
 .../src/main/resources/application.yaml               | 11 ++++++-----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/alfresco-transformer-base/src/main/java/org/alfresco/transformer/messaging/MessagingConfig.java b/alfresco-transformer-base/src/main/java/org/alfresco/transformer/messaging/MessagingConfig.java
index 437b349d..ce5d7568 100644
--- a/alfresco-transformer-base/src/main/java/org/alfresco/transformer/messaging/MessagingConfig.java
+++ b/alfresco-transformer-base/src/main/java/org/alfresco/transformer/messaging/MessagingConfig.java
@@ -34,6 +34,7 @@ import org.apache.activemq.command.ActiveMQQueue;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.jms.annotation.JmsListenerConfigurer;
@@ -52,6 +53,7 @@ import org.springframework.transaction.PlatformTransactionManager;
  * created on 18/12/2018
  */
 @Configuration
+@ConditionalOnProperty(name = "activemq.url")
 public class MessagingConfig implements JmsListenerConfigurer
 {
     private static final Logger logger = LoggerFactory.getLogger(MessagingConfig.class);
@@ -63,6 +65,7 @@ public class MessagingConfig implements JmsListenerConfigurer
     }
 
     @Bean
+    @ConditionalOnProperty(name = "activemq.url")
     public DefaultMessageHandlerMethodFactory methodFactory()
     {
         DefaultMessageHandlerMethodFactory factory = new DefaultMessageHandlerMethodFactory();
@@ -71,6 +74,7 @@ public class MessagingConfig implements JmsListenerConfigurer
     }
 
     @Bean
+    @ConditionalOnProperty(name = "activemq.url")
     public DefaultJmsListenerContainerFactory jmsListenerContainerFactory(
         final ConnectionFactory connectionFactory,
         final TransformMessageConverter transformMessageConverter)
@@ -84,6 +88,7 @@ public class MessagingConfig implements JmsListenerConfigurer
     }
 
     @Bean
+    @ConditionalOnProperty(name = "activemq.url")
     public PlatformTransactionManager transactionManager(final ConnectionFactory connectionFactory)
     {
         final JmsTransactionManager transactionManager = new JmsTransactionManager();
@@ -92,6 +97,7 @@ public class MessagingConfig implements JmsListenerConfigurer
     }
 
     @Bean
+    @ConditionalOnProperty(name = "activemq.url")
     public Queue engineRequestQueue(@Value("${queue.engineRequestQueue}") String engineRequestQueueValue)
     {
         return new ActiveMQQueue(engineRequestQueueValue);
diff --git a/alfresco-transformer-base/src/main/resources/application.yaml b/alfresco-transformer-base/src/main/resources/application.yaml
index 8bc4f767..d18bf043 100644
--- a/alfresco-transformer-base/src/main/resources/application.yaml
+++ b/alfresco-transformer-base/src/main/resources/application.yaml
@@ -1,3 +1,4 @@
+---
 spring:
   servlet:
     multipart:
@@ -18,7 +19,7 @@ server:
 
 logging:
   level:
-    #org.alfresco.util.exec.RuntimeExec: debug
+    # org.alfresco.util.exec.RuntimeExec: debug
     org.alfresco.transformer.LibreOfficeController: debug
     org.alfresco.transformer.JodConverterSharedInstance: debug
     org.alfresco.transformer.AlfrescoPdfRendererController: debug
@@ -36,9 +37,9 @@ management:
     web:
       exposure:
         include:
-        - metrics
-        - prometheus
-        - health
+          - metrics
+          - prometheus
+          - health
   metrics:
     enable[http]: false
     enable[logback]: false
@@ -46,4 +47,4 @@ management:
     enable[jvm.classes]: false
 
 container:
-  name: ${HOSTNAME:t-engine}
\ No newline at end of file
+  name: ${HOSTNAME:t-engine}