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
The following commit(s) were added to refs/heads/main by this push:
new d2beba26f7 Suppress expected warnings
d2beba26f7 is described below
commit d2beba26f79375477655ca23795b1ee5d370500b
Author: Andy Seaborne <[email protected]>
AuthorDate: Thu Jan 2 12:31:21 2025 +0000
Suppress expected warnings
---
.../java/org/apache/jena/query/QueryExecutionDatasetBuilder.java | 4 ++--
.../main/java/org/apache/jena/query/QueryExecutionFactory.java | 6 +++---
.../org/apache/jena/sparql/exec/QueryExecDatasetBuilder.java | 2 +-
.../org/apache/jena/sparql/exec/UpdateExecDatasetBuilder.java | 4 ++--
.../java/org/apache/jena/sparql/modify/UpdateEngineWorker.java | 2 +-
.../main/java/org/apache/jena/sparql/util/graph/GraphUtils.java | 4 ++--
jena-arq/src/main/java/org/apache/jena/update/UpdateAction.java | 2 +-
jena-arq/src/test/java/org/apache/jena/sparql/api/TestAPI.java | 9 +++++++++
.../apache/jena/mem/graph/helper/GraphTripleNodeHelper480.java | 2 ++
.../java/org/apache/jena/riot/lang/rdfxml/TestXMLParser.java | 2 ++
.../main/java/org/apache/jena/ext/xerces/impl/dv/XSFacets.java | 9 +++------
.../apache/jena/shacl/engine/constraint/SparqlValidation.java | 1 +
.../main/java/org/apache/jena/shacl/validation/EvalSparql.java | 1 +
13 files changed, 30 insertions(+), 18 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 ab4fe51b12..882e105642 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
@@ -105,15 +105,15 @@ public class QueryExecutionDatasetBuilder implements
QueryExecutionBuilder {
/** @deprecated Prefer {@link #substitution(Binding)} which substitutes
variables for values in the the query before execution. */
@Deprecated(forRemoval = true)
- @SuppressWarnings("all")
public QueryExecutionDatasetBuilder initialBinding(Binding binding) {
builder.initialBinding(binding);
return this;
}
/**
- * Prefer {@link #substitution(QuerySolution)} which substitutes variables
for values in the the query before execution.
+ * @deprecated Prefer {@link #substitution(QuerySolution)} which
substitutes variables for values in the the query before execution.
*/
+ @Deprecated(forRemoval = true)
public QueryExecutionDatasetBuilder initialBinding(QuerySolution
querySolution) {
if ( querySolution != null ) {
Binding binding = BindingLib.toBinding(querySolution);
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 7d5435065f..a3c98f7a98 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
@@ -187,7 +187,7 @@ public class QueryExecutionFactory
* @return QueryExecution
* @deprecated Use {@code
QueryExecution.dataset(dataset).query(query).substitution(querySolution).build()}.
*/
- @Deprecated
+ @Deprecated(forRemoval = true)
public static QueryExecution create(Query query, Dataset dataset,
QuerySolution querySolution) {
checkArg(query);
return
QueryExecution.dataset(dataset).query(query).substitution(querySolution).build();
@@ -201,7 +201,7 @@ public class QueryExecutionFactory
* @return QueryExecution
* @deprecated Use {@code
QueryExecution#model(model).query(query).substitution(querySolution).build()}.
*/
- @Deprecated
+ @Deprecated(forRemoval = true)
public static QueryExecution create(Query query, Model model,
QuerySolution querySolution) {
checkArg(query);
return
QueryExecution.model(model).query(query).substitution(querySolution).build();
@@ -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("all")
+ @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/sparql/exec/QueryExecDatasetBuilder.java
b/jena-arq/src/main/java/org/apache/jena/sparql/exec/QueryExecDatasetBuilder.java
index 23e003009a..6ba3ead521 100644
---
a/jena-arq/src/main/java/org/apache/jena/sparql/exec/QueryExecDatasetBuilder.java
+++
b/jena-arq/src/main/java/org/apache/jena/sparql/exec/QueryExecDatasetBuilder.java
@@ -155,7 +155,7 @@ public class QueryExecDatasetBuilder implements
QueryExecMod, QueryExecBuilder {
substitutionMap = new HashMap<>();
}
- /** Use {@link #substitution(Binding)} */
+ /** @deprecated Use {@link #substitution(Binding)} */
@Deprecated(forRemoval = true)
public QueryExecDatasetBuilder initialBinding(Binding binding) {
this.initialBinding = binding;
diff --git
a/jena-arq/src/main/java/org/apache/jena/sparql/exec/UpdateExecDatasetBuilder.java
b/jena-arq/src/main/java/org/apache/jena/sparql/exec/UpdateExecDatasetBuilder.java
index f58c9b3bda..e160117783 100644
---
a/jena-arq/src/main/java/org/apache/jena/sparql/exec/UpdateExecDatasetBuilder.java
+++
b/jena-arq/src/main/java/org/apache/jena/sparql/exec/UpdateExecDatasetBuilder.java
@@ -148,8 +148,8 @@ public class UpdateExecDatasetBuilder implements
UpdateExecBuilder {
return this;
}
- /** Use {@link #substitution(Binding)} */
- @Deprecated
+ /** @deprecated Use {@link #substitution(Binding)} */
+ @Deprecated(forRemoval = true)
public UpdateExecDatasetBuilder initialBinding(Binding initialBinding) {
this.initialBinding = initialBinding;
return this;
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 c8c8930638..ae0dd626e5 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
@@ -563,7 +563,7 @@ public class UpdateEngineWorker implements UpdateVisitor
return evalBindings(query, datasetGraph, inputBinding, context);
}
- @SuppressWarnings("all")
+ @SuppressWarnings("removal")
protected 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/util/graph/GraphUtils.java
b/jena-arq/src/main/java/org/apache/jena/sparql/util/graph/GraphUtils.java
index cad5c3e69a..18e486231f 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/util/graph/GraphUtils.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/util/graph/GraphUtils.java
@@ -286,7 +286,7 @@ public class GraphUtils {
QuerySolutionMap qsm = new QuerySolutionMap();
qsm.add("ATYPE", atype);
- try(QueryExecution qExec =
QueryExecution.model(model).query(q).initialBinding(qsm).build() ) {
+ try( @SuppressWarnings("removal") QueryExecution qExec =
QueryExecution.model(model).query(q).initialBinding(qsm).build() ) {
return (Resource)QueryExecUtils.getAtMostOne(qExec, "root");
}
}
@@ -299,7 +299,7 @@ public class GraphUtils {
Query q = QueryFactory.create(s);
QuerySolutionMap qsm = new QuerySolutionMap();
qsm.add("ATYPE", atype);
- try(QueryExecution qExec =
QueryExecution.model(model).query(q).initialBinding(qsm).build() ) {
+ try( @SuppressWarnings("removal") QueryExecution qExec =
QueryExecution.model(model).query(q).initialBinding(qsm).build() ) {
return QueryExecUtils.getAll(qExec,
"root").stream().map(r->(Resource)r).toList();
}
}
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 e13d7a6238..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
@@ -247,7 +247,7 @@ public class UpdateAction {
// All non-streaming updates come through here.
private static void execute$(UpdateRequest request, DatasetGraph
datasetGraph, Binding inputBinding) {
- @SuppressWarnings("all")
+ @SuppressWarnings("removal")
UpdateExec uProc =
UpdateExec.newBuilder().update(request).dataset(datasetGraph).initialBinding(inputBinding).build();
if ( uProc == null )
throw new ARQException("No suitable update procesors are
registered/able to execute your updates");
diff --git a/jena-arq/src/test/java/org/apache/jena/sparql/api/TestAPI.java
b/jena-arq/src/test/java/org/apache/jena/sparql/api/TestAPI.java
index d17d46c828..a6be4ee47c 100644
--- a/jena-arq/src/test/java/org/apache/jena/sparql/api/TestAPI.java
+++ b/jena-arq/src/test/java/org/apache/jena/sparql/api/TestAPI.java
@@ -66,6 +66,7 @@ import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
+
public class TestAPI
{
private static final String ns = "http://example/ns#"; ;
@@ -90,6 +91,7 @@ public class TestAPI
d.addNamedModel(g1.getURI(), m);
}
+ @SuppressWarnings("removal")
@Test public void testInitialBindingsConstruct1()
{
QuerySolutionMap init = new QuerySolutionMap() ;
@@ -106,6 +108,7 @@ public class TestAPI
}
}
+ @SuppressWarnings("removal")
@Test public void testInitialBindingsConstruct2()
{
QuerySolutionMap init = new QuerySolutionMap() ;
@@ -171,6 +174,7 @@ public class TestAPI
assertTrue(smap2.contains("o")) ;
}
+ @SuppressWarnings("removal")
@Test public void testInitialBindings1()
{
QuerySolutionMap init = new QuerySolutionMap() ;
@@ -184,6 +188,7 @@ public class TestAPI
}
}
+ @SuppressWarnings("removal")
@Test public void testInitialBindings2()
{
QuerySolutionMap init = new QuerySolutionMap() ;
@@ -197,6 +202,7 @@ public class TestAPI
}
}
+ @SuppressWarnings("removal")
@Test public void testInitialBindings3()
{
QuerySolutionMap init = new QuerySolutionMap() ;
@@ -211,6 +217,7 @@ public class TestAPI
}
}
+ @SuppressWarnings("removal")
@Test public void testInitialBindings4()
{
// Test derived from report by Holger Knublauch
@@ -242,6 +249,7 @@ public class TestAPI
/**
* Initial binding substitution happens before optimization so initial
bindings can make a semantically always false query into one that can return
true
*/
+ @SuppressWarnings("removal")
@Test public void testInitialBindings5() {
// From JENA-500
Query query = QueryFactory.create(
@@ -264,6 +272,7 @@ public class TestAPI
/**
* Initial binding substitution happens before optimization so initial
bindings can make a semantically always false query into one that can return
true
*/
+ @SuppressWarnings("removal")
@Test public void testInitialBindings6() {
// From JENA-500
Query query = QueryFactory.create(
diff --git
a/jena-benchmarks/jena-benchmarks-jmh/src/test/java/org/apache/jena/mem/graph/helper/GraphTripleNodeHelper480.java
b/jena-benchmarks/jena-benchmarks-jmh/src/test/java/org/apache/jena/mem/graph/helper/GraphTripleNodeHelper480.java
index eba4124a82..f3e08ade0d 100644
---
a/jena-benchmarks/jena-benchmarks-jmh/src/test/java/org/apache/jena/mem/graph/helper/GraphTripleNodeHelper480.java
+++
b/jena-benchmarks/jena-benchmarks-jmh/src/test/java/org/apache/jena/mem/graph/helper/GraphTripleNodeHelper480.java
@@ -30,6 +30,7 @@ import java.util.Objects;
public class GraphTripleNodeHelper480 implements GraphTripleNodeHelper<Graph,
Triple, Node> {
+ @SuppressWarnings("deprecation")
@Override
public Graph createGraph(Context.GraphClass graphClass) {
if (Objects.requireNonNull(graphClass) == Context.GraphClass.GraphMem)
{
@@ -38,6 +39,7 @@ public class GraphTripleNodeHelper480 implements
GraphTripleNodeHelper<Graph, Tr
throw new IllegalArgumentException("Unknown graph class: " +
graphClass);
}
+ @SuppressWarnings("deprecation")
@Override
public List<Triple> readTriples(String graphUri) {
var list = new ArrayList<Triple>();
diff --git
a/jena-benchmarks/jena-benchmarks-jmh/src/test/java/org/apache/jena/riot/lang/rdfxml/TestXMLParser.java
b/jena-benchmarks/jena-benchmarks-jmh/src/test/java/org/apache/jena/riot/lang/rdfxml/TestXMLParser.java
index e3a6c439c7..c4f1ce06fc 100644
---
a/jena-benchmarks/jena-benchmarks-jmh/src/test/java/org/apache/jena/riot/lang/rdfxml/TestXMLParser.java
+++
b/jena-benchmarks/jena-benchmarks-jmh/src/test/java/org/apache/jena/riot/lang/rdfxml/TestXMLParser.java
@@ -53,6 +53,7 @@ public class TestXMLParser {
public String param1_ParserLang;
+ @SuppressWarnings("removal")
private static Lang getLang(String langName) {
switch (langName) {
case "RRX.RDFXML_SAX":
@@ -72,6 +73,7 @@ public class TestXMLParser {
}
}
+ @SuppressWarnings("removal")
private static org.apache.shadedJena510.riot.Lang getLangJena510(String
langName) {
switch (langName) {
case "RRX.RDFXML_SAX":
diff --git
a/jena-core/src/main/java/org/apache/jena/ext/xerces/impl/dv/XSFacets.java
b/jena-core/src/main/java/org/apache/jena/ext/xerces/impl/dv/XSFacets.java
index 077fcf02b3..38d3eedef9 100644
--- a/jena-core/src/main/java/org/apache/jena/ext/xerces/impl/dv/XSFacets.java
+++ b/jena-core/src/main/java/org/apache/jena/ext/xerces/impl/dv/XSFacets.java
@@ -5,9 +5,9 @@
* 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.
@@ -18,15 +18,12 @@
package org.apache.jena.ext.xerces.impl.dv;
/**
- * The class used to pass all facets to {@link XSSimpleType#applyFacets}.
- *
- * {@literal @xerces.internal}
+ * {@literal @xerces.internal}
*
* @author Sandy Gao, IBM
*
* @version $Id: XSFacets.java 699892 2008-09-28 21:08:27Z mrglavas $
*/
-@SuppressWarnings("all")
public class XSFacets {
/**
diff --git
a/jena-shacl/src/main/java/org/apache/jena/shacl/engine/constraint/SparqlValidation.java
b/jena-shacl/src/main/java/org/apache/jena/shacl/engine/constraint/SparqlValidation.java
index aa9e36b6bb..47f3dc4bc0 100644
---
a/jena-shacl/src/main/java/org/apache/jena/shacl/engine/constraint/SparqlValidation.java
+++
b/jena-shacl/src/main/java/org/apache/jena/shacl/engine/constraint/SparqlValidation.java
@@ -96,6 +96,7 @@ import org.apache.jena.sparql.util.ModelUtils;
}
/** return true if the validation is "conforms" */
+ @SuppressWarnings("removal")
private static boolean validateMap(ValidationContext vCxt, Graph data,
Shape shape,
Node focusNode, Path path, Node
valueNode,
Query _query, Map<Parameter, Node>
parameterMap,
diff --git
a/jena-shacl/src/main/java/org/apache/jena/shacl/validation/EvalSparql.java
b/jena-shacl/src/main/java/org/apache/jena/shacl/validation/EvalSparql.java
index 33213bbcfe..26375f6027 100644
--- a/jena-shacl/src/main/java/org/apache/jena/shacl/validation/EvalSparql.java
+++ b/jena-shacl/src/main/java/org/apache/jena/shacl/validation/EvalSparql.java
@@ -50,6 +50,7 @@ public class EvalSparql {
private static boolean USE_QueryTransformOps = true;
+ @SuppressWarnings("removal")
public static Collection<Node> evalSparqlComponent(Graph data, Node node,
SparqlComponent sparqlComponent) {
checkForRequiredParams(data, node, sparqlComponent);
