Remove legacy certificate handling
[sdc.git] / catalog-be / src / main / java / org / openecomp / sdc / be / servlets / CapabilityServlet.java
index 999c172..372d59b 100644 (file)
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.openecomp.sdc.be.servlets;
 
 import com.jcabi.aspects.Loggable;
@@ -28,11 +27,26 @@ import io.swagger.v3.oas.annotations.servers.Server;
 import io.swagger.v3.oas.annotations.servers.Servers;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import io.swagger.v3.oas.annotations.tags.Tags;
+import java.util.List;
+import java.util.Optional;
+import javax.inject.Inject;
+import javax.servlet.ServletContext;
+import javax.servlet.http.HttpServletRequest;
+import javax.ws.rs.Consumes;
+import javax.ws.rs.DELETE;
+import javax.ws.rs.GET;
+import javax.ws.rs.HeaderParam;
+import javax.ws.rs.POST;
+import javax.ws.rs.PUT;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
 import org.openecomp.sdc.be.components.impl.CapabilitiesBusinessLogic;
 import org.openecomp.sdc.be.components.impl.ComponentInstanceBusinessLogic;
 import org.openecomp.sdc.be.components.impl.ResourceImportManager;
-import org.openecomp.sdc.be.components.impl.aaf.AafPermission;
-import org.openecomp.sdc.be.components.impl.aaf.PermissionAllowed;
 import org.openecomp.sdc.be.config.BeEcompErrorManager;
 import org.openecomp.sdc.be.dao.api.ActionStatus;
 import org.openecomp.sdc.be.datatypes.enums.ComponentTypeEnum;
@@ -42,110 +56,75 @@ import org.openecomp.sdc.be.model.CapabilityDefinition;
 import org.openecomp.sdc.be.model.User;
 import org.openecomp.sdc.be.resources.data.auditing.AuditingActionEnum;
 import org.openecomp.sdc.be.ui.model.UiComponentDataTransfer;
-import org.openecomp.sdc.be.user.UserBusinessLogic;
 import org.openecomp.sdc.common.api.Constants;
 import org.openecomp.sdc.common.log.wrappers.Logger;
 import org.openecomp.sdc.exception.ResponseFormat;
 import org.springframework.stereotype.Controller;
 
-import javax.inject.Inject;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.GET;
-import javax.ws.rs.HeaderParam;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-import java.util.List;
-import java.util.Optional;
-
 @Loggable(prepend = true, value = Loggable.DEBUG, trim = false)
 @Path("/v1/catalog")
 @Consumes(MediaType.APPLICATION_JSON)
 @Produces(MediaType.APPLICATION_JSON)
