From 0dc7c10e3deed4e79163caed997cc8f40d9b073c Mon Sep 17 00:00:00 2001
From: Remigiusz Janeczek <remigiusz.janeczek@nokia.com>
Date: Mon, 21 Sep 2020 11:52:05 +0200
Subject: Sonar fixes in bpgenerator models/blueprints package

Issue-ID: DCAEGEN2-2449
Signed-off-by: Remigiusz Janeczek <remigiusz.janeczek@nokia.com>
Change-Id: Ia696077e0e524515eac395ad81f1a59addb6d6b2
---
 .../blueprintgenerator/models/blueprint/Appconfig.java    | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

(limited to 'mod/bpgenerator/src/main/java/org/onap/blueprintgenerator/models/blueprint/Appconfig.java')

diff --git a/mod/bpgenerator/src/main/java/org/onap/blueprintgenerator/models/blueprint/Appconfig.java b/mod/bpgenerator/src/main/java/org/onap/blueprintgenerator/models/blueprint/Appconfig.java
index b39a8ec..75864be 100644
--- a/mod/bpgenerator/src/main/java/org/onap/blueprintgenerator/models/blueprint/Appconfig.java
+++ b/mod/bpgenerator/src/main/java/org/onap/blueprintgenerator/models/blueprint/Appconfig.java
@@ -52,8 +52,7 @@ public class Appconfig {
 
 	public TreeMap<String, LinkedHashMap<String, Object>> createAppconfig(TreeMap<String, LinkedHashMap<String, Object>> inps, ComponentSpec cs, String override,
 																		  boolean isDmaap) {
-		TreeMap<String, LinkedHashMap<String, Object>> retInputs = new TreeMap<String, LinkedHashMap<String, Object>>();
-		retInputs = inps;
+		TreeMap<String, LinkedHashMap<String, Object>> retInputs = inps;
 
 		//set service calls
 		CallsObj[] call = new CallsObj[0];
@@ -83,7 +82,7 @@ public class Appconfig {
 		}
 
 		//set the stream publishes
-		TreeMap<String, DmaapObj> streamSubscribes = new TreeMap<String, DmaapObj>();
+		TreeMap<String, DmaapObj> streamSubscribes = new TreeMap<>();
 
 		if(cs.getStreams().getSubscribes().length != 0) {
 			for(Subscribes s: cs.getStreams().getSubscribes()) {
@@ -110,7 +109,7 @@ public class Appconfig {
 		this.setStreams_subscribes(streamSubscribes);
 
 		//set the parameters into the appconfig
-		TreeMap<String, Object> parameters = new TreeMap<String, Object>();
+		TreeMap<String, Object> parameters = new TreeMap<>();
 		for(Parameters p: cs.getParameters()) {
 			String pName = p.getName();
 			if(p.isSourced_at_deployment()) {
@@ -119,17 +118,17 @@ public class Appconfig {
 				parameters.put(pName, paramInput);
 
 				if(!p.getValue().equals("")) {
-					LinkedHashMap<String, Object> inputs = new LinkedHashMap<String, Object>();
+					LinkedHashMap<String, Object> inputs = new LinkedHashMap<>();
 					inputs.put("type", "string");
 					inputs.put("default", p.getValue());
 					retInputs.put(pName, inputs);
 				} else {
-					LinkedHashMap<String, Object> inputs = new LinkedHashMap<String, Object>();
+					LinkedHashMap<String, Object> inputs = new LinkedHashMap<>();
 					inputs.put("type", "string");
 					retInputs.put(pName, inputs);
 				}
 			} else {
-				if(p.getType() == "string") {
+				if("string".equals(p.getType())) {
 					String val  =(String) p.getValue();
 					val = '"' + val + '"';
 					parameters.put(pName, val);
@@ -143,7 +142,7 @@ public class Appconfig {
 			GetInput ov = new GetInput();
 			ov.setBpInputName("service_component_name_override");
 			parameters.put("service_component_name_override", ov);
-			LinkedHashMap<String, Object> over = new LinkedHashMap<String, Object>();
+			LinkedHashMap<String, Object> over = new LinkedHashMap<>();
 			over.put("type", "string");
 			over.put("default", override);
 			retInputs.put("service_component_name_override", over);
-- 
cgit 1.2.3-korg