1 files changed, 20 insertions, 8 deletions

diff --git a/pnfsimulator/integration/src/main/java/org/onap/pnfsimulator/integration/VesSimulatorController.java b/pnfsimulator/integration/src/main/java/org/onap/pnfsimulator/integration/VesSimulatorController.java
index 70e0c60..304df60 100644
--- a/pnfsimulator/integration/src/main/java/org/onap/pnfsimulator/integration/VesSimulatorController.java
+++ b/pnfsimulator/integration/src/main/java/org/onap/pnfsimulator/integration/VesSimulatorController.java
@@ -22,18 +22,27 @@ package org.onap.pnfsimulator.integration;
 
 import com.google.gson.Gson;
 import com.google.gson.JsonObject;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+
 @RequestMapping("ves-simulator")
 @RestController
 public class VesSimulatorController {
 
+    private static final Logger LOGGER = LoggerFactory.getLogger(VesSimulatorController.class);
     private final VesSimulatorService vesSimulatorService;
     private final Gson gson;
+    private final ResponseEntity<String> response = ResponseEntity
+        .status(HttpStatus.ACCEPTED)
+        .body("Accepted");
 
     @Autowired
     public VesSimulatorController(VesSimulatorService vesSimulatorService, Gson gson) {
@@ -42,18 +51,21 @@ public class VesSimulatorController {
     }
 
     @PostMapping("eventListener/v5")
-    String sendEventToDmaapV5(@RequestBody String body) {
-        System.out.println("Received event" + body);
-        JsonObject jsonObject = gson.fromJson(body, JsonObject.class);
+    public ResponseEntity<String> sendEventToDmaapV5(@RequestBody String body) {
+        JsonObject jsonObject = getJsonObjectFromBody(body);
         vesSimulatorService.sendEventToDmaapV5(jsonObject);
-        return "MessageAccepted";
+        return response;
     }
 
     @PostMapping("eventListener/v7")
-    String sendEventToDmaapV7(@RequestBody String body) {
-        System.out.println("Received event" + body);
-        JsonObject jsonObject = gson.fromJson(body, JsonObject.class);
+    public ResponseEntity<String> sendEventToDmaapV7(@RequestBody String body) {
+        JsonObject jsonObject = getJsonObjectFromBody(body);
         vesSimulatorService.sendEventToDmaapV7(jsonObject);
-        return "MessageAccepted";
+        return response;
+    }
+
+    private JsonObject getJsonObjectFromBody(@RequestBody String body) {
+        LOGGER.info(String.format("Received event: %s", body));
+        return gson.fromJson(body, JsonObject.class);
     }
 }