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 78a7cecf46 GH-3219: Deprecate for removal in jena-permissions
78a7cecf46 is described below
commit 78a7cecf46cd41555e0fc67b91bdd574b04a0263
Author: Andy Seaborne <[email protected]>
AuthorDate: Wed May 21 21:20:02 2025 +0100
GH-3219: Deprecate for removal in jena-permissions
---
jena-permissions/pom.xml | 11 +++++
.../jena/permissions/example/ExampleEvaluator.java | 1 +
.../jena/permissions/example/SecurityExample.java | 5 ++-
.../permissions/example/ShiroExampleEvaluator.java | 15 +++----
.../permissions/example/readonly/ReadOnlyEval.java | 7 ++--
.../java/org/apache/jena/permissions/Factory.java | 4 ++
.../apache/jena/permissions/SecuredAssembler.java | 1 +
.../org/apache/jena/permissions/SecuredItem.java | 40 +++++++++---------
.../apache/jena/permissions/SecurityEvaluator.java | 2 +
.../permissions/SecurityEvaluatorAssembler.java | 1 +
.../jena/permissions/graph/SecuredGraph.java | 4 +-
.../graph/SecuredGraphEventManager.java | 1 +
.../permissions/graph/SecuredPrefixMapping.java | 1 +
.../jena/permissions/graph/impl/Factory.java | 5 ++-
.../permissions/graph/impl/SecuredGraphImpl.java | 2 +-
.../permissions/impl/CachedSecurityEvaluator.java | 1 +
.../apache/jena/permissions/impl/ItemHolder.java | 13 +++---
.../jena/permissions/impl/SecuredItemImpl.java | 1 +
.../jena/permissions/impl/SecuredItemInvoker.java | 3 +-
.../apache/jena/permissions/model/SecuredAlt.java | 2 +
.../apache/jena/permissions/model/SecuredBag.java | 2 +
.../jena/permissions/model/SecuredContainer.java | 2 +
.../jena/permissions/model/SecuredLiteral.java | 2 +
.../jena/permissions/model/SecuredModel.java | 2 +
.../jena/permissions/model/SecuredProperty.java | 2 +
.../jena/permissions/model/SecuredRDFList.java | 3 +-
.../jena/permissions/model/SecuredRDFNode.java | 2 +
.../jena/permissions/model/SecuredResource.java | 8 ++--
.../apache/jena/permissions/model/SecuredSeq.java | 3 +-
.../jena/permissions/model/SecuredStatement.java | 4 +-
.../permissions/model/SecuredStatementTerm.java | 2 +
.../permissions/model/impl/SecuredAltImpl.java | 41 +++++++++---------
.../permissions/model/impl/SecuredBagImpl.java | 6 ++-
.../model/impl/SecuredContainerImpl.java | 49 +++++++++++-----------
.../permissions/model/impl/SecuredLiteralImpl.java | 2 +
.../permissions/model/impl/SecuredModelImpl.java | 2 +-
.../model/impl/SecuredNodeIterator.java | 4 +-
.../model/impl/SecuredPropertyImpl.java | 1 +
.../permissions/model/impl/SecuredRDFListImpl.java | 1 +
.../permissions/model/impl/SecuredRDFNodeImpl.java | 1 +
.../permissions/model/impl/SecuredResIterator.java | 9 ++--
.../model/impl/SecuredResourceImpl.java | 1 +
.../permissions/model/impl/SecuredSeqImpl.java | 1 +
.../model/impl/SecuredStatementImpl.java | 1 +
.../model/impl/SecuredStatementIterator.java | 7 ++--
.../model/impl/SecuredStatementTermImpl.java | 1 +
.../jena/permissions/query/SecuredQueryEngine.java | 5 ++-
.../query/SecuredQueryEngineFactory.java | 5 ++-
.../permissions/query/rewriter/OpRewriter.java | 1 +
.../query/rewriter/SecuredFunction.java | 5 ++-
.../permissions/utils/PermStatementFilter.java | 17 ++++----
.../jena/permissions/utils/PermTripleFilter.java | 17 ++++----
.../jena/permissions/utils/RDFListSecFilter.java | 11 ++---
.../jena/permissions/MockSecurityEvaluator.java | 11 ++---
.../permissions/ModelBasedSecurityEvaluator.java | 5 ++-
.../jena/permissions/SecuredAssemblerTest.java | 1 +
.../jena/permissions/SecurityEvaluatorTest.java | 1 +
.../jena/permissions/StaticSecurityEvaluator.java | 5 ++-
.../graph/CachedSecurityEvaluatorTest.java | 5 ++-
.../contract/graph/SecuredGraphContractTests.java | 1 +
.../contract/graph/SecuredGraphListenerTest.java | 1 +
.../graph/SecuredTDBGraphContractTests.java | 5 ++-
.../permissions/contract/model/SecTestPackage.java | 1 +
.../graph/CrossIDGraphEventManagerTest.java | 1 +
.../permissions/graph/GraphEventManagerTest.java | 5 ++-
.../jena/permissions/graph/MemGraphTest.java | 2 +-
.../graph/SecuredPrefixMappingTest.java | 7 ++--
.../jena/permissions/impl/SecuredItemImplTest.java | 1 +
.../jena/permissions/model/SecuredAltTest.java | 5 ++-
.../jena/permissions/model/SecuredBagTest.java | 5 ++-
.../permissions/model/SecuredContainerTest.java | 5 ++-
.../jena/permissions/model/SecuredLiteralTest.java | 1 +
.../permissions/model/SecuredModelDetailTest.java | 1 +
.../jena/permissions/model/SecuredModelTest.java | 1 +
.../permissions/model/SecuredPropertyTest.java | 5 ++-
.../jena/permissions/model/SecuredRDFListTest.java | 1 +
.../jena/permissions/model/SecuredRDFNodeTest.java | 5 ++-
.../permissions/model/SecuredResourceTest.java | 7 ++--
.../jena/permissions/model/SecuredSeqTest.java | 1 +
.../permissions/model/SecuredStatementTest.java | 1 +
.../apache/jena/permissions/query/DataSetTest.java | 1 +
.../jena/permissions/query/QueryEngineTest.java | 1 +
.../permissions/query/rewriter/OpRewriterTest.java | 5 ++-
83 files changed, 273 insertions(+), 164 deletions(-)
diff --git a/jena-permissions/pom.xml b/jena-permissions/pom.xml
index 050c1cd41d..455d23533e 100644
--- a/jena-permissions/pom.xml
+++ b/jena-permissions/pom.xml
@@ -50,6 +50,17 @@
<build>
<plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <release>${java.version}</release>
+ <compilerArgs>
+ <arg>-Xlint:-removal</arg>
+ <arg>-proc:none</arg>
+ </compilerArgs>
+ </configuration>
+ </plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
diff --git
a/jena-permissions/src/example/java/org/apache/jena/permissions/example/ExampleEvaluator.java
b/jena-permissions/src/example/java/org/apache/jena/permissions/example/ExampleEvaluator.java
index 3989513a29..e4e341c651 100644
---
a/jena-permissions/src/example/java/org/apache/jena/permissions/example/ExampleEvaluator.java
+++
b/jena-permissions/src/example/java/org/apache/jena/permissions/example/ExampleEvaluator.java
@@ -32,6 +32,7 @@ import org.apache.jena.vocabulary.RDF;
* are from or to the principal.
*
*/
+@SuppressWarnings("removal")
public class ExampleEvaluator implements SecurityEvaluator {
private Principal principal;
diff --git
a/jena-permissions/src/example/java/org/apache/jena/permissions/example/SecurityExample.java
b/jena-permissions/src/example/java/org/apache/jena/permissions/example/SecurityExample.java
index 4400eae7c3..f2efb3ab1d 100644
---
a/jena-permissions/src/example/java/org/apache/jena/permissions/example/SecurityExample.java
+++
b/jena-permissions/src/example/java/org/apache/jena/permissions/example/SecurityExample.java
@@ -6,9 +6,9 @@
* 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.
@@ -31,6 +31,7 @@ import org.apache.jena.rdf.model.ResourceFactory;
import org.apache.jena.rdf.model.Statement;
import org.apache.jena.vocabulary.RDF;
+@SuppressWarnings("all")
public class SecurityExample {
/**
diff --git
a/jena-permissions/src/example/java/org/apache/jena/permissions/example/ShiroExampleEvaluator.java
b/jena-permissions/src/example/java/org/apache/jena/permissions/example/ShiroExampleEvaluator.java
index 3e92790221..f6390a00b7 100644
---
a/jena-permissions/src/example/java/org/apache/jena/permissions/example/ShiroExampleEvaluator.java
+++
b/jena-permissions/src/example/java/org/apache/jena/permissions/example/ShiroExampleEvaluator.java
@@ -6,9 +6,9 @@
* 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.
@@ -31,11 +31,12 @@ import org.slf4j.LoggerFactory;
/**
* Class to use Shiro to provide credentials.
- *
+ *
* An example evaluator that only provides access to messages in the graph that
* are from or to the principal.
*
*/
+@SuppressWarnings("removal")
public class ShiroExampleEvaluator implements SecurityEvaluator {
private static final Logger LOG =
LoggerFactory.getLogger(ShiroExampleEvaluator.class);
@@ -46,7 +47,7 @@ public class ShiroExampleEvaluator implements
SecurityEvaluator {
private Property pFrom =
ResourceFactory.createProperty("http://example.com/from";);
/**
- *
+ *
* @param model The graph we are going to evaluate against.
*/
public ShiroExampleEvaluator(Model model) {
@@ -67,7 +68,7 @@ public class ShiroExampleEvaluator implements
SecurityEvaluator {
* method is called from the evaluate(Object,Node) method. A user may only
* access the resource if they are authenticated, and are either the
sender or
* the recipient. Additionally the admin can always see the messages.
- *
+ *
* @param principalObj
* @param r
* @return
@@ -101,7 +102,7 @@ public class ShiroExampleEvaluator implements
SecurityEvaluator {
/**
* Check that the user can see a specific node.
- *
+ *
* @param principal
* @param node
* @return
@@ -126,7 +127,7 @@ public class ShiroExampleEvaluator implements
SecurityEvaluator {
/**
* Evaluate if the user can see the triple.
- *
+ *
* @param principal
* @param triple
* @return
diff --git
a/jena-permissions/src/example/java/org/apache/jena/permissions/example/readonly/ReadOnlyEval.java
b/jena-permissions/src/example/java/org/apache/jena/permissions/example/readonly/ReadOnlyEval.java
index ee99a8d5ea..251e94c481 100644
---
a/jena-permissions/src/example/java/org/apache/jena/permissions/example/readonly/ReadOnlyEval.java
+++
b/jena-permissions/src/example/java/org/apache/jena/permissions/example/readonly/ReadOnlyEval.java
@@ -6,9 +6,9 @@
* 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.
@@ -27,11 +27,12 @@ import
org.apache.jena.shared.AuthenticationRequiredException;
/**
* An example of a security evaluator that creates read-only graphs and models.
- *
+ *
* This evaluator does this by only allowing the Action.READ action, all others
* are denied.
*
*/
+@SuppressWarnings("removal")
public class ReadOnlyEval implements SecurityEvaluator {
@Override
diff --git
a/jena-permissions/src/main/java/org/apache/jena/permissions/Factory.java
b/jena-permissions/src/main/java/org/apache/jena/permissions/Factory.java
index 08a71441a8..9722f068d5 100644
--- a/jena-permissions/src/main/java/org/apache/jena/permissions/Factory.java
+++ b/jena-permissions/src/main/java/org/apache/jena/permissions/Factory.java
@@ -39,7 +39,9 @@ public class Factory {
* @param graphIRI The IRI for the graph.
* @param graph The graph that we are wrapping.
* @return the graph secured under the name graphIRI
+ * @deprecated jena-permissions will be retired
*/
+ @Deprecated(forRemoval = true)
public static SecuredGraph getInstance(final SecurityEvaluator
securityEvaluator, final String graphIRI,
final Graph graph) {
@@ -54,7 +56,9 @@ public class Factory {
* against.
* @param model The model to secure.
* @return the model secured under the name modelIRI
+ * @deprecated jena-permissions will be retired
*/
+ @Deprecated(forRemoval = true)
public static SecuredModel getInstance(final SecurityEvaluator
securityEvaluator, final String modelIRI,
final Model model) {
return
org.apache.jena.permissions.model.impl.SecuredModelImpl.getInstance(securityEvaluator,
modelIRI, model);
diff --git
a/jena-permissions/src/main/java/org/apache/jena/permissions/SecuredAssembler.java
b/jena-permissions/src/main/java/org/apache/jena/permissions/SecuredAssembler.java
index 164df111f8..d689938e6c 100644
---
a/jena-permissions/src/main/java/org/apache/jena/permissions/SecuredAssembler.java
+++
b/jena-permissions/src/main/java/org/apache/jena/permissions/SecuredAssembler.java
@@ -126,6 +126,7 @@ import org.apache.jena.sparql.util.MappingRegistry;
* assembler.</dd>
* </dl>
*/
+@SuppressWarnings("removal")
public class SecuredAssembler extends ModelAssembler implements
AssemblerConstants {
private static boolean initialized;
diff --git
a/jena-permissions/src/main/java/org/apache/jena/permissions/SecuredItem.java
b/jena-permissions/src/main/java/org/apache/jena/permissions/SecuredItem.java
index 73482939ad..7cef46f250 100644
---
a/jena-permissions/src/main/java/org/apache/jena/permissions/SecuredItem.java
+++
b/jena-permissions/src/main/java/org/apache/jena/permissions/SecuredItem.java
@@ -26,7 +26,9 @@ import org.apache.jena.shared.AuthenticationRequiredException;
* The secured item interface is mixed into instances of secured objects by the
* proxy. It provides the security context for the security checks as well as
* several useful shorthand methods for common checks.
+ * @deprecated To be removed
*/
+@Deprecated(forRemoval = true)
public interface SecuredItem {
/**
@@ -36,7 +38,7 @@ public interface SecuredItem {
/**
* Secured items are equivalent if their security evaluators and
modelIRIs are
* equal.
- *
+ *
* @param si1 A secured item to check
* @param si2 A second secured item to check
* @return true if si1 is equivalent to si2.
@@ -66,9 +68,9 @@ public interface SecuredItem {
* Return true if the triple can be created. If any s,p or o is
SecNode.ANY then
* this method must return false if there are any restrictions where the
* remaining nodes and held constant and the ANY node is allowed to vary.
- *
+ *
* See canRead(Triple t)
- *
+ *
* @param t The triple to check
* @return true if the triple can be created.
* @throws AuthenticationRequiredException if user is not authenticated
and is
@@ -78,9 +80,9 @@ public interface SecuredItem {
/**
* Return true if the fronted triple can be created.
- *
+ *
* See canRead(Triple t)
- *
+ *
* @param t The fronted triple to check
* @return true if the triple can be created.
* @throws AuthenticationRequiredException if user is not authenticated
and is
@@ -99,9 +101,9 @@ public interface SecuredItem {
* Return true if the triple can be deleted. If any s,p or o is
SecNode.ANY then
* this method must return false if there are any restrictions where the
* remaining nodes and held constant and the ANY node is allowed to vary.
- *
+ *
* See canRead(Triple t)
- *
+ *
* @param t The triple to check
* @return true if the triple can be deleted.
* @throws AuthenticationRequiredException if user is not authenticated
and is
@@ -111,9 +113,9 @@ public interface SecuredItem {
/**
* Return true if the fronted triple can be deleted.
- *
+ *
* See canRead(Triple t)
- *
+ *
* @param t The fronted triple to check
* @return true if the triple can be deleted.
* @throws AuthenticationRequiredException if user is not authenticated
and is
@@ -132,11 +134,11 @@ public interface SecuredItem {
* Return true if the triple can be read. If any s,p or o is SecNode.ANY
then
* this method must return false if there are any restrictions where the
* remaining nodes and held constant and the ANY node is allowed to vary.
- *
+ *
* (S, P, O) check if S,P,O can be read. (S, P, ANY) check if there are any
* S,P,x restrictions. (S, ANY, P) check if there are any S,x,P
restrictions.
* (ANY, ANY, ANY) check if there are any restrictions on reading.
- *
+ *
* @param t The triple to check
* @return true if the triple can be read.
* @throws AuthenticationRequiredException if user is not authenticated
and is
@@ -146,7 +148,7 @@ public interface SecuredItem {
/**
* Return true if the fronted triple can be read.
- *
+ *
* @param t The frontedtriple to check
* @return true if the triple can be read.
* @throws AuthenticationRequiredException if user is not authenticated
and is
@@ -165,9 +167,9 @@ public interface SecuredItem {
* Return true if the triple can be updated. If any s,p or o is
SecNode.ANY then
* this method must return false if there are any restrictions where the
* remaining nodes and held constant and the ANY node is allowed to vary.
- *
+ *
* See canRead(Triple t)
- *
+ *
* @param from The triple that will be changed
* @param to The resulting triple.
* @return true if the from triple can be updated as the to triple.
@@ -178,10 +180,10 @@ public interface SecuredItem {
/**
* Return true if the fronted triple can be updated.
- *
- *
+ *
+ *
* See canUpdate(Triple from, Triple to)
- *
+ *
* @param from The fronted triple that will be changed
* @param to The resulting fronted triple.
* @return true if the from triple can be updated as the to triple.
@@ -210,7 +212,7 @@ public interface SecuredItem {
/**
* The SecurityEvaluator implementation that is being used to determine
access.
- *
+ *
* @return The SecurityEvaluator implementation.
*/
public SecurityEvaluator getSecurityEvaluator();
@@ -218,7 +220,7 @@ public interface SecuredItem {
/**
* Return true if this secured item is equivalent to another secured item.
* Generally implemented by calling SecuredItem.Util.isEquivalent
- *
+ *
* @param securedItem the other secured item.
* @return True if they are equivalent, false otherwise.
*/
diff --git
a/jena-permissions/src/main/java/org/apache/jena/permissions/SecurityEvaluator.java
b/jena-permissions/src/main/java/org/apache/jena/permissions/SecurityEvaluator.java
index 175b6e41b3..d45ff9e839 100644
---
a/jena-permissions/src/main/java/org/apache/jena/permissions/SecurityEvaluator.java
+++
b/jena-permissions/src/main/java/org/apache/jena/permissions/SecurityEvaluator.java
@@ -79,7 +79,9 @@ import org.apache.jena.shared.AuthenticationRequiredException;
* </ul>
* </dd>
* </dl>
+ * @deprecated jena-permissions will be retired
*/
+@Deprecated(forRemoval = true)
public interface SecurityEvaluator {
/**
* Identifies a specific CRUD actions.
diff --git
a/jena-permissions/src/main/java/org/apache/jena/permissions/SecurityEvaluatorAssembler.java
b/jena-permissions/src/main/java/org/apache/jena/permissions/SecurityEvaluatorAssembler.java
index 7deb936eb1..e4d4c9dd99 100644
---
a/jena-permissions/src/main/java/org/apache/jena/permissions/SecurityEvaluatorAssembler.java
+++
b/jena-permissions/src/main/java/org/apache/jena/permissions/SecurityEvaluatorAssembler.java
@@ -104,6 +104,7 @@ import org.apache.jena.rdf.model.Seq;
* @see SecuredAssembler
*
*/
+@SuppressWarnings("removal")
public class SecurityEvaluatorAssembler extends AssemblerBase implements
Assembler, AssemblerConstants {
// initialization and registration is performed by SecuredAssembler
diff --git
a/jena-permissions/src/main/java/org/apache/jena/permissions/graph/SecuredGraph.java
b/jena-permissions/src/main/java/org/apache/jena/permissions/graph/SecuredGraph.java
index 147c48dba2..bb6b3f3c45 100644
---
a/jena-permissions/src/main/java/org/apache/jena/permissions/graph/SecuredGraph.java
+++
b/jena-permissions/src/main/java/org/apache/jena/permissions/graph/SecuredGraph.java
@@ -25,9 +25,11 @@ import org.apache.jena.permissions.SecuredItem;
*
* Use the SecuredGraph.Factory to create instances
*
- *
+ *
* {@link org.apache.jena.permissions.graph.impl.SecuredGraphImpl} for javadocs
+ * @deprecated To be removed.
*/
+@Deprecated(forRemoval = true)
public interface SecuredGraph extends Graph, SecuredItem {
}
diff --git
a/jena-permissions/src/main/java/org/apache/jena/permissions/graph/SecuredGraphEventManager.java
b/jena-permissions/src/main/java/org/apache/jena/permissions/graph/SecuredGraphEventManager.java
index e23deba3ef..d5911f1983 100644
---
a/jena-permissions/src/main/java/org/apache/jena/permissions/graph/SecuredGraphEventManager.java
+++
b/jena-permissions/src/main/java/org/apache/jena/permissions/graph/SecuredGraphEventManager.java
@@ -33,6 +33,7 @@ import org.apache.jena.util.iterator.WrappedIterator;
* Since we sit between the graph and other items we have to determine when the
* message is first seen and send it to the underlying graph if necessary.
*/
+@SuppressWarnings("removal")
public class SecuredGraphEventManager implements GraphEventManager {
private class SecuredGraphListener implements GraphListener {
private final GraphListener wrapped;
diff --git
a/jena-permissions/src/main/java/org/apache/jena/permissions/graph/SecuredPrefixMapping.java
b/jena-permissions/src/main/java/org/apache/jena/permissions/graph/SecuredPrefixMapping.java
index 6f8b165059..beaa201eae 100644
---
a/jena-permissions/src/main/java/org/apache/jena/permissions/graph/SecuredPrefixMapping.java
+++
b/jena-permissions/src/main/java/org/apache/jena/permissions/graph/SecuredPrefixMapping.java
@@ -30,6 +30,7 @@ import org.apache.jena.shared.UpdateDeniedException;
*
* Use the SecuredPrefixMapping.Factory to create instances
*/
+@SuppressWarnings("removal")
public interface SecuredPrefixMapping extends PrefixMapping, SecuredItem {
/**
* @sec.graph Read
diff --git
a/jena-permissions/src/main/java/org/apache/jena/permissions/graph/impl/Factory.java
b/jena-permissions/src/main/java/org/apache/jena/permissions/graph/impl/Factory.java
index 17fd0a22bc..48984369c9 100644
---
a/jena-permissions/src/main/java/org/apache/jena/permissions/graph/impl/Factory.java
+++
b/jena-permissions/src/main/java/org/apache/jena/permissions/graph/impl/Factory.java
@@ -25,11 +25,12 @@ import org.apache.jena.permissions.impl.ItemHolder;
import org.apache.jena.permissions.impl.SecuredItemInvoker;
import org.apache.jena.shared.PrefixMapping;
+@SuppressWarnings("removal")
public class Factory {
/**
* Create an instance of SecuredPrefixMapping
- *
+ *
* @param graph The SecuredGraph that contains the prefixmapping.
* @param prefixMapping The prefixmapping returned from the base graph.
* @return The SecuredPrefixMapping.
@@ -50,7 +51,7 @@ public class Factory {
/**
* Create an instance of the SecuredGraph
- *
+ *
* @param securityEvaluator The security evaluator to use
* @param graphIRI The IRI for the graph.
* @param graph The graph that we are wrapping.
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 7551baa124..47acd04adb 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
@@ -41,6 +41,7 @@ import org.apache.jena.util.iterator.ExtendedIterator;
/**
* Implementation of SecuredGraph to be used by a SecuredItemInvoker proxy.
*/
+@SuppressWarnings("removal")
public class SecuredGraphImpl extends SecuredItemImpl implements SecuredGraph {
// the prefixMapping for this graph.
@@ -170,7 +171,6 @@ public class SecuredGraphImpl extends SecuredItemImpl
implements SecuredGraph {
* @throws AuthenticationRequiredException if user is not authenticated
and is
* required to be.
*/
- @SuppressWarnings("removal")
@Override
public boolean dependsOn(final Graph other) throws ReadDeniedException,
AuthenticationRequiredException {
if (checkSoftRead()) {
diff --git
a/jena-permissions/src/main/java/org/apache/jena/permissions/impl/CachedSecurityEvaluator.java
b/jena-permissions/src/main/java/org/apache/jena/permissions/impl/CachedSecurityEvaluator.java
index f3ce7c2fb1..0f262859cf 100644
---
a/jena-permissions/src/main/java/org/apache/jena/permissions/impl/CachedSecurityEvaluator.java
+++
b/jena-permissions/src/main/java/org/apache/jena/permissions/impl/CachedSecurityEvaluator.java
@@ -27,6 +27,7 @@ import org.apache.jena.shared.AuthenticationRequiredException;
/**
* A SecurityEvaluator that can be cached for later use.
*/
+@SuppressWarnings("removal")
public class CachedSecurityEvaluator implements SecurityEvaluator {
private final SecurityEvaluator wrapped;
private final Object origPrincipal;
diff --git
a/jena-permissions/src/main/java/org/apache/jena/permissions/impl/ItemHolder.java
b/jena-permissions/src/main/java/org/apache/jena/permissions/impl/ItemHolder.java
index bab418364f..c4291a9974 100644
---
a/jena-permissions/src/main/java/org/apache/jena/permissions/impl/ItemHolder.java
+++
b/jena-permissions/src/main/java/org/apache/jena/permissions/impl/ItemHolder.java
@@ -33,6 +33,7 @@ import org.apache.jena.permissions.SecuredItem;
* @param <Base> The base class that is being secured
* @param <Secured> The implementation (proxy) of the secured class.
*/
+@SuppressWarnings("all")
public class ItemHolder<Base, Secured extends SecuredItem> {
/**
* The base item that is being secured
@@ -45,7 +46,7 @@ public class ItemHolder<Base, Secured extends SecuredItem> {
/**
* Constructor.
- *
+ *
* @param baseItem The base item.
*/
public ItemHolder(final Base baseItem) {
@@ -55,9 +56,9 @@ public class ItemHolder<Base, Secured extends SecuredItem> {
/**
* Get the base item.
- *
+ *
* This method is used in the proxy to get call to the underlying instance.
- *
+ *
* @return The instance that is being protected.
*/
public Base getBaseItem() {
@@ -66,11 +67,11 @@ public class ItemHolder<Base, Secured extends SecuredItem> {
/**
* Get the secured item.
- *
+ *
* This method is used in the invocation handler to get the instance of the
* proxy on which a method call was made. Generally used in returning the
* original object to support cascading.
- *
+ *
* @return the proxy.
*/
public Secured getSecuredItem() {
@@ -79,7 +80,7 @@ public class ItemHolder<Base, Secured extends SecuredItem> {
/**
* Creates the proxy, saves it as the securedItem and returns it.
- *
+ *
* @param handler The SecuredItemInvoker to create the proxy with.
* @return The proxy.
*/
diff --git
a/jena-permissions/src/main/java/org/apache/jena/permissions/impl/SecuredItemImpl.java
b/jena-permissions/src/main/java/org/apache/jena/permissions/impl/SecuredItemImpl.java
index 216ae2dbb7..8d1deb65dd 100644
---
a/jena-permissions/src/main/java/org/apache/jena/permissions/impl/SecuredItemImpl.java
+++
b/jena-permissions/src/main/java/org/apache/jena/permissions/impl/SecuredItemImpl.java
@@ -47,6 +47,7 @@ import org.apache.jena.vocabulary.RDF;
* </p>
*
*/
+@SuppressWarnings("removal")
public abstract class SecuredItemImpl implements SecuredItem {
// a key for the secured item.
private class CacheKey implements Comparable<CacheKey> {
diff --git
a/jena-permissions/src/main/java/org/apache/jena/permissions/impl/SecuredItemInvoker.java
b/jena-permissions/src/main/java/org/apache/jena/permissions/impl/SecuredItemInvoker.java
index 3d586411c4..c546c47a72 100644
---
a/jena-permissions/src/main/java/org/apache/jena/permissions/impl/SecuredItemInvoker.java
+++
b/jena-permissions/src/main/java/org/apache/jena/permissions/impl/SecuredItemInvoker.java
@@ -28,6 +28,7 @@ import org.apache.jena.permissions.SecuredItem;
* A generic InvocationHandler that handles the general invocation of the
* security methods.
*/
+@SuppressWarnings("removal")
public class SecuredItemInvoker implements InvocationHandler {
// the equals() method
private static Method EQUALS;
@@ -56,7 +57,7 @@ public class SecuredItemInvoker implements InvocationHandler {
/**
* Constructor.
- *
+ *
* @param securedClass The class of the object that is being protected.
* @param securedItem The implementation of the SecuredItem version of the
* object.
diff --git
a/jena-permissions/src/main/java/org/apache/jena/permissions/model/SecuredAlt.java
b/jena-permissions/src/main/java/org/apache/jena/permissions/model/SecuredAlt.java
index 36a1ae38db..5e5dc8a65c 100644
---
a/jena-permissions/src/main/java/org/apache/jena/permissions/model/SecuredAlt.java
+++
b/jena-permissions/src/main/java/org/apache/jena/permissions/model/SecuredAlt.java
@@ -23,7 +23,9 @@ import org.apache.jena.rdf.model.Alt;
* The interface for secured Alt instances.
*
* Use the SecuredAlt.Factory to create instances
+ * @deprecated To be removed.
*/
+@Deprecated(forRemoval = true)
public interface SecuredAlt extends Alt, SecuredContainer {
}
diff --git
a/jena-permissions/src/main/java/org/apache/jena/permissions/model/SecuredBag.java
b/jena-permissions/src/main/java/org/apache/jena/permissions/model/SecuredBag.java
index 9dbe45e9b6..1051b57530 100644
---
a/jena-permissions/src/main/java/org/apache/jena/permissions/model/SecuredBag.java
+++
b/jena-permissions/src/main/java/org/apache/jena/permissions/model/SecuredBag.java
@@ -23,6 +23,8 @@ import org.apache.jena.rdf.model.Bag;
* The interface for secured Bag instances.
*
* Use the SecuredBag.Factory to create instances
+ * @deprecated To be removed.
*/
+@Deprecated(forRemoval = true)
public interface SecuredBag extends Bag, SecuredContainer {
}
diff --git
a/jena-permissions/src/main/java/org/apache/jena/permissions/model/SecuredContainer.java
b/jena-permissions/src/main/java/org/apache/jena/permissions/model/SecuredContainer.java
index cd7cba7568..24657cd484 100644
---
a/jena-permissions/src/main/java/org/apache/jena/permissions/model/SecuredContainer.java
+++
b/jena-permissions/src/main/java/org/apache/jena/permissions/model/SecuredContainer.java
@@ -24,6 +24,8 @@ import org.apache.jena.rdf.model.Container;
*
* Use one of the SecuredContainer derived class Factory methods to create
* instances
+ * @deprecated To be removed.
*/
+@Deprecated(forRemoval = true)
public interface SecuredContainer extends Container, SecuredResource {
}
diff --git
a/jena-permissions/src/main/java/org/apache/jena/permissions/model/SecuredLiteral.java
b/jena-permissions/src/main/java/org/apache/jena/permissions/model/SecuredLiteral.java
index df110580ea..5d021cf4ac 100644
---
a/jena-permissions/src/main/java/org/apache/jena/permissions/model/SecuredLiteral.java
+++
b/jena-permissions/src/main/java/org/apache/jena/permissions/model/SecuredLiteral.java
@@ -23,6 +23,8 @@ import org.apache.jena.rdf.model.Literal;
* The interface for secured Literal instances.
*
* Use the SecuredLiteral.Factory to create instances
+ * @deprecated To be removed.
*/
+@Deprecated(forRemoval = true)
public interface SecuredLiteral extends Literal, SecuredRDFNode {
}
diff --git
a/jena-permissions/src/main/java/org/apache/jena/permissions/model/SecuredModel.java
b/jena-permissions/src/main/java/org/apache/jena/permissions/model/SecuredModel.java
index cda5ee5bb2..84ca508777 100644
---
a/jena-permissions/src/main/java/org/apache/jena/permissions/model/SecuredModel.java
+++
b/jena-permissions/src/main/java/org/apache/jena/permissions/model/SecuredModel.java
@@ -25,7 +25,9 @@ import org.apache.jena.rdf.model.Model;
* The interface for secured Model instances.
*
* Use the SecuredModel.Factory to create instances
+ * @deprecated To be removed.
*/
+@Deprecated(forRemoval = true)
public interface SecuredModel extends Model, SecuredItem, SecuredPrefixMapping
{
}
diff --git
a/jena-permissions/src/main/java/org/apache/jena/permissions/model/SecuredProperty.java
b/jena-permissions/src/main/java/org/apache/jena/permissions/model/SecuredProperty.java
index c79c89a5f5..f7165dc124 100644
---
a/jena-permissions/src/main/java/org/apache/jena/permissions/model/SecuredProperty.java
+++
b/jena-permissions/src/main/java/org/apache/jena/permissions/model/SecuredProperty.java
@@ -23,7 +23,9 @@ import org.apache.jena.rdf.model.Property;
* The interface for secured Property instances.
*
* Use the SecuredProperty.Factory to create instances
+ * @deprecated To be removed.
*/
+@Deprecated(forRemoval = true)
public interface SecuredProperty extends SecuredResource, Property {
}
diff --git
a/jena-permissions/src/main/java/org/apache/jena/permissions/model/SecuredRDFList.java
b/jena-permissions/src/main/java/org/apache/jena/permissions/model/SecuredRDFList.java
index 4b919e1e54..12e46786f1 100644
---
a/jena-permissions/src/main/java/org/apache/jena/permissions/model/SecuredRDFList.java
+++
b/jena-permissions/src/main/java/org/apache/jena/permissions/model/SecuredRDFList.java
@@ -30,6 +30,7 @@ import org.apache.jena.shared.AuthenticationRequiredException;
import org.apache.jena.shared.ReadDeniedException;
import org.apache.jena.util.iterator.ExtendedIterator;
+@SuppressWarnings("removal")
public interface SecuredRDFList extends RDFList, SecuredResource {
/**
@@ -66,7 +67,7 @@ public interface SecuredRDFList extends RDFList,
SecuredResource {
/**
* Execute a reduct function across the list.
- *
+ *
* @param requiredActions the permission set required to execute the
reduce.
* @param fn the reduction function.
* @param initial the initial accumulation value.
diff --git
a/jena-permissions/src/main/java/org/apache/jena/permissions/model/SecuredRDFNode.java
b/jena-permissions/src/main/java/org/apache/jena/permissions/model/SecuredRDFNode.java
index eec132a2d1..f381fb6105 100644
---
a/jena-permissions/src/main/java/org/apache/jena/permissions/model/SecuredRDFNode.java
+++
b/jena-permissions/src/main/java/org/apache/jena/permissions/model/SecuredRDFNode.java
@@ -24,6 +24,8 @@ import org.apache.jena.rdf.model.RDFNode;
* The interface for secured RDFNode instances.
*
* Use one the SecuredRDFNode derived class Factories to create instances
+ * @deprecated To be removed.
*/
+@Deprecated(forRemoval = true)
public interface SecuredRDFNode extends RDFNode, SecuredItem {
}
diff --git
a/jena-permissions/src/main/java/org/apache/jena/permissions/model/SecuredResource.java
b/jena-permissions/src/main/java/org/apache/jena/permissions/model/SecuredResource.java
index a639ac6994..13d5b8051a 100644
---
a/jena-permissions/src/main/java/org/apache/jena/permissions/model/SecuredResource.java
+++
b/jena-permissions/src/main/java/org/apache/jena/permissions/model/SecuredResource.java
@@ -6,9 +6,9 @@
* 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.
@@ -21,8 +21,10 @@ import org.apache.jena.rdf.model.*;
/**
* The interface for secured Resource instances.
- *
+ *
* Use a secured Model to create instances.
+ * @deprecated To be removed.
*/
+@Deprecated(forRemoval = true)
public interface SecuredResource extends Resource, SecuredRDFNode {
}
diff --git
a/jena-permissions/src/main/java/org/apache/jena/permissions/model/SecuredSeq.java
b/jena-permissions/src/main/java/org/apache/jena/permissions/model/SecuredSeq.java
index 98bb9d3b74..b52d35ea0d 100644
---
a/jena-permissions/src/main/java/org/apache/jena/permissions/model/SecuredSeq.java
+++
b/jena-permissions/src/main/java/org/apache/jena/permissions/model/SecuredSeq.java
@@ -26,8 +26,9 @@ import org.apache.jena.rdf.model.Seq;
*
* Sequence may have breaks in the order.
* http://www.w3.org/TR/2004/REC-rdf-mt-20040210/#Containers
- *
+ * @deprecated To be removed.
*/
+@Deprecated(forRemoval = true)
public interface SecuredSeq extends Seq, SecuredContainer {
}
diff --git
a/jena-permissions/src/main/java/org/apache/jena/permissions/model/SecuredStatement.java
b/jena-permissions/src/main/java/org/apache/jena/permissions/model/SecuredStatement.java
index ceff3b04a4..5744562458 100644
---
a/jena-permissions/src/main/java/org/apache/jena/permissions/model/SecuredStatement.java
+++
b/jena-permissions/src/main/java/org/apache/jena/permissions/model/SecuredStatement.java
@@ -24,7 +24,9 @@ import org.apache.jena.rdf.model.Statement;
* The interface for secured Statement instances.
*
* Use the SecuredStatement.Factory to create instances
- */
+* @deprecated To be removed.
+*/
+@Deprecated(forRemoval = true)
public interface SecuredStatement extends Statement, SecuredItem {
}
diff --git
a/jena-permissions/src/main/java/org/apache/jena/permissions/model/SecuredStatementTerm.java
b/jena-permissions/src/main/java/org/apache/jena/permissions/model/SecuredStatementTerm.java
index 74b633c64f..65541a88f4 100644
---
a/jena-permissions/src/main/java/org/apache/jena/permissions/model/SecuredStatementTerm.java
+++
b/jena-permissions/src/main/java/org/apache/jena/permissions/model/SecuredStatementTerm.java
@@ -23,6 +23,8 @@ import org.apache.jena.rdf.model.*;
* The interface for secured StatementTerm instances.
*
* Use a secured Model to create instances.
+ * @deprecated To be removed.
*/
+@Deprecated(forRemoval = true)
public interface SecuredStatementTerm extends StatementTerm, SecuredRDFNode {
}
diff --git
a/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredAltImpl.java
b/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredAltImpl.java
index 1df0fed986..85ac53c42e 100644
---
a/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredAltImpl.java
+++
b/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredAltImpl.java
@@ -42,10 +42,11 @@ import org.apache.jena.util.iterator.ExtendedIterator;
/**
* Implementation of SecuredAlt to be used by a SecuredItemInvoker proxy.
*/
+@SuppressWarnings("all")
public class SecuredAltImpl extends SecuredContainerImpl implements SecuredAlt
{
/**
* Get an instance of SecuredAlt.
- *
+ *
* @param securedModel the Secured Model to use.
* @param alt The Alt to be secured.
* @return The secured Alt instance.
@@ -74,7 +75,7 @@ public class SecuredAltImpl extends SecuredContainerImpl
implements SecuredAlt {
/**
* Constructor.
- *
+ *
* @param securedModel the securedModel to use.
* @param holder The item holder that will hold this SecuredAlt.
*/
@@ -88,7 +89,7 @@ public class SecuredAltImpl extends SecuredContainerImpl
implements SecuredAlt {
* @sec.graph Read - if {@link SecurityEvaluator#isHardReadError()} is
true and
* the user does not have read access then an
* AltHasNoDefaultException is returned.
- *
+ *
* @sec.triple Read SecTriple(this, RDF.li(1), o )
* @throws ReadDeniedException
* @throws AuthenticationRequiredException if user is not authenticated
and is
@@ -105,7 +106,7 @@ public class SecuredAltImpl extends SecuredContainerImpl
implements SecuredAlt {
* the user does not have read access then an
* AltHasNoDefaultException is returned.
* @sec.triple Read SecTriple(this, RDF.li(1), o )
- *
+ *
* @throws ReadDeniedException
* @throws AuthenticationRequiredException if user is not authenticated
and is
* required to be.
@@ -121,7 +122,7 @@ public class SecuredAltImpl extends SecuredContainerImpl
implements SecuredAlt {
* the user does not have read access then an
* AltHasNoDefaultException is returned.
* @sec.triple Read SecTriple(this, RDF.li(1), o )
- *
+ *
* @throws ReadDeniedException
* @throws AuthenticationRequiredException if user is not authenticated
and is
* required to be.
@@ -137,7 +138,7 @@ public class SecuredAltImpl extends SecuredContainerImpl
implements SecuredAlt {
* the user does not have read access then an
* AltHasNoDefaultException is returned.
* @sec.triple Read SecTriple(this, RDF.li(1), o )
- *
+ *
* @throws ReadDeniedException
* @throws AuthenticationRequiredException if user is not authenticated
and is
* required to be.
@@ -152,9 +153,9 @@ public class SecuredAltImpl extends SecuredContainerImpl
implements SecuredAlt {
* @sec.graph Read - if {@link SecurityEvaluator#isHardReadError()} is
true and
* the user does not have read access then an
* AltHasNoDefaultException is returned.
- *
+ *
* @sec.triple Read SecTriple(this, RDF.li(1), o )
- *
+ *
* @throws ReadDeniedException
* @throws AuthenticationRequiredException if user is not authenticated
and is
* required to be.
@@ -170,7 +171,7 @@ public class SecuredAltImpl extends SecuredContainerImpl
implements SecuredAlt {
* the user does not have read access then an
* AltHasNoDefaultException is returned.
* @sec.triple Read SecTriple(this, RDF.li(1), o )
- *
+ *
* @throws ReadDeniedException
* @throws AuthenticationRequiredException if user is not authenticated
and is
* required to be.
@@ -186,7 +187,7 @@ public class SecuredAltImpl extends SecuredContainerImpl
implements SecuredAlt {
* the user does not have read access then an
* AltHasNoDefaultException is returned.
* @sec.triple Read SecTriple(this, RDF.li(1), o )
- *
+ *
* @throws ReadDeniedException
* @throws AuthenticationRequiredException if user is not authenticated
and is
* required to be.
@@ -202,7 +203,7 @@ public class SecuredAltImpl extends SecuredContainerImpl
implements SecuredAlt {
* the user does not have read access then an
* AltHasNoDefaultException is returned.
* @sec.triple Read SecTriple(this, RDF.li(1), o )
- *
+ *
* @throws ReadDeniedException
* @throws AuthenticationRequiredException if user is not authenticated
and is
* required to be.
@@ -218,7 +219,7 @@ public class SecuredAltImpl extends SecuredContainerImpl
implements SecuredAlt {
* the user does not have read access then an
* AltHasNoDefaultException is returned.
* @sec.triple Read SecTriple(this, RDF.li(1), o )
- *
+ *
* @throws ReadDeniedException
* @throws AuthenticationRequiredException if user is not authenticated
and is
* required to be.
@@ -234,7 +235,7 @@ public class SecuredAltImpl extends SecuredContainerImpl
implements SecuredAlt {
* the user does not have read access then an
* AltHasNoDefaultException is returned.
* @sec.triple Read SecTriple(this, RDF.li(1), o )
- *
+ *
* @throws ReadDeniedException
* @throws AuthenticationRequiredException if user is not authenticated
and is
* required to be.
@@ -250,7 +251,7 @@ public class SecuredAltImpl extends SecuredContainerImpl
implements SecuredAlt {
* the user does not have read access then an
* AltHasNoDefaultException is returned.
* @sec.triple Read SecTriple(this, RDF.li(1), o )
- *
+ *
* @throws ReadDeniedException
* @throws AuthenticationRequiredException if user is not authenticated
and is
* required to be.
@@ -266,7 +267,7 @@ public class SecuredAltImpl extends SecuredContainerImpl
implements SecuredAlt {
* the user does not have read access then an
* AltHasNoDefaultException is returned.
* @sec.triple Read SecTriple(this, RDF.li(1), o )
- *
+ *
* @throws ReadDeniedException
* @throws AuthenticationRequiredException if user is not authenticated
and is
* required to be.
@@ -282,7 +283,7 @@ public class SecuredAltImpl extends SecuredContainerImpl
implements SecuredAlt {
* the user does not have read access then an
* AltHasNoDefaultException is returned.
* @sec.triple Read SecTriple(this, RDF.li(1), o )
- *
+ *
* @throws ReadDeniedException
* @throws AuthenticationRequiredException if user is not authenticated
and is
* required to be.
@@ -298,7 +299,7 @@ public class SecuredAltImpl extends SecuredContainerImpl
implements SecuredAlt {
* the user does not have read access then an
* AltHasNoDefaultException is returned.
* @sec.triple Read SecTriple(this, RDF.li(1), o )
- *
+ *
* @throws ReadDeniedException
* @throws AuthenticationRequiredException if user is not authenticated
and is
* required to be.
@@ -314,7 +315,7 @@ public class SecuredAltImpl extends SecuredContainerImpl
implements SecuredAlt {
* the user does not have read access then an
* AltHasNoDefaultException is returned.
* @sec.triple Read SecTriple(this, RDF.li(1), o )
- *
+ *
* @throws ReadDeniedException
* @throws AuthenticationRequiredException if user is not authenticated
and is
* required to be.
@@ -331,7 +332,7 @@ public class SecuredAltImpl extends SecuredContainerImpl
implements SecuredAlt {
* the user does not have read access then an
* AltHasNoDefaultException is returned.
* @sec.triple Read SecTriple(this, RDF.li(1), o )
- *
+ *
* @throws ReadDeniedException
* @throws AuthenticationRequiredException if user is not authenticated
and is
* required to be.
@@ -356,7 +357,7 @@ public class SecuredAltImpl extends SecuredContainerImpl
implements SecuredAlt {
* the user does not have read access then an
* AltHasNoDefaultException is returned.
* @sec.triple Read SecTriple(this, RDF.li(1), o )
- *
+ *
* @throws ReadDeniedException
* @throws AuthenticationRequiredException if user is not authenticated
and is
* required to be.
diff --git
a/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredBagImpl.java
b/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredBagImpl.java
index 67eeef10b1..d83f17f5b5 100644
---
a/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredBagImpl.java
+++
b/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredBagImpl.java
@@ -25,11 +25,13 @@ import org.apache.jena.rdf.model.Bag;
/**
* Implementation of SecuredBag to be used by a SecuredItemInvoker proxy.
+ * @deprecated To be removed.
*/
+@Deprecated(forRemoval = true)
public class SecuredBagImpl extends SecuredContainerImpl implements SecuredBag
{
/**
* Get an instance of SecuredBag
- *
+ *
* @param securedModel The Secured Model to use.
* @param bag The bag to secure
* @return The SecuredBag
@@ -55,7 +57,7 @@ public class SecuredBagImpl extends SecuredContainerImpl
implements SecuredBag {
/**
* Constructor.
- *
+ *
* @param securedModel The Secured Model to use.
* @param holder The holder that will contain this SecuredBag.
*/
diff --git
a/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredContainerImpl.java
b/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredContainerImpl.java
index 01f6da3cc5..cdf4e58275 100644
---
a/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredContainerImpl.java
+++
b/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredContainerImpl.java
@@ -51,10 +51,11 @@ import org.apache.jena.vocabulary.RDF;
/**
* Implementation of SecuredContainer to be used by a SecuredItemInvoker proxy.
*/
+@SuppressWarnings("all")
public class SecuredContainerImpl extends SecuredResourceImpl implements
SecuredContainer {
/**
* Constructor
- *
+ *
* @param securedModel the Secured Model to use.
* @param container The container to secure.
* @return The SecuredResource
@@ -94,7 +95,7 @@ public class SecuredContainerImpl extends SecuredResourceImpl
implements Secured
/**
* Constructor
- *
+ *
* @param securedModel the Secured Model to use.
* @param holder The item holder that will contain this
SecuredContainer
*/
@@ -277,10 +278,10 @@ public class SecuredContainerImpl extends
SecuredResourceImpl implements Secured
/**
* @sec.graph Read
* @sec.triple Read SecTriple( this, RDF.li, o );
- *
+ *
* if {@link SecurityEvaluator#isHardReadError()} is true and
the
* user does not have read access then @{code false} is
returned.
- *
+ *
* @throws ReadDeniedException
* @throws AuthenticationRequiredException if user is not authenticated
and is
* required to be.
@@ -293,10 +294,10 @@ public class SecuredContainerImpl extends
SecuredResourceImpl implements Secured
/**
* @sec.graph Read
* @sec.triple Read SecTriple( this, RDF.li, o );
- *
+ *
* if {@link SecurityEvaluator#isHardReadError()} is true and
the
* user does not have read access then @{code false} is
returned.
- *
+ *
* @throws ReadDeniedException
* @throws AuthenticationRequiredException if user is not authenticated
and is
* required to be.
@@ -309,10 +310,10 @@ public class SecuredContainerImpl extends
SecuredResourceImpl implements Secured
/**
* @sec.graph Read
* @sec.triple Read SecTriple( this, RDF.li, o );
- *
+ *
* if {@link SecurityEvaluator#isHardReadError()} is true and
the
* user does not have read access then @{code false} is
returned.
- *
+ *
* @throws ReadDeniedException
* @throws AuthenticationRequiredException if user is not authenticated
and is
* required to be.
@@ -325,10 +326,10 @@ public class SecuredContainerImpl extends
SecuredResourceImpl implements Secured
/**
* @sec.graph Read
* @sec.triple Read SecTriple( this, RDF.li, o );
- *
+ *
* if {@link SecurityEvaluator#isHardReadError()} is true and
the
* user does not have read access then @{code false} is
returned.
- *
+ *
* @throws ReadDeniedException
* @throws AuthenticationRequiredException if user is not authenticated
and is
* required to be.
@@ -341,10 +342,10 @@ public class SecuredContainerImpl extends
SecuredResourceImpl implements Secured
/**
* @sec.graph Read
* @sec.triple Read SecTriple( this, RDF.li, o );
- *
+ *
* if {@link SecurityEvaluator#isHardReadError()} is true and
the
* user does not have read access then @{code false} is
returned.
- *
+ *
* @throws ReadDeniedException
* @throws AuthenticationRequiredException if user is not authenticated
and is
* required to be.
@@ -357,10 +358,10 @@ public class SecuredContainerImpl extends
SecuredResourceImpl implements Secured
/**
* @sec.graph Read
* @sec.triple Read SecTriple( this, RDF.li, o );
- *
+ *
* if {@link SecurityEvaluator#isHardReadError()} is true and
the
* user does not have read access then @{code false} is
returned.
- *
+ *
* @throws ReadDeniedException
* @throws AuthenticationRequiredException if user is not authenticated
and is
* required to be.
@@ -373,10 +374,10 @@ public class SecuredContainerImpl extends
SecuredResourceImpl implements Secured
/**
* @sec.graph Read
* @sec.triple Read SecTriple( this, RDF.li, o );
- *
+ *
* if {@link SecurityEvaluator#isHardReadError()} is true and
the
* user does not have read access then @{code false} is
returned.
- *
+ *
* @throws ReadDeniedException
* @throws AuthenticationRequiredException if user is not authenticated
and is
* required to be.
@@ -400,10 +401,10 @@ public class SecuredContainerImpl extends
SecuredResourceImpl implements Secured
/**
* @sec.graph Read
* @sec.triple Read SecTriple( this, RDF.li, o );
- *
+ *
* if {@link SecurityEvaluator#isHardReadError()} is true and
the
* user does not have read access then @{code false} is
returned.
- *
+ *
* @throws ReadDeniedException
* @throws AuthenticationRequiredException if user is not authenticated
and is
* required to be.
@@ -416,10 +417,10 @@ public class SecuredContainerImpl extends
SecuredResourceImpl implements Secured
/**
* @sec.graph Read
* @sec.triple Read SecTriple( this, RDF.li, o );
- *
+ *
* if {@link SecurityEvaluator#isHardReadError()} is true and
the
* user does not have read access then @{code false} is
returned.
- *
+ *
* @throws ReadDeniedException
* @throws AuthenticationRequiredException if user is not authenticated
and is
* required to be.
@@ -496,11 +497,11 @@ public class SecuredContainerImpl extends
SecuredResourceImpl implements Secured
/**
* @sec.graph Read
* @sec.triple Read on each triple ( this, rdf:li_? node ) returned by
iterator;
- *
+ *
* if {@link SecurityEvaluator#isHardReadError()} is true and
the
* user does not have read access then an empty iterator is
* returned.
- *
+ *
* @throws ReadDeniedException
* @throws AuthenticationRequiredException if user is not authenticated
and is
* required to be.
@@ -530,11 +531,11 @@ public class SecuredContainerImpl extends
SecuredResourceImpl implements Secured
* @sec.graph Read
* @sec.triple Read + perms on each triple ( this, rdf:li_? node )
returned by
* iterator;
- *
+ *
* if {@link SecurityEvaluator#isHardReadError()} is true and
the
* user does not have read access then an empty iterator is
* returned.
- *
+ *
* @throws ReadDeniedException
* @throws AuthenticationRequiredException if user is not authenticated
and is
* required to be.
diff --git
a/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredLiteralImpl.java
b/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredLiteralImpl.java
index 2c5be5e4cb..257b067eb9 100644
---
a/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredLiteralImpl.java
+++
b/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredLiteralImpl.java
@@ -32,7 +32,9 @@ import org.apache.jena.shared.ReadDeniedException;
/**
* Implementation of SecuredLiteral to be used by a SecuredItemInvoker proxy.
+ * @deprecated To be removed.
*/
+@Deprecated
public class SecuredLiteralImpl extends SecuredRDFNodeImpl implements
SecuredLiteral {
/**
* Get an instance of SecuredLiteral
diff --git
a/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredModelImpl.java
b/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredModelImpl.java
index e47b818f1a..5496ef7847 100644
---
a/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredModelImpl.java
+++
b/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredModelImpl.java
@@ -75,7 +75,7 @@ import org.apache.jena.vocabulary.RDF;
/**
* Implementation of SecuredModel to be used by a SecuredItemInvoker proxy.
*/
-@SuppressWarnings("deprecation")
+@SuppressWarnings({"deprecation", "removal"})
public class SecuredModelImpl extends SecuredItemImpl implements SecuredModel {
/**
diff --git
a/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredNodeIterator.java
b/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredNodeIterator.java
index 7704380349..ef79ecca15 100644
---
a/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredNodeIterator.java
+++
b/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredNodeIterator.java
@@ -32,7 +32,9 @@ import org.apache.jena.util.iterator.ExtendedIterator;
/**
* A secured RDFNode iterator implementation
+ * @deprecated To be removed.
*/
+@Deprecated(forRemoval = true)
public class SecuredNodeIterator<T extends RDFNode> implements NodeIterator {
private class PermNodeMap<N extends RDFNode> implements Function<N,
RDFNode> {
private final SecuredModel securedModel;
@@ -51,7 +53,7 @@ public class SecuredNodeIterator<T extends RDFNode>
implements NodeIterator {
/**
* Constructor
- *
+ *
* @param securedItem the item defining the security context
* @param wrapped the iterator to be wrapped.
*/
diff --git
a/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredPropertyImpl.java
b/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredPropertyImpl.java
index b3c43e8da5..f44b0292a4 100644
---
a/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredPropertyImpl.java
+++
b/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredPropertyImpl.java
@@ -30,6 +30,7 @@ import org.apache.jena.shared.ReadDeniedException;
/**
* Implementation of SecuredProperty to be used by a SecuredItemInvoker proxy.
*/
+@SuppressWarnings("removal")
public class SecuredPropertyImpl extends SecuredResourceImpl implements
SecuredProperty {
/**
* Get an instance of SecuredProperty
diff --git
a/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredRDFListImpl.java
b/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredRDFListImpl.java
index 768517db27..1b618ab773 100644
---
a/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredRDFListImpl.java
+++
b/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredRDFListImpl.java
@@ -54,6 +54,7 @@ import org.apache.jena.util.iterator.NiceIterator;
import org.apache.jena.util.iterator.WrappedIterator;
import org.apache.jena.vocabulary.RDF;
+@SuppressWarnings("removal")
public class SecuredRDFListImpl extends SecuredResourceImpl implements
SecuredRDFList {
/**
diff --git
a/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredRDFNodeImpl.java
b/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredRDFNodeImpl.java
index 09ee7eafe9..56a0595667 100644
---
a/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredRDFNodeImpl.java
+++
b/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredRDFNodeImpl.java
@@ -35,6 +35,7 @@ import org.apache.jena.shared.ReadDeniedException;
/**
* Implementation of SecuredRDFNode to be used by a SecuredItemInvoker proxy.
*/
+@SuppressWarnings("all")
public abstract class SecuredRDFNodeImpl extends SecuredItemImpl implements
SecuredRDFNode {
/**
*
diff --git
a/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredResIterator.java
b/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredResIterator.java
index 74692602f4..061db40380 100644
---
a/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredResIterator.java
+++
b/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredResIterator.java
@@ -6,9 +6,9 @@
* 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.
@@ -29,6 +29,7 @@ import org.apache.jena.rdf.model.ResIterator;
import org.apache.jena.rdf.model.Resource;
import org.apache.jena.util.iterator.ExtendedIterator;
+@SuppressWarnings("removal")
public class SecuredResIterator implements ResIterator {
/**
@@ -40,7 +41,7 @@ public class SecuredResIterator implements ResIterator {
/**
* Constructor.
- *
+ *
* @param securedModel the secured model in which the resources will
be created.
*/
public PermResourceMap(final SecuredModel securedModel) {
@@ -57,7 +58,7 @@ public class SecuredResIterator implements ResIterator {
/**
* Constructor.
- *
+ *
* @param securedModel The model in which resources will be constructed
* @param wrapped the Resource iterator.
*/
diff --git
a/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredResourceImpl.java
b/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredResourceImpl.java
index 2caf65b862..b38313b5d3 100644
---
a/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredResourceImpl.java
+++
b/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredResourceImpl.java
@@ -45,6 +45,7 @@ import org.apache.jena.util.iterator.NiceIterator;
/**
* Implementation of SecuredResource to be used by a SecuredItemInvoker proxy.
*/
+@SuppressWarnings("removal")
public class SecuredResourceImpl extends SecuredRDFNodeImpl implements
SecuredResource {
/**
* Get a SecuredResource.
diff --git
a/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredSeqImpl.java
b/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredSeqImpl.java
index 61baa435dd..2411925265 100644
---
a/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredSeqImpl.java
+++
b/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredSeqImpl.java
@@ -54,6 +54,7 @@ import org.apache.jena.vocabulary.RDF;
* http://www.w3.org/TR/2004/REC-rdf-mt-20040210/#Containers
*
*/
+@SuppressWarnings("all")
public class SecuredSeqImpl extends SecuredContainerImpl implements SecuredSeq
{
/**
diff --git
a/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredStatementImpl.java
b/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredStatementImpl.java
index 4862cabcae..c253b41e8d 100644
---
a/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredStatementImpl.java
+++
b/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredStatementImpl.java
@@ -45,6 +45,7 @@ import org.apache.jena.shared.UpdateDeniedException;
/**
* Implementation of SecuredStatement to be used by a SecuredItemInvoker proxy.
*/
+@SuppressWarnings("all")
public class SecuredStatementImpl extends SecuredItemImpl implements
SecuredStatement {
/**
* get a SecuredStatement
diff --git
a/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredStatementIterator.java
b/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredStatementIterator.java
index e2ed1a4f23..89a248403a 100644
---
a/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredStatementIterator.java
+++
b/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredStatementIterator.java
@@ -6,9 +6,9 @@
* 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.
@@ -35,6 +35,7 @@ import org.apache.jena.util.iterator.ExtendedIterator;
/**
* A secured StatementIterator implementation
*/
+@SuppressWarnings("removal")
public class SecuredStatementIterator implements StmtIterator {
private class PermStatementMap implements Function<Statement, Statement> {
@@ -54,7 +55,7 @@ public class SecuredStatementIterator implements StmtIterator
{
/**
* Constructor.
- *
+ *
* @param securedModel The item providing the security context.
* @param wrapped The iterator to wrap.
*/
diff --git
a/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredStatementTermImpl.java
b/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredStatementTermImpl.java
index 9712b50af5..b00d855a92 100644
---
a/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredStatementTermImpl.java
+++
b/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredStatementTermImpl.java
@@ -25,6 +25,7 @@ import org.apache.jena.rdf.model.*;
/**
* Implementation of SecuredStatement to be used by a SecuredItemInvoker proxy.
*/
+@SuppressWarnings("removal")
public class SecuredStatementTermImpl extends SecuredRDFNodeImpl implements
SecuredStatementTerm {
/**
* get a SecuredStatement
diff --git
a/jena-permissions/src/main/java/org/apache/jena/permissions/query/SecuredQueryEngine.java
b/jena-permissions/src/main/java/org/apache/jena/permissions/query/SecuredQueryEngine.java
index 11cc20a2fe..8ef87f5055 100644
---
a/jena-permissions/src/main/java/org/apache/jena/permissions/query/SecuredQueryEngine.java
+++
b/jena-permissions/src/main/java/org/apache/jena/permissions/query/SecuredQueryEngine.java
@@ -6,9 +6,9 @@
* 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.
@@ -36,6 +36,7 @@ import org.apache.jena.sparql.util.Context;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+@SuppressWarnings("removal")
public class SecuredQueryEngine extends QueryEngineMain {
private static Logger LOG =
LoggerFactory.getLogger(SecuredQueryEngine.class);
diff --git
a/jena-permissions/src/main/java/org/apache/jena/permissions/query/SecuredQueryEngineFactory.java
b/jena-permissions/src/main/java/org/apache/jena/permissions/query/SecuredQueryEngineFactory.java
index 1383e03496..ff4077e729 100644
---
a/jena-permissions/src/main/java/org/apache/jena/permissions/query/SecuredQueryEngineFactory.java
+++
b/jena-permissions/src/main/java/org/apache/jena/permissions/query/SecuredQueryEngineFactory.java
@@ -6,9 +6,9 @@
* 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.
@@ -30,6 +30,7 @@ import org.apache.jena.sparql.engine.QueryEngineRegistry;
import org.apache.jena.sparql.engine.binding.Binding;
import org.apache.jena.sparql.util.Context;
+@SuppressWarnings("removal")
public class SecuredQueryEngineFactory implements QueryEngineFactory {
private boolean silentService = true;
private SecuredQueryEngineConfig cfgResource;
diff --git
a/jena-permissions/src/main/java/org/apache/jena/permissions/query/rewriter/OpRewriter.java
b/jena-permissions/src/main/java/org/apache/jena/permissions/query/rewriter/OpRewriter.java
index 87e73e93fb..9eba0b1722 100644
---
a/jena-permissions/src/main/java/org/apache/jena/permissions/query/rewriter/OpRewriter.java
+++
b/jena-permissions/src/main/java/org/apache/jena/permissions/query/rewriter/OpRewriter.java
@@ -42,6 +42,7 @@ import org.slf4j.LoggerFactory;
* This implementation inserts security evaluator checks where necessary.
* </p>
*/
+@SuppressWarnings("removal")
public class OpRewriter implements OpVisitor {
private static Logger LOG = LoggerFactory.getLogger(OpRewriter.class);
private OpSequence result;
diff --git
a/jena-permissions/src/main/java/org/apache/jena/permissions/query/rewriter/SecuredFunction.java
b/jena-permissions/src/main/java/org/apache/jena/permissions/query/rewriter/SecuredFunction.java
index 67807d4ad5..ec903a6df8 100644
---
a/jena-permissions/src/main/java/org/apache/jena/permissions/query/rewriter/SecuredFunction.java
+++
b/jena-permissions/src/main/java/org/apache/jena/permissions/query/rewriter/SecuredFunction.java
@@ -6,9 +6,9 @@
* 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.
@@ -30,6 +30,7 @@ import org.apache.jena.sparql.expr.*;
import org.apache.jena.sparql.function.FunctionEnv;
import org.apache.jena.sparql.graph.NodeTransform;
+@SuppressWarnings("removal")
public class SecuredFunction extends ExprFunctionN {
private final SecurityEvaluator securityEvaluator;
private final List<Node> variables;
diff --git
a/jena-permissions/src/main/java/org/apache/jena/permissions/utils/PermStatementFilter.java
b/jena-permissions/src/main/java/org/apache/jena/permissions/utils/PermStatementFilter.java
index 5a0981c6ea..ec668d5d64 100644
---
a/jena-permissions/src/main/java/org/apache/jena/permissions/utils/PermStatementFilter.java
+++
b/jena-permissions/src/main/java/org/apache/jena/permissions/utils/PermStatementFilter.java
@@ -6,9 +6,9 @@
* 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.
@@ -32,6 +32,7 @@ import org.apache.jena.shared.AuthenticationRequiredException;
* A filter for to filter ExtendedIterators on Statements. This filter removes
* any triple that the user can not perform all the actions on.
*/
+@SuppressWarnings("removal")
public class PermStatementFilter implements Predicate<Statement> {
private final SecurityEvaluator evaluator;
private final Node modelNode;
@@ -41,7 +42,7 @@ public class PermStatementFilter implements
Predicate<Statement> {
/**
* Creates a filter that requires that the user have all the permissions
listed
* in the actions parameter
- *
+ *
* @param action The action the user must be permitted to perform.
* @param securedItem The secured item that secures this iterator.
*/
@@ -55,7 +56,7 @@ public class PermStatementFilter implements
Predicate<Statement> {
/**
* Creates a filter that requires that the user have all the permissions
listed
* in the actions parameter
- *
+ *
* @param action The action the user must be permitted to perform.
* @param securedItem The secured item that secures this iterator.
* @param evaluator The security evaluator to evaluate the security
queries.
@@ -70,7 +71,7 @@ public class PermStatementFilter implements
Predicate<Statement> {
/**
* Creates a filter that requires that the user have all the permissions
listed
* in the actions parameter
- *
+ *
* @param actions The actions the user must be permitted to perform.
* @param securedItem The secured item that secures this iterator.
*/
@@ -84,7 +85,7 @@ public class PermStatementFilter implements
Predicate<Statement> {
/**
* Creates a filter that requires that the user have all the permissions
listed
* in the actions parameter
- *
+ *
* @param actions The actions the user must be permitted to perform.
* @param securedItem The secured item that secures this iterator.
* @param evaluator The security evaluator to evaluate the security
queries.
@@ -100,7 +101,7 @@ public class PermStatementFilter implements
Predicate<Statement> {
/**
* Creates a filter that requires that the user have all the permissions
listed
* in the actions parameter
- *
+ *
* @param actions The actions the user must be permitted to perform.
* @param securedItem The secured item that secures this iterator.
*/
@@ -114,7 +115,7 @@ public class PermStatementFilter implements
Predicate<Statement> {
/**
* Creates a filter that requires that the user have all the permissions
listed
* in the actions parameter
- *
+ *
* @param actions The actions the user must be permitted to perform.
* @param securedItem The secured item that secures this iterator.
* @param evaluator The security evaluator to evaluate the security
queries.
diff --git
a/jena-permissions/src/main/java/org/apache/jena/permissions/utils/PermTripleFilter.java
b/jena-permissions/src/main/java/org/apache/jena/permissions/utils/PermTripleFilter.java
index 3db33954aa..75ad835aff 100644
---
a/jena-permissions/src/main/java/org/apache/jena/permissions/utils/PermTripleFilter.java
+++
b/jena-permissions/src/main/java/org/apache/jena/permissions/utils/PermTripleFilter.java
@@ -6,9 +6,9 @@
* 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.
@@ -32,6 +32,7 @@ import org.apache.jena.shared.AuthenticationRequiredException;
* A filter for to filter ExtendedIterators on Triples. This filter removes any
* triple that the user can not perform all the actions on.
*/
+@SuppressWarnings("removal")
public class PermTripleFilter implements Predicate<Triple> {
private final SecurityEvaluator evaluator;
private final Node modelNode;
@@ -41,7 +42,7 @@ public class PermTripleFilter implements Predicate<Triple> {
/**
* Creates a filter that requires that the user have all the permissions
listed
* in the actions parameter
- *
+ *
* @param action The action the user must be permitted to perform.
* @param securedItem The secured item that secures this iterator.
*/
@@ -55,7 +56,7 @@ public class PermTripleFilter implements Predicate<Triple> {
/**
* Creates a filter that requires that the user have all the permissions
listed
* in the actions parameter
- *
+ *
* @param action The action the user must be permitted to perform.
* @param securedItem The secured item that secures this iterator.
* @param evaluator The security evaluator to evaluate the security
queries.
@@ -70,7 +71,7 @@ public class PermTripleFilter implements Predicate<Triple> {
/**
* Creates a filter that requires that the user have all the permissions
listed
* in the actions parameter
- *
+ *
* @param actions The actions the user must be permitted to perform.
* @param securedItem The secured item that secures this iterator.
*/
@@ -84,7 +85,7 @@ public class PermTripleFilter implements Predicate<Triple> {
/**
* Creates a filter that requires that the user have all the permissions
listed
* in the actions parameter
- *
+ *
* @param actions The actions the user must be permitted to perform.
* @param securedItem The secured item that secures this iterator.
* @param evaluator The security evaluator to evaluate the security
queries.
@@ -99,7 +100,7 @@ public class PermTripleFilter implements Predicate<Triple> {
/**
* Creates a filter that requires that the user have all the permissions
listed
* in the actions parameter
- *
+ *
* @param actions The actions the user must be permitted to perform.
* @param securedItem The secured item that secures this iterator.
*/
@@ -113,7 +114,7 @@ public class PermTripleFilter implements Predicate<Triple> {
/**
* Creates a filter that requires that the user have all the permissions
listed
* in the actions parameter
- *
+ *
* @param actions The actions the user must be permitted to perform.
* @param securedItem The secured item that secures this iterator.
* @param evaluator The security evaluator to evaluate the security
queries.
diff --git
a/jena-permissions/src/main/java/org/apache/jena/permissions/utils/RDFListSecFilter.java
b/jena-permissions/src/main/java/org/apache/jena/permissions/utils/RDFListSecFilter.java
index b6ea737507..00a359a65d 100644
---
a/jena-permissions/src/main/java/org/apache/jena/permissions/utils/RDFListSecFilter.java
+++
b/jena-permissions/src/main/java/org/apache/jena/permissions/utils/RDFListSecFilter.java
@@ -6,9 +6,9 @@
* 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.
@@ -30,9 +30,10 @@ import org.apache.jena.vocabulary.RDF;
/**
* An RDF List security filter. Filters out nodes the user can not see.
- *
+ *
* @param <T>
*/
+@SuppressWarnings("removal")
public class RDFListSecFilter<T extends RDFList> implements Predicate<T> {
private final SecuredItem securedItem;
private final Set<Action> perms;
@@ -40,7 +41,7 @@ public class RDFListSecFilter<T extends RDFList> implements
Predicate<T> {
/**
* Constructor.
- *
+ *
* @param securedItem The secured item for permission checks.
* @param perm the permission that user must have to access the
item.
*/
@@ -50,7 +51,7 @@ public class RDFListSecFilter<T extends RDFList> implements
Predicate<T> {
/**
* Constructor
- *
+ *
* @param securedItem The secured item for permission checks.
* @param perms the set of permissions that user must have to access
the
* item.
diff --git
a/jena-permissions/src/test/java/org/apache/jena/permissions/MockSecurityEvaluator.java
b/jena-permissions/src/test/java/org/apache/jena/permissions/MockSecurityEvaluator.java
index 7eef40b82f..ad92e0ef2c 100644
---
a/jena-permissions/src/test/java/org/apache/jena/permissions/MockSecurityEvaluator.java
+++
b/jena-permissions/src/test/java/org/apache/jena/permissions/MockSecurityEvaluator.java
@@ -6,9 +6,9 @@
* 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.
@@ -25,6 +25,7 @@ import org.apache.jena.graph.Node;
import org.apache.jena.graph.Triple;
import org.apache.jena.rdf.model.Resource;
+@SuppressWarnings("removal")
public class MockSecurityEvaluator implements SecurityEvaluator {
private final boolean loggedIn;
@@ -67,9 +68,9 @@ public class MockSecurityEvaluator implements
SecurityEvaluator {
/**
* Answers the question. can the logged in user perform action on the
object.
- *
+ *
* if there is no logged in user then anonymous access is assumed.
- *
+ *
* @param action
* @param object
* @return boolean
@@ -106,7 +107,7 @@ public class MockSecurityEvaluator implements
SecurityEvaluator {
/**
* Return true if all the permissions are present
- *
+ *
* @param action the set of actions to test
* @return the result of the logical and of the permissions
*/
diff --git
a/jena-permissions/src/test/java/org/apache/jena/permissions/ModelBasedSecurityEvaluator.java
b/jena-permissions/src/test/java/org/apache/jena/permissions/ModelBasedSecurityEvaluator.java
index 6622de563f..9ca2725317 100644
---
a/jena-permissions/src/test/java/org/apache/jena/permissions/ModelBasedSecurityEvaluator.java
+++
b/jena-permissions/src/test/java/org/apache/jena/permissions/ModelBasedSecurityEvaluator.java
@@ -6,9 +6,9 @@
* 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.
@@ -23,6 +23,7 @@ import org.apache.jena.graph.Node;
import org.apache.jena.graph.Triple;
import org.apache.jena.rdf.model.Model;
+@SuppressWarnings("removal")
public class ModelBasedSecurityEvaluator implements SecurityEvaluator {
// private Model model;
diff --git
a/jena-permissions/src/test/java/org/apache/jena/permissions/SecuredAssemblerTest.java
b/jena-permissions/src/test/java/org/apache/jena/permissions/SecuredAssemblerTest.java
index 31a37363a5..550260f925 100644
---
a/jena-permissions/src/test/java/org/apache/jena/permissions/SecuredAssemblerTest.java
+++
b/jena-permissions/src/test/java/org/apache/jena/permissions/SecuredAssemblerTest.java
@@ -28,6 +28,7 @@ import org.apache.jena.rdf.model.Resource;
import org.junit.Before;
import org.junit.Test;
+@SuppressWarnings("removal")
public class SecuredAssemblerTest {
private Assembler assembler;
private Model model;
diff --git
a/jena-permissions/src/test/java/org/apache/jena/permissions/SecurityEvaluatorTest.java
b/jena-permissions/src/test/java/org/apache/jena/permissions/SecurityEvaluatorTest.java
index 97e7043401..1d51a7a75c 100644
---
a/jena-permissions/src/test/java/org/apache/jena/permissions/SecurityEvaluatorTest.java
+++
b/jena-permissions/src/test/java/org/apache/jena/permissions/SecurityEvaluatorTest.java
@@ -27,6 +27,7 @@ import org.junit.Test;
import java.util.EnumSet;
+@SuppressWarnings("removal")
public class SecurityEvaluatorTest {
private static final Object PRINCIPAL = null;
private static final Node GRAPH = null;
diff --git
a/jena-permissions/src/test/java/org/apache/jena/permissions/StaticSecurityEvaluator.java
b/jena-permissions/src/test/java/org/apache/jena/permissions/StaticSecurityEvaluator.java
index 7138d51931..ee3d9ab85a 100644
---
a/jena-permissions/src/test/java/org/apache/jena/permissions/StaticSecurityEvaluator.java
+++
b/jena-permissions/src/test/java/org/apache/jena/permissions/StaticSecurityEvaluator.java
@@ -6,9 +6,9 @@
* 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.
@@ -23,6 +23,7 @@ import org.apache.jena.graph.Node;
import org.apache.jena.graph.NodeFactory;
import org.apache.jena.graph.Triple;
+@SuppressWarnings("removal")
public class StaticSecurityEvaluator implements SecurityEvaluator {
private Node user;
diff --git
a/jena-permissions/src/test/java/org/apache/jena/permissions/contract/graph/CachedSecurityEvaluatorTest.java
b/jena-permissions/src/test/java/org/apache/jena/permissions/contract/graph/CachedSecurityEvaluatorTest.java
index f2f9b39d89..71d28d9ebe 100644
---
a/jena-permissions/src/test/java/org/apache/jena/permissions/contract/graph/CachedSecurityEvaluatorTest.java
+++
b/jena-permissions/src/test/java/org/apache/jena/permissions/contract/graph/CachedSecurityEvaluatorTest.java
@@ -6,9 +6,9 @@
* 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.
@@ -27,6 +27,7 @@ import org.junit.Test;
import static org.junit.Assert.*;
+@SuppressWarnings("removal")
public class CachedSecurityEvaluatorTest {
private StaticSecurityEvaluator securityEvaluator;
diff --git
a/jena-permissions/src/test/java/org/apache/jena/permissions/contract/graph/SecuredGraphContractTests.java
b/jena-permissions/src/test/java/org/apache/jena/permissions/contract/graph/SecuredGraphContractTests.java
index 84aabe373d..99cddcab4c 100644
---
a/jena-permissions/src/test/java/org/apache/jena/permissions/contract/graph/SecuredGraphContractTests.java
+++
b/jena-permissions/src/test/java/org/apache/jena/permissions/contract/graph/SecuredGraphContractTests.java
@@ -23,6 +23,7 @@ import org.apache.jena.graph.test.MetaTestGraph;
import org.apache.jena.permissions.MockSecurityEvaluator;
import org.apache.jena.permissions.SecurityEvaluator;
+@SuppressWarnings("removal")
public class SecuredGraphContractTests extends MetaTestGraph {
private final SecurityEvaluator eval;
diff --git
a/jena-permissions/src/test/java/org/apache/jena/permissions/contract/graph/SecuredGraphListenerTest.java
b/jena-permissions/src/test/java/org/apache/jena/permissions/contract/graph/SecuredGraphListenerTest.java
index 3b05877d22..200dddb9d1 100644
---
a/jena-permissions/src/test/java/org/apache/jena/permissions/contract/graph/SecuredGraphListenerTest.java
+++
b/jena-permissions/src/test/java/org/apache/jena/permissions/contract/graph/SecuredGraphListenerTest.java
@@ -23,6 +23,7 @@ import org.apache.jena.graph.test.TestGraphListener;
import org.apache.jena.permissions.MockSecurityEvaluator;
import org.apache.jena.permissions.SecurityEvaluator;
+@SuppressWarnings("removal")
public class SecuredGraphListenerTest extends TestGraphListener {
private final SecurityEvaluator eval;
diff --git
a/jena-permissions/src/test/java/org/apache/jena/permissions/contract/graph/SecuredTDBGraphContractTests.java
b/jena-permissions/src/test/java/org/apache/jena/permissions/contract/graph/SecuredTDBGraphContractTests.java
index 56bf0b3f9d..f4ed8277ad 100644
---
a/jena-permissions/src/test/java/org/apache/jena/permissions/contract/graph/SecuredTDBGraphContractTests.java
+++
b/jena-permissions/src/test/java/org/apache/jena/permissions/contract/graph/SecuredTDBGraphContractTests.java
@@ -6,9 +6,9 @@
* 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.
@@ -23,6 +23,7 @@ import org.apache.jena.permissions.MockSecurityEvaluator;
import org.apache.jena.permissions.SecurityEvaluator;
import org.apache.jena.tdb1.TDB1Factory;
+@SuppressWarnings("removal")
public class SecuredTDBGraphContractTests extends MetaTestGraph {
private final SecurityEvaluator eval;
diff --git
a/jena-permissions/src/test/java/org/apache/jena/permissions/contract/model/SecTestPackage.java
b/jena-permissions/src/test/java/org/apache/jena/permissions/contract/model/SecTestPackage.java
index 4dd385b39a..67626a8f02 100644
---
a/jena-permissions/src/test/java/org/apache/jena/permissions/contract/model/SecTestPackage.java
+++
b/jena-permissions/src/test/java/org/apache/jena/permissions/contract/model/SecTestPackage.java
@@ -36,6 +36,7 @@ import junit.framework.TestSuite;
/**
* Test package to test Model implementation.
*/
+@SuppressWarnings("removal")
public class SecTestPackage extends AbstractTestPackage {
static public TestSuite suite() throws SecurityException,
IllegalArgumentException {
return new SecTestPackage();
diff --git
a/jena-permissions/src/test/java/org/apache/jena/permissions/graph/CrossIDGraphEventManagerTest.java
b/jena-permissions/src/test/java/org/apache/jena/permissions/graph/CrossIDGraphEventManagerTest.java
index 603d42ee00..cf150e3e44 100644
---
a/jena-permissions/src/test/java/org/apache/jena/permissions/graph/CrossIDGraphEventManagerTest.java
+++
b/jena-permissions/src/test/java/org/apache/jena/permissions/graph/CrossIDGraphEventManagerTest.java
@@ -27,6 +27,7 @@ import org.apache.jena.sparql.graph.GraphFactory;
import org.junit.Assert;
import org.junit.Test;
+@SuppressWarnings("all")
public class CrossIDGraphEventManagerTest {
private final GraphEventManager manager;
diff --git
a/jena-permissions/src/test/java/org/apache/jena/permissions/graph/GraphEventManagerTest.java
b/jena-permissions/src/test/java/org/apache/jena/permissions/graph/GraphEventManagerTest.java
index bc6f4ab548..5239e3449c 100644
---
a/jena-permissions/src/test/java/org/apache/jena/permissions/graph/GraphEventManagerTest.java
+++
b/jena-permissions/src/test/java/org/apache/jena/permissions/graph/GraphEventManagerTest.java
@@ -6,9 +6,9 @@
* 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.
@@ -38,6 +38,7 @@ import org.junit.runner.RunWith;
* Verifies that messages are properly filtered when sent to listeners.
*
*/
+@SuppressWarnings("removal")
@RunWith(value = SecurityEvaluatorParameters.class)
public class GraphEventManagerTest {
private final GraphEventManager manager;
diff --git
a/jena-permissions/src/test/java/org/apache/jena/permissions/graph/MemGraphTest.java
b/jena-permissions/src/test/java/org/apache/jena/permissions/graph/MemGraphTest.java
index 5b38d26432..b60c516dca 100644
---
a/jena-permissions/src/test/java/org/apache/jena/permissions/graph/MemGraphTest.java
+++
b/jena-permissions/src/test/java/org/apache/jena/permissions/graph/MemGraphTest.java
@@ -39,6 +39,7 @@ import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
+@SuppressWarnings("removal")
@RunWith(value = SecurityEvaluatorParameters.class)
public class MemGraphTest {
private SecuredGraph securedGraph;
@@ -139,7 +140,6 @@ public class MemGraphTest {
}
}
- @SuppressWarnings("removal")
@Test
public void testDependsOn() throws Exception {
try {
diff --git
a/jena-permissions/src/test/java/org/apache/jena/permissions/graph/SecuredPrefixMappingTest.java
b/jena-permissions/src/test/java/org/apache/jena/permissions/graph/SecuredPrefixMappingTest.java
index 70ac7da02a..0727bec426 100644
---
a/jena-permissions/src/test/java/org/apache/jena/permissions/graph/SecuredPrefixMappingTest.java
+++
b/jena-permissions/src/test/java/org/apache/jena/permissions/graph/SecuredPrefixMappingTest.java
@@ -6,9 +6,9 @@
* 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.
@@ -38,11 +38,12 @@ import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
+@SuppressWarnings("removal")
@RunWith(value = SecurityEvaluatorParameters.class)
public class SecuredPrefixMappingTest {
/**
* Run tests from other classes that have instances of prefix mapping
- *
+ *
* @param securityEvaluator the SecurityEvaluator for the tests
* @param supplier The supplier for the prefixMapping to test.
* @param aBaseMap The map of prefix to URL that should be in the
diff --git
a/jena-permissions/src/test/java/org/apache/jena/permissions/impl/SecuredItemImplTest.java
b/jena-permissions/src/test/java/org/apache/jena/permissions/impl/SecuredItemImplTest.java
index 2876ede92b..615e246330 100644
---
a/jena-permissions/src/test/java/org/apache/jena/permissions/impl/SecuredItemImplTest.java
+++
b/jena-permissions/src/test/java/org/apache/jena/permissions/impl/SecuredItemImplTest.java
@@ -30,6 +30,7 @@ import org.mockito.ArgumentCaptor;
import static org.junit.Assert.*;
import static org.mockito.Mockito.*;
+@SuppressWarnings("removal")
public class SecuredItemImplTest {
private SecurityEvaluator evaluator = mock(SecurityEvaluator.class);
private ItemHolder<?, ?> holder = mock(ItemHolder.class);
diff --git
a/jena-permissions/src/test/java/org/apache/jena/permissions/model/SecuredAltTest.java
b/jena-permissions/src/test/java/org/apache/jena/permissions/model/SecuredAltTest.java
index 51fd3ba5d8..6eb6923485 100644
---
a/jena-permissions/src/test/java/org/apache/jena/permissions/model/SecuredAltTest.java
+++
b/jena-permissions/src/test/java/org/apache/jena/permissions/model/SecuredAltTest.java
@@ -6,9 +6,9 @@
* 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.
@@ -44,6 +44,7 @@ import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
+@SuppressWarnings("removal")
@RunWith(value = SecurityEvaluatorParameters.class)
public class SecuredAltTest extends SecuredContainerTest {
private Alt alt;
diff --git
a/jena-permissions/src/test/java/org/apache/jena/permissions/model/SecuredBagTest.java
b/jena-permissions/src/test/java/org/apache/jena/permissions/model/SecuredBagTest.java
index f391064b35..005d2d07d5 100644
---
a/jena-permissions/src/test/java/org/apache/jena/permissions/model/SecuredBagTest.java
+++
b/jena-permissions/src/test/java/org/apache/jena/permissions/model/SecuredBagTest.java
@@ -6,9 +6,9 @@
* 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.
@@ -25,6 +25,7 @@ import org.junit.Before;
import org.junit.runner.RunWith;
@RunWith(value = SecurityEvaluatorParameters.class)
+@SuppressWarnings("removal")
public class SecuredBagTest extends SecuredContainerTest {
public SecuredBagTest(final MockSecurityEvaluator securityEvaluator) {
diff --git
a/jena-permissions/src/test/java/org/apache/jena/permissions/model/SecuredContainerTest.java
b/jena-permissions/src/test/java/org/apache/jena/permissions/model/SecuredContainerTest.java
index 35b7968b2a..bbd5e82554 100644
---
a/jena-permissions/src/test/java/org/apache/jena/permissions/model/SecuredContainerTest.java
+++
b/jena-permissions/src/test/java/org/apache/jena/permissions/model/SecuredContainerTest.java
@@ -6,9 +6,9 @@
* 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.
@@ -43,6 +43,7 @@ import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
+@SuppressWarnings("removal")
@RunWith(value = SecurityEvaluatorParameters.class)
public class SecuredContainerTest extends SecuredResourceTest {
diff --git
a/jena-permissions/src/test/java/org/apache/jena/permissions/model/SecuredLiteralTest.java
b/jena-permissions/src/test/java/org/apache/jena/permissions/model/SecuredLiteralTest.java
index 19a6e2317b..e0cdc6f72a 100644
---
a/jena-permissions/src/test/java/org/apache/jena/permissions/model/SecuredLiteralTest.java
+++
b/jena-permissions/src/test/java/org/apache/jena/permissions/model/SecuredLiteralTest.java
@@ -33,6 +33,7 @@ import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
+@SuppressWarnings("all")
@RunWith(value = SecurityEvaluatorParameters.class)
public class SecuredLiteralTest extends SecuredRDFNodeTest {
diff --git
a/jena-permissions/src/test/java/org/apache/jena/permissions/model/SecuredModelDetailTest.java
b/jena-permissions/src/test/java/org/apache/jena/permissions/model/SecuredModelDetailTest.java
index a1a8e68cc1..9b2e9f65bb 100644
---
a/jena-permissions/src/test/java/org/apache/jena/permissions/model/SecuredModelDetailTest.java
+++
b/jena-permissions/src/test/java/org/apache/jena/permissions/model/SecuredModelDetailTest.java
@@ -37,6 +37,7 @@ import org.junit.Test;
* available to the user.
*
*/
+@SuppressWarnings("removal")
public class SecuredModelDetailTest {
private static String NS_FMT = "http://example.com/%s";;
diff --git
a/jena-permissions/src/test/java/org/apache/jena/permissions/model/SecuredModelTest.java
b/jena-permissions/src/test/java/org/apache/jena/permissions/model/SecuredModelTest.java
index f7fa917cb5..e869ea2dca 100644
---
a/jena-permissions/src/test/java/org/apache/jena/permissions/model/SecuredModelTest.java
+++
b/jena-permissions/src/test/java/org/apache/jena/permissions/model/SecuredModelTest.java
@@ -42,6 +42,7 @@ import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
+@SuppressWarnings("removal")
@RunWith(value = SecurityEvaluatorParameters.class)
public class SecuredModelTest {
protected final MockSecurityEvaluator securityEvaluator;
diff --git
a/jena-permissions/src/test/java/org/apache/jena/permissions/model/SecuredPropertyTest.java
b/jena-permissions/src/test/java/org/apache/jena/permissions/model/SecuredPropertyTest.java
index f1a6f1e901..6e79e18f8a 100644
---
a/jena-permissions/src/test/java/org/apache/jena/permissions/model/SecuredPropertyTest.java
+++
b/jena-permissions/src/test/java/org/apache/jena/permissions/model/SecuredPropertyTest.java
@@ -6,9 +6,9 @@
* 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.
@@ -29,6 +29,7 @@ import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
+@SuppressWarnings("removal")
@RunWith(value = SecurityEvaluatorParameters.class)
public class SecuredPropertyTest extends SecuredResourceTest {
diff --git
a/jena-permissions/src/test/java/org/apache/jena/permissions/model/SecuredRDFListTest.java
b/jena-permissions/src/test/java/org/apache/jena/permissions/model/SecuredRDFListTest.java
index 9873f1ee95..f3fe9fbcb1 100644
---
a/jena-permissions/src/test/java/org/apache/jena/permissions/model/SecuredRDFListTest.java
+++
b/jena-permissions/src/test/java/org/apache/jena/permissions/model/SecuredRDFListTest.java
@@ -54,6 +54,7 @@ import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
+@SuppressWarnings("removal")
@RunWith(value = SecurityEvaluatorParameters.class)
public class SecuredRDFListTest extends SecuredResourceTest {
private RDFList baseList;
diff --git
a/jena-permissions/src/test/java/org/apache/jena/permissions/model/SecuredRDFNodeTest.java
b/jena-permissions/src/test/java/org/apache/jena/permissions/model/SecuredRDFNodeTest.java
index a9c7293533..f1dce6c81a 100644
---
a/jena-permissions/src/test/java/org/apache/jena/permissions/model/SecuredRDFNodeTest.java
+++
b/jena-permissions/src/test/java/org/apache/jena/permissions/model/SecuredRDFNodeTest.java
@@ -6,9 +6,9 @@
* 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.
@@ -33,6 +33,7 @@ import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
+@SuppressWarnings("removal")
@RunWith(value = SecurityEvaluatorParameters.class)
public class SecuredRDFNodeTest {
protected final MockSecurityEvaluator securityEvaluator;
diff --git
a/jena-permissions/src/test/java/org/apache/jena/permissions/model/SecuredResourceTest.java
b/jena-permissions/src/test/java/org/apache/jena/permissions/model/SecuredResourceTest.java
index a590bd0570..11037c8830 100644
---
a/jena-permissions/src/test/java/org/apache/jena/permissions/model/SecuredResourceTest.java
+++
b/jena-permissions/src/test/java/org/apache/jena/permissions/model/SecuredResourceTest.java
@@ -6,9 +6,9 @@
* 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.
@@ -46,6 +46,7 @@ import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
+@SuppressWarnings("removal")
@RunWith(value = SecurityEvaluatorParameters.class)
public class SecuredResourceTest extends SecuredRDFNodeTest {
@@ -70,7 +71,7 @@ public class SecuredResourceTest extends SecuredRDFNodeTest {
/**
* True if the P property should exist
- *
+ *
* @return
*/
protected boolean hasP() {
diff --git
a/jena-permissions/src/test/java/org/apache/jena/permissions/model/SecuredSeqTest.java
b/jena-permissions/src/test/java/org/apache/jena/permissions/model/SecuredSeqTest.java
index 201bc447ec..490733519f 100644
---
a/jena-permissions/src/test/java/org/apache/jena/permissions/model/SecuredSeqTest.java
+++
b/jena-permissions/src/test/java/org/apache/jena/permissions/model/SecuredSeqTest.java
@@ -45,6 +45,7 @@ import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
+@SuppressWarnings("removal")
@RunWith(value = SecurityEvaluatorParameters.class)
public class SecuredSeqTest extends SecuredContainerTest {
private Seq seq;
diff --git
a/jena-permissions/src/test/java/org/apache/jena/permissions/model/SecuredStatementTest.java
b/jena-permissions/src/test/java/org/apache/jena/permissions/model/SecuredStatementTest.java
index 90a962dc45..60fd78003d 100644
---
a/jena-permissions/src/test/java/org/apache/jena/permissions/model/SecuredStatementTest.java
+++
b/jena-permissions/src/test/java/org/apache/jena/permissions/model/SecuredStatementTest.java
@@ -47,6 +47,7 @@ import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
+@SuppressWarnings("removal")
@RunWith(value = SecurityEvaluatorParameters.class)
public class SecuredStatementTest {
private final MockSecurityEvaluator securityEvaluator;
diff --git
a/jena-permissions/src/test/java/org/apache/jena/permissions/query/DataSetTest.java
b/jena-permissions/src/test/java/org/apache/jena/permissions/query/DataSetTest.java
index 3360adbf9c..e9f860e455 100644
---
a/jena-permissions/src/test/java/org/apache/jena/permissions/query/DataSetTest.java
+++
b/jena-permissions/src/test/java/org/apache/jena/permissions/query/DataSetTest.java
@@ -34,6 +34,7 @@ import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
+@SuppressWarnings("removal")
public class DataSetTest {
private Dataset dataset;
private Model baseModel;
diff --git
a/jena-permissions/src/test/java/org/apache/jena/permissions/query/QueryEngineTest.java
b/jena-permissions/src/test/java/org/apache/jena/permissions/query/QueryEngineTest.java
index 6c0ac9a5e1..f2efc344e2 100644
---
a/jena-permissions/src/test/java/org/apache/jena/permissions/query/QueryEngineTest.java
+++
b/jena-permissions/src/test/java/org/apache/jena/permissions/query/QueryEngineTest.java
@@ -38,6 +38,7 @@ import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
+@SuppressWarnings("removal")
public class QueryEngineTest {
@BeforeClass
diff --git
a/jena-permissions/src/test/java/org/apache/jena/permissions/query/rewriter/OpRewriterTest.java
b/jena-permissions/src/test/java/org/apache/jena/permissions/query/rewriter/OpRewriterTest.java
index 491394e86f..bb1df5d702 100644
---
a/jena-permissions/src/test/java/org/apache/jena/permissions/query/rewriter/OpRewriterTest.java
+++
b/jena-permissions/src/test/java/org/apache/jena/permissions/query/rewriter/OpRewriterTest.java
@@ -6,9 +6,9 @@
* 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.
@@ -34,6 +34,7 @@ import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+@SuppressWarnings("removal")
public class OpRewriterTest {
private OpRewriter rewriter;
private Triple[] triples;
