git-svn-id: https://svn.d4science-ii.research-infrastructures.eu/gcube/trunk/Common/storagehub-client@171726 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
parent
3ec9a982e0
commit
f24a4a4dbe
18
pom.xml
18
pom.xml
|
@ -86,6 +86,24 @@
|
|||
<artifactId>common-generic-clients</artifactId>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>org.slf4j</groupId>
|
||||
<artifactId>slf4j-api</artifactId>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>junit</groupId>
|
||||
<artifactId>junit</artifactId>
|
||||
<version>4.11</version>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>ch.qos.logback</groupId>
|
||||
<artifactId>logback-classic</artifactId>
|
||||
<version>1.0.13</version>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
|
||||
</dependencies>
|
||||
|
||||
<build>
|
||||
|
|
|
@ -54,7 +54,7 @@ public class DefaultItemManager implements ItemManagerClient {
|
|||
if (onlyOfType!=null)
|
||||
params.put("onlyType", new Object[] {resolveNodeType(onlyOfType)});
|
||||
|
||||
GXInboundResponse response = myManager.setAcceptedResponseType(MediaType.APPLICATION_JSON_TYPE).queryParams(params).get();
|
||||
GXInboundResponse response = myManager.queryParams(params).get();
|
||||
|
||||
if (response.hasGXError())
|
||||
throw response.getException();
|
||||
|
@ -91,7 +91,7 @@ public class DefaultItemManager implements ItemManagerClient {
|
|||
params.put("limit", new Object[] {limit});
|
||||
|
||||
|
||||
GXInboundResponse response = myManager.setAcceptedResponseType(MediaType.APPLICATION_JSON_TYPE).queryParams(params).get();
|
||||
GXInboundResponse response = myManager.queryParams(params).get();
|
||||
|
||||
if (response.hasGXError())
|
||||
throw response.getException();
|
||||
|
@ -133,7 +133,7 @@ public class DefaultItemManager implements ItemManagerClient {
|
|||
if (onlyOfType!=null)
|
||||
params.put("onlyType", new Object[] {resolveNodeType(onlyOfType)});
|
||||
|
||||
GXInboundResponse response = myManager.queryParams(params).setAcceptedResponseType(MediaType.TEXT_PLAIN_TYPE).get();
|
||||
GXInboundResponse response = myManager.queryParams(params).get();
|
||||
|
||||
if (response.hasGXError())
|
||||
throw response.getException();
|
||||
|
@ -172,7 +172,7 @@ public class DefaultItemManager implements ItemManagerClient {
|
|||
if (excludeNodes !=null && excludeNodes.length>0)
|
||||
params.put("exclude",excludeNodes);
|
||||
|
||||
GXInboundResponse response = myManager.setAcceptedResponseType(MediaType.APPLICATION_OCTET_STREAM_TYPE).queryParams(params).get();
|
||||
GXInboundResponse response = myManager.queryParams(params).get();
|
||||
|
||||
if (response.hasGXError())
|
||||
throw response.getException();
|
||||
|
@ -205,7 +205,7 @@ public class DefaultItemManager implements ItemManagerClient {
|
|||
if (excludeNodes !=null && excludeNodes.length>0)
|
||||
params.put("exclude",excludeNodes);
|
||||
|
||||
GXInboundResponse response = myManager.setAcceptedResponseType(MediaType.APPLICATION_JSON_TYPE).queryParams(params).get();
|
||||
GXInboundResponse response = myManager.queryParams(params).get();
|
||||
|
||||
if (response.hasGXError())
|
||||
throw response.getException();
|
||||
|
@ -230,7 +230,7 @@ public class DefaultItemManager implements ItemManagerClient {
|
|||
@Override
|
||||
public ItemWrapper<Item> call(GXWebTargetAdapterRequest manager) throws Exception {
|
||||
GXWebTargetAdapterRequest myManager = manager.path(id).path("rootSharedFolder");
|
||||
GXInboundResponse response = myManager.setAcceptedResponseType(MediaType.APPLICATION_JSON_TYPE).get();
|
||||
GXInboundResponse response = myManager.get();
|
||||
|
||||
if (response.hasGXError())
|
||||
throw response.getException();
|
||||
|
@ -285,7 +285,7 @@ public class DefaultItemManager implements ItemManagerClient {
|
|||
if (excludeNodes !=null && excludeNodes.length>0)
|
||||
params.put("exclude",excludeNodes);
|
||||
|
||||
GXInboundResponse response = myManager.queryParams(params).setAcceptedResponseType(MediaType.APPLICATION_JSON_TYPE).get();
|
||||
GXInboundResponse response = myManager.queryParams(params).get();
|
||||
|
||||
if (response.hasGXError())
|
||||
throw response.getException();
|
||||
|
@ -318,7 +318,7 @@ public class DefaultItemManager implements ItemManagerClient {
|
|||
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));
|
||||
GXInboundResponse response = myManager.post(Entity.entity(multipart, MediaType.MULTIPART_FORM_DATA));
|
||||
|
||||
if (response.hasGXError())
|
||||
throw response.getException();
|
||||
|
@ -345,7 +345,7 @@ public class DefaultItemManager implements ItemManagerClient {
|
|||
multipart.field("parentFolderName", extractionFolderName);
|
||||
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.post(Entity.entity(multipart, MediaType.MULTIPART_FORM_DATA_TYPE));
|
||||
|
||||
if (response.hasGXError())
|
||||
throw response.getException();
|
||||
|
@ -376,7 +376,7 @@ public class DefaultItemManager implements ItemManagerClient {
|
|||
formData.add("description", description);
|
||||
|
||||
|
||||
GXInboundResponse response = myManager.setAcceptedResponseType(MediaType.APPLICATION_FORM_URLENCODED_TYPE).post(Entity.entity(formData, MediaType.APPLICATION_FORM_URLENCODED));
|
||||
GXInboundResponse response = myManager.post(Entity.entity(formData, MediaType.APPLICATION_FORM_URLENCODED));
|
||||
|
||||
if (response.hasGXError() || response.hasException())
|
||||
throw response.getException();
|
||||
|
@ -407,7 +407,7 @@ public class DefaultItemManager implements ItemManagerClient {
|
|||
multipart.field("defaultAccessType", accessType, MediaType.APPLICATION_JSON_TYPE);
|
||||
multipart.field("users", users, MediaType.APPLICATION_JSON_TYPE);
|
||||
|
||||
GXInboundResponse response = myManager.setAcceptedResponseType(MediaType.TEXT_PLAIN_TYPE).put(Entity.entity(multipart, MediaType.MULTIPART_FORM_DATA_TYPE));
|
||||
GXInboundResponse response = myManager.put(Entity.entity(multipart, MediaType.MULTIPART_FORM_DATA_TYPE));
|
||||
|
||||
if (response.hasGXError())
|
||||
throw response.getException();
|
||||
|
@ -433,7 +433,7 @@ public class DefaultItemManager implements ItemManagerClient {
|
|||
|
||||
try (FormDataMultiPart multipart = new FormDataMultiPart()){
|
||||
multipart.field("users", users, MediaType.APPLICATION_JSON_TYPE);
|
||||
GXInboundResponse response = myManager.setAcceptedResponseType(MediaType.TEXT_PLAIN_TYPE).put(Entity.entity(multipart, MediaType.MULTIPART_FORM_DATA_TYPE));
|
||||
GXInboundResponse response = myManager.put(Entity.entity(multipart, MediaType.MULTIPART_FORM_DATA_TYPE));
|
||||
|
||||
if (response.hasGXError())
|
||||
throw response.getException();
|
||||
|
@ -455,7 +455,7 @@ public class DefaultItemManager implements ItemManagerClient {
|
|||
@Override
|
||||
public Void call(GXWebTargetAdapterRequest manager) throws Exception {
|
||||
GXWebTargetAdapterRequest myManager = manager.path(id);
|
||||
GXInboundResponse response = myManager.setAcceptedResponseType(MediaType.TEXT_PLAIN_TYPE).delete();
|
||||
GXInboundResponse response = myManager.delete();
|
||||
|
||||
if (response.hasGXError())
|
||||
throw response.getException();
|
||||
|
@ -480,7 +480,7 @@ public class DefaultItemManager implements ItemManagerClient {
|
|||
if (excludeNodes !=null && excludeNodes.length>0)
|
||||
params.put("exclude",excludeNodes);
|
||||
|
||||
GXInboundResponse response = myManager.setAcceptedResponseType(MediaType.APPLICATION_JSON_TYPE).queryParams(params).get();
|
||||
GXInboundResponse response = myManager.queryParams(params).get();
|
||||
|
||||
if (response.hasGXError())
|
||||
throw response.getException();
|
||||
|
@ -502,7 +502,7 @@ public class DefaultItemManager implements ItemManagerClient {
|
|||
@Override
|
||||
public ACLList call(GXWebTargetAdapterRequest manager) throws Exception {
|
||||
GXWebTargetAdapterRequest myManager = manager.path(id).path("acls");
|
||||
GXInboundResponse response = myManager.setAcceptedResponseType(MediaType.APPLICATION_JSON_TYPE).get();
|
||||
GXInboundResponse response = myManager.get();
|
||||
|
||||
if (response.hasGXError())
|
||||
throw response.getException();
|
||||
|
@ -531,7 +531,7 @@ public class DefaultItemManager implements ItemManagerClient {
|
|||
formData.add("fileName", newFilename);
|
||||
|
||||
|
||||
GXInboundResponse response = myManager.setAcceptedResponseType(MediaType.TEXT_PLAIN_TYPE).post(Entity.form(formData));
|
||||
GXInboundResponse response = myManager.post(Entity.form(formData));
|
||||
|
||||
if (response.hasGXError())
|
||||
throw response.getException();
|
||||
|
|
|
@ -43,7 +43,7 @@ public class DefaultWorkspaceManager implements WorkspaceManagerClient {
|
|||
if (excludeNodes !=null && excludeNodes.length>0)
|
||||
params.put("exclude",excludeNodes);
|
||||
|
||||
GXInboundResponse response = myManager.setAcceptedResponseType(MediaType.APPLICATION_JSON_TYPE).queryParams(params).get();
|
||||
GXInboundResponse response = myManager.queryParams(params).get();
|
||||
|
||||
if (response.hasGXError())
|
||||
throw response.getException();
|
||||
|
@ -94,7 +94,7 @@ public class DefaultWorkspaceManager implements WorkspaceManagerClient {
|
|||
if (excludeNodes !=null && excludeNodes.length>0)
|
||||
params.put("exclude",excludeNodes);
|
||||
|
||||
GXInboundResponse response = myManager.setAcceptedResponseType(MediaType.APPLICATION_JSON_TYPE).queryParams(params).get();
|
||||
GXInboundResponse response = myManager.queryParams(params).get();
|
||||
|
||||
if (response.hasGXError())
|
||||
throw response.getException();
|
||||
|
@ -123,7 +123,7 @@ public class DefaultWorkspaceManager implements WorkspaceManagerClient {
|
|||
params.put("start", new Object[] {start});
|
||||
params.put("limit", new Object[] {limit});
|
||||
|
||||
GXInboundResponse response = myManager.setAcceptedResponseType(MediaType.APPLICATION_JSON_TYPE).queryParams(params).get();
|
||||
GXInboundResponse response = myManager.queryParams(params).get();
|
||||
|
||||
if (response.hasGXError())
|
||||
throw response.getException();
|
||||
|
@ -150,7 +150,7 @@ public class DefaultWorkspaceManager implements WorkspaceManagerClient {
|
|||
if (excludeNodes !=null && excludeNodes.length>0)
|
||||
params.put("exclude",excludeNodes);
|
||||
|
||||
GXInboundResponse response = myManager.setAcceptedResponseType(MediaType.APPLICATION_JSON_TYPE).queryParams(params).get();
|
||||
GXInboundResponse response = myManager.queryParams(params).get();
|
||||
if (response.hasGXError())
|
||||
throw response.getException();
|
||||
return response.getSource().readEntity(ItemWrapper.class);
|
||||
|
@ -171,7 +171,7 @@ public class DefaultWorkspaceManager implements WorkspaceManagerClient {
|
|||
public ItemList call(GXWebTargetAdapterRequest manager) throws Exception {
|
||||
GXWebTargetAdapterRequest myManager = manager.path("vrefolder").path("recents");
|
||||
|
||||
GXInboundResponse response = myManager.setAcceptedResponseType(MediaType.APPLICATION_JSON_TYPE).get();
|
||||
GXInboundResponse response = myManager.get();
|
||||
|
||||
if (response.hasGXError())
|
||||
throw response.getException();
|
||||
|
@ -198,7 +198,7 @@ public class DefaultWorkspaceManager implements WorkspaceManagerClient {
|
|||
if (excludeNodes !=null && excludeNodes.length>0)
|
||||
params.put("exclude",excludeNodes);
|
||||
|
||||
GXInboundResponse response = myManager.setAcceptedResponseType(MediaType.APPLICATION_JSON_TYPE).queryParams(params).get();
|
||||
GXInboundResponse response = myManager.queryParams(params).get();
|
||||
if (response.hasGXError())
|
||||
throw response.getException();
|
||||
return response.getSource().readEntity(ItemWrapper.class);
|
||||
|
@ -219,7 +219,7 @@ public class DefaultWorkspaceManager implements WorkspaceManagerClient {
|
|||
public Void call(GXWebTargetAdapterRequest manager) throws Exception {
|
||||
GXWebTargetAdapterRequest myManager = manager.path("trash").path("empty");
|
||||
|
||||
GXInboundResponse response = myManager.setAcceptedResponseType(MediaType.TEXT_PLAIN_TYPE).delete();
|
||||
GXInboundResponse response = myManager.delete();
|
||||
if (response.hasGXError())
|
||||
throw response.getException();
|
||||
|
||||
|
@ -240,7 +240,7 @@ public class DefaultWorkspaceManager implements WorkspaceManagerClient {
|
|||
public String call(GXWebTargetAdapterRequest manager) throws Exception {
|
||||
GXWebTargetAdapterRequest myManager = manager.path("trash").path("restore");
|
||||
|
||||
GXInboundResponse response = myManager.setAcceptedResponseType(MediaType.TEXT_PLAIN_TYPE).put(Entity.text(id));
|
||||
GXInboundResponse response = myManager.put(Entity.text(id));
|
||||
if (response.hasGXError())
|
||||
throw response.getException();
|
||||
|
||||
|
@ -287,7 +287,7 @@ public class DefaultWorkspaceManager implements WorkspaceManagerClient {
|
|||
|
||||
params.put("e", new Object[] { URLEncoder.encode(serializedJson)});
|
||||
|
||||
GXInboundResponse response = myManager.setAcceptedResponseType(MediaType.APPLICATION_JSON_TYPE).queryParams(params).get();
|
||||
GXInboundResponse response = myManager.queryParams(params).get();
|
||||
if (response.hasGXError())
|
||||
throw response.getException();
|
||||
return response.getSource().readEntity(ItemList.class);
|
||||
|
|
|
@ -0,0 +1,16 @@
|
|||
<configuration>
|
||||
|
||||
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
|
||||
<encoder>
|
||||
<pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{0}: %msg%n</pattern>
|
||||
</encoder>
|
||||
</appender>
|
||||
|
||||
|
||||
<logger name="org.gcube" level="TRACE" />
|
||||
|
||||
<root level="WARN">
|
||||
<appender-ref ref="STDOUT" />
|
||||
</root>
|
||||
|
||||
</configuration>
|
Loading…
Reference in New Issue