You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by an...@apache.org on 2015/07/21 22:35:16 UTC
[01/12] jena git commit: Cleaning warning:
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 <an...@apache.org>
Authored: Sun Jul 19 18:15:18 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
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))));
[05/12] jena git commit: Added missing licenses Part of the fix for
JENA-990
Posted by an...@apache.org.
Added missing licenses
Part of the fix for JENA-990
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/68d00726
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/68d00726
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/68d00726
Branch: refs/heads/master
Commit: 68d00726fee5494dc0d96355080fca00da65a6ae
Parents: dbcaa0e
Author: Claude Warren <cl...@apache.org>
Authored: Sun Jul 19 11:05:51 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Tue Jul 21 21:33:40 2015 +0100
----------------------------------------------------------------------
.../shared/AuthenticationRequiredException.java | 24 ++++++++++++++++++++
.../permissions/impl/SecuredItemImplTest.java | 17 ++++++++++++++
2 files changed, 41 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/68d00726/jena-core/src/main/java/org/apache/jena/shared/AuthenticationRequiredException.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/shared/AuthenticationRequiredException.java b/jena-core/src/main/java/org/apache/jena/shared/AuthenticationRequiredException.java
index 448ef9e..160aa69 100644
--- a/jena-core/src/main/java/org/apache/jena/shared/AuthenticationRequiredException.java
+++ b/jena-core/src/main/java/org/apache/jena/shared/AuthenticationRequiredException.java
@@ -1,5 +1,29 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package org.apache.jena.shared;
+/**
+ * Exception to indicate that authentication is required for the operation to proceed.
+ *
+ * My only be thrown if authentication credentials are not available.
+ *
+ */
public class AuthenticationRequiredException extends OperationDeniedException {
public AuthenticationRequiredException() {
http://git-wip-us.apache.org/repos/asf/jena/blob/68d00726/jena-permissions/src/test/java/org/apache/jena/permissions/impl/SecuredItemImplTest.java
----------------------------------------------------------------------
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 e6ed8c5..22c992d 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
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package org.apache.jena.permissions.impl;
import org.apache.jena.graph.Node;
[02/12] jena git commit: Use identical formatted text for license
Posted by an...@apache.org.
Use identical formatted text for license
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/dbcaa0e8
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/dbcaa0e8
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/dbcaa0e8
Branch: refs/heads/master
Commit: dbcaa0e8f647d70ea970594dd43d61e6b65eff73
Parents: 2cd87b4
Author: Andy Seaborne <an...@apache.org>
Authored: Sun Jul 19 10:40:19 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Tue Jul 21 21:33:40 2015 +0100
----------------------------------------------------------------------
.../jena/sparql/core/DatasetChangesCapture.java | 3 ++-
.../org/apache/jena/sparql/util/Context.java | 27 ++++++++++----------
.../apache/jena/sparql/core/TestContext.java | 27 ++++++++++----------
.../apache/jena/atlas/lib/PropertyUtils.java | 27 ++++++++++----------
4 files changed, 44 insertions(+), 40 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/dbcaa0e8/jena-arq/src/main/java/org/apache/jena/sparql/core/DatasetChangesCapture.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/core/DatasetChangesCapture.java b/jena-arq/src/main/java/org/apache/jena/sparql/core/DatasetChangesCapture.java
index 2e09941..0c72ffd 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/core/DatasetChangesCapture.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/core/DatasetChangesCapture.java
@@ -108,7 +108,8 @@ public class DatasetChangesCapture implements DatasetChanges {
@Override
public void reset() {
- actions.clear() ;
+ if ( actions != null )
+ actions.clear() ;
actions = null ;
}
}
http://git-wip-us.apache.org/repos/asf/jena/blob/dbcaa0e8/jena-arq/src/main/java/org/apache/jena/sparql/util/Context.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/util/Context.java b/jena-arq/src/main/java/org/apache/jena/sparql/util/Context.java
index 6593271..ce911a8 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/util/Context.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/util/Context.java
@@ -1,18 +1,19 @@
/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with this
- * work for additional information regarding copyright ownership. The ASF
- * licenses this file to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
* Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*/
package org.apache.jena.sparql.util ;
http://git-wip-us.apache.org/repos/asf/jena/blob/dbcaa0e8/jena-arq/src/test/java/org/apache/jena/sparql/core/TestContext.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/org/apache/jena/sparql/core/TestContext.java b/jena-arq/src/test/java/org/apache/jena/sparql/core/TestContext.java
index 5dc0e46..c6a55a8 100644
--- a/jena-arq/src/test/java/org/apache/jena/sparql/core/TestContext.java
+++ b/jena-arq/src/test/java/org/apache/jena/sparql/core/TestContext.java
@@ -1,18 +1,19 @@
/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with this
- * work for additional information regarding copyright ownership. The ASF
- * licenses this file to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
* Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*/
package org.apache.jena.sparql.core ;
http://git-wip-us.apache.org/repos/asf/jena/blob/dbcaa0e8/jena-base/src/main/java/org/apache/jena/atlas/lib/PropertyUtils.java
----------------------------------------------------------------------
diff --git a/jena-base/src/main/java/org/apache/jena/atlas/lib/PropertyUtils.java b/jena-base/src/main/java/org/apache/jena/atlas/lib/PropertyUtils.java
index f9acfc8..e69da44 100644
--- a/jena-base/src/main/java/org/apache/jena/atlas/lib/PropertyUtils.java
+++ b/jena-base/src/main/java/org/apache/jena/atlas/lib/PropertyUtils.java
@@ -1,18 +1,19 @@
/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with this
- * work for additional information regarding copyright ownership. The ASF
- * licenses this file to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
* Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*/
package org.apache.jena.atlas.lib ;
[11/12] jena git commit: JENA-994: Explicit dependency on
commons-codec
Posted by an...@apache.org.
JENA-994: Explicit dependency on commons-codec
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/752e64e9
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/752e64e9
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/752e64e9
Branch: refs/heads/master
Commit: 752e64e9bdac4a5e7d88f9414d60f6c475396bb4
Parents: 3bf3144
Author: Andy Seaborne <an...@apache.org>
Authored: Tue Jul 21 09:38:00 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Tue Jul 21 21:34:47 2015 +0100
----------------------------------------------------------------------
jena-text/pom.xml | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/752e64e9/jena-text/pom.xml
----------------------------------------------------------------------
diff --git a/jena-text/pom.xml b/jena-text/pom.xml
index 9b28c18..be6eec0 100644
--- a/jena-text/pom.xml
+++ b/jena-text/pom.xml
@@ -44,7 +44,12 @@
<version>3.0.0-SNAPSHOT</version>
<type>pom</type>
</dependency>
-
+
+ <dependency>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ </dependency>
+
<!-- Testing support -->
<dependency>
<groupId>org.apache.jena</groupId>
[07/12] jena git commit: Explict version required
Posted by an...@apache.org.
Explict version required
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/491b85d1
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/491b85d1
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/491b85d1
Branch: refs/heads/master
Commit: 491b85d11bedff8e70f040a4efed5c4928a3e849
Parents: 0322edc
Author: Andy Seaborne <an...@apache.org>
Authored: Sun Jul 19 21:25:54 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Tue Jul 21 21:34:34 2015 +0100
----------------------------------------------------------------------
jena-maven-tools/pom.xml | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/491b85d1/jena-maven-tools/pom.xml
----------------------------------------------------------------------
diff --git a/jena-maven-tools/pom.xml b/jena-maven-tools/pom.xml
index 0bb98df..653ea22 100644
--- a/jena-maven-tools/pom.xml
+++ b/jena-maven-tools/pom.xml
@@ -62,6 +62,7 @@ limitations under the License.
</organization>
<properties>
+ <jenaCoreVersion>${project.version}</jenaCoreVersion>
<mavenVersion>3.0.4</mavenVersion>
</properties>
[10/12] jena git commit: JENA-994: Use constants from Lucene 4.9
Posted by an...@apache.org.
JENA-994: Use constants from Lucene 4.9
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/3bf3144d
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/3bf3144d
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/3bf3144d
Branch: refs/heads/master
Commit: 3bf3144df8fa24f455f607ee1da384ef05a28f95
Parents: 491b85d
Author: Andy Seaborne <an...@apache.org>
Authored: Tue Jul 21 09:37:45 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Tue Jul 21 21:34:47 2015 +0100
----------------------------------------------------------------------
.../src/main/java/org/apache/jena/query/text/TextIndexLucene.java | 2 +-
.../org/apache/jena/query/text/TestLuceneWithMultipleThreads.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/3bf3144d/jena-text/src/main/java/org/apache/jena/query/text/TextIndexLucene.java
----------------------------------------------------------------------
diff --git a/jena-text/src/main/java/org/apache/jena/query/text/TextIndexLucene.java b/jena-text/src/main/java/org/apache/jena/query/text/TextIndexLucene.java
index e209326..bada3e9 100644
--- a/jena-text/src/main/java/org/apache/jena/query/text/TextIndexLucene.java
+++ b/jena-text/src/main/java/org/apache/jena/query/text/TextIndexLucene.java
@@ -49,7 +49,7 @@ public class TextIndexLucene implements TextIndex {
private static Logger log = LoggerFactory.getLogger(TextIndexLucene.class) ;
private static int MAX_N = 10000 ;
- public static final Version VER = Version.LUCENE_46 ;
+ public static final Version VER = Version.LUCENE_4_9 ;
// prefix for storing datatype URIs in the index, to distinguish them from language tags
private static final String DATATYPE_PREFIX = "^^";
http://git-wip-us.apache.org/repos/asf/jena/blob/3bf3144d/jena-text/src/test/java/org/apache/jena/query/text/TestLuceneWithMultipleThreads.java
----------------------------------------------------------------------
diff --git a/jena-text/src/test/java/org/apache/jena/query/text/TestLuceneWithMultipleThreads.java b/jena-text/src/test/java/org/apache/jena/query/text/TestLuceneWithMultipleThreads.java
index 5bbe7c3..207e746 100644
--- a/jena-text/src/test/java/org/apache/jena/query/text/TestLuceneWithMultipleThreads.java
+++ b/jena-text/src/test/java/org/apache/jena/query/text/TestLuceneWithMultipleThreads.java
@@ -51,7 +51,7 @@ public class TestLuceneWithMultipleThreads
entDef = new EntityDefinition("uri", "label");
entDef.setGraphField("graph");
entDef.setPrimaryPredicate(RDFS.label);
- StandardAnalyzer analyzer = new StandardAnalyzer(Version.LUCENE_46);
+ StandardAnalyzer analyzer = new StandardAnalyzer(Version.LUCENE_4_9);
entDef.setAnalyzer("label", analyzer);
}
[08/12] jena git commit: JENA-994: Dependency management for
commons-codec
Posted by an...@apache.org.
JENA-994: Dependency management for commons-codec
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/a43f23c8
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/a43f23c8
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/a43f23c8
Branch: refs/heads/master
Commit: a43f23c8c6dce085dd6b127bed08c2063fa2168a
Parents: 752e64e
Author: Andy Seaborne <an...@apache.org>
Authored: Tue Jul 21 09:40:24 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Tue Jul 21 21:34:47 2015 +0100
----------------------------------------------------------------------
jena-parent/pom.xml | 23 ++++++++++++++++++-----
1 file changed, 18 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/a43f23c8/jena-parent/pom.xml
----------------------------------------------------------------------
diff --git a/jena-parent/pom.xml b/jena-parent/pom.xml
index 7d2ac69..df6c627 100644
--- a/jena-parent/pom.xml
+++ b/jena-parent/pom.xml
@@ -47,7 +47,7 @@
</organization>
<properties>
- <ver.slf4j>1.7.9</ver.slf4j>
+ <ver.slf4j>1.7.12</ver.slf4j>
<ver.log4j>1.2.17</ver.log4j>
<ver.junit>4.12</ver.junit>
<ver.xerces>2.11.0</ver.xerces>
@@ -58,10 +58,17 @@
<!-- These are connected because solr4j depends on httpclient as well -->
<ver.httpclient>4.2.6</ver.httpclient>
- <ver.httpcore>4.2.5</ver.httpcore>
- <ver.lucene>4.6.1</ver.lucene>
- <ver.solr>4.6.1</ver.solr>
- <ver.spatial4j>0.4</ver.spatial4j>
+ <ver.httpcore>4.2.6</ver.httpcore>
+ <!-- Normally, these are the same as the above
+ In the case of 4.2.6, there isn't a httpcore-osgi.
+ -->
+ <ver.httpcore-osgi>4.2.5</ver.httpcore-osgi>
+ <ver.httpclient-osgi>4.2.6</ver.httpclient-osgi>
+
+ <ver.commons-codec>1.9</ver.commons-codec>
+ <ver.lucene>4.9.1</ver.lucene>
+ <ver.solr>4.9.1</ver.solr>
+ <ver.spatial4j>0.4.1</ver.spatial4j>
<jdk.version>1.8</jdk.version>
<targetJdk>${jdk.version}</targetJdk> <!-- MPMD-86 workaround -->
@@ -136,6 +143,12 @@
</dependency>
<dependency>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ <version>${ver.commons-codec}</version>
+ </dependency>
+
+ <dependency>
<groupId>org.apache.thrift</groupId>
<artifactId>libthrift</artifactId>
<version>0.9.2</version>
[06/12] jena git commit: Explict version required
Posted by an...@apache.org.
Explict version required
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/0322edc4
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/0322edc4
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/0322edc4
Branch: refs/heads/master
Commit: 0322edc49145a606ac6781150867a5f57dd1a2b3
Parents: 714e4a3
Author: Andy Seaborne <an...@apache.org>
Authored: Sun Jul 19 21:11:57 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Tue Jul 21 21:34:19 2015 +0100
----------------------------------------------------------------------
jena-maven-tools/pom.xml | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/0322edc4/jena-maven-tools/pom.xml
----------------------------------------------------------------------
diff --git a/jena-maven-tools/pom.xml b/jena-maven-tools/pom.xml
index 9ee595c..0bb98df 100644
--- a/jena-maven-tools/pom.xml
+++ b/jena-maven-tools/pom.xml
@@ -62,8 +62,6 @@ limitations under the License.
</organization>
<properties>
- <jenaCoreVersion>${project.version}</jenaCoreVersion>
- <version>${project.version}</version>
<mavenVersion>3.0.4</mavenVersion>
</properties>
@@ -184,7 +182,7 @@ limitations under the License.
<dependency>
<groupId>org.apache.jena</groupId>
<artifactId>jena-core</artifactId>
- <version>${jenaCoreVersion}</version>
+ <version>3.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
[09/12] jena git commit: Explicitly control dependecies for
httpcompoents OSGi
Posted by an...@apache.org.
Explicitly control dependecies for httpcompoents OSGi
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/2b9511f1
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/2b9511f1
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/2b9511f1
Branch: refs/heads/master
Commit: 2b9511f1c1e151ad04c9e976ea33f797a5cadfdc
Parents: a43f23c
Author: Andy Seaborne <an...@apache.org>
Authored: Tue Jul 21 09:40:59 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Tue Jul 21 21:34:47 2015 +0100
----------------------------------------------------------------------
apache-jena-osgi/jena-osgi/pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/2b9511f1/apache-jena-osgi/jena-osgi/pom.xml
----------------------------------------------------------------------
diff --git a/apache-jena-osgi/jena-osgi/pom.xml b/apache-jena-osgi/jena-osgi/pom.xml
index e1ea258..026bb2e 100644
--- a/apache-jena-osgi/jena-osgi/pom.xml
+++ b/apache-jena-osgi/jena-osgi/pom.xml
@@ -135,7 +135,7 @@
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient-osgi</artifactId>
- <version>${ver.httpclient}</version>
+ <version>${ver.httpclient-osgi}</version>
<exclusions>
<!-- These are all embedded within httpclient-osgi -->
<exclusion>
@@ -163,7 +163,7 @@
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpcore-osgi</artifactId>
- <version>${ver.httpcore}</version>
+ <version>${ver.httpcore-osgi}</version>
<exclusions>
<exclusion>
<groupId>org.apache.httpcomponents</groupId>
[03/12] jena git commit: Clean javadoc of warnings.
Posted by an...@apache.org.
Clean javadoc of warnings.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/6889895a
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/6889895a
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/6889895a
Branch: refs/heads/master
Commit: 6889895a391339aba0e223eb26f07af8962ca6ef
Parents: b67d5af
Author: Andy Seaborne <an...@apache.org>
Authored: Sun Jul 19 18:08:35 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Tue Jul 21 21:33:40 2015 +0100
----------------------------------------------------------------------
.../java/org/apache/jena/permissions/graph/SecuredGraph.java | 2 +-
.../java/org/apache/jena/permissions/model/SecuredModel.java | 3 ++-
.../jena/permissions/model/SecuredReifiedStatementTest.java | 4 ----
.../org/apache/jena/permissions/model/SecuredResourceTest.java | 1 -
.../org/apache/jena/permissions/model/SecuredStatementTest.java | 1 -
5 files changed, 3 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/6889895a/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 d872dc5..5109465 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
@@ -154,7 +154,7 @@ public interface SecuredGraph extends Graph, SecuredItem
/**
* @sec.graph Update
* @sec.triple Delete (s, p, o )
- *@throws DeleteDeniesException
+ * @throws DeleteDeniedException
*/
@Override
public void remove( Node s, Node p, Node o ) throws DeleteDeniedException;
http://git-wip-us.apache.org/repos/asf/jena/blob/6889895a/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 44c6601..f81e9f6 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
@@ -704,7 +704,8 @@ public interface SecuredModel extends Model, SecuredPrefixMapping
/**
* @sec.graph Update
* @sec.triple Create SecTriple( s, p, o )
- * @throws AccessDeniedRuntimeException
+ * @throws AddDeniedException
+ * @throws UpdateDeniedException
*/
@Override
public SecuredStatement createStatement( final Resource s,
http://git-wip-us.apache.org/repos/asf/jena/blob/6889895a/jena-permissions/src/test/java/org/apache/jena/permissions/model/SecuredReifiedStatementTest.java
----------------------------------------------------------------------
diff --git a/jena-permissions/src/test/java/org/apache/jena/permissions/model/SecuredReifiedStatementTest.java b/jena-permissions/src/test/java/org/apache/jena/permissions/model/SecuredReifiedStatementTest.java
index 41cbe0f..55a0771 100644
--- a/jena-permissions/src/test/java/org/apache/jena/permissions/model/SecuredReifiedStatementTest.java
+++ b/jena-permissions/src/test/java/org/apache/jena/permissions/model/SecuredReifiedStatementTest.java
@@ -52,10 +52,6 @@ public class SecuredReifiedStatementTest extends SecuredResourceTest {
stmt);
}
- /**
- * @sec.graph Read
- * @throws AccessDeniedRuntimeException
- */
@Test
public void testGetStatement() {
try {
http://git-wip-us.apache.org/repos/asf/jena/blob/6889895a/jena-permissions/src/test/java/org/apache/jena/permissions/model/SecuredResourceTest.java
----------------------------------------------------------------------
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 08386c4..b47457f 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
@@ -59,7 +59,6 @@ public class SecuredResourceTest extends SecuredRDFNodeTest {
/**
* @sec.graph Update
* @sec.triple Create (this, p, o )
- * @throws AccessDeniedRuntimeException
*/
@Test
public void testAddLiteralBoolean() {
http://git-wip-us.apache.org/repos/asf/jena/blob/6889895a/jena-permissions/src/test/java/org/apache/jena/permissions/model/SecuredStatementTest.java
----------------------------------------------------------------------
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 fb131a4..d897e6e 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
@@ -71,7 +71,6 @@ public class SecuredStatementTest {
/**
* @sec.graph Update
* @sec.triple Update
- * @throws AccessDeniedRuntimeException
*/
@Test
public void testChangeLiteralObject() {
[12/12] jena git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/jena
Posted by an...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/jena
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/01f85230
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/01f85230
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/01f85230
Branch: refs/heads/master
Commit: 01f852309bcef8f982ea21ae9994c14b7da5da55
Parents: 2b9511f 26d9f03
Author: Andy Seaborne <an...@apache.org>
Authored: Tue Jul 21 21:35:04 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Tue Jul 21 21:35:04 2015 +0100
----------------------------------------------------------------------
----------------------------------------------------------------------
[04/12] jena git commit: Fixed mock conflict in SecuredItemImplTest.
part of the fix for JENA-990
Posted by an...@apache.org.
Fixed mock conflict in SecuredItemImplTest.
part of the fix for JENA-990
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/b67d5af1
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/b67d5af1
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/b67d5af1
Branch: refs/heads/master
Commit: b67d5af1dc84baa6c4b093394e92cebbe5198273
Parents: 68d0072
Author: Claude Warren <cl...@apache.org>
Authored: Sun Jul 19 11:29:43 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Tue Jul 21 21:33:40 2015 +0100
----------------------------------------------------------------------
.../jena/permissions/impl/SecuredItemImplTest.java | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/b67d5af1/jena-permissions/src/test/java/org/apache/jena/permissions/impl/SecuredItemImplTest.java
----------------------------------------------------------------------
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 22c992d..8e18555 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
@@ -53,7 +53,7 @@ public class SecuredItemImplTest {
{
// Triple.ANY
when( evaluator.getPrincipal() ).thenReturn( PRINCIPAL );
- when( evaluator.evaluate( any(), any(), any(), any())).thenReturn( Boolean.TRUE);
+ when( evaluator.evaluate( anyObject(), any(SecurityEvaluator.Action.class), any(Node.class), any(Triple.class))).thenReturn( Boolean.TRUE);
assertTrue( securedItemImpl.canRead( Triple.ANY ) );
verify( evaluator ).evaluate( principal.capture(), action.capture(), modelNode.capture(), triple.capture());
@@ -75,7 +75,7 @@ public class SecuredItemImplTest {
// FUTURE ANY Variable
when( evaluator.getPrincipal() ).thenReturn( PRINCIPAL );
- when( evaluator.evaluate( any(), any(), any(), any())).thenReturn( Boolean.TRUE);
+ when( evaluator.evaluate( anyObject(), any(SecurityEvaluator.Action.class), any(Node.class), any(Triple.class))).thenReturn( Boolean.TRUE);
Triple target = new Triple( SecurityEvaluator.FUTURE, Node.ANY, Var.alloc( "var"));
assertTrue( securedItemImpl.canRead( target ) );
verify( evaluator ).evaluate( principal.capture(), action.capture(), modelNode.capture(), triple.capture());
@@ -100,7 +100,7 @@ public class SecuredItemImplTest {
{
// Triple.ANY
when( evaluator.getPrincipal() ).thenReturn( PRINCIPAL );
- when( evaluator.evaluate( any(), any(), any(), any())).thenReturn( Boolean.TRUE);
+ when( evaluator.evaluate( anyObject(), any(SecurityEvaluator.Action.class), any(Node.class), any(Triple.class))).thenReturn( Boolean.TRUE);
assertTrue( securedItemImpl.canCreate( Triple.ANY ) );
verify( evaluator ).evaluate( principal.capture(), action.capture(), modelNode.capture(), triple.capture());
@@ -122,7 +122,7 @@ public class SecuredItemImplTest {
// FUTURE ANY Variable
when( evaluator.getPrincipal() ).thenReturn( PRINCIPAL );
- when( evaluator.evaluate( any(), any(), any(), any())).thenReturn( Boolean.TRUE);
+ when( evaluator.evaluate( anyObject(), any(SecurityEvaluator.Action.class), any(Node.class), any(Triple.class))).thenReturn( Boolean.TRUE);
Triple target = new Triple( SecurityEvaluator.FUTURE, Node.ANY, Var.alloc( "var"));
assertTrue( securedItemImpl.canCreate( target ) );
verify( evaluator ).evaluate( principal.capture(), action.capture(), modelNode.capture(), triple.capture());
@@ -147,7 +147,7 @@ public class SecuredItemImplTest {
{
// Triple.ANY
when( evaluator.getPrincipal() ).thenReturn( PRINCIPAL );
- when( evaluator.evaluateUpdate( any(), any(), any(), any())).thenReturn( Boolean.TRUE);
+ when( evaluator.evaluateUpdate( anyObject(), any(Node.class), any(Triple.class), any(Triple.class))).thenReturn( Boolean.TRUE);
assertTrue( securedItemImpl.canUpdate( Triple.ANY, Triple.ANY ) );
verify( evaluator ).evaluateUpdate( principal.capture(), modelNode.capture(), triple.capture(), any());
@@ -166,7 +166,7 @@ public class SecuredItemImplTest {
// FUTURE ANY Variable
when( evaluator.getPrincipal() ).thenReturn( PRINCIPAL );
- when( evaluator.evaluateUpdate( any(), any(), any(), any())).thenReturn( Boolean.TRUE);
+ when( evaluator.evaluateUpdate( anyObject(), any(Node.class), any(Triple.class), any(Triple.class))).thenReturn( Boolean.TRUE);
Triple target = new Triple( SecurityEvaluator.FUTURE, Node.ANY, Var.alloc( "var"));
assertTrue( securedItemImpl.canUpdate( target, Triple.ANY ) );
verify( evaluator ).evaluateUpdate( principal.capture(), modelNode.capture(), triple.capture(), any());
@@ -188,7 +188,7 @@ public class SecuredItemImplTest {
{
// Triple.ANY
when( evaluator.getPrincipal() ).thenReturn( PRINCIPAL );
- when( evaluator.evaluate( any(), any(), any(), any())).thenReturn( Boolean.TRUE);
+ when( evaluator.evaluate( anyObject(), any(SecurityEvaluator.Action.class), any(Node.class), any(Triple.class))).thenReturn( Boolean.TRUE);
assertTrue( securedItemImpl.canDelete( Triple.ANY ) );
verify( evaluator ).evaluate( principal.capture(), action.capture(), modelNode.capture(), triple.capture());
@@ -210,7 +210,7 @@ public class SecuredItemImplTest {
// FUTURE ANY Variable
when( evaluator.getPrincipal() ).thenReturn( PRINCIPAL );
- when( evaluator.evaluate( any(), any(), any(), any())).thenReturn( Boolean.TRUE);
+ when( evaluator.evaluate( anyObject(), any(SecurityEvaluator.Action.class), any(Node.class), any(Triple.class))).thenReturn( Boolean.TRUE);
Triple target = new Triple( SecurityEvaluator.FUTURE, Node.ANY, Var.alloc( "var"));
assertTrue( securedItemImpl.canDelete( target ) );
verify( evaluator ).evaluate( principal.capture(), action.capture(), modelNode.capture(), triple.capture());