Implant vid-app-common org.onap.vid.job (main and test)

Issue-ID: VID-378

Change-Id: I41b0bdc2c4e3635f3f3319b1cd63cefc61912dfc
Signed-off-by: Einat Vinouze <einat.vinouze@intl.att.com>
Signed-off-by: Ittay Stern <ittay.stern@att.com>

1 files changed, 22 insertions, 15 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
index 35f631183..744b2fe39 100644
--- 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
@@ -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.
@@ -21,12 +21,15 @@
 package org.onap.vid.job.command;
 
 import com.fasterxml.jackson.core.type.TypeReference;
-import com.fasterxml.jackson.databind.ObjectMapper;
+import org.onap.vid.model.Action;
 import org.onap.vid.mso.model.ModelInfo;
 
 import java.util.HashMap;
 import java.util.Map;
 
+import static java.util.Collections.emptyMap;
+import static org.onap.vid.utils.KotlinUtilsKt.JACKSON_OBJECT_MAPPER;
+
 public class CommandParentData {
 
 
@@ -36,6 +39,7 @@ public class CommandParentData {
         VNF_INSTANCE_ID,
         VNF_MODEL_INFO,
         VG_INSTANCE_ID,
+        VNF_GROUP_INSTANCE_ID,
         ;
     }
 
@@ -49,32 +53,30 @@ public class CommandParentData {
             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;
+        Object object = commandData.getOrDefault(RESOURCE_MODEL_INFOS, emptyMap());
+        return JACKSON_OBJECT_MAPPER.convertValue(object, mapCommandKeyToModelInfo);
     }
 
     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;
+        Object object = commandData.getOrDefault(RESOURCE_INSTANCE_IDS, emptyMap());
+        return JACKSON_OBJECT_MAPPER.convertValue(object, mapCommandKeyToString);
     }
 
     public Map<String, Object> getParentData() {
         Map<String, Object> data = new HashMap<>();
         data.put(RESOURCE_INSTANCE_IDS, resourceInstancesIds);
         data.put(RESOURCE_MODEL_INFOS, resourceModelInfos);
+
+        if (actionPhase != null) {
+                data.put(ResourceCommandKt.ACTION_PHASE, actionPhase);
+        }
+
         return data;
     }
     private Map<CommandDataKey, String> resourceInstancesIds = new HashMap<>();
     private Map<CommandDataKey, ModelInfo> resourceModelInfos = new HashMap<>();
+    private Action actionPhase = null;
 
     public void addModelInfo(CommandDataKey modelInfoKey, ModelInfo modelInfo) {
         resourceModelInfos.put(modelInfoKey, modelInfo);
@@ -83,6 +85,11 @@ public class CommandParentData {
     public void addInstanceId(CommandDataKey instanceIdKey, String instanceId) {
          resourceInstancesIds.put(instanceIdKey, instanceId);
     }
+
+    public void setActionPhase(Action actionPhase) {
+        this.actionPhase = actionPhase;
+    }
+
     public ModelInfo getModelInfo(CommandDataKey modelInfoKey) {
         return resourceModelInfos.get(modelInfoKey);
     }