diff options
author | Sotiropoulos, Ioannis (is948x) <Ioannis.Sotiropoulos@amdocs.com> | 2018-07-10 17:57:43 +0100 |
---|---|---|
committer | Sotiropoulos, Ioannis (is948x) <Ioannis.Sotiropoulos@amdocs.com> | 2018-07-10 17:57:43 +0100 |
commit | d5322dbd0fa1e32d543b24824a28d6bf0a0b5497 (patch) | |
tree | 3fd9c7c2ce924395346601490e96327e47928afc /src/main/java/org/onap/crud/event | |
parent | 600ca7e0b82c6932caa4f4ffb53e6c053525d9d5 (diff) |
Increase code coverage
Add tests to increase code coverage above 60 percent.
Issue-ID: AAI-1198
Change-Id: I4c2f964ce41d01521cc1313e32e34fb6460d49bf
Signed-off-by: Sotiropoulos, Ioannis (is948x) <Ioannis.Sotiropoulos@amdocs.com>
Diffstat (limited to 'src/main/java/org/onap/crud/event')
-rw-r--r-- | src/main/java/org/onap/crud/event/response/GraphEventResponseHandler.java | 48 |
1 files changed, 16 insertions, 32 deletions
diff --git a/src/main/java/org/onap/crud/event/response/GraphEventResponseHandler.java b/src/main/java/org/onap/crud/event/response/GraphEventResponseHandler.java index d858384..83be4bc 100644 --- a/src/main/java/org/onap/crud/event/response/GraphEventResponseHandler.java +++ b/src/main/java/org/onap/crud/event/response/GraphEventResponseHandler.java @@ -42,12 +42,7 @@ public class GraphEventResponseHandler { public String handleVertexResponse(String version, GraphEvent event, GraphEventEnvelope response) throws CrudException { - handlePolicyViolations(event, response); - logResponse(event, response.getBody()); - - if (isErrorResponse(response.getBody())) { - throwOperationException(response); - } + validate(event, response); return CrudResponseBuilder.buildUpsertVertexResponse( OxmModelValidator.validateOutgoingPayload(version, response.getBody().getVertex().toVertex()), version); @@ -55,12 +50,7 @@ public class GraphEventResponseHandler { public String handleEdgeResponse(String version, GraphEvent event, GraphEventEnvelope response) throws CrudException { - handlePolicyViolations(event, response); - logResponse(event, response.getBody()); - - if (isErrorResponse(response.getBody())) { - throwOperationException(response); - } + validate(event, response); return CrudResponseBuilder.buildUpsertEdgeResponse( RelationshipSchemaValidator.validateOutgoingPayload(version, response.getBody().getEdge().toEdge()), @@ -68,23 +58,12 @@ public class GraphEventResponseHandler { } public String handleDeletionResponse(GraphEvent event, GraphEventEnvelope response) throws CrudException { - handlePolicyViolations(event, response); - logResponse(event, response.getBody()); - - if (isErrorResponse(response.getBody())) { - throwOperationException(response); - } - + validate(event, response); return ""; } public void handleBulkEventResponse(GraphEvent event, GraphEventEnvelope response) throws CrudException { - handlePolicyViolations(event, response); - logResponse(event, response.getBody()); - - if (isErrorResponse(response.getBody())) { - throwOperationException(response); - } + validate(event, response); } public boolean hasPolicyViolations(GraphEventEnvelope event) { @@ -92,6 +71,18 @@ public class GraphEventResponseHandler { && event.getPolicyViolations().getAsJsonArray().size() != 0; } + private void validate(GraphEvent event, GraphEventEnvelope response) throws CrudException { + handlePolicyViolations(event, response); + logResponse(event, response.getBody()); + + if (isErrorResponse(response.getBody())) { + throw new CrudException( + GraphEventResponseMessage.OPERATION_ERROR_EXCEPTION_MESSAGE + .getMessage(response.getBody().getTransactionId(), response.getBody().getErrorMessage()), + response.getBody().getHttpErrorStatus()); + } + } + private void handlePolicyViolations(GraphEvent event, GraphEventEnvelope response) throws CrudException { if (hasPolicyViolations(response)) { logPolicyViolation(event, response); @@ -126,13 +117,6 @@ public class GraphEventResponseHandler { //@formatter:on } - private void throwOperationException(GraphEventEnvelope response) throws CrudException { - throw new CrudException( - GraphEventResponseMessage.OPERATION_ERROR_EXCEPTION_MESSAGE - .getMessage(response.getBody().getTransactionId(), response.getBody().getErrorMessage()), - response.getBody().getHttpErrorStatus()); - } - private boolean isErrorResponse(GraphEvent response) { return GraphEventResult.FAILURE.equals(response.getResult()); } |