From 8981b3ffd62d38c59ea7e629fbb930eab10861f9 Mon Sep 17 00:00:00 2001
From: Fabio Sinibaldi <fabio.sinibaldi@isti.cnr.it>
Date: Thu, 11 Mar 2021 16:14:17 +0100
Subject: [PATCH] Integrated Ucar library

---
 .settings/.gitignore                          |  1 +
 pom.xml                                       | 53 ++++++++++++++-----
 .../transfer/plugins/sis/TestGetMetadata.java | 29 ++++++++--
 3 files changed, 65 insertions(+), 18 deletions(-)
 create mode 100644 .settings/.gitignore

diff --git a/.settings/.gitignore b/.settings/.gitignore
new file mode 100644
index 0000000..3b1537c
--- /dev/null
+++ b/.settings/.gitignore
@@ -0,0 +1 @@
+/org.eclipse.jdt.core.prefs
diff --git a/pom.xml b/pom.xml
index 6594681..4b5c9b6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,6 +17,7 @@
 		<sis.version>1.0</sis.version>
 		<sis.utils.modules>${sis.version}</sis.utils.modules>
 		<gitBaseUrl>https://code-repo.d4science.org/gCubeSystem</gitBaseUrl>
+		<netcdfJavaVersion>5.3.3</netcdfJavaVersion>
 	</properties>
 
 	<scm>
@@ -31,14 +32,22 @@
 			<dependency>
 				<groupId>org.gcube.distribution</groupId>
 				<artifactId>gcube-smartgears-bom</artifactId>
-				<version>2.0.0</version>
+				<version>2.1.0</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
 			<dependency>
 				<groupId>org.gcube.distribution</groupId>
 				<artifactId>gcube-bom</artifactId>
-				<version>2.0.0</version>
+				<version>2.0.1</version>
+				<type>pom</type>
+				<scope>import</scope>
+			</dependency>
+			<!-- https://mvnrepository.com/artifact/org.apache.sis/storage -->
+			<dependency>
+				<groupId>org.apache.sis</groupId>
+				<artifactId>storage</artifactId>
+				<version>1.0</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
@@ -49,7 +58,7 @@
 		<dependency>
 			<groupId>org.gcube.data.transfer</groupId>
 			<artifactId>data-transfer-plugin-framework</artifactId>
-			<version>[1.0.2,2.0.0-SNAPSHOT)</version>
+			<version>[1.0.2,2.0.0)</version>
 		</dependency>
 
 		<dependency>
@@ -70,7 +79,7 @@
 		<dependency>
 			<groupId>org.gcube.spatial.data</groupId>
 			<artifactId>sdi-library</artifactId>
-			<version>[1.0.0-SNAPSHOT,2.0.0-SNAPSHOT)</version>
+			<version>[1.0.0,2.0.0)</version>
 		</dependency>
 
 		<!-- SMARTGEARS -->
@@ -109,6 +118,20 @@
 		</dependency>
 
 
+		<!-- SIS EXTERNALS -->
+		<!-- https://mvnrepository.com/artifact/com.esri.geometry/esri-geometry-api -->
+		<dependency>
+			<groupId>com.esri.geometry</groupId>
+			<artifactId>esri-geometry-api</artifactId>
+		</dependency>
+
+		<!-- https://mvnrepository.com/artifact/edu.ucar/cdm -->
+		<dependency>
+			<groupId>edu.ucar</groupId>
+			<artifactId>cdm</artifactId>
+		</dependency>
+
+
 
 		<!-- EPSG Dataset. NB Check Performances -->
 		<dependency>
@@ -118,14 +141,7 @@
 			<scope>runtime</scope>
 		</dependency>
 
-
-		<!-- UCAR Library used by SIS if embedded can't decode -->
-		<!-- https://mvnrepository.com/artifact/edu.ucar/netcdf -->
-		<dependency>
-			<groupId>edu.ucar</groupId>
-			<artifactId>netcdf</artifactId>
-			<version>4.3.22</version>
-		</dependency>
+	
 
 
 		<!-- TEST -->
@@ -138,7 +154,6 @@
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
-			<version>4.12</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
@@ -151,13 +166,23 @@
 		<dependency>
 			<groupId>org.opengis</groupId>
 			<artifactId>geoapi-conformance</artifactId>
-			<version>3.0.1</version>
 			<scope>test</scope>
 		</dependency>
 
 
 	</dependencies>
 
+	<repositories>
+		<repository>
+			<id>unidata-all</id>
+			<name>Unidata All</name>
+
+			<url>https://nexus.d4science.org/nexus/content/repositories/unidata/</url>
+		</repository>
+	</repositories>
+
+
+
 	<build>
 		<plugins>
 
diff --git a/src/test/java/org/gcube/data/transfer/plugins/sis/TestGetMetadata.java b/src/test/java/org/gcube/data/transfer/plugins/sis/TestGetMetadata.java
index 0adb476..1f6791b 100644
--- a/src/test/java/org/gcube/data/transfer/plugins/sis/TestGetMetadata.java
+++ b/src/test/java/org/gcube/data/transfer/plugins/sis/TestGetMetadata.java
@@ -2,12 +2,10 @@ package org.gcube.data.transfer.plugins.sis;
 
 import java.io.File;
 import java.io.FileInputStream;
-import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
-import java.net.MalformedURLException;
 import java.nio.file.Files;
 import java.nio.file.StandardCopyOption;
 import java.security.MessageDigest;
@@ -15,7 +13,6 @@ import java.security.NoSuchAlgorithmException;
 
 import org.apache.sis.storage.DataStoreException;
 import org.apache.sis.storage.UnsupportedStorageException;
-import org.gcube.data.transfer.model.TransferTicket.Status;
 import org.gcube.data.transfer.plugins.thredds.sis.SisPlugin;
 
 public class TestGetMetadata {
@@ -28,11 +25,35 @@ public class TestGetMetadata {
 		
 		for(String f:toCheckFiles) {
 			System.out.println("checking "+f);
-			check(false,f);
+			try{
+				check(false,f);
+			}catch(UnsupportedStorageException e) {
+				System.err.println(e.getMessage());
+//				System.out.println("Trying opening "+f+" manually");
+//				open(f);
+			}
 		}
 		System.out.println("Done");
 	}
 
+	
+//	private static void open(String path) throws IOException, UnsupportedStorageException, DataStoreException {
+//		System.out.println("Opening "+path);
+//		NetcdfFile f=NetcdfFiles.open(path);
+//		System.out.println(f.getFileTypeDescription()+"\t"+f.getFileTypeId());
+//		
+//		
+//		NetcdfDataset ncDs=NetcdfDatasets.openDataset(path);
+////		NcMLReaderNew.
+////		
+//		System.out.println(ncDs.getFileTypeDescription()+"\t"+ncDs.getFileTypeId());
+//		
+////		NetcdfDatasets.openFile(path,null);
+//		
+//		
+//	}
+	
+	
 	private static void check(boolean checkCopy,String src) throws UnsupportedStorageException, DataStoreException, IOException, NoSuchAlgorithmException {
 
 		File original=new File(src);