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 04c01f9f168009e234fc28b1dd1a90a03ed51fc1 Author: Andy Seaborne <[email protected]> AuthorDate: Fri Mar 13 21:26:44 2026 +0000 Fix: FusekiMain.builder default to std 'main' modules --- .../org/apache/jena/fuseki/main/FusekiMain.java | 5 ++++- .../apache/jena/fuseki/main/runner/FusekiArgs.java | 25 ++-------------------- 2 files changed, 6 insertions(+), 24 deletions(-) diff --git a/jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/main/FusekiMain.java b/jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/main/FusekiMain.java index c7ab0263ed..2a7ccc8b69 100644 --- a/jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/main/FusekiMain.java +++ b/jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/main/FusekiMain.java @@ -97,8 +97,11 @@ public class FusekiMain { * @param args Command line syntax */ public static FusekiServer.Builder builder(FusekiModules fusekiModules, String... args) { + FusekiModules fmods = fusekiModules; + if ( fmods == null ) + fmods = FusekiRunner.fmodsMain(); FusekiServer.Builder builder = FusekiServer.create(); - FusekiArgs.applyArgs(builder, fusekiModules, args); + FusekiArgs.applyArgs(builder, fmods, args); return builder; } } diff --git a/jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/main/runner/FusekiArgs.java b/jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/main/runner/FusekiArgs.java index ddbc42a87d..65ceb3deda 100644 --- a/jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/main/runner/FusekiArgs.java +++ b/jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/main/runner/FusekiArgs.java @@ -178,9 +178,10 @@ public class FusekiArgs extends CmdGeneral { static String argUsage = "[--config=FILE|--mem|--loc=DIR|--file=FILE] [--port PORT] /DatasetPathName"; + /** Calls to {@code FusekiArgs} should provide the intended fuseki modules. */ /*package*/ FusekiArgs(FusekiModules fusekiModules, String... args) { super(args); - Objects.requireNonNull(fusekiModules); + Objects.requireNonNull(fusekiModules, "FusekiModules argument must not be null"); this.serverArgs.fusekiModules = fusekiModules; // serverArgsHandlers for argument processing. this.serverArgsHandlersList = ( fusekiModules == null ) ? FusekiModules.empty().asList() : fusekiModules.asList(); @@ -547,28 +548,6 @@ public class FusekiArgs extends CmdGeneral { serverArgs.jettyConfigFile = jettyConfigFile; } - // No-op. - // To be removed. -// boolean withModules = hasValueOfTrue(argEnableModules); -// if ( withModules ) { -// // Passed in when the FusekiArgs object was created -// FusekiModules presetModules = serverArgs.fusekiModules; -// // Get auto modules from system-wide setup. -// FusekiModules autoModules = FusekiModules.getSystemModules(); -// -// // Merge preset and auto-loaded modules into one FusekiModules instance. -// if ( presetModules == null ) { -// serverArgs.fusekiModules = autoModules; -// } else { -// List<FusekiModule> allModules = Stream.concat( -// presetModules.asList().stream(), -// autoModules.asList().stream()) -// .distinct() -// .toList(); -// serverArgs.fusekiModules = FusekiModules.create(allModules); -// } -// } - if ( contains(argCORS) ) { String corsConfigFile = getValue(argCORS); if ( ! FileOps.exists(corsConfigFile) )
