- Percent encoding of local names of the property URIs

0.0.7 release

Author: luigi-asprino

pom.xml

@@ -5,7 +5,7 @@
 
 	<groupId>com.github.spice-h2020</groupId>
 	<artifactId>json2rdf</artifactId>
-	<version>0.0.6-SNAPSHOT</version>
+	<version>0.0.7</version>
 	<packaging>jar</packaging>
 
 	<name>json2rdf</name>
@@ -163,6 +163,12 @@
 			<artifactId>slf4j-jdk14</artifactId>
 			<version>1.7.7</version>
 		</dependency>
+		
+		<dependency>
+			<groupId>com.google.guava</groupId>
+			<artifactId>guava</artifactId>
+			<version>30.1-jre</version>
+		</dependency>
 
 		<dependency>
 			<groupId>com.jsoniter</groupId>

src/main/java/com/github/spiceh2020/json2rdf/transformers/JSONTransformer.java

@@ -80,7 +80,7 @@ private void getModel(JSONObject object, Resource r, Model m) {
 //		m.add(r, RDF.type, RDFS.Resource);
 		object.keys().forEachRemaining(k -> {
 			Object o = object.get(k);
-			Property p = m.createProperty(propertyPrefix + k);
+			Property p = m.createProperty(propertyPrefix + Utils.toSafeURIString(k));
 //			m.add(p, RDFS.label, m.createTypedLiteral(k));
 			if (o instanceof String || o instanceof Boolean || o instanceof Integer) {
 				transformPrimites(m, r, p, o);

src/main/java/com/github/spiceh2020/json2rdf/transformers/Utils.java

@@ -0,0 +1,13 @@
+package com.github.spiceh2020.json2rdf.transformers;
+
+import com.google.common.escape.UnicodeEscaper;
+import com.google.common.net.PercentEscaper;
+
+public class Utils {
+	static UnicodeEscaper basicEscaper = new PercentEscaper("%", false);
+
+	public static String toSafeURIString(String s) {
+		return basicEscaper.escape(s);
+	}
+
+}

src/test/java/com/github/spiceh2020/json2rdf/test/JSON2RDFTransformerTest.java

@@ -45,7 +45,6 @@ public void testEmptyAndNull() {
 		}
 		{
 			JSONTransformer_JSONIter jt = new JSONTransformer_JSONIter(ontologyPrefix);
-			
 
 			assertEquals(jt.transformJSON("{}").size(), 0L);
 			assertEquals(jt.transformJSON("[]").size(), 0L);
@@ -103,15 +102,13 @@ public void testPrimitive() {
 				mn.add(rn, mn.createProperty(ontologyPrefix + "string"), mn.createTypedLiteral("string"));
 				mn.add(rn, mn.createProperty(ontologyPrefix + "bool"), mn.createTypedLiteral(true));
 				mn.add(rn, mn.createProperty(ontologyPrefix + "boolf"), mn.createTypedLiteral(false));
-				
+
 //				mn.add(mn.createProperty(ontologyPrefix + "a"), RDFS.label, mn.createTypedLiteral("a"));
 //				mn.add(mn.createProperty(ontologyPrefix + "string"), RDFS.label, mn.createTypedLiteral("string"));
 //				mn.add(mn.createProperty(ontologyPrefix + "bool"), RDFS.label, mn.createTypedLiteral("bool"));
 //				mn.add(mn.createProperty(ontologyPrefix + "boolf"), RDFS.label, mn.createTypedLiteral("boolf"));
 //				mn.add(mn.createProperty(ontologyPrefix + "n"), RDFS.label, mn.createTypedLiteral("n"));
-				
-				
-				
+
 				assertTrue(mn.isIsomorphicWith(jtN.transformJSON(primitive1)));
 			}
 		}
@@ -127,15 +124,14 @@ public void testPrimitive() {
 				m.add(r, m.createProperty(ontologyPrefix + "string"), m.createTypedLiteral("string"));
 				m.add(r, m.createProperty(ontologyPrefix + "bool"), m.createTypedLiteral(true));
 				m.add(r, m.createProperty(ontologyPrefix + "boolf"), m.createTypedLiteral(false));
-				
+
 //				m.add(r, RDF.type, RDFS.Resource);
 //				m.add(m.createProperty(ontologyPrefix + "a"), RDFS.label, m.createTypedLiteral("a"));
 //				m.add(m.createProperty(ontologyPrefix + "string"), RDFS.label, m.createTypedLiteral("string"));
 //				m.add(m.createProperty(ontologyPrefix + "bool"), RDFS.label, m.createTypedLiteral("bool"));
 //				m.add(m.createProperty(ontologyPrefix + "boolf"), RDFS.label, m.createTypedLiteral("boolf"));
 //				m.add(m.createProperty(ontologyPrefix + "n"), RDFS.label, m.createTypedLiteral("n"));
-				
-				
+
 				assertTrue(m.isIsomorphicWith(jt.transformJSON(primitive1)));
 			}
 
@@ -151,14 +147,13 @@ public void testPrimitive() {
 				mn.add(rn, mn.createProperty(ontologyPrefix + "string"), mn.createTypedLiteral("string"));
 				mn.add(rn, mn.createProperty(ontologyPrefix + "bool"), mn.createTypedLiteral(true));
 				mn.add(rn, mn.createProperty(ontologyPrefix + "boolf"), mn.createTypedLiteral(false));
-				
+
 //				mn.add(mn.createProperty(ontologyPrefix + "a"), RDFS.label, mn.createTypedLiteral("a"));
 //				mn.add(mn.createProperty(ontologyPrefix + "string"), RDFS.label, mn.createTypedLiteral("string"));
 //				mn.add(mn.createProperty(ontologyPrefix + "bool"), RDFS.label, mn.createTypedLiteral("bool"));
 //				mn.add(mn.createProperty(ontologyPrefix + "boolf"), RDFS.label, mn.createTypedLiteral("boolf"));
 //				mn.add(mn.createProperty(ontologyPrefix + "n"), RDFS.label, mn.createTypedLiteral("n"));
-				
-				
+
 				assertTrue(mn.isIsomorphicWith(jtN.transformJSON(primitive1)));
 			}
 		}
@@ -282,4 +277,17 @@ public void testDuplicateKeyJSON() {
 		}
 	}
 
+	@Test
+	public void testWhiteSpace() {
+		String test = "{\"a b\":{\"a c\":\"c\"}}";
+		JSONTransformer jt = new JSONTransformer(ontologyPrefix);
+
+		Model m = ModelFactory.createDefaultModel();
+		Resource r = m.createResource(), r1 = m.createResource();
+		m.add(r, m.createProperty(ontologyPrefix + "a%20b"), r1);
+		m.add(r1, m.createProperty(ontologyPrefix + "a%20c"), m.createTypedLiteral("c"));
+		
+		assertTrue(m.isIsomorphicWith(jt.transformJSON(test)));
+	}
+
 }