diff options
Diffstat (limited to 'openecomp-be/api/openecomp-sdc-rest-webapp/openecomp-sdc-common-rest')
3 files changed, 193 insertions, 117 deletions
diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/openecomp-sdc-common-rest/src/main/java/org/openecomp/sdcrests/errors/DefaultExceptionMapper.java b/openecomp-be/api/openecomp-sdc-rest-webapp/openecomp-sdc-common-rest/src/main/java/org/openecomp/sdcrests/errors/DefaultExceptionMapper.java index 098a89d6ff..0f17bae35c 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/openecomp-sdc-common-rest/src/main/java/org/openecomp/sdcrests/errors/DefaultExceptionMapper.java +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/openecomp-sdc-common-rest/src/main/java/org/openecomp/sdcrests/errors/DefaultExceptionMapper.java @@ -16,6 +16,18 @@ package org.openecomp.sdcrests.errors; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Set; + +import javax.validation.ConstraintViolation; +import javax.validation.ConstraintViolationException; +import javax.validation.Path; +import javax.ws.rs.core.MediaType; +import javax.ws.rs.core.Response; +import javax.ws.rs.ext.ExceptionMapper; + import org.codehaus.jackson.map.JsonMappingException; import org.hibernate.validator.internal.engine.path.PathImpl; import org.openecomp.core.utilities.CommonMethods; @@ -31,131 +43,103 @@ import org.openecomp.sdc.common.errors.ValidationErrorBuilder; import org.openecomp.sdc.logging.api.Logger; import org.openecomp.sdc.logging.api.LoggerFactory; -import javax.validation.ConstraintViolation; -import javax.validation.ConstraintViolationException; -import javax.validation.Path; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; -import javax.ws.rs.ext.ExceptionMapper; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.Set; - public class DefaultExceptionMapper implements ExceptionMapper<Exception> { - private static final String ERROR_CODES_TO_RESPONSE_STATUS_MAPPING_FILE = - "errorCodesToResponseStatusMapping.json"; - @SuppressWarnings("unchecked") - private static final Map<String, String> ERROR_CODE_TO_RESPONSE_STATUS = - FileUtils.readViaInputStream(ERROR_CODES_TO_RESPONSE_STATUS_MAPPING_FILE, - stream -> JsonUtil.json2Object(stream, Map.class)); - - private static final Logger LOGGER = LoggerFactory.getLogger(DefaultExceptionMapper - .class); - - @Override - public Response toResponse(Exception exception) { - Response response; - if (exception instanceof CoreException) { - response = transform(CoreException.class.cast(exception)); - } else if (exception instanceof ConstraintViolationException) { - response = transform(ConstraintViolationException.class.cast(exception)); - - } else if (exception instanceof JsonMappingException) { - response = transform(JsonMappingException.class.cast(exception)); - - } else { - response = transform(exception); + + private static final String ERROR_CODES_TO_RESPONSE_STATUS_MAPPING_FILE = "errorCodesToResponseStatusMapping.json"; + @SuppressWarnings("unchecked") + private static final Map<String, String> ERROR_CODE_TO_RESPONSE_STATUS = FileUtils.readViaInputStream( + ERROR_CODES_TO_RESPONSE_STATUS_MAPPING_FILE, stream -> JsonUtil.json2Object(stream, Map.class)); + + private static final Logger LOGGER = LoggerFactory.getLogger(DefaultExceptionMapper.class); + + @Override + public Response toResponse(Exception exception) { + Response response; + if (exception instanceof CoreException) { + response = transform(CoreException.class.cast(exception)); + } else if (exception instanceof ConstraintViolationException) { + response = transform(ConstraintViolationException.class.cast(exception)); + + } else if (exception instanceof JsonMappingException) { + response = transform(JsonMappingException.class.cast(exception)); + + } else { + response = transform(exception); + } + + List<Object> contentTypes = new ArrayList<>(); + contentTypes.add(MediaType.APPLICATION_JSON); + response.getMetadata().put("Content-Type", contentTypes); + return response; } - List<Object> contentTypes = new ArrayList<>(); - contentTypes.add(MediaType.APPLICATION_JSON); - response.getMetadata().put("Content-Type", contentTypes); - return response; - } - - private Response transform(CoreException coreException) { - Response response; - ErrorCode code = coreException.code(); - LOGGER.error(code.message(), coreException); - - if (coreException.code().category().equals(ErrorCategory.APPLICATION)) { - if (Response.Status.NOT_FOUND.name().equals(ERROR_CODE_TO_RESPONSE_STATUS.get(code.id()))) { - response = Response - .status(Response.Status.NOT_FOUND) - .entity(toEntity(Response.Status.NOT_FOUND, code)) - .build(); - } else if (Response.Status.BAD_REQUEST.name() - .equals(ERROR_CODE_TO_RESPONSE_STATUS.get(code.id()))) { - response = Response - .status(Response.Status.BAD_REQUEST) - .entity(toEntity(Response.Status.BAD_REQUEST, code)) - .build(); - } else { - response = Response - .status(Response.Status.EXPECTATION_FAILED) - .entity(toEntity(Response.Status.EXPECTATION_FAILED, code)) - .build(); - } - } else { - response = Response - .status(Response.Status.INTERNAL_SERVER_ERROR) - .entity(toEntity(Response.Status.INTERNAL_SERVER_ERROR, code)) - .build(); + private Response transform(CoreException coreException) { + Response response; + ErrorCode code = coreException.code(); + LOGGER.error(code.message(), coreException); + + if (coreException.code().category().equals(ErrorCategory.APPLICATION)) { + if (Response.Status.NOT_FOUND.name().equals(ERROR_CODE_TO_RESPONSE_STATUS.get(code.id()))) { + response = Response.status(Response.Status.NOT_FOUND).entity(toEntity(Response.Status.NOT_FOUND, code)) + .build(); + } else if (Response.Status.BAD_REQUEST.name().equals(ERROR_CODE_TO_RESPONSE_STATUS.get(code.id()))) { + response = + Response.status(Response.Status.BAD_REQUEST).entity(toEntity(Response.Status.BAD_REQUEST, code)) + .build(); + } else { + response = Response.status(Response.Status.EXPECTATION_FAILED) + .entity(toEntity(Response.Status.EXPECTATION_FAILED, code)).build(); + } + } else { + response = Response.status(Response.Status.INTERNAL_SERVER_ERROR) + .entity(toEntity(Response.Status.INTERNAL_SERVER_ERROR, code)).build(); + } + + + return response; } + private Response transform(ConstraintViolationException validationException) { + Set<ConstraintViolation<?>> constraintViolationSet = validationException.getConstraintViolations(); + String message; - return response; - } + String fieldName = null; + if (!CommonMethods.isEmpty(constraintViolationSet)) { + // getting the first violation message for the output response. + ConstraintViolation<?> constraintViolation = constraintViolationSet.iterator().next(); + message = constraintViolation.getMessage(); + fieldName = getFieldName(constraintViolation.getPropertyPath()); - private Response transform(ConstraintViolationException validationException) { - Set<ConstraintViolation<?>> constraintViolationSet = - validationException.getConstraintViolations(); - String message; + } else { + message = validationException.getMessage(); + } - String fieldName = null; - if (!CommonMethods.isEmpty(constraintViolationSet)) { - // getting the first violation message for the output response. - ConstraintViolation<?> constraintViolation = constraintViolationSet.iterator().next(); - message = constraintViolation.getMessage(); - fieldName = getFieldName(constraintViolation.getPropertyPath()); + ErrorCode validationErrorCode = new ValidationErrorBuilder(message, fieldName).build(); - } else { - message = validationException.getMessage(); + LOGGER.error(validationErrorCode.message(), validationException); + return Response.status(Response.Status.EXPECTATION_FAILED) //error 417 + .entity(toEntity(Response.Status.EXPECTATION_FAILED, validationErrorCode)).build(); } - ErrorCode validationErrorCode = new ValidationErrorBuilder(message, fieldName).build(); - - LOGGER.error(validationErrorCode.message(), validationException); - return Response - .status(Response.Status.EXPECTATION_FAILED) //error 417 - .entity(toEntity(Response.Status.EXPECTATION_FAILED, validationErrorCode)) - .build(); - } - - private Response transform(JsonMappingException jsonMappingException) { - ErrorCode jsonMappingErrorCode = new JsonMappingErrorBuilder().build(); - LOGGER.error(jsonMappingErrorCode.message(), jsonMappingException); - return Response - .status(Response.Status.EXPECTATION_FAILED) //error 417 - .entity(toEntity(Response.Status.EXPECTATION_FAILED, jsonMappingErrorCode)) - .build(); - } - - private Response transform(Exception exception) { - ErrorCode errorCode = new GeneralErrorBuilder().build(); - LOGGER.error(errorCode.message(), exception); - return Response - .status(Response.Status.INTERNAL_SERVER_ERROR) - .entity(toEntity(Response.Status.INTERNAL_SERVER_ERROR, errorCode)) - .build(); - } - - private String getFieldName(Path propertyPath) { - return ((PathImpl) propertyPath).getLeafNode().toString(); - } - - private Object toEntity(Response.Status status, ErrorCode code) { - return new ErrorCodeAndMessage(status, code); - } + private Response transform(JsonMappingException jsonMappingException) { + ErrorCode jsonMappingErrorCode = new JsonMappingErrorBuilder().build(); + LOGGER.error(jsonMappingErrorCode.message(), jsonMappingException); + return Response.status(Response.Status.EXPECTATION_FAILED) //error 417 + .entity(toEntity(Response.Status.EXPECTATION_FAILED, jsonMappingErrorCode)).build(); + } + + private Response transform(Exception exception) { + ErrorCode errorCode = new GeneralErrorBuilder().build(); + LOGGER.error(errorCode.message(), exception); + return Response.status(Response.Status.INTERNAL_SERVER_ERROR) + .entity(toEntity(Response.Status.INTERNAL_SERVER_ERROR, errorCode)).build(); + } + + private String getFieldName(Path propertyPath) { + return ((PathImpl) propertyPath).getLeafNode().toString(); + } + + private Object toEntity(Response.Status status, ErrorCode code) { + return new ErrorCodeAndMessage(status, code); + } } diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/openecomp-sdc-common-rest/src/main/java/org/openecomp/sdcrests/errors/ZusammenExceptionMapper.java b/openecomp-be/api/openecomp-sdc-rest-webapp/openecomp-sdc-common-rest/src/main/java/org/openecomp/sdcrests/errors/ZusammenExceptionMapper.java new file mode 100644 index 0000000000..4100cc5bf7 --- /dev/null +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/openecomp-sdc-common-rest/src/main/java/org/openecomp/sdcrests/errors/ZusammenExceptionMapper.java @@ -0,0 +1,89 @@ +/* + * Copyright © 2016-2018 European Support Limited + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.openecomp.sdcrests.errors; + +import com.amdocs.zusammen.datatypes.response.Module; + +import java.util.stream.Stream; + +import javax.ws.rs.core.Response; +import javax.ws.rs.ext.ExceptionMapper; + +import org.openecomp.sdc.common.errors.ErrorCode; +import org.openecomp.sdc.common.errors.ErrorCodeAndMessage; +import org.openecomp.sdc.common.errors.GeneralErrorBuilder; +import org.openecomp.sdc.common.errors.Messages; +import org.openecomp.sdc.common.errors.SdcRuntimeException; +import org.openecomp.sdc.logging.api.Logger; +import org.openecomp.sdc.logging.api.LoggerFactory; + +public class ZusammenExceptionMapper implements ExceptionMapper<SdcRuntimeException> { + private static final String ZUSAMMEN_DB_PREFIX = Module.ZDB + "-"; + private static final String VLM_VSP_VERSION_ID_DOES_NOT_EXISTS = + ZUSAMMEN_DB_PREFIX + com.amdocs.zusammen.datatypes.response.ErrorCode.ZU_ITEM_VERSION_NOT_EXIST; + private static final String VLM_VSP_ITEM_ID_DOES_NOT_EXISTS = + ZUSAMMEN_DB_PREFIX + com.amdocs.zusammen.datatypes.response.ErrorCode.ZU_ITEM_DOES_NOT_EXIST; + private static final String SUB_ENTITY_ID_DOES_NOT_EXISTS = + ZUSAMMEN_DB_PREFIX + com.amdocs.zusammen.datatypes.response.ErrorCode.ZU_ELEMENT_GET_INFO; + private static final String FAILED_TO_SYNC = + ZUSAMMEN_DB_PREFIX + com.amdocs.zusammen.datatypes.response.ErrorCode.ZU_ITEM_VERSION_SYNC; + private static final String FAILED_TO_PUBLISH_OUT_OF_SYNC = + ZUSAMMEN_DB_PREFIX + com.amdocs.zusammen.datatypes.response.ErrorCode + .ZU_ITEM_VERSION_PUBLISH_NOT_ALLOWED; + + private static final Logger LOGGER = LoggerFactory.getLogger(ZusammenExceptionMapper.class); + + @Override + public Response toResponse(SdcRuntimeException exception) { + return transform(exception); + } + + private Response transform(SdcRuntimeException exception) { + if (Stream.of(VLM_VSP_ITEM_ID_DOES_NOT_EXISTS, VLM_VSP_VERSION_ID_DOES_NOT_EXISTS) + .anyMatch(exception.getMessage()::contains)) { + return generateSdcErrorResponse(Messages.ENTITY_NOT_FOUND, Response.Status.NOT_FOUND, + new SdcRuntimeException(Messages.ENTITY_NOT_FOUND.getErrorMessage(), exception)); + } else if (exception.getMessage().contains(SUB_ENTITY_ID_DOES_NOT_EXISTS)) { + return generateSdcErrorResponse(Messages.SUB_ENTITY_NOT_FOUND, Response.Status.NOT_FOUND, + new SdcRuntimeException(Messages.SUB_ENTITY_NOT_FOUND.getErrorMessage(), exception)); + } else if (exception.getMessage().contains(FAILED_TO_SYNC)) { + return generateSdcErrorResponse(Messages.FAILED_TO_SYNC, Response.Status.EXPECTATION_FAILED, + new SdcRuntimeException(Messages.FAILED_TO_SYNC.getErrorMessage(), exception)); + } else if (exception.getMessage().contains(FAILED_TO_PUBLISH_OUT_OF_SYNC)) { + return generateSdcErrorResponse(Messages.FAILED_TO_PUBLISH_OUT_OF_SYNC, Response.Status.EXPECTATION_FAILED, + new SdcRuntimeException(Messages.FAILED_TO_PUBLISH_OUT_OF_SYNC.getErrorMessage(), exception)); + } + + return genericError(exception); + } + + private Response generateSdcErrorResponse(Messages messages, Response.Status status, Exception exception) { + ErrorCode errorCode = new ErrorCode.ErrorCodeBuilder() + .withId(messages.name()) + .withMessage(exception.getMessage()).build(); + + LOGGER.error(errorCode.message(), exception); + return Response.status(status).entity(new ErrorCodeAndMessage(status, errorCode)).build(); + } + + private Response genericError(Exception exception) { + ErrorCode errorCode = new GeneralErrorBuilder().build(); + LOGGER.error(errorCode.message(), exception); + return Response.status(Response.Status.INTERNAL_SERVER_ERROR) + .entity(new ErrorCodeAndMessage(Response.Status.INTERNAL_SERVER_ERROR, errorCode)).build(); + } +} diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/openecomp-sdc-common-rest/src/main/resources/errorCodesToResponseStatusMapping.json b/openecomp-be/api/openecomp-sdc-rest-webapp/openecomp-sdc-common-rest/src/main/resources/errorCodesToResponseStatusMapping.json index e4c6962847..b1b1b76f33 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/openecomp-sdc-common-rest/src/main/resources/errorCodesToResponseStatusMapping.json +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/openecomp-sdc-common-rest/src/main/resources/errorCodesToResponseStatusMapping.json @@ -5,5 +5,8 @@ "PACKAGE_NOT_FOUND": "NOT_FOUND", "PACKAGE_INVALID": "BAD_REQUEST", "VENDOR_LICENSE_MODEL_NOT_FOUND": "NOT_FOUND", - "VENDOR_LICENSE_ENTITY_NOT_FOUND": "NOT_FOUND" + "VENDOR_LICENSE_ENTITY_NOT_FOUND": "NOT_FOUND", + "VERSIONABLE_SUB_ENTITY_NOT_FOUND": "NOT_FOUND", + "FEATURE_GROUP_NOT_EXIST_FOR_VSP": "NOT_FOUND", + "INVALID_COMPUTE_FLAVOR_ID": "NOT_FOUND" }
\ No newline at end of file |