You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by an...@apache.org on 2025/11/30 20:38:59 UTC

(jena) branch main updated (8c63c92617 -> fd4df838d5)

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

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


    from 8c63c92617 GH-3597 schemagen: Allow versionInfo to be URI.
     new b2b41fc90e Add QueryExecUtils.exec(query,graph)
     new 66b8b89132 Code tidy (datatypes/xsd)
     new 84d1ab62bf Clean-up SHACL SPARQL constraints
     new 190c726605 Comments in JenaXMLInput
     new 9d93b64fc6 Don't set volatile twice
     new 4a561c8b34 Code tidy
     new c13f675ffb Add upcoming media type parameters
     new 4ddc4afc93 Remove deprecated constructor (QueryExecDataset)
     new 64a8004385 Code tidy (SolverLibTDB)
     new b2e9781293 Query cancellation HTTP status code
     new 3a006c4a6b Add ExecutionContext.checkCancelSignal
     new b3611f945a Adjust to common license header
     new f855413f4c Clean up of HTTP method name constants
     new 315588f411 Rename function sparql_plus as sparql_add
     new fd4df838d5 Add GraphFactory.empty()

The 15 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../java/org/apache/jena/riot/web/HttpNames.java   | 12 ++-
 .../jena/sparql/engine/ExecutionContext.java       |  7 ++
 .../jena/sparql/engine/QueryEngineFactory.java     |  2 +-
 .../engine/iterator/QueryIterPlainWrapper.java     |  2 +-
 .../sparql/engine/iterator/QueryIterProcedure.java | 92 ++++++++++------------
 .../apache/jena/sparql/exec/QueryExecDataset.java  | 11 +--
 .../sparql/expr/urifunctions/SPARQLDispatch.java   |  4 +-
 .../sparql/expr/urifunctions/SPARQLFuncOp.java     |  9 +++
 .../org/apache/jena/sparql/graph/GraphFactory.java | 11 ++-
 .../sparql/sse/builders/SSE_BuildException.java    | 11 +--
 .../java/org/apache/jena/sparql/util/Context.java  | 42 +++++-----
 .../apache/jena/sparql/util/QueryExecUtils.java    |  6 ++
 .../java/org/apache/jena/arq/junit/Scripts.java    |  4 +-
 .../jena/datatypes/xsd/AbstractDateTime.java       |  5 +-
 .../org/apache/jena/datatypes/xsd/XSDDatatype.java |  2 +-
 .../xsd/impl/XSDAbstractDateTimeType.java          |  1 -
 .../java/org/apache/jena/util/JenaXMLInput.java    | 35 +++++---
 .../examples/RDFConnectionExampleDBpedia01.java    | 18 +++++
 .../main/java/org/apache/jena/fuseki/Fuseki.java   |  5 ++
 .../apache/jena/fuseki/servlets/ActionExecLib.java |  3 +-
 .../jena/fuseki/servlets/ActionProcessor.java      |  3 +-
 .../apache/jena/fuseki/servlets/HttpAction.java    |  2 +-
 .../org/apache/jena/fuseki/servlets/Responses.java |  3 +-
 .../jena/fuseki/servlets/SPARQLQueryProcessor.java |  3 +-
 .../apache/jena/fuseki/servlets/ServletBase.java   |  9 ---
 .../java/org/apache/jena/langtag/LangTagJDK.java   | 25 +++---
 .../shacl/engine/constraint/SparqlComponent.java   |  8 --
 .../shacl/engine/constraint/SparqlValidation.java  |  8 +-
 .../org/apache/jena/tdb1/sys/StoreConnection.java  |  2 +-
 .../org/apache/jena/tdb2/solver/SolverLibTDB.java  | 27 +++----
 30 files changed, 200 insertions(+), 172 deletions(-)


(jena) 06/15: Code tidy

Posted by an...@apache.org.
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 4a561c8b3428ff1dd9cf541d03f7fb55bb86d6e5
Author: Andy Seaborne <an...@apache.org>
AuthorDate: Thu Nov 20 11:31:19 2025 +0000

    Code tidy
---
 .../engine/iterator/QueryIterPlainWrapper.java     |  2 +-
 .../sparql/engine/iterator/QueryIterProcedure.java | 92 ++++++++++------------
 .../sparql/sse/builders/SSE_BuildException.java    | 11 +--
 .../java/org/apache/jena/sparql/util/Context.java  | 42 +++++-----
 .../apache/jena/fuseki/servlets/ActionExecLib.java |  1 -
 .../apache/jena/fuseki/servlets/HttpAction.java    |  2 +-
 .../jena/fuseki/servlets/SPARQLQueryProcessor.java |  3 +-
 7 files changed, 70 insertions(+), 83 deletions(-)

diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterPlainWrapper.java b/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterPlainWrapper.java
index dac45c196c..ac7d6fe3ce 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterPlainWrapper.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterPlainWrapper.java
@@ -73,7 +73,7 @@ public class QueryIterPlainWrapper extends QueryIter
 
     @Override
     protected void requestCancel()
-    { }
+    { closeIterator(); }
 
     @Override
     public void output(IndentedWriter out, SerializationContext sCxt)
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterProcedure.java b/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterProcedure.java
index eaf6da1860..d528545712 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterProcedure.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterProcedure.java
@@ -18,73 +18,65 @@
 
 package org.apache.jena.sparql.engine.iterator;
 
-import org.apache.jena.atlas.io.IndentedWriter ;
-import org.apache.jena.atlas.lib.Lib ;
-import org.apache.jena.sparql.engine.ExecutionContext ;
-import org.apache.jena.sparql.engine.QueryIterator ;
-import org.apache.jena.sparql.engine.binding.Binding ;
-import org.apache.jena.sparql.procedure.Procedure ;
-import org.apache.jena.sparql.serializer.SerializationContext ;
+import org.apache.jena.atlas.io.IndentedWriter;
+import org.apache.jena.atlas.lib.Lib;
+import org.apache.jena.sparql.engine.ExecutionContext;
+import org.apache.jena.sparql.engine.QueryIterator;
+import org.apache.jena.sparql.engine.binding.Binding;
+import org.apache.jena.sparql.procedure.Procedure;
+import org.apache.jena.sparql.serializer.SerializationContext;
 
