GH-2753: Improve customising Fuseki args #2754
Draft
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Improves how Fuseki arguments are customised, in particular makes the ServerConfig class public adding the ability to store extra configuration on it. It also changes the previously private static applyServerArgs() method into a protected instance method so users can extend FusekiMain and override it to use that to customise the FusekiServer.Builder further. Unit tests are added that validate that custom arguments can now be passed through CLI inputs and used to influence the Server being built.
afs
reviewed
Oct 7, 2024
| @@ -23,12 +23,15 @@ | |||
| import org.apache.jena.graph.Graph; | |||
| import org.apache.jena.sparql.core.DatasetGraph; | |||
|
|
|||
| import java.util.HashMap; | |||
| import java.util.Map; | |||
|
|
|||
| /** | |||
| * Setup details (command line, config file) from command line processing. | |||
| * This is built by {@link FusekiMain#exec}. | |||
| * This is processed by {@link FusekiMain#buildServer}. | |||
There was a problem hiding this comment.
Suggested change
| * This is processed by {@link FusekiMain#buildServer}. | |
| * This is processed by {@link FusekiMain#applyServerArgs}. |
buildServer is removed by this PR.
Comment on lines
+68
to
+80
| private void testForCmdException(List<String> arguments, String expectedMessage) { | ||
| // when | ||
| Throwable actual = null; | ||
| try { | ||
| buildServer(buildCmdLineArguments(arguments)); | ||
| } catch (Exception e) { | ||
| actual = e; | ||
| } | ||
| // then | ||
| assertNotNull(actual); | ||
| assertTrue("Expecting correct exception", (actual instanceof CmdException)); | ||
| assertEquals("Expecting correct message", expectedMessage, actual.getMessage()); | ||
| } |
There was a problem hiding this comment.
Suggested change
| private void testForCmdException(List<String> arguments, String expectedMessage) { | |
| // when | |
| Throwable actual = null; | |
| try { | |
| buildServer(buildCmdLineArguments(arguments)); | |
| } catch (Exception e) { | |
| actual = e; | |
| } | |
| // then | |
| assertNotNull(actual); | |
| assertTrue("Expecting correct exception", (actual instanceof CmdException)); | |
| assertEquals("Expecting correct message", expectedMessage, actual.getMessage()); | |
| } | |
| private void testForCmdException(List<String> arguments, String expectedMessage) { | |
| CmdException ex = assertThrows(CmdException.class, ()->buildServer(buildCmdLineArguments(arguments))); | |
| assertEquals("Expecting correct message", expectedMessage, ex.getMessage()); | |
| } |
mixing Junit 4 and junit5.
Not that this function is actually called from anywhere!
| server.stop(); | ||
| } | ||
|
|
||
| @Test |
There was a problem hiding this comment.
This seems to be the only test and the rest of the code is taken from TestFusekiCmdArguments.
Move TestFusekiCmdArguments or DRY the code?
|
Release 5.2.0 is approaching. I have a discussion point #2753 (comment) which is about whether this feature now will fit into future possible changes and some code comments here. Would you prefer to wait or get into 5.2.0? |
|
See larger discussion response on #2753, let's leave this out for now and look at other options as we can workaround this for now |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Improves how Fuseki arguments are customised, in particular makes the
ServerConfigclass public adding the ability to store extra configuration on it.It also changes the previously
private static applyServerArgs()method into a protected instance method so users can extendFusekiMainand override it to use that to customise theFusekiServer.Builderfurther.Unit tests are added that validate that custom arguments can now be passed through CLI inputs and used to influence the Server being built.
GitHub issue resolved #2753
By submitting this pull request, I acknowledge that I am making a contribution to the Apache Software Foundation under the terms and conditions of the Contributor's Agreement.
See the Apache Jena "Contributing" guide.