Merge branch 'Development' of code-repo.d4science.org:MaDgiK-CITE/argos into Development

This commit is contained in:
argirok 2022-03-29 10:32:39 +03:00
commit 35ea0b5d6c
26 changed files with 100 additions and 170 deletions

View File

@ -16,6 +16,7 @@ import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
import org.apache.poi.util.Units; import org.apache.poi.util.Units;
import org.apache.poi.xwpf.usermodel.*; import org.apache.poi.xwpf.usermodel.*;
import org.json.JSONArray; import org.json.JSONArray;
import org.json.JSONException;
import org.jsoup.Jsoup; import org.jsoup.Jsoup;
import org.jsoup.nodes.Document; import org.jsoup.nodes.Document;
import org.openxmlformats.schemas.wordprocessingml.x2006.main.*; import org.openxmlformats.schemas.wordprocessingml.x2006.main.*;
@ -378,6 +379,7 @@ public class WordBuilder {
if((format == null || format.isEmpty()) || (attribute == null || attribute.isEmpty())){ if((format == null || format.isEmpty()) || (attribute == null || attribute.isEmpty())){
return null; return null;
} }
try {
JSONArray array = new JSONArray(JavaToJson.objectStringToJson(format)); JSONArray array = new JSONArray(JavaToJson.objectStringToJson(format));
StringBuilder multipleFormats = new StringBuilder(); StringBuilder multipleFormats = new StringBuilder();
for (int i = 0; i < array.length(); i++) { for (int i = 0; i < array.length(); i++) {
@ -387,6 +389,9 @@ public class WordBuilder {
multipleFormats.setLength(multipleFormats.length() - 2); multipleFormats.setLength(multipleFormats.length() - 2);
} }
return multipleFormats.toString(); return multipleFormats.toString();
} catch (JSONException e) {
return format;
}
} }
public XWPFParagraph addParagraphContent(Object content, XWPFDocument mainDocumentPart, ParagraphStyle style, BigInteger numId) { public XWPFParagraph addParagraphContent(Object content, XWPFDocument mainDocumentPart, ParagraphStyle style, BigInteger numId) {

View File

@ -18,6 +18,7 @@ public abstract class RecentActivityModel<T extends DataEntity, S extends DataMo
private String grant; private String grant;
private Date finalizedAt; private Date finalizedAt;
private Date publishedAt; private Date publishedAt;
private DatasetProfileOverviewModel profile;
private int type; private int type;
private List<UserInfoListingModel> users; private List<UserInfoListingModel> users;
private Boolean isPublic; private Boolean isPublic;
@ -94,6 +95,14 @@ public abstract class RecentActivityModel<T extends DataEntity, S extends DataMo
this.publishedAt = publishedAt; this.publishedAt = publishedAt;
} }
public DatasetProfileOverviewModel getProfile() {
return profile;
}
public void setProfile(DatasetProfileOverviewModel profile) {
this.profile = profile;
}
public int getType() { public int getType() {
return type; return type;
} }

View File

