This is an automated email from the ASF dual-hosted git repository. andy pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/jena.git
commit 9128a0b358e38091b2f8d92ac253aef470542ab3 Author: Andy Seaborne <[email protected]> AuthorDate: Sun May 18 20:49:45 2025 +0100 Fix SPARQL namespace --- jena-arq/src/main/java/org/apache/jena/sparql/ARQConstants.java | 2 +- .../org/apache/jena/sparql/expr/urifunctions/SPARQLDispatch.java | 6 +++--- .../org/apache/jena/sparql/expr/urifunctions/SPARQLFuncOp.java | 7 ++++--- .../test/java/org/apache/jena/sparql/expr/TestFunctionsByURI.java | 8 ++++---- 4 files changed, 12 insertions(+), 11 deletions(-) diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/ARQConstants.java b/jena-arq/src/main/java/org/apache/jena/sparql/ARQConstants.java index 464c51223e..8c19d110b0 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/ARQConstants.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/ARQConstants.java @@ -54,7 +54,7 @@ public class ARQConstants public static final String rdfsPrefix = "http://www.w3.org/2000/01/rdf-schema#";; //RDFS.getURI() ; /** SPARQL namespace prefix */ - public static final String sparqlPrefix = "https://www.w3.org/ns/sparql#";; + public static final String sparqlPrefix = "http://www.w3.org/ns/sparql#";; /** OWL namespace prefix */ public static final String owlPrefix = "http://www.w3.org/2002/07/owl#";; //OWL.getURI() ; diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/expr/urifunctions/SPARQLDispatch.java b/jena-arq/src/main/java/org/apache/jena/sparql/expr/urifunctions/SPARQLDispatch.java index c1cc858c04..0f40f6287a 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/expr/urifunctions/SPARQLDispatch.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/expr/urifunctions/SPARQLDispatch.java @@ -160,9 +160,9 @@ public class SPARQLDispatch { register(map, "equals", SPARQLFuncOp::sparql_equals ); register(map, "not-equals", SPARQLFuncOp::sparql_not_equals ); register(map, "greaterThan", SPARQLFuncOp::sparql_greaterThan ); - register(map, "greaterThanOrEquals", SPARQLFuncOp::sparql_greaterThanOrEquals ); - register(map, "lessThat", SPARQLFuncOp::sparql_lessThat ); - register(map, "lessThanOrEquals", SPARQLFuncOp::sparql_lessThanOrEquals ); + register(map, "greaterThanOrEqual", SPARQLFuncOp::sparql_greaterThanOrEqual ); + register(map, "lessThan", SPARQLFuncOp::sparql_lessThat ); + register(map, "lessThanOrEqual", SPARQLFuncOp::sparql_lessThanOrEqual ); register(map, "and", SPARQLFuncOp::sparql_function_and ); register(map, "or", SPARQLFuncOp::sparql_function_or ); diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/expr/urifunctions/SPARQLFuncOp.java b/jena-arq/src/main/java/org/apache/jena/sparql/expr/urifunctions/SPARQLFuncOp.java index 24493cc72a..f04157ed8e 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/expr/urifunctions/SPARQLFuncOp.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/expr/urifunctions/SPARQLFuncOp.java @@ -23,6 +23,7 @@ import java.util.Map; import org.apache.jena.atlas.lib.*; import org.apache.jena.query.ARQ; +import org.apache.jena.sparql.ARQConstants; import org.apache.jena.sparql.expr.*; import org.apache.jena.sparql.expr.nodevalue.NodeFunctions; import org.apache.jena.sparql.expr.nodevalue.NodeValueDigest; @@ -45,7 +46,7 @@ import org.apache.jena.sparql.function.library.triple.TripleTermOps; */ public class SPARQLFuncOp { - public static final String NS = "https://www.w3.org/ns/sparql#";; + public static final String NS = ARQConstants.sparqlPrefix; // ---- Integration into ARQ function execution @@ -147,12 +148,12 @@ public class SPARQLFuncOp { return NodeValue.booleanReturn(r == Expr.CMP_LESS); } - public static NodeValue sparql_greaterThanOrEquals(NodeValue nv1, NodeValue nv2) { + public static NodeValue sparql_greaterThanOrEqual(NodeValue nv1, NodeValue nv2) { int r = NodeValue.compare(nv1, nv2); return NodeValue.booleanReturn(r == Expr.CMP_GREATER || r == Expr.CMP_EQUAL); } - public static NodeValue sparql_lessThanOrEquals(NodeValue nv1, NodeValue nv2) { + public static NodeValue sparql_lessThanOrEqual(NodeValue nv1, NodeValue nv2) { int r = NodeValue.compare(nv1, nv2); return NodeValue.booleanReturn(r == Expr.CMP_LESS || r == Expr.CMP_EQUAL); } diff --git a/jena-arq/src/test/java/org/apache/jena/sparql/expr/TestFunctionsByURI.java b/jena-arq/src/test/java/org/apache/jena/sparql/expr/TestFunctionsByURI.java index f9290ad091..6fec794d2f 100644 --- a/jena-arq/src/test/java/org/apache/jena/sparql/expr/TestFunctionsByURI.java +++ b/jena-arq/src/test/java/org/apache/jena/sparql/expr/TestFunctionsByURI.java @@ -32,8 +32,8 @@ import org.apache.jena.sparql.util.ExprUtils ; import org.apache.jena.sys.JenaSystem; /** - * Test that SPARQl functions can be called by their URI as given in the SPARQL 1.2 - * namespace <a href="https://www.w3.org/ns/sparql#";>https://www.w3.org/ns/sparql#</a>. + * Test that SPARQL functions can be called by their URI as given in the SPARQL 1.2 + * namespace <a href="https://www.w3.org/ns/sparql#";>http://www.w3.org/ns/sparql#</a>. */ public class TestFunctionsByURI { @@ -52,8 +52,8 @@ public class TestFunctionsByURI NodeValue.VerboseWarnings = warnOnBadLexicalForms; } - @Test public void sparql_function_uri_1() { test("sparql:unary-minus(123)", "-123") ; } - @Test public void sparql_function_uri_2() { test("sparql:subtract(12 ,sparql:multiply(5,2))", "2") ; } + @Test public void sparql_function_uri_1() { test("sparql:unary-minus(123)", "-123") ; } + @Test public void sparql_function_uri_2() { test("sparql:subtract(12, sparql:multiply(5,2))", "2") ; } @Test public void sparql_function_uri_3() { test("sparql:not(123)", "false") ; } // EBV - effective boolean value // --------
