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 f273482..2cd3bb3 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 @@ -33,4 +33,12 @@ public class StorageHubClient { return new FolderContainer(itemclient, wsClient.getTrashFolder()); } + public void emptyTrash() { + wsClient.emptyTrash(); + } + + public FolderContainer restoreThrashItem(String itemId) { + return new FolderContainer(itemclient, wsClient.restoreFromTrash(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 aa39824..23a7efa 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 @@ -9,6 +9,7 @@ import java.util.Set; import javax.ws.rs.client.Entity; import javax.ws.rs.client.Invocation; +import javax.ws.rs.client.WebTarget; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.MultivaluedHashMap; import javax.ws.rs.core.MultivaluedMap; @@ -275,14 +276,14 @@ public class DefaultItemManager implements ItemManagerClient { public String call(GXWebTargetAdapterRequest manager) throws Exception { GXWebTargetAdapterRequest myManager = manager.register(MultiPartFeature.class).path(parentId) .path("create").path("FILE"); - + FormDataMultiPart multipart = new FormDataMultiPart(); multipart.field("name", fileName); multipart.field("description", description); multipart.field("file", stream, MediaType.APPLICATION_OCTET_STREAM_TYPE); - GXInboundResponse response = myManager.setAcceptedResponseType(MediaType.TEXT_PLAIN_TYPE).post(Entity.entity(multipart, MediaType.MULTIPART_FORM_DATA_TYPE)); + GXInboundResponse response = myManager.setAcceptedResponseType(MediaType.TEXT_PLAIN_TYPE).post(Entity.entity(multipart, MediaType.MULTIPART_FORM_DATA)); if (response.hasGXError()) throw response.getException(); 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 aab1b77..92b063c 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 @@ -7,7 +7,6 @@ import java.util.List; import java.util.Map; import javax.ws.rs.client.Entity; -import javax.ws.rs.client.Invocation; import javax.ws.rs.core.MediaType; import org.gcube.common.clients.Call; @@ -214,7 +213,7 @@ public class DefaultWorkspaceManager implements WorkspaceManagerClient { } @Override - public void emptyTrash(String id) { + public void emptyTrash() { Call call = new Call() { @Override public Void call(GXWebTargetAdapterRequest manager) throws Exception { 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 c3be4f4..f05b5bc 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 @@ -26,6 +26,6 @@ public interface WorkspaceManagerClient { String restoreFromTrash(String id); - void emptyTrash(String id); + void emptyTrash(); } 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 467c4e6..ba03628 100644 --- a/src/test/java/org/gcube/data/access/fs/TestCall.java +++ b/src/test/java/org/gcube/data/access/fs/TestCall.java @@ -58,8 +58,12 @@ public class TestCall { public void getListByPath() throws Exception{ ItemManagerClient itemclient = AbstractPlugin.item().build(); WorkspaceManagerClient client = AbstractPlugin.workspace().build(); - Item ws = client.getWorkspace(); - System.out.println("ws id is "+ws.getId()); + try { + Item ws = client.getWorkspace(); + }catch (Exception e) { + e.printStackTrace(); + } + /*System.out.println("ws id is "+ws.getId()); List items = itemclient.getChildren(ws.getId(),10, 5, "hl:accounting", "jcr:content"); List Vreitems = client.getVreFolders("hl:accounting"); List VreitemsPaged = client.getVreFolders(5,5, "hl:accounting"); @@ -68,7 +72,7 @@ public class TestCall { System.out.println("vreItems are "+Vreitems.size()); - System.in.read(); + System.in.read();*/ }