Repository: jena Updated Branches: refs/heads/master 26d9f0348 -> 01f852309
Cleaning warning: Deprecation: createAnon->createBlankNodeId Unnecessary semicolons Unused imports Missing @Override Project: http://git-wip-us.apache.org/repos/asf/jena/repo Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/714e4a32 Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/714e4a32 Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/714e4a32 Branch: refs/heads/master Commit: 714e4a32a9b5c6a8c077d15bdb3e4189ca1193be Parents: 6889895 Author: Andy Seaborne <[email protected]> Authored: Sun Jul 19 18:15:18 2015 +0100 Committer: Andy Seaborne <[email protected]> Committed: Tue Jul 21 21:33:40 2015 +0100 ---------------------------------------------------------------------- .../jena/permissions/graph/SecuredGraph.java | 6 ++++-- .../graph/SecuredGraphEventManager.java | 1 - .../jena/permissions/model/SecuredModel.java | 18 +++++++++--------- .../model/impl/SecuredRDFListImpl.java | 1 - .../permissions/model/impl/SecuredRSIterator.java | 1 - .../permissions/query/rewriter/OpRewriter.java | 1 - .../query/rewriter/SecuredFunction.java | 10 +++++----- .../permissions/graph/GraphEventManagerTest.java | 9 +++------ .../jena/permissions/graph/MemGraphTest.java | 1 - .../permissions/model/SecuredModelDetailTest.java | 5 ++--- .../query/rewriter/OpRewriterTest.java | 8 ++++---- 11 files changed, 27 insertions(+), 34 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jena/blob/714e4a32/jena-permissions/src/main/java/org/apache/jena/permissions/graph/SecuredGraph.java ---------------------------------------------------------------------- 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 5109465..4274bc4 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 @@ -104,12 +104,14 @@ public interface SecuredGraph extends Graph, SecuredItem * Return the name of the graph. * @return The name of the graph as a node. */ - public Node getModelNode(); + @Override + public Node getModelNode(); @Override public SecuredPrefixMapping getPrefixMapping(); - public SecurityEvaluator getSecurityEvaluator(); + @Override + public SecurityEvaluator getSecurityEvaluator(); /** * @sec.graph Read http://git-wip-us.apache.org/repos/asf/jena/blob/714e4a32/jena-permissions/src/main/java/org/apache/jena/permissions/graph/SecuredGraphEventManager.java ---------------------------------------------------------------------- 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 3b11b80..192b015 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 @@ -36,7 +36,6 @@ import org.apache.jena.graph.impl.CollectionGraph ; import org.apache.jena.permissions.SecurityEvaluator; import org.apache.jena.permissions.SecurityEvaluator.Action; import org.apache.jena.permissions.impl.CachedSecurityEvaluator; -import org.apache.jena.permissions.impl.SecuredItemImpl; import org.apache.jena.permissions.utils.PermTripleFilter; import org.apache.jena.util.iterator.ExtendedIterator ; import org.apache.jena.util.iterator.NiceIterator ; http://git-wip-us.apache.org/repos/asf/jena/blob/714e4a32/jena-permissions/src/main/java/org/apache/jena/permissions/model/SecuredModel.java ---------------------------------------------------------------------- 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 f81e9f6..f0088aa 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 @@ -1397,7 +1397,7 @@ public interface SecuredModel extends Model, SecuredPrefixMapping * @throws DeleteDeniedException */ @Override - public SecuredModel remove( final Model m ) throws DeleteDeniedException, UpdateDeniedException;; + public SecuredModel remove( final Model m ) throws DeleteDeniedException, UpdateDeniedException; /** * @@ -1407,7 +1407,7 @@ public interface SecuredModel extends Model, SecuredPrefixMapping * @throws DeleteDeniedException */ @Override - public SecuredModel remove( final Resource s, final Property p, final RDFNode o ) throws DeleteDeniedException, UpdateDeniedException;; + public SecuredModel remove( final Resource s, final Property p, final RDFNode o ) throws DeleteDeniedException, UpdateDeniedException; /** * @@ -1418,7 +1418,7 @@ public interface SecuredModel extends Model, SecuredPrefixMapping */ @Override public SecuredModel remove( final Statement s ) - throws DeleteDeniedException, UpdateDeniedException;; + throws DeleteDeniedException, UpdateDeniedException; /** * @@ -1429,7 +1429,7 @@ public interface SecuredModel extends Model, SecuredPrefixMapping */ @Override public SecuredModel remove( final Statement[] statements ) - throws DeleteDeniedException, UpdateDeniedException;; + throws DeleteDeniedException, UpdateDeniedException; /** * @@ -1440,7 +1440,7 @@ public interface SecuredModel extends Model, SecuredPrefixMapping */ @Override public SecuredModel remove( final StmtIterator iter ) - throws DeleteDeniedException, UpdateDeniedException;; + throws DeleteDeniedException, UpdateDeniedException; /** * @@ -1450,7 +1450,7 @@ public interface SecuredModel extends Model, SecuredPrefixMapping * @throws DeleteDeniedException */ @Override - public SecuredModel removeAll() throws DeleteDeniedException, UpdateDeniedException;; + public SecuredModel removeAll() throws DeleteDeniedException, UpdateDeniedException; /** * @@ -1461,7 +1461,7 @@ public interface SecuredModel extends Model, SecuredPrefixMapping */ @Override public SecuredModel removeAll( final Resource s, final Property p, - final RDFNode r ) throws DeleteDeniedException, UpdateDeniedException;; + final RDFNode r ) throws DeleteDeniedException, UpdateDeniedException; /** * @@ -1473,7 +1473,7 @@ public interface SecuredModel extends Model, SecuredPrefixMapping */ @Override public void removeAllReifications( final Statement s ) - throws DeleteDeniedException, UpdateDeniedException;; + throws DeleteDeniedException, UpdateDeniedException; /** * @@ -1494,7 +1494,7 @@ public interface SecuredModel extends Model, SecuredPrefixMapping */ @Override public void removeReification( final ReifiedStatement rs ) - throws DeleteDeniedException, UpdateDeniedException;; + throws DeleteDeniedException, UpdateDeniedException; /** * http://git-wip-us.apache.org/repos/asf/jena/blob/714e4a32/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredRDFListImpl.java ---------------------------------------------------------------------- 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 66fc8f3..36c524f 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 @@ -30,7 +30,6 @@ import org.apache.jena.permissions.SecuredItem; import org.apache.jena.permissions.SecurityEvaluator; import org.apache.jena.permissions.SecurityEvaluator.Action; import org.apache.jena.permissions.impl.ItemHolder; -import org.apache.jena.permissions.impl.SecuredItemImpl; import org.apache.jena.permissions.impl.SecuredItemInvoker; import org.apache.jena.permissions.model.SecuredModel; import org.apache.jena.permissions.model.SecuredRDFList; http://git-wip-us.apache.org/repos/asf/jena/blob/714e4a32/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredRSIterator.java ---------------------------------------------------------------------- diff --git a/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredRSIterator.java b/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredRSIterator.java index 5b38a17..7ec06b1 100644 --- a/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredRSIterator.java +++ b/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredRSIterator.java @@ -26,7 +26,6 @@ import java.util.function.Predicate; import org.apache.jena.graph.Node; import org.apache.jena.permissions.SecurityEvaluator; import org.apache.jena.permissions.SecurityEvaluator.Action; -import org.apache.jena.permissions.impl.SecuredItemImpl; import org.apache.jena.permissions.model.SecuredModel; import org.apache.jena.rdf.model.RSIterator ; import org.apache.jena.rdf.model.ReifiedStatement ; http://git-wip-us.apache.org/repos/asf/jena/blob/714e4a32/jena-permissions/src/main/java/org/apache/jena/permissions/query/rewriter/OpRewriter.java ---------------------------------------------------------------------- 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 59aa4e5..d47a246 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 @@ -26,7 +26,6 @@ import org.apache.jena.graph.Triple ; import org.apache.jena.permissions.SecuredItem; import org.apache.jena.permissions.SecurityEvaluator; import org.apache.jena.permissions.SecurityEvaluator.Action; -import org.apache.jena.permissions.impl.SecuredItemImpl; import org.apache.jena.shared.ReadDeniedException; import org.apache.jena.sparql.algebra.Op ; import org.apache.jena.sparql.algebra.OpVisitor ; http://git-wip-us.apache.org/repos/asf/jena/blob/714e4a32/jena-permissions/src/main/java/org/apache/jena/permissions/query/rewriter/SecuredFunction.java ---------------------------------------------------------------------- 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 84b699c..fa2819f 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 @@ -17,17 +17,17 @@ */ package org.apache.jena.permissions.query.rewriter; -import java.util.List; +import java.util.List ; + import org.apache.jena.graph.Node ; import org.apache.jena.graph.Triple ; -import org.apache.jena.permissions.SecurityEvaluator; -import org.apache.jena.permissions.SecurityEvaluator.Action; -import org.apache.jena.permissions.impl.SecuredItemImpl; +import org.apache.jena.permissions.SecurityEvaluator ; +import org.apache.jena.permissions.SecurityEvaluator.Action ; import org.apache.jena.sparql.core.Var ; import org.apache.jena.sparql.engine.binding.Binding ; import org.apache.jena.sparql.expr.* ; import org.apache.jena.sparql.function.FunctionEnv ; -import org.apache.jena.sparql.graph.NodeTransform; +import org.apache.jena.sparql.graph.NodeTransform ; public class SecuredFunction extends ExprFunctionN { http://git-wip-us.apache.org/repos/asf/jena/blob/714e4a32/jena-permissions/src/test/java/org/apache/jena/permissions/graph/GraphEventManagerTest.java ---------------------------------------------------------------------- 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 8e01cf9..639a868 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 @@ -62,7 +62,6 @@ public class GraphEventManagerTest { } @Test - @SuppressWarnings("deprecation") public void notifyAddTest() { Object principal = securityEvaluator.getPrincipal(); final Set<Action> ADD = SecurityEvaluator.Util.asSet(new Action[] { @@ -75,10 +74,8 @@ public class GraphEventManagerTest { } g.delete(Triple.ANY); listener.reset(); - } - @SuppressWarnings("deprecation") @Test public void notifyDeleteTest() { Object principal = securityEvaluator.getPrincipal(); @@ -117,13 +114,13 @@ public class GraphEventManagerTest { tripleArray = new Triple[] { new Triple(NodeFactory.createURI("http://example.com/1";), NodeFactory.createURI("http://example.com/v";), - NodeFactory.createAnon()), + NodeFactory.createBlankNode()), new Triple(NodeFactory.createURI("http://example.com/2";), NodeFactory.createURI("http://example.com/v";), - NodeFactory.createAnon()), + NodeFactory.createBlankNode()), new Triple(NodeFactory.createURI("http://example.com/3";), NodeFactory.createURI("http://example.com/v";), - NodeFactory.createAnon()) }; + NodeFactory.createBlankNode()) }; } } http://git-wip-us.apache.org/repos/asf/jena/blob/714e4a32/jena-permissions/src/test/java/org/apache/jena/permissions/graph/MemGraphTest.java ---------------------------------------------------------------------- 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 00dfaea..32a5a20 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 @@ -53,7 +53,6 @@ public class MemGraphTest { return GraphFactory.createDefaultGraph(); } - @SuppressWarnings("deprecation") @Before public void setUp() throws Exception { baseGraph = createGraph(); http://git-wip-us.apache.org/repos/asf/jena/blob/714e4a32/jena-permissions/src/test/java/org/apache/jena/permissions/model/SecuredModelDetailTest.java ---------------------------------------------------------------------- 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 51375ac..723615e 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 @@ -22,9 +22,8 @@ import java.security.Principal ; import java.util.Set ; import org.apache.http.auth.BasicUserPrincipal ; -import org.apache.jena.graph.Node; -import org.apache.jena.graph.NodeFactory ; -import org.apache.jena.graph.Triple; +import org.apache.jena.graph.Node ; +import org.apache.jena.graph.Triple ; import org.apache.jena.permissions.Factory ; import org.apache.jena.permissions.SecurityEvaluator ; import org.apache.jena.rdf.model.* ; http://git-wip-us.apache.org/repos/asf/jena/blob/714e4a32/jena-permissions/src/test/java/org/apache/jena/permissions/query/rewriter/OpRewriterTest.java ---------------------------------------------------------------------- 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 99d73d2..4a4442c 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 @@ -50,10 +50,10 @@ public class OpRewriterTest { RDF.type.asNode(), NodeFactory.createURI("http://example.com/class";)), new Triple(NodeFactory.createVariable("foo"), - NodeFactory.createAnon(), + NodeFactory.createBlankNode(), NodeFactory.createVariable("bar")), new Triple(NodeFactory.createVariable("bar"), - NodeFactory.createAnon(), + NodeFactory.createBlankNode(), NodeFactory.createVariable("baz")), }; } @@ -104,10 +104,10 @@ public class OpRewriterTest { RDF.type.asNode(), NodeFactory.createURI("http://example.com/class";)), new Triple(NodeFactory.createVariable("foo"), - NodeFactory.createAnon(), + NodeFactory.createBlankNode(), NodeFactory.createVariable("bar")), new Triple(NodeFactory.createVariable("bar"), - NodeFactory.createAnon(), + NodeFactory.createBlankNode(), NodeFactory.createVariable("baz")), }; try { rewriter.visit(new OpBGP(BasicPattern.wrap(Arrays.asList(triples))));
