X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=catalog-be%2Fsrc%2Fmain%2Fjava%2Forg%2Fopenecomp%2Fsdc%2Fbe%2Fservlets%2FRequirementServlet.java;h=e84a463d7c8e2434f2713f091396e929cf2642d0;hb=5f3e9912406897ee18c424b940881ce08d59bb44;hp=fcfe37ac11d0a5bba8c42ce399f3fc7bda9b4e59;hpb=e020ca3c855ec9555213abfdd89e14d72310177d;p=sdc.git

diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/RequirementServlet.java b/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/RequirementServlet.java
index fcfe37ac11..e84a463d7c 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/RequirementServlet.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/RequirementServlet.java
@@ -46,8 +46,6 @@ import javax.ws.rs.core.Response;
 import org.openecomp.sdc.be.components.impl.ComponentInstanceBusinessLogic;
 import org.openecomp.sdc.be.components.impl.RequirementBusinessLogic;
 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;
@@ -57,7 +55,6 @@ import org.openecomp.sdc.be.model.RequirementDefinition;
 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;
@@ -76,10 +73,10 @@ public class RequirementServlet extends AbstractValidationsServlet {
     private final RequirementBusinessLogic requirementBusinessLogic;
 
     @Inject
-    public RequirementServlet(UserBusinessLogic userBusinessLogic, ComponentInstanceBusinessLogic componentInstanceBL,
+    public RequirementServlet(ComponentInstanceBusinessLogic componentInstanceBL,
                               ComponentsUtils componentsUtils, ServletUtils servletUtils, ResourceImportManager resourceImportManager,
                               RequirementBusinessLogic requirementBusinessLogic) {
-        super(userBusinessLogic, componentInstanceBL, componentsUtils, servletUtils, resourceImportManager);
+        super(componentInstanceBL, componentsUtils, servletUtils, resourceImportManager);
         this.requirementBusinessLogic = requirementBusinessLogic;
     }
 
@@ -93,7 +90,6 @@ public class RequirementServlet extends AbstractValidationsServlet {
         @ApiResponse(responseCode = "403", description = "Restricted operation"),
         @ApiResponse(responseCode = "400", description = "Invalid content / Missing content"),
         @ApiResponse(responseCode = "409", description = "requirement already exist")})
-    @PermissionAllowed(AafPermission.PermNames.INTERNAL_ALL_VALUE)
     public Response createRequirementsOnResource(@Parameter(description = "Requirement to create", required = true) String data,
                                                  @Parameter(description = "Resource Id") @PathParam("resourceId") String resourceId,
                                                  @Context final HttpServletRequest request,
@@ -110,7 +106,6 @@ public class RequirementServlet extends AbstractValidationsServlet {
         @ApiResponse(responseCode = "201", description = "Update Requirements"),
         @ApiResponse(responseCode = "403", description = "Restricted operation"),
         @ApiResponse(responseCode = "400", description = "Invalid content / Missing content")})
-    @PermissionAllowed(AafPermission.PermNames.INTERNAL_ALL_VALUE)
     public Response updateRequirementsOnResource(@Parameter(description = "Requirements to update", required = true) String data,
                                                  @Parameter(description = "Component Id") @PathParam("resourceId") String resourceId,
                                                  @Context final HttpServletRequest request,
@@ -126,7 +121,6 @@ public class RequirementServlet extends AbstractValidationsServlet {
         @ApiResponse(content = @Content(array = @ArraySchema(schema = @Schema(implementation = RequirementDefinition.class)))),
         @ApiResponse(responseCode = "201", description = "GET requirement"), @ApiResponse(responseCode = "403", description = "Restricted operation"),
         @ApiResponse(responseCode = "400", description = "Invalid content / Missing content")})
-    @PermissionAllowed(AafPermission.PermNames.INTERNAL_ALL_VALUE)
     public Response getRequirementsFromResource(@Parameter(description = "Resource Id") @PathParam("resourceId") String resourceId,
                                                 @Parameter(description = "Requirement Id") @PathParam("requirementId") String requirementId,
                                                 @Context final HttpServletRequest request,
@@ -143,7 +137,6 @@ public class RequirementServlet extends AbstractValidationsServlet {
         @ApiResponse(responseCode = "201", description = "Delete requirement"),
         @ApiResponse(responseCode = "403", description = "Restricted operation"),
         @ApiResponse(responseCode = "400", description = "Invalid content / Missing content")})
-    @PermissionAllowed(AafPermission.PermNames.INTERNAL_ALL_VALUE)
     public Response deleteRequirementsFromResource(@Parameter(description = "Resource Id") @PathParam("resourceId") String resourceId,
                                                    @Parameter(description = "requirement Id") @PathParam("requirementId") String requirementId,
                                                    @Context final HttpServletRequest request,
@@ -161,7 +154,6 @@ public class RequirementServlet extends AbstractValidationsServlet {
         @ApiResponse(responseCode = "403", description = "Restricted operation"),
         @ApiResponse(responseCode = "400", description = "Invalid content / Missing content"),
         @ApiResponse(responseCode = "409", description = "Requirement already exist")})
-    @PermissionAllowed(AafPermission.PermNames.INTERNAL_ALL_VALUE)
     public Response createRequirementsOnService(@Parameter(description = "Requirements to create", required = true) String data,
                                                 @Parameter(description = "Service Id") @PathParam("serviceId") String serviceId,
                                                 @Context final HttpServletRequest request,
@@ -178,7 +170,6 @@ public class RequirementServlet extends AbstractValidationsServlet {
         @ApiResponse(responseCode = "201", description = "Update requirements"),
         @ApiResponse(responseCode = "403", description = "Restricted operation"),
         @ApiResponse(responseCode = "400", description = "Invalid content / Missing content")})
-    @PermissionAllowed(AafPermission.PermNames.INTERNAL_ALL_VALUE)
     public Response updateRequirementsOnService(@Parameter(description = "Requirements to update", required = true) String data,
                                                 @Parameter(description = "Component Id") @PathParam("serviceId") String serviceId,
                                                 @Context final HttpServletRequest request,
@@ -195,7 +186,6 @@ public class RequirementServlet extends AbstractValidationsServlet {
         @ApiResponse(responseCode = "201", description = "GET Requirements"),
         @ApiResponse(responseCode = "403", description = "Restricted operation"),
         @ApiResponse(responseCode = "400", description = "Invalid content / Missing content")})
-    @PermissionAllowed(AafPermission.PermNames.INTERNAL_ALL_VALUE)
     public Response getRequirementsOnService(@Parameter(description = "Service Id") @PathParam("serviceId") String serviceId,
                                              @Parameter(description = "Requirement Id") @PathParam("requirementId") String requirementId,
                                              @Context final HttpServletRequest request,
@@ -212,7 +202,6 @@ public class RequirementServlet extends AbstractValidationsServlet {
         @ApiResponse(responseCode = "201", description = "Delete Requirements"),
         @ApiResponse(responseCode = "403", description = "Restricted operation"),
         @ApiResponse(responseCode = "400", description = "Invalid content / Missing content")})
-    @PermissionAllowed(AafPermission.PermNames.INTERNAL_ALL_VALUE)
     public Response deleteRequirementsOnService(@Parameter(description = "Service Id") @PathParam("serviceId") String serviceId,
                                                 @Parameter(description = "Requirement Id") @PathParam("requirementId") String requirementId,
                                                 @Context final HttpServletRequest request,