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 6ecd624827d1f1d474d3d486b6034014a26d1d3d Author: Andy Seaborne <[email protected]> AuthorDate: Sat Apr 27 20:40:18 2024 +0100 GH-2435: Use @Deprecated(forRemoval=true) --- .../jena/query/QueryExecutionDatasetBuilder.java | 3 +- .../apache/jena/query/QueryExecutionFactory.java | 2 +- .../org/apache/jena/query/ResultSetFactory.java | 2 +- .../main/java/org/apache/jena/riot/RDFDataMgr.java | 4 +- .../src/main/java/org/apache/jena/riot/RIOT.java | 2 +- .../jena/riot/adapters/AdapterFileManager.java | 4 +- .../java/org/apache/jena/riot/lang/rdfxml/RRX.java | 4 +- .../jena/riot/lang/rdfxml/ReaderRDFXML_ARP1.java | 2 +- .../jena/riot/system/stream/StreamManager.java | 4 +- .../sparql/core/assembler/DatasetAssembler.java | 4 - .../sparql/engine/ResultSetCheckCondition.java | 4 +- .../engine/main/iterator/QueryIterService.java | 2 +- .../jena/sparql/exec/http/QueryExecHTTP.java | 4 +- .../jena/sparql/modify/UpdateEngineWorker.java | 2 +- .../sparql/service/ServiceExecutorRegistry.java | 2 +- .../java/org/apache/jena/update/UpdateAction.java | 450 +++++++++++---------- .../jena/update/UpdateExecutionDatasetBuilder.java | 2 +- .../apache/jena/update/UpdateExecutionFactory.java | 1 + .../org/apache/jena/update/UpdateStreaming.java | 9 +- .../java/org/apache/jena/riot/TestRiotReader.java | 2 +- .../riot/lang/TestRDFXML_ReaderProperties.java | 3 +- .../lang/rdfxml/converted_legacy/LibTestARP1.java | 4 +- .../jena/atlas/iterator/IteratorNoRemove.java | 2 +- .../main/java/org/apache/jena/atlas/lib/Cache.java | 2 +- .../org/apache/jena/atlas/lib/ProgressMonitor.java | 2 +- .../org/apache/jena/atlas/lib/cache/Cache1.java | 6 - .../apache/jena/atlas/lib/cache/CacheCaffeine.java | 5 - .../apache/jena/atlas/lib/cache/CacheSimple.java | 5 - .../apache/jena/atlas/lib/cache/CacheWrapper.java | 2 +- .../java/org/apache/jena/atlas/logging/LogCtl.java | 2 +- .../org/apache/jena/mem/graph/TestGraphCopy.java | 2 +- jena-cmds/src/test/java/arq/qtest.java | 2 +- jena-cmds/src/test/java/riotcmd/rdflangtest.java | 2 +- .../java/org/apache/jena/graph/NodeFactory.java | 2 +- .../jena/rdfxml/xmloutput/impl/SplitRDFXML.java | 2 +- .../main/java/org/apache/jena/util/SplitIRI.java | 2 +- .../java/org/apache/jena/graph/test/TestGraph.java | 6 + .../apache/jena/graph/test/TestGraphListener.java | 5 +- .../org/apache/jena/graph/test/TestReifier.java | 5 +- .../apache/jena/mem/test/TestGraphMemPackage.java | 2 +- .../{TestGraphMem.java => TestGraphMemValue.java} | 6 +- .../riot/ExRIOT_RDFXML_ReaderProperties.java | 2 +- .../jena/rdfconnection/RDFConnectionFactory.java | 2 +- .../jena/rdfconnection/RDFConnectionLocal.java | 2 +- .../main/java/org/apache/jena/shacl/Shapes.java | 2 +- .../apache/jena/shex/sys/ValidationContext.java | 2 +- .../src/main/java/org/apache/jena/tdb/TDB.java | 2 +- .../main/java/org/apache/jena/tdb/TDBBackup.java | 6 +- .../main/java/org/apache/jena/tdb/TDBFactory.java | 2 +- .../main/java/org/apache/jena/tdb/TDBLoader.java | 2 +- .../tdb2/store/nodetable/ThreadBufferingCache.java | 2 +- .../jena/query/text/assembler/TextVocab.java | 2 +- 52 files changed, 310 insertions(+), 294 deletions(-) diff --git a/jena-arq/src/main/java/org/apache/jena/query/QueryExecutionDatasetBuilder.java b/jena-arq/src/main/java/org/apache/jena/query/QueryExecutionDatasetBuilder.java index fe0f0ae56a..d4f3c60978 100644 --- a/jena-arq/src/main/java/org/apache/jena/query/QueryExecutionDatasetBuilder.java +++ b/jena-arq/src/main/java/org/apache/jena/query/QueryExecutionDatasetBuilder.java @@ -98,7 +98,8 @@ public class QueryExecutionDatasetBuilder implements QueryExecutionBuilder { } /** @deprecated Prefer {@link #substitution(Binding)} which substitutes variables for values in the the query before execution. */ - @Deprecated + @Deprecated(forRemoval = true) + @SuppressWarnings("all") public QueryExecutionDatasetBuilder initialBinding(Binding binding) { builder.initialBinding(binding); return this; diff --git a/jena-arq/src/main/java/org/apache/jena/query/QueryExecutionFactory.java b/jena-arq/src/main/java/org/apache/jena/query/QueryExecutionFactory.java index c4aa90eae7..1ed2a37a83 100644 --- a/jena-arq/src/main/java/org/apache/jena/query/QueryExecutionFactory.java +++ b/jena-arq/src/main/java/org/apache/jena/query/QueryExecutionFactory.java @@ -260,7 +260,7 @@ public class QueryExecutionFactory // This form of "make" has support for "initialBinding" (seed the execution) // The preferred approach is to use "substitution" )(replace variables with RDF terms). - @SuppressWarnings("deprecation") + @SuppressWarnings("removal") private static QueryExecution make$(Query query, Dataset dataset, DatasetGraph datasetGraph, Binding initialBinding) { QueryExecDatasetBuilder builder = QueryExecDataset.newBuilder().query(query); if ( initialBinding != null ) diff --git a/jena-arq/src/main/java/org/apache/jena/query/ResultSetFactory.java b/jena-arq/src/main/java/org/apache/jena/query/ResultSetFactory.java index 4d4fd2aa0d..ae94e2e212 100644 --- a/jena-arq/src/main/java/org/apache/jena/query/ResultSetFactory.java +++ b/jena-arq/src/main/java/org/apache/jena/query/ResultSetFactory.java @@ -175,7 +175,7 @@ public class ResultSetFactory { * @param filenameOrURI * @param format * @return Model - * @deprecated This functions will become be internal. + * @deprecated This function will become be internal. */ @Deprecated public static Model loadAsModel(Model model, String filenameOrURI, ResultsFormat format) { diff --git a/jena-arq/src/main/java/org/apache/jena/riot/RDFDataMgr.java b/jena-arq/src/main/java/org/apache/jena/riot/RDFDataMgr.java index 8a151d9a3e..0473d33ea6 100644 --- a/jena-arq/src/main/java/org/apache/jena/riot/RDFDataMgr.java +++ b/jena-arq/src/main/java/org/apache/jena/riot/RDFDataMgr.java @@ -824,7 +824,7 @@ public class RDFDataMgr * @return Iterator over the triples * @deprecated Use {@link AsyncParser#asyncParseTriples} or for N-Triples, {@link IteratorParsers#createIteratorNTriples} */ - @Deprecated + @Deprecated(forRemoval = true) public static Iterator<Triple> createIteratorTriples(InputStream input, Lang lang, String baseIRI) { // Special case N-Triples, because the RIOT reader has a pull interface if ( RDFLanguages.sameLang(RDFLanguages.NTRIPLES, lang) ) @@ -843,7 +843,7 @@ public class RDFDataMgr * @return Iterator over the quads * @deprecated Use {@link AsyncParser#asyncParseQuads} or for N-Triples, {@link IteratorParsers#createIteratorNQuads} */ - @Deprecated + @Deprecated(forRemoval = true) public static Iterator<Quad> createIteratorQuads(InputStream input, Lang lang, String baseIRI) { // Special case N-Quads, because the RIOT reader has a pull interface if ( RDFLanguages.sameLang(RDFLanguages.NQUADS, lang) ) diff --git a/jena-arq/src/main/java/org/apache/jena/riot/RIOT.java b/jena-arq/src/main/java/org/apache/jena/riot/RIOT.java index 0f7dded672..5eec2619ee 100644 --- a/jena-arq/src/main/java/org/apache/jena/riot/RIOT.java +++ b/jena-arq/src/main/java/org/apache/jena/riot/RIOT.java @@ -125,7 +125,7 @@ public class RIOT { * to access ARP v1 (RIOT integration) or ARP v0 (the original ARP parser). * @deprecated Do not use this symbol! This will be removed. */ - @Deprecated + @Deprecated(forRemoval = true) public static Symbol symRDFXML0 = SystemARQ.allocSymbol(RDFXML_SYMBOL_BASE, "rdfxml0"); /** diff --git a/jena-arq/src/main/java/org/apache/jena/riot/adapters/AdapterFileManager.java b/jena-arq/src/main/java/org/apache/jena/riot/adapters/AdapterFileManager.java index 499eb0bb9e..c1d00045d0 100644 --- a/jena-arq/src/main/java/org/apache/jena/riot/adapters/AdapterFileManager.java +++ b/jena-arq/src/main/java/org/apache/jena/riot/adapters/AdapterFileManager.java @@ -413,7 +413,7 @@ public class AdapterFileManager implements org.apache.jena.util.FileManager * @deprecated Use {@link IO#readWholeFileAsUTF8(InputStream)} */ @Override - @Deprecated + @Deprecated(forRemoval = true) public String readWholeFileAsUTF8(InputStream in) { return IO.readWholeFileAsUTF8(in); } @@ -421,8 +421,8 @@ public class AdapterFileManager implements org.apache.jena.util.FileManager /** * @deprecated Use {@link IO#readWholeFileAsUTF8(String)} */ - @Deprecated @Override + @Deprecated(forRemoval = true) public String readWholeFileAsUTF8(String filename) { InputStream in = open(filename) ; diff --git a/jena-arq/src/main/java/org/apache/jena/riot/lang/rdfxml/RRX.java b/jena-arq/src/main/java/org/apache/jena/riot/lang/rdfxml/RRX.java index 214b4b435a..8e3efe6327 100644 --- a/jena-arq/src/main/java/org/apache/jena/riot/lang/rdfxml/RRX.java +++ b/jena-arq/src/main/java/org/apache/jena/riot/lang/rdfxml/RRX.java @@ -51,7 +51,7 @@ public class RRX { * <a href="http://www.w3.org/TR/rdf-syntax-grammar/";>RDF/XML</a> implemented by ARP1. * @deprecated To be removed. Transition only. */ - @Deprecated + @Deprecated(forRemoval = true) public static final Lang RDFXML_ARP1 = LangBuilder.create("RDFXML-ARP1", "application/rdf+arp1") .addAltContentTypes("application/rdf+arp") .addAltNames("arp1", "arp", "RDFXML-ARP") @@ -62,7 +62,7 @@ public class RRX { * <a href="http://www.w3.org/TR/rdf-syntax-grammar/";>RDF/XML</a> implemented by ARP0. * @deprecated To be removed. Transition only. */ - @Deprecated + @Deprecated(forRemoval = true) public static final Lang RDFXML_ARP0 = LangBuilder.create("RDFXML-ARP0", "application/rdf+arp0") .addAltNames("arp0") .addFileExtensions("arp0") diff --git a/jena-arq/src/main/java/org/apache/jena/riot/lang/rdfxml/ReaderRDFXML_ARP1.java b/jena-arq/src/main/java/org/apache/jena/riot/lang/rdfxml/ReaderRDFXML_ARP1.java index b37d9ee84b..5a5437e765 100644 --- a/jena-arq/src/main/java/org/apache/jena/riot/lang/rdfxml/ReaderRDFXML_ARP1.java +++ b/jena-arq/src/main/java/org/apache/jena/riot/lang/rdfxml/ReaderRDFXML_ARP1.java @@ -133,7 +133,7 @@ public class ReaderRDFXML_ARP1 implements ReaderRIOT options.setErrorMode(cond, val); } - @SuppressWarnings("deprecation") + @SuppressWarnings({"deprecation", "removal"}) private void parse(InputStream input, Reader reader, String xmlBase, ContentType ct, StreamRDF sink, Context context) { // One of input and reader is null. boolean legacySwitch = context.isTrue(RIOT.symRDFXML0); diff --git a/jena-arq/src/main/java/org/apache/jena/riot/system/stream/StreamManager.java b/jena-arq/src/main/java/org/apache/jena/riot/system/stream/StreamManager.java index 4cc33c4e39..58aa603a2c 100644 --- a/jena-arq/src/main/java/org/apache/jena/riot/system/stream/StreamManager.java +++ b/jena-arq/src/main/java/org/apache/jena/riot/system/stream/StreamManager.java @@ -183,7 +183,7 @@ public class StreamManager { * Set the location mapping * @deprecated Use {@link #locationMapper(LocationMapper)} */ - @Deprecated + @Deprecated(forRemoval = true) public void setLocationMapper(LocationMapper mapper) { this.mapper = mapper ; } @@ -192,7 +192,7 @@ public class StreamManager { * Get the location mapping * @deprecated Use {@link #locationMapper()} */ - @Deprecated + @Deprecated(forRemoval = true) public LocationMapper getLocationMapper() { return mapper ; } diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/core/assembler/DatasetAssembler.java b/jena-arq/src/main/java/org/apache/jena/sparql/core/assembler/DatasetAssembler.java index 6b35c3e0c1..db281ec028 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/core/assembler/DatasetAssembler.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/core/assembler/DatasetAssembler.java @@ -32,10 +32,6 @@ import org.apache.jena.sparql.core.DatasetGraph; public abstract class DatasetAssembler extends AssemblerBase implements Assembler { - /** @deprecated To be removed - use {@link #getGeneralType()} */ - @Deprecated - public static Resource getType() { return getGeneralType(); } - /** This is the superclass of all datasets assemblers */ public static Resource getGeneralType() { return DatasetAssemblerVocab.tDataset ; diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/engine/ResultSetCheckCondition.java b/jena-arq/src/main/java/org/apache/jena/sparql/engine/ResultSetCheckCondition.java index 44d20aad8e..e8ba4a933b 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/engine/ResultSetCheckCondition.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/engine/ResultSetCheckCondition.java @@ -32,19 +32,17 @@ import org.apache.jena.sparql.engine.binding.Binding ; * (e.g. the QueryExecution has not been closed). * @deprecated To be removed. */ -@Deprecated +@Deprecated(forRemoval = true) public class ResultSetCheckCondition implements ResultSet { interface Condition { boolean check() ; } private final ResultSet other ; private final Condition condition ; - @Deprecated public ResultSetCheckCondition(ResultSet other, QueryExecution qExec) { this(other, checkQExec(qExec) ) ; } - @Deprecated public ResultSetCheckCondition(ResultSet other, Condition condition) { this.other = other ; this.condition = condition ; diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/engine/main/iterator/QueryIterService.java b/jena-arq/src/main/java/org/apache/jena/sparql/engine/main/iterator/QueryIterService.java index 59b074a134..53160340c2 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/engine/main/iterator/QueryIterService.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/engine/main/iterator/QueryIterService.java @@ -40,7 +40,7 @@ import org.apache.jena.sparql.util.Context; * New code should register extensions at a {@link ServiceExecutorRegistry}. * @deprecated To be removed. Migrate to {@link ServiceExecutorRegistry}. */ -@Deprecated(since = "4.6.0") +@Deprecated(forRemoval = true, since = "4.6.0") public class QueryIterService extends QueryIterRepeatApply { protected OpService opService ; diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/exec/http/QueryExecHTTP.java b/jena-arq/src/main/java/org/apache/jena/sparql/exec/http/QueryExecHTTP.java index 76ebeee9ab..beb947f4f0 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/exec/http/QueryExecHTTP.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/exec/http/QueryExecHTTP.java @@ -327,7 +327,7 @@ public class QueryExecHTTP implements QueryExec { return dataset; } - @SuppressWarnings("deprecation") + @SuppressWarnings("removal") private Iterator<Triple> execTriples(String acceptHeader) { Pair<InputStream, Lang> p = execRdfWorker(acceptHeader, WebContent.contentTypeRDFXML); InputStream input = p.getLeft(); @@ -338,7 +338,7 @@ public class QueryExecHTTP implements QueryExec { return Iter.onCloseIO(iter, input); } - @SuppressWarnings("deprecation") + @SuppressWarnings("removal") private Iterator<Quad> execQuads() { checkNotClosed(); Pair<InputStream, Lang> p = execRdfWorker(datasetAcceptHeader, WebContent.contentTypeNQuads); diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/modify/UpdateEngineWorker.java b/jena-arq/src/main/java/org/apache/jena/sparql/modify/UpdateEngineWorker.java index 04d80286cb..c97ca9bd6d 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/modify/UpdateEngineWorker.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/modify/UpdateEngineWorker.java @@ -522,7 +522,7 @@ public class UpdateEngineWorker implements UpdateVisitor return evalBindings(query, datasetGraph, inputBinding, context); } - @SuppressWarnings("deprecation") + @SuppressWarnings("removal") protected static Iterator<Binding> evalBindings(Query query, DatasetGraph dsg, Binding inputBinding, Context context) { // The UpdateProcessorBase already copied the context and made it safe // ... but that's going to happen again :-( diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/service/ServiceExecutorRegistry.java b/jena-arq/src/main/java/org/apache/jena/sparql/service/ServiceExecutorRegistry.java index 3717afe36a..29509743d0 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/service/ServiceExecutorRegistry.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/service/ServiceExecutorRegistry.java @@ -219,7 +219,7 @@ public class ServiceExecutorRegistry * Execution * @deprecated To be removed. Moved to {@link ServiceExec#exec}. */ - @Deprecated(since = "4.9.0") + @Deprecated(forRemoval = true, since = "4.9.0") public static QueryIterator exec(QueryIterator input, OpService opService, ExecutionContext execCxt) { return ServiceExec.exec(input, opService, execCxt); } diff --git a/jena-arq/src/main/java/org/apache/jena/update/UpdateAction.java b/jena-arq/src/main/java/org/apache/jena/update/UpdateAction.java index 139fb62526..987b76e7e6 100644 --- a/jena-arq/src/main/java/org/apache/jena/update/UpdateAction.java +++ b/jena-arq/src/main/java/org/apache/jena/update/UpdateAction.java @@ -18,417 +18,451 @@ package org.apache.jena.update; -import java.io.InputStream ; - -import org.apache.jena.atlas.io.IO ; -import org.apache.jena.graph.Graph ; -import org.apache.jena.query.Dataset ; -import org.apache.jena.query.QuerySolution ; -import org.apache.jena.query.Syntax ; -import org.apache.jena.rdf.model.Model ; -import org.apache.jena.sparql.ARQException ; -import org.apache.jena.sparql.core.DatasetGraph ; -import org.apache.jena.sparql.core.DatasetGraphFactory ; -import org.apache.jena.sparql.engine.binding.Binding ; +import java.io.InputStream; + +import org.apache.jena.atlas.io.IO; +import org.apache.jena.graph.Graph; +import org.apache.jena.query.Dataset; +import org.apache.jena.query.QuerySolution; +import org.apache.jena.query.Syntax; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.sparql.ARQException; +import org.apache.jena.sparql.core.DatasetGraph; +import org.apache.jena.sparql.core.DatasetGraphFactory; +import org.apache.jena.sparql.engine.binding.Binding; import org.apache.jena.sparql.engine.binding.BindingLib; import org.apache.jena.sparql.exec.UpdateExec; -import org.apache.jena.sparql.lang.UpdateParser ; -import org.apache.jena.sparql.modify.UpdateSink ; -import org.apache.jena.sparql.modify.UsingList ; -import org.apache.jena.sparql.modify.UsingUpdateSink ; -import org.apache.jena.sparql.modify.request.UpdateWithUsing ; - -/** A class of forms for executing SPARQL Update operations. - * parse means the update request is in a String or an InputStream; - * read means read the contents of a file. +import org.apache.jena.sparql.lang.UpdateParser; +import org.apache.jena.sparql.modify.UpdateSink; +import org.apache.jena.sparql.modify.UsingList; +import org.apache.jena.sparql.modify.UsingUpdateSink; +import org.apache.jena.sparql.modify.request.UpdateWithUsing; + +/** + * A class of forms for executing SPARQL Update operations. parse means the update + * request is in a String or an InputStream; read means read the contents of a file. */ -public class UpdateAction -{ - /** Read a file containing SPARQL Update operations, and execute the operations. +public class UpdateAction { + /** + * Read a file containing SPARQL Update operations, and execute the operations. + * * @param filename * @param model */ - public static void readExecute(String filename, Model model) - { - readExecute(filename, toDatasetGraph(model.getGraph())) ; + public static void readExecute(String filename, Model model) { + readExecute(filename, toDatasetGraph(model.getGraph())); } - /** Read a file containing SPARQL Update operations, and execute the operations. + /** + * Read a file containing SPARQL Update operations, and execute the operations. + * * @param filename * @param graph */ - public static void readExecute(String filename, Graph graph) - { - readExecute(filename, toDatasetGraph(graph)) ; + public static void readExecute(String filename, Graph graph) { + readExecute(filename, toDatasetGraph(graph)); } - /** Read a file containing SPARQL Update operations, and execute the operations. + /** + * Read a file containing SPARQL Update operations, and execute the operations. + * * @param filename * @param dataset */ - public static void readExecute(String filename, Dataset dataset) - { - readExecute(filename, dataset.asDatasetGraph()) ; + public static void readExecute(String filename, Dataset dataset) { + readExecute(filename, dataset.asDatasetGraph()); } - /** Read a file containing SPARQL Update operations, and execute the operations. + /** + * Read a file containing SPARQL Update operations, and execute the operations. + * * @param filename * @param dataset */ - public static void readExecute(String filename, DatasetGraph dataset) - { - readExecute(filename, dataset, null) ; + public static void readExecute(String filename, DatasetGraph dataset) { + readExecute(filename, dataset, null); } - /** Read a file containing SPARQL Update operations, and execute the operations. + /** + * Read a file containing SPARQL Update operations, and execute the operations. + * * @param filename * @param dataset * @param inputBinding */ public static void readExecute(String filename, Dataset dataset, QuerySolution inputBinding) { - UpdateRequest req = UpdateFactory.read(filename) ; - execute(req, dataset, inputBinding) ; + UpdateRequest req = UpdateFactory.read(filename); + execute(req, dataset, inputBinding); } - /** Read a file containing SPARQL Update operations, and execute the operations. + /** + * Read a file containing SPARQL Update operations, and execute the operations. + * * @param filename * @param datasetGraph * @param inputBinding */ public static void readExecute(String filename, DatasetGraph datasetGraph, Binding inputBinding) { - UpdateRequest req = UpdateFactory.read(filename) ; - execute$(req, datasetGraph, inputBinding) ; + UpdateRequest req = UpdateFactory.read(filename); + execute$(req, datasetGraph, inputBinding); } - /** Parse a string containing SPARQL Update operations, and execute the operations. + /** + * Parse a string containing SPARQL Update operations, and execute the + * operations. + * * @param updateString * @param model */ - public static void parseExecute(String updateString, Model model) - { - parseExecute(updateString, model.getGraph()) ; + public static void parseExecute(String updateString, Model model) { + parseExecute(updateString, model.getGraph()); } - /** Parse a string containing SPARQL Update operations, and execute the operations. + /** + * Parse a string containing SPARQL Update operations, and execute the + * operations. + * * @param updateString * @param graph */ - public static void parseExecute(String updateString, Graph graph) - { - parseExecute(updateString, toDatasetGraph(graph)) ; + public static void parseExecute(String updateString, Graph graph) { + parseExecute(updateString, toDatasetGraph(graph)); } - /** Parse a string containing SPARQL Update operations, and execute the operations. + /** + * Parse a string containing SPARQL Update operations, and execute the + * operations. + * * @param updateString * @param dataset */ - public static void parseExecute(String updateString, Dataset dataset) - { - parseExecute(updateString, dataset.asDatasetGraph()) ; + public static void parseExecute(String updateString, Dataset dataset) { + parseExecute(updateString, dataset.asDatasetGraph()); } - /** Parse a string containing SPARQL Update operations, and execute the operations. + /** + * Parse a string containing SPARQL Update operations, and execute the + * operations. + * * @param updateString * @param dataset */ - public static void parseExecute(String updateString, DatasetGraph dataset) - { - UpdateRequest req = UpdateFactory.create(updateString) ; - execute(req, dataset) ; + public static void parseExecute(String updateString, DatasetGraph dataset) { + UpdateRequest req = UpdateFactory.create(updateString); + execute(req, dataset); } - /** Parse a string containing SPARQL Update operations, and execute the operations. + /** + * Parse a string containing SPARQL Update operations, and execute the + * operations. + * * @param updateString * @param dataset * @param inputBinding */ - public static void parseExecute(String updateString, Dataset dataset, QuerySolution inputBinding) - { - parseExecute(updateString, dataset.asDatasetGraph(), BindingLib.asBinding(inputBinding)) ; + public static void parseExecute(String updateString, Dataset dataset, QuerySolution inputBinding) { + parseExecute(updateString, dataset.asDatasetGraph(), BindingLib.asBinding(inputBinding)); } - /** Parse a string containing SPARQL Update operations, and execute the operations. + /** + * Parse a string containing SPARQL Update operations, and execute the + * operations. + * * @param updateString * @param dataset * @param inputBinding */ - public static void parseExecute(String updateString, DatasetGraph dataset, Binding inputBinding) - { - UpdateRequest req = UpdateFactory.create(updateString) ; - execute(req, dataset, inputBinding) ; + public static void parseExecute(String updateString, DatasetGraph dataset, Binding inputBinding) { + UpdateRequest req = UpdateFactory.create(updateString); + execute(req, dataset, inputBinding); } - /** Execute SPARQL Update operations. + /** + * Execute SPARQL Update operations. + * * @param request * @param model */ - public static void execute(UpdateRequest request, Model model) - { - execute(request, model.getGraph()) ; + public static void execute(UpdateRequest request, Model model) { + execute(request, model.getGraph()); } - /** Execute SPARQL Update operations. + /** + * Execute SPARQL Update operations. + * * @param request * @param graph */ - public static void execute(UpdateRequest request, Graph graph) - { - execute(request, toDatasetGraph(graph)) ; + public static void execute(UpdateRequest request, Graph graph) { + execute(request, toDatasetGraph(graph)); } - /** Execute SPARQL Update operations. + /** + * Execute SPARQL Update operations. + * * @param request * @param dataset */ - public static void execute(UpdateRequest request, Dataset dataset) - { - execute(request, dataset.asDatasetGraph()) ; + public static void execute(UpdateRequest request, Dataset dataset) { + execute(request, dataset.asDatasetGraph()); } - /** Execute SPARQL Update operations. + /** + * Execute SPARQL Update operations. + * * @param request * @param dataset */ - public static void execute(UpdateRequest request, DatasetGraph dataset) - { - execute$(request, dataset, null) ; + public static void execute(UpdateRequest request, DatasetGraph dataset) { + execute$(request, dataset, null); } - /** Execute SPARQL Update operations. + /** + * Execute SPARQL Update operations. + * * @param request * @param dataset * @param inputBinding */ - public static void execute(UpdateRequest request, Dataset dataset, QuerySolution inputBinding) - { - execute(request, dataset.asDatasetGraph(), BindingLib.asBinding(inputBinding)) ; + public static void execute(UpdateRequest request, Dataset dataset, QuerySolution inputBinding) { + execute(request, dataset.asDatasetGraph(), BindingLib.asBinding(inputBinding)); } - /** Execute SPARQL Update operations. + /** + * Execute SPARQL Update operations. + * * @param request * @param datasetGraph * @param inputBinding */ - public static void execute(UpdateRequest request, DatasetGraph datasetGraph, Binding inputBinding) - { - execute$(request, datasetGraph, inputBinding) ; + public static void execute(UpdateRequest request, DatasetGraph datasetGraph, Binding inputBinding) { + execute$(request, datasetGraph, inputBinding); } - private static DatasetGraph toDatasetGraph(Graph graph) { - return DatasetGraphFactory.create(graph) ; + return DatasetGraphFactory.create(graph); } // All non-streaming updates come through here. - @SuppressWarnings("deprecation") - private static void execute$(UpdateRequest request, DatasetGraph datasetGraph, Binding inputBinding) - { + + private static void execute$(UpdateRequest request, DatasetGraph datasetGraph, Binding inputBinding) { + @SuppressWarnings("removal") UpdateExec uProc = UpdateExec.newBuilder().update(request).dataset(datasetGraph).initialBinding(inputBinding).build(); - if (uProc == null) + if ( uProc == null ) throw new ARQException("No suitable update procesors are registered/able to execute your updates"); uProc.execute(); } - - /** Execute a single SPARQL Update operation. + /** + * Execute a single SPARQL Update operation. + * * @param update * @param model */ - public static void execute(Update update, Model model) - { - execute(update, model.getGraph()) ; + public static void execute(Update update, Model model) { + execute(update, model.getGraph()); } - /** Execute a single SPARQL Update operation. + /** + * Execute a single SPARQL Update operation. + * * @param update * @param graph */ - public static void execute(Update update, Graph graph) - { - execute(update, toDatasetGraph(graph)) ; + public static void execute(Update update, Graph graph) { + execute(update, toDatasetGraph(graph)); } - /** Execute a single SPARQL Update operation. + /** + * Execute a single SPARQL Update operation. + * * @param update * @param dataset */ - public static void execute(Update update, Dataset dataset) - { - execute(update, dataset.asDatasetGraph()) ; + public static void execute(Update update, Dataset dataset) { + execute(update, dataset.asDatasetGraph()); } - /** Execute a single SPARQL Update operation. + /** + * Execute a single SPARQL Update operation. + * * @param update * @param dataset */ - public static void execute(Update update, DatasetGraph dataset) - { - execute(update, dataset, null) ; + public static void execute(Update update, DatasetGraph dataset) { + execute(update, dataset, null); } - /** Execute a single SPARQL Update operation. + /** + * Execute a single SPARQL Update operation. + * * @param update * @param dataset * @param inputBinding */ - public static void execute(Update update, Dataset dataset, QuerySolution inputBinding) - { - execute(update, dataset.asDatasetGraph(), BindingLib.asBinding(inputBinding)) ; + public static void execute(Update update, Dataset dataset, QuerySolution inputBinding) { + execute(update, dataset.asDatasetGraph(), BindingLib.asBinding(inputBinding)); } - /** Execute a single SPARQL Update operation. + /** + * Execute a single SPARQL Update operation. + * * @param update * @param datasetGraph * @param inputBinding */ - public static void execute(Update update, DatasetGraph datasetGraph, Binding inputBinding) - { - execute$(update, datasetGraph, inputBinding) ; + public static void execute(Update update, DatasetGraph datasetGraph, Binding inputBinding) { + execute$(update, datasetGraph, inputBinding); } - private static void execute$(Update update, DatasetGraph datasetGraph, Binding inputBinding) - { - UpdateRequest request = new UpdateRequest() ; - request.add(update) ; - execute$(request, datasetGraph, inputBinding) ; + private static void execute$(Update update, DatasetGraph datasetGraph, Binding inputBinding) { + UpdateRequest request = new UpdateRequest(); + request.add(update); + execute$(request, datasetGraph, inputBinding); } // Streaming Updates: /** Parse update operations into a DatasetGraph by reading it from a file */ - public static void parseExecute(UsingList usingList, DatasetGraph dataset, String fileName) - { - parseExecute(usingList, dataset, fileName, null, Syntax.defaultUpdateSyntax) ; + public static void parseExecute(UsingList usingList, DatasetGraph dataset, String fileName) { + parseExecute(usingList, dataset, fileName, null, Syntax.defaultUpdateSyntax); } /** Parse update operations into a DatasetGraph by reading it from a file */ - public static void parseExecute(UsingList usingList, DatasetGraph dataset, String fileName, Syntax syntax) - { - parseExecute(usingList, dataset, fileName, null, syntax) ; + public static void parseExecute(UsingList usingList, DatasetGraph dataset, String fileName, Syntax syntax) { + parseExecute(usingList, dataset, fileName, null, syntax); } /** Parse update operations into a DatasetGraph by reading it from a file */ - public static void parseExecute(UsingList usingList, DatasetGraph dataset, String fileName, String baseURI, Syntax syntax) - { + public static void parseExecute(UsingList usingList, DatasetGraph dataset, String fileName, String baseURI, Syntax syntax) { parseExecute(usingList, dataset, fileName, (Binding)null, baseURI, syntax); } /** Parse update operations into a DatasetGraph by reading it from a file */ - public static void parseExecute(UsingList usingList, DatasetGraph dataset, String fileName, QuerySolution inputBinding, String baseURI, Syntax syntax) - { - parseExecute(usingList, dataset, fileName, BindingLib.asBinding(inputBinding), baseURI, syntax) ; + public static void parseExecute(UsingList usingList, DatasetGraph dataset, String fileName, QuerySolution inputBinding, String baseURI, + Syntax syntax) { + parseExecute(usingList, dataset, fileName, BindingLib.asBinding(inputBinding), baseURI, syntax); } /** Parse update operations into a DatasetGraph by reading it from a file */ - public static void parseExecute(UsingList usingList, DatasetGraph dataset, String fileName, Binding inputBinding, String baseURI, Syntax syntax) - { - InputStream in = null ; + public static void parseExecute(UsingList usingList, DatasetGraph dataset, String fileName, Binding inputBinding, String baseURI, + Syntax syntax) { + InputStream in = null; if ( fileName.equals("-") ) - in = System.in ; + in = System.in; else { - in = IO.openFile(fileName) ; + in = IO.openFile(fileName); if ( in == null ) - throw new UpdateException("File could not be opened: "+fileName) ; + throw new UpdateException("File could not be opened: " + fileName); } - parseExecute(usingList, dataset, in, inputBinding, baseURI, syntax) ; + parseExecute(usingList, dataset, in, inputBinding, baseURI, syntax); if ( in != System.in ) - IO.close(in) ; + IO.close(in); } /** * Parse update operations into a DatasetGraph by parsing from an InputStream. - * @param usingList A list of USING or USING NAMED statements that be added to all {@link UpdateWithUsing} queries - * @param input The source of the update request (must be UTF-8). + * + * @param usingList A list of USING or USING NAMED statements that be added to + * all {@link UpdateWithUsing} queries + * @param input The source of the update request (must be UTF-8). */ - public static void parseExecute(UsingList usingList, DatasetGraph dataset, InputStream input) - { - parseExecute(usingList, dataset, input, Syntax.defaultUpdateSyntax) ; + public static void parseExecute(UsingList usingList, DatasetGraph dataset, InputStream input) { + parseExecute(usingList, dataset, input, Syntax.defaultUpdateSyntax); } /** * Parse update operations into a DatasetGraph by parsing from an InputStream. - * @param usingList A list of USING or USING NAMED statements that be added to all {@link UpdateWithUsing} queries - * @param input The source of the update request (must be UTF-8). - * @param syntax The update language syntax + * + * @param usingList A list of USING or USING NAMED statements that be added to + * all {@link UpdateWithUsing} queries + * @param input The source of the update request (must be UTF-8). + * @param syntax The update language syntax */ - public static void parseExecute(UsingList usingList, DatasetGraph dataset, InputStream input, Syntax syntax) - { - parseExecute(usingList, dataset, input, null, syntax) ; + public static void parseExecute(UsingList usingList, DatasetGraph dataset, InputStream input, Syntax syntax) { + parseExecute(usingList, dataset, input, null, syntax); } /** * Parse update operations into a DatasetGraph by parsing from an InputStream. - * @param usingList A list of USING or USING NAMED statements that be added to all {@link UpdateWithUsing} queries - * @param input The source of the update request (must be UTF-8). - * @param baseURI The base URI for resolving relative URIs. + * + * @param usingList A list of USING or USING NAMED statements that be added to + * all {@link UpdateWithUsing} queries + * @param input The source of the update request (must be UTF-8). + * @param baseURI The base URI for resolving relative URIs. */ - public static void parseExecute(UsingList usingList, DatasetGraph dataset, InputStream input, String baseURI) - { - parseExecute(usingList, dataset, input, baseURI, Syntax.defaultUpdateSyntax) ; + public static void parseExecute(UsingList usingList, DatasetGraph dataset, InputStream input, String baseURI) { + parseExecute(usingList, dataset, input, baseURI, Syntax.defaultUpdateSyntax); } /** * Parse update operations into a DatasetGraph by parsing from an InputStream. - * @param usingList A list of USING or USING NAMED statements that be added to all {@link UpdateWithUsing} queries - * @param dataset The dataset to apply the changes to - * @param input The source of the update request (must be UTF-8). - * @param baseURI The base URI for resolving relative URIs (may be <code>null</code>) - * @param syntax The update language syntax + * + * @param usingList A list of USING or USING NAMED statements that be added to + * all {@link UpdateWithUsing} queries + * @param dataset The dataset to apply the changes to + * @param input The source of the update request (must be UTF-8). + * @param baseURI The base URI for resolving relative URIs (may be + * <code>null</code>) + * @param syntax The update language syntax */ - public static void parseExecute(UsingList usingList, DatasetGraph dataset, InputStream input, String baseURI, Syntax syntax) - { + public static void parseExecute(UsingList usingList, DatasetGraph dataset, InputStream input, String baseURI, Syntax syntax) { parseExecute(usingList, dataset, input, (Binding)null, baseURI, syntax); } /** * Parse update operations into a DatasetGraph by parsing from an InputStream. - * @param usingList A list of USING or USING NAMED statements that be added to all {@link UpdateWithUsing} queries - * @param dataset The dataset to apply the changes to - * @param input The source of the update request (must be UTF-8). - * @param inputBinding Initial binding to be applied to Update operations that can apply an initial binding - * (i.e. UpdateDeleteWhere, UpdateModify). May be <code>null</code> - * @param baseURI The base URI for resolving relative URIs (may be <code>null</code>) - * @param syntax The update language syntax + * + * @param usingList A list of USING or USING NAMED statements that be added to + * all {@link UpdateWithUsing} queries + * @param dataset The dataset to apply the changes to + * @param input The source of the update request (must be UTF-8). + * @param inputBinding Initial binding to be applied to Update operations that + * can apply an initial binding (i.e. UpdateDeleteWhere, UpdateModify). May + * be <code>null</code> + * @param baseURI The base URI for resolving relative URIs (may be + * <code>null</code>) + * @param syntax The update language syntax */ - public static void parseExecute(UsingList usingList, DatasetGraph dataset, InputStream input, QuerySolution inputBinding, String baseURI, Syntax syntax) - { - parseExecute(usingList, dataset, input, BindingLib.asBinding(inputBinding), baseURI, syntax) ; + public static void parseExecute(UsingList usingList, DatasetGraph dataset, InputStream input, QuerySolution inputBinding, + String baseURI, Syntax syntax) { + parseExecute(usingList, dataset, input, BindingLib.asBinding(inputBinding), baseURI, syntax); } /** * Parse update operations into a DatasetGraph by parsing from an InputStream. - * @param usingList A list of USING or USING NAMED statements that be added to all {@link UpdateWithUsing} queries - * @param dataset The dataset to apply the changes to - * @param input The source of the update request (must be UTF-8). - * @param inputBinding Initial binding to be applied to Update operations that can apply an initial binding - * (i.e. UpdateDeleteWhere, UpdateModify). May be <code>null</code> - * @param baseURI The base URI for resolving relative URIs (may be <code>null</code>) - * @param syntax The update language syntax + * + * @param usingList A list of USING or USING NAMED statements that be added to + * all {@link UpdateWithUsing} queries + * @param dataset The dataset to apply the changes to + * @param input The source of the update request (must be UTF-8). + * @param inputBinding Initial binding to be applied to Update operations that + * can apply an initial binding (i.e. UpdateDeleteWhere, UpdateModify). May + * be <code>null</code> + * @param baseURI The base URI for resolving relative URIs (may be + * <code>null</code>) + * @param syntax The update language syntax */ - public static void parseExecute(UsingList usingList, DatasetGraph dataset, InputStream input, Binding inputBinding, String baseURI, Syntax syntax) - { - @SuppressWarnings("deprecation") - UpdateProcessorStreaming uProc = UpdateStreaming.createStreaming(dataset, inputBinding) ; - if (uProc == null) + public static void parseExecute(UsingList usingList, DatasetGraph dataset, InputStream input, Binding inputBinding, String baseURI, + Syntax syntax) { + @SuppressWarnings("removal") + UpdateProcessorStreaming uProc = UpdateStreaming.createStreaming(dataset, inputBinding); + if ( uProc == null ) throw new ARQException("No suitable update procesors are registered/able to execute your updates"); uProc.startRequest(); - try - { - UpdateSink sink = new UsingUpdateSink(uProc.getUpdateSink(), usingList) ; - try - { - UpdateParser parser = UpdateFactory.setupParser(uProc.getPrologue(), baseURI, syntax) ; - parser.parse(sink, uProc.getPrologue(), input) ; + try { + UpdateSink sink = new UsingUpdateSink(uProc.getUpdateSink(), usingList); + try { + UpdateParser parser = UpdateFactory.setupParser(uProc.getPrologue(), baseURI, syntax); + parser.parse(sink, uProc.getPrologue(), input); } - finally - { - sink.close() ; + finally { + sink.close(); } } - finally - { + finally { uProc.finishRequest(); } } diff --git a/jena-arq/src/main/java/org/apache/jena/update/UpdateExecutionDatasetBuilder.java b/jena-arq/src/main/java/org/apache/jena/update/UpdateExecutionDatasetBuilder.java index d51f79c471..219fc69140 100644 --- a/jena-arq/src/main/java/org/apache/jena/update/UpdateExecutionDatasetBuilder.java +++ b/jena-arq/src/main/java/org/apache/jena/update/UpdateExecutionDatasetBuilder.java @@ -99,7 +99,7 @@ public class UpdateExecutionDatasetBuilder implements UpdateExecutionBuilder { // } /** @deprecated Prefer {@link #substitution(QuerySolution)}. */ - @Deprecated + @Deprecated(forRemoval = true) public UpdateExecutionDatasetBuilder initialBinding(QuerySolution querySolution) { if ( querySolution == null ) return this; diff --git a/jena-arq/src/main/java/org/apache/jena/update/UpdateExecutionFactory.java b/jena-arq/src/main/java/org/apache/jena/update/UpdateExecutionFactory.java index cfe083b9ec..9372de4e94 100644 --- a/jena-arq/src/main/java/org/apache/jena/update/UpdateExecutionFactory.java +++ b/jena-arq/src/main/java/org/apache/jena/update/UpdateExecutionFactory.java @@ -91,6 +91,7 @@ public class UpdateExecutionFactory * @param dataset * @return UpdateExecution */ + @Deprecated(forRemoval = true) public static UpdateProcessorStreaming createStreaming(Dataset dataset) { return UpdateStreaming.makeStreaming(dataset.asDatasetGraph(), null, null); } diff --git a/jena-arq/src/main/java/org/apache/jena/update/UpdateStreaming.java b/jena-arq/src/main/java/org/apache/jena/update/UpdateStreaming.java index e6f5b4f841..bee2c28c7f 100644 --- a/jena-arq/src/main/java/org/apache/jena/update/UpdateStreaming.java +++ b/jena-arq/src/main/java/org/apache/jena/update/UpdateStreaming.java @@ -38,7 +38,7 @@ public class UpdateStreaming { * @param datasetGraph * @return UpdateExecution */ - @Deprecated + @Deprecated(forRemoval = true) public static UpdateProcessorStreaming createStreaming(DatasetGraph datasetGraph) { return makeStreaming(datasetGraph, null, null); } @@ -52,7 +52,7 @@ public class UpdateStreaming { * can apply an initial binding (i.e. UpdateDeleteWhere, UpdateModify) * @return UpdateExecution */ - @Deprecated + @Deprecated(forRemoval = true) public static UpdateProcessorStreaming createStreaming(Dataset dataset, QuerySolution inputBinding) { return createStreaming(dataset.asDatasetGraph(), BindingLib.asBinding(inputBinding)); } @@ -67,7 +67,7 @@ public class UpdateStreaming { * @return UpdateExecution * @deprecated Use {@code UpdateExecution.dataset(dataset)... build()} */ - @Deprecated + @Deprecated(forRemoval = true) public static UpdateProcessorStreaming createStreaming(DatasetGraph datasetGraph, Binding inputBinding) { return makeStreaming(datasetGraph, inputBinding, null); } @@ -80,7 +80,6 @@ public class UpdateStreaming { * @param context (null means use merge of global and graph store context)) * @return UpdateExecution */ - @Deprecated public static UpdateProcessorStreaming createStreaming(Dataset dataset, Context context) { return makeStreaming(dataset.asDatasetGraph(), null, context); } @@ -93,7 +92,7 @@ public class UpdateStreaming { * @param context (null means use merge of global and graph store context)) * @return UpdateExecution */ - @Deprecated + @Deprecated(forRemoval = true) public static UpdateProcessorStreaming createStreaming(DatasetGraph datasetGraph, Context context) { return makeStreaming(datasetGraph, null, context); } diff --git a/jena-arq/src/test/java/org/apache/jena/riot/TestRiotReader.java b/jena-arq/src/test/java/org/apache/jena/riot/TestRiotReader.java index 299d78f095..dd351513c1 100644 --- a/jena-arq/src/test/java/org/apache/jena/riot/TestRiotReader.java +++ b/jena-arq/src/test/java/org/apache/jena/riot/TestRiotReader.java @@ -31,7 +31,7 @@ import org.apache.jena.atlas.lib.StrUtils ; import org.apache.jena.graph.Triple ; import org.junit.Test ; -@SuppressWarnings("deprecation") +@SuppressWarnings("removal") public class TestRiotReader { @Test public void testCreateIteratorTriples_01() { diff --git a/jena-arq/src/test/java/org/apache/jena/riot/lang/TestRDFXML_ReaderProperties.java b/jena-arq/src/test/java/org/apache/jena/riot/lang/TestRDFXML_ReaderProperties.java index e2b308f53b..4baab11164 100644 --- a/jena-arq/src/test/java/org/apache/jena/riot/lang/TestRDFXML_ReaderProperties.java +++ b/jena-arq/src/test/java/org/apache/jena/riot/lang/TestRDFXML_ReaderProperties.java @@ -37,13 +37,12 @@ import org.junit.Test; /** * Tests for setting reader properties - specific to ARP0 and ARP1. */ +@SuppressWarnings("removal") public class TestRDFXML_ReaderProperties { - @SuppressWarnings("deprecation") @Test public void rdfxmlreaderProperties_arp0() { execTest(RRX.RDFXML_ARP0); } - @SuppressWarnings("deprecation") @Test public void rdfxmlreaderProperties_arp1() { execTest(RRX.RDFXML_ARP0); } diff --git a/jena-arq/src/test/java/org/apache/jena/riot/lang/rdfxml/converted_legacy/LibTestARP1.java b/jena-arq/src/test/java/org/apache/jena/riot/lang/rdfxml/converted_legacy/LibTestARP1.java index 072d044c9e..ddf9a6635a 100644 --- a/jena-arq/src/test/java/org/apache/jena/riot/lang/rdfxml/converted_legacy/LibTestARP1.java +++ b/jena-arq/src/test/java/org/apache/jena/riot/lang/rdfxml/converted_legacy/LibTestARP1.java @@ -93,7 +93,7 @@ class LibTestARP1 { "ERROR", ()->runPositive1(inputURI, fnInput, fnOutput)); } - @SuppressWarnings("deprecation") + @SuppressWarnings("removal") private static void runPositive1(String baseURI, String fnInput, String fnOutput) { String label = "RDF: "+fnInput; Graph actual; @@ -129,7 +129,7 @@ class LibTestARP1 { } } - @SuppressWarnings("deprecation") + @SuppressWarnings("removal") static void negativeTest(String testURI, String inputURI ) { diff --git a/jena-base/src/main/java/org/apache/jena/atlas/iterator/IteratorNoRemove.java b/jena-base/src/main/java/org/apache/jena/atlas/iterator/IteratorNoRemove.java index 362df6a41b..dc56f02740 100644 --- a/jena-base/src/main/java/org/apache/jena/atlas/iterator/IteratorNoRemove.java +++ b/jena-base/src/main/java/org/apache/jena/atlas/iterator/IteratorNoRemove.java @@ -24,7 +24,7 @@ import java.util.Iterator; * Wrap an iterator except for remove which throws UnsupportedOperationException. * @deprecated Use {@link Iter#noRemove(Iterator)}. */ -@Deprecated +@Deprecated(forRemoval = true) public class IteratorNoRemove<T> extends IteratorWrapper<T> { public IteratorNoRemove(int x, Iterator<T> iterator) { diff --git a/jena-base/src/main/java/org/apache/jena/atlas/lib/Cache.java b/jena-base/src/main/java/org/apache/jena/atlas/lib/Cache.java index 020262f7cb..c794616df6 100644 --- a/jena-base/src/main/java/org/apache/jena/atlas/lib/Cache.java +++ b/jena-base/src/main/java/org/apache/jena/atlas/lib/Cache.java @@ -44,7 +44,7 @@ public interface Cache<Key, Value> * to try to fill the cache. This operation should be atomic. * @deprecated Use {@link #get(Object, Function)} */ - @Deprecated + @Deprecated(forRemoval = true) public default Value getOrFill(Key key, Callable<Value> callable) { return get(key, k->{ try { diff --git a/jena-base/src/main/java/org/apache/jena/atlas/lib/ProgressMonitor.java b/jena-base/src/main/java/org/apache/jena/atlas/lib/ProgressMonitor.java index d1b372f1e2..c64c880897 100644 --- a/jena-base/src/main/java/org/apache/jena/atlas/lib/ProgressMonitor.java +++ b/jena-base/src/main/java/org/apache/jena/atlas/lib/ProgressMonitor.java @@ -27,7 +27,7 @@ import org.slf4j.Logger ; * Once per item processed, call the {@link #tick()} operation. * @deprecated Use RIOT's {@code org.apache.system.progress.ProgressMonitor}. */ -@Deprecated +@Deprecated(forRemoval = true) public class ProgressMonitor { @FunctionalInterface public interface Output { diff --git a/jena-base/src/main/java/org/apache/jena/atlas/lib/cache/Cache1.java b/jena-base/src/main/java/org/apache/jena/atlas/lib/cache/Cache1.java index f9e4b27d6e..22b1d71836 100644 --- a/jena-base/src/main/java/org/apache/jena/atlas/lib/cache/Cache1.java +++ b/jena-base/src/main/java/org/apache/jena/atlas/lib/cache/Cache1.java @@ -20,7 +20,6 @@ package org.apache.jena.atlas.lib.cache; import java.util.Iterator; import java.util.Objects; -import java.util.concurrent.Callable; import java.util.function.BiConsumer; import java.util.function.Function; @@ -58,11 +57,6 @@ public class Cache1<K, V> implements Cache<K, V> { return null; } - @Override - public V getOrFill(K key, Callable<V> callable) { - return CacheOps.getOrFillSync(this, key, callable); - } - @Override public V get(K key, Function<K, V> function) { return CacheOps.getOrFillSync(this, key, function); diff --git a/jena-base/src/main/java/org/apache/jena/atlas/lib/cache/CacheCaffeine.java b/jena-base/src/main/java/org/apache/jena/atlas/lib/cache/CacheCaffeine.java index 9f6721f5b7..2b65a9d5e2 100644 --- a/jena-base/src/main/java/org/apache/jena/atlas/lib/cache/CacheCaffeine.java +++ b/jena-base/src/main/java/org/apache/jena/atlas/lib/cache/CacheCaffeine.java @@ -69,11 +69,6 @@ final public class CacheCaffeine<K,V> implements Cache<K, V> this.size = -1; // Unknown } - @Override - public V getOrFill(K key, Callable<V> filler) { - return cache.get(key, k->call(filler)); - } - // Callable to function conversion. private static <X> X call(Callable<X> filler) { try { diff --git a/jena-base/src/main/java/org/apache/jena/atlas/lib/cache/CacheSimple.java b/jena-base/src/main/java/org/apache/jena/atlas/lib/cache/CacheSimple.java index 8ac538c95a..b339e16440 100644 --- a/jena-base/src/main/java/org/apache/jena/atlas/lib/cache/CacheSimple.java +++ b/jena-base/src/main/java/org/apache/jena/atlas/lib/cache/CacheSimple.java @@ -100,11 +100,6 @@ public class CacheSimple<K, V> implements Cache<K, V> { return values[x]; } - @Override - public V getOrFill(K key, Callable<V> callable) { - return getOrFillNoSync(this, key, callable); - } - @Override public V get(K key, Function<K, V> function) { return getOrFillNoSync(this, key, function); diff --git a/jena-base/src/main/java/org/apache/jena/atlas/lib/cache/CacheWrapper.java b/jena-base/src/main/java/org/apache/jena/atlas/lib/cache/CacheWrapper.java index d8f932b88a..5dcaf2d3bd 100644 --- a/jena-base/src/main/java/org/apache/jena/atlas/lib/cache/CacheWrapper.java +++ b/jena-base/src/main/java/org/apache/jena/atlas/lib/cache/CacheWrapper.java @@ -40,7 +40,7 @@ public class CacheWrapper<Key,T> implements Cache<Key,T> @Override public T getIfPresent(Key key) { return cache.getIfPresent(key) ; } - @SuppressWarnings("deprecation") + @SuppressWarnings("removal") @Override public T getOrFill(Key key, Callable<T> callable) { return cache.getOrFill(key, callable) ; } diff --git a/jena-base/src/main/java/org/apache/jena/atlas/logging/LogCtl.java b/jena-base/src/main/java/org/apache/jena/atlas/logging/LogCtl.java index bba604c90c..e721d3b7c2 100644 --- a/jena-base/src/main/java/org/apache/jena/atlas/logging/LogCtl.java +++ b/jena-base/src/main/java/org/apache/jena/atlas/logging/LogCtl.java @@ -271,7 +271,7 @@ public class LogCtl { /** * @deprecated Use {@link #setLogging}. */ - @Deprecated + @Deprecated(forRemoval = true) public static void setCmdLogging() { setLogging(); } diff --git a/jena-benchmarks/jena-benchmarks-jmh/src/test/java/org/apache/jena/mem/graph/TestGraphCopy.java b/jena-benchmarks/jena-benchmarks-jmh/src/test/java/org/apache/jena/mem/graph/TestGraphCopy.java index 2a44483369..89b7bc2c9c 100644 --- a/jena-benchmarks/jena-benchmarks-jmh/src/test/java/org/apache/jena/mem/graph/TestGraphCopy.java +++ b/jena-benchmarks/jena-benchmarks-jmh/src/test/java/org/apache/jena/mem/graph/TestGraphCopy.java @@ -69,7 +69,7 @@ public class TestGraphCopy { } private GraphMem2 findAndAddAll() { - var copy = (GraphMem2) newGraphSupplier.get(); + var copy = newGraphSupplier.get(); sutCurrent.find().forEachRemaining(copy::add); return copy; } diff --git a/jena-cmds/src/test/java/arq/qtest.java b/jena-cmds/src/test/java/arq/qtest.java index 2b018e7583..fee93331cc 100644 --- a/jena-cmds/src/test/java/arq/qtest.java +++ b/jena-cmds/src/test/java/arq/qtest.java @@ -26,7 +26,7 @@ package arq; * </pre> * @deprecated Use "rdftests" */ -@Deprecated +@Deprecated(forRemoval = true) public class qtest { public static void main(String...argv) { System.err.println("** Run arq.rdftests"); diff --git a/jena-cmds/src/test/java/riotcmd/rdflangtest.java b/jena-cmds/src/test/java/riotcmd/rdflangtest.java index 117b7eea6d..4aad195dd7 100644 --- a/jena-cmds/src/test/java/riotcmd/rdflangtest.java +++ b/jena-cmds/src/test/java/riotcmd/rdflangtest.java @@ -30,7 +30,7 @@ import arq.rdftests; * </pre> * @deprecated Use "rdftests" */ -@Deprecated +@Deprecated(forRemoval = true) public class rdflangtest { public static void main (String... argv) { System.err.println("** Run arq.rdftests"); diff --git a/jena-core/src/main/java/org/apache/jena/graph/NodeFactory.java b/jena-core/src/main/java/org/apache/jena/graph/NodeFactory.java index 1c2a7ab8c0..a679e7fe90 100644 --- a/jena-core/src/main/java/org/apache/jena/graph/NodeFactory.java +++ b/jena-core/src/main/java/org/apache/jena/graph/NodeFactory.java @@ -84,7 +84,7 @@ public class NodeFactory { } /** @deprecated Use {@link #createLiteralString} */ - @Deprecated + @Deprecated(forRemoval = true) public static Node createLiteral(String string) { return createLiteralString(string); } diff --git a/jena-core/src/main/java/org/apache/jena/rdfxml/xmloutput/impl/SplitRDFXML.java b/jena-core/src/main/java/org/apache/jena/rdfxml/xmloutput/impl/SplitRDFXML.java index 687c198d15..e810f0bc2a 100644 --- a/jena-core/src/main/java/org/apache/jena/rdfxml/xmloutput/impl/SplitRDFXML.java +++ b/jena-core/src/main/java/org/apache/jena/rdfxml/xmloutput/impl/SplitRDFXML.java @@ -31,7 +31,7 @@ import org.apache.jena.util.SplitIRI; */ class SplitRDFXML { - @SuppressWarnings("deprecation") + @SuppressWarnings("removal") static int splitXML10(String uri) { return SplitIRI.splitXML10(uri); } diff --git a/jena-core/src/main/java/org/apache/jena/util/SplitIRI.java b/jena-core/src/main/java/org/apache/jena/util/SplitIRI.java index aba18e63aa..4bc5171abd 100644 --- a/jena-core/src/main/java/org/apache/jena/util/SplitIRI.java +++ b/jena-core/src/main/java/org/apache/jena/util/SplitIRI.java @@ -282,7 +282,7 @@ public class SplitIRI * splitXML with local stricter XML 1.0 rules (only single Java characters) * @deprecated Retained as a record of previous split handling. */ - @Deprecated + @Deprecated(forRemoval = true) public static int splitXML10(String string) { return splitNamespaceXML10(string); } /** diff --git a/jena-core/src/test/java/org/apache/jena/graph/test/TestGraph.java b/jena-core/src/test/java/org/apache/jena/graph/test/TestGraph.java index 5c25c2a3d2..333380cb37 100644 --- a/jena-core/src/test/java/org/apache/jena/graph/test/TestGraph.java +++ b/jena-core/src/test/java/org/apache/jena/graph/test/TestGraph.java @@ -46,16 +46,22 @@ public class TestGraph extends GraphTestBase public static TestSuite suite() { TestSuite result = new TestSuite(TestGraph.class); + result.addTest(suite(MetaTestGraph.class, GraphMem.class)); result.addTest(suite(TestReifier.class, GraphMem.class)); + result.addTest(suite(MetaTestGraph.class, WrappedGraphMem.class)); result.addTest(suite(TestReifier.class, WrappedGraphMem.class)); + result.addTest(suite(MetaTestGraph.class, GraphMem2Fast.class)); result.addTest(suite(TestReifier.class, GraphMem2Fast.class)); + result.addTest(suite(MetaTestGraph.class, GraphMem2Legacy.class)); result.addTest(suite(TestReifier.class, GraphMem2Legacy.class)); + result.addTest(suite(MetaTestGraph.class, GraphMem2Roaring.class)); result.addTest(suite(TestReifier.class, GraphMem2Roaring.class)); + result.addTest(TestGraphListener.suite()); result.addTestSuite(TestRegisterGraphListener.class); return result; diff --git a/jena-core/src/test/java/org/apache/jena/graph/test/TestGraphListener.java b/jena-core/src/test/java/org/apache/jena/graph/test/TestGraphListener.java index 6dc5749356..48dfcf8feb 100644 --- a/jena-core/src/test/java/org/apache/jena/graph/test/TestGraphListener.java +++ b/jena-core/src/test/java/org/apache/jena/graph/test/TestGraphListener.java @@ -25,14 +25,13 @@ import java.util.List ; import junit.framework.TestSuite ; import org.apache.jena.graph.* ; -import org.apache.jena.mem.GraphMem ; +import org.apache.jena.mem2.GraphMem2Fast; /** * Version of graph tests that set up a listener that copies all changes * and verifies that after every notification modified graph * and original are isomorphic. */ -@SuppressWarnings("deprecation") public class TestGraphListener extends MetaTestGraph { public TestGraphListener(String name) { super(name); @@ -41,7 +40,7 @@ public class TestGraphListener extends MetaTestGraph { { super( graphClass, name); } public static TestSuite suite() - { return MetaTestGraph.suite( TestGraphListener.class, GraphMem.class ); } + { return MetaTestGraph.suite( TestGraphListener.class, GraphMem2Fast.class ); } /** * A listener to check that a graph is being tracked * correctly by its events. diff --git a/jena-core/src/test/java/org/apache/jena/graph/test/TestReifier.java b/jena-core/src/test/java/org/apache/jena/graph/test/TestReifier.java index 63da057781..3ad461e61c 100644 --- a/jena-core/src/test/java/org/apache/jena/graph/test/TestReifier.java +++ b/jena-core/src/test/java/org/apache/jena/graph/test/TestReifier.java @@ -22,14 +22,13 @@ import java.lang.reflect.Constructor ; import junit.framework.TestSuite ; import org.apache.jena.graph.Graph ; -import org.apache.jena.mem.GraphMem ; +import org.apache.jena.mem2.GraphMem2Fast; import org.apache.jena.shared.JenaException ; /** This class tests the reifiers of ordinary GraphMem graphs. Old test suite - kept to ensure compatibility for the one and only Standard mode */ -@SuppressWarnings("deprecation") public class TestReifier extends AbstractTestReifier { public TestReifier( String name ) @@ -46,7 +45,7 @@ public class TestReifier extends AbstractTestReifier public static TestSuite suite() { TestSuite result = new TestSuite(); - result.addTest( MetaTestGraph.suite( TestReifier.class, GraphMem.class ) ); + result.addTest( MetaTestGraph.suite( TestReifier.class, GraphMem2Fast.class ) ); result.setName(TestReifier.class.getSimpleName()); return result; } diff --git a/jena-core/src/test/java/org/apache/jena/mem/test/TestGraphMemPackage.java b/jena-core/src/test/java/org/apache/jena/mem/test/TestGraphMemPackage.java index 8088ffbe94..768c2a4828 100644 --- a/jena-core/src/test/java/org/apache/jena/mem/test/TestGraphMemPackage.java +++ b/jena-core/src/test/java/org/apache/jena/mem/test/TestGraphMemPackage.java @@ -26,7 +26,7 @@ public class TestGraphMemPackage extends TestCase public static TestSuite suite() { TestSuite result = new TestSuite(); - result.addTest( TestGraphMem.suite() ); + result.addTest( TestGraphMemValue.suite() ); result.addTest( TestGraphMem2.suite() ); result.addTest( TestConcurrentModificationException.suite() ); return result; diff --git a/jena-core/src/test/java/org/apache/jena/mem/test/TestGraphMem.java b/jena-core/src/test/java/org/apache/jena/mem/test/TestGraphMemValue.java similarity index 92% rename from jena-core/src/test/java/org/apache/jena/mem/test/TestGraphMem.java rename to jena-core/src/test/java/org/apache/jena/mem/test/TestGraphMemValue.java index 3594bc9da2..4920f40e18 100644 --- a/jena-core/src/test/java/org/apache/jena/mem/test/TestGraphMem.java +++ b/jena-core/src/test/java/org/apache/jena/mem/test/TestGraphMemValue.java @@ -26,13 +26,13 @@ import org.apache.jena.shared.* ; import org.apache.jena.util.iterator.ExtendedIterator ; @SuppressWarnings("deprecation") -public class TestGraphMem extends AbstractTestGraph +public class TestGraphMemValue extends AbstractTestGraph { - public TestGraphMem( String name ) + public TestGraphMemValue( String name ) { super( name ); } public static TestSuite suite() - { return new TestSuite( TestGraphMem.class ); } + { return new TestSuite( TestGraphMemValue.class ); } @Override public Graph getGraph() { return new GraphMem(); } diff --git a/jena-examples/src/main/java/arq/examples/riot/ExRIOT_RDFXML_ReaderProperties.java b/jena-examples/src/main/java/arq/examples/riot/ExRIOT_RDFXML_ReaderProperties.java index 1063282fff..3ad8d6edf7 100644 --- a/jena-examples/src/main/java/arq/examples/riot/ExRIOT_RDFXML_ReaderProperties.java +++ b/jena-examples/src/main/java/arq/examples/riot/ExRIOT_RDFXML_ReaderProperties.java @@ -52,7 +52,7 @@ public class ExRIOT_RDFXML_ReaderProperties { ); System.out.println(data); System.out.println(); - @SuppressWarnings("deprecation") + @SuppressWarnings("removal") Lang legacyARP1 = RRX.RDFXML_ARP1; // Properties to be set. // See diff --git a/jena-rdfconnection/src/main/java/org/apache/jena/rdfconnection/RDFConnectionFactory.java b/jena-rdfconnection/src/main/java/org/apache/jena/rdfconnection/RDFConnectionFactory.java index 977ee22efd..87820a89c0 100644 --- a/jena-rdfconnection/src/main/java/org/apache/jena/rdfconnection/RDFConnectionFactory.java +++ b/jena-rdfconnection/src/main/java/org/apache/jena/rdfconnection/RDFConnectionFactory.java @@ -38,7 +38,7 @@ import org.apache.jena.sys.JenaSystem; * </p> * @deprecated See individual static methods for replacements. */ -@Deprecated +@Deprecated(forRemoval = true) public class RDFConnectionFactory { static { JenaSystem.init(); } diff --git a/jena-rdfconnection/src/main/java/org/apache/jena/rdfconnection/RDFConnectionLocal.java b/jena-rdfconnection/src/main/java/org/apache/jena/rdfconnection/RDFConnectionLocal.java index e7baf6d6f3..0ad9613f53 100644 --- a/jena-rdfconnection/src/main/java/org/apache/jena/rdfconnection/RDFConnectionLocal.java +++ b/jena-rdfconnection/src/main/java/org/apache/jena/rdfconnection/RDFConnectionLocal.java @@ -54,7 +54,7 @@ import org.apache.jena.update.UpdateRequest; * </ul> * @deprecated Use {@link RDFConnection#connect(Dataset)}. */ -@Deprecated +@Deprecated(forRemoval = true) public class RDFConnectionLocal implements RDFConnection { private ThreadLocal<Boolean> transactionActive = ThreadLocal.withInitial(()->false); diff --git a/jena-shacl/src/main/java/org/apache/jena/shacl/Shapes.java b/jena-shacl/src/main/java/org/apache/jena/shacl/Shapes.java index a116f1415f..10650db20e 100644 --- a/jena-shacl/src/main/java/org/apache/jena/shacl/Shapes.java +++ b/jena-shacl/src/main/java/org/apache/jena/shacl/Shapes.java @@ -92,7 +92,7 @@ public class Shapes implements Iterable<Shape> { * * @deprecated Use {@link #parse(Graph)}. */ - @Deprecated + @Deprecated(forRemoval = true) public static Shapes parseTargets(Graph graph) { Shapes shapes = parseProcess(graph, Collections.emptyList()); return shapes; diff --git a/jena-shex/src/main/java/org/apache/jena/shex/sys/ValidationContext.java b/jena-shex/src/main/java/org/apache/jena/shex/sys/ValidationContext.java index 5f72ed7b19..1e4d2c9e63 100644 --- a/jena-shex/src/main/java/org/apache/jena/shex/sys/ValidationContext.java +++ b/jena-shex/src/main/java/org/apache/jena/shex/sys/ValidationContext.java @@ -46,7 +46,7 @@ public class ValidationContext { private final ShexReport.Builder reportBuilder = ShexReport.create(); /** @deprecated Use method {@link #create()} */ - @Deprecated + @Deprecated(forRemoval = true) public static ValidationContext create(ValidationContext vCxt) { return vCxt.create(); } 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 16881fc206..22bb208847 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 @@ -54,7 +54,7 @@ import org.slf4j.LoggerFactory ; /** * @deprecated Use {@link org.apache.jena.tdb1.TDB1} */ -@Deprecated +@Deprecated(forRemoval = true) public class TDB { private TDB() {} 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 cd1b4d9007..907716fda1 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 @@ -27,14 +27,14 @@ import org.apache.jena.tdb1.base.file.Location; * Backup a database. * @deprecated Use {@link org.apache.jena.tdb1.TDB1Backup} */ -@Deprecated +@Deprecated(forRemoval = true) public class TDBBackup { /** * @deprecated Use * {@link org.apache.jena.tdb1.TDB1Backup#backup(Location, String)} */ - @Deprecated + @Deprecated(forRemoval = true) public static void backup(Location location, String backupfile) { TDB1Backup.backup(location, backupfile); } @@ -43,7 +43,7 @@ public class TDBBackup * @deprecated Use * {@link org.apache.jena.tdb1.TDB1Backup#backup(Location, OutputStream)} */ - @Deprecated + @Deprecated(forRemoval = true) public static void backup(Location location, OutputStream backupfile) { TDB1Backup.backup(location, backupfile); } 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 4be2b21c09..2d449d158b 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 @@ -30,7 +30,7 @@ import org.apache.jena.tdb1.setup.StoreParams; * @deprecated Use {@link org.apache.jena.tdb1.TDB1Factory} * */ -@Deprecated +@Deprecated(forRemoval = true) public class TDBFactory { static { JenaSystem.init(); 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 fa41d50280..aec11d9668 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 @@ -32,7 +32,7 @@ import org.apache.jena.tdb1.store.GraphTDB; * * @deprecated Use {@link org.apache.jena.tdb1.TDB1Loader} */ -@Deprecated +@Deprecated(forRemoval = true) public class TDBLoader { /** Load the contents of URL into a dataset. diff --git a/jena-tdb2/src/main/java/org/apache/jena/tdb2/store/nodetable/ThreadBufferingCache.java b/jena-tdb2/src/main/java/org/apache/jena/tdb2/store/nodetable/ThreadBufferingCache.java index d2c94a0961..c1681cc2c5 100644 --- a/jena-tdb2/src/main/java/org/apache/jena/tdb2/store/nodetable/ThreadBufferingCache.java +++ b/jena-tdb2/src/main/java/org/apache/jena/tdb2/store/nodetable/ThreadBufferingCache.java @@ -136,7 +136,7 @@ public class ThreadBufferingCache<Key,Value> implements Cache<Key,Value> { return baseCache.getIfPresent(key); } - @SuppressWarnings("deprecation") + @SuppressWarnings("removal") @Override public Value getOrFill(Key key, Callable<Value> callable) { if ( ! buffering() ) diff --git a/jena-text/src/main/java/org/apache/jena/query/text/assembler/TextVocab.java b/jena-text/src/main/java/org/apache/jena/query/text/assembler/TextVocab.java index 005942b7eb..7955c68ad6 100644 --- a/jena-text/src/main/java/org/apache/jena/query/text/assembler/TextVocab.java +++ b/jena-text/src/main/java/org/apache/jena/query/text/assembler/TextVocab.java @@ -83,7 +83,7 @@ public class TextVocab * * @deprecated Do not use. To be removed. */ - @Deprecated + @Deprecated(forRemoval = true) public static final Resource standardFilter = Vocab.resource(NS, "StandardFilter"); public static final Resource lowerCaseFilter = Vocab.resource(NS, "LowerCaseFilter");
