Commit 374db9e6 authored by Noel Alonso's avatar Noel Alonso
Browse files

Merge branch 'dev' into 'feature-realTime' 

# Conflicts:
#   pom.xml
parents e30ab1da c019df27

pom.xml

+24 −45
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>

<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

<project xmlns="http://maven.apache.org/POM/4.0.0"

	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">



	<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>
@@ -13,7 +14,7 @@ 
	<groupId>es.redmic.lib</groupId>

	<artifactId>models</artifactId>

	<packaging>jar</packaging>

	<version>0.6.1</version>

	<version>0.8.1</version>

	<name>Models</name>

	<description>Input-output classes and models</description>
@@ -25,16 +26,14 @@ 
		<java.version>1.8</java.version>



		<!-- REDMIC -->

		<redmic.exceptions.version>0.6.0</redmic.exceptions.version>

		<redmic.jackson-jsonschema.version>0.6.0</redmic.jackson-jsonschema.version>

		<redmic.exceptions.version>0.7.0</redmic.exceptions.version>

		<redmic.jackson-jsonschema.version>0.7.0</redmic.jackson-jsonschema.version>

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

		

		<!-- OTHERS -->

		<commons-beanutils.version>1.9.3</commons-beanutils.version>

		<geotools.version>19.0</geotools.version>

		<commons-io.version>2.6</commons-io.version>

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

		<geotools.version>20.1</geotools.version>

		

		<hibernate-validator.version>6.0.8.Final</hibernate-validator.version>

		<org.mockito-version>1.10.19</org.mockito-version>



		<!-- Version plugins -->
@@ -60,6 +59,12 @@ 
			<version>${redmic.jackson-jsonschema.version}</version>

		</dependency>

		

		<dependency>

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

			<artifactId>jts4jackson</artifactId>

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

		</dependency>



		<!-- Spring -->

		<!-- Para multpartfile -->

		<dependency>
@@ -100,31 +105,12 @@ 
			<version>${geotools.version}</version>

		</dependency>



		<dependency>

			<groupId>commons-io</groupId>

			<artifactId>commons-io</artifactId>

			<version>${commons-io.version}</version>

			<scope>provided</scope>

		</dependency>



		<!-- Jackson -->

		<dependency>

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

			<artifactId>jackson-datatype-joda</artifactId>

		</dependency>



		<dependency>

			<groupId>com.bedatadriven</groupId>

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

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

			<exclusions>

				<exclusion>

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

      				<artifactId>jackson-databind</artifactId>

				</exclusion>

			</exclusions>

		</dependency>



		<dependency>

			<groupId>org.apache.commons</groupId>

			<artifactId>commons-lang3</artifactId>
@@ -151,15 +137,8 @@ 


		<!-- test -->

		<dependency>

			<groupId>org.mockito</groupId>

			<artifactId>mockito-all</artifactId>

			<version>${org.mockito-version}</version>

			<scope>test</scope>

		</dependency>

		

		<dependency>

			<groupId>org.skyscreamer</groupId>

			<artifactId>jsonassert</artifactId>

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

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

			<scope>test</scope>

		</dependency>

src/main/java/es/redmic/models/es/administrative/dto/ContactDTO.java

+1 −1
Original line number Diff line number Diff line 
package es.redmic.models.es.administrative.dto;



import javax.validation.constraints.Email;

import javax.validation.constraints.Size;



import org.hibernate.validator.constraints.Email;

import org.joda.time.DateTime;



import com.fasterxml.jackson.annotation.JsonIgnoreProperties;

src/main/java/es/redmic/models/es/administrative/dto/OrganisationDTO.java

+1 −1
Original line number Diff line number Diff line 
package es.redmic.models.es.administrative.dto;



import javax.validation.constraints.Email;

import javax.validation.constraints.NotNull;

import javax.validation.constraints.Size;



import org.hibernate.validator.constraints.Email;

import org.joda.time.DateTime;



import com.fasterxml.jackson.annotation.JsonIgnoreProperties;

src/main/java/es/redmic/models/es/atlas/dto/LayerDTO.java

+6 −5
Original line number Diff line number Diff line
@@ -9,16 +9,16 @@ import java.util.Map; 
import org.geotools.data.ows.CRSEnvelope;

import org.geotools.data.ows.Layer;

import org.geotools.data.ows.StyleImpl;

import org.locationtech.jts.geom.Coordinate;

import org.locationtech.jts.geom.Geometry;

import org.locationtech.jts.geom.GeometryFactory;

import org.locationtech.jts.geom.LinearRing;

import org.locationtech.jts.geom.Polygon;



import com.fasterxml.jackson.annotation.JsonGetter;

import com.fasterxml.jackson.annotation.JsonIgnore;

import com.fasterxml.jackson.annotation.JsonIgnoreProperties;

import com.fasterxml.jackson.annotation.JsonSetter;

import com.vividsolutions.jts.geom.Coordinate;

import com.vividsolutions.jts.geom.Geometry;

import com.vividsolutions.jts.geom.GeometryFactory;

import com.vividsolutions.jts.geom.LinearRing;

import com.vividsolutions.jts.geom.Polygon;



import es.redmic.exception.custom.ResourceNotFoundException;

import es.redmic.models.es.administrative.dto.AncestorActivityDTO;
@@ -227,6 +227,7 @@ public class LayerDTO extends LayerCompactDTO { 
		}

	}



	@Override

	public String toString() {



		String result = "Name: " + getId() + "\nTitle: " + getTitle() + "\nAbstract: " + getAbstractLayer() + "\nSRS: "

src/main/java/es/redmic/models/es/atlas/model/LayerModel.java

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ package es.redmic.models.es.atlas.model; 


import java.util.List;



import com.vividsolutions.jts.geom.Geometry;

import org.locationtech.jts.geom.Geometry;



import es.redmic.models.es.administrative.model.ActivityReferences;

import es.redmic.models.es.atlas.Contact;