fix PRH dmaap content type configuration after breaking changes introduced to SDK

and mix of minor code cleanups

Change-Id: I568f49b8b6635f23b2089a4355eb78451102c2b1
Issue-ID: DCAEGEN2-1647
Signed-off-by: grabinsk <maciej.grabinski@nokia.com>

1 files changed, 6 insertions, 9 deletions

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 a57a5393..85b4c035 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
@@ -69,21 +69,18 @@ class CbsContentParser {
     }
 
     MessageRouterPublishRequest getMessageRouterPublishRequest() {
-        RawDataStream<JsonObject> sink = DataStreams.namedSinks(jsonObject).find(streamWithName(PNF_READY)).get();
-        MessageRouterSink parsedSink = StreamFromGsonParsers.messageRouterSinkParser().unsafeParse(sink);
-
-        return ImmutableMessageRouterPublishRequest.builder()
-                .contentType(jsonObject.get("dmaap.dmaapProducerConfiguration.dmaapContentType").getAsString())
-                .sinkDefinition(parsedSink)
-                .build();
+        return getMessageRouterPublishRequest(PNF_READY);
     }
 
     MessageRouterPublishRequest getMessageRouterUpdatePublishRequest() {
-        RawDataStream<JsonObject> sink = DataStreams.namedSinks(jsonObject).find(streamWithName(PNF_UPDATE)).get();
+        return getMessageRouterPublishRequest(PNF_UPDATE);
+    }
+
+    private MessageRouterPublishRequest getMessageRouterPublishRequest(String streamName) {
+        RawDataStream<JsonObject> sink = DataStreams.namedSinks(jsonObject).find(streamWithName(streamName)).get();
         MessageRouterSink parsedSink = StreamFromGsonParsers.messageRouterSinkParser().unsafeParse(sink);
 
         return ImmutableMessageRouterPublishRequest.builder()
-                .contentType(jsonObject.get("dmaap.dmaapProducerConfiguration.dmaapContentType").getAsString())
                 .sinkDefinition(parsedSink)
                 .build();
     }