@ -1,6 +1,7 @@
package eu.eudat.models.data.dashboard.recent.model; package eu.eudat.models.data.dashboard.recent.model;
import eu.eudat.data.entities.Dataset; import eu.eudat.data.entities.Dataset;
import eu.eudat.models.data.datasetprofile.DatasetProfileOverviewModel;
import eu.eudat.models.data.listingmodels.UserInfoListingModel; import eu.eudat.models.data.listingmodels.UserInfoListingModel;
import java.util.Date; import java.util.Date;
@ -37,6 +38,7 @@ public class RecentDatasetModel extends RecentActivityModel<Dataset, RecentDatas
this.setVersion(entity.getDmp() != null ? entity.getDmp().getVersion(): 0); this.setVersion(entity.getDmp() != null ? entity.getDmp().getVersion(): 0);
this.setFinalizedAt(entity.getFinalizedAt()); this.setFinalizedAt(entity.getFinalizedAt());
this.setPublishedAt(entity.getDmp() != null ? entity.getDmp().getPublishedAt() : new Date()); this.setPublishedAt(entity.getDmp() != null ? entity.getDmp().getPublishedAt() : new Date());
this.setProfile(entity.getProfile() != null ? new DatasetProfileOverviewModel().fromDataModel(entity.getProfile()): null);
this.setGrant(entity.getDmp() != null ? entity.getDmp().getGrant().getLabel() : ""); this.setGrant(entity.getDmp() != null ? entity.getDmp().getGrant().getLabel() : "");
this.setDmp( entity.getDmp() != null ? entity.getDmp().getLabel() : ""); this.setDmp( entity.getDmp() != null ? entity.getDmp().getLabel() : "");
this.setDmpId(entity.getDmp() != null ? entity.getDmp().getId().toString() : ""); this.setDmpId(entity.getDmp() != null ? entity.getDmp().getId().toString() : "");
@ -55,6 +57,7 @@ public class RecentDatasetModel extends RecentActivityModel<Dataset, RecentDatas
this.setVersion(entity.getDmp() != null ? entity.getDmp().getVersion(): 0); this.setVersion(entity.getDmp() != null ? entity.getDmp().getVersion(): 0);
this.setFinalizedAt(entity.getFinalizedAt()); this.setFinalizedAt(entity.getFinalizedAt());
this.setPublishedAt(entity.getDmp() != null ? entity.getDmp().getPublishedAt() : new Date()); this.setPublishedAt(entity.getDmp() != null ? entity.getDmp().getPublishedAt() : new Date());
this.setProfile(entity.getProfile() != null ? new DatasetProfileOverviewModel().fromDataModel(entity.getProfile()) : null);
this.setGrant(entity.getDmp() != null ? entity.getDmp().getGrant().getLabel() : ""); this.setGrant(entity.getDmp() != null ? entity.getDmp().getGrant().getLabel() : "");
this.setDmp( entity.getDmp() != null ? entity.getDmp().getLabel() : ""); this.setDmp( entity.getDmp() != null ? entity.getDmp().getLabel() : "");
this.setDmpId(entity.getDmp() != null ? entity.getDmp().getId().toString() : ""); this.setDmpId(entity.getDmp() != null ? entity.getDmp().getId().toString() : "");

View File

@ -4,6 +4,7 @@ import eu.eudat.data.entities.DMP;
import eu.eudat.data.entities.Dataset; import eu.eudat.data.entities.Dataset;
import eu.eudat.data.entities.Grant; import eu.eudat.data.entities.Grant;
import eu.eudat.models.DataModel; import eu.eudat.models.DataModel;
import eu.eudat.models.data.datasetprofile.DatasetProfileOverviewModel;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Date; import java.util.Date;
@ -18,6 +19,7 @@ public class DatasetListingModel implements DataModel<Dataset, DatasetListingMod
private String grant; private String grant;
private String dmp; private String dmp;
private String dmpId; private String dmpId;
private DatasetProfileOverviewModel profile;
private int status; private int status;
private Date created; private Date created;
private Date modified; private Date modified;
@ -63,6 +65,14 @@ public class DatasetListingModel implements DataModel<Dataset, DatasetListingMod
this.dmpId = dmpId; this.dmpId = dmpId;
} }
public DatasetProfileOverviewModel getProfile() {
return profile;
}
public void setProfile(DatasetProfileOverviewModel profile) {
this.profile = profile;
}
public int getStatus() { public int getStatus() {
return status; return status;
} }
@ -137,6 +147,7 @@ public class DatasetListingModel implements DataModel<Dataset, DatasetListingMod
this.grant = entity.getDmp() != null ? entity.getDmp().getGrant().getLabel() : ""; this.grant = entity.getDmp() != null ? entity.getDmp().getGrant().getLabel() : "";
this.dmp = entity.getDmp() != null ? entity.getDmp().getLabel() : ""; this.dmp = entity.getDmp() != null ? entity.getDmp().getLabel() : "";
this.dmpId = entity.getDmp() != null ? entity.getDmp().getId().toString() : ""; this.dmpId = entity.getDmp() != null ? entity.getDmp().getId().toString() : "";
this.profile = entity.getProfile() != null ? new DatasetProfileOverviewModel().fromDataModel(entity.getProfile()) : null;
this.description = entity.getDescription(); this.description = entity.getDescription();
this.status = entity.getStatus(); this.status = entity.getStatus();
if (entity.getFinalizedAt() == null && entity.getStatus() == Dataset.Status.FINALISED.getValue()) { if (entity.getFinalizedAt() == null && entity.getStatus() == Dataset.Status.FINALISED.getValue()) {
@ -173,6 +184,7 @@ public class DatasetListingModel implements DataModel<Dataset, DatasetListingMod
dmp.setPublic(this.getPublic()); dmp.setPublic(this.getPublic());
dmp.setFinalizedAt(this.getFinalizedAt()); dmp.setFinalizedAt(this.getFinalizedAt());
entity.setDmp(dmp); entity.setDmp(dmp);
entity.setProfile(this.getProfile() != null ? this.getProfile().toDataModel() : null);
return entity; return entity;
} }

