Renombra campo de referencias a actividades (76fcb2de) · Commits · REDMIC Project / Server / Atlas

atlas-commands/src/test/resources/data/layers/layerDTO.json

+1 −1

Original line number	Diff line number	Diff line
		@@ -94,7 +94,7 @@
		"address": "Edf. Puerto-Ciudad, of. 1b, S/C de Tenerife 38001 Spain ",
		"email": "gis@oag-fundacion.org"
		},
		"activities": [
		"relatedActivities": [
		{
		"activity": {
		"id": "817"

atlas-commands/src/test/resources/data/layers/layerInfoDTO.json

+1 −1

Original line number	Diff line number	Diff line
		@@ -3,7 +3,7 @@
		"id": "category-213423",
		"name": "Batimetrías"
		},
		"activities": [
		"relatedActivities": [
		{
		"activity": {
		"id": "817"

atlas-commands/src/test/resources/data/schemas/layerschema.json

+1 −1

Original line number	Diff line number	Diff line
		@@ -11,7 +11,7 @@
		"minLength": 1,
		"maxLength": 500
		},
		"activities": {
		"relatedActivities": {
		"type": ["array", "null"],
		"uniqueItemsByRequiredProperties": true,
		"uniqueItems": true,

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

+10 −10

Original line number	Diff line number	Diff line
		@@ -40,12 +40,12 @@ public abstract class LayerCompactDTO extends LayerBaseDTO {
		public LayerCompactDTO() {
		super();
		this.protocols = new ArrayList<>();
		this.activities = new ArrayList<>();
		this.relatedActivities = new ArrayList<>();
		}

		@JsonSchemaUniqueItemsByRequiredProperties
		@Valid
		private List<LayerActivityDTO> activities;
		private List<LayerActivityDTO> relatedActivities;

		@JsonDeserialize(using = CustomRelationDeserializer.class)
		@JsonSchemaUrlUuid(value = "controller.mapping.THEME_INSPIRE")
		@@ -86,12 +86,12 @@ public abstract class LayerCompactDTO extends LayerBaseDTO {

		private String styles;

		public List<LayerActivityDTO> getActivities() {
		return this.activities;
		public List<LayerActivityDTO> getRelatedActivities() {
		return this.relatedActivities;
		}

		public void setActivities(List<LayerActivityDTO> activities) {
		this.activities = activities;
		public void setRelatedActivities(List<LayerActivityDTO> relatedActivities) {
		this.relatedActivities = relatedActivities;
		}

		public ThemeInspireDTO getThemeInspire() {
		@@ -197,7 +197,7 @@ public abstract class LayerCompactDTO extends LayerBaseDTO {
		result = prime * result + ((urlSource == null) ? 0 : urlSource.hashCode());
		result = prime * result + ((styles == null) ? 0 : styles.hashCode());
		result = prime * result + ((themeInspire == null) ? 0 : themeInspire.hashCode());
		result = prime * result + ((activities == null) ? 0 : activities.hashCode());
		result = prime * result + ((relatedActivities == null) ? 0 : relatedActivities.hashCode());
		return result;
		}

		@@ -265,10 +265,10 @@ public abstract class LayerCompactDTO extends LayerBaseDTO {
		return false;
		} else if (!themeInspire.equals(other.themeInspire))
		return false;
		if (activities == null) {
		if (other.activities != null)
		if (relatedActivities == null) {
		if (other.relatedActivities != null)
		return false;
		} else if (!activities.equals(other.activities))
		} else if (!relatedActivities.equals(other.relatedActivities))
		return false;
		return true;
		}

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

+3 −3

Original line number	Diff line number	Diff line
		@@ -80,7 +80,7 @@ public class LayerDTO extends LayerInfoDTO {
		+ "{\"name\":\"updated\",\"type\":[\"null\",{\"type\":\"long\",\"logicalType\":\"timestamp-millis\"}],"
		+ "\"default\": null},"
		+ "{\"name\":\"parent\",\"type\":" + CategoryDTO.SCHEMA$ + "},"
		+ "{\"name\":\"activities\",\"type\": [\"null\", {\"type\": \"array\",\"items\": "+ LayerActivityDTO.SCHEMA$ +"}],\"default\":null},"
		+ "{\"name\":\"relatedActivities\",\"type\": [\"null\", {\"type\": \"array\",\"items\": "+ LayerActivityDTO.SCHEMA$ +"}],\"default\":null},"
		+ "{\"name\":\"themeInspire\",\"type\":["+ ThemeInspireDTO.SCHEMA$ +", \"null\"], \"default\": null },"
		+ "{\"name\":\"latLonBoundsImage\",\"type\":[" + LatLonBoundingBoxDTO.SCHEMA$ + ", \"null\"], \"default\": null },"
		+ "{\"name\":\"protocols\",\"type\": [{\"type\": \"array\",\"items\":" + ProtocolDTO.SCHEMA$ + "}]},"
		@@ -332,7 +332,7 @@ public class LayerDTO extends LayerInfoDTO {
		case 16:
		return getParent();
		case 17:
		return getActivities();
		return getRelatedActivities();
		case 18:
		return getThemeInspire();
		case 19:
		@@ -427,7 +427,7 @@ public class LayerDTO extends LayerInfoDTO {
		setParent((CategoryDTO) value);
		break;
		case 17:
		setActivities(value != null ? (java.util.List) value : null);
		setRelatedActivities(value != null ? (java.util.List) value : null);
		break;
		case 18:
		setThemeInspire(value != null ? (ThemeInspireDTO) value : null);