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

Añade dominio resourceType

parent 3df704de

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

+16 −19
Original line number Diff line number Diff line
@@ -23,16 +23,21 @@ package es.redmic.models.es.administrative.dto; 
import javax.validation.constraints.NotNull;

import javax.validation.constraints.Size;



import com.fasterxml.jackson.annotation.JsonIgnoreProperties;

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

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



import es.redmic.models.es.common.deserializer.CustomRelationDeserializer;

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

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



public class ActivityResourceDTO extends DTOImplement {



	@JsonIgnoreProperties(value = {"_meta"})

	@NotNull

	@Size(min = 1, max = 100)

	private String name;



	@Size(min = 0, max = 1500)

	private String description;

	@JsonDeserialize(using = CustomRelationDeserializer.class)

	@JsonSchemaUrl(value="controller.mapping.RESOURCE_TYPE")

	private ResourceTypeDTO resourceType;



	@NotNull

	@Size(min = 1, max = 500)
@@ -42,20 +47,12 @@ public class ActivityResourceDTO extends DTOImplement { 
		// default constructor

	}



	public String getName() {

		return this.name;

	}



	public void setName(String name) {

		this.name = name;

	}



	public String getDescription() {

		return this.description;

	public ResourceTypeDTO getResourceType() {

		return this.resourceType;

	}



	public void setDescription(String description) {

		this.description = description;

	public void setResourceType(ResourceTypeDTO resourceType) {

		this.resourceType = resourceType;

	}



	public String getUrlResource() {

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

+8 −17
Original line number Diff line number Diff line
@@ -21,12 +21,11 @@ package es.redmic.models.es.administrative.model; 
 */



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

import es.redmic.models.es.maintenance.administrative.model.ResourceType;



public class ActivityResource extends BaseAbstractES {



	private String name;



	private String description;

	private ResourceType resourceType;



	private String urlResource;
@@ -34,20 +33,12 @@ public class ActivityResource extends BaseAbstractES { 
		// default constructor

	}



	public String getName() {

		return this.name;

	}



	public void setName(String name) {

		this.name = name;

	}



	public String getDescription() {

		return this.description;

	public ResourceType getResourceType() {

		return this.resourceType;

	}



	public void setDescription(String description) {

		this.description = description;

	public void setResourceType(ResourceType resourceType) {

		this.resourceType = resourceType;

	}



	public String getUrlResource() {

src/main/java/es/redmic/models/es/maintenance/administrative/dto/ResourceTypeDTO.java

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



import javax.validation.constraints.Size;



/*-

 * #%L

 * Models

 * %%

 * Copyright (C) 2019 REDMIC Project / Server

 * %%

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 * #L%

 */



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



public class ResourceTypeDTO extends DomainImplDTO {



	@Size(min = 0, max = 1500)

	private String description;



	public ResourceTypeDTO() {

		super();

	}



	public String getDescription() {

		return this.description;

	}



	public void setDescription(String description) {

		this.description = description;

	}

}

src/main/java/es/redmic/models/es/maintenance/administrative/model/ResourceType.java

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



/*-

 * #%L

 * Models

 * %%

 * Copyright (C) 2019 REDMIC Project / Server

 * %%

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 * #L%

 */



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



public class ResourceType extends DomainES {



	private String description;



	public ResourceType() {

		super();

	}



	public String getDescription() {

		return this.description;

	}



	public void setDescription(String description) {

		this.description = description;

	}

}