Sonar Scans and Role Centralization; clean nl

PORTAL-21: centralized user role management
PORTAL-72: Address Sonar Scan code issues for ONAP - mostly on raptor
PORTAL-86: ONAP - Remove internal att.com usages from tests and otherfiles
PORTAL-90: Add debug statements to demo app's class; no functional change

Issue: PORTAL-21 PORTAL-72 PORTAL-86 PORTAL-90
Change-Id: I72a6c812009f51446330bf42bab6d3338d053805
Signed-off-by: Christopher Lott (cl778h) <clott@research.att.com>

1 files changed, 38 insertions, 35 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 1496b9fa..68007062 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
@@ -2329,43 +2329,46 @@ public class WizardProcessor extends org.onap.portalsdk.analytics.RaptorObject {
 			useDefaultSize = "N";
 		if (repMap == null)
 				rdef.setReportMap(new ObjectFactory().createReportMap());
-		repMap.setAddressColumn(addressColumn);
-		repMap.setDataColumn(dataColumn);
-		repMap.setIsMapAllowedYN(isMapAllowed);
-		repMap.setUseDefaultSize(useDefaultSize);
-		repMap.setMarkerColor(color);
-		repMap.setAddAddressInDataYN(addAddress);
-		repMap.setLatColumn(latCol);
-		repMap.setLongColumn(longCol);
-		repMap.setColorColumn(colorCol);
-		repMap.setHeight(height.trim());
-		repMap.setWidth(width.trim());
-		repMap.setLegendColumn(legendColumn);
-		//repMap.setLegendDisplayName(legendDisplayName);
-		
-		Marker m = new ObjectFactory().createMarker();
-		m.setAddressColumn(addressColumn);
-		m.setDataColumn(dataColumn);
-		repMap.getMarkers().add(m);
-		String markerCountString = AppUtils.getRequestNvlValue(request, "markerCount");
-		int markerCount = 0;
-		if (markerCountString != null && markerCountString.equals("") == false){
-			markerCount = new Integer(markerCountString).intValue();
-		}
-		for (int i = 1; i < markerCount; i ++){
-			String additionalAddressColumn = XSSFilter.filterRequestOnlyScript(AppUtils.getRequestNvlValue(request, "addressColumn" + i));
-			String additionalDataHeader = XSSFilter.filterRequestOnlyScript(AppUtils.getRequestNvlValue(request, "dataHeader" + i));
-			String additionalData = XSSFilter.filterRequestOnlyScript(AppUtils.getRequestNvlValue(request, "dataColumn" + i));
-			String additionalColor = XSSFilter.filterRequestOnlyScript(AppUtils.getRequestNvlValue(request, "markerColor" + i));
-			if (additionalAddressColumn.equals("1") == false){
-				m = new ObjectFactory().createMarker();
-				m.setAddressColumn(additionalAddressColumn);
-				m.setDataHeader(additionalDataHeader);
-				m.setDataColumn(additionalData);
-				m.setMarkerColor(additionalColor);
-				repMap.getMarkers().add(m);
+		if(repMap!=null){
+			repMap.setAddressColumn(addressColumn);
+			repMap.setDataColumn(dataColumn);
+			repMap.setIsMapAllowedYN(isMapAllowed);
+			repMap.setUseDefaultSize(useDefaultSize);
+			repMap.setMarkerColor(color);
+			repMap.setAddAddressInDataYN(addAddress);
+			repMap.setLatColumn(latCol);
+			repMap.setLongColumn(longCol);
+			repMap.setColorColumn(colorCol);
+			repMap.setHeight(height.trim());
+			repMap.setWidth(width.trim());
+			repMap.setLegendColumn(legendColumn);
+			//repMap.setLegendDisplayName(legendDisplayName);
+			
+			Marker m = new ObjectFactory().createMarker();
+			m.setAddressColumn(addressColumn);
+			m.setDataColumn(dataColumn);
+			repMap.getMarkers().add(m);
+			String markerCountString = AppUtils.getRequestNvlValue(request, "markerCount");
+			int markerCount = 0;
+			if (markerCountString != null && markerCountString.equals("") == false){
+				markerCount = new Integer(markerCountString).intValue();
+			}
+			for (int i = 1; i < markerCount; i ++){
+				String additionalAddressColumn = XSSFilter.filterRequestOnlyScript(AppUtils.getRequestNvlValue(request, "addressColumn" + i));
+				String additionalDataHeader = XSSFilter.filterRequestOnlyScript(AppUtils.getRequestNvlValue(request, "dataHeader" + i));
+				String additionalData = XSSFilter.filterRequestOnlyScript(AppUtils.getRequestNvlValue(request, "dataColumn" + i));
+				String additionalColor = XSSFilter.filterRequestOnlyScript(AppUtils.getRequestNvlValue(request, "markerColor" + i));
+				if (additionalAddressColumn.equals("1") == false){
+					m = new ObjectFactory().createMarker();
+					m.setAddressColumn(additionalAddressColumn);
+					m.setDataHeader(additionalDataHeader);
+					m.setDataColumn(additionalData);
+					m.setMarkerColor(additionalColor);
+					repMap.getMarkers().add(m);
+				}
 			}
 		}
+		
 		return true;
 	} // processMap
 	/*****For Report Maps - End******/