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 02ecb71c7033dc09cd929474c9884045dfaa9dc1 Author: Andy Seaborne <[email protected]> AuthorDate: Sat Apr 6 14:15:00 2024 +0100 Abstraction -- FusekiLifecycle --- .../main/java/org/apache/jena/fuseki/build/FusekiExt.java | 2 +- .../org/apache/jena/fuseki/main/sys/FusekiActionCycle.java | 2 +- .../org/apache/jena/fuseki/main/sys/FusekiAutoModule.java | 4 ++-- .../sys/{FusekiActionCycle.java => FusekiLifecycle.java} | 13 +++++++++++-- 4 files changed, 15 insertions(+), 6 deletions(-) diff --git a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/build/FusekiExt.java b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/build/FusekiExt.java index a982c76f12..2b890808af 100644 --- a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/build/FusekiExt.java +++ b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/build/FusekiExt.java @@ -31,7 +31,7 @@ public class FusekiExt { // Additional operations provided by extension, added via Jena init / typically ServiceLoader // These are used in FuskeiConfig. - // Left in case in the future we want to have customized defautl setup. + // Left in case in the future we want to have customized default setup. // Currently, Jena5, the preferred way is to have control via config.ttl or FusekiServer.Builder. /*package*/ static Map<String, Operation> extraOperationServicesRead = null; /*package*/ static Map<String, Operation> extraOperationServicesWrite = null; diff --git a/jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/main/sys/FusekiActionCycle.java b/jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/main/sys/FusekiActionCycle.java index 1c511ff887..180a1c5cf5 100644 --- a/jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/main/sys/FusekiActionCycle.java +++ b/jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/main/sys/FusekiActionCycle.java @@ -18,7 +18,7 @@ package org.apache.jena.fuseki.main.sys; -/** Extension access to Fuseki disptch and execution. */ +/** Extension access to Fuseki dispatch and execution. */ public interface FusekiActionCycle { // Placeholder. } diff --git a/jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/main/sys/FusekiAutoModule.java b/jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/main/sys/FusekiAutoModule.java index b361ee7601..1b43f5c69e 100644 --- a/jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/main/sys/FusekiAutoModule.java +++ b/jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/main/sys/FusekiAutoModule.java @@ -20,7 +20,6 @@ package org.apache.jena.fuseki.main.sys; import java.util.Set; -import org.apache.jena.base.module.SubsystemLifecycle; import org.apache.jena.fuseki.main.FusekiServer; import org.apache.jena.fuseki.server.DataAccessPoint; import org.apache.jena.fuseki.server.DataAccessPointRegistry; @@ -62,10 +61,11 @@ import org.apache.jena.rdf.model.Model; * Modules must not rely on a call to {@code serverStopped} happening.</li> * </ul> */ -public interface FusekiAutoModule extends FusekiModule, SubsystemLifecycle { +public interface FusekiAutoModule extends FusekiModule, FusekiLifecycle { // Inherited javadoc. // Methods mentioned here to show all method interfaces in one place. + /** {@inheritDoc} */ @Override public String name(); diff --git a/jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/main/sys/FusekiActionCycle.java b/jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/main/sys/FusekiLifecycle.java similarity index 66% copy from jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/main/sys/FusekiActionCycle.java copy to jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/main/sys/FusekiLifecycle.java index 1c511ff887..70ddbb3973 100644 --- a/jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/main/sys/FusekiActionCycle.java +++ b/jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/main/sys/FusekiLifecycle.java @@ -18,7 +18,16 @@ package org.apache.jena.fuseki.main.sys; -/** Extension access to Fuseki disptch and execution. */ -public interface FusekiActionCycle { +import org.apache.jena.base.module.SubsystemLifecycle; + +/** + * A {@link SubsystemLifecycle} for Fuseki. + * This lifecycle is run after Jena system initialization. + * Jena system initialization includes system initialization of Fuseki itself + * in {@link InitFuseki}. + * This lifecycle is for extensions to an initialized Fuseki server + * and is used via {@link FusekiAutoModule}. + */ +public interface FusekiLifecycle extends SubsystemLifecycle { // Placeholder. }
