From fc5702325e1d4830825789ff0e42360486337c47 Mon Sep 17 00:00:00 2001 From: Fabio Sinibaldi Date: Thu, 3 Dec 2020 20:23:38 +0100 Subject: [PATCH 1/3] model update --- CHANGELOG.md | 4 ++++ pom.xml | 2 +- .../common/model/legacy/LayerConcessione.java | 11 +++++++++++ .../model/legacy/SDILayerDescriptor.java | 19 +++++++++---------- 4 files changed, 25 insertions(+), 11 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 40b2d49..84eb897 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm # Changelog for org.gcube.application.geoportal-common +## [v1.0.1-SNAPSHOT] - 2020-11-11 + +Model update + ## [v1.0.0] - 2020-11-11 First release \ No newline at end of file diff --git a/pom.xml b/pom.xml index 101f4bf..6a0e459 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.gcube.application geoportal-common - 1.0.0 + 1.0.1-SNAPSHOT Geoportal Common diff --git a/src/main/java/org/gcube/application/geoportal/common/model/legacy/LayerConcessione.java b/src/main/java/org/gcube/application/geoportal/common/model/legacy/LayerConcessione.java index 784d9ce..49c0e09 100644 --- a/src/main/java/org/gcube/application/geoportal/common/model/legacy/LayerConcessione.java +++ b/src/main/java/org/gcube/application/geoportal/common/model/legacy/LayerConcessione.java @@ -14,6 +14,17 @@ import lombok.Setter; public class LayerConcessione extends SDILayerDescriptor{ + + //meta + private String layerUUID; + private Long layerID; + + //layer + private String layerName; + private String WMSLink; + + + //1.Identificazione private String abstractSection; diff --git a/src/main/java/org/gcube/application/geoportal/common/model/legacy/SDILayerDescriptor.java b/src/main/java/org/gcube/application/geoportal/common/model/legacy/SDILayerDescriptor.java index 7ed8f03..dc4e9be 100644 --- a/src/main/java/org/gcube/application/geoportal/common/model/legacy/SDILayerDescriptor.java +++ b/src/main/java/org/gcube/application/geoportal/common/model/legacy/SDILayerDescriptor.java @@ -8,16 +8,15 @@ import lombok.Setter; @Setter public abstract class SDILayerDescriptor extends AssociatedContent{ - - //meta - private String layerUUID; - private Long layerID; - - //layer - private String layerName; - private String wmsLink; - - + + public abstract Long getLayerID(); + public abstract void setLayerID(Long layerID); + public abstract String getLayerUUID(); + public abstract void setLayerUUID(String layerUUID); + public abstract String getLayerName(); + public abstract void setLayerName(String layerName); + public abstract String getWMSLink(); + public abstract void setWMSLink(String wmsLink); } From 63ea948d5362ecc58e5e84ff5b75d88f2fbbbf1e Mon Sep 17 00:00:00 2001 From: Fabio Sinibaldi Date: Thu, 3 Dec 2020 20:32:31 +0100 Subject: [PATCH 2/3] method signature fix --- .../geoportal/common/model/legacy/LayerConcessione.java | 2 +- .../geoportal/common/model/legacy/SDILayerDescriptor.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/gcube/application/geoportal/common/model/legacy/LayerConcessione.java b/src/main/java/org/gcube/application/geoportal/common/model/legacy/LayerConcessione.java index 49c0e09..cc8331b 100644 --- a/src/main/java/org/gcube/application/geoportal/common/model/legacy/LayerConcessione.java +++ b/src/main/java/org/gcube/application/geoportal/common/model/legacy/LayerConcessione.java @@ -21,7 +21,7 @@ public class LayerConcessione extends SDILayerDescriptor{ //layer private String layerName; - private String WMSLink; + private String wmsLink; diff --git a/src/main/java/org/gcube/application/geoportal/common/model/legacy/SDILayerDescriptor.java b/src/main/java/org/gcube/application/geoportal/common/model/legacy/SDILayerDescriptor.java index dc4e9be..716bf7c 100644 --- a/src/main/java/org/gcube/application/geoportal/common/model/legacy/SDILayerDescriptor.java +++ b/src/main/java/org/gcube/application/geoportal/common/model/legacy/SDILayerDescriptor.java @@ -15,8 +15,8 @@ public abstract class SDILayerDescriptor extends AssociatedContent{ public abstract void setLayerUUID(String layerUUID); public abstract String getLayerName(); public abstract void setLayerName(String layerName); - public abstract String getWMSLink(); - public abstract void setWMSLink(String wmsLink); + public abstract String getWmsLink(); + public abstract void setWmsLink(String wmsLink); } From ebf1e80a2079f3df634f4451974e362efaab699a Mon Sep 17 00:00:00 2001 From: Fabio Sinibaldi Date: Thu, 3 Dec 2020 21:20:00 +0100 Subject: [PATCH 3/3] release --- CHANGELOG.md | 2 +- pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 84eb897..f4c46d2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm # Changelog for org.gcube.application.geoportal-common -## [v1.0.1-SNAPSHOT] - 2020-11-11 +## [v1.0.1] - 2020-11-11 Model update diff --git a/pom.xml b/pom.xml index 6a0e459..a5e4ec2 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.gcube.application geoportal-common - 1.0.1-SNAPSHOT + 1.0.1 Geoportal Common