diff options
author | Ittay Stern <ittay.stern@att.com> | 2019-12-07 20:05:38 +0200 |
---|---|---|
committer | Ittay Stern <ittay.stern@att.com> | 2019-12-09 12:26:47 +0000 |
commit | 57e44972ab82fcd166eb6c0a3a948bd2c4287661 (patch) | |
tree | 83830688d00c12a1bf9f12233820b079a7a3fe3a /vid-app-common/src/main/java/org/onap/vid/model/serviceInstantiation/ServiceInstantiation.java | |
parent | 6d937099efa1cb30eb16470005c7e05c1f29f729 (diff) |
Change ServiceInstance's top-level rollbackOnFailure serialization to String
This will satisfy a new test: Template Topology API test:
Deploy Cypress -> getTemplateTopology returns the same template
Also updating templates__instance_template.json with actual
"templateTopology" endpoint fields.
Issue-ID: VID-724
Change-Id: I1160656c9a58ab2678ca6f2529688463fbd60a91
Signed-off-by: Ittay Stern <ittay.stern@att.com>
Diffstat (limited to 'vid-app-common/src/main/java/org/onap/vid/model/serviceInstantiation/ServiceInstantiation.java')
-rw-r--r-- | vid-app-common/src/main/java/org/onap/vid/model/serviceInstantiation/ServiceInstantiation.java | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/vid-app-common/src/main/java/org/onap/vid/model/serviceInstantiation/ServiceInstantiation.java b/vid-app-common/src/main/java/org/onap/vid/model/serviceInstantiation/ServiceInstantiation.java index 8828faf1d..e7e5783c4 100644 --- a/vid-app-common/src/main/java/org/onap/vid/model/serviceInstantiation/ServiceInstantiation.java +++ b/vid-app-common/src/main/java/org/onap/vid/model/serviceInstantiation/ServiceInstantiation.java @@ -21,18 +21,19 @@ package org.onap.vid.model.serviceInstantiation; import com.fasterxml.jackson.annotation.JsonProperty; -import org.apache.commons.lang3.ObjectUtils; -import org.onap.vid.job.JobAdapter; -import org.onap.vid.job.JobType; -import org.onap.vid.model.VidNotions; -import org.onap.vid.mso.model.ModelInfo; - +import com.fasterxml.jackson.databind.annotation.JsonSerialize; import java.util.Collection; import java.util.Collections; import java.util.List; import java.util.Map; import java.util.stream.Collectors; import java.util.stream.Stream; +import org.apache.commons.lang3.ObjectUtils; +import org.onap.vid.job.JobAdapter; +import org.onap.vid.job.JobType; +import org.onap.vid.model.VidNotions; +import org.onap.vid.mso.model.ModelInfo; +import org.onap.vid.utils.jackson.BooleanAsStringSerializer; public class ServiceInstantiation extends BaseResource implements JobAdapter.AsyncJobRequest { @@ -127,6 +128,13 @@ public class ServiceInstantiation extends BaseResource implements JobAdapter.Asy this.vidNotions = vidNotions; } + @Override + @JsonSerialize(using=BooleanAsStringSerializer.class) + public boolean isRollbackOnFailure() { + // this override is for the BooleanAsStringSerializer annotation, + // but for Service-Instance level only + return super.isRollbackOnFailure(); + } public String getOwningEntityId() { return owningEntityId; |