From: PatrikBuhr Date: Mon, 2 Mar 2020 11:18:56 +0000 (+0100) Subject: Changed the Dmaap message payload X-Git-Tag: 2.0.0~150^2 X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=72c98f3b7ef556cf3556c398e12078d9b9eb6d1a;p=nonrtric.git Changed the Dmaap message payload The Dmaap message payload is changed from String to a json object. Change-Id: I1e928eca6c7de6105673aa53da09c1271de80764 Issue-ID: NONRTRIC-107 Signed-off-by: PatrikBuhr --- diff --git a/policy-agent/src/main/java/org/oransc/policyagent/dmaap/DmaapMessageHandler.java b/policy-agent/src/main/java/org/oransc/policyagent/dmaap/DmaapMessageHandler.java index 6b4f0f40..b23595a9 100644 --- a/policy-agent/src/main/java/org/oransc/policyagent/dmaap/DmaapMessageHandler.java +++ b/policy-agent/src/main/java/org/oransc/policyagent/dmaap/DmaapMessageHandler.java @@ -22,7 +22,9 @@ package org.oransc.policyagent.dmaap; import com.google.gson.Gson; import com.google.gson.GsonBuilder; + import java.io.IOException; + import org.onap.dmaap.mr.client.MRBatchingPublisher; import org.oransc.policyagent.clients.AsyncRestClient; import org.oransc.policyagent.dmaap.DmaapRequestMessage.Operation; @@ -36,7 +38,6 @@ public class DmaapMessageHandler { private static final Logger logger = LoggerFactory.getLogger(DmaapMessageHandler.class); private static Gson gson = new GsonBuilder() // - .serializeNulls() // .create(); // private final MRBatchingPublisher dmaapClient; @@ -83,15 +84,24 @@ public class DmaapMessageHandler { } else if (operation == Operation.GET) { result = agentClient.get(uri); } else if (operation == Operation.PUT) { - result = agentClient.put(uri, dmaapRequestMessage.payload()); + result = agentClient.put(uri, payload(dmaapRequestMessage)); } else if (operation == Operation.POST) { - result = agentClient.post(uri, dmaapRequestMessage.payload()); + result = agentClient.post(uri, payload(dmaapRequestMessage)); } else { return Mono.error(new Exception("Not implemented operation: " + operation)); } return result; } + private String payload(DmaapRequestMessage message) { + if (message.payload().isPresent()) { + return gson.toJson(message.payload().get()); + } else { + logger.warn("Expected payload in message from DMAAP: {}", message); + return ""; + } + } + private Mono sendDmaapResponse(String response, DmaapRequestMessage dmaapRequestMessage, HttpStatus status) { return getDmaapResponseMessage(dmaapRequestMessage, response, status) // diff --git a/policy-agent/src/main/java/org/oransc/policyagent/dmaap/DmaapRequestMessage.java b/policy-agent/src/main/java/org/oransc/policyagent/dmaap/DmaapRequestMessage.java index d7faa742..7e61b398 100644 --- a/policy-agent/src/main/java/org/oransc/policyagent/dmaap/DmaapRequestMessage.java +++ b/policy-agent/src/main/java/org/oransc/policyagent/dmaap/DmaapRequestMessage.java @@ -20,6 +20,10 @@ package org.oransc.policyagent.dmaap; +import java.util.Optional; + +import com.google.gson.JsonObject; + import org.immutables.gson.Gson; import org.immutables.value.Value; @@ -49,5 +53,5 @@ public interface DmaapRequestMessage { String url(); - String payload(); + Optional payload(); } diff --git a/policy-agent/src/test/java/org/oransc/policyagent/dmaap/DmaapMessageHandlerTest.java b/policy-agent/src/test/java/org/oransc/policyagent/dmaap/DmaapMessageHandlerTest.java index 09dbf92f..6576c699 100644 --- a/policy-agent/src/test/java/org/oransc/policyagent/dmaap/DmaapMessageHandlerTest.java +++ b/policy-agent/src/test/java/org/oransc/policyagent/dmaap/DmaapMessageHandlerTest.java @@ -20,6 +20,9 @@ package org.oransc.policyagent.dmaap; +import static org.junit.Assert.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; @@ -30,16 +33,19 @@ import static org.mockito.Mockito.verifyNoMoreInteractions; import com.google.gson.Gson; import com.google.gson.GsonBuilder; +import com.google.gson.JsonObject; import java.io.IOException; +import java.util.Optional; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.onap.dmaap.mr.client.MRBatchingPublisher; import org.onap.dmaap.mr.client.response.MRPublisherResponse; import org.oransc.policyagent.clients.AsyncRestClient; -import org.oransc.policyagent.configuration.ApplicationConfig; import org.oransc.policyagent.dmaap.DmaapRequestMessage.Operation; +import org.oransc.policyagent.repository.ImmutablePolicyType; +import org.oransc.policyagent.repository.PolicyType; import reactor.core.publisher.Mono; import reactor.test.StepVerifier; @@ -47,14 +53,11 @@ import reactor.test.StepVerifier; public class DmaapMessageHandlerTest { private static final String URL = "url"; - private static final String PAYLOAD = "payload"; - private ApplicationConfig appConfig = mock(ApplicationConfig.class); private final MRBatchingPublisher dmaapClient = mock(MRBatchingPublisher.class); private final AsyncRestClient agentClient = mock(AsyncRestClient.class); private DmaapMessageHandler testedObject; private static Gson gson = new GsonBuilder() // - .serializeNulls() // .create(); // @BeforeEach @@ -62,12 +65,24 @@ public class DmaapMessageHandlerTest { testedObject = spy(new DmaapMessageHandler(dmaapClient, agentClient)); } + static JsonObject payloadAsJson() { + return gson.fromJson(payloadAsString(), JsonObject.class); + } + + static String payloadAsString() { + PolicyType pt = ImmutablePolicyType.builder().name("name").schema("schema").build(); + return gson.toJson(pt); + } + DmaapRequestMessage dmaapRequestMessage(Operation operation) { + Optional payload = + ((operation == Operation.PUT || operation == Operation.POST) ? Optional.of(payloadAsJson()) + : Optional.empty()); return ImmutableDmaapRequestMessage.builder().apiVersion("apiVersion") // .correlationId("correlationId") // .operation(operation) // .originatorId("originatorId") // - .payload(PAYLOAD) // + .payload(payload) // .requestId("requestId") // .target("target") // .timestamp("timestamp") // @@ -80,14 +95,31 @@ public class DmaapMessageHandlerTest { return gson.toJson(dmaapRequestMessage(operation)); } + @Test + public void testMessageParsing() { + String message = dmaapInputMessage(Operation.DELETE); + System.out.println(message); + DmaapRequestMessage parsedMessage = gson.fromJson(message, ImmutableDmaapRequestMessage.class); + assertTrue(parsedMessage != null); + assertFalse(parsedMessage.payload().isPresent()); + + message = dmaapInputMessage(Operation.PUT); + System.out.println(message); + parsedMessage = gson.fromJson(message, ImmutableDmaapRequestMessage.class); + assertTrue(parsedMessage != null); + assertTrue(parsedMessage.payload().isPresent()); + } + @Test public void successfulDelete() throws IOException { doReturn(Mono.just("OK")).when(agentClient).delete(anyString()); doReturn(1).when(dmaapClient).send(anyString()); doReturn(new MRPublisherResponse()).when(dmaapClient).sendBatchWithResponse(); + String message = dmaapInputMessage(Operation.DELETE); + StepVerifier // - .create(testedObject.createTask(dmaapInputMessage(Operation.DELETE))) // + .create(testedObject.createTask(message)) // .expectSubscription() // .expectNext("OK") // .verifyComplete(); // @@ -132,7 +164,7 @@ public class DmaapMessageHandlerTest { .expectNext("OK") // .verifyComplete(); // - verify(agentClient, times(1)).put(URL, PAYLOAD); + verify(agentClient, times(1)).put(URL, payloadAsString()); verifyNoMoreInteractions(agentClient); verify(dmaapClient, times(1)).send(anyString()); @@ -152,7 +184,7 @@ public class DmaapMessageHandlerTest { .expectNext("OK") // .verifyComplete(); // - verify(agentClient, times(1)).post(URL, PAYLOAD); + verify(agentClient, times(1)).post(URL, payloadAsString()); verifyNoMoreInteractions(agentClient); verify(dmaapClient, times(1)).send(anyString()); @@ -162,7 +194,7 @@ public class DmaapMessageHandlerTest { @Test public void errorCase() throws IOException { - doReturn(Mono.error(new Exception("Refused"))).when(agentClient).put(anyString(), anyString()); + doReturn(Mono.error(new Exception("Refused"))).when(agentClient).put(anyString(), any()); doReturn(1).when(dmaapClient).send(anyString()); doReturn(new MRPublisherResponse()).when(dmaapClient).sendBatchWithResponse(); StepVerifier // @@ -170,7 +202,7 @@ public class DmaapMessageHandlerTest { .expectSubscription() // .verifyComplete(); // - verify(agentClient, times(1)).put(URL, PAYLOAD); + verify(agentClient, times(1)).put(anyString(), anyString()); verifyNoMoreInteractions(agentClient); // Error response