diff options
author | Ittay Stern <ittay.stern@att.com> | 2018-12-31 17:21:27 +0200 |
---|---|---|
committer | Ittay Stern <ittay.stern@att.com> | 2019-01-09 20:19:55 +0200 |
commit | 6ad41e3ccd398a2721f41ad61c80b7bb03f7d127 (patch) | |
tree | 3bd672dff83e3218232cd8665680416b7fc26a5d /vid-app-common/src/main/java/org/onap/vid/aai/model/AaiGetPnfs/Pnf.java | |
parent | 5ec29ff5e3864f1ba6ecac71f8bffbefa400cf27 (diff) |
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>
Diffstat (limited to 'vid-app-common/src/main/java/org/onap/vid/aai/model/AaiGetPnfs/Pnf.java')
-rw-r--r-- | vid-app-common/src/main/java/org/onap/vid/aai/model/AaiGetPnfs/Pnf.java | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/vid-app-common/src/main/java/org/onap/vid/aai/model/AaiGetPnfs/Pnf.java b/vid-app-common/src/main/java/org/onap/vid/aai/model/AaiGetPnfs/Pnf.java index 00a731a7..d359474d 100644 --- a/vid-app-common/src/main/java/org/onap/vid/aai/model/AaiGetPnfs/Pnf.java +++ b/vid-app-common/src/main/java/org/onap/vid/aai/model/AaiGetPnfs/Pnf.java @@ -1,31 +1,25 @@ package org.onap.vid.aai.model.AaiGetPnfs; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; -import org.codehaus.jackson.annotate.JsonProperty; +import com.fasterxml.jackson.annotation.JsonAlias; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import org.onap.vid.aai.model.AaiRelationResponse; @JsonIgnoreProperties(ignoreUnknown = true) public class Pnf extends AaiRelationResponse { - @JsonProperty("pnf-name") - public String pnfName; - @JsonProperty("pnf-name2") - public String pnfName2; - @JsonProperty("pnf-name2-source") - public String pnfName2Source; - @JsonProperty("pnf-id") - public String pnfId; - @JsonProperty("equip-type") - public String equipType; - @JsonProperty("equip-vendor") - public String equipVendor; - @JsonProperty("equip-model") - public String equipModel; + private String pnfName; + private String pnfName2; + private String pnfName2Source; + private String pnfId; + private String equipType; + private String equipVendor; + private String equipModel; public String getPnfName() { return pnfName; } + @JsonAlias("pnf-name") public void setPnfName(String pnfName) { this.pnfName = pnfName; } @@ -34,6 +28,7 @@ public class Pnf extends AaiRelationResponse { return equipType; } + @JsonAlias("equip-type") public void setEquipType(String equipType) { this.equipType = equipType; } @@ -42,6 +37,7 @@ public class Pnf extends AaiRelationResponse { return equipVendor; } + @JsonAlias("equip-vendor") public void setEquipVendor(String equipVendor) { this.equipVendor = equipVendor; } @@ -50,6 +46,7 @@ public class Pnf extends AaiRelationResponse { return pnfName2; } + @JsonAlias("pnf-name2") public void setPnfName2(String pnfName2) { this.pnfName2 = pnfName2; } @@ -58,6 +55,7 @@ public class Pnf extends AaiRelationResponse { return pnfId; } + @JsonAlias("pnf-id") public void setPnfId(String pnfId) { this.pnfId = pnfId; } @@ -66,12 +64,14 @@ public class Pnf extends AaiRelationResponse { return equipModel; } + @JsonAlias("equip-model") public void setEquipModel(String equipModel) { this.equipModel = equipModel; } public String getPnfName2Source() { return pnfName2Source; } + @JsonAlias("pnf-name2-source") public void setPnfName2Source(String pnfName2Source) { this.pnfName2Source = pnfName2Source; } } |