diff options
Diffstat (limited to 'openecomp-be/api/openecomp-sdc-rest-webapp/openecomp-sdc-common-rest/src/main/java/org/openecomp/sdcrests/errors/ZusammenExceptionMapper.java')
| -rw-r--r-- | openecomp-be/api/openecomp-sdc-rest-webapp/openecomp-sdc-common-rest/src/main/java/org/openecomp/sdcrests/errors/ZusammenExceptionMapper.java | 38 |
1 files changed, 13 insertions, 25 deletions
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 index abf6024701..497d3cfeb7 100644 --- 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 @@ -13,16 +13,12 @@ * 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; @@ -32,19 +28,16 @@ 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 + "-"; static final String VLM_VSP_VERSION_ID_DOES_NOT_EXISTS = - ZUSAMMEN_DB_PREFIX + com.amdocs.zusammen.datatypes.response.ErrorCode.ZU_ITEM_VERSION_NOT_EXIST; + ZUSAMMEN_DB_PREFIX + com.amdocs.zusammen.datatypes.response.ErrorCode.ZU_ITEM_VERSION_NOT_EXIST; static final String VLM_VSP_ITEM_ID_DOES_NOT_EXISTS = - ZUSAMMEN_DB_PREFIX + com.amdocs.zusammen.datatypes.response.ErrorCode.ZU_ITEM_DOES_NOT_EXIST; - static final String SUB_ENTITY_ID_DOES_NOT_EXISTS = - ZUSAMMEN_DB_PREFIX + com.amdocs.zusammen.datatypes.response.ErrorCode.ZU_ELEMENT_GET_INFO; - static final String FAILED_TO_SYNC = - ZUSAMMEN_DB_PREFIX + com.amdocs.zusammen.datatypes.response.ErrorCode.ZU_ITEM_VERSION_SYNC; + ZUSAMMEN_DB_PREFIX + com.amdocs.zusammen.datatypes.response.ErrorCode.ZU_ITEM_DOES_NOT_EXIST; + static final String SUB_ENTITY_ID_DOES_NOT_EXISTS = ZUSAMMEN_DB_PREFIX + com.amdocs.zusammen.datatypes.response.ErrorCode.ZU_ELEMENT_GET_INFO; + static final String FAILED_TO_SYNC = ZUSAMMEN_DB_PREFIX + com.amdocs.zusammen.datatypes.response.ErrorCode.ZU_ITEM_VERSION_SYNC; static final String FAILED_TO_PUBLISH_OUT_OF_SYNC = - ZUSAMMEN_DB_PREFIX + com.amdocs.zusammen.datatypes.response.ErrorCode - .ZU_ITEM_VERSION_PUBLISH_NOT_ALLOWED; - + 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 @@ -53,29 +46,24 @@ public class ZusammenExceptionMapper implements ExceptionMapper<SdcRuntimeExcept } 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)) { + 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)); + 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)); + 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)); + 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)); + 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(); - + 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(); } @@ -84,6 +72,6 @@ public class ZusammenExceptionMapper implements ExceptionMapper<SdcRuntimeExcept 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(); + .entity(new ErrorCodeAndMessage(Response.Status.INTERNAL_SERVER_ERROR, errorCode)).build(); } } |