Remove DMaaP dependency from AAI-Common

- Remove Dmaap dependency in AAI-Common and replace it with Kafka.

Issue-ID: AAI-3792
Change-Id: If3fd5c3bdc2448f7e260a26000b02a510c80d7fb
Signed-off-by: Singh <soumya.e.singh@accenture.com>

5 files changed, 234 insertions, 17 deletions

diff --git a/aai-core/src/test/java/org/onap/aai/kafka/AAIKafkaEventJMSConsumerTest.java b/aai-core/src/test/java/org/onap/aai/kafka/AAIKafkaEventJMSConsumerTest.java
new file mode 100644
index 00000000..c72499c4
--- /dev/null
+++ b/aai-core/src/test/java/org/onap/aai/kafka/AAIKafkaEventJMSConsumerTest.java
@@ -0,0 +1,89 @@
+package org.onap.aai.kafka;
+
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import javax.jms.TextMessage;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnitRunner;
+import org.onap.aai.PayloadUtil;
+import org.springframework.core.env.Environment;
+import org.springframework.kafka.core.KafkaTemplate;
+import org.springframework.kafka.test.context.EmbeddedKafka;
+import org.springframework.test.util.ReflectionTestUtils;
+
+@RunWith(MockitoJUnitRunner.class)
+@EmbeddedKafka(partitions = 1, brokerProperties = { "listeners=PLAINTEXT://localhost:9092", "port=9092" })
+public class AAIKafkaEventJMSConsumerTest {
+
+    @Mock
+    private Environment environment;
+
+    @Mock
+    private KafkaTemplate<String,String> kafkaTemplate;
+
+    private AAIKafkaEventJMSConsumer aaiKafkaEventJMSConsumer;
+
+    @Before
+    public void setUp(){
+        aaiKafkaEventJMSConsumer = new AAIKafkaEventJMSConsumer(environment,kafkaTemplate);
+    }
+
+    @Test
+    public void onMessage_shouldSendMessageToKafkaTopic_whenAAIEventReceived()
+    throws Exception
+    {
+        TextMessage mockTextMessage = mock(TextMessage.class);
+        String payload = PayloadUtil.getResourcePayload("aai-event.json");
+
+        when(mockTextMessage.getText()).thenReturn(payload);
+        aaiKafkaEventJMSConsumer.onMessage(mockTextMessage);
+        verify(kafkaTemplate, times(1)).send(eq("AAI-EVENT"), anyString());
+    }
+
+    @Test
+    public void onMessage_shouldNotSendMessageToKafkaTopic_whenInvalidEventReceived() throws Exception{
+        TextMessage mockTextMessage = mock(TextMessage.class);
+        String payload = PayloadUtil.getResourcePayload("aai-invalid-event.json");
+        when(mockTextMessage.getText()).thenReturn(payload);
+        aaiKafkaEventJMSConsumer.onMessage(mockTextMessage);
+    }
+
+
+    @Test
+    public void onMessage_shouldHandleJSONException() throws Exception {
+        // Arrange
+        AAIKafkaEventJMSConsumer consumer = new AAIKafkaEventJMSConsumer(null, kafkaTemplate);
+        TextMessage mockTextMessage = mock(TextMessage.class);
+        ReflectionTestUtils.setField(consumer, "kafkaTemplate", null); // Simulate null kafkaTemplate
+
+        // Act
+        consumer.onMessage(mockTextMessage);
+
+        // Assert
+        // Verify that exception is logged
+    }
+
+    @Test
+    public void onMessage_shouldHandleGenericException() throws Exception {
+        // Arrange
+        AAIKafkaEventJMSConsumer consumer = new AAIKafkaEventJMSConsumer(null, kafkaTemplate);
+        TextMessage mockTextMessage = mock(TextMessage.class);
+        when(mockTextMessage.getText()).thenReturn("{\"event-topic\":\"AAI-EVENT\",\"aaiEventPayload\":{}}"); // Valid JSON but missing required fields
+
+        // Act
+        consumer.onMessage(mockTextMessage);
+
+        // Assert
+        // Verify that exception is logged
+    }
+
+}
diff --git a/aai-core/src/test/java/org/onap/aai/util/StoreNotificationEventTest.java b/aai-core/src/test/java/org/onap/aai/util/StoreNotificationEventTest.java
index b4b8810e..a0c3f639 100644
--- a/aai-core/src/test/java/org/onap/aai/util/StoreNotificationEventTest.java
+++ b/aai-core/src/test/java/org/onap/aai/util/StoreNotificationEventTest.java
@@ -39,27 +39,27 @@ import org.junit.Ignore;
 import org.junit.Test;
 import org.mockito.Mockito;
 import org.onap.aai.AAISetup;
-import org.onap.aai.dmaap.AAIDmaapEventJMSProducer;
 import org.onap.aai.domain.notificationEvent.NotificationEvent.EventHeader;
 import org.onap.aai.exceptions.AAIException;
 import org.onap.aai.introspection.Introspector;
 import org.onap.aai.introspection.Loader;
 import org.onap.aai.introspection.ModelType;
