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 ca09e240b6d17928c354d5cf2d7c7983c74620a7 Author: Andy Seaborne <[email protected]> AuthorDate: Fri Jun 13 09:04:20 2025 +0100 Code tidy - remove unused --- .../src/main/java/org/apache/jena/fuseki/Fuseki.java | 5 ++--- .../org/apache/jena/fuseki/server/ValidString.java | 1 - .../org/apache/jena/fuseki/main/FusekiServer.java | 20 -------------------- .../org/apache/jena/fuseki/mgt/FusekiServerCtl.java | 11 +++++++++-- .../org/apache/jena/fuseki/mod/admin/FMod_Admin.java | 3 --- .../apache/jena/fuseki/mod/admin/LocalhostOnly.java | 1 - .../apache/jena/fuseki/main/TestFusekiStdSetup.java | 3 --- .../access/AbstractTestFusekiSecurityAssembler.java | 5 +---- .../access/TestFusekiSecurityAssemblerSeparate.java | 2 +- .../access/TestFusekiSecurityAssemblerShared.java | 2 +- .../fuseki/main/access/TestSecurityFilterFuseki.java | 10 +++++----- .../main/prefixes/TestPrefixesActionResponse.java | 4 ---- .../jena/fuseki/main/sys/TestFusekiModules.java | 2 -- 13 files changed, 19 insertions(+), 50 deletions(-) diff --git a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/Fuseki.java b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/Fuseki.java index 2c39ab0497..beca3d7f2a 100644 --- a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/Fuseki.java +++ b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/Fuseki.java @@ -23,7 +23,6 @@ import java.util.TimeZone; import java.util.concurrent.TimeUnit; import jakarta.servlet.ServletContext; - import org.apache.jena.atlas.lib.DateTimeUtils; import org.apache.jena.atlas.lib.Version; import org.apache.jena.fuseki.system.FusekiCore; @@ -32,6 +31,7 @@ import org.apache.jena.riot.system.stream.LocatorFTP; import org.apache.jena.riot.system.stream.LocatorHTTP; import org.apache.jena.riot.system.stream.StreamManager; import org.apache.jena.sparql.util.Context; +import org.apache.jena.sparql.util.Symbol; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -45,8 +45,7 @@ public class Fuseki { static public final String FusekiIRI = "http://jena.apache.org/Fuseki";; /** - * a unique IRI including the symbol notation for which properties should be - * appended + * A Fuseki base IRI for {@link Symbol Symbols} */ static public final String FusekiSymbolIRI = "http://jena.apache.org/fuseki#";; diff --git a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/server/ValidString.java b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/server/ValidString.java index 99f746b91b..620410aae9 100644 --- a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/server/ValidString.java +++ b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/server/ValidString.java @@ -38,7 +38,6 @@ public class ValidString { return new ValidString(string, validator); } - // It's a record. public final String string; public final Validator validator; 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 b7787b6de1..8f8cb9991c 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 @@ -25,7 +25,6 @@ import static org.apache.jena.fuseki.Fuseki.serverLog; import java.io.IOException; import java.nio.file.Path; import java.util.*; -import java.util.function.Function; import java.util.function.Predicate; import jakarta.servlet.Filter; @@ -61,7 +60,6 @@ import org.apache.jena.graph.Node; import org.apache.jena.query.Dataset; import org.apache.jena.rdf.model.Model; import org.apache.jena.rdf.model.ModelFactory; -import org.apache.jena.rdf.model.Resource; import org.apache.jena.sparql.core.DatasetGraph; import org.apache.jena.sparql.core.assembler.AssemblerUtils; import org.apache.jena.sparql.util.Context; @@ -474,9 +472,6 @@ public class FusekiServer { private String httpsKeystore = null; private String httpsKeystorePasswd = null; - // Bearer authentication : verify and extract the user for a request. - private Function<String, String> bearerVerifiedUser = null; - // Other servlets to add. The pathspec for servlets must be unique. // Order does not matter, the rules of pathspec dispatch are "exact match" // before "prefix match". @@ -933,16 +928,6 @@ public class FusekiServer { return this; } - /** - * Server level setting specific to Fuseki main. - * General settings done by {@link FusekiConfig#processServerConfiguration}. - */ - private void processConfigServerLevel(Resource server) { - if ( server == null ) - return; - processConfigServerLevel(server.getModel().getGraph(), server.asNode()); - } - private void processConfigServerLevel(Graph config, Node server) { if ( server == null ) return; @@ -957,11 +942,6 @@ public class FusekiServer { serverAuth = FusekiConfig.allowedUsers(config, server); } - /** Process password file, auth and realm settings on the server description. **/ - private void processConfAuthentication(Resource server) { - - } - private void processConfAuthentication(Graph config, Node server) { String passwdFile = getAsString(config, server, FusekiVocabG.pPasswordFile); if ( passwdFile != null ) diff --git a/jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/mgt/FusekiServerCtl.java b/jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/mgt/FusekiServerCtl.java index 0407df4e04..a255b9b20c 100644 --- a/jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/mgt/FusekiServerCtl.java +++ b/jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/mgt/FusekiServerCtl.java @@ -59,6 +59,9 @@ import org.apache.jena.sparql.core.DatasetGraph; import org.apache.jena.sparql.core.assembler.AssemblerUtils; import org.apache.jena.system.G; +/** + * Each server with management has a {@code FusekiServerCtl} object for its per-server configuration. + */ public class FusekiServerCtl { public static final String envFusekiBase = "FUSEKI_BASE"; public static final String envFusekiShiro = "FUSEKI_SHIRO"; @@ -108,15 +111,16 @@ public class FusekiServerCtl { /** Directory for assembler files */ public static Path dirTemplates = null; - private static boolean initialized = false; // Marks the end of successful initialization. /*package*/static boolean serverInitialized = false; // Default - "run" in the current directory. - public static final String dftFusekiBase = "run"; + public static final String dftFusekiBase = "run"; private Path fusekiBase = null; + // Server-wide lock for configuration changes. + private final Object serverLock = new Object(); public FusekiServerCtl(Path location) { if ( location == null ) @@ -129,6 +133,9 @@ public class FusekiServerCtl { return fusekiBase; } + public Object getServerlock() { + return serverLock; + } private Path envFusekiBase() { // Does not guarantee existence diff --git a/jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/mod/admin/FMod_Admin.java b/jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/mod/admin/FMod_Admin.java index eebda1acda..518aa62608 100644 --- a/jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/mod/admin/FMod_Admin.java +++ b/jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/mod/admin/FMod_Admin.java @@ -45,9 +45,6 @@ import org.slf4j.Logger; public class FMod_Admin implements FusekiModule { - private static FusekiModule singleton = new FMod_Admin(); - // ---- - // @Override // public void start() {} // diff --git a/jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/mod/admin/LocalhostOnly.java b/jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/mod/admin/LocalhostOnly.java index 957a29d949..6f24864d03 100644 --- a/jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/mod/admin/LocalhostOnly.java +++ b/jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/mod/admin/LocalhostOnly.java @@ -49,7 +49,6 @@ public class LocalhostOnly implements Filter { Arrays.asList(LOCALHOST_IpV4, LOCALHOST_IpV6_a, LOCALHOST_IpV6_b, LOCALHOST_IpV6_c)); private static Logger log = Fuseki.serverLog; - private static final String message = "Access denied : only localhost access allowed"; public LocalhostOnly() { } diff --git a/jena-fuseki2/jena-fuseki-main/src/test/java/org/apache/jena/fuseki/main/TestFusekiStdSetup.java b/jena-fuseki2/jena-fuseki-main/src/test/java/org/apache/jena/fuseki/main/TestFusekiStdSetup.java index d56bab9235..bce13313e5 100644 --- a/jena-fuseki2/jena-fuseki-main/src/test/java/org/apache/jena/fuseki/main/TestFusekiStdSetup.java +++ b/jena-fuseki2/jena-fuseki-main/src/test/java/org/apache/jena/fuseki/main/TestFusekiStdSetup.java @@ -42,13 +42,10 @@ import org.apache.jena.sparql.sse.SSE; public class TestFusekiStdSetup { private static FusekiServer server = null; - private static int port; private static Graph data; private static DatasetGraph dataset; - private static String URL; - @BeforeAll public static void buildData() { data = SSE.parseGraph(StrUtils.strjoinNL ("(graph" diff --git a/jena-fuseki2/jena-fuseki-main/src/test/java/org/apache/jena/fuseki/main/access/AbstractTestFusekiSecurityAssembler.java b/jena-fuseki2/jena-fuseki-main/src/test/java/org/apache/jena/fuseki/main/access/AbstractTestFusekiSecurityAssembler.java index 9d00a6f742..e18c7201a6 100644 --- a/jena-fuseki2/jena-fuseki-main/src/test/java/org/apache/jena/fuseki/main/access/AbstractTestFusekiSecurityAssembler.java +++ b/jena-fuseki2/jena-fuseki-main/src/test/java/org/apache/jena/fuseki/main/access/AbstractTestFusekiSecurityAssembler.java @@ -70,8 +70,6 @@ public abstract class AbstractTestFusekiSecurityAssembler { private final String assemblerFile; private static AtomicReference<String> user = new AtomicReference<>(); - private boolean sharedDatabase; - private static FusekiServer server; private FusekiServer getServer() { if ( server == null ) @@ -147,9 +145,8 @@ public abstract class AbstractTestFusekiSecurityAssembler { return server; } - protected AbstractTestFusekiSecurityAssembler(String assemberFile, boolean sharedDatabase) { + protected AbstractTestFusekiSecurityAssembler(String assemberFile) { this.assemblerFile = assemberFile; - this.sharedDatabase = sharedDatabase; } private static Node s1 = SSE.parseNode(":s1"); diff --git a/jena-fuseki2/jena-fuseki-main/src/test/java/org/apache/jena/fuseki/main/access/TestFusekiSecurityAssemblerSeparate.java b/jena-fuseki2/jena-fuseki-main/src/test/java/org/apache/jena/fuseki/main/access/TestFusekiSecurityAssemblerSeparate.java index ed2b80f233..bc51a7abc2 100644 --- a/jena-fuseki2/jena-fuseki-main/src/test/java/org/apache/jena/fuseki/main/access/TestFusekiSecurityAssemblerSeparate.java +++ b/jena-fuseki2/jena-fuseki-main/src/test/java/org/apache/jena/fuseki/main/access/TestFusekiSecurityAssemblerSeparate.java @@ -21,6 +21,6 @@ package org.apache.jena.fuseki.main.access; public class TestFusekiSecurityAssemblerSeparate extends AbstractTestFusekiSecurityAssembler { public TestFusekiSecurityAssemblerSeparate() { - super(DIR+"assem-security.ttl", false); + super(DIR+"assem-security.ttl"); } } diff --git a/jena-fuseki2/jena-fuseki-main/src/test/java/org/apache/jena/fuseki/main/access/TestFusekiSecurityAssemblerShared.java b/jena-fuseki2/jena-fuseki-main/src/test/java/org/apache/jena/fuseki/main/access/TestFusekiSecurityAssemblerShared.java index 4163e7d783..1683af0ed5 100644 --- a/jena-fuseki2/jena-fuseki-main/src/test/java/org/apache/jena/fuseki/main/access/TestFusekiSecurityAssemblerShared.java +++ b/jena-fuseki2/jena-fuseki-main/src/test/java/org/apache/jena/fuseki/main/access/TestFusekiSecurityAssemblerShared.java @@ -21,6 +21,6 @@ package org.apache.jena.fuseki.main.access; public class TestFusekiSecurityAssemblerShared extends AbstractTestFusekiSecurityAssembler { public TestFusekiSecurityAssemblerShared() { - super(DIR+"assem-security-shared.ttl", true); + super(DIR+"assem-security-shared.ttl"); } } diff --git a/jena-fuseki2/jena-fuseki-main/src/test/java/org/apache/jena/fuseki/main/access/TestSecurityFilterFuseki.java b/jena-fuseki2/jena-fuseki-main/src/test/java/org/apache/jena/fuseki/main/access/TestSecurityFilterFuseki.java index fd08b2ace4..40fb445dbb 100644 --- a/jena-fuseki2/jena-fuseki-main/src/test/java/org/apache/jena/fuseki/main/access/TestSecurityFilterFuseki.java +++ b/jena-fuseki2/jena-fuseki-main/src/test/java/org/apache/jena/fuseki/main/access/TestSecurityFilterFuseki.java @@ -140,11 +140,11 @@ public class TestSecurityFilterFuseki { public TestSecurityFilterFuseki() {} private static String queryAll = "SELECT * { { ?s ?p ?o } UNION { GRAPH ?g { ?s ?p ?o } } }"; - private static String queryDft = "SELECT * { ?s ?p ?o }"; - private static String queryNamed = "SELECT * { GRAPH ?g { ?s ?p ?o } }"; - - private static String queryG2 = "SELECT * { GRAPH <http://test/graph2> { ?s ?p ?o } }"; - private static String queryGraphNames = "SELECT * { GRAPH ?g { } }"; +// private static String queryDft = "SELECT * { ?s ?p ?o }"; +// private static String queryNamed = "SELECT * { GRAPH ?g { ?s ?p ?o } }"; +// +// private static String queryG2 = "SELECT * { GRAPH <http://test/graph2> { ?s ?p ?o } }"; +// private static String queryGraphNames = "SELECT * { GRAPH ?g { } }"; private Set<Node> query(String user, String password, String dsName, String queryString) { Set<Node> results = new HashSet<>(); diff --git a/jena-fuseki2/jena-fuseki-main/src/test/java/org/apache/jena/fuseki/main/prefixes/TestPrefixesActionResponse.java b/jena-fuseki2/jena-fuseki-main/src/test/java/org/apache/jena/fuseki/main/prefixes/TestPrefixesActionResponse.java index 27ee9b16a8..dadeb47a90 100644 --- a/jena-fuseki2/jena-fuseki-main/src/test/java/org/apache/jena/fuseki/main/prefixes/TestPrefixesActionResponse.java +++ b/jena-fuseki2/jena-fuseki-main/src/test/java/org/apache/jena/fuseki/main/prefixes/TestPrefixesActionResponse.java @@ -65,10 +65,6 @@ public class TestPrefixesActionResponse { return serviceR; } - // Test JSON responses - - private record PrefixesEntry(String prefix, String namespace) {} - @Test public void getAllJson() { TypedInputStream x = httpGet(testReadURL()); diff --git a/jena-fuseki2/jena-fuseki-main/src/test/java/org/apache/jena/fuseki/main/sys/TestFusekiModules.java b/jena-fuseki2/jena-fuseki-main/src/test/java/org/apache/jena/fuseki/main/sys/TestFusekiModules.java index ba230a8682..667e076f29 100644 --- a/jena-fuseki2/jena-fuseki-main/src/test/java/org/apache/jena/fuseki/main/sys/TestFusekiModules.java +++ b/jena-fuseki2/jena-fuseki-main/src/test/java/org/apache/jena/fuseki/main/sys/TestFusekiModules.java @@ -33,8 +33,6 @@ import org.apache.jena.sys.JenaSystem; /** Same package for access */ public class TestFusekiModules { - private static FusekiModules system = null; - @BeforeAll public static void beforeClass() { JenaSystem.init(); }
