diff options
Diffstat (limited to 'participant/participant-impl/participant-impl-http')
3 files changed, 28 insertions, 74 deletions
diff --git a/participant/participant-impl/participant-impl-http/src/main/java/org/onap/policy/clamp/acm/participant/http/config/ParticipantConfig.java b/participant/participant-impl/participant-impl-http/src/main/java/org/onap/policy/clamp/acm/participant/http/config/ParticipantConfig.java deleted file mode 100644 index e2b5d1718..000000000 --- a/participant/participant-impl/participant-impl-http/src/main/java/org/onap/policy/clamp/acm/participant/http/config/ParticipantConfig.java +++ /dev/null @@ -1,43 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * Copyright (C) 2021 Nordix Foundation. - * ================================================================================ - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * SPDX-License-Identifier: Apache-2.0 - * ============LICENSE_END========================================================= - */ - -package org.onap.policy.clamp.acm.participant.http.config; - -import org.onap.policy.clamp.acm.participant.http.main.handler.AutomationCompositionElementHandler; -import org.onap.policy.clamp.acm.participant.intermediary.api.ParticipantIntermediaryApi; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.annotation.Configuration; - -@Configuration -public class ParticipantConfig { - - /** - * Register AutomationCompositionElementListener. - * - * @param intermediaryApi the ParticipantIntermediaryApi - * @param acElementHandler the AutomationComposition Element Handler - */ - @Autowired - public void registerAutomationCompositionElementListener(ParticipantIntermediaryApi intermediaryApi, - AutomationCompositionElementHandler acElementHandler) { - intermediaryApi.registerAutomationCompositionElementListener(acElementHandler); - acElementHandler.setIntermediaryApi(intermediaryApi); - } -} diff --git a/participant/participant-impl/participant-impl-http/src/main/java/org/onap/policy/clamp/acm/participant/http/main/handler/AutomationCompositionElementHandler.java b/participant/participant-impl/participant-impl-http/src/main/java/org/onap/policy/clamp/acm/participant/http/main/handler/AutomationCompositionElementHandler.java index 966aee971..711887423 100644 --- a/participant/participant-impl/participant-impl-http/src/main/java/org/onap/policy/clamp/acm/participant/http/main/handler/AutomationCompositionElementHandler.java +++ b/participant/participant-impl/participant-impl-http/src/main/java/org/onap/policy/clamp/acm/participant/http/main/handler/AutomationCompositionElementHandler.java @@ -34,7 +34,6 @@ import java.util.stream.Collectors; import javax.validation.Validation; import javax.ws.rs.core.Response.Status; import lombok.RequiredArgsConstructor; -import lombok.Setter; import org.apache.commons.lang3.tuple.Pair; import org.onap.policy.clamp.acm.participant.http.main.models.ConfigRequest; import org.onap.policy.clamp.acm.participant.http.main.webclient.AcHttpClient; @@ -70,8 +69,7 @@ public class AutomationCompositionElementHandler implements AutomationCompositio private final ExecutorService executor = Executors.newFixedThreadPool(Runtime.getRuntime().availableProcessors()); - @Setter - private ParticipantIntermediaryApi intermediaryApi; + private final ParticipantIntermediaryApi intermediaryApi; private final AcHttpClient acHttpClient; diff --git a/participant/participant-impl/participant-impl-http/src/test/java/org/onap/policy/clamp/acm/participant/http/handler/AcElementHandlerTest.java b/participant/participant-impl/participant-impl-http/src/test/java/org/onap/policy/clamp/acm/participant/http/handler/AcElementHandlerTest.java index 4dca5a58f..12b8ee4c3 100644 --- a/participant/participant-impl/participant-impl-http/src/test/java/org/onap/policy/clamp/acm/participant/http/handler/AcElementHandlerTest.java +++ b/participant/participant-impl/participant-impl-http/src/test/java/org/onap/policy/clamp/acm/participant/http/handler/AcElementHandlerTest.java @@ -54,11 +54,10 @@ class AcElementHandlerTest { var instanceId = commonTestData.getAutomationCompositionId(); var element = commonTestData.getAutomationCompositionElement(); var acElementId = element.getId(); + var participantIntermediaryApi = mock(ParticipantIntermediaryApi.class); try (var automationCompositionElementHandler = - new AutomationCompositionElementHandler(mock(AcHttpClient.class))) { - var participantIntermediaryApi = mock(ParticipantIntermediaryApi.class); - automationCompositionElementHandler.setIntermediaryApi(participantIntermediaryApi); + new AutomationCompositionElementHandler(participantIntermediaryApi, mock(AcHttpClient.class))) { automationCompositionElementHandler.undeploy(instanceId, acElementId); verify(participantIntermediaryApi).updateAutomationCompositionElementState(instanceId, acElementId, DeployState.UNDEPLOYED, null, StateChangeResult.NO_ERROR, ""); @@ -72,8 +71,8 @@ class AcElementHandlerTest { var participantIntermediaryApi = mock(ParticipantIntermediaryApi.class); try (var automationCompositionElementHandler = - new AutomationCompositionElementHandler(mock(AcHttpClient.class))) { - automationCompositionElementHandler.setIntermediaryApi(participantIntermediaryApi); + new AutomationCompositionElementHandler(participantIntermediaryApi, mock(AcHttpClient.class))) { + Map<String, Object> map = new HashMap<>(); automationCompositionElementHandler.deploy(instanceId, element, map); verify(participantIntermediaryApi).updateAutomationCompositionElementState(instanceId, element.getId(), @@ -89,8 +88,8 @@ class AcElementHandlerTest { var participantIntermediaryApi = mock(ParticipantIntermediaryApi.class); try (var automationCompositionElementHandler = - new AutomationCompositionElementHandler(mock(AcHttpClient.class))) { - automationCompositionElementHandler.setIntermediaryApi(participantIntermediaryApi); + new AutomationCompositionElementHandler(participantIntermediaryApi, mock(AcHttpClient.class))) { + Map<String, Object> map = new HashMap<>(); map.put("httpHeaders", 1); automationCompositionElementHandler.deploy(instanceId, element, map); @@ -108,9 +107,11 @@ class AcElementHandlerTest { map.putAll(element.getProperties()); var instanceId = commonTestData.getAutomationCompositionId(); var acHttpClient = mock(AcHttpClient.class); - try (var automationCompositionElementHandler = new AutomationCompositionElementHandler(acHttpClient)) { - var participantIntermediaryApi = mock(ParticipantIntermediaryApi.class); - automationCompositionElementHandler.setIntermediaryApi(participantIntermediaryApi); + var participantIntermediaryApi = mock(ParticipantIntermediaryApi.class); + + try (var automationCompositionElementHandler = + new AutomationCompositionElementHandler(participantIntermediaryApi, acHttpClient)) { + automationCompositionElementHandler.deploy(instanceId, element, map); verify(acHttpClient).run(any(ConfigRequest.class), anyMap()); verify(participantIntermediaryApi).updateAutomationCompositionElementState(instanceId, element.getId(), @@ -123,11 +124,11 @@ class AcElementHandlerTest { var instanceId = commonTestData.getAutomationCompositionId(); var element = commonTestData.getAutomationCompositionElement(); var acElementId = element.getId(); + var participantIntermediaryApi = mock(ParticipantIntermediaryApi.class); try (var automationCompositionElementHandler = - new AutomationCompositionElementHandler(mock(AcHttpClient.class))) { - var participantIntermediaryApi = mock(ParticipantIntermediaryApi.class); - automationCompositionElementHandler.setIntermediaryApi(participantIntermediaryApi); + new AutomationCompositionElementHandler(participantIntermediaryApi, mock(AcHttpClient.class))) { + automationCompositionElementHandler.update(instanceId, element, Map.of()); verify(participantIntermediaryApi).updateAutomationCompositionElementState(instanceId, acElementId, DeployState.DEPLOYED, null, StateChangeResult.NO_ERROR, "Update not supported"); @@ -138,11 +139,11 @@ class AcElementHandlerTest { void testLock() throws Exception { var instanceId = commonTestData.getAutomationCompositionId(); var acElementId = UUID.randomUUID(); + var participantIntermediaryApi = mock(ParticipantIntermediaryApi.class); try (var automationCompositionElementHandler = - new AutomationCompositionElementHandler(mock(AcHttpClient.class))) { - var participantIntermediaryApi = mock(ParticipantIntermediaryApi.class); - automationCompositionElementHandler.setIntermediaryApi(participantIntermediaryApi); + new AutomationCompositionElementHandler(participantIntermediaryApi, mock(AcHttpClient.class))) { + automationCompositionElementHandler.lock(instanceId, acElementId); verify(participantIntermediaryApi).updateAutomationCompositionElementState(instanceId, acElementId, null, LockState.LOCKED, StateChangeResult.NO_ERROR, "Locked"); @@ -153,11 +154,11 @@ class AcElementHandlerTest { void testUnlock() throws Exception { var instanceId = commonTestData.getAutomationCompositionId(); var acElementId = UUID.randomUUID(); + var participantIntermediaryApi = mock(ParticipantIntermediaryApi.class); try (var automationCompositionElementHandler = - new AutomationCompositionElementHandler(mock(AcHttpClient.class))) { - var participantIntermediaryApi = mock(ParticipantIntermediaryApi.class); - automationCompositionElementHandler.setIntermediaryApi(participantIntermediaryApi); + new AutomationCompositionElementHandler(participantIntermediaryApi, mock(AcHttpClient.class))) { + automationCompositionElementHandler.unlock(instanceId, acElementId); verify(participantIntermediaryApi).updateAutomationCompositionElementState(instanceId, acElementId, null, LockState.UNLOCKED, StateChangeResult.NO_ERROR, "Unlocked"); @@ -168,11 +169,11 @@ class AcElementHandlerTest { void testDelete() throws Exception { var instanceId = commonTestData.getAutomationCompositionId(); var acElementId = UUID.randomUUID(); + var participantIntermediaryApi = mock(ParticipantIntermediaryApi.class); try (var automationCompositionElementHandler = - new AutomationCompositionElementHandler(mock(AcHttpClient.class))) { - var participantIntermediaryApi = mock(ParticipantIntermediaryApi.class); - automationCompositionElementHandler.setIntermediaryApi(participantIntermediaryApi); + new AutomationCompositionElementHandler(participantIntermediaryApi, mock(AcHttpClient.class))) { + automationCompositionElementHandler.delete(instanceId, acElementId); verify(participantIntermediaryApi).updateAutomationCompositionElementState(instanceId, acElementId, DeployState.DELETED, null, StateChangeResult.NO_ERROR, "Deleted"); @@ -182,11 +183,10 @@ class AcElementHandlerTest { @Test void testPrime() throws Exception { var compositionId = UUID.randomUUID(); + var participantIntermediaryApi = mock(ParticipantIntermediaryApi.class); try (var automationCompositionElementHandler = - new AutomationCompositionElementHandler(mock(AcHttpClient.class))) { - var participantIntermediaryApi = mock(ParticipantIntermediaryApi.class); - automationCompositionElementHandler.setIntermediaryApi(participantIntermediaryApi); + new AutomationCompositionElementHandler(participantIntermediaryApi, mock(AcHttpClient.class))) { automationCompositionElementHandler.prime(compositionId, List.of()); verify(participantIntermediaryApi).updateCompositionState(compositionId, AcTypeState.PRIMED, @@ -197,11 +197,10 @@ class AcElementHandlerTest { @Test void testDeprime() throws Exception { var compositionId = UUID.randomUUID(); + var participantIntermediaryApi = mock(ParticipantIntermediaryApi.class); try (var automationCompositionElementHandler = - new AutomationCompositionElementHandler(mock(AcHttpClient.class))) { - var participantIntermediaryApi = mock(ParticipantIntermediaryApi.class); - automationCompositionElementHandler.setIntermediaryApi(participantIntermediaryApi); + new AutomationCompositionElementHandler(participantIntermediaryApi, mock(AcHttpClient.class))) { automationCompositionElementHandler.deprime(compositionId); verify(participantIntermediaryApi).updateCompositionState(compositionId, AcTypeState.COMMISSIONED, |