From 85cb4a4e557e8bfda496a5b05ba99d010cb67e81 Mon Sep 17 00:00:00 2001
From: "luca.frosini" <luca.frosini@nb-frosini.isti.cnr.it>
Date: Thu, 9 Nov 2023 19:04:12 +0100
Subject: [PATCH] Fixing getAllContextsFromServer()

---
 .../client/ResourceRegistryClientImpl.java           | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/client/ResourceRegistryClientImpl.java b/src/main/java/org/gcube/informationsystem/resourceregistry/client/ResourceRegistryClientImpl.java
index 647583a..b37e2d1 100644
--- a/src/main/java/org/gcube/informationsystem/resourceregistry/client/ResourceRegistryClientImpl.java
+++ b/src/main/java/org/gcube/informationsystem/resourceregistry/client/ResourceRegistryClientImpl.java
@@ -116,6 +116,10 @@ public class ResourceRegistryClientImpl extends BaseRequestInfo implements Resou
 	}
 	
 	private void addIncludeMeta(Map<String,String> queryParams) throws UnsupportedEncodingException{
+		addIncludeMeta(queryParams, includeMeta);
+	}
+	
+	private void addIncludeMeta(Map<String,String> queryParams, boolean includeMeta) throws UnsupportedEncodingException{
 		if(includeMeta) {
 			queryParams.put(AccessPath.INCLUDE_META_QUERY_PARAMETER, Boolean.toString(includeMeta));
 		}
@@ -151,7 +155,7 @@ public class ResourceRegistryClientImpl extends BaseRequestInfo implements Resou
 		
 		@Override
 		public List<Context> renew() throws ResourceRegistryException {
-			return getAllContextFromServer(0, BaseRequestInfo.UNBOUNDED_LIMIT);
+			return getAllContextFromServer(true, 0, BaseRequestInfo.UNBOUNDED_LIMIT);
 		}
 		
 	};
@@ -200,10 +204,10 @@ public class ResourceRegistryClientImpl extends BaseRequestInfo implements Resou
 	 * @throws ResourceRegistryException
 	 */
 	public List<Context> getAllContextFromServer() throws ResourceRegistryException {
-		return getAllContextFromServer(offset, limit);
+		return getAllContextFromServer(includeMeta, offset, limit);
 	}
 	
-	protected List<Context> getAllContextFromServer(Integer offset, Integer limit) throws ResourceRegistryException {
+	protected List<Context> getAllContextFromServer(boolean includeMeta, Integer offset, Integer limit) throws ResourceRegistryException {
 		try {
 			logger.info("Going to read all {}s", Context.NAME);
 			GXHTTPStringRequest gxHTTPStringRequest = getGXHTTPStringRequest();
@@ -212,7 +216,7 @@ public class ResourceRegistryClientImpl extends BaseRequestInfo implements Resou
 			gxHTTPStringRequest.path(AccessPath.CONTEXTS_PATH_PART);
 			
 			Map<String,String> parameters = new HashMap<>();
-			addIncludeMeta(parameters);
+			addIncludeMeta(parameters, includeMeta);
 			addOffset(parameters, offset);
 			addLimit(parameters, limit);
 			gxHTTPStringRequest.queryParams(parameters);