1 files changed, 105 insertions, 142 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/ComponentProcessesImpl.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/ComponentProcessesImpl.java
index 4e4d7d5d9e..ab0ad04075 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/ComponentProcessesImpl.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/ComponentProcessesImpl.java
@@ -13,9 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.openecomp.sdcrests.vsp.rest.services;
 
+import java.io.File;
+import java.io.InputStream;
+import java.util.Collection;
+import javax.inject.Named;
+import javax.ws.rs.core.Response;
 import org.apache.cxf.jaxrs.ext.multipart.Attachment;
 import org.openecomp.sdc.activitylog.ActivityLogManager;
 import org.openecomp.sdc.activitylog.ActivityLogManagerFactory;
@@ -37,165 +41,124 @@ import org.openecomp.sdcrests.wrappers.StringWrapperResponse;
 import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Service;
 
-import javax.inject.Named;
-import javax.ws.rs.core.Response;
-import java.io.File;
-import java.io.InputStream;
-import java.util.Collection;
-
 @Named
 @Service("componentProcesses")
 @Scope(value = "prototype")
 public class ComponentProcessesImpl implements ComponentProcesses {
 
-  private final ProcessManager processManager;
-  private final ComponentManager componentManager;
-  private final ActivityLogManager activityLogManager;
-
-  public ComponentProcessesImpl() {
-    this.processManager = ProcessManagerFactory.getInstance().createInterface();
-    this.componentManager = ComponentManagerFactory.getInstance().createInterface();
-    this.activityLogManager = ActivityLogManagerFactory.getInstance().createInterface();
-  }
-
-  public ComponentProcessesImpl(ProcessManager processManager,
-      ComponentManager componentManager, ActivityLogManager activityLogManager) {
-    this.processManager = processManager;
-    this.componentManager = componentManager;
-    this.activityLogManager = activityLogManager;
-  }
-
-  @Override
-  public Response list(String vspId, String versionId, String componentId, String user) {
+    private final ProcessManager processManager;
+    private final ComponentManager componentManager;
+    private final ActivityLogManager activityLogManager;
 
-    Version version = new Version(versionId);
-    validateComponentExistence(vspId, version, componentId, user);
-    Collection<ProcessEntity> processes = processManager.listProcesses(vspId, version, componentId);
-
-    MapProcessEntityToProcessEntityDto mapper = new MapProcessEntityToProcessEntityDto();
-    GenericCollectionWrapper<ProcessEntityDto> results = new GenericCollectionWrapper<>();
-    for (ProcessEntity process : processes) {
-      results.add(mapper.applyMapping(process, ProcessEntityDto.class));
+    public ComponentProcessesImpl() {
+        this.processManager = ProcessManagerFactory.getInstance().createInterface();
+        this.componentManager = ComponentManagerFactory.getInstance().createInterface();
+        this.activityLogManager = ActivityLogManagerFactory.getInstance().createInterface();
     }
 
-    return Response.ok(results).build();
-  }
-
-  @Override
-  public Response deleteList(String vspId, String versionId, String componentId, String user) {
-
-    Version version = new Version(versionId);
-    validateComponentExistence(vspId, version, componentId, user);
-    processManager.deleteProcesses(vspId, version, componentId);
-
-    return Response.ok().build();
-  }
-
-  @Override
-  public Response create(ProcessRequestDto request, String vspId, String versionId,
-                         String componentId, String user) {
-
-    ProcessEntity process =
-        new MapProcessRequestDtoToProcessEntity().applyMapping(request, ProcessEntity.class);
-    process.setVspId(vspId);
-    process.setVersion(new Version(versionId));
-    process.setComponentId(componentId);
-
-    validateComponentExistence(vspId, process.getVersion(), componentId, user);
-    ProcessEntity createdProcess = processManager.createProcess(process);
-
-    return Response
-        .ok(createdProcess != null ? new StringWrapperResponse(createdProcess.getId()) : null)
-        .build();
-  }
-
-  @Override
-  public Response get(String vspId, String versionId, String componentId, String processId,
-                      String user) {
-
-    Version version = new Version(versionId);
-    validateComponentExistence(vspId, version, componentId, user);
-    ProcessEntity process = processManager.getProcess(vspId, version, componentId, processId);
-    ProcessEntityDto result =
-        new MapProcessEntityToProcessEntityDto().applyMapping(process, ProcessEntityDto.class);
-    return Response.ok(result).build();
-  }
-
-  @Override
-  public Response delete(String vspId, String versionId, String componentId, String processId,
-                         String user) {
-
-    Version version = new Version(versionId);
-    validateComponentExistence(vspId, version, componentId, user);
-    processManager.deleteProcess(vspId, version, componentId, processId);
-    return Response.ok().build();
-  }
-
-  @Override
-  public Response update(ProcessRequestDto request, String vspId, String versionId,
-                         String componentId,
-                         String processId, String user) {
-
-    ProcessEntity process =
-        new MapProcessRequestDtoToProcessEntity().applyMapping(request, ProcessEntity.class);
-    process.setVspId(vspId);
-    process.setVersion(new Version(versionId));
-    process.setComponentId(componentId);
-    process.setId(processId);
-    validateComponentExistence(vspId, process.getVersion(), componentId, user);
-    processManager.updateProcess(process);
-    return Response.ok().build();
-  }
+    public ComponentProcessesImpl(ProcessManager processManager, ComponentManager componentManager, ActivityLogManager activityLogManager) {
+        this.processManager = processManager;
+        this.componentManager = componentManager;
+        this.activityLogManager = activityLogManager;
+    }
 
-  @Override
-  public Response getUploadedFile(String vspId, String versionId, String componentId,
-                                  String processId, String user) {
+    @Override
+    public Response list(String vspId, String versionId, String componentId, String user) {
+        Version version = new Version(versionId);
+        validateComponentExistence(vspId, version, componentId, user);
+        Collection<ProcessEntity> processes = processManager.listProcesses(vspId, version, componentId);
+        MapProcessEntityToProcessEntityDto mapper = new MapProcessEntityToProcessEntityDto();
+        GenericCollectionWrapper<ProcessEntityDto> results = new GenericCollectionWrapper<>();
+        for (ProcessEntity process : processes) {
+            results.add(mapper.applyMapping(process, ProcessEntityDto.class));
+        }
+        return Response.ok(results).build();
+    }
 
-    Version vspVersion = new Version(versionId);
-    validateComponentExistence(vspId, vspVersion, componentId, user);
-    File file = processManager.getProcessArtifact(vspId, vspVersion, componentId, processId);
+    @Override
+    public Response deleteList(String vspId, String versionId, String componentId, String user) {
+        Version version = new Version(versionId);
+        validateComponentExistence(vspId, version, componentId, user);
+        processManager.deleteProcesses(vspId, version, componentId);
+        return Response.ok().build();
+    }
 
-    Response.ResponseBuilder response = Response.ok(file);
-    if (file == null) {
-      return Response.status(Response.Status.NOT_FOUND).build();
+    @Override
+    public Response create(ProcessRequestDto request, String vspId, String versionId, String componentId, String user) {
+        ProcessEntity process = new MapProcessRequestDtoToProcessEntity().applyMapping(request, ProcessEntity.class);
+        process.setVspId(vspId);
+        process.setVersion(new Version(versionId));
+        process.setComponentId(componentId);
+        validateComponentExistence(vspId, process.getVersion(), componentId, user);
+        ProcessEntity createdProcess = processManager.createProcess(process);
+        return Response.ok(createdProcess != null ? new StringWrapperResponse(createdProcess.getId()) : null).build();
     }
-    response.header("Content-Disposition", "attachment; filename=" + file.getName());
-    return response.build();
-  }
 
-  @Override
-  public Response deleteUploadedFile(String vspId, String versionId, String componentId,
-                                     String processId,
-                                     String user) {
+    @Override
+    public Response get(String vspId, String versionId, String componentId, String processId, String user) {
+        Version version = new Version(versionId);
+        validateComponentExistence(vspId, version, componentId, user);
+        ProcessEntity process = processManager.getProcess(vspId, version, componentId, processId);
+        ProcessEntityDto result = new MapProcessEntityToProcessEntityDto().applyMapping(process, ProcessEntityDto.class);
+        return Response.ok(result).build();
+    }
 
-    Version version = new Version(versionId);
-    validateComponentExistence(vspId, version, componentId, user);
-    processManager.deleteProcessArtifact(vspId, version, componentId, processId);
-    return Response.ok().build();
-  }
+    @Override
+    public Response delete(String vspId, String versionId, String componentId, String processId, String user) {
+        Version version = new Version(versionId);
+        validateComponentExistence(vspId, version, componentId, user);
+        processManager.deleteProcess(vspId, version, componentId, processId);
+        return Response.ok().build();
+    }
 
-  @Override
-  public Response uploadFile(Attachment attachment, String vspId, String versionId,
-                             String componentId,
-                             String processId, String user) {
+    @Override
+    public Response update(ProcessRequestDto request, String vspId, String versionId, String componentId, String processId, String user) {
+        ProcessEntity process = new MapProcessRequestDtoToProcessEntity().applyMapping(request, ProcessEntity.class);
+        process.setVspId(vspId);
+        process.setVersion(new Version(versionId));
+        process.setComponentId(componentId);
+        process.setId(processId);
+        validateComponentExistence(vspId, process.getVersion(), componentId, user);
+        processManager.updateProcess(process);
+        return Response.ok().build();
+    }
 
-    Version version = new Version(versionId);
-    validateComponentExistence(vspId, version, componentId, user);
-    processManager.uploadProcessArtifact(attachment.getObject(InputStream.class),
-        attachment.getContentDisposition().getParameter("filename"), vspId, version, componentId,
-        processId);
-    activityLogManager.logActivity(new ActivityLogEntity(vspId, version,
-            ActivityType.Upload_Artifact, user, true, "", ""));
+    @Override
+    public Response getUploadedFile(String vspId, String versionId, String componentId, String processId, String user) {
+        Version vspVersion = new Version(versionId);
+        validateComponentExistence(vspId, vspVersion, componentId, user);
+        File file = processManager.getProcessArtifact(vspId, vspVersion, componentId, processId);
+        Response.ResponseBuilder response = Response.ok(file);
+        if (file == null) {
+            return Response.status(Response.Status.NOT_FOUND).build();
+        }
+        response.header("Content-Disposition", "attachment; filename=" + file.getName());
+        return response.build();
+    }
 
-    return Response.ok().build();
-  }
+    @Override
+    public Response deleteUploadedFile(String vspId, String versionId, String componentId, String processId, String user) {
+        Version version = new Version(versionId);
+        validateComponentExistence(vspId, version, componentId, user);
+        processManager.deleteProcessArtifact(vspId, version, componentId, processId);
+        return Response.ok().build();
+    }
 
+    @Override
+    public Response uploadFile(Attachment attachment, String vspId, String versionId, String componentId, String processId, String user) {
+        Version version = new Version(versionId);
+        validateComponentExistence(vspId, version, componentId, user);
+        processManager
+            .uploadProcessArtifact(attachment.getObject(InputStream.class), attachment.getContentDisposition().getParameter("filename"), vspId,
+                version, componentId, processId);
+        activityLogManager.logActivity(new ActivityLogEntity(vspId, version, ActivityType.Upload_Artifact, user, true, "", ""));
+        return Response.ok().build();
+    }
 
-  private void validateComponentExistence(String vspId, Version version, String componentId,
-                                          String user) {
-    if (componentId == null) {
-      return;
+    private void validateComponentExistence(String vspId, Version version, String componentId, String user) {
+        if (componentId == null) {
+            return;
+        }
+        componentManager.validateComponentExistence(vspId, version, componentId);
     }
-    componentManager.validateComponentExistence(vspId, version, componentId);
-  }
 }