From e3595ee528b4ddb9d6ff6e26d812c0e293b34a19 Mon Sep 17 00:00:00 2001 From: Michal Kabaj Date: Thu, 28 Nov 2019 12:21:19 +0100 Subject: aaiclient api refactor - Moved aaiclient code from SDK to PRH improvement of logic fragmentation Issue-ID: DCAEGEN2-1955 Signed-off-by: Michal Kabaj Change-Id: I11d5b92014cdeb036699099113f64fc320cb4dd1 --- .../services/prh/configuration/CbsContentParser.java | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/configuration/CbsContentParser.java') diff --git a/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/configuration/CbsContentParser.java b/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/configuration/CbsContentParser.java index ee7ff222..869d537f 100644 --- a/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/configuration/CbsContentParser.java +++ b/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/configuration/CbsContentParser.java @@ -20,14 +20,19 @@ package org.onap.dcaegen2.services.prh.configuration; +import static org.onap.dcaegen2.services.sdk.rest.services.cbs.client.api.streams.StreamPredicates.streamWithName; + import com.google.common.reflect.TypeToken; import com.google.gson.Gson; import com.google.gson.JsonObject; +import java.nio.file.Paths; +import java.time.Duration; +import java.util.Map; +import org.onap.dcaegen2.services.prh.adapter.aai.api.AaiClientConfiguration; +import org.onap.dcaegen2.services.prh.adapter.aai.api.ImmutableAaiClientConfiguration; import org.onap.dcaegen2.services.sdk.model.streams.RawDataStream; import org.onap.dcaegen2.services.sdk.model.streams.dmaap.MessageRouterSink; import org.onap.dcaegen2.services.sdk.model.streams.dmaap.MessageRouterSource; -import org.onap.dcaegen2.services.sdk.rest.services.aai.client.api.AaiClientConfiguration; -import org.onap.dcaegen2.services.sdk.rest.services.aai.client.api.ImmutableAaiClientConfiguration; import org.onap.dcaegen2.services.sdk.rest.services.cbs.client.api.streams.DataStreams; import org.onap.dcaegen2.services.sdk.rest.services.cbs.client.api.streams.StreamFromGsonParsers; import org.onap.dcaegen2.services.sdk.rest.services.dmaap.client.model.ImmutableMessageRouterPublishRequest; @@ -43,12 +48,6 @@ import org.onap.dcaegen2.services.sdk.security.ssl.ImmutableSecurityKeysStore; import org.onap.dcaegen2.services.sdk.security.ssl.Passwords; import org.onap.dcaegen2.services.sdk.security.ssl.SecurityKeys; -import java.nio.file.Paths; -import java.time.Duration; -import java.util.Map; - -import static org.onap.dcaegen2.services.sdk.rest.services.cbs.client.api.streams.StreamPredicates.streamWithName; - /** * @author Przemysław Wąsala on 8/21/18 */ -- cgit 1.2.3-korg