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, 6 insertions, 14 deletions

diff --git a/vid-app-common/src/main/java/org/onap/vid/aai/model/Model.java b/vid-app-common/src/main/java/org/onap/vid/aai/model/Model.java
index 5f422f68a..7a771e4e8 100644
--- a/vid-app-common/src/main/java/org/onap/vid/aai/model/Model.java
+++ b/vid-app-common/src/main/java/org/onap/vid/aai/model/Model.java
@@ -1,7 +1,7 @@
 package org.onap.vid.aai.model;
 
-import org.codehaus.jackson.annotate.JsonIgnoreProperties;
-import org.codehaus.jackson.annotate.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonAlias;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 
 /**
  * Created by moriya1 on 15/10/2017.
@@ -9,51 +9,43 @@ import org.codehaus.jackson.annotate.JsonProperty;
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class Model {
 
-        @JsonProperty("model-invariant-id")
         private String modelInvariantId;
-        @JsonProperty("model-type")
         private String modelType;
-        @JsonProperty("resource-version")
         private String resourceVersion;
-        @JsonProperty("model-vers")
         private ModelVers modelVers;
 
-        @JsonProperty("model-invariant-id")
         public String getModelInvariantId() {
             return modelInvariantId;
         }
 
-        @JsonProperty("model-invariant-id")
+        @JsonAlias("model-invariant-id")
         public void setModelInvariantId(String modelInvariantId) {
             this.modelInvariantId = modelInvariantId;
         }
 
-        @JsonProperty("model-type")
         public String getModelType() {
             return modelType;
         }
 
-        @JsonProperty("model-type")
+        @JsonAlias("model-type")
         public void setModelType(String modelType) {
             this.modelType = modelType;
         }
 
-        @JsonProperty("resource-version")
         public String getResourceVersion() {
             return resourceVersion;
         }
 
-        @JsonProperty("resource-version")
+        @JsonAlias("resource-version")
         public void setResourceVersion(String resourceVersion) {
             this.resourceVersion = resourceVersion;
         }
 
-        @JsonProperty("model-vers")
         public ModelVers getModelVers() {
             return modelVers;
         }
 
-        @JsonProperty("model-vers")
+        @JsonAlias("model-vers")
         public void setModelVers(ModelVers modelVers) {
             this.modelVers = modelVers;
         }