diff --git a/src/main/java/org/gcube/portlets/user/workspace/server/GWTWorkspaceServiceImpl.java b/src/main/java/org/gcube/portlets/user/workspace/server/GWTWorkspaceServiceImpl.java index f4cbcd6..16bfb07 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/server/GWTWorkspaceServiceImpl.java +++ b/src/main/java/org/gcube/portlets/user/workspace/server/GWTWorkspaceServiceImpl.java @@ -2062,7 +2062,7 @@ public class GWTWorkspaceServiceImpl extends RemoteServiceServlet implements GWT WorkspaceItem wsItem = workspace.getItem(folderId); if(wsItem.isShared() && wsItem.getType().equals(WorkspaceItemType.SHARED_FOLDER)){ - WorkspaceSharedFolder ite = (WorkspaceSharedFolder) workspace.getItemByPath(wsItem.getPath()); + WorkspaceSharedFolder ite = (WorkspaceSharedFolder) wsItem; workspaceLogger.info("Retrieving administrators..."); Map> aclOwner = ite.getACLOwner(); @@ -2693,7 +2693,7 @@ public class GWTWorkspaceServiceImpl extends RemoteServiceServlet implements GWT WorkspaceItem wsItem = workspace.getItem(folderId); if(wsItem.isShared() && wsItem.getType().equals(WorkspaceItemType.SHARED_FOLDER)){ - WorkspaceSharedFolder ite = (WorkspaceSharedFolder) workspace.getItemByPath(wsItem.getPath()); + WorkspaceSharedFolder ite = (WorkspaceSharedFolder) wsItem; //PATCH TODO TEMPORARY SOLUTION if(ite.isVreFolder()){ List groupName = new ArrayList(); diff --git a/src/test/java/org/gcube/portlets/user/workspace/ItemRetrieve.java b/src/test/java/org/gcube/portlets/user/workspace/ItemRetrieve.java index a46df25..856e66e 100644 --- a/src/test/java/org/gcube/portlets/user/workspace/ItemRetrieve.java +++ b/src/test/java/org/gcube/portlets/user/workspace/ItemRetrieve.java @@ -31,9 +31,9 @@ public class ItemRetrieve { // public static String DEFAULT_SCOPE = "/d4science.research-infrastructures.eu/gCubeApps"; //PRODUCTION public static String DEFAULT_SCOPE = "/gcube/devsec"; //DEV - public static String TEST_USER = "francesco.mangiacrapa"; + public static String TEST_USER = "gianpaolo.coro"; // public static String ITEMID = "63832213-098d-42d1-8774-89b6349764c0"; //Activity T3.4 working drafts/T2-EC-IMAR-HO-14-015 iMarine Sustainability WP - Business Model tools.pdf -// public static String ITEMID = "79b2490b-43aa-40b0-98ec-e073cf7d4887"; + public static String ITEMID = "a5aca54d-67cf-4838-9025-9ef5bb204ae9"; // d81d3a64-603f-4907-ae74-be8353211807 protected static Logger logger = Logger.getLogger(ItemRetrieve.class); @@ -47,10 +47,10 @@ public class ItemRetrieve { try { Workspace ws = getWorkspace(); + System.out.println(ws.getRoot().getId()); +// retrieveFirstLevel(ws, null); - retrieveFirstLevel(ws, null); - -// retrieveFirstLevel(ws, ITEMID); + retrieveFirstLevel(ws, ITEMID); System.out.println("get workspace -> OK"); // WorkspaceItem item = ws.getItem(ITEMID); @@ -134,7 +134,7 @@ public class ItemRetrieve { WorkspaceFolder folder = (WorkspaceFolder) workspaceItem; - System.out.println(++i+") "+folder.getId() +" folder name: "+folder.getName() + " owner "+folder.getOwner()); + System.out.println(++i+") "+folder.getId() +" folder name: "+folder.getName() + " owner "+folder.getOwner() +" path: "+folder.getPath()); foldersCounter++; break; @@ -143,7 +143,7 @@ public class ItemRetrieve { WorkspaceSharedFolder shared = (WorkspaceSharedFolder) workspaceItem; - System.out.println(++i+") "+shared.getId() +" shared folder name: "+shared.getName() + " owner "+shared.getOwner()+" isVRE "+shared.isVreFolder() +" ACLOwner: "+shared.getACLOwner()+" AclUser: "+shared.getACLUser()); + System.out.println(++i+") "+shared.getId() +" shared folder name: "+shared.getName() + " owner "+shared.getOwner()+" isVRE "+shared.isVreFolder() +" ACLOwner: "+shared.getACLOwner()+" AclUser: "+shared.getACLUser() +" path: "+shared.getPath()); // System.out.println(++i+") shared folder name: "+shared.getName() + " owner "+shared.getOwner().getPortalLogin()); sharedFoldersCounter++; @@ -154,13 +154,13 @@ public class ItemRetrieve { FolderItem folderItem = (FolderItem) workspaceItem; - System.out.println(++i+") folderItem id: "+folderItem.getId() +", name: "+folderItem.getName() + ", own: "+folderItem.getOwner()); + System.out.println(++i+") folderItem id: "+folderItem.getId() +", name: "+folderItem.getName() + ", own: "+folderItem.getOwner() +" path: "+folderItem.getPath()); folderItemCounter++; break; default: - System.out.println(++i+") DEFAULT - item id: "+workspaceItem.getId() +", name: "+workspaceItem.getName() + ", own: "+workspaceItem.getOwner()); - othersCounter++; +// System.out.println(++i+") DEFAULT - item id: "+workspaceItem.getId() +", name: "+workspaceItem.getName() + ", own: "+workspaceItem.getOwner()); +// othersCounter++; break; } }