Merge main (#4932)

Author: hmottestad

core/sparqlbuilder/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();
 	}
 }

core/sparqlbuilder/src/main/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();
 	}
 }

core/sparqlbuilder/src/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(" | ", "!( ", " )"));
 		}
 	}
 }

core/sparqlbuilder/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() + "+";
 	}
 }

core/sparqlbuilder/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() + "*";
 	}
 }

core/sparqlbuilder/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() + "?";
 	}
 }

core/sparqlbuilder/src/test/java/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());
 	}
 

site/content/download.md

@@ -5,15 +5,15 @@ toc: true
 
 You can either retrieve RDF4J via Apache Maven, or download the SDK or onejar directly.
 
-## RDF4J 4.3.9 (latest)
+## RDF4J 4.3.10 (latest)
 
-RDF4J 4.3.9 is our latest stable release. It requires Java 11 minimally.
-For details on what’s new and how to upgrade, see the [release and upgrade notes](/release-notes/4.3.9).
+RDF4J 4.3.10 is our latest stable release. It requires Java 11 minimally.
+For details on what’s new and how to upgrade, see the [release and upgrade notes](/release-notes/4.3.10).
 
-- [RDF4J 4.3.9 SDK (zip)](http://www.eclipse.org/downloads/download.php?file=/rdf4j/eclipse-rdf4j-4.3.9-sdk.zip)<br/>
+- [RDF4J 4.3.10 SDK (zip)](http://www.eclipse.org/downloads/download.php?file=/rdf4j/eclipse-rdf4j-4.3.10-sdk.zip)<br/>
   Full Eclipse RDF4J SDK, containing all libraries, RDF4J Server, Workbench, and Console applications, and Javadoc API.
 
-- [RDF4J 4.3.9 onejar](http://www.eclipse.org/downloads/download.php?file=/rdf4j/eclipse-rdf4j-4.3.9-onejar.jar)<br/>
+- [RDF4J 4.3.10 onejar](http://www.eclipse.org/downloads/download.php?file=/rdf4j/eclipse-rdf4j-4.3.10-onejar.jar)<br/>
   Single jar file for easy inclusion of the full RDF4J toolkit in your Java project.
 
 - [RDF4J artifacts](https://search.maven.org/search?q=org.eclipse.rdf4j) on the [Maven Central Repository](http://search.maven.org/)
@@ -28,7 +28,7 @@ You can include RDF4J as a Maven dependency in your Java project by including th
         <dependency>
             <groupId>org.eclipse.rdf4j</groupId>
             <artifactId>rdf4j-bom</artifactId>
-            <version>4.3.9</version>
+            <version>4.3.10</version>
             <type>pom</type>
             <scope>import</scope>
         </dependency>

site/content/news/rdf4j-4310.md

@@ -0,0 +1,14 @@
+---
+title: "RDF4J 4.3.10 released"
+date: 2024-03-06T12:04:16+0100
+layout: "single"
+categories: ["news"]
+---
+RDF4J 4.3.10 is now available. This is a patch release fixing 2 bugs.
+
+For more details, have a look at the [release notes](/release-notes/4.3.10).
+<!--more-->
+### Links
+
+- [Download RDF4J](/download/)
+- [release notes](/release-notes/4.3.10).

site/content/release-notes/4.3.10.md

@@ -0,0 +1,11 @@
+---
+title: "4.3.10"
+toc: true
+---
+RDF4J 4.3.10 is a patch release that fixes 2 issues.
+
+For a complete overview, see [all issues fixed in 4.3.10](https://github.com/eclipse/rdf4j/milestone/103?closed=1).
+
+### Acknowledgements
+
+This release was made possible by contributions from Frens Jan Rumph, Håvard M. Ottestad and Michael Vorburger.