Merge "DMAAP Improvements"

3 files changed, 103 insertions, 91 deletions

diff --git a/a1-policy-management/src/test/java/org/onap/ccsdk/oran/a1policymanagementservice/clients/SdncOscA1ClientTest.java b/a1-policy-management/src/test/java/org/onap/ccsdk/oran/a1policymanagementservice/clients/SdncOscA1ClientTest.java
index 08e99847..1e9695c7 100644
--- a/a1-policy-management/src/test/java/org/onap/ccsdk/oran/a1policymanagementservice/clients/SdncOscA1ClientTest.java
+++ b/a1-policy-management/src/test/java/org/onap/ccsdk/oran/a1policymanagementservice/clients/SdncOscA1ClientTest.java
@@ -20,7 +20,6 @@
 
 package org.onap.ccsdk.oran.a1policymanagementservice.clients;
 
-import static org.junit.Assert.fail;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.mockito.ArgumentMatchers.anyString;
diff --git a/a1-policy-management/src/test/java/org/onap/ccsdk/oran/a1policymanagementservice/dmaap/DmaapMessageConsumerTest.java b/a1-policy-management/src/test/java/org/onap/ccsdk/oran/a1policymanagementservice/dmaap/DmaapMessageConsumerTest.java
index cc9efa07..2bd8c7f4 100644
--- a/a1-policy-management/src/test/java/org/onap/ccsdk/oran/a1policymanagementservice/dmaap/DmaapMessageConsumerTest.java
+++ b/a1-policy-management/src/test/java/org/onap/ccsdk/oran/a1policymanagementservice/dmaap/DmaapMessageConsumerTest.java
@@ -22,6 +22,9 @@ package org.onap.ccsdk.oran.a1policymanagementservice.dmaap;
 
 import static ch.qos.logback.classic.Level.WARN;
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.doNothing;
 import static org.mockito.Mockito.doReturn;
@@ -34,8 +37,13 @@ import static org.mockito.Mockito.when;
 import ch.qos.logback.classic.spi.ILoggingEvent;
 import ch.qos.logback.core.read.ListAppender;
 
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import com.google.gson.JsonObject;
+
 import java.time.Duration;
 import java.util.LinkedList;
+import java.util.List;
 
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Test;
@@ -46,6 +54,8 @@ import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
 import org.onap.ccsdk.oran.a1policymanagementservice.clients.AsyncRestClient;
 import org.onap.ccsdk.oran.a1policymanagementservice.configuration.ApplicationConfig;
