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

Merge branch 'release-0.10.0' into 'master' 

release-0.10.0

See merge request redmic-project/server/library/elasticsearch!14
parents 885a7fe3 52f20f98

pom.xml

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

	<artifactId>elasticsearch</artifactId>

	<packaging>jar</packaging>

	<version>0.9.0</version>

	<version>0.10.0</version>

	<name>ElasticSearch</name>

	<description>ElasticSearch library </description>



	<properties>

		<!-- REDMIC -->

		<redmic.models.version>0.13.0</redmic.models.version>

		<redmic.models.version>0.14.0</redmic.models.version>

		<redmic.exceptions.version>0.10.0</redmic.exceptions.version>

		<redmic.utils.version>0.10.0-feature-changeJtsVersion</redmic.utils.version>

src/main/java/es/redmic/es/administrative/repository/DocumentESRepository.java

+13 −0
Original line number Diff line number Diff line
@@ -22,9 +22,13 @@ package es.redmic.es.administrative.repository; 


import java.util.ArrayList;

import java.util.List;

import java.util.Map;



import org.elasticsearch.action.index.IndexRequest;

import org.elasticsearch.index.query.BoolQueryBuilder;

import org.elasticsearch.index.query.QueryBuilder;

import org.elasticsearch.index.query.QueryBuilders;

import org.elasticsearch.join.query.JoinQueryBuilders;

import org.springframework.stereotype.Repository;



import es.redmic.es.data.common.repository.AdministrativeCommonESRepository;
@@ -127,6 +131,15 @@ public class DocumentESRepository extends AdministrativeCommonESRepository<Docum 
				QueryBuilders.boolQuery().must(queryBuilder).filter(QueryBuilders.idsQuery(getType()).addIds(ids)));

	}



	@Override

	public QueryBuilder getTermQuery(Map<String, Object> terms, BoolQueryBuilder query) {



		if (terms.containsKey("only_enable") && terms.get("only_enable").equals(true)) {

			query.must(QueryBuilders.termsQuery("enabled", true));

		}

		return super.getTermQuery(terms, query);

	}



	@Override

	protected String[] getDefaultSearchFields() {

		return new String[] { "title", "title.suggest", "author", "author.suggest", "code", "code.suggest",

src/main/java/es/redmic/es/common/utils/ElasticPersistenceUtils.java

+1 −1
Original line number Diff line number Diff line
@@ -143,7 +143,7 @@ public class ElasticPersistenceUtils<TModel extends BaseES<?>> { 


		UpdateRequest updateRequest = new UpdateRequest(index, type, id)

				.doc(convertTModelToSource(model))

				.fetchSource(false)

				.fetchSource(true)

				.setRefreshPolicy(RefreshPolicy.IMMEDIATE);



		if (parentId != null) {

src/main/java/es/redmic/es/config/EsClientProvider.java

+1 −1
Original line number Diff line number Diff line
@@ -110,7 +110,7 @@ public class EsClientProvider { 
	private HttpClientConfigCallback getHttpClientConfigCallback(CredentialsProvider credentialsProvider) {

		return new HttpClientConfigCallback() {



			private static final int KEEP_ALIVE_MS = 20 * 60 * 1000; // 20 minutes

			private static final int KEEP_ALIVE_MS = 5 * 60 * 1000; // 5 minutes



			@Override

			public HttpAsyncClientBuilder customizeHttpClient(HttpAsyncClientBuilder httpClientBuilder) {

src/main/java/es/redmic/es/geodata/common/repository/GeoResultProcessingFunction.java

0 → 100644
+66 −0
Original line number Diff line number Diff line 
package es.redmic.es.geodata.common.repository;



/*-

 * #%L

 * ElasticSearch

 * %%

 * Copyright (C) 2019 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 java.util.ArrayList;

import java.util.List;



import org.elasticsearch.search.SearchHit;

import org.elasticsearch.common.document.DocumentField;



import com.fasterxml.jackson.databind.ObjectMapper;



import es.redmic.es.common.repository.IProcessItemFunction;

import es.redmic.models.es.geojson.common.model.Feature;



public class GeoResultProcessingFunction<TModel extends Feature<?, ?>> implements IProcessItemFunction<TModel> {



	List<TModel> items = new ArrayList<TModel>();

	Class<TModel> typeOfTModel;

	protected ObjectMapper objectMapper;



	public GeoResultProcessingFunction(Class<TModel> typeOfTModel, ObjectMapper objectMapper) {



		this.typeOfTModel = typeOfTModel;

		this.objectMapper = objectMapper;

	}



	@Override

	public void process(SearchHit hit) {



		TModel item = mapper(hit);

		items.add(item);

	}



	private TModel mapper(SearchHit hit) {



		TModel item = objectMapper.convertValue(hit.getSourceAsMap(), this.typeOfTModel);

		//DocumentField parent = (DocumentField) hit.getFields().get("_parent");

		//item.set_parentId(parent.getValue().toString());



		return item;

	}



	@Override

	public List<?> getResults() {

		return items;

	}

}