From c1816bf2694bcfaa905d9811bbd4fac151b92df5 Mon Sep 17 00:00:00 2001
From: "francesco.mangiacrapa" <francesco.mangiacrapa@isti.cnr.it>
Date: Thu, 8 Mar 2018 16:57:35 +0000
Subject: [PATCH] Added Catalogue Bean

git-svn-id: http://svn.d4science-ii.research-infrastructures.eu/gcube/trunk/portal/ws-synchronized-module-library@164836 82a268e6-3cf1-43bd-a215-b396298e98cf
---
 .../shared/thredds/ThCatalogueBean.java       | 32 +++++++++----------
 .../thredds/WorkspaceThreddsSynchronize.java  |  7 ++--
 2 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/src/main/java/org/gcube/portal/wssynclibrary/shared/thredds/ThCatalogueBean.java b/src/main/java/org/gcube/portal/wssynclibrary/shared/thredds/ThCatalogueBean.java
index 6860493..0f56f09 100644
--- a/src/main/java/org/gcube/portal/wssynclibrary/shared/thredds/ThCatalogueBean.java
+++ b/src/main/java/org/gcube/portal/wssynclibrary/shared/thredds/ThCatalogueBean.java
@@ -59,7 +59,7 @@ public class ThCatalogueBean implements Serializable, Comparable<ThCatalogueBean
 	/**
 	 * @return the isDefault
 	 */
-	public Boolean getIsDefault() {
+	public Boolean isDefault() {
 
 		return isDefault;
 	}
@@ -91,6 +91,21 @@ public class ThCatalogueBean implements Serializable, Comparable<ThCatalogueBean
 		this.isDefault = isDefault;
 	}
 
+
+	/* (non-Javadoc)
+	 * @see java.lang.Comparable#compareTo(java.lang.Object)
+	 */
+	@Override
+	public int compareTo(ThCatalogueBean o) {
+
+		if(o==null)
+			return -1;
+
+		return this.getName().compareTo(o.getName());
+
+	}
+
+
 	/* (non-Javadoc)
 	 * @see java.lang.Object#toString()
 	 */
@@ -108,20 +123,5 @@ public class ThCatalogueBean implements Serializable, Comparable<ThCatalogueBean
 		return builder.toString();
 	}
 
-	/* (non-Javadoc)
-	 * @see java.lang.Comparable#compareTo(java.lang.Object)
-	 */
-	@Override
-	public int compareTo(ThCatalogueBean o) {
-
-		if(o==null)
-			return -1;
-
-		return this.getName().compareTo(o.getName());
-
-	}
-
-
-
 
 }
diff --git a/src/main/java/org/gcube/portal/wssynclibrary/thredds/WorkspaceThreddsSynchronize.java b/src/main/java/org/gcube/portal/wssynclibrary/thredds/WorkspaceThreddsSynchronize.java
index 7eaae33..0829289 100644
--- a/src/main/java/org/gcube/portal/wssynclibrary/thredds/WorkspaceThreddsSynchronize.java
+++ b/src/main/java/org/gcube/portal/wssynclibrary/thredds/WorkspaceThreddsSynchronize.java
@@ -410,11 +410,14 @@ public class WorkspaceThreddsSynchronize implements WorkspaceThreddsSynchronized
 		if(token==null || token.isEmpty())
 			throw new Exception("Invalid parameter token null or empty");
 
-		logger.debug("Get Available Catalogues by token: "+token.substring(0, token.length()-5)+"XXXXX");
+		String printToken = token.substring(0, token.length()-5)+"XXXXX";
+		logger.debug("Get Available Catalogues by token: "+printToken);
 		Set<CatalogBean> ctlgs = engine.getAvailableCatalogsByToken(token);
 
-		if(ctlgs==null || ctlgs.size()==0)
+		if(ctlgs==null || ctlgs.size()==0){
+			logger.debug("No Catalogue available for token: "+printToken +" returning empty list");
 			return new ArrayList<ThCatalogueBean>(1);
+		}
 
 		List<ThCatalogueBean> listCtlgs = new ArrayList<ThCatalogueBean>(ctlgs.size());
 		for(CatalogBean bean: ctlgs){