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, 80 insertions, 0 deletions

diff --git a/vid-app-common/src/main/java/org/onap/vid/job/command/CommandParentData.java b/vid-app-common/src/main/java/org/onap/vid/job/command/CommandParentData.java
new file mode 100644
index 000000000..25c197278
--- /dev/null
+++ b/vid-app-common/src/main/java/org/onap/vid/job/command/CommandParentData.java
@@ -0,0 +1,80 @@
+package org.onap.vid.job.command;
+
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.onap.vid.mso.model.ModelInfo;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class CommandParentData {
+
+
+    public enum CommandDataKey{
+        SERVICE_MODEL_INFO,
+        SERVICE_INSTANCE_ID,
+        VNF_INSTANCE_ID,
+        VNF_MODEL_INFO,
+        VG_INSTANCE_ID,
+        ;
+    }
+
+    private static final String RESOURCE_INSTANCE_IDS = "resourceInstancesIds";
+    private static final String RESOURCE_MODEL_INFOS = "resourceModelInfos";
+
+    private final TypeReference<Map<CommandDataKey, String>> mapCommandKeyToString =
+            new TypeReference<Map<CommandDataKey, String>> () {};
+
+    private  final TypeReference<Map<CommandDataKey, ModelInfo>> mapCommandKeyToModelInfo =
+            new TypeReference<Map<CommandDataKey, ModelInfo>> () {};
+
+
+    private ObjectMapper objectMapper = new ObjectMapper();
+
+    private Map<CommandDataKey,ModelInfo> getModelInfosByCommandData(Map<String, Object> commandData) {
+        Object object = commandData.get(RESOURCE_MODEL_INFOS);
+        if (object != null) {
+            return objectMapper.convertValue(object, mapCommandKeyToModelInfo);
+        }
+        return null;
+    }
+
+    private Map<CommandDataKey,String> getInstanceIdsByCommandData(Map<String, Object> commandData) {
+        Object object = commandData.get(RESOURCE_INSTANCE_IDS);
+        if (object != null) {
+            return objectMapper.convertValue(object, mapCommandKeyToString);
+        }
+        return null;
+    }
+
+    public Map<String, Object> getParentData() {
+        Map<String, Object> data = new HashMap<>();
+        data.put(RESOURCE_INSTANCE_IDS, resourceInstancesIds);
+        data.put(RESOURCE_MODEL_INFOS, resourceModelInfos);
+        return data;
+    }
+    private Map<CommandDataKey, String> resourceInstancesIds = new HashMap<>();
+    private Map<CommandDataKey, ModelInfo> resourceModelInfos = new HashMap<>();
+
+    public void addModelInfo(CommandDataKey modelInfoKey, ModelInfo modelInfo) {
+        resourceModelInfos.put(modelInfoKey, modelInfo);
+    }
+
+    public void addInstanceId(CommandDataKey instanceIdKey, String instanceId) {
+         resourceInstancesIds.put(instanceIdKey, instanceId);
+    }
+    public ModelInfo getModelInfo(CommandDataKey modelInfoKey) {
+        return resourceModelInfos.get(modelInfoKey);
+    }
+
+    public String getInstanceId(CommandDataKey instanceIdKey) {
+        return resourceInstancesIds.get(instanceIdKey);
+    }
+
+    public CommandParentData initParentData(Map<String, Object> commandData) {
+        resourceModelInfos = getModelInfosByCommandData(commandData);
+        resourceInstancesIds = getInstanceIdsByCommandData(commandData);
+        return this;
+    }
+
+}