Commit 467f55fb authored by Noel Alonso's avatar Noel Alonso
Browse files

Elimina referencias a TimeSeries antiguo

parent 7fd1df0c

src/main/java/es/redmic/models/es/common/DataPrefixType.java

+5 −6
Original line number Diff line number Diff line
@@ -39,7 +39,6 @@ import es.redmic.models.es.geojson.tracking.animal.dto.AnimalTrackingDTO; 
import es.redmic.models.es.geojson.tracking.common.ElementTrackingDTO;

import es.redmic.models.es.geojson.tracking.platform.dto.PlatformTrackingDTO;

import es.redmic.models.es.series.objectcollecting.dto.ObjectCollectingSeriesDTO;

import es.redmic.models.es.series.timeseries.dto.TimeSeriesDTO;



@SuppressWarnings("serial")

public final class DataPrefixType {
@@ -110,7 +109,7 @@ public final class DataPrefixType { 
			}

		}));

		classesHash.put(ToponymDTO.class, new Type(TOPONYM));

		classesHash.put(TimeSeriesDTO.class, new Type(TIMESERIES));

		//classesHash.put(TimeSeriesDTO.class, new Type(TIMESERIES));

		classesHash.put(ObjectCollectingSeriesDTO.class, new Type(COLLECTINGSERIES));

		classesHash.put(ActivityDTO.class, new Type(ACTIVITY));

		classesHash.put(ProjectDTO.class, new Type(PROJECT));

src/main/java/es/redmic/models/es/geojson/common/model/InnerHits.java

+10 −15
Original line number Diff line number Diff line
@@ -22,15 +22,10 @@ package es.redmic.models.es.geojson.common.model; 


import com.fasterxml.jackson.annotation.JsonIgnoreProperties;



import es.redmic.models.es.series.attributeseries.model.AttributeSeries;

import es.redmic.models.es.series.common.model.SeriesSearchWrapper;

import es.redmic.models.es.series.objectcollecting.model.ObjectCollectingSeries;

import es.redmic.models.es.series.timeseries.model.TimeSeries;



@JsonIgnoreProperties(ignoreUnknown=true)

public class InnerHits {



	SeriesSearchWrapper<TimeSeries> timeseries;

	/*-SeriesSearchWrapper<TimeSeries> timeseries;

	SeriesSearchWrapper<ObjectCollectingSeries> collecting;

	SeriesSearchWrapper<AttributeSeries> attributeseries;
@@ -56,5 +51,5 @@ public class InnerHits { 


	public void setAttributeseries(SeriesSearchWrapper<AttributeSeries> attributeseries) {

		this.attributeseries = attributeseries;

	}

	}-*/

}

src/test/java/es/redmic/test/unit/geodata/common/model/GeoSearchWrapperMapperTest.java

+4 −4
Original line number Diff line number Diff line
@@ -76,9 +76,9 @@ public class GeoSearchWrapperMapperTest { 
		assertTrue(model.getTotal() == 41033);

		assertTrue(hits.size() == 1);



		List<TimeSeries> inner_hits = hits.get(0).getInner_hits().getTimeseries().getSourceList();

		//List<TimeSeries> inner_hits = hits.get(0).getInner_hits().getTimeseries().getSourceList();



		assertTrue(inner_hits.size() == 1);

		//assertTrue(inner_hits.size() == 1);



	}

}