Modified CloudHttpClient in order to be more generic

New AaiClients and AaiModels have been added

Change-Id: I80151e8296482e39f7f36123210861702c205b7b
Signed-off-by: andrzejszukuc <andrzej.szukuc@nokia.com>
Issue-ID: DCAEGEN2-1059

1 files changed, 18 insertions, 18 deletions

diff --git a/rest-services/common-dependency/src/test/java/org/onap/dcaegen2/services/sdk/rest/services/adapters/http/CloudHttpClientIT.java b/rest-services/common-dependency/src/test/java/org/onap/dcaegen2/services/sdk/rest/services/adapters/http/CloudHttpClientIT.java
index 9844ef1d..d221a809 100644
--- a/rest-services/common-dependency/src/test/java/org/onap/dcaegen2/services/sdk/rest/services/adapters/http/CloudHttpClientIT.java
+++ b/rest-services/common-dependency/src/test/java/org/onap/dcaegen2/services/sdk/rest/services/adapters/http/CloudHttpClientIT.java
@@ -61,12 +61,12 @@ class CloudHttpClientIT {
         CloudHttpClient cloudHttpClient = new CloudHttpClient(httpClient);
 
         when(jsonBodyBuilder.createJsonBody(dmaapModel)).thenReturn(JSON_BODY);
-        Mono<HttpClientResponse> content = cloudHttpClient
+        Mono<HttpResponse> content = cloudHttpClient
                 .patch(SAMPLE_URL, createRequestDiagnosticContext(), createCustomHeaders(),
                         jsonBodyBuilder, dmaapModel);
-        HttpClientResponse httpClientResponse = content.block();
+        HttpResponse httpClientResponse = content.block();
 
-        assertEquals(HttpResponseStatus.OK, httpClientResponse.status());
+        assertEquals(HttpResponseStatus.OK.code(), httpClientResponse.statusCode());
         server.disposeNow();
     }
 
@@ -77,12 +77,12 @@ class CloudHttpClientIT {
         CloudHttpClient cloudHttpClient = new CloudHttpClient(httpClient);
 
         when(jsonBodyBuilder.createJsonBody(dmaapModel)).thenReturn(JSON_BODY);
-        Mono<HttpClientResponse> content = cloudHttpClient
+        Mono<HttpResponse> content = cloudHttpClient
                 .patch(SAMPLE_URL, createRequestDiagnosticContext(), createCustomHeaders(),
                         jsonBodyBuilder, dmaapModel);
-        HttpClientResponse httpClientResponse = content.block();
+        HttpResponse httpClientResponse = content.block();
 
-        assertEquals(HttpResponseStatus.INTERNAL_SERVER_ERROR, httpClientResponse.status());
+        assertEquals(HttpResponseStatus.INTERNAL_SERVER_ERROR.code(), httpClientResponse.statusCode());
         server.disposeNow();
     }
 
@@ -93,12 +93,12 @@ class CloudHttpClientIT {
         CloudHttpClient cloudHttpClient = new CloudHttpClient(httpClient);
 
         when(jsonBodyBuilder.createJsonBody(dmaapModel)).thenReturn(JSON_BODY);
-        Mono<HttpClientResponse> content = cloudHttpClient
+        Mono<HttpResponse> content = cloudHttpClient
                 .post(SAMPLE_URL, createRequestDiagnosticContext(), createCustomHeaders(),
                         jsonBodyBuilder, dmaapModel);
-        HttpClientResponse httpClientResponse = content.block();
+        HttpResponse httpClientResponse = content.block();
 
-        assertEquals(HttpResponseStatus.OK, httpClientResponse.status());
+        assertEquals(HttpResponseStatus.OK.code(), httpClientResponse.statusCode());
         server.disposeNow();
     }
 
@@ -109,12 +109,12 @@ class CloudHttpClientIT {
         CloudHttpClient cloudHttpClient = new CloudHttpClient(httpClient);
 
         when(jsonBodyBuilder.createJsonBody(dmaapModel)).thenReturn(JSON_BODY);
-        Mono<HttpClientResponse> content = cloudHttpClient
+        Mono<HttpResponse> content = cloudHttpClient
                 .post(SAMPLE_URL, createRequestDiagnosticContext(), createCustomHeaders(),
                         jsonBodyBuilder, dmaapModel);
-        HttpClientResponse httpClientResponse = content.block();
+        HttpResponse httpClientResponse = content.block();
 
-        assertEquals(HttpResponseStatus.INTERNAL_SERVER_ERROR, httpClientResponse.status());
+        assertEquals(HttpResponseStatus.INTERNAL_SERVER_ERROR.code(), httpClientResponse.statusCode());
         server.disposeNow();
     }
 
@@ -161,12 +161,12 @@ class CloudHttpClientIT {
         CloudHttpClient cloudHttpClient = new CloudHttpClient(httpClient);
 
         when(jsonBodyBuilder.createJsonBody(dmaapModel)).thenReturn(JSON_BODY);
-        Mono<HttpClientResponse> content = cloudHttpClient
+        Mono<HttpResponse> content = cloudHttpClient
             .put(SAMPLE_URL, createRequestDiagnosticContext(), createCustomHeaders(),
                 jsonBodyBuilder, dmaapModel);
-        HttpClientResponse httpClientResponse = content.block();
+        HttpResponse httpClientResponse = content.block();
 
-        assertEquals(HttpResponseStatus.OK, httpClientResponse.status());
+        assertEquals(HttpResponseStatus.OK.code(), httpClientResponse.statusCode());
         server.disposeNow();
     }
 
@@ -177,12 +177,12 @@ class CloudHttpClientIT {
         CloudHttpClient cloudHttpClient = new CloudHttpClient(httpClient);
 
         when(jsonBodyBuilder.createJsonBody(dmaapModel)).thenReturn(JSON_BODY);
-        Mono<HttpClientResponse> content = cloudHttpClient
+        Mono<HttpResponse> content = cloudHttpClient
             .put(SAMPLE_URL, createRequestDiagnosticContext(), createCustomHeaders(),
                 jsonBodyBuilder, dmaapModel);
-        HttpClientResponse httpClientResponse = content.block();
+        HttpResponse httpClientResponse = content.block();
 
-        assertEquals(HttpResponseStatus.INTERNAL_SERVER_ERROR, httpClientResponse.status());
+        assertEquals(HttpResponseStatus.INTERNAL_SERVER_ERROR.code(), httpClientResponse.statusCode());
         server.disposeNow();
     }