+import org.onap.ccsdk.oran.a1policymanagementservice.dmaap.DmaapRequestMessage.Operation;
+import org.onap.ccsdk.oran.a1policymanagementservice.exceptions.ServiceException;
 import org.onap.ccsdk.oran.a1policymanagementservice.utils.LoggingUtils;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -62,6 +72,8 @@ class DmaapMessageConsumerTest {
 
     private DmaapMessageConsumer messageConsumerUnderTest;
 
+    private Gson gson = new GsonBuilder().create();
+
     @AfterEach
     void resetLogging() {
         LoggingUtils.getLogListAppender(DmaapMessageConsumer.class);
@@ -147,17 +159,7 @@ class DmaapMessageConsumerTest {
         setUpMrConfig();
         messageConsumerUnderTest = spy(new DmaapMessageConsumer(applicationConfigMock));
 
-        String message = "{\"apiVersion\":\"1.0\"," //
-            + "\"operation\":\"GET\"," //
-            + "\"correlationId\":\"1592341013115594000\"," //
-            + "\"originatorId\":\"849e6c6b420\"," //
-            + "\"payload\":{}," //
-            + "\"requestId\":\"23343221\", " //
-            + "\"target\":\"policy-management-service\"," //
-            + "\"timestamp\":\"2020-06-16 20:56:53.115665\"," //
-            + "\"type\":\"request\"," //
-            + "\"url\":\"/rics\"}";
-        String messages = "[" + message + "]";
+        String messages = jsonArray(gson.toJson(dmaapRequestMessage(Operation.PUT)));
 
         doReturn(false, true).when(messageConsumerUnderTest).isStopped();
         doReturn(messageRouterConsumerMock).when(messageConsumerUnderTest).getMessageRouterConsumer();
@@ -169,37 +171,84 @@ class DmaapMessageConsumerTest {
 
         messageConsumerUnderTest.start().join();
 
-        ArgumentCaptor<String> captor = ArgumentCaptor.forClass(String.class);
+        ArgumentCaptor<DmaapRequestMessage> captor = ArgumentCaptor.forClass(DmaapRequestMessage.class);
         verify(messageHandlerMock).handleDmaapMsg(captor.capture());
-        String messageAfterJsonParsing = captor.getValue();
-        assertThat(messageAfterJsonParsing).contains("apiVersion");
+        DmaapRequestMessage messageAfterJsonParsing = captor.getValue();
+        assertThat(messageAfterJsonParsing.apiVersion()).isNotEmpty();
 
         verifyNoMoreInteractions(messageHandlerMock);
     }
 
     @Test
-    void dmaapConfiguredAndOneMessage_thenPollOnceAndProcessMessage2() throws Exception {
-        // The message from MR is here an array of String (which is the case when the MR
-        // simulator is used)
-        setUpMrConfig();
-        messageConsumerUnderTest = spy(new DmaapMessageConsumer(applicationConfigMock));
-
-        doReturn(false, true).when(messageConsumerUnderTest).isStopped();
-        doReturn(messageRouterConsumerMock).when(messageConsumerUnderTest).getMessageRouterConsumer();
+    void testMessageParsing() throws ServiceException {
+        messageConsumerUnderTest = new DmaapMessageConsumer(applicationConfigMock);
+        String json = gson.toJson(dmaapRequestMessage(Operation.PUT));
+        {
+            String jsonArrayOfObject = jsonArray(json);
+            List<DmaapRequestMessage> parsedMessage = messageConsumerUnderTest.parseMessages(jsonArrayOfObject);
+            assertNotNull(parsedMessage);
+            assertTrue(parsedMessage.get(0).payload().isPresent());
+        }
+        {
+            String jsonArrayOfString = jsonArray(quote(json));
+            List<DmaapRequestMessage> parsedMessage = messageConsumerUnderTest.parseMessages(jsonArrayOfString);
+            assertNotNull(parsedMessage);
+            assertTrue(parsedMessage.get(0).payload().isPresent());
+        }
 
-        Mono<ResponseEntity<String>> response = Mono.just(new ResponseEntity<>("[\"aMessage\"]", HttpStatus.OK));
-        when(messageRouterConsumerMock.getForEntity(any())).thenReturn(response);
+    }
 
+    @Test
+    void incomingUnparsableRequest_thenSendResponse() throws Exception {
+        messageConsumerUnderTest = spy(new DmaapMessageConsumer(applicationConfigMock));
         doReturn(messageHandlerMock).when(messageConsumerUnderTest).getDmaapMessageHandler();
+        doReturn(Mono.just("OK")).when(messageHandlerMock).sendDmaapResponse(any(), any(), any());
+        Exception actualException =
+            assertThrows(ServiceException.class, () -> messageConsumerUnderTest.parseMessages("[\"abc:\"def\"]"));
+        assertThat(actualException.getMessage())
+            .contains("Could not parse incomming request. Reason :com.google.gson.stream.MalformedJsonException");
 
-        messageConsumerUnderTest.start().join();
+        verify(messageHandlerMock).sendDmaapResponse(any(), any(), any());
+    }
 
-        verify(messageHandlerMock).handleDmaapMsg("aMessage");
-        verifyNoMoreInteractions(messageHandlerMock);
+    @Test
+    void incomingUnparsableRequest_thenSendingResponseFailed() throws Exception {
+        messageConsumerUnderTest = spy(new DmaapMessageConsumer(applicationConfigMock));
+        doReturn(messageHandlerMock).when(messageConsumerUnderTest).getDmaapMessageHandler();
+        doReturn(Mono.error(new Exception("Sending response failed"))).when(messageHandlerMock).sendDmaapResponse(any(),
+            any(), any());
+        Exception actualException =
+            assertThrows(Exception.class, () -> messageConsumerUnderTest.parseMessages("[\"abc:\"def\"]"));
+        assertThat(actualException.getMessage()).contains("Sending response failed");
+
+        verify(messageHandlerMock).sendDmaapResponse(any(), any(), any());
     }
 
     private void setUpMrConfig() {
         when(applicationConfigMock.getDmaapConsumerTopicUrl()).thenReturn("url");
         when(applicationConfigMock.getDmaapProducerTopicUrl()).thenReturn("url");
     }
+
+    private String jsonArray(String s) {
+        return "[" + s + "]";
+    }
+
+    private String quote(String s) {
+        return "\"" + s.replace("\"", "\\\"") + "\"";
+    }
+
+    private DmaapRequestMessage dmaapRequestMessage(Operation operation) {
+        return ImmutableDmaapRequestMessage.builder() //
+            .apiVersion("apiVersion") //
+            .correlationId("correlationId") //
+            .operation(operation) //
+            .originatorId("originatorId") //
+            .payload(new JsonObject()) //
+            .requestId("requestId") //
+            .target("target") //
+            .timestamp("timestamp") //
+            .url("URL") //
+            .build();
+    }
+
 }
diff --git a/a1-policy-management/src/test/java/org/onap/ccsdk/oran/a1policymanagementservice/dmaap/DmaapMessageHandlerTest.java b/a1-policy-management/src/test/java/org/onap/ccsdk/oran/a1policymanagementservice/dmaap/DmaapMessageHandlerTest.java
index 2405e46c..3656ec1a 100644
--- a/a1-policy-management/src/test/java/org/onap/ccsdk/oran/a1policymanagementservice/dmaap/DmaapMessageHandlerTest.java
+++ b/a1-policy-management/src/test/java/org/onap/ccsdk/oran/a1policymanagementservice/dmaap/DmaapMessageHandlerTest.java
@@ -22,9 +22,6 @@ package org.onap.ccsdk.oran.a1policymanagementservice.dmaap;
 
 import static ch.qos.logback.classic.Level.WARN;
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
@@ -66,19 +63,18 @@ class DmaapMessageHandlerTest {
     private final AsyncRestClient dmaapClient = mock(AsyncRestClient.class);
     private final AsyncRestClient pmsClient = mock(AsyncRestClient.class);
     private DmaapMessageHandler testedObject;
-    private static Gson gson = new GsonBuilder() //
-        .create(); //
+    private Gson gson = new GsonBuilder().create(); //
 
     @BeforeEach
     private void setUp() throws Exception {
         testedObject = spy(new DmaapMessageHandler(dmaapClient, pmsClient));
     }
 
-    static JsonObject payloadAsJson() {
+    JsonObject payloadAsJson() {
         return gson.fromJson(payloadAsString(), JsonObject.class);
     }
 
-    static String payloadAsString() {
+    String payloadAsString() {
         return "{\"param\":\"value\"}";
     }
 
@@ -99,10 +95,6 @@ class DmaapMessageHandlerTest {
             .build();
     }
 
-    private String dmaapInputMessage(Operation operation) {
-        return gson.toJson(dmaapRequestMessage(operation));
-    }
-
     private Mono<ResponseEntity<String>> okResponse() {
         ResponseEntity<String> entity = new ResponseEntity<>("OK", HttpStatus.OK);
         return Mono.just(entity);
@@ -114,39 +106,11 @@ class DmaapMessageHandlerTest {
     }
 
     @Test
-    void testMessageParsing() {
-        String message = dmaapInputMessage(Operation.DELETE);
-        logger.info(message);
-        DmaapRequestMessage parsedMessage = gson.fromJson(message, ImmutableDmaapRequestMessage.class);
-        assertNotNull(parsedMessage);
-        assertFalse(parsedMessage.payload().isPresent());
-
-        message = dmaapInputMessage(Operation.PUT);
-        logger.info(message);
-        parsedMessage = gson.fromJson(message, ImmutableDmaapRequestMessage.class);
-        assertNotNull(parsedMessage);
-        assertTrue(parsedMessage.payload().isPresent());
-    }
-
-    @Test
-    void unparseableMessage_thenWarning() {
-        final ListAppender<ILoggingEvent> logAppender =
-            LoggingUtils.getLogListAppender(DmaapMessageHandler.class, WARN);
-
-        String msg = "bad message";
-        testedObject.handleDmaapMsg(msg);
-
-        assertThat(logAppender.list.get(0).getFormattedMessage()).startsWith(
-            "handleDmaapMsg failure org.onap.ccsdk.oran.a1policymanagementservice.exceptions.ServiceException: Received unparsable "
-                + "message from DMAAP: \"" + msg + "\", reason: ");
-    }
-
-    @Test
     void successfulDelete() throws IOException {
         doReturn(okResponse()).when(pmsClient).deleteForEntity(anyString());
         doReturn(Mono.just("OK")).when(dmaapClient).post(anyString(), anyString());
 
-        String message = dmaapInputMessage(Operation.DELETE);
+        DmaapRequestMessage message = dmaapRequestMessage(Operation.DELETE);
 
         StepVerifier //
             .create(testedObject.createTask(message)) //
@@ -167,8 +131,9 @@ class DmaapMessageHandlerTest {
         doReturn(okResponse()).when(pmsClient).getForEntity(anyString());
         doReturn(Mono.just("OK")).when(dmaapClient).post(anyString(), anyString());
 
+        DmaapRequestMessage message = dmaapRequestMessage(Operation.GET);
         StepVerifier //
-            .create(testedObject.createTask(dmaapInputMessage(Operation.GET))) //
+            .create(testedObject.createTask(message)) //
             .expectSubscription() //
             .expectNext("OK") //
             .verifyComplete(); //
@@ -188,8 +153,9 @@ class DmaapMessageHandlerTest {
         doReturn(Mono.error(webClientResponseException)).when(pmsClient).getForEntity(anyString());
         doReturn(Mono.just("OK")).when(dmaapClient).post(anyString(), anyString());
 
+        DmaapRequestMessage message = dmaapRequestMessage(Operation.GET);
         StepVerifier //
-            .create(testedObject.createTask(dmaapInputMessage(Operation.GET))) //
+            .create(testedObject.createTask(message)) //
             .expectSubscription() //
             .verifyComplete(); //
 
@@ -205,8 +171,9 @@ class DmaapMessageHandlerTest {
         doReturn(okResponse()).when(pmsClient).putForEntity(anyString(), anyString());
         doReturn(Mono.just("OK")).when(dmaapClient).post(anyString(), anyString());
 
+        DmaapRequestMessage message = dmaapRequestMessage(Operation.PUT);
         StepVerifier //
-            .create(testedObject.createTask(dmaapInputMessage(Operation.PUT))) //
+            .create(testedObject.createTask(message)) //
             .expectSubscription() //
             .expectNext("OK") //
             .verifyComplete(); //
@@ -223,8 +190,9 @@ class DmaapMessageHandlerTest {
         doReturn(okResponse()).when(pmsClient).postForEntity(anyString(), anyString());
         doReturn(Mono.just("OK")).when(dmaapClient).post(anyString(), anyString());
 
+        DmaapRequestMessage message = dmaapRequestMessage(Operation.POST);
         StepVerifier //
-            .create(testedObject.createTask(dmaapInputMessage(Operation.POST))) //
+            .create(testedObject.createTask(message)) //
             .expectSubscription() //
             .expectNext("OK") //
             .verifyComplete(); //
@@ -237,12 +205,13 @@ class DmaapMessageHandlerTest {
     }
 
     @Test
-    void exceptionWhenCallingPms_thenNotFoundResponse() throws IOException {
+    void exceptionWhenCallingPms_thenErrorResponse() throws IOException {
 
         doReturn(notOkResponse()).when(pmsClient).putForEntity(anyString(), anyString());
         doReturn(Mono.just("OK")).when(dmaapClient).post(anyString(), anyString());
 
-        testedObject.createTask(dmaapInputMessage(Operation.PUT)).block();
+        DmaapRequestMessage message = dmaapRequestMessage(Operation.PUT);
+        testedObject.createTask(message).block();
 
         verify(pmsClient).putForEntity(anyString(), anyString());
         verifyNoMoreInteractions(pmsClient);
@@ -257,24 +226,18 @@ class DmaapMessageHandlerTest {
     }
 
     @Test
-    void unsupportedOperationInMessage_thenNotFoundResponseWithNotImplementedOperation() throws Exception {
-        String message = dmaapInputMessage(Operation.PUT).toString();
-        String badOperation = "BAD";
-        message = message.replace(Operation.PUT.toString(), badOperation);
-
-        testedObject.handleDmaapMsg(message);
-
-        ArgumentCaptor<String> captor = ArgumentCaptor.forClass(String.class);
-        verify(dmaapClient).post(anyString(), captor.capture());
-        String actualMessage = captor.getValue();
-        assertThat(actualMessage).contains("Not implemented operation") //
-            .contains("BAD_REQUEST");
-    }
-
-    @Test
     void putWithoutPayload_thenNotFoundResponseWithWarning() throws Exception {
-        String message = dmaapInputMessage(Operation.PUT).toString();
-        message = message.replace("payload", "junk");
+        DmaapRequestMessage message = ImmutableDmaapRequestMessage.builder() //
+            .apiVersion("apiVersion") //
+            .correlationId("correlationId") //
+            .operation(DmaapRequestMessage.Operation.PUT) //
+            .originatorId("originatorId") //
+            .payload(Optional.empty()) //
+            .requestId("requestId") //
+            .target("target") //
+            .timestamp("timestamp") //
+            .url(URL) //
+            .build();
 
         final ListAppender<ILoggingEvent> logAppender =
             LoggingUtils.getLogListAppender(DmaapMessageHandler.class, WARN);
@@ -284,4 +247,5 @@ class DmaapMessageHandlerTest {
         assertThat(logAppender.list.get(0).getFormattedMessage())
             .startsWith("Expected payload in message from DMAAP: ");
     }
+
 }