From aa8057fa429db6852a86ad217a641bb2bf12123c Mon Sep 17 00:00:00 2001 From: vempo Date: Sun, 5 Aug 2018 18:06:55 +0300 Subject: Resolved slf4j binding conflict in tests Removed an slf4j binding, moved dependencies up to the dependencyManagement of root POM, improved logging. Change-Id: I21eb5160adac7d520363a524e679962be4754d11 Issue-ID: SDC-1278 Signed-off-by: vempo --- .../sdcrests/vsp/rest/services/VnfPackageRepositoryImpl.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vnf-repository-rest-services/src/main/java') diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vnf-repository-rest-services/src/main/java/org/openecomp/sdcrests/vsp/rest/services/VnfPackageRepositoryImpl.java b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vnf-repository-rest-services/src/main/java/org/openecomp/sdcrests/vsp/rest/services/VnfPackageRepositoryImpl.java index be14c45dc4..6f76bf4527 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vnf-repository-rest-services/src/main/java/org/openecomp/sdcrests/vsp/rest/services/VnfPackageRepositoryImpl.java +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vnf-repository-rest-services/src/main/java/org/openecomp/sdcrests/vsp/rest/services/VnfPackageRepositoryImpl.java @@ -197,9 +197,15 @@ public class VnfPackageRepositoryImpl implements VnfPackageRepository { } private static Response handleUnexpectedStatus(String action, String uri, Response response) { + ErrorCode error = new GeneralErrorBuilder().build(); - LOGGER.error("Unexpected response status while {}: URI={}, Response={}", action, uri, response, - new CoreException(error)); + + if (LOGGER.isErrorEnabled()) { + String body = response.hasEntity() ? response.readEntity(String.class) : ""; + LOGGER.error("Unexpected response status while {}: URI={}, status={}, body={}", action, uri, + response.getStatus(), body, new CoreException(error)); + } + return generateInternalServerError(error); } -- cgit 1.2.3-korg