Merge pull request #26 from axonivy-market/feature-complete-master-im…

…port

feature complete import

README.md

@@ -3,5 +3,6 @@
 [![CI Build](https://github.com/axonivy-market/express-importer/actions/workflows/ci.yml/badge.svg)](https://github.com/axonivy-market/express-importer/actions/workflows/ci.yml)
 
 Imports No-Code Processes from Axon Ivy Express into the Designer for further development.
+The result is an up and running Axon Ivy BPMN process with task dialogs and the data objects behind.  
 
 Read our [documentation](express-importer-product/README.md).

express-importer/src/com/axonivy/portal/express/importer/ExpressEmail.java

@@ -0,0 +1,59 @@
+package com.axonivy.portal.express.importer;
+
+import java.io.Serializable;
+import java.util.List;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.databind.JsonNode;
+
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class ExpressEmail implements Serializable {
+
+	private static final long serialVersionUID = -4263607320804462685L;
+	private String recipients;
+	private String responseTo;
+	private String subject;
+	private String content;
+	private List<JsonNode> attachments;
+
+	public String getRecipients() {
+		return recipients;
+	}
+
+	public void setRecipients(String recipients) {
+		this.recipients = recipients;
+	}
+
+	public String getResponseTo() {
+		return responseTo;
+	}
+
+	public void setResponseTo(String responseTo) {
+		this.responseTo = responseTo;
+	}
+
+	public String getSubject() {
+		return subject;
+	}
+
+	public void setSubject(String subject) {
+		this.subject = subject;
+	}
+
+	public String getContent() {
+		return content;
+	}
+
+	public void setContent(String content) {
+		this.content = content;
+	}
+
+	public List<JsonNode> getAttachments() {
+		return attachments;
+	}
+
+	public void setAttachments(List<JsonNode> attachments) {
+		this.attachments = attachments;
+	}
+
+}

express-importer/src/com/axonivy/portal/express/importer/ExpressTaskDefinition.java

@@ -1,10 +1,10 @@
 package com.axonivy.portal.express.importer;
 
 import java.io.Serializable;
+import java.util.ArrayList;
 import java.util.List;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.databind.JsonNode;
 
 @JsonInclude(JsonInclude.Include.NON_NULL)
 public class ExpressTaskDefinition implements Serializable {
@@ -17,7 +17,7 @@ public class ExpressTaskDefinition implements Serializable {
   private int taskPosition;
   private int untilDays;
   private String responsibleDisplayName;
-  private JsonNode email;
+  private ExpressEmail email;
   private List<ExpressFormElement> formElements;
 
   public String getType() {
@@ -29,7 +29,7 @@ public void setType(String type) {
   }
 
   public List<String> getResponsibles() {
-    return responsibles;
+	  return responsibles == null ? new ArrayList<String>() : responsibles;
   }
 
   public void setResponsibles(List<String> responsibles) {
@@ -45,7 +45,7 @@ public void setSubject(String subject) {
   }
 
   public String getDescription() {
-    return description;
+	  return description == null ? "" : description;
   }
 
   public void setDescription(String description) {
@@ -76,11 +76,11 @@ public void setResponsibleDisplayName(String responsibleDisplayName) {
     this.responsibleDisplayName = responsibleDisplayName;
   }
 
-  public JsonNode getEmail() {
+  public ExpressEmail getEmail() {
     return email;
   }
 
-  public void setEmail(JsonNode email) {
+  public void setEmail(ExpressEmail email) {
     this.email = email;
   }
 

express-importer/src/com/axonivy/portal/express/importer/ExpressWorkflowConverter.java

@@ -65,7 +65,7 @@ private void writeProcess(ExpressProcess expressProcess) throws Exception {
     writer.drawElements(
       expressProcess.getTaskDefinitions(),
       diagram,
-      expressProcess.getProcessName(),
+      processName,
       dataclassName,
       dataFields);
     process.save();