gCubeSystem
/
grsf-publisher-ws
16
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Aligning code and documentation

This commit is contained in:
Luca Frosini 2022-04-13 09:46:46 +02:00
parent 92b68df8c5
commit ac22e2dddb
2 changed files with 47 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/record/Base.java
View File

@ -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
+ "]";
}
}

57
src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/record/Common.java
View File

@ -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
+ "]";
}
}