From 443ead033c4d72bc97ce53f8c4b46fd6ab23fc0d Mon Sep 17 00:00:00 2001 From: Giancarlo Panichi Date: Tue, 25 Sep 2018 14:51:56 +0000 Subject: [PATCH] ref 11724: SAI - Update to StorageHUB https://support.d4science.org/issues/11724 Updated to StorageHub git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/statistical-algorithms-importer@171664 82a268e6-3cf1-43bd-a215-b396298e98cf --- pom.xml | 6 ------ .../server/storage/FilesStorage.java | 16 ++++++++-------- 2 files changed, 8 insertions(+), 14 deletions(-) diff --git a/pom.xml b/pom.xml index a026073..339b6f2 100644 --- a/pom.xml +++ b/pom.xml @@ -76,12 +76,6 @@ runtime - - xerces - xerces - 2.4.0 - - diff --git a/src/main/java/org/gcube/portlets/user/statisticalalgorithmsimporter/server/storage/FilesStorage.java b/src/main/java/org/gcube/portlets/user/statisticalalgorithmsimporter/server/storage/FilesStorage.java index 1da6079..cdd1a25 100644 --- a/src/main/java/org/gcube/portlets/user/statisticalalgorithmsimporter/server/storage/FilesStorage.java +++ b/src/main/java/org/gcube/portlets/user/statisticalalgorithmsimporter/server/storage/FilesStorage.java @@ -448,18 +448,18 @@ public class FilesStorage { FolderContainer folderContainer = openResolver.asFolder(); ListResolver listResolver = folderContainer.findByName(STATISTICAL_ALGORITHM_PROJECT_FILE_NAME); - List items = listResolver.getItems(); - if (items == null || items.isEmpty()) { + List> itemsContainer = listResolver.getContainers(); + if (itemsContainer == null || itemsContainer.isEmpty()) { logger.debug("No project found in this folder!"); throw new StatAlgoImporterServiceException("No project found in this folder!"); } else { - Item item = items.get(0); - logger.debug("Item: " + item); - if (item != null) { - logger.debug("Item Id=" + item.getId()); - StreamDescriptor streamDescr = shc.open(item.getId()).asFile().download(); + ItemContainer itemContainer = itemsContainer.get(0); + logger.debug("ItemContainer: " + itemContainer); + if (itemContainer != null) { + logger.debug("Item Id: "+itemContainer.get().getId()); + StreamDescriptor streamDescr = itemContainer.download(); + logger.debug("Stream Descriptor: "+streamDescr); return streamDescr.getStream(); - } else { logger.debug("No project found in this folder!"); throw new StatAlgoImporterServiceException("No project found in this folder!");