1 files changed, 82 insertions, 98 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/ComponentsImpl.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/ComponentsImpl.java
index fefa52842e..9f2cbd36b7 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/ComponentsImpl.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/ComponentsImpl.java
@@ -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;
@@ -29,122 +31,104 @@ import org.openecomp.sdc.vendorsoftwareproduct.types.QuestionnaireResponse;
 import org.openecomp.sdc.vendorsoftwareproduct.types.composition.ComponentData;
 import org.openecomp.sdc.vendorsoftwareproduct.types.composition.CompositionEntityValidationData;
 import org.openecomp.sdc.versioning.dao.types.Version;
-import org.openecomp.sdcrests.vendorsoftwareproducts.types.*;
+import org.openecomp.sdcrests.vendorsoftwareproducts.types.ComponentCreationDto;
+import org.openecomp.sdcrests.vendorsoftwareproducts.types.ComponentDto;
+import org.openecomp.sdcrests.vendorsoftwareproducts.types.ComponentRequestDto;
+import org.openecomp.sdcrests.vendorsoftwareproducts.types.CompositionEntityResponseDto;
+import org.openecomp.sdcrests.vendorsoftwareproducts.types.CompositionEntityValidationDataDto;
+import org.openecomp.sdcrests.vendorsoftwareproducts.types.QuestionnaireResponseDto;
 import org.openecomp.sdcrests.vsp.rest.Components;
