Commit 1a436f55 authored by Noel Alonso's avatar Noel Alonso
Browse files

Compatibiliza mapper con ObjectCollectingSeries

parent cf4d3e40

time-series-view/src/main/java/es/redmic/timeseriesview/mapper/DataHistogramESMapper.java

+10 −2
Original line number Diff line number Diff line
@@ -43,6 +43,8 @@ public abstract class DataHistogramESMapper { 
			return data;



		Map<String, Object> dateHistogram = (Map<String, Object>) aggregations.get("date_histogram#dateHistogram");

		if (dateHistogram == null)

			dateHistogram = (Map<String, Object>) aggregations.get("dateHistogram");

		if ( dateHistogram == null || dateHistogram.size() == 0)

			return data;
@@ -64,7 +66,13 @@ public abstract class DataHistogramESMapper { 
	private DataHistogramItemDTO map(Map<String, Object> source) {

		DataHistogramItemDTO item = new DataHistogramItemDTO();

		item.setKey_as_string((String) source.get("key_as_string"));

		item.setValue(getDataHistogramStats((LinkedHashMap<String, Object>) source.get("stats#value")));



		LinkedHashMap<String, Object> value = (LinkedHashMap<String, Object>) source.get("stats#value");



		if (value == null)

			value = (LinkedHashMap<String, Object>) source.get("value");



		item.setValue(getDataHistogramStats(value));

		return item;

	}