Merge "Fix sonar issues (part) in WizardProcessor"

1 files changed, 6 insertions, 97 deletions

diff --git a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/controller/WizardProcessor.java b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/controller/WizardProcessor.java
index f0829d29..bd8d778e 100644
--- a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/controller/WizardProcessor.java
+++ b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/controller/WizardProcessor.java
@@ -376,12 +376,7 @@ public class WizardProcessor extends org.onap.portalsdk.analytics.RaptorObject {
 			rdef.setDataContainerWidth(dataContainerWidth);
 			rdef.setAllowSchedule(isAllowSchedule?"Y":"N");
 
-
-  		    reportUpdated = true;
-
-
-			if (rdef.getWizardSequence() instanceof WizardSequence)
-				rdef.generateWizardSequence(request);
+			rdef.generateWizardSequence(request);
 
 		} else {
 
@@ -412,22 +407,17 @@ public class WizardProcessor extends org.onap.portalsdk.analytics.RaptorObject {
 			else
 				rdef.setEmptyMessage("");
 			String formHelp = XSSFilter.filterRequestOnlyScript(AppUtils.getRequestNvlValue(request, "formHelp"));
-			//String rDashboardType = nvl(AppUtils.getRequestValue(request, "showDashboardOptions"), "N");
-			//rdef.setDashboardType(rDashboardType.equals("Y"));
-			int excelDownloadSize =  500;
-			try {
-				excelDownloadSize = Integer.parseInt(AppUtils.getRequestValue(request, "excelDownloadSize"));
-			} catch (NumberFormatException ex) {}
+
 			if(AppUtils.getRequestNvlValue(request, "excelDownloadSize").length()>0)
 			 rdef.setMaxRowsInExcelDownload(Integer.parseInt(AppUtils.getRequestValue(request, "excelDownloadSize")));
 			if(AppUtils.getRequestNvlValue(request, "reportInNewWindow").length()>0)
-				reportsInNewWindow = AppUtils.getRequestNvlValue(request,"reportInNewWindow").equals("Y");
+				reportsInNewWindow = "Y".equals(AppUtils.getRequestNvlValue(request,"reportInNewWindow"));
 			if(AppUtils.getRequestNvlValue(request, "hideFormFieldsAfterRun").length()>0)
-				hideFormFieldAfterRun = AppUtils.getRequestNvlValue(request,"hideFormFieldsAfterRun").equals("Y");
+				hideFormFieldAfterRun = "Y".equals(AppUtils.getRequestNvlValue(request,"hideFormFieldsAfterRun"));
 
 
 			if(AppUtils.getRequestNvlValue(request, "displayFolderTree").length()>0)
-				rdef.setDisplayFolderTree(AppUtils.getRequestNvlValue(request,"displayFolderTree").equals("Y"));
+				rdef.setDisplayFolderTree("Y".equals(AppUtils.getRequestNvlValue(request,"displayFolderTree")));
 			else
 				rdef.setDisplayFolderTree(false);
 			String dataSource = AppUtils.getRequestNvlValue(request, "dataSource");
@@ -457,11 +447,7 @@ public class WizardProcessor extends org.onap.portalsdk.analytics.RaptorObject {
 			if (menuIDs != null)
 				for (int i = 0; i < menuIDs.length; i++)
 					menuID += (menuID.length() == 0 ? "" : "|") + menuIDs[i];
-		/*	else
-				menuID = "";*/
 
-//			boolean additionalFieldsShown = AppUtils.getRequestNvlValue(request,
-//					"additionalFieldsShown").equals("Y");
 			boolean rRCSDisabled = AppUtils.getRequestNvlValue(request, "runtimeColSortDisabled").equals("Y");
 			String reportDefType = AppUtils.getRequestNvlValue(request, "reportDefType");
 			String dataContainerHeight = nvl(AppUtils.getRequestValue(request, "heightContainer"), "auto");
@@ -474,10 +460,6 @@ public class WizardProcessor extends org.onap.portalsdk.analytics.RaptorObject {
 					+ nvl(AppUtils.getRequestValue(request, "hideMap"), "N")
 					+ nvl(AppUtils.getRequestValue(request, "hideExcelIcons"), "N")
 					+ nvl(AppUtils.getRequestValue(request, "hidePDFIcons"), "N");
-/*			StringBuffer dashboardOptions = new StringBuffer("");
-			dashboardOptions.append((nvl(AppUtils.getRequestValue(request, "hide"),"chart").equals("chart"))?"Y":"N");
-			dashboardOptions.append((nvl(AppUtils.getRequestValue(request, "hide"),"").equals("data"))?"Y":"N");
-			dashboardOptions.append((nvl(AppUtils.getRequestValue(request, "hideBtns"),"").equals("Y"))?"Y":"N");*/
 
 			String numFormCols = nvl(AppUtils.getRequestValue(request, "numFormCols"), "1");
 			String reportTitle = XSSFilter.filterRequestOnlyScript(AppUtils.getRequestNvlValue(request, "reportTitle"));
@@ -492,64 +474,6 @@ public class WizardProcessor extends org.onap.portalsdk.analytics.RaptorObject {
 
 			}
 
-/*			reportUpdated = (!(reportName.equals(nvl(rdef.getReportName()))))
-					&& (!(reportDescr.equals(nvl(rdef.getReportDescr()))))
-					&& (!(formHelp.equals(nvl(rdef.getFormHelpText()))))
-					&& (!(reportType.equals(nvl(rdef.getReportType()))))
-					&& (pageSize != rdef.getPageSize()) &&
-					// rPublic.equals(rdef.isPublic()?"Y":"N")&&
-					(!(menuID.equals(nvl(rdef.getMenuID()))))
-					&& (!(rApproved.equals(rdef.isMenuApproved()))) && (additionalFieldsShown ? ((!(rRCSDisabled
-					.equals(rdef.isRuntimeColSortDisabled())))
-					&& (!(displayOptions.equals(nvl(rdef.getDisplayOptions()))))
-					&& (!(dashboardOptions.equals(nvl(rdef.getDashboardOptions()))))
-					&& (!(numFormCols.equals(nvl(rdef.getNumFormCols()))))
-					&& (!(reportTitle.equals(nvl(rdef.getReportTitle()))))
-					&& (!(reportSubTitle.equals(nvl(rdef.getReportSubTitle()))))
-					&& (!(reportHeader.equals(nvl(rdef.getReportHeader())))) && (!(reportFooter
-					.equals(nvl(rdef.getReportFooter()))))&& (reportsInNewWindow != rdef.isReportInNewWindow())):true);
-*/
-/*			reportUpdated = rRCSDisabled ==(rdef.isRuntimeColSortDisabled()
-					&& displayOptions.equals(nvl(rdef.getDisplayOptions()))
-					//&& dashboardOptions.equals(nvl(rdef.getDashboardOptions()))
-					&& numFormCols.equals(nvl(rdef.getNumFormCols()))
-					&& reportTitle.equals(nvl(rdef.getReportTitle()))
-					&& reportSubTitle.equals(nvl(rdef.getReportSubTitle()))
-					&& reportHeader.equals(nvl(rdef.getReportHeader()))
-					&& reportsInNewWindow == rdef.isReportInNewWindow()
-					&& reportFooter.equals(nvl(rdef.getReportFooter())))
-					;*/
-
-
-			/*reportUpdated = (!(reportName.equals(nvl(rdef.getReportName()))
-					&& reportDescr.equals(nvl(rdef.getReportDescr()))
-					&& formHelp.equals(nvl(rdef.getFormHelpText()))
-					&& reportType.equals(nvl(rdef.getReportType()))
-					&& (pageSize == rdef.getPageSize())
-					&& excelDownloadSize == rdef.getMaxRowsInExcelDownload()
-					&& reportsInNewWindow == rdef.isReportInNewWindow()
-					&& displayOptions.equals(rdef.getDisplayOptions())
-					&& dataContainerHeight.equals(rdef.getDataContainerHeight())
-					&& dataContainerWidth.equals(rdef.getDataContainerWidth())
-					&& (isAllowSchedule ==(rdef.isAllowSchedule()))
-					// rPublic.equals(rdef.isPublic()?"Y":"N")&&
-					&& menuID.equals(nvl(rdef.getMenuID()))
-					&& rApproved.equals(rdef.isMenuApproved() ? "Y" : "N") && (rRCSDisabled
-					== ((rdef.isRuntimeColSortDisabled())
-					&& displayOptions.equals(nvl(rdef.getDisplayOptions()))
-					//&& dashboardOptions.equals(nvl(rdef.getDashboardOptions()))
-					&& numFormCols.equals(nvl(rdef.getNumFormCols()))
-					&& reportTitle.equals(nvl(rdef.getReportTitle()))
-					&& reportSubTitle.equals(nvl(rdef.getReportSubTitle()))
-					&& isOneTimeScheduleAllowed.equals(nvl(rdef.getIsOneTimeScheduleAllowed()))
-                    && isHourlyScheduleAllowed.equals(nvl(rdef.getIsHourlyScheduleAllowed()))
-                    && isDailyScheduleAllowed.equals(nvl(rdef.getIsDailyScheduleAllowed()))
-                    && isDailyMFScheduleAllowed.equals(nvl(rdef.getIsDailyMFScheduleAllowed()))
-                    && isWeeklyScheduleAllowed.equals(nvl(rdef.getIsWeeklyScheduleAllowed()))
-                    && isMonthlyScheduleAllowed.equals(nvl(rdef.getIsMonthlyScheduleAllowed()))
-                    && reportHeader.equals(nvl(rdef.getReportHeader())) && reportFooter
-					.equals(nvl(rdef.getReportFooter()))))
-					));	*/
 			rdef.setReportName(reportName);
 			rdef.setReportDescr(reportDescr);
 			rdef.setFormHelpText(formHelp);
@@ -564,14 +488,11 @@ public class WizardProcessor extends org.onap.portalsdk.analytics.RaptorObject {
 			rdef.setMultiGroupColumn(isColumnGroup?"Y":"N");
 			rdef.setTopDown(isTopDown?"Y":"N");
 			rdef.setSizedByContent(isSizedByContent?"Y":"N");
-			// rdef.setPublic(rPublic.equals("Y"));
 			rdef.setMenuID(menuID);
 			rdef.setMenuApproved(rApproved.equals("Y"));
 			if (reportDefType.length() > 0)
 				rdef.setReportDefType(reportDefType);
-/*			if(rdef.isDashboardType()) {
-				rdef.setDashboardOptions(dashboardOptions.toString());
-			}*/
+
 			rdef.setHideFormFieldAfterRun(hideFormFieldAfterRun);
 			rdef.setReportInNewWindow(reportsInNewWindow);
 			rdef.setRuntimeColSortDisabled(rRCSDisabled);
@@ -594,18 +515,6 @@ public class WizardProcessor extends org.onap.portalsdk.analytics.RaptorObject {
 				rdef.generateWizardSequence(request);
 
 
-		/*
-		 * if(formHelp.length()>255) formHelp = formHelp.substring(0, 255);
-		 */
-
-
-		// String rPublic = nvl(AppUtils.getRequestValue(request, "public"),
-		// "N");
-		// String menuID = AppUtils.getRequestNvlValue(request, "menuID");
-
-//		boolean dashboardOptionsShown = AppUtils.getRequestNvlValue(request,
-//		          "dashboardOptionsShown").equals("Y");
-
 		reportUpdated = true;
 
 		if (rdef.getReportID().equals("-1"))