+import org.onap.aai.kafka.AAIKafkaEventJMSProducer;
 
 public class StoreNotificationEventTest extends AAISetup {
 
-    private static AAIDmaapEventJMSProducer producer;
+    private static AAIKafkaEventJMSProducer producer;
     private static StoreNotificationEvent sne;
 
     @BeforeClass
     public static void setUp() {
-        producer = Mockito.mock(AAIDmaapEventJMSProducer.class);
+        producer = Mockito.mock(AAIKafkaEventJMSProducer.class);
         // sne = new StoreNotificationEvent(producer, "transiationId", "sourceOfTruth");
     }
 
     @Before
     public void setUpBefore() {
-        producer = Mockito.mock(AAIDmaapEventJMSProducer.class);
+        producer = Mockito.mock(AAIKafkaEventJMSProducer.class);
         sne = new StoreNotificationEvent(producer, "transiationId", "sourceOfTruth");
 
     }
diff --git a/aai-core/src/test/resources/logback.xml b/aai-core/src/test/resources/logback.xml
index 5d4f7bf3..4c82c0bf 100644
--- a/aai-core/src/test/resources/logback.xml
+++ b/aai-core/src/test/resources/logback.xml
@@ -170,14 +170,14 @@
 		<appender-ref ref="translog" />
 	</appender>
 
-	<appender name="dmaapAAIEventConsumer"
+	<appender name="kafkaAAIEventConsumer"
 		class="ch.qos.logback.core.rolling.RollingFileAppender">
 		<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
 			<level>WARN</level>
 		</filter>
-		<File>${logDirectory}/dmaapAAIEventConsumer/error.log</File>
+		<File>${logDirectory}/kafkaAAIEventConsumer/error.log</File>
 		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-			<fileNamePattern>${logDirectory}/dmaapAAIEventConsumer/error.log.%d{yyyy-MM-dd}
+			<fileNamePattern>${logDirectory}/kafkaAAIEventConsumer/error.log.%d{yyyy-MM-dd}
 			</fileNamePattern>
 		</rollingPolicy>
 		<encoder class="org.onap.aai.logging.EcompEncoder">
@@ -185,32 +185,32 @@
 		</encoder>
 	</appender>
 
-	<appender name="dmaapAAIEventConsumerDebug"
+	<appender name="kafkaAAIEventConsumerDebug"
 		class="ch.qos.logback.core.rolling.RollingFileAppender">
 		<filter class="ch.qos.logback.classic.filter.LevelFilter">
 			<level>DEBUG</level>
 			<onMatch>ACCEPT</onMatch>
 			<onMismatch>DENY</onMismatch>
 		</filter>
-		<File>${logDirectory}/dmaapAAIEventConsumer/debug.log</File>
+		<File>${logDirectory}/kafkaAAIEventConsumer/debug.log</File>
 		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-			<fileNamePattern>${logDirectory}/dmaapAAIEventConsumer/debug.log.%d{yyyy-MM-dd}
+			<fileNamePattern>${logDirectory}/kafkaAAIEventConsumer/debug.log.%d{yyyy-MM-dd}
 			</fileNamePattern>
 		</rollingPolicy>
 		<encoder class="org.onap.aai.logging.EcompEncoder">
 			<pattern>${eelfLogPattern}</pattern>
 		</encoder>
 	</appender>
-	<appender name="dmaapAAIEventConsumerMetric"
+	<appender name="kafkaAAIEventConsumerMetric"
 		class="ch.qos.logback.core.rolling.RollingFileAppender">
 		<filter class="ch.qos.logback.classic.filter.LevelFilter">
 			<level>INFO</level>
 			<onMatch>ACCEPT</onMatch>
 			<onMismatch>DENY</onMismatch>
 		</filter>
-		<File>${logDirectory}/dmaapAAIEventConsumer/metrics.log</File>
+		<File>${logDirectory}/kafkaAAIEventConsumer/metrics.log</File>
 		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-			<fileNamePattern>${logDirectory}/dmaapAAIEventConsumer/metrics.log.%d{yyyy-MM-dd}
+			<fileNamePattern>${logDirectory}/kafkaAAIEventConsumer/metrics.log.%d{yyyy-MM-dd}
 			</fileNamePattern>
 		</rollingPolicy>
 		<encoder class="org.onap.aai.logging.EcompEncoder">
@@ -362,10 +362,10 @@
 		<appender-ref ref="asyncAUDIT"/>
 	</logger>
 
-	<logger name="org.onap.aai.dmaap" level="DEBUG" additivity="false">
-		<appender-ref ref="dmaapAAIEventConsumer" />
-		<appender-ref ref="dmaapAAIEventConsumerDebug" />
-		<appender-ref ref="dmaapAAIEventConsumerMetric" />
+	<logger name="org.onap.aai.kafka" level="DEBUG" additivity="false">
+		<appender-ref ref="kafkaAAIEventConsumer" />
+		<appender-ref ref="kafkaAAIEventConsumerDebug" />
+		<appender-ref ref="kafkaAAIEventConsumerMetric" />
 	</logger>
 
 	<logger name="org.apache" level="WARN" />
diff --git a/aai-core/src/test/resources/payloads/resource/aai-event.json b/aai-core/src/test/resources/payloads/resource/aai-event.json
new file mode 100644
index 00000000..0fab96da
--- /dev/null
+++ b/aai-core/src/test/resources/payloads/resource/aai-event.json
@@ -0,0 +1,64 @@
+{
+    "event-topic": "AAI-EVENT",
+    "aaiEventPayload": {
+        "cambria.partition": "AAI",
+        "event-header": {
+            "severity": "NORMAL",
+            "entity-type": "object-group",
+            "top-entity-type": "object-group",
+            "entity-link": "/aai/v28/common/object-groups/object-group/ric_cluster",
+            "event-type": "AAI-EVENT",
+            "domain": "dev",
+            "action": "UPDATE",
+            "sequence-number": "0",
+            "id": "23f12123-c326-48a7-b57e-e48746c295ea",
+            "source-name": "postman-api",
+            "version": "v28",
+            "timestamp": "20231207-12:14:44:757"
+        },
+        "entity": {
+            "relationship-list": {
+                "relationship": [
+                    {
+                        "related-to": "cell",
+                        "relationship-data": [
+                            {
+                                "relationship-value": "445611193273958916",
+                                "relationship-key": "cell.cell-id"
+                            }
+                        ],
+                        "related-link": "/aai/v28/network/cells/cell/445611193273958916",
+                        "relationship-label": "org.onap.relationships.inventory.MemberOf",
+                        "related-to-property": [
+                            {
+                                "property-key": "cell.cell-name",
+                                "property-value": "MY6885_M-Schwere-Reiter-Str-440460_GU2_84079913"
+                            }
+                        ]
+                    },
+                    {
+                        "related-to": "cell",
+                        "relationship-data": [
+                            {
+                                "relationship-value": "445611193272330241",
+                                "relationship-key": "cell.cell-id"
+                            }
+                        ],
+                        "related-link": "/aai/v28/network/cells/cell/445611193272330241",
+                        "relationship-label": "org.onap.relationships.inventory.MemberOf",
+                        "related-to-property": [
+                            {
+                                "property-key": "cell.cell-name",
+                                "property-value": "MY6885_M-Schwere-Reiter-Str-440460_GTC2_84003803"
+                            }
+                        ]
+                    }
+                ]
+            },
+            "group-name": "Urban",
+            "resource-version": "1701951284582",
+            "group-type": "cell",
+            "object-group-id": "ric_cluster"
+        }
+    }
+}
\ No newline at end of file
diff --git a/aai-core/src/test/resources/payloads/resource/aai-invalid-event.json b/aai-core/src/test/resources/payloads/resource/aai-invalid-event.json
new file mode 100644
index 00000000..77b2fc1f
--- /dev/null
+++ b/aai-core/src/test/resources/payloads/resource/aai-invalid-event.json
@@ -0,0 +1,64 @@
+{
+    "event-topic": "AAI-INVALID-EVENT",
+    "aaiEventPayload": {
+        "cambria.partition": "AAI",
+        "event-header": {
+            "severity": "NORMAL",
+            "entity-type": "object-group",
+            "top-entity-type": "object-group",
+            "entity-link": "/aai/v28/common/object-groups/object-group/ric_cluster",
+            "event-type": "AAI-EVENT",
+            "domain": "dev",
+            "action": "UPDATE",
+            "sequence-number": "0",
+            "id": "23f12123-c326-48a7-b57e-e48746c295ea",
+            "source-name": "postman-api",
+            "version": "v28",
+            "timestamp": "20231207-12:14:44:757"
+        },
+        "entity": {
+            "relationship-list": {
+                "relationship": [
+                    {
+                        "related-to": "cell",
+                        "relationship-data": [
+                            {
+                                "relationship-value": "445611193273958916",
+                                "relationship-key": "cell.cell-id"
+                            }
+                        ],
+                        "related-link": "/aai/v28/network/cells/cell/445611193273958916",
+                        "relationship-label": "org.onap.relationships.inventory.MemberOf",
+                        "related-to-property": [
+                            {
+                                "property-key": "cell.cell-name",
+                                "property-value": "MY6885_M-Schwere-Reiter-Str-440460_GU2_84079913"
+                            }
+                        ]
+                    },
+                    {
+                        "related-to": "cell",
+                        "relationship-data": [
+                            {
+                                "relationship-value": "445611193272330241",
+                                "relationship-key": "cell.cell-id"
+                            }
+                        ],
+                        "related-link": "/aai/v28/network/cells/cell/445611193272330241",
+                        "relationship-label": "org.onap.relationships.inventory.MemberOf",
+                        "related-to-property": [
+                            {
+                                "property-key": "cell.cell-name",
+                                "property-value": "MY6885_M-Schwere-Reiter-Str-440460_GTC2_84003803"
+                            }
+                        ]
+                    }
+                ]
+            },
+            "group-name": "Urban",
+            "resource-version": "1701951284582",
+            "group-type": "cell",
+            "object-group-id": "ric_cluster"
+        }
+    }
+}
\ No newline at end of file