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 8d40f8603b2e3ee46f8397d1911707726c9fab80 Author: Andy Seaborne <[email protected]> AuthorDate: Fri Jul 3 17:03:25 2026 +0100 GH-4037: Rename packagings and cmd names in Fuseki --- .../org/apache/jena/fuseki/main/FusekiServer.java | 4 ++-- .../jena/fuseki/main/cmds/FusekiBasicCmd.java | 20 ++++------------ .../apache/jena/fuseki/main/cmds/FusekiCmd.java | 7 +++++- ...sekiBasicCmd.java => FusekiServerBasicCmd.java} | 2 +- .../jena/fuseki/main/cmds/FusekiServerCmd.java | 4 +++- .../fuseki/main/cmds/FusekiServerPlainCmd.java | 3 +-- .../apache/jena/fuseki/main/runner/FusekiArgs.java | 2 +- .../jena/fuseki/main/runner/FusekiRunner.java | 28 ++++++++++++++-------- .../apache/jena/fuseki/main/TestFusekiStart.java | 4 ++-- .../jena/fuseki/server/TestFusekiServer.java | 2 +- 10 files changed, 40 insertions(+), 36 deletions(-) diff --git a/jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/main/FusekiServer.java b/jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/main/FusekiServer.java index 3d70c493ab..80ffb58f22 100644 --- a/jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/main/FusekiServer.java +++ b/jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/main/FusekiServer.java @@ -117,7 +117,7 @@ public class FusekiServer { /** * Construct a Fuseki server from command line arguments. * The return server has not been started. - * @deprecated Use {@link FusekiMain#construct} or {@link FusekiRunner#basic()} + * @deprecated Use {@link FusekiMain#construct} or {@link FusekiRunner#serverBasic()} */ @Deprecated static public FusekiServer construct(String... args) { @@ -127,7 +127,7 @@ public class FusekiServer { /** * Run a Fuseki server using the command line arguments for setup * The returned server has been started. - * @deprecated Use {@link FusekiMain#run} or {@link FusekiRunner#basic()} + * @deprecated Use {@link FusekiMain#run} or {@link FusekiRunner#serverBasic()} */ @Deprecated static public FusekiServer run(String...args) { diff --git a/jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/main/cmds/FusekiBasicCmd.java b/jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/main/cmds/FusekiBasicCmd.java index 57347a6f1e..3b7c8daca4 100644 --- a/jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/main/cmds/FusekiBasicCmd.java +++ b/jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/main/cmds/FusekiBasicCmd.java @@ -21,22 +21,12 @@ package org.apache.jena.fuseki.main.cmds; -import org.apache.jena.fuseki.main.FusekiMain; -import org.apache.jena.fuseki.main.runner.FusekiRunner; - -/** Fuseki command that runs a minimal Fuseki server. No addition modules, no UI. - * <p> - * Use {@code --conf=} for multiple datasets and specific service names. - * <p> - * The command line dataset setup only supports a single dataset. +/** + * @deprecated Use {@link FusekiServerBasicCmd} */ +@Deprecated(forRemoval = true) public class FusekiBasicCmd { - /** - * Build and run, a server based on command line syntax. This operation does not - * return. See {@link FusekiMain#build} to build a server using command line - * syntax but not start it. - */ - static public void main(String... args) { - RunFuseki.run(args, FusekiRunner::execBasic); + public static void main(String[] args) { + FusekiServerBasicCmd.main(args); } } diff --git a/jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/main/cmds/FusekiCmd.java b/jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/main/cmds/FusekiCmd.java index 452ddb2397..fc374ec807 100644 --- a/jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/main/cmds/FusekiCmd.java +++ b/jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/main/cmds/FusekiCmd.java @@ -21,7 +21,12 @@ package org.apache.jena.fuseki.main.cmds; -/** Reserved. Entry point used by the combined jar and "--jar" (from v6.0.0) */ +/** + * Reserved. Entry point used by the combined jar and "--jar" (from v6.0.0) + * @deprecated Do not use. Equivalent to {@link FusekiServerUICmd} + */ + +@Deprecated(forRemoval = true) public class FusekiCmd { static public void main(String... args) { FusekiServerUICmd.main(args); diff --git a/jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/main/cmds/FusekiBasicCmd.java b/jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/main/cmds/FusekiServerBasicCmd.java similarity index 97% copy from jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/main/cmds/FusekiBasicCmd.java copy to jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/main/cmds/FusekiServerBasicCmd.java index 57347a6f1e..4e3a808147 100644 --- a/jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/main/cmds/FusekiBasicCmd.java +++ b/jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/main/cmds/FusekiServerBasicCmd.java @@ -30,7 +30,7 @@ import org.apache.jena.fuseki.main.runner.FusekiRunner; * <p> * The command line dataset setup only supports a single dataset. */ -public class FusekiBasicCmd { +public class FusekiServerBasicCmd { /** * Build and run, a server based on command line syntax. This operation does not * return. See {@link FusekiMain#build} to build a server using command line diff --git a/jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/main/cmds/FusekiServerCmd.java b/jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/main/cmds/FusekiServerCmd.java index d6a9915250..ddc8cb1502 100644 --- a/jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/main/cmds/FusekiServerCmd.java +++ b/jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/main/cmds/FusekiServerCmd.java @@ -21,9 +21,11 @@ package org.apache.jena.fuseki.main.cmds; -/** +/** * Old name used in the fuseki-server script up to v5.6.0 + * @deprecated Do not use. Equivalent to {@link FusekiServerUICmd} */ +@Deprecated(forRemoval = true) public class FusekiServerCmd { static public void main(String... args) { FusekiServerUICmd.main(args); diff --git a/jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/main/cmds/FusekiServerPlainCmd.java b/jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/main/cmds/FusekiServerPlainCmd.java index 042441bc9c..0820ba4e20 100644 --- a/jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/main/cmds/FusekiServerPlainCmd.java +++ b/jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/main/cmds/FusekiServerPlainCmd.java @@ -26,7 +26,7 @@ import org.apache.jena.fuseki.main.runner.FusekiRunner; /** * Fuseki command that runs a Fuseki server with all function except with UI. - * Shiro must be configured using the command line {@code --shiro=...} + * Shiro is configured using the command line {@code --shiro=...} * or using environment {@code FUSEKI_SHIRO}. * <p> * Use {@code --conf=} for multiple datasets and specific service names. @@ -44,4 +44,3 @@ public class FusekiServerPlainCmd { RunFuseki.run(args, FusekiRunner::execServerPlain); } } - 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 a37e402643..5ee7b2a722 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 @@ -211,7 +211,7 @@ public class FusekiArgs extends CmdGeneral { } private void argumentsSetup() { - modVersion.addClass("Fuseki", Fuseki.class); + //modVersion.addClass("Fuseki", Fuseki.class); getUsage().startCategory("Fuseki"); add(argConfig, "--config=FILE", 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 3e8d0b88c0..2d69fb18f8 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 @@ -72,20 +72,20 @@ public class FusekiRunner { */ enum FusekiForm { - BASIC("basic"), MAIN("main"), SERVER_PLAIN("server/plain"), SERVER("server/ui"); + SERVER_BASIC("server/basic"), SERVER_MAIN("server/main"), SERVER_PLAIN("server/plain"), SERVER_UI("server/ui"); final String fusekiFormName; FusekiForm(String string) { this.fusekiFormName = string; } } /** Minimal server - e.g. embedded use and testing. */ public static void execBasic(String...args) { - announcementExec(FusekiForm.BASIC); + announcementExec(FusekiForm.SERVER_BASIC); runnerBasic().exec(args); } /** Basic server */ public static void execMain(String...args) { - announcementExec(FusekiForm.MAIN); + announcementExec(FusekiForm.SERVER_MAIN); runnerMain().exec(args); } @@ -97,19 +97,22 @@ public class FusekiRunner { /** General server, with UI */ public static void execServerUI(String...args) { - announcementExec(FusekiForm.SERVER); + announcementExec(FusekiForm.SERVER_UI); runnerServerUI().exec(args); } /** Minimal server - e.g. embedded use and testing */ public static FusekiServer runAsyncBasic(String...args) { - announcementAsync(FusekiForm.BASIC); + announcementAsync(FusekiForm.SERVER_BASIC); return runnerBasic().runAsync(args); } - /** Basic server */ + /** + * Server with ping, Shiro and Prometheus. + * See {@link FusekiRunner#serverMain()}. + */ public static FusekiServer runAsyncMain(String...args) { - announcementAsync(FusekiForm.MAIN); + announcementAsync(FusekiForm.SERVER_MAIN); return runnerMain().runAsync(args); } @@ -121,19 +124,24 @@ public class FusekiRunner { /** General server, with UI */ public static FusekiServer runAsyncServerUI(String...args) { - announcementAsync(FusekiForm.SERVER); + announcementAsync(FusekiForm.SERVER_UI); return runnerServerUI().runAsync(args); } // @formatter:off + /** Minimal server - e.g. embedded use and testing */ - public static Runner basic() { return runnerBasic(); } + public static Runner serverBasic() { return runnerBasic(); } + /** Basic server */ - public static Runner main() { return runnerMain(); } + public static Runner serverMain() { return runnerMain(); } + /** All available server functionality, except admin functionality; no UI; Shiro configuration by command line or environment variable. */ public static Runner serverPlain() { return runnerServerPlain(); } + /** General server, with UI */ public static Runner serverUI() { return runnerServerUI(); } + // @formatter:on // Banners diff --git a/jena-fuseki2/jena-fuseki-main/src/test/java/org/apache/jena/fuseki/main/TestFusekiStart.java b/jena-fuseki2/jena-fuseki-main/src/test/java/org/apache/jena/fuseki/main/TestFusekiStart.java index 3cd6269e0e..8807c49fdb 100644 --- a/jena-fuseki2/jena-fuseki-main/src/test/java/org/apache/jena/fuseki/main/TestFusekiStart.java +++ b/jena-fuseki2/jena-fuseki-main/src/test/java/org/apache/jena/fuseki/main/TestFusekiStart.java @@ -75,12 +75,12 @@ public class TestFusekiStart { } @Test public void runner_01() { - FusekiServer server = FusekiRunner.basic().runAsync("--port=0", "--empty"); + FusekiServer server = FusekiRunner.serverBasic().runAsync("--port=0", "--empty"); server.stop(); } @Test public void runner_02() { - FusekiServer server = FusekiRunner.main().runAsync("--port=0", "--empty"); + FusekiServer server = FusekiRunner.serverMain().runAsync("--port=0", "--empty"); server.stop(); } diff --git a/jena-fuseki2/jena-fuseki-main/src/test/java/org/apache/jena/fuseki/server/TestFusekiServer.java b/jena-fuseki2/jena-fuseki-main/src/test/java/org/apache/jena/fuseki/server/TestFusekiServer.java index 7e416e47b6..d0832f6252 100644 --- a/jena-fuseki2/jena-fuseki-main/src/test/java/org/apache/jena/fuseki/server/TestFusekiServer.java +++ b/jena-fuseki2/jena-fuseki-main/src/test/java/org/apache/jena/fuseki/server/TestFusekiServer.java @@ -58,7 +58,7 @@ public class TestFusekiServer { String runBase = serverBase+"1"; setup(runBase); // Build-run command line - FusekiServer server = FusekiRunner.basic().runAsync("--port=0", "--empty"); + FusekiServer server = FusekiRunner.serverBasic().runAsync("--port=0", "--empty"); try { int port = server.getPort(); assertNotEquals(0, port, "Port is zero after async start");
