From e22eec55bf0815dd1c303ac5fb1c6e6f211a70f0 Mon Sep 17 00:00:00 2001
From: "Christopher Lott (cl778h)" <clott@research.att.com>
Date: Wed, 25 Oct 2017 09:55:06 -0400
Subject: Repair security filters

Revise app web.xml to remove typo in Java package name.
Also drop unneeded test class.

Issue: PORTAL-135
Change-Id: I49662928c5eed38520e9a9c5f839385148aef0fa
Signed-off-by: Christopher Lott (cl778h) <clott@research.att.com>
---
 .../analytics/model/runtime/ChartD3Helper.java         | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/runtime/ChartD3Helper.java')

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 1a8da8d0..f5c641a4 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
@@ -61,6 +61,7 @@ import java.util.regex.Pattern;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpSession;
 
+import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.time.DateUtils;
 import org.onap.portalsdk.analytics.error.RaptorException;
 import org.onap.portalsdk.analytics.model.ReportHandler;
@@ -1932,29 +1933,28 @@ public class ChartD3Helper {
 					wholeScript.append("<script> \n");
 
 					wholeScript.append("historicalBarChart = [ \n");
-					 double TOTAL = 0;
-					 double VALUE = 0;
+					 double total = 0;
+					 double value = 0;
 					 int flagNull = 0;
-					 String KEY = "";
 					 String COLOR = "";
 					 TreeSet<String> colorList = new TreeSet<String>();
 					 for (int i = 0; i < ds.getRowCount(); i++) {
-						 VALUE = 0;
+						 value = 0;
 						 try {
-						  VALUE = Double.parseDouble(ds.getString(i, 2));
-						  TOTAL = TOTAL+VALUE;
+							 value = Double.parseDouble(ds.getString(i, 2));
+						  total = total+value;
 						 } catch (NumberFormatException ex) {
 							 flagNull = 1;
 						 }
-						 KEY = ds.getString(i, 0);
+						 String key = ds.getString(i, 0);
 						 try {
 							 if(ds.getString(i, "chart_color")!=null) {
-								 colorList.add(KEY+"|"+ds.getString(i,  "chart_color"));					 
+								 colorList.add(key+"|"+ds.getString(i,  "chart_color"));					 
 							 }
 						 } catch (ArrayIndexOutOfBoundsException ex) {
 							 //System.out.println("No Chart Color");
 						 }
-						 wholeScript.append("{ \""+ "key" +"\":\""+ KEY+"\", \""+ "y" +"\":"+VALUE+"}, \n");
+						 wholeScript.append("{ \""+ "key" +"\":\""+ key+"\", \""+ "y" +"\":"+value+"}, \n");
 						 
 					 }
 					 StringBuffer color = new StringBuffer("");
-- 
cgit 1.2.3-korg