From 53b60d3e11a53c6e7db76725bddbf43b75795132 Mon Sep 17 00:00:00 2001
From: Francesco Mangiacrapa <francesco.mangiacrapa@isti.cnr.it>
Date: Wed, 21 Nov 2018 10:49:19 +0000
Subject: [PATCH] Returning property map in case of folder in order to avoid
 multiple calls to load sync status

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/Common/storagehub-client-wrapper@174303 82a268e6-3cf1-43bd-a215-b396298e98cf
---
 .../server/converter/HLMapper.java            |  7 ++++-
 src/test/java/WorkspaceInstance.java          | 31 +++++++++++++------
 2 files changed, 28 insertions(+), 10 deletions(-)

diff --git a/src/main/java/org/gcube/common/storagehubwrapper/server/converter/HLMapper.java b/src/main/java/org/gcube/common/storagehubwrapper/server/converter/HLMapper.java
index 18be634..fc0480a 100644
--- a/src/main/java/org/gcube/common/storagehubwrapper/server/converter/HLMapper.java
+++ b/src/main/java/org/gcube/common/storagehubwrapper/server/converter/HLMapper.java
@@ -113,6 +113,10 @@ public class HLMapper {
 		if(metadata!=null)
 			pm = new PropertyMap(metadata.getValues());
 
+		//IN CASE OF EMPTY MAP RETURNS NULL
+		if(pm!=null && pm.getValues()!=null && pm.getValues().isEmpty())
+			pm = null;
+
 		return pm;
 	}
 
@@ -247,7 +251,8 @@ public class HLMapper {
 
 	    	//ADDING (GCUBE) PROPERTIES
 	    	PropertyMap pm = null;
-	    	if(withMapProperties){
+	    	if(withMapProperties || isFolder){
+	    		//System.out.println("Setting map: "+item.getPropertyMap().getValues());
 	    		pm = toPropertyMap(item.getPropertyMap());
 	    	}
 
diff --git a/src/test/java/WorkspaceInstance.java b/src/test/java/WorkspaceInstance.java
index 49ff3b5..798a4c5 100644
--- a/src/test/java/WorkspaceInstance.java
+++ b/src/test/java/WorkspaceInstance.java
@@ -31,7 +31,11 @@ public class WorkspaceInstance {
 
 	public static String USERNAME = "francesco.mangiacrapa";
 	public static String SCOPE = "/gcube";
-	public static String TOKEN = "0e2c7963-8d3e-4ea6-a56d-ffda530dd0fa-98187548";
+	//public static String SCOPE = "/d4science.research-infrastructures.eu";
+	//public static String TOKEN = "0e2c7963-8d3e-4ea6-a56d-ffda530dd0fa-98187548";
+	//public static String TOKEN = "bdc2e70f-36c3-4db4-8b03-829a973b3095-98187548"; //PREVRE
+	public static String TOKEN = "57b42a99-6239-44c4-9a68-591c18363222-843339462"; //BiodiversityLab
+
 
 	public static String FIND_FILE_NAME = "francesco";
 
@@ -56,14 +60,14 @@ public class WorkspaceInstance {
 //		build();
 	}
 
-	@Test
+	//@Test
 	public void getRoot() {
 		System.out.println("Get Root test");
 		WorkspaceFolder root;
 		try {
 			root = storageHubWrapper.getWorkspace().getRoot();
 			rootId = root.getId();
-			System.out.println(root);
+			System.out.println("The root is:"+root);
 		}
 		catch (Exception e) {
 			// TODO Auto-generated catch block
@@ -72,7 +76,7 @@ public class WorkspaceInstance {
 
 	}
 
-	//@Test
+	@Test
 	public void getChildren() throws Exception{
 		System.out.println("Get children test");
 
@@ -81,13 +85,22 @@ public class WorkspaceInstance {
 		List<? extends WorkspaceItem> children = storageHubWrapper.getWorkspace().getChildren(root.getId());
 		int i = 0;
 		for (WorkspaceItem workspaceItem : children) {
-			System.out.println(++i+")"+workspaceItem);
-			System.out.println(workspaceItem.getType() +" "+workspaceItem.getClass());
+//			System.out.println(++i+")"+workspaceItem);
+//			System.out.println(workspaceItem.getType() +" "+workspaceItem.getClass());
+			System.out.println(++i+")");
+			printMap(workspaceItem);
 		}
 
 	}
 
-	@Test
+	public static void printMap(WorkspaceItem workspaceItem){
+		if(workspaceItem.getPropertyMap()!=null){
+			System.out.println(workspaceItem.getId() + " name: "+workspaceItem.getName() + " isFolder: "+workspaceItem.isFolder());
+			System.out.println("Property Map: "+workspaceItem.getPropertyMap().getValues().toString());
+		}
+	}
+
+	//@Test
 	public void getWorkspaceId()  {
 		System.out.println("Getting the workspaceId test");
 		try {
@@ -101,7 +114,7 @@ public class WorkspaceInstance {
 		}
 	}
 
-	@Test
+	//@Test
 	public void getChildrenPerWorkspaceItem() throws InternalErrorException{
 		System.out.println("Get children test per workspace item");
 
@@ -159,7 +172,7 @@ public class WorkspaceInstance {
 
 	}
 
-	@Test
+	//@Test
 	public void findFileName() throws InternalErrorException{
 		System.out.println("Find file name test");
 		getRoot();