From cdb53b2bf6dc846d6579194a5a8b9b36cca05ca7 Mon Sep 17 00:00:00 2001 From: Lucio Lelii Date: Thu, 19 Sep 2019 15:14:21 +0000 Subject: [PATCH] git-svn-id: https://svn.d4science-ii.research-infrastructures.eu/gcube/trunk/Common/storagehub-client@181775 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../common/storagehub/client/dsl/FolderContainer.java | 6 ++++-- .../storagehub/client/proxies/DefaultItemManager.java | 4 ++-- .../storagehub/client/proxies/ItemManagerClient.java | 4 +++- src/test/java/org/gcube/data/access/fs/Items.java | 7 +++---- 4 files changed, 12 insertions(+), 9 deletions(-) diff --git a/src/main/java/org/gcube/common/storagehub/client/dsl/FolderContainer.java b/src/main/java/org/gcube/common/storagehub/client/dsl/FolderContainer.java index 2186d9b..fee5edd 100644 --- a/src/main/java/org/gcube/common/storagehub/client/dsl/FolderContainer.java +++ b/src/main/java/org/gcube/common/storagehub/client/dsl/FolderContainer.java @@ -145,6 +145,8 @@ public class FolderContainer extends ItemContainer{ return itemclient.getACL(this.itemId); } + + /** * * changes {@ACL} of the {FolderItem} represented by this FolderContainer for a user @@ -153,10 +155,10 @@ public class FolderContainer extends ItemContainer{ * @throws {@InvalidItemException} * @throws {@UserNotAuthorizedException} if user is not administrator of this folder */ - public FolderContainer changeAcls(String user, AccessType accessType) throws StorageHubException { + /*public FolderContainer changeAcls(String user, AccessType accessType) throws StorageHubException { itemclient.changeACL(this.itemId, user, accessType); return this; - } + }*/ public boolean canWrite() throws Exception { return itemclient.canWriteInto(this.itemId); diff --git a/src/main/java/org/gcube/common/storagehub/client/proxies/DefaultItemManager.java b/src/main/java/org/gcube/common/storagehub/client/proxies/DefaultItemManager.java index a475ac6..d3542f6 100644 --- a/src/main/java/org/gcube/common/storagehub/client/proxies/DefaultItemManager.java +++ b/src/main/java/org/gcube/common/storagehub/client/proxies/DefaultItemManager.java @@ -1006,7 +1006,7 @@ public class DefaultItemManager implements ItemManagerClient { } - +/* @Override public String removeSharedFolderAdmin(String id, String user) throws StorageHubException { Call call = new Call() { @@ -1040,7 +1040,7 @@ public class DefaultItemManager implements ItemManagerClient { }catch(Exception e1) { throw new RuntimeException(e1); } - } + }*/ @Override diff --git a/src/main/java/org/gcube/common/storagehub/client/proxies/ItemManagerClient.java b/src/main/java/org/gcube/common/storagehub/client/proxies/ItemManagerClient.java index 4aa1592..0341cde 100644 --- a/src/main/java/org/gcube/common/storagehub/client/proxies/ItemManagerClient.java +++ b/src/main/java/org/gcube/common/storagehub/client/proxies/ItemManagerClient.java @@ -49,8 +49,10 @@ public interface ItemManagerClient { String changeACL(String id, String user, AccessType accessType) throws StorageHubException; + /* String removeSharedFolderAdmin(String id, String user) throws StorageHubException; - + */ + @Deprecated void delete(String id) throws StorageHubException; 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 bea887c..c1e5a5c 100644 --- a/src/test/java/org/gcube/data/access/fs/Items.java +++ b/src/test/java/org/gcube/data/access/fs/Items.java @@ -30,8 +30,8 @@ public class Items { @BeforeClass public static void setUp(){ - SecurityTokenProvider.instance.set("257800d8-24bf-4bae-83cd-ea99369e7dd6-843339462"); - ScopeProvider.instance.set("/d4science.research-infrastructures.eu"); + SecurityTokenProvider.instance.set("b7c80297-e4ed-42ab-ab42-fdc0b8b0eabf-98187548"); + ScopeProvider.instance.set("/gcube"); } @@ -59,8 +59,7 @@ public class Items { StorageHubClient shc = new StorageHubClient(); - shc.open("2ca7e04a-b461-4098-a8b9-a31ddb691a2d").asFolder().changeAcls("giancarlo.panichi", AccessType.READ_ONLY); - + System.out.println(shc.open("65e502ff-92ef-46cc-afbd-3e91f4b680be").asFolder().canWrite()); }