1 files changed, 55 insertions, 67 deletions
diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/src/main/java/org/openecomp/sdcrests/vendorlicense/rest/VendorLicenseModels.java b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/src/main/java/org/openecomp/sdcrests/vendorlicense/rest/VendorLicenseModels.java
index 3778129f7f..0636b6e599 100644
--- a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/src/main/java/org/openecomp/sdcrests/vendorlicense/rest/VendorLicenseModels.java
+++ b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/src/main/java/org/openecomp/sdcrests/vendorlicense/rest/VendorLicenseModels.java
@@ -13,19 +13,32 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
-
 package org.openecomp.sdcrests.vendorlicense.rest;
 
+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 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.QueryParam;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
 import org.openecomp.sdcrests.common.RestConstants;
 import org.openecomp.sdcrests.item.types.ItemDto;
 import org.openecomp.sdcrests.vendorlicense.types.VendorLicenseModelActionRequestDto;
@@ -33,15 +46,6 @@ import org.openecomp.sdcrests.vendorlicense.types.VendorLicenseModelEntityDto;
 import org.openecomp.sdcrests.vendorlicense.types.VendorLicenseModelRequestDto;
 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 static org.openecomp.sdcrests.common.RestConstants.USER_MISSING_ERROR_MSG;
-
-
 @Path("/v1.0/vendor-license-models")
 @Produces(MediaType.APPLICATION_JSON)
 @Consumes(MediaType.APPLICATION_JSON)
