From 865100d2bbaafac77f1d9e637bca81adc03c4c44 Mon Sep 17 00:00:00 2001 From: "adheli.tavares" Date: Thu, 28 Sep 2023 18:26:22 +0100 Subject: Fix nexus and sonar vulnerabilities - IQ nexus dependencies - sonar hotspots and code smells Issue-ID: POLICY-4760 Change-Id: Ic4260c568f9d9164a33aacb34a5ff3a6f91b1bd8 Signed-off-by: adheli.tavares --- .../controlloop/actor/appc/AppcOperation.java | 24 ++++++++-------------- .../actor/appc/ModifyConfigOperation.java | 3 ++- .../controlloop/actor/appc/AppcOperationTest.java | 16 +++++++-------- 3 files changed, 19 insertions(+), 24 deletions(-) (limited to 'models-interactions/model-actors/actor.appc') diff --git a/models-interactions/model-actors/actor.appc/src/main/java/org/onap/policy/controlloop/actor/appc/AppcOperation.java b/models-interactions/model-actors/actor.appc/src/main/java/org/onap/policy/controlloop/actor/appc/AppcOperation.java index b8ec634e3..ffdbde831 100644 --- a/models-interactions/model-actors/actor.appc/src/main/java/org/onap/policy/controlloop/actor/appc/AppcOperation.java +++ b/models-interactions/model-actors/actor.appc/src/main/java/org/onap/policy/controlloop/actor/appc/AppcOperation.java @@ -3,6 +3,7 @@ * ONAP * ================================================================================ * Copyright (C) 2020-2021 AT&T Intellectual Property. All rights reserved. + * Modifications Copyright (C) 2023 Nordix Foundation. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -74,11 +75,10 @@ public abstract class AppcOperation extends BidirectionalTopicOperation Status.SUCCESS; + case FAILURE -> Status.FAILURE; + case ERROR, REJECT -> throw new IllegalArgumentException("APP-C request was not accepted, code=" + code); + // awaiting a "final" response + default -> Status.STILL_WAITING; + }; } /** diff --git a/models-interactions/model-actors/actor.appc/src/main/java/org/onap/policy/controlloop/actor/appc/ModifyConfigOperation.java b/models-interactions/model-actors/actor.appc/src/main/java/org/onap/policy/controlloop/actor/appc/ModifyConfigOperation.java index 524c797b6..0cf004935 100644 --- a/models-interactions/model-actors/actor.appc/src/main/java/org/onap/policy/controlloop/actor/appc/ModifyConfigOperation.java +++ b/models-interactions/model-actors/actor.appc/src/main/java/org/onap/policy/controlloop/actor/appc/ModifyConfigOperation.java @@ -3,6 +3,7 @@ * ONAP * ================================================================================ * Copyright (C) 2020 AT&T Intellectual Property. All rights reserved. + * Modifications Copyright (C) 2023 Nordix Foundation. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -43,6 +44,6 @@ public class ModifyConfigOperation extends AppcOperation { @Override protected Request makeRequest(int attempt) { - return makeRequest(attempt, getRequiredProperty(OperationProperties.AAI_RESOURCE_VNF, "resource VNF")); + return makeRequest(getRequiredProperty(OperationProperties.AAI_RESOURCE_VNF, "resource VNF")); } } diff --git a/models-interactions/model-actors/actor.appc/src/test/java/org/onap/policy/controlloop/actor/appc/AppcOperationTest.java b/models-interactions/model-actors/actor.appc/src/test/java/org/onap/policy/controlloop/actor/appc/AppcOperationTest.java index d40fa025d..b6e9b34e7 100644 --- a/models-interactions/model-actors/actor.appc/src/test/java/org/onap/policy/controlloop/actor/appc/AppcOperationTest.java +++ b/models-interactions/model-actors/actor.appc/src/test/java/org/onap/policy/controlloop/actor/appc/AppcOperationTest.java @@ -90,7 +90,7 @@ public class AppcOperationTest extends BasicAppcOperation { String subreq = oper.getSubRequestId(); assertNotNull(subreq); - Request request = oper.makeRequest(2, genvnf); + Request request = oper.makeRequest(genvnf); assertEquals(DEFAULT_OPERATION, request.getAction()); assertNotNull(request.getPayload()); @@ -101,18 +101,18 @@ public class AppcOperationTest extends BasicAppcOperation { assertEquals(subreq, header.getSubRequestId()); - request = oper.makeRequest(2, genvnf); + request = oper.makeRequest(genvnf); assertEquals(subreq, request.getCommonHeader().getSubRequestId()); // repeat using a null payload params = params.toBuilder().payload(null).build(); oper = new MyOper(params, config); - assertEquals(Map.of(AppcOperation.VNF_ID_KEY, MY_VNF), oper.makeRequest(2, genvnf).getPayload()); + assertEquals(Map.of(AppcOperation.VNF_ID_KEY, MY_VNF), oper.makeRequest(genvnf).getPayload()); } @Test public void testConvertPayload() { - Request request = oper.makeRequest(2, genvnf); + Request request = oper.makeRequest(genvnf); // @formatter:off assertEquals( @@ -132,7 +132,7 @@ public class AppcOperationTest extends BasicAppcOperation { params = params.toBuilder().payload(payload).build(); oper = new MyOper(params, config); - request = oper.makeRequest(2, genvnf); + request = oper.makeRequest(genvnf); // @formatter:off assertEquals( @@ -153,7 +153,7 @@ public class AppcOperationTest extends BasicAppcOperation { params = params.toBuilder().payload(payload).build(); oper = new MyOper(params, config); - request = oper.makeRequest(2, genvnf); + request = oper.makeRequest(genvnf); payload.put(AppcOperation.VNF_ID_KEY, MY_VNF); payload.put(KEY1, "abc"); @@ -166,7 +166,7 @@ public class AppcOperationTest extends BasicAppcOperation { @Test public void testGetExpectedKeyValues() { oper.generateSubRequestId(2); - Request request = oper.makeRequest(2, genvnf); + Request request = oper.makeRequest(genvnf); assertEquals(Arrays.asList(request.getCommonHeader().getSubRequestId()), oper.getExpectedKeyValues(50, request)); } @@ -239,7 +239,7 @@ public class AppcOperationTest extends BasicAppcOperation { @Override protected Request makeRequest(int attempt) { - return makeRequest(attempt, genvnf); + return makeRequest(genvnf); } } } -- cgit 1.2.3-korg