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

Merge branch 'release-0.14.0' into 'master' 

Release 0.14.0

See merge request redmic-project/server/library/models!25
parents b84c9795 c14fc76d

pom.xml

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
	<groupId>es.redmic.lib</groupId>

	<artifactId>models</artifactId>

	<packaging>jar</packaging>

	<version>0.13.0</version>

	<version>0.14.0</version>

	<name>Models</name>

	<description>Input-output classes and models</description>

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

+42 −3
Original line number Diff line number Diff line
@@ -29,10 +29,12 @@ import javax.validation.constraints.Size; 
import org.joda.time.DateTime;

import org.springframework.util.StringUtils;



import com.fasterxml.jackson.annotation.JsonFilter;

import com.fasterxml.jackson.annotation.JsonIgnore;

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

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

import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaUrl;
@@ -42,9 +44,11 @@ import es.redmic.models.es.common.deserializer.CustomRelationDeserializer; 
import es.redmic.models.es.common.serializer.CustomDateTimeSerializer;

import es.redmic.models.es.maintenance.administrative.dto.DocumentTypeDTO;



@JsonFilter("InternalDocumentFilter")

public class DocumentDTO extends DocumentCompactDTO {



	@Size(min = 0, max = 20)

	@NotNull

	@Size(min = 1, max = 20)

	private String code;



	@NotNull
@@ -68,6 +72,17 @@ public class DocumentDTO extends DocumentCompactDTO { 
	@JsonSchemaUrl(value = "controller.mapping.DOCUMENT_TYPE")

	private DocumentTypeDTO documentType;



	@Size(min = 0, max = 250)

	private String internalUrl;



	@NotNull

	@JsonSchemaDefault(value = "false")

	private Boolean privateInternalUrl = false;



	@NotNull

	@JsonSchemaDefault(value = "true")

	private Boolean enabled;



	@JsonSchemaIgnore

	@JsonSerialize(using = CustomDateTimeSerializer.class)

	@JsonDeserialize(using = CustomDateTimeDeserializer.class)
@@ -148,6 +163,30 @@ public class DocumentDTO extends DocumentCompactDTO { 
		this.documentType = documentType;

	}



	public String getInternalUrl() {

		return this.internalUrl;

	}



	public void setInternalUrl(String internalUrl) {

		this.internalUrl = internalUrl;

	}



	public Boolean getPrivateInternalUrl() {

		return this.privateInternalUrl;

	}



	public void setPrivateInternalUrl(Boolean privateInternalUrl) {

		this.privateInternalUrl = privateInternalUrl;

	}



	public void setEnabled(Boolean enabled) {

		this.enabled = enabled;

	}



	public Boolean getEnabled() {

		return this.enabled;

	}



	public DateTime getUpdated() {

		return updated;

	}

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

+32 −2
Original line number Diff line number Diff line
@@ -50,6 +50,12 @@ public class Document extends DocumentCompact { 


	private String remark;



	private String internalUrl;



	private Boolean privateInternalUrl;



	private Boolean enabled;



	@JsonSerialize(using = CustomDateTimeSerializer.class)

	@JsonDeserialize(using = CustomDateTimeDeserializer.class)

	private DateTime updated;
@@ -104,6 +110,30 @@ public class Document extends DocumentCompact { 
		this.remark = remark;

	}



	public String getInternalUrl() {

		return this.internalUrl;

	}



	public void setInternalUrl(String internalUrl) {

		this.internalUrl = internalUrl;

	}



	public Boolean getPrivateInternalUrl() {

		return this.privateInternalUrl;

	}



	public void setPrivateInternalUrl(Boolean privateInternalUrl) {

		this.privateInternalUrl = privateInternalUrl;

	}



	public Boolean getEnabled() {

		return this.enabled;

	}



	public void setEnabled(Boolean enabled) {

		this.enabled = enabled;

	}



	public DateTime getUpdated() {

		return updated;

	}

src/test/java/es/redmic/test/unit/common/dto/CompleteDTOUtils.java

+3 −0
Original line number Diff line number Diff line
@@ -179,10 +179,13 @@ public class CompleteDTOUtils { 
		DocumentDTO documentDTO = new DocumentDTO();



		documentDTO.setTitle("title");

		documentDTO.setCode("code");

		documentDTO.setYear(2000);

		documentDTO.setAuthor("author");

		documentDTO.setSource("source");

		documentDTO.setLanguage("es");

		documentDTO.setEnabled(true);

		documentDTO.setPrivateInternalUrl(true);



		DocumentTypeDTO documentTypeDTO = new DocumentTypeDTO();

		documentTypeDTO.setName("name");

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

+4 −4

File changed.

Contains only whitespace changes.

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

+2 −2

File changed.

Contains only whitespace changes.