diff options
Diffstat (limited to 'models-interactions/model-actors/actor.guard/src')
2 files changed, 5 insertions, 5 deletions
diff --git a/models-interactions/model-actors/actor.guard/src/main/java/org/onap/policy/controlloop/actor/guard/GuardOperation.java b/models-interactions/model-actors/actor.guard/src/main/java/org/onap/policy/controlloop/actor/guard/GuardOperation.java index edd2e230d..3a7821ec2 100644 --- a/models-interactions/model-actors/actor.guard/src/main/java/org/onap/policy/controlloop/actor/guard/GuardOperation.java +++ b/models-interactions/model-actors/actor.guard/src/main/java/org/onap/policy/controlloop/actor/guard/GuardOperation.java @@ -21,7 +21,6 @@ package org.onap.policy.controlloop.actor.guard; import java.util.Map; -import java.util.UUID; import java.util.concurrent.CompletableFuture; import java.util.concurrent.Executor; import javax.ws.rs.client.Entity; @@ -106,8 +105,6 @@ public class GuardOperation extends HttpOperation<DecisionResponse> { @Override protected CompletableFuture<OperationOutcome> startOperationAsync(int attempt, OperationOutcome outcome) { - outcome.setSubRequestId(String.valueOf(attempt)); - DecisionRequest request = makeRequest(); Entity<DecisionRequest> entity = Entity.entity(request, MediaType.APPLICATION_JSON); @@ -135,7 +132,7 @@ public class GuardOperation extends HttpOperation<DecisionResponse> { } DecisionRequest req = config.makeRequest(); - req.setRequestId(UUID.randomUUID().toString()); + req.setRequestId(getSubRequestId()); req.setResource(Map.of("guard", params.getPayload())); return req; diff --git a/models-interactions/model-actors/actor.guard/src/test/java/org/onap/policy/controlloop/actor/guard/GuardOperationTest.java b/models-interactions/model-actors/actor.guard/src/test/java/org/onap/policy/controlloop/actor/guard/GuardOperationTest.java index 3d1538312..58d54a5ed 100644 --- a/models-interactions/model-actors/actor.guard/src/test/java/org/onap/policy/controlloop/actor/guard/GuardOperationTest.java +++ b/models-interactions/model-actors/actor.guard/src/test/java/org/onap/policy/controlloop/actor/guard/GuardOperationTest.java @@ -161,7 +161,8 @@ public class GuardOperationTest extends BasicHttpOperation<DecisionRequest> { assertEquals(PolicyResult.SUCCESS, future2.get().getResult()); - assertEquals("1", future2.get().getSubRequestId()); + assertNotNull(oper.getSubRequestId()); + assertEquals(oper.getSubRequestId(), future2.get().getSubRequestId()); } /** @@ -189,6 +190,8 @@ public class GuardOperationTest extends BasicHttpOperation<DecisionRequest> { @Test public void testMakeRequest() throws CoderException { + oper.generateSubRequestId(2); + verifyPayload("makeReqStd.json", makePayload()); verifyPayload("makeReqDefault.json", new TreeMap<>()); |