From f1ea637a60bace906db5619d71a914ad601e9478 Mon Sep 17 00:00:00 2001 From: Bogumil Zebek Date: Thu, 13 Aug 2020 07:35:53 +0200 Subject: StndDefined event routing - Update WS error response - Update DPO configuration Change-Id: Id4eb5ea50af6d55c839047c4f39b9f99487e95de Issue-ID: DCAEGEN2-1771 Signed-off-by: Zebek Bogumil --- src/main/java/org/onap/dcae/restapi/ApiException.java | 16 ++++++++++++++-- .../org/onap/dcae/restapi/VesRestControllerTest.java | 17 ++++++++++------- 2 files changed, 24 insertions(+), 9 deletions(-) (limited to 'src') diff --git a/src/main/java/org/onap/dcae/restapi/ApiException.java b/src/main/java/org/onap/dcae/restapi/ApiException.java index 255999a6..9ea02076 100644 --- a/src/main/java/org/onap/dcae/restapi/ApiException.java +++ b/src/main/java/org/onap/dcae/restapi/ApiException.java @@ -22,6 +22,9 @@ package org.onap.dcae.restapi; import com.google.common.base.CaseFormat; import org.json.JSONObject; +import java.util.ArrayList; +import java.util.List; + /** * @author Pawel Szalapski (pawel.szalapski@nokia.com) */ @@ -32,19 +35,25 @@ public enum ApiException { INVALID_CONTENT_TYPE(ExceptionType.SERVICE_EXCEPTION, "SVC0002", "Bad Parameter (Incorrect request Content-Type)", 400), UNAUTHORIZED_USER(ExceptionType.POLICY_EXCEPTION, "POL2000", "Unauthorized user", 401), INVALID_CUSTOM_HEADER(ExceptionType.SERVICE_EXCEPTION, "SVC0002", "Bad Parameter (Incorrect request api version)", 400), - MISSING_NAMESPACE_PARAMETER(ExceptionType.SERVICE_EXCEPTION, "SVC2006", "Mandatory input attribute event.commonEventHeader.stndDefinedNamespace is missing from request", 400), - EMPTY_NAMESPACE_PARAMETER(ExceptionType.SERVICE_EXCEPTION, "SVC2006", "Mandatory input attribute event.commonEventHeader.stndDefinedNamespace is empty in request", 400), + MISSING_NAMESPACE_PARAMETER(ExceptionType.SERVICE_EXCEPTION, "SVC2006", "Mandatory input %1 %2 is missing from request", List.of("attribute", "event.commonEventHeader.stndDefinedNamespace"), 400), + EMPTY_NAMESPACE_PARAMETER(ExceptionType.SERVICE_EXCEPTION, "SVC2006", "Mandatory input %1 %2 is empty in request", List.of("attribute", "event.commonEventHeader.stndDefinedNamespace"), 400), NO_SERVER_RESOURCES(ExceptionType.SERVICE_EXCEPTION, "SVC1000", "No server resources (internal processing queue full)", 503); public final int httpStatusCode; private final ExceptionType type; private final String code; private final String details; + private final List variables; ApiException(ExceptionType type, String code, String details, int httpStatusCode) { + this(type, code, details, new ArrayList<>(), httpStatusCode); + } + + ApiException(ExceptionType type, String code, String details, List variables, int httpStatusCode) { this.type = type; this.code = code; this.details = details; + this.variables = variables; this.httpStatusCode = httpStatusCode; } @@ -52,6 +61,9 @@ public enum ApiException { JSONObject exceptionTypeNode = new JSONObject(); exceptionTypeNode.put("messageId", code); exceptionTypeNode.put("text", details); + if(!variables.isEmpty()) { + exceptionTypeNode.put("variables", variables); + } JSONObject requestErrorNode = new JSONObject(); requestErrorNode.put(type.toString(), exceptionTypeNode); diff --git a/src/test/java/org/onap/dcae/restapi/VesRestControllerTest.java b/src/test/java/org/onap/dcae/restapi/VesRestControllerTest.java index e5e7239c..10423053 100644 --- a/src/test/java/org/onap/dcae/restapi/VesRestControllerTest.java +++ b/src/test/java/org/onap/dcae/restapi/VesRestControllerTest.java @@ -191,7 +191,8 @@ public class VesRestControllerTest { verifyErrorResponse( response, "SVC2006", - "Mandatory input attribute event.commonEventHeader.stndDefinedNamespace is missing from request" + "Mandatory input %1 %2 is missing from request", + List.of("attribute", "event.commonEventHeader.stndDefinedNamespace") ); verifyThatEventWasNotSend(); } @@ -215,7 +216,8 @@ public class VesRestControllerTest { verifyErrorResponse( response, "SVC2006", - "Mandatory input attribute event.commonEventHeader.stndDefinedNamespace is empty in request" + "Mandatory input %1 %2 is empty in request", + List.of("attribute", "event.commonEventHeader.stndDefinedNamespace") ); verifyThatEventWasNotSend(); } @@ -251,13 +253,14 @@ public class VesRestControllerTest { when(applicationSettings.jsonSchema(eq(VERSION_V7))).thenReturn(loadedJsonSchemas.get(VERSION_V7).get()); } - private void verifyErrorResponse(ResponseEntity response, String messageId, String messageText) throws com.fasterxml.jackson.core.JsonProcessingException { - final Map errorDetails = fetchErrorDetails(response); - assertThat(errorDetails).containsEntry("messageId", messageId); - assertThat(errorDetails).containsEntry("text", messageText); + private void verifyErrorResponse(ResponseEntity response, String messageId, String messageText, List variables) throws com.fasterxml.jackson.core.JsonProcessingException { + final Map errorDetails = fetchErrorDetails(response); + assertThat((Map)errorDetails).containsEntry("messageId", messageId); + assertThat((Map)errorDetails).containsEntry("text", messageText); + assertThat((Map>)errorDetails).containsEntry("variables", variables); } - private Map fetchErrorDetails(ResponseEntity response) throws com.fasterxml.jackson.core.JsonProcessingException { + private Map fetchErrorDetails(ResponseEntity response) throws com.fasterxml.jackson.core.JsonProcessingException { final String body = response.getBody(); ObjectMapper mapper = new ObjectMapper(); Map>> map = mapper.readValue(body, Map.class); -- cgit 1.2.3-korg