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

Merge branch 'dev' into 'master' 

Actualiza dependencia model

See merge request redmic-project/server/library/view-lib!12
parents 8a7a5d8c 50ef04f1

pom.xml

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

	<artifactId>view-lib</artifactId>

	<packaging>jar</packaging>

	<version>0.11.0</version>

	<version>0.12.0</version>

	<name>view-lib</name>



	<properties>

		<!-- REDMIC -->

		<redmic.rest-lib.version>0.11.0</redmic.rest-lib.version>

		<redmic.models.version>0.11.0</redmic.models.version>

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

		<redmic.broker-lib.version>0.11.0</redmic.broker-lib.version>

		<redmic.user-settings-lib.version>0.2.0</redmic.user-settings-lib.version>

		<redmic.test-utils.version>0.10.0</redmic.test-utils.version>

src/main/java/es/redmic/viewlib/common/controller/RController.java

+9 −8
Original line number Diff line number Diff line
@@ -33,8 +33,7 @@ import org.springframework.beans.factory.annotation.Autowired; 
import org.springframework.kafka.core.KafkaTemplate;

import org.springframework.kafka.support.SendResult;

import org.springframework.util.concurrent.ListenableFuture;

import org.springframework.web.bind.annotation.RequestMapping;

import org.springframework.web.bind.annotation.RequestMethod;

import org.springframework.web.bind.annotation.GetMapping;

import org.springframework.web.bind.annotation.ResponseBody;



import es.redmic.brokerlib.avro.common.CommonDTO;
@@ -56,18 +55,18 @@ public abstract class RController<TModel extends BaseES<?>, TDTO extends CommonD 


	protected Class<TQueryDTO> typeOfTQueryDTO;



	protected Set<String> fieldsExcludedOnQuery = new HashSet<String>();

	protected Set<String> fieldsExcludedOnQuery = new HashSet<>();



	protected Map<String, Object> fixedQuery = new HashMap<String, Object>();

	protected Map<String, Object> fixedQuery = new HashMap<>();



	IBaseService<TModel, TDTO, TQueryDTO> service;



	public RController(IBaseService<TModel, TDTO, TQueryDTO> service) {

	protected RController(IBaseService<TModel, TDTO, TQueryDTO> service) {

		this.service = service;

		defineTypeOfArguments();

	}



	@RequestMapping(value = { "${controller.mapping.FILTER_SCHEMA}" }, method = RequestMethod.GET)

	@GetMapping(value = { "${controller.mapping.FILTER_SCHEMA}", "${controller.mapping.ADDITIONAL_SCHEMA}" })

	@ResponseBody

	public ElasticSearchDTO getFilterSchema() {
@@ -89,6 +88,8 @@ public abstract class RController<TModel extends BaseES<?>, TDTO extends CommonD 
			this.typeOfTDTO = (Class<TDTO>) (arguments[1]);

			this.typeOfTQueryDTO = (Class<TQueryDTO>) (arguments[2]);

			break;

		default:

			logger.error("Número de argumentos no válido.");

		}

	}

src/main/java/es/redmic/viewlib/common/mapper/es2dto/BaseESMapper.java

+12 −6
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ import es.redmic.models.es.common.dto.MetaDataDTO; 
import es.redmic.models.es.common.model.BaseES;

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

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

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



public abstract class BaseESMapper<TDTO extends CommonDTO, TModel extends BaseES<?>> {
@@ -43,20 +44,25 @@ public abstract class BaseESMapper<TDTO extends CommonDTO, TModel extends BaseES 
		return _meta;

	}



	AggregationsDTO getAggs(SearchWrapper wrapper) {

	protected AggregationsDTO getAggs(SearchWrapper wrapper) {



		return getAggs(wrapper.getAggregations());

	}



	protected AggregationsDTO getAggs(Aggregations aggregations) {



		AggregationsDTO aggs = new AggregationsDTO();



		if (wrapper.getAggregations() == null || wrapper.getAggregations().getAttributes().isEmpty())

		if (aggregations == null || aggregations.getAttributes().isEmpty())

			return aggs;



		aggs.setAttributes(getCleanAttributes(wrapper.getAggregations().getAttributes()));

		aggs.setAttributes(getCleanAttributes(aggregations.getAttributes()));



		return aggs;

	}



	@SuppressWarnings("unchecked")

	private Map<String, Object> getCleanAttributes(Map<String, Object> source) {

	protected Map<String, Object> getCleanAttributes(Map<String, Object> source) {



		Map<String, Object> attrs = new HashMap<>();

src/main/java/es/redmic/viewlib/common/service/RBaseService.java

+4 −4
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ public abstract class RBaseService<TModel extends BaseES<?>, TDTO extends Common 


	protected Class<TQueryDTO> typeOfTQueryDTO;



	protected Map<Object, Object> globalProperties = new HashMap<Object, Object>();

	protected Map<Object, Object> globalProperties = new HashMap<>();



	@Autowired

	protected ObjectMapper objectMapper;
@@ -64,7 +64,7 @@ public abstract class RBaseService<TModel extends BaseES<?>, TDTO extends Common 
	UserService userService;



	@SuppressWarnings("unchecked")

	public RBaseService() {

	protected RBaseService() {



		this.typeOfTModel = (Class<TModel>) (((ParameterizedType) getClass().getGenericSuperclass())

				.getActualTypeArguments()[0]);

src/main/java/es/redmic/viewlib/geodata/controller/GeoDataController.java

+3 −3
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ import es.redmic.models.es.common.dto.ElasticSearchDTO; 
import es.redmic.models.es.common.dto.SuperDTO;

import es.redmic.models.es.common.query.dto.MgetDTO;

import es.redmic.models.es.common.query.dto.SimpleQueryDTO;

import es.redmic.models.es.geojson.base.Feature;

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

import es.redmic.viewlib.common.controller.RController;

import es.redmic.viewlib.geodata.dto.GeoMetaDTO;

import es.redmic.viewlib.geodata.service.IGeoDataService;