From 6ad41e3ccd398a2721f41ad61c80b7bb03f7d127 Mon Sep 17 00:00:00 2001
From: Ittay Stern <ittay.stern@att.com>
Date: Mon, 31 Dec 2018 17:21:27 +0200
Subject: 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>
---
 .../ResourceWithChildrenInProgressCommand.java     | 65 ++++++++++++++++++++++
 1 file changed, 65 insertions(+)
 create mode 100644 vid-app-common/src/main/java/org/onap/vid/job/command/ResourceWithChildrenInProgressCommand.java

(limited to 'vid-app-common/src/main/java/org/onap/vid/job/command/ResourceWithChildrenInProgressCommand.java')

diff --git a/vid-app-common/src/main/java/org/onap/vid/job/command/ResourceWithChildrenInProgressCommand.java b/vid-app-common/src/main/java/org/onap/vid/job/command/ResourceWithChildrenInProgressCommand.java
new file mode 100644
index 000000000..53164f433
--- /dev/null
+++ b/vid-app-common/src/main/java/org/onap/vid/job/command/ResourceWithChildrenInProgressCommand.java
@@ -0,0 +1,65 @@
+package org.onap.vid.job.command;
+
+import org.onap.vid.job.Job;
+import org.onap.vid.job.NextCommand;
+import org.onap.vid.job.impl.JobSharedData;
+
+import java.util.HashMap;
+import java.util.Map;
+
+
+public class ResourceWithChildrenInProgressCommand extends BaseInProgressStatusCommand {
+
+    public ResourceWithChildrenInProgressCommand() {
+    }
+
+    public ResourceWithChildrenInProgressCommand(JobSharedData sharedData,
+                                                 String requestId,
+                                                 String instanceId,
+                                                 CommandParentData commandParentData) {
+        init(sharedData, requestId, instanceId, commandParentData);
+    }
+
+    protected BaseInProgressStatusCommand init(JobSharedData sharedData,
+                                               String requestId,
+                                               String instanceId,
+                                               CommandParentData commandParentData) {
+        init(sharedData, requestId, instanceId);
+        this.commandParentData= commandParentData;
+        return this;
+    }
+
+
+    @Override
+    public Map<String, Object> getData() {
+        Map<String, Object> data = new HashMap<>(super.getData());
+        data.putAll(buildDataForChild());
+        return data;
+    }
+
+    @Override
+    public BaseInProgressStatusCommand init(JobSharedData sharedData, Map<String, Object> commandData) {
+        return init(
+                sharedData,
+                (String) commandData.get("requestId"),
+                (String) commandData.get("instanceId"),
+                commandParentData.initParentData(commandData));
+    }
+
+    protected Map<String, Object> buildDataForChild() {
+       return commandParentData.getParentData();
+    }
+
+
+
+    @Override
+    protected NextCommand processJobStatus(Job.JobStatus jobStatus) {
+        return new NextCommand(jobStatus, this);
+    }
+
+    @Override
+    protected ExpiryChecker getExpiryChecker() {
+        return x->false;
+    }
+
+}
-- 
cgit 1.2.3-korg