Merge "lowered code smells in DBColumnInfo & ReportDefini"

2 files changed, 1 insertions, 41 deletions

diff --git a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/definition/DBColumnInfo.java b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/definition/DBColumnInfo.java
index 2b04fd46..20edc5b7 100644
--- a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/definition/DBColumnInfo.java
+++ b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/definition/DBColumnInfo.java
@@ -48,8 +48,6 @@ public class DBColumnInfo extends RaptorObject {
 
 	private String label = null;
 
-	// public DBColumnInfo() {}
-
 	public DBColumnInfo(String tableName, String colName, String colType, String label) {
 		super();
 
diff --git a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/definition/ReportDefinition.java b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/definition/ReportDefinition.java
index 11adb35b..16129b98 100644
--- a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/definition/ReportDefinition.java
+++ b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/definition/ReportDefinition.java
@@ -508,7 +508,6 @@ public class ReportDefinition extends ReportWrapper implements Serializable {
 				dct.setOrderSeq(getAllColumns().size() + 1);
 			dct.setVisible(visible);
 			dct.setCalculated(calculated);
-			// dct.setColType(colType);
 			if (nvl(colFormat).length() > 0)
 				dct.setColFormat(colFormat);
 			dct.setGroupBreak(groupBreak);
@@ -535,10 +534,7 @@ public class ReportDefinition extends ReportWrapper implements Serializable {
 	
 			dct.setDbColType(colType);
 			adjustColumnType(dct);
-	
-			// ColFilterList colFilterList = objFactory.createColFilterList();
-			// dct.setColFilterList(colFilterList);
-	
+
 			getTableById(tableId).getDataColumnList().getDataColumn().add(dct);
 	
 			resetCache(false);
@@ -849,7 +845,6 @@ public class ReportDefinition extends ReportWrapper implements Serializable {
 				}
 				
 			}
-		//return null;
 	}
 	
 	public JavascriptItemType addJavascriptType(ObjectFactory objFactory, String id) throws RaptorException {
@@ -940,16 +935,11 @@ public class ReportDefinition extends ReportWrapper implements Serializable {
 			fft.setOrderBySeq((getFormFieldList() == null) ? 1 : getFormFieldList().getFormField()
 					.size() + 1);
 			fft.setFieldSQL(fieldSQL);
-			//fft.setRangeStartDate(rangeStartDate);
-			//fft.setRangeEndDate(rangeEndDate);
-
             try {
                 fft.setRangeStartDate(DatatypeFactory.newInstance()
                         .newXMLGregorianCalendar(rangeStartDate.YEAR, rangeStartDate.MONTH, rangeStartDate.DAY_OF_WEEK, rangeStartDate.HOUR, rangeStartDate.MINUTE, rangeStartDate.SECOND, rangeStartDate.MILLISECOND, rangeStartDate.ZONE_OFFSET));
                 fft.setRangeStartDate(DatatypeFactory.newInstance()
                         .newXMLGregorianCalendar(rangeEndDate.YEAR, rangeEndDate.MONTH, rangeEndDate.DAY_OF_WEEK, rangeEndDate.HOUR, rangeEndDate.MINUTE, rangeEndDate.SECOND, rangeEndDate.MILLISECOND, rangeEndDate.ZONE_OFFSET));
-                /*currField.setRangeEndDate(DatatypeFactory.newInstance()
-                        .newXMLGregorianCalendar(end));*/
             } catch (DatatypeConfigurationException ex) {
             	
             }
@@ -1053,7 +1043,6 @@ public class ReportDefinition extends ReportWrapper implements Serializable {
 				FormFieldType fft = (FormFieldType) iter.next();
 
 				if (fieldId.equals(fft.getFieldId())) {
-					//orderBySeq = fft.getOrderBySeq();
 					fieldDisplayName = getFormFieldDisplayName(fft);
 					iter.remove();
 				} else if (fft.getOrderBySeq()!=null && (fft.getOrderBySeq().intValue() > orderBySeq))
@@ -1602,32 +1591,5 @@ public class ReportDefinition extends ReportWrapper implements Serializable {
 			DataminingOptions dataminingOptions = objFactory.createDataminingOptions();
 			cr.setDataminingOptions(dataminingOptions);
 	}	
-	/*public void addChartAdditionalOptions(ObjectFactory objFactory, String chartType, String chartMultiplePieOrder, String chartMultiplePieLabelDisplay,
-			String chartOrientation, String secondaryChartRenderer, String chartDisplay, String legendPosition,
-			String labelAngle) throws RaptorException {
-		try { 
-			ChartAdditionalOptions chartOptions = objFactory.createChartAdditionalOptions();
-	        
-			if (nvl(chartMultiplePieOrder).length() > 0)
-				chartOptions.setChartMultiplePieOrder(chartMultiplePieOrder);
-			if (nvl(chartMultiplePieLabelDisplay).length() > 0)
-				chartOptions.setChartMultiplePieLabelDisplay(chartMultiplePieLabelDisplay);
-			if (nvl(chartOrientation).length() > 0)
-				chartOptions.setChartOrientation(chartOrientation);
-			if (nvl(secondaryChartRenderer).length() > 0)
-				chartOptions.setSecondaryChartRenderer(secondaryChartRenderer);
-			if (nvl(chartDisplay).length() > 0)
-				chartOptions.setChartDisplay(chartDisplay);
-			if (nvl(legendPosition).length() > 0)
-				chartOptions.setLegendPosition(legendPosition);
-			if (nvl(labelAngle).length() > 0)
-				chartOptions.setLabelAngle(labelAngle);
-	
-	        cr.setChartAdditionalOptions(chartOptions);
-		} catch (JAXBException ex) {
-			throw new RaptorException(ex.getMessage(), ex.getCause());
-		}	
-	} // addChartAdditionalOptions*/
-	
 
 } // ReportDefinition