From 864b4bfec88b7cf3c5444aa950920dcd1805612b Mon Sep 17 00:00:00 2001 From: George Kalampokis Date: Tue, 22 Mar 2022 16:40:51 +0200 Subject: [PATCH 1/4] Make rda mapping more lax --- .../src/main/java/eu/eudat/models/rda/Contact.java | 10 +++------- .../src/main/java/eu/eudat/models/rda/ContactId.java | 12 +++--------- .../main/java/eu/eudat/models/rda/Contributor.java | 10 +++------- .../main/java/eu/eudat/models/rda/ContributorId.java | 12 +++--------- .../web/src/main/java/eu/eudat/models/rda/Cost.java | 12 +++--------- .../src/main/java/eu/eudat/models/rda/Dataset.java | 12 +++--------- .../src/main/java/eu/eudat/models/rda/DatasetId.java | 12 +++--------- .../main/java/eu/eudat/models/rda/Distribution.java | 12 +++--------- .../web/src/main/java/eu/eudat/models/rda/Dmp.java | 2 +- .../web/src/main/java/eu/eudat/models/rda/DmpId.java | 12 +++--------- .../src/main/java/eu/eudat/models/rda/FunderId.java | 12 +++--------- .../src/main/java/eu/eudat/models/rda/Funding.java | 12 +++--------- .../src/main/java/eu/eudat/models/rda/GrantId.java | 12 +++--------- .../web/src/main/java/eu/eudat/models/rda/Host.java | 12 +++--------- .../src/main/java/eu/eudat/models/rda/License.java | 10 +++------- .../java/eu/eudat/models/rda/MetadataStandardId.java | 12 +++--------- .../src/main/java/eu/eudat/models/rda/Metadatum.java | 12 +++--------- .../src/main/java/eu/eudat/models/rda/Project.java | 10 +++------- .../src/main/java/eu/eudat/models/rda/RDAModel.java | 3 +++ .../java/eu/eudat/models/rda/SecurityAndPrivacy.java | 10 +++------- .../java/eu/eudat/models/rda/TechnicalResource.java | 10 +++------- 21 files changed, 61 insertions(+), 160 deletions(-) diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/rda/Contact.java b/dmp-backend/web/src/main/java/eu/eudat/models/rda/Contact.java index bbd5e40f9..b16856537 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/models/rda/Contact.java +++ b/dmp-backend/web/src/main/java/eu/eudat/models/rda/Contact.java @@ -4,13 +4,8 @@ package eu.eudat.models.rda; import java.io.Serializable; import java.util.HashMap; import java.util.Map; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyDescription; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; + +import com.fasterxml.jackson.annotation.*; /** @@ -25,6 +20,7 @@ import com.fasterxml.jackson.annotation.JsonPropertyOrder; "mbox", "name" }) +@JsonIgnoreProperties(ignoreUnknown = true) public class Contact implements Serializable { diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/rda/ContactId.java b/dmp-backend/web/src/main/java/eu/eudat/models/rda/ContactId.java index 11bd8b54e..240d9e652 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/models/rda/ContactId.java +++ b/dmp-backend/web/src/main/java/eu/eudat/models/rda/ContactId.java @@ -4,15 +4,8 @@ package eu.eudat.models.rda; import java.io.Serializable; import java.util.HashMap; import java.util.Map; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyDescription; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.annotation.JsonValue; + +import com.fasterxml.jackson.annotation.*; /** @@ -26,6 +19,7 @@ import com.fasterxml.jackson.annotation.JsonValue; "identifier", "type" }) +@JsonIgnoreProperties(ignoreUnknown = true) public class ContactId implements Serializable { diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/rda/Contributor.java b/dmp-backend/web/src/main/java/eu/eudat/models/rda/Contributor.java index c53c2551d..e926b8093 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/models/rda/Contributor.java +++ b/dmp-backend/web/src/main/java/eu/eudat/models/rda/Contributor.java @@ -5,13 +5,8 @@ import java.io.Serializable; import java.util.HashMap; import java.util.Map; import java.util.Set; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyDescription; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; + +import com.fasterxml.jackson.annotation.*; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; @@ -28,6 +23,7 @@ import com.fasterxml.jackson.databind.annotation.JsonDeserialize; "name", "role" }) +@JsonIgnoreProperties(ignoreUnknown = true) public class Contributor implements Serializable { diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/rda/ContributorId.java b/dmp-backend/web/src/main/java/eu/eudat/models/rda/ContributorId.java index c92a5227a..deacce048 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/models/rda/ContributorId.java +++ b/dmp-backend/web/src/main/java/eu/eudat/models/rda/ContributorId.java @@ -4,15 +4,8 @@ package eu.eudat.models.rda; import java.io.Serializable; import java.util.HashMap; import java.util.Map; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyDescription; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.annotation.JsonValue; + +import com.fasterxml.jackson.annotation.*; /** @@ -26,6 +19,7 @@ import com.fasterxml.jackson.annotation.JsonValue; "identifier", "type" }) +@JsonIgnoreProperties(ignoreUnknown = true) public class ContributorId implements Serializable { diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/rda/Cost.java b/dmp-backend/web/src/main/java/eu/eudat/models/rda/Cost.java index ee5b3289f..b5783ed2a 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/models/rda/Cost.java +++ b/dmp-backend/web/src/main/java/eu/eudat/models/rda/Cost.java @@ -4,15 +4,8 @@ package eu.eudat.models.rda; import java.io.Serializable; import java.util.HashMap; import java.util.Map; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyDescription; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.annotation.JsonValue; + +import com.fasterxml.jackson.annotation.*; /** @@ -28,6 +21,7 @@ import com.fasterxml.jackson.annotation.JsonValue; "title", "value" }) +@JsonIgnoreProperties(ignoreUnknown = true) public class Cost implements Serializable { diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/rda/Dataset.java b/dmp-backend/web/src/main/java/eu/eudat/models/rda/Dataset.java index 5e91de9e3..b39188065 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/models/rda/Dataset.java +++ b/dmp-backend/web/src/main/java/eu/eudat/models/rda/Dataset.java @@ -5,15 +5,8 @@ import java.io.Serializable; import java.util.HashMap; import java.util.List; import java.util.Map; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyDescription; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.annotation.JsonValue; + +import com.fasterxml.jackson.annotation.*; /** @@ -41,6 +34,7 @@ import com.fasterxml.jackson.annotation.JsonValue; "type", "additional_properties" }) +@JsonIgnoreProperties(ignoreUnknown = true) public class Dataset implements Serializable { diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/rda/DatasetId.java b/dmp-backend/web/src/main/java/eu/eudat/models/rda/DatasetId.java index 02108950b..b099c9cc8 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/models/rda/DatasetId.java +++ b/dmp-backend/web/src/main/java/eu/eudat/models/rda/DatasetId.java @@ -4,15 +4,8 @@ package eu.eudat.models.rda; import java.io.Serializable; import java.util.HashMap; import java.util.Map; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyDescription; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.annotation.JsonValue; + +import com.fasterxml.jackson.annotation.*; /** @@ -26,6 +19,7 @@ import com.fasterxml.jackson.annotation.JsonValue; "identifier", "type" }) +@JsonIgnoreProperties(ignoreUnknown = true) public class DatasetId implements Serializable { diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/rda/Distribution.java b/dmp-backend/web/src/main/java/eu/eudat/models/rda/Distribution.java index 176931e9e..b47a08ba4 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/models/rda/Distribution.java +++ b/dmp-backend/web/src/main/java/eu/eudat/models/rda/Distribution.java @@ -6,15 +6,8 @@ import java.net.URI; import java.util.HashMap; import java.util.List; import java.util.Map; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyDescription; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.annotation.JsonValue; + +import com.fasterxml.jackson.annotation.*; /** @@ -37,6 +30,7 @@ import com.fasterxml.jackson.annotation.JsonValue; "title", "additional_properties" }) +@JsonIgnoreProperties(ignoreUnknown = true) public class Distribution implements Serializable { diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/rda/Dmp.java b/dmp-backend/web/src/main/java/eu/eudat/models/rda/Dmp.java index a6dfb29d0..9594fedb6 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/models/rda/Dmp.java +++ b/dmp-backend/web/src/main/java/eu/eudat/models/rda/Dmp.java @@ -19,7 +19,7 @@ import eu.eudat.logic.utilities.json.MultiDateDeserializer; * * */ -@JsonIgnoreProperties(value = { "schema" }) +@JsonIgnoreProperties(value = { "schema" }, ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_NULL) @JsonPropertyOrder({ "contact", diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/rda/DmpId.java b/dmp-backend/web/src/main/java/eu/eudat/models/rda/DmpId.java index d277fbdd9..7557c169d 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/models/rda/DmpId.java +++ b/dmp-backend/web/src/main/java/eu/eudat/models/rda/DmpId.java @@ -4,15 +4,8 @@ package eu.eudat.models.rda; import java.io.Serializable; import java.util.HashMap; import java.util.Map; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyDescription; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.annotation.JsonValue; + +import com.fasterxml.jackson.annotation.*; /** @@ -26,6 +19,7 @@ import com.fasterxml.jackson.annotation.JsonValue; "identifier", "type" }) +@JsonIgnoreProperties(ignoreUnknown = true) public class DmpId implements Serializable { diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/rda/FunderId.java b/dmp-backend/web/src/main/java/eu/eudat/models/rda/FunderId.java index 4033f415c..0787f63b9 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/models/rda/FunderId.java +++ b/dmp-backend/web/src/main/java/eu/eudat/models/rda/FunderId.java @@ -4,15 +4,8 @@ package eu.eudat.models.rda; import java.io.Serializable; import java.util.HashMap; import java.util.Map; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyDescription; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.annotation.JsonValue; + +import com.fasterxml.jackson.annotation.*; /** @@ -26,6 +19,7 @@ import com.fasterxml.jackson.annotation.JsonValue; "identifier", "type" }) +@JsonIgnoreProperties(ignoreUnknown = true) public class FunderId implements Serializable { diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/rda/Funding.java b/dmp-backend/web/src/main/java/eu/eudat/models/rda/Funding.java index 0b8aa8c53..d97ca6938 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/models/rda/Funding.java +++ b/dmp-backend/web/src/main/java/eu/eudat/models/rda/Funding.java @@ -4,15 +4,8 @@ package eu.eudat.models.rda; import java.io.Serializable; import java.util.HashMap; import java.util.Map; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyDescription; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.annotation.JsonValue; + +import com.fasterxml.jackson.annotation.*; /** @@ -27,6 +20,7 @@ import com.fasterxml.jackson.annotation.JsonValue; "funding_status", "grant_id" }) +@JsonIgnoreProperties(ignoreUnknown = true) public class Funding implements Serializable { diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/rda/GrantId.java b/dmp-backend/web/src/main/java/eu/eudat/models/rda/GrantId.java index d3a695c55..0974b51cf 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/models/rda/GrantId.java +++ b/dmp-backend/web/src/main/java/eu/eudat/models/rda/GrantId.java @@ -4,15 +4,8 @@ package eu.eudat.models.rda; import java.io.Serializable; import java.util.HashMap; import java.util.Map; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyDescription; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.annotation.JsonValue; + +import com.fasterxml.jackson.annotation.*; /** @@ -26,6 +19,7 @@ import com.fasterxml.jackson.annotation.JsonValue; "identifier", "type" }) +@JsonIgnoreProperties(ignoreUnknown = true) public class GrantId implements Serializable { diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/rda/Host.java b/dmp-backend/web/src/main/java/eu/eudat/models/rda/Host.java index 2227460df..cd4b17e9d 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/models/rda/Host.java +++ b/dmp-backend/web/src/main/java/eu/eudat/models/rda/Host.java @@ -6,15 +6,8 @@ import java.net.URI; import java.util.HashMap; import java.util.List; import java.util.Map; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyDescription; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.annotation.JsonValue; + +import com.fasterxml.jackson.annotation.*; /** @@ -37,6 +30,7 @@ import com.fasterxml.jackson.annotation.JsonValue; "title", "url" }) +@JsonIgnoreProperties(ignoreUnknown = true) public class Host implements Serializable { diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/rda/License.java b/dmp-backend/web/src/main/java/eu/eudat/models/rda/License.java index e622e14cc..3b9b5a205 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/models/rda/License.java +++ b/dmp-backend/web/src/main/java/eu/eudat/models/rda/License.java @@ -5,13 +5,8 @@ import java.io.Serializable; import java.net.URI; import java.util.HashMap; import java.util.Map; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyDescription; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; + +import com.fasterxml.jackson.annotation.*; /** @@ -25,6 +20,7 @@ import com.fasterxml.jackson.annotation.JsonPropertyOrder; "license_ref", "start_date" }) +@JsonIgnoreProperties(ignoreUnknown = true) public class License implements Serializable { diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/rda/MetadataStandardId.java b/dmp-backend/web/src/main/java/eu/eudat/models/rda/MetadataStandardId.java index a693f34a5..b23ac73a0 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/models/rda/MetadataStandardId.java +++ b/dmp-backend/web/src/main/java/eu/eudat/models/rda/MetadataStandardId.java @@ -4,15 +4,8 @@ package eu.eudat.models.rda; import java.io.Serializable; import java.util.HashMap; import java.util.Map; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyDescription; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.annotation.JsonValue; + +import com.fasterxml.jackson.annotation.*; /** @@ -26,6 +19,7 @@ import com.fasterxml.jackson.annotation.JsonValue; "identifier", "type" }) +@JsonIgnoreProperties(ignoreUnknown = true) public class MetadataStandardId implements Serializable { diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/rda/Metadatum.java b/dmp-backend/web/src/main/java/eu/eudat/models/rda/Metadatum.java index 56bee437d..2e10b8df1 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/models/rda/Metadatum.java +++ b/dmp-backend/web/src/main/java/eu/eudat/models/rda/Metadatum.java @@ -4,15 +4,8 @@ package eu.eudat.models.rda; import java.io.Serializable; import java.util.HashMap; import java.util.Map; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyDescription; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.annotation.JsonValue; + +import com.fasterxml.jackson.annotation.*; /** @@ -28,6 +21,7 @@ import com.fasterxml.jackson.annotation.JsonValue; "metadata_standard_id", "additional_properties" }) +@JsonIgnoreProperties(ignoreUnknown = true) public class Metadatum implements Serializable { diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/rda/Project.java b/dmp-backend/web/src/main/java/eu/eudat/models/rda/Project.java index 4854fa609..d16c3957d 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/models/rda/Project.java +++ b/dmp-backend/web/src/main/java/eu/eudat/models/rda/Project.java @@ -5,13 +5,8 @@ import java.io.Serializable; import java.util.HashMap; import java.util.List; import java.util.Map; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyDescription; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; + +import com.fasterxml.jackson.annotation.*; /** @@ -28,6 +23,7 @@ import com.fasterxml.jackson.annotation.JsonPropertyOrder; "start", "title" }) +@JsonIgnoreProperties(ignoreUnknown = true) public class Project implements Serializable { diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/rda/RDAModel.java b/dmp-backend/web/src/main/java/eu/eudat/models/rda/RDAModel.java index 61df61b32..8d9b7e8d2 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/models/rda/RDAModel.java +++ b/dmp-backend/web/src/main/java/eu/eudat/models/rda/RDAModel.java @@ -2,6 +2,8 @@ package eu.eudat.models.rda; import java.io.Serializable; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyOrder; @@ -17,6 +19,7 @@ import com.fasterxml.jackson.annotation.JsonPropertyOrder; @JsonPropertyOrder({ "dmp" }) +@JsonIgnoreProperties(ignoreUnknown = true) public class RDAModel implements Serializable { diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/rda/SecurityAndPrivacy.java b/dmp-backend/web/src/main/java/eu/eudat/models/rda/SecurityAndPrivacy.java index 245d202d0..d962b3713 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/models/rda/SecurityAndPrivacy.java +++ b/dmp-backend/web/src/main/java/eu/eudat/models/rda/SecurityAndPrivacy.java @@ -4,13 +4,8 @@ package eu.eudat.models.rda; import java.io.Serializable; import java.util.HashMap; import java.util.Map; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyDescription; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; + +import com.fasterxml.jackson.annotation.*; /** @@ -25,6 +20,7 @@ import com.fasterxml.jackson.annotation.JsonPropertyOrder; "title", "additional_properties" }) +@JsonIgnoreProperties(ignoreUnknown = true) public class SecurityAndPrivacy implements Serializable { diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/rda/TechnicalResource.java b/dmp-backend/web/src/main/java/eu/eudat/models/rda/TechnicalResource.java index c7bd2b055..87683fd5b 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/models/rda/TechnicalResource.java +++ b/dmp-backend/web/src/main/java/eu/eudat/models/rda/TechnicalResource.java @@ -4,13 +4,8 @@ package eu.eudat.models.rda; import java.io.Serializable; import java.util.HashMap; import java.util.Map; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyDescription; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; + +import com.fasterxml.jackson.annotation.*; /** @@ -25,6 +20,7 @@ import com.fasterxml.jackson.annotation.JsonPropertyOrder; "name", "additional_properties" }) +@JsonIgnoreProperties(ignoreUnknown = true) public class TechnicalResource implements Serializable { From 78895a1df1ba473a686f0482ba8b36fd644068a8 Mon Sep 17 00:00:00 2001 From: Aldo Mihasi Date: Thu, 24 Mar 2022 09:43:13 +0200 Subject: [PATCH 2/4] no message --- .../utilities/documents/word/WordBuilder.java | 21 ++++++++++++------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/utilities/documents/word/WordBuilder.java b/dmp-backend/web/src/main/java/eu/eudat/logic/utilities/documents/word/WordBuilder.java index c746ae053..df9549b8d 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/logic/utilities/documents/word/WordBuilder.java +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/utilities/documents/word/WordBuilder.java @@ -16,6 +16,7 @@ import org.apache.poi.openxml4j.exceptions.InvalidFormatException; import org.apache.poi.util.Units; import org.apache.poi.xwpf.usermodel.*; import org.json.JSONArray; +import org.json.JSONException; import org.jsoup.Jsoup; import org.jsoup.nodes.Document; import org.openxmlformats.schemas.wordprocessingml.x2006.main.*; @@ -378,15 +379,19 @@ public class WordBuilder { if((format == null || format.isEmpty()) || (attribute == null || attribute.isEmpty())){ return null; } - JSONArray array = new JSONArray(JavaToJson.objectStringToJson(format)); - StringBuilder multipleFormats = new StringBuilder(); - for (int i = 0; i < array.length(); i++) { - multipleFormats.append(array.getJSONObject(i).getString(attribute)).append(", "); + try { + JSONArray array = new JSONArray(JavaToJson.objectStringToJson(format)); + StringBuilder multipleFormats = new StringBuilder(); + for (int i = 0; i < array.length(); i++) { + multipleFormats.append(array.getJSONObject(i).getString(attribute)).append(", "); + } + if (multipleFormats.length() > 0) { + multipleFormats.setLength(multipleFormats.length() - 2); + } + return multipleFormats.toString(); + } catch (JSONException e) { + return format; } - if (multipleFormats.length() > 0) { - multipleFormats.setLength(multipleFormats.length() - 2); - } - return multipleFormats.toString(); } public XWPFParagraph addParagraphContent(Object content, XWPFDocument mainDocumentPart, ParagraphStyle style, BigInteger numId) { From 650e0ceb06b3c4c0e974918ce2e580bf9caede68 Mon Sep 17 00:00:00 2001 From: "konstantina.galouni" Date: Mon, 28 Mar 2022 17:02:57 +0300 Subject: [PATCH 3/4] #7636: [Bug fix] Copy dataset from latest activity or dataset listing: Reverting some changes from commit:b6c28be3b3 1. DatasetListingModel.java: Added field DatasetProfileOverviewModel profile, getter/setter and set profile in methods "fromDataModel()" and "toDataModel()". 2. RecentActivityModel.java: Added field DatasetProfileOverviewModel profile and getter/setter. 3. RecentDatasetModel.java: Set profile in methods "fromEntity()" and "fromDmpEntity()". --- .../dashboard/recent/model/RecentActivityModel.java | 9 +++++++++ .../dashboard/recent/model/RecentDatasetModel.java | 3 +++ .../data/listingmodels/DatasetListingModel.java | 12 ++++++++++++ 3 files changed, 24 insertions(+) diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/dashboard/recent/model/RecentActivityModel.java b/dmp-backend/web/src/main/java/eu/eudat/models/data/dashboard/recent/model/RecentActivityModel.java index 10b30b87b..4ea17cd64 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/models/data/dashboard/recent/model/RecentActivityModel.java +++ b/dmp-backend/web/src/main/java/eu/eudat/models/data/dashboard/recent/model/RecentActivityModel.java @@ -18,6 +18,7 @@ public abstract class RecentActivityModel users; private Boolean isPublic; @@ -94,6 +95,14 @@ public abstract class RecentActivityModel Date: Mon, 28 Mar 2022 18:00:14 +0300 Subject: [PATCH 4/4] #7638: [Bug fix] dmp-finalize-dialog.component.html: Truncate text and show tooltip with full dataset title. --- .../dmp-finalize-dialog/dmp-finalize-dialog.component.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dmp-frontend/src/app/ui/dmp/editor/dmp-finalize-dialog/dmp-finalize-dialog.component.html b/dmp-frontend/src/app/ui/dmp/editor/dmp-finalize-dialog/dmp-finalize-dialog.component.html index 68021e4cf..634ea89e8 100644 --- a/dmp-frontend/src/app/ui/dmp/editor/dmp-finalize-dialog/dmp-finalize-dialog.component.html +++ b/dmp-frontend/src/app/ui/dmp/editor/dmp-finalize-dialog/dmp-finalize-dialog.component.html @@ -33,7 +33,7 @@ {{ 'TYPES.DATASET-STATUS.DRAFT' | translate }} ({{'DMP-FINALISE-DIALOG.INVALID' | translate}}) - + : {{ dataset.label }} @@ -50,7 +50,7 @@
- {{ dataset.label }} + {{ dataset.label }}