1 files changed, 97 insertions, 116 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/ComputeImpl.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/ComputeImpl.java
index 1eea42803b..8c06629849 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/ComputeImpl.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/ComputeImpl.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,9 +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.collections4.CollectionUtils;
 import org.openecomp.sdc.vendorsoftwareproduct.ComponentManager;
 import org.openecomp.sdc.vendorsoftwareproduct.ComponentManagerFactory;
@@ -32,137 +34,116 @@ import org.openecomp.sdc.vendorsoftwareproduct.types.QuestionnaireResponse;
 import org.openecomp.sdc.vendorsoftwareproduct.types.composition.CompositionEntityValidationData;
 import org.openecomp.sdc.vendorsoftwareproduct.types.composition.ComputeData;
 import org.openecomp.sdc.versioning.dao.types.Version;
-import org.openecomp.sdcrests.vendorsoftwareproducts.types.*;
+import org.openecomp.sdcrests.vendorsoftwareproducts.types.CompositionEntityResponseDto;
+import org.openecomp.sdcrests.vendorsoftwareproducts.types.CompositionEntityValidationDataDto;
+import org.openecomp.sdcrests.vendorsoftwareproducts.types.ComputeCreationDto;
+import org.openecomp.sdcrests.vendorsoftwareproducts.types.ComputeDetailsDto;
+import org.openecomp.sdcrests.vendorsoftwareproducts.types.ComputeDto;
+import org.openecomp.sdcrests.vendorsoftwareproducts.types.QuestionnaireResponseDto;
 import org.openecomp.sdcrests.vsp.rest.Compute;
