From 39300ffd1dde766624036b361e444e5ef30371ce Mon Sep 17 00:00:00 2001 From: wasala Date: Thu, 18 Oct 2018 08:07:37 +0200 Subject: Fixed Reactor-Netty SSL_conf *Error calling secure AAI http client Change-Id: Ie4ba090f9ed33e134d584270e3ae875cd54472b6 Issue-ID: DCAEGEN2-870 Signed-off-by: wasala --- .../onap/dcaegen2/services/prh/service/DmaapConsumerJsonParser.java | 4 ++-- .../onap/dcaegen2/services/prh/configuration/PrhAppConfigTest.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'prh-app-server') diff --git a/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/service/DmaapConsumerJsonParser.java b/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/service/DmaapConsumerJsonParser.java index bf3987cb..4749b520 100644 --- a/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/service/DmaapConsumerJsonParser.java +++ b/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/service/DmaapConsumerJsonParser.java @@ -23,6 +23,8 @@ package org.onap.dcaegen2.services.prh.service; import com.google.gson.JsonElement; import com.google.gson.JsonObject; import com.google.gson.JsonParser; +import java.util.Optional; +import java.util.stream.StreamSupport; import org.onap.dcaegen2.services.prh.exceptions.DmaapNotFoundException; import org.onap.dcaegen2.services.prh.model.ConsumerDmaapModel; import org.onap.dcaegen2.services.prh.model.ImmutableConsumerDmaapModel; @@ -32,8 +34,6 @@ import org.springframework.util.StringUtils; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; -import java.util.Optional; -import java.util.stream.StreamSupport; /** * @author Przemysław Wąsala on 5/8/18 diff --git a/prh-app-server/src/test/java/org/onap/dcaegen2/services/prh/configuration/PrhAppConfigTest.java b/prh-app-server/src/test/java/org/onap/dcaegen2/services/prh/configuration/PrhAppConfigTest.java index 01866309..c4c86db9 100644 --- a/prh-app-server/src/test/java/org/onap/dcaegen2/services/prh/configuration/PrhAppConfigTest.java +++ b/prh-app-server/src/test/java/org/onap/dcaegen2/services/prh/configuration/PrhAppConfigTest.java @@ -77,8 +77,8 @@ class PrhAppConfigTest { + "\"dmaapHostName\":\"localhost\",\"dmaapPortNumber\":2223,\"dmaapProtocol\":\"http\",\"dmaaptopicName\"" + ":\"temp\",\"dmaapuserName\":\"admin\",\"dmaapuserPassword\":\"admin\"}}}}"; - private static PrhAppConfig prhAppConfig; - private static AppConfig appConfig; + private PrhAppConfig prhAppConfig; + private AppConfig appConfig; private static InputStream inputStream; -- cgit 1.2.3-korg