Adapta y limpia código (b9ba0319) · Commits · REDMIC Project / Server / Library / Elasticsearch lib

src/main/java/es/redmic/elasticsearchlib/common/repository/RBaseESRepository.java

+30 −34

Original line number	Diff line number	Diff line
		@@ -98,7 +98,7 @@ import es.redmic.models.es.common.query.dto.SuggestQueryDTO;

		public abstract class RBaseESRepository<TModel extends BaseES<?>, TQueryDTO extends SimpleQueryDTO> {

		protected final static Logger LOGGER = LoggerFactory.getLogger(RBaseESRepository.class);
		protected static final Logger LOGGER = LoggerFactory.getLogger(RBaseESRepository.class);

		@Value("${redmic.elasticsearch.check.mappings}")
		private boolean checkMappings;
		@@ -125,16 +125,16 @@ public abstract class RBaseESRepository<TModel extends BaseES<?>, TQueryDTO exte

		protected Class<TModel> typeOfTModel;

		public RBaseESRepository() {
		protected RBaseESRepository() {
		}

		public RBaseESRepository(String[] index, String type, Boolean rollOverIndex) {
		protected RBaseESRepository(String[] index, String type, Boolean rollOverIndex) {
		this(index, type);
		ROLLOVER_INDEX = rollOverIndex;
		}

		@SuppressWarnings("unchecked")
		public RBaseESRepository(String[] index, String type) {
		protected RBaseESRepository(String[] index, String type) {
		this.INDEX = index;
		this.TYPE = type;

		@@ -240,7 +240,7 @@ public abstract class RBaseESRepository<TModel extends BaseES<?>, TQueryDTO exte
		*/
		private void prepareIndex(String index) {

		if (ROLLOVER_INDEX) {
		if (Boolean.TRUE.equals(ROLLOVER_INDEX)) {
		createTemplate(index);
		} else {
		createIndex(index);
		@@ -313,7 +313,7 @@ public abstract class RBaseESRepository<TModel extends BaseES<?>, TQueryDTO exte

		protected GetResponse getRequest(String id, String parentId) {

		LOGGER.debug("FindById en " + getIndex() + " " + getType() + " con id " + id);
		LOGGER.debug("FindById en {} {} con id {}", getIndex(), getType(), id);

		for (int i = 0; i < getIndex().length; i++) {

		@@ -364,8 +364,8 @@ public abstract class RBaseESRepository<TModel extends BaseES<?>, TQueryDTO exte
		partialQuery = QueryBuilders.boolQuery().must(termQuery);
		}

		LOGGER.debug("Suggest en " + getIndex() + " " + getType() + " con fields " + fields + " y texto " + text
		+ " y query interna " + partialQuery);
		LOGGER.debug("Suggest en {} {} con fields {} y texto {} y query interna {}",
		getIndex(), getType(), fields, text, partialQuery);

		SearchRequest searchRequest = new SearchRequest(INDEX);

		@@ -405,14 +405,13 @@ public abstract class RBaseESRepository<TModel extends BaseES<?>, TQueryDTO exte

		protected MultiGetResponse multigetRequest(MgetDTO dto, String parentId) {

		LOGGER.debug("Mget en " + getIndex() + " " + getType() + " con fields " + dto.getFields() + " e ids "
		+ dto.getIds());
		LOGGER.debug("Mget en {} {} con fields {} e ids {}", getIndex(), getType(), dto.getFields(), dto.getIds());

		MultiGetRequest request = new MultiGetRequest();

		FetchSourceContext fetchSourceContext;

		if (dto.getFields() == null \|\| dto.getFields().size() == 0) {
		if (dto.getFields() == null \|\| dto.getFields().isEmpty()) {
		fetchSourceContext = new FetchSourceContext(true);
		} else {
		String[] fieldsArray = dto.getFields().toArray(new String[dto.getFields().size()]);
		@@ -458,8 +457,7 @@ public abstract class RBaseESRepository<TModel extends BaseES<?>, TQueryDTO exte

		protected SearchResponse searchRequest(QueryBuilder query, SortBuilder<?> sort, List<String> returnFields) {

		LOGGER.debug("FindBy query en " + getIndex() + " " + getType() + " con query " + query.toString()
		+ " y ordenación " /* + sort.toString() */);
		LOGGER.debug("FindBy query en {} {} con query {} y ordenación.", getIndex(), getType(), query.toString() /* + sort.toString() */);

		Integer size = getCount(QueryBuilders.boolQuery().filter(query));

		@@ -468,7 +466,7 @@ public abstract class RBaseESRepository<TModel extends BaseES<?>, TQueryDTO exte
		SearchSourceBuilder searchSourceBuilder = new SearchSourceBuilder();
		searchSourceBuilder.query(query).size(size).sort(sort);

		if (returnFields != null && returnFields.size() > 0) {
		if (returnFields != null && !returnFields.isEmpty()) {
		searchSourceBuilder.fetchSource(ElasticSearchUtils.getReturnFields(returnFields), null);
		}

		@@ -493,8 +491,6 @@ public abstract class RBaseESRepository<TModel extends BaseES<?>, TQueryDTO exte

		protected SearchResponse searchRequest(TQueryDTO queryDTO, QueryBuilder serviceQuery) {

		LOGGER.debug("Find en " + getIndex() + " " + getType() + " con queryDTO " + queryDTO + " y query interna ");

		SearchRequest searchRequest = new SearchRequest(getIndex());

		SearchSourceBuilder requestBuilder = searchRequestBuilder(queryDTO, serviceQuery);
		@@ -520,7 +516,7 @@ public abstract class RBaseESRepository<TModel extends BaseES<?>, TQueryDTO exte

		protected SearchSourceBuilder searchRequestBuilder(TQueryDTO queryDTO, QueryBuilder serviceQuery) {

		LOGGER.debug("Find en " + getIndex() + " " + getType() + " con queryDTO " + queryDTO + " y query interna ");
		LOGGER.debug("Find en {} {} con queryDTO {} y query interna.", getIndex(), getType(), queryDTO);

		QueryBuilder termQuery = getTermQuery(queryDTO.getTerms());

		@@ -569,13 +565,13 @@ public abstract class RBaseESRepository<TModel extends BaseES<?>, TQueryDTO exte

		List<SortBuilder<?>> sorts = getSorts(queryDTO.getSorts());
		// Finalmente solo en caso de tener una ordenación se añade a la request
		if (sorts != null && sorts.size() > 0) {
		if (sorts != null && !sorts.isEmpty()) {
		for (int i = 0; i < sorts.size(); i++)
		searchSourceBuilder.sort(sorts.get(i));
		}

		List<String> returnFields = queryDTO.getReturnFields();
		if (returnFields != null && returnFields.size() > 0) {
		if (returnFields != null && !returnFields.isEmpty()) {
		searchSourceBuilder.fetchSource(ElasticSearchUtils.getReturnFields(returnFields), null);
		}