aboutsummaryrefslogtreecommitdiffstats
path: root/prh-dmaap-client
diff options
context:
space:
mode:
Diffstat (limited to 'prh-dmaap-client')
-rw-r--r--prh-dmaap-client/src/main/java/org/onap/dcaegen2/services/prh/service/consumer/DmaapConsumerReactiveHttpClient.java9
-rw-r--r--prh-dmaap-client/src/main/java/org/onap/dcaegen2/services/prh/service/consumer/ExtendedDmaapConsumerHttpClientImpl.java130
-rw-r--r--prh-dmaap-client/src/test/java/org/onap/dcaegen2/services/prh/service/consumer/ExtendedDmaapConsumerHttpClientImplTest.java192
3 files changed, 102 insertions, 229 deletions
diff --git a/prh-dmaap-client/src/main/java/org/onap/dcaegen2/services/prh/service/consumer/DmaapConsumerReactiveHttpClient.java b/prh-dmaap-client/src/main/java/org/onap/dcaegen2/services/prh/service/consumer/DmaapConsumerReactiveHttpClient.java
index 859784a8..a99833dc 100644
--- a/prh-dmaap-client/src/main/java/org/onap/dcaegen2/services/prh/service/consumer/DmaapConsumerReactiveHttpClient.java
+++ b/prh-dmaap-client/src/main/java/org/onap/dcaegen2/services/prh/service/consumer/DmaapConsumerReactiveHttpClient.java
@@ -24,6 +24,7 @@ import static org.springframework.web.reactive.function.client.ExchangeFilterFun
import java.net.URI;
import java.net.URISyntaxException;
+import java.util.Optional;
import org.apache.http.client.utils.URIBuilder;
import org.onap.dcaegen2.services.prh.config.DmaapConsumerConfiguration;
import org.slf4j.Logger;
@@ -66,7 +67,7 @@ public class DmaapConsumerReactiveHttpClient {
.build();
}
- public Mono<String> getDmaaPConsumerResposne() {
+ public Mono<Optional<String>> getDmaaPConsumerResponse() {
try {
return webClient
.get()
@@ -75,8 +76,10 @@ public class DmaapConsumerReactiveHttpClient {
.onStatus(HttpStatus::is4xxClientError, clientResponse ->
Mono.error(new Exception("HTTP 400"))
)
- .onStatus(HttpStatus::is5xxServerError, clientResponse -> Mono.error(new Exception("HTTP 500")))
- .bodyToMono(String.class);
+ .onStatus(HttpStatus::is5xxServerError, clientResponse ->
+ Mono.error(new Exception("HTTP 500")))
+ .bodyToMono(String.class)
+ .map(Optional::of);
} catch (URISyntaxException e) {
logger.warn("Exception while executing HTTP request: ", e);
return Mono.error(e);
diff --git a/prh-dmaap-client/src/main/java/org/onap/dcaegen2/services/prh/service/consumer/ExtendedDmaapConsumerHttpClientImpl.java b/prh-dmaap-client/src/main/java/org/onap/dcaegen2/services/prh/service/consumer/ExtendedDmaapConsumerHttpClientImpl.java
deleted file mode 100644
index 0f8fe28c..00000000
--- a/prh-dmaap-client/src/main/java/org/onap/dcaegen2/services/prh/service/consumer/ExtendedDmaapConsumerHttpClientImpl.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
- * ============LICENSE_START=======================================================
- * PNF-REGISTRATION-HANDLER
- * ================================================================================
- * 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 org.onap.dcaegen2.services.prh.service.consumer;
-
-import java.io.IOException;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.util.Optional;
-import org.apache.http.HttpEntity;
-import org.apache.http.client.ResponseHandler;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.client.methods.HttpRequestBase;
-import org.apache.http.client.utils.URIBuilder;
-import org.apache.http.impl.client.CloseableHttpClient;
-import org.apache.http.util.EntityUtils;
-import org.onap.dcaegen2.services.prh.config.DmaapConsumerConfiguration;
-import org.onap.dcaegen2.services.prh.service.DmaapHttpClientImpl;
-import org.onap.dcaegen2.services.prh.service.HttpUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-
-public class ExtendedDmaapConsumerHttpClientImpl {
-
- private final Logger logger = LoggerFactory.getLogger(this.getClass());
-
- private final CloseableHttpClient closeableHttpClient;
- private final String dmaapHostName;
- private final String dmaapProtocol;
- private final Integer dmaapPortNumber;
- private final String dmaapTopicName;
- private final String consumerGroup;
- private final String consumerId;
- private final String dmaapContentType;
-
-
- public ExtendedDmaapConsumerHttpClientImpl(DmaapConsumerConfiguration configuration) {
- this.closeableHttpClient = new DmaapHttpClientImpl(configuration).getHttpClient();
- this.dmaapHostName = configuration.dmaapHostName();
- this.dmaapProtocol = configuration.dmaapProtocol();
- this.dmaapPortNumber = configuration.dmaapPortNumber();
- this.dmaapTopicName = configuration.dmaapTopicName();
- this.consumerGroup = configuration.consumerGroup();
- this.consumerId = configuration.consumerId();
- this.dmaapContentType = configuration.dmaapContentType();
- }
-
- public Optional<String> getHttpConsumerResponse() {
-
- try {
- return createRequest()
- .flatMap(this::executeHttpClient);
- } catch (URISyntaxException e) {
- logger.warn("Exception while executing HTTP request: ", e);
- }
- return Optional.empty();
- }
-
- private Optional<String> executeHttpClient(HttpRequestBase httpRequestBase) {
- try {
- return closeableHttpClient.execute(httpRequestBase, getDmaapConsumerResponseHandler());
- } catch (IOException e) {
- logger.warn("Exception while executing HTTP request: ", e);
- }
- return Optional.empty();
- }
-
- private Optional<HttpRequestBase> createRequest() throws URISyntaxException {
- return "application/json".equals(dmaapContentType)
- ? createDmaapConsumerExtendedURI().map(this::createHttpRequest)
- : Optional.empty();
- }
-
- private HttpRequestBase createHttpRequest(URI extendedURI) {
- HttpRequestBase httpRequestBase = new HttpGet(extendedURI);
- httpRequestBase.addHeader("Content-type", dmaapContentType);
- return httpRequestBase;
- }
-
-
- private String createRequestPath() {
- return dmaapTopicName + "/" + consumerGroup + "/" + consumerId;
- }
-
- private Optional<URI> createDmaapConsumerExtendedURI() throws URISyntaxException {
- return Optional.ofNullable(new URIBuilder()
- .setScheme(dmaapProtocol)
- .setHost(dmaapHostName)
- .setPort(dmaapPortNumber)
- .setPath(createRequestPath()).build());
- }
-
- private ResponseHandler<Optional<String>> getDmaapConsumerResponseHandler() {
- return httpResponse -> {
- final int responseCode = httpResponse.getStatusLine().getStatusCode();
- logger.info("Status code of operation: {}", responseCode);
- final HttpEntity responseEntity = httpResponse.getEntity();
-
- if (HttpUtils.isSuccessfulResponseCode(responseCode)) {
- logger.trace("HTTP response successful.");
- final String dmaapResponse = EntityUtils.toString(responseEntity);
- return Optional.of(dmaapResponse);
- } else {
- String dmaapResponse = responseEntity != null ? EntityUtils.toString(responseEntity) : "";
- logger.trace("HTTP response not successful : {}", dmaapResponse);
- return Optional.of(String.valueOf(responseCode));
- }
- };
- }
-}
-
-
diff --git a/prh-dmaap-client/src/test/java/org/onap/dcaegen2/services/prh/service/consumer/ExtendedDmaapConsumerHttpClientImplTest.java b/prh-dmaap-client/src/test/java/org/onap/dcaegen2/services/prh/service/consumer/ExtendedDmaapConsumerHttpClientImplTest.java
index 39c10de5..d2c0e77b 100644
--- a/prh-dmaap-client/src/test/java/org/onap/dcaegen2/services/prh/service/consumer/ExtendedDmaapConsumerHttpClientImplTest.java
+++ b/prh-dmaap-client/src/test/java/org/onap/dcaegen2/services/prh/service/consumer/ExtendedDmaapConsumerHttpClientImplTest.java
@@ -1,96 +1,96 @@
-/*-
- * ============LICENSE_START=======================================================
- * PNF-REGISTRATION-HANDLER
- * ================================================================================
- * 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 org.onap.dcaegen2.services.prh.service.consumer;
-
-import org.apache.http.client.ResponseHandler;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.impl.client.CloseableHttpClient;
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.Test;
-import org.onap.dcaegen2.services.prh.config.DmaapConsumerConfiguration;
-
-import java.io.IOException;
-import java.lang.reflect.Field;
-import java.util.Optional;
-
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-
-public class ExtendedDmaapConsumerHttpClientImplTest {
-
- private static ExtendedDmaapConsumerHttpClientImpl objectUnderTest;
-
- private static DmaapConsumerConfiguration configurationMock = mock(DmaapConsumerConfiguration.class);
- private static CloseableHttpClient closeableHttpClientMock = mock(CloseableHttpClient.class);
-
- private static final String JSON_MESSAGE = "{ \"responseFromDmaap\": \"Success\" }";
-
- private static Optional<String> expectedResult = Optional.empty();
-
- @BeforeAll
- public static void init() throws NoSuchFieldException, IllegalAccessException {
-
- when(configurationMock.dmaapHostName()).thenReturn("54.45.33.2");
- when(configurationMock.dmaapProtocol()).thenReturn("https");
- when(configurationMock.dmaapPortNumber()).thenReturn(1234);
- when(configurationMock.dmaapUserName()).thenReturn("PRH");
- when(configurationMock.dmaapUserPassword()).thenReturn("PRH");
- when(configurationMock.dmaapContentType()).thenReturn("application/json");
- when(configurationMock.dmaapTopicName()).thenReturn("unauthenticated.SEC_OTHER_OUTPUT");
- when(configurationMock.consumerGroup()).thenReturn("OpenDCAE-c12");
- when(configurationMock.consumerId()).thenReturn("c12");
-
- objectUnderTest = new ExtendedDmaapConsumerHttpClientImpl(configurationMock);
-
- setField();
- }
-
-
- @Test
- public void getHttpResponseGet_success() throws IOException {
- expectedResult = Optional.of(JSON_MESSAGE);
-
- when(closeableHttpClientMock.execute(any(HttpGet.class), any(ResponseHandler.class)))
- .thenReturn(expectedResult);
-
- Optional<String> actualResult = objectUnderTest.getHttpConsumerResponse();
-
- Assertions.assertEquals(expectedResult.get(), actualResult.get());
- }
-
- @Test
- public void getExtendedDetails_returnsNull() throws IOException {
- when(closeableHttpClientMock.execute(any(HttpGet.class), any(ResponseHandler.class))).
- thenReturn(Optional.empty());
- Optional<String> actualResult = objectUnderTest.getHttpConsumerResponse();
- Assertions.assertEquals(Optional.empty(),actualResult);
- }
-
-
- private static void setField() throws NoSuchFieldException, IllegalAccessException {
- Field field = objectUnderTest.getClass().getDeclaredField("closeableHttpClient");
- field.setAccessible(true);
- field.set(objectUnderTest, closeableHttpClientMock);
- }
-}
+///*-
+// * ============LICENSE_START=======================================================
+// * PNF-REGISTRATION-HANDLER
+// * ================================================================================
+// * 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 org.onap.dcaegen2.services.prh.service.consumer;
+//
+//import org.apache.http.client.ResponseHandler;
+//import org.apache.http.client.methods.HttpGet;
+//import org.apache.http.impl.client.CloseableHttpClient;
+//import org.junit.jupiter.api.Assertions;
+//import org.junit.jupiter.api.BeforeAll;
+//import org.junit.jupiter.api.Test;
+//import org.onap.dcaegen2.services.prh.config.DmaapConsumerConfiguration;
+//
+//import java.io.IOException;
+//import java.lang.reflect.Field;
+//import java.util.Optional;
+//
+//import static org.mockito.ArgumentMatchers.any;
+//import static org.mockito.Mockito.mock;
+//import static org.mockito.Mockito.when;
+//
+//
+//public class ExtendedDmaapConsumerHttpClientImplTest {
+//
+// private static ExtendedDmaapConsumerHttpClientImpl objectUnderTest;
+//
+// private static DmaapConsumerConfiguration configurationMock = mock(DmaapConsumerConfiguration.class);
+// private static CloseableHttpClient closeableHttpClientMock = mock(CloseableHttpClient.class);
+//
+// private static final String JSON_MESSAGE = "{ \"responseFromDmaap\": \"Success\" }";
+//
+// private static Optional<String> expectedResult = Optional.empty();
+//
+// @BeforeAll
+// public static void init() throws NoSuchFieldException, IllegalAccessException {
+//
+// when(configurationMock.dmaapHostName()).thenReturn("54.45.33.2");
+// when(configurationMock.dmaapProtocol()).thenReturn("https");
+// when(configurationMock.dmaapPortNumber()).thenReturn(1234);
+// when(configurationMock.dmaapUserName()).thenReturn("PRH");
+// when(configurationMock.dmaapUserPassword()).thenReturn("PRH");
+// when(configurationMock.dmaapContentType()).thenReturn("application/json");
+// when(configurationMock.dmaapTopicName()).thenReturn("unauthenticated.SEC_OTHER_OUTPUT");
+// when(configurationMock.consumerGroup()).thenReturn("OpenDCAE-c12");
+// when(configurationMock.consumerId()).thenReturn("c12");
+//
+// objectUnderTest = new ExtendedDmaapConsumerHttpClientImpl(configurationMock);
+//
+// setField();
+// }
+//
+//
+// @Test
+// public void getHttpResponseGet_success() throws IOException {
+// expectedResult = Optional.of(JSON_MESSAGE);
+//
+// when(closeableHttpClientMock.execute(any(HttpGet.class), any(ResponseHandler.class)))
+// .thenReturn(expectedResult);
+//
+// Optional<String> actualResult = objectUnderTest.getHttpConsumerResponse();
+//
+// Assertions.assertEquals(expectedResult.get(), actualResult.get());
+// }
+//
+// @Test
+// public void getExtendedDetails_returnsNull() throws IOException {
+// when(closeableHttpClientMock.execute(any(HttpGet.class), any(ResponseHandler.class))).
+// thenReturn(Optional.empty());
+// Optional<String> actualResult = objectUnderTest.getHttpConsumerResponse();
+// Assertions.assertEquals(Optional.empty(),actualResult);
+// }
+//
+//
+// private static void setField() throws NoSuchFieldException, IllegalAccessException {
+// Field field = objectUnderTest.getClass().getDeclaredField("closeableHttpClient");
+// field.setAccessible(true);
+// field.set(objectUnderTest, closeableHttpClientMock);
+// }
+//}