summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--controlloop/common/eventmanager/src/main/java/org/onap/policy/controlloop/eventmanager/ControlLoopOperationManager.java11
-rw-r--r--controlloop/common/model-impl/appclcm/src/main/java/org/onap/policy/appclcm/LCMResponseCode.java1
2 files changed, 8 insertions, 4 deletions
diff --git a/controlloop/common/eventmanager/src/main/java/org/onap/policy/controlloop/eventmanager/ControlLoopOperationManager.java b/controlloop/common/eventmanager/src/main/java/org/onap/policy/controlloop/eventmanager/ControlLoopOperationManager.java
index ec99c1a5c..10cf173fc 100644
--- a/controlloop/common/eventmanager/src/main/java/org/onap/policy/controlloop/eventmanager/ControlLoopOperationManager.java
+++ b/controlloop/common/eventmanager/src/main/java/org/onap/policy/controlloop/eventmanager/ControlLoopOperationManager.java
@@ -190,7 +190,7 @@ public class ControlLoopOperationManager implements Serializable {
this.policyResult = null;
Operation operation = new Operation();
operation.attempt = ++this.attempts;
- operation.operation.actor = this.policy.getActor().toString();
+ operation.operation.actor = this.policy.getActor();
operation.operation.operation = this.policy.getRecipe();
operation.operation.target = this.policy.getTarget().toString();
operation.operation.subRequestId = Integer.toString(operation.attempt);
@@ -421,7 +421,8 @@ public class ControlLoopOperationManager implements Serializable {
if (this.currentOperation != null && this.currentOperation.operation != null) {
return this.currentOperation.operation.toMessage();
}
- if (this.operationHistory != null && this.operationHistory.size() > 0) {
+
+ if (!this.operationHistory.isEmpty()) {
return this.operationHistory.getLast().operation.toMessage();
}
return null;
@@ -431,7 +432,8 @@ public class ControlLoopOperationManager implements Serializable {
if (this.currentOperation != null && this.currentOperation.operation != null) {
return this.currentOperation.operation.toMessage()+ ", Guard result: " + guardResult;
}
- if (this.operationHistory != null && this.operationHistory.size() > 0) {
+
+ if (!this.operationHistory.isEmpty()) {
return this.operationHistory.getLast().operation.toMessage() + ", Guard result: " + guardResult;
}
return null;
@@ -441,7 +443,8 @@ public class ControlLoopOperationManager implements Serializable {
if (this.currentOperation != null && this.currentOperation.operation != null) {
return this.currentOperation.operation.toHistory();
}
- if (this.operationHistory != null && this.operationHistory.size() > 0) {
+
+ if (!this.operationHistory.isEmpty()) {
return this.operationHistory.getLast().operation.toHistory();
}
return null;
diff --git a/controlloop/common/model-impl/appclcm/src/main/java/org/onap/policy/appclcm/LCMResponseCode.java b/controlloop/common/model-impl/appclcm/src/main/java/org/onap/policy/appclcm/LCMResponseCode.java
index 484e793e2..85427c468 100644
--- a/controlloop/common/model-impl/appclcm/src/main/java/org/onap/policy/appclcm/LCMResponseCode.java
+++ b/controlloop/common/model-impl/appclcm/src/main/java/org/onap/policy/appclcm/LCMResponseCode.java
@@ -41,6 +41,7 @@ public class LCMResponseCode {
return this.code;
}
+ @Override
public String toString() {
return Integer.toString(this.code);
}