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

diff --git a/vid-app-common/src/main/java/org/onap/vid/aai/model/PnfProperties.java b/vid-app-common/src/main/java/org/onap/vid/aai/model/PnfProperties.java
index 3481d263e..032714b93 100644
--- a/vid-app-common/src/main/java/org/onap/vid/aai/model/PnfProperties.java
+++ b/vid-app-common/src/main/java/org/onap/vid/aai/model/PnfProperties.java
@@ -1,12 +1,6 @@
 package org.onap.vid.aai.model;
 
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import org.codehaus.jackson.annotate.JsonIgnoreProperties;
-import org.codehaus.jackson.annotate.JsonProperty;
+import com.fasterxml.jackson.annotation.*;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -23,20 +17,15 @@ import java.util.Map;
 })
 public class PnfProperties {
 
-    @JsonProperty("pnf-name")
     public String pnfName;
-    @JsonProperty("equip-type")
     public String equipType;
-    @JsonProperty("equip-vendor")
     public String equipVendor;
-    @JsonProperty("equip-model")
     public String equipModel;
-    @JsonProperty("in-maint")
     public Boolean inMaint;
-    @JsonProperty("resource-version")
     public String resourceVersion;
+
     @JsonIgnore
-    private Map<String, Object> additionalProperties = new HashMap<String, Object>();
+    private Map<String, Object> additionalProperties = new HashMap<>();
 
     @JsonAnyGetter
     public Map<String, Object> getAdditionalProperties() {
@@ -48,4 +37,34 @@ public class PnfProperties {
         this.additionalProperties.put(name, value);
     }
 
+    @JsonProperty("pnf-name")
+    public void setJsonPnfName(String pnfName) {
+        this.pnfName = pnfName;
+    }
+
+    @JsonProperty("equip-type")
+    public void setJsonEquipType(String equipType) {
+        this.equipType = equipType;
+    }
+
+    @JsonProperty("equip-vendor")
+    public void setJsonEquipVendor(String equipVendor) {
+        this.equipVendor = equipVendor;
+    }
+
+    @JsonProperty("equip-model")
+    public void setJsonEquipModel(String equipModel) {
+        this.equipModel = equipModel;
+    }
+
+    @JsonProperty("in-maint")
+    public void setJsonInMaint(Boolean inMaint) {
+        this.inMaint = inMaint;
+    }
+
+    @JsonProperty("resource-version")
+    public void setJsonResourceVersion(String resourceVersion) {
+        this.resourceVersion = resourceVersion;
+    }
+
 }