From 5958fddd50b4534826790009b42d8003cafd4d81 Mon Sep 17 00:00:00 2001
From: Giancarlo Panichi <giancarlo.panichi@isti.cnr.it>
Date: Mon, 17 Dec 2018 16:57:10 +0000
Subject: [PATCH] ref 11720: DataMiner - Update to StorageHUB

https://support.d4science.org/issues/11720

Updated to support StorageHub Metadata

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/data-miner-manager@174944 82a268e6-3cf1-43bd-a215-b396298e98cf
---
 .classpath                                                  | 6 +++---
 distro/changelog.xml                                        | 4 ++++
 pom.xml                                                     | 2 +-
 .../user/dataminermanager/server/storage/StorageUtil.java   | 4 ++--
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/.classpath b/.classpath
index d1d7469..fca9db7 100644
--- a/.classpath
+++ b/.classpath
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" output="target/data-miner-manager-1.9.0-SNAPSHOT/WEB-INF/classes" path="src/main/java">
+	<classpathentry kind="src" output="target/data-miner-manager-1.9.1-SNAPSHOT/WEB-INF/classes" path="src/main/java">
 		<attributes>
 			<attribute name="optional" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry excluding="**" kind="src" output="target/data-miner-manager-1.9.0-SNAPSHOT/WEB-INF/classes" path="src/main/resources">
+	<classpathentry excluding="**" kind="src" output="target/data-miner-manager-1.9.1-SNAPSHOT/WEB-INF/classes" path="src/main/resources">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
@@ -34,5 +34,5 @@
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="target/data-miner-manager-1.9.0-SNAPSHOT/WEB-INF/classes"/>
+	<classpathentry kind="output" path="target/data-miner-manager-1.9.1-SNAPSHOT/WEB-INF/classes"/>
 </classpath>
diff --git a/distro/changelog.xml b/distro/changelog.xml
index f6c5a2b..78d0262 100644
--- a/distro/changelog.xml
+++ b/distro/changelog.xml
@@ -1,4 +1,8 @@
 <ReleaseNotes>
+	<Changeset component="${groupId}.${artifactId}.1-9-1" date="2018-12-13">
+		<Change>Updated to support StorageHub properties [ticket #11720]
+		</Change>
+	</Changeset>
 	<Changeset component="${groupId}.${artifactId}.1-9-0" date="2018-10-01">
 		<Change>Updated download item to support StorageHub[ticket #11720]
 		</Change>
diff --git a/pom.xml b/pom.xml
index 4d42f80..2a3c415 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
 
 	<groupId>org.gcube.portlets.user</groupId>
 	<artifactId>data-miner-manager</artifactId>
-	<version>1.9.0-SNAPSHOT</version>
+	<version>1.9.1-SNAPSHOT</version>
 	<packaging>war</packaging>
 
 	<name>data-miner-manager</name>
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 d050498..8cedd6a 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
@@ -48,9 +48,9 @@ public class StorageUtil {
 		try {
 			StorageHubClient shc = new StorageHubClient();
 			Item item = shc.open(itemId).asItem().get();
-			Metadata metadata = item.getPropertyMap();
+			Metadata metadata = item.getMetadata();
 			Map<String, String> itemMap = new HashMap<String, String>();
-			Map<String, Object> metadataMap = metadata.getValues();
+			Map<String, Object> metadataMap = metadata.getMap();
 			for (String key : metadataMap.keySet()) {
 				String s = String.valueOf(metadataMap.get(key));
 				itemMap.put(key, s);