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 1a1378a359361928c3b74ae3fd9ad64449c6cdd9 Author: Andy Seaborne <[email protected]> AuthorDate: Mon Jan 6 11:11:59 2025 +0000 Tidy comments --- .../jena/fuseki/main/cmds/ArgCustomisers.java | 3 +- .../apache/jena/fuseki/main/cmds/FusekiMain.java | 73 +++++++++++----------- .../jena/fuseki/main/sys/FusekiBuildCycle.java | 4 +- 3 files changed, 38 insertions(+), 42 deletions(-) diff --git a/jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/main/cmds/ArgCustomisers.java b/jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/main/cmds/ArgCustomisers.java index c83b2fc1de..b022ba6fe3 100644 --- a/jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/main/cmds/ArgCustomisers.java +++ b/jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/main/cmds/ArgCustomisers.java @@ -28,8 +28,7 @@ import org.apache.jena.fuseki.main.sys.FusekiModules; import org.apache.jena.fuseki.main.sys.FusekiServerArgsCustomiser; /** - * The list of {@link FusekiServerArgsCustomiser} used by FusekiMain. - * + * The list of {@link FusekiServerArgsCustomiser FusekiServerArgsCustomisers} used by FusekiMain. */ class ArgCustomizers { private ArgCustomizers(){} diff --git a/jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/main/cmds/FusekiMain.java b/jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/main/cmds/FusekiMain.java index 6f4636b730..be5a6314a8 100644 --- a/jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/main/cmds/FusekiMain.java +++ b/jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/main/cmds/FusekiMain.java @@ -222,12 +222,6 @@ public class FusekiMain extends CmdARQ { action.accept(customiser); } } -// -// private List<FusekiServerArgsCustomiser> customiseServerArgs() { -// if ( customiseServerArgs == null ) -// customiseServerArgs = new arrayList<>(); -// return customiseServerArgs; -// } // Customiser Lifecycle // @@ -243,8 +237,8 @@ public class FusekiMain extends CmdARQ { // -- End of applyServerArgs // ---- FusekiServerArgsCustomiser.serverArgsBuilder(FusekiServer.Builder serverBuilder, Model configModel) - // == builder.build. - // Decide FusekiModules + // == Enter the build lifecycle in builder.build(). + // Decide FusekiModules for the build. // --> then into FusekiBuildCycle.prepare(FusekiServer.Builder serverBuilder, Set<String> datasetNames, Model configModel) { } protected FusekiMain(String... argv) { @@ -255,8 +249,9 @@ public class FusekiMain extends CmdARQ { } private void argumentsSetup() { + modVersion.addClass("Fuseki", Fuseki.class); + getUsage().startCategory("Fuseki"); - add(argConfig, "--config=FILE", "Use a configuration file to determine the services"); // ---- Describe the dataset on the command line. @@ -296,10 +291,8 @@ public class FusekiMain extends CmdARQ { "https port (default port is 3043)"); add(argPasswdFile, "--passwd=FILE", "Password file"); - add(argTimeout, "--timeout=", "Global timeout applied to queries (value in ms) -- format is X[,Y] "); - // ---- Servlets add(argSparqler, "--sparqler=DIR", "Run with SPARQLer services Directory for static content"); @@ -322,8 +315,6 @@ public class FusekiMain extends CmdARQ { add(argEnableModules, "--modules=true|false", "Enable Fuseki autoloaded modules"); - super.modVersion.addClass("Fuseki", Fuseki.class); - applyCustomisers(customiser -> customiser.serverArgsModify(this, serverArgs)); } @@ -640,32 +631,17 @@ public class FusekiMain extends CmdARQ { @Override protected void exec() { - // Arguments have been processed to set serverArgs - // Check for command line or config setup. + FusekiCoreInfo.logCode(Fuseki.serverLog); + FusekiServer server = execMakeServer(); + execStartServer(server); + } + + private FusekiServer execMakeServer() { try { - Logger log = Fuseki.serverLog; - FusekiCoreInfo.logCode(log); - FusekiServer server = makeServer(serverArgs); - infoCmd(server, log); - try { - server.start(); - } catch (FusekiException ex) { - if ( ex.getCause() instanceof BindException ) { - if ( serverArgs.jettyConfigFile == null ) - Fuseki.serverLog.error("Failed to start server: "+ex.getCause().getMessage()+ ": port="+serverArgs.port); - else - Fuseki.serverLog.error("Failed to start server: "+ex.getCause().getMessage()+ ": port in use"); - System.exit(1); - } - throw ex; - } catch (Exception ex) { - throw new FusekiException("Failed to start server: " + ex.getMessage(), ex); - } - // This does not normally return. - server.join(); - System.exit(0); - } - catch (AssemblerException | FusekiException ex) { + FusekiCoreInfo.logCode(Fuseki.serverLog); + // Arguments have been processed to produce serverArgs in processModulesAndArgs() + return makeServer(serverArgs); + } catch (AssemblerException | FusekiException ex) { if ( ex.getCause() != null ) System.err.println(ex.getCause().getMessage()); else @@ -674,6 +650,27 @@ public class FusekiMain extends CmdARQ { } } + private void execStartServer(FusekiServer server) { + infoCmd(server, Fuseki.serverLog); + try { + server.start(); + } catch (FusekiException ex) { + if ( ex.getCause() instanceof BindException ) { + if ( serverArgs.jettyConfigFile == null ) + Fuseki.serverLog.error("Failed to start server: "+ex.getCause().getMessage()+ ": port="+serverArgs.port); + else + Fuseki.serverLog.error("Failed to start server: "+ex.getCause().getMessage()+ ": port in use"); + System.exit(1); + } + throw ex; + } catch (Exception ex) { + throw new FusekiException("Failed to start server: " + ex.getMessage(), ex); + } + // This does not normally return. + server.join(); + System.exit(0); + } + /** * Take a {@link ServerArgs} and make a {@Link FusekiServer}. * The server has not been started. diff --git a/jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/main/sys/FusekiBuildCycle.java b/jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/main/sys/FusekiBuildCycle.java index 33f865b3b1..31208bc69d 100644 --- a/jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/main/sys/FusekiBuildCycle.java +++ b/jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/main/sys/FusekiBuildCycle.java @@ -82,8 +82,8 @@ public interface FusekiBuildCycle { /** * This method is called for each {@link DataAccessPoint} by the default - * implementation of {@link #configured} after the new servers - * DataAccessPointRegistry has been built. + * implementation of {@link #configured} after the new server's + * {@link DataAccessPointRegistry} has been built. */ public default void configDataAccessPoint(DataAccessPoint dap, Model configModel) {}
