handleResponse refactor

Due to logs consistency handleResponse method
was incorporated to the each of http producers.

Change-Id: I621d1795c376161273270f07ff3dd6caca2fc1d6
Issue-ID: DCAEGEN2-451
Signed-off-by: pwielebs <piotr.wielebski@nokia.com>

2 files changed, 54 insertions, 5 deletions

diff --git a/prh-dmaap-client/src/main/java/org/onap/dcaegen2/services/prh/service/producer/ExtendedDmaapProducerHttpClientImpl.java b/prh-dmaap-client/src/main/java/org/onap/dcaegen2/services/prh/service/producer/ExtendedDmaapProducerHttpClientImpl.java
index b93c9c6b..5704cd11 100644
--- a/prh-dmaap-client/src/main/java/org/onap/dcaegen2/services/prh/service/producer/ExtendedDmaapProducerHttpClientImpl.java
+++ b/prh-dmaap-client/src/main/java/org/onap/dcaegen2/services/prh/service/producer/ExtendedDmaapProducerHttpClientImpl.java
@@ -20,14 +20,18 @@
 
 package org.onap.dcaegen2.services.prh.service.producer;
 
+import org.apache.http.HttpEntity;
+import org.apache.http.HttpResponse;
 import org.apache.http.client.methods.HttpPost;
 import org.apache.http.client.methods.HttpRequestBase;
 import org.apache.http.client.utils.URIBuilder;
 import org.apache.http.entity.StringEntity;
 import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.util.EntityUtils;
 import org.onap.dcaegen2.services.prh.config.DmaapPublisherConfiguration;
 import org.onap.dcaegen2.services.prh.model.CommonFunctions;
 import org.onap.dcaegen2.services.prh.model.ConsumerDmaapModel;
+import org.onap.dcaegen2.services.prh.model.utils.HttpUtils;
 import org.onap.dcaegen2.services.prh.service.DmaapHttpClientImpl;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -73,7 +77,7 @@ public class ExtendedDmaapProducerHttpClientImpl {
 
     private Optional<Integer> executeHttpClient(HttpRequestBase httpRequestBase) {
         try {
-            return closeableHttpClient.execute(httpRequestBase, CommonFunctions::handleResponse);
+            return closeableHttpClient.execute(httpRequestBase, this::handleResponse);
         } catch (IOException e) {
             logger.warn("Exception while executing HTTP request: ", e);
         }
@@ -109,4 +113,20 @@ public class ExtendedDmaapProducerHttpClientImpl {
         }
         return Optional.empty();
     }
+
+    Optional<Integer> handleResponse(HttpResponse response) throws IOException {
+
+        final Integer responseCode = response.getStatusLine().getStatusCode();
+        logger.info("Status code of operation: {}", responseCode);
+        final HttpEntity responseEntity = response.getEntity();
+
+        if (HttpUtils.isSuccessfulResponseCode(responseCode)) {
+            logger.trace("HTTP response successful.");
+            return Optional.of(responseCode);
+        } else {
+            String aaiResponse = responseEntity != null ? EntityUtils.toString(responseEntity) : "";
+            logger.warn("HTTP response not successful : {}", aaiResponse);
+            return Optional.of(responseCode);
+        }
+    }
 }
\ No newline at end of file
diff --git a/prh-dmaap-client/src/test/java/org/onap/dcaegen2/services/prh/service/producer/ExtendedDmaapProducerHttpClientImplTest.java b/prh-dmaap-client/src/test/java/org/onap/dcaegen2/services/prh/service/producer/ExtendedDmaapProducerHttpClientImplTest.java
index aa6810e3..d9e74267 100644
--- a/prh-dmaap-client/src/test/java/org/onap/dcaegen2/services/prh/service/producer/ExtendedDmaapProducerHttpClientImplTest.java
+++ b/prh-dmaap-client/src/test/java/org/onap/dcaegen2/services/prh/service/producer/ExtendedDmaapProducerHttpClientImplTest.java
@@ -20,6 +20,10 @@
 
 package org.onap.dcaegen2.services.prh.service.producer;
 
