From 7ba4f3c680fca8edeaf6bbe966b541bfd7971341 Mon Sep 17 00:00:00 2001
From: Fabio Sinibaldi <fabio.sinibaldi@isti.cnr.it>
Date: Thu, 26 May 2022 15:53:30 +0200
Subject: [PATCH 1/5] 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 0faac6e..b9e90e2 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] - 2022-05-25
+## [v1.0.7-SNAPSHOT] - 2022-05-25
 - Clone Concessione
 
 ## [v1.0.6] - 2021-09-20
diff --git a/geoportal-client/pom.xml b/geoportal-client/pom.xml
index f626cf7..10c39bc 100644
--- a/geoportal-client/pom.xml
+++ b/geoportal-client/pom.xml
@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.gcube.application</groupId>
 	<artifactId>geoportal-client</artifactId>
-	<version>1.0.7</version>
+	<version>1.0.7-SNAPSHOT</version>
 	<name>Geoportal Client</name>
 
 
-- 
2.17.1


From 1036446bfd11ed94aea1212ad4b96d608445d9f1 Mon Sep 17 00:00:00 2001
From: Fabio Sinibaldi <fabio.sinibaldi@isti.cnr.it>
Date: Thu, 26 May 2022 15:56:07 +0200
Subject: [PATCH 2/5] 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 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.gcube.application</groupId>
 	<artifactId>geoportal-client</artifactId>
-	<version>1.0.7-SNAPSHOT</version>
+	<version>1.0.7</version>
 	<name>Geoportal Client</name>
 
 
-- 
2.17.1


From 1a0c26b44f5ecdda18799b802c383a4987ba7851 Mon Sep 17 00:00:00 2001
From: Fabio Sinibaldi <fabio.sinibaldi@isti.cnr.it>
Date: Fri, 27 May 2022 14:26:36 +0200
Subject: [PATCH 3/5] Fixes files in piante

---
 geoportal-client/CHANGELOG.md                                   | 2 +-
 geoportal-client/pom.xml                                        | 2 +-
 .../application/geoportal/client/utils/ConcessioniUtils.java    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/geoportal-client/CHANGELOG.md b/geoportal-client/CHANGELOG.md
index 0faac6e..b9e90e2 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] - 2022-05-25
+## [v1.0.7-SNAPSHOT] - 2022-05-25
 - Clone Concessione
 
 ## [v1.0.6] - 2021-09-20
diff --git a/geoportal-client/pom.xml b/geoportal-client/pom.xml
index f626cf7..10c39bc 100644
--- a/geoportal-client/pom.xml
+++ b/geoportal-client/pom.xml
@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.gcube.application</groupId>
 	<artifactId>geoportal-client</artifactId>
-	<version>1.0.7</version>
+	<version>1.0.7-SNAPSHOT</version>
 	<name>Geoportal Client</name>
 
 
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
index df3eb99..8a8c951 100644
--- 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
@@ -82,7 +82,7 @@ public class ConcessioniUtils {
                     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));
+                    req.setDestinationPath(Concessione.Paths.piantaByIndex(i));
                     if(req.getStreams()!=null&&!req.getStreams().isEmpty())
                         copied=client.registerFileSet(copied.getMongo_id(),req);
                 }
-- 
2.17.1


From c5c2a4cec72f42f31bac12912293d745fd5353b4 Mon Sep 17 00:00:00 2001
From: Fabio Sinibaldi <fabio.sinibaldi@isti.cnr.it>
Date: Fri, 27 May 2022 14:26:50 +0200
Subject: [PATCH 4/5] Improved cloning tests

---
 .../clients/StatelessClientTests.java         | 31 +++++++++++++++++++
 1 file changed, 31 insertions(+)

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 578c8e3..a9f9f0b 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
@@ -10,7 +10,9 @@ import java.nio.charset.Charset;
 import java.util.Collections;
 import java.util.Iterator;
 import java.util.concurrent.atomic.AtomicLong;
+import java.util.stream.Collectors;
 
+import com.sun.corba.se.spi.orbutil.threadpool.Work;
 import org.bson.Document;
 import org.gcube.application.cms.tests.model.concessioni.TestConcessioniFilters;
 import org.gcube.application.cms.tests.model.concessioni.TestConcessioniModel;
@@ -113,10 +115,39 @@ public class StatelessClientTests extends BasicVreTests{
 		Concessione c= prepare();
 		Concessione copied = ConcessioniUtils.clone(client,c.getMongo_id());
 		assertEquals(copied.getNome(),c.getNome());
+		checkCopied(copied.getRelazioneScavo(),c.getRelazioneScavo());
+		checkCopied(copied.getAbstractRelazione(),c.getAbstractRelazione());
+		checkCopied(copied.getPosizionamentoScavo(),c.getPosizionamentoScavo());
 		assertEquals(copied.getPianteFineScavo().size(),c.getPianteFineScavo().size());
+		for(int i=0;i<c.getPianteFineScavo().size();i++)
+			checkCopied(copied.getPianteFineScavo().get(i),c.getPianteFineScavo().get(i));
+		assertEquals(copied.getImmaginiRappresentative().size(),c.getImmaginiRappresentative().size());
+		for(int i=0;i<c.getImmaginiRappresentative().size();i++)
+			checkCopied(copied.getImmaginiRappresentative().get(i),c.getImmaginiRappresentative().get(i));
 	}
 
+	private static void checkCopied(AssociatedContent copied,AssociatedContent original){
+		assertEquals(copied.getPolicy(),original.getPolicy());
+		assertEquals(copied.getLicenseID(),original.getLicenseID());
+		assertEquals(copied.getTitolo(),original.getTitolo());
+		if(copied instanceof LayerConcessione){
+				assertNull(((LayerConcessione)copied).getLayerName());
+				assertNull(((LayerConcessione)copied).getLayerID());
+				assertNull(((LayerConcessione)copied).getLayerUUID());
+				assertNull(((LayerConcessione)copied).getWorkspace());
+				assertNull(((LayerConcessione)copied).getWmsLink());
+		}
 
+		if(original.getActualContent()!=null){
+			assertNotNull(copied.getActualContent());
+			// count only workspace content
+			int oriringalCount= original.getActualContent().stream().
+					filter(persistedContent -> persistedContent instanceof WorkspaceContent).
+					collect(Collectors.toList()).size();
+
+			assertEquals(copied.getActualContent().size(),oriringalCount);
+		}
+	}
 
 
 
-- 
2.17.1


From 17f4f5e9919c0f6c8af5e49f471b9b0f24b5aa4d Mon Sep 17 00:00:00 2001
From: Fabio Sinibaldi <fabio.sinibaldi@isti.cnr.it>
Date: Fri, 27 May 2022 16:16:54 +0200
Subject: [PATCH 5/5] 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 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.gcube.application</groupId>
 	<artifactId>geoportal-client</artifactId>
-	<version>1.0.7-SNAPSHOT</version>
+	<version>1.0.7</version>
 	<name>Geoportal Client</name>
 
 
-- 
2.17.1