model changes

src/main/java/eu/eudat/commonmodels/models/FileEnvelopeModel.java

@@ -2,6 +2,7 @@ package eu.eudat.commonmodels.models;
 
 public class FileEnvelopeModel {
     private String filename;
+    private String fileRef;
     private byte[] file;
 
     public String getFilename() {
@@ -19,4 +20,12 @@ public class FileEnvelopeModel {
     public void setFile(byte[] file) {
         this.file = file;
     }
+
+    public String getFileRef() {
+        return fileRef;
+    }
+
+    public void setFileRef(String fileRef) {
+        this.fileRef = fileRef;
+    }
 }

src/main/java/eu/eudat/commonmodels/models/descriptiotemplate/FieldSetModel.java

@@ -21,8 +21,6 @@ public class FieldSetModel {
 
 	private MultiplicityModel multiplicity;
 
-	private Boolean hasCommentField;
-
 	private List<FieldModel> fields;
 
 	public String getId() {
@@ -89,14 +87,6 @@ public class FieldSetModel {
 		this.multiplicity = multiplicity;
 	}
 
-	public Boolean getHasCommentField() {
-		return hasCommentField;
-	}
-
-	public void setHasCommentField(Boolean hasCommentField) {
-		this.hasCommentField = hasCommentField;
-	}
-
 	public List<FieldModel> getFields() {
 		return fields;
 	}

src/main/java/eu/eudat/commonmodels/models/dmp/DmpModel.java

@@ -8,6 +8,7 @@ import eu.eudat.commonmodels.models.FileEnvelopeModel;
 import eu.eudat.commonmodels.models.UserModel;
 import eu.eudat.commonmodels.models.description.DescriptionModel;
 import eu.eudat.commonmodels.models.dmpblueprint.DmpBlueprintModel;
+import eu.eudat.commonmodels.models.dmpreference.DmpReferenceModel;
 import eu.eudat.commonmodels.models.reference.ReferenceModel;
 
 import java.time.Instant;
@@ -27,7 +28,7 @@ public class DmpModel {
     private List<EntityDoiModel> entityDois;
     private List<DescriptionModel> descriptions;
     private List<DmpUserModel> users;
-    private List<ReferenceModel> references;
+    private List<DmpReferenceModel> references;
     private FileEnvelopeModel pdfFile;
     private FileEnvelopeModel rdaJsonFile;
     private FileEnvelopeModel supportingFilesZip;
@@ -84,11 +85,11 @@ public class DmpModel {
         this.users = users;
     }
 
-    public List<ReferenceModel> getReferences() {
+    public List<DmpReferenceModel> getReferences() {
         return references;
     }
 
-    public void setReferences(List<ReferenceModel> references) {
+    public void setReferences(List<DmpReferenceModel> references) {
         this.references = references;
     }
 

src/main/java/eu/eudat/commonmodels/models/dmpblueprint/SectionModel.java

@@ -14,7 +14,6 @@ public class SectionModel {
 	private Boolean hasTemplates;
 
 	private List<FieldModel> fields;
-	private List<DescriptionTemplateModel> descriptionTemplates;
 
 	public UUID getId() {
 		return id;
@@ -63,12 +62,4 @@ public class SectionModel {
 	public void setFields(List<FieldModel> fields) {
 		this.fields = fields;
 	}
-
-	public List<DescriptionTemplateModel> getDescriptionTemplates() {
-		return descriptionTemplates;
-	}
-
-	public void setDescriptionTemplates(List<DescriptionTemplateModel> descriptionTemplates) {
-		this.descriptionTemplates = descriptionTemplates;
-	}
 }

src/main/java/eu/eudat/commonmodels/models/dmpreference/DmpReferenceDataModel.java

@@ -0,0 +1,15 @@
+package eu.eudat.commonmodels.models.dmpreference;
+
+import java.util.UUID;
+
+public class DmpReferenceDataModel {
+	private UUID blueprintFieldId;
+
+	public UUID getBlueprintFieldId() {
+		return blueprintFieldId;
+	}
+
+	public void setBlueprintFieldId(UUID blueprintFieldId) {
+		this.blueprintFieldId = blueprintFieldId;
+	}
+}

src/main/java/eu/eudat/commonmodels/models/dmpreference/DmpReferenceModel.java

@@ -0,0 +1,37 @@
+package eu.eudat.commonmodels.models.dmpreference;
+
+import eu.eudat.commonmodels.models.reference.ReferenceModel;
+
+import java.util.UUID;
+
+public class DmpReferenceModel {
+	private UUID id;
+	private ReferenceModel reference;
+	
+	private DmpReferenceDataModel data;
+
+	public UUID getId() {
+		return id;
+	}
+
+	public void setId(UUID id) {
+		this.id = id;
+	}
+
+	public ReferenceModel getReference() {
+		return reference;
+	}
+
+	public void setReference(ReferenceModel reference) {
+		this.reference = reference;
+	}
+
+	public DmpReferenceDataModel getData() {
+		return data;
+	}
+
+	public void setData(DmpReferenceDataModel data) {
+		this.data = data;
+	}
+}
+