From 20eec251378501efb42f078f2252b26b1a45b605 Mon Sep 17 00:00:00 2001
From: Robert von Burg <eitch@eitchnet.ch>
Date: Mon, 29 Oct 2018 16:36:22 +0100
Subject: [PATCH] [Fix] Fix version loading from PostgreSql with Json

---
 .../model/json/StrolchElementToJsonVisitor.java | 17 +++++++++++++----
 .../json/StrolchRootElementToJsonVisitor.java   |  5 +++++
 .../java/li/strolch/model/ModelToJsonTest.java  |  6 +++---
 .../li/strolch/rest/endpoint/Inspector.java     |  6 +++---
 4 files changed, 24 insertions(+), 10 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 cb250c33f..d6024d6e5 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
@@ -41,7 +41,7 @@ public class StrolchElementToJsonVisitor implements StrolchElementVisitor<JsonEl
 
 	private boolean flat;
 	private boolean withoutElementName;
-	private boolean withVersion;
+	private boolean withoutVersion;
 	private boolean withoutPolicies;
 	private int activityDepth = Integer.MAX_VALUE;
 
@@ -56,7 +56,11 @@ public class StrolchElementToJsonVisitor implements StrolchElementVisitor<JsonEl
 	}
 
 	public boolean isWithVersion() {
-		return this.withVersion;
+		return !this.withoutVersion;
+	}
+
+	public boolean isWithoutVersion() {
+		return this.withoutVersion;
 	}
 
 	public boolean isWithoutElementName() {
@@ -68,7 +72,12 @@ public class StrolchElementToJsonVisitor implements StrolchElementVisitor<JsonEl
 	}
 
 	public StrolchElementToJsonVisitor withVersion() {
-		this.withVersion = true;
+		this.withoutVersion = false;
+		return this;
+	}
+
+	public StrolchElementToJsonVisitor withoutVersion() {
+		this.withoutVersion = true;
 		return this;
 	}
 
@@ -645,7 +654,7 @@ public class StrolchElementToJsonVisitor implements StrolchElementVisitor<JsonEl
 	protected void addVersion(StrolchRootElement element, JsonObject rootJ) {
 		if (!element.hasVersion())
 			return;
-		if (!isWithVersion())
+		if (isWithoutVersion())
 			return;
 
 		Version version = element.getVersion();
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 d6588de5e..338bd102f 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
@@ -53,6 +53,11 @@ public class StrolchRootElementToJsonVisitor implements StrolchRootElementVisito
 		return this;
 	}
 
+	public StrolchRootElementToJsonVisitor withoutVersion() {
+		this.visitor.withoutVersion();
+		return this;
+	}
+
 	public StrolchRootElementToJsonVisitor withoutElementName() {
 		this.visitor.withoutElementName();
 		return this;
diff --git a/li.strolch.model/src/test/java/li/strolch/model/ModelToJsonTest.java b/li.strolch.model/src/test/java/li/strolch/model/ModelToJsonTest.java
index 714264fa7..e3ddedd4b 100644
--- a/li.strolch.model/src/test/java/li/strolch/model/ModelToJsonTest.java
+++ b/li.strolch.model/src/test/java/li/strolch/model/ModelToJsonTest.java
@@ -32,7 +32,7 @@ public class ModelToJsonTest extends ModelMarshallingTest {
 
 	@Override
 	protected Order formatAndParseOrder(Order order) {
-		StrolchRootElementToJsonVisitor jsonVisitor = new StrolchRootElementToJsonVisitor().withVersion();
+		StrolchRootElementToJsonVisitor jsonVisitor = new StrolchRootElementToJsonVisitor();
 		JsonObject jsonObject = order.accept(jsonVisitor).getAsJsonObject();
 
 		Order parsedOrder = new OrderFromJsonVisitor().visit(jsonObject);
@@ -47,7 +47,7 @@ public class ModelToJsonTest extends ModelMarshallingTest {
 	@Override
 	protected Resource formatAndParseResource(Resource resource) {
 
-		StrolchRootElementToJsonVisitor jsonVisitor = new StrolchRootElementToJsonVisitor().withVersion();
+		StrolchRootElementToJsonVisitor jsonVisitor = new StrolchRootElementToJsonVisitor();
 		JsonObject jsonObject = resource.accept(jsonVisitor).getAsJsonObject();
 
 		Resource parsedResource = new ResourceFromJsonVisitor().visit(jsonObject);
@@ -62,7 +62,7 @@ public class ModelToJsonTest extends ModelMarshallingTest {
 	@Override
 	protected Activity formatAndParseActivity(Activity activity) {
 
-		StrolchRootElementToJsonVisitor jsonVisitor = new StrolchRootElementToJsonVisitor().withVersion();
+		StrolchRootElementToJsonVisitor jsonVisitor = new StrolchRootElementToJsonVisitor();
 		JsonObject jsonObject = activity.accept(jsonVisitor).getAsJsonObject();
 
 		Activity parsedActivity = new ActivityFromJsonVisitor().visit(jsonObject);
diff --git a/li.strolch.rest/src/main/java/li/strolch/rest/endpoint/Inspector.java b/li.strolch.rest/src/main/java/li/strolch/rest/endpoint/Inspector.java
index 921810da7..4a0c465ad 100644
--- a/li.strolch.rest/src/main/java/li/strolch/rest/endpoint/Inspector.java
+++ b/li.strolch.rest/src/main/java/li/strolch/rest/endpoint/Inspector.java
@@ -415,7 +415,7 @@ public class Inspector {
 		// build JSON response
 		ResourceVisitor<JsonObject> visitor;
 		if (overview == null || !overview) {
-			visitor = new StrolchRootElementToJsonVisitor().withVersion().asResourceVisitor();
+			visitor = new StrolchRootElementToJsonVisitor().asResourceVisitor();
 		} else {
 			visitor = e -> {
 				JsonObject jsonObject = new JsonObject();
@@ -459,7 +459,7 @@ public class Inspector {
 		// build JSON response
 		OrderVisitor<JsonObject> visitor;
 		if (overview == null || !overview) {
-			visitor = new StrolchRootElementToJsonVisitor().withVersion().asOrderVisitor();
+			visitor = new StrolchRootElementToJsonVisitor().asOrderVisitor();
 		} else {
 			visitor = e -> {
 				JsonObject jsonObject = new JsonObject();
@@ -505,7 +505,7 @@ public class Inspector {
 		// build JSON response
 		ActivityVisitor<JsonObject> visitor;
 		if (overview == null || !overview) {
-			visitor = new StrolchRootElementToJsonVisitor().withVersion().asActivityVisitor();
+			visitor = new StrolchRootElementToJsonVisitor().asActivityVisitor();
 		} else {
 			visitor = e -> {
 				JsonObject jsonObject = new JsonObject();