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>
---
 .../main/java/org/onap/vid/job/impl/JobData.java   | 54 ++++++++++++++++++++++
 1 file changed, 54 insertions(+)
 create mode 100644 vid-app-common/src/main/java/org/onap/vid/job/impl/JobData.java

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

diff --git a/vid-app-common/src/main/java/org/onap/vid/job/impl/JobData.java b/vid-app-common/src/main/java/org/onap/vid/job/impl/JobData.java
new file mode 100644
index 000000000..0b7a6b7cf
--- /dev/null
+++ b/vid-app-common/src/main/java/org/onap/vid/job/impl/JobData.java
@@ -0,0 +1,54 @@
+package org.onap.vid.job.impl;
+
+import org.onap.vid.job.JobType;
+
+import java.util.Map;
+import java.util.Objects;
+import java.util.TreeMap;
+
+public class JobData {
+
+    private TreeMap<JobType, Map<String, Object>> commandData;
+    private JobSharedData sharedData;
+
+    public JobData() {
+        commandData = new TreeMap<>();
+        sharedData = new JobSharedData();
+    }
+
+    public JobData(TreeMap<JobType, Map<String, Object>> commandData, JobSharedData sharedData) {
+        this.commandData = commandData;
+        this.sharedData = sharedData;
+    }
+
+    public TreeMap<JobType, Map<String, Object>> getCommandData() {
+        return commandData;
+    }
+
+    public void setCommandData(TreeMap<JobType, Map<String, Object>> commandData) {
+        this.commandData = commandData;
+    }
+
+    public JobSharedData getSharedData() {
+        return sharedData;
+    }
+
+    public void setSharedData(JobSharedData sharedData) {
+        this.sharedData = sharedData;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (!(o instanceof JobData)) return false;
+        JobData jobData = (JobData) o;
+        return Objects.equals(getCommandData(), jobData.getCommandData()) &&
+                Objects.equals(getSharedData(), jobData.getSharedData());
+    }
+
+    @Override
+    public int hashCode() {
+
+        return Objects.hash(getCommandData(), getSharedData());
+    }
+}
-- 
cgit 1.2.3-korg