From 1dd41890f83702d47c5a957493046433989ef36c Mon Sep 17 00:00:00 2001 From: Jim Hahn Date: Wed, 18 Nov 2020 10:44:41 -0500 Subject: Delete preprocessed flag from actors Removed the "preprocessed" flag from the Actor parameter class, now that the actors no longer have a startPreprocess() method. Also removed targetEntity from Actor parameter class. Created a makeOutcome method within OperationPartial, which is used to create an initial outcome whose target field is pre-populated with the target-entity extracted from the properties. As the meaning of "target" may be specific to an operation, the makeOutcome method may be overridden by an operation subclass. Issue-ID: POLICY-2804 Change-Id: Ifb66de63301d644e69340009593513773ee5672d Signed-off-by: Jim Hahn --- .../java/org/onap/policy/controlloop/actor/test/BasicOperation.java | 2 +- .../java/org/onap/policy/controlloop/actor/test/BasicOperationTest.java | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) (limited to 'models-interactions/model-actors/actor.test') diff --git a/models-interactions/model-actors/actor.test/src/main/java/org/onap/policy/controlloop/actor/test/BasicOperation.java b/models-interactions/model-actors/actor.test/src/main/java/org/onap/policy/controlloop/actor/test/BasicOperation.java index bb7f34b61..4bfbe40f2 100644 --- a/models-interactions/model-actors/actor.test/src/main/java/org/onap/policy/controlloop/actor/test/BasicOperation.java +++ b/models-interactions/model-actors/actor.test/src/main/java/org/onap/policy/controlloop/actor/test/BasicOperation.java @@ -112,7 +112,7 @@ public class BasicOperation { */ protected void makeContext() { params = ControlLoopOperationParams.builder().executor(executor).requestId(REQ_ID).actorService(service) - .actor(actorName).operation(operationName).targetEntity(TARGET_ENTITY).payload(makePayload()) + .actor(actorName).operation(operationName).payload(makePayload()) .build(); } diff --git a/models-interactions/model-actors/actor.test/src/test/java/org/onap/policy/controlloop/actor/test/BasicOperationTest.java b/models-interactions/model-actors/actor.test/src/test/java/org/onap/policy/controlloop/actor/test/BasicOperationTest.java index fe06ad52f..758acf75e 100644 --- a/models-interactions/model-actors/actor.test/src/test/java/org/onap/policy/controlloop/actor/test/BasicOperationTest.java +++ b/models-interactions/model-actors/actor.test/src/test/java/org/onap/policy/controlloop/actor/test/BasicOperationTest.java @@ -74,7 +74,6 @@ public class BasicOperationTest { assertEquals(ACTOR, oper.params.getActor()); assertEquals(OPERATION, oper.params.getOperation()); assertSame(BasicHttpOperation.REQ_ID, oper.params.getRequestId()); - assertEquals(BasicHttpOperation.TARGET_ENTITY, oper.params.getTargetEntity()); } @Test -- cgit 1.2.3-korg