Commit 647aa924 authored by Noel Alonso's avatar Noel Alonso
Browse files

Añade retrocompatibilidad con series geolocalizada

parent fd9766e3

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

+7 −2
Original line number Diff line number Diff line
@@ -22,10 +22,15 @@ 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;
@@ -51,5 +56,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

+2 −2
Original line number Diff line number Diff line
@@ -22,11 +22,11 @@ package es.redmic.models.es.series.common.model; 


import com.fasterxml.jackson.annotation.JsonIgnoreProperties;



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

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

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



@JsonIgnoreProperties(ignoreUnknown=true)

public class SeriesHitWrapper<TModel extends BaseAbstractStringES> extends HitWrapper {

public class SeriesHitWrapper<TModel extends BaseES<?>> extends HitWrapper {



	private TModel _source;

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

+2 −2
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.BaseAbstractStringES;

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

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



@JsonIgnoreProperties(ignoreUnknown=true)

public class SeriesHitsWrapper<TModel extends BaseAbstractStringES> extends HitsWrapper {

public class SeriesHitsWrapper<TModel extends BaseES<?>> extends HitsWrapper {



	public SeriesHitsWrapper() {

	}

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

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

import com.fasterxml.jackson.annotation.JsonIgnoreProperties;



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

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

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



@JsonIgnoreProperties(ignoreUnknown=true)

public class SeriesSearchWrapper<TModel extends BaseAbstractStringES> extends SearchWrapper {

public class SeriesSearchWrapper<TModel extends BaseES<?>> extends SearchWrapper {



	private SeriesHitsWrapper<TModel> hits;