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

Reestructura implementación base

parent e0c41020

src/main/java/es/redmic/elasticsearchlib/series/repository/IBaseSeriesESRepository.java

+1 −10
Original line number Diff line number Diff line
@@ -24,10 +24,7 @@ import org.elasticsearch.search.aggregations.AggregationBuilders; 
import org.elasticsearch.search.aggregations.bucket.histogram.DateHistogramAggregationBuilder;

import org.elasticsearch.search.aggregations.bucket.histogram.DateHistogramInterval;



import es.redmic.models.es.common.dto.EventApplicationResult;

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



public interface IBaseSeriesESRepository<TModel extends BaseAbstractStringES> {

public interface IBaseSeriesESRepository {



	static String[] INDEX = { "timeseries" };

	static String TYPE = "_doc";
@@ -43,10 +40,4 @@ public interface IBaseSeriesESRepository<TModel extends BaseAbstractStringES> { 
		return AggregationBuilders.dateHistogram("dateHistogram").field(dateTimeField)

				.dateHistogramInterval(dateHistogramInterval).minDocCount(minDocCount);

	}



	EventApplicationResult save(TModel modelToIndex);



	EventApplicationResult update(TModel modelToIndex);



	EventApplicationResult delete(String id);

}

src/main/java/es/redmic/elasticsearchlib/series/repository/IRSeriesESRepository.java

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ 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;



public interface IRSeriesESRepository<TModel extends BaseAbstractStringES> extends IBaseSeriesESRepository<TModel> {

public interface IRSeriesESRepository<TModel extends BaseAbstractStringES> extends IBaseSeriesESRepository {



	public SeriesHitWrapper<TModel> findById(String id);

	public SeriesSearchWrapper<TModel> searchByIds(String[] ids);

src/main/java/es/redmic/elasticsearchlib/series/repository/IRWSeriesESRepository.java

0 → 100644
+33 −0
Original line number Diff line number Diff line 
package es.redmic.elasticsearchlib.series.repository;



/*-

 * #%L

 * elasticsearch-lib

 * %%

 * Copyright (C) 2019 - 2021 REDMIC Project / Server

 * %%

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 * 

 *      http://www.apache.org/licenses/LICENSE-2.0

 * 

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 * #L%

 */



import es.redmic.models.es.common.dto.EventApplicationResult;

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



public interface IRWSeriesESRepository <TModel extends BaseAbstractStringES> {



	EventApplicationResult save(TModel modelToIndex);



	EventApplicationResult update(TModel modelToIndex);



	EventApplicationResult delete(String id);

}

src/main/java/es/redmic/elasticsearchlib/series/repository/RWSeriesESRepository.java

+2 −2
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ import es.redmic.models.es.common.model.BaseTimeDataAbstractES; 
import es.redmic.models.es.common.query.dto.DataQueryDTO;



public abstract class RWSeriesESRepository<TModel extends BaseTimeDataAbstractES, TQueryDTO extends DataQueryDTO>

		extends RSeriesESRepository<TModel, TQueryDTO> {

		extends RSeriesESRepository<TModel, TQueryDTO> implements IRWSeriesESRepository<TModel> {



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

	String timeSeriesIndexPattern;
@@ -44,7 +44,7 @@ public abstract class RWSeriesESRepository<TModel extends BaseTimeDataAbstractES 


	@Override

	protected String getIndex(final TModel modelToIndex) {

		return timeSeriesIndexPattern + "-" + modelToIndex.getDate().toString(DateTimeFormat.forPattern(timeSeriesIndexPattern));

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

	}



	@Override