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
The following commit(s) were added to refs/heads/main by this push:
new 969df0d06f JENA-2182: Pass builder into FusekiModule.configured()
new 2930e63190 Merge pull request #1398 from afs/fuseki-modules
969df0d06f is described below
commit 969df0d06f6ae0fb24f0e46f3980b20518dbfd6f
Author: Andy Seaborne <a...@apache.org>
AuthorDate: Wed Jun 22 22:12:37 2022 +0100
JENA-2182: Pass builder into FusekiModule.configured()
---
.../src/main/java/org/apache/jena/fuseki/main/FusekiServer.java | 2 +-
.../main/java/org/apache/jena/fuseki/main/sys/FusekiModule.java | 8 ++++----
.../java/org/apache/jena/fuseki/main/sys/FusekiModuleStep.java | 4 ++--
3 files changed, 7 insertions(+), 7 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 95d94495dd..a375607aa4 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
@@ -1198,7 +1198,7 @@ public class FusekiServer {
DataAccessPointRegistry dapRegistry = buildStart();
// FusekiModule call - inspect the DataAccessPointRegistry.
- FusekiModuleStep.configured(dapRegistry, configModel);
+ FusekiModuleStep.configured(this, dapRegistry, configModel);
buildSecurity(dapRegistry);
try {
diff --git
a/jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/main/sys/FusekiModule.java
b/jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/main/sys/FusekiModule.java
index 650d022c26..96e2b51e66 100644
---
a/jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/main/sys/FusekiModule.java
+++
b/jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/main/sys/FusekiModule.java
@@ -46,7 +46,7 @@ import org.apache.jena.rdf.model.Model;
* <li>{@linkplain #serverBeforeStarting(FusekiServer)} -- called before
{@code server.start} happens.</li>
* <li>{@linkplain #serverAfterStarting(FusekiServer)} -- called after {@code
server.start} happens.</li>
* <li>{@linkplain #serverStopped(FusekiServer)} -- call after {@code
server.stop}, but only if a clean shutdown happens.
- * Servers may simply exit without shutdown phase.
+ * Servers may simply exit without a shutdown phase.
* The JVM may exit or be killed without clean shutdown.
* Modules must not rely on a call to {@code serverStopped} happening.</li>
* <li>{@linkplain #stop} -- modules finishes. Unlikely to be called in
practice. There is no guarantee of a clean shutdown.
@@ -54,7 +54,7 @@ import org.apache.jena.rdf.model.Model;
*/
public interface FusekiModule extends SubsystemLifecycle {
/**
- * Display name id to identify this module.
+ * Display name to identify this module.
* <p>
* Modules are loaded once by the service loader.
* <p>
@@ -70,7 +70,7 @@ public interface FusekiModule extends SubsystemLifecycle {
/**
* Called at the start of "build" step. The builder has been set according
to the
- * configuration of API calls and paring configuration files. No build
actions have been carried out yet.
+ * configuration of API calls and parsing configuration files. No build
actions have been carried out yet.
* The module can make further FusekiServer.{@link Builder} calls.
* The "configModel" parameter is set if a configuration file was used
otherwise it is null.
* <p>
@@ -95,7 +95,7 @@ public interface FusekiModule extends SubsystemLifecycle {
* dapRegistry.accessPoints().forEach(accessPoint{@literal
->}configDataAccessPoint(accessPoint, configModel));
* </pre>
*/
- public default void configured(DataAccessPointRegistry dapRegistry, Model
configModel) {
+ public default void configured(FusekiServer.Builder serverBuilder,
DataAccessPointRegistry dapRegistry, Model configModel) {
dapRegistry.accessPoints().forEach(accessPoint->configDataAccessPoint(accessPoint,
configModel));
}
diff --git
a/jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/main/sys/FusekiModuleStep.java
b/jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/main/sys/FusekiModuleStep.java
index 42d1d5a6d1..84223860ed 100644
---
a/jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/main/sys/FusekiModuleStep.java
+++
b/jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/main/sys/FusekiModuleStep.java
@@ -39,8 +39,8 @@ public class FusekiModuleStep {
* The DataAccessPointRegistry that will be used to build the server.
*
*/
- public static void configured(DataAccessPointRegistry dapRegistry, Model
configModel) {
- FusekiModules.forEachModule(module -> module.configured(dapRegistry,
configModel));
+ public static void configured(FusekiServer.Builder serverBuilder,
DataAccessPointRegistry dapRegistry, Model configModel) {
+ FusekiModules.forEachModule(module -> module.configured(serverBuilder,
dapRegistry, configModel));
}
/**
