3 files changed, 104 insertions, 0 deletions
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/exception/ComponentExceptionMapper.java b/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/exception/ComponentExceptionMapper.java
new file mode 100644
index 0000000000..4ec1915014
--- /dev/null
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/exception/ComponentExceptionMapper.java
@@ -0,0 +1,41 @@
+package org.openecomp.sdc.be.servlets.exception;
+
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import org.openecomp.sdc.be.components.impl.exceptions.ComponentException;
+import org.openecomp.sdc.be.impl.ComponentsUtils;
+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 ComponentExceptionMapper implements ExceptionMapper<ComponentException> {
+
+    private static final Logger log = Logger.getLogger(ComponentExceptionMapper.class);
+    private final Gson gson = new GsonBuilder().setPrettyPrinting().create();
+    private final ComponentsUtils componentsUtils;
+
+    public ComponentExceptionMapper(ComponentsUtils componentsUtils) {
+        this.componentsUtils = componentsUtils;
+    }
+
+    @Override
+    public Response toResponse(ComponentException exception) {
+        // TODO log this? BeEcompErrorManager.getInstance().logBeRestApiGeneralError(requestURI);
+        log.debug("#toResponse - An error occurred: ", exception);
+        ResponseFormat responseFormat = exception.getResponseFormat();
+        if (exception.getResponseFormat()==null) {
+            responseFormat = componentsUtils.getResponseFormat(exception.getActionStatus(), exception.getParams());
+        }
+
+        return Response.status(responseFormat.getStatus())
+                .entity(gson.toJson(responseFormat.getRequestError()))
+                .build();
+    }
+
+}
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/exception/DefaultExceptionMapper.java b/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/exception/DefaultExceptionMapper.java
new file mode 100644
index 0000000000..d19a64ee65
--- /dev/null
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/exception/DefaultExceptionMapper.java
@@ -0,0 +1,24 @@
+package org.openecomp.sdc.be.servlets.exception;
+
+import org.eclipse.jetty.http.HttpStatus;
+import org.openecomp.sdc.common.log.wrappers.Logger;
+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 DefaultExceptionMapper implements ExceptionMapper<Exception> {
+
+    private static final Logger log = Logger.getLogger(DefaultExceptionMapper.class);
+
+    @Override
+    public Response toResponse(Exception exception) {
+        log.debug("#toResponse - An error occurred: ", exception);
+        return Response.status(HttpStatus.INTERNAL_SERVER_ERROR_500)
+                .entity(exception.getMessage())
+                .build();
+    }
+}
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
new file mode 100644
index 0000000000..0a56591f67
--- /dev/null
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/exception/StorageExceptionMapper.java
@@ -0,0 +1,39 @@
+package org.openecomp.sdc.be.servlets.exception;
+
+
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import org.openecomp.sdc.be.dao.api.ActionStatus;
+import org.openecomp.sdc.be.impl.ComponentsUtils;
+import org.openecomp.sdc.be.model.operations.StorageException;
+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>  {
+
+    private static final Logger log = Logger.getLogger(DefaultExceptionMapper.class);
+    private final Gson gson = new GsonBuilder().setPrettyPrinting().create();
+    private final ComponentsUtils componentsUtils;
+
+    public StorageExceptionMapper(ComponentsUtils componentsUtils) {
+        this.componentsUtils = componentsUtils;
+    }
+
+    @Override
+    public Response toResponse(StorageException exception) {
+        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();
+    }
+
+}