Applied patch afs-adapter-2026-02-21.patch from apache#3511 (review)

Author: Aklakan

jena-arq/src/main/java/org/apache/jena/http/sys/ExecHTTPBuilder.java

@@ -56,10 +56,6 @@ public abstract class ExecHTTPBuilder<X, Y> {
     protected Params params = Params.create();
     private ContextAccumulator contextAcc = ContextAccumulator.newBuilder(()->ARQ.getContext());
 
-    // Accept choice by the application. Deprecated - Superseded by acceptHeader(String) which sets all header fields explicitly.
-    @Deprecated(forRemoval = true)
-    protected String appAcceptHeader     = null;
-
     protected String selectAcceptHeader  = WebContent.defaultSparqlResultsHeader;
     protected String askAcceptHeader     = WebContent.defaultSparqlAskHeader;
     protected String graphAcceptHeader   = WebContent.defaultGraphAcceptHeader;
@@ -271,10 +267,8 @@ public Y substitution(Var var, Node value) {
     }
 
     /** Setting this header overrides any other header. */
-    @SuppressWarnings("removal")
     public Y acceptHeader(String acceptHeader) {
         Objects.requireNonNull(acceptHeader);
-        this.appAcceptHeader = acceptHeader;
         this.selectAcceptHeader = acceptHeader;
         this.askAcceptHeader = acceptHeader;
         this.graphAcceptHeader = acceptHeader;

jena-arq/src/main/java/org/apache/jena/http/sys/ExecUpdateHTTPBuilder.java

@@ -27,7 +27,6 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
-import java.util.Optional;
 import java.util.concurrent.TimeUnit;
 
 import org.apache.jena.graph.Node;

jena-arq/src/main/java/org/apache/jena/sparql/SystemARQ.java

@@ -31,6 +31,8 @@
 import org.apache.jena.reasoner.InfGraph ;
 import org.apache.jena.sparql.core.DatasetGraph ;
 import org.apache.jena.sparql.core.GraphView ;
+import org.apache.jena.sparql.exec.QueryExec;
+import org.apache.jena.sparql.exec.UpdateExec;
 import org.apache.jena.sparql.graph.GraphWrapper ;
 import org.apache.jena.sparql.util.Symbol ;
 
@@ -68,6 +70,11 @@ public class SystemARQ
      */
     public static boolean EnableCDTs   = true ;
 
+    /**
+     * Control for {@link QueryExec} and {@link UpdateExec} builder.
+     */
+    public final static boolean DeferredExecBuilders = true;
+
     /**
      * Sync a Model if it provides the underlying graph provides sync . Do nothing
      * otherwise.

jena-arq/src/main/java/org/apache/jena/sparql/adapter/DatasetGraphSPARQL.java

@@ -402,7 +402,9 @@ private static Triple matchTriple(Node s, Node p, Node o) {
     }
 
     private static Quad harmonizeTripleInQuad(Quad quad) {
-        Quad result = quad.isTriple() ? new Quad(Quad.defaultGraphIRI, quad.asTriple()) : quad;
+        Quad result = quad.isTriple()
+                ? Quad.create(Quad.defaultGraphIRI, quad.asTriple())
+                : quad;
         return result;
     }
 

jena-arq/src/main/java/org/apache/jena/sparql/adapter/SparqlAdapterRegistry.java

@@ -25,7 +25,6 @@
 
 import org.apache.jena.sparql.ARQConstants;
 import org.apache.jena.sparql.core.DatasetGraph;
-import org.apache.jena.sparql.core.DatasetGraphOne;
 import org.apache.jena.sparql.util.Context;
 
 public class SparqlAdapterRegistry {

jena-arq/src/main/java/org/apache/jena/sparql/adapter/StreamRDFToUpdateRequest.java

@@ -47,7 +47,7 @@
     /**
      * Constructs the StreamRDFToRDFLink using default {@value #DFT_BUFFER_SIZE} quad buffer size.
      *
-     * @param link the link to talk to.
+     * @param sink the link to talk to.
      */
     public StreamRDFToUpdateRequest(Consumer<UpdateRequest> sink) {
         this(sink, null);

jena-arq/src/main/java/org/apache/jena/sparql/exec/QueryExec.java

@@ -29,7 +29,6 @@
 import org.apache.jena.graph.Triple;
 import org.apache.jena.query.Query;
 import org.apache.jena.query.QueryExecution;
-import org.apache.jena.sparql.adapter.SparqlAdapter;
 import org.apache.jena.sparql.adapter.SparqlAdapterRegistry;
 import org.apache.jena.sparql.core.DatasetGraph;
 import org.apache.jena.sparql.core.DatasetGraphFactory;
@@ -75,7 +74,7 @@ public static QueryExecBuilder service(String serviceURL) {
      * settings are transferred.
      */
     public static QueryExecDatasetBuilder newBuilder() {
-        return QueryExecDatasetBuilderDeferred.create();
+        return QueryExecDatasetBuilder.create();
     }
 
     /**

jena-arq/src/main/java/org/apache/jena/sparql/exec/QueryExecDataset.java

@@ -66,7 +66,9 @@
 
 public class QueryExecDataset implements QueryExec
 {
-    public static QueryExecDatasetBuilder newBuilder() { return QueryExecDatasetBuilderDeferred.create(); }
+    public static QueryExecDatasetBuilder newBuilder() {
+        return QueryExecDatasetBuilder.create();
+    }
 
     private final Query              query;
     private String                   queryString = null;

jena-arq/src/main/java/org/apache/jena/sparql/exec/QueryExecDatasetBuilder.java

@@ -26,6 +26,7 @@
 import org.apache.jena.graph.Node;
 import org.apache.jena.query.Query;
 import org.apache.jena.query.Syntax;
+import org.apache.jena.sparql.SystemARQ;
 import org.apache.jena.sparql.core.DatasetGraph;
 import org.apache.jena.sparql.core.Var;
 import org.apache.jena.sparql.engine.binding.Binding;
@@ -37,13 +38,10 @@
 public interface QueryExecDatasetBuilder
     extends QueryExecBuilder
 {
-    /** Create an uninitialized {@link QueryExecDatasetBuilderDeferred}. */
-    public static QueryExecDatasetBuilder newBuilder() {
-        return QueryExecDatasetBuilderDeferred.create();
-    }
-
     public static QueryExecDatasetBuilder create() {
-        return QueryExecDatasetBuilderDeferred.create();
+        return SystemARQ.DeferredExecBuilders
+                ? QueryExecDatasetBuilderDeferred.create()
+                : QueryExecDatasetBuilderImpl.create();
     }
 
     // TODO SparqlAdapter binds QueryExecBuilder to a dsg - must not set it afterwards.

jena-arq/src/main/java/org/apache/jena/sparql/exec/QueryExecDatasetBuilderDeferred.java

@@ -28,6 +28,9 @@
 public class QueryExecDatasetBuilderDeferred
     extends QueryExecDatasetBuilderDeferredBase<QueryExecDatasetBuilderDeferred>
 {
+
+    private QueryExecDatasetBuilderDeferred() {}
+
     public static QueryExecDatasetBuilderDeferred create() {
         return new QueryExecDatasetBuilderDeferred();
     }