From 789f89e43a061eb1c6494926e0de7703618f8ec2 Mon Sep 17 00:00:00 2001 From: Lucio Lelii Date: Tue, 26 Mar 2019 16:40:44 +0000 Subject: [PATCH] git-svn-id: https://svn.d4science-ii.research-infrastructures.eu/gcube/branches/data-access/storagehub-webapp/1.0@178699 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../data/access/storagehub/services/ACLManager.java | 1 + .../data/access/storagehub/services/ItemsManager.java | 9 +++++++++ .../access/storagehub/services/WorkspaceManager.java | 7 +++++++ 3 files changed, 17 insertions(+) diff --git a/src/main/java/org/gcube/data/access/storagehub/services/ACLManager.java b/src/main/java/org/gcube/data/access/storagehub/services/ACLManager.java index 66eee5d..4618eb9 100644 --- a/src/main/java/org/gcube/data/access/storagehub/services/ACLManager.java +++ b/src/main/java/org/gcube/data/access/storagehub/services/ACLManager.java @@ -72,6 +72,7 @@ public class ACLManager { */ @GET @Path("{id}/acls") + @Produces(MediaType.APPLICATION_JSON) public ACLList getACL() { InnerMethodName.instance.set("getACLById"); Session ses = null; diff --git a/src/main/java/org/gcube/data/access/storagehub/services/ItemsManager.java b/src/main/java/org/gcube/data/access/storagehub/services/ItemsManager.java index 28d852f..c9f7448 100644 --- a/src/main/java/org/gcube/data/access/storagehub/services/ItemsManager.java +++ b/src/main/java/org/gcube/data/access/storagehub/services/ItemsManager.java @@ -119,6 +119,7 @@ public class ItemsManager { @GET @Path("{id}") + @Produces(MediaType.APPLICATION_JSON) public ItemWrapper getById(@QueryParam("exclude") List excludes){ InnerMethodName.instance.set("getById"); Session ses = null; @@ -147,6 +148,7 @@ public class ItemsManager { @GET @Path("{id}/items/{name}") + @Produces(MediaType.APPLICATION_JSON) public ItemList findChildrenByNamePattern(@QueryParam("exclude") List excludes, @PathParam("name") String name){ InnerMethodName.instance.set("findChildrenByNamePattern"); Session ses = null; @@ -191,6 +193,7 @@ public class ItemsManager { @GET @Path("{id}/children/count") + @Produces(MediaType.APPLICATION_JSON) public Long countById(@QueryParam("showHidden") Boolean showHidden, @QueryParam("exclude") List excludes, @QueryParam("onlyType") String nodeType){ InnerMethodName.instance.set("countById"); Session ses = null; @@ -218,6 +221,7 @@ public class ItemsManager { @GET @Path("{id}/children") + @Produces(MediaType.APPLICATION_JSON) public ItemList listById(@QueryParam("showHidden") Boolean showHidden, @QueryParam("exclude") List excludes, @QueryParam("onlyType") String nodeType){ InnerMethodName.instance.set("listById"); Session ses = null; @@ -245,6 +249,7 @@ public class ItemsManager { @GET @Path("{id}/children/paged") + @Produces(MediaType.APPLICATION_JSON) public ItemList listByIdPaged(@QueryParam("showHidden") Boolean showHidden, @QueryParam("start") Integer start, @QueryParam("limit") Integer limit, @QueryParam("exclude") List excludes, @QueryParam("onlyType") String nodeType){ InnerMethodName.instance.set("listByIdPaged"); Session ses = null; @@ -339,6 +344,7 @@ public class ItemsManager { } @GET + @Produces(MediaType.APPLICATION_JSON) @Path("{id}/publiclink") public URL getPublicLink(@QueryParam("version") String version) { InnerMethodName.instance.set("getPubliclink"); @@ -422,6 +428,7 @@ public class ItemsManager { @GET @Path("{id}/rootSharedFolder") + @Produces(MediaType.APPLICATION_JSON) public ItemWrapper getRootSharedFolder(@QueryParam("exclude") List excludes){ InnerMethodName.instance.set("getRootSharedFolder"); Session ses = null; @@ -464,6 +471,7 @@ public class ItemsManager { @GET @Path("{id}/versions") + @Produces(MediaType.APPLICATION_JSON) public VersionList getVersions(){ InnerMethodName.instance.set("getVersions"); Session ses = null; @@ -563,6 +571,7 @@ public class ItemsManager { @GET @Path("{id}/anchestors") + @Produces(MediaType.APPLICATION_JSON) public ItemList getAnchestors(@QueryParam("exclude") List excludes){ InnerMethodName.instance.set("getAnchestors"); org.gcube.common.storagehub.model.Path absolutePath = Utils.getWorkspacePath(); diff --git a/src/main/java/org/gcube/data/access/storagehub/services/WorkspaceManager.java b/src/main/java/org/gcube/data/access/storagehub/services/WorkspaceManager.java index f0d1b00..af018bc 100644 --- a/src/main/java/org/gcube/data/access/storagehub/services/WorkspaceManager.java +++ b/src/main/java/org/gcube/data/access/storagehub/services/WorkspaceManager.java @@ -93,6 +93,7 @@ public class WorkspaceManager { @Path("") @GET + @Produces(MediaType.APPLICATION_JSON) public ItemWrapper getWorkspace(@QueryParam("relPath") String relPath){ InnerMethodName.instance.set("getWorkspace"); Session ses = null; @@ -155,6 +156,7 @@ public class WorkspaceManager { @Path("vrefolder") @GET + @Produces(MediaType.APPLICATION_JSON) public ItemWrapper getVreRootFolder(){ InnerMethodName.instance.set("getVreRootFolder"); Session ses = null; @@ -177,6 +179,7 @@ public class WorkspaceManager { @Path("vrefolder/recents") @GET + @Produces(MediaType.APPLICATION_JSON) public ItemList getVreFolderRecentsDocument(){ InnerMethodName.instance.set("getVreFolderRecents"); Session ses = null; @@ -209,6 +212,7 @@ public class WorkspaceManager { @Path("trash") @GET + @Produces(MediaType.APPLICATION_JSON) public ItemWrapper getTrashRootFolder(){ InnerMethodName.instance.set("getTrashRootFolder"); Session ses = null; @@ -307,6 +311,7 @@ public class WorkspaceManager { @Path("vrefolders") @GET + @Produces(MediaType.APPLICATION_JSON) public ItemList getVreFolders(){ InnerMethodName.instance.set("getVreFolders"); Session ses = null; @@ -333,6 +338,7 @@ public class WorkspaceManager { @Path("vrefolders/paged") @GET + @Produces(MediaType.APPLICATION_JSON) public ItemList getVreFoldersPaged(@QueryParam("start") Integer start, @QueryParam("limit") Integer limit){ InnerMethodName.instance.set("getVreFoldersPaged"); Session ses = null; @@ -359,6 +365,7 @@ public class WorkspaceManager { @Path("query") @GET + @Produces(MediaType.APPLICATION_JSON) public ItemList searchItems(@QueryParam("n") String node, @QueryParam("e") String jsonExpr, @QueryParam("o") List orderField, @QueryParam("l") Integer limit, @QueryParam("f") Integer offset){ InnerMethodName.instance.set("searchItems"); Session ses = null;