Commit 6a178728 authored by Noel Alonso's avatar Noel Alonso
Browse files

Añade filtro con comportamiento por defecto 

Para evitar error al no estar definido, se añade filtro con
comportamiento por defecto.
parent 00083fa3

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;

	}

}

src/test/java/es/redmic/test/unit/geodata/common/JsonToBeanTestUtil.java

+6 −0
Original line number Diff line number Diff line
@@ -31,6 +31,8 @@ import com.fasterxml.jackson.core.type.TypeReference; 
import com.fasterxml.jackson.databind.DeserializationFeature;

import com.fasterxml.jackson.databind.JavaType;

import com.fasterxml.jackson.databind.ObjectMapper;

import com.fasterxml.jackson.databind.ser.impl.SimpleBeanPropertyFilter;

import com.fasterxml.jackson.databind.ser.impl.SimpleFilterProvider;



import ma.glasnost.orika.MappingContext;
@@ -40,6 +42,10 @@ public class JsonToBeanTestUtil { 
			.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false).registerModule(new JtsModule());



	public JsonToBeanTestUtil() {



		SimpleFilterProvider filterProvider = new SimpleFilterProvider();

		filterProvider.addFilter("InternalDocumentFilter", SimpleBeanPropertyFilter.serializeAll());

		jacksonMapper.setFilterProvider(filterProvider);

	}



	protected String getJsonString(String filePath) throws IOException {