AAI events are not being published

- create e2e test case for notification sending
- fix notification sending
- disable tests since they can only be active with some larger refactoring

Issue-ID: AAI-3988
Change-Id: I498b3b02218d81821dd17c3d8ad0da4de859924b
Signed-off-by: Fiete Ostkamp <Fiete.Ostkamp@telekom.de>

1 files changed, 36 insertions, 20 deletions

diff --git a/aai-core/src/main/java/org/onap/aai/kafka/AAIKafkaEventJMSProducer.java b/aai-core/src/main/java/org/onap/aai/kafka/AAIKafkaEventJMSProducer.java
index 4e948772..1ed35424 100644
--- a/aai-core/src/main/java/org/onap/aai/kafka/AAIKafkaEventJMSProducer.java
+++ b/aai-core/src/main/java/org/onap/aai/kafka/AAIKafkaEventJMSProducer.java
@@ -20,29 +20,45 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.aai.kafka;
+ package org.onap.aai.kafka;
 
-import org.json.JSONObject;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.jms.core.JmsTemplate;
-import org.springframework.stereotype.Service;
+ import org.json.JSONObject;
+ import org.onap.aai.config.SpringContextAware;
+ import org.onap.aai.domain.notificationEvent.NotificationEvent;
+ import org.onap.aai.util.AAIConfig;
+ import org.springframework.jms.core.JmsTemplate;
+ import org.springframework.stereotype.Service;
 
-import lombok.RequiredArgsConstructor;
+ import com.fasterxml.jackson.core.JsonProcessingException;
+ import com.fasterxml.jackson.databind.ObjectMapper;
+ import com.fasterxml.jackson.databind.json.JsonMapper;
 
-@Service
-@RequiredArgsConstructor
-public class AAIKafkaEventJMSProducer implements MessageProducer {
+ import lombok.RequiredArgsConstructor;
+ import lombok.extern.slf4j.Slf4j;
 
-    @Value("${aai.events.enabled:true}") private boolean eventsEnabled;
-    private final JmsTemplate jmsTemplate;
+ @Slf4j
+ @Service
+ @RequiredArgsConstructor
+ public class AAIKafkaEventJMSProducer implements MessageProducer {
 
-    public void sendMessageToDefaultDestination(String msg) {
-        if (eventsEnabled) {
-            jmsTemplate.convertAndSend(msg);
-        }
-    }
+     private boolean eventsEnabled = "true".equals(AAIConfig.get("aai.jms.enable", "true"));
+     private JmsTemplate jmsTemplate;
+     private static final ObjectMapper mapper = new JsonMapper();
 
-    public void sendMessageToDefaultDestination(JSONObject finalJson) {
-        sendMessageToDefaultDestination(finalJson.toString());
-    }
-}
+     public AAIKafkaEventJMSProducer(JmsTemplate jmsTemplate) {
+         this.jmsTemplate = jmsTemplate;
+     }
+
+     public void sendMessageToDefaultDestination(String msg) {
+         if (eventsEnabled) {
+             if(jmsTemplate == null) {
+                 this.jmsTemplate = SpringContextAware.getBean(JmsTemplate.class);
+             }
+             jmsTemplate.convertAndSend(msg);
+         }
+     }
+
+     public void sendMessageToDefaultDestination(JSONObject finalJson) {
+         sendMessageToDefaultDestination(finalJson.toString());
+     }
+ }