Rename statusProperites to outProperites in ACM
Issue-ID: POLICY-4687
Change-Id: Ida8ff3fbc72c2f6d75a8e3399fa40099696c1477
Signed-off-by: FrancescoFioraEst <francesco.fiora@est.tech>
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 39bbdd1..b34fb12 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 @@
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 208766e..8095b5c 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 @@
// 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 @@
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 9d8fd72..8894c3f 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 @@
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 @@
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 9956a47..27da039 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 @@
@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 @@
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 @@
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 @@
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 38add31..7b39360 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 @@
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 f355727..550ac37 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 @@
* @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 69fd9f3..1bc3e5e 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 @@
@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 26ec146..d334985 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 @@
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 @@
* @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 @@
}
element.setOperationalState(operationalState);
element.setUseState(useState);
- element.setStatusProperties(statusProperties);
+ element.setOutProperties(outProperties);
var statusMsg = new ParticipantStatus();
statusMsg.setParticipantId(participantId);
@@ -576,7 +576,7 @@
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 8032b4d..654c311 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 @@
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;
}
}