diff --git a/li.strolch.model/src/main/java/li/strolch/model/json/ActivityToFlatJsonVisitor.java b/li.strolch.model/src/main/java/li/strolch/model/json/ActivityToFlatJsonVisitor.java index c0f91d2f0..3caa42fa7 100644 --- a/li.strolch.model/src/main/java/li/strolch/model/json/ActivityToFlatJsonVisitor.java +++ b/li.strolch.model/src/main/java/li/strolch/model/json/ActivityToFlatJsonVisitor.java @@ -9,6 +9,14 @@ import li.strolch.model.visitor.ActivityVisitor; public class ActivityToFlatJsonVisitor extends ToFlatJsonVisitor implements ActivityVisitor { + public ActivityToFlatJsonVisitor() { + super(); + } + + public ActivityToFlatJsonVisitor(boolean withVersion) { + super(withVersion); + } + @Override public JsonObject visit(Activity element) { return toJson(element); diff --git a/li.strolch.model/src/main/java/li/strolch/model/json/OrderToFlatJsonVisitor.java b/li.strolch.model/src/main/java/li/strolch/model/json/OrderToFlatJsonVisitor.java index 323dde106..4ec57c14a 100644 --- a/li.strolch.model/src/main/java/li/strolch/model/json/OrderToFlatJsonVisitor.java +++ b/li.strolch.model/src/main/java/li/strolch/model/json/OrderToFlatJsonVisitor.java @@ -9,6 +9,14 @@ import li.strolch.model.visitor.OrderVisitor; public class OrderToFlatJsonVisitor extends ToFlatJsonVisitor implements OrderVisitor { + public OrderToFlatJsonVisitor() { + super(); + } + + public OrderToFlatJsonVisitor(boolean withVersion) { + super(withVersion); + } + @Override public JsonObject visit(Order element) { return toJson(element); diff --git a/li.strolch.model/src/main/java/li/strolch/model/json/ResourceToFlatJsonVisitor.java b/li.strolch.model/src/main/java/li/strolch/model/json/ResourceToFlatJsonVisitor.java index bb693e615..711f989d1 100644 --- a/li.strolch.model/src/main/java/li/strolch/model/json/ResourceToFlatJsonVisitor.java +++ b/li.strolch.model/src/main/java/li/strolch/model/json/ResourceToFlatJsonVisitor.java @@ -9,6 +9,14 @@ import li.strolch.model.visitor.ResourceVisitor; public class ResourceToFlatJsonVisitor extends ToFlatJsonVisitor implements ResourceVisitor { + public ResourceToFlatJsonVisitor() { + super(); + } + + public ResourceToFlatJsonVisitor(boolean withVersion) { + super(withVersion); + } + @Override public JsonObject visit(Resource element) { return toJson(element); 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 a7b172522..edacaddd2 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 @@ -168,14 +168,6 @@ public class StrolchElementToJsonVisitor implements StrolchRootElementVisitor { private MapOfSets ignoredKeys; private BiConsumer hook; private boolean withoutElementName; + private boolean withVersion; public ToFlatJsonVisitor() { - this.ignoredKeys = new MapOfSets<>(); + this(false); } - public ToFlatJsonVisitor(MapOfSets ignoredParams) { + public ToFlatJsonVisitor(boolean withVersion) { + this.withVersion = withVersion; this.ignoredKeys = new MapOfSets<>(); } @@ -120,9 +123,12 @@ public class ToFlatJsonVisitor { } } - if (hook != null) + if (this.hook != null) this.hook.accept(element, jsonObject); + if (this.withVersion) + addVersion(element, jsonObject); + return jsonObject; } }