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 5dc957edd334d4586808fb942c45db248ae38a8e Author: Andy Seaborne <[email protected]> AuthorDate: Sat Nov 15 11:21:53 2025 +0000 Remove deprecated classes, methods and constants (jena-tdb2, jena-tdb1) --- .../src/main/java/tdb/cmdline/ModTDBDataset.java | 23 -------------------- .../org/apache/jena/tdb1/assembler/VocabTDB.java | 25 ---------------------- .../org/apache/jena/tdb2/assembler/VocabTDB2.java | 8 ------- .../org/apache/jena/tdb2/params/StoreParams.java | 12 ----------- .../jena/tdb2/params/StoreParamsBuilder.java | 12 ----------- 5 files changed, 80 deletions(-) diff --git a/jena-cmds/src/main/java/tdb/cmdline/ModTDBDataset.java b/jena-cmds/src/main/java/tdb/cmdline/ModTDBDataset.java deleted file mode 100644 index c569d3f484..0000000000 --- a/jena-cmds/src/main/java/tdb/cmdline/ModTDBDataset.java +++ /dev/null @@ -1,23 +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 tdb.cmdline; - -/** @deprecated (short term) Use {@link ModTDB1Dataset} (long term) Use TDB2. */ -@Deprecated(forRemoval = true) -public class ModTDBDataset extends ModTDB1Dataset {} diff --git a/jena-tdb1/src/main/java/org/apache/jena/tdb1/assembler/VocabTDB.java b/jena-tdb1/src/main/java/org/apache/jena/tdb1/assembler/VocabTDB.java deleted file mode 100644 index fd38681b6e..0000000000 --- a/jena-tdb1/src/main/java/org/apache/jena/tdb1/assembler/VocabTDB.java +++ /dev/null @@ -1,25 +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.tdb1.assembler; - -/** @deprecated Use {@link VocabTDB1} */ -@Deprecated(forRemoval = true) -public class VocabTDB extends VocabTDB1 { - -} diff --git a/jena-tdb2/src/main/java/org/apache/jena/tdb2/assembler/VocabTDB2.java b/jena-tdb2/src/main/java/org/apache/jena/tdb2/assembler/VocabTDB2.java index 191ea6c7ae..52dcaf24e6 100644 --- a/jena-tdb2/src/main/java/org/apache/jena/tdb2/assembler/VocabTDB2.java +++ b/jena-tdb2/src/main/java/org/apache/jena/tdb2/assembler/VocabTDB2.java @@ -40,17 +40,9 @@ public class VocabTDB2 // Another accept name. public static final Resource tDatasetTDB2 = Vocab.type(NS, "DatasetTDB2"); - /** @deprecated Use {@link #tDatasetTDB} */ - @Deprecated(forRemoval = true) - public static final Resource tDatasetTDB_alt = Vocab.type(NS, "DatasetTDB"); - public static final Resource tGraphTDB = Vocab.type(NS, "GraphTDB"); public static final Resource tGraphTDB2 = Vocab.type(NS, "GraphTDB2"); - /** @deprecated Use {@link #tGraphTDB} */ - @Deprecated(forRemoval = true) - public static final Resource tGraphTDB_alt = Vocab.type(NS, "GraphTDB"); - // public static final Resource tTupleIndex = Vocab.type(NS, "TupleIndex"); // public static final Resource tNodeTable = Vocab.type(NS, "NodeTable"); diff --git a/jena-tdb2/src/main/java/org/apache/jena/tdb2/params/StoreParams.java b/jena-tdb2/src/main/java/org/apache/jena/tdb2/params/StoreParams.java index a031f310ca..d24f4bb64c 100644 --- a/jena-tdb2/src/main/java/org/apache/jena/tdb2/params/StoreParams.java +++ b/jena-tdb2/src/main/java/org/apache/jena/tdb2/params/StoreParams.java @@ -79,18 +79,6 @@ public class StoreParams implements IndexParams, BlockParams, StoreParamsDynamic /*package*/ final Item<String> primaryIndexPrefix; /*package*/ final Item<String[]> prefixIndexes; - /** @deprecated Prefer {@link #builder(String)}. */ - @Deprecated - public static StoreParamsBuilder builder() { - return builder((String)null); - } - - /** @deprecated Prefer {@link #builder(String, StoreParams)}. */ - @Deprecated - public static StoreParamsBuilder builder(StoreParams params) { - return builder(null, params); - } - /** Build StoreParams, starting from system defaults. * * @return StoreParamsBuilder diff --git a/jena-tdb2/src/main/java/org/apache/jena/tdb2/params/StoreParamsBuilder.java b/jena-tdb2/src/main/java/org/apache/jena/tdb2/params/StoreParamsBuilder.java index 7d08148ad0..0c014ce789 100644 --- a/jena-tdb2/src/main/java/org/apache/jena/tdb2/params/StoreParamsBuilder.java +++ b/jena-tdb2/src/main/java/org/apache/jena/tdb2/params/StoreParamsBuilder.java @@ -105,18 +105,6 @@ public class StoreParamsBuilder { private Item<String[]> prefixIndexes = new Item<>(StoreParamsConst.prefixIndexes, false); - /** @deprecated Prefer {@link #create(String)}. */ - @Deprecated - public static StoreParamsBuilder create() { - return new StoreParamsBuilder(); - } - - /** @deprecated Prefer {@link #create(String, StoreParams)}. */ - @Deprecated - public static StoreParamsBuilder create(StoreParams params) { - return new StoreParamsBuilder(params); - } - public static StoreParamsBuilder create(String label) { return new StoreParamsBuilder().label(label); }
