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
/
AaiRelationResponse.java
diff --git
a/vid-app-common/src/main/java/org/onap/vid/aai/model/AaiRelationResponse.java
b/vid-app-common/src/main/java/org/onap/vid/aai/model/AaiRelationResponse.java
index
7bc2e7a
..
981f856
100644
(file)
--- a/
vid-app-common/src/main/java/org/onap/vid/aai/model/AaiRelationResponse.java
+++ b/
vid-app-common/src/main/java/org/onap/vid/aai/model/AaiRelationResponse.java
@@
-1,9
+1,8
@@
package org.onap.vid.aai.model;
package org.onap.vid.aai.model;
-
-import org.codehaus.jackson.annotate.JsonIgnore;
-import org.codehaus.jackson.annotate.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonAlias;
+import com.fasterxml.jackson.annotation.JsonIgnore;
import java.util.HashMap;
import java.util.Map;
import java.util.HashMap;
import java.util.Map;
@@
-13,30
+12,27
@@
import java.util.Map;
*/
public class AaiRelationResponse {
*/
public class AaiRelationResponse {
- @JsonProperty("resource-version")
private String resourceVersion;
private String resourceVersion;
- @JsonProperty("relationship-list")
private RelationshipList relationshipList;
private RelationshipList relationshipList;
+
@JsonIgnore
@JsonIgnore
- private Map<String, Object> additionalProperties = new HashMap<
String, Object
>();
+ private Map<String, Object> additionalProperties = new HashMap<>();
- @JsonProperty("resource-version")
public String getResourceVersion() {
return resourceVersion;
}
public String getResourceVersion() {
return resourceVersion;
}
- @Json
Property
("resource-version")
+ @Json
Alias
("resource-version")
public void setResourceVersion(String resourceVersion) {
this.resourceVersion = resourceVersion;
}
public void setResourceVersion(String resourceVersion) {
this.resourceVersion = resourceVersion;
}
- @JsonProperty("relationship-list")
public RelationshipList getRelationshipList() {
return relationshipList;
}
public RelationshipList getRelationshipList() {
return relationshipList;
}
- @Json
Property
("relationship-list")
+ @Json
Alias
("relationship-list")
public void setRelationshipList(RelationshipList relationshipList) {
this.relationshipList = relationshipList;
}
public void setRelationshipList(RelationshipList relationshipList) {
this.relationshipList = relationshipList;
}