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
---
 .../org/onap/blueprintgenerator/service/common/DmaapService.java | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

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

diff --git a/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/service/common/DmaapService.java b/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/service/common/DmaapService.java
index e21b852..09ed925 100644
--- a/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/service/common/DmaapService.java
+++ b/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/service/common/DmaapService.java
@@ -4,6 +4,7 @@
  *  *  org.onap.dcae
  *  *  ================================================================================
  *  *  Copyright (c) 2020  AT&T Intellectual Property. All rights reserved.
+ *  *  Copyright (c) 2021 Nokia. 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.
@@ -56,7 +57,7 @@ public class DmaapService {
      * @return
      */
     public Map<String, Object> createDmaapMessageRouter(
-        Map<String, LinkedHashMap<String, Object>> inputs,
+        Map<String, Map<String, Object>> inputs,
         String config,
         char type,
         String counter,
@@ -72,7 +73,7 @@ public class DmaapService {
         if (!isDmaap) {
             Map<String, Object> infoResponse = infoService
                 .createMessageRouterInfo(inputs, config, type);
-            inputs = (Map<String, LinkedHashMap<String, Object>>) infoResponse.get("inputs");
+            inputs = (Map<String, Map<String, Object>>) infoResponse.get("inputs");
             dmaap.setDmaap_info(infoResponse.get("info"));
         } else {
             String infoType = "<<" + counter + ">>";
@@ -103,7 +104,7 @@ public class DmaapService {
      * @return
      */
     public Map<String, Object> createDmaapDataRouter(
-        Map<String, LinkedHashMap<String, Object>> inputs,
+        Map<String, Map<String, Object>> inputs,
         String config,
         String counter,
         boolean isDmaap) {
@@ -113,7 +114,7 @@ public class DmaapService {
 
         if (!isDmaap) {
             Map<String, Object> infoResponse = infoService.createDataRouterInfo(inputs, config);
-            inputs = (Map<String, LinkedHashMap<String, Object>>) infoResponse.get("inputs");
+            inputs = (Map<String, Map<String, Object>>) infoResponse.get("inputs");
             dmaap.setDmaap_info(infoResponse.get("info"));
         } else {
             String infoType = "<<" + counter + ">>";
-- 
cgit 1.2.3-korg