0.4.1 - Fix error in JSON serializer for RDF content, literal values …

…properly serialized.
basilapi · Sep 27, 2018 · afcc7f6 · afcc7f6
1 parent f5dea60
commit afcc7f6
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 9 deletions.
diff --git a/basil/pom.xml b/basil/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>basil</groupId>
 		<artifactId>parent</artifactId>
-		<version>0.4.0</version>
+		<version>0.4.1</version>
 		<relativePath>../parent</relativePath>
 	</parent>
 	<artifactId>basil</artifactId>

diff --git a/it/pom.xml b/it/pom.xml
@@ -13,7 +13,7 @@
 	<parent>
 		<groupId>basil</groupId>
 		<artifactId>parent</artifactId>
-		<version>0.4.0</version>
+		<version>0.4.1</version>
 		<relativePath>../parent</relativePath>
 	</parent>
 

diff --git a/parent/pom.xml b/parent/pom.xml
@@ -6,7 +6,7 @@
 
 	<groupId>basil</groupId>
 	<artifactId>parent</artifactId>
-	<version>0.4.0</version>
+	<version>0.4.1</version>
 	<packaging>pom</packaging>
 
 	<name>BASIL :: Parent</name>
@@ -24,7 +24,7 @@
 		<org.eclipse.jetty.version>9.3.0.v20150612</org.eclipse.jetty.version>
 
 		<!-- basil version -->
-		<basil.version>0.4.0</basil.version>
+		<basil.version>0.4.1</basil.version>
 
 		<!-- github server corresponds to entry in ~/.m2/settings.xml -->
 		<github.global.server>github</github.global.server>

diff --git a/pom.xml b/pom.xml
@@ -8,7 +8,7 @@
 	<parent>
 		<groupId>basil</groupId>
 		<artifactId>parent</artifactId>
-		<version>0.4.0</version>
+		<version>0.4.1</version>
 		<relativePath>parent</relativePath>
 	</parent>
 	<name>BASIL :: Reactor</name>

diff --git a/rendering/pom.xml b/rendering/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>basil</groupId>
 		<artifactId>parent</artifactId>
-		<version>0.4.0</version>
+		<version>0.4.1</version>
 		<relativePath>../parent</relativePath>
 	</parent>
 	<artifactId>rendering</artifactId>

diff --git a/rendering/src/main/java/uk/ac/open/kmi/basil/rendering/ModelRenderer.java b/rendering/src/main/java/uk/ac/open/kmi/basil/rendering/ModelRenderer.java
@@ -159,7 +159,14 @@ public String render(MediaType type, String graphName, Map<String, String> pref)
 					}
 				}
 				p.append(">");
-				p.append(n.toString());
+				if (n.isBlank()) {
+					p.append(n.getBlankNodeLabel());
+				} else if (n.isURI()) {
+					p.append(n.getURI());
+				} else {
+					// Literal
+					p.append(n.getLiteralLexicalForm());
+				}
 				p.append("</");
 				p.append(v);
 				p.append(">");
@@ -195,7 +202,18 @@ public String render(MediaType type, String graphName, Map<String, String> pref)
 				JsonObject item = new JsonObject();
 				item.add("subject", new JsonPrimitive(t.getSubject().toString()));
 				item.add("predicate", new JsonPrimitive(t.getPredicate().toString()));
-				item.add("object", new JsonPrimitive(t.getObject().toString()));
+
+				String ostring;
+				if (t.getObject().isBlank()) {
+					ostring = t.getObject().getBlankNodeLabel();
+				} else if (t.getObject().isURI()) {
+					ostring = t.getObject().getURI();
+				} else {
+					// Literal
+					ostring = t.getObject().getLiteralLexicalForm();
+				}
+				item.add("object", new JsonPrimitive(ostring));
+
 				item.add("subject_type", new JsonPrimitive(t.getSubject().isBlank() ? "bnode" : "uri"));
 				item.add("object_type", new JsonPrimitive(
 						t.getObject().isBlank() ? "bnode" : (t.getObject().isLiteral() ? "literal" : "uri")));

diff --git a/server/pom.xml b/server/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>basil</groupId>
 		<artifactId>parent</artifactId>
-		<version>0.4.0</version>
+		<version>0.4.1</version>
 		<relativePath>../parent</relativePath>
 	</parent>
 	<artifactId>basil-server</artifactId>