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;
private static final Logger logger = LoggerFactory.getLogger(DmaapMessageHandler.class);
private static Gson gson = new GsonBuilder() //
- .serializeNulls() //
.create(); //
private final MRBatchingPublisher dmaapClient;
} 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<String> sendDmaapResponse(String response, DmaapRequestMessage dmaapRequestMessage,
HttpStatus status) {
return getDmaapResponseMessage(dmaapRequestMessage, response, status) //
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;
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;
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
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<JsonObject> 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") //
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(); //
.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());
.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());
@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 //
.expectSubscription() //
.verifyComplete(); //
- verify(agentClient, times(1)).put(URL, PAYLOAD);
+ verify(agentClient, times(1)).put(anyString(), anyString());
verifyNoMoreInteractions(agentClient);
// Error response