Fix sonar issues in epsdk-analytics 38/88838/1
authorParshad Patel <pars.patel@samsung.com>
Thu, 30 May 2019 08:08:18 +0000 (17:08 +0900)
committerParshad Patel <pars.patel@samsung.com>
Thu, 30 May 2019 08:37:33 +0000 (17:37 +0900)
Fix Cast one of the operands of this multiplication operation to a "long"
Fix Either log or rethrow this exception
Fix Replace these toUpperCase()/toLowerCase() and equals() calls with a single equalsIgnoreCase() call
Fix Replace the type specification in this constructor call with the diamond operator ("<>")

Issue-ID: PORTAL-562
Change-Id: Ia356d705ece6528f401cf5a5a7b73843be562df3
Signed-off-by: Parshad Patel <pars.patel@samsung.com>
ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/runtime/ChartJSONHelper.java

index 0e36dd0..29cbca1 100644 (file)
@@ -80,10 +80,10 @@ public class ChartJSONHelper {
        private ReportRuntime reportRuntime;
        private String chartType;
 
-       public static final long HOUR = 3600*1000;      
-       public static final long DAY = 3600*1000*24;    
-       public static final long MONTH = 3600*1000*24*31;       
-       public static final long YEAR = 3600*1000*24*365;       
+    public static final long HOUR = 3600L * 1000L;
+    public static final long DAY = 3600L * 1000L * 24L;
+    public static final long MONTH = 3600L * 1000L * 24L * 31L;
+    public static final long YEAR = 3600L * 1000L * 24L * 365L;
        
        
        public ChartJSONHelper() {
@@ -108,138 +108,191 @@ public class ChartJSONHelper {
                this.reportRuntime = rr;
        }
        
-       public String generateJSON(String reportID, HttpServletRequest request, boolean showData) throws RaptorException {
-               //From annotations chart
-               clearReportRuntimeBackup(request);
-               
-               //HttpServletRequest request = ((ServletRequestAttributes)RequestContextHolder.currentRequestAttributes()).getRequest();
-        final Long user_id = new Long((long) UserUtils.getUserId(request));
-               //String action = request.getParameter(AppConstants.RI_ACTION);
-               //String reportID = AppUtils.getRequestValue(request, AppConstants.RI_REPORT_ID);
+    public String generateJSON(String reportID, HttpServletRequest request, boolean showData)
+            throws RaptorException {
+        // From annotations chart
+        clearReportRuntimeBackup(request);
 
-               ReportHandler rh = new ReportHandler();
-               //ReportData reportData = null;
-                HashMap<String, String> chartOptionsMap = new HashMap<String, String>();
-               try {
-                if(reportID !=null) {  
-                        reportRuntime = rh.loadReportRuntime(request, reportID, true, 1);
-                        setChartType(reportRuntime.getChartType());
-                        //reportData           = reportRuntime.loadReportData(0, user_id.toString(), 10000,request, false);
-                }
-                
-               
-                       
-                       String rotateLabelsStr = "";
-                       rotateLabelsStr = AppUtils.nvl(reportRuntime.getLegendLabelAngle());
-                       if(rotateLabelsStr.toLowerCase().equals("standard")) {
-                               rotateLabelsStr = "0";
-                       } else if (rotateLabelsStr.toLowerCase().equals("up45")) {
-                               rotateLabelsStr = "45";
-                       } else if (rotateLabelsStr.toLowerCase().equals("down45")) {
-                               rotateLabelsStr = "-45";
-                       } else if (rotateLabelsStr.toLowerCase().equals("up90")) {
-                               rotateLabelsStr = "90";
-                       } else if (rotateLabelsStr.toLowerCase().equals("down90")) {
-                               rotateLabelsStr = "-90";
-                       } else
-                               rotateLabelsStr = "0";
-                       
-                       String width                                                    = (AppUtils.getRequestNvlValue(request, "width").length()>0?AppUtils.getRequestNvlValue(request, "width"):(AppUtils.nvl(reportRuntime.getChartWidth()).length()>0?reportRuntime.getChartWidth():"700"));
-                       String height                                                   = (AppUtils.getRequestNvlValue(request, "height").length()>0?AppUtils.getRequestNvlValue(request, "height"):(AppUtils.nvl(reportRuntime.getChartHeight()).length()>0?reportRuntime.getChartHeight():"300"));
-                       String animationStr                                     = (AppUtils.getRequestNvlValue(request, "animation").length()>0?AppUtils.getRequestNvlValue(request, "animation"):new Boolean(reportRuntime.isAnimateAnimatedChart()).toString());
-                       
-                       String rotateLabels                                     = (AppUtils.getRequestNvlValue(request, "rotateLabels").length()>0?AppUtils.getRequestNvlValue(request, "rotateLabels"):(rotateLabelsStr.length()>0?rotateLabelsStr:"0"));
-                       String staggerLabelsStr                                 = (AppUtils.getRequestNvlValue(request, "staggerLabels").length()>0?AppUtils.getRequestNvlValue(request, "staggerLabels"):"false");
-                       String showMaxMinStr                                    = (AppUtils.getRequestNvlValue(request, "showMaxMin").length()>0?AppUtils.getRequestNvlValue(request, "showMaxMin"):"false");
-                       String showControlsStr                                  = (AppUtils.getRequestNvlValue(request, "showControls").length()>0?AppUtils.getRequestNvlValue(request, "showControls"):new Boolean(reportRuntime.displayBarControls()).toString());
-                       String showLegendStr                                    = (AppUtils.getRequestNvlValue(request, "showLegend").length()>0?AppUtils.getRequestNvlValue(request, "showLegend"):new Boolean(!new Boolean(reportRuntime.hideChartLegend())).toString()); 
-                       String topMarginStr                                     = AppUtils.getRequestNvlValue(request, "topMargin");
-                       String topMargin                                                = (AppUtils.nvl(topMarginStr).length()<=0)?(reportRuntime.getTopMargin()!=null?reportRuntime.getTopMargin().toString():"30"):topMarginStr;
-                       String bottomMarginStr                                  = AppUtils.getRequestNvlValue(request, "bottomMargin");
-                       String bottomMargin                                     = (AppUtils.nvl(bottomMarginStr).length()<=0)?(reportRuntime.getBottomMargin()!=null?reportRuntime.getBottomMargin().toString():"50"):bottomMarginStr;
-                       String leftMarginStr                                    = AppUtils.getRequestNvlValue(request, "leftMargin");
-                       String leftMargin                                               = (AppUtils.nvl(leftMarginStr).length()<=0)?(reportRuntime.getLeftMargin()!=null?reportRuntime.getLeftMargin().toString():"100"):leftMarginStr;
-                       String rightMarginStr                                   = AppUtils.getRequestNvlValue(request, "rightMargin");
-                       String rightMargin                                              = (AppUtils.nvl(rightMarginStr).length()<=0)?(reportRuntime.getRightMargin()!=null?reportRuntime.getRightMargin().toString():"160"):rightMarginStr;
-                       String showTitleStr                                     = (AppUtils.getRequestNvlValue(request, "showTitle").length()>0?AppUtils.getRequestNvlValue(request, "showTitle"):new Boolean(reportRuntime.displayChartTitle()).toString()); 
-                       String subType                                                  = AppUtils.getRequestNvlValue(request, "subType").length()>0?AppUtils.getRequestNvlValue(request, "subType"):(AppUtils.nvl(reportRuntime.getTimeSeriesRender()).equals("area")?reportRuntime.getTimeSeriesRender():"");
-                       String stackedStr                                               = AppUtils.getRequestNvlValue(request, "stacked").length()>0?AppUtils.getRequestNvlValue(request, "stacked"):new Boolean(reportRuntime.isChartStacked()).toString();
-                       String horizontalBar                                    = AppUtils.getRequestNvlValue(request, "horizontalBar").length()>0?AppUtils.getRequestNvlValue(request, "horizontalBar"):new Boolean(reportRuntime.isHorizontalOrientation()).toString();
-                       String barRealTimeAxis                                  = AppUtils.getRequestNvlValue(request, "barRealTimeAxis");
-                       String barReduceXAxisLabels                             = AppUtils.getRequestNvlValue(request, "barReduceXAxisLabels").length()>0?AppUtils.getRequestNvlValue(request, "barReduceXAxisLabels"):new Boolean(reportRuntime.isLessXaxisTickers()).toString();;
-                       String timeAxis                                                 = AppUtils.getRequestNvlValue(request, "timeAxis").length()>0?AppUtils.getRequestNvlValue(request, "timeAxis"):new Boolean(reportRuntime.isTimeAxis()).toString();
-                       String logScale                                                 = AppUtils.getRequestNvlValue(request, "logScale").length()>0?AppUtils.getRequestNvlValue(request, "logScale"):new Boolean(reportRuntime.isLogScale()).toString();
-                       String precision                                                = AppUtils.getRequestNvlValue(request, "precision").length()>0?AppUtils.getRequestNvlValue(request, "precision"):"2";
-                       
+        ReportHandler rh = new ReportHandler();
 
-                       chartOptionsMap.put("width", width);
-                       chartOptionsMap.put("height", height);
-                       chartOptionsMap.put("animation", animationStr);
-                       chartOptionsMap.put("rotateLabels", rotateLabels);
-                       chartOptionsMap.put("staggerLabels", staggerLabelsStr);
-                       chartOptionsMap.put("showMaxMin", showMaxMinStr);
-                       chartOptionsMap.put("showControls", showControlsStr);
-                       chartOptionsMap.put("showLegend", showLegendStr);
-                       chartOptionsMap.put("topMargin", topMargin);
-                       chartOptionsMap.put("bottomMargin", bottomMargin);
-                       chartOptionsMap.put("leftMargin", leftMargin);
-                       chartOptionsMap.put("rightMargin", rightMargin);
-                       chartOptionsMap.put("showTitle", showTitleStr);
-                       chartOptionsMap.put("subType", subType);
-                       chartOptionsMap.put("stacked", stackedStr);
-                       chartOptionsMap.put("horizontalBar", horizontalBar);
-                       chartOptionsMap.put("timeAxis", timeAxis);
-                       chartOptionsMap.put("barRealTimeAxis", barRealTimeAxis);
-                       chartOptionsMap.put("barReduceXAxisLabels", barReduceXAxisLabels);
-                       
-                       chartOptionsMap.put("logScale", logScale);
-                       chartOptionsMap.put("precision", precision);
-                       
-               
-               } catch (RaptorException ex) {
-                       ex.printStackTrace();
-               }
-               return generateJSON(reportRuntime, chartOptionsMap, request, showData);
-       }
+        HashMap<String, String> chartOptionsMap = new HashMap<>();
+
+        try {
+            if (reportID != null) {
+                reportRuntime = rh.loadReportRuntime(request, reportID, true, 1);
+                setChartType(reportRuntime.getChartType());
+            }
+
+            String rotateLabelsStr = "";
+            rotateLabelsStr = AppUtils.nvl(reportRuntime.getLegendLabelAngle());
+            if (rotateLabelsStr.equalsIgnoreCase("standard")) {
+                rotateLabelsStr = "0";
+            } else if (rotateLabelsStr.equalsIgnoreCase("up45")) {
+                rotateLabelsStr = "45";
+            } else if (rotateLabelsStr.equalsIgnoreCase("down45")) {
+                rotateLabelsStr = "-45";
+            } else if (rotateLabelsStr.equalsIgnoreCase("up90")) {
+                rotateLabelsStr = "90";
+            } else if (rotateLabelsStr.equalsIgnoreCase("down90")) {
+                rotateLabelsStr = "-90";
+            } else
+                rotateLabelsStr = "0";
+
+            String width = (AppUtils.getRequestNvlValue(request, "width").length() > 0
+                    ? AppUtils.getRequestNvlValue(request, "width")
+                    : (AppUtils.nvl(reportRuntime.getChartWidth()).length() > 0
+                            ? reportRuntime.getChartWidth()
+                            : "700"));
+            String height = (AppUtils.getRequestNvlValue(request, "height").length() > 0
+                    ? AppUtils.getRequestNvlValue(request, "height")
+                    : (AppUtils.nvl(reportRuntime.getChartHeight()).length() > 0
+                            ? reportRuntime.getChartHeight()
+                            : "300"));
+            String animationStr = (AppUtils.getRequestNvlValue(request, "animation").length() > 0
+                    ? AppUtils.getRequestNvlValue(request, "animation")
+                    : new Boolean(reportRuntime.isAnimateAnimatedChart()).toString());
+
+            String rotateLabels = (AppUtils.getRequestNvlValue(request, "rotateLabels").length() > 0
+                    ? AppUtils.getRequestNvlValue(request, "rotateLabels")
+                    : (rotateLabelsStr.length() > 0 ? rotateLabelsStr : "0"));
+            String staggerLabelsStr =
+                    (AppUtils.getRequestNvlValue(request, "staggerLabels").length() > 0
+                            ? AppUtils.getRequestNvlValue(request, "staggerLabels")
+                            : "false");
+            String showMaxMinStr = (AppUtils.getRequestNvlValue(request, "showMaxMin").length() > 0
+                    ? AppUtils.getRequestNvlValue(request, "showMaxMin")
+                    : "false");
+            String showControlsStr =
+                    (AppUtils.getRequestNvlValue(request, "showControls").length() > 0
+                            ? AppUtils.getRequestNvlValue(request, "showControls")
+                            : new Boolean(reportRuntime.displayBarControls()).toString());
+            String showLegendStr = (AppUtils.getRequestNvlValue(request, "showLegend").length() > 0
+                    ? AppUtils.getRequestNvlValue(request, "showLegend")
+                    : new Boolean(!new Boolean(reportRuntime.hideChartLegend())).toString());
+            String topMarginStr = AppUtils.getRequestNvlValue(request, "topMargin");
+            String topMargin = (AppUtils.nvl(topMarginStr).length() <= 0)
+                    ? (reportRuntime.getTopMargin() != null
+                            ? reportRuntime.getTopMargin().toString()
+                            : "30")
+                    : topMarginStr;
+            String bottomMarginStr = AppUtils.getRequestNvlValue(request, "bottomMargin");
+            String bottomMargin = (AppUtils.nvl(bottomMarginStr).length() <= 0)
+                    ? (reportRuntime.getBottomMargin() != null
+                            ? reportRuntime.getBottomMargin().toString()
+                            : "50")
+                    : bottomMarginStr;
+            String leftMarginStr = AppUtils.getRequestNvlValue(request, "leftMargin");
+            String leftMargin = (AppUtils.nvl(leftMarginStr).length() <= 0)
+                    ? (reportRuntime.getLeftMargin() != null
+                            ? reportRuntime.getLeftMargin().toString()
+                            : "100")
+                    : leftMarginStr;
+            String rightMarginStr = AppUtils.getRequestNvlValue(request, "rightMargin");
+            String rightMargin = (AppUtils.nvl(rightMarginStr).length() <= 0)
+                    ? (reportRuntime.getRightMargin() != null
+                            ? reportRuntime.getRightMargin().toString()
+                            : "160")
+                    : rightMarginStr;
+            String showTitleStr = (AppUtils.getRequestNvlValue(request, "showTitle").length() > 0
+                    ? AppUtils.getRequestNvlValue(request, "showTitle")
+                    : new Boolean(reportRuntime.displayChartTitle()).toString());
+            String subType = AppUtils.getRequestNvlValue(request, "subType").length() > 0
+                    ? AppUtils.getRequestNvlValue(request, "subType")
+                    : (AppUtils.nvl(reportRuntime.getTimeSeriesRender()).equals("area")
+                            ? reportRuntime.getTimeSeriesRender()
+                            : "");
+            String stackedStr = AppUtils.getRequestNvlValue(request, "stacked").length() > 0
+                    ? AppUtils.getRequestNvlValue(request, "stacked")
+                    : new Boolean(reportRuntime.isChartStacked()).toString();
+            String horizontalBar =
+                    AppUtils.getRequestNvlValue(request, "horizontalBar").length() > 0
+                            ? AppUtils.getRequestNvlValue(request, "horizontalBar")
+                            : new Boolean(reportRuntime.isHorizontalOrientation()).toString();
+            String barRealTimeAxis = AppUtils.getRequestNvlValue(request, "barRealTimeAxis");
+            String barReduceXAxisLabels =
+                    AppUtils.getRequestNvlValue(request, "barReduceXAxisLabels").length() > 0
+                            ? AppUtils.getRequestNvlValue(request, "barReduceXAxisLabels")
+                            : new Boolean(reportRuntime.isLessXaxisTickers()).toString();;
+            String timeAxis = AppUtils.getRequestNvlValue(request, "timeAxis").length() > 0
+                    ? AppUtils.getRequestNvlValue(request, "timeAxis")
+                    : new Boolean(reportRuntime.isTimeAxis()).toString();
+            String logScale = AppUtils.getRequestNvlValue(request, "logScale").length() > 0
+                    ? AppUtils.getRequestNvlValue(request, "logScale")
+                    : new Boolean(reportRuntime.isLogScale()).toString();
+            String precision = AppUtils.getRequestNvlValue(request, "precision").length() > 0
+                    ? AppUtils.getRequestNvlValue(request, "precision")
+                    : "2";
+
+
+            chartOptionsMap.put("width", width);
+            chartOptionsMap.put("height", height);
+            chartOptionsMap.put("animation", animationStr);
+            chartOptionsMap.put("rotateLabels", rotateLabels);
+            chartOptionsMap.put("staggerLabels", staggerLabelsStr);
+            chartOptionsMap.put("showMaxMin", showMaxMinStr);
+            chartOptionsMap.put("showControls", showControlsStr);
+            chartOptionsMap.put("showLegend", showLegendStr);
+            chartOptionsMap.put("topMargin", topMargin);
+            chartOptionsMap.put("bottomMargin", bottomMargin);
+            chartOptionsMap.put("leftMargin", leftMargin);
+            chartOptionsMap.put("rightMargin", rightMargin);
+            chartOptionsMap.put("showTitle", showTitleStr);
+            chartOptionsMap.put("subType", subType);
+            chartOptionsMap.put("stacked", stackedStr);
+            chartOptionsMap.put("horizontalBar", horizontalBar);
+            chartOptionsMap.put("timeAxis", timeAxis);
+            chartOptionsMap.put("barRealTimeAxis", barRealTimeAxis);
+            chartOptionsMap.put("barReduceXAxisLabels", barReduceXAxisLabels);
+
+            chartOptionsMap.put("logScale", logScale);
+            chartOptionsMap.put("precision", precision);
+
+
+        } catch (RaptorException ex) {
+            logger.error("Exception in generateJSON", ex);
+        }
+        return generateJSON(reportRuntime, chartOptionsMap, request, showData);
+    }
        
        public String generateJSON(ReportRuntime reportRuntime, HttpServletRequest request, boolean showData) throws RaptorException {
                
                String rotateLabelsStr = "";
                rotateLabelsStr = AppUtils.nvl(reportRuntime.getLegendLabelAngle());
-               if(rotateLabelsStr.toLowerCase().equals("standard")) {
-                       rotateLabelsStr = "0";
-               } else if (rotateLabelsStr.toLowerCase().equals("up45")) {
-                       rotateLabelsStr = "45";
-               } else if (rotateLabelsStr.toLowerCase().equals("down45")) {
-                       rotateLabelsStr = "-45";
-               } else if (rotateLabelsStr.toLowerCase().equals("up90")) {
-                       rotateLabelsStr = "90";
-               } else if (rotateLabelsStr.toLowerCase().equals("down90")) {
-                       rotateLabelsStr = "-90";
-               } else
-                       rotateLabelsStr = "0";
+        if (rotateLabelsStr.equalsIgnoreCase("standard")) {
+            rotateLabelsStr = "0";
+        } else if (rotateLabelsStr.equalsIgnoreCase("up45")) {
+            rotateLabelsStr = "45";
+        } else if (rotateLabelsStr.equalsIgnoreCase("down45")) {
+            rotateLabelsStr = "-45";
+        } else if (rotateLabelsStr.equalsIgnoreCase("up90")) {
+            rotateLabelsStr = "90";
+        } else if (rotateLabelsStr.equalsIgnoreCase("down90")) {
+            rotateLabelsStr = "-90";
+        } else {
+            rotateLabelsStr = "0";
+        }
                
-               HashMap<String,String> chartOptionsMap = new HashMap<String, String>();
+               HashMap<String,String> chartOptionsMap = new HashMap<>();
                chartOptionsMap.put("width", reportRuntime.getChartWidth());
                chartOptionsMap.put("height", reportRuntime.getChartHeight());
-               chartOptionsMap.put("animation", new Boolean(reportRuntime.isAnimateAnimatedChart()).toString());
+               chartOptionsMap.put("animation", Boolean.toString(reportRuntime.isAnimateAnimatedChart()));
                chartOptionsMap.put("rotateLabels", rotateLabelsStr);
                chartOptionsMap.put("staggerLabels", "false");
                chartOptionsMap.put("showMaxMin", "false");
-               chartOptionsMap.put("showControls", new Boolean(reportRuntime.displayBarControls()).toString());
-               chartOptionsMap.put("showLegend", new Boolean(!reportRuntime.hideChartLegend()).toString());
+               chartOptionsMap.put("showControls", Boolean.toString(reportRuntime.displayBarControls()));
+               chartOptionsMap.put("showLegend", Boolean.toString(!reportRuntime.hideChartLegend()));
                chartOptionsMap.put("topMargin", reportRuntime.getTopMargin()!=null?reportRuntime.getTopMargin().toString():"30");
                chartOptionsMap.put("bottomMargin", reportRuntime.getBottomMargin()!=null?reportRuntime.getBottomMargin().toString():"50");
                chartOptionsMap.put("leftMargin", reportRuntime.getLeftMargin()!=null?reportRuntime.getLeftMargin().toString():"100");
                chartOptionsMap.put("rightMargin", reportRuntime.getRightMargin()!=null?reportRuntime.getRightMargin().toString():"160");
-               chartOptionsMap.put("showTitle", new Boolean(reportRuntime.displayChartTitle()).toString());
+               chartOptionsMap.put("showTitle", Boolean.toString(reportRuntime.displayChartTitle()));
                chartOptionsMap.put("subType", (AppUtils.nvl(reportRuntime.getTimeSeriesRender()).equals("area")?reportRuntime.getTimeSeriesRender():""));
-               chartOptionsMap.put("stacked", new Boolean(reportRuntime.isChartStacked()).toString());
-               chartOptionsMap.put("horizontalBar", new Boolean(reportRuntime.isHorizontalOrientation()).toString());
-               chartOptionsMap.put("timeAxis", new Boolean(reportRuntime.isTimeAxis()).toString());
-               chartOptionsMap.put("barReduceXAxisLabels", new Boolean(reportRuntime.isLessXaxisTickers()).toString());
+               chartOptionsMap.put("stacked", Boolean.toString(reportRuntime.isChartStacked()));
+               chartOptionsMap.put("horizontalBar", Boolean.toString(reportRuntime.isHorizontalOrientation()));
+               chartOptionsMap.put("timeAxis", Boolean.toString(reportRuntime.isTimeAxis()));
+               chartOptionsMap.put("barReduceXAxisLabels", Boolean.toString(reportRuntime.isLessXaxisTickers()));
 
-               chartOptionsMap.put("logScale", new Boolean(reportRuntime.isLogScale()).toString());
+               chartOptionsMap.put("logScale", Boolean.toString(reportRuntime.isLogScale()));
                chartOptionsMap.put("precision", "2");
                
 
@@ -247,7 +300,7 @@ public class ChartJSONHelper {
                return generateJSON(reportRuntime, chartOptionsMap, request, showData);
        }
        
-       public String generateJSON(ReportRuntime reportRuntime, HashMap<String,String> chartOptionsMap, HttpServletRequest request, boolean showData) throws RaptorException {
+       public String generateJSON(ReportRuntime reportRuntime,Map<String, String> chartOptionsMap, HttpServletRequest request, boolean showData) throws RaptorException {
                
                //String width, String height, boolean animation, String rotateLabels, boolean staggerLabels, boolean showMaxMin, boolean showLegend, boolean showControls, String topMargin, String bottomMargin, boolean showTitle, String subType
                String userId = AppUtils.getUserID(request);
@@ -375,97 +428,6 @@ public class ChartJSONHelper {
                                        chartColumnJSONList.add(ccJSON);
                                }
                                chartJSON.setChartColumnJSONList(chartColumnJSONList);
-                               /* setting formfields show only showForm got triggered*/
-                               /*ArrayList<IdNameValue> formFieldValues = new ArrayList<IdNameValue>();
-                               ArrayList<FormFieldJSON> formFieldJSONList = new ArrayList<FormFieldJSON>();
-                               if(reportRuntime.getReportFormFields()!=null) {
-                                       formFieldJSONList = new ArrayList<FormFieldJSON>(reportRuntime.getReportFormFields().size());
-                               for (Iterator iter = reportRuntime.getReportFormFields().iterator(); iter.hasNext();) {
-                                       formFieldValues = new ArrayList<IdNameValue>();
-                                       FormField ff = (FormField) iter.next();
-                                       ff.setDbInfo(reportRuntime.getDbInfo());
-                                       FormFieldJSON ffJSON = new FormFieldJSON();
-                                       ffJSON.setFieldId(ff.getFieldName());
-                                       ffJSON.setFieldType(ff.getFieldType());
-                                       ffJSON.setFieldDisplayName(ff.getFieldDisplayName());
-                                       ffJSON.setHelpText(ff.getHelpText());
-                                       ffJSON.setValidationType(ff.getValidationType());
-                                       //ffJSON.setTriggerOtherFormFields(ff.getDependsOn());
-                                       IdNameList lookup =  null;
-                                       lookup = ff.getLookupList();
-                                       String selectedValue = "";
-                                       String oldSQL = "";
-                                       IdNameList lookupList = null;
-                                       boolean readOnly = false;
-                                       if(lookup!=null) {
-                                                       if(!ff.hasPredefinedList) {
-                                                                       IdNameSql lu = (IdNameSql) lookup;
-                                                               String SQL = lu.getSql();
-                                                               oldSQL = lu.getSql();
-                                                               reportRuntime.setTriggerFormFieldCheck( reportRuntime.getReportFormFields(), ff);
-                                               ffJSON.setTriggerOtherFormFields(ff.isTriggerOtherFormFields());
-                                                               SQL = reportRuntime.parseAndFillReq_Session_UserValues(request, SQL, userId);
-                                                               SQL = reportRuntime.parseAndFillWithCurrentValues(request, SQL, ff);
-                                                               String defaultSQL = lu.getDefaultSQL();
-                                                               defaultSQL = reportRuntime.parseAndFillReq_Session_UserValues(request, defaultSQL, userId);
-                                                               defaultSQL = reportRuntime.parseAndFillWithCurrentValues(request, SQL, ff);
-                                                               lookup = new IdNameSql(-1,SQL,defaultSQL);
-                                                               
-                                                               lookupList = lookup;
-                                                   try {
-                                                       lookup.loadUserData(0, "", ff.getDbInfo(), ff.getUserId());
-                                                   } catch (Exception e ){ e.printStackTrace(); //throw new RaptorRuntimeException(e);
-                                                               }
-                                               }
-                                               lookup.trimToSize();
-                               
-                                               String[] requestValue = request.getParameterValues(ff.getFieldName());
-                                               
-                                               if(lookup != null  && lookup.size() > 0) { 
-                                               for (lookup.resetNext(); lookup.hasNext();) {
-                                                       IdNameValue value = lookup.getNext();
-                                                       readOnly = value.isReadOnly();
-                                                       if(requestValue != null && Arrays.asList(requestValue).contains(value.getId())) { 
-                                                               //if(value.getId().equals(requestValue))
-                                                                value.setDefaultValue(true);
-                                                       }
-                                                       if(!(ff.getFieldType().equals(FormField.FFT_CHECK_BOX) || ff.getFieldType().equals(FormField.FFT_COMBO_BOX) || ff.getFieldType().equals(FormField.FFT_LIST_BOX)
-                                                                       || ff.getFieldType().equals(FormField.FFT_LIST_MULTI)) && value.isDefaultValue())
-                                                               formFieldValues.add(value);
-                                                       else if(ff.getFieldType().equals(FormField.FFT_CHECK_BOX) || ff.getFieldType().equals(FormField.FFT_COMBO_BOX) || ff.getFieldType().equals(FormField.FFT_LIST_BOX)
-                                                                       || ff.getFieldType().equals(FormField.FFT_LIST_MULTI)) {
-                                                               formFieldValues.add(value);
-                                                       }
-                                                       //break;
-                                               }
-                                               } else {
-                                                       if(requestValue!=null && requestValue.length>0) {
-                                                               IdNameValue value = new IdNameValue(requestValue[0], requestValue[0], true, false);
-                                                               formFieldValues.add(value);
-                                                       }
-                                               }
-                               
-                                       } else {
-                                               String[] requestValue = request.getParameterValues(ff.getFieldName());
-                                               if(requestValue!=null && requestValue.length>0) {
-                                                       IdNameValue value = new IdNameValue(requestValue[0], requestValue[0], true, false);
-                                                       formFieldValues.add(value);
-                                               }
-                                       }
-                               if(!ff.hasPredefinedList) {
-                           if(oldSQL != null && !oldSQL.equals("")) {
-                               ((IdNameSql)lookup).setSQL(oldSQL);
-                           }
-                               }
-                               
-                               
-                               
-                                       ffJSON.setFormFieldValues(formFieldValues);
-                                       formFieldJSONList.add(ffJSON);
-                               } // for
-                         }
-                               chartJSON.setFormFieldList(formFieldJSONList);
-                               chartJSON.setChartSqlWhole(sql);*/
                                chartJSON.setChartAvailable(displayChart);
                                
                                ChartTypeJSON chartTypeJSON = new ChartTypeJSON();
@@ -687,7 +649,7 @@ public class ChartJSONHelper {
                }
                
                public boolean getFlagInBoolean(String s) {
-                       return nvl(s).toUpperCase().startsWith("Y") || nvl(s).toLowerCase().equals("true");
+                       return nvl(s).toUpperCase().startsWith("Y") || nvl(s).equalsIgnoreCase("true");
                }
                
                public DataSet loadChartData(String userId, HttpServletRequest request) throws RaptorException {