From 72c2d38329865afa6692454b4fb90ab6f8a70638 Mon Sep 17 00:00:00 2001
From: Joanna Jeremicz <joanna.jeremicz@nokia.com>
Date: Thu, 25 Feb 2021 15:24:34 +0100
Subject: Fix sonar issues - Use Map instead of LinkedHashMap when possible -
 Rename some constants - Remove some commented lines - Add logger - Other
 minor improvements and refactor

Issue-ID: DCAEGEN2-2636
Signed-off-by: Joanna Jeremicz <joanna.jeremicz@nokia.com>
Change-Id: I7a03cee453b3d254c4ff0fdf51c60a0ae4a61c42
---
 .../service/common/kafka/KafkaStreamService.java   | 24 +++++++++++-----------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/service/common/kafka/KafkaStreamService.java')

diff --git a/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/service/common/kafka/KafkaStreamService.java b/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/service/common/kafka/KafkaStreamService.java
index 2090ef0..c36387c 100644
--- a/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/service/common/kafka/KafkaStreamService.java
+++ b/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/service/common/kafka/KafkaStreamService.java
@@ -59,7 +59,7 @@ public class KafkaStreamService {
      * @param streamName Stream name
      * @return
      */
-    public Map<String, LinkedHashMap<String, Object>> createStreamPublishInputs(String streamName) {
+    public Map<String, Map<String, Object>> createStreamPublishInputs(String streamName) {
         return createStreamInputs(streamName + PUBLISH_URL_SUFFIX);
     }
 
@@ -69,7 +69,7 @@ public class KafkaStreamService {
      * @param streamName Stream name
      * @return
      */
-    public Map<String, LinkedHashMap<String, Object>> createStreamSubscribeInputs(String streamName) {
+    public Map<String, Map<String, Object>> createStreamSubscribeInputs(String streamName) {
         return createStreamInputs(streamName + SUBSCRIBE_URL_SUFFIX);
     }
 
@@ -81,7 +81,7 @@ public class KafkaStreamService {
      */
     public Map<String, KafkaStream> createAppPropertiesPublish(String streamName) {
 
-        LinkedHashMap<String, KafkaStream> kafkaStreamMap = new LinkedHashMap<>();
+        Map<String, KafkaStream> kafkaStreamMap = new LinkedHashMap<>();
         KafkaStream kafkaStream = createAppProperties(streamName, PUBLISH_URL_SUFFIX);
 
         kafkaStreamMap.put(streamName, kafkaStream);
@@ -97,7 +97,7 @@ public class KafkaStreamService {
      */
     public Map<String, KafkaStream> createAppPropertiesSubscribe(String streamName) {
 
-        LinkedHashMap<String, KafkaStream> kafkaStreamMap = new LinkedHashMap<>();
+        Map<String, KafkaStream> kafkaStreamMap = new LinkedHashMap<>();
         KafkaStream kafkaStream = createAppProperties(streamName, SUBSCRIBE_URL_SUFFIX);
 
         kafkaStreamMap.put(streamName, kafkaStream);
@@ -111,25 +111,25 @@ public class KafkaStreamService {
         return new KafkaStream(topicName);
     }
 
-    private Map<String, LinkedHashMap<String, Object>> createStreamInputs(String streamName) {
-        LinkedHashMap<String, LinkedHashMap<String, Object>> streamInputs = createBaseInputs();
-        LinkedHashMap<String, Object> stream =
+    private Map<String, Map<String, Object>> createStreamInputs(String streamName) {
+        Map<String, Map<String, Object>> streamInputs = createBaseInputs();
+        Map<String, Object> stream =
             blueprintHelperService.createStringInput(DEFAULT_STREAM_URL);
         streamInputs.put(streamName, stream);
         return streamInputs;
     }
 
-    private LinkedHashMap<String, LinkedHashMap<String, Object>> createBaseInputs() {
-        LinkedHashMap<String, LinkedHashMap<String, Object>> baseInputs = new LinkedHashMap<>();
+    private Map<String, Map<String, Object>> createBaseInputs() {
+        Map<String, Map<String, Object>> baseInputs = new LinkedHashMap<>();
 
-        LinkedHashMap<String, Object> kafka_message_router = blueprintHelperService
+        Map<String, Object> kafka_message_router = blueprintHelperService
             .createStringInput(DEFAULT_BOOTSTRAP_SERVER);
         baseInputs.put(KAFKA_INFO_BOOTSTRAP_SERVERS_INPUT_NAME, kafka_message_router);
 
-        LinkedHashMap<String, Object> kafka_username = blueprintHelperService.createStringInput(DEFAULT_AAF_USER);
+        Map<String, Object> kafka_username = blueprintHelperService.createStringInput(DEFAULT_AAF_USER);
         baseInputs.put(AFF_KAFKA_USER_INPUT_NAME, kafka_username);
 
-        LinkedHashMap<String, Object> kafka_password = blueprintHelperService.createStringInput(DEFAULT_AAF_PASSWORD);
+        Map<String, Object> kafka_password = blueprintHelperService.createStringInput(DEFAULT_AAF_PASSWORD);
         baseInputs.put(AAF_KAFKA_PASSWORD_INPUT_NAME, kafka_password);
 
         return baseInputs;
-- 
cgit 1.2.3-korg