From bf9a55152e8d3d8412753c2ababe10f7dc6ce8e2 Mon Sep 17 00:00:00 2001
From: "francesco.mangiacrapa" <francesco.mangiacrapa@isti.cnr.it>
Date: Fri, 20 May 2022 14:15:20 +0200
Subject: [PATCH] Applying default parameters

---
 .../resolvers/CatalogueResolverCallBuilder.java |  1 -
 .../CatalogueResolverQueryStringBuilder.java    | 17 +++++++++++++----
 src/test/java/UriResolverManagerTest.java       |  4 ++--
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/src/main/java/org/gcube/portlets/user/uriresolvermanager/resolvers/CatalogueResolverCallBuilder.java b/src/main/java/org/gcube/portlets/user/uriresolvermanager/resolvers/CatalogueResolverCallBuilder.java
index 4d8f256..a434180 100644
--- a/src/main/java/org/gcube/portlets/user/uriresolvermanager/resolvers/CatalogueResolverCallBuilder.java
+++ b/src/main/java/org/gcube/portlets/user/uriresolvermanager/resolvers/CatalogueResolverCallBuilder.java
@@ -11,7 +11,6 @@ import java.net.URL;
 import java.util.Map;
 
 import org.gcube.portlets.user.uriresolvermanager.entity.GenericResolver;
-import org.gcube.portlets.user.uriresolvermanager.resolvers.query.CatalogueResolverQueryStringBuilder;
 import org.gcube.portlets.user.uriresolvermanager.util.UrlEncoderUtil;
 import org.gcube.portlets.user.urlshortener.UrlShortener;
 import org.json.JSONObject;
diff --git a/src/main/java/org/gcube/portlets/user/uriresolvermanager/resolvers/query/CatalogueResolverQueryStringBuilder.java b/src/main/java/org/gcube/portlets/user/uriresolvermanager/resolvers/query/CatalogueResolverQueryStringBuilder.java
index 64e5c46..bf40ef3 100644
--- a/src/main/java/org/gcube/portlets/user/uriresolvermanager/resolvers/query/CatalogueResolverQueryStringBuilder.java
+++ b/src/main/java/org/gcube/portlets/user/uriresolvermanager/resolvers/query/CatalogueResolverQueryStringBuilder.java
@@ -20,6 +20,10 @@ import org.slf4j.LoggerFactory;
  */
 public final class CatalogueResolverQueryStringBuilder {
 
+	// DEFAULT PARAMETERS
+	public static final String DEFAULT_STATUS = "pending";
+	public static final String DEFAULT_MODERATION_OP = MODERATION_OP.show.name();
+
 	public static final Logger LOG = LoggerFactory.getLogger(CatalogueResolverQueryStringBuilder.class);
 	public static final String MODERATION_PARAMETER = "moderation";
 	public static final String ITEM_NAME_PARAMETER = "item_name";
@@ -120,22 +124,27 @@ public final class CatalogueResolverQueryStringBuilder {
 
 		CatalogueResolverQueryString crQS = new CatalogueResolverQueryString(this);
 
+		if (crQS.getItemName() == null || crQS.getItemName().isEmpty()) {
+			throw new IllegalArgumentException("The " + ITEM_NAME_PARAMETER + " cannot be null or empty");
+		}
+
 		Map<String, String> query = new HashMap<String, String>();
+		query.put(ITEM_NAME_PARAMETER, crQS.getItemName());
 
 		if (crQS.getItemId() != null) {
 			query.put(ITEM_ID_PARAMETER, crQS.getItemId());
 		}
 
-		if (crQS.getItemName() != null) {
-			query.put(ITEM_NAME_PARAMETER, crQS.getItemName());
-		}
-
 		if (crQS.getItemStatus() != null) {
 			query.put(STATUS_PARAMETER, crQS.getItemStatus());
+		} else {
+			query.put(STATUS_PARAMETER, DEFAULT_STATUS);
 		}
 
 		if (crQS.getModeration() != null) {
 			query.put(MODERATION_PARAMETER, crQS.getModeration().name());
+		} else {
+			query.put(MODERATION_PARAMETER, DEFAULT_MODERATION_OP);
 		}
 
 		return query;
diff --git a/src/test/java/UriResolverManagerTest.java b/src/test/java/UriResolverManagerTest.java
index 81a4454..e282122 100644
--- a/src/test/java/UriResolverManagerTest.java
+++ b/src/test/java/UriResolverManagerTest.java
@@ -96,7 +96,7 @@ public class UriResolverManagerTest {
 		}
 	}
 
-	// @Test
+	//@Test
 	public void testCTLGGenerateLinkForModeration() {
 
 		try {
@@ -110,7 +110,7 @@ public class UriResolverManagerTest {
 
 			CatalogueResolverQueryStringBuilder builder = new CatalogueResolverQueryStringBuilder(
 					"test-moderation-1649068829317");
-			builder.itemStatus("approved").moderation(MODERATION_OP.show);
+			//builder.itemStatus("approved").moderation(MODERATION_OP.show);
 
 			String queryString = builder.buildQueryParametersToQueryString();
 			params.put(CatalogueResolverQueryStringBuilder.QUERY_STRING_PARAMETER, queryString);