-@Tags({@Tag(name = "SDC Internal APIs")})
+@Tags({@Tag(name = "SDCE-2 APIs")})
 @Servers({@Server(url = "/sdc2/rest")})
 @Controller
 public class CapabilityServlet extends AbstractValidationsServlet {
+
     private static final Logger LOGGER = Logger.getLogger(CapabilityServlet.class);
     private final CapabilitiesBusinessLogic capabilitiesBusinessLogic;
 
     @Inject
-    public CapabilityServlet(UserBusinessLogic userBusinessLogic,
-        ComponentInstanceBusinessLogic componentInstanceBL,
-        ComponentsUtils componentsUtils, ServletUtils servletUtils,
-        ResourceImportManager resourceImportManager,
-        CapabilitiesBusinessLogic capabilitiesBusinessLogic) {
-        super(userBusinessLogic, componentInstanceBL, componentsUtils, servletUtils, resourceImportManager);
+    public CapabilityServlet(ComponentInstanceBusinessLogic componentInstanceBL, ComponentsUtils componentsUtils,
+                             ServletUtils servletUtils, ResourceImportManager resourceImportManager,
+                             CapabilitiesBusinessLogic capabilitiesBusinessLogic) {
+        super(componentInstanceBL, componentsUtils, servletUtils, resourceImportManager);
         this.capabilitiesBusinessLogic = capabilitiesBusinessLogic;
     }
 
-
     @POST
     @Consumes(MediaType.APPLICATION_JSON)
     @Produces(MediaType.APPLICATION_JSON)
     @Path("/resources/{resourceId}/capabilities")
-    @Operation(description = "Create Capabilities on resource", method = "POST",
-            summary = "Create Capabilities on resource", responses = {
-            @ApiResponse(content = @Content(array = @ArraySchema(schema = @Schema(implementation = Response.class)))),
-            @ApiResponse(responseCode = "201", description = "Create Capabilities"),
-            @ApiResponse(responseCode = "403", description = "Restricted operation"),
-            @ApiResponse(responseCode = "400", description = "Invalid content / Missing content"),
-            @ApiResponse(responseCode = "409", description = "Capability already exist")})
-    @PermissionAllowed(AafPermission.PermNames.INTERNAL_ALL_VALUE)
-    public Response createCapabilitiesOnResource(
-            @Parameter(description = "Capability to create", required = true) String data,
-            @Parameter(description = "Resource Id") @PathParam("resourceId") String resourceId,
-            @Context final HttpServletRequest request,
-            @HeaderParam(value = Constants.USER_ID_HEADER) String userId) {
-        return createOrUpdate(data, "resources" , resourceId,
-                request, userId, false, "createCapabilities");
+    @Operation(description = "Create Capabilities on resource", method = "POST", summary = "Create Capabilities on resource", responses = {
+        @ApiResponse(content = @Content(array = @ArraySchema(schema = @Schema(implementation = Response.class)))),
+        @ApiResponse(responseCode = "201", description = "Create Capabilities"),
+        @ApiResponse(responseCode = "403", description = "Restricted operation"),
+        @ApiResponse(responseCode = "400", description = "Invalid content / Missing content"),
+        @ApiResponse(responseCode = "409", description = "Capability already exist")})
+    public Response createCapabilitiesOnResource(@Parameter(description = "Capability to create", required = true) String data,
+                                                 @Parameter(description = "Resource Id") @PathParam("resourceId") String resourceId,
+                                                 @Context final HttpServletRequest request,
+                                                 @HeaderParam(value = Constants.USER_ID_HEADER) String userId) {
+        return createOrUpdate(data, "resources", resourceId, request, userId, false, "createCapabilities");
     }
 
     @PUT
     @Consumes(MediaType.APPLICATION_JSON)
     @Produces(MediaType.APPLICATION_JSON)
     @Path("/resources/{resourceId}/capabilities")
-    @Operation(description = "Update Capabilities on resource", method = "PUT",
-            summary = "Update Capabilities on resource", responses = {@ApiResponse(
-            content = @Content(array = @ArraySchema(schema = @Schema(implementation = CapabilityDefinition.class)))),
-            @ApiResponse(responseCode = "201", description = "Update Capabilities"),
-            @ApiResponse(responseCode = "403", description = "Restricted operation"),
-            @ApiResponse(responseCode = "400", description = "Invalid content / Missing content")})
-    @PermissionAllowed(AafPermission.PermNames.INTERNAL_ALL_VALUE)
-    public Response updateCapabilitiesOnResource(
-            @Parameter(description = "Capabilities to update", required = true) String data,
-            @Parameter(description = "Component Id") @PathParam("resourceId") String resourceId,
-            @Context final HttpServletRequest request,
-            @HeaderParam(value = Constants.USER_ID_HEADER) String userId) {
-        return createOrUpdate(data, "resources", resourceId,
-                request, userId, true, "updateCapabilities");
+    @Operation(description = "Update Capabilities on resource", method = "PUT", summary = "Update Capabilities on resource", responses = {
+        @ApiResponse(content = @Content(array = @ArraySchema(schema = @Schema(implementation = CapabilityDefinition.class)))),
+        @ApiResponse(responseCode = "201", description = "Update Capabilities"),
+        @ApiResponse(responseCode = "403", description = "Restricted operation"),
+        @ApiResponse(responseCode = "400", description = "Invalid content / Missing content")})
+    public Response updateCapabilitiesOnResource(@Parameter(description = "Capabilities to update", required = true) String data,
+                                                 @Parameter(description = "Component Id") @PathParam("resourceId") String resourceId,
+                                                 @Context final HttpServletRequest request,
+                                                 @HeaderParam(value = Constants.USER_ID_HEADER) String userId) {
+        return createOrUpdate(data, "resources", resourceId, request, userId, true, "updateCapabilities");
     }
 
     @GET
     @Consumes(MediaType.APPLICATION_JSON)
     @Produces(MediaType.APPLICATION_JSON)
     @Path("/resources/{resourceId}/capabilities/{capabilityId}")
-    @Operation(description = "Get Capability from resource", method = "GET", summary = "GET Capability from resource",
-            responses = {@ApiResponse(content = @Content(
-                    array = @ArraySchema(schema = @Schema(implementation = CapabilityDefinition.class)))),
-                    @ApiResponse(responseCode = "201", description = "GET Capability"),
-                    @ApiResponse(responseCode = "403", description = "Restricted operation"),
-                    @ApiResponse(responseCode = "400", description = "Invalid content / Missing content")})
-    @PermissionAllowed(AafPermission.PermNames.INTERNAL_ALL_VALUE)
-    public Response getCapabilityOnResource(
-            @Parameter(description = "Resource Id") @PathParam("resourceId") String resourceId,
-            @Parameter(description = "Capability Id") @PathParam("capabilityId") String capabilityId,
-            @Context final HttpServletRequest request,
-            @HeaderParam(value = Constants.USER_ID_HEADER) String userId) {
-
+    @Operation(description = "Get Capability from resource", method = "GET", summary = "GET Capability from resource", responses = {
+        @ApiResponse(content = @Content(array = @ArraySchema(schema = @Schema(implementation = CapabilityDefinition.class)))),
+        @ApiResponse(responseCode = "201", description = "GET Capability"), @ApiResponse(responseCode = "403", description = "Restricted operation"),
+        @ApiResponse(responseCode = "400", description = "Invalid content / Missing content")})
+    public Response getCapabilityOnResource(@Parameter(description = "Resource Id") @PathParam("resourceId") String resourceId,
+                                            @Parameter(description = "Capability Id") @PathParam("capabilityId") String capabilityId,
+                                            @Context final HttpServletRequest request, @HeaderParam(value = Constants.USER_ID_HEADER) String userId) {
         return get(capabilityId, resourceId, request, userId);
     }
 
@@ -153,18 +132,15 @@ public class CapabilityServlet extends AbstractValidationsServlet {
     @Consumes(MediaType.APPLICATION_JSON)
     @Produces(MediaType.APPLICATION_JSON)
     @Path("/resources/{resourceId}/capabilities/{capabilityId}")
-    @Operation(description = "Delete capability from resource", method = "DELETE",
-            summary = "Delete capability from resource", responses = {@ApiResponse(
-            content = @Content(array = @ArraySchema(schema = @Schema(implementation = CapabilityDefinition.class)))),
-            @ApiResponse(responseCode = "201", description = "Delete capability"),
-            @ApiResponse(responseCode = "403", description = "Restricted operation"),
-            @ApiResponse(responseCode = "400", description = "Invalid content / Missing content")})
-    @PermissionAllowed(AafPermission.PermNames.INTERNAL_ALL_VALUE)
-    public Response deleteCapabilityOnResource(
-            @Parameter(description = "capability Id") @PathParam("capabilityId") String capabilityId,
-            @Parameter(description = "Resource Id") @PathParam("resourceId") String resourceId,
-            @Context final HttpServletRequest request,
-            @HeaderParam(value = Constants.USER_ID_HEADER) String userId) {
+    @Operation(description = "Delete capability from resource", method = "DELETE", summary = "Delete capability from resource", responses = {
+        @ApiResponse(content = @Content(array = @ArraySchema(schema = @Schema(implementation = CapabilityDefinition.class)))),
+        @ApiResponse(responseCode = "201", description = "Delete capability"),
+        @ApiResponse(responseCode = "403", description = "Restricted operation"),
+        @ApiResponse(responseCode = "400", description = "Invalid content / Missing content")})
+    public Response deleteCapabilityOnResource(@Parameter(description = "capability Id") @PathParam("capabilityId") String capabilityId,
+                                               @Parameter(description = "Resource Id") @PathParam("resourceId") String resourceId,
+                                               @Context final HttpServletRequest request,
+                                               @HeaderParam(value = Constants.USER_ID_HEADER) String userId) {
         return delete(capabilityId, resourceId, request, userId);
     }
 
@@ -172,60 +148,46 @@ public class CapabilityServlet extends AbstractValidationsServlet {
     @Consumes(MediaType.APPLICATION_JSON)
     @Produces(MediaType.APPLICATION_JSON)
     @Path("/services/{serviceId}/capabilities")
-    @Operation(description = "Create Capabilities on service", method = "POST",
-            summary = "Create Capabilities on service", responses = {
-            @ApiResponse(content = @Content(array = @ArraySchema(schema = @Schema(implementation = Response.class)))),
-            @ApiResponse(responseCode = "201", description = "Create Capabilities"),
-            @ApiResponse(responseCode = "403", description = "Restricted operation"),
-            @ApiResponse(responseCode = "400", description = "Invalid content / Missing content"),
-            @ApiResponse(responseCode = "409", description = "Capability already exist")})
-    @PermissionAllowed(AafPermission.PermNames.INTERNAL_ALL_VALUE)
-    public Response createCapabilitiesOnService(
-            @Parameter(description = "Capability to create", required = true) String data,
-            @Parameter(description = "Service Id") @PathParam("serviceId") String serviceId,
-            @Context final HttpServletRequest request,
-            @HeaderParam(value = Constants.USER_ID_HEADER) String userId) {
-        return createOrUpdate(data, "services" , serviceId,
-                request, userId, false, "createCapabilities");
+    @Operation(description = "Create Capabilities on service", method = "POST", summary = "Create Capabilities on service", responses = {
+        @ApiResponse(content = @Content(array = @ArraySchema(schema = @Schema(implementation = Response.class)))),
+        @ApiResponse(responseCode = "201", description = "Create Capabilities"),
+        @ApiResponse(responseCode = "403", description = "Restricted operation"),
+        @ApiResponse(responseCode = "400", description = "Invalid content / Missing content"),
+        @ApiResponse(responseCode = "409", description = "Capability already exist")})
+    public Response createCapabilitiesOnService(@Parameter(description = "Capability to create", required = true) String data,
+                                                @Parameter(description = "Service Id") @PathParam("serviceId") String serviceId,
+                                                @Context final HttpServletRequest request,
+                                                @HeaderParam(value = Constants.USER_ID_HEADER) String userId) {
+        return createOrUpdate(data, "services", serviceId, request, userId, false, "createCapabilities");
     }
 
     @PUT
     @Consumes(MediaType.APPLICATION_JSON)
     @Produces(MediaType.APPLICATION_JSON)
     @Path("/services/{serviceId}/capabilities")
-    @Operation(description = "Update Capabilities on service", method = "PUT",
-            summary = "Update Capabilities on service", responses = {@ApiResponse(
-            content = @Content(array = @ArraySchema(schema = @Schema(implementation = CapabilityDefinition.class)))),
-            @ApiResponse(responseCode = "201", description = "Update Capabilities"),
-            @ApiResponse(responseCode = "403", description = "Restricted operation"),
-            @ApiResponse(responseCode = "400", description = "Invalid content / Missing content")})
-    @PermissionAllowed(AafPermission.PermNames.INTERNAL_ALL_VALUE)
-    public Response updateCapabilitiesOnService(
-            @Parameter(description = "Capabilities to update", required = true) String data,
-            @Parameter(description = "Component Id") @PathParam("serviceId") String serviceId,
-            @Context final HttpServletRequest request,
-            @HeaderParam(value = Constants.USER_ID_HEADER) String userId) {
-        return createOrUpdate(data, "services", serviceId,
-                request, userId, true, "updateCapabilities");
+    @Operation(description = "Update Capabilities on service", method = "PUT", summary = "Update Capabilities on service", responses = {
+        @ApiResponse(content = @Content(array = @ArraySchema(schema = @Schema(implementation = CapabilityDefinition.class)))),
+        @ApiResponse(responseCode = "201", description = "Update Capabilities"),
+        @ApiResponse(responseCode = "403", description = "Restricted operation"),
+        @ApiResponse(responseCode = "400", description = "Invalid content / Missing content")})
+    public Response updateCapabilitiesOnService(@Parameter(description = "Capabilities to update", required = true) String data,
+                                                @Parameter(description = "Component Id") @PathParam("serviceId") String serviceId,
+                                                @Context final HttpServletRequest request,
+                                                @HeaderParam(value = Constants.USER_ID_HEADER) String userId) {
+        return createOrUpdate(data, "services", serviceId, request, userId, true, "updateCapabilities");
     }
 
     @GET
     @Consumes(MediaType.APPLICATION_JSON)
     @Produces(MediaType.APPLICATION_JSON)
     @Path("/services/{serviceId}/capabilities/{capabilityId}")
-    @Operation(description = "Get Capability from service", method = "GET", summary = "GET Capability from service",
-            responses = {@ApiResponse(content = @Content(
-                    array = @ArraySchema(schema = @Schema(implementation = CapabilityDefinition.class)))),
-                    @ApiResponse(responseCode = "201", description = "GET Capability"),
-                    @ApiResponse(responseCode = "403", description = "Restricted operation"),
-                    @ApiResponse(responseCode = "400", description = "Invalid content / Missing content")})
-    @PermissionAllowed(AafPermission.PermNames.INTERNAL_ALL_VALUE)
-    public Response getCapabilityOnService(
-            @Parameter(description = "Service Id") @PathParam("serviceId") String serviceId,
-            @Parameter(description = "Capability Id") @PathParam("capabilityId") String capabilityId,
-            @Context final HttpServletRequest request,
-            @HeaderParam(value = Constants.USER_ID_HEADER) String userId) {
-
+    @Operation(description = "Get Capability from service", method = "GET", summary = "GET Capability from service", responses = {
+        @ApiResponse(content = @Content(array = @ArraySchema(schema = @Schema(implementation = CapabilityDefinition.class)))),
+        @ApiResponse(responseCode = "201", description = "GET Capability"), @ApiResponse(responseCode = "403", description = "Restricted operation"),
+        @ApiResponse(responseCode = "400", description = "Invalid content / Missing content")})
+    public Response getCapabilityOnService(@Parameter(description = "Service Id") @PathParam("serviceId") String serviceId,
+                                           @Parameter(description = "Capability Id") @PathParam("capabilityId") String capabilityId,
+                                           @Context final HttpServletRequest request, @HeaderParam(value = Constants.USER_ID_HEADER) String userId) {
         return get(capabilityId, serviceId, request, userId);
     }
 
@@ -233,56 +195,45 @@ public class CapabilityServlet extends AbstractValidationsServlet {
     @Consumes(MediaType.APPLICATION_JSON)
     @Produces(MediaType.APPLICATION_JSON)
     @Path("/services/{serviceId}/capabilities/{capabilityId}")
-    @Operation(description = "Delete capability from service", method = "DELETE",
-            summary = "Delete capability from service", responses = {@ApiResponse(
-            content = @Content(array = @ArraySchema(schema = @Schema(implementation = CapabilityDefinition.class)))),
-            @ApiResponse(responseCode = "201", description = "Delete capability"),
-            @ApiResponse(responseCode = "403", description = "Restricted operation"),
-            @ApiResponse(responseCode = "400", description = "Invalid content / Missing content")})
-    @PermissionAllowed(AafPermission.PermNames.INTERNAL_ALL_VALUE)
-    public Response deleteCapabilityOnService(
-            @Parameter(description = "capability Id") @PathParam("capabilityId") String capabilityId,
-            @Parameter(description = "Service Id") @PathParam("serviceId") String serviceId,
-            @Context final HttpServletRequest request,
-            @HeaderParam(value = Constants.USER_ID_HEADER) String userId) {
+    @Operation(description = "Delete capability from service", method = "DELETE", summary = "Delete capability from service", responses = {
+        @ApiResponse(content = @Content(array = @ArraySchema(schema = @Schema(implementation = CapabilityDefinition.class)))),
+        @ApiResponse(responseCode = "201", description = "Delete capability"),
+        @ApiResponse(responseCode = "403", description = "Restricted operation"),
+        @ApiResponse(responseCode = "400", description = "Invalid content / Missing content")})
+    public Response deleteCapabilityOnService(@Parameter(description = "capability Id") @PathParam("capabilityId") String capabilityId,
+                                              @Parameter(description = "Service Id") @PathParam("serviceId") String serviceId,
+                                              @Context final HttpServletRequest request,
+                                              @HeaderParam(value = Constants.USER_ID_HEADER) String userId) {
         return delete(capabilityId, serviceId, request, userId);
     }
 
-    private Response createOrUpdate (String data, String componentType, String componentId,
-                                     HttpServletRequest request,
-                                     String userId,
-                                     boolean isUpdate,
-                                     String errorContext) {
+    private Response createOrUpdate(String data, String componentType, String componentId, HttpServletRequest request, String userId,
+                                    boolean isUpdate, String errorContext) {
         ServletContext context = request.getSession().getServletContext();
         String url = request.getMethod() + " " + request.getRequestURI();
-
         User modifier = new User();
         modifier.setUserId(userId);
         LOGGER.debug("Start create or update request of {} with modifier id {}", url, userId);
         try {
             String componentIdLower = componentId.toLowerCase();
-
-            Either<List<CapabilityDefinition>, ResponseFormat> mappedCapabilitiesDataEither
-                    = getMappedCapabilitiesData(data, modifier, ComponentTypeEnum.findByParamName(componentType));
-            if(mappedCapabilitiesDataEither.isRight()) {
+            Either<List<CapabilityDefinition>, ResponseFormat> mappedCapabilitiesDataEither = getMappedCapabilitiesData(data, modifier,
+                ComponentTypeEnum.findByParamName(componentType));
+            if (mappedCapabilitiesDataEither.isRight()) {
                 LOGGER.error("Failed to create or update capabilities");
-                buildErrorResponse(mappedCapabilitiesDataEither.right().value());
+                return buildErrorResponse(mappedCapabilitiesDataEither.right().value());
             }
             List<CapabilityDefinition> mappedCapabilitiesData = mappedCapabilitiesDataEither.left().value();
             Either<List<CapabilityDefinition>, ResponseFormat> actionResponse;
-            if(isUpdate) {
-                actionResponse = capabilitiesBusinessLogic.updateCapabilities(componentIdLower,
-                        mappedCapabilitiesData, modifier, errorContext, true);
+            if (isUpdate) {
+                actionResponse = capabilitiesBusinessLogic.updateCapabilities(componentIdLower, mappedCapabilitiesData, modifier, errorContext, true);
             } else {
-                actionResponse = capabilitiesBusinessLogic.createCapabilities(componentIdLower,
-                        mappedCapabilitiesData, modifier, errorContext, true);
+                actionResponse = capabilitiesBusinessLogic.createCapabilities(componentIdLower, mappedCapabilitiesData, modifier, errorContext, true);
             }
             if (actionResponse.isRight()) {
                 LOGGER.error("Failed to create or update capabilities");
                 return buildErrorResponse(actionResponse.right().value());
             }
-            return buildOkResponse(getComponentsUtils().getResponseFormat(ActionStatus.OK),
-                    actionResponse.left().value());
+            return buildOkResponse(getComponentsUtils().getResponseFormat(ActionStatus.OK), actionResponse.left().value());
         } catch (Exception e) {
             BeEcompErrorManager.getInstance().logBeRestApiGeneralError("Capabilities create or update");
             LOGGER.error("Failed to create or update capabilities with an error", e);
@@ -290,20 +241,16 @@ public class CapabilityServlet extends AbstractValidationsServlet {
         }
     }
 
-    private Response get (String capabilityIdToGet,  String componentId,
-                          HttpServletRequest request, String userId){
+    private Response get(String capabilityIdToGet, String componentId, HttpServletRequest request, String userId) {
         ServletContext context = request.getSession().getServletContext();
         String url = request.getMethod() + " " + request.getRequestURI();
-
         User modifier = new User();
         modifier.setUserId(userId);
         LOGGER.debug("Start get request of {} with modifier id {}", url, userId);
-
         try {
             String componentIdLower = componentId.toLowerCase();
-
             Either<CapabilityDefinition, ResponseFormat> actionResponse = capabilitiesBusinessLogic
-                    .getCapability(componentIdLower, capabilityIdToGet, modifier, true);
+                .getCapability(componentIdLower, capabilityIdToGet, modifier, true);
             if (actionResponse.isRight()) {
                 LOGGER.error("failed to get capability");
                 return buildErrorResponse(actionResponse.right().value());
@@ -317,21 +264,16 @@ public class CapabilityServlet extends AbstractValidationsServlet {
         }
     }
 
-    private Response delete (String capabilityId, String componentId, HttpServletRequest
-            request, String userId){
-
+    private Response delete(String capabilityId, String componentId, HttpServletRequest request, String userId) {
         ServletContext context = request.getSession().getServletContext();
         String url = request.getMethod() + " " + request.getRequestURI();
-
         User modifier = new User();
         modifier.setUserId(userId);
         LOGGER.debug("Start delete request of {} with modifier id {}", url, userId);
-
         try {
             String componentIdLower = componentId.toLowerCase();
-
             Either<CapabilityDefinition, ResponseFormat> actionResponse = capabilitiesBusinessLogic
-                    .deleteCapability(componentIdLower, capabilityId, modifier, true);
+                .deleteCapability(componentIdLower, capabilityId, modifier, true);
             if (actionResponse.isRight()) {
                 LOGGER.error("failed to delete capability");
                 return buildErrorResponse(actionResponse.right().value());
@@ -346,14 +288,15 @@ public class CapabilityServlet extends AbstractValidationsServlet {
     }
 
     private Either<List<CapabilityDefinition>, ResponseFormat> getMappedCapabilitiesData(String inputJson, User user,
-                                                                 ComponentTypeEnum componentTypeEnum){
+                                                                                         ComponentTypeEnum componentTypeEnum) {
         Either<UiComponentDataTransfer, ResponseFormat> mappedData = getComponentsUtils()
-                .convertJsonToObjectUsingObjectMapper(inputJson, user, UiComponentDataTransfer.class,
-                        AuditingActionEnum.CREATE_RESOURCE, componentTypeEnum);
-        Optional<List<CapabilityDefinition>> capabilityDefinitionList =
-                mappedData.left().value().getCapabilities().values().stream().findFirst();
-        return capabilityDefinitionList.<Either<List<CapabilityDefinition>, ResponseFormat>>
-                map(Either::left).orElseGet(() -> Either.right(getComponentsUtils()
-                .getResponseFormat(ActionStatus.GENERAL_ERROR)));
+            .convertJsonToObjectUsingObjectMapper(inputJson, user, UiComponentDataTransfer.class, AuditingActionEnum.CREATE_RESOURCE,
+                componentTypeEnum);
+        if (mappedData.isRight()) {
+            return Either.right(getComponentsUtils().getResponseFormat(ActionStatus.INVALID_CONTENT));
+        }
+        Optional<List<CapabilityDefinition>> capabilityDefinitionList = mappedData.left().value().getCapabilities().values().stream().findFirst();
+        return capabilityDefinitionList.<Either<List<CapabilityDefinition>, ResponseFormat>>map(Either::left)
+            .orElseGet(() -> Either.right(getComponentsUtils().getResponseFormat(ActionStatus.GENERAL_ERROR)));
     }
 }