1 files changed, 72 insertions, 84 deletions
diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vendor-software-products-rest-services/src/main/java/org/openecomp/sdcrests/vsp/rest/Components.java b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vendor-software-products-rest-services/src/main/java/org/openecomp/sdcrests/vsp/rest/Components.java
index fa0ecbdcbe..ccad46bb3e 100644
--- a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vendor-software-products-rest-services/src/main/java/org/openecomp/sdcrests/vsp/rest/Components.java
+++ b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vendor-software-products-rest-services/src/main/java/org/openecomp/sdcrests/vsp/rest/Components.java
@@ -17,18 +17,33 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.sdcrests.vsp.rest;
 
+import static org.openecomp.sdcrests.common.RestConstants.USER_ID_HEADER_PARAM;
+import static org.openecomp.sdcrests.common.RestConstants.USER_MISSING_ERROR_MSG;
+
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.info.Info;
 import io.swagger.v3.oas.annotations.media.ArraySchema;
 import io.swagger.v3.oas.annotations.media.Content;
 import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.responses.ApiResponse;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import io.swagger.v3.oas.annotations.tags.Tags;
+import java.util.List;
+import javax.validation.Valid;
+import javax.validation.constraints.NotNull;
+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.MediaType;
+import javax.ws.rs.core.Response;
 import org.openecomp.sdc.vendorsoftwareproduct.types.composition.ComponentData;
 import org.openecomp.sdcrests.vendorsoftwareproducts.types.ComponentDto;
 import org.openecomp.sdcrests.vendorsoftwareproducts.types.ComponentRequestDto;
@@ -36,99 +51,72 @@ import org.openecomp.sdcrests.vendorsoftwareproducts.types.QuestionnaireResponse
 import org.openecomp.sdcrests.vendorsoftwareproducts.types.validation.IsValidJson;
 import org.springframework.validation.annotation.Validated;
 
