diff options
Diffstat (limited to 'prh-aai-client/src/main')
6 files changed, 8 insertions, 96 deletions
diff --git a/prh-aai-client/src/main/java/services/service/AAIExtendedHttpClient.java b/prh-aai-client/src/main/java/services/service/AAIExtendedHttpClient.java index 8b7db1ba..41cf87e5 100644 --- a/prh-aai-client/src/main/java/services/service/AAIExtendedHttpClient.java +++ b/prh-aai-client/src/main/java/services/service/AAIExtendedHttpClient.java @@ -1,6 +1,6 @@ /*- * ============LICENSE_START======================================================= - * PROJECT + * PNF-REGISTRATION-HANDLER * ================================================================================ * Copyright (C) 2018 NOKIA Intellectual Property. All rights reserved. * ================================================================================ diff --git a/prh-aai-client/src/main/java/services/service/AAIExtendedHttpClientImpl.java b/prh-aai-client/src/main/java/services/service/AAIExtendedHttpClientImpl.java index c7f7b0db..7a5a9f8b 100644 --- a/prh-aai-client/src/main/java/services/service/AAIExtendedHttpClientImpl.java +++ b/prh-aai-client/src/main/java/services/service/AAIExtendedHttpClientImpl.java @@ -1,6 +1,6 @@ /*- * ============LICENSE_START======================================================= - * PROJECT + * PNF-REGISTRATION-HANDLER * ================================================================================ * Copyright (C) 2018 NOKIA Intellectual Property. All rights reserved. * ================================================================================ diff --git a/prh-aai-client/src/main/java/services/service/AAIHttpClient.java b/prh-aai-client/src/main/java/services/service/AAIHttpClient.java index 3dd17fc2..c1054d7b 100644 --- a/prh-aai-client/src/main/java/services/service/AAIHttpClient.java +++ b/prh-aai-client/src/main/java/services/service/AAIHttpClient.java @@ -1,6 +1,6 @@ /*- * ============LICENSE_START======================================================= - * PROJECT + * PNF-REGISTRATION-HANDLER * ================================================================================ * Copyright (C) 2018 NOKIA Intellectual Property. All rights reserved. * ================================================================================ diff --git a/prh-aai-client/src/main/java/services/service/AAIHttpClientImpl.java b/prh-aai-client/src/main/java/services/service/AAIHttpClientImpl.java index 76d090d6..39c91ddc 100644 --- a/prh-aai-client/src/main/java/services/service/AAIHttpClientImpl.java +++ b/prh-aai-client/src/main/java/services/service/AAIHttpClientImpl.java @@ -1,6 +1,6 @@ /*- * ============LICENSE_START======================================================= - * PROJECT + * PNF-REGISTRATION-HANDLER * ================================================================================ * Copyright (C) 2018 NOKIA Intellectual Property. All rights reserved. * ================================================================================ diff --git a/prh-aai-client/src/main/java/services/utils/HttpUtils.java b/prh-aai-client/src/main/java/services/utils/HttpUtils.java index f752d145..d4d5c880 100644 --- a/prh-aai-client/src/main/java/services/utils/HttpUtils.java +++ b/prh-aai-client/src/main/java/services/utils/HttpUtils.java @@ -1,6 +1,6 @@ /*- * ============LICENSE_START======================================================= - * PROJECT + * PNF-REGISTRATION-HANDLER * ================================================================================ * Copyright (C) 2018 NOKIA Intellectual Property. All rights reserved. * ================================================================================ @@ -19,16 +19,12 @@ */ package services.utils; -public class HttpUtils { +import org.apache.http.HttpStatus; + +public class HttpUtils implements HttpStatus { private HttpUtils() {} - public static final Integer HTTP_OK_RESPONSE_CODE = 200; - public static final Integer HTTP_ACCEPTED_RESPONSE_CODE = 200; - public static final Integer HTTP_NONAUTHORATIVE_INFORMATION_RESPONSE_CODE = 203; - public static final Integer HTTP_NO_CONTENT_RESPONSE_CODE = 204; - public static final Integer HTTP_RESET_CONTENT_RESPONSE_CODE = 205; - public static final Integer HTTP_PARTIAL_CONTENT_RESPONSE_CODE = 206; public static final String JSON_APPLICATION_TYPE = "application/json"; public static boolean isSuccessfulResponseCode(Integer statusCode) { diff --git a/prh-aai-client/src/main/test/java/services/service/AAIExtendedHttpClientImplTest.java b/prh-aai-client/src/main/test/java/services/service/AAIExtendedHttpClientImplTest.java deleted file mode 100644 index 5932528b..00000000 --- a/prh-aai-client/src/main/test/java/services/service/AAIExtendedHttpClientImplTest.java +++ /dev/null @@ -1,84 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * PROJECT - * ================================================================================ - * Copyright (C) 2018 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 services.service; - -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; - -import java.io.IOException; -import java.lang.reflect.Field; -import java.util.HashMap; -import java.util.Map; -import java.util.Optional; -import org.apache.http.client.ResponseHandler; -import org.apache.http.client.methods.HttpGet; -import org.apache.http.impl.client.CloseableHttpClient; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; -import services.config.AAIHttpClientConfiguration; - -public class AAIExtendedHttpClientImplTest { - - private AAIExtendedHttpClientImpl testedObject; - private AAIHttpClientConfiguration aaiHttpClientConfigurationMock = mock(AAIHttpClientConfiguration.class); - private CloseableHttpClient closeableHttpClientMock = mock(CloseableHttpClient.class); - - @Before - public void init() throws NoSuchFieldException, IllegalAccessException { - when(aaiHttpClientConfigurationMock.aaiHost()).thenReturn("hostTest"); - when(aaiHttpClientConfigurationMock.aaiProtocol()).thenReturn("https"); - when(aaiHttpClientConfigurationMock.aaiHostPortNumber()).thenReturn(1234); - testedObject = new AAIExtendedHttpClientImpl(aaiHttpClientConfigurationMock); - setField(); - } - - @Test - public void getExtendedDetails_success() throws IOException { - String expectedResult = "getExtendedDetailsOK"; - Map<String, String> queryParams = new HashMap<>(); - queryParams.put("key1", "value1"); - Map<String, String> headers = new HashMap<>(); - headers.put("headerKey", "headerValue"); - - when(closeableHttpClientMock.execute(any(HttpGet.class), any(ResponseHandler.class))). - thenReturn(Optional.of(expectedResult)); - String actualResult = testedObject.getExtendedDetails("testPath", queryParams, headers); - Assert.assertEquals(expectedResult, actualResult); - } - - @Test - public void getExtendedDetails_returnsNull() throws IOException { - when(closeableHttpClientMock.execute(any(HttpGet.class), any(ResponseHandler.class))). - thenReturn(Optional.empty()); - String actualResult = testedObject.getExtendedDetails("testPath", new HashMap<>(), new HashMap<>()); - Assert.assertNull(actualResult); - } - - private void setField() throws NoSuchFieldException, IllegalAccessException { - Field field = testedObject.getClass().getDeclaredField("closeableHttpClient"); - field.setAccessible(true); - field.set(testedObject, closeableHttpClientMock); - } - - -} |