gCubeSystem
/
data-transfer-model
16
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/branches/data-transfer/data-transfer-model/1.2@165138 82a268e6-3cf1-43bd-a215-b396298e98cf

This commit is contained in:
Fabio Sinibaldi 2018-03-15 15:12:08 +00:00
parent f873f73b8e
commit be340c3b1d
2 changed files with 34 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/org/gcube/data/transfer/model/plugins/thredds/ThreddsInfo.java
View File

@ -45,7 +45,9 @@ public class ThreddsInfo {
} }
public DataSet getDataSetFromLocation(String location) { public DataSet getDataSetFromLocation(String location) {
return getCatalogByFittingLocation(location).getDataSetFromLocation(location); try{
return getCatalogByFittingLocation(location).getDataSetFromLocation(location);
}catch(NullPointerException e) {return null;}
} }
public static ThreddsCatalog findById(ThreddsCatalog catalog,String id) { public static ThreddsCatalog findById(ThreddsCatalog catalog,String id) {
@ -77,6 +79,8 @@ public class ThreddsInfo {
} }
public static boolean matchesPath(String catalogPath,String toMatchPath) { public static boolean matchesPath(String catalogPath,String toMatchPath) {
if(toMatchPath.endsWith("/"))
return toMatchPath.startsWith(catalogPath); return toMatchPath.startsWith(catalogPath);
else return (toMatchPath+"/").startsWith(catalogPath);
} }
} }

33
src/test/java/org/gcube/data/transfer/test/MarshallUnmarshalTest.java
View File

@ -50,6 +50,8 @@ import org.gcube.data.transfer.model.utils.DateWrapper;
import org.junit.BeforeClass; import org.junit.BeforeClass;
import org.junit.Test; import org.junit.Test;
import junit.framework.Assert;
public class MarshallUnmarshalTest { public class MarshallUnmarshalTest {
static JAXBContext ctx =null; static JAXBContext ctx =null;
@ -267,9 +269,9 @@ public class MarshallUnmarshalTest {
ThreddsCatalog mainCatalog=new ThreddsCatalog(); ThreddsCatalog mainCatalog=new ThreddsCatalog();
mainCatalog.setCatalogFile("catalog.xml"); mainCatalog.setCatalogFile("catalog.xml");
mainCatalog.setDeclaredDataSetRoot(new DataSetRoot("public",info.getLocalBasePath()+"/public/genericRoot",1000l)); mainCatalog.setDeclaredDataSetRoot(new DataSetRoot("public",info.getLocalBasePath()+"/public/genericRoot/",1000l));
mainCatalog.setDeclaredDataSetScan(new HashSet<DataSetScan>()); mainCatalog.setDeclaredDataSetScan(new HashSet<DataSetScan>());
mainCatalog.getDeclaredDataSetScan().add(new DataSetScan("generic scan","/public",info.getLocalBasePath()+"/public/genericScanned","ROOT-DatasetScan")); mainCatalog.getDeclaredDataSetScan().add(new DataSetScan("generic scan","/public",info.getLocalBasePath()+"/public/genericScanned/","ROOT-DatasetScan"));
CatalogCollection collection=new CatalogCollection(); CatalogCollection collection=new CatalogCollection();
collection.setID("Catalog_VREs"); collection.setID("Catalog_VREs");
@ -291,8 +293,31 @@ public class MarshallUnmarshalTest {
info.setCatalog(mainCatalog); info.setCatalog(mainCatalog);
info.getById(subCatalog.getID()); info.getById(subCatalog.getID());
System.out.println(info.getCatalogByFittingLocation("/tmp/public/genericScanned"));
System.out.println(info.getCatalogByFittingLocation("/tmp/more_tuna/anotherfolder/inside/this/one/"));
String[] toTestPaths=new String[] {
"/tmp/public/genericScanned",
"/tmp/vres/tunaScanned/anotherfolder/inside/this/one/",
"/tmp/public/genericScanned/notSure",
"/tmp/public/genericScanned/notSure/",
};
String[] toTestMissing=new String[] {
"/tmp/public/myCatalog",
"/tmp/some/other/catalog"
};
for(String path:toTestPaths) {
Assert.assertNotNull(info.getCatalogByFittingLocation(path));
Assert.assertNotNull(info.getDataSetFromLocation(path));
}
for(String path:toTestMissing) {
Assert.assertNull(info.getCatalogByFittingLocation(path));
Assert.assertNull(info.getDataSetFromLocation(path));
}
return info; return info;
} }