From 93ff0f0d022ea09426eaa57b629dd2cf99f6c968 Mon Sep 17 00:00:00 2001
From: Robert von Burg <eitch@eitchnet.ch>
Date: Fri, 17 Jun 2022 15:33:32 +0200
Subject: [PATCH] [New] Added StrolchElementToJsonVisitor.withBagId()

---
 .../model/json/StrolchElementToJsonVisitor.java       | 11 ++++++++++-
 .../model/json/StrolchRootElementToJsonVisitor.java   |  5 +++++
 2 files changed, 15 insertions(+), 1 deletion(-)

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 66d76f987..a98c5a427 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
@@ -51,6 +51,7 @@ public class StrolchElementToJsonVisitor implements StrolchElementVisitor<JsonEl
 	private boolean withoutElementName;
 	private boolean withoutObjectType;
 	private boolean withLocator;
+	private boolean withBagId;
 	private boolean withoutVersion;
 	private boolean withoutPolicies;
 	private boolean withoutStateVariables;
@@ -106,6 +107,11 @@ public class StrolchElementToJsonVisitor implements StrolchElementVisitor<JsonEl
 		return this.withListParametersAsArray;
 	}
 
+	public StrolchElementToJsonVisitor withBagId() {
+		this.withBagId = true;
+		return this;
+	}
+
 	public StrolchElementToJsonVisitor withLocator() {
 		this.withLocator = true;
 		return this;
@@ -405,6 +411,8 @@ public class StrolchElementToJsonVisitor implements StrolchElementVisitor<JsonEl
 		if (isFlat() || isBagFlat(bag)) {
 
 			JsonObject bagJ = new JsonObject();
+			if (this.withBagId)
+				bagJ.addProperty(ID, bag.getId());
 
 			Set<String> ignoredParamIds = this.ignoredKeys.getSet(bag.getId());
 			addParameterBagFlat(bagJ, ignoredParamIds, bag);
@@ -678,7 +686,8 @@ public class StrolchElementToJsonVisitor implements StrolchElementVisitor<JsonEl
 		JsonObject paramsJ = new JsonObject();
 		bagJ.add(PARAMETERS, paramsJ);
 
-		bag.streamOfParameters().sorted(comparing(Parameter::getIndex))
+		bag.streamOfParameters()
+				.sorted(comparing(Parameter::getIndex))
 				.forEach(param -> paramsJ.add(param.getId(), paramToJsonFull(param)));
 
 		if (this.bagHook != null)
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 b936c3500..d9fa00cfc 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
@@ -54,6 +54,11 @@ public class StrolchRootElementToJsonVisitor implements StrolchRootElementVisito
 		return this::visitActivity;
 	}
 
+	public StrolchRootElementToJsonVisitor withBagId() {
+		this.visitor.withBagId();
+		return this;
+	}
+
 	public StrolchRootElementToJsonVisitor withLocator() {
 		this.visitor.withLocator();
 		return this;