From: Jim Hahn <jrh3@att.com>
Date: Fri, 20 Nov 2020 16:47:02 +0000 (-0500)
Subject: Use Params makeOutcome() without targetEntity
X-Git-Tag: 1.8.0~11^2
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=74332b54731f535624a6a7ddb27bb048cc36c95e;p=policy%2Fdrools-applications.git

Use Params makeOutcome() without targetEntity

Planning to remove the second flavor of makeOutcome() from the Params,
so modifying the drools-apps code to work with the first flavor.

Issue-ID: POLICY-2804
Change-Id: Iddb288f7cf53e93919e77aca8afe3869fadb0d37
Signed-off-by: Jim Hahn <jrh3@att.com>
---

diff --git a/controlloop/common/controller-usecases/src/main/resources/usecases.drl b/controlloop/common/controller-usecases/src/main/resources/usecases.drl
index 578bd9ca4..12c9849f9 100644
--- a/controlloop/common/controller-usecases/src/main/resources/usecases.drl
+++ b/controlloop/common/controller-usecases/src/main/resources/usecases.drl
@@ -395,7 +395,7 @@ rule "EVENT.MANAGER.EXECUTE.STEP"
 
         if (guardDisabled && "GUARD".equals($step.getActorName())) {
             // guard is disabled - just enqueue a "SUCCESS" (i.e., "Permit")
-            OperationOutcome outcome = $step.getParams().makeOutcome(null);
+            OperationOutcome outcome = $step.getParams().makeOutcome();
             outcome.setStart(Instant.now());
             outcome.setEnd(outcome.getStart());
 
diff --git a/controlloop/common/eventmanager/src/main/java/org/onap/policy/controlloop/eventmanager/Step.java b/controlloop/common/eventmanager/src/main/java/org/onap/policy/controlloop/eventmanager/Step.java
index d406e6efe..15070bdad 100644
--- a/controlloop/common/eventmanager/src/main/java/org/onap/policy/controlloop/eventmanager/Step.java
+++ b/controlloop/common/eventmanager/src/main/java/org/onap/policy/controlloop/eventmanager/Step.java
@@ -270,7 +270,10 @@ public class Step {
      * @return a new operation outcome
      */
     public OperationOutcome makeOutcome() {
-        return params.makeOutcome(operation.getProperty(OperationProperties.AAI_TARGET_ENTITY));
+        OperationOutcome outcome = params.makeOutcome();
+        outcome.setTarget(operation.getProperty(OperationProperties.AAI_TARGET_ENTITY));
+
+        return outcome;
     }
 
     @Override