(jena) branch main updated: Align naming to sparql-ns.ttl

[andy]

This is an automated email from the ASF dual-hosted git repository.

afs pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/jena.git


The following commit(s) were added to refs/heads/main by this push:
     new c3cfe7df7b Align naming to sparql-ns.ttl
c3cfe7df7b is described below

commit c3cfe7df7b51e7fdf23b865dbcad6af27f1eac34
Author: Andy Seaborne <a...@apache.org>
AuthorDate: Tue Jun 16 20:56:02 2026 +0100

    Align naming to sparql-ns.ttl
---
 .../org/apache/jena/sparql/expr/urifunctions/SPARQLDispatch.java  | 8 ++++----
 .../org/apache/jena/sparql/expr/urifunctions/SPARQLFuncOp.java    | 7 ++++---
 2 files changed, 8 insertions(+), 7 deletions(-)

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 08b5727acd..e888879955 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
@@ -178,10 +178,10 @@ 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, "greaterThanOrEqual", 
SPARQLFuncOp::sparql_greaterThanOrEqual );
-        register(map, "lessThan", SPARQLFuncOp::sparql_lessThan );
-        register(map, "lessThanOrEqual", SPARQLFuncOp::sparql_lessThanOrEqual 
);
+        register(map, "greater-than", SPARQLFuncOp::sparql_greaterThan );
+        register(map, "greater-than-or-equals", 
SPARQLFuncOp::sparql_greaterThanOrEqual );
+        register(map, "less-than", SPARQLFuncOp::sparql_lessThan );
+        register(map, "less-than-or-equal", 
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 c39d10b98c..c0a642193b 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
@@ -25,6 +25,7 @@ import java.util.List;
 import java.util.Map;
 
 import org.apache.jena.atlas.lib.*;
+import org.apache.jena.graph.NodeFactory;
 import org.apache.jena.query.ARQ;
 import org.apache.jena.sparql.ARQConstants;
 import org.apache.jena.sparql.expr.*;
@@ -229,7 +230,7 @@ public class SPARQLFuncOp {
     public static NodeValue sparql_isNumeric(NodeValue nv)  { return 
NodeFunctions.isNumeric(nv); }
     public static NodeValue sparql_str(NodeValue nv)        { return 
NodeFunctions.str(nv); }
 
-    public static NodeValue sparql_lang(NodeValue nv)       { return 
NodeFunctions.str(nv); }
+    public static NodeValue sparql_lang(NodeValue nv)       { return 
NodeFunctions.lang(nv); }
     public static NodeValue sparql_langdir(NodeValue nv)    { return 
NodeFunctions.langdir(nv); }
     public static NodeValue sparql_haslang(NodeValue nv)    { return 
NodeFunctions.hasLang(nv); }
     public static NodeValue sparql_haslangdir(NodeValue nv) { return 
NodeFunctions.hasLangDir(nv); }
@@ -245,7 +246,7 @@ public class SPARQLFuncOp {
     public static NodeValue arq_uri(NodeValue nv, NodeValue nvBase) { return 
NodeFunctions.iri(nv, nvBase.getString()); }
 
     // Only BNODE(), not BNODE(str)
-    public static NodeValue sparql_bnode() { return null; }
+    public static NodeValue sparql_bnode() { return 
NodeValue.makeNode(NodeFactory.createBlankNode()); }
 
     // Not a function - depends on "current row".
     //public static NodeValue sparql_bnode(NodeValue nv) { return null; }
@@ -328,7 +329,7 @@ public class SPARQLFuncOp {
     public static NodeValue sparql_object(NodeValue tripleTerm)                
     { return TripleTermOps.tripleObject(tripleTerm); }
     public static NodeValue sparql_isTriple(NodeValue nv)                      
     { return TripleTermOps.isTriple(nv); }
 
-    public static NodeValue sparql_md5(NodeValue nv)    { return 
NodeValueDigest.calculateDigest(nv, "MD-5"); }
+    public static NodeValue sparql_md5(NodeValue nv)    { return 
NodeValueDigest.calculateDigest(nv, "MD5"); }
     public static NodeValue sparql_sha1(NodeValue nv)   { return 
NodeValueDigest.calculateDigest(nv, "SHA-1"); }
     public static NodeValue sparql_sha224(NodeValue nv) { return 
NodeValueDigest.calculateDigest(nv, "SHA-224"); }
     public static NodeValue sparql_sha256(NodeValue nv) { return 
NodeValueDigest.calculateDigest(nv, "SHA-256"); }