diff --git a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/others/ConnectedBean.java b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/others/ConnectedBean.java index 257d8d9..f1e45da 100644 --- a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/others/ConnectedBean.java +++ b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/others/ConnectedBean.java @@ -24,23 +24,44 @@ public class ConnectedBean { @Size(min=1, message= Constants.CONNECTED_RECORD_KNOWLEDGE_BASE_ID_JSON_KEY + " cannot be empty") private String knowledeBaseId; + @JsonProperty(Constants.CONNECTED_JSON_KEY) + private boolean connected; + public ConnectedBean() { super(); } + + /** * @param semanticIdentifier * @param shortName * @param knowledeBaseId + * @param connected */ public ConnectedBean(String semanticIdentifier, String shortName, - String knowledeBaseId) { + String knowledeBaseId, boolean connected) { super(); this.semanticIdentifier = semanticIdentifier; this.shortName = shortName; this.knowledeBaseId = knowledeBaseId; + this.connected = connected; } + + + public boolean isConnected() { + return connected; + } + + + + public void setConnected(boolean connected) { + this.connected = connected; + } + + + public String getSemanticIdentifier() { return semanticIdentifier; } @@ -70,14 +91,10 @@ public class ConnectedBean { public String toString() { JSONObject obj = new JSONObject(); - obj.put(Constants.CONNECTED_RECORD_SHORT_NAME_JSON_KEY, shortName); - - if(semanticIdentifier != null && !semanticIdentifier.isEmpty()) - obj.put(Constants.CONNECTED_RECORD_SEMANTIC_IDENTIFIER_JSON_KEY, semanticIdentifier); - + obj.put(Constants.CONNECTED_RECORD_SEMANTIC_IDENTIFIER_JSON_KEY, semanticIdentifier); obj.put(Constants.CONNECTED_RECORD_KNOWLEDGE_BASE_ID_JSON_KEY, knowledeBaseId); - + obj.put(Constants.CONNECTED_JSON_KEY, connected); return obj.toJSONString(); } diff --git a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/others/TimeSeriesBean.java b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/others/TimeSeriesBean.java index 4730817..1f5ba61 100644 --- a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/others/TimeSeriesBean.java +++ b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/others/TimeSeriesBean.java @@ -120,7 +120,7 @@ public class TimeSeriesBean implements Comparable>{ public boolean isValuePresent(){ return value != null && !value.getClass().equals(Void.class); } - + public boolean isDataOwnerPresent(){ return dataOwner != null && !dataOwner.isEmpty(); } @@ -135,14 +135,34 @@ public class TimeSeriesBean implements Comparable>{ public String toString() { String value = "" + this.value; - String unit = (this.unit != null ? " " + this.unit : ""); - String databaseSource = (this.databaseSource != null ? " (" + this.databaseSource + ")" : ""); - String dataOwner = (this.dataOwner != null ? " " + this.dataOwner : ""); - String referenceYear = year >= 0 ? " Ref. Year " + year : ""; - String reportingYearOrAssessment = (assessment != null ? " and Rep. Year or Assessment Id " + assessment + "" : ""); + String unit = this.unit != null ? "Unit : " + this.unit : ""; + String databaseSource = (this.databaseSource != null ? " - DB Source: " + this.databaseSource : ""); + String dataOwner = (this.dataOwner != null ? " - Data Owner: " + this.dataOwner : ""); + String referenceYear = year >= 0 ? " - Ref. Year: " + year : ""; + String reportingYearOrAssessment = (assessment != null ? " - Rep. Year or Assessment Id: " + assessment + "" : ""); + String partial = value + "[" + + unit + + reportingYearOrAssessment + + referenceYear + + dataOwner + + databaseSource + + "]"; - return value + unit + databaseSource + dataOwner + referenceYear + reportingYearOrAssessment; + return partial.replaceAll("\\b\\[ - \\b", "["); } + // public static void main(String[] args) { + // + // TimeSeriesBean t = new TimeSeriesBean(); + // t.setYear(1021L); + // t.setDatabaseSource("tttt"); + // t.setDataOwner("zzzz"); + // t.setUnit("uuuu"); + // t.setValue("vvvv"); + // t.setAssessment("2015"); + // System.err.println("Result is \n" + t); + // + // } + }