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 e3eeba4c5ec21b65ffa4204b4e3411cbd209a6f7 Author: Andy Seaborne <[email protected]> AuthorDate: Wed May 14 19:27:24 2025 +0100 GH-3194: Deprecation-removal Capabilites --- .../src/main/java/org/apache/jena/sparql/core/GraphView.java | 12 ++++-------- .../main/java/org/apache/jena/sparql/graph/GraphZero.java | 8 -------- .../src/main/java/org/apache/jena/graph/Capabilities.java | 1 + .../java/org/apache/jena/graph/impl/AllCapabilities.java | 3 +-- .../java/org/apache/jena/graph/impl/BaseCapabilities.java | 1 + .../java/org/apache/jena/graph/impl/CollectionGraph.java | 6 ------ .../java/org/apache/jena/graph/impl/WrappedCapabilities.java | 1 + .../src/main/java/org/apache/jena/reasoner/BaseInfGraph.java | 4 ++++ .../jena/reasoner/rulesys/BasicForwardRuleReasoner.java | 3 --- .../org/apache/jena/reasoner/rulesys/FBRuleReasoner.java | 3 --- .../apache/jena/reasoner/rulesys/LPBackwardRuleReasoner.java | 3 --- .../jena/reasoner/transitiveReasoner/TransitiveReasoner.java | 3 --- .../java/org/apache/jena/graph/test/AbstractTestGraph.java | 2 +- .../test/java/org/apache/jena/graph/test/TestGraphPlain.java | 2 +- .../src/test/java/org/apache/jena/mem2/GraphMem2Test.java | 1 + .../apache/jena/permissions/graph/SecuredCapabilities.java | 1 + .../apache/jena/permissions/graph/impl/SecuredGraphImpl.java | 1 + 17 files changed, 17 insertions(+), 38 deletions(-) diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/core/GraphView.java b/jena-arq/src/main/java/org/apache/jena/sparql/core/GraphView.java index 3773219f3c..d9c95d0169 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/core/GraphView.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/core/GraphView.java @@ -22,8 +22,10 @@ import java.util.Iterator ; import org.apache.jena.atlas.iterator.Iter ; import org.apache.jena.atlas.lib.Sync ; -import org.apache.jena.graph.*; -import org.apache.jena.graph.impl.AllCapabilities; +import org.apache.jena.graph.GraphEvents; +import org.apache.jena.graph.Node; +import org.apache.jena.graph.TransactionHandler; +import org.apache.jena.graph.Triple; import org.apache.jena.graph.impl.GraphBase ; import org.apache.jena.riot.system.Prefixes; import org.apache.jena.shared.AddDeniedException; @@ -194,10 +196,4 @@ public class GraphView extends GraphBase implements NamedGraph, Sync public TransactionHandler getTransactionHandler() { return new TransactionHandlerView(dsg); } - - private Capabilities capabilities = null; - @Override - public Capabilities getCapabilities() { - return AllCapabilities.updateAllowed; - } } diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/graph/GraphZero.java b/jena-arq/src/main/java/org/apache/jena/sparql/graph/GraphZero.java index 5fd9d8a293..39abaca9d1 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/graph/GraphZero.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/graph/GraphZero.java @@ -18,11 +18,9 @@ package org.apache.jena.sparql.graph; -import org.apache.jena.graph.Capabilities; import org.apache.jena.graph.Graph; import org.apache.jena.graph.TransactionHandler; import org.apache.jena.graph.Triple; -import org.apache.jena.graph.impl.AllCapabilities; import org.apache.jena.graph.impl.GraphBase; import org.apache.jena.shared.PrefixMapping; import org.apache.jena.util.iterator.ExtendedIterator; @@ -70,10 +68,4 @@ public class GraphZero extends GraphBase { @Override public void performDelete( Triple t ) { throw new UnsupportedOperationException("delete triple"); } - - private Capabilities capabilities = null; - @Override - public Capabilities getCapabilities() { - return AllCapabilities.updateNotAllowed; - } } diff --git a/jena-core/src/main/java/org/apache/jena/graph/Capabilities.java b/jena-core/src/main/java/org/apache/jena/graph/Capabilities.java index 4fc37868d3..31938d9ab4 100644 --- a/jena-core/src/main/java/org/apache/jena/graph/Capabilities.java +++ b/jena-core/src/main/java/org/apache/jena/graph/Capabilities.java @@ -21,6 +21,7 @@ package org.apache.jena.graph; /** * Interface for expressing capabilities. */ +@Deprecated(forRemoval = true) public interface Capabilities { /** * Answer true iff Graph::size() is accurate. diff --git a/jena-core/src/main/java/org/apache/jena/graph/impl/AllCapabilities.java b/jena-core/src/main/java/org/apache/jena/graph/impl/AllCapabilities.java index d292a0ff7a..818ee51092 100644 --- a/jena-core/src/main/java/org/apache/jena/graph/impl/AllCapabilities.java +++ b/jena-core/src/main/java/org/apache/jena/graph/impl/AllCapabilities.java @@ -20,8 +20,7 @@ package org.apache.jena.graph.impl; import org.apache.jena.graph.Capabilities ; -/** - */ +@SuppressWarnings("removal") public class AllCapabilities { public static Capabilities updateAllowed = create(true, true, true, false); diff --git a/jena-core/src/main/java/org/apache/jena/graph/impl/BaseCapabilities.java b/jena-core/src/main/java/org/apache/jena/graph/impl/BaseCapabilities.java index 937a9bd319..2ffc186f97 100644 --- a/jena-core/src/main/java/org/apache/jena/graph/impl/BaseCapabilities.java +++ b/jena-core/src/main/java/org/apache/jena/graph/impl/BaseCapabilities.java @@ -26,6 +26,7 @@ import org.apache.jena.graph.Capabilities; * The settings are the * general default: allow update, size is accurate, and term value semantics. */ +@SuppressWarnings("removal") public class BaseCapabilities implements Capabilities { @Override public boolean sizeAccurate() { return true; } @Override public boolean addAllowed() { return true; } diff --git a/jena-core/src/main/java/org/apache/jena/graph/impl/CollectionGraph.java b/jena-core/src/main/java/org/apache/jena/graph/impl/CollectionGraph.java index 38826305c0..332eed695f 100644 --- a/jena-core/src/main/java/org/apache/jena/graph/impl/CollectionGraph.java +++ b/jena-core/src/main/java/org/apache/jena/graph/impl/CollectionGraph.java @@ -21,7 +21,6 @@ import java.util.Collection ; import java.util.HashSet ; import java.util.Set ; -import org.apache.jena.graph.Capabilities ; import org.apache.jena.graph.Node ; import org.apache.jena.graph.Triple ; import org.apache.jena.util.iterator.ExtendedIterator ; @@ -93,9 +92,4 @@ public class CollectionGraph extends GraphBase public void performDelete(final Triple t) { triples.remove(t); } - - @Override - public Capabilities getCapabilities() { - return AllCapabilities.updateAllowed; - } } diff --git a/jena-core/src/main/java/org/apache/jena/graph/impl/WrappedCapabilities.java b/jena-core/src/main/java/org/apache/jena/graph/impl/WrappedCapabilities.java index 7919cfdfc7..d24b70066c 100644 --- a/jena-core/src/main/java/org/apache/jena/graph/impl/WrappedCapabilities.java +++ b/jena-core/src/main/java/org/apache/jena/graph/impl/WrappedCapabilities.java @@ -20,6 +20,7 @@ package org.apache.jena.graph.impl; import org.apache.jena.graph.Capabilities; +@SuppressWarnings("removal") public class WrappedCapabilities implements Capabilities { protected final Capabilities other; diff --git a/jena-core/src/main/java/org/apache/jena/reasoner/BaseInfGraph.java b/jena-core/src/main/java/org/apache/jena/reasoner/BaseInfGraph.java index 1412b21d54..ef52d03ca2 100644 --- a/jena-core/src/main/java/org/apache/jena/reasoner/BaseInfGraph.java +++ b/jena-core/src/main/java/org/apache/jena/reasoner/BaseInfGraph.java @@ -48,6 +48,7 @@ public abstract class BaseInfGraph extends GraphBase implements InfGraph { /** version count */ protected volatile int version = 0; + @SuppressWarnings("removal") private Capabilities infCapabilities; /** @@ -71,6 +72,7 @@ public abstract class BaseInfGraph extends GraphBase implements InfGraph { this.infCapabilities = calcCapabilitiesFrom(data); } + @SuppressWarnings("removal") private Capabilities calcCapabilitiesFrom(Graph data) { if ( data == null ) return reasonerInfCapabilities; @@ -86,6 +88,7 @@ public abstract class BaseInfGraph extends GraphBase implements InfGraph { /** Answer the InfCapabilities of this InfGraph. */ + @SuppressWarnings("removal") @Override public Capabilities getCapabilities() { return infCapabilities; @@ -96,6 +99,7 @@ public abstract class BaseInfGraph extends GraphBase implements InfGraph { * A base graph may also provide handling literal datatypes. */ + @SuppressWarnings("removal") public static Capabilities reasonerInfCapabilities = new Capabilities() { @Override public boolean sizeAccurate() { return false; } diff --git a/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/BasicForwardRuleReasoner.java b/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/BasicForwardRuleReasoner.java index 72084a18b4..d4e326bf57 100755 --- a/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/BasicForwardRuleReasoner.java +++ b/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/BasicForwardRuleReasoner.java @@ -46,9 +46,6 @@ public class BasicForwardRuleReasoner implements Reasoner { /** Flag which, if true, enables tracing of rule actions to logger.info */ protected boolean traceOn = false; - /** The graph capabilities of the infgraphs generated by this reasoner */ - protected Capabilities capabilities; - /** * Constructor. This is the raw version that does not reference a ReasonerFactory * and so has no capabilities description. diff --git a/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/FBRuleReasoner.java b/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/FBRuleReasoner.java index 64d02cc05a..bc3f6ac4e9 100644 --- a/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/FBRuleReasoner.java +++ b/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/FBRuleReasoner.java @@ -58,9 +58,6 @@ public class FBRuleReasoner implements RuleReasoner { /** The original configuration properties, if any */ protected Resource configuration; - /** The graph capabilities of the infgraphs generated by this reasoner */ - protected Capabilities capabilities; - /** * Constructor. This is the raw version that does not reference a ReasonerFactory * and so has no capabilities description. diff --git a/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/LPBackwardRuleReasoner.java b/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/LPBackwardRuleReasoner.java index bdabeed3db..b10944b113 100644 --- a/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/LPBackwardRuleReasoner.java +++ b/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/LPBackwardRuleReasoner.java @@ -53,9 +53,6 @@ public class LPBackwardRuleReasoner implements Reasoner { /** Flag which, if true, enables tracing of rule actions to logger.info */ boolean traceOn = false; - /** The graph capabilities of the infgraphs generated by this reasoner */ - protected Capabilities capabilities; - /** * Constructor. This is the raw version that does not reference a ReasonerFactory * and so has no capabilities description. diff --git a/jena-core/src/main/java/org/apache/jena/reasoner/transitiveReasoner/TransitiveReasoner.java b/jena-core/src/main/java/org/apache/jena/reasoner/transitiveReasoner/TransitiveReasoner.java index 9a8f6d3855..5b655f4966 100644 --- a/jena-core/src/main/java/org/apache/jena/reasoner/transitiveReasoner/TransitiveReasoner.java +++ b/jena-core/src/main/java/org/apache/jena/reasoner/transitiveReasoner/TransitiveReasoner.java @@ -61,9 +61,6 @@ public class TransitiveReasoner implements Reasoner { /** The normal subClassOf property */ public static final Node subClassOf = RDFS.Nodes.subClassOf; - /** The graph capabilities of the infgraphs generated by this reasoner */ - protected Capabilities capabilities; - /** Constructor */ public TransitiveReasoner() { subClassCache = new TransitiveGraphCache(directSubClassOf, subClassOf); diff --git a/jena-core/src/test/java/org/apache/jena/graph/test/AbstractTestGraph.java b/jena-core/src/test/java/org/apache/jena/graph/test/AbstractTestGraph.java index 7c0e170347..2840aa6903 100644 --- a/jena-core/src/test/java/org/apache/jena/graph/test/AbstractTestGraph.java +++ b/jena-core/src/test/java/org/apache/jena/graph/test/AbstractTestGraph.java @@ -340,10 +340,10 @@ public abstract class AbstractTestGraph extends GraphTestBase } } + @SuppressWarnings("removal") public void testHasCapabilities() { Graph g = getNewGraph(); - @SuppressWarnings("removal") Capabilities c = g.getCapabilities(); boolean sa = c.sizeAccurate(); boolean aaSome = c.addAllowed(); diff --git a/jena-core/src/test/java/org/apache/jena/graph/test/TestGraphPlain.java b/jena-core/src/test/java/org/apache/jena/graph/test/TestGraphPlain.java index bbda304744..a2996d4cd6 100644 --- a/jena-core/src/test/java/org/apache/jena/graph/test/TestGraphPlain.java +++ b/jena-core/src/test/java/org/apache/jena/graph/test/TestGraphPlain.java @@ -35,7 +35,7 @@ import org.apache.jena.util.iterator.ExtendedIterator ; import org.junit.BeforeClass ; import org.junit.Test ; -@SuppressWarnings("deprecation") +@SuppressWarnings({"deprecation", "removal"}) public class TestGraphPlain { private static Graph graph; diff --git a/jena-core/src/test/java/org/apache/jena/mem2/GraphMem2Test.java b/jena-core/src/test/java/org/apache/jena/mem2/GraphMem2Test.java index bee503ce0b..2dedd9d474 100644 --- a/jena-core/src/test/java/org/apache/jena/mem2/GraphMem2Test.java +++ b/jena-core/src/test/java/org/apache/jena/mem2/GraphMem2Test.java @@ -156,6 +156,7 @@ public class GraphMem2Test { verifyNoMoreInteractions(mockStore); } + @SuppressWarnings("removal") @Test public void testGetCapabilities() { TripleStore mockStore = mock(); diff --git a/jena-permissions/src/main/java/org/apache/jena/permissions/graph/SecuredCapabilities.java b/jena-permissions/src/main/java/org/apache/jena/permissions/graph/SecuredCapabilities.java index 921ba21879..a7b10456c9 100644 --- a/jena-permissions/src/main/java/org/apache/jena/permissions/graph/SecuredCapabilities.java +++ b/jena-permissions/src/main/java/org/apache/jena/permissions/graph/SecuredCapabilities.java @@ -27,6 +27,7 @@ import org.apache.jena.permissions.SecurityEvaluator.Action; * The interface for secured Capabilities instances. * */ +@Deprecated(forRemoval = true) public class SecuredCapabilities implements Capabilities { // the security evaluator in use private final SecurityEvaluator securityEvaluator; diff --git a/jena-permissions/src/main/java/org/apache/jena/permissions/graph/impl/SecuredGraphImpl.java b/jena-permissions/src/main/java/org/apache/jena/permissions/graph/impl/SecuredGraphImpl.java index 4c53336008..8b530c0304 100644 --- a/jena-permissions/src/main/java/org/apache/jena/permissions/graph/impl/SecuredGraphImpl.java +++ b/jena-permissions/src/main/java/org/apache/jena/permissions/graph/impl/SecuredGraphImpl.java @@ -233,6 +233,7 @@ public class SecuredGraphImpl extends SecuredItemImpl implements SecuredGraph { return createIterator(() -> holder.getBaseItem().find(t), () -> new PermTripleFilter(Action.Read, this)); } + @Deprecated(forRemoval = true) @Override public SecuredCapabilities getCapabilities() { return new SecuredCapabilities(getSecurityEvaluator(), getModelIRI(), holder.getBaseItem().getCapabilities());
