From 4209d0d5a73009b17bf5b3245c3fb9e58d1cd583 Mon Sep 17 00:00:00 2001
From: Lucio Lelii <lucio.lelii@isti.cnr.it>
Date: Tue, 26 Jun 2018 08:51:34 +0000
Subject: [PATCH] git-svn-id:
 https://svn.d4science-ii.research-infrastructures.eu/gcube/trunk/Common/storagehub-client@169435
 82a268e6-3cf1-43bd-a215-b396298e98cf

---
 .../common/storagehub/client/plugins/ItemManagerPlugin.java | 2 +-
 src/test/java/org/gcube/data/access/fs/Items.java           | 2 +-
 src/test/java/org/gcube/data/access/fs/TestCall.java        | 6 ++++--
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/gcube/common/storagehub/client/plugins/ItemManagerPlugin.java b/src/main/java/org/gcube/common/storagehub/client/plugins/ItemManagerPlugin.java
index 83780f8..206fec6 100644
--- a/src/main/java/org/gcube/common/storagehub/client/plugins/ItemManagerPlugin.java
+++ b/src/main/java/org/gcube/common/storagehub/client/plugins/ItemManagerPlugin.java
@@ -37,7 +37,7 @@ public class ItemManagerPlugin extends AbstractPlugin<WebTarget, ItemManagerClie
 		Node node =result.getNode();
 		Node child=node.getFirstChild();
 		String address = child.getTextContent();
-		GcubeService service = GcubeService.service().withName(Constants.MANAGER_QNAME).andPath("item");
+		GcubeService service = GcubeService.service().withName(Constants.MANAGER_QNAME).andPath("items");
 		return TargetFactory.stubFor(service).at(address);
 				
 	}
diff --git a/src/test/java/org/gcube/data/access/fs/Items.java b/src/test/java/org/gcube/data/access/fs/Items.java
index 75af1d5..e64a247 100644
--- a/src/test/java/org/gcube/data/access/fs/Items.java
+++ b/src/test/java/org/gcube/data/access/fs/Items.java
@@ -34,7 +34,7 @@ public class Items {
 		
 		String afi = null;
 		try (InputStream is = new FileInputStream(new File("/home/lucio/Downloads/rockandroll.jpeg"))){
-			afi = shc.getWSRoot().uploadFile(is, "tes-image.jpeg", "descr").get().getId();
+			shc.getWSRoot().uploadFile(is, "tes-image.jpeg", "descr");
 			
 			System.out.println(afi);
 		} catch (Exception e) {
diff --git a/src/test/java/org/gcube/data/access/fs/TestCall.java b/src/test/java/org/gcube/data/access/fs/TestCall.java
index 386cd60..07a8778 100644
--- a/src/test/java/org/gcube/data/access/fs/TestCall.java
+++ b/src/test/java/org/gcube/data/access/fs/TestCall.java
@@ -23,6 +23,7 @@ import org.gcube.common.storagehub.model.expressions.date.Before;
 import org.gcube.common.storagehub.model.expressions.logical.And;
 import org.gcube.common.storagehub.model.expressions.logical.ISDescendant;
 import org.gcube.common.storagehub.model.expressions.text.Contains;
+import org.gcube.common.storagehub.model.expressions.text.Like;
 import org.gcube.common.storagehub.model.items.AbstractFileItem;
 import org.gcube.common.storagehub.model.items.Item;
 import org.gcube.common.storagehub.model.query.Queries;
@@ -176,9 +177,10 @@ public class TestCall {
 		WorkspaceManagerClient wsclient = AbstractPlugin.workspace().build();
 		//String path = wsclient.getVreFolder("hl:accounting").getPath();
 		//System.out.println("path is "+path);
-		query.setExpression(new ISDescendant(Paths.getPath("/Home/massimiliano.assante/Workspace/MySpecialFolders/gcube-devNext-NextNext/")));
+		query.setExpression(new And(new ISDescendant(Paths.getPath("/Home/massimiliano.assante/Workspace/MySpecialFolders/gcube-devNext-NextNext/")), 
+				new Like(GenericSearchableItem.get().title,"title")));
 		query.setLimit(10);
-		query.setOrder(new OrderField(GenericSearchableItem.get().lastModification,MODE.DESC));
+		query.setOrder(new OrderField(GenericSearchableItem.get().title));
 		List<? extends Item> items = wsclient.search(query, "hl:accounting", "jcr:content");
 		for (Item item: items) {
 			System.out.println(item.getName()+" "+item.getLastModificationTime().getTimeInMillis());