Commit 27913ac9 authored by Noel Alonso's avatar Noel Alonso
Browse files

Merge branch 'dev' into 'master' 

Dev

See merge request redmic-project/server/library/elasticsearch-lib!15
parents 4ffa3eae 699753ee

pom.xml

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

	<artifactId>elasticsearch-lib</artifactId>

	<packaging>jar</packaging>

	<version>0.11.0</version>

	<version>0.12.0</version>

	<name>elasticsearch-lib</name>



	<properties>

src/main/java/es/redmic/elasticsearchlib/timeseries/repository/RTimeSeriesESRepository.java

+5 −1
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ package es.redmic.elasticsearchlib.timeseries.repository; 
 */



import org.joda.time.format.DateTimeFormat;

import org.springframework.beans.factory.annotation.Value;



import es.redmic.elasticsearchlib.data.repository.RDataESRepository;

import es.redmic.models.es.common.model.BaseTimeDataAbstractES;
@@ -29,12 +30,15 @@ import es.redmic.models.es.common.query.dto.DataQueryDTO; 
public abstract class RTimeSeriesESRepository<TModel extends BaseTimeDataAbstractES, TQueryDTO extends DataQueryDTO>

		extends RDataESRepository<TModel, TQueryDTO> implements IBaseTimeSeriesESRepository {



	@Value("${timeseries.index.pattern}")

	String timeSeriesIndexPattern;



	public RTimeSeriesESRepository() {

		super(IBaseTimeSeriesESRepository.INDEX, IBaseTimeSeriesESRepository.TYPE, true);

	}



	@Override

	protected String getIndex(final TModel modelToIndex) {

		return getIndex()[0] + "-" + modelToIndex.getDate().toString(DateTimeFormat.forPattern("yyyy-MM-dd"));

		return getIndex()[0] + "-" + modelToIndex.getDate().toString(DateTimeFormat.forPattern(timeSeriesIndexPattern));

	}

}

src/main/java/es/redmic/elasticsearchlib/timeseries/repository/RWTimeSeriesESRepository.java

+5 −1
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ package es.redmic.elasticsearchlib.timeseries.repository; 
 */



import org.joda.time.format.DateTimeFormat;

import org.springframework.beans.factory.annotation.Value;



import es.redmic.elasticsearchlib.data.repository.RWDataESRepository;

import es.redmic.models.es.common.model.BaseTimeDataAbstractES;
@@ -29,12 +30,15 @@ import es.redmic.models.es.common.query.dto.DataQueryDTO; 
public abstract class RWTimeSeriesESRepository<TModel extends BaseTimeDataAbstractES, TQueryDTO extends DataQueryDTO>

		extends RWDataESRepository<TModel, TQueryDTO> implements IBaseTimeSeriesESRepository {



	@Value("${timeseries.index.pattern}")

	String timeSeriesIndexPattern;



	public RWTimeSeriesESRepository() {

		super(IBaseTimeSeriesESRepository.INDEX, IBaseTimeSeriesESRepository.TYPE, true);

	}



	@Override

	protected String getIndex(final TModel modelToIndex) {

		return getIndex()[0] + "-" + modelToIndex.getDate().toString(DateTimeFormat.forPattern("yyyy-MM-dd"));

		return getIndex()[0] + "-" + modelToIndex.getDate().toString(DateTimeFormat.forPattern(timeSeriesIndexPattern));

	}

}