Commit 6a59f9cc authored by Noel Alonso's avatar Noel Alonso
Browse files

Merge branch 'legacy-0.6' into dev

parents 296eea72 6410ebdb

pom.xml

+36 −2
Original line number Diff line number Diff line
@@ -33,6 +33,14 @@ 
		<!-- OTHERS -->

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

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

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

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



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

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



		<!-- Version plugins -->

		<jacoco.version>0.8.1</jacoco.version>



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

	</properties>
@@ -99,6 +107,13 @@ 
			<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>
@@ -117,10 +132,29 @@ 
			<scope>provided</scope>

		</dependency>



		<!-- Logs -->

		<dependency>

			<groupId>org.apache.logging.log4j</groupId>

			<artifactId>log4j-api</artifactId>

			<scope>provided</scope>

		</dependency>

		<dependency>

			<groupId>org.apache.logging.log4j</groupId>

			<artifactId>log4j-core</artifactId>

			<scope>provided</scope>

		</dependency>



		<!-- test -->

		<dependency>

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

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

			<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>

			<scope>test</scope>

		</dependency>

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

+17 −3
Original line number Diff line number Diff line
@@ -21,11 +21,13 @@ package es.redmic.models.es.administrative.dto; 
 */



import javax.validation.constraints.NotNull;



import java.util.ArrayList;

import java.util.List;

import com.fasterxml.jackson.annotation.JsonIgnoreProperties;

import com.fasterxml.jackson.databind.annotation.JsonDeserialize;

import com.fasterxml.jackson.databind.annotation.JsonSerialize;

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

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

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



import es.redmic.models.es.common.deserializer.CustomRelationDeserializer;
@@ -49,8 +51,12 @@ public class ActivityDTO extends ActivityBaseDTO { 
	@JsonSchemaIgnore

	private String activityCategory;



	@JsonSchemaUniqueItemsByRequiredProperties

	private List<ActivityResourceDTO> resources;



	public ActivityDTO() {

		super();

		this.resources = new ArrayList<>();

	}



	public AncestorActivityDTO getParent() {
@@ -76,4 +82,12 @@ public class ActivityDTO extends ActivityBaseDTO { 
	public void setActivityCategory(String activityCategory) {

		this.activityCategory = activityCategory;

	}



	public List<ActivityResourceDTO> getResources() {

		return this.resources;

	}



	public void setResources(List<ActivityResourceDTO> resources) {

		this.resources = resources;

	}

}

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

0 → 100644
+58 −0
Original line number Diff line number Diff line 
package es.redmic.models.es.administrative.dto;



import javax.validation.constraints.NotNull;

import javax.validation.constraints.Size;



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



public class ActivityResourceDTO extends DTOImplement {



	@NotNull

	@Size(min = 1, max = 100)

	private String name;



	@Size(min = 0, max = 1500)

	private String description;



	@NotNull

	@Size(min = 1, max = 500)

	private String urlResource;



	public ActivityResourceDTO() {

		// default constructor

	}



	public String getName() {

		return this.name;

	}



	public void setName(String name) {

		this.name = name;

	}



	public String getDescription() {

		return this.description;

	}



	public void setDescription(String description) {

		this.description = description;

	}



	public String getUrlResource() {

		return this.urlResource;

	}



	public void setUrlResource(String urlResource) {

		this.urlResource = urlResource;

	}



	@Override

	public boolean equals(Object obj) {

		return super.equals(obj);

	}



	@Override

	public int hashCode() {

		return super.hashCode();

	}

}

src/main/java/es/redmic/models/es/administrative/model/Activity.java

+14 −3
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ package es.redmic.models.es.administrative.model; 
 * #L%

 */



import java.util.List;

import com.fasterxml.jackson.annotation.JsonIgnoreProperties;

import com.fasterxml.jackson.annotation.JsonProperty;
@@ -40,6 +41,8 @@ public class Activity extends ActivityBase { 


	private String activityCategory;



	private List<ActivityResource> resources;



	public Activity() {

		super();

	}
@@ -59,4 +62,12 @@ public class Activity extends ActivityBase { 
	public void setActivityCategory(String activityCategory) {

		this.activityCategory = activityCategory;

	}



	public List<ActivityResource> getResources() {

		return resources;

	}



	public void setResources(List<ActivityResource> resources) {

		this.resources = resources;

	}

}

src/main/java/es/redmic/models/es/administrative/model/ActivityResource.java

0 → 100644
+40 −0
Original line number Diff line number Diff line 
package es.redmic.models.es.administrative.model;



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



public class ActivityResource extends BaseAbstractES {



	private String name;



	private String description;



	private String urlResource;



	public ActivityResource() {

		// default constructor

	}



	public String getName() {

		return this.name;

	}



	public void setName(String name) {

		this.name = name;

	}



	public String getDescription() {

		return this.description;

	}



	public void setDescription(String description) {

		this.description = description;

	}



	public String getUrlResource() {

		return this.urlResource;

	}



	public void setUrlResource(String urlResource) {

		this.urlResource = urlResource;

	}

}