From d4e604931ea56f43fd5a742ba8625146bf437d2f Mon Sep 17 00:00:00 2001
From: Fabio Sinibaldi <fabio.sinibaldi@isti.cnr.it>
Date: Thu, 10 Dec 2020 12:50:57 +0100
Subject: [PATCH] exlcuded gcube 5

---
 CHANGELOG.md                                  |  4 +++
 pom.xml                                       | 11 +++++--
 .../common/model/ConcessioniTests.java        | 31 +++++++++++++++++++
 3 files changed, 44 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 77ba6e4..36bfd3d 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-client
 
+## [v1.0.1-SNAPSHOT] - 2020-11-11
+Excluded common-calls 1.2.0
+
+
 ## [v1.0.0] - 2020-11-11
 
 First release
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 6a31620..b9b23e7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.gcube.application</groupId>
 	<artifactId>geoportal-client</artifactId>
-	<version>1.0.0</version>
+	<version>1.0.1-SNAPSHOT</version>
 	<name>Geoportal Client</name>
 
 
@@ -45,6 +45,13 @@
 
 	<dependencies>
 
+		<!-- REMOVE FROM GCUBE 5 -->
+		<dependency>
+			<groupId>org.gcube.core</groupId>
+			<artifactId>common-gcube-calls</artifactId>
+			<version>[1.0.0,1.2.0)</version>
+		</dependency>
+
 		<dependency>
 			<groupId>org.projectlombok</groupId>
 			<artifactId>lombok</artifactId>
@@ -54,7 +61,7 @@
 		<dependency>
 			<groupId>org.gcube.application</groupId>
 			<artifactId>geoportal-common</artifactId>
-			<version>[1.0.0,2.0.0)</version>
+			<version>[1.0.0-SNAPSHOT,2.0.0)</version>
 		</dependency>
 
 
diff --git a/src/test/java/org/gcube/application/geoportal/common/model/ConcessioniTests.java b/src/test/java/org/gcube/application/geoportal/common/model/ConcessioniTests.java
index 5b9f333..12a7be5 100644
--- a/src/test/java/org/gcube/application/geoportal/common/model/ConcessioniTests.java
+++ b/src/test/java/org/gcube/application/geoportal/common/model/ConcessioniTests.java
@@ -5,6 +5,9 @@ import java.util.concurrent.atomic.AtomicLong;
 
 import org.gcube.application.geoportal.client.legacy.ConcessioniManager;
 import org.gcube.application.geoportal.common.model.legacy.Concessione;
+import org.gcube.application.geoportal.common.model.legacy.GeoServerContent;
+import org.gcube.application.geoportal.common.model.legacy.LayerConcessione;
+import org.gcube.application.geoportal.common.model.legacy.PersistedContent;
 import org.gcube.application.geoportal.common.model.legacy.report.ValidationReport.ValidationStatus;
 import org.junit.Before;
 import org.junit.Test;
@@ -30,6 +33,11 @@ public class ConcessioniTests {
 		
 		final ArrayList<Long> imgs=new ArrayList<Long>();
 		final AtomicLong error=new AtomicLong(0);
+		
+		final ArrayList<Long> piante=new ArrayList<Long>();
+		final ArrayList<Long> pos=new ArrayList<Long>();
+		final ArrayList<Long> wmsLink=new ArrayList<Long>();
+		
 		found.forEach((Concessione c )->{
 			try {
 				manager.getById(c.getId()+"");
@@ -38,6 +46,22 @@ public class ConcessioniTests {
 					validIDs.add(c.getId());
 			if(c.getImmaginiRappresentative()!=null&&c.getImmaginiRappresentative().size()>0)
 				imgs.add(c.getId());
+			if(c.getPianteFineScavo()!=null)
+				c.getPianteFineScavo().forEach((LayerConcessione l)->{
+					if(l.getActualContent()!=null)
+						l.getActualContent().forEach((PersistedContent p)->{
+							if(p instanceof GeoServerContent) piante.add(c.getId());
+						});
+					if(l.getWmsLink()!=null) wmsLink.add(c.getId());
+				});
+			
+			if(c.getPosizionamentoScavo()!=null) {
+				LayerConcessione l=c.getPosizionamentoScavo();
+				l.getActualContent().forEach((PersistedContent p)->{
+							if(p instanceof GeoServerContent) pos.add(c.getId());
+						});
+				if(l.getWmsLink()!=null) wmsLink.add(c.getId());
+			}
 			}catch(Throwable t) {				
 				error.incrementAndGet();
 				if(STOP_ON_FAIL) {
@@ -48,8 +72,15 @@ public class ConcessioniTests {
 		System.out.println("Valid count "+validIDs.size()+ "Load BY ID : "+byId.get()+" Error : "+error.get()+" OUT OF "+found.size());
 		System.out.println("Valid IDS "+validIDs);
 		System.out.println("With imgs : "+imgs);
+		System.out.println("With piante : "+piante);
+		System.out.println("With pos : "+pos);
+		System.out.println("With wmsLink : "+wmsLink);
 	}
 	
+	
+	
+	
+	
 //	@Test
 //	public void readOne() throws Exception {
 //		ConcessioniManager manager=new ConcessioniManager();