-import org.openecomp.sdcrests.vsp.rest.mapping.*;
+import org.openecomp.sdcrests.vsp.rest.mapping.MapComponentDataToComponentDto;
+import org.openecomp.sdcrests.vsp.rest.mapping.MapComponentEntityToComponentCreationDto;
+import org.openecomp.sdcrests.vsp.rest.mapping.MapComponentEntityToComponentDto;
+import org.openecomp.sdcrests.vsp.rest.mapping.MapComponentRequestDtoToComponentEntity;
+import org.openecomp.sdcrests.vsp.rest.mapping.MapCompositionEntityResponseToDto;
+import org.openecomp.sdcrests.vsp.rest.mapping.MapCompositionEntityValidationDataToDto;
+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("components")
 @Scope(value = "prototype")
 public class ComponentsImpl implements Components {
-  private final ComponentManager componentManager;
-
-  public ComponentsImpl() {
-    this.componentManager = ComponentManagerFactory.getInstance().createInterface();
-  }
-
-  public ComponentsImpl(ComponentManager componentManager) {
-    this.componentManager = componentManager;
-  }
 
-  @Override
-  public Response list(String vspId, String versionId, String user) {
+    private final ComponentManager componentManager;
 
-    Collection<ComponentEntity> components =
-        componentManager.listComponents(vspId, new Version(versionId));
-
-    MapComponentEntityToComponentDto mapper = new MapComponentEntityToComponentDto();
-    GenericCollectionWrapper<ComponentDto> results = new GenericCollectionWrapper<>();
-    for (ComponentEntity component : components) {
-      results.add(mapper.applyMapping(component, ComponentDto.class));
+    public ComponentsImpl() {
+        this.componentManager = ComponentManagerFactory.getInstance().createInterface();
     }
 
-    return Response.ok(results).build();
-  }
-
-  @Override
-  public Response deleteList(String vspId, String versionId, String user) {
-    componentManager.deleteComponents(vspId, new Version(versionId));
-    return Response.ok().build();
-  }
-
-  @Override
-  public Response create(ComponentRequestDto request, String vspId, String versionId, String user) {
-
-    ComponentEntity component =
-        new MapComponentRequestDtoToComponentEntity().applyMapping(request, ComponentEntity.class);
-    component.setVspId(vspId);
-    component.setVersion(new Version(versionId));
-
-    ComponentEntity createdComponent = componentManager.createComponent(component);
-    MapComponentEntityToComponentCreationDto mapping =
-        new MapComponentEntityToComponentCreationDto();
-    ComponentCreationDto createdComponentDto = mapping.applyMapping(createdComponent,
-        ComponentCreationDto.class);
-    return Response
-        .ok(createdComponent != null ? createdComponentDto : null)
-        .build();
-  }
-
-  @Override
-  public Response get(String vspId, String versionId, String componentId, String user) {
+    public ComponentsImpl(ComponentManager componentManager) {
+        this.componentManager = componentManager;
+    }
 
-    CompositionEntityResponse<ComponentData> response =
-        componentManager.getComponent(vspId, new Version(versionId), componentId);
+    @Override
+    public Response list(String vspId, String versionId, String user) {
+        Collection<ComponentEntity> components = componentManager.listComponents(vspId, new Version(versionId));
+        MapComponentEntityToComponentDto mapper = new MapComponentEntityToComponentDto();
+        GenericCollectionWrapper<ComponentDto> results = new GenericCollectionWrapper<>();
+        for (ComponentEntity component : components) {
+            results.add(mapper.applyMapping(component, ComponentDto.class));
+        }
+        return Response.ok(results).build();
+    }
 
-    CompositionEntityResponseDto<ComponentDto> responseDto = new CompositionEntityResponseDto<>();
-    new MapCompositionEntityResponseToDto<>(new MapComponentDataToComponentDto(),
-        ComponentDto.class).doMapping(response, responseDto);
-    return Response.ok(responseDto).build();
-  }
+    @Override
+    public Response deleteList(String vspId, String versionId, String user) {
+        componentManager.deleteComponents(vspId, new Version(versionId));
+        return Response.ok().build();
+    }
 
-  @Override
-  public Response delete(String vspId, String versionId, String componentId, String user) {
-    componentManager.deleteComponent(vspId, new Version(versionId), componentId);
-    return Response.ok().build();
-  }
+    @Override
+    public Response create(ComponentRequestDto request, String vspId, String versionId, String user) {
+        ComponentEntity component = new MapComponentRequestDtoToComponentEntity().applyMapping(request, ComponentEntity.class);
+        component.setVspId(vspId);
+        component.setVersion(new Version(versionId));
+        ComponentEntity createdComponent = componentManager.createComponent(component);
+        MapComponentEntityToComponentCreationDto mapping = new MapComponentEntityToComponentCreationDto();
+        ComponentCreationDto createdComponentDto = mapping.applyMapping(createdComponent, ComponentCreationDto.class);
+        return Response.ok(createdComponent != null ? createdComponentDto : null).build();
+    }
 
-  @Override
-  public Response update(ComponentRequestDto request, String vspId, String versionId,
-                         String componentId,
-                         String user) {
-    ComponentEntity componentEntity =
-        new MapComponentRequestDtoToComponentEntity().applyMapping(request, ComponentEntity.class);
-    componentEntity.setVspId(vspId);
-    componentEntity.setVersion(new Version(versionId));
-    componentEntity.setId(componentId);
+    @Override
+    public Response get(String vspId, String versionId, String componentId, String user) {
+        CompositionEntityResponse<ComponentData> response = componentManager.getComponent(vspId, new Version(versionId), componentId);
+        CompositionEntityResponseDto<ComponentDto> responseDto = new CompositionEntityResponseDto<>();
+        new MapCompositionEntityResponseToDto<>(new MapComponentDataToComponentDto(), ComponentDto.class).doMapping(response, responseDto);
+        return Response.ok(responseDto).build();
+    }
 
-    CompositionEntityValidationData validationData =
-        componentManager.updateComponent(componentEntity);
-    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 delete(String vspId, String versionId, String componentId, String user) {
+        componentManager.deleteComponent(vspId, new Version(versionId), componentId);
+        return Response.ok().build();
+    }
 
-  @Override
-  public Response getQuestionnaire(String vspId, String versionId, String componentId,
-                                   String user) {
-    QuestionnaireResponse questionnaireResponse =
-        componentManager.getQuestionnaire(vspId, new Version(versionId), componentId);
+    @Override
+    public Response update(ComponentRequestDto request, String vspId, String versionId, String componentId, String user) {
+        ComponentEntity componentEntity = new MapComponentRequestDtoToComponentEntity().applyMapping(request, ComponentEntity.class);
+        componentEntity.setVspId(vspId);
+        componentEntity.setVersion(new Version(versionId));
+        componentEntity.setId(componentId);
+        CompositionEntityValidationData validationData = componentManager.updateComponent(componentEntity);
+        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 getQuestionnaire(String vspId, String versionId, String componentId, String user) {
+        QuestionnaireResponse questionnaireResponse = componentManager.getQuestionnaire(vspId, new Version(versionId), componentId);
+        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 user) {
-    componentManager
-        .updateQuestionnaire(vspId, new Version(versionId), componentId, questionnaireData);
-    return Response.ok().build();
-  }
+    @Override
+    public Response updateQuestionnaire(String questionnaireData, String vspId, String versionId, String componentId, String user) {
+        componentManager.updateQuestionnaire(vspId, new Version(versionId), componentId, questionnaireData);
+        return Response.ok().build();
+    }
 }