diff options
Diffstat (limited to 'catalog-be/src/main/java/org/openecomp/sdc/be/servlets/exception/StorageExceptionMapper.java')
-rw-r--r-- | catalog-be/src/main/java/org/openecomp/sdc/be/servlets/exception/StorageExceptionMapper.java | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/exception/StorageExceptionMapper.java b/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/exception/StorageExceptionMapper.java index 40355f21fd..18e5a15497 100644 --- a/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/exception/StorageExceptionMapper.java +++ b/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/exception/StorageExceptionMapper.java @@ -7,9 +7,9 @@ * 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. @@ -17,12 +17,13 @@ * limitations under the License. * ============LICENSE_END========================================================= */ - package org.openecomp.sdc.be.servlets.exception; - import com.google.gson.Gson; import com.google.gson.GsonBuilder; +import javax.ws.rs.core.Response; +import javax.ws.rs.ext.ExceptionMapper; +import javax.ws.rs.ext.Provider; import org.openecomp.sdc.be.dao.api.ActionStatus; import org.openecomp.sdc.be.impl.ComponentsUtils; import org.openecomp.sdc.be.model.operations.StorageException; @@ -30,13 +31,9 @@ import org.openecomp.sdc.common.log.wrappers.Logger; import org.openecomp.sdc.exception.ResponseFormat; import org.springframework.stereotype.Component; -import javax.ws.rs.core.Response; -import javax.ws.rs.ext.ExceptionMapper; -import javax.ws.rs.ext.Provider; - @Component @Provider -public class StorageExceptionMapper implements ExceptionMapper<StorageException> { +public class StorageExceptionMapper implements ExceptionMapper<StorageException> { private static final Logger log = Logger.getLogger(DefaultExceptionMapper.class); private final Gson gson = new GsonBuilder().setPrettyPrinting().create(); @@ -51,9 +48,6 @@ public class StorageExceptionMapper implements ExceptionMapper<StorageException> log.debug("#toResponse - An error occurred: ", exception); ActionStatus actionStatus = componentsUtils.convertFromStorageResponse(exception.getStorageOperationStatus()); ResponseFormat responseFormat = componentsUtils.getResponseFormat(actionStatus, exception.getParams()); - return Response.status(responseFormat.getStatus()) - .entity(gson.toJson(responseFormat.getRequestError())) - .build(); + return Response.status(responseFormat.getStatus()).entity(gson.toJson(responseFormat.getRequestError())).build(); } - } |