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

diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/GroupTypesEndpoint.java b/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/GroupTypesEndpoint.java
index 69c51a62df..6f77540236 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/GroupTypesEndpoint.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/GroupTypesEndpoint.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,7 +17,6 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.sdc.be.servlets;
 
 import com.jcabi.aspects.Loggable;
@@ -31,17 +30,7 @@ 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 org.openecomp.sdc.be.components.impl.GroupTypeBusinessLogic;
-import org.openecomp.sdc.be.components.impl.aaf.AafPermission;
-import org.openecomp.sdc.be.components.impl.aaf.PermissionAllowed;
-import org.openecomp.sdc.be.impl.ComponentsUtils;
-import org.openecomp.sdc.be.mixin.GroupTypeMixin;
-import org.openecomp.sdc.be.model.GroupTypeDefinition;
-import org.openecomp.sdc.be.user.UserBusinessLogic;
-import org.openecomp.sdc.be.view.ResponseView;
-import org.openecomp.sdc.common.api.Constants;
-import org.springframework.stereotype.Controller;
-
+import java.util.List;
 import javax.ws.rs.Consumes;
 import javax.ws.rs.GET;
 import javax.ws.rs.HeaderParam;
@@ -49,40 +38,48 @@ import javax.ws.rs.Path;
 import javax.ws.rs.Produces;
 import javax.ws.rs.QueryParam;
 import javax.ws.rs.core.MediaType;
-import java.util.List;
+import org.openecomp.sdc.be.components.impl.GroupTypeBusinessLogic;
+import org.openecomp.sdc.be.impl.ComponentsUtils;
+import org.openecomp.sdc.be.mixin.GroupTypeMixin;
+import org.openecomp.sdc.be.model.GroupTypeDefinition;
+import org.openecomp.sdc.be.view.ResponseView;
+import org.openecomp.sdc.common.api.Constants;
+import org.openecomp.sdc.common.util.ValidationUtils;
+import org.springframework.stereotype.Controller;
 
 @Loggable(prepend = true, value = Loggable.DEBUG, trim = false)
 @Path("/v1/catalog")
-@Tags({@Tag(name = "SDC Internal APIs")})
+@Tags({@Tag(name = "SDCE-2 APIs")})
 @Servers({@Server(url = "/sdc2/rest")})
 @Controller
 @Consumes(MediaType.APPLICATION_JSON)
 @Produces(MediaType.APPLICATION_JSON)
-public class GroupTypesEndpoint extends BeGenericServlet{
+public class GroupTypesEndpoint extends BeGenericServlet {
 
     private final GroupTypeBusinessLogic groupTypeBusinessLogic;
 
-    public GroupTypesEndpoint(UserBusinessLogic userBusinessLogic,
-        ComponentsUtils componentsUtils, GroupTypeBusinessLogic groupTypeBusinessLogic) {
-        super(userBusinessLogic, componentsUtils);
+    public GroupTypesEndpoint(ComponentsUtils componentsUtils, GroupTypeBusinessLogic groupTypeBusinessLogic) {
+        super(componentsUtils);
         this.groupTypeBusinessLogic = groupTypeBusinessLogic;
     }
 
     @GET
     @Path("/groupTypes")
     @Operation(description = "Get group types ", method = "GET", summary = "Returns group types", responses = {
-            @ApiResponse(content = @Content(
-                    array = @ArraySchema(schema = @Schema(implementation = GroupTypeDefinition.class)))),
-            @ApiResponse(responseCode = "200", description = "group types found"), @ApiResponse(responseCode = "400",
-            description = "field name invalid type/length, characters;  mandatory field is absent, already exists (name)"),
-            @ApiResponse(responseCode = "403", description = "Restricted operation"),
-            @ApiResponse(responseCode = "500", description = "Internal Error")})
+        @ApiResponse(content = @Content(array = @ArraySchema(schema = @Schema(implementation = GroupTypeDefinition.class)))),
+        @ApiResponse(responseCode = "200", description = "group types found"),
+        @ApiResponse(responseCode = "400", description = "field name invalid type/length, characters;  mandatory field is absent, already exists (name)"),
+        @ApiResponse(responseCode = "403", description = "Restricted operation"), @ApiResponse(responseCode = "500", description = "Internal Error")})
     @ResponseView(mixin = {GroupTypeMixin.class})
-    @PermissionAllowed(AafPermission.PermNames.INTERNAL_ALL_VALUE)
     public List<GroupTypeDefinition> getGroupTypes(@HeaderParam(value = Constants.USER_ID_HEADER) String userId,
-            @Parameter(
-                    description = "An optional parameter to indicate the type of the container from where this call is executed") @QueryParam("internalComponentType") String internalComponentType) {
-        return groupTypeBusinessLogic.getAllGroupTypes(userId, internalComponentType);
+                                                   @Parameter(description =
+                                                       "An optional parameter to indicate the type of the container from where this call is executed")
+                                                   @QueryParam("internalComponentType") String internalComponentType,
+                                                   @QueryParam("componentModel") String internalComponentModel) {
+        if (internalComponentModel != null) {
+            internalComponentModel = ValidationUtils.sanitizeInputString(internalComponentModel.trim());
+        }
+        return groupTypeBusinessLogic
+            .getAllGroupTypes(userId, internalComponentType, internalComponentModel);
     }
-
 }