MaDgiK-CITE
/
argos
13
0
Fork 0
Code Issues Pull Requests Projects Releases 3 Wiki Activity

Make rda mapping more lax

This commit is contained in:
George Kalampokis 2022-03-22 16:40:51 +02:00
parent 116f9b99ea
commit 864b4bfec8
21 changed files with 61 additions and 160 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
dmp-backend/web/src/main/java/eu/eudat/models/rda/Contact.java
View File

@ -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
{

12
dmp-backend/web/src/main/java/eu/eudat/models/rda/ContactId.java
View File

@ -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
{

10
dmp-backend/web/src/main/java/eu/eudat/models/rda/Contributor.java
View File

@ -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
{

12
dmp-backend/web/src/main/java/eu/eudat/models/rda/ContributorId.java
View File

@ -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
{

12
dmp-backend/web/src/main/java/eu/eudat/models/rda/Cost.java
View File

@ -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
{

12
dmp-backend/web/src/main/java/eu/eudat/models/rda/Dataset.java
View File

@ -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
{

12
dmp-backend/web/src/main/java/eu/eudat/models/rda/DatasetId.java
View File

@ -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
{

12
dmp-backend/web/src/main/java/eu/eudat/models/rda/Distribution.java
View File

@ -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
{

2
dmp-backend/web/src/main/java/eu/eudat/models/rda/Dmp.java
View File

@ -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",

12
dmp-backend/web/src/main/java/eu/eudat/models/rda/DmpId.java
View File

@ -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
{

12
dmp-backend/web/src/main/java/eu/eudat/models/rda/FunderId.java
View File

@ -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
{

12
dmp-backend/web/src/main/java/eu/eudat/models/rda/Funding.java
View File

@ -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
{

12
dmp-backend/web/src/main/java/eu/eudat/models/rda/GrantId.java
View File

@ -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
{

12
dmp-backend/web/src/main/java/eu/eudat/models/rda/Host.java
View File

@ -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
{

10
dmp-backend/web/src/main/java/eu/eudat/models/rda/License.java
View File

@ -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
{

12
dmp-backend/web/src/main/java/eu/eudat/models/rda/MetadataStandardId.java
View File

@ -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
{

12
dmp-backend/web/src/main/java/eu/eudat/models/rda/Metadatum.java
View File

@ -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
{

10
dmp-backend/web/src/main/java/eu/eudat/models/rda/Project.java
View File

@ -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
{

3
dmp-backend/web/src/main/java/eu/eudat/models/rda/RDAModel.java
View File

@ -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
{

10
dmp-backend/web/src/main/java/eu/eudat/models/rda/SecurityAndPrivacy.java
View File

@ -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
{

10
dmp-backend/web/src/main/java/eu/eudat/models/rda/TechnicalResource.java
View File

@ -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
{