aaiclient api refactor

- Removed AaiRequests
- ImmutableHttpRequests are explicitly created inside http method impl
- Removed dep to custom URI/URIBuilder

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

1 files changed, 9 insertions, 12 deletions

diff --git a/prh-commons/src/main/java/org/onap/dcaegen2/services/prh/adapter/aai/api/get/AaiHttpGetClient.java b/prh-commons/src/main/java/org/onap/dcaegen2/services/prh/adapter/aai/api/get/AaiHttpGetClient.java
index 62c2ef50..f97c57be 100644
--- a/prh-commons/src/main/java/org/onap/dcaegen2/services/prh/adapter/aai/api/get/AaiHttpGetClient.java
+++ b/prh-commons/src/main/java/org/onap/dcaegen2/services/prh/adapter/aai/api/get/AaiHttpGetClient.java
@@ -20,16 +20,16 @@
 
 package org.onap.dcaegen2.services.prh.adapter.aai.api.get;
 
-import static org.onap.dcaegen2.services.prh.adapter.aai.impl.AaiRequests.createAaiGetRequest;
 import static org.onap.dcaegen2.services.prh.adapter.aai.main.AaiHttpClientFactory.createRequestDiagnosticContext;
 
+import io.vavr.collection.HashMap;
 import org.onap.dcaegen2.services.prh.adapter.aai.api.AaiClientConfiguration;
 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.sdk.rest.services.adapters.http.HttpRequest;
+import org.onap.dcaegen2.services.sdk.rest.services.adapters.http.HttpMethod;
 import org.onap.dcaegen2.services.sdk.rest.services.adapters.http.HttpResponse;
+import org.onap.dcaegen2.services.sdk.rest.services.adapters.http.ImmutableHttpRequest;
 import org.onap.dcaegen2.services.sdk.rest.services.adapters.http.RxHttpClient;
-import org.onap.dcaegen2.services.sdk.rest.services.uri.URI;
 import reactor.core.publisher.Mono;
 
 public final class AaiHttpGetClient implements AaiHttpClient<AaiModel, HttpResponse> {
@@ -45,14 +45,11 @@ public final class AaiHttpGetClient implements AaiHttpClient<AaiModel, HttpRespo
 
     @Override
     public Mono<HttpResponse> getAaiResponse(AaiModel aaiModel) {
-        final HttpRequest getRequest = createAaiGetRequest(getUri(aaiModel.getCorrelationId()),
-            createRequestDiagnosticContext(), configuration.aaiHeaders());
-
-        return httpClient.call(getRequest);
-    }
-
-
-    private String getUri(String pnfName) {
-        return new URI.URIBuilder().path(configuration.pnfUrl() + "/" + pnfName).build().toString();
+        return httpClient.call(ImmutableHttpRequest.builder()
+            .method(HttpMethod.GET)
+            .url(configuration.pnfUrl() + "/" + aaiModel.getCorrelationId())
+            .customHeaders(HashMap.ofAll(configuration.aaiHeaders()))
+            .diagnosticContext(createRequestDiagnosticContext())
+            .build());
     }
 }