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, 10 insertions, 22 deletions

diff --git a/vid-app-common/src/main/java/org/onap/vid/aai/model/SimpleResult.java b/vid-app-common/src/main/java/org/onap/vid/aai/model/SimpleResult.java
index b2edfc17e..554449b96 100644
--- a/vid-app-common/src/main/java/org/onap/vid/aai/model/SimpleResult.java
+++ b/vid-app-common/src/main/java/org/onap/vid/aai/model/SimpleResult.java
@@ -1,85 +1,73 @@
 package org.onap.vid.aai.model;
 
-import org.codehaus.jackson.annotate.JsonAnyGetter;
-import org.codehaus.jackson.annotate.JsonAnySetter;
-import org.codehaus.jackson.annotate.JsonIgnore;
-import org.codehaus.jackson.annotate.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
 public class SimpleResult {
-    @JsonProperty("id")
     private String id;
-    @JsonProperty("node-type")
     private String nodeType;
-    @JsonProperty("url")
     private String url;
-    @JsonProperty("properties")
     private Properties properties;
-    @JsonProperty("related-to")
     private List<RelatedTo> relatedTo = null;
     @JsonIgnore
-    private Map<String, Object> additionalProperties = new HashMap<String, Object>();
+    private Map<String, Object> additionalProperties = new HashMap<>();
 
-    @JsonProperty("id")
     public String getId() {
         return id;
     }
 
     @JsonProperty("id")
-    public void setId(String id) {
+    public void setJsonId(String id) {
         this.id = id;
     }
 
-    @JsonProperty("node-type")
     public String getNodeType() {
         return nodeType;
     }
 
     @JsonProperty("node-type")
-    public void setNodeType(String nodeType) {
+    public void setJsonNodeType(String nodeType) {
         this.nodeType = nodeType;
     }
 
-    @JsonProperty("url")
     public String getUrl() {
         return url;
     }
 
     @JsonProperty("url")
-    public void setUrl(String url) {
+    public void setJsonUrl(String url) {
         this.url = url;
     }
 
-    @JsonProperty("properties")
     public Properties getProperties() {
         return properties;
     }
 
     @JsonProperty("properties")
-    public void setProperties(Properties properties) {
+    public void setJsonProperties(Properties properties) {
         this.properties = properties;
     }
 
-    @JsonProperty("related-to")
     public List<RelatedTo> getRelatedTo() {
         return relatedTo;
     }
 
     @JsonProperty("related-to")
-    public void setRelatedTo(List<RelatedTo> relatedTo) {
+    public void setJsonRelatedTo(List<RelatedTo> relatedTo) {
         this.relatedTo = relatedTo;
     }
 
-    @JsonAnyGetter
     public Map<String, Object> getAdditionalProperties() {
         return this.additionalProperties;
     }
 
     @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
+    public void setJsonAdditionalProperty(String name, Object value) {
         this.additionalProperties.put(name, value);
     }
 }