diff options
9 files changed, 21 insertions, 21 deletions
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<String, Object> statusProperties = new LinkedHashMap<>(); + private Map<String, Object> 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<String, Object> properties = new LinkedHashMap<>(); - private Map<String, Object> statusProperties = new LinkedHashMap<>(); + private Map<String, Object> 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<String, Object> statusProperties = new LinkedHashMap<>(); + private Map<String, Object> 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<String, Object> statusProperties; + private Map<String, Object> 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); } } diff --git a/participant/participant-intermediary/src/main/java/org/onap/policy/clamp/acm/participant/intermediary/api/ParticipantIntermediaryApi.java b/participant/participant-intermediary/src/main/java/org/onap/policy/clamp/acm/participant/intermediary/api/ParticipantIntermediaryApi.java index f35572769..550ac37c5 100644 --- a/participant/participant-intermediary/src/main/java/org/onap/policy/clamp/acm/participant/intermediary/api/ParticipantIntermediaryApi.java +++ b/participant/participant-intermediary/src/main/java/org/onap/policy/clamp/acm/participant/intermediary/api/ParticipantIntermediaryApi.java @@ -66,8 +66,8 @@ public interface ParticipantIntermediaryApi { * @param id the ID of the automation composition element to update the states * @param useState the use State * @param operationalState the operational State - * @param statusProperties the status Properties Map + * @param outProperties the output Properties Map */ void sendAcElementInfo(UUID automationCompositionId, UUID id, String useState, String operationalState, - Map<String, Object> statusProperties); + Map<String, Object> outProperties); } diff --git a/participant/participant-intermediary/src/main/java/org/onap/policy/clamp/acm/participant/intermediary/api/impl/ParticipantIntermediaryApiImpl.java b/participant/participant-intermediary/src/main/java/org/onap/policy/clamp/acm/participant/intermediary/api/impl/ParticipantIntermediaryApiImpl.java index 69fd9f3e8..1bc3e5e72 100644 --- a/participant/participant-intermediary/src/main/java/org/onap/policy/clamp/acm/participant/intermediary/api/impl/ParticipantIntermediaryApiImpl.java +++ b/participant/participant-intermediary/src/main/java/org/onap/policy/clamp/acm/participant/intermediary/api/impl/ParticipantIntermediaryApiImpl.java @@ -65,9 +65,9 @@ public class ParticipantIntermediaryApiImpl implements ParticipantIntermediaryAp @Override public void sendAcElementInfo(UUID automationCompositionId, UUID elementId, String useState, - String operationalState, Map<String, Object> statusProperties) { + String operationalState, Map<String, Object> outProperties) { automationCompositionHandler.sendAcElementInfo(automationCompositionId, elementId, useState, operationalState, - statusProperties); + outProperties); } @Override diff --git a/participant/participant-intermediary/src/main/java/org/onap/policy/clamp/acm/participant/intermediary/handler/AutomationCompositionHandler.java b/participant/participant-intermediary/src/main/java/org/onap/policy/clamp/acm/participant/intermediary/handler/AutomationCompositionHandler.java index 26ec1462c..d33498518 100644 --- a/participant/participant-intermediary/src/main/java/org/onap/policy/clamp/acm/participant/intermediary/handler/AutomationCompositionHandler.java +++ b/participant/participant-intermediary/src/main/java/org/onap/policy/clamp/acm/participant/intermediary/handler/AutomationCompositionHandler.java @@ -154,7 +154,7 @@ public class AutomationCompositionHandler { automationCompositionStateChangeAck.setAutomationCompositionId(automationCompositionId); automationCompositionStateChangeAck.getAutomationCompositionResultMap().put(element.getId(), new AcElementDeployAck(element.getDeployState(), element.getLockState(), element.getOperationalState(), - element.getUseState(), element.getStatusProperties(), true, + element.getUseState(), element.getOutProperties(), true, "Automation composition element {} state changed to {}\", id, newState)")); LOGGER.debug("Automation composition element {} state changed to {}", id, deployState); automationCompositionStateChangeAck.setResult(true); @@ -509,10 +509,10 @@ public class AutomationCompositionHandler { * @param elementId the automationComposition Element id * @param useState the use State * @param operationalState the operational State - * @param statusProperties the status Properties Map + * @param outProperties the output Properties Map */ public void sendAcElementInfo(UUID automationCompositionId, UUID elementId, String useState, - String operationalState, Map<String, Object> statusProperties) { + String operationalState, Map<String, Object> outProperties) { if (automationCompositionId == null || elementId == null) { LOGGER.error("Cannot update Automation composition element state, id is null"); @@ -534,7 +534,7 @@ public class AutomationCompositionHandler { } element.setOperationalState(operationalState); element.setUseState(useState); - element.setStatusProperties(statusProperties); + element.setOutProperties(outProperties); var statusMsg = new ParticipantStatus(); statusMsg.setParticipantId(participantId); @@ -576,7 +576,7 @@ public class AutomationCompositionHandler { elementInfo.setLockState(element.getLockState()); elementInfo.setOperationalState(element.getOperationalState()); elementInfo.setUseState(element.getUseState()); - elementInfo.setStatusProperties(element.getStatusProperties()); + elementInfo.setOutProperties(element.getOutProperties()); return elementInfo; } } diff --git a/runtime-acm/src/main/java/org/onap/policy/clamp/acm/runtime/supervision/SupervisionAcHandler.java b/runtime-acm/src/main/java/org/onap/policy/clamp/acm/runtime/supervision/SupervisionAcHandler.java index 8032b4d5d..654c31194 100644 --- a/runtime-acm/src/main/java/org/onap/policy/clamp/acm/runtime/supervision/SupervisionAcHandler.java +++ b/runtime-acm/src/main/java/org/onap/policy/clamp/acm/runtime/supervision/SupervisionAcHandler.java @@ -192,7 +192,7 @@ public class SupervisionAcHandler { element.setLockState(acElementAck.getValue().getLockState()); element.setOperationalState(acElementAck.getValue().getOperationalState()); element.setUseState(acElementAck.getValue().getUseState()); - element.setStatusProperties(acElementAck.getValue().getStatusProperties()); + element.setOutProperties(acElementAck.getValue().getOutProperties()); updated = true; } } |