-import javax.validation.Valid;
-import javax.validation.constraints.NotNull;
-import javax.ws.rs.*;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-
-import java.util.List;
-
-import static org.openecomp.sdcrests.common.RestConstants.USER_ID_HEADER_PARAM;
-import static org.openecomp.sdcrests.common.RestConstants.USER_MISSING_ERROR_MSG;
-
 @Path("/v1.0/vendor-software-products/{vspId}/versions/{versionId}/components")
 @Produces(MediaType.APPLICATION_JSON)
 @Consumes(MediaType.APPLICATION_JSON)
 @Tags({@Tag(name = "SDCE-1 APIs"), @Tag(name = "Vendor Software Product Components")})
 @Validated
 public interface Components extends VspEntities {
-  @GET
-  @Path("/")
-  @Operation(description = "List vendor software product components", responses = @ApiResponse(content = @Content(array = @ArraySchema(schema = @Schema(implementation = ComponentDto.class)))))
-  Response list(@Parameter(description = "Vendor software product Id") @PathParam("vspId") String vspId,
-                @Parameter(description = "Version Id") @PathParam("versionId") String versionId,
-                @NotNull(message = USER_MISSING_ERROR_MSG) @HeaderParam(USER_ID_HEADER_PARAM)
-                    String user);
-
-  @DELETE
-  @Path("/")
-  @Operation(description = "Delete vendor software product components", responses = @ApiResponse(content = @Content(schema = @Schema(implementation = List.class))))
-  Response deleteList(
-      @Parameter(description = "Vendor software product Id") @PathParam("vspId") String vspId,
-      @Parameter(description = "Version Id") @PathParam("versionId") String versionId,
-      @NotNull(message = USER_MISSING_ERROR_MSG) @HeaderParam(USER_ID_HEADER_PARAM) String user);
 
-  @POST
-  @Path("/")
-  @Operation(description = "Create a vendor software product component")
-  Response create(@Valid ComponentRequestDto request,
-                  @Parameter(description = "Vendor software product Id") @PathParam("vspId") String vspId,
+    @GET
+    @Path("/")
+    @Operation(description = "List vendor software product components", responses = @ApiResponse(content = @Content(array = @ArraySchema(schema = @Schema(implementation = ComponentDto.class)))))
+    Response list(@Parameter(description = "Vendor software product Id") @PathParam("vspId") String vspId,
                   @Parameter(description = "Version Id") @PathParam("versionId") String versionId,
-                  @NotNull(message = USER_MISSING_ERROR_MSG) @HeaderParam(USER_ID_HEADER_PARAM)
-                      String user);
+                  @NotNull(message = USER_MISSING_ERROR_MSG) @HeaderParam(USER_ID_HEADER_PARAM) String user);
 
-  @GET
-  @Path("/{componentId}")
-  @Operation(description = "Get vendor software product component", responses = @ApiResponse(content = @Content(schema = @Schema(implementation =ComponentData.class))))
-  Response get(@Parameter(description = "Vendor software product Id") @PathParam("vspId") String vspId,
-               @Parameter(description = "Version Id") @PathParam("versionId") String versionId,
-               @Parameter(description = "Vendor software product component Id")
-               @PathParam("componentId") String componentId,
-               @NotNull(message = USER_MISSING_ERROR_MSG) @HeaderParam(USER_ID_HEADER_PARAM)
-                   String user);
+    @DELETE
+    @Path("/")
+    @Operation(description = "Delete vendor software product components", responses = @ApiResponse(content = @Content(schema = @Schema(implementation = List.class))))
+    Response deleteList(@Parameter(description = "Vendor software product Id") @PathParam("vspId") String vspId,
+                        @Parameter(description = "Version Id") @PathParam("versionId") String versionId,
+                        @NotNull(message = USER_MISSING_ERROR_MSG) @HeaderParam(USER_ID_HEADER_PARAM) String user);
 
-  @DELETE
-  @Path("/{componentId}")
-  @Operation(description = "Delete vendor software product component")
-  Response delete(@Parameter(description = "Vendor software product Id") @PathParam("vspId") String vspId,
-                  @Parameter(description = "Version Id") @PathParam("versionId") String versionId,
-                  @Parameter(description = "Vendor software product component Id")
-                  @PathParam("componentId") String componentId,
-                  @NotNull(message = USER_MISSING_ERROR_MSG) @HeaderParam(USER_ID_HEADER_PARAM)
-                      String user);
+    @POST
+    @Path("/")
+    @Operation(description = "Create a vendor software product component")
+    Response create(@Valid ComponentRequestDto request, @Parameter(description = "Vendor software product Id") @PathParam("vspId") String vspId,
+                    @Parameter(description = "Version Id") @PathParam("versionId") String versionId,
+                    @NotNull(message = USER_MISSING_ERROR_MSG) @HeaderParam(USER_ID_HEADER_PARAM) String user);
 
-  @PUT
-  @Path("/{componentId}")
-  @Operation(description = "Update vendor software product component")
-  Response update(@Valid ComponentRequestDto request,
-                  @Parameter(description = "Vendor software product Id") @PathParam("vspId") String vspId,
-                  @Parameter(description = "Version Id") @PathParam("versionId") String versionId,
-                  @Parameter(description = "Vendor software product component Id")
-                  @PathParam("componentId") String componentId,
-                  @NotNull(message = USER_MISSING_ERROR_MSG) @HeaderParam(USER_ID_HEADER_PARAM)
-                      String user);
+    @GET
+    @Path("/{componentId}")
+    @Operation(description = "Get vendor software product component", responses = @ApiResponse(content = @Content(schema = @Schema(implementation = ComponentData.class))))
+    Response get(@Parameter(description = "Vendor software product Id") @PathParam("vspId") String vspId,
+                 @Parameter(description = "Version Id") @PathParam("versionId") String versionId,
+                 @Parameter(description = "Vendor software product component Id") @PathParam("componentId") String componentId,
+                 @NotNull(message = USER_MISSING_ERROR_MSG) @HeaderParam(USER_ID_HEADER_PARAM) String user);
+
+    @DELETE
+    @Path("/{componentId}")
+    @Operation(description = "Delete vendor software product component")
+    Response delete(@Parameter(description = "Vendor software product Id") @PathParam("vspId") String vspId,
+                    @Parameter(description = "Version Id") @PathParam("versionId") String versionId,
+                    @Parameter(description = "Vendor software product component Id") @PathParam("componentId") String componentId,
+                    @NotNull(message = USER_MISSING_ERROR_MSG) @HeaderParam(USER_ID_HEADER_PARAM) String user);
+
+    @PUT
+    @Path("/{componentId}")
+    @Operation(description = "Update vendor software product component")
+    Response update(@Valid ComponentRequestDto request, @Parameter(description = "Vendor software product Id") @PathParam("vspId") String vspId,
+                    @Parameter(description = "Version Id") @PathParam("versionId") String versionId,
+                    @Parameter(description = "Vendor software product component Id") @PathParam("componentId") String componentId,
+                    @NotNull(message = USER_MISSING_ERROR_MSG) @HeaderParam(USER_ID_HEADER_PARAM) String user);
 
-  @GET
-  @Path("/{componentId}/questionnaire")
-  @Operation(description = "Get vendor software product component questionnaire",responses = @ApiResponse(content = @Content(schema = @Schema(implementation =QuestionnaireResponseDto.class))))
-  Response getQuestionnaire(
-      @Parameter(description = "Vendor software product Id") @PathParam("vspId") String vspId,
-      @Parameter(description = "Version Id") @PathParam("versionId") String versionId,
-      @Parameter(description = "Vendor software product component Id")
-      @PathParam("componentId") String componentId,
-      @NotNull(message = USER_MISSING_ERROR_MSG) @HeaderParam(USER_ID_HEADER_PARAM) String user);
+    @GET
+    @Path("/{componentId}/questionnaire")
+    @Operation(description = "Get vendor software product component questionnaire", responses = @ApiResponse(content = @Content(schema = @Schema(implementation = QuestionnaireResponseDto.class))))
+    Response getQuestionnaire(@Parameter(description = "Vendor software product Id") @PathParam("vspId") String vspId,
+                              @Parameter(description = "Version Id") @PathParam("versionId") String versionId,
+                              @Parameter(description = "Vendor software product component Id") @PathParam("componentId") String componentId,
+                              @NotNull(message = USER_MISSING_ERROR_MSG) @HeaderParam(USER_ID_HEADER_PARAM) String user);
 
-  @PUT
-  @Path("/{componentId}/questionnaire")
-  @Operation(description = "Update vendor software product component questionnaire")
-  Response updateQuestionnaire(@NotNull @IsValidJson String questionnaireData,
-                               @Parameter(description = "Vendor software product Id") @PathParam("vspId")
-                                   String vspId,
-                               @Parameter(description = "Version Id") @PathParam("versionId")
-                                   String versionId,
-                               @Parameter(description = "Vendor software product component Id")
-                               @PathParam("componentId") String componentId,
-                               @NotNull(message = USER_MISSING_ERROR_MSG)
-                               @HeaderParam(USER_ID_HEADER_PARAM) String user);
+    @PUT
+    @Path("/{componentId}/questionnaire")
+    @Operation(description = "Update vendor software product component questionnaire")
+    Response updateQuestionnaire(@NotNull @IsValidJson String questionnaireData,
+                                 @Parameter(description = "Vendor software product Id") @PathParam("vspId") String vspId,
+                                 @Parameter(description = "Version Id") @PathParam("versionId") String versionId,
+                                 @Parameter(description = "Vendor software product component Id") @PathParam("componentId") String componentId,
+                                 @NotNull(message = USER_MISSING_ERROR_MSG) @HeaderParam(USER_ID_HEADER_PARAM) String user);
 }