Commit 0ba3345f authored by Noel Alonso's avatar Noel Alonso
Browse files

Merge branch 'dev' into 'master' 

Actualiza versión

See merge request redmic-project/server/library/view-lib!2
parents 4657ddcc 3aa7849b

pom.xml

+5 −5
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
	<parent>

		<groupId>org.springframework.boot</groupId>

   		<artifactId>spring-boot-starter-parent</artifactId>

    	<version>2.0.0.RELEASE</version>

    	<version>2.1.0.RELEASE</version>

		<relativePath/>

	</parent>
@@ -12,7 +12,7 @@ 
	<groupId>es.redmic.lib</groupId>

	<artifactId>view-lib</artifactId>

	<packaging>jar</packaging>

	<version>0.6.0</version>

	<version>0.8.0</version>

	<name>view-lib</name>

	

	<properties>
@@ -22,9 +22,9 @@ 
		<maven.compiler.target>1.8</maven.compiler.target>

		<java.version>1.8</java.version>

		<!-- REDMIC -->

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

		<redmic.models.version>0.6.0</redmic.models.version>

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

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

		<redmic.models.version>0.8.0</redmic.models.version>

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

		

		<!-- OTHERS -->

		<ma.glasnost.orika.core.version>1.5.2</ma.glasnost.orika.core.version>

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

+2 −2
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ public abstract class RController<TModel extends BaseES<?>, TDTO extends CommonD 


	protected void publishFailedEvent(Event event, String topic) {



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

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



		ListenableFuture<SendResult<String, Event>> future = kafkaTemplate.send(topic, event.getAggregateId(), event);
@@ -95,7 +95,7 @@ public abstract class RController<TModel extends BaseES<?>, TDTO extends CommonD 


	protected void publishConfirmedEvent(Event event, String topic) {



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

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



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

src/main/java/es/redmic/viewlib/geodata/dto/GeoMetaDTO.java

+2 −1
Original line number Diff line number Diff line 
package es.redmic.viewlib.geodata.dto;



import org.locationtech.jts.geom.Geometry;



import com.fasterxml.jackson.annotation.JsonUnwrapped;

import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaIgnore;

import com.vividsolutions.jts.geom.Geometry;



import es.redmic.brokerlib.avro.geodata.common.FeatureDTO;

import es.redmic.brokerlib.avro.geodata.common.PropertiesBaseDTO;