Integrated Ucar library

This commit is contained in:
Fabio Sinibaldi 2021-03-11 16:14:17 +01:00
parent 05ff46dc6f
commit 8981b3ffd6
3 changed files with 65 additions and 18 deletions

1
.settings/.gitignore vendored Normal file
View File

@ -0,0 +1 @@
/org.eclipse.jdt.core.prefs

53
pom.xml
View File

@ -17,6 +17,7 @@
<sis.version>1.0</sis.version> <sis.version>1.0</sis.version>
<sis.utils.modules>${sis.version}</sis.utils.modules> <sis.utils.modules>${sis.version}</sis.utils.modules>
<gitBaseUrl>https://code-repo.d4science.org/gCubeSystem</gitBaseUrl> <gitBaseUrl>https://code-repo.d4science.org/gCubeSystem</gitBaseUrl>
<netcdfJavaVersion>5.3.3</netcdfJavaVersion>
</properties> </properties>
<scm> <scm>
@ -31,14 +32,22 @@
<dependency> <dependency>
<groupId>org.gcube.distribution</groupId> <groupId>org.gcube.distribution</groupId>
<artifactId>gcube-smartgears-bom</artifactId> <artifactId>gcube-smartgears-bom</artifactId>
<version>2.0.0</version> <version>2.1.0</version>
<type>pom</type> <type>pom</type>
<scope>import</scope> <scope>import</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.gcube.distribution</groupId> <groupId>org.gcube.distribution</groupId>
<artifactId>gcube-bom</artifactId> <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> <type>pom</type>
<scope>import</scope> <scope>import</scope>
</dependency> </dependency>
@ -49,7 +58,7 @@
<dependency> <dependency>
<groupId>org.gcube.data.transfer</groupId> <groupId>org.gcube.data.transfer</groupId>
<artifactId>data-transfer-plugin-framework</artifactId> <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>
<dependency> <dependency>
@ -70,7 +79,7 @@
<dependency> <dependency>
<groupId>org.gcube.spatial.data</groupId> <groupId>org.gcube.spatial.data</groupId>
<artifactId>sdi-library</artifactId> <artifactId>sdi-library</artifactId>
<version>[1.0.0-SNAPSHOT,2.0.0-SNAPSHOT)</version> <version>[1.0.0,2.0.0)</version>
</dependency> </dependency>
<!-- SMARTGEARS --> <!-- SMARTGEARS -->
@ -109,6 +118,20 @@
</dependency> </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 --> <!-- EPSG Dataset. NB Check Performances -->
<dependency> <dependency>
@ -118,14 +141,7 @@
<scope>runtime</scope> <scope>runtime</scope>
</dependency> </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 --> <!-- TEST -->
@ -138,7 +154,6 @@
<dependency> <dependency>
<groupId>junit</groupId> <groupId>junit</groupId>
<artifactId>junit</artifactId> <artifactId>junit</artifactId>
<version>4.12</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
@ -151,13 +166,23 @@
<dependency> <dependency>
<groupId>org.opengis</groupId> <groupId>org.opengis</groupId>
<artifactId>geoapi-conformance</artifactId> <artifactId>geoapi-conformance</artifactId>
<version>3.0.1</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
</dependencies> </dependencies>
<repositories>
<repository>
<id>unidata-all</id>
<name>Unidata All</name>
<url>https://nexus.d4science.org/nexus/content/repositories/unidata/</url>
</repository>
</repositories>
<build> <build>
<plugins> <plugins>

View File

@ -2,12 +2,10 @@ package org.gcube.data.transfer.plugins.sis;
import java.io.File; import java.io.File;
import java.io.FileInputStream; import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.FileOutputStream; import java.io.FileOutputStream;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.io.OutputStream; import java.io.OutputStream;
import java.net.MalformedURLException;
import java.nio.file.Files; import java.nio.file.Files;
import java.nio.file.StandardCopyOption; import java.nio.file.StandardCopyOption;
import java.security.MessageDigest; import java.security.MessageDigest;
@ -15,7 +13,6 @@ import java.security.NoSuchAlgorithmException;
import org.apache.sis.storage.DataStoreException; import org.apache.sis.storage.DataStoreException;
import org.apache.sis.storage.UnsupportedStorageException; import org.apache.sis.storage.UnsupportedStorageException;
import org.gcube.data.transfer.model.TransferTicket.Status;
import org.gcube.data.transfer.plugins.thredds.sis.SisPlugin; import org.gcube.data.transfer.plugins.thredds.sis.SisPlugin;
public class TestGetMetadata { public class TestGetMetadata {
@ -28,11 +25,35 @@ public class TestGetMetadata {
for(String f:toCheckFiles) { for(String f:toCheckFiles) {
System.out.println("checking "+f); 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"); 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 { private static void check(boolean checkCopy,String src) throws UnsupportedStorageException, DataStoreException, IOException, NoSuchAlgorithmException {
File original=new File(src); File original=new File(src);