From ed2ef1de330c8997a52319c1d9088a00cb389603 Mon Sep 17 00:00:00 2001 From: Lucio Lelii Date: Thu, 25 Jul 2019 15:47:18 +0000 Subject: [PATCH] git-svn-id: https://svn.d4science-ii.research-infrastructures.eu/gcube/trunk/Common/storagehub-client@181326 82a268e6-3cf1-43bd-a215-b396298e98cf --- pom.xml | 2 +- .../client/dsl/StorageHubClient.java | 10 +++++++ .../proxies/DefaultWorkspaceManager.java | 8 ++--- .../proxies/WorkspaceManagerClient.java | 4 +-- .../java/org/gcube/data/access/fs/Items.java | 30 +++++++++++++++++++ .../org/gcube/data/access/fs/TestCall.java | 6 ++-- 6 files changed, 50 insertions(+), 10 deletions(-) diff --git a/pom.xml b/pom.xml index 7eed9ef..9310aff 100644 --- a/pom.xml +++ b/pom.xml @@ -12,7 +12,7 @@ org.gcube.common storagehub-client-library - 1.0.4-SNAPSHOT + 1.0.5-SNAPSHOT storagehub-client-library diff --git a/src/main/java/org/gcube/common/storagehub/client/dsl/StorageHubClient.java b/src/main/java/org/gcube/common/storagehub/client/dsl/StorageHubClient.java index 6e67c1d..7a0c56f 100644 --- a/src/main/java/org/gcube/common/storagehub/client/dsl/StorageHubClient.java +++ b/src/main/java/org/gcube/common/storagehub/client/dsl/StorageHubClient.java @@ -41,6 +41,16 @@ public class StorageHubClient { wsClient.emptyTrash(); } + public double getTotalVolume() { + return wsClient.getTotalVolume(); + } + + public long getTotalItemCount() { + return wsClient.getTotalItemCount(); + } + + + public GenericItemContainer restoreThrashItem(String itemId) { return new GenericItemContainer(itemclient, wsClient.restoreFromTrash(itemId)); } diff --git a/src/main/java/org/gcube/common/storagehub/client/proxies/DefaultWorkspaceManager.java b/src/main/java/org/gcube/common/storagehub/client/proxies/DefaultWorkspaceManager.java index 9693e4d..ee90cd1 100644 --- a/src/main/java/org/gcube/common/storagehub/client/proxies/DefaultWorkspaceManager.java +++ b/src/main/java/org/gcube/common/storagehub/client/proxies/DefaultWorkspaceManager.java @@ -351,7 +351,7 @@ public class DefaultWorkspaceManager implements WorkspaceManagerClient { } @Override - public String getTotalItemCount() { + public long getTotalItemCount() { Call call = new Call() { @Override public String call(GXWebTargetAdapterRequest manager) throws Exception { @@ -370,14 +370,14 @@ public class DefaultWorkspaceManager implements WorkspaceManagerClient { } }; try { - return delegate.make(call); + return Long.parseLong(delegate.make(call)); }catch(Exception e) { throw new RuntimeException(e); } } @Override - public String getTotalVolume() { + public long getTotalVolume() { Call call = new Call() { @Override public String call(GXWebTargetAdapterRequest manager) throws Exception { @@ -396,7 +396,7 @@ public class DefaultWorkspaceManager implements WorkspaceManagerClient { } }; try { - return delegate.make(call); + return Long.parseLong(delegate.make(call)); }catch(Exception e) { throw new RuntimeException(e); } diff --git a/src/main/java/org/gcube/common/storagehub/client/proxies/WorkspaceManagerClient.java b/src/main/java/org/gcube/common/storagehub/client/proxies/WorkspaceManagerClient.java index a1bae0e..a841c3d 100644 --- a/src/main/java/org/gcube/common/storagehub/client/proxies/WorkspaceManagerClient.java +++ b/src/main/java/org/gcube/common/storagehub/client/proxies/WorkspaceManagerClient.java @@ -28,8 +28,8 @@ public interface WorkspaceManagerClient { void emptyTrash(); - String getTotalItemCount(); + long getTotalItemCount(); - String getTotalVolume(); + long getTotalVolume(); } diff --git a/src/test/java/org/gcube/data/access/fs/Items.java b/src/test/java/org/gcube/data/access/fs/Items.java index c8b8bef..3a4d94b 100644 --- a/src/test/java/org/gcube/data/access/fs/Items.java +++ b/src/test/java/org/gcube/data/access/fs/Items.java @@ -9,6 +9,7 @@ import java.util.Arrays; import java.util.Collections; import java.util.HashSet; import java.util.List; +import java.util.Map.Entry; import java.util.Set; import org.gcube.common.authorization.library.provider.SecurityTokenProvider; @@ -19,6 +20,7 @@ import org.gcube.common.storagehub.client.dsl.FileContainer; import org.gcube.common.storagehub.client.dsl.FolderContainer; import org.gcube.common.storagehub.client.dsl.ItemContainer; import org.gcube.common.storagehub.client.dsl.StorageHubClient; +import org.gcube.common.storagehub.model.Metadata; import org.gcube.common.storagehub.model.acls.AccessType; import org.gcube.common.storagehub.model.exceptions.StorageHubException; import org.gcube.common.storagehub.model.exceptions.UserNotAuthorizedException; @@ -148,6 +150,34 @@ public class Items { } + @Test + public void changeProp() throws Exception { + StorageHubClient shc = new StorageHubClient(); + + ItemContainer item = shc.open("6399daa7-2173-4314-b4f7-2afa24eae8f8").asItem(); + Metadata first = item.get().getMetadata(); + first.getMap().put("lucio", "ok"); + + item.setMetadata(first); + + Metadata second = item.get().getMetadata(); + for (Entry entry: second.getMap().entrySet()) + System.out.println(entry.getKey()+" "+entry.getValue()); + + + second.getMap().put("lucio", null); + second.getMap().put("lelii", "0"); + + item.setMetadata(second); + + Metadata third = item.get().getMetadata(); + for (Entry entry: third.getMap().entrySet()) + System.out.println(entry.getKey()+" "+entry.getValue()); + + + } + + @Test public void uploadArchive() throws Exception { diff --git a/src/test/java/org/gcube/data/access/fs/TestCall.java b/src/test/java/org/gcube/data/access/fs/TestCall.java index 1ef220d..2e0fc3f 100644 --- a/src/test/java/org/gcube/data/access/fs/TestCall.java +++ b/src/test/java/org/gcube/data/access/fs/TestCall.java @@ -53,8 +53,8 @@ public class TestCall { @BeforeClass public static void setUp(){ - SecurityTokenProvider.instance.set("7c26a682-f47b-4e6e-90e0-6d101a4314cd-980114272"); - ScopeProvider.instance.set("/pred4s"); + SecurityTokenProvider.instance.set("b7c80297-e4ed-42ab-ab42-fdc0b8b0eabf-98187548"); + ScopeProvider.instance.set("/gcube"); } @Test(expected=UserNotAuthorizedException.class) @@ -281,7 +281,7 @@ public class TestCall { WorkspaceManagerClient wsclient = AbstractPlugin.workspace().build(); //String path = wsclient.getVreFolder("hl:accounting").getPath(); //System.out.println("path is "+path); - query.setExpression(new ISDescendant(Paths.getPath("/Home/m.assante/Workspace/"))); + query.setExpression(new ISDescendant(Paths.getPath("/Home/lucio.lelii/Workspace/"))); query.setLimit(10); query.setOrder(new OrderField(GenericSearchableItem.get().title)); List items = wsclient.search(query, "hl:accounting", "jcr:content");