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

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));
+        try {
-        StringBuilder multipleFormats = new StringBuilder();
+            JSONArray array = new JSONArray(JavaToJson.objectStringToJson(format));
-        for (int i = 0; i < array.length(); i++) {
+            StringBuilder multipleFormats = new StringBuilder();
-            multipleFormats.append(array.getJSONObject(i).getString(attribute)).append(", ");
+            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) {

dmp-backend/web/src/main/java/eu/eudat/models/data/dashboard/recent/model/RecentActivityModel.java

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

dmp-backend/web/src/main/java/eu/eudat/models/data/dashboard/recent/model/RecentDatasetModel.java

@@ -1,6 +1,7 @@
 package eu.eudat.models.data.dashboard.recent.model;
 
 import eu.eudat.data.entities.Dataset;
+import eu.eudat.models.data.datasetprofile.DatasetProfileOverviewModel;
 import eu.eudat.models.data.listingmodels.UserInfoListingModel;
 
 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.setFinalizedAt(entity.getFinalizedAt());
 		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.setDmp( entity.getDmp() != null ? entity.getDmp().getLabel() : "");
 		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.setFinalizedAt(entity.getFinalizedAt());
 		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.setDmp( entity.getDmp() != null ? entity.getDmp().getLabel() : "");
 		this.setDmpId(entity.getDmp() != null ? entity.getDmp().getId().toString() : "");

dmp-backend/web/src/main/java/eu/eudat/models/data/listingmodels/DatasetListingModel.java

@@ -4,6 +4,7 @@ import eu.eudat.data.entities.DMP;
 import eu.eudat.data.entities.Dataset;
 import eu.eudat.data.entities.Grant;
 import eu.eudat.models.DataModel;
+import eu.eudat.models.data.datasetprofile.DatasetProfileOverviewModel;
 
 import java.util.ArrayList;
 import java.util.Date;
@@ -18,6 +19,7 @@ public class DatasetListingModel implements DataModel<Dataset, DatasetListingMod
     private String grant;
     private String dmp;
     private String dmpId;
+    private DatasetProfileOverviewModel profile;
     private int status;
     private Date created;
     private Date modified;
@@ -63,6 +65,14 @@ public class DatasetListingModel implements DataModel<Dataset, DatasetListingMod
         this.dmpId = dmpId;
     }
 
+    public DatasetProfileOverviewModel getProfile() {
+        return profile;
+    }
+
+    public void setProfile(DatasetProfileOverviewModel profile) {
+        this.profile = profile;
+    }
+
     public int getStatus() {
         return status;
     }
@@ -137,6 +147,7 @@ public class DatasetListingModel implements DataModel<Dataset, DatasetListingMod
         this.grant = entity.getDmp() != null ? entity.getDmp().getGrant().getLabel() : "";
         this.dmp = entity.getDmp() != null ? entity.getDmp().getLabel() : "";
         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.status = entity.getStatus();
         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.setFinalizedAt(this.getFinalizedAt());
         entity.setDmp(dmp);
+        entity.setProfile(this.getProfile() != null ? this.getProfile().toDataModel() : null);
         return entity;
     }
 

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.*;
-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",
     "name"
 })
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class Contact implements Serializable
 {
 

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.*;
-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",
     "type"
 })
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class ContactId implements Serializable
 {
 

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.*;
-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;
 
 
@@ -28,6 +23,7 @@ import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
     "name",
     "role"
 })
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class Contributor implements Serializable
 {
 

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.*;
-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",
     "type"
 })
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class ContributorId implements Serializable
 {
 

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.*;
-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",
     "value"
 })
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class Cost implements Serializable
 {
 

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.*;
-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",
     "additional_properties"
 })
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class Dataset implements Serializable
 {
 

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.*;
-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",
     "type"
 })
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class DatasetId implements Serializable
 {
 

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.*;
-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",
     "additional_properties"
 })
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class Distribution implements Serializable
 {
 

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

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.*;
-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",
     "type"
 })
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class DmpId implements Serializable
 {
 

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.*;
-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",
     "type"
 })
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class FunderId implements Serializable
 {
 

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.*;
-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",
     "grant_id"
 })
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class Funding implements Serializable
 {
 

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.*;
-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",
     "type"
 })
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class GrantId implements Serializable
 {
 

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.*;
-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",
     "url"
 })
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class Host implements Serializable
 {
 

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.*;
-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",
     "start_date"
 })
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class License implements Serializable
 {
 

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.*;
-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",
     "type"
 })
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class MetadataStandardId implements Serializable
 {
 

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.*;
-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",
     "additional_properties"
 })
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class Metadatum implements Serializable
 {
 

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.*;
-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",
     "title"
 })
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class Project implements Serializable
 {
 

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
 {
 

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.*;
-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",
     "additional_properties"
 })
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class SecurityAndPrivacy implements Serializable
 {
 

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.*;
-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",
     "additional_properties"
 })
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class TechnicalResource implements Serializable
 {
 

dmp-frontend/src/app/ui/dmp/editor/dmp-finalize-dialog/dmp-finalize-dialog.component.html

@@ -33,7 +33,7 @@
 							<span>{{ 'TYPES.DATASET-STATUS.DRAFT' | translate }}
 							<ng-container *ngIf="datasetLookupStatus[dataset.id] && (datasetLookupStatus[dataset.id] === datasetLookupStatusEnum.INVALID)">
 								({{'DMP-FINALISE-DIALOG.INVALID' | translate}})
-							</ng-container>	
+							</ng-container>
 							:</span>
 							{{ dataset.label }}
 							<i *ngIf="(datasetLookupStatus[dataset.id] != datasetLookupStatusEnum.INVALID) && (datasetLookupStatus[dataset.id] != datasetLookupStatusEnum.VALID) " class="fa fa-spinner fa-spin" ></i>
@@ -50,7 +50,7 @@
 			<mat-selection-list #datasetsDraftSelectionList [(ngModel)]="outputModel.datasetsToBeFinalized">
 				<div class="styleBorder" *ngFor="let dataset of validDrafts">
 					<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>
 				</div>
 			</mat-selection-list>