From 04e5167f6054ab6bef59d394213d19720e4706a0 Mon Sep 17 00:00:00 2001
From: Robert von Burg <eitch@eitchnet.ch>
Date: Sun, 6 Mar 2022 20:01:42 +0100
Subject: [PATCH] [New] Added
 StrolchElementToJsonVisitor.withListParametersAsArray()

---
 .../json/StrolchElementToJsonVisitor.java     | 23 +++++++++++++++++++
 .../json/StrolchRootElementToJsonVisitor.java |  5 ++++
 2 files changed, 28 insertions(+)

diff --git a/li.strolch.model/src/main/java/li/strolch/model/json/StrolchElementToJsonVisitor.java b/li.strolch.model/src/main/java/li/strolch/model/json/StrolchElementToJsonVisitor.java
index a4b1f29ec..66d76f987 100644
--- a/li.strolch.model/src/main/java/li/strolch/model/json/StrolchElementToJsonVisitor.java
+++ b/li.strolch.model/src/main/java/li/strolch/model/json/StrolchElementToJsonVisitor.java
@@ -55,6 +55,7 @@ public class StrolchElementToJsonVisitor implements StrolchElementVisitor<JsonEl
 	private boolean withoutPolicies;
 	private boolean withoutStateVariables;
 	private boolean withoutValueChanges;
+	private boolean withListParametersAsArray;
 	private int activityDepth = Integer.MAX_VALUE;
 
 	public StrolchElementToJsonVisitor() {
@@ -101,6 +102,10 @@ public class StrolchElementToJsonVisitor implements StrolchElementVisitor<JsonEl
 		return this.withoutValueChanges;
 	}
 
+	public boolean isWithListParametersAsArray() {
+		return this.withListParametersAsArray;
+	}
+
 	public StrolchElementToJsonVisitor withLocator() {
 		this.withLocator = true;
 		return this;
@@ -156,6 +161,11 @@ public class StrolchElementToJsonVisitor implements StrolchElementVisitor<JsonEl
 		return this;
 	}
 
+	public StrolchElementToJsonVisitor withListParametersAsArray() {
+		this.withListParametersAsArray = true;
+		return this;
+	}
+
 	public StrolchElementToJsonVisitor activityDepth(int depth) {
 		this.activityDepth = depth;
 		return this;
@@ -641,6 +651,19 @@ public class StrolchElementToJsonVisitor implements StrolchElementVisitor<JsonEl
 				rootJ.addProperty(paramId, (Boolean) param.getValue());
 			} else if (type.isNumber()) {
 				rootJ.addProperty(paramId, (Number) param.getValue());
+			} else if (this.withListParametersAsArray && type.isList()) {
+				JsonArray valuesJ = switch (type) {
+					case FLOAT_LIST -> ((FloatListParameter) param).streamValues()
+							.collect(JsonArray::new, JsonArray::add, JsonArray::addAll);
+					case INTEGER_LIST -> ((IntegerListParameter) param).streamValues()
+							.collect(JsonArray::new, JsonArray::add, JsonArray::addAll);
+					case STRING_LIST -> ((StringListParameter) param).streamValues()
+							.collect(JsonArray::new, JsonArray::add, JsonArray::addAll);
+					case LONG_LIST -> ((LongListParameter) param).streamValues()
+							.collect(JsonArray::new, JsonArray::add, JsonArray::addAll);
+					default -> throw new IllegalStateException("Unhandle list type " + type);
+				};
+				rootJ.add(paramId, valuesJ);
 			} else {
 				rootJ.addProperty(paramId, param.getValueAsString());
 			}
diff --git a/li.strolch.model/src/main/java/li/strolch/model/json/StrolchRootElementToJsonVisitor.java b/li.strolch.model/src/main/java/li/strolch/model/json/StrolchRootElementToJsonVisitor.java
index 321b2fa3c..b936c3500 100644
--- a/li.strolch.model/src/main/java/li/strolch/model/json/StrolchRootElementToJsonVisitor.java
+++ b/li.strolch.model/src/main/java/li/strolch/model/json/StrolchRootElementToJsonVisitor.java
@@ -104,6 +104,11 @@ public class StrolchRootElementToJsonVisitor implements StrolchRootElementVisito
 		return this;
 	}
 
+	public StrolchRootElementToJsonVisitor withListParametersAsArray() {
+		this.visitor.withListParametersAsArray();
+		return this;
+	}
+
 	public StrolchRootElementToJsonVisitor withPolicies() {
 		this.visitor.withPolicies();
 		return this;