From 7476cec4d86f5182e9cb64e2f3da508202364bd1 Mon Sep 17 00:00:00 2001 From: Giancarlo Panichi Date: Mon, 25 Jun 2018 09:03:46 +0000 Subject: [PATCH] ref 11720: DataMiner - Update to StorageHUB https://support.d4science.org/issues/11720 Updated to StorageHub getPublicLink and getProperties functions. git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/data-miner-manager@169412 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../server/storage/StorageUtil.java | 30 +++++-------------- 1 file changed, 8 insertions(+), 22 deletions(-) diff --git a/src/main/java/org/gcube/portlets/user/dataminermanager/server/storage/StorageUtil.java b/src/main/java/org/gcube/portlets/user/dataminermanager/server/storage/StorageUtil.java index cb6eef6..daaf230 100644 --- a/src/main/java/org/gcube/portlets/user/dataminermanager/server/storage/StorageUtil.java +++ b/src/main/java/org/gcube/portlets/user/dataminermanager/server/storage/StorageUtil.java @@ -9,16 +9,13 @@ import org.gcube.common.homelibrary.home.HomeLibrary; import org.gcube.common.homelibrary.home.workspace.Workspace; import org.gcube.common.homelibrary.home.workspace.WorkspaceItem; import org.gcube.common.storagehub.client.StreamDescriptor; +import org.gcube.common.storagehub.client.dsl.FileContainer; import org.gcube.common.storagehub.client.dsl.ItemContainer; import org.gcube.common.storagehub.client.dsl.OpenResolver; import org.gcube.common.storagehub.client.dsl.StorageHubClient; import org.gcube.common.storagehub.model.Metadata; -import org.gcube.common.storagehub.model.items.AbstractFileItem; import org.gcube.common.storagehub.model.items.FolderItem; -import org.gcube.common.storagehub.model.items.GenericFileItem; -import org.gcube.common.storagehub.model.items.ImageFile; import org.gcube.common.storagehub.model.items.Item; -import org.gcube.common.storagehub.model.items.PDFFileItem; import org.gcube.portlets.user.dataminermanager.shared.exception.ServiceException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -77,24 +74,12 @@ public class StorageUtil { try { logger.debug("getInputStreamForItemOnWorkspace: [user="+user+", itemId="+itemId+"]"); StorageHubClient shc = new StorageHubClient(); - ItemContainer itemContainer = shc.open(itemId).asItem(); - - Item item = itemContainer.get(); - if (item instanceof AbstractFileItem) { - if (item instanceof GenericFileItem | item instanceof ImageFile | item instanceof PDFFileItem) { - StreamDescriptor streamDescriptor = itemContainer.download(); - return streamDescriptor.getStream(); - } else { - throw new ServiceException("Is not a valid file!"); - } - - } else { - throw new ServiceException("Is not a valid file!"); - - } - + FileContainer fileContainer = shc.open(itemId).asFile(); + StreamDescriptor streamDescriptor = fileContainer.download(); + return streamDescriptor.getStream(); + } catch (Throwable e) { - logger.error("Error retrieving InputStream for Item: " +e.getLocalizedMessage(), e); + logger.error("Error retrieving InputStream for File: " +e.getLocalizedMessage(), e); throw new ServiceException(e.getLocalizedMessage(),e); } } @@ -170,7 +155,7 @@ public class StorageUtil { public WorkspaceItem getItemInRootFolderOnWorkspace(String user, String itemName) throws ServiceException { Workspace ws; try { - logger.debug(""); + logger.debug("GetItemInRootFolder: [user=" + user + ", itemName=" + itemName + "]"); ws = HomeLibrary.getUserWorkspace(user); WorkspaceItem item = ws.find(itemName, ws.getRoot().getId()); @@ -199,6 +184,7 @@ public class StorageUtil { throws ServiceException { Workspace ws; try { + logger.debug("GetItemInFolder: [user=" + user + ", folderId="+folderId+", itemName=" + itemName + "]"); ws = HomeLibrary.getUserWorkspace(user); WorkspaceItem item = ws.find(itemName, folderId);