View File

@ -4,13 +4,8 @@ package eu.eudat.models.rda;
import java.io.Serializable; import java.io.Serializable;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import com.fasterxml.jackson.annotation.JsonAnyGetter;
import com.fasterxml.jackson.annotation.JsonAnySetter; import com.fasterxml.jackson.annotation.*;
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;
/** /**
@ -25,6 +20,7 @@ import com.fasterxml.jackson.annotation.JsonPropertyOrder;
"mbox", "mbox",
"name" "name"
}) })
@JsonIgnoreProperties(ignoreUnknown = true)
public class Contact implements Serializable public class Contact implements Serializable
{ {

View File

@ -4,15 +4,8 @@ package eu.eudat.models.rda;
import java.io.Serializable; import java.io.Serializable;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import com.fasterxml.jackson.annotation.JsonAnyGetter;
import com.fasterxml.jackson.annotation.JsonAnySetter; import com.fasterxml.jackson.annotation.*;
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;
/** /**
@ -26,6 +19,7 @@ import com.fasterxml.jackson.annotation.JsonValue;
"identifier", "identifier",
"type" "type"
}) })
@JsonIgnoreProperties(ignoreUnknown = true)
public class ContactId implements Serializable public class ContactId implements Serializable
{ {

View File

@ -5,13 +5,8 @@ import java.io.Serializable;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
import com.fasterxml.jackson.annotation.JsonAnyGetter;
import com.fasterxml.jackson.annotation.JsonAnySetter; import com.fasterxml.jackson.annotation.*;
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.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
@ -28,6 +23,7 @@ import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
"name", "name",
"role" "role"
}) })
@JsonIgnoreProperties(ignoreUnknown = true)
public class Contributor implements Serializable public class Contributor implements Serializable
{ {

View File

@ -4,15 +4,8 @@ package eu.eudat.models.rda;
import java.io.Serializable; import java.io.Serializable;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import com.fasterxml.jackson.annotation.JsonAnyGetter;
import com.fasterxml.jackson.annotation.JsonAnySetter; import com.fasterxml.jackson.annotation.*;
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;
/** /**
@ -26,6 +19,7 @@ import com.fasterxml.jackson.annotation.JsonValue;
"identifier", "identifier",
"type" "type"
}) })
@JsonIgnoreProperties(ignoreUnknown = true)
public class ContributorId implements Serializable public class ContributorId implements Serializable
{ {

View File

@ -4,15 +4,8 @@ package eu.eudat.models.rda;
import java.io.Serializable; import java.io.Serializable;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import com.fasterxml.jackson.annotation.JsonAnyGetter;
import com.fasterxml.jackson.annotation.JsonAnySetter; import com.fasterxml.jackson.annotation.*;
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;
/** /**
@ -28,6 +21,7 @@ import com.fasterxml.jackson.annotation.JsonValue;
"title", "title",
"value" "value"
}) })
@JsonIgnoreProperties(ignoreUnknown = true)
public class Cost implements Serializable public class Cost implements Serializable
{ {

View File

@ -5,15 +5,8 @@ import java.io.Serializable;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import com.fasterxml.jackson.annotation.JsonAnyGetter;
import com.fasterxml.jackson.annotation.JsonAnySetter; import com.fasterxml.jackson.annotation.*;
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;
/** /**
@ -41,6 +34,7 @@ import com.fasterxml.jackson.annotation.JsonValue;
"type", "type",
"additional_properties" "additional_properties"
}) })
@JsonIgnoreProperties(ignoreUnknown = true)
public class Dataset implements Serializable public class Dataset implements Serializable
{ {

View File

@ -4,15 +4,8 @@ package eu.eudat.models.rda;
import java.io.Serializable; import java.io.Serializable;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import com.fasterxml.jackson.annotation.JsonAnyGetter;
import com.fasterxml.jackson.annotation.JsonAnySetter; import com.fasterxml.jackson.annotation.*;
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;
/** /**
@ -26,6 +19,7 @@ import com.fasterxml.jackson.annotation.JsonValue;
"identifier", "identifier",
"type" "type"
}) })
@JsonIgnoreProperties(ignoreUnknown = true)
public class DatasetId implements Serializable public class DatasetId implements Serializable
{ {

View File

@ -6,15 +6,8 @@ import java.net.URI;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import com.fasterxml.jackson.annotation.JsonAnyGetter;
import com.fasterxml.jackson.annotation.JsonAnySetter; import com.fasterxml.jackson.annotation.*;
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;
/** /**
@ -37,6 +30,7 @@ import com.fasterxml.jackson.annotation.JsonValue;
"title", "title",
"additional_properties" "additional_properties"
}) })
@JsonIgnoreProperties(ignoreUnknown = true)
public class Distribution implements Serializable public class Distribution implements Serializable
{ {

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) @JsonInclude(JsonInclude.Include.NON_NULL)
@JsonPropertyOrder({ @JsonPropertyOrder({
"contact", "contact",

View File

@ -4,15 +4,8 @@ package eu.eudat.models.rda;
import java.io.Serializable; import java.io.Serializable;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import com.fasterxml.jackson.annotation.JsonAnyGetter;
import com.fasterxml.jackson.annotation.JsonAnySetter; import com.fasterxml.jackson.annotation.*;
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;
/** /**
@ -26,6 +19,7 @@ import com.fasterxml.jackson.annotation.JsonValue;
"identifier", "identifier",
"type" "type"
}) })
@JsonIgnoreProperties(ignoreUnknown = true)
public class DmpId implements Serializable public class DmpId implements Serializable
{ {

View File

@ -4,15 +4,8 @@ package eu.eudat.models.rda;
import java.io.Serializable; import java.io.Serializable;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import com.fasterxml.jackson.annotation.JsonAnyGetter;
import com.fasterxml.jackson.annotation.JsonAnySetter; import com.fasterxml.jackson.annotation.*;
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;
/** /**
@ -26,6 +19,7 @@ import com.fasterxml.jackson.annotation.JsonValue;
"identifier", "identifier",
"type" "type"
}) })
@JsonIgnoreProperties(ignoreUnknown = true)
public class FunderId implements Serializable public class FunderId implements Serializable
{ {

View File

@ -4,15 +4,8 @@ package eu.eudat.models.rda;
import java.io.Serializable; import java.io.Serializable;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import com.fasterxml.jackson.annotation.JsonAnyGetter;
import com.fasterxml.jackson.annotation.JsonAnySetter; import com.fasterxml.jackson.annotation.*;
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;
/** /**
@ -27,6 +20,7 @@ import com.fasterxml.jackson.annotation.JsonValue;
"funding_status", "funding_status",
"grant_id" "grant_id"
}) })
@JsonIgnoreProperties(ignoreUnknown = true)
public class Funding implements Serializable public class Funding implements Serializable
{ {

View File

@ -4,15 +4,8 @@ package eu.eudat.models.rda;
import java.io.Serializable; import java.io.Serializable;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import com.fasterxml.jackson.annotation.JsonAnyGetter;
import com.fasterxml.jackson.annotation.JsonAnySetter; import com.fasterxml.jackson.annotation.*;
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;
/** /**
@ -26,6 +19,7 @@ import com.fasterxml.jackson.annotation.JsonValue;
"identifier", "identifier",
"type" "type"
}) })
@JsonIgnoreProperties(ignoreUnknown = true)
public class GrantId implements Serializable public class GrantId implements Serializable
{ {

View File

@ -6,15 +6,8 @@ import java.net.URI;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import com.fasterxml.jackson.annotation.JsonAnyGetter;
import com.fasterxml.jackson.annotation.JsonAnySetter; import com.fasterxml.jackson.annotation.*;
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;
/** /**
@ -37,6 +30,7 @@ import com.fasterxml.jackson.annotation.JsonValue;
"title", "title",
"url" "url"
}) })
@JsonIgnoreProperties(ignoreUnknown = true)
public class Host implements Serializable public class Host implements Serializable
{ {

View File

@ -5,13 +5,8 @@ import java.io.Serializable;
import java.net.URI; import java.net.URI;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import com.fasterxml.jackson.annotation.JsonAnyGetter;
import com.fasterxml.jackson.annotation.JsonAnySetter; import com.fasterxml.jackson.annotation.*;
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;
/** /**
@ -25,6 +20,7 @@ import com.fasterxml.jackson.annotation.JsonPropertyOrder;
"license_ref", "license_ref",
"start_date" "start_date"
}) })
@JsonIgnoreProperties(ignoreUnknown = true)
public class License implements Serializable public class License implements Serializable
{ {

View File

@ -4,15 +4,8 @@ package eu.eudat.models.rda;
import java.io.Serializable; import java.io.Serializable;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import com.fasterxml.jackson.annotation.JsonAnyGetter;
import com.fasterxml.jackson.annotation.JsonAnySetter; import com.fasterxml.jackson.annotation.*;
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;
/** /**
@ -26,6 +19,7 @@ import com.fasterxml.jackson.annotation.JsonValue;
"identifier", "identifier",
"type" "type"
}) })
@JsonIgnoreProperties(ignoreUnknown = true)
public class MetadataStandardId implements Serializable public class MetadataStandardId implements Serializable
{ {

View File

@ -4,15 +4,8 @@ package eu.eudat.models.rda;
import java.io.Serializable; import java.io.Serializable;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import com.fasterxml.jackson.annotation.JsonAnyGetter;
import com.fasterxml.jackson.annotation.JsonAnySetter; import com.fasterxml.jackson.annotation.*;
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;
/** /**
@ -28,6 +21,7 @@ import com.fasterxml.jackson.annotation.JsonValue;
"metadata_standard_id", "metadata_standard_id",
"additional_properties" "additional_properties"
}) })
@JsonIgnoreProperties(ignoreUnknown = true)
public class Metadatum implements Serializable public class Metadatum implements Serializable
{ {

View File

@ -5,13 +5,8 @@ import java.io.Serializable;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import com.fasterxml.jackson.annotation.JsonAnyGetter;
import com.fasterxml.jackson.annotation.JsonAnySetter; import com.fasterxml.jackson.annotation.*;
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;
/** /**
@ -28,6 +23,7 @@ import com.fasterxml.jackson.annotation.JsonPropertyOrder;
"start", "start",
"title" "title"
}) })
@JsonIgnoreProperties(ignoreUnknown = true)
public class Project implements Serializable public class Project implements Serializable
{ {

View File

@ -2,6 +2,8 @@
package eu.eudat.models.rda; package eu.eudat.models.rda;
import java.io.Serializable; import java.io.Serializable;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.annotation.JsonPropertyOrder;
@ -17,6 +19,7 @@ import com.fasterxml.jackson.annotation.JsonPropertyOrder;
@JsonPropertyOrder({ @JsonPropertyOrder({
"dmp" "dmp"
}) })
@JsonIgnoreProperties(ignoreUnknown = true)
public class RDAModel implements Serializable public class RDAModel implements Serializable
{ {

View File

@ -4,13 +4,8 @@ package eu.eudat.models.rda;
import java.io.Serializable; import java.io.Serializable;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import com.fasterxml.jackson.annotation.JsonAnyGetter;
import com.fasterxml.jackson.annotation.JsonAnySetter; import com.fasterxml.jackson.annotation.*;
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;
/** /**
@ -25,6 +20,7 @@ import com.fasterxml.jackson.annotation.JsonPropertyOrder;
"title", "title",
"additional_properties" "additional_properties"
}) })
@JsonIgnoreProperties(ignoreUnknown = true)
public class SecurityAndPrivacy implements Serializable public class SecurityAndPrivacy implements Serializable
{ {

View File

@ -4,13 +4,8 @@ package eu.eudat.models.rda;
import java.io.Serializable; import java.io.Serializable;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import com.fasterxml.jackson.annotation.JsonAnyGetter;
import com.fasterxml.jackson.annotation.JsonAnySetter; import com.fasterxml.jackson.annotation.*;
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;
/** /**
@ -25,6 +20,7 @@ import com.fasterxml.jackson.annotation.JsonPropertyOrder;
"name", "name",
"additional_properties" "additional_properties"
}) })
@JsonIgnoreProperties(ignoreUnknown = true)
public class TechnicalResource implements Serializable public class TechnicalResource implements Serializable
{ {

View File

@ -50,7 +50,7 @@
<mat-selection-list #datasetsDraftSelectionList [(ngModel)]="outputModel.datasetsToBeFinalized"> <mat-selection-list #datasetsDraftSelectionList [(ngModel)]="outputModel.datasetsToBeFinalized">
<div class="styleBorder" *ngFor="let dataset of validDrafts"> <div class="styleBorder" *ngFor="let dataset of validDrafts">
<mat-list-option [value]='dataset.id' [disabled]="!datasetLookupStatus[dataset.id] || (datasetLookupStatus[dataset.id] != datasetLookupStatusEnum.VALID)"> <mat-list-option [value]='dataset.id' [disabled]="!datasetLookupStatus[dataset.id] || (datasetLookupStatus[dataset.id] != datasetLookupStatusEnum.VALID)">
{{ dataset.label }} <span class="text-truncate" [matTooltip]="dataset.label">{{ dataset.label }}</span>
</mat-list-option> </mat-list-option>
</div> </div>
</mat-selection-list> </mat-selection-list>