+import org.apache.http.HttpEntity;
+import org.apache.http.HttpResponse;
+import org.apache.http.HttpStatus;
+import org.apache.http.StatusLine;
 import org.apache.http.client.ResponseHandler;
 import org.apache.http.client.methods.HttpPost;
 import org.apache.http.impl.client.CloseableHttpClient;
@@ -34,12 +38,13 @@ import java.io.IOException;
 import java.lang.reflect.Field;
 import java.util.Optional;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
 
-public class ExtendedDmaapProducerHttpClientImplTest {
+class ExtendedDmaapProducerHttpClientImplTest {
 
     private static ExtendedDmaapProducerHttpClientImpl objectUnderTest;
     private static DmaapPublisherConfiguration configurationMock = mock(DmaapPublisherConfiguration.class);
@@ -48,9 +53,13 @@ public class ExtendedDmaapProducerHttpClientImplTest {
     private static Integer expectedResult;
     private static final Integer RESPONSE_SUCCESS = 200;
     private static final Integer RESPONSE_FAILURE = 404;
+    private final static HttpResponse httpResponseMock = mock(HttpResponse.class);
+    private final static HttpEntity httpEntityMock = mock(HttpEntity.class);
+    private final static StatusLine statusLineMock = mock(StatusLine.class);
+
 
     @BeforeAll
-    public static void init() throws NoSuchFieldException, IllegalAccessException {
+    static void init() throws NoSuchFieldException, IllegalAccessException {
         when(configurationMock.dmaapHostName()).thenReturn("54.45.33.2");
         when(configurationMock.dmaapProtocol()).thenReturn("https");
         when(configurationMock.dmaapPortNumber()).thenReturn(1234);
@@ -64,7 +73,7 @@ public class ExtendedDmaapProducerHttpClientImplTest {
 
 
     @Test
-    public void getHttpResponsePost_success() throws IOException {
+    void getHttpResponsePost_success() throws IOException {
         expectedResult = RESPONSE_SUCCESS;
         when(closeableHttpClientMock.execute(any(HttpPost.class), any(ResponseHandler.class)))
             .thenReturn(Optional.of(expectedResult));
@@ -73,7 +82,7 @@ public class ExtendedDmaapProducerHttpClientImplTest {
     }
 
     @Test
-    public void getExtendedDetails_returnsFailure() throws IOException {
+    void getExtendedDetails_returnsFailure() throws IOException {
         expectedResult = RESPONSE_FAILURE;
         when(closeableHttpClientMock.execute(any(HttpPost.class), any(ResponseHandler.class)))
             .thenReturn(Optional.of(expectedResult));
@@ -81,6 +90,26 @@ public class ExtendedDmaapProducerHttpClientImplTest {
         Assertions.assertEquals(expectedResult, actualResult.get());
     }
 
+    @Test
+    void handleResponse_shouldReturn200() throws IOException {
+        // When
+        when(httpResponseMock.getEntity()).thenReturn(httpEntityMock);
+        when(httpResponseMock.getStatusLine()).thenReturn(statusLineMock);
+        when(httpResponseMock.getStatusLine().getStatusCode()).thenReturn(HttpStatus.SC_OK);
+        // Then
+        assertEquals(Optional.of(HttpStatus.SC_OK), objectUnderTest.handleResponse(httpResponseMock));
+    }
+
+    @Test
+    void handleResponse_shouldReturn300() throws IOException {
+        // When
+        when(httpResponseMock.getEntity()).thenReturn(httpEntityMock);
+        when(httpResponseMock.getStatusLine()).thenReturn(statusLineMock);
+        when(httpResponseMock.getStatusLine().getStatusCode()).thenReturn(HttpStatus.SC_BAD_REQUEST);
+        // Then
+        assertEquals(Optional.of(HttpStatus.SC_BAD_REQUEST), objectUnderTest.handleResponse(httpResponseMock));
+    }
+
     private static void setField() throws NoSuchFieldException, IllegalAccessException {
         Field field = objectUnderTest.getClass().getDeclaredField("closeableHttpClient");
         field.setAccessible(true);