Arregla tests y corrige sintaxis (6488f047) · Commits · REDMIC Project / Server / Time Series

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

+0 −2

Original line number	Diff line number	Diff line
		@@ -34,9 +34,7 @@ import es.redmic.models.es.common.model.DomainES;
		import es.redmic.models.es.geojson.common.domain.dto.ConfidenceDTO;
		import es.redmic.models.es.geojson.common.model.Aggregations;
		import es.redmic.models.es.maintenance.objects.dto.ObjectClassificationDTO;
		import es.redmic.models.es.maintenance.objects.dto.ObjectCollectingDTO;
		import es.redmic.models.es.maintenance.objects.model.ObjectClassification;
		import es.redmic.models.es.maintenance.objects.model.ObjectType;
		import es.redmic.models.es.series.common.model.SeriesHitWrapper;
		import es.redmic.models.es.series.common.model.SeriesHitsWrapper;
		import es.redmic.models.es.series.common.model.SeriesSearchWrapper;

time-series-view/src/main/java/es/redmic/timeseriesview/service/ObjectCollectingSeriesESService.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -123,6 +123,6 @@ public class ObjectCollectingSeriesESService

		@Override
		protected String[] getDefaultSuggestFields() {
		return new String[] { DEFAULT_SEARCH_FIELD };;
		return new String[] { DEFAULT_SEARCH_FIELD };
		}
		}

time-series-view/src/test/java/es/redmic/test/timeseriesview/unit/mapper/ObjectCollectMappingTest.java

+3 −0

Original line number	Diff line number	Diff line
		@@ -30,7 +30,9 @@ import com.fasterxml.jackson.databind.ObjectMapper;

		import org.apache.commons.io.IOUtils;
		import org.junit.Test;
		import org.junit.runner.RunWith;
		import org.mapstruct.factory.Mappers;
		import org.mockito.junit.MockitoJUnitRunner;
		import org.skyscreamer.jsonassert.JSONAssert;

		import es.redmic.jts4jackson.module.JTSModule;
		@@ -39,6 +41,7 @@ import es.redmic.timeseriesview.mapper.DataHistogramESMapper;
		import es.redmic.timeseriesview.mapper.ObjectCollectingSeriesESMapper;
		import es.redmic.timeseriesview.model.objectcollectingseries.ObjectCollectingSeries;

		@RunWith(MockitoJUnitRunner.class)
		public class ObjectCollectMappingTest {

		protected ObjectMapper jacksonMapper = new ObjectMapper()

time-series-view/src/test/resources/data/timeseries/timeSeriesAggResult.json

+14 −14

Original line number	Diff line number	Diff line
		@@ -515,7 +515,7 @@
		"max": 270.0,
		"count": 4,
		"sum": 549.55,
		"avg": 137.388
		"avg": 137.387
		},
		"date": "2019-01-03T10:00:00.000Z"
		}, {
		@@ -884,7 +884,7 @@
		"max": 290.0,
		"count": 4,
		"sum": 590.35,
		"avg": 147.587
		"avg": 147.588
		},
		"date": "2019-01-05T03:00:00.000Z"
		}, {
		@@ -1316,7 +1316,7 @@
		"max": 120.0,
		"count": 4,
		"sum": 254.15,
		"avg": 63.537
		"avg": 63.538
		},
		"date": "2019-01-07T03:00:00.000Z"
		}, {
		@@ -1451,7 +1451,7 @@
		"max": 170.0,
		"count": 4,
		"sum": 332.65,
		"avg": 83.163
		"avg": 83.162
		},
		"date": "2019-01-07T18:00:00.000Z"
		}, {
		@@ -1748,7 +1748,7 @@
		"max": 280.0,
		"count": 4,
		"sum": 597.95,
		"avg": 149.487
		"avg": 149.488
		},
		"date": "2019-01-09T03:00:00.000Z"
		}, {
		@@ -2594,7 +2594,7 @@
		"max": 70.0,
		"count": 4,
		"sum": 164.15,
		"avg": 41.037
		"avg": 41.038
		},
		"date": "2019-01-13T03:00:00.000Z"
		}, {
		@@ -2945,7 +2945,7 @@
		"max": 230.0,
		"count": 4,
		"sum": 474.95,
		"avg": 118.738
		"avg": 118.737
		},
		"date": "2019-01-14T18:00:00.000Z"
		}, {
		@@ -3206,7 +3206,7 @@
		"max": 280.0,
		"count": 4,
		"sum": 577.95,
		"avg": 144.487
		"avg": 144.488
		},
		"date": "2019-01-16T00:00:00.000Z"
		}, {
		@@ -3836,7 +3836,7 @@
		"max": 40.0,
		"count": 4,
		"sum": 89.55,
		"avg": 22.388
		"avg": 22.387
		},
		"date": "2019-01-19T03:00:00.000Z"
		}, {
		@@ -4052,7 +4052,7 @@
		"max": 360.0,
		"count": 4,
		"sum": 728.05,
		"avg": 182.012
		"avg": 182.013
		},
		"date": "2019-01-20T03:00:00.000Z"
		}, {
		@@ -4700,7 +4700,7 @@
		"max": 320.0,
		"count": 4,
		"sum": 640.35,
		"avg": 160.087
		"avg": 160.088
		},
		"date": "2019-01-23T03:00:00.000Z"
		}, {
		@@ -5393,7 +5393,7 @@
		"max": 290.0,
		"count": 4,
		"sum": 293.45,
		"avg": 73.363
		"avg": 73.362
		},
		"date": "2019-01-26T08:00:00.000Z"
		}, {
		@@ -5924,7 +5924,7 @@
		"max": 20.0,
		"count": 4,
		"sum": 66.45,
		"avg": 16.612
		"avg": 16.613
		},
		"date": "2019-01-28T19:00:00.000Z"
		}, {
		@@ -5996,7 +5996,7 @@
		"max": 250.0,
		"count": 4,
		"sum": 253.45,
		"avg": 63.363
		"avg": 63.362
		},
		"date": "2019-01-29T03:00:00.000Z"
		}, {