Code Review
/
vid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge from ECOMP's repository
[vid.git]
/
vid-app-common
/
src
/
main
/
java
/
org
/
onap
/
vid
/
aai
/
model
/
ModelVers.java
diff --git
a/vid-app-common/src/main/java/org/onap/vid/aai/model/ModelVers.java
b/vid-app-common/src/main/java/org/onap/vid/aai/model/ModelVers.java
index
f352158
..
eed40fc
100644
(file)
--- a/
vid-app-common/src/main/java/org/onap/vid/aai/model/ModelVers.java
+++ b/
vid-app-common/src/main/java/org/onap/vid/aai/model/ModelVers.java
@@
-1,7
+1,7
@@
package org.onap.vid.aai.model;
package org.onap.vid.aai.model;
-import
org.codehaus.jackson.annotate.JsonIgnorePropertie
s;
-import
org.codehaus.jackson.annotate.JsonProperty
;
+import
com.fasterxml.jackson.annotation.JsonAlia
s;
+import
com.fasterxml.jackson.annotation.JsonIgnoreProperties
;
import java.util.List;
import java.util.List;
@@
-11,15
+11,13
@@
import java.util.List;
@JsonIgnoreProperties(ignoreUnknown = true)
public class ModelVers {
@JsonIgnoreProperties(ignoreUnknown = true)
public class ModelVers {
- @JsonProperty("model-ver")
private List<ModelVer> modelVer;
private List<ModelVer> modelVer;
- @JsonProperty("model-ver")
public List<ModelVer> getModelVer() {
return modelVer;
}
public List<ModelVer> getModelVer() {
return modelVer;
}
- @Json
Property
("model-ver")
+ @Json
Alias
("model-ver")
public void setModelVer(List<ModelVer> modelVer) {
this.modelVer = modelVer;
}
public void setModelVer(List<ModelVer> modelVer) {
this.modelVer = modelVer;
}