Sonar Fix- ActionHandler.java

Fixed Sonar Issues accross the file

Issue-ID: PORTAL-686
Change-Id: I12f69c75607056542758a60f045d42f51d6b1d1e
Signed-off-by: dinesha <dineshgs@in.ibm.com>
(cherry picked from commit 893bc5ef38b19b02f9ca9c4c29ecedeae2dd4c99)

diff --git a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/controller/ActionHandler.java b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/controller/ActionHandler.java
index 7e76c46..f76d58d 100644 (file)
--- a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/controller/ActionHandler.java
+++ b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/controller/ActionHandler.java
@@ -254,8 +254,8 @@ public class ActionHandler extends org.onap.portalsdk.analytics.RaptorObject {
                                        downloadLimit = Globals.getCSVDownloadLimit();
        
                                if(rr!=null && rr.getReportType().equals(AppConstants.RT_LINEAR)) {
-                                       String sql_whole = rr.getReportDataSQL(userId, downloadLimit, request);
-                                       request.setAttribute(AppConstants.RI_REPORT_SQL_WHOLE, sql_whole);
+                                       String sqlWhole = rr.getReportDataSQL(userId, downloadLimit, request);
+                                       request.setAttribute(AppConstants.RI_REPORT_SQL_WHOLE, sqlWhole);
                                } else if(rr!=null && rr.getReportType().equals(AppConstants.RT_CROSSTAB)) {
                                        rd              = rr.loadReportData(-1, userId, downloadLimit,request, false); /* TODO: should be changed to true */
                                        request.getSession().setAttribute(AppConstants.RI_REPORT_DATA, rd);
@@ -683,11 +683,11 @@ public class ActionHandler extends org.onap.portalsdk.analytics.RaptorObject {
                                        request.getSession().setAttribute(AppConstants.RI_REPORT_DATA, rd);
                                        //if (Globals.getMapAllowedYN().equals("Y") && !hideReportMap && (rr.getReportMap()!=null && rr.getReportMap().getLatColumn()!=null && rr.getReportMap().getLongColumn()!=null)) {
                                        if(rr!=null && rr.getReportType().equals(AppConstants.RT_LINEAR)) {
-                                               String sql_whole = rr.getReportDataSQL(userId, downloadLimit, request);
-                                               request.setAttribute(AppConstants.RI_REPORT_SQL_WHOLE, sql_whole);
+                                               String sqlWhole = rr.getReportDataSQL(userId, downloadLimit, request);
+                                               request.setAttribute(AppConstants.RI_REPORT_SQL_WHOLE, sqlWhole);
                                        } else if(rr.getReportType().equals(AppConstants.RT_HIVE)) {
-                                               String sql_whole = rr.getReportSQL();
-                                               request.setAttribute(AppConstants.RI_REPORT_SQL_WHOLE, sql_whole);
+                                               String sqlWhole = rr.getReportSQL();
+                                               request.setAttribute(AppConstants.RI_REPORT_SQL_WHOLE, sqlWhole);
                                        }
                                        if (!rr.getReportType().equals(AppConstants.RT_HIVE)) {
                                                long currentChartTime = System.currentTimeMillis();