From ac22e2dddb7bca258ccef8adee8b674b7129099e Mon Sep 17 00:00:00 2001
From: Luca Frosini <luca.frosini@isti.cnr.it>
Date: Wed, 13 Apr 2022 09:46:46 +0200
Subject: [PATCH] Aligning code and documentation

---
 .../json/input/record/Base.java               | 18 ++++--
 .../json/input/record/Common.java             | 57 ++++++++++++-------
 2 files changed, 47 insertions(+), 28 deletions(-)

diff --git a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/record/Base.java b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/record/Base.java
index 6fad4d8..dc34fdd 100644
--- a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/record/Base.java
+++ b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/record/Base.java
@@ -202,12 +202,18 @@ public abstract class Base {
 
 	@Override
 	public String toString() {
-		return "Base [catalogId=" + catalogId + ", description=" + description
-				+ ", license=" + license + ", author=" + author
-				+ ", authorContact=" + authorContact + ", version=" + version
-				+ ", maintainer=" + maintainer + ", maintainerContact="
-				+ maintainerContact + ", extrasFields=" + extrasFields
-				+ ", extrasResources=" + extrasResources + "]";
+		return "Base ["
+				+ "catalogId=" + catalogId
+				+ ", description=" + description
+				+ ", license=" + license
+				+ ", author=" + author
+				+ ", authorContact=" + authorContact
+				+ ", version=" + version
+				+ ", maintainer=" + maintainer
+				+ ", maintainerContact=" + maintainerContact
+				+ ", extrasFields=" + extrasFields
+				+ ", extrasResources=" + extrasResources
+				+ "]";
 	}
 
 }
\ No newline at end of file
diff --git a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/record/Common.java b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/record/Common.java
index 50d81b4..a14803e 100644
--- a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/record/Common.java
+++ b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/record/Common.java
@@ -28,7 +28,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
  * @author Luca Frosini (ISTI - CNR)
  * 
  */
-public abstract class Common extends Base{
+public abstract class Common extends Base {
 
 	@JsonProperty(Constants.DATA_OWNER_JSON_KEY)
 	@CustomField(key=Constants.DATA_OWNER_CUSTOM_KEY)
@@ -88,9 +88,9 @@ public abstract class Common extends Base{
 	@CustomField(key=Constants.SIMILAR_GRSF_RECORDS_CUSTOM_KEY)
 	private List<SimilarRecordBean> similarGRSFRecords;
 
-	@JsonProperty(Constants.SIMILAR_SOURCE_RECORDS_JSON_KEY)
-	@CustomField(key=Constants.SIMILAR_SOURCE_RECORDS_CUSTOM_KEY)
-	private List<SimilarRecordBean> similarSourceRecords;
+//	@JsonProperty(Constants.SIMILAR_SOURCE_RECORDS_JSON_KEY)
+//	@CustomField(key=Constants.SIMILAR_SOURCE_RECORDS_CUSTOM_KEY)
+//	private List<SimilarRecordBean> similarSourceRecords;
 
 	// automatically set
 	@CustomField(key=Constants.DOMAIN_CUSTOM_KEY)
@@ -180,7 +180,7 @@ public abstract class Common extends Base{
 		this.landings = landings;
 		this.species = species;
 		this.similarGRSFRecords = similarGRSFRecords;
-		this.similarSourceRecords = similarSourceRecords;
+//		this.similarSourceRecords = similarSourceRecords;
 		this.domain = domain;
 		this.uuid = uuid;
 		this.managementBodyAuthorities = managementBodyAuthorities;
@@ -228,6 +228,7 @@ public abstract class Common extends Base{
 	public void setRefersTo(List<RefersToBean> refersTo) {
 		this.refersTo = refersTo;
 	}
+	
 	public List<Resource<Sources>> getDatabaseSources() {
 		return databaseSources;
 	}
@@ -300,13 +301,13 @@ public abstract class Common extends Base{
 		this.similarGRSFRecords = similarGRSFRecords;
 	}
 
-	public List<SimilarRecordBean> getSimilarSourceRecords() {
-		return similarSourceRecords;
-	}
-
-	public void setSimilarSourceRecords(List<SimilarRecordBean> similarSourceRecords) {
-		this.similarSourceRecords = similarSourceRecords;
-	}
+//	public List<SimilarRecordBean> getSimilarSourceRecords() {
+//		return similarSourceRecords;
+//	}
+//
+//	public void setSimilarSourceRecords(List<SimilarRecordBean> similarSourceRecords) {
+//		this.similarSourceRecords = similarSourceRecords;
+//	}
 
 	public String getSpatial() {
 		return spatial;
@@ -367,17 +368,29 @@ public abstract class Common extends Base{
 
 	@Override
 	public String toString() {
-		return "Common [dataOwner=" + dataOwner + ", databaseSources="
-				+ databaseSources + ", sourceOfInformation="
-				+ sourceOfInformation + ", refersTo=" + refersTo
-				+ ", shortName=" + shortName + ", sdgFlag=" + sdgFlag + ", status="
-				+ status + ", systemType=" + systemType + ", catches="
-				+ catches + ", landings=" + landings + ", species=" + species
+		return super.toString() + " - Common ["
+				+ " dataOwner=" + dataOwner 
+				+ ", databaseSources=" + databaseSources 
+				+ ", sourceOfInformation=" + sourceOfInformation 
+				+ ", refersTo=" + refersTo
+				+ ", shortName=" + shortName 
+				+ ", sdgFlag=" + sdgFlag 
+				+ ", status=" + status 
+				+ ", systemType=" + systemType 
+				+ ", catches=" + catches 
+				+ ", landings=" + landings
+				+ ", species=" + species
 				+ ", similarGRSFRecords=" + similarGRSFRecords
-				+ ", similarSourceRecords=" + similarSourceRecords
-				+ ", domain=" + domain + ", uuid=" + uuid
+//				+ ", similarSourceRecords=" + similarSourceRecords
+				+ ", domain=" + domain 
+				+ ", uuid=" + uuid
 				+ ", managementBodyAuthorities=" + managementBodyAuthorities
-				+ ", spatial=" + spatial + ", connectedBeans=" + connectedBeans
-				+ ", annotations=" + annotations + "]";
+				+ ", spatial=" + spatial 
+				+ ", connectedBeans=" + connectedBeans
+				+ ", annotations=" + annotations 
+				+ ", similaritiesIndicator=" + similaritiesIndicator 
+				+ ", connectionsIndicator=" + connectionsIndicator 
+				+ ", citation=" + citation
+				+ "]";
 	}
 }
\ No newline at end of file