Commit afce6bd3 authored by Noel Alonso's avatar Noel Alonso
Browse files

Merge branch 'feature-cleanTimeSeries' into 'dev' 

Feature clean time series

See merge request redmic-project/server/library/models!19
parents 7f9326b7 467f55fb

pom.xml

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
	<groupId>es.redmic.lib</groupId>

	<artifactId>models</artifactId>

	<packaging>jar</packaging>

	<version>0.11.0</version>

	<version>0.11.0-feature-cleanTimeSeries</version>

	<name>Models</name>

	<description>Input-output classes and models</description>

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/main/java/es/redmic/models/es/series/common/model/SeriesHitWrapper.java

+5 −25
Original line number Diff line number Diff line
@@ -22,34 +22,14 @@ package es.redmic.models.es.series.common.model; 


import com.fasterxml.jackson.annotation.JsonIgnoreProperties;



import es.redmic.models.es.common.model.BaseAbstractES;

import es.redmic.models.es.common.model.BaseAbstractStringES;

import es.redmic.models.es.common.model.HitWrapper;



@JsonIgnoreProperties(ignoreUnknown=true)

public class SeriesHitWrapper<TModel extends BaseAbstractES> extends HitWrapper {

	

	private String _parent;

	

	private String _routing;

public class SeriesHitWrapper<TModel extends BaseAbstractStringES> extends HitWrapper {



	private TModel _source;



	public String get_parent() {

		return _parent;

	}



	public void set_parent(String _parent) {

		this._parent = _parent;

	}

	

	public String get_routing() {

		return _routing;

	}



	public void set_routing(String _routing) {

		this._routing = _routing;

	}



	public TModel get_source() {

		return _source;

	}

src/main/java/es/redmic/models/es/series/common/model/SeriesHitsWrapper.java

+10 −10
Original line number Diff line number Diff line
@@ -26,11 +26,11 @@ import java.util.List; 
import com.fasterxml.jackson.annotation.JsonIgnore;

import com.fasterxml.jackson.annotation.JsonIgnoreProperties;



import es.redmic.models.es.common.model.BaseAbstractES;

import es.redmic.models.es.common.model.BaseAbstractStringES;

import es.redmic.models.es.common.model.HitsWrapper;



@JsonIgnoreProperties(ignoreUnknown=true)

public class SeriesHitsWrapper<TModel extends BaseAbstractES> extends HitsWrapper {

public class SeriesHitsWrapper<TModel extends BaseAbstractStringES> extends HitsWrapper {



	public SeriesHitsWrapper() {

	}