From 6ad41e3ccd398a2721f41ad61c80b7bb03f7d127 Mon Sep 17 00:00:00 2001 From: Ittay Stern 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 --- .../onap/vid/aai/model/ServiceRelationships.java | 62 +++++++++++++++++----- 1 file changed, 48 insertions(+), 14 deletions(-) (limited to 'vid-app-common/src/main/java/org/onap/vid/aai/model/ServiceRelationships.java') diff --git a/vid-app-common/src/main/java/org/onap/vid/aai/model/ServiceRelationships.java b/vid-app-common/src/main/java/org/onap/vid/aai/model/ServiceRelationships.java index b8abc8494..eba00356e 100644 --- a/vid-app-common/src/main/java/org/onap/vid/aai/model/ServiceRelationships.java +++ b/vid-app-common/src/main/java/org/onap/vid/aai/model/ServiceRelationships.java @@ -1,40 +1,31 @@ package org.onap.vid.aai.model; -import org.codehaus.jackson.annotate.JsonProperty; +import com.fasterxml.jackson.annotation.JsonAlias; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +@JsonIgnoreProperties(ignoreUnknown = true) public class ServiceRelationships { - @JsonProperty("service-instance-id") public String serviceInstanceId; - @JsonProperty("service-instance-name") public String serviceInstanceName; - @JsonProperty("service-type") public String serviceType; - @JsonProperty("service-role") public String serviceRole; - @JsonProperty("environment-context") public String environmentContext; - @JsonProperty("workload-context") public String workloadContext; - @JsonProperty("model-invariant-id") public String modelInvariantId; - - @JsonProperty("model-version-id") + public String modelVersionId; - @JsonProperty("resource-version") public String resourceVersion; - - @JsonProperty("orchestration-status") + public String orchestrationStatus; - @JsonProperty("relationship-list") public RelationshipList relationshipList; @@ -42,6 +33,7 @@ public class ServiceRelationships { return serviceInstanceId; } + @JsonAlias("service-instance-id") public void setServiceInstanceId(String serviceInstanceId) { this.serviceInstanceId = serviceInstanceId; } @@ -50,6 +42,7 @@ public class ServiceRelationships { return serviceInstanceName; } + @JsonAlias("service-instance-name") public void setServiceInstanceName(String serviceInstanceName) { this.serviceInstanceName = serviceInstanceName; } @@ -58,6 +51,43 @@ public class ServiceRelationships { return modelInvariantId; } + public String getServiceType() { + return serviceType; + } + + @JsonAlias("service-type") + public void setServiceType(String serviceType) { + this.serviceType = serviceType; + } + + public String getServiceRole() { + return serviceRole; + } + + @JsonAlias("service-role") + public void setServiceRole(String serviceRole) { + this.serviceRole = serviceRole; + } + + public String getEnvironmentContext() { + return environmentContext; + } + + @JsonAlias("environment-context") + public void setEnvironmentContext(String environmentContext) { + this.environmentContext = environmentContext; + } + + public String getWorkloadContext() { + return workloadContext; + } + + @JsonAlias("workload-context") + public void setWorkloadContext(String workloadContext) { + this.workloadContext = workloadContext; + } + + @JsonAlias("model-invariant-id") public void setModelInvariantId(String modelInvariantId) { this.modelInvariantId = modelInvariantId; } @@ -66,6 +96,7 @@ public class ServiceRelationships { return modelVersionId; } + @JsonAlias("model-version-id") public void setModelVersionId(String modelVersionId) { this.modelVersionId = modelVersionId; } @@ -74,6 +105,7 @@ public class ServiceRelationships { return resourceVersion; } + @JsonAlias("resource-version") public void setResourceVersion(String resourceVersion) { this.resourceVersion = resourceVersion; } @@ -82,6 +114,7 @@ public class ServiceRelationships { return orchestrationStatus; } + @JsonAlias("orchestration-status") public void setOrchestrationStatus(String orchestrationStatus) { this.orchestrationStatus = orchestrationStatus; } @@ -90,6 +123,7 @@ public class ServiceRelationships { return relationshipList; } + @JsonAlias("relationship-list") public void setRelationshipList(RelationshipList relationshipList) { this.relationshipList = relationshipList; } -- cgit 1.2.3-korg