1 files changed, 96 insertions, 114 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/services/ImagesImpl.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/services/ImagesImpl.java
index 7971b48427..350630c0aa 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/services/ImagesImpl.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/services/ImagesImpl.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,10 +17,11 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.sdcrests.vsp.rest.services;
 
-
+import java.util.Collection;
+import javax.inject.Named;
+import javax.ws.rs.core.Response;
 import org.apache.commons.collections.CollectionUtils;
 import org.openecomp.sdc.vendorsoftwareproduct.ComponentManager;
 import org.openecomp.sdc.vendorsoftwareproduct.ComponentManagerFactory;
@@ -32,135 +33,116 @@ import org.openecomp.sdc.vendorsoftwareproduct.types.QuestionnaireResponse;
 import org.openecomp.sdc.vendorsoftwareproduct.types.composition.CompositionEntityValidationData;
 import org.openecomp.sdc.vendorsoftwareproduct.types.composition.Image;
 import org.openecomp.sdc.versioning.dao.types.Version;
-import org.openecomp.sdcrests.vendorsoftwareproducts.types.*;
+import org.openecomp.sdcrests.vendorsoftwareproducts.types.CompositionEntityValidationDataDto;
+import org.openecomp.sdcrests.vendorsoftwareproducts.types.ImageCreationDto;
+import org.openecomp.sdcrests.vendorsoftwareproducts.types.ImageDto;
+import org.openecomp.sdcrests.vendorsoftwareproducts.types.ImageRequestDto;
+import org.openecomp.sdcrests.vendorsoftwareproducts.types.QuestionnaireResponseDto;
 import org.openecomp.sdcrests.vsp.rest.Images;
-import org.openecomp.sdcrests.vsp.rest.mapping.*;
+import org.openecomp.sdcrests.vsp.rest.mapping.MapCompositionEntityValidationDataToDto;
+import org.openecomp.sdcrests.vsp.rest.mapping.MapImageEntityToImageCreationDto;
+import org.openecomp.sdcrests.vsp.rest.mapping.MapImageEntityToImageDto;
+import org.openecomp.sdcrests.vsp.rest.mapping.MapImageRequestDtoToImageEntity;
+import org.openecomp.sdcrests.vsp.rest.mapping.MapQuestionnaireResponseToQuestionnaireResponseDto;
 import org.openecomp.sdcrests.wrappers.GenericCollectionWrapper;
 import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Service;
 
