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 bffa64d6dafd6a74f0689db87604fffdfaafc985 Author: Andy Seaborne <[email protected]> AuthorDate: Fri Nov 14 21:04:14 2025 +0000 Remove deprecated classes, methods and constants (jena-fuseki2) --- jena-cmds/src/test/java/riotcmd/rdflangtest.java | 39 --------------- .../apache/jena/fuseki/access/SecurityContext.java | 18 +------ .../fuseki/access/SecurityContextAllowAll.java | 2 +- .../access/SecurityContextAllowNamedGraphs.java | 4 +- .../jena/fuseki/access/SecurityContextView.java | 2 +- .../org/apache/jena/fuseki/build/FusekiConfig.java | 7 --- .../apache/jena/fuseki/servlets/HttpAction.java | 4 -- .../jena/fuseki/servlets/ResponseCallback.java | 24 ---------- .../jena/fuseki/servlets/ResponseDataset.java | 41 ---------------- .../apache/jena/fuseki/servlets/ResponseJson.java | 41 ---------------- .../jena/fuseki/servlets/ResponseResultSet.java | 41 ---------------- .../jena-fuseki-main/src/main/java/fuseki/run.java | 33 ------------- .../java/org/apache/jena/fuseki/cmd/FusekiCmd.java | 32 ------------- .../apache/jena/fuseki/cmd/FusekiWebappCmd.java | 32 ------------- .../org/apache/jena/fuseki/main/FusekiServer.java | 14 +----- .../apache/jena/fuseki/main/cmds/FusekiMain.java | 23 --------- .../apache/jena/fuseki/mod/FusekiServerRunner.java | 55 ---------------------- 17 files changed, 5 insertions(+), 407 deletions(-) diff --git a/jena-cmds/src/test/java/riotcmd/rdflangtest.java b/jena-cmds/src/test/java/riotcmd/rdflangtest.java deleted file mode 100644 index 4aad195dd7..0000000000 --- a/jena-cmds/src/test/java/riotcmd/rdflangtest.java +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package riotcmd; - -import arq.rdftests; - -/** A program to execute test suites (old name) - * - * <pre> - * Usage: - * [--strict] - * [--earl] - * <i>testManifest</i> - * </pre> - * @deprecated Use "rdftests" - */ -@Deprecated(forRemoval = true) -public class rdflangtest { - public static void main (String... argv) { - System.err.println("** Run arq.rdftests"); - rdftests.main(argv); - } - } diff --git a/jena-fuseki2/jena-fuseki-access/src/main/java/org/apache/jena/fuseki/access/SecurityContext.java b/jena-fuseki2/jena-fuseki-access/src/main/java/org/apache/jena/fuseki/access/SecurityContext.java index 267ebd8715..fa38d37402 100644 --- a/jena-fuseki2/jena-fuseki-access/src/main/java/org/apache/jena/fuseki/access/SecurityContext.java +++ b/jena-fuseki2/jena-fuseki-access/src/main/java/org/apache/jena/fuseki/access/SecurityContext.java @@ -28,11 +28,9 @@ import org.apache.jena.graph.Node; import org.apache.jena.graph.NodeFactory; import org.apache.jena.query.Query; import org.apache.jena.query.QueryExecution; -import org.apache.jena.query.QueryFactory; import org.apache.jena.sparql.core.DatasetGraph; import org.apache.jena.sparql.core.Quad; import org.apache.jena.sparql.exec.QueryExec; -import org.apache.jena.sparql.exec.QueryExecutionAdapter; import org.apache.jena.sparql.util.Context; /** A {@link SecurityContext} is the things actor (user, role) is allowed to do. @@ -80,24 +78,10 @@ public interface SecurityContext { public boolean visableDefaultGraph(); - /** @deprecated Use {@link #createQueryExec(Query, DatasetGraph)} */ - @Deprecated(forRemoval = true) - public default QueryExecution createQueryExecution(String queryString, DatasetGraph dsg) { - return createQueryExecution(QueryFactory.create(queryString), dsg); - } - - /** @deprecated Use {@link #createQueryExec(Query, DatasetGraph)} */ - @Deprecated(forRemoval = true) - public default QueryExecution createQueryExecution(Query query, DatasetGraph dsg) { - return QueryExecutionAdapter.adapt(createQueryExec(query, dsg)); - } - public QueryExec createQueryExec(Query query, DatasetGraph dsg); /** - * Quad filter to reflect the security policy of this {@link SecurityContext}. It is - * better to call {@link #createQueryExecution(Query, DatasetGraph)} which may be more - * efficient. + * Quad filter to reflect the security policy of this {@link SecurityContext}. */ public Predicate<Quad> predicateQuad(); diff --git a/jena-fuseki2/jena-fuseki-access/src/main/java/org/apache/jena/fuseki/access/SecurityContextAllowAll.java b/jena-fuseki2/jena-fuseki-access/src/main/java/org/apache/jena/fuseki/access/SecurityContextAllowAll.java index 80b7b959de..0196232e66 100644 --- a/jena-fuseki2/jena-fuseki-access/src/main/java/org/apache/jena/fuseki/access/SecurityContextAllowAll.java +++ b/jena-fuseki2/jena-fuseki-access/src/main/java/org/apache/jena/fuseki/access/SecurityContextAllowAll.java @@ -48,7 +48,7 @@ public class SecurityContextAllowAll implements SecurityContext { /** * Quad filter to reflect the security policy of this {@link SecurityContextAllowAll}. It is - * better to call {@link #createQueryExecution(Query, DatasetGraph)} which may be more + * better to call {@link #createQueryExec(Query, DatasetGraph)} which may be more * efficient. */ @Override diff --git a/jena-fuseki2/jena-fuseki-access/src/main/java/org/apache/jena/fuseki/access/SecurityContextAllowNamedGraphs.java b/jena-fuseki2/jena-fuseki-access/src/main/java/org/apache/jena/fuseki/access/SecurityContextAllowNamedGraphs.java index c54006fb34..bdafa681ff 100644 --- a/jena-fuseki2/jena-fuseki-access/src/main/java/org/apache/jena/fuseki/access/SecurityContextAllowNamedGraphs.java +++ b/jena-fuseki2/jena-fuseki-access/src/main/java/org/apache/jena/fuseki/access/SecurityContextAllowNamedGraphs.java @@ -47,9 +47,7 @@ public class SecurityContextAllowNamedGraphs implements SecurityContext { } /** - * Quad filter to reflect the security policy of this {@link SecurityContextAllowNamedGraphs}. It is - * better to call {@link #createQueryExecution(Query, DatasetGraph)} which may be more - * efficient. + * Quad filter to reflect the security policy of this {@link SecurityContextAllowNamedGraphs}. */ @Override public Predicate<Quad> predicateQuad() { return q -> ! Quad.isDefaultGraph(q.getGraph()); } diff --git a/jena-fuseki2/jena-fuseki-access/src/main/java/org/apache/jena/fuseki/access/SecurityContextView.java b/jena-fuseki2/jena-fuseki-access/src/main/java/org/apache/jena/fuseki/access/SecurityContextView.java index 16b6f3242f..af7b2a5d6c 100644 --- a/jena-fuseki2/jena-fuseki-access/src/main/java/org/apache/jena/fuseki/access/SecurityContextView.java +++ b/jena-fuseki2/jena-fuseki-access/src/main/java/org/apache/jena/fuseki/access/SecurityContextView.java @@ -108,7 +108,7 @@ public class SecurityContextView implements SecurityContext { /** * Quad filter to reflect the security policy of this {@link SecurityContext}. It is - * better to call {@link #createQueryExecution(Query, DatasetGraph)} which may be more + * better to call {@link #createQueryExec(Query, DatasetGraph)} which may be more * efficient. */ @Override diff --git a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/build/FusekiConfig.java b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/build/FusekiConfig.java index 63eb901bf5..c29707ddd9 100644 --- a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/build/FusekiConfig.java +++ b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/build/FusekiConfig.java @@ -51,7 +51,6 @@ import org.apache.jena.fuseki.servlets.ActionService; import org.apache.jena.graph.Graph; import org.apache.jena.graph.Node; import org.apache.jena.query.Dataset; -import org.apache.jena.query.DatasetFactory; import org.apache.jena.rdf.model.Model; import org.apache.jena.rdf.model.ModelFactory; import org.apache.jena.rdf.model.RDFNode; @@ -666,12 +665,6 @@ public class FusekiConfig { endpoints.add(endpoint); } - @Deprecated(forRemoval = true) - public static Dataset getDataset(Resource datasetDesc, DatasetDescriptionMap dsDescMap) { - DatasetGraph dsg = getDataset(datasetDesc.getModel().getGraph(), datasetDesc.asNode(), dsDescMap); - return DatasetFactory.wrap(dsg); - } - public static DatasetGraph getDataset(Graph configuration, Node datasetDesc, DatasetDescriptionMap dsDescMap) { // check if this one already built // This is absolute and does not require a NamedDatasetAssembler and to have a ja:name. diff --git a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/HttpAction.java b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/HttpAction.java index 220625f9a3..e9c015aff3 100644 --- a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/HttpAction.java +++ b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/HttpAction.java @@ -637,10 +637,6 @@ public class HttpAction // ---- Request - response abstraction. - /** @deprecated Use {@link #getRequestMethod}. */ - @Deprecated(since="5.1.0", forRemoval=true) - public String getMethod() { return request.getMethod(); } - public HttpServletRequest getRequest() { return request; } public HttpServletResponse getResponse() { return response; } diff --git a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/ResponseCallback.java b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/ResponseCallback.java deleted file mode 100644 index fbed491776..0000000000 --- a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/ResponseCallback.java +++ /dev/null @@ -1,24 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.jena.fuseki.servlets; - -public interface ResponseCallback -{ - public void callback(boolean successfulOperation); -} diff --git a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/ResponseDataset.java b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/ResponseDataset.java deleted file mode 100644 index 5d9635ffc3..0000000000 --- a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/ResponseDataset.java +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.jena.fuseki.servlets; - -import org.apache.jena.query.Dataset; -import org.apache.jena.query.DatasetFactory; -import org.apache.jena.rdf.model.Model; -import org.apache.jena.sparql.exec.QueryExec; - -/** - * @deprecated Use {@link QueryExec} and {@link Responses}. - */ -@Deprecated(forRemoval = true) -public class ResponseDataset -{ - public static void doResponseModel(HttpAction action, Model model) { - Dataset ds = DatasetFactory.wrap(model); - ResponseDataset.doResponseDataset(action, ds); - } - - public static void doResponseDataset(HttpAction action, Dataset dataset) { - Responses.doResponseDataset(action, dataset.asDatasetGraph()); - } -} - diff --git a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/ResponseJson.java b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/ResponseJson.java deleted file mode 100644 index 8c7ce104ed..0000000000 --- a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/ResponseJson.java +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.jena.fuseki.servlets; - -import java.util.Iterator; - -import org.apache.jena.atlas.json.JsonObject; -import org.apache.jena.sparql.exec.QueryExec; - -/** - * @deprecated Use {@link QueryExec} and {@link Responses}. - */ -@Deprecated(forRemoval = true) -public class ResponseJson { - - /** - * Outputs a JSON query result - * - * @param action HTTP action - * @param jsonItem a ResultSetJsonStream instance - */ - public static void doResponseJson(HttpAction action, Iterator<JsonObject> jsonItem) { - Responses.doResponseJson(action, jsonItem); - } -} diff --git a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/ResponseResultSet.java b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/ResponseResultSet.java deleted file mode 100644 index 054dde3252..0000000000 --- a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/ResponseResultSet.java +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.jena.fuseki.servlets; - -import org.apache.jena.query.ResultSet; -import org.apache.jena.sparql.core.Prologue; -import org.apache.jena.sparql.exec.QueryExec; -import org.apache.jena.sparql.exec.RowSet; - -/** - * This is the content negotiation for each kind of SPARQL query result. - * @deprecated Use {@link QueryExec} and {@link Responses}. - */ -@Deprecated(forRemoval = true) -public class ResponseResultSet -{ - public static void doResponseResultSet(HttpAction action, Boolean booleanResult) { - Responses.doResponseBoolean(action, booleanResult); - } - - public static void doResponseResultSet(HttpAction action, ResultSet resultSet, Prologue qPrologue) { - RowSet rowSet = RowSet.adapt(resultSet); - Responses.doResponseResultSet(action, rowSet, qPrologue); - } -} diff --git a/jena-fuseki2/jena-fuseki-main/src/main/java/fuseki/run.java b/jena-fuseki2/jena-fuseki-main/src/main/java/fuseki/run.java deleted file mode 100644 index 195ce8464a..0000000000 --- a/jena-fuseki2/jena-fuseki-main/src/main/java/fuseki/run.java +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package fuseki; - -import org.apache.jena.fuseki.main.FusekiMainRunner; - -/** - * Run FusekiMain. - * @deprecated Use {@link FusekiMainRunner#run}. - */ -@Deprecated(forRemoval = true) -public class run { - public static void main (String... args) { - // This does FusekiLogging.setLogging - FusekiMainRunner.run(args); - } -} diff --git a/jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/cmd/FusekiCmd.java b/jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/cmd/FusekiCmd.java deleted file mode 100644 index b3a434138a..0000000000 --- a/jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/cmd/FusekiCmd.java +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.jena.fuseki.cmd; - -import org.apache.jena.fuseki.main.cmds.FusekiServerCmd; - -/** This duplicates an entry point of Fuseki/webapp (jena-fuseki-fulljar) */ -@Deprecated(forRemoval = true) -public class FusekiCmd { - /** This duplicates an entry point of Fuseki/webapp (jena-fuseki-fulljar) */ - public static void main(String... args) { - System.err.println("WARNING: Legacy entry point - use org.apache.jena.fuseki.main.cmds.FusekiServerCmd"); - FusekiServerCmd.main(args); - } - -} diff --git a/jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/cmd/FusekiWebappCmd.java b/jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/cmd/FusekiWebappCmd.java deleted file mode 100644 index a3b3b1df91..0000000000 --- a/jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/cmd/FusekiWebappCmd.java +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.jena.fuseki.cmd; - -import org.apache.jena.fuseki.main.cmds.FusekiServerCmd; - -/** This duplicates an entry point of Fuseki/webapp (jena-fuseki-fulljar) */ -@Deprecated(forRemoval = true) -public class FusekiWebappCmd { - /** This duplicates an entry point of Fuseki/webapp (jena-fuseki-fulljar) */ - public static void main(String... args) { - System.err.println("WARNING: Legacy entry point - use org.apache.jena.fuseki.main.cmds.FusekiServerCmd"); - FusekiServerCmd.main(args); - } - -} 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 4f5457a60d..df2e6fdc54 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 @@ -118,7 +118,7 @@ public class FusekiServer { /** * Construct a Fuseki server from command line arguments. * The return server has not been started. - * @deprecated Use {@link FusekiMainRunner#construct} or {@link FusekiServerRunner#construct} + * @deprecated Use {@link FusekiMainRunner#construct} or {@link FusekiServerRunner#construct} */ @Deprecated static public FusekiServer construct(String... args) { @@ -142,18 +142,6 @@ public class FusekiServer { return new Builder(); } - /** - * Return a builder, with a custom set of operation-action mappings. An endpoint must - * still be created for the server to be able to provide the action. An endpoint - * dispatches to an operation, and an operation maps to an implementation. This is a - * specialised operation - normal use is the operation {@link #create()}. - * @deprecated Use {@link #create(OperationRegistry, Context)}. - */ - @Deprecated(forRemoval = true) - public static Builder create(OperationRegistry serviceDispatchRegistry) { - return create(serviceDispatchRegistry, Fuseki.getContext()); - } - /** * Return a builder, with a custom set of operation-action mappings. An endpoint must * still be created for the server to be able to provide the action. An endpoint diff --git a/jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/main/cmds/FusekiMain.java b/jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/main/cmds/FusekiMain.java index b709b3ab53..26bfa4f0a3 100644 --- a/jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/main/cmds/FusekiMain.java +++ b/jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/main/cmds/FusekiMain.java @@ -159,29 +159,6 @@ public class FusekiMain extends CmdARQ { return builder; } - /** - * Registers a custom arguments module. - * - * @deprecated Register a {@link org.apache.jena.fuseki.main.sys.FusekiServerArgsCustomiser} via - * {@link #addCustomiser(FusekiServerArgsCustomiser)} instead. - */ - @Deprecated(forRemoval = true) - public static void addArgModule(ArgModuleGeneral argModule) { - FusekiServerArgsCustomiser customiser = - new FusekiServerArgsCustomiser() { - final ArgModuleGeneral argMod = argModule; - @Override - public void serverArgsModify(CmdGeneral fusekiCmd, ServerArgs serverArgs) { - fusekiCmd.addModule(argMod); - } - @Override - public void serverArgsPrepare(CmdGeneral fusekiCmd, ServerArgs serverArgs) { - argMod.processArgs(fusekiCmd); - } - }; - addCustomiser(customiser); - } - /** * Registers a CLI customiser * <p> diff --git a/jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/mod/FusekiServerRunner.java b/jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/mod/FusekiServerRunner.java deleted file mode 100644 index f7faa4e653..0000000000 --- a/jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/mod/FusekiServerRunner.java +++ /dev/null @@ -1,55 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.jena.fuseki.mod; - -import org.apache.jena.fuseki.main.FusekiServer; -import org.apache.jena.fuseki.main.sys.FusekiModules; - -/** - * @deprecated Use from new locations - */ -@Deprecated(forRemoval = true) -public class FusekiServerRunner { - - /** - * Run {@link FusekiServer} with {@link FusekiModules} as given by {@link #serverModules()}. - * @deprecated Use from new location {@link org.apache.jena.fuseki.server.FusekiServerRunner#runAsync}. - */ - @Deprecated(forRemoval = true) - public static FusekiServer runAsync(String... args) { - return org.apache.jena.fuseki.server.FusekiServerRunner.runAsync(args); - } - - /** - * Build but do not start, a {@link FusekiServer} with {@link FusekiModules} as given by {@link #serverModules()}. - * @deprecated Use from new location {@link org.apache.jena.fuseki.server.FusekiServerRunner#construct}. - */ - @Deprecated(forRemoval = true) - public static FusekiServer construct(String... args) { - return org.apache.jena.fuseki.server.FusekiServerRunner.construct(args); - } - - /** - * @deprecated Use from new location {@link FusekiServerModules#serverModules}. - */ - @Deprecated(forRemoval = true) - public static FusekiModules serverModules() { - return org.apache.jena.fuseki.mod.FusekiServerModules.serverModules(); - } -}