-import org.openecomp.sdcrests.vsp.rest.mapping.*;
+import org.openecomp.sdcrests.vsp.rest.mapping.MapCompositionEntityResponseToDto;
+import org.openecomp.sdcrests.vsp.rest.mapping.MapCompositionEntityValidationDataToDto;
+import org.openecomp.sdcrests.vsp.rest.mapping.MapComputeDataToComputeDetailsDto;
+import org.openecomp.sdcrests.vsp.rest.mapping.MapComputeDetailsDtoToComputeEntity;
+import org.openecomp.sdcrests.vsp.rest.mapping.MapComputeEntityToComputeCreationDto;
+import org.openecomp.sdcrests.vsp.rest.mapping.MapComputeEntityToComputeDto;
+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("computes")
 @Scope(value = "prototype")
 public class ComputeImpl implements Compute {
-  private final ComputeManager computetManager;
-  private final ComponentManager componentManager;
 
-  public ComputeImpl() {
-    this.computetManager = ComputeManagerFactory.getInstance().createInterface();
-    this.componentManager = ComponentManagerFactory.getInstance().createInterface();
-  }
+    private final ComputeManager computetManager;
+    private final ComponentManager componentManager;
 
-  public ComputeImpl(ComputeManager computetManager, ComponentManager componentManager) {
-    this.computetManager = computetManager;
-    this.componentManager = componentManager;
-  }
-
-  @Override
-  public Response list(String vspId, String versionId, String componentId, String user) {
-
-    Version version = new Version(versionId);
-    componentManager.validateComponentExistence(vspId, version, componentId);
-    Collection<ListComputeResponse> computes =
-        computetManager.listComputes(vspId, version, componentId);
-
-    MapComputeEntityToComputeDto mapper = new MapComputeEntityToComputeDto();
-    GenericCollectionWrapper<ComputeDto> results = new GenericCollectionWrapper<>();
-    for (ListComputeResponse compute : computes) {
-      results.add(mapper.applyMapping(compute, ComputeDto.class));
+    public ComputeImpl() {
+        this.computetManager = ComputeManagerFactory.getInstance().createInterface();
+        this.componentManager = ComponentManagerFactory.getInstance().createInterface();
     }
 
-    return Response.ok(results).build();
-  }
-
-  @Override
-  public Response get(String vspId, String versionId, String componentId, String computeId,
-                      String user) {
-
-    Version version = new Version(versionId);
-    componentManager.validateComponentExistence(vspId, version, componentId);
-    CompositionEntityResponse<ComputeData> response =
-        computetManager.getCompute(vspId, version, componentId, computeId);
-
-    CompositionEntityResponseDto<ComputeDetailsDto> responseDto = new
-        CompositionEntityResponseDto<>();
-    new MapCompositionEntityResponseToDto<>(new MapComputeDataToComputeDetailsDto(),
-        ComputeDetailsDto.class).doMapping(response, responseDto);
-    return Response.ok(responseDto).build();
-  }
-
-  @Override
-  public Response create(ComputeDetailsDto request, String vspId, String versionId,
-                         String componentId, String user) {
-
-    ComputeEntity compute = new MapComputeDetailsDtoToComputeEntity().applyMapping(request,
-        ComputeEntity.class);
-    compute.setVspId(vspId);
-    compute.setVersion(new Version(versionId));
-    compute.setComponentId(componentId);
-    componentManager.validateComponentExistence(vspId, compute.getVersion(), componentId);
-
-    ComputeEntity createdCompute = computetManager.createCompute(compute);
-
-    MapComputeEntityToComputeCreationDto mapper = new MapComputeEntityToComputeCreationDto();
-    ComputeCreationDto createdComputeDto =
-        mapper.applyMapping(createdCompute, ComputeCreationDto.class);
-    return Response.ok(createdComputeDto != null ? createdComputeDto : null).build();
-  }
-
-  @Override
-  public Response update(ComputeDetailsDto request, String vspId, String versionId,
-                         String componentId, String computeFlavorId, String user) {
-
-    ComputeEntity compute =
-        new MapComputeDetailsDtoToComputeEntity().applyMapping(request, ComputeEntity.class);
-    compute.setVspId(vspId);
-    compute.setVersion(new Version(versionId));
-    compute.setComponentId(componentId);
-    compute.setId(computeFlavorId);
-
-    componentManager.validateComponentExistence(vspId, compute.getVersion(), componentId);
-    CompositionEntityValidationData validationData = computetManager.updateCompute(compute);
-    return validationData != null && CollectionUtils.isNotEmpty(validationData.getErrors())
-        ? Response.status(Response.Status.EXPECTATION_FAILED).entity(
-        new MapCompositionEntityValidationDataToDto().applyMapping(validationData,
-            CompositionEntityValidationDataDto.class)).build() : Response.ok().build();
-  }
+    public ComputeImpl(ComputeManager computetManager, ComponentManager componentManager) {
+        this.computetManager = computetManager;
+        this.componentManager = componentManager;
+    }
 
-  @Override
-  public Response delete(String vspId, String versionId, String componentId, String computeFlavorId,
-                         String user) {
+    @Override
+    public Response list(String vspId, String versionId, String componentId, String user) {
+        Version version = new Version(versionId);
+        componentManager.validateComponentExistence(vspId, version, componentId);
+        Collection<ListComputeResponse> computes = computetManager.listComputes(vspId, version, componentId);
+        MapComputeEntityToComputeDto mapper = new MapComputeEntityToComputeDto();
+        GenericCollectionWrapper<ComputeDto> results = new GenericCollectionWrapper<>();
+        for (ListComputeResponse compute : computes) {
+            results.add(mapper.applyMapping(compute, ComputeDto.class));
+        }
+        return Response.ok(results).build();
+    }
 
-    Version version = new Version(versionId);
-    componentManager.validateComponentExistence(vspId, version, componentId);
-    computetManager.deleteCompute(vspId, version, componentId, computeFlavorId);
-    return Response.ok().build();
-  }
+    @Override
+    public Response get(String vspId, String versionId, String componentId, String computeId, String user) {
+        Version version = new Version(versionId);
+        componentManager.validateComponentExistence(vspId, version, componentId);
+        CompositionEntityResponse<ComputeData> response = computetManager.getCompute(vspId, version, componentId, computeId);
+        CompositionEntityResponseDto<ComputeDetailsDto> responseDto = new CompositionEntityResponseDto<>();
+        new MapCompositionEntityResponseToDto<>(new MapComputeDataToComputeDetailsDto(), ComputeDetailsDto.class).doMapping(response, responseDto);
+        return Response.ok(responseDto).build();
+    }
 
-  @Override
-  public Response getQuestionnaire(String vspId, String versionId, String componentId,
-                                   String computeFlavorId, String user) {
+    @Override
+    public Response create(ComputeDetailsDto request, String vspId, String versionId, String componentId, String user) {
+        ComputeEntity compute = new MapComputeDetailsDtoToComputeEntity().applyMapping(request, ComputeEntity.class);
+        compute.setVspId(vspId);
+        compute.setVersion(new Version(versionId));
+        compute.setComponentId(componentId);
+        componentManager.validateComponentExistence(vspId, compute.getVersion(), componentId);
+        ComputeEntity createdCompute = computetManager.createCompute(compute);
+        MapComputeEntityToComputeCreationDto mapper = new MapComputeEntityToComputeCreationDto();
+        ComputeCreationDto createdComputeDto = mapper.applyMapping(createdCompute, ComputeCreationDto.class);
+        return Response.ok(createdComputeDto != null ? createdComputeDto : null).build();
+    }
 
-    Version version = new Version(versionId);
-    componentManager.validateComponentExistence(vspId, version, componentId);
-    QuestionnaireResponse questionnaireResponse =
-        computetManager.getComputeQuestionnaire(vspId, version, componentId, computeFlavorId);
+    @Override
+    public Response update(ComputeDetailsDto request, String vspId, String versionId, String componentId, String computeFlavorId, String user) {
+        ComputeEntity compute = new MapComputeDetailsDtoToComputeEntity().applyMapping(request, ComputeEntity.class);
+        compute.setVspId(vspId);
+        compute.setVersion(new Version(versionId));
+        compute.setComponentId(componentId);
+        compute.setId(computeFlavorId);
+        componentManager.validateComponentExistence(vspId, compute.getVersion(), componentId);
+        CompositionEntityValidationData validationData = computetManager.updateCompute(compute);
+        return validationData != null && CollectionUtils.isNotEmpty(validationData.getErrors()) ? Response.status(Response.Status.EXPECTATION_FAILED)
+            .entity(new MapCompositionEntityValidationDataToDto().applyMapping(validationData, CompositionEntityValidationDataDto.class)).build()
+            : Response.ok().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 computeFlavorId, String user) {
+        Version version = new Version(versionId);
+        componentManager.validateComponentExistence(vspId, version, componentId);
+        computetManager.deleteCompute(vspId, version, componentId, computeFlavorId);
+        return Response.ok().build();
+    }
 
-  @Override
-  public Response updateQuestionnaire(String questionnaireData, String vspId, String versionId,
-                                      String componentId, String computeFlavorId, String user) {
+    @Override
+    public Response getQuestionnaire(String vspId, String versionId, String componentId, String computeFlavorId, String user) {
+        Version version = new Version(versionId);
+        componentManager.validateComponentExistence(vspId, version, componentId);
+        QuestionnaireResponse questionnaireResponse = computetManager.getComputeQuestionnaire(vspId, version, componentId, computeFlavorId);
+        QuestionnaireResponseDto result = new MapQuestionnaireResponseToQuestionnaireResponseDto()
+            .applyMapping(questionnaireResponse, QuestionnaireResponseDto.class);
+        return Response.ok(result).build();
+    }
 
-    Version version = new Version(versionId);
-    componentManager.validateComponentExistence(vspId, version, componentId);
-    computetManager.updateComputeQuestionnaire(vspId, version, componentId, computeFlavorId,
-        questionnaireData);
-    return Response.ok().build();
-  }
+    @Override
+    public Response updateQuestionnaire(String questionnaireData, String vspId, String versionId, String componentId, String computeFlavorId,
+                                        String user) {
+        Version version = new Version(versionId);
+        componentManager.validateComponentExistence(vspId, version, componentId);
+        computetManager.updateComputeQuestionnaire(vspId, version, componentId, computeFlavorId, questionnaireData);
+        return Response.ok().build();
+    }
 }