Commit 46368e4d authored by Noel Alonso's avatar Noel Alonso
Browse files

Permite que urlSource y name sean editados 

Para ello deben estar en layerInfoDTO
parent 2cc00731

atlas-lib/src/main/java/es/redmic/atlaslib/dto/layer/LayerBaseDTO.java

+4 −2
Original line number Diff line number Diff line
@@ -20,13 +20,15 @@ package es.redmic.atlaslib.dto.layer; 
 * #L%

 */



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

import javax.validation.constraints.NotNull;

import javax.validation.constraints.Size;



import es.redmic.brokerlib.avro.common.CommonDTO;



public abstract class LayerBaseDTO extends CommonDTO {



	@JsonSchemaIgnore

	@Size(min = 1, max = 500)

	@NotNull

	private String name;



	public LayerBaseDTO() {

atlas-lib/src/main/java/es/redmic/atlaslib/dto/layer/LayerCompactDTO.java

+17 −0
Original line number Diff line number Diff line
@@ -70,6 +70,9 @@ public abstract class LayerCompactDTO extends LayerBaseDTO { 
	@JsonSchemaDefault(value = "0")

	private Integer refresh = 0;



	@NotNull

	private String urlSource;



	public ThemeInspireDTO getThemeInspire() {

		return themeInspire;

	}
@@ -126,6 +129,14 @@ public abstract class LayerCompactDTO extends LayerBaseDTO { 
		this.refresh = refresh;

	}



	public String getUrlSource() {

		return urlSource;

	}



	public void setUrlSource(String urlSource) {

		this.urlSource = urlSource;

	}



	@Override

	public int hashCode() {

		final int prime = 31;
@@ -136,6 +147,7 @@ public abstract class LayerCompactDTO extends LayerBaseDTO { 
		result = prime * result + ((latLonBoundsImage == null) ? 0 : latLonBoundsImage.hashCode());

		result = prime * result + ((protocols == null) ? 0 : protocols.hashCode());

		result = prime * result + ((refresh == null) ? 0 : refresh.hashCode());

		result = prime * result + ((urlSource == null) ? 0 : urlSource.hashCode());

		result = prime * result + ((themeInspire == null) ? 0 : themeInspire.hashCode());

		return result;

	}
@@ -179,6 +191,11 @@ public abstract class LayerCompactDTO extends LayerBaseDTO { 
				return false;

		} else if (!refresh.equals(other.refresh))

			return false;

		if (urlSource == null) {

			if (other.urlSource != null)

				return false;

		} else if (!urlSource.equals(other.urlSource))

			return false;

		if (themeInspire == null) {

			if (other.themeInspire != null)

				return false;