From 15e8b8512620d3e68f6f79fbf47781664f6609da Mon Sep 17 00:00:00 2001
From: Robert von Burg <eitch@eitchnet.ch>
Date: Thu, 24 Feb 2022 15:29:53 +0100
Subject: [PATCH] [New] Added StrolchElementToJsonVisitor.withoutObjectType()

---
 .../json/StrolchElementToJsonVisitor.java      | 18 ++++++++++++++----
 .../json/StrolchRootElementToJsonVisitor.java  |  5 +++++
 2 files changed, 19 insertions(+), 4 deletions(-)

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 68b4f3e75..0eff21ace 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
@@ -49,6 +49,7 @@ public class StrolchElementToJsonVisitor implements StrolchElementVisitor<JsonEl
 	private Set<String> flatBags;
 	private Set<String> flatBagsByType;
 	private boolean withoutElementName;
+	private boolean withoutObjectType;
 	private boolean withLocator;
 	private boolean withoutVersion;
 	private boolean withoutPolicies;
@@ -120,6 +121,11 @@ public class StrolchElementToJsonVisitor implements StrolchElementVisitor<JsonEl
 		return this;
 	}
 
+	public StrolchElementToJsonVisitor withoutObjectType() {
+		this.withoutObjectType = true;
+		return this;
+	}
+
 	public StrolchElementToJsonVisitor withElementName() {
 		this.withoutElementName = false;
 		return this;
@@ -398,7 +404,8 @@ public class StrolchElementToJsonVisitor implements StrolchElementVisitor<JsonEl
 	protected JsonObject toJson(Resource element) {
 
 		JsonObject rootJ = new JsonObject();
-		rootJ.addProperty(OBJECT_TYPE, RESOURCE);
+		if (!this.withoutObjectType)
+			rootJ.addProperty(OBJECT_TYPE, RESOURCE);
 
 		toJson(element, rootJ);
 
@@ -416,7 +423,8 @@ public class StrolchElementToJsonVisitor implements StrolchElementVisitor<JsonEl
 	protected JsonObject toJson(Order element) {
 
 		JsonObject rootJ = new JsonObject();
-		rootJ.addProperty(OBJECT_TYPE, ORDER);
+		if (!this.withoutObjectType)
+			rootJ.addProperty(OBJECT_TYPE, ORDER);
 
 		toJson(element, rootJ);
 		rootJ.addProperty(DATE, formatDate(element.getDate()));
@@ -444,7 +452,8 @@ public class StrolchElementToJsonVisitor implements StrolchElementVisitor<JsonEl
 
 	protected JsonObject toJson(Activity element, JsonObject rootJ, int currentDepth) {
 
-		rootJ.addProperty(OBJECT_TYPE, ACTIVITY);
+		if (!this.withoutObjectType)
+			rootJ.addProperty(OBJECT_TYPE, ACTIVITY);
 
 		toJson((AbstractStrolchElement) element, rootJ);
 		rootJ.addProperty(TIME_ORDERING, element.getTimeOrdering().getName());
@@ -490,7 +499,8 @@ public class StrolchElementToJsonVisitor implements StrolchElementVisitor<JsonEl
 
 	protected JsonObject toJson(Action element, JsonObject rootJ) {
 
-		rootJ.addProperty(OBJECT_TYPE, ACTION);
+		if (!this.withoutObjectType)
+			rootJ.addProperty(OBJECT_TYPE, ACTION);
 
 		// attributes
 		toJson((AbstractStrolchElement) element, rootJ);
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 e161819b9..321b2fa3c 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
@@ -74,6 +74,11 @@ public class StrolchRootElementToJsonVisitor implements StrolchRootElementVisito
 		return this;
 	}
 
+	public StrolchRootElementToJsonVisitor withoutObjectType() {
+		this.visitor.withoutObjectType();
+		return this;
+	}
+
 	public StrolchRootElementToJsonVisitor withElementName() {
 		this.visitor.withElementName();
 		return this;