1 files changed, 24 insertions, 10 deletions
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/CapabilityServlet.java b/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/CapabilityServlet.java
index a1456bb65d..eacfbc774b 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/CapabilityServlet.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/CapabilityServlet.java
@@ -23,14 +23,21 @@ import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import io.swagger.annotations.ApiResponse;
 import io.swagger.annotations.ApiResponses;
+import javax.inject.Inject;
 import org.openecomp.sdc.be.components.impl.CapabilitiesBusinessLogic;
+import org.openecomp.sdc.be.components.impl.ComponentInstanceBusinessLogic;
+import org.openecomp.sdc.be.components.impl.GroupBusinessLogic;
+import org.openecomp.sdc.be.components.impl.ResourceImportManager;
 import org.openecomp.sdc.be.config.BeEcompErrorManager;
 import org.openecomp.sdc.be.dao.api.ActionStatus;
 import org.openecomp.sdc.be.datatypes.enums.ComponentTypeEnum;
+import org.openecomp.sdc.be.impl.ComponentsUtils;
+import org.openecomp.sdc.be.impl.ServletUtils;
 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;
@@ -52,6 +59,7 @@ import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 import java.util.List;
 import java.util.Optional;
+import org.springframework.beans.factory.annotation.Autowired;
 
 @Loggable(prepend = true, value = Loggable.DEBUG, trim = false)
 @Path("/v1/catalog")
@@ -61,6 +69,18 @@ import java.util.Optional;
 @Singleton
 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);
+        this.capabilitiesBusinessLogic = capabilitiesBusinessLogic;
+    }
+
 
     @POST
     @Consumes(MediaType.APPLICATION_JSON)
@@ -211,7 +231,6 @@ public class CapabilityServlet extends AbstractValidationsServlet {
                                      String userId,
                                      boolean isUpdate,
                                      String errorContext) {
-        ServletContext context = request.getSession().getServletContext();
         String url = request.getMethod() + " " + request.getRequestURI();
 
         User modifier = new User();
@@ -219,7 +238,6 @@ public class CapabilityServlet extends AbstractValidationsServlet {
         LOGGER.debug("Start create or update request of {} with modifier id {}", url, userId);
         try {
             String componentIdLower = componentId.toLowerCase();
-            CapabilitiesBusinessLogic businessLogic = getCapabilitiesBL(context);
 
             Either<List<CapabilityDefinition>, ResponseFormat> mappedCapabilitiesDataEither
                     = getMappedCapabilitiesData(data, modifier, ComponentTypeEnum.findByParamName(componentType));
@@ -230,10 +248,10 @@ public class CapabilityServlet extends AbstractValidationsServlet {
             List<CapabilityDefinition> mappedCapabilitiesData = mappedCapabilitiesDataEither.left().value();
             Either<List<CapabilityDefinition>, ResponseFormat> actionResponse;
             if(isUpdate) {
-                actionResponse = businessLogic.updateCapabilities(componentIdLower,
+                actionResponse = capabilitiesBusinessLogic.updateCapabilities(componentIdLower,
                         mappedCapabilitiesData, modifier, errorContext, true);
             } else {
-                actionResponse = businessLogic.createCapabilities(componentIdLower,
+                actionResponse = capabilitiesBusinessLogic.createCapabilities(componentIdLower,
                         mappedCapabilitiesData, modifier, errorContext, true);
             }
             if (actionResponse.isRight()) {
@@ -251,7 +269,6 @@ public class CapabilityServlet extends AbstractValidationsServlet {
 
     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();
@@ -260,9 +277,8 @@ public class CapabilityServlet extends AbstractValidationsServlet {
 
         try {
             String componentIdLower = componentId.toLowerCase();
-            CapabilitiesBusinessLogic businessLogic = getCapabilitiesBL(context);
 
-            Either<CapabilityDefinition, ResponseFormat> actionResponse = businessLogic
+            Either<CapabilityDefinition, ResponseFormat> actionResponse = capabilitiesBusinessLogic
                     .getCapability(componentIdLower, capabilityIdToGet, modifier, true);
             if (actionResponse.isRight()) {
                 LOGGER.error("failed to get capability");
@@ -280,7 +296,6 @@ public class CapabilityServlet extends AbstractValidationsServlet {
     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();
@@ -289,9 +304,8 @@ public class CapabilityServlet extends AbstractValidationsServlet {
 
         try {
             String componentIdLower = componentId.toLowerCase();
-            CapabilitiesBusinessLogic businessLogic = getCapabilitiesBL(context);
 
-            Either<CapabilityDefinition, ResponseFormat> actionResponse = businessLogic
+            Either<CapabilityDefinition, ResponseFormat> actionResponse = capabilitiesBusinessLogic
                     .deleteCapability(componentIdLower, capabilityId, modifier, true);
             if (actionResponse.isRight()) {
                 LOGGER.error("failed to delete capability");