-/** QueryIterator for a procedure.  Delays first touch until first call because
- *  first touch may cause work to be done.
- *  
- *  Assumes .build already called. */
+/**
+ * QueryIterator for a procedure. Delays first touch until first call because first
+ * touch may cause work to be done.
+ */
+
+public class QueryIterProcedure extends QueryIter1 {
+    private final Procedure proc;
+    private boolean initialized = false;
+    private QueryIterator procIter = null;
 
-public class QueryIterProcedure extends QueryIter1
-{
-    private Procedure proc ;
-    private boolean initialized = false ;
-    private QueryIterator procIter = null ;
-    
-    public QueryIterProcedure(QueryIterator input, Procedure proc, ExecutionContext execCxt)
-    {
-        super(input, execCxt) ;
-        this.proc = proc ;
+    public QueryIterProcedure(QueryIterator input, Procedure proc, ExecutionContext execCxt) {
+        super(input, execCxt);
+        this.proc = proc;
     }
 
-    private void init()
-    {
-        if ( ! initialized )
-        {
-            procIter = proc.proc(getInput(), getExecContext()) ;
-            initialized = true ;
+    private void init() {
+        if ( !initialized ) {
+            procIter = proc.proc(getInput(), getExecContext());
+            initialized = true;
         }
     }
 
     @Override
-    protected void closeSubIterator()
-    { 
-        init() ;    // Ensure initialized even if immediately closed.
-        procIter.close(); 
+    protected void closeSubIterator() {
+        // Ensure initialized even if immediately closed.
+        init();
+        procIter.close();
     }
 
     @Override
-    protected void requestSubCancel()
-    { 
-       if (procIter != null) 
-    	   procIter.cancel(); 
+    protected void requestSubCancel() {
+        if ( procIter != null )
+            procIter.cancel();
     }
-    
+
     @Override
-    protected boolean hasNextBinding()
-    {
-        init() ;
-        return procIter.hasNext() ;
+    protected boolean hasNextBinding() {
+        init();
+        return procIter.hasNext();
     }
 
     @Override
-    protected Binding moveToNextBinding()
-    {
-        init( ) ;
-        return procIter.nextBinding() ;
+    protected Binding moveToNextBinding() {
+        init();
+        return procIter.nextBinding();
     }
-    
+
     @Override
-    protected void details(IndentedWriter out, SerializationContext sCxt)
-    {
-        out.print(Lib.className(this)) ;
-        out.print(" ") ;
-        proc.output(out, sCxt) ;
+    protected void details(IndentedWriter out, SerializationContext sCxt) {
+        out.print(Lib.className(this));
+        out.print(" ");
+        proc.output(out, sCxt);
     }
 }
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/sse/builders/SSE_BuildException.java b/jena-arq/src/main/java/org/apache/jena/sparql/sse/builders/SSE_BuildException.java
index 2b779c31b4..bca13ff4f9 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/sse/builders/SSE_BuildException.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/sse/builders/SSE_BuildException.java
@@ -20,10 +20,7 @@ package org.apache.jena.sparql.sse.builders;
 
 import org.apache.jena.sparql.sse.ItemException;
 
-public class SSE_BuildException extends ItemException
-{
-//        public BuildException(Throwable cause) { super(cause); }
-//        public BuildException() { super(); }
-        public SSE_BuildException (String msg) { super(msg); }
-        public SSE_BuildException (String msg, Throwable cause) { super(msg, cause); }
-    }
+public class SSE_BuildException extends ItemException {
+    public SSE_BuildException (String msg) { super(msg); }
+    public SSE_BuildException (String msg, Throwable cause) { super(msg, cause); }
+}
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/util/Context.java b/jena-arq/src/main/java/org/apache/jena/sparql/util/Context.java
index 370d93bf49..308398df29 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/util/Context.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/util/Context.java
@@ -390,6 +390,27 @@ public class Context {
         context.clear();
     }
 
+    /** Atomic compute. */
+    @SuppressWarnings("unchecked")
+    public <V> V compute(Symbol key, BiFunction<Symbol, Object, ? extends V> remappingFunction) {
+        Object obj = context.compute(key, remappingFunction);
+        return (V)obj;
+    }
+
+    /** Atomic computeIfAbsent. */
+    @SuppressWarnings("unchecked")
+    public <V> V computeIfAbsent(Symbol key, Function<Symbol, ? extends V> mappingFunction) {
+        Object obj = context.computeIfAbsent(key, mappingFunction);
+        return (V)obj;
+    }
+
+    /** Atomic computeIfPresent. */
+    @SuppressWarnings("unchecked")
+    public <V> V computeIfPresent(Symbol key, BiFunction<Symbol, Object, V> remappingFunction) {
+        Object obj = context.computeIfPresent(key, remappingFunction);
+        return (V)obj;
+    }
+
     @Override
     public String toString() {
         String x = "";
@@ -434,27 +455,6 @@ public class Context {
         }
     }
 
-    /** Atomic compute. */
-    @SuppressWarnings("unchecked")
-    public <V> V compute(Symbol key, BiFunction<Symbol, Object, ? extends V> remappingFunction) {
-        Object obj = context.compute(key, remappingFunction);
-        return (V)obj;
-    }
-
-    /** Atomic computeIfAbsent. */
-    @SuppressWarnings("unchecked")
-    public <V> V computeIfAbsent(Symbol key, Function<Symbol, ? extends V> mappingFunction) {
-        Object obj = context.computeIfAbsent(key, mappingFunction);
-        return (V)obj;
-    }
-
-    /** Atomic computeIfPresent. */
-    @SuppressWarnings("unchecked")
-    public <V> V computeIfPresent(Symbol key, BiFunction<Symbol, Object, V> remappingFunction) {
-        Object obj = context.computeIfPresent(key, remappingFunction);
-        return (V)obj;
-    }
-
     /** Get the context's cancel signal. Create and set one if needed. Context must not be null. */
     public static AtomicBoolean getOrSetCancelSignal(Context context) {
         try {
diff --git a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/ActionExecLib.java b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/ActionExecLib.java
index f83a342083..96ec9dca2e 100644
--- a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/ActionExecLib.java
+++ b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/ActionExecLib.java
@@ -385,5 +385,4 @@ public class ActionExecLib {
             Fuseki.serverLog.warn("Exception on counter dec", ex);
         }
     }
-
 }
diff --git a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/HttpAction.java b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/HttpAction.java
index e9c015aff3..04f54634f9 100644
--- a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/HttpAction.java
+++ b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/HttpAction.java
@@ -190,7 +190,7 @@ public class HttpAction
             transactional = dsg;
             isTransactional = false;
         } else {
-            // Nothing to build on.  Be safe.
+            // Nothing to build on. Be safe.
             transactional = TransactionalLock.createMutex();
             isTransactional = false;
         }
diff --git a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/SPARQLQueryProcessor.java b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/SPARQLQueryProcessor.java
index 84f4d9fd1b..186d7e3e6e 100644
--- a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/SPARQLQueryProcessor.java
+++ b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/SPARQLQueryProcessor.java
@@ -303,8 +303,7 @@ public abstract class SPARQLQueryProcessor extends ActionService
         action.abortSilent();
     }
 
-    /**
-     * Check the query - if unacceptable, throw ActionErrorException
+    /** Check the query - if unacceptable, throw ActionErrorException
      * or call on of the {@link ServletOps#error} operations.
      * @param action HTTP Action
      * @param query  SPARQL Query


(jena) 09/15: Code tidy (SolverLibTDB)

Posted by an...@apache.org.
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 64a800438567c1bb35a7e896c79c6182a7717435
Author: Andy Seaborne <an...@apache.org>
AuthorDate: Sun Nov 23 20:51:57 2025 +0000

    Code tidy (SolverLibTDB)
---
 .../org/apache/jena/tdb2/solver/SolverLibTDB.java  | 27 ++++++++--------------
 1 file changed, 10 insertions(+), 17 deletions(-)

diff --git a/jena-tdb2/src/main/java/org/apache/jena/tdb2/solver/SolverLibTDB.java b/jena-tdb2/src/main/java/org/apache/jena/tdb2/solver/SolverLibTDB.java
index b37cebe6de..96d8dc66f7 100644
--- a/jena-tdb2/src/main/java/org/apache/jena/tdb2/solver/SolverLibTDB.java
+++ b/jena-tdb2/src/main/java/org/apache/jena/tdb2/solver/SolverLibTDB.java
@@ -106,7 +106,7 @@ public class SolverLibTDB
                 // Can occur with BindingProject
                 continue;
 
-            // Rely on the node table cache for efficency - we will likely be
+            // Rely on the node table cache for efficiency - we will likely be
             // repeatedly looking up the same node in different bindings.
             NodeId id = nodeTable.getNodeIdForNode(n);
             // Even put in "does not exist" for a node now known not to be in the DB.
@@ -148,9 +148,7 @@ public class SolverLibTDB
     private static Tuple<NodeId> TupleANY = TupleFactory.create4(NodeId.NodeIdAny, NodeId.NodeIdAny, NodeId.NodeIdAny, NodeId.NodeIdAny);
 
     private enum GraphNamesDistinctMode {
-        NONE,
-        ADJACENT,
-        FULL;
+        NONE, ADJACENT, FULL;
     }
 
     /** Find all the graph names in the quads table. */
@@ -198,22 +196,17 @@ public class SolverLibTDB
         if ( filter != null )
             iter1 = Iter.filter(iter1, filter);
 
+        // Extract graph node.
         Iterator<NodeId> iter2 = Iter.map(iter1, t -> t.get(0));
+        // iter2 yields 1-1 with iter1 and does not touch the database
+        // so there is no need to wrap iter2 in an IterAbortable.
 
         // Apply the necessary distinct calculation (if any)
-        Iterator<NodeId> iter3;
-        switch (distinctMode) {
-            case FULL:
-                iter3 = Iter.distinct(iter2);
-                break;
-            case ADJACENT:
-                iter3 = Iter.distinctAdjacent(iter2);
-                break;
-            case NONE:
-            default:
-                iter3 = iter2;
-                break;
-        }
+        Iterator<NodeId> iter3 = switch (distinctMode) {
+            case FULL -> Iter.distinct(iter2);
+            case ADJACENT -> Iter.distinctAdjacent(iter2);
+            default -> iter2;
+        };
 
         Iterator<Node> iter4 = NodeLib.nodes(ds.getQuadTable().getNodeTupleTable().getNodeTable(), iter3);
 


(jena) 12/15: Adjust to common license header

Posted by an...@apache.org.
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 b3611f945aa585c749aacd92335175aed4911cb9
Author: Andy Seaborne <an...@apache.org>
AuthorDate: Tue Nov 25 17:41:11 2025 +0000

    Adjust to common license header
---
 .../examples/RDFConnectionExampleDBpedia01.java    | 18 ++++++++++++++++
 .../java/org/apache/jena/langtag/LangTagJDK.java   | 25 +++++++++++-----------
 2 files changed, 31 insertions(+), 12 deletions(-)

diff --git a/jena-examples/src/main/java/rdfconnection/examples/RDFConnectionExampleDBpedia01.java b/jena-examples/src/main/java/rdfconnection/examples/RDFConnectionExampleDBpedia01.java
index 47c8014350..6e5206775d 100644
--- a/jena-examples/src/main/java/rdfconnection/examples/RDFConnectionExampleDBpedia01.java
+++ b/jena-examples/src/main/java/rdfconnection/examples/RDFConnectionExampleDBpedia01.java
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package rdfconnection.examples;
 
 import java.util.List;
diff --git a/jena-langtag/src/main/java/org/apache/jena/langtag/LangTagJDK.java b/jena-langtag/src/main/java/org/apache/jena/langtag/LangTagJDK.java
index 60ce5e910f..50763f99bf 100644
--- a/jena-langtag/src/main/java/org/apache/jena/langtag/LangTagJDK.java
+++ b/jena-langtag/src/main/java/org/apache/jena/langtag/LangTagJDK.java
@@ -1,18 +1,19 @@
 /*
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- *
- *  See the NOTICE file distributed with this work for additional
- *  information regarding copyright ownership.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 package org.apache.jena.langtag;


(jena) 13/15: Clean up of HTTP method name constants

Posted by an...@apache.org.
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 f855413f4c1bc286052290f3f369aa6a3e89b9a0
Author: Andy Seaborne <an...@apache.org>
AuthorDate: Sun Nov 30 18:10:37 2025 +0000

    Clean up of HTTP method name constants
---
 jena-arq/src/main/java/org/apache/jena/riot/web/HttpNames.java   | 1 +
 .../java/org/apache/jena/fuseki/servlets/ActionProcessor.java    | 3 ++-
 .../main/java/org/apache/jena/fuseki/servlets/ServletBase.java   | 9 ---------
 3 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/jena-arq/src/main/java/org/apache/jena/riot/web/HttpNames.java b/jena-arq/src/main/java/org/apache/jena/riot/web/HttpNames.java
index 520ff4e3cb..a7b8be22e6 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/web/HttpNames.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/web/HttpNames.java
@@ -96,6 +96,7 @@ public class HttpNames
     public static final String paramForceAccept     = "force-accept" ;  // Force the accept header at the last moment
     public static final String paramTimeout         = "timeout" ;
 
+    // Replace by enum HttpMethods
     public static final String METHOD_DELETE        = "DELETE";
     public static final String METHOD_HEAD          = "HEAD";
     public static final String METHOD_GET           = "GET";
diff --git a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/ActionProcessor.java b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/ActionProcessor.java
index 44085722aa..32b4491136 100644
--- a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/ActionProcessor.java
+++ b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/ActionProcessor.java
@@ -31,12 +31,13 @@ public interface ActionProcessor {
     public default void process(HttpAction action) {
         switch ( action.getRequestMethod() ) {
             case METHOD_GET ->       execGet(action);
+            //case METHOD_QUERY ->     execQuery(action);
             case METHOD_POST ->      execPost(action);
             case METHOD_PATCH ->     execPatch(action);
             case METHOD_PUT ->       execPut(action);
             case METHOD_DELETE ->    execDelete(action);
             case METHOD_HEAD ->      execHead(action);
-            case METHOD_OPTIONS->    execOptions(action);
+            case METHOD_OPTIONS ->   execOptions(action);
             case METHOD_TRACE ->     execTrace(action);
             default -> execAny(action.getRequestMethod(), action);
         }
diff --git a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/ServletBase.java b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/ServletBase.java
index 8b9c465ba1..cdd2ec0803 100644
--- a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/ServletBase.java
+++ b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/ServletBase.java
@@ -32,15 +32,6 @@ import org.apache.jena.riot.web.HttpNames;
  */
 public abstract class ServletBase extends HttpServlet {
 
-    public static final String METHOD_DELETE    = "DELETE";
-    public static final String METHOD_HEAD      = "HEAD";
-    public static final String METHOD_GET       = "GET";
-    public static final String METHOD_OPTIONS   = "OPTIONS";
-    public static final String METHOD_POST      = "POST";
-    public static final String METHOD_PUT       = "PUT";
-    public static final String METHOD_TRACE     = "TRACE";
-    public static final String METHOD_PATCH     = "PATCH";
-
     private static AtomicLong     requestIdAlloc = new AtomicLong(0);
 
     protected ServletBase() {}


(jena) 02/15: Code tidy (datatypes/xsd)

Posted by an...@apache.org.
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 66b8b891326b5147c7f72b898e9d1d56932966e4
Author: Andy Seaborne <an...@apache.org>
AuthorDate: Fri Oct 31 11:39:20 2025 +0000

    Code tidy (datatypes/xsd)
---
 .../main/java/org/apache/jena/datatypes/xsd/AbstractDateTime.java    | 5 +----
 .../src/main/java/org/apache/jena/datatypes/xsd/XSDDatatype.java     | 2 +-
 .../org/apache/jena/datatypes/xsd/impl/XSDAbstractDateTimeType.java  | 1 -
 3 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/jena-core/src/main/java/org/apache/jena/datatypes/xsd/AbstractDateTime.java b/jena-core/src/main/java/org/apache/jena/datatypes/xsd/AbstractDateTime.java
index a46e214d04..31de2b4413 100644
--- a/jena-core/src/main/java/org/apache/jena/datatypes/xsd/AbstractDateTime.java
+++ b/jena-core/src/main/java/org/apache/jena/datatypes/xsd/AbstractDateTime.java
@@ -154,7 +154,7 @@ public class AbstractDateTime implements Comparable<AbstractDateTime> {
     }
 
 //  --------------------------------------------------------------------
-//  This code is adapated from Xerces 2.6.0 AbstractDateTimeDV.
+//  This code is adapted from Xerces 2.6.0 AbstractDateTimeDV.
 //  Copyright (c) 1999-2003 The Apache Software Foundation.  All rights
 //  reserved.
 //  --------------------------------------------------------------------
@@ -229,7 +229,6 @@ public class AbstractDateTime implements Comparable<AbstractDateTime> {
             return INDETERMINATE;
         }
         return INDETERMINATE;
-
     }
 
     /**
@@ -317,7 +316,6 @@ public class AbstractDateTime implements Comparable<AbstractDateTime> {
          date[utc]='Z';
      }
 
-
     /**
      * Resets object representation of date/time
      *
@@ -408,5 +406,4 @@ public class AbstractDateTime implements Comparable<AbstractDateTime> {
 //  --------------------------------------------------------------------
 //  End of code is adapated from Xerces 2.6.0 AbstractDateTimeDV.
 //  --------------------------------------------------------------------
-
 }
diff --git a/jena-core/src/main/java/org/apache/jena/datatypes/xsd/XSDDatatype.java b/jena-core/src/main/java/org/apache/jena/datatypes/xsd/XSDDatatype.java
index eea5e01bd1..ea696f8e66 100644
--- a/jena-core/src/main/java/org/apache/jena/datatypes/xsd/XSDDatatype.java
+++ b/jena-core/src/main/java/org/apache/jena/datatypes/xsd/XSDDatatype.java
@@ -360,7 +360,7 @@ public class XSDDatatype extends BaseDatatype {
 
     /**
      * Parse a validated lexical form. Subclasses which use the default
-     * parse implementation and are not convered by the explicit convertValidatedData
+     * parse implementation and are not covered by the explicit convertValidatedData
      * cases should override this.
      */
     public Object parseValidated(String lexical) {
diff --git a/jena-core/src/main/java/org/apache/jena/datatypes/xsd/impl/XSDAbstractDateTimeType.java b/jena-core/src/main/java/org/apache/jena/datatypes/xsd/impl/XSDAbstractDateTimeType.java
index fba2a44eb9..7aeb88ded6 100644
--- a/jena-core/src/main/java/org/apache/jena/datatypes/xsd/impl/XSDAbstractDateTimeType.java
+++ b/jena-core/src/main/java/org/apache/jena/datatypes/xsd/impl/XSDAbstractDateTimeType.java
@@ -61,7 +61,6 @@ public class XSDAbstractDateTimeType extends XSDDatatype {
     /** Mask to indicate all date/time are present */
     public static final short FULL_MASK = 0xf;
 
-
 //  --------------------------------------------------------------------
 //  This code is adapted from Xerces 2.6.0 AbstractDateTimeDV.
 //  Copyright (c) 1999-2003 The Apache Software Foundation.  All rights


(jena) 15/15: Add GraphFactory.empty()

Posted by an...@apache.org.
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 fd4df838d5bba5c80cff1b5a18de75dcb88f3f44
Author: Andy Seaborne <an...@apache.org>
AuthorDate: Sun Nov 30 18:15:01 2025 +0000

    Add GraphFactory.empty()
---
 .../org/apache/jena/sparql/engine/QueryEngineFactory.java     |  2 +-
 .../main/java/org/apache/jena/sparql/graph/GraphFactory.java  | 11 ++++++++++-
 jena-arq/src/test/java/org/apache/jena/arq/junit/Scripts.java |  4 +---
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/engine/QueryEngineFactory.java b/jena-arq/src/main/java/org/apache/jena/sparql/engine/QueryEngineFactory.java
index fb7571a2fc..df492c1f39 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/engine/QueryEngineFactory.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/engine/QueryEngineFactory.java
@@ -34,7 +34,7 @@ import org.apache.jena.sparql.util.Context;
  *  * A {@code QueryEngineFactory} is registered with the
  * {@link QueryEngineRegistry}.
  * <p>
- *  * When determining which factory to use, the querye execution process calls
+ * When determining which factory to use, the query execution process calls
  * {@link #accept(Query, DatasetGraph, Context)} or
  * {@link #accept(Op, DatasetGraph, Context)} to determine whether the
  * particular type of query engine produced by this factory accepts the
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/graph/GraphFactory.java b/jena-arq/src/main/java/org/apache/jena/sparql/graph/GraphFactory.java
index ee0d6e7006..98a5dd93f6 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/graph/GraphFactory.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/graph/GraphFactory.java
@@ -76,6 +76,15 @@ public class GraphFactory {
         return new GraphTxn();
     }
 
+    /**
+     * Return an immutable, transactional, empty graph.
+     * <p>
+     * This fully supports transactions.
+     */
+    public static Graph emptyGraph() {
+        return GraphZero.instance();
+    }
+
     /**
      * Create a graph - ARQ-wide default type.
      * <p>
@@ -91,7 +100,7 @@ public class GraphFactory {
     }
 
     public static Graph sinkGraph() {
-        return new GraphSink();
+        return GraphSink.instance();
     }
 
     /** Guaranteed call-through to Jena's ModelFactory operation */
diff --git a/jena-arq/src/test/java/org/apache/jena/arq/junit/Scripts.java b/jena-arq/src/test/java/org/apache/jena/arq/junit/Scripts.java
index bee7bddaef..e5329bfa91 100644
--- a/jena-arq/src/test/java/org/apache/jena/arq/junit/Scripts.java
+++ b/jena-arq/src/test/java/org/apache/jena/arq/junit/Scripts.java
@@ -45,7 +45,6 @@ public class Scripts {
     public static Function<ManifestEntry, Runnable> testMaker() { return runnableGenerator.testMaker(); }
 
     public static Stream<DynamicNode> manifestTestFactory(String filename, String namePrefix, Function<ManifestEntry, Runnable> testMaker) {
-        // When does this happen?
         EntryToTest f = entry -> {
             Runnable r = testMaker.apply(entry);
             if ( r == null )
@@ -119,12 +118,11 @@ public class Scripts {
         }
     }
 
-    /** Does the URI of the test conain a substring? */
+    /** Does the URI of the test contain a substring? */
     public static boolean entryContainsSubstring(ManifestEntry entry, String fingerprint) {
         String testURI = entry.getURI();
         if ( testURI == null )
             return false;
         return testURI.contains(fingerprint);
     }
-
 }


(jena) 03/15: Clean-up SHACL SPARQL constraints

Posted by an...@apache.org.
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 84d1ab62bf76f33d721b9f3c77d8cc2699d9eecb
Author: Andy Seaborne <an...@apache.org>
AuthorDate: Fri Nov 14 16:48:23 2025 +0000

    Clean-up SHACL SPARQL constraints
---
 .../org/apache/jena/shacl/engine/constraint/SparqlComponent.java  | 8 --------
 .../org/apache/jena/shacl/engine/constraint/SparqlValidation.java | 8 ++++----
 2 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/jena-shacl/src/main/java/org/apache/jena/shacl/engine/constraint/SparqlComponent.java b/jena-shacl/src/main/java/org/apache/jena/shacl/engine/constraint/SparqlComponent.java
index 64fadb99de..d547c98a9f 100644
--- a/jena-shacl/src/main/java/org/apache/jena/shacl/engine/constraint/SparqlComponent.java
+++ b/jena-shacl/src/main/java/org/apache/jena/shacl/engine/constraint/SparqlComponent.java
@@ -74,14 +74,6 @@ public class SparqlComponent {
         return query;
     }
 
-//    public String getSparqlString() {
-//        return sparqlString;
-//    }
-//
-//    public boolean isSelect() {
-//        return query.isSelectType();
-//    }
-
     public List<Parameter> getParams() {
         return params;
     }
diff --git a/jena-shacl/src/main/java/org/apache/jena/shacl/engine/constraint/SparqlValidation.java b/jena-shacl/src/main/java/org/apache/jena/shacl/engine/constraint/SparqlValidation.java
index c6cc0f0b11..c5d71f0a98 100644
--- a/jena-shacl/src/main/java/org/apache/jena/shacl/engine/constraint/SparqlValidation.java
+++ b/jena-shacl/src/main/java/org/apache/jena/shacl/engine/constraint/SparqlValidation.java
@@ -137,16 +137,16 @@ import org.apache.jena.sparql.util.ModelUtils;
 
         // ASK validator.
         if ( qExec.getQuery().isAskType() ) {
-            boolean b = qExec.execAsk();
-            if ( ! b ) {
+            boolean askResult = qExec.execAsk();
+            if ( ! askResult ) {
                 String msg = ( violationTemplate == null )
                     ? "SPARQL ASK constraint for "+ShLib.displayStr(valueNode)+" returns false"
                     : substitute(violationTemplate, parameterMap, focusNode, path, valueNode);
                 vCxt.reportEntry(msg, shape, focusNode, path, valueNode, reportConstraint);
             }
             vCxt.notifyValidationListener(() ->
-                new ConstraintEvaluatedOnSinglePathNodeEvent(vCxt, shape, focusNode, reportConstraint, path, valueNode,b));
-            return b;
+                new ConstraintEvaluatedOnSinglePathNodeEvent(vCxt, shape, focusNode, reportConstraint, path, valueNode, askResult));
+            return askResult;
         }
 
         // SELECT validator.


(jena) 01/15: Add QueryExecUtils.exec(query,graph)

Posted by an...@apache.org.
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 b2b41fc90e51dbb2f8a2be38011d7dfd7f040d22
Author: Andy Seaborne <an...@apache.org>
AuthorDate: Fri Oct 31 11:38:50 2025 +0000

    Add QueryExecUtils.exec(query,graph)
---
 .../src/main/java/org/apache/jena/sparql/util/QueryExecUtils.java   | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/util/QueryExecUtils.java b/jena-arq/src/main/java/org/apache/jena/sparql/util/QueryExecUtils.java
index 657b618343..d90d152e86 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/util/QueryExecUtils.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/util/QueryExecUtils.java
@@ -25,6 +25,7 @@ import java.util.List ;
 
 import org.apache.jena.atlas.json.JSON;
 import org.apache.jena.atlas.json.JsonArray;
+import org.apache.jena.graph.Graph;
 import org.apache.jena.query.* ;
 import org.apache.jena.rdf.model.Model ;
 import org.apache.jena.rdf.model.RDFNode ;
@@ -71,6 +72,11 @@ public class QueryExecUtils {
         exec(qExec);
     }
 
+    public static void exec(Query query, Graph graph) {
+        QueryExec qExec = QueryExec.graph(graph).query(query).build();
+        exec(qExec);
+    }
+
     public static void exec(QueryExec queryExec) {
         exec(queryExec.getQuery(), queryExec) ;
     }


(jena) 07/15: Add upcoming media type parameters

Posted by an...@apache.org.
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 c13f675ffb23e9d0119dd56eb9fd2fd938f4168c
Author: Andy Seaborne <an...@apache.org>
AuthorDate: Sat Nov 22 18:25:16 2025 +0000

    Add upcoming media type parameters
---
 .../src/main/java/org/apache/jena/riot/web/HttpNames.java     | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/jena-arq/src/main/java/org/apache/jena/riot/web/HttpNames.java b/jena-arq/src/main/java/org/apache/jena/riot/web/HttpNames.java
index 6ba08475f8..520ff4e3cb 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/web/HttpNames.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/web/HttpNames.java
@@ -43,7 +43,6 @@ public class HttpNames
     public static final String hLocation            = "Location" ;
     public static final String hVary                = "Vary" ;
     public static final String hUserAgent           = "User-Agent" ;
-    public static final String charset              = "charset" ;
 
     // CORS:
     //   http://www.w3.org/TR/cors/  http://esw.w3.org/CORS_Enabled
@@ -57,6 +56,14 @@ public class HttpNames
     public static final String hAccessControlRequestMethod      = "Access-Control-Request-Method" ;
     public static final String hAccessControlRequestHeaders     = "Access-Control-Request-Headers" ;
 
+    // Media type parameters.
+    // XXX Rename as mtCharset?
+    public static final String charset              = "charset" ;
+    // RDF .1.2+ SPARQL 1.2+ HTTP header parameters
+    public static final String mtParamVersion         = "version" ;
+    // RFC 6906 -- https://www.rfc-editor.org/rfc/rfc6906
+    public static final String mtParamProfile         = "profile" ;
+
     // GSP parameter names
     public static final String paramGraph           = "graph" ;
     public static final String paramGraphDefault    = "default" ;
@@ -81,7 +88,7 @@ public class HttpNames
     // Jena parameter names (SPARQL protocol extensions)
     public static final String paramStyleSheet      = "stylesheet" ;
     public static final String paramLang            = "lang" ;
-    public static final String paramAccept          = "accept" ;
+    public static final String paramAccept          = "accept" ;        // Unused
     public static final String paramOutput1         = "output" ;
     public static final String paramOutput2         = "format" ;        // Alternative name
     public static final String paramOutput3         = "results" ;       // Alternative name


(jena) 08/15: Remove deprecated constructor (QueryExecDataset)

Posted by an...@apache.org.
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 4ddc4afc93e1a12ffa88380149a889a4f326ae02
Author: Andy Seaborne <an...@apache.org>
AuthorDate: Sat Nov 22 18:26:03 2025 +0000

    Remove deprecated constructor (QueryExecDataset)
---
 .../java/org/apache/jena/sparql/exec/QueryExecDataset.java    | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/exec/QueryExecDataset.java b/jena-arq/src/main/java/org/apache/jena/sparql/exec/QueryExecDataset.java
index 35a883345d..8441320990 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/exec/QueryExecDataset.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/exec/QueryExecDataset.java
@@ -19,9 +19,9 @@
 package org.apache.jena.sparql.exec;
 
 import java.util.*;
-import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicReference;
+
 import org.apache.jena.atlas.iterator.Iter;
 import org.apache.jena.atlas.json.JsonArray;
 import org.apache.jena.atlas.json.JsonObject;
@@ -48,10 +48,10 @@ import org.apache.jena.sparql.core.describe.DescribeHandlerRegistry;
 import org.apache.jena.sparql.engine.Plan;
 import org.apache.jena.sparql.engine.QueryEngineFactory;
 import org.apache.jena.sparql.engine.QueryIterator;
+import org.apache.jena.sparql.engine.Timeouts.Timeout;
 import org.apache.jena.sparql.engine.binding.Binding;
 import org.apache.jena.sparql.engine.binding.BindingFactory;
 import org.apache.jena.sparql.engine.iterator.QueryIteratorWrapper;
-import org.apache.jena.sparql.engine.Timeouts.Timeout;
 import org.apache.jena.sparql.graph.GraphOps;
 import org.apache.jena.sparql.modify.TemplateLib;
 import org.apache.jena.sparql.syntax.ElementGroup;
@@ -90,13 +90,6 @@ public class QueryExecDataset implements QueryExec
     private long                     queryStartTime   = -1; // Unset
     private AtomicBoolean            cancelSignal;
 
-    @Deprecated
-    protected QueryExecDataset(Query query, String queryString, DatasetGraph datasetGraph, Context cxt,
-            QueryEngineFactory qeFactory, long timeout1, TimeUnit timeUnit1, long timeout2, TimeUnit timeUnit2,
-            Binding initialToEngine) {
-        this(query, queryString, datasetGraph, cxt, qeFactory, new Timeout(timeout1, timeUnit1, timeout2, timeUnit2), initialToEngine);
-    }
-
     protected QueryExecDataset(Query query, String queryString, DatasetGraph datasetGraph, Context cxt,
                                QueryEngineFactory qeFactory, Timeout timeout,
                                Binding initialToEngine) {


(jena) 04/15: Comments in JenaXMLInput

Posted by an...@apache.org.
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 190c7266051c36f225c1322c72560c09530bb25f
Author: Andy Seaborne <an...@apache.org>
AuthorDate: Sun Nov 16 22:03:57 2025 +0000

    Comments in JenaXMLInput
---
 .../java/org/apache/jena/util/JenaXMLInput.java    | 35 +++++++++++++++-------
 1 file changed, 24 insertions(+), 11 deletions(-)

diff --git a/jena-core/src/main/java/org/apache/jena/util/JenaXMLInput.java b/jena-core/src/main/java/org/apache/jena/util/JenaXMLInput.java
index 0283be1765..f589d76075 100644
--- a/jena-core/src/main/java/org/apache/jena/util/JenaXMLInput.java
+++ b/jena-core/src/main/java/org/apache/jena/util/JenaXMLInput.java
@@ -54,20 +54,33 @@ public class JenaXMLInput {
     static {
         // XMLConstants.FEATURE_SECURE_PROCESSING defaults to true.
         // This can result in problems occasionally.
-        //
-        // It limits internal resources - one case: system property "entityExpansionLimit"
+
+        // Limits on internal resources - one case: system property "java.xml.entityExpansionLimit"
         // The default setting Java17 is 64000. RDF/XML that uses a lot of "&ent;" as a form of URI management
         // might lead to exceeding this limit.
         //
-        // This limit applies to SAX/XMLreader, StAX/XMLStreamReader and StAX/XMLEventReader.
-        // Illustrative code that sets the default higher if it is not already been set.
-        if ( false ) {
-            String keyExpansionLimit = "entityExpansionLimit";
-            if ( System.getProperty(keyExpansionLimit) == null ) {
-                // The system default (no setting) is 64000
-                System.setProperty(keyExpansionLimit, "200000");
-            }
-        }
+        // These limits apply to SAX/XMLreader, StAX/XMLStreamReader and StAX/XMLEventReader.
+
+        // https://docs.oracle.com/javase/tutorial/jaxp/limits/limits.html
+
+        /*
+         * Limits:
+         * System property                      Default value (less than or equal to zero means no limit)
+         * jdk.xml.entityExpansionLimit           64000
+         * jdk.xml.elementAttributeLimit          10000
+         * jdk.xml.maxOccurLimit                   5000
+         * jdk.xml.totalEntitySizeLimit          5x10^7
+         * jdk.xml.maxGeneralEntitySizeLimit          0
+         * jdk.xml.maxParameterEntitySizeLimit  1000000
+         * jdk.xml.entityReplacementLimit       3000000
+         * jdk.xml.maxElementDepth                    0
+         * jdk.xml.maxXMLNameLimit                 1000
+         *
+         * Legacy:
+         * entityExpansionLimit         jdk.xml.entityExpansionLimit
+         * elementAttributeLimit        jdk.xml.elementAttributeLimit
+         * maxOccurLimit                jdk.xml.maxOccur (typo in documentation?)
+         */
     }
 
     public static XMLReader createXMLReader() throws ParserConfigurationException, SAXException {


(jena) 05/15: Don't set volatile twice

Posted by an...@apache.org.
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 9d93b64fc6d2db784c99ca4970a751b3abd34be7
Author: Andy Seaborne <an...@apache.org>
AuthorDate: Mon Nov 17 08:27:43 2025 +0000

    Don't set volatile twice
---
 jena-tdb1/src/main/java/org/apache/jena/tdb1/sys/StoreConnection.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jena-tdb1/src/main/java/org/apache/jena/tdb1/sys/StoreConnection.java b/jena-tdb1/src/main/java/org/apache/jena/tdb1/sys/StoreConnection.java
index 7bf6dbcb5d..01176aefe3 100644
--- a/jena-tdb1/src/main/java/org/apache/jena/tdb1/sys/StoreConnection.java
+++ b/jena-tdb1/src/main/java/org/apache/jena/tdb1/sys/StoreConnection.java
@@ -102,8 +102,8 @@ public class StoreConnection
      */
     public DatasetGraphTxn begin(TxnType mode, String label) {
         checkValid();
+        // This sets haveUsedInTransaction = true;
         checkTransactional();
-        haveUsedInTransaction = true;
         return transactionManager.begin(mode, label);
     }
 


(jena) 14/15: Rename function sparql_plus as sparql_add

Posted by an...@apache.org.
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 315588f4113df95a8b84aa068d50bfe876936277
Author: Andy Seaborne <an...@apache.org>
AuthorDate: Sun Nov 30 18:13:43 2025 +0000

    Rename function sparql_plus as sparql_add
---
 .../org/apache/jena/sparql/expr/urifunctions/SPARQLDispatch.java | 4 ++--
 .../org/apache/jena/sparql/expr/urifunctions/SPARQLFuncOp.java   | 9 +++++++++
 2 files changed, 11 insertions(+), 2 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 c301490275..3ae9fec872 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
@@ -166,8 +166,8 @@ public class SPARQLDispatch {
         // Move out/rename to "FunctionDispatch"
         // Add ARQ specials.
 
-        register(map, "plus", SPARQLFuncOp::sparql_plus );
-        register(map, "add", SPARQLFuncOp::sparql_plus );           // Alt name.
+        register(map, "plus", SPARQLFuncOp::sparql_add );
+        register(map, "add", SPARQLFuncOp::sparql_add );            // Alt name.
         register(map, "subtract", SPARQLFuncOp::sparql_subtract );
         register(map, "minus", SPARQLFuncOp::sparql_subtract );     // Alt name.
         register(map, "multiply", SPARQLFuncOp::sparql_multiply );
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 411473218c..7d81076bc2 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
@@ -96,12 +96,21 @@ public class SPARQLFuncOp {
 
     // ---- All the implementations
 
+    /** @deprecated Use  {@link #sparql_add} */
+    @Deprecated(forRemoval = true)
     public static NodeValue sparql_plus(NodeValue nv1, NodeValue nv2) {
         if ( strict() )
             return XSDFuncOp.numAdd(nv1, nv2);
         return NodeValueOps.additionNV(nv1, nv2);
     }
 
+    public static NodeValue sparql_add(NodeValue nv1, NodeValue nv2) {
+        if ( strict() )
+            return XSDFuncOp.numAdd(nv1, nv2);
+        return NodeValueOps.additionNV(nv1, nv2);
+    }
+
+
     public static NodeValue sparql_subtract(NodeValue nv1, NodeValue nv2) {
         if ( strict() )
             return XSDFuncOp.numSubtract(nv1, nv2);


(jena) 11/15: Add ExecutionContext.checkCancelSignal

Posted by an...@apache.org.
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 3a006c4a6b44c0fe3af22e619937fb03c6f2c5f2
Author: Andy Seaborne <an...@apache.org>
AuthorDate: Sun Nov 23 21:13:42 2025 +0000

    Add ExecutionContext.checkCancelSignal
---
 .../main/java/org/apache/jena/sparql/engine/ExecutionContext.java  | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/engine/ExecutionContext.java b/jena-arq/src/main/java/org/apache/jena/sparql/engine/ExecutionContext.java
index a1b87415f8..7a0ddbba9b 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/engine/ExecutionContext.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/engine/ExecutionContext.java
@@ -27,6 +27,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
 import org.apache.jena.atlas.iterator.Iter;
 import org.apache.jena.graph.Graph;
 import org.apache.jena.query.ARQ;
+import org.apache.jena.query.QueryCancelledException;
 import org.apache.jena.sparql.core.DatasetGraph;
 import org.apache.jena.sparql.core.DatasetGraphFactory;
 import org.apache.jena.sparql.engine.main.OpExecutorFactory;
@@ -183,6 +184,12 @@ public class ExecutionContext implements FunctionEnv
         return cancelSignal;
     }
 
+    /** Check the cancel signal and throw {@link QueryCancelledException}} if it is true. */
+    public void checkCancelSignal() {
+      if ( cancelSignal != null && cancelSignal.get() )
+          throw new QueryCancelledException();
+    }
+
     public void openIterator(QueryIterator qIter) {
         openIterators.add(qIter);
         if ( allIterators != null )