From 22413b34218e632c509c1b8b87dbfcc5644b5abd Mon Sep 17 00:00:00 2001 From: FrancescoFioraEst Date: Wed, 17 May 2023 11:21:25 +0100 Subject: Rename statusProperites to outProperites in ACM Issue-ID: POLICY-4687 Change-Id: Ida8ff3fbc72c2f6d75a8e3399fa40099696c1477 Signed-off-by: FrancescoFioraEst --- .../policy/clamp/models/acm/concepts/AcElementDeployAck.java | 2 +- .../models/acm/concepts/AutomationCompositionElement.java | 4 ++-- .../models/acm/concepts/AutomationCompositionElementInfo.java | 4 ++-- .../persistence/concepts/JpaAutomationCompositionElement.java | 10 +++++----- .../persistence/provider/AutomationCompositionProvider.java | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-) (limited to 'models') diff --git a/models/src/main/java/org/onap/policy/clamp/models/acm/concepts/AcElementDeployAck.java b/models/src/main/java/org/onap/policy/clamp/models/acm/concepts/AcElementDeployAck.java index 39bbdd173..b34fb12d7 100644 --- a/models/src/main/java/org/onap/policy/clamp/models/acm/concepts/AcElementDeployAck.java +++ b/models/src/main/java/org/onap/policy/clamp/models/acm/concepts/AcElementDeployAck.java @@ -43,7 +43,7 @@ public class AcElementDeployAck { private String useState; - private Map statusProperties = new LinkedHashMap<>(); + private Map outProperties = new LinkedHashMap<>(); // Result: Success/Fail. private Boolean result; diff --git a/models/src/main/java/org/onap/policy/clamp/models/acm/concepts/AutomationCompositionElement.java b/models/src/main/java/org/onap/policy/clamp/models/acm/concepts/AutomationCompositionElement.java index 208766ebb..8095b5cee 100644 --- a/models/src/main/java/org/onap/policy/clamp/models/acm/concepts/AutomationCompositionElement.java +++ b/models/src/main/java/org/onap/policy/clamp/models/acm/concepts/AutomationCompositionElement.java @@ -64,7 +64,7 @@ public class AutomationCompositionElement { // which can be deserialized into an instance of the type of the property. private Map properties = new LinkedHashMap<>(); - private Map statusProperties = new LinkedHashMap<>(); + private Map outProperties = new LinkedHashMap<>(); /** * Copy constructor, does a deep copy but as all fields here are immutable, it's just a regular copy. @@ -77,7 +77,7 @@ public class AutomationCompositionElement { this.participantId = otherElement.participantId; this.description = otherElement.description; this.properties = PfUtils.mapMap(otherElement.properties, UnaryOperator.identity()); - this.statusProperties = PfUtils.mapMap(otherElement.statusProperties, UnaryOperator.identity()); + this.outProperties = PfUtils.mapMap(otherElement.outProperties, UnaryOperator.identity()); this.deployState = otherElement.deployState; this.lockState = otherElement.lockState; this.operationalState = otherElement.operationalState; diff --git a/models/src/main/java/org/onap/policy/clamp/models/acm/concepts/AutomationCompositionElementInfo.java b/models/src/main/java/org/onap/policy/clamp/models/acm/concepts/AutomationCompositionElementInfo.java index 9d8fd72ae..8894c3f88 100644 --- a/models/src/main/java/org/onap/policy/clamp/models/acm/concepts/AutomationCompositionElementInfo.java +++ b/models/src/main/java/org/onap/policy/clamp/models/acm/concepts/AutomationCompositionElementInfo.java @@ -47,7 +47,7 @@ public class AutomationCompositionElementInfo { private String useState; - private Map statusProperties = new LinkedHashMap<>(); + private Map outProperties = new LinkedHashMap<>(); /** * Copy constructor, does a deep copy but as all fields here are immutable, it's just a regular copy. @@ -60,6 +60,6 @@ public class AutomationCompositionElementInfo { this.lockState = otherElement.lockState; this.operationalState = otherElement.operationalState; this.useState = otherElement.useState; - this.statusProperties = PfUtils.mapMap(otherElement.statusProperties, UnaryOperator.identity()); + this.outProperties = PfUtils.mapMap(otherElement.outProperties, UnaryOperator.identity()); } } diff --git a/models/src/main/java/org/onap/policy/clamp/models/acm/persistence/concepts/JpaAutomationCompositionElement.java b/models/src/main/java/org/onap/policy/clamp/models/acm/persistence/concepts/JpaAutomationCompositionElement.java index 9956a471b..27da0399c 100644 --- a/models/src/main/java/org/onap/policy/clamp/models/acm/persistence/concepts/JpaAutomationCompositionElement.java +++ b/models/src/main/java/org/onap/policy/clamp/models/acm/persistence/concepts/JpaAutomationCompositionElement.java @@ -111,7 +111,7 @@ public class JpaAutomationCompositionElement extends Validated @NotNull @Valid @Convert(converter = StringToMapConverter.class) - private Map statusProperties; + private Map outProperties; /** * The Default Constructor creates a {@link JpaAutomationCompositionElement} object with a null key. @@ -162,8 +162,8 @@ public class JpaAutomationCompositionElement extends Validated this.participantId = copyConcept.participantId; this.description = copyConcept.description; this.properties = (copyConcept.properties != null ? new LinkedHashMap<>(copyConcept.properties) : null); - this.statusProperties = - (copyConcept.statusProperties != null ? new LinkedHashMap<>(copyConcept.statusProperties) + this.outProperties = + (copyConcept.outProperties != null ? new LinkedHashMap<>(copyConcept.outProperties) : null); this.deployState = copyConcept.deployState; this.lockState = copyConcept.lockState; @@ -189,7 +189,7 @@ public class JpaAutomationCompositionElement extends Validated element.setParticipantId(UUID.fromString(participantId)); element.setDescription(description); element.setProperties(PfUtils.mapMap(properties, UnaryOperator.identity())); - element.setStatusProperties(PfUtils.mapMap(statusProperties, UnaryOperator.identity())); + element.setOutProperties(PfUtils.mapMap(outProperties, UnaryOperator.identity())); element.setDeployState(deployState); element.setLockState(lockState); element.setOperationalState(operationalState); @@ -204,7 +204,7 @@ public class JpaAutomationCompositionElement extends Validated this.participantId = element.getParticipantId().toString(); this.description = element.getDescription(); this.properties = PfUtils.mapMap(element.getProperties(), UnaryOperator.identity()); - this.statusProperties = PfUtils.mapMap(element.getStatusProperties(), UnaryOperator.identity()); + this.outProperties = PfUtils.mapMap(element.getOutProperties(), UnaryOperator.identity()); this.deployState = element.getDeployState(); this.lockState = element.getLockState(); this.operationalState = element.getOperationalState(); diff --git a/models/src/main/java/org/onap/policy/clamp/models/acm/persistence/provider/AutomationCompositionProvider.java b/models/src/main/java/org/onap/policy/clamp/models/acm/persistence/provider/AutomationCompositionProvider.java index 38add31dd..7b39360f0 100644 --- a/models/src/main/java/org/onap/policy/clamp/models/acm/persistence/provider/AutomationCompositionProvider.java +++ b/models/src/main/java/org/onap/policy/clamp/models/acm/persistence/provider/AutomationCompositionProvider.java @@ -203,7 +203,7 @@ public class AutomationCompositionProvider { var jpa = acElementRepository.getReferenceById(element.getAutomationCompositionElementId().toString()); jpa.setUseState(element.getUseState()); jpa.setOperationalState(element.getOperationalState()); - jpa.setStatusProperties(element.getStatusProperties()); + jpa.setOutProperties(element.getOutProperties()); jpaList.add(jpa); } } -- cgit 1.2.3-korg