diff options
author | Bartosz Gardziejewski <bartosz.gardziejewski@nokia.com> | 2021-01-26 07:43:22 +0100 |
---|---|---|
committer | Bartosz Gardziejewski <bartosz.gardziejewski@nokia.com> | 2021-01-28 10:16:25 +0100 |
commit | ed18ea83def89626ba42cbe3f38d96e50aabd2f6 (patch) | |
tree | 7fbfe76c003d8da7f9e4472340555c4ddd2cabf9 /pnfsimulator/integration/src/main/java/org | |
parent | ef730fbed8743def93b864800928653a9e330457 (diff) |
Add message from VES to PNF simulator response when performing one time event request
Signed-off-by: Bartosz Gardziejewski <bartosz.gardziejewski@nokia.com>
Change-Id: I0a12263daafacc52643838ff80482e4c7168b7ea
Issue-ID: INT-1804
Diffstat (limited to 'pnfsimulator/integration/src/main/java/org')
-rw-r--r-- | pnfsimulator/integration/src/main/java/org/onap/pnfsimulator/integration/VesSimulatorController.java | 28 |
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); } } |