From 09893f98631753467a9c2ec8c591b917c0bc25c4 Mon Sep 17 00:00:00 2001 From: pwielebs Date: Mon, 11 Jun 2018 13:39:31 +0200 Subject: 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 --- .../services/prh/model/CommonFunctions.java | 26 ---------------------- .../services/prh/model/CommonFunctionsTest.java | 24 ++++---------------- 2 files changed, 4 insertions(+), 46 deletions(-) (limited to 'prh-commons') diff --git a/prh-commons/src/main/java/org/onap/dcaegen2/services/prh/model/CommonFunctions.java b/prh-commons/src/main/java/org/onap/dcaegen2/services/prh/model/CommonFunctions.java index 634cfa9b..c78146f7 100644 --- a/prh-commons/src/main/java/org/onap/dcaegen2/services/prh/model/CommonFunctions.java +++ b/prh-commons/src/main/java/org/onap/dcaegen2/services/prh/model/CommonFunctions.java @@ -22,41 +22,15 @@ package org.onap.dcaegen2.services.prh.model; import com.google.gson.Gson; import com.google.gson.GsonBuilder; -import org.apache.http.HttpEntity; -import org.apache.http.HttpResponse; -import org.apache.http.util.EntityUtils; -import org.onap.dcaegen2.services.prh.model.utils.HttpUtils; -import org.slf4j.LoggerFactory; -import org.slf4j.Logger; -import java.io.IOException; -import java.util.Optional; public class CommonFunctions { - private static Logger logger = LoggerFactory.getLogger(CommonFunctions.class); - private static Gson gson = new GsonBuilder().create(); - private CommonFunctions() {} public static String createJsonBody(ConsumerDmaapModel consumerDmaapModel) { return gson.toJson(consumerDmaapModel); } - - public static Optional 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); - } - } } diff --git a/prh-commons/src/test/java/org/onap/dcaegen2/services/prh/model/CommonFunctionsTest.java b/prh-commons/src/test/java/org/onap/dcaegen2/services/prh/model/CommonFunctionsTest.java index a2b077e5..49b97abd 100644 --- a/prh-commons/src/test/java/org/onap/dcaegen2/services/prh/model/CommonFunctionsTest.java +++ b/prh-commons/src/test/java/org/onap/dcaegen2/services/prh/model/CommonFunctionsTest.java @@ -37,11 +37,10 @@ import static org.mockito.Mockito.when; class CommonFunctionsTest { // Given private ConsumerDmaapModel model = new ConsumerDmaapModelForUnitTest(); - private String expectedResult = "{\"pnfName\":\"NOKnhfsadhff\",\"ipv4\":\"256.22.33.155\",\"ipv6\":\"2001:0db8:85a3:0000:0000:8a2e:0370:7334\"}"; - final static HttpResponse httpResponseMock = mock(HttpResponse.class); - final static HttpEntity httpEntityMock = mock(HttpEntity.class); - final static StatusLine statusLineMock = mock(StatusLine.class); + 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 static void setup() { @@ -51,22 +50,7 @@ class CommonFunctionsTest { @Test void createJsonBody_shouldReturnJsonInString() { + String expectedResult = "{\"pnfName\":\"NOKnhfsadhff\",\"ipv4\":\"256.22.33.155\",\"ipv6\":\"2001:0db8:85a3:0000:0000:8a2e:0370:7334\"}"; assertEquals(expectedResult, CommonFunctions.createJsonBody(model)); } - - @Test - void handleResponse_shouldReturn200() throws IOException { - // When - when(httpResponseMock.getStatusLine().getStatusCode()).thenReturn(HttpStatus.SC_OK); - // Then - assertEquals(Optional.of(HttpStatus.SC_OK), CommonFunctions.handleResponse(httpResponseMock)); - } - - @Test - void handleResponse_shouldReturn300() throws IOException { - // When - when(httpResponseMock.getStatusLine().getStatusCode()).thenReturn(HttpStatus.SC_BAD_REQUEST); - // Then - assertEquals(Optional.of(HttpStatus.SC_BAD_REQUEST), CommonFunctions.handleResponse(httpResponseMock)); - } } -- cgit 1.2.3-korg