Merge "code smells removed"

1 files changed, 7 insertions, 7 deletions

diff --git a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/runtime/ChartD3Helper.java b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/runtime/ChartD3Helper.java
index 52077aa8..72769e3f 100644
--- a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/runtime/ChartD3Helper.java
+++ b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/runtime/ChartD3Helper.java
@@ -393,7 +393,7 @@ public class ChartD3Helper {
 					}	
 					
 					// added to load all date elements
-					HashMap<String, HashMap<String, String>> dataSeriesMap = new HashMap<String, HashMap<String, String>>();
+					HashMap<String, HashMap<String, String>> dataSeriesMap = new HashMap<>();
 					
 					for (int i = 0; i < uniqueElements.length; i++) {
 						if(multipleSeries && (nvl(chartRightAxisLabel).length() > 0))
@@ -427,9 +427,9 @@ public class ChartD3Helper {
 					
 					int formatFlag = 0;
 			        
-			        TreeSet<String> dateStrList = new TreeSet<String>();
+			        TreeSet<String> dateStrList = new TreeSet<>();
 			        // added to store all date elements 
-					SortedSet<String> sortSet = new TreeSet<String>();
+					SortedSet<String> sortSet = new TreeSet<>();
 			        int count = 0;
 					if(flag!= 1) {
 						HashMap dataSeriesStrMap = new HashMap();
@@ -780,7 +780,7 @@ public class ChartD3Helper {
 					 for (int i = 0; i < uniqueElements.length; i++) {
 						 HashMap<String, String> dataMap = dataSeriesMap.get((String)uniqueElements[i]);
 						 Set<String> keySet = dataMap.keySet();
-						 ArrayList<String> keySortedList = new ArrayList<String>(new TreeSet<String>(keySet));
+						 ArrayList<String> keySortedList = new ArrayList<>(new TreeSet<String>(keySet));
 						 
 						 for (int k=0; k < keySortedList.size(); k++) {
 							 valueStr = dataSeriesMap.get((String)uniqueElements[i]).get(keySortedList.get(k));
@@ -1723,7 +1723,7 @@ public class ChartD3Helper {
 					 double value = 0;
 					 int flagNull = 0;
 					 String COLOR = "";
-					 TreeSet<String> colorList = new TreeSet<String>();
+					 TreeSet<String> colorList = new TreeSet<>();
 					 for (int i = 0; i < ds.getRowCount(); i++) {
 						 value = 0;
 						 try {
@@ -1845,9 +1845,9 @@ public class ChartD3Helper {
 					
 					int formatFlag = 0;
 			        
-			        TreeSet<String> dateStrList = new TreeSet<String>();
+			        TreeSet<String> dateStrList = new TreeSet<>();
 			        // added to store all date elements 
-					SortedSet<String> sortSet = new TreeSet<String>();
+					SortedSet<String> sortSet = new TreeSet<>();
 			        int count = 0;
 			        
 			        int flag = 0;