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 45265e8ee9c780a26be04d8e8478d7d3fb727d36 Author: Andy Seaborne <[email protected]> AuthorDate: Wed Dec 10 16:52:24 2025 +0000 Clean new warnings --- .../src/main/java/org/apache/jena/http/sys/ExecHTTPBuilder.java | 1 + jena-arq/src/main/java/org/apache/jena/system/RDFStar.java | 8 ++++++++ jena-core/src/main/java/org/apache/jena/assembler/Assembler.java | 2 ++ .../src/main/java/org/apache/jena/assembler/ConstAssembler.java | 2 ++ .../org/apache/jena/assembler/assemblers/OntModelAssembler.java | 1 + .../apache/jena/assembler/assemblers/OntModelSpecAssembler.java | 1 + jena-core/src/main/java/org/apache/jena/ontology/OntModel.java | 1 + .../src/main/java/org/apache/jena/ontology/OntModelSpec.java | 2 ++ .../src/main/java/org/apache/jena/rdf/model/ModelFactory.java | 5 +++++ .../org/apache/jena/geosparql/spatial/SpatialIndexStorage.java | 7 +++++-- .../jena/geosparql/spatial/index/v1/SpatialIndexAdapterV1.java | 1 + .../apache/jena/geosparql/spatial/index/v1/SpatialIndexV1.java | 1 + jena-tdb1/src/main/java/org/apache/jena/tdb1/TDB1.java | 1 + jena-tdb1/src/main/java/org/apache/jena/tdb1/TDB1Backup.java | 1 + jena-tdb1/src/main/java/org/apache/jena/tdb1/TDB1Factory.java | 1 + jena-tdb1/src/main/java/org/apache/jena/tdb1/TDB1Loader.java | 1 + .../src/main/java/org/apache/jena/tdb1/assembler/VocabTDB1.java | 1 + jena-tdb1/src/main/java/org/apache/jena/tdb1/sys/SetupTDB.java | 1 + 18 files changed, 36 insertions(+), 2 deletions(-) diff --git a/jena-arq/src/main/java/org/apache/jena/http/sys/ExecHTTPBuilder.java b/jena-arq/src/main/java/org/apache/jena/http/sys/ExecHTTPBuilder.java index c62c468534..030973b982 100644 --- a/jena-arq/src/main/java/org/apache/jena/http/sys/ExecHTTPBuilder.java +++ b/jena-arq/src/main/java/org/apache/jena/http/sys/ExecHTTPBuilder.java @@ -263,6 +263,7 @@ public abstract class ExecHTTPBuilder<X, Y> { } /** Setting this header overrides any other header. */ + @SuppressWarnings("removal") public Y acceptHeader(String acceptHeader) { Objects.requireNonNull(acceptHeader); this.appAcceptHeader = acceptHeader; diff --git a/jena-arq/src/main/java/org/apache/jena/system/RDFStar.java b/jena-arq/src/main/java/org/apache/jena/system/RDFStar.java index abc9d08b0e..deb60689da 100644 --- a/jena-arq/src/main/java/org/apache/jena/system/RDFStar.java +++ b/jena-arq/src/main/java/org/apache/jena/system/RDFStar.java @@ -59,6 +59,7 @@ public class RDFStar { * Returns a new graph with triples involving triple terms replaced with * reification. */ + @Deprecated(forRemoval = true) public static Graph encodeAsRDF(Graph graph) { Graph output = GraphFactory.createDefaultGraph(); StreamRDF dest = StreamRDFLib.graph(output); @@ -73,6 +74,7 @@ public class RDFStar { * Copy to a {@link StreamRDF}, encoding RDF-star Triple terms by replacing them with * RDF Reification. */ + @Deprecated(forRemoval = true) public static void encodeAsRDF(Graph graph, StreamRDF dest) { StreamRDFOps.sendPrefixesToStream(graph.getPrefixMapping(), dest); // Ensure set because this process uses vocabulary from RDF. @@ -90,6 +92,7 @@ public class RDFStar { * See {@link #encodeAsRDFInPlace(Graph)} {@link #decodeFromRDFInPlace(Graph)} * for operations that alters the argument graph in-place. */ + @Deprecated(forRemoval = true) public static Graph decodeFromRDF(Graph graph) { Graph gx = GraphFactory.createDefaultGraph(); decodeFromRDF(graph, StreamRDFLib.graph(gx)); @@ -102,6 +105,7 @@ public class RDFStar { * Copy the argument graph to a {@link StreamRDF}, replacing reifications with for triple terms. * Caution: this operation uses space proportional to the number of triple terms present. */ + @Deprecated(forRemoval = true) public static void decodeFromRDF(Graph graph, StreamRDF dest) { // Two pass // 1: Generate <<>> @@ -152,6 +156,7 @@ public class RDFStar { * Changes the argument graph in-place. * @see #decodeFromRDF */ + @Deprecated(forRemoval = true) public static Graph encodeAsRDFInPlace(Graph graph) { Graph gx = graph; @@ -187,6 +192,7 @@ public class RDFStar { */ // [RDF-star] Streamify. Buffering Graph + @Deprecated(forRemoval = true) public static Graph decodeFromRDFInPlace(Graph graph) { Graph gx = copyGraph(graph); @@ -351,6 +357,7 @@ public class RDFStar { /** * Test whether a triple has an triple term as one of its components. */ + @Deprecated(forRemoval = true) static boolean tripleHasNodeTriple(Triple triple) { return triple.getSubject().isTripleTerm() /*|| triple.getPredicate().isNodeTriple()*/ @@ -456,6 +463,7 @@ public class RDFStar { * This must be the same node (same by value) whenever called with * a {@link Node_Triple} with the same s/p/o. */ + @Deprecated(forRemoval = true) public static Node reificationSubject(Node_Triple nodeTriple) { Triple t = nodeTriple.getTriple(); String x = reifStr(t); diff --git a/jena-core/src/main/java/org/apache/jena/assembler/Assembler.java b/jena-core/src/main/java/org/apache/jena/assembler/Assembler.java index 9307a7dd01..aa0338b303 100644 --- a/jena-core/src/main/java/org/apache/jena/assembler/Assembler.java +++ b/jena-core/src/main/java/org/apache/jena/assembler/Assembler.java @@ -78,6 +78,7 @@ public interface Assembler { public static final Assembler infModel = ConstAssembler.infModel(); /** @deprecated Use org.apache.jena.ontapi */ + @SuppressWarnings("removal") @Deprecated(forRemoval=true) public static final Assembler ontModel = ConstAssembler.ontModel(); @@ -90,6 +91,7 @@ public interface Assembler { public static final Assembler unionModel = ConstAssembler.unionModel(); /** @deprecated Use org.apache.jena.ontapi */ + @SuppressWarnings("removal") @Deprecated(forRemoval=true) public static final Assembler ontModelSpec = ConstAssembler.ontModelSpec(); diff --git a/jena-core/src/main/java/org/apache/jena/assembler/ConstAssembler.java b/jena-core/src/main/java/org/apache/jena/assembler/ConstAssembler.java index 7ac7ce0ca4..20aefc2384 100644 --- a/jena-core/src/main/java/org/apache/jena/assembler/ConstAssembler.java +++ b/jena-core/src/main/java/org/apache/jena/assembler/ConstAssembler.java @@ -55,6 +55,7 @@ import org.apache.jena.assembler.assemblers.* ; private static Assembler ontModel = null ; @Deprecated(forRemoval=true) + @SuppressWarnings("removal") public static Assembler ontModel() { if ( ontModel == null ) ontModel = new OntModelAssembler(); @@ -91,6 +92,7 @@ import org.apache.jena.assembler.assemblers.* ; private static Assembler ontModelSpec = null ; @Deprecated(forRemoval=true) + @SuppressWarnings("removal") public static Assembler ontModelSpec() { if ( ontModelSpec == null ) ontModelSpec = new OntModelSpecAssembler(); diff --git a/jena-core/src/main/java/org/apache/jena/assembler/assemblers/OntModelAssembler.java b/jena-core/src/main/java/org/apache/jena/assembler/assemblers/OntModelAssembler.java index 005f401670..7cec3daa0a 100644 --- a/jena-core/src/main/java/org/apache/jena/assembler/assemblers/OntModelAssembler.java +++ b/jena-core/src/main/java/org/apache/jena/assembler/assemblers/OntModelAssembler.java @@ -25,6 +25,7 @@ import org.apache.jena.ontology.* ; import org.apache.jena.rdf.model.* ; @Deprecated(forRemoval=true) +@SuppressWarnings("removal") public class OntModelAssembler extends InfModelAssembler implements Assembler { @Override public Model openEmptyModel( Assembler a, Resource root, Mode mode ) diff --git a/jena-core/src/main/java/org/apache/jena/assembler/assemblers/OntModelSpecAssembler.java b/jena-core/src/main/java/org/apache/jena/assembler/assemblers/OntModelSpecAssembler.java index e808898766..05d3339bb9 100644 --- a/jena-core/src/main/java/org/apache/jena/assembler/assemblers/OntModelSpecAssembler.java +++ b/jena-core/src/main/java/org/apache/jena/assembler/assemblers/OntModelSpecAssembler.java @@ -37,6 +37,7 @@ import org.apache.jena.shared.NotFoundException ; in which case the defaults are taken from there. */ @Deprecated(forRemoval=true) +@SuppressWarnings("removal") public class OntModelSpecAssembler extends AssemblerBase implements Assembler { @Override diff --git a/jena-core/src/main/java/org/apache/jena/ontology/OntModel.java b/jena-core/src/main/java/org/apache/jena/ontology/OntModel.java index 914f8e8927..ccdad85b0a 100644 --- a/jena-core/src/main/java/org/apache/jena/ontology/OntModel.java +++ b/jena-core/src/main/java/org/apache/jena/ontology/OntModel.java @@ -1497,6 +1497,7 @@ public interface OntModel * <p>Answer the ontology model specification that was used to construct this model</p> * @return An ont model spec instance. */ + @SuppressWarnings("removal") public OntModelSpec getSpecification(); diff --git a/jena-core/src/main/java/org/apache/jena/ontology/OntModelSpec.java b/jena-core/src/main/java/org/apache/jena/ontology/OntModelSpec.java index 5e4c8c9a26..572b281302 100644 --- a/jena-core/src/main/java/org/apache/jena/ontology/OntModelSpec.java +++ b/jena-core/src/main/java/org/apache/jena/ontology/OntModelSpec.java @@ -52,6 +52,8 @@ import java.util.Objects; * @deprecated Use org.apache.jena.ontapi. */ @Deprecated(forRemoval = true) +@SuppressWarnings("removal") + public class OntModelSpec { // Constants ////////////////////////////////// diff --git a/jena-core/src/main/java/org/apache/jena/rdf/model/ModelFactory.java b/jena-core/src/main/java/org/apache/jena/rdf/model/ModelFactory.java index ff481ec050..9ac8a55cf3 100644 --- a/jena-core/src/main/java/org/apache/jena/rdf/model/ModelFactory.java +++ b/jena-core/src/main/java/org/apache/jena/rdf/model/ModelFactory.java @@ -186,6 +186,7 @@ public class ModelFactory extends ModelFactoryBase * * @deprecated Use org.apache.jena.ontapi. */ + @SuppressWarnings("removal") @Deprecated(forRemoval = true) public static OntModel createOntologyModel() { return createOntologyModel( ProfileRegistry.OWL_LANG ); @@ -239,6 +240,7 @@ public class ModelFactory extends ModelFactoryBase * @see OntModelSpec#getDefaultSpec * @deprecated Use org.apache.jena.ontapi. */ + @SuppressWarnings("removal") @Deprecated(forRemoval = true) public static OntModel createOntologyModel( String languageURI ) { return createOntologyModel( OntModelSpec.getDefaultSpec( languageURI ), null ); @@ -261,6 +263,7 @@ public class ModelFactory extends ModelFactoryBase * @see OntModelSpec * @deprecated Use org.apache.jena.ontapi. */ + @SuppressWarnings("removal") @Deprecated(forRemoval = true) public static OntModel createOntologyModel( OntModelSpec spec, ModelMaker maker, Model base ) { OntModelSpec _spec = new OntModelSpec( spec ); @@ -282,6 +285,7 @@ public class ModelFactory extends ModelFactoryBase * @see OntModelSpec * @deprecated Use org.apache.jena.ontapi. */ + @SuppressWarnings("removal") @Deprecated(forRemoval = true) public static OntModel createOntologyModel( OntModelSpec spec, Model base ) { return new OntModelImpl( spec, base ); @@ -292,6 +296,7 @@ public class ModelFactory extends ModelFactoryBase * a ModelMaker which will create the necessary base model. * @deprecated Use org.apache.jena.ontapi. */ + @SuppressWarnings("removal") @Deprecated(forRemoval = true) public static OntModel createOntologyModel(OntModelSpec spec) { return new OntModelImpl(spec); diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/SpatialIndexStorage.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/SpatialIndexStorage.java index dacaba1915..b2b900ede2 100644 --- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/SpatialIndexStorage.java +++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/SpatialIndexStorage.java @@ -30,10 +30,11 @@ import org.locationtech.jts.geom.Envelope; /** * Spatial Index Items in a Serializable form for file reading or writing. * + * */ -@Deprecated /** Serializable java class of spatial index v1. Moving this class would break Java serialization. */ +@Deprecated public class SpatialIndexStorage implements Serializable { - + /* Serializable java class of spatial index v1. Moving this class would break Java serialization. */ private final String srsURI; private final List<StorageItem> storageItems; @@ -65,6 +66,8 @@ public class SpatialIndexStorage implements Serializable { return indexItems; } + + @SuppressWarnings("removal") public SpatialIndexV1 getSpatialIndex() throws SpatialIndexException { return new SpatialIndexV1(getIndexItems(), srsURI); } diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/index/v1/SpatialIndexAdapterV1.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/index/v1/SpatialIndexAdapterV1.java index 9f33eeae15..4ab59a29b7 100644 --- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/index/v1/SpatialIndexAdapterV1.java +++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/index/v1/SpatialIndexAdapterV1.java @@ -33,6 +33,7 @@ import org.locationtech.jts.geom.Envelope; /** Adapter class for spatial index v1. */ @Deprecated(forRemoval=true) +@SuppressWarnings("removal") public class SpatialIndexAdapterV1 implements SpatialIndex { diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/index/v1/SpatialIndexV1.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/index/v1/SpatialIndexV1.java index 5e5b27b655..97929f81bc 100644 --- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/index/v1/SpatialIndexV1.java +++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/index/v1/SpatialIndexV1.java @@ -247,6 +247,7 @@ public class SpatialIndexV1 { */ public static final void setSpatialIndex(Dataset dataset, SpatialIndexV1 spatialIndex) { Context context = dataset.getContext(); + @SuppressWarnings("removal") SpatialIndex wrapper = new SpatialIndexAdapterV1(spatialIndex); SpatialIndexLib.setSpatialIndex(context, wrapper); } 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 3165cdb106..5d7d775981 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 @@ -52,6 +52,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @Deprecated(forRemoval = true) +@SuppressWarnings({"removal", "deprecated"}) 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 cd5c9fc1cd..277b82b9b4 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 @@ -35,6 +35,7 @@ import org.apache.jena.tdb1.transaction.DatasetGraphTxn; * @deprecated Migrate to TDB2. */ @Deprecated(forRemoval =true) +@SuppressWarnings("removal") public class TDB1Backup { public static void backup(Location location, String backupfile) 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 38a8078b05..31639313a2 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 @@ -40,6 +40,7 @@ import org.apache.jena.tdb1.transaction.DatasetGraphTransaction; * @deprecated TDB1 will be phased out at some point. TDB2 is the preferred database. */ @Deprecated(forRemoval = true) +@SuppressWarnings("removal") 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 197988ccc6..6d8f7d7586 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 @@ -215,6 +215,7 @@ public class TDB1Loader private static void loadGraph$(GraphTDB graph, InputStream input, boolean showProgress, boolean collectStats) { + @SuppressWarnings("removal") DatasetGraphTDB dsgtdb = TDBInternal.getBaseDatasetGraphTDB(graph.getDatasetGraphTDB()); if ( graph.getGraphName() == null ) 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 c40c3c1ac1..1f53d16a7f 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 @@ -28,6 +28,7 @@ import org.apache.jena.tdb1.TDB1; @Deprecated(forRemoval = true) public class VocabTDB1 { + @SuppressWarnings("removal") private static final String NS = TDB1.namespace ; public static String getURI() { return NS ; } 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 7369d92c49..939ea68fd3 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 @@ -38,6 +38,7 @@ import org.slf4j.Logger ; /** Makes things : datasets from locations, indexes, etc etc. */ @Deprecated(forRemoval = true) +@SuppressWarnings({"removal", "deprecated"}) public class SetupTDB { // Replaced/merge with DatasetBuilderStd mechanisms.
