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

Merge branch 'dev' into 'master' 

Feature change spatial library

See merge request redmic-project/server/library/test-utils!3
parents 5da9c612 f97b0ae5

pom.xml

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

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

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

		<version>2.0.3.RELEASE</version>

		<version>2.1.0.RELEASE</version>

		<relativePath />

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

	<artifactId>test-utils</artifactId>

	<packaging>jar</packaging>

	<version>0.6.0</version>

	<version>0.8.0</version>

	<name>Test utils</name>

	<description>Utilidades y servicios comunes para los tests</description>
@@ -25,14 +25,15 @@ 
		<java.version>1.8</java.version>



		<!-- REDMIC -->

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

		<redmic.utils.version>0.6.0</redmic.utils.version>

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

		<redmic.utils.version>0.8.0</redmic.utils.version>

		<redmic.jts4jackson.version>0.0.1</redmic.jts4jackson.version>

		

		<!-- Others -->

		<oauth.version>2.3.0.RELEASE</oauth.version>

		<jackson-datatype-jts.version>2.4</jackson-datatype-jts.version>

		<ma.glasnost.orika.core>1.4.6</ma.glasnost.orika.core>

		<powermock.version>1.7.3</powermock.version>

		<confluent.version>4.1.2</confluent.version>

		<confluent.version>5.0.1</confluent.version>

		<jersey-guava.version>2.26-b03</jersey-guava.version>



		<!-- Environment variables -->
@@ -54,20 +55,15 @@ 
		</dependency>

		

		<dependency>

			<groupId>org.springframework.security.oauth</groupId>

			<artifactId>spring-security-oauth2</artifactId>

			<version>${oauth.version}</version>

		</dependency>



		<dependency>

			<groupId>com.fasterxml.jackson.core</groupId>

			<artifactId>jackson-databind</artifactId>

			<groupId>es.redmic.lib</groupId>

			<artifactId>jts4jackson</artifactId>

			<version>${redmic.jts4jackson.version}</version>

		</dependency>



		<dependency>

			<groupId>com.bedatadriven</groupId>

			<artifactId>jackson-datatype-jts</artifactId>

			<version>${jackson-datatype-jts.version}</version>

			<groupId>org.springframework.security.oauth</groupId>

			<artifactId>spring-security-oauth2</artifactId>

			<version>${oauth.version}</version>

		</dependency>



		<dependency>
@@ -123,7 +119,6 @@ 
		<dependency>

			<groupId>org.glassfish.jersey.inject</groupId>

			<artifactId>jersey-hk2</artifactId>

			<version>${jersey.version}</version>

		</dependency>



		<dependency>

src/main/java/es/redmic/testutils/utils/JsonToBeanTestUtil.java

+3 −2
Original line number Diff line number Diff line
@@ -11,19 +11,20 @@ import java.nio.charset.StandardCharsets; 
import org.slf4j.Logger;

import org.slf4j.LoggerFactory;



import com.bedatadriven.jackson.datatype.jts.JtsModule;

import com.fasterxml.jackson.core.JsonProcessingException;

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 es.redmic.jts4jackson.module.JTSModule;



public final class JsonToBeanTestUtil {



	private final static Logger LOGGER = LoggerFactory.getLogger(JsonToBeanTestUtil.class);



	private static ObjectMapper jacksonMapper = new ObjectMapper()

			.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false).registerModule(new JtsModule());

			.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false).registerModule(new JTSModule());



	private JsonToBeanTestUtil() {