From 3943333a7c12a0bbd1d3d7dbbc13ee7209427189 Mon Sep 17 00:00:00 2001
From: Francesco Mangiacrapa <francesco.mangiacrapa@isti.cnr.it>
Date: Thu, 22 Nov 2018 13:35:01 +0000
Subject: [PATCH] added parameters withAccounting, withMapProperties to get
 filtered list

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/Common/storagehub-client-wrapper@174322 82a268e6-3cf1-43bd-a215-b396298e98cf
---
 .../server/StorageHubClientService.java       | 22 +++++++++++++++----
 .../WorkspaceStorageHubClientService.java     |  2 +-
 src/test/java/WorkspaceInstance.java          | 14 ++++++------
 3 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/src/main/java/org/gcube/common/storagehubwrapper/server/StorageHubClientService.java b/src/main/java/org/gcube/common/storagehubwrapper/server/StorageHubClientService.java
index 378dcab..c82132e 100644
--- a/src/main/java/org/gcube/common/storagehubwrapper/server/StorageHubClientService.java
+++ b/src/main/java/org/gcube/common/storagehubwrapper/server/StorageHubClientService.java
@@ -125,16 +125,30 @@ public class StorageHubClientService {
 		return theResolver.getItems();
 	}
 
+
 	/**
-	 * Gets the children.
+	 * Gets the filtered children.
 	 *
 	 * @param id the id
 	 * @param aType the a type
-	 * @return the children
+	 * @param withAccounting the with accounting
+	 * @param withMapProperties the with map properties
+	 * @return the filtered children
 	 */
-	public List<? extends Item> getFilteredChildren(String id, Class<? extends Item> aType){
+	public List<? extends Item> getFilteredChildren(String id, Class<? extends Item> aType, boolean withAccounting, boolean withMapProperties){
 		setContextProviders(scope, authorizationToken);
-		return shcClient.open(id).asFolder().list().ofType(aType).withContent().getItems();
+
+		ListResolver resolverTyped = shcClient.open(id).asFolder().list().ofType(aType);
+		ListResolver theResolver = resolverTyped.withContent();
+
+		if(withAccounting)
+			theResolver = theResolver.withAccounting();
+
+		if(withMapProperties)
+			theResolver = theResolver.withMetadata();
+
+
+		return theResolver.getItems();
 	}
 
 
diff --git a/src/main/java/org/gcube/common/storagehubwrapper/server/WorkspaceStorageHubClientService.java b/src/main/java/org/gcube/common/storagehubwrapper/server/WorkspaceStorageHubClientService.java
index 9d9fc3d..51106bb 100644
--- a/src/main/java/org/gcube/common/storagehubwrapper/server/WorkspaceStorageHubClientService.java
+++ b/src/main/java/org/gcube/common/storagehubwrapper/server/WorkspaceStorageHubClientService.java
@@ -293,7 +293,7 @@ public final class WorkspaceStorageHubClientService implements Workspace{
 	public List<? extends WorkspaceItem> getFilteredChildren(String id, Class<? extends Item> aType) throws Exception{
 
 		Validate.notNull(id,"The input id is null");
-		List<? extends Item> children = storageHubClientService.getFilteredChildren(id, aType);
+		List<? extends Item> children = storageHubClientService.getFilteredChildren(id, aType, withAccounting, withMapProperties);
 		List<WorkspaceItem> toChildren = new ArrayList<WorkspaceItem>(children.size());
 
 		for (Item item : children) {
diff --git a/src/test/java/WorkspaceInstance.java b/src/test/java/WorkspaceInstance.java
index 9ebac20..4a9155c 100644
--- a/src/test/java/WorkspaceInstance.java
+++ b/src/test/java/WorkspaceInstance.java
@@ -91,15 +91,15 @@ public class WorkspaceInstance {
 
 		int i = 0;
 		for (WorkspaceItem workspaceItem : children) {
-//			System.out.println(++i+")"+workspaceItem);
-//			System.out.println(workspaceItem.getType() +" "+workspaceItem.getClass());
-			System.out.println(++i+")");
+			System.out.println(++i+")"+workspaceItem);
+			System.out.println(workspaceItem.getType() +" "+workspaceItem.getClass());
 
 
-			if(workspaceItem.isFolder()){
-				WorkspaceFolder folder = (WorkspaceFolder) workspaceItem;
-				System.out.println("is public? "+folder.isPublicFolder());
-			}
+//			System.out.println(++i+")");
+//			if(workspaceItem.isFolder()){
+//				WorkspaceFolder folder = (WorkspaceFolder) workspaceItem;
+//				System.out.println("is public? "+folder.isPublicFolder());
+//			}
 
 			//printMap(workspaceItem);
 		}