diff options
Diffstat (limited to 'src')
4 files changed, 20 insertions, 6 deletions
diff --git a/src/main/java/org/onap/dcae/common/validator/StndDefinedDataValidator.java b/src/main/java/org/onap/dcae/common/validator/StndDefinedDataValidator.java index d936f272..20890f01 100644 --- a/src/main/java/org/onap/dcae/common/validator/StndDefinedDataValidator.java +++ b/src/main/java/org/onap/dcae/common/validator/StndDefinedDataValidator.java @@ -29,6 +29,8 @@ import org.onap.dcae.restapi.EventValidatorException; import org.onap.dcaegen2.services.sdk.services.external.schema.manager.exception.IncorrectInternalFileReferenceException; import org.onap.dcaegen2.services.sdk.services.external.schema.manager.exception.NoLocalReferenceException; import org.onap.dcaegen2.services.sdk.services.external.schema.manager.service.StndDefinedValidator; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -39,6 +41,8 @@ public class StndDefinedDataValidator { private final StndDefinedValidator stndDefinedValidator; + public static final Logger log = LoggerFactory.getLogger(StndDefinedDataValidator.class); + @Autowired public StndDefinedDataValidator(StndDefinedValidator validator) { this.stndDefinedValidator = validator; @@ -56,7 +60,7 @@ public class StndDefinedDataValidator { throw new EventValidatorException(ApiException.STND_DEFINED_VALIDATION_FAILED); } } catch (JsonProcessingException ex) { - throw new EventValidatorException(ApiException.INVALID_JSON_INPUT); + throw new EventValidatorException(ApiException.INVALID_JSON_INPUT, ex); } } @@ -64,9 +68,9 @@ public class StndDefinedDataValidator { try { return stndDefinedValidator.validate(event); } catch (NoLocalReferenceException e) { - throw new EventValidatorException(ApiException.NO_LOCAL_SCHEMA_REFERENCE); + throw new EventValidatorException(ApiException.NO_LOCAL_SCHEMA_REFERENCE, e); } catch (IncorrectInternalFileReferenceException e) { - throw new EventValidatorException(ApiException.INCORRECT_INTERNAL_FILE_REFERENCE); + throw new EventValidatorException(ApiException.INCORRECT_INTERNAL_FILE_REFERENCE, e); } } diff --git a/src/main/java/org/onap/dcae/restapi/EventValidatorException.java b/src/main/java/org/onap/dcae/restapi/EventValidatorException.java index 380694d1..f477bc7c 100644 --- a/src/main/java/org/onap/dcae/restapi/EventValidatorException.java +++ b/src/main/java/org/onap/dcae/restapi/EventValidatorException.java @@ -22,6 +22,11 @@ package org.onap.dcae.restapi; public class EventValidatorException extends RuntimeException { private final ApiException apiException; + public EventValidatorException(ApiException apiException, Exception cause) { + super(cause); + this.apiException = apiException; + } + public EventValidatorException(ApiException apiException) { this.apiException = apiException; } diff --git a/src/main/java/org/onap/dcae/restapi/VesRestController.java b/src/main/java/org/onap/dcae/restapi/VesRestController.java index 0a5930f6..93e428b4 100644 --- a/src/main/java/org/onap/dcae/restapi/VesRestController.java +++ b/src/main/java/org/onap/dcae/restapi/VesRestController.java @@ -61,6 +61,7 @@ public class VesRestController { private static final String EVENT = "event"; private final ApplicationSettings settings; private final Logger requestLogger; + private final Logger logger; private EventSender eventSender; private final HeaderUtils headerUtils; private final GeneralEventValidator generalEventValidator; @@ -69,10 +70,11 @@ public class VesRestController { @Autowired VesRestController(ApplicationSettings settings, @Qualifier("incomingRequestsLogger") Logger incomingRequestsLogger, - @Qualifier("eventSender") EventSender eventSender, HeaderUtils headerUtils, + @Qualifier("errorLog") Logger logger, @Qualifier("eventSender") EventSender eventSender, HeaderUtils headerUtils, StndDefinedDataValidator stndDefinedDataValidator) { this.settings = settings; this.requestLogger = incomingRequestsLogger; + this.logger = logger; this.eventSender = eventSender; this.headerUtils = headerUtils; this.stndDefinedValidator = stndDefinedDataValidator; @@ -113,6 +115,7 @@ public class VesRestController { executeStndDefinedValidation(vesEvents); eventSender.send(vesEvents); } catch (EventValidatorException e) { + logger.error(e.getMessage()); return ResponseEntity.status(e.getApiException().httpStatusCode) .body(e.getApiException().toJSON().toString()); } catch (StndDefinedNamespaceParameterNotDefinedException e) { diff --git a/src/test/java/org/onap/dcae/restapi/VesRestControllerTest.java b/src/test/java/org/onap/dcae/restapi/VesRestControllerTest.java index 5504ca8e..a3c0628d 100644 --- a/src/test/java/org/onap/dcae/restapi/VesRestControllerTest.java +++ b/src/test/java/org/onap/dcae/restapi/VesRestControllerTest.java @@ -27,7 +27,6 @@ import com.networknt.schema.JsonSchema; import io.vavr.collection.HashMap; import org.apache.http.HttpStatus; import org.jetbrains.annotations.NotNull; -import org.json.JSONObject; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -82,6 +81,9 @@ public class VesRestControllerTest { private Logger logger; @Mock + private Logger errorLogger; + + @Mock private HeaderUtils headerUtils; @Mock @@ -97,7 +99,7 @@ public class VesRestControllerTest { "3GPP-FaultSupervision", new String[]{VES_3_GPP_FAULT_SUPERVISION_TOPIC} ); this.vesRestController = new VesRestController(applicationSettings, logger, - new EventSender(eventPublisher, streamIds), headerUtils, stndDefinedDataValidator); + errorLogger, new EventSender(eventPublisher, streamIds), headerUtils, stndDefinedDataValidator); } @Test |