@@ -49,64 +53,48 @@ import static org.openecomp.sdcrests.common.RestConstants.USER_MISSING_ERROR_MSG
 @Validated
 public interface VendorLicenseModels {
 
-  @GET
-  @Path("/")
-  @Operation(description = "List vendor license models", responses = @ApiResponse(content = @Content(array = @ArraySchema( schema = @Schema(implementation=ItemDto.class)))))
-  Response listLicenseModels(@Parameter(description = "Filter to return only Vendor License Models with at" +
-                            " least one version at this status. Currently supported values: 'Certified' , 'Draft'")
-                            @QueryParam("versionFilter") String versionStatus,
-                            @Parameter(description = "Filter to only return Vendor License Models at this status." +
-                            "Currently supported values: 'ACTIVE' , 'ARCHIVED'." +
-                            "Default value = 'ACTIVE'.")
-                            @QueryParam("Status") String itemStatus,
-                            @NotNull(message = USER_MISSING_ERROR_MSG)
-                            @HeaderParam(RestConstants.USER_ID_HEADER_PARAM) String user);
-
-  @POST
-  @Path("/")
-  @Operation(description = "Create vendor license model")
-  Response createLicenseModel(@Valid VendorLicenseModelRequestDto request,
-                              @NotNull(message = USER_MISSING_ERROR_MSG)
-                              @HeaderParam(RestConstants.USER_ID_HEADER_PARAM) String user);
+    @GET
+    @Path("/")
+    @Operation(description = "List vendor license models", responses = @ApiResponse(content = @Content(array = @ArraySchema(schema = @Schema(implementation = ItemDto.class)))))
+    Response listLicenseModels(@Parameter(description = "Filter to return only Vendor License Models with at"
+        + " least one version at this status. Currently supported values: 'Certified' , 'Draft'") @QueryParam("versionFilter") String versionStatus,
+                               @Parameter(description = "Filter to only return Vendor License Models at this status."
+                                   + "Currently supported values: 'ACTIVE' , 'ARCHIVED'."
+                                   + "Default value = 'ACTIVE'.") @QueryParam("Status") String itemStatus,
+                               @NotNull(message = USER_MISSING_ERROR_MSG) @HeaderParam(RestConstants.USER_ID_HEADER_PARAM) String user);
 
-  @DELETE
-  @Path("/{vlmId}")
-  @Operation(description = "Delete vendor license model")
-  Response deleteLicenseModel(
-            @Parameter(description = "Vendor license model Id") @PathParam("vlmId") String vlmId,
-            @NotNull(message = USER_MISSING_ERROR_MSG) @HeaderParam(RestConstants.USER_ID_HEADER_PARAM)
-                    String user);
+    @POST
+    @Path("/")
+    @Operation(description = "Create vendor license model")
+    Response createLicenseModel(@Valid VendorLicenseModelRequestDto request,
+                                @NotNull(message = USER_MISSING_ERROR_MSG) @HeaderParam(RestConstants.USER_ID_HEADER_PARAM) String user);
 
-  @PUT
-  @Path("/{vlmId}/versions/{versionId}")
-  @Operation(description = "Update vendor license model")
-  Response updateLicenseModel(@Valid VendorLicenseModelRequestDto request,
-                              @Parameter(description = "Vendor license model Id")
-                              @PathParam("vlmId") String vlmId,
-                              @Parameter(description = "Vendor license model version Id")
-                              @PathParam("versionId") String versionId,
-                              @NotNull(message = USER_MISSING_ERROR_MSG)
-                              @HeaderParam(RestConstants.USER_ID_HEADER_PARAM) String user);
+    @DELETE
+    @Path("/{vlmId}")
+    @Operation(description = "Delete vendor license model")
+    Response deleteLicenseModel(@Parameter(description = "Vendor license model Id") @PathParam("vlmId") String vlmId,
+                                @NotNull(message = USER_MISSING_ERROR_MSG) @HeaderParam(RestConstants.USER_ID_HEADER_PARAM) String user);
 
-  @GET
-  @Path("/{vlmId}/versions/{versionId}")
-  @Operation(description = "Get vendor license model", responses = @ApiResponse(content = @Content(schema = @Schema(implementation=VendorLicenseModelEntityDto.class))))
-  Response getLicenseModel(
-      @Parameter(description = "Vendor license model Id") @PathParam("vlmId") String vlmId,
-      @Parameter(description = "Vendor license model version Id") @PathParam
-          ("versionId") String versionId,
-      @NotNull(message = USER_MISSING_ERROR_MSG) @HeaderParam(RestConstants.USER_ID_HEADER_PARAM)
-          String user);
+    @PUT
+    @Path("/{vlmId}/versions/{versionId}")
+    @Operation(description = "Update vendor license model")
+    Response updateLicenseModel(@Valid VendorLicenseModelRequestDto request,
+                                @Parameter(description = "Vendor license model Id") @PathParam("vlmId") String vlmId,
+                                @Parameter(description = "Vendor license model version Id") @PathParam("versionId") String versionId,
+                                @NotNull(message = USER_MISSING_ERROR_MSG) @HeaderParam(RestConstants.USER_ID_HEADER_PARAM) String user);
 
+    @GET
+    @Path("/{vlmId}/versions/{versionId}")
+    @Operation(description = "Get vendor license model", responses = @ApiResponse(content = @Content(schema = @Schema(implementation = VendorLicenseModelEntityDto.class))))
+    Response getLicenseModel(@Parameter(description = "Vendor license model Id") @PathParam("vlmId") String vlmId,
+                             @Parameter(description = "Vendor license model version Id") @PathParam("versionId") String versionId,
+                             @NotNull(message = USER_MISSING_ERROR_MSG) @HeaderParam(RestConstants.USER_ID_HEADER_PARAM) String user);
 
-  @PUT
-  @Path("/{vlmId}/versions/{versionId}/actions")
-  @Operation(description = "Update vendor license model")
-  Response actOnLicenseModel(@Valid VendorLicenseModelActionRequestDto request,
-                             @Parameter(description = "Vendor license model Id") @PathParam("vlmId")
-                                 String vlmId,
-                             @Parameter(description = "Vendor license model version Id") @PathParam
-                                 ("versionId") String versionId,
-                             @NotNull(message = USER_MISSING_ERROR_MSG)
-                             @HeaderParam(RestConstants.USER_ID_HEADER_PARAM) String user);
+    @PUT
+    @Path("/{vlmId}/versions/{versionId}/actions")
+    @Operation(description = "Update vendor license model")
+    Response actOnLicenseModel(@Valid VendorLicenseModelActionRequestDto request,
+                               @Parameter(description = "Vendor license model Id") @PathParam("vlmId") String vlmId,
+                               @Parameter(description = "Vendor license model version Id") @PathParam("versionId") String versionId,
+                               @NotNull(message = USER_MISSING_ERROR_MSG) @HeaderParam(RestConstants.USER_ID_HEADER_PARAM) String user);
 }