GH-4923 Spaces inserted by PropertyPathBuilder cause problems with Al…

…legroGraph (#4928)
eclipse-rdf4j · Mar 14, 2024 · 5c0a1b3 · 5c0a1b3
2 parents 7e6e284 + 0722900
commit 5c0a1b3
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 15 deletions.
diff --git a/...er/src/main/java/org/eclipse/rdf4j/sparqlbuilder/constraint/propertypath/InversePath.java b/...er/src/main/java/org/eclipse/rdf4j/sparqlbuilder/constraint/propertypath/InversePath.java
@@ -22,7 +22,8 @@ public InversePath(PropertyPath path) {
 		this.path = path;
 	}
 
+	@Override
 	public String getQueryString() {
-		return "^ " + path.getQueryString();
+		return "^" + path.getQueryString();
 	}
 }
diff --git a/...in/java/org/eclipse/rdf4j/sparqlbuilder/constraint/propertypath/InversePredicatePath.java b/...in/java/org/eclipse/rdf4j/sparqlbuilder/constraint/propertypath/InversePredicatePath.java
@@ -33,6 +33,6 @@ public InversePredicatePath(IRI predicate) {
 
 	@Override
 	public String getQueryString() {
-		return "^ " + predicate.getQueryString();
+		return "^" + predicate.getQueryString();
 	}
 }
diff --git a/...main/java/org/eclipse/rdf4j/sparqlbuilder/constraint/propertypath/NegatedPropertySet.java b/...main/java/org/eclipse/rdf4j/sparqlbuilder/constraint/propertypath/NegatedPropertySet.java
@@ -30,12 +30,12 @@ public NegatedPropertySet(PredicatePathOrInversePredicatePath... properties) {
 	@Override
 	public String getQueryString() {
 		if (properties.length == 1) {
-			return "! " + properties[0].getQueryString();
+			return "!" + properties[0].getQueryString();
 		} else {
 			return Arrays
 					.stream(properties)
 					.map(QueryElement::getQueryString)
-					.collect(Collectors.joining(" | ", "! ( ", " )"));
+					.collect(Collectors.joining(" | ", "!( ", " )"));
 		}
 	}
 }
diff --git a/.../src/main/java/org/eclipse/rdf4j/sparqlbuilder/constraint/propertypath/OneOrMorePath.java b/.../src/main/java/org/eclipse/rdf4j/sparqlbuilder/constraint/propertypath/OneOrMorePath.java
@@ -24,6 +24,6 @@ public OneOrMorePath(PropertyPath path) {
 
 	@Override
 	public String getQueryString() {
-		return path.getQueryString() + " +";
+		return path.getQueryString() + "+";
 	}
 }
diff --git a/...src/main/java/org/eclipse/rdf4j/sparqlbuilder/constraint/propertypath/ZeroOrMorePath.java b/...src/main/java/org/eclipse/rdf4j/sparqlbuilder/constraint/propertypath/ZeroOrMorePath.java
@@ -24,6 +24,6 @@ public ZeroOrMorePath(PropertyPath path) {
 
 	@Override
 	public String getQueryString() {
-		return path.getQueryString() + " *";
+		return path.getQueryString() + "*";
 	}
 }
diff --git a/.../src/main/java/org/eclipse/rdf4j/sparqlbuilder/constraint/propertypath/ZeroOrOnePath.java b/.../src/main/java/org/eclipse/rdf4j/sparqlbuilder/constraint/propertypath/ZeroOrOnePath.java
@@ -24,6 +24,6 @@ public ZeroOrOnePath(PropertyPath path) {
 
 	@Override
 	public String getQueryString() {
-		return path.getQueryString() + " ?";
+		return path.getQueryString() + "?";
 	}
 }
diff --git a/...ava/org/eclipse/rdf4j/sparqlbuilder/constraint/propertypath/builder/PropertyPathTest.java b/...ava/org/eclipse/rdf4j/sparqlbuilder/constraint/propertypath/builder/PropertyPathTest.java
@@ -122,7 +122,7 @@ public void testInversePath() {
 				.path(iri(RDFS.COMMENT))
 				.inv()
 				.build();
-		assertEquals("^ ( <" + RDFS.COMMENT + "> )", p.getQueryString());
+		assertEquals("^( <" + RDFS.COMMENT + "> )", p.getQueryString());
 	}
 
 	@Test
@@ -131,7 +131,7 @@ public void testOneOrMorePath() {
 				.path(iri(RDFS.COMMENT))
 				.oneOrMore()
 				.build();
-		assertEquals("<" + RDFS.COMMENT + "> +", p.getQueryString());
+		assertEquals("<" + RDFS.COMMENT + ">+", p.getQueryString());
 	}
 
 	@Test
@@ -140,7 +140,7 @@ public void testZeroOrMorePath() {
 				.path(iri(RDFS.COMMENT))
 				.zeroOrMore()
 				.build();
-		assertEquals("<" + RDFS.COMMENT + "> *", p.getQueryString());
+		assertEquals("<" + RDFS.COMMENT + ">*", p.getQueryString());
 	}
 
 	@Test
@@ -149,7 +149,7 @@ public void testZeroOrOnePath() {
 				.path(iri(RDFS.COMMENT))
 				.zeroOrOne()
 				.build();
-		assertEquals("<" + RDFS.COMMENT + "> ?", p.getQueryString());
+		assertEquals("<" + RDFS.COMMENT + ">?", p.getQueryString());
 	}
 
 	@Test
@@ -159,7 +159,7 @@ public void testNegatedPropertySetSingle() {
 				.negProp()
 				.pred(iri(RDFS.COMMENT))
 				.build();
-		assertEquals("! <" + RDFS.COMMENT + ">", p.getQueryString());
+		assertEquals("!<" + RDFS.COMMENT + ">", p.getQueryString());
 	}
 
 	@Test
@@ -169,7 +169,7 @@ public void testNegatedPropertySetSingleInverted() {
 				.negProp()
 				.invPred(iri(RDFS.COMMENT))
 				.build();
-		assertEquals("! ^ <" + RDFS.COMMENT + ">", p.getQueryString());
+		assertEquals("!^<" + RDFS.COMMENT + ">", p.getQueryString());
 	}
 
 	@Test
@@ -180,7 +180,7 @@ public void testNegatedPropertySetMultipleInverted() {
 				.invPred(iri(RDFS.COMMENT))
 				.invPred(iri(RDFS.LABEL))
 				.build();
-		assertEquals("! ( ^ <" + RDFS.COMMENT + "> | ^ <" + RDFS.LABEL + "> )", p.getQueryString());
+		assertEquals("!( ^<" + RDFS.COMMENT + "> | ^<" + RDFS.LABEL + "> )", p.getQueryString());
 	}
 
 	@Test
@@ -193,7 +193,7 @@ public void testNegatedPropertySetMultipleMixed() {
 				.invPred(iri(RDFS.SUBPROPERTYOF))
 				.pred(iri(RDFS.COMMENT))
 				.build();
-		assertEquals("! ( ^ <" + RDFS.SUBCLASSOF + "> | <" + RDFS.LABEL + "> | ^ <" + RDFS.SUBPROPERTYOF
+		assertEquals("!( ^<" + RDFS.SUBCLASSOF + "> | <" + RDFS.LABEL + "> | ^<" + RDFS.SUBPROPERTYOF
 				+ "> | <" + RDFS.COMMENT + "> )", p.getQueryString());
 	}