From 2532f556a8bda4d6eec02d5120553262e65c7329 Mon Sep 17 00:00:00 2001 From: Michal Kabaj Date: Wed, 4 Dec 2019 12:51:19 +0100 Subject: Refactor AaiClient API - remove interfaces - Removed JsonBodyBuilder because it had only one impl - AaiJsonBodyBuilderImpl - Removed AaiModel because it had only one impl - ConsumerDmaapModel - Replaced usages of removed interfaces with concrete implementations Issue-ID: DCAEGEN2-1955 Signed-off-by: Michal Kabaj Change-Id: I6cd651b2061e8520a508e3a62091d1cb15002c99 --- .../dcaegen2/services/prh/configuration/AaiHttpClientConfig.java | 6 +++--- .../onap/dcaegen2/services/prh/tasks/AaiProducerTaskImpl.java | 5 ++--- .../java/org/onap/dcaegen2/services/prh/tasks/AaiQueryTask.java | 4 ++-- .../org/onap/dcaegen2/services/prh/tasks/AaiQueryTaskImpl.java | 8 ++++---- .../onap/dcaegen2/services/prh/tasks/AaiQueryTaskImplTest.java | 9 +++++---- 5 files changed, 16 insertions(+), 16 deletions(-) (limited to 'prh-app-server') diff --git a/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/configuration/AaiHttpClientConfig.java b/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/configuration/AaiHttpClientConfig.java index 9156732d..d8f6d966 100644 --- a/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/configuration/AaiHttpClientConfig.java +++ b/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/configuration/AaiHttpClientConfig.java @@ -28,11 +28,11 @@ import org.onap.dcaegen2.services.prh.adapter.aai.api.get.AaiGetServiceInstanceC import org.onap.dcaegen2.services.prh.adapter.aai.api.get.AaiHttpGetClient; import org.onap.dcaegen2.services.prh.adapter.aai.api.patch.AaiHttpPatchClient; import org.onap.dcaegen2.services.prh.adapter.aai.main.AaiHttpClientFactory; -import org.onap.dcaegen2.services.prh.adapter.aai.model.AaiModel; import org.onap.dcaegen2.services.prh.adapter.aai.model.AaiServiceInstanceQueryModel; import org.onap.dcaegen2.services.prh.model.AaiJsonBodyBuilderImpl; import org.onap.dcaegen2.services.prh.model.AaiPnfResultModel; import org.onap.dcaegen2.services.prh.model.AaiServiceInstanceResultModel; +import org.onap.dcaegen2.services.prh.model.ConsumerDmaapModel; import org.onap.dcaegen2.services.prh.model.utils.PrhModelAwareGsonBuilder; import org.onap.dcaegen2.services.sdk.rest.services.adapters.http.HttpResponse; import org.onap.dcaegen2.services.sdk.rest.services.adapters.http.RxHttpClient; @@ -47,7 +47,7 @@ public class AaiHttpClientConfig { private CbsConfiguration cbsConfiguration; @Bean - public AaiHttpClient getPatchClientFactory() { + public AaiHttpClient getPatchClientFactory() { return createLazyConfigClient( (config, client) -> new AaiHttpPatchClient(config, new AaiJsonBodyBuilderImpl(), client)); } @@ -64,7 +64,7 @@ public class AaiHttpClientConfig { } @Bean - public AaiHttpClient getGetClient() { + public AaiHttpClient getGetClient() { return createLazyConfigClient( (config, client) -> new AaiHttpGetClient(config, client) .map(httpResponse -> { diff --git a/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/tasks/AaiProducerTaskImpl.java b/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/tasks/AaiProducerTaskImpl.java index e0764fd2..fd7f11c0 100644 --- a/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/tasks/AaiProducerTaskImpl.java +++ b/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/tasks/AaiProducerTaskImpl.java @@ -21,7 +21,6 @@ package org.onap.dcaegen2.services.prh.tasks; import org.onap.dcaegen2.services.prh.adapter.aai.api.AaiHttpClient; -import org.onap.dcaegen2.services.prh.adapter.aai.model.AaiModel; import org.onap.dcaegen2.services.prh.exceptions.AaiNotFoundException; import org.onap.dcaegen2.services.prh.exceptions.DmaapNotFoundException; import org.onap.dcaegen2.services.prh.exceptions.PrhTaskException; @@ -43,10 +42,10 @@ public class AaiProducerTaskImpl implements AaiProducerTask { private static final Logger LOGGER = LoggerFactory.getLogger(AaiProducerTaskImpl.class); - private final AaiHttpClient aaiHttpPatchClient; + private final AaiHttpClient aaiHttpPatchClient; @Autowired - public AaiProducerTaskImpl(final AaiHttpClient aaiHttpPatchClient) { + public AaiProducerTaskImpl(final AaiHttpClient aaiHttpPatchClient) { this.aaiHttpPatchClient = aaiHttpPatchClient; } diff --git a/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/tasks/AaiQueryTask.java b/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/tasks/AaiQueryTask.java index 0bcb1dea..b4ab10f0 100644 --- a/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/tasks/AaiQueryTask.java +++ b/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/tasks/AaiQueryTask.java @@ -20,10 +20,10 @@ package org.onap.dcaegen2.services.prh.tasks; -import org.onap.dcaegen2.services.prh.adapter.aai.model.AaiModel; +import org.onap.dcaegen2.services.prh.model.ConsumerDmaapModel; import reactor.core.publisher.Mono; @FunctionalInterface public interface AaiQueryTask { - Mono execute(final AaiModel aaiModel); + Mono execute(final ConsumerDmaapModel aaiModel); } diff --git a/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/tasks/AaiQueryTaskImpl.java b/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/tasks/AaiQueryTaskImpl.java index 46f9d3d9..9489a501 100644 --- a/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/tasks/AaiQueryTaskImpl.java +++ b/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/tasks/AaiQueryTaskImpl.java @@ -24,11 +24,11 @@ import java.util.List; import java.util.Optional; import java.util.stream.Stream; import org.onap.dcaegen2.services.prh.adapter.aai.api.AaiHttpClient; -import org.onap.dcaegen2.services.prh.adapter.aai.model.AaiModel; import org.onap.dcaegen2.services.prh.adapter.aai.model.AaiServiceInstanceQueryModel; import org.onap.dcaegen2.services.prh.adapter.aai.model.ImmutableAaiServiceInstanceQueryModel; import org.onap.dcaegen2.services.prh.model.AaiPnfResultModel; import org.onap.dcaegen2.services.prh.model.AaiServiceInstanceResultModel; +import org.onap.dcaegen2.services.prh.model.ConsumerDmaapModel; import org.onap.dcaegen2.services.prh.model.Relationship; import org.onap.dcaegen2.services.prh.model.RelationshipData; import org.onap.dcaegen2.services.prh.model.RelationshipDict; @@ -44,19 +44,19 @@ public class AaiQueryTaskImpl implements AaiQueryTask { static final String SERVICE_TYPE = "service-subscription.service-type"; static final String SERVICE_INSTANCE_ID = "service-instance.service-instance-id"; - private final AaiHttpClient getPnfModelClient; + private final AaiHttpClient getPnfModelClient; private final AaiHttpClient getServiceClient; @Autowired public AaiQueryTaskImpl( - final AaiHttpClient getPnfModelClient, + final AaiHttpClient getPnfModelClient, final AaiHttpClient getServiceClient) { this.getPnfModelClient = getPnfModelClient; this.getServiceClient = getServiceClient; } @Override - public Mono execute(AaiModel aaiModel) { + public Mono execute(ConsumerDmaapModel aaiModel) { return getPnfModelClient .getAaiResponse(aaiModel) .flatMap(this::checkIfPnfHasRelationToService) diff --git a/prh-app-server/src/test/java/org/onap/dcaegen2/services/prh/tasks/AaiQueryTaskImplTest.java b/prh-app-server/src/test/java/org/onap/dcaegen2/services/prh/tasks/AaiQueryTaskImplTest.java index f2d562dc..b2702a9d 100644 --- a/prh-app-server/src/test/java/org/onap/dcaegen2/services/prh/tasks/AaiQueryTaskImplTest.java +++ b/prh-app-server/src/test/java/org/onap/dcaegen2/services/prh/tasks/AaiQueryTaskImplTest.java @@ -22,6 +22,7 @@ package org.onap.dcaegen2.services.prh.tasks; import static org.mockito.ArgumentMatchers.any; import static org.mockito.BDDMockito.given; +import static org.mockito.Mockito.mock; import java.util.Collections; import java.util.List; @@ -33,10 +34,10 @@ import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; import org.onap.dcaegen2.services.prh.adapter.aai.api.AaiHttpClient; -import org.onap.dcaegen2.services.prh.adapter.aai.model.AaiModel; import org.onap.dcaegen2.services.prh.adapter.aai.model.AaiServiceInstanceQueryModel; import org.onap.dcaegen2.services.prh.model.AaiPnfResultModel; import org.onap.dcaegen2.services.prh.model.AaiServiceInstanceResultModel; +import org.onap.dcaegen2.services.prh.model.ConsumerDmaapModel; import org.onap.dcaegen2.services.prh.model.ImmutableRelationshipData; import org.onap.dcaegen2.services.prh.model.Relationship; import org.onap.dcaegen2.services.prh.model.RelationshipData; @@ -46,7 +47,7 @@ import reactor.core.publisher.Mono; @ExtendWith(MockitoExtension.class) class AaiQueryTaskImplTest { @Mock - private AaiHttpClient getPnfModelClient; + private AaiHttpClient getPnfModelClient; @Mock private AaiHttpClient getServiceClient; @@ -67,7 +68,7 @@ class AaiQueryTaskImplTest { private AaiQueryTask sut; - private final AaiModel aaiModel = () -> "SomePNF"; + private final ConsumerDmaapModel aaiModel = mock(ConsumerDmaapModel.class); @BeforeEach void setUp() { @@ -199,7 +200,7 @@ class AaiQueryTaskImplTest { Assertions.assertTrue(task::block); } - private void configurePnfClient(final AaiModel aaiModel, final AaiPnfResultModel pnfResultModel) { + private void configurePnfClient(final ConsumerDmaapModel aaiModel, final AaiPnfResultModel pnfResultModel) { given(getPnfModelClient.getAaiResponse(aaiModel)).willReturn(Mono.just(pnfResultModel)); } } -- cgit 1.2.3-korg