gCubeSystem
/
storagehub-client-library
16
0
Fork 0
Code Issues Pull Requests Releases 2 Wiki Activity

git-svn-id: https://svn.d4science-ii.research-infrastructures.eu/gcube/trunk/Common/storagehub-client@171591 82a268e6-3cf1-43bd-a215-b396298e98cf

This commit is contained in:
Lucio Lelii 2018-09-21 13:28:19 +00:00
parent 045c149b70
commit 328583d21b
5 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/org/gcube/common/storagehub/client/dsl/StorageHubClient.java
View File

@ -33,4 +33,12 @@ public class StorageHubClient {
return new FolderContainer(itemclient, wsClient.getTrashFolder()); return new FolderContainer(itemclient, wsClient.getTrashFolder());
} }
public void emptyTrash() {
wsClient.emptyTrash();
}
public FolderContainer restoreThrashItem(String itemId) {
return new FolderContainer(itemclient, wsClient.restoreFromTrash(itemId));
}
} }

5
src/main/java/org/gcube/common/storagehub/client/proxies/DefaultItemManager.java
View File

@ -9,6 +9,7 @@ import java.util.Set;
import javax.ws.rs.client.Entity; import javax.ws.rs.client.Entity;
import javax.ws.rs.client.Invocation; import javax.ws.rs.client.Invocation;
import javax.ws.rs.client.WebTarget;
import javax.ws.rs.core.MediaType; import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.MultivaluedHashMap; import javax.ws.rs.core.MultivaluedHashMap;
import javax.ws.rs.core.MultivaluedMap; import javax.ws.rs.core.MultivaluedMap;
@ -275,14 +276,14 @@ public class DefaultItemManager implements ItemManagerClient {
public String call(GXWebTargetAdapterRequest manager) throws Exception { public String call(GXWebTargetAdapterRequest manager) throws Exception {
GXWebTargetAdapterRequest myManager = manager.register(MultiPartFeature.class).path(parentId) GXWebTargetAdapterRequest myManager = manager.register(MultiPartFeature.class).path(parentId)
.path("create").path("FILE"); .path("create").path("FILE");
FormDataMultiPart multipart = new FormDataMultiPart(); FormDataMultiPart multipart = new FormDataMultiPart();
multipart.field("name", fileName); multipart.field("name", fileName);
multipart.field("description", description); multipart.field("description", description);
multipart.field("file", stream, MediaType.APPLICATION_OCTET_STREAM_TYPE); 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()) if (response.hasGXError())
throw response.getException(); throw response.getException();

3
src/main/java/org/gcube/common/storagehub/client/proxies/DefaultWorkspaceManager.java
View File

@ -7,7 +7,6 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import javax.ws.rs.client.Entity; import javax.ws.rs.client.Entity;
import javax.ws.rs.client.Invocation;
import javax.ws.rs.core.MediaType; import javax.ws.rs.core.MediaType;
import org.gcube.common.clients.Call; import org.gcube.common.clients.Call;
@ -214,7 +213,7 @@ public class DefaultWorkspaceManager implements WorkspaceManagerClient {
} }
@Override @Override
public void emptyTrash(String id) { public void emptyTrash() {
Call<GXWebTargetAdapterRequest, Void> call = new Call<GXWebTargetAdapterRequest, Void>() { Call<GXWebTargetAdapterRequest, Void> call = new Call<GXWebTargetAdapterRequest, Void>() {
@Override @Override
public Void call(GXWebTargetAdapterRequest manager) throws Exception { public Void call(GXWebTargetAdapterRequest manager) throws Exception {

2
src/main/java/org/gcube/common/storagehub/client/proxies/WorkspaceManagerClient.java
View File

@ -26,6 +26,6 @@ public interface WorkspaceManagerClient {
String restoreFromTrash(String id); String restoreFromTrash(String id);
void emptyTrash(String id); void emptyTrash();
} }

10
src/test/java/org/gcube/data/access/fs/TestCall.java
View File

@ -58,8 +58,12 @@ public class TestCall {
public void getListByPath() throws Exception{ public void getListByPath() throws Exception{
ItemManagerClient itemclient = AbstractPlugin.item().build(); ItemManagerClient itemclient = AbstractPlugin.item().build();
WorkspaceManagerClient client = AbstractPlugin.workspace().build(); WorkspaceManagerClient client = AbstractPlugin.workspace().build();
Item ws = client.getWorkspace(); try {
System.out.println("ws id is "+ws.getId()); Item ws = client.getWorkspace();
}catch (Exception e) {
e.printStackTrace();
}
/*System.out.println("ws id is "+ws.getId());
List<? extends Item> items = itemclient.getChildren(ws.getId(),10, 5, "hl:accounting", "jcr:content"); List<? extends Item> items = itemclient.getChildren(ws.getId(),10, 5, "hl:accounting", "jcr:content");
List<? extends Item> Vreitems = client.getVreFolders("hl:accounting"); List<? extends Item> Vreitems = client.getVreFolders("hl:accounting");
List<? extends Item> VreitemsPaged = client.getVreFolders(5,5, "hl:accounting"); List<? extends Item> VreitemsPaged = client.getVreFolders(5,5, "hl:accounting");
@ -68,7 +72,7 @@ public class TestCall {
System.out.println("vreItems are "+Vreitems.size()); System.out.println("vreItems are "+Vreitems.size());
System.in.read(); System.in.read();*/
} }