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 17419b5fef9025759bdf57f4df5f17d90434d885 Author: Andy Seaborne <[email protected]> AuthorDate: Thu May 22 22:23:21 2025 +0100 GH-3217: Deprecation for TDB1 --- jena-cmds/src/main/java/tdb/cmdline/CmdTDB.java | 5 +- .../{ModTDBDataset.java => ModTDB1Dataset.java} | 5 +- .../src/main/java/tdb/cmdline/ModTDBDataset.java | 128 +-------------------- jena-cmds/src/main/java/tdb/tdbbackup.java | 1 + jena-cmds/src/main/java/tdb/tdbconfig.java | 1 + jena-cmds/src/main/java/tdb/tdbloader.java | 1 + jena-cmds/src/main/java/tdb/tdbquery.java | 5 +- jena-cmds/src/main/java/tdb/tdbrecovery.java | 1 + jena-cmds/src/main/java/tdb/tdbupdate.java | 5 +- jena-cmds/src/main/java/tdb/tools/tdbgenindex.java | 1 + .../org/apache/jena/fuseki/access/GraphFilter.java | 1 + .../apache/jena/fuseki/access/GraphFilterTDB1.java | 1 + .../apache/jena/fuseki/access/SecurityContext.java | 1 + .../jena/fuseki/access/SecurityContextView.java | 2 + .../fuseki/access/TestSecurityFilterLocal.java | 2 + .../org/apache/jena/fuseki/ctl/ActionCompact.java | 1 + .../org/apache/jena/fuseki/server/DataService.java | 8 +- .../org/apache/jena/fuseki/system/FusekiCore.java | 1 + .../fuseki/server/TestDatasetDescriptionMap.java | 13 +-- .../galbiston/rdf_tables/file/TDB1Builder.java | 1 + .../jena/fuseki/geosparql/DatasetOperations.java | 1 + .../org/apache/jena/fuseki/main/cmds/DSGSetup.java | 4 +- .../org/apache/jena/fuseki/mgt/ActionDatasets.java | 1 + .../main/access/TestSecurityFilterFuseki.java | 1 + .../org/apache/jena/fuseki/mgt/ActionDatasets.java | 1 + .../jena/fuseki/webapp/FusekiServerListener.java | 1 + .../jena/test/integration/TestDatasetPrefixes.java | 1 + .../rdfconnection/TS_RDFConnectionIntegration.java | 2 +- ...calTDB.java => TestRDFConnectionLocalTDB1.java} | 3 +- .../jena/test/rdflink/TS_RDFLinkIntegration.java | 2 +- ...LinkLocalTDB.java => TestRDFLinkLocalTDB1.java} | 3 +- .../apache/jena/test/txn/TestDataset2Graph.java | 1 + .../graph/SecuredTDBGraphContractTests.java | 1 - .../jena/permissions/graph/TDBGraphTest.java | 1 + jena-tdb1/pom.xml | 7 ++ .../src/main/java/org/apache/jena/tdb/TDB.java | 2 +- .../main/java/org/apache/jena/tdb/TDBBackup.java | 2 +- .../main/java/org/apache/jena/tdb/TDBFactory.java | 2 +- .../main/java/org/apache/jena/tdb/TDBLoader.java | 2 +- .../src/main/java/org/apache/jena/tdb1/TDB1.java | 1 + .../main/java/org/apache/jena/tdb1/TDB1Backup.java | 11 +- .../java/org/apache/jena/tdb1/TDB1Factory.java | 6 +- .../main/java/org/apache/jena/tdb1/TDB1Loader.java | 2 + .../jena/tdb1/assembler/DatasetAssemblerTDB1.java | 11 +- .../apache/jena/tdb1/assembler/IndexAssembler.java | 25 ++-- .../jena/tdb1/assembler/SettingAssembler.java | 14 +-- .../jena/tdb1/assembler/TDB1GraphAssembler.java | 16 +-- .../org/apache/jena/tdb1/assembler/VocabTDB1.java | 2 + .../apache/jena/tdb1/base/file/LocationLock.java | 2 +- .../tdb1/base/objectfile/ObjectFileStorage.java | 2 +- .../apache/jena/tdb1/setup/DatasetBuilderStd.java | 2 +- .../apache/jena/tdb1/solver/QueryEngineTDB.java | 2 +- .../org/apache/jena/tdb1/solver/SolverLibTDB.java | 1 + .../jena/tdb1/store/GraphTxnTDB_Prefixes.java | 1 + .../jena/tdb1/store/bulkloader/BulkLoader.java | 1 + .../apache/jena/tdb1/store/nodetable/NodecSSE.java | 2 +- .../store/xloader/ProcNodeTableDataBuilder.java | 1 + .../java/org/apache/jena/tdb1/sys/DebugTDB.java | 27 ++--- .../main/java/org/apache/jena/tdb1/sys/EnvTDB.java | 1 + .../java/org/apache/jena/tdb1/sys/InitTDB.java | 5 +- .../java/org/apache/jena/tdb1/sys/SetupTDB.java | 28 ++--- .../org/apache/jena/tdb1/sys/StoreConnection.java | 1 + .../java/org/apache/jena/tdb1/sys/SystemTDB.java | 1 + .../java/org/apache/jena/tdb1/sys/TDBInternal.java | 6 +- .../jena/tdb1/transaction/BlockMgrJournal.java | 1 + .../tdb1/transaction/DatasetGraphTransaction.java | 1 + .../test/java/org/apache/jena/tdb1/TC_TDB1.java | 2 - .../java/org/apache/jena/tdb1/TestMiscTDB1.java | 1 + .../java/org/apache/jena/tdb1/TestTDB1Factory.java | 1 + .../jena/tdb1/assembler/TestTDB1Assembler.java | 1 + .../jena/tdb1/graph/AbstractTestGraphsTDB1.java | 1 + .../jena/tdb1/graph/TestDatasetGraphTDB1.java | 1 + .../jena/tdb1/graph/TestGraphOverDatasetTDB1.java | 1 + .../apache/jena/tdb1/graph/TestPrefixMapTDB1.java | 1 + .../jena/tdb1/graph/TestPrefixMappingTDB1.java | 1 + .../apache/jena/tdb1/junit/RunnerSPARQL_TDB1.java | 1 + .../apache/jena/tdb1/solver/TestSolverTDB1.java | 1 + .../org/apache/jena/tdb1/solver/TestStats.java | 1 + .../jena/tdb1/store/AbstractStoreConnections.java | 2 +- .../org/apache/jena/tdb1/store/GraphLocation.java | 1 + .../jena/tdb1/store/TestConcurrentAccess.java | 55 ++++----- .../jena/tdb1/store/TestDatasetGraphTDB1Find.java | 3 +- .../store/TestDatasetGraphTDB1FindPattern.java | 3 +- .../apache/jena/tdb1/store/TestDatasetTDB1.java | 1 + .../jena/tdb1/store/TestDatasetTDB1Persist.java | 41 +++---- .../jena/tdb1/store/TestDynamicDatasetTDB1.java | 3 +- .../apache/jena/tdb1/store/TestGraphNamedTDB1.java | 3 +- .../org/apache/jena/tdb1/store/TestGraphTDB1.java | 21 ++-- .../jena/tdb1/store/TestGraphTDB1_Prefixes.java | 1 + .../org/apache/jena/tdb1/store/TestLoader.java | 1 + .../org/apache/jena/tdb1/store/TestQuadFilter.java | 1 + .../apache/jena/tdb1/store/TestQueryExecTDB1.java | 1 + .../tdb1/store/TestStoreConnectionsMapped.java | 3 +- .../apache/jena/tdb1/store/Test_SPARQL_TDB1.java | 1 + .../test/java/org/apache/jena/tdb1/sys/TS_Sys.java | 36 ------ .../java/org/apache/jena/tdb1/sys/TestSys.java | 31 ----- .../AbstractTestTransSequentialDisk.java | 7 +- .../jena/tdb1/transaction/TestTDB1Internal.java | 1 + .../jena/tdb1/transaction/TestTransControl.java | 51 ++++---- .../jena/tdb1/transaction/TestTransIsolation.java | 1 + .../apache/jena/tdb1/transaction/TestTransMem.java | 5 +- .../tdb1/transaction/TestTransPromoteTDB1.java | 1 + .../jena/tdb1/transaction/TestTransRestart.java | 51 ++++---- .../tdb1/transaction/TestTransactionMiscTDB1.java | 1 + .../jena/tdb1/transaction/TestTransactionTDB1.java | 7 +- .../transaction/TestTransactionUnionGraph.java | 1 + .../java/org/apache/jena/tdb2/sys/TDBInternal.java | 1 - .../apache/jena/query/text/DatasetGraphText.java | 1 + ...bstractTestDatasetWithLuceneGraphTextIndex.java | 1 + ...tDatasetWithLuceneTextIndexDeletionSupport.java | 1 + .../jena/query/text/TestBuildTextDataset.java | 1 + .../query/text/TestLuceneWithMultipleThreads.java | 1 + .../jena/query/text/TestTextGraphIndexExtra.java | 19 +-- .../org/apache/jena/query/text/TestTextNonTxn.java | 1 + .../apache/jena/query/text/TestTextNonTxnTDB1.java | 1 + .../org/apache/jena/query/text/TestTextTxn.java | 2 +- .../org/apache/jena/query/text/TestTextTxnTDB.java | 2 +- .../text/assembler/TestTextDatasetAssembler.java | 1 + 118 files changed, 341 insertions(+), 433 deletions(-) diff --git a/jena-cmds/src/main/java/tdb/cmdline/CmdTDB.java b/jena-cmds/src/main/java/tdb/cmdline/CmdTDB.java index 16381e0a1f..960381ff8e 100644 --- a/jena-cmds/src/main/java/tdb/cmdline/CmdTDB.java +++ b/jena-cmds/src/main/java/tdb/cmdline/CmdTDB.java @@ -23,14 +23,14 @@ import org.apache.jena.atlas.lib.Lib; import org.apache.jena.query.Dataset; import org.apache.jena.sparql.core.DatasetGraph; import org.apache.jena.sys.JenaSystem; -import org.apache.jena.tdb1.TDB1; import org.apache.jena.tdb1.base.file.Location; import org.apache.jena.tdb1.setup.DatasetBuilderStd; import org.apache.jena.tdb1.store.DatasetGraphTDB; import org.apache.jena.tdb1.sys.TDBInternal; +@SuppressWarnings("removal") public abstract class CmdTDB extends CmdARQ { - protected final ModTDBDataset tdbDatasetAssembler = new ModTDBDataset(); + protected final ModTDB1Dataset tdbDatasetAssembler = new ModTDB1Dataset(); private static boolean initialized = false; @@ -38,7 +38,6 @@ public abstract class CmdTDB extends CmdARQ { super(argv); init(); super.addModule(tdbDatasetAssembler); - super.modVersion.addClass("TDB1", TDB1.class); } public static synchronized void init() { diff --git a/jena-cmds/src/main/java/tdb/cmdline/ModTDBDataset.java b/jena-cmds/src/main/java/tdb/cmdline/ModTDB1Dataset.java similarity index 98% copy from jena-cmds/src/main/java/tdb/cmdline/ModTDBDataset.java copy to jena-cmds/src/main/java/tdb/cmdline/ModTDB1Dataset.java index def2048bd4..afbcd52792 100644 --- a/jena-cmds/src/main/java/tdb/cmdline/ModTDBDataset.java +++ b/jena-cmds/src/main/java/tdb/cmdline/ModTDB1Dataset.java @@ -42,7 +42,8 @@ import org.apache.jena.tdb1.assembler.VocabTDB1; import org.apache.jena.tdb1.base.file.Location; import org.apache.jena.tdb1.transaction.DatasetGraphTransaction; -public class ModTDBDataset extends ModDataset { +@SuppressWarnings("removal") +public class ModTDB1Dataset extends ModDataset { // Mixes assembler, location and "tdb" // Can make a single model or a dataset @@ -50,7 +51,7 @@ public class ModTDBDataset extends ModDataset { private ModTDBAssembler modAssembler = new ModTDBAssembler() ; private String inMemFile = null ; - public ModTDBDataset() {} + public ModTDB1Dataset() {} @Override public void registerWith(CmdGeneral cmdLine) { diff --git a/jena-cmds/src/main/java/tdb/cmdline/ModTDBDataset.java b/jena-cmds/src/main/java/tdb/cmdline/ModTDBDataset.java index def2048bd4..c569d3f484 100644 --- a/jena-cmds/src/main/java/tdb/cmdline/ModTDBDataset.java +++ b/jena-cmds/src/main/java/tdb/cmdline/ModTDBDataset.java @@ -18,128 +18,6 @@ package tdb.cmdline; -import java.util.ArrayList; -import java.util.List; - -import arq.cmdline.ModDataset; -import org.apache.jena.assembler.Assembler; -import org.apache.jena.atlas.logging.Log; -import org.apache.jena.cmd.ArgDecl; -import org.apache.jena.cmd.CmdArgModule; -import org.apache.jena.cmd.CmdException; -import org.apache.jena.cmd.CmdGeneral; -import org.apache.jena.query.*; -import org.apache.jena.rdf.model.Model; -import org.apache.jena.rdf.model.Resource; -import org.apache.jena.riot.RDFDataMgr; -import org.apache.jena.shared.JenaException; -import org.apache.jena.sparql.ARQException; -import org.apache.jena.sparql.core.assembler.AssemblerUtils; -import org.apache.jena.sparql.core.assembler.DatasetAssemblerVocab; -import org.apache.jena.sparql.util.graph.GraphUtils; -import org.apache.jena.tdb1.TDB1Factory; -import org.apache.jena.tdb1.assembler.VocabTDB1; -import org.apache.jena.tdb1.base.file.Location; -import org.apache.jena.tdb1.transaction.DatasetGraphTransaction; - -public class ModTDBDataset extends ModDataset { - // Mixes assembler, location and "tdb" - // Can make a single model or a dataset - - private ArgDecl argMem = new ArgDecl(ArgDecl.HasValue, "mem", "data") ; - private ModTDBAssembler modAssembler = new ModTDBAssembler() ; - private String inMemFile = null ; - - public ModTDBDataset() {} - - @Override - public void registerWith(CmdGeneral cmdLine) { - cmdLine.add(argMem, "--mem=FILE", "Execute on an in-memory TDB database (for testing)"); - cmdLine.addModule(modAssembler); - } - - @Override - public void processArgs(CmdArgModule cmdLine) { - inMemFile = cmdLine.getValue(argMem); - modAssembler.processArgs(cmdLine); - } - - @Override - public Dataset createDataset() { - if ( inMemFile != null ) { - Dataset ds = TDB1Factory.createDataset(); - RDFDataMgr.read(ds, inMemFile); - return ds; - - } - - if ( modAssembler.getAssemblerFile() != null ) { - Dataset thing = null; - // Two variants: plain dataset with a TDB graph or a TDB dataset. - try { - thing = buildDataset(modAssembler); - if ( thing != null && !(thing.asDatasetGraph() instanceof DatasetGraphTransaction) ) - Log.warn(this, "Unexpected: Not a TDB dataset for type DatasetTDB"); - - if ( thing == null ) - // Should use assembler inheritance but how do we assert the - // subclass relationship in a program? - thing = (Dataset)AssemblerUtils.build(modAssembler.getAssemblerFile(), DatasetAssemblerVocab.tDataset); - } catch (JenaException ex) { - throw ex; - } catch (Exception ex) { - throw new CmdException("Error creating", ex); - } - return thing; - } - - if ( modAssembler.getLocation() == null ) - throw new CmdException("No assembler file nor location provided"); - - // No assembler - use location to find a database. - Dataset ds = TDB1Factory.createDataset(modAssembler.getLocation()); - return ds; - } - - /** Build a dataset - several possible names (legacy) */ - private static Dataset buildDataset(ModTDBAssembler modAssembler) { - Model spec = AssemblerUtils.readAssemblerFile(modAssembler.getAssemblerFile()); - // throws ARQException("Multiple types for: " + tDataset); - Resource root = GraphUtils.findRootByType(spec, VocabTDB1.tDatasetTDB); - if ( root == null ) - // Not found - try again. - root = GraphUtils.findRootByType(spec, VocabTDB1.tDatasetTDB1); - if ( root == null ) - throw new ARQException("Not found: No such type: <" + VocabTDB1.tDatasetTDB + ">"); - return (Dataset)Assembler.general().open(root) ; - } - - public Location getLocation() { - List<String> x = locations(); - if ( x.size() == 0 ) - return null; - return Location.create(x.get(0)); - } - - public List<String> locations() { - List<String> locations = new ArrayList<>(); - - if ( modAssembler.getLocation() != null ) - locations.add(modAssembler.getLocation().getDirectoryPath()); - - // Extract the location from the assembler file. - if ( modAssembler.getAssemblerFile() != null ) { - // Find and clear all locations - Model m = RDFDataMgr.loadModel(modAssembler.getAssemblerFile()); - Query query = QueryFactory.create("PREFIX tdb: <http://jena.hpl.hp.com/2008/tdb#> SELECT ?dir { [] tdb:location ?dir FILTER (isURI(?dir)) }"); - try (QueryExecution qExec = QueryExecutionFactory.create(query, m)) { - for ( ResultSet rs = qExec.execSelect() ; rs.hasNext() ; ) { - String x = rs.nextSolution().getResource("dir").getURI(); - locations.add(x); - } - } - } - - return locations; - } -} +/** @deprecated (short term) Use {@link ModTDB1Dataset} (long term) Use TDB2. */ +@Deprecated(forRemoval = true) +public class ModTDBDataset extends ModTDB1Dataset {} diff --git a/jena-cmds/src/main/java/tdb/tdbbackup.java b/jena-cmds/src/main/java/tdb/tdbbackup.java index f749473265..1fff795b41 100644 --- a/jena-cmds/src/main/java/tdb/tdbbackup.java +++ b/jena-cmds/src/main/java/tdb/tdbbackup.java @@ -21,6 +21,7 @@ package tdb; import org.apache.jena.tdb1.TDB1Backup; import tdb.cmdline.CmdTDB; +@SuppressWarnings("removal") public class tdbbackup extends CmdTDB { static public void main(String...argv) { CmdTDB.init(); diff --git a/jena-cmds/src/main/java/tdb/tdbconfig.java b/jena-cmds/src/main/java/tdb/tdbconfig.java index f8d0504dbf..6fa5cd23ab 100644 --- a/jena-cmds/src/main/java/tdb/tdbconfig.java +++ b/jena-cmds/src/main/java/tdb/tdbconfig.java @@ -42,6 +42,7 @@ import tdb.cmdline.CmdTDB; import tdb.cmdline.CmdTDBGraph; /** Tools to manage a TDB store. Subcommand based. */ +@SuppressWarnings("removal") public class tdbconfig extends CmdSub { static final String CMD_CLEAN = "clean" ; diff --git a/jena-cmds/src/main/java/tdb/tdbloader.java b/jena-cmds/src/main/java/tdb/tdbloader.java index 331fc04a57..73ca3ac55f 100644 --- a/jena-cmds/src/main/java/tdb/tdbloader.java +++ b/jena-cmds/src/main/java/tdb/tdbloader.java @@ -35,6 +35,7 @@ import org.apache.jena.util.FileUtils; import tdb.cmdline.CmdTDB; import tdb.cmdline.CmdTDBGraph; +@SuppressWarnings("removal") public class tdbloader extends CmdTDBGraph { private static final ArgDecl argNoStats = new ArgDecl(ArgDecl.NoValue, "nostats") ; private static final ArgDecl argStats = new ArgDecl(ArgDecl.HasValue, "stats") ; diff --git a/jena-cmds/src/main/java/tdb/tdbquery.java b/jena-cmds/src/main/java/tdb/tdbquery.java index 1e05b63a18..1c9fef2371 100644 --- a/jena-cmds/src/main/java/tdb/tdbquery.java +++ b/jena-cmds/src/main/java/tdb/tdbquery.java @@ -19,10 +19,11 @@ package tdb; import tdb.cmdline.CmdTDB; -import tdb.cmdline.ModTDBDataset; +import tdb.cmdline.ModTDB1Dataset; import arq.cmdline.ModDataset; import org.apache.jena.tdb1.TDB1; +@SuppressWarnings("removal") public class tdbquery extends arq.query { // Inherits from arq.query so is not a CmdTDB. Mixins for Java! public static void main(String...argv) { @@ -48,6 +49,6 @@ public class tdbquery extends arq.query { @Override protected ModDataset setModDataset() { - return new ModTDBDataset(); + return new ModTDB1Dataset(); } } diff --git a/jena-cmds/src/main/java/tdb/tdbrecovery.java b/jena-cmds/src/main/java/tdb/tdbrecovery.java index 546a490eca..678a33bdf1 100644 --- a/jena-cmds/src/main/java/tdb/tdbrecovery.java +++ b/jena-cmds/src/main/java/tdb/tdbrecovery.java @@ -23,6 +23,7 @@ import org.apache.jena.tdb1.store.DatasetGraphTDB; import org.apache.jena.tdb1.transaction.JournalControl; import tdb.cmdline.CmdTDB; +@SuppressWarnings("removal") public class tdbrecovery extends CmdTDB { static public void main(String...argv) { CmdTDB.init(); diff --git a/jena-cmds/src/main/java/tdb/tdbupdate.java b/jena-cmds/src/main/java/tdb/tdbupdate.java index 8d6eb8a24f..b88db82ed0 100644 --- a/jena-cmds/src/main/java/tdb/tdbupdate.java +++ b/jena-cmds/src/main/java/tdb/tdbupdate.java @@ -24,8 +24,9 @@ import org.apache.jena.sparql.core.DatasetGraph; import org.apache.jena.tdb1.TDB1; import org.apache.jena.tdb1.transaction.TransactionManager; import tdb.cmdline.CmdTDB; -import tdb.cmdline.ModTDBDataset; +import tdb.cmdline.ModTDB1Dataset; +@SuppressWarnings("removal") public class tdbupdate extends arq.update { // Inherits from arq.update so is not a CmdTDB. Mixins for Java! public static void main(String...argv) { @@ -49,7 +50,7 @@ public class tdbupdate extends arq.update { @Override protected ModDataset setModDataset() { - return new ModTDBDataset(); + return new ModTDB1Dataset(); } @Override diff --git a/jena-cmds/src/main/java/tdb/tools/tdbgenindex.java b/jena-cmds/src/main/java/tdb/tools/tdbgenindex.java index dd70f5cb68..dbbe77c1cc 100644 --- a/jena-cmds/src/main/java/tdb/tools/tdbgenindex.java +++ b/jena-cmds/src/main/java/tdb/tools/tdbgenindex.java @@ -31,6 +31,7 @@ import org.apache.jena.tdb1.sys.SystemTDB; /** copy one index to another, possibly changing the order */ public class tdbgenindex { + @SuppressWarnings("removal") public static void main(String...argv) { // Usage: srcLocation indexName dstLocation indexName if ( argv.length != 4 ) { diff --git a/jena-fuseki2/jena-fuseki-access/src/main/java/org/apache/jena/fuseki/access/GraphFilter.java b/jena-fuseki2/jena-fuseki-access/src/main/java/org/apache/jena/fuseki/access/GraphFilter.java index 11fdd2139c..93b7ea7ed4 100644 --- a/jena-fuseki2/jena-fuseki-access/src/main/java/org/apache/jena/fuseki/access/GraphFilter.java +++ b/jena-fuseki2/jena-fuseki-access/src/main/java/org/apache/jena/fuseki/access/GraphFilter.java @@ -49,6 +49,7 @@ public abstract class GraphFilter<X> implements Predicate<Tuple<X>> { this.matchDefaultGraph = matchDefaultGraph; } + @SuppressWarnings("removal") public static Symbol getContextKey(DatasetGraph dsg) { dsg = DatasetGraphAccessControl.removeWrapper(dsg); diff --git a/jena-fuseki2/jena-fuseki-access/src/main/java/org/apache/jena/fuseki/access/GraphFilterTDB1.java b/jena-fuseki2/jena-fuseki-access/src/main/java/org/apache/jena/fuseki/access/GraphFilterTDB1.java index 71fe0c5a2b..2fcf37e47d 100644 --- a/jena-fuseki2/jena-fuseki-access/src/main/java/org/apache/jena/fuseki/access/GraphFilterTDB1.java +++ b/jena-fuseki2/jena-fuseki-access/src/main/java/org/apache/jena/fuseki/access/GraphFilterTDB1.java @@ -48,6 +48,7 @@ class GraphFilterTDB1 extends GraphFilter<NodeId> { * true) for Tuples where the graph slot in quad is in the collection or for triples in the default * graph according the boolean. */ + @SuppressWarnings("removal") public static GraphFilterTDB1 graphFilter(DatasetGraph dsg, Collection<Node> namedGraphs, boolean matchDefaultGraph) { if ( ! TDBInternal.isTDB1(dsg) ) throw new IllegalArgumentException("DatasetGraph is not TDB1-backed"); 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 42e31532f5..267ebd8715 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 @@ -107,6 +107,7 @@ public interface SecurityContext { * Throws {@link IllegalArgumentException} if {@link DatasetGraph} is not a TDB1 or TDB2 backed dataset. * May throw {@link UnsupportedOperationException}. */ + @SuppressWarnings("removal") public default void filterTDB(DatasetGraph dsg, QueryExec qExec) { if ( ! org.apache.jena.tdb1.sys.TDBInternal.isTDB1(dsg) || ! org.apache.jena.tdb2.sys.TDBInternal.isTDB2(dsg) ) throw new IllegalArgumentException("Not a TDB database"); 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 440bd39341..16b6f3242f 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 @@ -131,6 +131,7 @@ public class SecurityContextView implements SecurityContext { * if not a TDB database, or a {@link DatasetGraphAccessControl} wrapped * TDB database. */ + @SuppressWarnings("removal") protected GraphFilter<?> predicate(DatasetGraph dsg) { dsg = DatasetGraphAccessControl.removeWrapper(dsg); // dsg has to be the database dataset, not wrapped. @@ -142,6 +143,7 @@ public class SecurityContextView implements SecurityContext { throw new IllegalArgumentException("Not a TDB1 or TDB2 database: "+dsg.getClass().getSimpleName()); } + @SuppressWarnings("removal") protected static boolean isAccessControlledTDB(DatasetGraph dsg) { DatasetGraph dsgBase = DatasetGraphAccessControl.unwrapOrNull(dsg); if ( dsgBase == null ) diff --git a/jena-fuseki2/jena-fuseki-access/src/test/java/org/apache/jena/fuseki/access/TestSecurityFilterLocal.java b/jena-fuseki2/jena-fuseki-access/src/test/java/org/apache/jena/fuseki/access/TestSecurityFilterLocal.java index 82d6d64b40..a32b428699 100644 --- a/jena-fuseki2/jena-fuseki-access/src/test/java/org/apache/jena/fuseki/access/TestSecurityFilterLocal.java +++ b/jena-fuseki2/jena-fuseki-access/src/test/java/org/apache/jena/fuseki/access/TestSecurityFilterLocal.java @@ -56,6 +56,7 @@ public class TestSecurityFilterLocal { @Parameters(name = "{index}: {0}") public static Iterable<Object[]> data() { // By filtering on the TDB database + @SuppressWarnings("removal") Creator<DatasetGraph> c1 = TDB1Factory::createDatasetGraph; Creator<DatasetGraph> c2 = DatabaseMgr::createDatasetGraph; Creator<DatasetGraph> c3 = DatasetGraphFactory::createTxnMem; @@ -242,6 +243,7 @@ public class TestSecurityFilterLocal { } // Query execution w/ union default graph + @SuppressWarnings("removal") private void filter_union_user(String user, Node ... expected) { SecurityContext sCxt = reg.get(user); Set<Node> visible; diff --git a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/ctl/ActionCompact.java b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/ctl/ActionCompact.java index 0ef644f174..7f4cb5b3e4 100644 --- a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/ctl/ActionCompact.java +++ b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/ctl/ActionCompact.java @@ -68,6 +68,7 @@ public class ActionCompact extends ActionAsyncTask // This include a DatasetGraphText. /** Safety condition that stops further unwrapping */ + @SuppressWarnings("removal") private static Predicate<DatasetGraph> notTDB2 = (dsg) -> org.apache.jena.tdb1.sys.TDBInternal.isTDB1(dsg); diff --git a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/server/DataService.java b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/server/DataService.java index b82a84511d..d6753933b9 100644 --- a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/server/DataService.java +++ b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/server/DataService.java @@ -20,7 +20,6 @@ package org.apache.jena.fuseki.server; import static java.lang.String.format; import static org.apache.jena.fuseki.server.DataServiceStatus.*; -import static org.apache.jena.tdb1.sys.TDBInternal.isTDB1; import static org.apache.jena.tdb2.sys.TDBInternal.isTDB2; import java.util.*; @@ -261,6 +260,7 @@ public class DataService { state = CLOSED; } + @SuppressWarnings("removal") private static void expel(DatasetGraph database) { // This should not be necessary. // When created by assembler, "closeIndexOnClose" should be set true. @@ -277,7 +277,8 @@ public class DataService { DatasetGraph base = findTDB(database); database.close(); - boolean isTDB1 = isTDB1(base); + // Using an import cause a javbadoc warning + boolean isTDB1 = org.apache.jena.tdb1.sys.TDBInternal.isTDB1(base); boolean isTDB2 = isTDB2(base); if ( isTDB1 || isTDB2 ) { @@ -290,10 +291,11 @@ public class DataService { } /** Unwrap until a TDB database is encountered */ + @SuppressWarnings("removal") private static DatasetGraph findTDB(DatasetGraph dsg) { DatasetGraph dsgw = dsg; while (dsgw instanceof DatasetGraphWrapper) { - if ( isTDB1(dsgw) ) + if ( org.apache.jena.tdb1.sys.TDBInternal.isTDB1(dsgw) ) return dsgw; if ( isTDB2(dsgw) ) return dsgw; diff --git a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/system/FusekiCore.java b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/system/FusekiCore.java index aa13af4c72..98ef185e1c 100644 --- a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/system/FusekiCore.java +++ b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/system/FusekiCore.java @@ -41,6 +41,7 @@ public class FusekiCore { private static boolean initialized = false; + @SuppressWarnings("removal") public synchronized static void init() { if ( initialized ) return; diff --git a/jena-fuseki2/jena-fuseki-core/src/test/java/org/apache/jena/fuseki/server/TestDatasetDescriptionMap.java b/jena-fuseki2/jena-fuseki-core/src/test/java/org/apache/jena/fuseki/server/TestDatasetDescriptionMap.java index 5d14bb06c4..bcd9997376 100644 --- a/jena-fuseki2/jena-fuseki-core/src/test/java/org/apache/jena/fuseki/server/TestDatasetDescriptionMap.java +++ b/jena-fuseki2/jena-fuseki-core/src/test/java/org/apache/jena/fuseki/server/TestDatasetDescriptionMap.java @@ -21,16 +21,15 @@ package org.apache.jena.fuseki.server; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotEquals; -import org.junit.jupiter.api.Test; - import org.apache.jena.fuseki.build.DatasetDescriptionMap; import org.apache.jena.fuseki.build.FusekiConfig; 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.tdb1.assembler.VocabTDB1; +import org.apache.jena.tdb2.assembler.VocabTDB2; import org.apache.jena.vocabulary.RDF; +import org.junit.jupiter.api.Test; public class TestDatasetDescriptionMap { @@ -42,11 +41,11 @@ public class TestDatasetDescriptionMap { static { dsModel = ModelFactory.createDefaultModel(); dsDesc1 = dsModel.createResource() - .addProperty(RDF.type, VocabTDB1.tDatasetTDB) - .addProperty(VocabTDB1.pLocation, "--mem--"); + .addProperty(RDF.type, VocabTDB2.tDatasetTDB) + .addProperty(VocabTDB2.pLocation, "--mem--"); dsDesc2 = dsModel.createResource() - .addProperty(RDF.type, VocabTDB1.tDatasetTDB) - .addProperty(VocabTDB1.pLocation, "--mem--"); + .addProperty(RDF.type, VocabTDB2.tDatasetTDB) + .addProperty(VocabTDB2.pLocation, "--mem--"); } @Test public void testVerifySameDatasetObjectForSameDescription() { diff --git a/jena-fuseki2/jena-fuseki-geosparql/src/main/java/org/apache/jena/ext/io/github/galbiston/rdf_tables/file/TDB1Builder.java b/jena-fuseki2/jena-fuseki-geosparql/src/main/java/org/apache/jena/ext/io/github/galbiston/rdf_tables/file/TDB1Builder.java index e75ac196a6..82d836ac37 100644 --- a/jena-fuseki2/jena-fuseki-geosparql/src/main/java/org/apache/jena/ext/io/github/galbiston/rdf_tables/file/TDB1Builder.java +++ b/jena-fuseki2/jena-fuseki-geosparql/src/main/java/org/apache/jena/ext/io/github/galbiston/rdf_tables/file/TDB1Builder.java @@ -35,6 +35,7 @@ import org.slf4j.LoggerFactory; * See the License for the specific language governing permissions and * limitations under the License. */ +@SuppressWarnings("removal") public class TDB1Builder { private static final Logger LOGGER = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass()); diff --git a/jena-fuseki2/jena-fuseki-geosparql/src/main/java/org/apache/jena/fuseki/geosparql/DatasetOperations.java b/jena-fuseki2/jena-fuseki-geosparql/src/main/java/org/apache/jena/fuseki/geosparql/DatasetOperations.java index 765f621c5f..b467c1ed58 100644 --- a/jena-fuseki2/jena-fuseki-geosparql/src/main/java/org/apache/jena/fuseki/geosparql/DatasetOperations.java +++ b/jena-fuseki2/jena-fuseki-geosparql/src/main/java/org/apache/jena/fuseki/geosparql/DatasetOperations.java @@ -103,6 +103,7 @@ public class DatasetOperations { return dataset; } + @SuppressWarnings("removal") public static Dataset prepareDataset(ArgsConfig argsConfig) { Dataset dataset; diff --git a/jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/main/cmds/DSGSetup.java b/jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/main/cmds/DSGSetup.java index c55296c6ab..8b240f3167 100644 --- a/jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/main/cmds/DSGSetup.java +++ b/jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/main/cmds/DSGSetup.java @@ -88,6 +88,7 @@ import org.slf4j.Logger; throw new CmdException("Directory not a database: " + directory); } + @SuppressWarnings("removal") private static void setupTDB1(Logger log, String directory, ServerArgs serverArgs) { serverArgs.datasetDescription = "TDB1 dataset: location="+directory; serverArgs.dataset = TDB1Factory.createDatasetGraph(directory); @@ -98,7 +99,8 @@ import org.slf4j.Logger; serverArgs.dataset = DatabaseMgr.connectDatasetGraph(directory); } - /*package*/ static void setupMemTDB(Logger log, boolean useTDB2, ServerArgs serverArgs) { + /*package*/ @SuppressWarnings("removal") + static void setupMemTDB(Logger log, boolean useTDB2, ServerArgs serverArgs) { String tag = useTDB2 ? "TDB2" : "TDB1"; serverArgs.datasetDescription = tag+" dataset in-memory"; serverArgs.dataset = useTDB2 diff --git a/jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/mgt/ActionDatasets.java b/jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/mgt/ActionDatasets.java index bc5a541c5a..0bc1a2c74b 100644 --- a/jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/mgt/ActionDatasets.java +++ b/jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/mgt/ActionDatasets.java @@ -355,6 +355,7 @@ public class ActionDatasets extends ActionContainerItem { // configuration file, so the databases will not be associated with the server // anymore. + @SuppressWarnings("removal") boolean isTDB1 = org.apache.jena.tdb1.sys.TDBInternal.isTDB1(dataService.getDataset()); boolean isTDB2 = org.apache.jena.tdb2.sys.TDBInternal.isTDB2(dataService.getDataset()); 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 315e80c15e..fd08b2ace4 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 @@ -74,6 +74,7 @@ public class TestSecurityFilterFuseki { return fusekiServer.datasetURL(dsName); } + @SuppressWarnings("removal") private static DatasetGraph testdsg1 = TDB1Factory.createDatasetGraph(); private static DatasetGraph testdsg2 = DatabaseMgr.createDatasetGraph(); private static DatasetGraph testdsg3 = DatasetGraphFactory.createTxnMem(); diff --git a/jena-fuseki2/jena-fuseki-webapp/src/main/java/org/apache/jena/fuseki/mgt/ActionDatasets.java b/jena-fuseki2/jena-fuseki-webapp/src/main/java/org/apache/jena/fuseki/mgt/ActionDatasets.java index e6fed0c5da..09f4796e06 100644 --- a/jena-fuseki2/jena-fuseki-webapp/src/main/java/org/apache/jena/fuseki/mgt/ActionDatasets.java +++ b/jena-fuseki2/jena-fuseki-webapp/src/main/java/org/apache/jena/fuseki/mgt/ActionDatasets.java @@ -343,6 +343,7 @@ public class ActionDatasets extends ActionContainerItem { // configuration file, so the databases will not be associated with the server // anymore. + @SuppressWarnings("removal") boolean isTDB1 = org.apache.jena.tdb1.sys.TDBInternal.isTDB1(dataService.getDataset()); boolean isTDB2 = org.apache.jena.tdb2.sys.TDBInternal.isTDB2(dataService.getDataset()); diff --git a/jena-fuseki2/jena-fuseki-webapp/src/main/java/org/apache/jena/fuseki/webapp/FusekiServerListener.java b/jena-fuseki2/jena-fuseki-webapp/src/main/java/org/apache/jena/fuseki/webapp/FusekiServerListener.java index 8b73219cca..ce31533dce 100644 --- a/jena-fuseki2/jena-fuseki-webapp/src/main/java/org/apache/jena/fuseki/webapp/FusekiServerListener.java +++ b/jena-fuseki2/jena-fuseki-webapp/src/main/java/org/apache/jena/fuseki/webapp/FusekiServerListener.java @@ -57,6 +57,7 @@ public class FusekiServerListener implements ServletContextListener { serverInitialization(servletContext); } + @SuppressWarnings("removal") @Override public void contextDestroyed(ServletContextEvent sce) { org.apache.jena.tdb1.sys.TDBInternal.reset(); diff --git a/jena-integration-tests/src/test/java/org/apache/jena/test/integration/TestDatasetPrefixes.java b/jena-integration-tests/src/test/java/org/apache/jena/test/integration/TestDatasetPrefixes.java index 31352e8b94..664a8cc36a 100644 --- a/jena-integration-tests/src/test/java/org/apache/jena/test/integration/TestDatasetPrefixes.java +++ b/jena-integration-tests/src/test/java/org/apache/jena/test/integration/TestDatasetPrefixes.java @@ -63,6 +63,7 @@ public class TestDatasetPrefixes { @Parameters(name = "{index}: {0}") public static Collection<Object[]> data(){ Creator<DatasetGraph> c1 = ()->DatasetGraphFactory.createTxnMem(); + @SuppressWarnings("removal") Creator<DatasetGraph> c2 = ()->TDB1Factory.createDatasetGraph(); Creator<DatasetGraph> c3 = ()->DatabaseMgr.createDatasetGraph(); Creator<DatasetGraph> c4 = ()->new DatasetGraphMap(); //DatasetGraphFactory.create(); diff --git a/jena-integration-tests/src/test/java/org/apache/jena/test/rdfconnection/TS_RDFConnectionIntegration.java b/jena-integration-tests/src/test/java/org/apache/jena/test/rdfconnection/TS_RDFConnectionIntegration.java index ab092a385e..7755bb77f8 100644 --- a/jena-integration-tests/src/test/java/org/apache/jena/test/rdfconnection/TS_RDFConnectionIntegration.java +++ b/jena-integration-tests/src/test/java/org/apache/jena/test/rdfconnection/TS_RDFConnectionIntegration.java @@ -30,7 +30,7 @@ import org.junit.runners.Suite ; TestBlankNodeBinary.class, // Addition tests added here. - TestRDFConnectionLocalTDB.class, + TestRDFConnectionLocalTDB1.class, TestRDFConnectionRemote.class, TestRDFConnectionFuseki.class, TestRDFConnectionFusekiBinary.class diff --git a/jena-integration-tests/src/test/java/org/apache/jena/test/rdfconnection/TestRDFConnectionLocalTDB.java b/jena-integration-tests/src/test/java/org/apache/jena/test/rdfconnection/TestRDFConnectionLocalTDB1.java similarity index 92% rename from jena-integration-tests/src/test/java/org/apache/jena/test/rdfconnection/TestRDFConnectionLocalTDB.java rename to jena-integration-tests/src/test/java/org/apache/jena/test/rdfconnection/TestRDFConnectionLocalTDB1.java index e215568ae4..b831947f93 100644 --- a/jena-integration-tests/src/test/java/org/apache/jena/test/rdfconnection/TestRDFConnectionLocalTDB.java +++ b/jena-integration-tests/src/test/java/org/apache/jena/test/rdfconnection/TestRDFConnectionLocalTDB1.java @@ -24,7 +24,8 @@ import org.apache.jena.rdfconnection.Isolation; import org.apache.jena.rdfconnection.RDFConnection; import org.apache.jena.tdb1.TDB1Factory; -public class TestRDFConnectionLocalTDB extends AbstractTestRDFConnection { +@SuppressWarnings("removal") +public class TestRDFConnectionLocalTDB1 extends AbstractTestRDFConnection { @Override protected boolean supportsAbort() { return true ; } diff --git a/jena-integration-tests/src/test/java/org/apache/jena/test/rdflink/TS_RDFLinkIntegration.java b/jena-integration-tests/src/test/java/org/apache/jena/test/rdflink/TS_RDFLinkIntegration.java index 411ee468d9..7d312eaec5 100644 --- a/jena-integration-tests/src/test/java/org/apache/jena/test/rdflink/TS_RDFLinkIntegration.java +++ b/jena-integration-tests/src/test/java/org/apache/jena/test/rdflink/TS_RDFLinkIntegration.java @@ -28,7 +28,7 @@ import org.junit.runners.Suite ; // TestRDFLinkLocalMRSW // Addition tests added here. - TestRDFLinkLocalTDB.class, + TestRDFLinkLocalTDB1.class, TestRDFLinkLocalTDB2.class, TestRDFLinkHTTP.class, TestRDFLinkFuseki.class, diff --git a/jena-integration-tests/src/test/java/org/apache/jena/test/rdflink/TestRDFLinkLocalTDB.java b/jena-integration-tests/src/test/java/org/apache/jena/test/rdflink/TestRDFLinkLocalTDB1.java similarity index 93% rename from jena-integration-tests/src/test/java/org/apache/jena/test/rdflink/TestRDFLinkLocalTDB.java rename to jena-integration-tests/src/test/java/org/apache/jena/test/rdflink/TestRDFLinkLocalTDB1.java index 48d1cfe643..02c56ffc08 100644 --- a/jena-integration-tests/src/test/java/org/apache/jena/test/rdflink/TestRDFLinkLocalTDB.java +++ b/jena-integration-tests/src/test/java/org/apache/jena/test/rdflink/TestRDFLinkLocalTDB1.java @@ -25,7 +25,8 @@ import org.apache.jena.rdflink.RDFLinkFactory; import org.apache.jena.sparql.core.DatasetGraph; import org.apache.jena.tdb1.TDB1Factory; -public class TestRDFLinkLocalTDB extends AbstractTestRDFLink { +@SuppressWarnings("removal") +public class TestRDFLinkLocalTDB1 extends AbstractTestRDFLink { @Override protected boolean supportsAbort() { return true ; } diff --git a/jena-integration-tests/src/test/java/org/apache/jena/test/txn/TestDataset2Graph.java b/jena-integration-tests/src/test/java/org/apache/jena/test/txn/TestDataset2Graph.java index 4eca2cbb2b..8d7ddf61b1 100644 --- a/jena-integration-tests/src/test/java/org/apache/jena/test/txn/TestDataset2Graph.java +++ b/jena-integration-tests/src/test/java/org/apache/jena/test/txn/TestDataset2Graph.java @@ -57,6 +57,7 @@ public class TestDataset2Graph { public static Collection<Object[]> data() { Creator<Dataset> datasetPlainMaker = ()-> DatasetFactory.createGeneral() ; Creator<Dataset> datasetTxnMemMaker = ()-> DatasetFactory.createTxnMem() ; + @SuppressWarnings("removal") Creator<Dataset> datasetTDB1 = ()-> TDB1Factory.createDataset(); Creator<Dataset> datasetTDB2 = ()-> TDB2Factory.createDataset(); diff --git a/jena-permissions/src/test/java/org/apache/jena/permissions/contract/graph/SecuredTDBGraphContractTests.java b/jena-permissions/src/test/java/org/apache/jena/permissions/contract/graph/SecuredTDBGraphContractTests.java index f4ed8277ad..9a64afd957 100644 --- a/jena-permissions/src/test/java/org/apache/jena/permissions/contract/graph/SecuredTDBGraphContractTests.java +++ b/jena-permissions/src/test/java/org/apache/jena/permissions/contract/graph/SecuredTDBGraphContractTests.java @@ -43,5 +43,4 @@ public class SecuredTDBGraphContractTests extends MetaTestGraph { return org.apache.jena.permissions.Factory.getInstance(eval, getName(), TDB1Factory.createDatasetGraph().getDefaultGraph()); } - } diff --git a/jena-permissions/src/test/java/org/apache/jena/permissions/graph/TDBGraphTest.java b/jena-permissions/src/test/java/org/apache/jena/permissions/graph/TDBGraphTest.java index b9a378e910..63d6810de1 100644 --- a/jena-permissions/src/test/java/org/apache/jena/permissions/graph/TDBGraphTest.java +++ b/jena-permissions/src/test/java/org/apache/jena/permissions/graph/TDBGraphTest.java @@ -26,6 +26,7 @@ import org.apache.jena.tdb1.TDB1; import org.apache.jena.tdb1.TDB1Factory; import org.junit.After; +@SuppressWarnings("removal") public class TDBGraphTest extends MemGraphTest { private DatasetGraph dsGraph; diff --git a/jena-tdb1/pom.xml b/jena-tdb1/pom.xml index 4cdddfd8f5..658cdb5ef5 100644 --- a/jena-tdb1/pom.xml +++ b/jena-tdb1/pom.xml @@ -91,6 +91,13 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <release>${java.version}</release> + <compilerArgs> + <arg>-proc:none</arg> + <arg>-Xlint:-removal</arg> + </compilerArgs> + </configuration> </plugin> <plugin> diff --git a/jena-tdb1/src/main/java/org/apache/jena/tdb/TDB.java b/jena-tdb1/src/main/java/org/apache/jena/tdb/TDB.java index 58763e38a2..d27820de43 100644 --- a/jena-tdb1/src/main/java/org/apache/jena/tdb/TDB.java +++ b/jena-tdb1/src/main/java/org/apache/jena/tdb/TDB.java @@ -32,7 +32,7 @@ import org.slf4j.Logger ; import org.slf4j.LoggerFactory ; /** - * @deprecated Use {@link org.apache.jena.tdb1.TDB1} + * @deprecated Migrate to TDB2 */ @Deprecated(forRemoval = true) @SuppressWarnings("all") diff --git a/jena-tdb1/src/main/java/org/apache/jena/tdb/TDBBackup.java b/jena-tdb1/src/main/java/org/apache/jena/tdb/TDBBackup.java index bd1109675e..005c1f5490 100644 --- a/jena-tdb1/src/main/java/org/apache/jena/tdb/TDBBackup.java +++ b/jena-tdb1/src/main/java/org/apache/jena/tdb/TDBBackup.java @@ -25,7 +25,7 @@ import org.apache.jena.tdb1.base.file.Location; /** * Backup a database. - * @deprecated Use {@link org.apache.jena.tdb1.TDB1Backup} + * @deprecated Migrate to TDB2 */ @Deprecated(forRemoval = true) public class TDBBackup diff --git a/jena-tdb1/src/main/java/org/apache/jena/tdb/TDBFactory.java b/jena-tdb1/src/main/java/org/apache/jena/tdb/TDBFactory.java index 2d449d158b..573103e588 100644 --- a/jena-tdb1/src/main/java/org/apache/jena/tdb/TDBFactory.java +++ b/jena-tdb1/src/main/java/org/apache/jena/tdb/TDBFactory.java @@ -27,7 +27,7 @@ import org.apache.jena.tdb1.base.file.Location; import org.apache.jena.tdb1.setup.StoreParams; /** Public factory for creating objects datasets backed by TDB1 storage. - * @deprecated Use {@link org.apache.jena.tdb1.TDB1Factory} + * @deprecated Migrate to TDB2 * */ @Deprecated(forRemoval = true) diff --git a/jena-tdb1/src/main/java/org/apache/jena/tdb/TDBLoader.java b/jena-tdb1/src/main/java/org/apache/jena/tdb/TDBLoader.java index aec11d9668..24b2eeac59 100644 --- a/jena-tdb1/src/main/java/org/apache/jena/tdb/TDBLoader.java +++ b/jena-tdb1/src/main/java/org/apache/jena/tdb/TDBLoader.java @@ -30,7 +30,7 @@ import org.apache.jena.tdb1.store.GraphTDB; /** Public interface to the loader functionality. * The bulk loader is not transactional. * - * @deprecated Use {@link org.apache.jena.tdb1.TDB1Loader} + * @deprecated Migrate to TDB2 */ @Deprecated(forRemoval = true) public class TDBLoader diff --git a/jena-tdb1/src/main/java/org/apache/jena/tdb1/TDB1.java b/jena-tdb1/src/main/java/org/apache/jena/tdb1/TDB1.java index a0f45b338b..3165cdb106 100644 --- a/jena-tdb1/src/main/java/org/apache/jena/tdb1/TDB1.java +++ b/jena-tdb1/src/main/java/org/apache/jena/tdb1/TDB1.java @@ -51,6 +51,7 @@ import org.apache.jena.tdb1.transaction.DatasetGraphTransaction; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +@Deprecated(forRemoval = true) public class TDB1 { private TDB1() {} diff --git a/jena-tdb1/src/main/java/org/apache/jena/tdb1/TDB1Backup.java b/jena-tdb1/src/main/java/org/apache/jena/tdb1/TDB1Backup.java index b4e1b06437..cd5c9fc1cd 100644 --- a/jena-tdb1/src/main/java/org/apache/jena/tdb1/TDB1Backup.java +++ b/jena-tdb1/src/main/java/org/apache/jena/tdb1/TDB1Backup.java @@ -32,25 +32,26 @@ import org.apache.jena.tdb1.transaction.DatasetGraphTxn; /** * Backup a database. + * @deprecated Migrate to TDB2. */ - +@Deprecated(forRemoval =true) public class TDB1Backup { public static void backup(Location location, String backupfile) { try(OutputStream out = new BufferedOutputStream(new FileOutputStream(backupfile))) { backup(location, out) ; - } + } catch (FileNotFoundException e) { Log.warn(TDB1Backup.class, "File not found: "+backupfile) ; throw new TDB1Exception("File not found: "+backupfile) ; - } + } catch (IOException e) { IO.exception(e) ; } - + } - + public static void backup(Location location, OutputStream backupfile) { Dataset ds = TDB1Factory.createDataset(location) ; diff --git a/jena-tdb1/src/main/java/org/apache/jena/tdb1/TDB1Factory.java b/jena-tdb1/src/main/java/org/apache/jena/tdb1/TDB1Factory.java index f981d9bf53..38a8078b05 100644 --- a/jena-tdb1/src/main/java/org/apache/jena/tdb1/TDB1Factory.java +++ b/jena-tdb1/src/main/java/org/apache/jena/tdb1/TDB1Factory.java @@ -35,7 +35,11 @@ import org.apache.jena.tdb1.sys.TDBInternal; import org.apache.jena.tdb1.sys.TDBMaker; import org.apache.jena.tdb1.transaction.DatasetGraphTransaction; -/** Public factory for creating objects datasets backed by TDB storage */ +/** + * Public factory for creating objects datasets backed by TDB storage. + * @deprecated TDB1 will be phased out at some point. TDB2 is the preferred database. + */ +@Deprecated(forRemoval = true) public class TDB1Factory { static { JenaSystem.init(); } diff --git a/jena-tdb1/src/main/java/org/apache/jena/tdb1/TDB1Loader.java b/jena-tdb1/src/main/java/org/apache/jena/tdb1/TDB1Loader.java index 4ec4a1fc49..197988ccc6 100644 --- a/jena-tdb1/src/main/java/org/apache/jena/tdb1/TDB1Loader.java +++ b/jena-tdb1/src/main/java/org/apache/jena/tdb1/TDB1Loader.java @@ -32,7 +32,9 @@ import org.apache.jena.tdb1.sys.TDBInternal; /** Public interface to the loader functionality. * The bulk loader is not transactional. + * @deprecated Migrate to TDB2. */ +@Deprecated(forRemoval =true) public class TDB1Loader { /** Load the contents of URL into a dataset. */ diff --git a/jena-tdb1/src/main/java/org/apache/jena/tdb1/assembler/DatasetAssemblerTDB1.java b/jena-tdb1/src/main/java/org/apache/jena/tdb1/assembler/DatasetAssemblerTDB1.java index 4912bf2445..adf28d8278 100644 --- a/jena-tdb1/src/main/java/org/apache/jena/tdb1/assembler/DatasetAssemblerTDB1.java +++ b/jena-tdb1/src/main/java/org/apache/jena/tdb1/assembler/DatasetAssemblerTDB1.java @@ -20,8 +20,6 @@ package org.apache.jena.tdb1.assembler; import static org.apache.jena.sparql.util.graph.GraphUtils.exactlyOneProperty ; import static org.apache.jena.sparql.util.graph.GraphUtils.getStringValue ; -import static org.apache.jena.tdb1.assembler.VocabTDB1.pLocation; -import static org.apache.jena.tdb1.assembler.VocabTDB1.pUnionDefaultGraph; import org.apache.jena.assembler.Assembler ; import org.apache.jena.assembler.exceptions.AssemblerException ; @@ -37,6 +35,7 @@ import org.apache.jena.tdb1.TDB1; import org.apache.jena.tdb1.TDB1Factory; import org.apache.jena.tdb1.base.file.Location; +@SuppressWarnings("removal") public class DatasetAssemblerTDB1 extends DatasetAssembler { // This is not a NamedDatasetAssembler @@ -53,15 +52,15 @@ public class DatasetAssemblerTDB1 extends DatasetAssembler } public static DatasetGraph make(Assembler a, Resource root) { - if ( !exactlyOneProperty(root, pLocation) ) + if ( !exactlyOneProperty(root, VocabTDB1.pLocation) ) throw new AssemblerException(root, "No location given"); - String dir = getStringValue(root, pLocation); + String dir = getStringValue(root, VocabTDB1.pLocation); Location loc = Location.create(dir); DatasetGraph dsg = TDB1Factory.createDatasetGraph(loc); - if ( root.hasProperty(pUnionDefaultGraph) ) { - Node b = root.getProperty(pUnionDefaultGraph).getObject().asNode(); + if ( root.hasProperty(VocabTDB1.pUnionDefaultGraph) ) { + Node b = root.getProperty(VocabTDB1.pUnionDefaultGraph).getObject().asNode(); NodeValue nv = NodeValue.makeNode(b); if ( nv.isBoolean() ) dsg.getContext().set(TDB1.symUnionDefaultGraph, nv.getBoolean()); diff --git a/jena-tdb1/src/main/java/org/apache/jena/tdb1/assembler/IndexAssembler.java b/jena-tdb1/src/main/java/org/apache/jena/tdb1/assembler/IndexAssembler.java index 521762866b..86e7a1beb4 100644 --- a/jena-tdb1/src/main/java/org/apache/jena/tdb1/assembler/IndexAssembler.java +++ b/jena-tdb1/src/main/java/org/apache/jena/tdb1/assembler/IndexAssembler.java @@ -20,8 +20,6 @@ package org.apache.jena.tdb1.assembler; import static org.apache.jena.sparql.util.graph.GraphUtils.exactlyOneProperty ; import static org.apache.jena.sparql.util.graph.GraphUtils.getAsStringValue ; -import static org.apache.jena.tdb1.assembler.VocabTDB1.pDescription; -import static org.apache.jena.tdb1.assembler.VocabTDB1.pFile; import java.util.Locale ; @@ -43,31 +41,32 @@ import org.apache.jena.tdb1.store.tupletable.TupleIndexRecord; import org.apache.jena.tdb1.sys.Names; import org.apache.jena.tdb1.sys.SystemTDB; +@SuppressWarnings("removal") public class IndexAssembler extends AssemblerBase //implements Assembler { - /* + /* * [ :description "SPO" ; :file "SPO.idx" ] */ - + private Location location = null ; private IndexAssembler() { this.location = null ; } private IndexAssembler(Location location) { this.location = location ; } - + @Override public TupleIndex open(Assembler a, Resource root, Mode mode) { - exactlyOneProperty(root, pDescription) ; - String desc = getAsStringValue(root, pDescription).toUpperCase(Locale.ENGLISH) ; - exactlyOneProperty(root, pFile) ; - String filename = getAsStringValue(root, pFile) ; - + exactlyOneProperty(root, VocabTDB1.pDescription) ; + String desc = getAsStringValue(root, VocabTDB1.pDescription).toUpperCase(Locale.ENGLISH) ; + exactlyOneProperty(root, VocabTDB1.pFile) ; + String filename = getAsStringValue(root, VocabTDB1.pFile) ; + // Need to get location from the enclosing PGraphAssembler if ( location != null ) filename = location.absolute(filename) ; - + String primary = null ; RecordFactory rf = null ; - + switch ( desc.length() ) { case 3: @@ -80,7 +79,7 @@ public class IndexAssembler extends AssemblerBase //implements Assembler break ; default: throw new TDB1Exception("Bad length for index description: "+desc) ; - + } // Problems with spotting the index technology. FileSet fileset = null ; //FileSet.fromFilename(filename) ; diff --git a/jena-tdb1/src/main/java/org/apache/jena/tdb1/assembler/SettingAssembler.java b/jena-tdb1/src/main/java/org/apache/jena/tdb1/assembler/SettingAssembler.java index b6439a124b..192398dbf3 100644 --- a/jena-tdb1/src/main/java/org/apache/jena/tdb1/assembler/SettingAssembler.java +++ b/jena-tdb1/src/main/java/org/apache/jena/tdb1/assembler/SettingAssembler.java @@ -20,9 +20,6 @@ package org.apache.jena.tdb1.assembler; import static org.apache.jena.sparql.util.graph.GraphUtils.getAsStringValue ; import static org.apache.jena.sparql.util.graph.GraphUtils.getResourceValue ; -import static org.apache.jena.tdb1.assembler.VocabTDB1.pName; -import static org.apache.jena.tdb1.assembler.VocabTDB1.pSetting; -import static org.apache.jena.tdb1.assembler.VocabTDB1.pValue; import org.apache.jena.assembler.Assembler ; import org.apache.jena.assembler.Mode ; @@ -30,19 +27,20 @@ import org.apache.jena.query.ARQ ; import org.apache.jena.rdf.model.Resource ; import org.apache.jena.sparql.util.Symbol ; +@SuppressWarnings("removal") public class SettingAssembler //extends DatasetAssembler { public SettingAssembler() {} - /* + /* * :setting [ :name tdbsym:name ; :value "SPO.idx" ] */ - + //@Override public Object open(Assembler a, Resource root, Mode mode) { - Resource r = getResourceValue(root, pSetting ) ; - String k = getAsStringValue(r, pName) ; - String v = getAsStringValue(r, pValue) ; + Resource r = getResourceValue(root, VocabTDB1.pSetting ) ; + String k = getAsStringValue(r, VocabTDB1.pName) ; + String v = getAsStringValue(r, VocabTDB1.pValue) ; Symbol symbol = Symbol.create(k) ; ARQ.getContext().set(symbol, v) ; return r ; diff --git a/jena-tdb1/src/main/java/org/apache/jena/tdb1/assembler/TDB1GraphAssembler.java b/jena-tdb1/src/main/java/org/apache/jena/tdb1/assembler/TDB1GraphAssembler.java index d6fca757b3..f29d0971c5 100644 --- a/jena-tdb1/src/main/java/org/apache/jena/tdb1/assembler/TDB1GraphAssembler.java +++ b/jena-tdb1/src/main/java/org/apache/jena/tdb1/assembler/TDB1GraphAssembler.java @@ -21,7 +21,6 @@ package org.apache.jena.tdb1.assembler; import static org.apache.jena.sparql.util.graph.GraphUtils.getAsStringValue ; import static org.apache.jena.sparql.util.graph.GraphUtils.getResourceValue ; import static org.apache.jena.sparql.util.graph.GraphUtils.getStringValue ; -import static org.apache.jena.tdb1.assembler.VocabTDB1.*; import org.apache.jena.assembler.Assembler ; import org.apache.jena.assembler.Mode ; @@ -38,6 +37,7 @@ import org.apache.jena.sys.JenaSystem; import org.apache.jena.tdb1.TDB1Factory; import org.apache.jena.tdb1.base.file.Location; +@SuppressWarnings("removal") public class TDB1GraphAssembler extends AssemblerBase implements Assembler { static { JenaSystem.init(); } @@ -59,8 +59,8 @@ public class TDB1GraphAssembler extends AssemblerBase implements Assembler // tdb:graphName <http://example/name>; // Location or dataset reference. - String locationDir = getStringValue(root, pLocation); - Resource dataset = getResourceValue(root, pDataset); + String locationDir = getStringValue(root, VocabTDB1.pLocation); + Resource dataset = getResourceValue(root, VocabTDB1.pDataset); if ( locationDir != null && dataset != null ) throw new AssemblerException(root, "Both location and dataset given: exactly one required"); @@ -69,12 +69,12 @@ public class TDB1GraphAssembler extends AssemblerBase implements Assembler throw new AssemblerException(root, "Must give location or refer to a dataset description"); String graphName = null; - if ( root.hasProperty(pGraphName1) ) - graphName = getAsStringValue(root, pGraphName1); - if ( root.hasProperty(pGraphName2) ) - graphName = getAsStringValue(root, pGraphName2); + if ( root.hasProperty(VocabTDB1.pGraphName1) ) + graphName = getAsStringValue(root, VocabTDB1.pGraphName1); + if ( root.hasProperty(VocabTDB1.pGraphName2) ) + graphName = getAsStringValue(root, VocabTDB1.pGraphName2); - if ( root.hasProperty(pIndex) ) + if ( root.hasProperty(VocabTDB1.pIndex) ) Log.warn(this, "Custom indexes not implemented yet - ignored"); DatasetGraph dsg; diff --git a/jena-tdb1/src/main/java/org/apache/jena/tdb1/assembler/VocabTDB1.java b/jena-tdb1/src/main/java/org/apache/jena/tdb1/assembler/VocabTDB1.java index 1d5040cbe1..c40c3c1ac1 100644 --- a/jena-tdb1/src/main/java/org/apache/jena/tdb1/assembler/VocabTDB1.java +++ b/jena-tdb1/src/main/java/org/apache/jena/tdb1/assembler/VocabTDB1.java @@ -24,6 +24,8 @@ import org.apache.jena.sparql.core.assembler.AssemblerUtils ; import org.apache.jena.system.Vocab; import org.apache.jena.tdb1.TDB1; +/** @deprecated Migrate to TDB2. */ +@Deprecated(forRemoval = true) public class VocabTDB1 { private static final String NS = TDB1.namespace ; diff --git a/jena-tdb1/src/main/java/org/apache/jena/tdb1/base/file/LocationLock.java b/jena-tdb1/src/main/java/org/apache/jena/tdb1/base/file/LocationLock.java index 47819fb099..67a424dc22 100644 --- a/jena-tdb1/src/main/java/org/apache/jena/tdb1/base/file/LocationLock.java +++ b/jena-tdb1/src/main/java/org/apache/jena/tdb1/base/file/LocationLock.java @@ -33,8 +33,8 @@ import org.apache.jena.tdb1.sys.SystemTDB; /** * Represents a lock on a TDB location - * */ +@SuppressWarnings("removal") public class LocationLock { private static final int NO_OWNER = 0; private static final String LOCK_FILENAME = "tdb.lock"; diff --git a/jena-tdb1/src/main/java/org/apache/jena/tdb1/base/objectfile/ObjectFileStorage.java b/jena-tdb1/src/main/java/org/apache/jena/tdb1/base/objectfile/ObjectFileStorage.java index 4988878f0c..af99418f22 100644 --- a/jena-tdb1/src/main/java/org/apache/jena/tdb1/base/objectfile/ObjectFileStorage.java +++ b/jena-tdb1/src/main/java/org/apache/jena/tdb1/base/objectfile/ObjectFileStorage.java @@ -38,7 +38,7 @@ import org.slf4j.LoggerFactory; * Variable length ByteBuffer file on disk with * buffering for delayed writes. */ - +@SuppressWarnings("removal") public class ObjectFileStorage implements ObjectFile { private static Logger log = LoggerFactory.getLogger(ObjectFileStorage.class); diff --git a/jena-tdb1/src/main/java/org/apache/jena/tdb1/setup/DatasetBuilderStd.java b/jena-tdb1/src/main/java/org/apache/jena/tdb1/setup/DatasetBuilderStd.java index 405febdf22..d49c3f7c6e 100644 --- a/jena-tdb1/src/main/java/org/apache/jena/tdb1/setup/DatasetBuilderStd.java +++ b/jena-tdb1/src/main/java/org/apache/jena/tdb1/setup/DatasetBuilderStd.java @@ -59,7 +59,7 @@ import org.slf4j.Logger; * This class is the process of building a dataset. Records * BlockMgr/BufferChannel/NodeTable for use by the transaction builder. */ - +@SuppressWarnings("removal") public class DatasetBuilderStd { private static final Logger log = TDB1.logInfo; diff --git a/jena-tdb1/src/main/java/org/apache/jena/tdb1/solver/QueryEngineTDB.java b/jena-tdb1/src/main/java/org/apache/jena/tdb1/solver/QueryEngineTDB.java index a3f259644f..c7e00c632b 100644 --- a/jena-tdb1/src/main/java/org/apache/jena/tdb1/solver/QueryEngineTDB.java +++ b/jena-tdb1/src/main/java/org/apache/jena/tdb1/solver/QueryEngineTDB.java @@ -45,7 +45,7 @@ import org.apache.jena.tdb1.transaction.DatasetGraphTransaction; // then to make the quad form. // TDB also uses a custom OpExecutor to intercept certain part // of the Op evaluations - +@SuppressWarnings("removal") public class QueryEngineTDB extends QueryEngineMain { // ---- Wiring diff --git a/jena-tdb1/src/main/java/org/apache/jena/tdb1/solver/SolverLibTDB.java b/jena-tdb1/src/main/java/org/apache/jena/tdb1/solver/SolverLibTDB.java index e054632d03..b68ac343b9 100644 --- a/jena-tdb1/src/main/java/org/apache/jena/tdb1/solver/SolverLibTDB.java +++ b/jena-tdb1/src/main/java/org/apache/jena/tdb1/solver/SolverLibTDB.java @@ -47,6 +47,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** Utilities used within the TDB BGP solver : local TDB store */ +@SuppressWarnings("removal") public class SolverLibTDB { private static Logger log = LoggerFactory.getLogger(SolverLibTDB.class); diff --git a/jena-tdb1/src/main/java/org/apache/jena/tdb1/store/GraphTxnTDB_Prefixes.java b/jena-tdb1/src/main/java/org/apache/jena/tdb1/store/GraphTxnTDB_Prefixes.java index 391740bbdc..59e34b0b49 100644 --- a/jena-tdb1/src/main/java/org/apache/jena/tdb1/store/GraphTxnTDB_Prefixes.java +++ b/jena-tdb1/src/main/java/org/apache/jena/tdb1/store/GraphTxnTDB_Prefixes.java @@ -69,6 +69,7 @@ public class GraphTxnTDB_Prefixes extends GraphTxnTDB { this.isDefault = (graphName==null)?true: Quad.isDefaultGraph(graphName); } + @SuppressWarnings("removal") private PrefixMap getPrefixMap() { DatasetPrefixesTDB pm = TDBInternal.getDatasetGraphTDB(dsgx).getStoragePrefixes(); if ( isDefault ) diff --git a/jena-tdb1/src/main/java/org/apache/jena/tdb1/store/bulkloader/BulkLoader.java b/jena-tdb1/src/main/java/org/apache/jena/tdb1/store/bulkloader/BulkLoader.java index 4a02dc51b9..081804cb11 100644 --- a/jena-tdb1/src/main/java/org/apache/jena/tdb1/store/bulkloader/BulkLoader.java +++ b/jena-tdb1/src/main/java/org/apache/jena/tdb1/store/bulkloader/BulkLoader.java @@ -63,6 +63,7 @@ public class BulkLoader { public static EventType evStartIndexBulkload = new EventType(baseName + "start-bulkload-index"); public static EventType evFinishIndexBulkload = new EventType(baseName + "finish-bulkload-index"); + @SuppressWarnings("removal") static private Logger loadLogger = TDB1.logLoader; // Event callbacks for the load stages? diff --git a/jena-tdb1/src/main/java/org/apache/jena/tdb1/store/nodetable/NodecSSE.java b/jena-tdb1/src/main/java/org/apache/jena/tdb1/store/nodetable/NodecSSE.java index 52d73b78ee..528f1dfb03 100644 --- a/jena-tdb1/src/main/java/org/apache/jena/tdb1/store/nodetable/NodecSSE.java +++ b/jena-tdb1/src/main/java/org/apache/jena/tdb1/store/nodetable/NodecSSE.java @@ -42,7 +42,7 @@ import org.apache.jena.tdb1.TDB1; import org.apache.jena.tdb1.TDB1Exception; /** Simple encoder/decoder for nodes that uses Turtle term string encoding. */ - +@SuppressWarnings("removal") public class NodecSSE implements Nodec { // Characters in IRIs that are illegal and cause SSE problems, but we wish to keep. diff --git a/jena-tdb1/src/main/java/org/apache/jena/tdb1/store/xloader/ProcNodeTableDataBuilder.java b/jena-tdb1/src/main/java/org/apache/jena/tdb1/store/xloader/ProcNodeTableDataBuilder.java index 2a933ecb63..7097950771 100644 --- a/jena-tdb1/src/main/java/org/apache/jena/tdb1/store/xloader/ProcNodeTableDataBuilder.java +++ b/jena-tdb1/src/main/java/org/apache/jena/tdb1/store/xloader/ProcNodeTableDataBuilder.java @@ -47,6 +47,7 @@ import org.apache.jena.tdb1.sys.TDBInternal; import org.slf4j.Logger; /** Create the Node table and write the triples/quads temporary files */ +@SuppressWarnings("removal") public class ProcNodeTableDataBuilder { // See also TDB2 ProcNodeTableBuilder private static Logger cmdLog = TDB1.logLoader; diff --git a/jena-tdb1/src/main/java/org/apache/jena/tdb1/sys/DebugTDB.java b/jena-tdb1/src/main/java/org/apache/jena/tdb1/sys/DebugTDB.java index a4634f0650..d128589ec2 100644 --- a/jena-tdb1/src/main/java/org/apache/jena/tdb1/sys/DebugTDB.java +++ b/jena-tdb1/src/main/java/org/apache/jena/tdb1/sys/DebugTDB.java @@ -35,6 +35,7 @@ import org.apache.jena.tdb1.store.tupletable.TupleIndexRecord; /** Lowlevel utilities for working with TDB */ +@SuppressWarnings("removal") public class DebugTDB { public static NodeId lookup(DatasetGraphTDB dsg, Node n) @@ -43,7 +44,7 @@ public class DebugTDB NodeId nid = nt.getNodeIdForNode(n) ; return nid ; } - + public static void dumpInternals(DatasetGraphTDB dsg, boolean includeNamedGraphs) { dumpNodeTable("Nodes", dsg) ; @@ -54,26 +55,26 @@ public class DebugTDB System.out.println(idx.getName()) ; dumpIndex(idx) ; } - + if ( ! includeNamedGraphs ) return ; - + for ( TupleIndex idx : indexes2 ) { System.out.println(idx.getName()) ; dumpIndex(idx) ; } } - + public static void dumpNodeTable(String label, DatasetGraphTDB dsg) { NodeTable nt1 = dsg.getTripleTable().getNodeTupleTable().getNodeTable() ; NodeTableLib.print(label, nt1) ; } - -// public static RangeIndex makeRangeIndex(Location location, String indexName, + +// public static RangeIndex makeRangeIndex(Location location, String indexName, // int dftKeyLength, int dftValueLength, // int readCacheSize,int writeCacheSize) - + public static void dumpNodeIndex(String dir) { Location location = Location.create(dir) ; @@ -83,21 +84,21 @@ public class DebugTDB System.out.println( aNodeToId ); } } - - + + public static TupleIndex getIndex(String idxName, DatasetGraphTDB dsg) { System.out.println(idxName) ; TupleIndex[] indexes1 = dsg.getTripleTable().getNodeTupleTable().getTupleTable().getIndexes() ; TupleIndex[] indexes2 = dsg.getQuadTable().getNodeTupleTable().getTupleTable().getIndexes() ; - TupleIndex idx = null ; - + TupleIndex idx = null ; + for ( TupleIndex i : indexes1 ) { if ( i.getName().equals(idxName) ) return i ; } - + for ( TupleIndex i : indexes2 ) { if ( i.getName().equals(idxName) ) @@ -114,7 +115,7 @@ public class DebugTDB Tuple<NodeId> tuple = iter.next() ; System.out.println(tuple) ; } - + if ( false ) { // Dump raw diff --git a/jena-tdb1/src/main/java/org/apache/jena/tdb1/sys/EnvTDB.java b/jena-tdb1/src/main/java/org/apache/jena/tdb1/sys/EnvTDB.java index 1789461755..52472edaab 100644 --- a/jena-tdb1/src/main/java/org/apache/jena/tdb1/sys/EnvTDB.java +++ b/jena-tdb1/src/main/java/org/apache/jena/tdb1/sys/EnvTDB.java @@ -25,6 +25,7 @@ import org.apache.jena.sparql.util.Context ; import org.apache.jena.sparql.util.Symbol ; import org.apache.jena.tdb1.TDB1; +@SuppressWarnings("removal") public class EnvTDB { public static void processGlobalSystemProperties() diff --git a/jena-tdb1/src/main/java/org/apache/jena/tdb1/sys/InitTDB.java b/jena-tdb1/src/main/java/org/apache/jena/tdb1/sys/InitTDB.java index df9d18c2e6..3c5f30755d 100644 --- a/jena-tdb1/src/main/java/org/apache/jena/tdb1/sys/InitTDB.java +++ b/jena-tdb1/src/main/java/org/apache/jena/tdb1/sys/InitTDB.java @@ -22,6 +22,7 @@ import org.apache.jena.sys.JenaSubsystemLifecycle ; import org.apache.jena.tdb1.TDB1; /** Jena subsystem initialization */ +@SuppressWarnings("removal") public class InitTDB implements JenaSubsystemLifecycle { @Override @@ -32,9 +33,9 @@ public class InitTDB implements JenaSubsystemLifecycle { @Override public void stop() { // This is savage and does not take account of in-flight transactions. - TDB1.closedown() ; + TDB1.closedown() ; } - + @Override public int level() { return 40 ; diff --git a/jena-tdb1/src/main/java/org/apache/jena/tdb1/sys/SetupTDB.java b/jena-tdb1/src/main/java/org/apache/jena/tdb1/sys/SetupTDB.java index 79e2b1c79a..7369d92c49 100644 --- a/jena-tdb1/src/main/java/org/apache/jena/tdb1/sys/SetupTDB.java +++ b/jena-tdb1/src/main/java/org/apache/jena/tdb1/sys/SetupTDB.java @@ -37,11 +37,11 @@ import org.apache.jena.tdb1.store.tupletable.TupleIndexRecord; import org.slf4j.Logger ; /** Makes things : datasets from locations, indexes, etc etc. */ - +@Deprecated(forRemoval = true) public class SetupTDB { // Replaced/merge with DatasetBuilderStd mechanisms. - + //private static final Logger log = LoggerFactory.getLogger(NewSetup.class) ; static final Logger log = TDB1.logInfo ; public static void error(Logger log, String msg) @@ -64,7 +64,7 @@ public class SetupTDB indexes[i] = makeTupleIndex(location, primary, descs[i], filenames[i], indexRecordLen) ; return indexes ; } - + public static TupleIndex makeTupleIndex(Location location, String primary, String indexOrder, String indexName, int keyLength) @@ -72,30 +72,30 @@ public class SetupTDB FileSet fs = new FileSet(location, indexName) ; int readCacheSize = params.getBlockReadCacheSize() ; int writeCacheSize = params.getBlockWriteCacheSize() ; - + // Value part is null (zero length) RangeIndex rIndex = SetupIndex.makeRangeIndex(location, indexName, params.getBlockSize(), keyLength, 0, readCacheSize, writeCacheSize) ; TupleIndex tupleIndex = new TupleIndexRecord(primary.length(), new ColumnMap(primary, indexOrder), indexOrder, rIndex.getRecordFactory(), rIndex) ; return tupleIndex ; } - - + + public static Index makeIndex(Location location, String indexName, int blkSize, - int dftKeyLength, int dftValueLength, + int dftKeyLength, int dftValueLength, int readCacheSize,int writeCacheSize) { return SetupIndex.makeIndex(location, indexName, blkSize, dftKeyLength, dftValueLength, readCacheSize, writeCacheSize) ; } - - public static RangeIndex makeRangeIndex(Location location, String indexName, + + public static RangeIndex makeRangeIndex(Location location, String indexName, int blkSize, int dftKeyLength, int dftValueLength, int readCacheSize,int writeCacheSize) { return SetupIndex.makeRangeIndex(location, indexName, blkSize, dftKeyLength, dftValueLength, readCacheSize, writeCacheSize) ; } - + public static RangeIndex makeBPlusTree(FileSet fs, int blkSize, int readCacheSize, int writeCacheSize, int dftKeyLength, int dftValueLength) @@ -107,7 +107,7 @@ public class SetupTDB { return SetupIndex.makeRecordFactory(keyLen, valueLen) ; } - + public static ObjectFile makeObjectFile(FileSet fsIdToNode) { String filename = fsIdToNode.filename(Names.extNodeData) ; @@ -119,7 +119,7 @@ public class SetupTDB public static RangeIndex createBPTree(FileSet fileset, RecordFactory factory) { return SetupIndex.createBPTree(fileset, factory) ; } - + /** Create a B+Tree by BlockSize */ public static RangeIndex createBPTreeByBlockSize(FileSet fileset, int blockSize, @@ -127,7 +127,7 @@ public class SetupTDB RecordFactory factory) { return SetupIndex.createBPTreeByBlockSize(fileset, blockSize, readCacheSize, writeCacheSize, factory) ; } - + /** Create a B+Tree by Order */ public static RangeIndex createBPTreeByOrder(FileSet fileset, int order, @@ -135,7 +135,7 @@ public class SetupTDB RecordFactory factory) { return SetupIndex.createBPTreeByOrder(fileset, order, readCacheSize, writeCacheSize, factory) ; } - + /** Knowing all the parameters, create a B+Tree */ public static BPlusTree createBPTree(FileSet fileset, int order, int blockSize, diff --git a/jena-tdb1/src/main/java/org/apache/jena/tdb1/sys/StoreConnection.java b/jena-tdb1/src/main/java/org/apache/jena/tdb1/sys/StoreConnection.java index fd9ca1987c..7bf6dbcb5d 100644 --- a/jena-tdb1/src/main/java/org/apache/jena/tdb1/sys/StoreConnection.java +++ b/jena-tdb1/src/main/java/org/apache/jena/tdb1/sys/StoreConnection.java @@ -185,6 +185,7 @@ public class StoreConnection * Stop managing a location. Use with great care (testing only). * Use via {@link TDBInternal#expel} wherever possible. */ + @SuppressWarnings("removal") public static synchronized void expel(Location location, boolean force) { // Evict from TBDMaker cache otherwise that will retain a reference to this StoreConnection. StoreConnection sConn = cache.get(location) ; diff --git a/jena-tdb1/src/main/java/org/apache/jena/tdb1/sys/SystemTDB.java b/jena-tdb1/src/main/java/org/apache/jena/tdb1/sys/SystemTDB.java index 8ee2ac249d..3cf235ddf1 100644 --- a/jena-tdb1/src/main/java/org/apache/jena/tdb1/sys/SystemTDB.java +++ b/jena-tdb1/src/main/java/org/apache/jena/tdb1/sys/SystemTDB.java @@ -40,6 +40,7 @@ import org.apache.jena.tdb1.store.NodeId; import org.slf4j.Logger ; import org.slf4j.LoggerFactory ; +@SuppressWarnings("removal") public class SystemTDB { static { JenaSystem.init(); } diff --git a/jena-tdb1/src/main/java/org/apache/jena/tdb1/sys/TDBInternal.java b/jena-tdb1/src/main/java/org/apache/jena/tdb1/sys/TDBInternal.java index 5b1482a9ba..23b251baa6 100644 --- a/jena-tdb1/src/main/java/org/apache/jena/tdb1/sys/TDBInternal.java +++ b/jena-tdb1/src/main/java/org/apache/jena/tdb1/sys/TDBInternal.java @@ -38,9 +38,11 @@ import org.apache.jena.tdb1.transaction.TransactionManager; * A collection of helpers to abstract away from internal details of TDB. * Use with care. * These are not general purpose operations. + * @deprecated Migrate to TDB2 */ -public class TDBInternal -{ +@Deprecated(forRemoval = true) +public class TDBInternal { + /** * Return true if this is a TDB1 backed DatasetGraph. */ diff --git a/jena-tdb1/src/main/java/org/apache/jena/tdb1/transaction/BlockMgrJournal.java b/jena-tdb1/src/main/java/org/apache/jena/tdb1/transaction/BlockMgrJournal.java index b296e29a95..4fc6173ed4 100644 --- a/jena-tdb1/src/main/java/org/apache/jena/tdb1/transaction/BlockMgrJournal.java +++ b/jena-tdb1/src/main/java/org/apache/jena/tdb1/transaction/BlockMgrJournal.java @@ -47,6 +47,7 @@ import org.slf4j.LoggerFactory ; * because the {@link TransactionManager} is responsible to writing * the blocks to the main storage. */ +@SuppressWarnings("removal") public class BlockMgrJournal implements BlockMgr, TransactionLifecycle { private static Logger log = LoggerFactory.getLogger(BlockMgrJournal.class) ; diff --git a/jena-tdb1/src/main/java/org/apache/jena/tdb1/transaction/DatasetGraphTransaction.java b/jena-tdb1/src/main/java/org/apache/jena/tdb1/transaction/DatasetGraphTransaction.java index 660b1cc4bf..a7bdad8eae 100644 --- a/jena-tdb1/src/main/java/org/apache/jena/tdb1/transaction/DatasetGraphTransaction.java +++ b/jena-tdb1/src/main/java/org/apache/jena/tdb1/transaction/DatasetGraphTransaction.java @@ -48,6 +48,7 @@ import org.apache.jena.tdb1.sys.StoreConnection; * * Not considered to be in the public API. */ +@SuppressWarnings("removal") public class DatasetGraphTransaction extends DatasetGraphWrapper implements Sync { /* * Initially, the app can use this DatasetGraph non-transactionally. But as diff --git a/jena-tdb1/src/test/java/org/apache/jena/tdb1/TC_TDB1.java b/jena-tdb1/src/test/java/org/apache/jena/tdb1/TC_TDB1.java index 6fa2665eb7..96878ede97 100644 --- a/jena-tdb1/src/test/java/org/apache/jena/tdb1/TC_TDB1.java +++ b/jena-tdb1/src/test/java/org/apache/jena/tdb1/TC_TDB1.java @@ -33,7 +33,6 @@ import org.apache.jena.tdb1.store.TS_Store; import org.apache.jena.tdb1.store.nodetable.TS_NodeTable; import org.apache.jena.tdb1.store.tupletable.TS_TupleTable; import org.apache.jena.tdb1.sys.SystemTDB; -import org.apache.jena.tdb1.sys.TS_Sys; import org.apache.jena.tdb1.transaction.TS_TransactionTDB1; import org.junit.AfterClass ; import org.junit.BeforeClass ; @@ -55,7 +54,6 @@ import org.junit.runners.Suite ; , TS_TDB1Setup.class , TS_Store.class // The main storage implementation. Some slow tests. , TS_SolverTDB1.class - , TS_Sys.class , TS_GraphTDB1.class , TS_TDB1Factory.class , TS_TDB1Assembler.class diff --git a/jena-tdb1/src/test/java/org/apache/jena/tdb1/TestMiscTDB1.java b/jena-tdb1/src/test/java/org/apache/jena/tdb1/TestMiscTDB1.java index b3ce8d4c94..e1844d6a8b 100644 --- a/jena-tdb1/src/test/java/org/apache/jena/tdb1/TestMiscTDB1.java +++ b/jena-tdb1/src/test/java/org/apache/jena/tdb1/TestMiscTDB1.java @@ -21,6 +21,7 @@ package org.apache.jena.tdb1; import org.apache.jena.query.Dataset; import org.apache.jena.sparql.AbstractTestAdditional; +@SuppressWarnings("removal") public class TestMiscTDB1 extends AbstractTestAdditional { @Override diff --git a/jena-tdb1/src/test/java/org/apache/jena/tdb1/TestTDB1Factory.java b/jena-tdb1/src/test/java/org/apache/jena/tdb1/TestTDB1Factory.java index 68c1a9bc5a..57413ed1e0 100644 --- a/jena-tdb1/src/test/java/org/apache/jena/tdb1/TestTDB1Factory.java +++ b/jena-tdb1/src/test/java/org/apache/jena/tdb1/TestTDB1Factory.java @@ -35,6 +35,7 @@ import org.junit.After ; import org.junit.Before ; import org.junit.Test ; +@SuppressWarnings("removal") public class TestTDB1Factory { String DIR = ConfigTest.getCleanDir() ; diff --git a/jena-tdb1/src/test/java/org/apache/jena/tdb1/assembler/TestTDB1Assembler.java b/jena-tdb1/src/test/java/org/apache/jena/tdb1/assembler/TestTDB1Assembler.java index 04d8927744..c7acaab9d4 100644 --- a/jena-tdb1/src/test/java/org/apache/jena/tdb1/assembler/TestTDB1Assembler.java +++ b/jena-tdb1/src/test/java/org/apache/jena/tdb1/assembler/TestTDB1Assembler.java @@ -39,6 +39,7 @@ import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; +@SuppressWarnings("removal") public class TestTDB1Assembler { // Can be slow - explicitly closes the dataset. static String dirAssem = null; diff --git a/jena-tdb1/src/test/java/org/apache/jena/tdb1/graph/AbstractTestGraphsTDB1.java b/jena-tdb1/src/test/java/org/apache/jena/tdb1/graph/AbstractTestGraphsTDB1.java index e1af4b07ad..d3a34e033d 100644 --- a/jena-tdb1/src/test/java/org/apache/jena/tdb1/graph/AbstractTestGraphsTDB1.java +++ b/jena-tdb1/src/test/java/org/apache/jena/tdb1/graph/AbstractTestGraphsTDB1.java @@ -27,6 +27,7 @@ import org.apache.jena.tdb1.sys.SystemTDB; import org.junit.AfterClass ; import org.junit.BeforeClass ; +@SuppressWarnings("removal") public abstract class AbstractTestGraphsTDB1 extends GraphsTests { private static ReorderTransformation reorder ; diff --git a/jena-tdb1/src/test/java/org/apache/jena/tdb1/graph/TestDatasetGraphTDB1.java b/jena-tdb1/src/test/java/org/apache/jena/tdb1/graph/TestDatasetGraphTDB1.java index cc25c68fd7..86fb811e90 100644 --- a/jena-tdb1/src/test/java/org/apache/jena/tdb1/graph/TestDatasetGraphTDB1.java +++ b/jena-tdb1/src/test/java/org/apache/jena/tdb1/graph/TestDatasetGraphTDB1.java @@ -23,6 +23,7 @@ import org.apache.jena.sparql.core.DatasetGraph ; import org.apache.jena.tdb1.TDB1Factory; // Quad tests +@SuppressWarnings("removal") public class TestDatasetGraphTDB1 extends AbstractDatasetGraphTests { @Override diff --git a/jena-tdb1/src/test/java/org/apache/jena/tdb1/graph/TestGraphOverDatasetTDB1.java b/jena-tdb1/src/test/java/org/apache/jena/tdb1/graph/TestGraphOverDatasetTDB1.java index 3f85043821..ed8bb50a1a 100644 --- a/jena-tdb1/src/test/java/org/apache/jena/tdb1/graph/TestGraphOverDatasetTDB1.java +++ b/jena-tdb1/src/test/java/org/apache/jena/tdb1/graph/TestGraphOverDatasetTDB1.java @@ -25,6 +25,7 @@ import org.apache.jena.sparql.core.DatasetGraph ; import org.apache.jena.tdb1.TDB1Factory; /** This is the view-graph test suite run over a TDB DatasetGraph to check compatibility */ +@SuppressWarnings("removal") public class TestGraphOverDatasetTDB1 extends AbstractTestGraphOverDatasetGraph { @Override diff --git a/jena-tdb1/src/test/java/org/apache/jena/tdb1/graph/TestPrefixMapTDB1.java b/jena-tdb1/src/test/java/org/apache/jena/tdb1/graph/TestPrefixMapTDB1.java index 6745760e88..76e2f7f504 100644 --- a/jena-tdb1/src/test/java/org/apache/jena/tdb1/graph/TestPrefixMapTDB1.java +++ b/jena-tdb1/src/test/java/org/apache/jena/tdb1/graph/TestPrefixMapTDB1.java @@ -22,6 +22,7 @@ import org.apache.jena.riot.system.AbstractTestPrefixMap; import org.apache.jena.riot.system.PrefixMap; import org.apache.jena.tdb1.TDB1Factory; +@SuppressWarnings("removal") public class TestPrefixMapTDB1 extends AbstractTestPrefixMap { @Override diff --git a/jena-tdb1/src/test/java/org/apache/jena/tdb1/graph/TestPrefixMappingTDB1.java b/jena-tdb1/src/test/java/org/apache/jena/tdb1/graph/TestPrefixMappingTDB1.java index 7c1f29f9a9..e8b47c8001 100644 --- a/jena-tdb1/src/test/java/org/apache/jena/tdb1/graph/TestPrefixMappingTDB1.java +++ b/jena-tdb1/src/test/java/org/apache/jena/tdb1/graph/TestPrefixMappingTDB1.java @@ -41,6 +41,7 @@ import org.apache.jena.tdb1.sys.SystemTDB; import org.apache.jena.tdb1.sys.TDBInternal; import org.junit.* ; +@SuppressWarnings("removal") public class TestPrefixMappingTDB1 extends AbstractTestPrefixMappingView { static DatasetPrefixesTDB last = null ; diff --git a/jena-tdb1/src/test/java/org/apache/jena/tdb1/junit/RunnerSPARQL_TDB1.java b/jena-tdb1/src/test/java/org/apache/jena/tdb1/junit/RunnerSPARQL_TDB1.java index 052c0fbc7d..9ccdc8787c 100644 --- a/jena-tdb1/src/test/java/org/apache/jena/tdb1/junit/RunnerSPARQL_TDB1.java +++ b/jena-tdb1/src/test/java/org/apache/jena/tdb1/junit/RunnerSPARQL_TDB1.java @@ -28,6 +28,7 @@ import org.apache.jena.query.Dataset; import org.apache.jena.tdb1.TDB1Factory; import org.junit.runners.model.InitializationError; +@SuppressWarnings("removal") public class RunnerSPARQL_TDB1 extends AbstractRunnerOfTests { public RunnerSPARQL_TDB1(Class<? > klass) throws InitializationError { diff --git a/jena-tdb1/src/test/java/org/apache/jena/tdb1/solver/TestSolverTDB1.java b/jena-tdb1/src/test/java/org/apache/jena/tdb1/solver/TestSolverTDB1.java index 8855033795..14dc87dd34 100644 --- a/jena-tdb1/src/test/java/org/apache/jena/tdb1/solver/TestSolverTDB1.java +++ b/jena-tdb1/src/test/java/org/apache/jena/tdb1/solver/TestSolverTDB1.java @@ -49,6 +49,7 @@ import org.apache.jena.sparql.sse.SSE; import org.apache.jena.tdb1.ConfigTest; import org.apache.jena.tdb1.TDB1Factory; +@SuppressWarnings("removal") public class TestSolverTDB1 { static String graphData = null; static Dataset dataset = null; diff --git a/jena-tdb1/src/test/java/org/apache/jena/tdb1/solver/TestStats.java b/jena-tdb1/src/test/java/org/apache/jena/tdb1/solver/TestStats.java index 3a4c70149e..f0d1506f4b 100644 --- a/jena-tdb1/src/test/java/org/apache/jena/tdb1/solver/TestStats.java +++ b/jena-tdb1/src/test/java/org/apache/jena/tdb1/solver/TestStats.java @@ -36,6 +36,7 @@ import org.apache.jena.tdb1.store.nodetupletable.NodeTupleTable; import org.apache.jena.tdb1.sys.TDBInternal; import org.junit.Test; +@SuppressWarnings("removal") public class TestStats { static DatasetGraphTDB dsg = TDBInternal.getBaseDatasetGraphTDB(TDB1Factory.createDatasetGraph()); static NodeTupleTable quads = dsg.getQuadTable().getNodeTupleTable(); diff --git a/jena-tdb1/src/test/java/org/apache/jena/tdb1/store/AbstractStoreConnections.java b/jena-tdb1/src/test/java/org/apache/jena/tdb1/store/AbstractStoreConnections.java index 286b17b02f..a32a0a77fb 100644 --- a/jena-tdb1/src/test/java/org/apache/jena/tdb1/store/AbstractStoreConnections.java +++ b/jena-tdb1/src/test/java/org/apache/jena/tdb1/store/AbstractStoreConnections.java @@ -41,6 +41,7 @@ import org.junit.After ; import org.junit.Before ; import org.junit.Test ; +@SuppressWarnings("removal") public abstract class AbstractStoreConnections { // Subclass to give direct and mapped versions. @@ -180,7 +181,6 @@ public abstract class AbstractStoreConnections dsgTxn2.end() ; } - @SuppressWarnings("removal") @Test public void store_7() { // No transaction, plain update, then transaction. diff --git a/jena-tdb1/src/test/java/org/apache/jena/tdb1/store/GraphLocation.java b/jena-tdb1/src/test/java/org/apache/jena/tdb1/store/GraphLocation.java index 9f843995d2..1e119f1772 100644 --- a/jena-tdb1/src/test/java/org/apache/jena/tdb1/store/GraphLocation.java +++ b/jena-tdb1/src/test/java/org/apache/jena/tdb1/store/GraphLocation.java @@ -37,6 +37,7 @@ import org.apache.jena.tdb1.base.file.Location; import org.apache.jena.tdb1.junit.TDB1TestException; /** Manage a graph at a fixed location */ +@SuppressWarnings("removal") class GraphLocation { private Location loc = null ; diff --git a/jena-tdb1/src/test/java/org/apache/jena/tdb1/store/TestConcurrentAccess.java b/jena-tdb1/src/test/java/org/apache/jena/tdb1/store/TestConcurrentAccess.java index 9dfbe7652a..8c37271f2c 100644 --- a/jena-tdb1/src/test/java/org/apache/jena/tdb1/store/TestConcurrentAccess.java +++ b/jena-tdb1/src/test/java/org/apache/jena/tdb1/store/TestConcurrentAccess.java @@ -41,6 +41,7 @@ import org.apache.jena.tdb1.TDB1Factory; import org.apache.jena.util.iterator.ExtendedIterator ; import org.junit.Test ; +@SuppressWarnings("removal") public class TestConcurrentAccess { static String data = StrUtils.strjoinNL( @@ -55,14 +56,14 @@ public class TestConcurrentAccess " (<x> <p> 8)" , " (<x> <p> 9)" , ")") ; - + private static Graph buildGraph() { Item item = SSE.parse(data) ; Graph g = BuilderGraph.buildGraph(item) ; return g ; } - + private static Dataset create() { Graph g = buildGraph() ; @@ -70,22 +71,22 @@ public class TestConcurrentAccess GraphUtil.addInto(ds.getDefaultModel().getGraph(), g) ; return ds ; } - + @Test public void mrswGraph1() { Model m = create().getDefaultModel() ; Resource r = m.createResource("x") ; ExtendedIterator<Statement> iter1 = m.listStatements(r, null, (RDFNode)null) ; assertNotNull(iter1.next()) ; - + ExtendedIterator<Statement> iter2 = m.listStatements(r, null, (RDFNode)null) ; assertNotNull(iter2.next()) ; - + for ( ; iter2.hasNext() ; ) iter2.next() ; - + assertNotNull(iter1.next()) ; } - + @Test(expected=ConcurrentModificationException.class) public void mrswGraph2() { @@ -93,14 +94,14 @@ public class TestConcurrentAccess Resource r = m.createResource("x") ; ExtendedIterator<Statement> iter1 = m.listStatements(r, null, (RDFNode)null) ; assertNotNull(iter1.next()) ; - + Triple t = SSE.parseTriple("(<y> <p> 99)") ; m.getGraph().add(t) ; - + // Bad iter1.hasNext(); } - + @Test(expected=ConcurrentModificationException.class) public void mrswGraph3() { @@ -108,10 +109,10 @@ public class TestConcurrentAccess Resource r = m.createResource("x") ; ExtendedIterator<Statement> iter1 = m.listStatements(r, null, (RDFNode)null) ; assertNotNull(iter1.next()) ; - + Triple t = SSE.parseTriple("(<y> <p> 99)") ; m.getGraph().delete(t) ; - + // Bad iter1.hasNext(); } @@ -124,14 +125,14 @@ public class TestConcurrentAccess ExtendedIterator<Statement> iter1 = m.listLiteralStatements(r, null, 1) ; assertNotNull(iter1.next()) ; // and now the iterator has implicitly finished. - + Triple t = SSE.parseTriple("(<y> <p> 99)") ; m.getGraph().add(t) ; - + // Bad - modification of the dataset occurred. iter1.hasNext(); } - + @Test public void mrswGraph5() { @@ -140,7 +141,7 @@ public class TestConcurrentAccess GraphUtil.addInto(m.getGraph(), buildGraph()) ; Resource r = m.createResource("x") ; ExtendedIterator<Statement> iter1 = m.listStatements(r, null, (RDFNode)null) ; - while(iter1.hasNext()) + while(iter1.hasNext()) iter1.next(); Triple t = SSE.parseTriple("(<y> <p> 99)") ; m.getGraph().delete(t) ; @@ -156,41 +157,41 @@ public class TestConcurrentAccess Resource r = m.createResource("x") ; ExtendedIterator<Statement> iter1 = m.listStatements(r, null, (RDFNode)null) ; assertNotNull(iter1.next()) ; - + Triple t = SSE.parseTriple("(<y> <p> 99)") ; m.getGraph().delete(t) ; iter1.next() ; } - + @Test public void mrswSPARQL1() { - Dataset ds = create(); + Dataset ds = create(); Query query = QueryFactory.create("SELECT * { ?s ?p ?o}") ; try(QueryExecution qExec = QueryExecutionFactory.create(query, ds)) { ResultSet rs = qExec.execSelect() ; - while(rs.hasNext()) + while(rs.hasNext()) rs.next(); } - + DatasetGraph dsg = ds.asDatasetGraph() ; Quad quad = SSE.parseQuad("(<g> <y> <p> 99)") ; dsg.add(quad) ; - + Iterator<Quad> iter = dsg.find() ; iter.hasNext() ; iter.next() ; } - + @Test(expected=ConcurrentModificationException.class) public void mrswSPARQL2() { - Dataset ds = create(); + Dataset ds = create(); DatasetGraph dsg = ds.asDatasetGraph() ; Query query = QueryFactory.create("SELECT * { ?s ?p ?o}") ; QueryExecution qExec = QueryExecutionFactory.create(query, ds) ; ResultSet rs = qExec.execSelect() ; - rs.hasNext() ; + rs.hasNext() ; rs.next(); Quad quad = SSE.parseQuad("(<g> <y> <p> 99)") ; dsg.add(quad) ; @@ -198,7 +199,7 @@ public class TestConcurrentAccess rs.next(); } - + @Test(expected=ConcurrentModificationException.class) public void mrswDataset1() { @@ -210,6 +211,6 @@ public class TestConcurrentAccess iter.hasNext() ; iter.next() ; } - + // More DSG tests .. } diff --git a/jena-tdb1/src/test/java/org/apache/jena/tdb1/store/TestDatasetGraphTDB1Find.java b/jena-tdb1/src/test/java/org/apache/jena/tdb1/store/TestDatasetGraphTDB1Find.java index c5d2d76b0f..7aaec192e0 100644 --- a/jena-tdb1/src/test/java/org/apache/jena/tdb1/store/TestDatasetGraphTDB1Find.java +++ b/jena-tdb1/src/test/java/org/apache/jena/tdb1/store/TestDatasetGraphTDB1Find.java @@ -23,11 +23,12 @@ import org.apache.jena.sparql.core.DatasetGraph ; import org.apache.jena.tdb1.TDB1Factory; import org.apache.jena.tdb1.transaction.DatasetGraphTransaction; +@SuppressWarnings("removal") public class TestDatasetGraphTDB1Find extends AbstractDatasetGraphFind { @Override public DatasetGraph create() { - // Get the underlying storage, not the transactional support. + // Get the underlying storage, not the transactional support. return ((DatasetGraphTransaction)TDB1Factory.createDatasetGraph()).getBaseDatasetGraph(); } } diff --git a/jena-tdb1/src/test/java/org/apache/jena/tdb1/store/TestDatasetGraphTDB1FindPattern.java b/jena-tdb1/src/test/java/org/apache/jena/tdb1/store/TestDatasetGraphTDB1FindPattern.java index c5468acb14..1d48354d35 100644 --- a/jena-tdb1/src/test/java/org/apache/jena/tdb1/store/TestDatasetGraphTDB1FindPattern.java +++ b/jena-tdb1/src/test/java/org/apache/jena/tdb1/store/TestDatasetGraphTDB1FindPattern.java @@ -23,11 +23,12 @@ import org.apache.jena.sparql.core.DatasetGraph ; import org.apache.jena.tdb1.TDB1Factory; import org.apache.jena.tdb1.transaction.DatasetGraphTransaction; +@SuppressWarnings("removal") public class TestDatasetGraphTDB1FindPattern extends AbstractDatasetGraphFindPatterns { @Override public DatasetGraph create() { - // Get the underlying storage, not the transactional support. + // Get the underlying storage, not the transactional support. return ((DatasetGraphTransaction)TDB1Factory.createDatasetGraph()).getBaseDatasetGraph(); } } diff --git a/jena-tdb1/src/test/java/org/apache/jena/tdb1/store/TestDatasetTDB1.java b/jena-tdb1/src/test/java/org/apache/jena/tdb1/store/TestDatasetTDB1.java index 7c8ff4ebfb..1fc2980981 100644 --- a/jena-tdb1/src/test/java/org/apache/jena/tdb1/store/TestDatasetTDB1.java +++ b/jena-tdb1/src/test/java/org/apache/jena/tdb1/store/TestDatasetTDB1.java @@ -35,6 +35,7 @@ import org.apache.jena.tdb1.TDB1Factory; import org.junit.Test ; /** Tests of datasets, prefixes, special URIs etc (see also {@link org.apache.jena.sparql.graph.GraphsTests} */ +@SuppressWarnings("removal") public class TestDatasetTDB1 { diff --git a/jena-tdb1/src/test/java/org/apache/jena/tdb1/store/TestDatasetTDB1Persist.java b/jena-tdb1/src/test/java/org/apache/jena/tdb1/store/TestDatasetTDB1Persist.java index b0022a3de1..1a00ce317a 100644 --- a/jena-tdb1/src/test/java/org/apache/jena/tdb1/store/TestDatasetTDB1Persist.java +++ b/jena-tdb1/src/test/java/org/apache/jena/tdb1/store/TestDatasetTDB1Persist.java @@ -40,34 +40,35 @@ import org.junit.AfterClass ; import org.junit.Before ; import org.junit.Test ; -/** Testing persistence */ +/** Testing persistence */ +@SuppressWarnings("removal") public class TestDatasetTDB1Persist { - static Node n0 = NodeFactoryExtra.parseNode("<http://example/n0>") ; + static Node n0 = NodeFactoryExtra.parseNode("<http://example/n0>") ; static Node n1 = NodeFactoryExtra.parseNode("<http://example/n1>") ; static Node n2 = NodeFactoryExtra.parseNode("<http://example/n2>") ; - + // To avoid the problems on MS Windows whereby memory mapped files - // can't be deleted from a running JVM, we use a different, cleaned + // can't be deleted from a running JVM, we use a different, cleaned // directory each time. GraphLocation graphLocation = null ; - + @Before public void before() - { + { TDBInternal.reset() ; String dirname = ConfigTest.getCleanDir() ; graphLocation = new GraphLocation(Location.create(dirname)) ; graphLocation.createDataset() ; } - + @After public void after() { if ( graphLocation != null ) graphLocation.release() ; graphLocation.clearDirectory() ; // Does not have the desired effect on Windows. } - + @AfterClass public static void afterClass() { TDBInternal.reset() ; } @Test public void dataset1() @@ -76,13 +77,13 @@ public class TestDatasetTDB1Persist assertTrue( ds.getDefaultModel().getGraph() instanceof GraphTDB ) ; assertTrue( ds.getNamedModel("http://example/";).getGraph() instanceof GraphTDB ) ; } - + @Test public void dataset2() { Dataset ds = graphLocation.getDataset() ; Graph g1 = ds.getDefaultModel().getGraph() ; Graph g2 = ds.getNamedModel("http://example/";).getGraph() ; - + g1.add(Triple.create(n0,n1,n2) ) ; assertTrue(g1.contains(n0,n1,n2) ) ; assertFalse(g2.contains(n0,n1,n2) ) ; @@ -92,11 +93,11 @@ public class TestDatasetTDB1Persist { Dataset ds = graphLocation.getDataset() ; Graph g1 = ds.getDefaultModel().getGraph() ; - // Sometimes, under windows, deleting the files by - // graphLocation.clearDirectory does not work. + // Sometimes, under windows, deleting the files by + // graphLocation.clearDirectory does not work. // Needed for safe tests on windows. g1.clear() ; - + Graph g2 = ds.getNamedModel("http://example/";).getGraph() ; g2.add(Triple.create(n0,n1,n2) ) ; assertTrue(g2.contains(n0,n1,n2) ) ; @@ -112,24 +113,24 @@ public class TestDatasetTDB1Persist Dataset ds = graphLocation.getDataset() ; // ?? See TupleLib. ds.asDatasetGraph().deleteAny(gn, null, null, null) ; - + Graph g2 = ds.asDatasetGraph().getGraph(gn) ; - + // if ( true ) // { // PrintStream ps = System.err ; // ps.println("Dataset names: ") ; // Iter.print(ps, ds.listNames()) ; // } - + // Graphs only exists if they have a triple in them assertFalse(ds.containsNamedModel(graphName)) ; - + List<String> names = Iter.toList(ds.listNames()) ; assertEquals(0, names.size()) ; assertEquals(0, ds.asDatasetGraph().size()) ; } - + @Test public void dataset5() { String graphName = "http://example/"; ; @@ -138,12 +139,12 @@ public class TestDatasetTDB1Persist Graph g2 = ds.asDatasetGraph().getGraph(org.apache.jena.graph.NodeFactory.createURI(graphName)) ; // Graphs only exists if they have a triple in them g2.add(triple) ; - + assertTrue(ds.containsNamedModel(graphName)) ; List<String> x = Iter.toList(ds.listNames()) ; List<String> y = Arrays.asList(graphName) ; assertEquals(x,y) ; - + assertEquals(1, ds.asDatasetGraph().size()) ; } } diff --git a/jena-tdb1/src/test/java/org/apache/jena/tdb1/store/TestDynamicDatasetTDB1.java b/jena-tdb1/src/test/java/org/apache/jena/tdb1/store/TestDynamicDatasetTDB1.java index 309cef9c25..df61c8ba62 100644 --- a/jena-tdb1/src/test/java/org/apache/jena/tdb1/store/TestDynamicDatasetTDB1.java +++ b/jena-tdb1/src/test/java/org/apache/jena/tdb1/store/TestDynamicDatasetTDB1.java @@ -23,6 +23,7 @@ import org.apache.jena.sparql.core.AbstractTestDynamicDataset ; import org.apache.jena.tdb1.TDB1Factory; import org.apache.jena.tdb1.sys.TDBInternal; +@SuppressWarnings("removal") public class TestDynamicDatasetTDB1 extends AbstractTestDynamicDataset { @Override @@ -30,7 +31,7 @@ public class TestDynamicDatasetTDB1 extends AbstractTestDynamicDataset { return TDB1Factory.createDataset() ; } - + @Override protected void releaseDataset(Dataset ds) { TDBInternal.expel(ds.asDatasetGraph()); diff --git a/jena-tdb1/src/test/java/org/apache/jena/tdb1/store/TestGraphNamedTDB1.java b/jena-tdb1/src/test/java/org/apache/jena/tdb1/store/TestGraphNamedTDB1.java index 79912666cf..1ad8e568b4 100644 --- a/jena-tdb1/src/test/java/org/apache/jena/tdb1/store/TestGraphNamedTDB1.java +++ b/jena-tdb1/src/test/java/org/apache/jena/tdb1/store/TestGraphNamedTDB1.java @@ -26,6 +26,7 @@ import org.apache.jena.sparql.util.NodeFactoryExtra ; import org.apache.jena.tdb1.TDB1Factory; /** Programmatic tests on persistent graph */ +@SuppressWarnings("removal") public class TestGraphNamedTDB1 extends AbstractTestGraphAddDelete { Node graphNode = NodeFactoryExtra.parseNode("<http://example/namedGraph>") ; @@ -36,7 +37,7 @@ public class TestGraphNamedTDB1 extends AbstractTestGraphAddDelete DatasetGraph dataset = TDB1Factory.createDatasetGraph() ; return dataset.getGraph(graphNode) ; } - + @Override protected void returnGraph(Graph g) {} diff --git a/jena-tdb1/src/test/java/org/apache/jena/tdb1/store/TestGraphTDB1.java b/jena-tdb1/src/test/java/org/apache/jena/tdb1/store/TestGraphTDB1.java index be755c0bd3..83bd9254d1 100644 --- a/jena-tdb1/src/test/java/org/apache/jena/tdb1/store/TestGraphTDB1.java +++ b/jena-tdb1/src/test/java/org/apache/jena/tdb1/store/TestGraphTDB1.java @@ -29,10 +29,11 @@ import org.junit.Before; import org.junit.BeforeClass; /** Programmatic tests on persistent graph */ +@SuppressWarnings("removal") public class TestGraphTDB1 extends AbstractTestGraphAddDelete { static GraphLocation graphLocation = null ; - + @BeforeClass public static void beforeClass() { TDBInternal.reset() ; @@ -43,32 +44,32 @@ public class TestGraphTDB1 extends AbstractTestGraphAddDelete graph = graphLocation.getGraph() ; } // ---------- - + @AfterClass public static void afterClass() - { + { graphLocation.release() ; TDBInternal.reset() ; graphLocation.clearDirectory() ; ConfigTest.deleteTestingDirDB() ; } - + static Graph graph = null ; @Before public void before() - { + { if ( graph != null ) graph.clear() ; } - - @After public void after() - { + + @After public void after() + { } - + @Override protected Graph emptyGraph() { return graph ; } - + @Override protected void returnGraph(Graph g) {} diff --git a/jena-tdb1/src/test/java/org/apache/jena/tdb1/store/TestGraphTDB1_Prefixes.java b/jena-tdb1/src/test/java/org/apache/jena/tdb1/store/TestGraphTDB1_Prefixes.java index 9f70a85f57..8877b47cfa 100644 --- a/jena-tdb1/src/test/java/org/apache/jena/tdb1/store/TestGraphTDB1_Prefixes.java +++ b/jena-tdb1/src/test/java/org/apache/jena/tdb1/store/TestGraphTDB1_Prefixes.java @@ -34,6 +34,7 @@ import org.apache.jena.tdb1.TDB1Factory; import org.apache.jena.tdb1.transaction.DatasetGraphTransaction; import org.junit.Test; +@SuppressWarnings("removal") public class TestGraphTDB1_Prefixes { public static Graph graphX(DatasetGraph dataset, Node graphName) { diff --git a/jena-tdb1/src/test/java/org/apache/jena/tdb1/store/TestLoader.java b/jena-tdb1/src/test/java/org/apache/jena/tdb1/store/TestLoader.java index d6df3eb85d..6849f6d7ce 100644 --- a/jena-tdb1/src/test/java/org/apache/jena/tdb1/store/TestLoader.java +++ b/jena-tdb1/src/test/java/org/apache/jena/tdb1/store/TestLoader.java @@ -43,6 +43,7 @@ import org.junit.AfterClass ; import org.junit.BeforeClass ; import org.junit.Test ; +@SuppressWarnings("removal") public class TestLoader { private static String DIR = null ; private static final Node g = NodeFactory.createURI("g") ; diff --git a/jena-tdb1/src/test/java/org/apache/jena/tdb1/store/TestQuadFilter.java b/jena-tdb1/src/test/java/org/apache/jena/tdb1/store/TestQuadFilter.java index 7b0237fbfa..4bac9b63db 100644 --- a/jena-tdb1/src/test/java/org/apache/jena/tdb1/store/TestQuadFilter.java +++ b/jena-tdb1/src/test/java/org/apache/jena/tdb1/store/TestQuadFilter.java @@ -37,6 +37,7 @@ import org.apache.jena.tdb1.sys.SystemTDB; import org.apache.jena.tdb1.sys.TDBInternal; import org.junit.Test ; +@SuppressWarnings("removal") public class TestQuadFilter { private static String graphToHide = "http://example/g2";; diff --git a/jena-tdb1/src/test/java/org/apache/jena/tdb1/store/TestQueryExecTDB1.java b/jena-tdb1/src/test/java/org/apache/jena/tdb1/store/TestQueryExecTDB1.java index 5d6a63f0ed..65be46b1a1 100644 --- a/jena-tdb1/src/test/java/org/apache/jena/tdb1/store/TestQueryExecTDB1.java +++ b/jena-tdb1/src/test/java/org/apache/jena/tdb1/store/TestQueryExecTDB1.java @@ -23,6 +23,7 @@ import org.apache.jena.sparql.core.AbstractTestQueryExec; import org.apache.jena.tdb1.TDB1Factory; import org.apache.jena.tdb1.sys.TDBInternal; +@SuppressWarnings("removal") public class TestQueryExecTDB1 extends AbstractTestQueryExec { @Override diff --git a/jena-tdb1/src/test/java/org/apache/jena/tdb1/store/TestStoreConnectionsMapped.java b/jena-tdb1/src/test/java/org/apache/jena/tdb1/store/TestStoreConnectionsMapped.java index d8438599f4..467f68ad69 100644 --- a/jena-tdb1/src/test/java/org/apache/jena/tdb1/store/TestStoreConnectionsMapped.java +++ b/jena-tdb1/src/test/java/org/apache/jena/tdb1/store/TestStoreConnectionsMapped.java @@ -25,9 +25,10 @@ import org.apache.jena.tdb1.sys.TDBInternal; import org.junit.AfterClass ; import org.junit.BeforeClass ; +@SuppressWarnings("removal") public class TestStoreConnectionsMapped extends AbstractStoreConnections { - static FileMode mode ; + static FileMode mode ; @BeforeClass public static void beforeClassFileMode() diff --git a/jena-tdb1/src/test/java/org/apache/jena/tdb1/store/Test_SPARQL_TDB1.java b/jena-tdb1/src/test/java/org/apache/jena/tdb1/store/Test_SPARQL_TDB1.java index aa08934eaf..731b3bb14c 100644 --- a/jena-tdb1/src/test/java/org/apache/jena/tdb1/store/Test_SPARQL_TDB1.java +++ b/jena-tdb1/src/test/java/org/apache/jena/tdb1/store/Test_SPARQL_TDB1.java @@ -41,6 +41,7 @@ import org.junit.Test ; /** * Test SPARQL */ +@SuppressWarnings("removal") public class Test_SPARQL_TDB1 { private static Dataset create() { diff --git a/jena-tdb1/src/test/java/org/apache/jena/tdb1/sys/TS_Sys.java b/jena-tdb1/src/test/java/org/apache/jena/tdb1/sys/TS_Sys.java deleted file mode 100644 index f0504a5f1f..0000000000 --- a/jena-tdb1/src/test/java/org/apache/jena/tdb1/sys/TS_Sys.java +++ /dev/null @@ -1,36 +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.sys; - - -import org.apache.jena.test.TestSystemSetup; -import org.junit.runner.RunWith; -import org.junit.runners.Suite; - -@RunWith(Suite.class) [email protected]( { - TestSys.class - // From jena-core ... includes initialization test. - , TestSystemSetup.class -}) - -public class TS_Sys -{ - -} diff --git a/jena-tdb1/src/test/java/org/apache/jena/tdb1/sys/TestSys.java b/jena-tdb1/src/test/java/org/apache/jena/tdb1/sys/TestSys.java deleted file mode 100644 index e7bc4ae171..0000000000 --- a/jena-tdb1/src/test/java/org/apache/jena/tdb1/sys/TestSys.java +++ /dev/null @@ -1,31 +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.sys; - -import static org.junit.Assert.assertNotNull; - -import org.apache.jena.tdb1.TDB1; -import org.junit.Test; - -public class TestSys { - @Test - public void sys1() { - assertNotNull(TDB1.VERSION); - } -} diff --git a/jena-tdb1/src/test/java/org/apache/jena/tdb1/transaction/AbstractTestTransSequentialDisk.java b/jena-tdb1/src/test/java/org/apache/jena/tdb1/transaction/AbstractTestTransSequentialDisk.java index 8ccb448a43..b363e30f95 100644 --- a/jena-tdb1/src/test/java/org/apache/jena/tdb1/transaction/AbstractTestTransSequentialDisk.java +++ b/jena-tdb1/src/test/java/org/apache/jena/tdb1/transaction/AbstractTestTransSequentialDisk.java @@ -30,11 +30,12 @@ import org.junit.Before ; public abstract class AbstractTestTransSequentialDisk extends AbstractTestTransSeq { protected String DIR = null ; - + // Subclasses must implement. // @BeforeClass public static void beforeClass() {} // @AfterClass public static void afterClass() {} - + + @SuppressWarnings("removal") @Before public void before() { TDBInternal.reset() ; @@ -42,7 +43,7 @@ public abstract class AbstractTestTransSequentialDisk extends AbstractTestTransS File d = new File(DIR) ; } - @After public void after() {} + @After public void after() {} @Override protected StoreConnection getStoreConnection() diff --git a/jena-tdb1/src/test/java/org/apache/jena/tdb1/transaction/TestTDB1Internal.java b/jena-tdb1/src/test/java/org/apache/jena/tdb1/transaction/TestTDB1Internal.java index b5ac3bb41b..be68814e87 100644 --- a/jena-tdb1/src/test/java/org/apache/jena/tdb1/transaction/TestTDB1Internal.java +++ b/jena-tdb1/src/test/java/org/apache/jena/tdb1/transaction/TestTDB1Internal.java @@ -29,6 +29,7 @@ import org.junit.Assert ; import org.junit.Test ; /** Tests for lower level details of TDB */ +@SuppressWarnings("removal") public class TestTDB1Internal { @Test public void basics_1() { diff --git a/jena-tdb1/src/test/java/org/apache/jena/tdb1/transaction/TestTransControl.java b/jena-tdb1/src/test/java/org/apache/jena/tdb1/transaction/TestTransControl.java index b79cbb3236..b6e1e52a90 100644 --- a/jena-tdb1/src/test/java/org/apache/jena/tdb1/transaction/TestTransControl.java +++ b/jena-tdb1/src/test/java/org/apache/jena/tdb1/transaction/TestTransControl.java @@ -31,25 +31,26 @@ import org.apache.jena.tdb1.sys.SystemTDB; import org.apache.jena.tdb1.sys.TDBInternal; import org.junit.* ; -/** Tests for transaction controls: batching, flushing on size, flushing on backlog of commits */ +/** Tests for transaction controls: batching, flushing on size, flushing on backlog of commits */ +@SuppressWarnings("removal") public class TestTransControl { - private static String levelInfo; - private static String levelErr; - + private static String levelInfo; + private static String levelErr; + @BeforeClass public static void beforeClassLogging() { levelInfo = LogCtl.getLevel(TDB1.logInfoName); levelErr = LogCtl.getLevel(SystemTDB.errlog.getName()); - + LogCtl.setLevel("org.apache.jena.tdb.info", "WARN"); LogCtl.setLevel("org.apache.jena.tdb.exec", "WARN"); - + } @AfterClass public static void afterClassLogging() { LogCtl.setLevel(TDB1.logInfoName, levelInfo); LogCtl.setLevel(SystemTDB.errlog.getName(), levelErr); } - + private static int x_QueueBatchSize ; private static int x_MaxQueueThreshold ; private static int x_JournalThresholdSize ; @@ -66,7 +67,7 @@ public class TestTransControl { TransactionManager.QueueBatchSize = x_QueueBatchSize ; TransactionManager.MaxQueueThreshold = x_MaxQueueThreshold ; TransactionManager.JournalThresholdSize = x_JournalThresholdSize ; - + } @@ -81,8 +82,8 @@ public class TestTransControl { @After public void after() { } - - + + private static Quad q1 = SSE.parseQuad("(_ :s :p1 1)") ; private static Quad q2 = SSE.parseQuad("(_ :s :p2 2)") ; private static Quad q3 = SSE.parseQuad("(_ :s :p3 3)") ; @@ -93,26 +94,26 @@ public class TestTransControl { // ---- JournalThresholdSize - // Flush on journal size / no spill. + // Flush on journal size / no spill. @Test public void journalThresholdSize_01() { TransactionManager.QueueBatchSize = 100 ; TransactionManager.MaxQueueThreshold = -1 ; - TransactionManager.JournalThresholdSize = 1000 ; // More than commit size, less than a block. + TransactionManager.JournalThresholdSize = 1000 ; // More than commit size, less than a block. DatasetGraph dsg = create() ; TransactionManager tMgr = TDBInternal.getTransactionManager(dsg) ; Txn.executeWrite(dsg, ()->{}); // About 20 bytes. assertEquals(1, tMgr.getQueueLength()) ; } - + // Flush on journal size / small setting. @Test public void journalThresholdSize_02() { TransactionManager.QueueBatchSize = 100 ; TransactionManager.MaxQueueThreshold = -1 ; - TransactionManager.JournalThresholdSize = 10 ; // Less than commit size. + TransactionManager.JournalThresholdSize = 10 ; // Less than commit size. DatasetGraph dsg = create() ; TransactionManager tMgr = TDBInternal.getTransactionManager(dsg) ; - + txnAddData(dsg) ; assertEquals(0, tMgr.getQueueLength()) ; } @@ -122,21 +123,21 @@ public class TestTransControl { TransactionManager.QueueBatchSize = 100 ; TransactionManager.MaxQueueThreshold = -1 ; TransactionManager.JournalThresholdSize = 1000 ; // More than commit size, less than block. - + DatasetGraph dsg = create() ; TransactionManager tMgr = TDBInternal.getTransactionManager(dsg) ; - + Txn.executeWrite(dsg, ()->{}); // About 20 bytes. assertEquals(1, tMgr.getQueueLength()) ; txnAddData(dsg) ; assertEquals(0, tMgr.getQueueLength()) ; } - + // ---- QueueBatchSize - + @Test public void queueBatchSize_01() { TransactionManager.QueueBatchSize = 0 ; // Immediate. - + DatasetGraph dsg = create() ; TransactionManager tMgr = TDBInternal.getTransactionManager(dsg) ; @@ -148,7 +149,7 @@ public class TestTransControl { @Test public void queueBatchSize_02() { TransactionManager.QueueBatchSize = 1 ; - + DatasetGraph dsg = create() ; TransactionManager tMgr = TDBInternal.getTransactionManager(dsg) ; @@ -173,10 +174,10 @@ public class TestTransControl { } // ---- MaxQueueThreshold - + @Test public void maxQueueThreshold_01() { TransactionManager.MaxQueueThreshold = 1 ; - + DatasetGraph dsg = create() ; TransactionManager tMgr = TDBInternal.getTransactionManager(dsg) ; @@ -185,10 +186,10 @@ public class TestTransControl { Txn.executeWrite(dsg, ()->{}); assertEquals(0, tMgr.getQueueLength()) ; } - + @Test public void maxQueueThreshold_02() { TransactionManager.MaxQueueThreshold = 2 ; - + DatasetGraph dsg = create() ; TransactionManager tMgr = TDBInternal.getTransactionManager(dsg) ; diff --git a/jena-tdb1/src/test/java/org/apache/jena/tdb1/transaction/TestTransIsolation.java b/jena-tdb1/src/test/java/org/apache/jena/tdb1/transaction/TestTransIsolation.java index cfb1d089a9..929126661f 100644 --- a/jena-tdb1/src/test/java/org/apache/jena/tdb1/transaction/TestTransIsolation.java +++ b/jena-tdb1/src/test/java/org/apache/jena/tdb1/transaction/TestTransIsolation.java @@ -22,6 +22,7 @@ import org.apache.jena.sparql.core.DatasetGraph ; import org.apache.jena.sparql.transaction.AbstractTestTransactionIsolation ; import org.apache.jena.tdb1.TDB1Factory; +@SuppressWarnings("removal") public class TestTransIsolation extends AbstractTestTransactionIsolation { @Override diff --git a/jena-tdb1/src/test/java/org/apache/jena/tdb1/transaction/TestTransMem.java b/jena-tdb1/src/test/java/org/apache/jena/tdb1/transaction/TestTransMem.java index 77a8d80a9a..4169a7d52c 100644 --- a/jena-tdb1/src/test/java/org/apache/jena/tdb1/transaction/TestTransMem.java +++ b/jena-tdb1/src/test/java/org/apache/jena/tdb1/transaction/TestTransMem.java @@ -25,15 +25,16 @@ import org.junit.After ; import org.junit.Before ; /** Basic tests and tests of ordering (single thread) */ +@SuppressWarnings("removal") public class TestTransMem extends AbstractTestTransSeq { @Before public void before() { TDBInternal.reset() ; } - + @After public void after() {} - + @Override protected StoreConnection getStoreConnection() { diff --git a/jena-tdb1/src/test/java/org/apache/jena/tdb1/transaction/TestTransPromoteTDB1.java b/jena-tdb1/src/test/java/org/apache/jena/tdb1/transaction/TestTransPromoteTDB1.java index b329b6f0be..99e9852dd6 100644 --- a/jena-tdb1/src/test/java/org/apache/jena/tdb1/transaction/TestTransPromoteTDB1.java +++ b/jena-tdb1/src/test/java/org/apache/jena/tdb1/transaction/TestTransPromoteTDB1.java @@ -26,6 +26,7 @@ import org.apache.jena.tdb1.TDB1Factory; import org.apache.jena.tdb1.sys.SystemTDB; /** Tests for transactions that start read and then promote to write -- TDB */ +@SuppressWarnings("removal") public class TestTransPromoteTDB1 extends AbstractTestTransPromote { public TestTransPromoteTDB1() { super(getLoggers()) ; diff --git a/jena-tdb1/src/test/java/org/apache/jena/tdb1/transaction/TestTransRestart.java b/jena-tdb1/src/test/java/org/apache/jena/tdb1/transaction/TestTransRestart.java index fe24580522..229fb34c3b 100644 --- a/jena-tdb1/src/test/java/org/apache/jena/tdb1/transaction/TestTransRestart.java +++ b/jena-tdb1/src/test/java/org/apache/jena/tdb1/transaction/TestTransRestart.java @@ -44,42 +44,43 @@ import org.junit.After ; import org.junit.Before ; import org.junit.Test ; -/** Test of re-attaching to a pre-existing database */ +/** Test of re-attaching to a pre-existing database */ +@SuppressWarnings("removal") public class TestTransRestart { - static { + static { // Only if run directly, not in test suite. if ( false ) - SystemTDB.setFileMode(FileMode.direct) ; + SystemTDB.setFileMode(FileMode.direct) ; } - - private String path = null ; + + private String path = null ; private Location location = null ; - + private static boolean useTransactionsSetup = true ; private static Quad quad1 = SSE.parseQuad("(_ <foo:bar> rdfs:label 'foo')") ; private static Quad quad2 = SSE.parseQuad("(_ <foo:bar> rdfs:label 'bar')") ; - + @Before public void setup() { TDBInternal.reset(); - path = ConfigTest.getCleanDir() ; + path = ConfigTest.getCleanDir() ; location = Location.create (path) ; if ( useTransactionsSetup ) setupTxn() ; else setupPlain() ; } - + @After public void teardown() { cleanup() ; } - + private static DatasetGraphTDB createPlain(Location location) { return DatasetBuilderStd.create(location) ; } - + private void setupPlain() { // Make without transactions. DatasetGraphTDB dsg = createPlain(location) ; - dsg.add(quad1) ; + dsg.add(quad1) ; dsg.close() ; return ; } @@ -89,13 +90,13 @@ public class TestTransRestart { FileOps.clearDirectory(path); StoreConnection sc = StoreConnection.make(location) ; DatasetGraphTxn dsg = sc.begin(TxnType.WRITE); - dsg.add(quad1) ; + dsg.add(quad1) ; dsg.commit() ; dsg.end() ; - sc.flush(); + sc.flush(); StoreConnection.release(location) ; } - + private void cleanup() { TDBInternal.reset(); if ( FileOps.exists(path)) { @@ -103,20 +104,20 @@ public class TestTransRestart { FileOps.deleteSilent(path) ; } } - + @Test public void testTxn() { assertEquals (3, countRDFNodes()) ; - StoreConnection sc = StoreConnection.make(location) ; + StoreConnection sc = StoreConnection.make(location) ; DatasetGraphTxn dsg = sc.begin(TxnType.WRITE) ; assertTrue(dsg.contains(quad1)) ; - dsg.add(quad2) ; - dsg.commit() ; - dsg.end() ; + dsg.add(quad2) ; + dsg.commit() ; + dsg.end() ; StoreConnection.release(location) ; assertEquals (4, countRDFNodes()) ; } - + @Test public void testPlain() { assertEquals (3, countRDFNodes()) ; @@ -128,13 +129,13 @@ public class TestTransRestart { StoreConnection.release(location) ; assertEquals (4, countRDFNodes()) ; } - - // Only call when the dataset is not in TDBMaker or in StoreConnection + + // Only call when the dataset is not in TDBMaker or in StoreConnection private int countRDFNodes() { ObjectFile objects = FileFactory.createObjectFileDisk( location.getPath(Names.indexId2Node, Names.extNodeData) ) ; int count = 0 ; - Iterator<Pair<Long,ByteBuffer>> iter = objects.all() ; - while ( iter.hasNext() ) { + Iterator<Pair<Long,ByteBuffer>> iter = objects.all() ; + while ( iter.hasNext() ) { iter.next() ; count++ ; } diff --git a/jena-tdb1/src/test/java/org/apache/jena/tdb1/transaction/TestTransactionMiscTDB1.java b/jena-tdb1/src/test/java/org/apache/jena/tdb1/transaction/TestTransactionMiscTDB1.java index 6e198ddd7d..e3f4559e78 100644 --- a/jena-tdb1/src/test/java/org/apache/jena/tdb1/transaction/TestTransactionMiscTDB1.java +++ b/jena-tdb1/src/test/java/org/apache/jena/tdb1/transaction/TestTransactionMiscTDB1.java @@ -23,6 +23,7 @@ import org.apache.jena.tdb1.TDB1Factory; import org.junit.Assert ; import org.junit.Test ; +@SuppressWarnings("removal") public class TestTransactionMiscTDB1 { @Test public void support() { DatasetGraph dsg = TDB1Factory.createDatasetGraph() ; diff --git a/jena-tdb1/src/test/java/org/apache/jena/tdb1/transaction/TestTransactionTDB1.java b/jena-tdb1/src/test/java/org/apache/jena/tdb1/transaction/TestTransactionTDB1.java index 5eac92b454..37ff4d8a7a 100644 --- a/jena-tdb1/src/test/java/org/apache/jena/tdb1/transaction/TestTransactionTDB1.java +++ b/jena-tdb1/src/test/java/org/apache/jena/tdb1/transaction/TestTransactionTDB1.java @@ -31,11 +31,12 @@ import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; +@SuppressWarnings("removal") public class TestTransactionTDB1 extends AbstractTestTransactionLifecycle { - private String DIR = null ; + private String DIR = null ; private static String level = null ; - + @BeforeClass public static void beforeClassLoggingOff() { level = LogCtl.getLevel(SystemTDB.errlog.getName()); @@ -46,7 +47,7 @@ public class TestTransactionTDB1 extends AbstractTestTransactionLifecycle public static void afterClassLoggingOn() { LogCtl.setLevel(SystemTDB.errlog.getName(), level); } - + @Before public void before() { TDBInternal.reset(); diff --git a/jena-tdb1/src/test/java/org/apache/jena/tdb1/transaction/TestTransactionUnionGraph.java b/jena-tdb1/src/test/java/org/apache/jena/tdb1/transaction/TestTransactionUnionGraph.java index 990890454d..09a10361b4 100644 --- a/jena-tdb1/src/test/java/org/apache/jena/tdb1/transaction/TestTransactionUnionGraph.java +++ b/jena-tdb1/src/test/java/org/apache/jena/tdb1/transaction/TestTransactionUnionGraph.java @@ -32,6 +32,7 @@ import org.apache.jena.update.* ; import org.junit.* ; /** Tests of transactions and the TDB union graph */ +@SuppressWarnings("removal") public class TestTransactionUnionGraph { private Dataset ds ; diff --git a/jena-tdb2/src/main/java/org/apache/jena/tdb2/sys/TDBInternal.java b/jena-tdb2/src/main/java/org/apache/jena/tdb2/sys/TDBInternal.java index 1e8ba58a66..c6cb213110 100644 --- a/jena-tdb2/src/main/java/org/apache/jena/tdb2/sys/TDBInternal.java +++ b/jena-tdb2/src/main/java/org/apache/jena/tdb2/sys/TDBInternal.java @@ -41,7 +41,6 @@ import org.apache.jena.tdb2.store.tupletable.TupleIndexRecord; * <p> * Use with care. * <p>{@link DatabaseOps#compact Compaction} invalidates any previous objects. - * */ public class TDBInternal { diff --git a/jena-text/src/main/java/org/apache/jena/query/text/DatasetGraphText.java b/jena-text/src/main/java/org/apache/jena/query/text/DatasetGraphText.java index f702219f01..1b5e42a9ce 100644 --- a/jena-text/src/main/java/org/apache/jena/query/text/DatasetGraphText.java +++ b/jena-text/src/main/java/org/apache/jena/query/text/DatasetGraphText.java @@ -80,6 +80,7 @@ public class DatasetGraphText extends DatasetGraphTextMonitor implements Transac this(dsg, index, producer, false); } + @SuppressWarnings("removal") public DatasetGraphText(DatasetGraph dsg, TextIndex index, TextDocProducer producer, boolean closeIndexOnClose) { super(dsg, producer); this.textIndex = index; diff --git a/jena-text/src/test/java/org/apache/jena/query/text/AbstractTestDatasetWithLuceneGraphTextIndex.java b/jena-text/src/test/java/org/apache/jena/query/text/AbstractTestDatasetWithLuceneGraphTextIndex.java index 64526ebb69..9807727b7f 100644 --- a/jena-text/src/test/java/org/apache/jena/query/text/AbstractTestDatasetWithLuceneGraphTextIndex.java +++ b/jena-text/src/test/java/org/apache/jena/query/text/AbstractTestDatasetWithLuceneGraphTextIndex.java @@ -30,6 +30,7 @@ import org.junit.Before ; /** * This abstract class defines a setup configuration for a dataset with a graph-enabled Lucene index. */ +@SuppressWarnings("removal") public class AbstractTestDatasetWithLuceneGraphTextIndex extends AbstractTestDatasetWithGraphTextIndex { @Before diff --git a/jena-text/src/test/java/org/apache/jena/query/text/AbstractTestDatasetWithLuceneTextIndexDeletionSupport.java b/jena-text/src/test/java/org/apache/jena/query/text/AbstractTestDatasetWithLuceneTextIndexDeletionSupport.java index 1b46fe065b..8ef207ea22 100644 --- a/jena-text/src/test/java/org/apache/jena/query/text/AbstractTestDatasetWithLuceneTextIndexDeletionSupport.java +++ b/jena-text/src/test/java/org/apache/jena/query/text/AbstractTestDatasetWithLuceneTextIndexDeletionSupport.java @@ -30,6 +30,7 @@ import org.junit.Before; /** * This abstract class defines a setup configuration for a dataset with a deletion-support-enabled Lucene index. */ +@SuppressWarnings("removal") public class AbstractTestDatasetWithLuceneTextIndexDeletionSupport extends AbstractTestDatasetWithTextIndex { @Before diff --git a/jena-text/src/test/java/org/apache/jena/query/text/TestBuildTextDataset.java b/jena-text/src/test/java/org/apache/jena/query/text/TestBuildTextDataset.java index 8004017831..ba8116928e 100644 --- a/jena-text/src/test/java/org/apache/jena/query/text/TestBuildTextDataset.java +++ b/jena-text/src/test/java/org/apache/jena/query/text/TestBuildTextDataset.java @@ -41,6 +41,7 @@ public class TestBuildTextDataset createAssembler("text-config.ttl") ; } + @SuppressWarnings("removal") @Test public void buildText_02() { Dataset ds = createAssembler("text-config-union.ttl") ; diff --git a/jena-text/src/test/java/org/apache/jena/query/text/TestLuceneWithMultipleThreads.java b/jena-text/src/test/java/org/apache/jena/query/text/TestLuceneWithMultipleThreads.java index 6e62755949..d5ecb8d3dc 100644 --- a/jena-text/src/test/java/org/apache/jena/query/text/TestLuceneWithMultipleThreads.java +++ b/jena-text/src/test/java/org/apache/jena/query/text/TestLuceneWithMultipleThreads.java @@ -43,6 +43,7 @@ import org.junit.Test ; /** * Spin up multiple threads against a multiple-reader/single-writer Dataset to test that the Lucene index handles concurrency properly. */ +@SuppressWarnings("removal") public class TestLuceneWithMultipleThreads { private static final EntityDefinition entDef; diff --git a/jena-text/src/test/java/org/apache/jena/query/text/TestTextGraphIndexExtra.java b/jena-text/src/test/java/org/apache/jena/query/text/TestTextGraphIndexExtra.java index 0da82d8bac..05d597617b 100644 --- a/jena-text/src/test/java/org/apache/jena/query/text/TestTextGraphIndexExtra.java +++ b/jena-text/src/test/java/org/apache/jena/query/text/TestTextGraphIndexExtra.java @@ -30,10 +30,11 @@ import org.apache.lucene.store.ByteBuffersDirectory ; import org.junit.Assert ; import org.junit.Test ; +@SuppressWarnings("removal") public class TestTextGraphIndexExtra { // JENA-1372 - // from https://lists.apache.org/thread.html/7c185d3666af3fbf1559b27129b32e2984582413f2331535ee653a83@%3Cusers.jena.apache.org%3E - + // from https://lists.apache.org/thread.html/7c185d3666af3fbf1559b27129b32e2984582413f2331535ee653a83@%3Cusers.jena.apache.org%3E + static Node rdfsLabel = RDFS.Nodes.label; static Dataset textDataset(Dataset dataset) { @@ -41,14 +42,14 @@ public class TestTextGraphIndexExtra { TextIndex textIndex = TextDatasetFactory.createLuceneIndex(new ByteBuffersDirectory(), new TextIndexConfig(entdef)); return TextDatasetFactory.create(dataset, textIndex, true); } - + static void populate(Dataset dataset) { Txn.executeWrite(dataset, ()->{ Quad q1 = SSE.parseQuad("(<x:/graph1> <x:/thing1> rdfs:label 'test1')"); dataset.asDatasetGraph().add(q1); Quad q2 = SSE.parseQuad("(<x:/graph1> <x:/thing2> rdfs:label 'abcd1')"); dataset.asDatasetGraph().add(q2); - + Quad q3 = SSE.parseQuad("(<x:/graph2> <x:/thing3> rdfs:label 'abcd2')"); dataset.asDatasetGraph().add(q3); }); @@ -61,7 +62,7 @@ public class TestTextGraphIndexExtra { ," ?thing text:query 'test1' ." // This would check in the graph the literal is present. // Then test_mem_link_ds returns 1. - //," ?thing ?p 'test1' ." + //," ?thing ?p 'test1' ." ," }" ,"}" ); @@ -72,7 +73,7 @@ public class TestTextGraphIndexExtra { ," graph ?g {" ," ?thing text:query 'test1' ." // This checks in the graph that the literal is present. - ," ?thing ?p 'test1' ." + ," ?thing ?p 'test1' ." ," }" ,"}" ); @@ -84,12 +85,12 @@ public class TestTextGraphIndexExtra { return ResultSetFormatter.consume(rs); }); } - + @Test public void test_mem_copy_ds () { test(DatasetFactory.create(), textQuery, 1); test(DatasetFactory.create(), textQuery2, 1); } - + @Test public void test_mem_link_ds () { // The general dataset contains graphs as given by linking to the graph object. // It does not provide their name in getGraph() and so the answer is 2 hits, @@ -114,5 +115,5 @@ public class TestTextGraphIndexExtra { int x = sparqlQuery(ds, queryStr); Assert.assertEquals(expected, x); } - + } diff --git a/jena-text/src/test/java/org/apache/jena/query/text/TestTextNonTxn.java b/jena-text/src/test/java/org/apache/jena/query/text/TestTextNonTxn.java index 40019b2fa6..630ae8e039 100644 --- a/jena-text/src/test/java/org/apache/jena/query/text/TestTextNonTxn.java +++ b/jena-text/src/test/java/org/apache/jena/query/text/TestTextNonTxn.java @@ -46,6 +46,7 @@ import org.junit.runners.Parameterized.Parameters; /** Test using various dataset implmentations without transactions * No context-set union graph usage either. */ +@SuppressWarnings("removal") @RunWith(Parameterized.class) public class TestTextNonTxn { diff --git a/jena-text/src/test/java/org/apache/jena/query/text/TestTextNonTxnTDB1.java b/jena-text/src/test/java/org/apache/jena/query/text/TestTextNonTxnTDB1.java index 51a17ae13d..39493ad758 100644 --- a/jena-text/src/test/java/org/apache/jena/query/text/TestTextNonTxnTDB1.java +++ b/jena-text/src/test/java/org/apache/jena/query/text/TestTextNonTxnTDB1.java @@ -39,6 +39,7 @@ import org.apache.lucene.store.ByteBuffersDirectory; import org.apache.lucene.store.Directory; /** Text dataset tests using TDB1 non-transactionally, including context unionDefaultGraph */ +@SuppressWarnings("removal") public class TestTextNonTxnTDB1 { private static Dataset create() { Dataset ds1 = TDB1Factory.createDataset(); diff --git a/jena-text/src/test/java/org/apache/jena/query/text/TestTextTxn.java b/jena-text/src/test/java/org/apache/jena/query/text/TestTextTxn.java index 2c13a2cd9d..8b51c8dab9 100644 --- a/jena-text/src/test/java/org/apache/jena/query/text/TestTextTxn.java +++ b/jena-text/src/test/java/org/apache/jena/query/text/TestTextTxn.java @@ -60,7 +60,7 @@ import org.junit.runners.Parameterized.Parameters; * TDB2 is transactional only. * <p>Union graph support by context is required for these tests. */ - +@SuppressWarnings("removal") @RunWith(Parameterized.class) public class TestTextTxn { diff --git a/jena-text/src/test/java/org/apache/jena/query/text/TestTextTxnTDB.java b/jena-text/src/test/java/org/apache/jena/query/text/TestTextTxnTDB.java index 1c247cb4ac..772d049a01 100644 --- a/jena-text/src/test/java/org/apache/jena/query/text/TestTextTxnTDB.java +++ b/jena-text/src/test/java/org/apache/jena/query/text/TestTextTxnTDB.java @@ -61,7 +61,7 @@ import org.junit.runners.Parameterized.Parameters; * TDB2 is transactional only. * <p>Union graph support by context is required for these tests. */ - +@SuppressWarnings("removal") @RunWith(Parameterized.class) public class TestTextTxnTDB { diff --git a/jena-text/src/test/java/org/apache/jena/query/text/assembler/TestTextDatasetAssembler.java b/jena-text/src/test/java/org/apache/jena/query/text/assembler/TestTextDatasetAssembler.java index 670147369a..2020e4e2a2 100644 --- a/jena-text/src/test/java/org/apache/jena/query/text/assembler/TestTextDatasetAssembler.java +++ b/jena-text/src/test/java/org/apache/jena/query/text/assembler/TestTextDatasetAssembler.java @@ -36,6 +36,7 @@ import org.junit.Test; /** * Test the text dataset assembler. */ +@SuppressWarnings("removal") public class TestTextDatasetAssembler extends AbstractTestTextAssembler { private static final String TESTBASE = "http://example.org/testDatasetAssembler/";;
