From 6c68b6c14237a0b159ff8d6f7c4d69ed04c2242e Mon Sep 17 00:00:00 2001 From: Lucio Lelii Date: Mon, 24 Sep 2018 13:21:20 +0000 Subject: [PATCH] git-svn-id: https://svn.d4science-ii.research-infrastructures.eu/gcube/trunk/Common/storagehub-client@171637 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../storagehub/client/plugins/WorkspaceManagerPlugin.java | 1 - .../storagehub/client/proxies/DefaultItemManager.java | 7 +++++-- src/test/java/org/gcube/data/access/fs/TestCall.java | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/gcube/common/storagehub/client/plugins/WorkspaceManagerPlugin.java b/src/main/java/org/gcube/common/storagehub/client/plugins/WorkspaceManagerPlugin.java index 085cbca..f6ff9a3 100644 --- a/src/main/java/org/gcube/common/storagehub/client/plugins/WorkspaceManagerPlugin.java +++ b/src/main/java/org/gcube/common/storagehub/client/plugins/WorkspaceManagerPlugin.java @@ -1,6 +1,5 @@ package org.gcube.common.storagehub.client.plugins; -import javax.ws.rs.client.WebTarget; import javax.xml.transform.dom.DOMResult; import javax.xml.ws.EndpointReference; 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 322486a..298d2cf 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 @@ -22,6 +22,7 @@ import org.gcube.common.gxrest.response.inbound.GXInboundResponse; import org.gcube.common.storagehub.client.StreamDescriptor; import org.gcube.common.storagehub.model.acls.ACL; import org.gcube.common.storagehub.model.acls.AccessType; +import org.gcube.common.storagehub.model.exceptions.BackendGenericError; import org.gcube.common.storagehub.model.items.Item; import org.gcube.common.storagehub.model.service.ItemList; import org.gcube.common.storagehub.model.service.ItemWrapper; @@ -341,10 +342,12 @@ public class DefaultItemManager implements ItemManagerClient { formData.add("description", description); - GXInboundResponse response = myManager.setAcceptedResponseType(MediaType.TEXT_PLAIN_TYPE).post(Entity.form(formData)); + GXInboundResponse response = myManager.setAcceptedResponseType(MediaType.APPLICATION_FORM_URLENCODED_TYPE).post(Entity.entity(formData, MediaType.APPLICATION_FORM_URLENCODED)); - if (response.hasGXError()) + if (response.hasGXError() || response.hasException()) throw response.getException(); + if (response.hasErrorCode()) + throw new BackendGenericError(); return response.getSource().readEntity(String.class); } 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 ba03628..512d1d0 100644 --- a/src/test/java/org/gcube/data/access/fs/TestCall.java +++ b/src/test/java/org/gcube/data/access/fs/TestCall.java @@ -82,7 +82,7 @@ public class TestCall { WorkspaceManagerClient client = AbstractPlugin.workspace().build(); Item ws = client.getWorkspace(); - String id = itemclient.createFolder(ws.getId(), "ok6SharingTest", "shared folder for test SHM"); + String id = itemclient.createFolder(ws.getId(), "ok7SharingTest", "shared folder for test SHM"); String sharedId = itemclient.shareFolder(id, new HashSet(Arrays.asList("giancarlo.panichi")), AccessType.WRITE_OWNER); itemclient.uploadFile(new FileInputStream("/home/lucio/Downloads/upload.pdf"), sharedId, "sharedFile.pdf" , "shared file in a shared folder");