From ba0545e2c732e720a1c91e84ced2b261e7af6610 Mon Sep 17 00:00:00 2001 From: Fabio Sinibaldi Date: Wed, 8 Jun 2022 18:38:19 +0200 Subject: [PATCH 1/2] Fixes #23391 (idempotent publish for concessioni) --- geoportal-service/CHANGELOG.md | 4 +++- geoportal-service/pom.xml | 2 +- .../service/engine/mongo/ConcessioniMongoManager.java | 5 +++++ 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/geoportal-service/CHANGELOG.md b/geoportal-service/CHANGELOG.md index e702d48..26858ec 100644 --- a/geoportal-service/CHANGELOG.md +++ b/geoportal-service/CHANGELOG.md @@ -3,8 +3,10 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm # Changelog for org.gcube.application.geoportal-service -## [v1.0.9] 2021-09-20 +## [v1.0.9-SNAPSHOT] 2021-09-20 - Fixes [#23381](https://support.d4science.org/issues/23381) +- Fixes [#23485](https://support.d4science.org/issues/23485) + ## [v1.0.8] 2021-09-20 - Logging diff --git a/geoportal-service/pom.xml b/geoportal-service/pom.xml index d9d4d1e..4200fbe 100644 --- a/geoportal-service/pom.xml +++ b/geoportal-service/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.gcube.application geoportal-service - 1.0.9 + 1.0.9-SNAPSHOT Geoportal Service war diff --git a/geoportal-service/src/main/java/org/gcube/application/geoportal/service/engine/mongo/ConcessioniMongoManager.java b/geoportal-service/src/main/java/org/gcube/application/geoportal/service/engine/mongo/ConcessioniMongoManager.java index fe9c811..bb88e62 100644 --- a/geoportal-service/src/main/java/org/gcube/application/geoportal/service/engine/mongo/ConcessioniMongoManager.java +++ b/geoportal-service/src/main/java/org/gcube/application/geoportal/service/engine/mongo/ConcessioniMongoManager.java @@ -213,7 +213,12 @@ public class ConcessioniMongoManager extends MongoManager{ public Concessione publish(String id) throws IOException{ Concessione toReturn=asConcessione(getById(asId(id),collectionName)); + // unpublish if published toReturn=onUpdate(toReturn); + // try unpublish + toReturn = unpublish(toReturn); + + toReturn.validate(); // MATERIALIZE LAYERS From c2c06c1e3f7f4ad7260668cfdb2356a55c95f5d6 Mon Sep 17 00:00:00 2001 From: Fabio Sinibaldi Date: Wed, 8 Jun 2022 19:15:53 +0200 Subject: [PATCH 2/2] Release Fix for #23485 --- geoportal-service/CHANGELOG.md | 2 +- geoportal-service/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/geoportal-service/CHANGELOG.md b/geoportal-service/CHANGELOG.md index 26858ec..8c61467 100644 --- a/geoportal-service/CHANGELOG.md +++ b/geoportal-service/CHANGELOG.md @@ -3,7 +3,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm # Changelog for org.gcube.application.geoportal-service -## [v1.0.9-SNAPSHOT] 2021-09-20 +## [v1.0.9] 2021-09-20 - Fixes [#23381](https://support.d4science.org/issues/23381) - Fixes [#23485](https://support.d4science.org/issues/23485) diff --git a/geoportal-service/pom.xml b/geoportal-service/pom.xml index 4200fbe..d9d4d1e 100644 --- a/geoportal-service/pom.xml +++ b/geoportal-service/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.gcube.application geoportal-service - 1.0.9-SNAPSHOT + 1.0.9 Geoportal Service war