From a8b4ae48bc4bdbb01a7f3be460dba521f5bfcd32 Mon Sep 17 00:00:00 2001
From: "francesco.mangiacrapa" <francesco.mangiacrapa@isti.cnr.it>
Date: Tue, 11 Oct 2022 10:35:35 +0200
Subject: [PATCH] Added PayloadDV

---
 .../ConvertToDataValueObjectModel.java        | 11 +++
 .../shared/geoportal/view/Payload.java        | 83 +++++++++++++++++++
 .../shared/geoportal/view/PayloadDV.java      | 16 +---
 3 files changed, 96 insertions(+), 14 deletions(-)
 create mode 100644 src/main/java/org/gcube/application/geoportalcommon/shared/geoportal/view/Payload.java

diff --git a/src/main/java/org/gcube/application/geoportalcommon/ConvertToDataValueObjectModel.java b/src/main/java/org/gcube/application/geoportalcommon/ConvertToDataValueObjectModel.java
index 0b932e3..83763bf 100644
--- a/src/main/java/org/gcube/application/geoportalcommon/ConvertToDataValueObjectModel.java
+++ b/src/main/java/org/gcube/application/geoportalcommon/ConvertToDataValueObjectModel.java
@@ -51,6 +51,8 @@ import org.gcube.application.geoportalcommon.shared.geoportal.ucd.GEOPORTAL_DATA
 import org.gcube.application.geoportalcommon.shared.geoportal.ucd.HandlerDeclarationDV;
 import org.gcube.application.geoportalcommon.shared.geoportal.ucd.RelationshipDefinitionDV;
 import org.gcube.application.geoportalcommon.shared.geoportal.ucd.UseCaseDescriptorDV;
+import org.gcube.application.geoportalcommon.shared.geoportal.view.Payload;
+import org.gcube.application.geoportalcommon.shared.geoportal.view.PayloadDV;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -1132,4 +1134,13 @@ public class ConvertToDataValueObjectModel {
 
 	}
 
+	public static PayloadDV toPayloadDV(Payload payload) {
+		PayloadDV p = new PayloadDV();
+		p.setName(payload.getName());
+		p.setLink(payload.getLink());
+		p.setMimetype(payload.getMimetype());
+		p.setStorageID(p.getStorageID());
+		return p;
+	}
+
 }
diff --git a/src/main/java/org/gcube/application/geoportalcommon/shared/geoportal/view/Payload.java b/src/main/java/org/gcube/application/geoportalcommon/shared/geoportal/view/Payload.java
new file mode 100644
index 0000000..1a92aab
--- /dev/null
+++ b/src/main/java/org/gcube/application/geoportalcommon/shared/geoportal/view/Payload.java
@@ -0,0 +1,83 @@
+package org.gcube.application.geoportalcommon.shared.geoportal.view;
+
+import java.io.Serializable;
+
+import javax.xml.bind.annotation.XmlRootElement;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import lombok.extern.slf4j.Slf4j;
+
+@XmlRootElement(name = "_payloads")
+@Slf4j
+public class Payload implements Serializable {
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = -3975356671779455705L;
+
+	@JsonProperty("_mimetype")
+	private String mimetype;
+
+	@JsonProperty("_storageID")
+	private String storageID;
+
+	@JsonProperty("_link")
+	private String link;
+
+	@JsonProperty("_name")
+	private String name;
+
+	public Payload() {
+
+	}
+
+	public String getMimetype() {
+		return mimetype;
+	}
+
+	public String getStorageID() {
+		return storageID;
+	}
+
+	public String getLink() {
+		return link;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setMimetype(String mimetype) {
+		this.mimetype = mimetype;
+	}
+
+	public void setStorageID(String storageID) {
+		this.storageID = storageID;
+	}
+
+	public void setLink(String link) {
+		this.link = link;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	@Override
+	public String toString() {
+		StringBuilder builder = new StringBuilder();
+		builder.append("Payload [mimetype=");
+		builder.append(mimetype);
+		builder.append(", storageID=");
+		builder.append(storageID);
+		builder.append(", link=");
+		builder.append(link);
+		builder.append(", name=");
+		builder.append(name);
+		builder.append("]");
+		return builder.toString();
+	}
+
+}
diff --git a/src/main/java/org/gcube/application/geoportalcommon/shared/geoportal/view/PayloadDV.java b/src/main/java/org/gcube/application/geoportalcommon/shared/geoportal/view/PayloadDV.java
index 20be44a..9053d26 100644
--- a/src/main/java/org/gcube/application/geoportalcommon/shared/geoportal/view/PayloadDV.java
+++ b/src/main/java/org/gcube/application/geoportalcommon/shared/geoportal/view/PayloadDV.java
@@ -2,31 +2,19 @@ package org.gcube.application.geoportalcommon.shared.geoportal.view;
 
 import java.io.Serializable;
 
-import javax.xml.bind.annotation.XmlRootElement;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import lombok.extern.slf4j.Slf4j;
-
-@XmlRootElement(name = "_payloads")
-@Slf4j
 public class PayloadDV implements Serializable {
 
 	/**
 	 * 
 	 */
-	private static final long serialVersionUID = -3975356671779455705L;
+	private static final long serialVersionUID = 1364319249658824189L;
 
-	@JsonProperty("_mimetype")
 	private String mimetype;
 
-	@JsonProperty("_storageID")
 	private String storageID;
 
-	@JsonProperty("_link")
 	private String link;
 
-	@JsonProperty("_name")
 	private String name;
 
 	public PayloadDV() {
@@ -68,7 +56,7 @@ public class PayloadDV implements Serializable {
 	@Override
 	public String toString() {
 		StringBuilder builder = new StringBuilder();
-		builder.append("PayloadDV [mimetype=");
+		builder.append("Payload [mimetype=");
 		builder.append(mimetype);
 		builder.append(", storageID=");
 		builder.append(storageID);