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

commit d9d07baedd936ed0d35ac134b9233fb35c526afb
Author: Andy Seaborne <[email protected]>
AuthorDate: Mon Nov 2 20:17:37 2026 +0000

    GH-4385: Add --set to Fuseki command line; add config example
---
 .../org/apache/jena/sparql/exec/http/Service.java  |  2 --
 .../src/main/java/arq/cmdline/CmdLib.java          | 37 ++++++++++----------
 jena-fuseki2/examples/config-set-context.ttl       | 39 ++++++++++++++++++++++
 .../jena/fuseki/main/runner/FusekiRunner.java      |  8 +++--
 .../fuseki/main/sys/FusekiServerArgsHandler.java   |  2 +-
 .../apache/jena/fuseki/mod/system/FMod_Ping.java   |  5 +++
 .../mod/system/{FMod_Ping.java => FMod_Set.java}   | 35 +++++++++++++------
 .../apache/jena/fuseki/mod/system/FMod_Stats.java  |  5 +++
 .../apache/jena/fuseki/mod/system/FMod_Tasks.java  |  6 ++++
 .../jena/fuseki/main/TestFusekiCmdLineArgs.java    | 16 +++++++++
 10 files changed, 121 insertions(+), 34 deletions(-)

diff --git 
a/jena-arq/src/main/java/org/apache/jena/sparql/exec/http/Service.java 
b/jena-arq/src/main/java/org/apache/jena/sparql/exec/http/Service.java
index b942694f88..20c3b554c7 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/exec/http/Service.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/exec/http/Service.java
@@ -190,9 +190,7 @@ public class Service {
 
         boolean silent = op.getSilent();
         String serviceURL = op.getService().getURI();
-
         checkServiceURL(serviceURL);
-
         Op opRemote = op.getSubOp();
         Query query;
         if ( false ) {
diff --git 
a/jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/mod/system/FMod_Stats.java
 b/jena-cmds/src/main/java/arq/cmdline/CmdLib.java
similarity index 51%
copy from 
jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/mod/system/FMod_Stats.java
copy to jena-cmds/src/main/java/arq/cmdline/CmdLib.java
index 83af5a7d07..3a4b727005 100644
--- 
a/jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/mod/system/FMod_Stats.java
+++ b/jena-cmds/src/main/java/arq/cmdline/CmdLib.java
@@ -19,29 +19,30 @@
  *   SPDX-License-Identifier: Apache-2.0
  */
 
-package org.apache.jena.fuseki.mod.system;
+package arq.cmdline;
 
-import org.apache.jena.cmd.CmdGeneral;
-import org.apache.jena.fuseki.main.runner.ServerArgs;
-import org.apache.jena.fuseki.main.sys.FusekiModule;
+import org.apache.jena.cmd.CmdException;
+import org.apache.jena.sparql.util.Context;
+import org.apache.jena.sparql.util.MappingRegistry;
+import org.apache.jena.sparql.util.Symbol;
 
 /**
- * Enable the {@code /$/stats} endpoint via the command line.
- * (May be disabled from a Fuseki server builder.)
+ * Library of shared code for commands.
  */
-public class FMod_Stats implements FusekiModule {
+public class CmdLib {
 
-    public static FusekiModule create() {
-        return new FMod_Stats();
-    }
+    /** Process the argument to "--set" */
+    public static void processArgSet(String setArg, Context context) {
+        String[] frags = setArg.split("=", 2);
+        if ( frags.length != 2 )
+            throw new CmdException("Can't split '" + setArg + "' -- looking 
for '=' to separate name and value");
+
+        String symbolName = frags[0];
+        String value = frags[1];
 
-    @Override
-    public void serverArgsModify(CmdGeneral fusekiCmd, ServerArgs serverArgs) {
-        serverArgs.withStats = true;
+        // Make it a long name.
+        symbolName = MappingRegistry.mapPrefixName(symbolName);
+        Symbol symbol = Symbol.create(symbolName);
+        context.set(symbol, value);
     }
-//
-//    @Override
-//    public void prepare(FusekiServer.Builder serverBuilder, Set<String> 
datasetNames, Model configModel) {
-//        serverBuilder.enableStats(true);
-//    }
 }
diff --git a/jena-fuseki2/examples/config-set-context.ttl 
b/jena-fuseki2/examples/config-set-context.ttl
new file mode 100644
index 0000000000..203cbc9f36
--- /dev/null
+++ b/jena-fuseki2/examples/config-set-context.ttl
@@ -0,0 +1,39 @@
+## Licensed under the terms of http://www.apache.org/licenses/LICENSE-2.0
+
+PREFIX :        <#>
+PREFIX fuseki:  <http://jena.apache.org/fuseki#>
+PREFIX rdf:     <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
+PREFIX rdfs:    <http://www.w3.org/2000/01/rdf-schema#>
+PREFIX ja:      <http://jena.hpl.hp.com/2005/11/Assembler#>
+PREFIX tdb2:    <http://jena.apache.org/2016/tdb#>
+
+## Server-wide timeout (all datasets).
+
+[] rdf:type fuseki:Server ;
+    # Disable SERVICE
+    # Context setting can be "server", as here,
+    # on the dataset or on the endpoint.
+    ja:context [ ja:cxtName "arq:httpServiceAllowed" ;  ja:cxtValue false ] ;
+    fuseki:services (
+       :service
+    ) .
+
+:service rdf:type fuseki:Service ;
+    fuseki:name "ds" ;
+    fuseki:endpoint [ 
+        fuseki:operation fuseki:query ;
+        fuseki:name "sparql"
+    ];
+    fuseki:endpoint [
+        fuseki:operation fuseki:query ;
+        fuseki:name "query"
+        # ja:context [ ja:cxtName "arq:httpServiceAllowed" ;  ja:cxtValue 
false ] ;
+    ] ;
+    fuseki:dataset :dataset
+    .
+
+# Transactional in-memory dataset.
+:dataset rdf:type ja:MemoryDataset ;
+    # ja:context [ ja:cxtName "arq:httpServiceAllowed" ;  ja:cxtValue false ] ;
+    ja:data "data.trig";
+    .
diff --git 
a/jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/main/runner/FusekiRunner.java
 
b/jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/main/runner/FusekiRunner.java
index 2d69fb18f8..72621e1ef0 100644
--- 
a/jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/main/runner/FusekiRunner.java
+++ 
b/jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/main/runner/FusekiRunner.java
@@ -34,6 +34,7 @@ import org.apache.jena.fuseki.mod.admin.FMod_Admin;
 import org.apache.jena.fuseki.mod.prometheus.FMod_Prometheus;
 import org.apache.jena.fuseki.mod.shiro.FMod_Shiro;
 import org.apache.jena.fuseki.mod.system.FMod_Ping;
+import org.apache.jena.fuseki.mod.system.FMod_Set;
 import org.apache.jena.fuseki.mod.ui.FMod_UI;
 import org.apache.jena.sys.JenaSystem;
 
@@ -191,13 +192,16 @@ public class FusekiRunner {
 
     // RDF publishing. No on-disk. No auto loaded modules.
     public static FusekiModules fmodsMain() {
-        return fmods0(FMod_Ping.create(),
+        return fmods0(FMod_Set.create(),
+                      FMod_Ping.create(),
                       FMod_Shiro.create(),
                       FMod_Prometheus.create());
     }
 
+    // Fuseki server with auto loading. No UI.
     public static FusekiModules fmodsServerPlain() {
-        return fmods(FMod_Ping.create(),
+        return fmods(FMod_Set.create(),
+                     FMod_Ping.create(),
                      FMod_Shiro.create(),
                      FMod_Prometheus.create()
                      );
diff --git 
a/jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/main/sys/FusekiServerArgsHandler.java
 
b/jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/main/sys/FusekiServerArgsHandler.java
index 7ad52a9907..194a679f45 100644
--- 
a/jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/main/sys/FusekiServerArgsHandler.java
+++ 
b/jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/main/sys/FusekiServerArgsHandler.java
@@ -30,7 +30,7 @@ import org.apache.jena.fuseki.main.runner.ServerArgs;
 import org.apache.jena.rdf.model.Model;
 
 /**
- * Interface to implement for extending the CLI argument parsing portion of a
+ * Interface to extend the CLI argument parsing portion of a
  * {@link FusekiServer} which task place in {@link FusekiArgs}
  * <p>
  * This is one of several interfaces combined into the extension mechanism of 
{@link FusekiModule}.
diff --git 
a/jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/mod/system/FMod_Ping.java
 
b/jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/mod/system/FMod_Ping.java
index a83f719eec..a475afcad2 100644
--- 
a/jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/mod/system/FMod_Ping.java
+++ 
b/jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/mod/system/FMod_Ping.java
@@ -36,6 +36,11 @@ public class FMod_Ping implements FusekiModule {
         return new FMod_Ping();
     }
 
+    private FMod_Ping() {}
+
+    @Override
+    public String name() { return "FMod Ping"; }
+
     @Override
     public void serverArgsModify(CmdGeneral fusekiCmd, ServerArgs serverArgs) {
         // Initial setting.
diff --git 
a/jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/mod/system/FMod_Ping.java
 
b/jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/mod/system/FMod_Set.java
similarity index 59%
copy from 
jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/mod/system/FMod_Ping.java
copy to 
jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/mod/system/FMod_Set.java
index a83f719eec..5e43223f45 100644
--- 
a/jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/mod/system/FMod_Ping.java
+++ 
b/jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/mod/system/FMod_Set.java
@@ -21,34 +21,47 @@
 
 package org.apache.jena.fuseki.mod.system;
 
+import arq.cmdline.CmdLib;
 import org.apache.jena.cmd.ArgDecl;
 import org.apache.jena.cmd.CmdGeneral;
 import org.apache.jena.fuseki.main.runner.ServerArgs;
 import org.apache.jena.fuseki.main.sys.FusekiModule;
+import org.apache.jena.query.ARQ;
+import org.apache.jena.sparql.util.Context;
 
 /**
- * Enable the {@code /$/ping} endpoint via the command line.
- * (May be disabled from a Fuseki server builder.)
+ * Provide setting of context symbols for Fuseki.
  */
-public class FMod_Ping implements FusekiModule {
+public class FMod_Set implements FusekiModule {
+
+    // Align with ModContext.
+    private static ArgDecl argSet = new ArgDecl(ArgDecl.HasValue, "set", 
"define", "defn", "def");
 
     public static FusekiModule create() {
-        return new FMod_Ping();
+        return new FMod_Set();
     }
 
+    private FMod_Set() {}
+
+    @Override
+    public String name() { return "FMod Set"; }
+
     @Override
     public void serverArgsModify(CmdGeneral fusekiCmd, ServerArgs serverArgs) {
-        // Initial setting.
-        serverArgs.withPing = true;
+        fusekiCmd.add(argSet, "--set", "Set a configuration symbol to a 
value");
     }
 
-    private final static ArgDecl  argWithPing = new ArgDecl(ArgDecl.NoValue,  
"withPing", "ping");
-
     @Override
     public void serverArgsPrepare(CmdGeneral fusekiCmd, ServerArgs serverArgs) 
{
-        // As a default.
-        if ( ! fusekiCmd.contains(argWithPing) )
-            serverArgs.withPing = true;
+        if ( fusekiCmd.contains(argSet) ) {
+            // Isolate while processing.
+            Context context = new Context();
+            for ( String arg : fusekiCmd.getValues(argSet) ) {
+                CmdLib.processArgSet(arg, context);
+            }
+            // Currently, has to be visible to the query engine throughout the 
JVM.
+            ARQ.getContext().putAll(context);
+        }
     }
 
 }
diff --git 
a/jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/mod/system/FMod_Stats.java
 
b/jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/mod/system/FMod_Stats.java
index 83af5a7d07..9622681c01 100644
--- 
a/jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/mod/system/FMod_Stats.java
+++ 
b/jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/mod/system/FMod_Stats.java
@@ -35,6 +35,11 @@ public class FMod_Stats implements FusekiModule {
         return new FMod_Stats();
     }
 
+    private FMod_Stats() {}
+
+    @Override
+    public String name() { return "FMod Stats"; }
+
     @Override
     public void serverArgsModify(CmdGeneral fusekiCmd, ServerArgs serverArgs) {
         serverArgs.withStats = true;
diff --git 
a/jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/mod/system/FMod_Tasks.java
 
b/jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/mod/system/FMod_Tasks.java
index c4870ac8f4..499bea7f51 100644
--- 
a/jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/mod/system/FMod_Tasks.java
+++ 
b/jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/mod/system/FMod_Tasks.java
@@ -33,6 +33,12 @@ public class FMod_Tasks implements FusekiModule {
         // Not in ServerArgs
         throw new NotImplemented();
     }
+
+    private FMod_Tasks() {}
+
+    @Override
+    public String name() { return "FMod Tasks"; }
+
 //
 //    public static FusekiModule create() {
 //        return new FMod_Tasks();
diff --git 
a/jena-fuseki2/jena-fuseki-main/src/test/java/org/apache/jena/fuseki/main/TestFusekiCmdLineArgs.java
 
b/jena-fuseki2/jena-fuseki-main/src/test/java/org/apache/jena/fuseki/main/TestFusekiCmdLineArgs.java
index 0f74daaaca..62af9c0980 100644
--- 
a/jena-fuseki2/jena-fuseki-main/src/test/java/org/apache/jena/fuseki/main/TestFusekiCmdLineArgs.java
+++ 
b/jena-fuseki2/jena-fuseki-main/src/test/java/org/apache/jena/fuseki/main/TestFusekiCmdLineArgs.java
@@ -24,6 +24,7 @@ package org.apache.jena.fuseki.main;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.io.IOException;
 import java.util.Arrays;
@@ -35,10 +36,13 @@ import org.junit.jupiter.api.Test;
 import org.apache.jena.atlas.json.JSON;
 import org.apache.jena.atlas.lib.FileOps;
 import org.apache.jena.atlas.web.TypedInputStream;
+import org.apache.jena.fuseki.Fuseki;
+import org.apache.jena.fuseki.main.runner.FusekiRunner;
 import org.apache.jena.fuseki.system.FusekiLogging;
 import org.apache.jena.http.HttpOp;
 import org.apache.jena.query.ResultSetFormatter;
 import org.apache.jena.rdfconnection.RDFConnection;
+import org.apache.jena.sparql.util.Symbol;
 
 /**
  * Test Fuseki command line.
@@ -130,4 +134,16 @@ public class TestFusekiCmdLineArgs {
         assertNotNull(x1);
         // Leaves "DB-compact" behind.
     }
+
+    @Test public void set_01() throws IOException {
+        Symbol testSymbol = Symbol.create("TEST");
+
+        // Not started but command line parsed and setup done.
+        FusekiRunner.serverMain().construct("--set", 
testSymbol.getSymbol()+"=998", "--mem", "/ds");
+
+        assertTrue(Fuseki.getContext().isDefined(testSymbol));
+        assertEquals("998", Fuseki.getContext().getAsString(testSymbol));
+        // Command line - only strings.
+        assertEquals("998", Fuseki.getContext().get(testSymbol));
+    }
 }

Reply via email to