aaiclient api refactor

- Moved aaiclient code from SDK to PRH
improvement of logic fragmentation

Issue-ID: DCAEGEN2-1955
Signed-off-by: Michal Kabaj <michal.kabaj@nokia.com>
Change-Id: I11d5b92014cdeb036699099113f64fc320cb4dd1

6 files changed, 432 insertions, 0 deletions

diff --git a/prh-commons/src/test/java/org/onap/dcaegen2/services/prh/adapter/aai/AaiClientConfigurations.java b/prh-commons/src/test/java/org/onap/dcaegen2/services/prh/adapter/aai/AaiClientConfigurations.java
new file mode 100644
index 00000000..072fa2d4
--- /dev/null
+++ b/prh-commons/src/test/java/org/onap/dcaegen2/services/prh/adapter/aai/AaiClientConfigurations.java
@@ -0,0 +1,60 @@
+/*
+ * ============LICENSE_START=======================================================
+ * DCAEGEN2-SERVICES-SDK
+ * ================================================================================
+ * Copyright (C) 2019 NOKIA Intellectual Property. All rights reserved.
+ * ================================================================================
+ * 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.
+ * ============LICENSE_END=========================================================
+ */
+package org.onap.dcaegen2.services.prh.adapter.aai;
+
+import java.util.HashMap;
+import java.util.Map;
+import org.onap.dcaegen2.services.prh.adapter.aai.api.AaiClientConfiguration;
+import org.onap.dcaegen2.services.prh.adapter.aai.api.ImmutableAaiClientConfiguration;
+
+public final class AaiClientConfigurations {
+
+    private AaiClientConfigurations() {
+    }
+
+    public static AaiClientConfiguration secureConfiguration() {
+        return secureConfiguration(new HashMap<>());
+    }
+
+    public static AaiClientConfiguration secureConfiguration(Map<String, String> headers) {
+        return validConfiguration(headers, true);
+    }
+
+    public static AaiClientConfiguration insecureConfiguration() {
+        return validConfiguration(new HashMap<>(), false);
+    }
+
+    private static AaiClientConfiguration validConfiguration(Map<String, String> headers, boolean secure) {
+        return new ImmutableAaiClientConfiguration.Builder()
+            .baseUrl("https://aai.onap.svc.cluster.local:8443/aai/v12")
+            .aaiUserName("sample-username")
+            .aaiUserPassword("sample-password")
+            .aaiIgnoreSslCertificateErrors(false)
+            .trustStorePath("/trust.pkcs12")
+            .trustStorePasswordPath("/trust.pass")
+            .keyStorePath("/server.pkcs12")
+            .keyStorePasswordPath("/server.pass")
+            .enableAaiCertAuth(secure)
+            .aaiHeaders(headers)
+            .aaiServiceInstancePath(
+                "/business/customers/customer/${customer}/service-subscriptions/service-subscription/${serviceType}/service-instances/service-instance/${serviceInstanceId}")
+            .build();
+    }
+}
\ No newline at end of file
diff --git a/prh-commons/src/test/java/org/onap/dcaegen2/services/prh/adapter/aai/AbstractHttpClientTest.java b/prh-commons/src/test/java/org/onap/dcaegen2/services/prh/adapter/aai/AbstractHttpClientTest.java
new file mode 100644
index 00000000..81f51ef9
--- /dev/null
+++ b/prh-commons/src/test/java/org/onap/dcaegen2/services/prh/adapter/aai/AbstractHttpClientTest.java
@@ -0,0 +1,42 @@
+/*
+ * ============LICENSE_START=======================================================
+ * DCAEGEN2-SERVICES-SDK
+ * ================================================================================
+ * Copyright (C) 2019 NOKIA Intellectual Property. All rights reserved.
+ * ================================================================================
+ * 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.
+ * ============LICENSE_END=========================================================
+ */
+package org.onap.dcaegen2.services.prh.adapter.aai;
+
+import static org.mockito.Mockito.mock;
+
+import org.onap.dcaegen2.services.prh.adapter.aai.api.AaiClientConfiguration;
+import org.onap.dcaegen2.services.prh.adapter.aai.model.AaiModel;
+import org.onap.dcaegen2.services.prh.adapter.aai.model.JsonBodyBuilder;
+import org.onap.dcaegen2.services.sdk.rest.services.adapters.http.HttpResponse;
+import org.onap.dcaegen2.services.sdk.rest.services.adapters.http.RxHttpClient;
+import org.onap.dcaegen2.services.sdk.rest.services.uri.URI;
+
+public class AbstractHttpClientTest {
+
+    protected final AaiModel aaiModel = () -> "test-id";
+    protected final RxHttpClient httpClient = mock(RxHttpClient.class);
+    protected final JsonBodyBuilder bodyBuilder = mock(JsonBodyBuilder.class);
+    protected final HttpResponse response = mock(HttpResponse.class);
+
+
+    protected String constructAaiUri(AaiClientConfiguration configuration, String pnfName) {
+        return new URI.URIBuilder().path(configuration.pnfUrl() + "/" + pnfName).build().toString();
+    }
+}
diff --git a/prh-commons/src/test/java/org/onap/dcaegen2/services/prh/adapter/aai/get/AaiGetServiceInstanceClientTest.java b/prh-commons/src/test/java/org/onap/dcaegen2/services/prh/adapter/aai/get/AaiGetServiceInstanceClientTest.java
new file mode 100644
index 00000000..77317414
--- /dev/null
+++ b/prh-commons/src/test/java/org/onap/dcaegen2/services/prh/adapter/aai/get/AaiGetServiceInstanceClientTest.java
@@ -0,0 +1,72 @@
+/*
+ * ============LICENSE_START=======================================================
+ * DCAEGEN2-SERVICES-SDK
+ * ================================================================================
+ * Copyright (C) 2019 NOKIA Intellectual Property. All rights reserved.
+ * ================================================================================
+ * 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.
+ * ============LICENSE_END=========================================================
+ */
+package org.onap.dcaegen2.services.prh.adapter.aai.get;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.argThat;
+import static org.mockito.BDDMockito.given;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.onap.dcaegen2.services.prh.adapter.aai.AaiClientConfigurations.secureConfiguration;
+
+import io.vavr.collection.HashMap;
+import io.vavr.collection.Map;
+import org.junit.jupiter.api.Test;
+import org.onap.dcaegen2.services.prh.adapter.aai.AbstractHttpClientTest;
+import org.onap.dcaegen2.services.prh.adapter.aai.api.get.AaiGetServiceInstanceClient;
+import org.onap.dcaegen2.services.prh.adapter.aai.model.AaiServiceInstanceQueryModel;
+import org.onap.dcaegen2.services.sdk.rest.services.adapters.http.HttpRequest;
+import reactor.core.publisher.Mono;
+import reactor.test.StepVerifier;
+
+class AaiGetServiceInstanceClientTest extends AbstractHttpClientTest {
+
+    public static final String SERVICE_INSTANCE_PATH =
+        "https://aai.onap.svc.cluster.local:8443/aai/v12/business/customers/customer/Demonstration/"
+            + "service-subscriptions/service-subscription/VCPE/service-instances/service-instance/df018f76-7fc8-46ab-8444-7d67e1efc284";
+
+    @Test
+    void getAaiResponse_shouldCallGetMethod_withGivenAaiHeaders() {
+
+        // given
+        AaiServiceInstanceQueryModel model = mock(AaiServiceInstanceQueryModel.class);
+        Map<String, String> headers = HashMap.of("sample-key", "sample-value");
+        AaiGetServiceInstanceClient cut = new AaiGetServiceInstanceClient(secureConfiguration(headers.toJavaMap()),
+            httpClient);
+
+        given(model.customerId()).willReturn("Demonstration");
+        given(model.serviceInstanceId()).willReturn("df018f76-7fc8-46ab-8444-7d67e1efc284");
+        given(model.serviceType()).willReturn("VCPE");
+
+        given(httpClient.call(any(HttpRequest.class)))
+            .willReturn(Mono.just(response));
+
+        // when
+        StepVerifier
+            .create(cut.getAaiResponse(model))
+            .expectNext(response)
+            .verifyComplete();
+
+        //then
+        verify(httpClient)
+            .call(argThat(httpRequest -> httpRequest.customHeaders().equals(headers) &&
+                httpRequest.url().equals(SERVICE_INSTANCE_PATH)));
+    }
+}
diff --git a/prh-commons/src/test/java/org/onap/dcaegen2/services/prh/adapter/aai/get/AaiHttpGetClientTest.java b/prh-commons/src/test/java/org/onap/dcaegen2/services/prh/adapter/aai/get/AaiHttpGetClientTest.java
new file mode 100644
index 00000000..10fc0f49
--- /dev/null
+++ b/prh-commons/src/test/java/org/onap/dcaegen2/services/prh/adapter/aai/get/AaiHttpGetClientTest.java
@@ -0,0 +1,82 @@
+/*
+ * ============LICENSE_START=======================================================
+ * DCAEGEN2-SERVICES-SDK
+ * ================================================================================
+ * Copyright (C) 2019 NOKIA Intellectual Property. All rights reserved.
+ * ================================================================================
+ * 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.
+ * ============LICENSE_END=========================================================
+ */
+package org.onap.dcaegen2.services.prh.adapter.aai.get;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.argThat;
+import static org.mockito.BDDMockito.given;
+import static org.mockito.Mockito.verify;
+import static org.onap.dcaegen2.services.prh.adapter.aai.AaiClientConfigurations.secureConfiguration;
+
+import io.vavr.collection.HashMap;
+import io.vavr.collection.Map;
+import org.junit.jupiter.api.Test;
+import org.onap.dcaegen2.services.prh.adapter.aai.AbstractHttpClientTest;
+import org.onap.dcaegen2.services.prh.adapter.aai.api.AaiClientConfiguration;
+import org.onap.dcaegen2.services.prh.adapter.aai.api.get.AaiHttpGetClient;
+import org.onap.dcaegen2.services.sdk.rest.services.adapters.http.HttpRequest;
+import reactor.core.publisher.Mono;
+import reactor.test.StepVerifier;
+
+class AaiHttpGetClientTest extends AbstractHttpClientTest {
+
+    @Test
+    void getAaiResponse_shouldCallGetMethod_withGivenAaiHeaders() {
+
+        // given
+        Map<String, String> headers = HashMap.of("sample-key", "sample-value");
+        AaiHttpGetClient cut = new AaiHttpGetClient(secureConfiguration(headers.toJavaMap()), httpClient);
+
+        given(httpClient.call(any(HttpRequest.class)))
+            .willReturn(Mono.just(response));
+
+        // when
+        StepVerifier
+            .create(cut.getAaiResponse(aaiModel))
+            .expectNext(response)
+            .verifyComplete();
+
+        //then
+        verify(httpClient)
+            .call(argThat(httpRequest -> httpRequest.customHeaders().equals(headers)));
+    }
+
+    @Test
+    void getAaiResponse_shouldCallGetMethod_withProperUri() {
+
+        // given
+        AaiClientConfiguration configuration = secureConfiguration();
+        String uri = constructAaiUri(configuration, aaiModel.getCorrelationId());
+        AaiHttpGetClient cut = new AaiHttpGetClient(configuration, httpClient);
+
+        given(httpClient.call(any(HttpRequest.class)))
+            .willReturn(Mono.just(response));
+
+        // when
+        StepVerifier
+            .create(cut.getAaiResponse(aaiModel))
+            .expectNext(response)
+            .verifyComplete();
+
+        // then
+        verify(httpClient)
+            .call(argThat(httpRequest -> httpRequest.url().equals(uri)));
+    }
+}
diff --git a/prh-commons/src/test/java/org/onap/dcaegen2/services/prh/adapter/aai/patch/AaiHttpPatchClientTest.java b/prh-commons/src/test/java/org/onap/dcaegen2/services/prh/adapter/aai/patch/AaiHttpPatchClientTest.java
new file mode 100644
index 00000000..6493b567
--- /dev/null
+++ b/prh-commons/src/test/java/org/onap/dcaegen2/services/prh/adapter/aai/patch/AaiHttpPatchClientTest.java
@@ -0,0 +1,95 @@
+/*
+ * ============LICENSE_START=======================================================
+ * DCAEGEN2-SERVICES-SDK
+ * ================================================================================
+ * Copyright (C) 2019 NOKIA Intellectual Property. All rights reserved.
+ * ================================================================================
+ * 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.
+ * ============LICENSE_END=========================================================
+ */
+package org.onap.dcaegen2.services.prh.adapter.aai.patch;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.argThat;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.BDDMockito.given;
+import static org.mockito.Mockito.verify;
+import static org.onap.dcaegen2.services.prh.adapter.aai.AaiClientConfigurations.secureConfiguration;
+
+import io.vavr.collection.HashMap;
+import io.vavr.collection.Map;
+import org.junit.jupiter.api.Test;
+import org.onap.dcaegen2.services.prh.adapter.aai.AbstractHttpClientTest;
+import org.onap.dcaegen2.services.prh.adapter.aai.api.AaiClientConfiguration;
+import org.onap.dcaegen2.services.prh.adapter.aai.api.patch.AaiHttpPatchClient;
+import org.onap.dcaegen2.services.sdk.rest.services.adapters.http.HttpRequest;
+import reactor.core.publisher.Mono;
+import reactor.test.StepVerifier;
+
+class AaiHttpPatchClientTest extends AbstractHttpClientTest {
+
+    private final Map<String, String> DEFAULT_PATCH_HEADERS =
+        HashMap.of("Content-Type", "application/merge-patch+json");
+
+    @Test
+    void getAaiResponse_shouldCallPatchMethod_withGivenHeaders_combinedWithContentType() {
+
+        // given
+        Map<String, String> headers = HashMap.of("sample-key", "sample-value");
+        Map<String, String> expectedHeaders = DEFAULT_PATCH_HEADERS.merge(headers);
+
+        AaiHttpPatchClient cut =
+            new AaiHttpPatchClient(secureConfiguration(headers.toJavaMap()), bodyBuilder, httpClient);
+
+        given(bodyBuilder.createJsonBody(eq(aaiModel)))
+            .willReturn("test-body");
+
+        given(httpClient.call(any(HttpRequest.class)))
+            .willReturn(Mono.just(response));
+
+        // when
+        StepVerifier
+            .create(cut.getAaiResponse(aaiModel))
+            .expectNext(response)
+            .verifyComplete();
+
+        // then
+        verify(httpClient)
+            .call(argThat(httpRequest -> httpRequest.customHeaders().equals(expectedHeaders)));
+    }
+
+    @Test
+    void getAaiResponse_shouldCallPatchMethod_withProperUri() {
+
+        // given
+        AaiClientConfiguration configuration = secureConfiguration();
+        String uri = constructAaiUri(configuration, aaiModel.getCorrelationId());
+        AaiHttpPatchClient cut = new AaiHttpPatchClient(configuration, bodyBuilder, httpClient);
+
+        given(bodyBuilder.createJsonBody(eq(aaiModel)))
+            .willReturn("test-body");
+
+        given(httpClient.call(any(HttpRequest.class)))
+            .willReturn(Mono.just(response));
+
+        // when
+        StepVerifier
+            .create(cut.getAaiResponse(aaiModel))
+            .expectNext(response)
+            .verifyComplete();
+
+        // then
+        verify(httpClient)
+            .call(argThat(httpRequest -> httpRequest.url().equals(uri)));
+    }
+}
diff --git a/prh-commons/src/test/java/org/onap/dcaegen2/services/prh/adapter/aai/put/AaiHttpPutClientTest.java b/prh-commons/src/test/java/org/onap/dcaegen2/services/prh/adapter/aai/put/AaiHttpPutClientTest.java
new file mode 100644
index 00000000..13a49174
--- /dev/null
+++ b/prh-commons/src/test/java/org/onap/dcaegen2/services/prh/adapter/aai/put/AaiHttpPutClientTest.java
@@ -0,0 +1,81 @@
+/*
+ * ============LICENSE_START=======================================================
+ * DCAEGEN2-SERVICES-SDK
+ * ================================================================================
+ * Copyright (C) 2019 NOKIA Intellectual Property. All rights reserved.
+ * ================================================================================
+ * 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.
+ * ============LICENSE_END=========================================================
+ */
+package org.onap.dcaegen2.services.prh.adapter.aai.put;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.argThat;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.BDDMockito.given;
+import static org.mockito.Mockito.verify;
+import static org.onap.dcaegen2.services.prh.adapter.aai.AaiClientConfigurations.secureConfiguration;
+
+import io.vavr.collection.HashMap;
+import io.vavr.collection.Map;
+import org.junit.jupiter.api.Test;
+import org.onap.dcaegen2.services.prh.adapter.aai.AbstractHttpClientTest;
+import org.onap.dcaegen2.services.prh.adapter.aai.api.put.AaiHttpPutClient;
+import org.onap.dcaegen2.services.sdk.rest.services.adapters.http.HttpRequest;
+import reactor.core.publisher.Mono;
+import reactor.test.StepVerifier;
+
+class AaiHttpPutClientTest extends AbstractHttpClientTest {
+
+    @Test
+    void getAaiResponse_shouldCallPutMethod_withGivenAaiHeaders() {
+        Map<String, String> headers = HashMap.of("sample-key", "sample-value");
+        AaiHttpPutClient cut = new AaiHttpPutClient(secureConfiguration(headers.toJavaMap()), bodyBuilder, "",
+            httpClient);
+
+        given(bodyBuilder.createJsonBody(eq(aaiModel)))
+            .willReturn("test-body");
+
+        given(httpClient.call(any(HttpRequest.class)))
+            .willReturn(Mono.just(response));
+
+        StepVerifier
+            .create(cut.getAaiResponse(aaiModel))
+            .expectNext(response)
+            .verifyComplete();
+
+        verify(httpClient)
+            .call(argThat(httpRequest -> httpRequest.customHeaders().equals(headers)));
+    }
+
+    @Test
+    void getAaiResponse_shouldCallPutMethod_withProperUri() {
+        String uri = "test-uri";
+        AaiHttpPutClient cut = new AaiHttpPutClient(secureConfiguration(), bodyBuilder, uri, httpClient);
+
+        given(bodyBuilder.createJsonBody(eq(aaiModel)))
+            .willReturn("test-body");
+
+        given(httpClient.call(any(HttpRequest.class)))
+            .willReturn(Mono.just(response));
+
+        StepVerifier
+            .create(cut.getAaiResponse(aaiModel))
+            .expectNext(response)
+            .verifyComplete();
+
+        verify(httpClient)
+            .call(argThat(httpRequest -> httpRequest.url().equals(uri)));
+
+    }
+}