dbAcce
if (XtoYMapping.containsKey(xValue)) {
String yValue = XtoYMapping.get(xValue);
- if (yValue == null)
- yValuesArray.add(null);
- else if (yValue.contains("."))
- yValuesArray.add(Float.parseFloat(yValue));
- else
- yValuesArray.add(Integer.parseInt(yValue));
+ yValuesArray.add(parseValue(yValue));
+
} else
yValuesArray.add(null);
}
@@ -348,12 +324,8 @@ else if (yValue.contains("."))
if (XtoYMapping.containsKey(xValue)) {
String yValue = XtoYMapping.get(xValue);
- if (yValue == null)
- yObjectValuesArray.add(new DataObject(xValue, null));
- else if (yValue.contains("."))
- yObjectValuesArray.add(new DataObject(xValue, Float.parseFloat(yValue)));
- else
- yObjectValuesArray.add(new DataObject(xValue, Integer.parseInt(yValue)));
+ yObjectValuesArray.add(new DataObject(xValue, parseValue(yValue)));
+
} else
yObjectValuesArray.add(new DataObject(xValue, null));
}
@@ -368,46 +340,42 @@ else if (yValue.contains("."))
}
}
- return new HighChartsJsonResponse(dataSeries,xAxis_Categories, dataSeriesNames, dataSeriesTypes);
+ return new HighChartsJsonResponse(dataSeries, xAxis_Categories, dataSeriesNames, dataSeriesTypes);
}
/**
* Highcharts Dependency Wheel and Sankey data are :
* | from node (string) | to node (string) | from-to edge weight (int) |
*
In this method, we aim to create the above data representation into GraphData
- *
*/
- private HighChartsJsonResponse HCGraph(Result result, boolean ignoreNodeWeight, SupportedChartTypes chartType, String chartName){
+ private HighChartsJsonResponse HCGraph(Result result, boolean ignoreNodeWeight, SupportedChartTypes chartType, String chartName) {
// For the purpose of making this as scalable as possible, we will consider the following assumption:
// The named query for the dependency wheel responds with the following rows :
// 4 rows result: | from node | from node value | to node | from-to edge weight |
// 3 rows result: | from node | to node | from-to edge weight |
-
+
// Initialize the keys array
List keys = Arrays.asList("from", "to", "weight");
// Initialize the data array
ArrayList