Author: andy
Date: Tue Jun 24 13:10:21 2014
New Revision: 1605074
URL: http://svn.apache.org/r1605074
Log:
Align of removal of 'reification style' from jena-core
Modified:
jena/trunk/jena-security/src/main/java/org/apache/jena/security/graph/impl/SecuredBulkUpdateHandlerImpl.java
jena/trunk/jena-security/src/main/java/org/apache/jena/security/graph/impl/SecuredGraphImpl.java
jena/trunk/jena-security/src/main/java/org/apache/jena/security/model/SecuredAlt.java
jena/trunk/jena-security/src/main/java/org/apache/jena/security/model/SecuredModel.java
jena/trunk/jena-security/src/main/java/org/apache/jena/security/model/impl/SecuredContainerImpl.java
jena/trunk/jena-security/src/main/java/org/apache/jena/security/model/impl/SecuredModelImpl.java
jena/trunk/jena-security/src/main/java/org/apache/jena/security/model/impl/SecuredNodeIterator.java
jena/trunk/jena-security/src/main/java/org/apache/jena/security/model/impl/SecuredResourceImpl.java
jena/trunk/jena-security/src/main/java/org/apache/jena/security/model/impl/SecuredSeqImpl.java
jena/trunk/jena-security/src/main/java/org/apache/jena/security/model/impl/SecuredStatementImpl.java
jena/trunk/jena-security/src/main/java/org/apache/jena/security/utils/PermStatementFilter.java
jena/trunk/jena-security/src/main/java/org/apache/jena/security/utils/PermTripleFilter.java
jena/trunk/jena-security/src/test/java/org/apache/jena/security/MockPrefixMapping.java
jena/trunk/jena-security/src/test/java/org/apache/jena/security/MockSecurityEvaluator.java
jena/trunk/jena-security/src/test/java/org/apache/jena/security/graph/GraphEventManagerTest.java
jena/trunk/jena-security/src/test/java/org/apache/jena/security/graph/MemGraphTest.java
jena/trunk/jena-security/src/test/java/org/apache/jena/security/model/SecuredModelTest.java
jena/trunk/jena-security/src/test/java/org/apache/jena/security/model/SecuredRDFListTest.java
Modified:
jena/trunk/jena-security/src/main/java/org/apache/jena/security/graph/impl/SecuredBulkUpdateHandlerImpl.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-security/src/main/java/org/apache/jena/security/graph/impl/SecuredBulkUpdateHandlerImpl.java?rev=1605074&r1=1605073&r2=1605074&view=diff
==============================================================================
---
jena/trunk/jena-security/src/main/java/org/apache/jena/security/graph/impl/SecuredBulkUpdateHandlerImpl.java
(original)
+++
jena/trunk/jena-security/src/main/java/org/apache/jena/security/graph/impl/SecuredBulkUpdateHandlerImpl.java
Tue Jun 24 13:10:21 2014
@@ -37,6 +37,7 @@ import org.apache.jena.security.impl.Sec
* Implementation of SecuredBulkUpdateHandler to be used by a
SecuredItemInvoker
* proxy.
*/
+@SuppressWarnings("deprecation")
public class SecuredBulkUpdateHandlerImpl extends SecuredItemImpl implements
SecuredBulkUpdateHandler
{
@@ -214,7 +215,7 @@ public class SecuredBulkUpdateHandlerImp
holder.getBaseItem().delete(triples);
}
- @Override
+ @Override
public void remove( final Node s, final Node p, final Node o )
{
checkUpdate();
Modified:
jena/trunk/jena-security/src/main/java/org/apache/jena/security/graph/impl/SecuredGraphImpl.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-security/src/main/java/org/apache/jena/security/graph/impl/SecuredGraphImpl.java?rev=1605074&r1=1605073&r2=1605074&view=diff
==============================================================================
---
jena/trunk/jena-security/src/main/java/org/apache/jena/security/graph/impl/SecuredGraphImpl.java
(original)
+++
jena/trunk/jena-security/src/main/java/org/apache/jena/security/graph/impl/SecuredGraphImpl.java
Tue Jun 24 13:10:21 2014
@@ -181,7 +181,8 @@ public class SecuredGraphImpl extends Se
return retval;
}
- @Override
+ @SuppressWarnings("deprecation")
+ @Override
public SecuredBulkUpdateHandler getBulkUpdateHandler()
{
return
org.apache.jena.security.graph.impl.Factory.getInstance(this,
Modified:
jena/trunk/jena-security/src/main/java/org/apache/jena/security/model/SecuredAlt.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-security/src/main/java/org/apache/jena/security/model/SecuredAlt.java?rev=1605074&r1=1605073&r2=1605074&view=diff
==============================================================================
---
jena/trunk/jena-security/src/main/java/org/apache/jena/security/model/SecuredAlt.java
(original)
+++
jena/trunk/jena-security/src/main/java/org/apache/jena/security/model/SecuredAlt.java
Tue Jun 24 13:10:21 2014
@@ -28,6 +28,7 @@ import org.apache.jena.security.AccessDe
*
* Use the SecuredAlt.Factory to create instances
*/
+@SuppressWarnings("deprecation")
public interface SecuredAlt extends Alt, SecuredContainer
{
/**
Modified:
jena/trunk/jena-security/src/main/java/org/apache/jena/security/model/SecuredModel.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-security/src/main/java/org/apache/jena/security/model/SecuredModel.java?rev=1605074&r1=1605073&r2=1605074&view=diff
==============================================================================
---
jena/trunk/jena-security/src/main/java/org/apache/jena/security/model/SecuredModel.java
(original)
+++
jena/trunk/jena-security/src/main/java/org/apache/jena/security/model/SecuredModel.java
Tue Jun 24 13:10:21 2014
@@ -17,39 +17,27 @@
*/
package org.apache.jena.security.model;
-import com.hp.hpl.jena.datatypes.RDFDatatype;
-import com.hp.hpl.jena.graph.Node;
-import com.hp.hpl.jena.graph.Triple;
-import com.hp.hpl.jena.rdf.model.AnonId;
-import com.hp.hpl.jena.rdf.model.Literal;
-import com.hp.hpl.jena.rdf.model.Model;
-import com.hp.hpl.jena.rdf.model.ModelChangedListener;
-import com.hp.hpl.jena.rdf.model.NsIterator;
-import com.hp.hpl.jena.rdf.model.Property;
-import com.hp.hpl.jena.rdf.model.RDFNode;
-import com.hp.hpl.jena.rdf.model.ReifiedStatement;
-import com.hp.hpl.jena.rdf.model.Resource;
-import com.hp.hpl.jena.rdf.model.ResourceF;
-import com.hp.hpl.jena.rdf.model.Selector;
-import com.hp.hpl.jena.rdf.model.Statement;
-import com.hp.hpl.jena.rdf.model.StmtIterator;
-import com.hp.hpl.jena.shared.PropertyNotFoundException;
-
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.Reader;
-import java.io.Writer;
-import java.util.Calendar;
-import java.util.Iterator;
-import java.util.List;
-
-import org.apache.jena.security.AccessDeniedException;
-import org.apache.jena.security.graph.SecuredGraph;
-import org.apache.jena.security.graph.SecuredPrefixMapping;
-import org.apache.jena.security.model.impl.SecuredNodeIterator;
-import org.apache.jena.security.model.impl.SecuredRSIterator;
-import org.apache.jena.security.model.impl.SecuredResIterator;
-import org.apache.jena.security.model.impl.SecuredStatementIterator;
+import java.io.InputStream ;
+import java.io.OutputStream ;
+import java.io.Reader ;
+import java.io.Writer ;
+import java.util.Calendar ;
+import java.util.Iterator ;
+import java.util.List ;
+
+import org.apache.jena.security.AccessDeniedException ;
+import org.apache.jena.security.graph.SecuredGraph ;
+import org.apache.jena.security.graph.SecuredPrefixMapping ;
+import org.apache.jena.security.model.impl.SecuredNodeIterator ;
+import org.apache.jena.security.model.impl.SecuredRSIterator ;
+import org.apache.jena.security.model.impl.SecuredResIterator ;
+import org.apache.jena.security.model.impl.SecuredStatementIterator ;
+
+import com.hp.hpl.jena.datatypes.RDFDatatype ;
+import com.hp.hpl.jena.graph.Node ;
+import com.hp.hpl.jena.graph.Triple ;
+import com.hp.hpl.jena.rdf.model.* ;
+import com.hp.hpl.jena.shared.PropertyNotFoundException ;
/**
* The interface for secured Model instances.
@@ -81,16 +69,6 @@ public interface SecuredModel extends Mo
/**
* @sec.graph Update
- * @sec.triple Create for each statement in the securedModel as a
triple.
- * @sec.triple Create for each reified statement if not
supressReifications.
- * @throws AccessDeniedException
- */
- @Override
- public SecuredModel add( final Model m, final boolean
suppressReifications )
- throws AccessDeniedException;
-
- /**
- * @sec.graph Update
* @sec.triple Create the triple SecTriple(s,p,o)
* @throws AccessDeniedException
*/
@@ -802,7 +780,7 @@ public interface SecuredModel extends Mo
* reification did not exist
* @sec.triple Create SecTriple( result, RDF.object, s.getObject() ) if
* reification did not exist
- * @throws AccessDeniedException.
+ * @throws AccessDeniedException
*/
@Override
public SecuredResource getAnyReifiedStatement( final Statement s )
@@ -1018,7 +996,7 @@ public interface SecuredModel extends Mo
* @throws AccessDeniedException
*/
@Override
- public SecuredNodeIterator listObjects() throws AccessDeniedException;
+ public SecuredNodeIterator<RDFNode> listObjects() throws
AccessDeniedException;
/**
*
@@ -1027,7 +1005,7 @@ public interface SecuredModel extends Mo
* @throws AccessDeniedException
*/
@Override
- public SecuredNodeIterator listObjectsOfProperty( final Property p )
+ public SecuredNodeIterator<RDFNode> listObjectsOfProperty( final
Property p )
throws AccessDeniedException;
/**
@@ -1037,7 +1015,7 @@ public interface SecuredModel extends Mo
* @throws AccessDeniedException
*/
@Override
- public SecuredNodeIterator listObjectsOfProperty( final Resource s,
+ public SecuredNodeIterator<RDFNode> listObjectsOfProperty( final
Resource s,
final Property p ) throws AccessDeniedException;
/**
@@ -1391,24 +1369,11 @@ public interface SecuredModel extends Mo
/**
*
* @sec.graph Update
- * @sec.triple Delete on every statement in baseModel.
- * @sec.triple Delete on every statement in reified statements if
- * suppressReifications is false.
- * @throws AccessDeniedException
- */
- @Override
- public SecuredModel remove( final Model m,
- final boolean suppressReifications ) throws
AccessDeniedException;
-
- /**
- *
- * @sec.graph Update
* @sec.triple Delete on SecTriple( s, p, o )
* @throws AccessDeniedException
*/
@Override
- public SecuredModel remove( final Resource s, final Property p,
- final RDFNode o ) throws AccessDeniedException;
+ public SecuredModel remove( final Resource s, final Property p, final
RDFNode o ) throws AccessDeniedException;
/**
*
Modified:
jena/trunk/jena-security/src/main/java/org/apache/jena/security/model/impl/SecuredContainerImpl.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-security/src/main/java/org/apache/jena/security/model/impl/SecuredContainerImpl.java?rev=1605074&r1=1605073&r2=1605074&view=diff
==============================================================================
---
jena/trunk/jena-security/src/main/java/org/apache/jena/security/model/impl/SecuredContainerImpl.java
(original)
+++
jena/trunk/jena-security/src/main/java/org/apache/jena/security/model/impl/SecuredContainerImpl.java
Tue Jun 24 13:10:21 2014
@@ -395,6 +395,7 @@ public class SecuredContainerImpl extend
* indexes.clear();
* }
*/
+ /*
/**
* find the position of i in the array
*
Modified:
jena/trunk/jena-security/src/main/java/org/apache/jena/security/model/impl/SecuredModelImpl.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-security/src/main/java/org/apache/jena/security/model/impl/SecuredModelImpl.java?rev=1605074&r1=1605073&r2=1605074&view=diff
==============================================================================
---
jena/trunk/jena-security/src/main/java/org/apache/jena/security/model/impl/SecuredModelImpl.java
(original)
+++
jena/trunk/jena-security/src/main/java/org/apache/jena/security/model/impl/SecuredModelImpl.java
Tue Jun 24 13:10:21 2014
@@ -17,76 +17,33 @@
*/
package org.apache.jena.security.model.impl;
-import com.hp.hpl.jena.datatypes.RDFDatatype;
-import com.hp.hpl.jena.graph.Node;
-import com.hp.hpl.jena.graph.NodeFactory;
-import com.hp.hpl.jena.graph.Triple;
-import com.hp.hpl.jena.graph.impl.CollectionGraph;
-import com.hp.hpl.jena.rdf.model.AnonId;
-import com.hp.hpl.jena.rdf.model.Literal;
-import com.hp.hpl.jena.rdf.model.Model;
-import com.hp.hpl.jena.rdf.model.ModelChangedListener;
-import com.hp.hpl.jena.rdf.model.ModelFactory;
-import com.hp.hpl.jena.rdf.model.NsIterator;
-import com.hp.hpl.jena.rdf.model.Property;
-import com.hp.hpl.jena.rdf.model.RDFNode;
-import com.hp.hpl.jena.rdf.model.RDFReader;
-import com.hp.hpl.jena.rdf.model.RDFReaderF;
-import com.hp.hpl.jena.rdf.model.RDFWriter;
-import com.hp.hpl.jena.rdf.model.RSIterator;
-import com.hp.hpl.jena.rdf.model.ReifiedStatement;
-import com.hp.hpl.jena.rdf.model.Resource;
-import com.hp.hpl.jena.rdf.model.ResourceF;
-import com.hp.hpl.jena.rdf.model.ResourceFactory;
-import com.hp.hpl.jena.rdf.model.Selector;
-import com.hp.hpl.jena.rdf.model.Statement;
-import com.hp.hpl.jena.rdf.model.StmtIterator;
-import com.hp.hpl.jena.rdf.model.impl.RDFReaderFImpl;
-import com.hp.hpl.jena.shared.Command;
-import com.hp.hpl.jena.shared.JenaException;
-import com.hp.hpl.jena.shared.Lock;
-import com.hp.hpl.jena.shared.PrefixMapping;
-import com.hp.hpl.jena.shared.PropertyNotFoundException;
-import com.hp.hpl.jena.shared.ReificationStyle;
-import com.hp.hpl.jena.shared.WrappedIOException;
-import com.hp.hpl.jena.util.iterator.ExtendedIterator;
-import com.hp.hpl.jena.util.iterator.Filter;
-import com.hp.hpl.jena.util.iterator.WrappedIterator;
-import com.hp.hpl.jena.vocabulary.RDF;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.Reader;
-import java.io.Writer;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Calendar;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.jena.security.AccessDeniedException;
-import org.apache.jena.security.SecurityEvaluator;
-import org.apache.jena.security.SecurityEvaluator.SecTriple;
-import org.apache.jena.security.graph.SecuredGraph;
-import org.apache.jena.security.graph.SecuredPrefixMapping;
-import org.apache.jena.security.impl.ItemHolder;
-import org.apache.jena.security.impl.SecuredItem;
-import org.apache.jena.security.impl.SecuredItemImpl;
-import org.apache.jena.security.impl.SecuredItemInvoker;
-import org.apache.jena.security.model.SecuredAlt;
-import org.apache.jena.security.model.SecuredBag;
-import org.apache.jena.security.model.SecuredLiteral;
-import org.apache.jena.security.model.SecuredModel;
-import org.apache.jena.security.model.SecuredProperty;
-import org.apache.jena.security.model.SecuredRDFList;
-import org.apache.jena.security.model.SecuredRDFNode;
-import org.apache.jena.security.model.SecuredResource;
-import org.apache.jena.security.model.SecuredSeq;
-import org.apache.jena.security.model.SecuredStatement;
+import java.io.* ;
+import java.net.URL ;
+import java.util.* ;
+
+import org.apache.jena.security.AccessDeniedException ;
+import org.apache.jena.security.SecurityEvaluator ;
+import org.apache.jena.security.SecurityEvaluator.SecTriple ;
+import org.apache.jena.security.graph.SecuredGraph ;
+import org.apache.jena.security.graph.SecuredPrefixMapping ;
+import org.apache.jena.security.impl.ItemHolder ;
+import org.apache.jena.security.impl.SecuredItem ;
+import org.apache.jena.security.impl.SecuredItemImpl ;
+import org.apache.jena.security.impl.SecuredItemInvoker ;
+import org.apache.jena.security.model.* ;
+
+import com.hp.hpl.jena.datatypes.RDFDatatype ;
+import com.hp.hpl.jena.graph.Node ;
+import com.hp.hpl.jena.graph.NodeFactory ;
+import com.hp.hpl.jena.graph.Triple ;
+import com.hp.hpl.jena.graph.impl.CollectionGraph ;
+import com.hp.hpl.jena.rdf.model.* ;
+import com.hp.hpl.jena.rdf.model.impl.RDFReaderFImpl ;
+import com.hp.hpl.jena.shared.* ;
+import com.hp.hpl.jena.util.iterator.ExtendedIterator ;
+import com.hp.hpl.jena.util.iterator.Filter ;
+import com.hp.hpl.jena.util.iterator.WrappedIterator ;
+import com.hp.hpl.jena.vocabulary.RDF ;
/**
* Implementation of SecuredModel to be used by a SecuredItemInvoker proxy.
@@ -430,12 +387,6 @@ public class SecuredModelImpl extends Se
}
@Override
- public SecuredModel add( final Model m, final boolean
suppressReifications )
- {
- return add( m );
- }
-
- @Override
public SecuredModel add( final Resource s, final Property p, final
RDFNode o )
{
checkUpdate();
@@ -1599,12 +1550,6 @@ public class SecuredModelImpl extends Se
}
@Override
- public ReificationStyle getReificationStyle()
- {
- return holder.getBaseItem().getReificationStyle();
- }
-
- @Override
public SecuredStatement getRequiredProperty( final Resource s,
final Property p )
{
@@ -2307,13 +2252,6 @@ public class SecuredModelImpl extends Se
@Override
public SecuredModel remove( final Model m )
{
- return remove(m, false);
- }
-
- @Override
- public SecuredModel remove( final Model m,
- final boolean suppressReifications )
- {
checkUpdate();
if (!canDelete(Triple.ANY))
{
@@ -2324,51 +2262,6 @@ public class SecuredModelImpl extends Se
{
final Statement stmt = iter.next();
checkDelete(stmt);
-
- if (suppressReifications)
- {
- final RSIterator rIter =
holder.getBaseItem()
-
.listReifiedStatements(stmt);
- try
- {
- while (rIter.hasNext())
- {
- final
ReifiedStatement rs = rIter.next();
- final
ExtendedIterator<Statement> tIter = holder
-
.getBaseItem()
-
.listStatements(rs, RDF.subject,
-
stmt.getSubject())
-
.andThen(
-
holder.getBaseItem()
-
.listStatements(
-
rs,
-
RDF.predicate,
-
stmt.getPredicate()))
-
.andThen(
-
holder.getBaseItem()
-
.listStatements(
-
rs,
-
RDF.object,
-
stmt.getObject()));
-
- try
- {
- while
(tIter.hasNext())
- {
-
checkDelete(tIter.next().asTriple());
- }
- }
- finally
- {
-
tIter.close();
- }
- }
- }
- finally
- {
- rIter.close();
- }
- }
}
}
finally
@@ -2376,14 +2269,13 @@ public class SecuredModelImpl extends Se
iter.close();
}
}
- holder.getBaseItem().remove(m, suppressReifications);
+ holder.getBaseItem().remove(m);
return holder.getSecuredItem();
}
@Override
- public SecuredModel remove( final Resource s, final Property p,
- final RDFNode o )
+ public SecuredModel remove( final Resource s, final Property p, final
RDFNode o )
{
checkUpdate();
checkDelete(new Triple(s.asNode(), p.asNode(), o.asNode()));
Modified:
jena/trunk/jena-security/src/main/java/org/apache/jena/security/model/impl/SecuredNodeIterator.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-security/src/main/java/org/apache/jena/security/model/impl/SecuredNodeIterator.java?rev=1605074&r1=1605073&r2=1605074&view=diff
==============================================================================
---
jena/trunk/jena-security/src/main/java/org/apache/jena/security/model/impl/SecuredNodeIterator.java
(original)
+++
jena/trunk/jena-security/src/main/java/org/apache/jena/security/model/impl/SecuredNodeIterator.java
Tue Jun 24 13:10:21 2014
@@ -36,7 +36,7 @@ import org.apache.jena.security.model.Se
*/
public class SecuredNodeIterator<T extends RDFNode> implements NodeIterator
{
- private class PermNodeMap<T extends RDFNode> implements Map1<T, RDFNode>
+ private class PermNodeMap<N extends RDFNode> implements Map1<N, RDFNode>
{
private final SecuredModel securedModel;
Modified:
jena/trunk/jena-security/src/main/java/org/apache/jena/security/model/impl/SecuredResourceImpl.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-security/src/main/java/org/apache/jena/security/model/impl/SecuredResourceImpl.java?rev=1605074&r1=1605073&r2=1605074&view=diff
==============================================================================
---
jena/trunk/jena-security/src/main/java/org/apache/jena/security/model/impl/SecuredResourceImpl.java
(original)
+++
jena/trunk/jena-security/src/main/java/org/apache/jena/security/model/impl/SecuredResourceImpl.java
Tue Jun 24 13:10:21 2014
@@ -17,32 +17,23 @@
*/
package org.apache.jena.security.model.impl;
-import com.hp.hpl.jena.datatypes.RDFDatatype;
-import com.hp.hpl.jena.graph.Node;
-import com.hp.hpl.jena.graph.Triple;
-import com.hp.hpl.jena.rdf.model.AnonId;
-import com.hp.hpl.jena.rdf.model.Literal;
-import com.hp.hpl.jena.rdf.model.LiteralRequiredException;
-import com.hp.hpl.jena.rdf.model.Model;
-import com.hp.hpl.jena.rdf.model.Property;
-import com.hp.hpl.jena.rdf.model.RDFNode;
-import com.hp.hpl.jena.rdf.model.RDFVisitor;
-import com.hp.hpl.jena.rdf.model.Resource;
-import com.hp.hpl.jena.rdf.model.ResourceFactory;
-import com.hp.hpl.jena.rdf.model.Statement;
-import com.hp.hpl.jena.rdf.model.StmtIterator;
-import com.hp.hpl.jena.shared.PropertyNotFoundException;
-import com.hp.hpl.jena.util.iterator.ExtendedIterator;
-
-import org.apache.jena.security.AccessDeniedException;
-import org.apache.jena.security.SecurityEvaluator.Action;
-import org.apache.jena.security.impl.ItemHolder;
-import org.apache.jena.security.impl.SecuredItemImpl;
-import org.apache.jena.security.impl.SecuredItemInvoker;
-import org.apache.jena.security.model.SecuredModel;
-import org.apache.jena.security.model.SecuredResource;
-import org.apache.jena.security.model.SecuredStatement;
-import org.apache.jena.security.utils.PermStatementFilter;
+import org.apache.jena.security.AccessDeniedException ;
+import org.apache.jena.security.SecurityEvaluator.Action ;
+import org.apache.jena.security.impl.ItemHolder ;
+import org.apache.jena.security.impl.SecuredItemImpl ;
+import org.apache.jena.security.impl.SecuredItemInvoker ;
+import org.apache.jena.security.model.SecuredModel ;
+import org.apache.jena.security.model.SecuredResource ;
+import org.apache.jena.security.model.SecuredStatement ;
+import org.apache.jena.security.utils.PermStatementFilter ;
+
+import com.hp.hpl.jena.datatypes.RDFDatatype ;
+import com.hp.hpl.jena.graph.Node ;
+import com.hp.hpl.jena.graph.NodeFactory ;
+import com.hp.hpl.jena.graph.Triple ;
+import com.hp.hpl.jena.rdf.model.* ;
+import com.hp.hpl.jena.shared.PropertyNotFoundException ;
+import com.hp.hpl.jena.util.iterator.ExtendedIterator ;
/**
* Implementation of SecuredResource to be used by a SecuredItemInvoker proxy.
@@ -328,7 +319,7 @@ public class SecuredResourceImpl extends
{
checkUpdate();
checkCreate(new Triple(holder.getBaseItem().asNode(),
p.asNode(),
- Node.createLiteral(o, l, false)));
+ NodeFactory.createLiteral(o, l, false)));
holder.getBaseItem().addProperty(p, o, l);
return holder.getSecuredItem();
}
Modified:
jena/trunk/jena-security/src/main/java/org/apache/jena/security/model/impl/SecuredSeqImpl.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-security/src/main/java/org/apache/jena/security/model/impl/SecuredSeqImpl.java?rev=1605074&r1=1605073&r2=1605074&view=diff
==============================================================================
---
jena/trunk/jena-security/src/main/java/org/apache/jena/security/model/impl/SecuredSeqImpl.java
(original)
+++
jena/trunk/jena-security/src/main/java/org/apache/jena/security/model/impl/SecuredSeqImpl.java
Tue Jun 24 13:10:21 2014
@@ -17,29 +17,15 @@
*/
package org.apache.jena.security.model.impl;
-import com.hp.hpl.jena.graph.Triple;
-import com.hp.hpl.jena.rdf.model.Alt;
-import com.hp.hpl.jena.rdf.model.Bag;
-import com.hp.hpl.jena.rdf.model.Literal;
-import com.hp.hpl.jena.rdf.model.RDFNode;
-import com.hp.hpl.jena.rdf.model.Resource;
-import com.hp.hpl.jena.rdf.model.ResourceF;
-import com.hp.hpl.jena.rdf.model.ResourceFactory;
-import com.hp.hpl.jena.rdf.model.Seq;
-import com.hp.hpl.jena.rdf.model.Statement;
-import com.hp.hpl.jena.util.iterator.ExtendedIterator;
-import com.hp.hpl.jena.util.iterator.Filter;
-import com.hp.hpl.jena.vocabulary.RDF;
-
-import org.apache.jena.security.impl.ItemHolder;
-import org.apache.jena.security.impl.SecuredItemInvoker;
-import org.apache.jena.security.model.SecuredAlt;
-import org.apache.jena.security.model.SecuredBag;
-import org.apache.jena.security.model.SecuredLiteral;
-import org.apache.jena.security.model.SecuredModel;
-import org.apache.jena.security.model.SecuredRDFNode;
-import org.apache.jena.security.model.SecuredResource;
-import org.apache.jena.security.model.SecuredSeq;
+import org.apache.jena.security.impl.ItemHolder ;
+import org.apache.jena.security.impl.SecuredItemInvoker ;
+import org.apache.jena.security.model.* ;
+
+import com.hp.hpl.jena.graph.Triple ;
+import com.hp.hpl.jena.rdf.model.* ;
+import com.hp.hpl.jena.util.iterator.ExtendedIterator ;
+import com.hp.hpl.jena.util.iterator.Filter ;
+import com.hp.hpl.jena.vocabulary.RDF ;
/**
* Implementation of SecuredSeq to be used by a SecuredItemInvoker proxy.
Modified:
jena/trunk/jena-security/src/main/java/org/apache/jena/security/model/impl/SecuredStatementImpl.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-security/src/main/java/org/apache/jena/security/model/impl/SecuredStatementImpl.java?rev=1605074&r1=1605073&r2=1605074&view=diff
==============================================================================
---
jena/trunk/jena-security/src/main/java/org/apache/jena/security/model/impl/SecuredStatementImpl.java
(original)
+++
jena/trunk/jena-security/src/main/java/org/apache/jena/security/model/impl/SecuredStatementImpl.java
Tue Jun 24 13:10:21 2014
@@ -17,30 +17,15 @@
*/
package org.apache.jena.security.model.impl;
-import com.hp.hpl.jena.graph.Node;
-import com.hp.hpl.jena.graph.Triple;
-import com.hp.hpl.jena.rdf.model.Property;
-import com.hp.hpl.jena.rdf.model.RDFNode;
-import com.hp.hpl.jena.rdf.model.RSIterator;
-import com.hp.hpl.jena.rdf.model.ReifiedStatement;
-import com.hp.hpl.jena.rdf.model.ResourceF;
-import com.hp.hpl.jena.rdf.model.Statement;
-import com.hp.hpl.jena.rdf.model.StmtIterator;
-import com.hp.hpl.jena.shared.PropertyNotFoundException;
-
-import org.apache.jena.security.impl.ItemHolder;
-import org.apache.jena.security.impl.SecuredItemImpl;
-import org.apache.jena.security.impl.SecuredItemInvoker;
-import org.apache.jena.security.model.SecuredAlt;
-import org.apache.jena.security.model.SecuredBag;
-import org.apache.jena.security.model.SecuredLiteral;
-import org.apache.jena.security.model.SecuredModel;
-import org.apache.jena.security.model.SecuredProperty;
-import org.apache.jena.security.model.SecuredRDFNode;
-import org.apache.jena.security.model.SecuredReifiedStatement;
-import org.apache.jena.security.model.SecuredResource;
-import org.apache.jena.security.model.SecuredSeq;
-import org.apache.jena.security.model.SecuredStatement;
+import org.apache.jena.security.impl.ItemHolder ;
+import org.apache.jena.security.impl.SecuredItemImpl ;
+import org.apache.jena.security.impl.SecuredItemInvoker ;
+import org.apache.jena.security.model.* ;
+
+import com.hp.hpl.jena.graph.NodeFactory ;
+import com.hp.hpl.jena.graph.Triple ;
+import com.hp.hpl.jena.rdf.model.* ;
+import com.hp.hpl.jena.shared.PropertyNotFoundException ;
/**
* Implementation of SecuredStatement to be used by a SecuredItemInvoker proxy.
@@ -234,7 +219,7 @@ public class SecuredStatementImpl extend
checkUpdate();
final Triple base = holder.getBaseItem().asTriple();
final Triple newBase = new Triple(base.getSubject(),
- base.getPredicate(), Node.createLiteral(o, "",
wellFormed));
+ base.getPredicate(),
NodeFactory.createLiteral(o, "", wellFormed));
checkUpdate(base, newBase);
return SecuredStatementImpl.getInstance(getModel(), holder
.getBaseItem().changeObject(o));
@@ -246,7 +231,7 @@ public class SecuredStatementImpl extend
checkUpdate();
final Triple base = holder.getBaseItem().asTriple();
final Triple newBase = new Triple(base.getSubject(),
- base.getPredicate(), Node.createLiteral(o, l,
false));
+ base.getPredicate(),
NodeFactory.createLiteral(o, l, false));
checkUpdate(base, newBase);
return SecuredStatementImpl.getInstance(getModel(), holder
.getBaseItem().changeObject(o, l));
@@ -259,7 +244,7 @@ public class SecuredStatementImpl extend
checkUpdate();
final Triple base = holder.getBaseItem().asTriple();
final Triple newBase = new Triple(base.getSubject(),
- base.getPredicate(), Node.createLiteral(o, l,
wellFormed));
+ base.getPredicate(),
NodeFactory.createLiteral(o, l, wellFormed));
checkUpdate(base, newBase);
return SecuredStatementImpl.getInstance(getModel(), holder
.getBaseItem().changeObject(o, l, wellFormed));
@@ -379,8 +364,8 @@ public class SecuredStatementImpl extend
private Triple getNewTriple( final Triple t, final Object o )
{
- return new Triple(t.getSubject(), t.getPredicate(),
Node.createLiteral(
- String.valueOf(o), "", false));
+ return new Triple(t.getSubject(), t.getPredicate(),
+ NodeFactory.createLiteral(String.valueOf(o),
"", false));
}
@Override
Modified:
jena/trunk/jena-security/src/main/java/org/apache/jena/security/utils/PermStatementFilter.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-security/src/main/java/org/apache/jena/security/utils/PermStatementFilter.java?rev=1605074&r1=1605073&r2=1605074&view=diff
==============================================================================
---
jena/trunk/jena-security/src/main/java/org/apache/jena/security/utils/PermStatementFilter.java
(original)
+++
jena/trunk/jena-security/src/main/java/org/apache/jena/security/utils/PermStatementFilter.java
Tue Jun 24 13:10:21 2014
@@ -127,7 +127,6 @@ public class PermStatementFilter extends
this.modelNode = securedItem.getModelNode();
this.actions = SecurityEvaluator.Util.asSet(actions);
this.evaluator = securedItem.getSecurityEvaluator();
- ;
}
/**
Modified:
jena/trunk/jena-security/src/main/java/org/apache/jena/security/utils/PermTripleFilter.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-security/src/main/java/org/apache/jena/security/utils/PermTripleFilter.java?rev=1605074&r1=1605073&r2=1605074&view=diff
==============================================================================
---
jena/trunk/jena-security/src/main/java/org/apache/jena/security/utils/PermTripleFilter.java
(original)
+++
jena/trunk/jena-security/src/main/java/org/apache/jena/security/utils/PermTripleFilter.java
Tue Jun 24 13:10:21 2014
@@ -54,7 +54,6 @@ public class PermTripleFilter extends Fi
this.modelNode = securedItem.getModelNode();
this.actions = SecurityEvaluator.Util.asSet(new Action[] {
action });
this.evaluator = securedItem.getSecurityEvaluator();
- ;
}
/**
@@ -127,7 +126,6 @@ public class PermTripleFilter extends Fi
this.modelNode = securedItem.getModelNode();
this.actions = SecurityEvaluator.Util.asSet(actions);
this.evaluator = securedItem.getSecurityEvaluator();
- ;
}
/**
Modified:
jena/trunk/jena-security/src/test/java/org/apache/jena/security/MockPrefixMapping.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-security/src/test/java/org/apache/jena/security/MockPrefixMapping.java?rev=1605074&r1=1605073&r2=1605074&view=diff
==============================================================================
---
jena/trunk/jena-security/src/test/java/org/apache/jena/security/MockPrefixMapping.java
(original)
+++
jena/trunk/jena-security/src/test/java/org/apache/jena/security/MockPrefixMapping.java
Tue Jun 24 13:10:21 2014
@@ -101,5 +101,5 @@ public class MockPrefixMapping implement
public PrefixMapping withDefaultMappings( final PrefixMapping map )
{
throw new UnsupportedOperationException();
- };
+ }
}
\ No newline at end of file
Modified:
jena/trunk/jena-security/src/test/java/org/apache/jena/security/MockSecurityEvaluator.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-security/src/test/java/org/apache/jena/security/MockSecurityEvaluator.java?rev=1605074&r1=1605073&r2=1605074&view=diff
==============================================================================
---
jena/trunk/jena-security/src/test/java/org/apache/jena/security/MockSecurityEvaluator.java
(original)
+++
jena/trunk/jena-security/src/test/java/org/apache/jena/security/MockSecurityEvaluator.java
Tue Jun 24 13:10:21 2014
@@ -78,7 +78,7 @@ public class MockSecurityEvaluator imple
*
* @param action
* @param object
- * @return
+ * @return boolean
*/
public boolean evaluate( final Action action, final Resource object )
{
Modified:
jena/trunk/jena-security/src/test/java/org/apache/jena/security/graph/GraphEventManagerTest.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-security/src/test/java/org/apache/jena/security/graph/GraphEventManagerTest.java?rev=1605074&r1=1605073&r2=1605074&view=diff
==============================================================================
---
jena/trunk/jena-security/src/test/java/org/apache/jena/security/graph/GraphEventManagerTest.java
(original)
+++
jena/trunk/jena-security/src/test/java/org/apache/jena/security/graph/GraphEventManagerTest.java
Tue Jun 24 13:10:21 2014
@@ -164,6 +164,7 @@ public class GraphEventManagerTest
}
@Test
+ @SuppressWarnings("deprecation")
public void notifyAddTest()
{
final Set<Action> ADD = SecurityEvaluator.Util.asSet(new
Action[] {
@@ -230,7 +231,8 @@ public class GraphEventManagerTest
listener.reset();
}
- @Test
+ @SuppressWarnings("deprecation")
+ @Test
public void notifyDeleteTest()
{
final Set<Action> DELETE = SecurityEvaluator.Util.asSet(new
Action[] {
Modified:
jena/trunk/jena-security/src/test/java/org/apache/jena/security/graph/MemGraphTest.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-security/src/test/java/org/apache/jena/security/graph/MemGraphTest.java?rev=1605074&r1=1605073&r2=1605074&view=diff
==============================================================================
---
jena/trunk/jena-security/src/test/java/org/apache/jena/security/graph/MemGraphTest.java
(original)
+++
jena/trunk/jena-security/src/test/java/org/apache/jena/security/graph/MemGraphTest.java
Tue Jun 24 13:10:21 2014
@@ -63,7 +63,8 @@ public class MemGraphTest
return GraphFactory.createDefaultGraph();
}
- @Before
+ @SuppressWarnings("deprecation")
+ @Before
public void setUp() throws Exception
{
baseGraph = createGraph();
Modified:
jena/trunk/jena-security/src/test/java/org/apache/jena/security/model/SecuredModelTest.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-security/src/test/java/org/apache/jena/security/model/SecuredModelTest.java?rev=1605074&r1=1605073&r2=1605074&view=diff
==============================================================================
---
jena/trunk/jena-security/src/test/java/org/apache/jena/security/model/SecuredModelTest.java
(original)
+++
jena/trunk/jena-security/src/test/java/org/apache/jena/security/model/SecuredModelTest.java
Tue Jun 24 13:10:21 2014
@@ -17,48 +17,26 @@
*/
package org.apache.jena.security.model;
-import com.hp.hpl.jena.datatypes.xsd.XSDDatatype;
-import com.hp.hpl.jena.graph.Graph;
-import com.hp.hpl.jena.graph.Node;
-import com.hp.hpl.jena.graph.NodeFactory;
-import com.hp.hpl.jena.graph.Triple;
-import com.hp.hpl.jena.rdf.model.Model;
-import com.hp.hpl.jena.rdf.model.ModelFactory;
-import com.hp.hpl.jena.rdf.model.Property;
-import com.hp.hpl.jena.rdf.model.RDFNode;
-import com.hp.hpl.jena.rdf.model.Resource;
-import com.hp.hpl.jena.rdf.model.ResourceFactory;
-import com.hp.hpl.jena.rdf.model.Selector;
-import com.hp.hpl.jena.rdf.model.SimpleSelector;
-import com.hp.hpl.jena.rdf.model.Statement;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.CharArrayWriter;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.Reader;
-import java.io.StringReader;
-import java.io.Writer;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-
-import org.apache.jena.security.AccessDeniedException;
-import org.apache.jena.security.EqualityTester;
-import org.apache.jena.security.Factory;
-import org.apache.jena.security.MockSecurityEvaluator;
-import org.apache.jena.security.SecurityEvaluator;
-import org.apache.jena.security.SecurityEvaluatorParameters;
-import org.apache.jena.security.SecurityEvaluator.Action;
-import org.apache.jena.security.graph.SecuredGraph;
-import org.apache.jena.security.graph.SecuredPrefixMappingTest;
-import org.apache.jena.security.model.SecuredModel;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import java.io.* ;
+import java.net.URL ;
+import java.util.ArrayList ;
+import java.util.List ;
+import java.util.Set ;
+
+import org.apache.jena.security.* ;
+import org.apache.jena.security.SecurityEvaluator.Action ;
+import org.apache.jena.security.graph.SecuredGraph ;
+import org.apache.jena.security.graph.SecuredPrefixMappingTest ;
+import org.junit.Assert ;
+import org.junit.Before ;
+import org.junit.Test ;
+import org.junit.runner.RunWith ;
+
+import com.hp.hpl.jena.datatypes.xsd.XSDDatatype ;
+import com.hp.hpl.jena.graph.Graph ;
+import com.hp.hpl.jena.graph.NodeFactory ;
+import com.hp.hpl.jena.graph.Triple ;
+import com.hp.hpl.jena.rdf.model.* ;
@RunWith( value = SecurityEvaluatorParameters.class )
public class SecuredModelTest
@@ -192,7 +170,7 @@ public class SecuredModelTest
}
try
{
- securedModel.add(baseModel, false);
+ securedModel.add(baseModel);
if (!securityEvaluator.evaluate(createAndUpdate))
{
Assert.fail("Should have thrown AccessDenied
Exception");
@@ -1112,12 +1090,6 @@ public class SecuredModelTest
}
@Test
- public void testGetReificationStyle()
- {
- securedModel.getReificationStyle();
- }
-
- @Test
public void testGetResource()
{
securedModel.getResource("foo");
@@ -1722,7 +1694,7 @@ public class SecuredModelTest
try
{
- securedModel.remove(baseModel, true);
+ securedModel.remove(baseModel);
if (!securityEvaluator.evaluate(DU))
{
Assert.fail("Should have thrown AccessDenied
Exception");
@@ -1947,8 +1919,7 @@ public class SecuredModelTest
@Test
public void testWrapAsResource() throws Exception
{
- securedModel.wrapAsResource(Node
- .createURI("http://example.com/rdfNode";));
+
securedModel.wrapAsResource(NodeFactory.createURI("http://example.com/rdfNode";));
}
@Test
Modified:
jena/trunk/jena-security/src/test/java/org/apache/jena/security/model/SecuredRDFListTest.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-security/src/test/java/org/apache/jena/security/model/SecuredRDFListTest.java?rev=1605074&r1=1605073&r2=1605074&view=diff
==============================================================================
---
jena/trunk/jena-security/src/test/java/org/apache/jena/security/model/SecuredRDFListTest.java
(original)
+++
jena/trunk/jena-security/src/test/java/org/apache/jena/security/model/SecuredRDFListTest.java
Tue Jun 24 13:10:21 2014
@@ -61,7 +61,7 @@ public class SecuredRDFListTest extends
final Iterator<RDFList> iter = new RDFListIterator(
(RDFList) getBaseRDFNode());
return WrappedIterator.create(iter)
- .filterKeep(new
RDFListSecFilter(getSecuredRDFList(), action))
+ .filterKeep(new
RDFListSecFilter<RDFList>(getSecuredRDFList(), action))
.toList().size();
}
@@ -70,7 +70,7 @@ public class SecuredRDFListTest extends
final Iterator<RDFList> iter = new RDFListIterator(
(RDFList) getBaseRDFNode());
return WrappedIterator.create(iter)
- .filterKeep(new
RDFListSecFilter(getSecuredRDFList(), action))
+ .filterKeep(new
RDFListSecFilter<RDFList>(getSecuredRDFList(), action))
.toList().size();
}
@@ -687,7 +687,8 @@ public class SecuredRDFListTest extends
}
}
- @Override
+ @SuppressWarnings("deprecation")
+ @Override
@Test
public void testRemoveAll()
{
