Commit 4657ddcc authored by Noel Alonso's avatar Noel Alonso
Browse files

Merge branch 'dev' into 'master' 

Actualiza imagen de compilación

See merge request redmic-project/server/library/view-lib!1
parents 74bd23b5 b49f99ed

.gitlab-ci.yml

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ stages: 


maven-build:

  stage: build

  image: redmic/maven-gitlab

  image: registry.gitlab.com/redmic-project/docker/maven

  variables:

    MAVEN_OPTS: "-Dmaven.repo.local=.m2/repository"

  only:

pom.xml

+7 −0
Original line number Diff line number Diff line
@@ -72,4 +72,11 @@ 
			<uniqueVersion>false</uniqueVersion>

		</snapshotRepository>

	</distributionManagement>

	<repositories>

		<repository>

			<id>confluent</id>

			<name>Confluent</name>

			<url>https://packages.confluent.io/maven/</url>

		</repository>

	</repositories>

</project>

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

+33 −65
Original line number Diff line number Diff line
@@ -7,35 +7,38 @@ import java.util.HashSet; 
import java.util.Map;

import java.util.Set;



import javax.validation.Valid;



import org.springframework.validation.BindingResult;

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

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

import org.apache.logging.log4j.LogManager;

import org.apache.logging.log4j.Logger;

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.RequestParam;

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



import es.redmic.brokerlib.avro.common.CommonDTO;

import es.redmic.exception.databinding.DTONotValidException;

import es.redmic.brokerlib.avro.common.Event;

import es.redmic.brokerlib.listener.SendListener;

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

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

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

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

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

import es.redmic.viewlib.common.dto.MetaDTO;

import es.redmic.viewlib.common.service.IBaseService;



public abstract class RController<TModel extends BaseES<?>, TDTO extends CommonDTO, TQueryDTO extends SimpleQueryDTO> {



	private static Logger logger = LogManager.getLogger();



	@Autowired

	protected KafkaTemplate<String, Event> kafkaTemplate;



	protected Class<TDTO> typeOfTDTO;



	protected Class<TQueryDTO> typeOfTQueryDTO;



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

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



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

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



	IBaseService<TModel, TDTO, TQueryDTO> service;
@@ -44,59 +47,6 @@ public abstract class RController<TModel extends BaseES<?>, TDTO extends CommonD 
		defineTypeOfArguments();

	}



	@RequestMapping(value = "", method = RequestMethod.GET)

	@ResponseBody

	public SuperDTO _search(@RequestParam(required = false, value = "fields") String[] fields,

			@RequestParam(required = false, value = "text") String text,

			@RequestParam(required = false, value = "from") Integer from,

			@RequestParam(required = false, value = "size") Integer size) {



		return new ElasticSearchDTO(service.find(fields, text, from, size, fixedQuery, fieldsExcludedOnQuery));

	}



	@RequestMapping(value = "/_search", method = RequestMethod.POST)

	@ResponseBody

	public SuperDTO _advancedSearch(@Valid @RequestBody TQueryDTO queryDTO, BindingResult bindingResult) {



		if (bindingResult != null && bindingResult.hasErrors())

			throw new DTONotValidException(bindingResult);



		return new ElasticSearchDTO(service.find(queryDTO, fixedQuery, fieldsExcludedOnQuery));

	}



	@RequestMapping(value = "/{id}", method = RequestMethod.GET)

	@ResponseBody

	public SuperDTO _get(@PathVariable("id") String id) {



		MetaDTO<?> response = service.findById(id);

		return new ElasticSearchDTO(response, response.get_source() == null ? 0 : 1);

	}



	@RequestMapping(value = "/_mget", method = RequestMethod.POST)

	@ResponseBody

	public SuperDTO _mget(@Valid @RequestBody MgetDTO dto, BindingResult errorDto) {



		if (errorDto.hasErrors())

			throw new DTONotValidException(errorDto);



		return new ElasticSearchDTO(service.mget(dto));

	}



	@RequestMapping(value = "/_suggest", method = RequestMethod.GET)

	@ResponseBody

	public SuperDTO _suggest(@RequestParam(required = false, value = "fields") String[] fields,

			@RequestParam("text") String text, @RequestParam(required = false, value = "size") Integer size) {



		return new ElasticSearchDTO(service.suggest(fields, text, size, fixedQuery, fieldsExcludedOnQuery));

	}



	@RequestMapping(value = "/_suggest", method = RequestMethod.POST)

	@ResponseBody

	public SuperDTO _advancedSuggest(@Valid @RequestBody TQueryDTO queryDTO, BindingResult bindingResult) {



		return new ElasticSearchDTO(service.suggest(queryDTO, fixedQuery, fieldsExcludedOnQuery));

	}



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

	@ResponseBody

	public ElasticSearchDTO getFilterSchema() {
@@ -133,4 +83,22 @@ public abstract class RController<TModel extends BaseES<?>, TDTO extends CommonD 
	protected void setFixedQuery(String term, Object value) {

		fixedQuery.put(term, value);

	}



	protected void publishFailedEvent(Event event, String topic) {



		logger.info("sending FailedEvent='{}' to topic='{}'", event, topic);



		ListenableFuture<SendResult<String, Event>> future = kafkaTemplate.send(topic, event.getAggregateId(), event);



		future.addCallback(new SendListener());

	}



	protected void publishConfirmedEvent(Event event, String topic) {



		logger.info("sending ConfirmEvent='{}' to topic='{}'", event, topic);



		ListenableFuture<SendResult<String, Event>> future = kafkaTemplate.send(topic, event.getAggregateId(), event);



		future.addCallback(new SendListener());

	}

}

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

deleted100644 → 0
+0 −46
Original line number Diff line number Diff line 
package es.redmic.viewlib.common.controller;



import org.apache.logging.log4j.LogManager;

import org.apache.logging.log4j.Logger;

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 es.redmic.brokerlib.avro.common.CommonDTO;

import es.redmic.brokerlib.avro.common.Event;

import es.redmic.brokerlib.listener.SendListener;

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

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

import es.redmic.viewlib.common.service.IBaseService;



public abstract class RWController<TModel extends BaseES<?>, TDTO extends CommonDTO, TQueryDTO extends SimpleQueryDTO>

		extends RController<TModel, TDTO, TQueryDTO> {



	private static Logger logger = LogManager.getLogger();



	@Autowired

	protected KafkaTemplate<String, Event> kafkaTemplate;



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

		super(service);

	}



	protected void publishFailedEvent(Event event, String topic) {



		logger.info("sending FailedEvent='{}' to topic='{}'", event, topic);



		ListenableFuture<SendResult<String, Event>> future = kafkaTemplate.send(topic, event.getAggregateId(), event);



		future.addCallback(new SendListener());

	}



	protected void publishConfirmedEvent(Event event, String topic) {



		logger.info("sending ConfirmEvent='{}' to topic='{}'", event, topic);



		ListenableFuture<SendResult<String, Event>> future = kafkaTemplate.send(topic, event.getAggregateId(), event);



		future.addCallback(new SendListener());

	}

}

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

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ import org.springframework.stereotype.Component; 


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

import es.redmic.models.es.data.common.model.DataHitsWrapper;

import es.redmic.viewlib.common.dto.MetaDTO;

import es.redmic.viewlib.data.dto.MetaDTO;

import ma.glasnost.orika.CustomMapper;

import ma.glasnost.orika.MappingContext;