From 6d5459569af6a9c70abf5a8bbb54917decd37b38 Mon Sep 17 00:00:00 2001 From: Jim Hahn Date: Fri, 29 May 2020 09:25:04 -0400 Subject: Do not generate notification in SDNR Actor Now that the SDNR Actor populates the operation outcome with the SDNR response, it no longer needs to populate the notification structure, as the application (e.g., drools-apps) can now generate the notification, itself, using the response. Issue-ID: POLICY-2593 Change-Id: Ie9bed0e59ca750211f17782fa7a2833c2087ac23 Signed-off-by: Jim Hahn --- .../policy/controlloop/actorserviceprovider/OperationOutcome.java | 3 --- .../controlloop/actorserviceprovider/OperationOutcomeTest.java | 6 ------ 2 files changed, 9 deletions(-) (limited to 'models-interactions/model-actors/actorServiceProvider/src') diff --git a/models-interactions/model-actors/actorServiceProvider/src/main/java/org/onap/policy/controlloop/actorserviceprovider/OperationOutcome.java b/models-interactions/model-actors/actorServiceProvider/src/main/java/org/onap/policy/controlloop/actorserviceprovider/OperationOutcome.java index 0fd2c0bfd..0c4350c63 100644 --- a/models-interactions/model-actors/actorServiceProvider/src/main/java/org/onap/policy/controlloop/actorserviceprovider/OperationOutcome.java +++ b/models-interactions/model-actors/actorServiceProvider/src/main/java/org/onap/policy/controlloop/actorserviceprovider/OperationOutcome.java @@ -25,7 +25,6 @@ import lombok.Data; import lombok.NoArgsConstructor; import lombok.NonNull; import org.onap.policy.controlloop.ControlLoopOperation; -import org.onap.policy.controlloop.ControlLoopResponse; import org.onap.policy.controlloop.policy.PolicyResult; /** @@ -44,7 +43,6 @@ public class OperationOutcome { private String message; private boolean finalOutcome; private Object response; - private ControlLoopResponse controlLoopResponse; /** * Copy constructor. @@ -62,7 +60,6 @@ public class OperationOutcome { this.message = source.message; this.finalOutcome = source.finalOutcome; this.response = source.response; - this.controlLoopResponse = source.controlLoopResponse; } /** diff --git a/models-interactions/model-actors/actorServiceProvider/src/test/java/org/onap/policy/controlloop/actorserviceprovider/OperationOutcomeTest.java b/models-interactions/model-actors/actorServiceProvider/src/test/java/org/onap/policy/controlloop/actorserviceprovider/OperationOutcomeTest.java index c60a0f00c..5820becc5 100644 --- a/models-interactions/model-actors/actorServiceProvider/src/test/java/org/onap/policy/controlloop/actorserviceprovider/OperationOutcomeTest.java +++ b/models-interactions/model-actors/actorServiceProvider/src/test/java/org/onap/policy/controlloop/actorserviceprovider/OperationOutcomeTest.java @@ -30,7 +30,6 @@ import java.time.Instant; import org.junit.Before; import org.junit.Test; import org.onap.policy.controlloop.ControlLoopOperation; -import org.onap.policy.controlloop.ControlLoopResponse; import org.onap.policy.controlloop.policy.PolicyResult; public class OperationOutcomeTest { @@ -44,7 +43,6 @@ public class OperationOutcomeTest { private static final String MESSAGE = "my-message"; private static final String RESPONSE = "my-response"; - private ControlLoopResponse response; private OperationOutcome outcome; /** @@ -52,8 +50,6 @@ public class OperationOutcomeTest { */ @Before public void setUp() { - response = new ControlLoopResponse(); - outcome = new OperationOutcome(); } @@ -72,7 +68,6 @@ public class OperationOutcomeTest { assertEquals(RESULT, outcome2.getResult()); assertEquals(MESSAGE, outcome2.getMessage()); assertSame(RESPONSE, outcome2.getResponse()); - assertSame(response, outcome2.getControlLoopResponse()); } @Test @@ -145,6 +140,5 @@ public class OperationOutcomeTest { outcome.setSubRequestId(SUB_REQ_ID); outcome.setTarget(TARGET); outcome.setResponse(RESPONSE); - outcome.setControlLoopResponse(response); } } -- cgit