Merge from ECOMP's repository

Main Features
--------------

-  Async-Instantiation jobs mechanism major update; still WIP (package
   `org.onap.vid.job`)

-  New features in View/Edit: Activate fabric configuration; show
   related networks; soft delete

-  Support AAI service-tree traversal (`AAIServiceTree`)

-  In-memory cache for SDC models and certain A&AI queries
   (`CacheProviderWithLoadingCache`)

-  Upgrade TOSCA Parser and add parsing options; fix malformed TOSCA
   models

-  Resolve Cloud-Owner values for MSO

-  Pass X-ONAP headers to MSO

Infrastructure
--------------
-  Remove codehaus' jackson mapper; use soley fasterxml 2.9.7
-  Surefire invokes both TestNG and JUnit tests
-  Support Kotlin source files
-  AaiController2 which handles errors in a "Spring manner"
-  Inline generated-sources and remove jsonschema2pojo

Quality
--------
-  Cumulative bug fixes (A&AI API, UI timeouts, and many more)
-  Many Sonar issues cleaned-up
-  Some unused classes removed
-  Minor changes in vid-automation project, allowing some API
   verification to run

Hard Merges
------------
-  HTTP Clients (MSO, A&AI, WebConfig, OutgoingRequestHeadersTest)
-  Moved `package org.onap.vid.controllers` to `controller`, without
   plural -- just to keep semantic sync with ECOMP.

Reference commit in ECOMP: 3d1141625

Issue-ID: VID-378
Change-Id: I9c8d1e74caa41815891d441fc0760bb5f29c5788
Signed-off-by: Ittay Stern <ittay.stern@att.com>

1 files changed, 19 insertions, 36 deletions

diff --git a/vid-app-common/src/main/java/org/onap/vid/job/impl/JobAdapterImpl.java b/vid-app-common/src/main/java/org/onap/vid/job/impl/JobAdapterImpl.java
index 59f12f4c5..1050ab933 100644
--- a/vid-app-common/src/main/java/org/onap/vid/job/impl/JobAdapterImpl.java
+++ b/vid-app-common/src/main/java/org/onap/vid/job/impl/JobAdapterImpl.java
@@ -4,16 +4,11 @@ import com.google.common.collect.ImmutableMap;
 import org.onap.vid.job.Job;
 import org.onap.vid.job.JobAdapter;
 import org.onap.vid.job.JobType;
-import org.onap.vid.model.JobBulk;
 import org.onap.vid.model.JobModel;
 import org.springframework.stereotype.Component;
 
-import javax.ws.rs.BadRequestException;
-import java.util.ArrayList;
-import java.util.List;
 import java.util.Map;
 import java.util.UUID;
-import java.util.stream.Collectors;
 
 @Component
 public class JobAdapterImpl implements JobAdapter {
@@ -28,44 +23,32 @@ public class JobAdapterImpl implements JobAdapter {
     }
 
     @Override
-    public JobBulk toModelBulk(List<Job> jobList) {
-        return new JobBulk(jobList.stream().map(this::toModel).collect(Collectors.toList()));
-    }
-
-    @Override
-    public Job createJob(JobType jobType, AsyncJobRequest request, UUID templateId, String userId, Integer indexInBulk) {
-        JobDaoImpl job = createJob(jobType, templateId, indexInBulk, ImmutableMap.of(
-                "request", request,
-                "userId", userId));
-        job.setUserId(userId);
+    public Job createServiceInstantiationJob(JobType jobType, AsyncJobRequest request, UUID templateId, String userId, String optimisticUniqueServiceInstanceName, Integer indexInBulk){
+        JobDaoImpl job = createJob(jobType, Job.JobStatus.PENDING , userId);
+        job.setSharedData(new JobSharedData(job.getUuid(), userId, request));
+        job.setTypeAndData(jobType, ImmutableMap.of(
+                "optimisticUniqueServiceInstanceName", optimisticUniqueServiceInstanceName
+        ));
+        job.setTemplateId(templateId);
+        job.setIndexInBulk(indexInBulk);
         return job;
     }
 
     @Override
-    public List<Job> createBulkOfJobs(Map<String, Object> bulkRequest) {
-        int count;
-        JobType jobType;
-
-        try {
-            count = (Integer) bulkRequest.get("count");
-            jobType = JobType.valueOf((String) bulkRequest.get("type"));
-        } catch (Exception exception) {
-            throw new BadRequestException(exception);
-        }
-        List<Job> jobList = new ArrayList<>(count + 1);
-        UUID templateId = UUID.randomUUID();
-        for (int i = 0; i < count; i++) {
-            jobList.add(createJob(jobType, templateId, i, bulkRequest));
-        }
-        return jobList;
+    public Job createChildJob(JobType jobType, Job.JobStatus jobStatus, AsyncJobRequest request, JobSharedData parentSharedData, Map<String, Object> jobData) {
+        JobDaoImpl job = createJob(jobType, jobStatus , parentSharedData.getUserId());
+        job.setSharedData(new JobSharedData(job.getUuid(), request, parentSharedData));
+        job.setTypeAndData(jobType, jobData);
+        return job;
     }
 
-    private JobDaoImpl createJob(JobType jobType, UUID templateId, Integer indexInBulk, Map<String, Object> data) {
+    protected JobDaoImpl createJob(JobType jobType, Job.JobStatus jobStatus, String userId) {
         JobDaoImpl job = new JobDaoImpl();
-        job.setStatus(Job.JobStatus.PENDING);
-        job.setTypeAndData(jobType, data);
-        job.setTemplateId(templateId);
-        job.setIndexInBulk(indexInBulk);
+        job.setTypeAndData(jobType, null);
+        job.setStatus(jobStatus);
+        job.setUuid(UUID.randomUUID());
+        job.setUserId(userId);
         return job;
     }
+
 }