-import javax.inject.Named;
-import javax.ws.rs.core.Response;
-import java.util.Collection;
-
-
 @Named
 @Service("images")
 @Scope(value = "prototype")
 public class ImagesImpl implements Images {
 
-  private final ImageManager imageManager;
-  private final ComponentManager componentManager;
-
-  public ImagesImpl() {
-    this.imageManager = ImageManagerFactory.getInstance().createInterface();
-    this.componentManager =
-        ComponentManagerFactory.getInstance().createInterface();
-  }
-
-  public ImagesImpl(ImageManager imageManager, ComponentManager componentManager) {
-    this.imageManager = imageManager;
-    this.componentManager = componentManager;
-  }
-
-  @Override
-  public Response create(ImageRequestDto request, String vspId, String versionId,
-                         String componentId, String user) {
-    ImageEntity image =
-        new MapImageRequestDtoToImageEntity().applyMapping(request, ImageEntity.class);
-    image.setVspId(vspId);
-    image.setComponentId(componentId);
-    image.setVersion(new Version(versionId));
-    componentManager.validateComponentExistence(vspId, image.getVersion(), componentId);
-    ImageEntity createdImage = imageManager.createImage(image);
-    MapImageEntityToImageCreationDto mapping = new MapImageEntityToImageCreationDto();
-    ImageCreationDto createdImageDto = mapping.applyMapping(createdImage, ImageCreationDto.class);
-    return Response
-        .ok(createdImage != null ? createdImageDto : null)
-        .build();
-  }
+    private final ImageManager imageManager;
+    private final ComponentManager componentManager;
 
-  @Override
-  public Response getImageSchema(String vspId, String versionId, String componentId, String user) {
-    CompositionEntityResponse<Image> response = imageManager.getImageSchema(vspId);
-    return Response.ok(response).build();
-  }
-
-  @Override
-  public Response get(String vspId, String versionId, String componentId, String imageId,
-                      String user) {
-    Version version = new Version(versionId);
-    componentManager.validateComponentExistence(vspId, version, componentId);
-    CompositionEntityResponse<Image> response =
-        imageManager.getImage(vspId, version, componentId, imageId);
-
-    return Response.ok(response).build();
-  }
-
-  @Override
-  public Response list(String vspId, String versionId, String componentId, String user) {
-    Version vspVersion = new Version(versionId);
-    componentManager.validateComponentExistence(vspId, vspVersion, componentId);
-    Collection<ImageEntity> images = imageManager.listImages(vspId, vspVersion, componentId);
-
-    MapImageEntityToImageDto mapper = new MapImageEntityToImageDto();
-    GenericCollectionWrapper<ImageDto> results = new GenericCollectionWrapper<>();
-    for (ImageEntity image : images) {
-      results.add(mapper.applyMapping(image, ImageDto.class));
+    public ImagesImpl() {
+        this.imageManager = ImageManagerFactory.getInstance().createInterface();
+        this.componentManager = ComponentManagerFactory.getInstance().createInterface();
     }
 
-    return Response.ok(results).build();
-  }
+    public ImagesImpl(ImageManager imageManager, ComponentManager componentManager) {
+        this.imageManager = imageManager;
+        this.componentManager = componentManager;
+    }
 
-  @Override
-  public Response delete(String vspId, String versionId, String componentId, String imageId,
-                         String user) {
-    Version vspVersion = new Version(versionId);
-    componentManager.validateComponentExistence(vspId, vspVersion, componentId);
-    imageManager.deleteImage(vspId, vspVersion, componentId, imageId);
-    return Response.ok().build();
-  }
+    @Override
+    public Response create(ImageRequestDto request, String vspId, String versionId, String componentId, String user) {
+        ImageEntity image = new MapImageRequestDtoToImageEntity().applyMapping(request, ImageEntity.class);
+        image.setVspId(vspId);
+        image.setComponentId(componentId);
+        image.setVersion(new Version(versionId));
+        componentManager.validateComponentExistence(vspId, image.getVersion(), componentId);
+        ImageEntity createdImage = imageManager.createImage(image);
+        MapImageEntityToImageCreationDto mapping = new MapImageEntityToImageCreationDto();
+        ImageCreationDto createdImageDto = mapping.applyMapping(createdImage, ImageCreationDto.class);
+        return Response.ok(createdImage != null ? createdImageDto : null).build();
+    }
 
-  @Override
-  public Response update(ImageRequestDto request, String vspId, String versionId,
-                         String componentId, String imageId, String user) {
-    ImageEntity imageEntity = new MapImageRequestDtoToImageEntity().applyMapping(request,
-        ImageEntity.class);
-    imageEntity.setVspId(vspId);
-    imageEntity.setVersion(new Version(versionId));
-    imageEntity.setComponentId(componentId);
-    imageEntity.setId(imageId);
-    componentManager.validateComponentExistence(vspId, imageEntity.getVersion(), componentId);
+    @Override
+    public Response getImageSchema(String vspId, String versionId, String componentId, String user) {
+        CompositionEntityResponse<Image> response = imageManager.getImageSchema(vspId);
+        return Response.ok(response).build();
+    }
 
-    CompositionEntityValidationData validationData = imageManager.updateImage(imageEntity);
-    return validationData != null && CollectionUtils.isNotEmpty(validationData.getErrors())
-        ? Response.status(Response.Status.EXPECTATION_FAILED).entity(
-        new MapCompositionEntityValidationDataToDto()
-            .applyMapping(validationData, CompositionEntityValidationDataDto.class)).build() :
-        Response.ok().build();
-  }
+    @Override
+    public Response get(String vspId, String versionId, String componentId, String imageId, String user) {
+        Version version = new Version(versionId);
+        componentManager.validateComponentExistence(vspId, version, componentId);
+        CompositionEntityResponse<Image> response = imageManager.getImage(vspId, version, componentId, imageId);
+        return Response.ok(response).build();
+    }
 
-  @Override
-  public Response getQuestionnaire(String vspId, String versionId, String componentId,
-                                   String imageId, String user) {
-    Version vspVersion = new Version(versionId);
-    componentManager.validateComponentExistence(vspId, vspVersion, componentId);
-    QuestionnaireResponse questionnaireResponse =
-        imageManager.getImageQuestionnaire(vspId, vspVersion, componentId, imageId);
+    @Override
+    public Response list(String vspId, String versionId, String componentId, String user) {
+        Version vspVersion = new Version(versionId);
+        componentManager.validateComponentExistence(vspId, vspVersion, componentId);
+        Collection<ImageEntity> images = imageManager.listImages(vspId, vspVersion, componentId);
+        MapImageEntityToImageDto mapper = new MapImageEntityToImageDto();
+        GenericCollectionWrapper<ImageDto> results = new GenericCollectionWrapper<>();
+        for (ImageEntity image : images) {
+            results.add(mapper.applyMapping(image, ImageDto.class));
+        }
+        return Response.ok(results).build();
+    }
 
-    QuestionnaireResponseDto result = new MapQuestionnaireResponseToQuestionnaireResponseDto()
-        .applyMapping(questionnaireResponse, QuestionnaireResponseDto.class);
-    return Response.ok(result).build();
+    @Override
+    public Response delete(String vspId, String versionId, String componentId, String imageId, String user) {
+        Version vspVersion = new Version(versionId);
+        componentManager.validateComponentExistence(vspId, vspVersion, componentId);
+        imageManager.deleteImage(vspId, vspVersion, componentId, imageId);
+        return Response.ok().build();
+    }
 
-  }
+    @Override
+    public Response update(ImageRequestDto request, String vspId, String versionId, String componentId, String imageId, String user) {
+        ImageEntity imageEntity = new MapImageRequestDtoToImageEntity().applyMapping(request, ImageEntity.class);
+        imageEntity.setVspId(vspId);
+        imageEntity.setVersion(new Version(versionId));
+        imageEntity.setComponentId(componentId);
+        imageEntity.setId(imageId);
+        componentManager.validateComponentExistence(vspId, imageEntity.getVersion(), componentId);
+        CompositionEntityValidationData validationData = imageManager.updateImage(imageEntity);
+        return validationData != null && CollectionUtils.isNotEmpty(validationData.getErrors()) ? Response.status(Response.Status.EXPECTATION_FAILED)
+            .entity(new MapCompositionEntityValidationDataToDto().applyMapping(validationData, CompositionEntityValidationDataDto.class)).build()
+            : Response.ok().build();
+    }
 
-  @Override
-  public Response updateQuestionnaire(String questionnaireData, String vspId, String versionId,
-                                      String componentId, String imageId, String user) {
-    Version version = new Version(versionId);
-    componentManager.validateComponentExistence(vspId, version, componentId);
-    imageManager.updateImageQuestionnaire(vspId, version, componentId, imageId, questionnaireData);
-    return Response.ok().build();
-  }
+    @Override
+    public Response getQuestionnaire(String vspId, String versionId, String componentId, String imageId, String user) {
+        Version vspVersion = new Version(versionId);
+        componentManager.validateComponentExistence(vspId, vspVersion, componentId);
+        QuestionnaireResponse questionnaireResponse = imageManager.getImageQuestionnaire(vspId, vspVersion, componentId, imageId);
+        QuestionnaireResponseDto result = new MapQuestionnaireResponseToQuestionnaireResponseDto()
+            .applyMapping(questionnaireResponse, QuestionnaireResponseDto.class);
+        return Response.ok(result).build();
+    }
 
+    @Override
+    public Response updateQuestionnaire(String questionnaireData, String vspId, String versionId, String componentId, String imageId, String user) {
+        Version version = new Version(versionId);
+        componentManager.validateComponentExistence(vspId, version, componentId);
+        imageManager.updateImageQuestionnaire(vspId, version, componentId, imageId, questionnaireData);
+        return Response.ok().build();
+    }
 }