From ec76ccfda9e8fa98c5806ca4fc18d736dccd6177 Mon Sep 17 00:00:00 2001 From: Fabio Sinibaldi Date: Tue, 24 May 2022 14:44:22 +0200 Subject: [PATCH 1/6] Fixes #23381 --- geoportal-service/CHANGELOG.md | 4 ++ geoportal-service/pom.xml | 2 +- .../engine/postgis/PostgisDBManager.java | 60 +++++++++++-------- .../providers/PostgisConnectionProvider.java | 10 +++- 4 files changed, 46 insertions(+), 30 deletions(-) diff --git a/geoportal-service/CHANGELOG.md b/geoportal-service/CHANGELOG.md index d89cf4e..1293451 100644 --- a/geoportal-service/CHANGELOG.md +++ b/geoportal-service/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-service + +## [v1.0.9-SNAPSHOT] 2021-09-20 +- Fixes [#23381](https://support.d4science.org/issues/23381) + ## [v1.0.8] 2021-09-20 - Logging - Fixes [#22193](https://support.d4science.org/issues/22193) diff --git a/geoportal-service/pom.xml b/geoportal-service/pom.xml index b837b74..dd39c83 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.8 + 1.0.9-SNAPSHOT Geoportal Service war diff --git a/geoportal-service/src/main/java/org/gcube/application/geoportal/service/engine/postgis/PostgisDBManager.java b/geoportal-service/src/main/java/org/gcube/application/geoportal/service/engine/postgis/PostgisDBManager.java index 571c84e..5184e1d 100644 --- a/geoportal-service/src/main/java/org/gcube/application/geoportal/service/engine/postgis/PostgisDBManager.java +++ b/geoportal-service/src/main/java/org/gcube/application/geoportal/service/engine/postgis/PostgisDBManager.java @@ -17,49 +17,57 @@ import java.util.regex.Pattern; @Slf4j public class PostgisDBManager implements PostgisDBManagerI { - @Synchronized - public static PostgisDBManager get() throws SQLException, ConfigurationException { - if(config==null) { - log.debug("Looking for Default Configuration.. "); +// @Synchronized +// public static PostgisDBManager get() throws SQLException, ConfigurationException { +// if(config==null) { +// log.debug("Looking for Default Configuration.. "); +// +// // TODO GENERIC +// DatabaseConnection defaultConfiguration= +// ImplementationProvider.get().getIsProvider().getIS().queryForDB("postgis", "Concessioni"); +// +// log.debug("Found configuration : "+defaultConfiguration); +// config=defaultConfiguration; +// } +// return new PostgisDBManager(); +// } +// +// - // TODO GENERIC - DatabaseConnection defaultConfiguration= - ImplementationProvider.get().getIsProvider().getIS().queryForDB("postgis", "Concessioni"); - log.debug("Found configuration : "+defaultConfiguration); - config=defaultConfiguration; - } - return new PostgisDBManager(); + public static PostgisDBManagerI get() throws SQLException, ConfigurationException { + return get(false); } - public static PostgisDBManagerI get(boolean autocommit) throws SQLException, ConfigurationException { - PostgisDBManager toReturn=get(); + + private static PostgisDBManagerI get(boolean autocommit) throws SQLException, ConfigurationException { + DatabaseConnection config= + ImplementationProvider.get().getIsProvider().getIS().queryForDB("postgis", "Concessioni"); + log.debug("Found configuration : "+config); + PostgisDBManager toReturn=new PostgisDBManager(config); toReturn.conn.setAutoCommit(autocommit); return toReturn; } - private static DatabaseConnection config; + + +// private static DatabaseConnection config; - private static Connection getConnection() throws SQLException { - - Connection toReturn= DriverManager.getConnection(config.getUrl(),config.getUser(),config.getPwd()); - - //TODO configure behaviour - toReturn.setAutoCommit(false); - return toReturn; - } - - private Connection conn=null; + private DatabaseConnection config; + private PostgisDBManager(DatabaseConnection config) throws SQLException { + this.config=config; + log.info("Opening connection to {}",config); + conn= DriverManager.getConnection(config.getUrl(),config.getUser(),config.getPwd()); - private PostgisDBManager() throws SQLException { - conn=getConnection(); + //TODO configure behaviour + conn.setAutoCommit(false); } @Override diff --git a/geoportal-service/src/main/java/org/gcube/application/geoportal/service/engine/providers/PostgisConnectionProvider.java b/geoportal-service/src/main/java/org/gcube/application/geoportal/service/engine/providers/PostgisConnectionProvider.java index 26a2e9c..60a8b24 100644 --- a/geoportal-service/src/main/java/org/gcube/application/geoportal/service/engine/providers/PostgisConnectionProvider.java +++ b/geoportal-service/src/main/java/org/gcube/application/geoportal/service/engine/providers/PostgisConnectionProvider.java @@ -1,19 +1,23 @@ package org.gcube.application.geoportal.service.engine.providers; import org.gcube.application.geoportal.service.engine.postgis.PostgisDBManager; +import org.gcube.application.geoportal.service.engine.postgis.PostgisDBManagerI; import org.gcube.application.geoportal.service.model.internal.faults.ConfigurationException; import java.sql.SQLException; +import java.time.Duration; +import java.time.temporal.ChronoUnit; -public class PostgisConnectionProvider extends AbstractScopedMap{ +public class PostgisConnectionProvider extends AbstractScopedMap{ public PostgisConnectionProvider() { super("Postgis connection descriptor cache"); + setTTL(Duration.of(30, ChronoUnit.SECONDS)); } @Override - protected PostgisDBManager retrieveObject() throws ConfigurationException { + protected PostgisDBManagerI retrieveObject() throws ConfigurationException { try { return PostgisDBManager.get(); } catch (SQLException throwables) { @@ -22,7 +26,7 @@ public class PostgisConnectionProvider extends AbstractScopedMap Date: Tue, 24 May 2022 15:05:35 +0200 Subject: [PATCH 2/6] Restricting version to released ones --- geoportal-service/pom.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/geoportal-service/pom.xml b/geoportal-service/pom.xml index dd39c83..4200fbe 100644 --- a/geoportal-service/pom.xml +++ b/geoportal-service/pom.xml @@ -85,11 +85,13 @@ org.gcube.application.cms geoportal-common + 1.0.8 org.gcube.application.cms cms-plugin-framework + 1.0.0 @@ -216,6 +218,7 @@ org.gcube.application.cms concessioni-lifecycle + 1.0.0 test @@ -240,6 +243,7 @@ org.gcube.application.cms cms-test-commons + 1.0.1 test From 0b2f078b31247066ab5242afcd1290655eddd6b7 Mon Sep 17 00:00:00 2001 From: Fabio Sinibaldi Date: Tue, 24 May 2022 15:16:06 +0200 Subject: [PATCH 3/6] Use of interface --- .../geoportal/service/engine/postgis/PostgisIndex.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/geoportal-service/src/main/java/org/gcube/application/geoportal/service/engine/postgis/PostgisIndex.java b/geoportal-service/src/main/java/org/gcube/application/geoportal/service/engine/postgis/PostgisIndex.java index 514ebb8..e21fcc2 100644 --- a/geoportal-service/src/main/java/org/gcube/application/geoportal/service/engine/postgis/PostgisIndex.java +++ b/geoportal-service/src/main/java/org/gcube/application/geoportal/service/engine/postgis/PostgisIndex.java @@ -38,7 +38,7 @@ public class PostgisIndex { private SDIManager sdiManager; private String wmsLink=null; - private static PostgisDBManager getDB() throws ConfigurationException { + private static PostgisDBManagerI getDB() throws ConfigurationException { return ImplementationProvider.get().getDbProvider().getObject(); }; From e84dd655855dade93e796d540d06a3480b32f50a Mon Sep 17 00:00:00 2001 From: Fabio Sinibaldi Date: Tue, 24 May 2022 16:04:47 +0200 Subject: [PATCH 4/6] Releasing service 1.0.9 --- 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 1293451..e702d48 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) ## [v1.0.8] 2021-09-20 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 From 240649b6993c8e25af9c591fccd2d1fcbe66a34a Mon Sep 17 00:00:00 2001 From: Fabio Sinibaldi Date: Wed, 25 May 2022 18:07:20 +0200 Subject: [PATCH 5/6] Patch for clone --- geoportal-client/CHANGELOG.md | 3 + geoportal-client/pom.xml | 4 +- .../client/DefaultMongoConcessioni.java | 3 + .../client/utils/ConcessioniUtils.java | 132 ++++++++++++++++++ .../geoportal/clients/BasicVreTests.java | 4 +- .../clients/StatelessClientTests.java | 15 ++ 6 files changed, 158 insertions(+), 3 deletions(-) create mode 100644 geoportal-client/src/main/java/org/gcube/application/geoportal/client/utils/ConcessioniUtils.java diff --git a/geoportal-client/CHANGELOG.md b/geoportal-client/CHANGELOG.md index 5b1585a..b9e90e2 100644 --- a/geoportal-client/CHANGELOG.md +++ b/geoportal-client/CHANGELOG.md @@ -2,6 +2,9 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm # Changelog for org.gcube.application.geoportal-client +## [v1.0.7-SNAPSHOT] - 2022-05-25 +- Clone Concessione + ## [v1.0.6] - 2021-09-20 - Changed artifact dependencies - Default Profiled Documents client diff --git a/geoportal-client/pom.xml b/geoportal-client/pom.xml index 35d70b8..10c39bc 100644 --- a/geoportal-client/pom.xml +++ b/geoportal-client/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.gcube.application geoportal-client - 1.0.6 + 1.0.7-SNAPSHOT Geoportal Client @@ -34,6 +34,7 @@ org.gcube.application.cms geoportal-common + 1.0.8 @@ -71,6 +72,7 @@ org.gcube.application.cms cms-test-commons + 1.0.1 test diff --git a/geoportal-client/src/main/java/org/gcube/application/geoportal/client/DefaultMongoConcessioni.java b/geoportal-client/src/main/java/org/gcube/application/geoportal/client/DefaultMongoConcessioni.java index 9e8d971..bce1e87 100644 --- a/geoportal-client/src/main/java/org/gcube/application/geoportal/client/DefaultMongoConcessioni.java +++ b/geoportal-client/src/main/java/org/gcube/application/geoportal/client/DefaultMongoConcessioni.java @@ -207,6 +207,9 @@ public class DefaultMongoConcessioni implements MongoConcessioni{ } + + + protected static T check(Response resp, Class clazz) throws IOException { String resString=resp.readEntity(String.class); if(resp.getStatus()<200||resp.getStatus()>=300) diff --git a/geoportal-client/src/main/java/org/gcube/application/geoportal/client/utils/ConcessioniUtils.java b/geoportal-client/src/main/java/org/gcube/application/geoportal/client/utils/ConcessioniUtils.java new file mode 100644 index 0000000..df3eb99 --- /dev/null +++ b/geoportal-client/src/main/java/org/gcube/application/geoportal/client/utils/ConcessioniUtils.java @@ -0,0 +1,132 @@ +package org.gcube.application.geoportal.client.utils; + +import com.sun.corba.se.spi.orbutil.threadpool.Work; +import lombok.extern.slf4j.Slf4j; +import org.gcube.application.geoportal.common.model.legacy.*; +import org.gcube.application.geoportal.common.model.rest.AddSectionToConcessioneRequest; +import org.gcube.application.geoportal.common.rest.MongoConcessioni; +import org.gcube.application.geoportal.common.rest.TempFile; +import org.gcube.application.geoportal.common.utils.StorageUtils; + +import java.io.IOException; +import java.net.MalformedURLException; +import java.net.URL; +import java.util.ArrayList; + +@Slf4j +public class ConcessioniUtils { + + public static final Concessione clone(MongoConcessioni client,String toCloneId) throws Exception { + StorageUtils storage=new StorageUtils(); + log.info("Cloning {}",toCloneId); + Concessione src = client.getById(toCloneId); + // copy + Concessione copied = Serialization.read(Serialization.write(src),Concessione.class); + // cleanup + copied.setMongo_id(null); + copied.setLastUpdateTime(null); + copied.setLastUpdateUser(null); + copied.setFolderId(null); + copied.setReport(null); + copied.setCreationTime(null); + copied.setCreationUser(null); + copied.setId(0); + copied.setVersion("1.0.0"); + + copied.setRelazioneScavo(null); + copied.setAbstractRelazione(null); + copied.setPosizionamentoScavo(null); + copied.setImmaginiRappresentative(null); + copied.setPianteFineScavo(null); + + + copied = client.createNew(copied); + + + //Handle Files + + copied.setRelazioneScavo(clean(src.getRelazioneScavo())); + copied=client.replace(copied); + AddSectionToConcessioneRequest req=asCopyRequest(src.getRelazioneScavo(),storage); + if(req.getStreams()!=null&&!req.getStreams().isEmpty()) + copied=client.registerFileSet(copied.getMongo_id(),req); + + copied.setAbstractRelazione(clean(src.getAbstractRelazione())); + copied=client.replace(copied); + req=asCopyRequest(src.getAbstractRelazione(),storage); + if(req.getStreams()!=null&&!req.getStreams().isEmpty()) + copied=client.registerFileSet(copied.getMongo_id(),req); + + + copied.setPosizionamentoScavo(clean(src.getPosizionamentoScavo())); + copied=client.replace(copied); + req=asCopyRequest(src.getPosizionamentoScavo(),storage); + if(req.getStreams()!=null&&!req.getStreams().isEmpty()) + copied=client.registerFileSet(copied.getMongo_id(),req); + + if(src.getImmaginiRappresentative()!=null&&src.getImmaginiRappresentative().size()>0) { + copied.setImmaginiRappresentative(new ArrayList<>()); + for (int i = 0; i < src.getImmaginiRappresentative().size(); i++) { + copied.getImmaginiRappresentative().add(clean(src.getImmaginiRappresentative().get(i))); + copied=client.replace(copied); + req=asCopyRequest(src.getImmaginiRappresentative().get(i),storage); + req.setDestinationPath(Concessione.Paths.imgByIndex(i)); + if(req.getStreams()!=null&&!req.getStreams().isEmpty()) + copied=client.registerFileSet(copied.getMongo_id(),req); + } + } + + if(src.getPianteFineScavo()!=null&&src.getPianteFineScavo().size()>0) { + copied.setPianteFineScavo(new ArrayList<>()); + for (int i = 0; i < src.getPianteFineScavo().size(); i++) { + copied.getPianteFineScavo().add(clean(src.getPianteFineScavo().get(i))); + copied=client.replace(copied); + req=asCopyRequest(src.getPianteFineScavo().get(i),storage); + req.setDestinationPath(Concessione.Paths.imgByIndex(i)); + if(req.getStreams()!=null&&!req.getStreams().isEmpty()) + copied=client.registerFileSet(copied.getMongo_id(),req); + } + } + + log.info("Cloned {} into {} ",src.getMongo_id(),copied.getMongo_id()); + return copied; + } + + private static AddSectionToConcessioneRequest asCopyRequest(T content, StorageUtils storage) throws IOException { + AddSectionToConcessioneRequest request = new AddSectionToConcessioneRequest(); + request.setStreams(new ArrayList<>()); + if(content.getActualContent()!=null) { + for (PersistedContent persistedContent : content.getActualContent()) { + if (persistedContent instanceof WorkspaceContent) { + WorkspaceContent wc = (WorkspaceContent) persistedContent; + request.getStreams().add(storage.putOntoStorage(new URL(wc.getLink()).openStream(), wc.getName())); + } + } + } + + String path = null; + if(content instanceof LayerConcessione) path = Concessione.Paths.POSIZIONAMENTO; + else if (content instanceof RelazioneScavo) path = Concessione.Paths.RELAZIONE; + else if (content instanceof AbstractRelazione) path = Concessione.Paths.ABSTRACT_RELAZIONE; + request.setDestinationPath(path); + return request; + } + + private static T clean(T content) throws IOException { + T toReturn = (T) Serialization.read(Serialization.write(content),content.getClass()); + toReturn.setMongo_id(null); + toReturn.setCreationTime(null); + toReturn.setId(0); + toReturn.setActualContent(new ArrayList<>()); + + if(content instanceof LayerConcessione) { + ((LayerConcessione)toReturn).setLayerName(null); + ((LayerConcessione)toReturn).setLayerID(null); + ((LayerConcessione)toReturn).setBbox(null); + ((LayerConcessione)toReturn).setLayerUUID(null); + ((LayerConcessione)toReturn).setWorkspace(null); + ((LayerConcessione)toReturn).setWmsLink(null); + } + return toReturn; + } +} diff --git a/geoportal-client/src/test/java/org/gcube/application/geoportal/clients/BasicVreTests.java b/geoportal-client/src/test/java/org/gcube/application/geoportal/clients/BasicVreTests.java index 4016eb1..a780e2d 100644 --- a/geoportal-client/src/test/java/org/gcube/application/geoportal/clients/BasicVreTests.java +++ b/geoportal-client/src/test/java/org/gcube/application/geoportal/clients/BasicVreTests.java @@ -7,9 +7,9 @@ public class BasicVreTests { @BeforeClass public static void setScope(){ -// TokenSetter.set("/pred4s/preprod/preVRE"); + TokenSetter.set("/pred4s/preprod/preVRE"); // TokenSetter.set("/d4science.research-infrastructures.eu/D4OS/GeoNA-Prototype"); - TokenSetter.set("/gcube/devsec/devVRE"); +// TokenSetter.set("/gcube/devsec/devVRE"); } diff --git a/geoportal-client/src/test/java/org/gcube/application/geoportal/clients/StatelessClientTests.java b/geoportal-client/src/test/java/org/gcube/application/geoportal/clients/StatelessClientTests.java index c9f953b..578c8e3 100644 --- a/geoportal-client/src/test/java/org/gcube/application/geoportal/clients/StatelessClientTests.java +++ b/geoportal-client/src/test/java/org/gcube/application/geoportal/clients/StatelessClientTests.java @@ -15,6 +15,7 @@ import org.bson.Document; import org.gcube.application.cms.tests.model.concessioni.TestConcessioniFilters; import org.gcube.application.cms.tests.model.concessioni.TestConcessioniModel; import org.gcube.application.cms.tests.model.concessioni.TestConcessioniQueries; +import org.gcube.application.geoportal.client.utils.ConcessioniUtils; import org.gcube.application.geoportal.client.utils.Queries; import org.gcube.application.geoportal.client.utils.Serialization; import org.gcube.application.geoportal.common.model.legacy.*; @@ -105,6 +106,20 @@ public class StatelessClientTests extends BasicVreTests{ assertNotNull(c.getMongo_id()); } + + + @Test + public void testClone() throws Exception { + Concessione c= prepare(); + Concessione copied = ConcessioniUtils.clone(client,c.getMongo_id()); + assertEquals(copied.getNome(),c.getNome()); + assertEquals(copied.getPianteFineScavo().size(),c.getPianteFineScavo().size()); + } + + + + + @Test public void testReplace() throws Exception { Concessione testObject= client.createNew(TestConcessioniModel.prepareEmptyConcessione()); From 64db661a9b22bf9fc225fe4b63ca0437c8c58c00 Mon Sep 17 00:00:00 2001 From: Fabio Sinibaldi Date: Thu, 26 May 2022 15:25:40 +0200 Subject: [PATCH 6/6] Release geoportal-client.1.0.7 --- geoportal-client/CHANGELOG.md | 2 +- geoportal-client/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/geoportal-client/CHANGELOG.md b/geoportal-client/CHANGELOG.md index b9e90e2..0faac6e 100644 --- a/geoportal-client/CHANGELOG.md +++ b/geoportal-client/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-client -## [v1.0.7-SNAPSHOT] - 2022-05-25 +## [v1.0.7] - 2022-05-25 - Clone Concessione ## [v1.0.6] - 2021-09-20 diff --git a/geoportal-client/pom.xml b/geoportal-client/pom.xml index 10c39bc..f626cf7 100644 --- a/geoportal-client/pom.xml +++ b/geoportal-client/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.gcube.application geoportal-client - 1.0.7-SNAPSHOT + 1.0.7 Geoportal Client