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/aai/model/ModelVer.java | 28 +++++++---------------
 1 file changed, 8 insertions(+), 20 deletions(-)

(limited to 'vid-app-common/src/main/java/org/onap/vid/aai/model/ModelVer.java')

diff --git a/vid-app-common/src/main/java/org/onap/vid/aai/model/ModelVer.java b/vid-app-common/src/main/java/org/onap/vid/aai/model/ModelVer.java
index f02bbacfe..6908feb71 100644
--- a/vid-app-common/src/main/java/org/onap/vid/aai/model/ModelVer.java
+++ b/vid-app-common/src/main/java/org/onap/vid/aai/model/ModelVer.java
@@ -1,82 +1,70 @@
 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;
 
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class ModelVer {
 
-    @JsonProperty("model-version-id")
     private String modelVersionId;
-    @JsonProperty("model-name")
     private String modelName;
-    @JsonProperty("model-version")
     private String modelVersion;
-    @JsonProperty("distribution-status")
     private String distributionStatus;
-    @JsonProperty("resource-version")
     private String resourceVersion;
-    @JsonProperty("model-description")
     private String modelDescription;
 
 
 
-    @JsonProperty("model-version-id")
     public String getModelVersionId() {
         return modelVersionId;
     }
 
-    @JsonProperty("model-version-id")
+    @JsonAlias("model-version-id")
     public void setModelVersionId(String modelVersionId) {
         this.modelVersionId = modelVersionId;
     }
 
-    @JsonProperty("model-name")
     public String getModelName() {
         return modelName;
     }
 
-    @JsonProperty("model-name")
+    @JsonAlias("model-name")
     public void setModelName(String modelName) {
         this.modelName = modelName;
     }
 
-    @JsonProperty("model-version")
     public String getModelVersion() {
         return modelVersion;
     }
 
-    @JsonProperty("model-version")
+    @JsonAlias("model-version")
     public void setModelVersion(String modelVersion) {
         this.modelVersion = modelVersion;
     }
 
-    @JsonProperty("distribution-status")
     public String getDistributionStatus() {
         return distributionStatus;
     }
 
-    @JsonProperty("distribution-status")
+    @JsonAlias("distribution-status")
     public void setDistributionStatus(String distributionStatus) {
         this.distributionStatus = distributionStatus;
     }
 
-    @JsonProperty("resource-version")
     public String getResourceVersion() {
         return resourceVersion;
     }
 
-    @JsonProperty("resource-version")
+    @JsonAlias("resource-version")
     public void setResourceVersion(String resourceVersion) {
         this.resourceVersion = resourceVersion;
     }
 
-    @JsonProperty("model-description")
     public String getModelDescription() {
         return modelDescription;
     }
 
-    @JsonProperty("model-description")
+    @JsonAlias("model-description")
     public void setModelDescription(String modelDescription) {
         this.modelDescription = modelDescription;
     }
-- 
cgit 1.2.3-korg