You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by cl...@apache.org on 2016/10/08 00:02:02 UTC

[4/8] jena git commit: Added code to properly filter the new literal language filtering methods. Added test code for the above.

http://git-wip-us.apache.org/repos/asf/jena/blob/dabc43f6/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredModelImpl.java
----------------------------------------------------------------------
diff --git a/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredModelImpl.java b/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredModelImpl.java
index 6880d45..cc066eb 100644
--- a/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredModelImpl.java
+++ b/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredModelImpl.java
@@ -21,7 +21,7 @@ import java.io.*;
 import java.net.URL;
 import java.util.*;
 import java.util.function.Predicate;
-import java.util.function.Supplier ;
+import java.util.function.Supplier;
 
 import org.apache.jena.datatypes.RDFDatatype;
 import org.apache.jena.graph.Node;
@@ -57,21 +57,18 @@ public class SecuredModelImpl extends SecuredItemImpl implements SecuredModel {
 		}
 
 		@Override
-		public void addedStatement(final Statement s)
-				throws AuthenticationRequiredException {
+		public void addedStatement(final Statement s) throws AuthenticationRequiredException {
 			if (canRead(s)) {
 				wrapped.addedStatement(s);
 			}
 		}
 
 		@Override
-		public void addedStatements(final List<Statement> statements)
-				throws AuthenticationRequiredException {
+		public void addedStatements(final List<Statement> statements) throws AuthenticationRequiredException {
 			if (canRead(Triple.ANY)) {
 				wrapped.addedStatements(statements);
 			} else {
-				final SecuredStatementIterator iter = new SecuredStatementIterator(
-						holder.getSecuredItem(),
+				final SecuredStatementIterator iter = new SecuredStatementIterator(holder.getSecuredItem(),
 						WrappedIterator.create(statements.iterator()));
 				try {
 					wrapped.addedStatements(iter.toList());
@@ -82,29 +79,24 @@ public class SecuredModelImpl extends SecuredItemImpl implements SecuredModel {
 		}
 
 		@Override
-		public void addedStatements(final Model m)
-				throws AuthenticationRequiredException {
+		public void addedStatements(final Model m) throws AuthenticationRequiredException {
 			if (canRead(Triple.ANY)) {
 				wrapped.addedStatements(m);
 			} else {
-				wrapped.addedStatements(SecuredModelImpl.getInstance(
-						holder.getSecuredItem(), m));
+				wrapped.addedStatements(SecuredModelImpl.getInstance(holder.getSecuredItem(), m));
 			}
 		}
 
 		@Override
-		public void addedStatements(final Statement[] statements)
-				throws AuthenticationRequiredException {
+		public void addedStatements(final Statement[] statements) throws AuthenticationRequiredException {
 			if (canRead(Triple.ANY)) {
 				wrapped.addedStatements(statements);
 			} else {
-				final SecuredStatementIterator iter = new SecuredStatementIterator(
-						holder.getSecuredItem(), WrappedIterator.create(Arrays
-								.asList(statements).iterator()));
+				final SecuredStatementIterator iter = new SecuredStatementIterator(holder.getSecuredItem(),
+						WrappedIterator.create(Arrays.asList(statements).iterator()));
 				try {
 					final List<Statement> stmts = iter.toList();
-					wrapped.addedStatements(stmts.toArray(new Statement[stmts
-							.size()]));
+					wrapped.addedStatements(stmts.toArray(new Statement[stmts.size()]));
 				} finally {
 					iter.close();
 				}
@@ -112,13 +104,11 @@ public class SecuredModelImpl extends SecuredItemImpl implements SecuredModel {
 		}
 
 		@Override
-		public void addedStatements(final StmtIterator statements)
-				throws AuthenticationRequiredException {
+		public void addedStatements(final StmtIterator statements) throws AuthenticationRequiredException {
 			if (canRead(Triple.ANY)) {
 				wrapped.addedStatements(statements);
 			} else {
-				final SecuredStatementIterator iter = new SecuredStatementIterator(
-						holder.getSecuredItem(), statements);
+				final SecuredStatementIterator iter = new SecuredStatementIterator(holder.getSecuredItem(), statements);
 				try {
 					wrapped.addedStatements(iter);
 				} finally {
@@ -133,22 +123,19 @@ public class SecuredModelImpl extends SecuredItemImpl implements SecuredModel {
 		}
 
 		@Override
-		public void removedStatement(final Statement s)
-				throws AuthenticationRequiredException {
+		public void removedStatement(final Statement s) throws AuthenticationRequiredException {
 			if (canRead(s)) {
 				wrapped.removedStatement(s);
 			}
 		}
 
 		@Override
-		public void removedStatements(final List<Statement> statements)
-				throws AuthenticationRequiredException {
+		public void removedStatements(final List<Statement> statements) throws AuthenticationRequiredException {
 
 			if (canRead(Triple.ANY)) {
 				wrapped.removedStatements(statements);
 			} else {
-				final SecuredStatementIterator iter = new SecuredStatementIterator(
-						holder.getSecuredItem(),
+				final SecuredStatementIterator iter = new SecuredStatementIterator(holder.getSecuredItem(),
 						WrappedIterator.create(statements.iterator()));
 				try {
 					wrapped.removedStatements(iter.toList());
@@ -159,29 +146,24 @@ public class SecuredModelImpl extends SecuredItemImpl implements SecuredModel {
 		}
 
 		@Override
-		public void removedStatements(final Model m)
-				throws AuthenticationRequiredException {
+		public void removedStatements(final Model m) throws AuthenticationRequiredException {
 			if (canRead(Triple.ANY)) {
 				wrapped.removedStatements(m);
 			} else {
-				wrapped.removedStatements(SecuredModelImpl.getInstance(
-						holder.getSecuredItem(), m));
+				wrapped.removedStatements(SecuredModelImpl.getInstance(holder.getSecuredItem(), m));
 			}
 		}
 
 		@Override
-		public void removedStatements(final Statement[] statements)
-				throws AuthenticationRequiredException {
+		public void removedStatements(final Statement[] statements) throws AuthenticationRequiredException {
 			if (canRead(Triple.ANY)) {
 				wrapped.removedStatements(statements);
 			} else {
-				final SecuredStatementIterator iter = new SecuredStatementIterator(
-						holder.getSecuredItem(), WrappedIterator.create(Arrays
-								.asList(statements).iterator()));
+				final SecuredStatementIterator iter = new SecuredStatementIterator(holder.getSecuredItem(),
+						WrappedIterator.create(Arrays.asList(statements).iterator()));
 				try {
 					final List<Statement> stmts = iter.toList();
-					wrapped.removedStatements(stmts.toArray(new Statement[stmts
-							.size()]));
+					wrapped.removedStatements(stmts.toArray(new Statement[stmts.size()]));
 				} finally {
 					iter.close();
 				}
@@ -189,13 +171,11 @@ public class SecuredModelImpl extends SecuredItemImpl implements SecuredModel {
 		}
 
 		@Override
-		public void removedStatements(final StmtIterator statements)
-				throws AuthenticationRequiredException {
+		public void removedStatements(final StmtIterator statements) throws AuthenticationRequiredException {
 			if (canRead(Triple.ANY)) {
 				wrapped.removedStatements(statements);
 			} else {
-				final SecuredStatementIterator iter = new SecuredStatementIterator(
-						holder.getSecuredItem(), statements);
+				final SecuredStatementIterator iter = new SecuredStatementIterator(holder.getSecuredItem(), statements);
 				try {
 					wrapped.removedStatements(iter);
 				} finally {
@@ -216,11 +196,9 @@ public class SecuredModelImpl extends SecuredItemImpl implements SecuredModel {
 	 *            the Model to secure.
 	 * @return The SecuredModel
 	 */
-	public static SecuredModel getInstance(final SecuredItem securedItem,
-			final Model model) {
-		return org.apache.jena.permissions.Factory.getInstance(
-				securedItem.getSecurityEvaluator(), securedItem.getModelIRI(),
-				model);
+	public static SecuredModel getInstance(final SecuredItem securedItem, final Model model) {
+		return org.apache.jena.permissions.Factory.getInstance(securedItem.getSecurityEvaluator(),
+				securedItem.getModelIRI(), model);
 	}
 
 	/**
@@ -234,14 +212,11 @@ public class SecuredModelImpl extends SecuredItemImpl implements SecuredModel {
 	 *            The Model to secure.
 	 * @return the SecuredModel
 	 */
-	public static SecuredModel getInstance(
-			final SecurityEvaluator securityEvaluator, final String modelIRI,
+	public static SecuredModel getInstance(final SecurityEvaluator securityEvaluator, final String modelIRI,
 			final Model model) {
-		final ItemHolder<Model, SecuredModel> holder = new ItemHolder<Model, SecuredModel>(
-				model);
+		final ItemHolder<Model, SecuredModel> holder = new ItemHolder<Model, SecuredModel>(model);
 
-		final SecuredModelImpl checker = new SecuredModelImpl(
-				securityEvaluator, modelIRI, holder);
+		final SecuredModelImpl checker = new SecuredModelImpl(securityEvaluator, modelIRI, holder);
 		// if we are going to create a duplicate proxy, just return this
 		// one.
 		if (model instanceof SecuredModel) {
@@ -249,8 +224,7 @@ public class SecuredModelImpl extends SecuredItemImpl implements SecuredModel {
 				return (SecuredModel) model;
 			}
 		}
-		return holder.setSecuredItem(new SecuredItemInvoker(model.getClass(),
-				checker));
+		return holder.setSecuredItem(new SecuredItemInvoker(model.getClass(), checker));
 	}
 
 	// the item holder that contains this SecuredModel.
@@ -271,17 +245,16 @@ public class SecuredModelImpl extends SecuredItemImpl implements SecuredModel {
 	 * @param holder
 	 *            The item holder that will contain this SecuredModel.
 	 */
-	private SecuredModelImpl(final SecurityEvaluator securityEvaluator,
-			final String modelURI, final ItemHolder<Model, SecuredModel> holder) {
+	private SecuredModelImpl(final SecurityEvaluator securityEvaluator, final String modelURI,
+			final ItemHolder<Model, SecuredModel> holder) {
 		super(securityEvaluator, modelURI, holder);
-		this.graph = org.apache.jena.permissions.Factory.getInstance(
-				securityEvaluator, modelURI, holder.getBaseItem().getGraph());
+		this.graph = org.apache.jena.permissions.Factory.getInstance(securityEvaluator, modelURI,
+				holder.getBaseItem().getGraph());
 		this.holder = holder;
 	}
 
 	private RDFNode asObject(Object o) {
-		return o instanceof RDFNode ? (RDFNode) o : ResourceFactory
-				.createTypedLiteral(o);
+		return o instanceof RDFNode ? (RDFNode) o : ResourceFactory.createTypedLiteral(o);
 	}
 
 	@Override
@@ -292,8 +265,7 @@ public class SecuredModelImpl extends SecuredItemImpl implements SecuredModel {
 
 	@Override
 	public SecuredModel add(final List<Statement> statements)
-			throws UpdateDeniedException, AddDeniedException,
-			AuthenticationRequiredException {
+			throws UpdateDeniedException, AddDeniedException, AuthenticationRequiredException {
 		checkUpdate();
 		checkCreateFrontsTriples(WrappedIterator.create(statements.iterator()));
 		holder.getBaseItem().add(statements);
@@ -301,8 +273,8 @@ public class SecuredModelImpl extends SecuredItemImpl implements SecuredModel {
 	}
 
 	@Override
-	public SecuredModel add(final Model m) throws UpdateDeniedException,
-			AddDeniedException, AuthenticationRequiredException {
+	public SecuredModel add(final Model m)
+			throws UpdateDeniedException, AddDeniedException, AuthenticationRequiredException {
 		checkUpdate();
 		if (!canCreate(Triple.ANY)) {
 			checkCreateFrontsTriples(m.listStatements());
@@ -313,8 +285,7 @@ public class SecuredModelImpl extends SecuredItemImpl implements SecuredModel {
 
 	@Override
 	public SecuredModel add(final Resource s, final Property p, final RDFNode o)
-			throws UpdateDeniedException, AddDeniedException,
-			AuthenticationRequiredException {
+			throws UpdateDeniedException, AddDeniedException, AuthenticationRequiredException {
 		checkUpdate();
 		checkCreate(new Triple(s.asNode(), p.asNode(), o.asNode()));
 		holder.getBaseItem().add(s, p, o);
@@ -323,48 +294,40 @@ public class SecuredModelImpl extends SecuredItemImpl implements SecuredModel {
 
 	@Override
 	public SecuredModel add(final Resource s, final Property p, final String o)
-			throws UpdateDeniedException, AddDeniedException,
-			AuthenticationRequiredException {
+			throws UpdateDeniedException, AddDeniedException, AuthenticationRequiredException {
 		return add(s, p, o, false);
 	}
 
 	@Override
-	public SecuredModel add(final Resource s, final Property p, final String o,
-			final boolean wellFormed) throws UpdateDeniedException,
-			AddDeniedException, AuthenticationRequiredException {
+	public SecuredModel add(final Resource s, final Property p, final String o, final boolean wellFormed)
+			throws UpdateDeniedException, AddDeniedException, AuthenticationRequiredException {
 		checkUpdate();
-		checkCreate(new Triple(s.asNode(), p.asNode(),
-				NodeFactory.createLiteral(o, "", wellFormed)));
+		checkCreate(new Triple(s.asNode(), p.asNode(), NodeFactory.createLiteral(o, "", wellFormed)));
 		holder.getBaseItem().add(s, p, o, wellFormed);
 		return holder.getSecuredItem();
 	}
 
 	@Override
-	public SecuredModel add(final Resource s, final Property p,
-			final String lex, final RDFDatatype datatype)
-			throws UpdateDeniedException, AddDeniedException,
-			AuthenticationRequiredException {
+	public SecuredModel add(final Resource s, final Property p, final String lex, final RDFDatatype datatype)
+			throws UpdateDeniedException, AddDeniedException, AuthenticationRequiredException {
 		checkUpdate();
-		checkCreate(new Triple(s.asNode(), p.asNode(),
-				NodeFactory.createLiteral(lex, datatype)));
+		checkCreate(new Triple(s.asNode(), p.asNode(), NodeFactory.createLiteral(lex, datatype)));
 		holder.getBaseItem().add(s, p, lex, datatype);
 		return holder.getSecuredItem();
 	}
 
 	@Override
-	public SecuredModel add(final Resource s, final Property p, final String o,
-			final String l) throws UpdateDeniedException, AddDeniedException,
-			AuthenticationRequiredException {
+	public SecuredModel add(final Resource s, final Property p, final String o, final String l)
+			throws UpdateDeniedException, AddDeniedException, AuthenticationRequiredException {
 		checkUpdate();
-		checkCreate(new Triple(s.asNode(), p.asNode(),
-				NodeFactory.createLiteral(o, l, false)));
+		checkCreate(new Triple(s.asNode(), p.asNode(), NodeFactory.createLiteral(o, l, false)));
 		holder.getBaseItem().add(s, p, o, l);
 		return holder.getSecuredItem();
 	}
 
 	@Override
-	public SecuredModel add(final Statement s) throws UpdateDeniedException,
-			AddDeniedException, AuthenticationRequiredException {
+	public SecuredModel add(final Statement s)
+			throws UpdateDeniedException, AddDeniedException, AuthenticationRequiredException {
 		checkUpdate();
 		checkCreate(s);
 		holder.getBaseItem().add(s);
@@ -373,8 +336,7 @@ public class SecuredModelImpl extends SecuredItemImpl implements SecuredModel {
 
 	@Override
 	public SecuredModel add(final Statement[] statements)
-			throws UpdateDeniedException, AddDeniedException,
-			AuthenticationRequiredException {
+			throws UpdateDeniedException, AddDeniedException, AuthenticationRequiredException {
 		checkUpdate();
 		if (!canCreate(Triple.ANY)) {
 			for (final Statement s : statements) {
@@ -388,8 +350,7 @@ public class SecuredModelImpl extends SecuredItemImpl implements SecuredModel {
 
 	@Override
 	public SecuredModel add(final StmtIterator iter)
-			throws UpdateDeniedException, AddDeniedException,
-			AuthenticationRequiredException {
+			throws UpdateDeniedException, AddDeniedException, AuthenticationRequiredException {
 		checkUpdate();
 		if (!canCreate(Triple.ANY)) {
 			final List<Triple> lst = new ArrayList<Triple>();
@@ -399,8 +360,7 @@ public class SecuredModelImpl extends SecuredItemImpl implements SecuredModel {
 					checkCreate(s);
 					lst.add(s.asTriple());
 				}
-				final Model m = ModelFactory
-						.createModelForGraph(new CollectionGraph(lst));
+				final Model m = ModelFactory.createModelForGraph(new CollectionGraph(lst));
 				holder.getBaseItem().add(m.listStatements());
 			} finally {
 				iter.close();
@@ -412,9 +372,8 @@ public class SecuredModelImpl extends SecuredItemImpl implements SecuredModel {
 	}
 
 	@Override
-	public SecuredModel addLiteral(final Resource s, final Property p,
-			final boolean o) throws UpdateDeniedException, AddDeniedException,
-			AuthenticationRequiredException {
+	public SecuredModel addLiteral(final Resource s, final Property p, final boolean o)
+			throws UpdateDeniedException, AddDeniedException, AuthenticationRequiredException {
 		final Literal l = ResourceFactory.createTypedLiteral(o);
 		if (l == null) {
 			throw new IllegalArgumentException("How did we get a null");
@@ -423,72 +382,62 @@ public class SecuredModelImpl extends SecuredItemImpl implements SecuredModel {
 	}
 
 	@Override
-	public SecuredModel addLiteral(final Resource s, final Property p,
-			final char o) throws UpdateDeniedException, AddDeniedException,
-			AuthenticationRequiredException {
+	public SecuredModel addLiteral(final Resource s, final Property p, final char o)
+			throws UpdateDeniedException, AddDeniedException, AuthenticationRequiredException {
 		final Literal l = ResourceFactory.createTypedLiteral(o);
 		return add(s, p, l);
 	}
 
 	@Override
-	public SecuredModel addLiteral(final Resource s, final Property p,
-			final double o) throws UpdateDeniedException, AddDeniedException,
-			AuthenticationRequiredException {
+	public SecuredModel addLiteral(final Resource s, final Property p, final double o)
+			throws UpdateDeniedException, AddDeniedException, AuthenticationRequiredException {
 		final Literal l = ResourceFactory.createTypedLiteral(o);
 		return add(s, p, l);
 	}
 
 	@Override
-	public SecuredModel addLiteral(final Resource s, final Property p,
-			final float o) throws UpdateDeniedException, AddDeniedException,
-			AuthenticationRequiredException {
+	public SecuredModel addLiteral(final Resource s, final Property p, final float o)
+			throws UpdateDeniedException, AddDeniedException, AuthenticationRequiredException {
 		final Literal l = ResourceFactory.createTypedLiteral(o);
 		return add(s, p, l);
 	}
 
 	@Override
-	public SecuredModel addLiteral(final Resource s, final Property p,
-			final int o) throws UpdateDeniedException, AddDeniedException,
-			AuthenticationRequiredException {
+	public SecuredModel addLiteral(final Resource s, final Property p, final int o)
+			throws UpdateDeniedException, AddDeniedException, AuthenticationRequiredException {
 		final Literal l = ResourceFactory.createTypedLiteral(o);
 		return add(s, p, l);
 	}
 
 	@Override
-	public SecuredModel addLiteral(final Resource s, final Property p,
-			final Literal o) throws UpdateDeniedException, AddDeniedException,
-			AuthenticationRequiredException {
+	public SecuredModel addLiteral(final Resource s, final Property p, final Literal o)
+			throws UpdateDeniedException, AddDeniedException, AuthenticationRequiredException {
 		return add(s, p, o);
 	}
 
 	@Override
-	public SecuredModel addLiteral(final Resource s, final Property p,
-			final long o) throws UpdateDeniedException, AddDeniedException,
-			AuthenticationRequiredException {
+	public SecuredModel addLiteral(final Resource s, final Property p, final long o)
+			throws UpdateDeniedException, AddDeniedException, AuthenticationRequiredException {
 		final Literal l = ResourceFactory.createTypedLiteral(o);
 		return add(s, p, l);
 	}
 
 	@Override
 	@Deprecated
-	public SecuredModel addLiteral(final Resource s, final Property p,
-			final Object o) throws UpdateDeniedException, AddDeniedException,
-			AuthenticationRequiredException {
+	public SecuredModel addLiteral(final Resource s, final Property p, final Object o)
+			throws UpdateDeniedException, AddDeniedException, AuthenticationRequiredException {
 		return add(s, p, asObject(o));
 	}
 
 	@Override
 	public SecuredRDFNode asRDFNode(final Node n) {
-		return SecuredRDFNodeImpl.getInstance(holder.getSecuredItem(), holder
-				.getBaseItem().asRDFNode(n));
+		return SecuredRDFNodeImpl.getInstance(holder.getSecuredItem(), holder.getBaseItem().asRDFNode(n));
 	}
 
 	@Override
 	public SecuredStatement asStatement(final Triple t)
-			throws UpdateDeniedException, AddDeniedException,
-			AuthenticationRequiredException {
-		final ExtendedIterator<Triple> iter = holder.getBaseItem().getGraph()
-				.find(t);
+			throws UpdateDeniedException, AddDeniedException, AuthenticationRequiredException {
+		final ExtendedIterator<Triple> iter = holder.getBaseItem().getGraph().find(t);
 		final boolean exists = iter.hasNext();
 		iter.close();
 		if (exists) {
@@ -498,8 +447,7 @@ public class SecuredModelImpl extends SecuredItemImpl implements SecuredModel {
 			checkUpdate();
 			checkCreate(t);
 		}
-		return SecuredStatementImpl.getInstance(holder.getSecuredItem(), holder
-				.getBaseItem().asStatement(t));
+		return SecuredStatementImpl.getInstance(holder.getSecuredItem(), holder.getBaseItem().asStatement(t));
 	}
 
 	@Override
@@ -523,9 +471,8 @@ public class SecuredModelImpl extends SecuredItemImpl implements SecuredModel {
 	public boolean contains(final Resource s, final Property p)
 			throws ReadDeniedException, AuthenticationRequiredException {
 		checkRead();
-		final SecuredStatementIterator iter = new SecuredStatementIterator(
-				holder.getSecuredItem(), holder.getBaseItem().listStatements(s,
-						p, (RDFNode) null));
+		final SecuredStatementIterator iter = new SecuredStatementIterator(holder.getSecuredItem(),
+				holder.getBaseItem().listStatements(s, p, (RDFNode) null));
 		try {
 			return iter.hasNext();
 		} finally {
@@ -537,9 +484,8 @@ public class SecuredModelImpl extends SecuredItemImpl implements SecuredModel {
 	public boolean contains(final Resource s, final Property p, final RDFNode o)
 			throws ReadDeniedException, AuthenticationRequiredException {
 		checkRead();
-		final SecuredStatementIterator iter = new SecuredStatementIterator(
-				holder.getSecuredItem(), holder.getBaseItem().listStatements(s,
-						p, o));
+		final SecuredStatementIterator iter = new SecuredStatementIterator(holder.getSecuredItem(),
+				holder.getBaseItem().listStatements(s, p, o));
 		try {
 			return iter.hasNext();
 		} finally {
@@ -551,9 +497,8 @@ public class SecuredModelImpl extends SecuredItemImpl implements SecuredModel {
 	public boolean contains(final Resource s, final Property p, final String o)
 			throws ReadDeniedException, AuthenticationRequiredException {
 		checkRead();
-		final SecuredStatementIterator iter = new SecuredStatementIterator(
-				holder.getSecuredItem(), holder.getBaseItem().listStatements(s,
-						p, o));
+		final SecuredStatementIterator iter = new SecuredStatementIterator(holder.getSecuredItem(),
+				holder.getBaseItem().listStatements(s, p, o));
 		try {
 			return iter.hasNext();
 		} finally {
@@ -562,13 +507,11 @@ public class SecuredModelImpl extends SecuredItemImpl implements SecuredModel {
 	}
 
 	@Override
-	public boolean contains(final Resource s, final Property p, final String o,
-			final String l) throws ReadDeniedException,
-			AuthenticationRequiredException {
+	public boolean contains(final Resource s, final Property p, final String o, final String l)
+			throws ReadDeniedException, AuthenticationRequiredException {
 		checkRead();
-		final SecuredStatementIterator iter = new SecuredStatementIterator(
-				holder.getSecuredItem(), holder.getBaseItem().listStatements(s,
-						p, o, l));
+		final SecuredStatementIterator iter = new SecuredStatementIterator(holder.getSecuredItem(),
+				holder.getBaseItem().listStatements(s, p, o, l));
 		try {
 			return iter.hasNext();
 		} finally {
@@ -577,22 +520,19 @@ public class SecuredModelImpl extends SecuredItemImpl implements SecuredModel {
 	}
 
 	@Override
-	public boolean contains(final Statement s) throws ReadDeniedException,
-			AuthenticationRequiredException {
+	public boolean contains(final Statement s) throws ReadDeniedException, AuthenticationRequiredException {
 		checkRead();
 		checkRead(s);
 		return holder.getBaseItem().contains(s);
 	}
 
 	@Override
-	public boolean containsAll(final Model model) throws ReadDeniedException,
-			AuthenticationRequiredException {
+	public boolean containsAll(final Model model) throws ReadDeniedException, AuthenticationRequiredException {
 		return containsAll(model.listStatements());
 	}
 
 	@Override
-	public boolean containsAll(final StmtIterator iter)
-			throws ReadDeniedException, AuthenticationRequiredException {
+	public boolean containsAll(final StmtIterator iter) throws ReadDeniedException, AuthenticationRequiredException {
 		checkRead();
 		final boolean doCheck = canRead(Triple.ANY);
 		try {
@@ -612,15 +552,13 @@ public class SecuredModelImpl extends SecuredItemImpl implements SecuredModel {
 	}
 
 	@Override
-	public boolean containsAny(final Model model) throws ReadDeniedException,
-			AuthenticationRequiredException {
+	public boolean containsAny(final Model model) throws ReadDeniedException, AuthenticationRequiredException {
 		return containsAny(model.listStatements());
 
 	}
 
 	@Override
-	public boolean containsAny(final StmtIterator iter)
-			throws ReadDeniedException, AuthenticationRequiredException {
+	public boolean containsAny(final StmtIterator iter) throws ReadDeniedException, AuthenticationRequiredException {
 		checkRead();
 		final boolean skipCheck = canRead(Triple.ANY);
 		try {
@@ -639,57 +577,49 @@ public class SecuredModelImpl extends SecuredItemImpl implements SecuredModel {
 	}
 
 	@Override
-	public boolean containsLiteral(final Resource s, final Property p,
-			final boolean o) throws ReadDeniedException,
-			AuthenticationRequiredException {
+	public boolean containsLiteral(final Resource s, final Property p, final boolean o)
+			throws ReadDeniedException, AuthenticationRequiredException {
 		return contains(s, p, ResourceFactory.createTypedLiteral(o));
 	}
 
 	@Override
-	public boolean containsLiteral(final Resource s, final Property p,
-			final char o) throws ReadDeniedException,
-			AuthenticationRequiredException {
+	public boolean containsLiteral(final Resource s, final Property p, final char o)
+			throws ReadDeniedException, AuthenticationRequiredException {
 		return contains(s, p, ResourceFactory.createTypedLiteral(o));
 	}
 
 	@Override
-	public boolean containsLiteral(final Resource s, final Property p,
-			final double o) throws ReadDeniedException,
-			AuthenticationRequiredException {
+	public boolean containsLiteral(final Resource s, final Property p, final double o)
+			throws ReadDeniedException, AuthenticationRequiredException {
 		return contains(s, p, ResourceFactory.createTypedLiteral(o));
 	}
 
 	@Override
-	public boolean containsLiteral(final Resource s, final Property p,
-			final float o) throws ReadDeniedException,
-			AuthenticationRequiredException {
+	public boolean containsLiteral(final Resource s, final Property p, final float o)
+			throws ReadDeniedException, AuthenticationRequiredException {
 		return contains(s, p, ResourceFactory.createTypedLiteral(o));
 	}
 
 	@Override
-	public boolean containsLiteral(final Resource s, final Property p,
-			final int o) throws ReadDeniedException,
-			AuthenticationRequiredException {
+	public boolean containsLiteral(final Resource s, final Property p, final int o)
+			throws ReadDeniedException, AuthenticationRequiredException {
 		return contains(s, p, ResourceFactory.createTypedLiteral(o));
 	}
 
 	@Override
-	public boolean containsLiteral(final Resource s, final Property p,
-			final long o) throws ReadDeniedException,
-			AuthenticationRequiredException {
+	public boolean containsLiteral(final Resource s, final Property p, final long o)
+			throws ReadDeniedException, AuthenticationRequiredException {
 		return contains(s, p, ResourceFactory.createTypedLiteral(o));
 	}
 
 	@Override
-	public boolean containsLiteral(final Resource s, final Property p,
-			final Object o) throws ReadDeniedException,
-			AuthenticationRequiredException {
+	public boolean containsLiteral(final Resource s, final Property p, final Object o)
+			throws ReadDeniedException, AuthenticationRequiredException {
 		return contains(s, p, asObject(o));
 	}
 
 	@Override
-	public boolean containsResource(final RDFNode r)
-			throws ReadDeniedException, AuthenticationRequiredException {
+	public boolean containsResource(final RDFNode r) throws ReadDeniedException, AuthenticationRequiredException {
 		checkRead();
 		if (canRead(new Triple(Node.ANY, Node.ANY, Node.ANY))) {
 			return holder.getBaseItem().containsResource(r);
@@ -698,17 +628,13 @@ public class SecuredModelImpl extends SecuredItemImpl implements SecuredModel {
 			if (r.isResource()) {
 
 				if (r.isURIResource()) {
-					iter = iter
-							.andThen(listStatements(null, ResourceFactory
-									.createProperty(r.asNode().getURI()),
-									(RDFNode) null));
+					iter = iter.andThen(
+							listStatements(null, ResourceFactory.createProperty(r.asNode().getURI()), (RDFNode) null));
 				} else {
-					iter = iter.andThen(listStatements(null, ResourceFactory
-							.createProperty(r.asNode().getBlankNodeLabel()),
-							(RDFNode) null));
+					iter = iter.andThen(listStatements(null,
+							ResourceFactory.createProperty(r.asNode().getBlankNodeLabel()), (RDFNode) null));
 				}
-				iter = iter.andThen(listStatements(r.asResource(), null,
-						(RDFNode) null));
+				iter = iter.andThen(listStatements(r.asResource(), null, (RDFNode) null));
 			}
 			try {
 				return iter.hasNext();
@@ -719,70 +645,54 @@ public class SecuredModelImpl extends SecuredItemImpl implements SecuredModel {
 	}
 
 	@Override
-	public SecuredAlt createAlt() throws UpdateDeniedException,
-			AddDeniedException, AuthenticationRequiredException {
+	public SecuredAlt createAlt() throws UpdateDeniedException, AddDeniedException, AuthenticationRequiredException {
 		checkUpdate();
-		checkCreate(new Triple(SecurityEvaluator.FUTURE, RDF.type.asNode(),
-				RDF.Alt.asNode()));
-		return SecuredAltImpl.getInstance(holder.getSecuredItem(), holder
-				.getBaseItem().createAlt());
+		checkCreate(new Triple(SecurityEvaluator.FUTURE, RDF.type.asNode(), RDF.Alt.asNode()));
+		return SecuredAltImpl.getInstance(holder.getSecuredItem(), holder.getBaseItem().createAlt());
 	}
 
 	@Override
-	public SecuredAlt createAlt(final String uri) throws UpdateDeniedException,
-			AddDeniedException, AuthenticationRequiredException {
+	public SecuredAlt createAlt(final String uri)
+			throws UpdateDeniedException, AddDeniedException, AuthenticationRequiredException {
 		checkUpdate();
-		checkCreate(new Triple(NodeFactory.createURI(uri), RDF.type.asNode(),
-				RDF.Alt.asNode()));
-		return SecuredAltImpl.getInstance(holder.getSecuredItem(), holder
-				.getBaseItem().createAlt(uri));
+		checkCreate(new Triple(NodeFactory.createURI(uri), RDF.type.asNode(), RDF.Alt.asNode()));
+		return SecuredAltImpl.getInstance(holder.getSecuredItem(), holder.getBaseItem().createAlt(uri));
 	}
 
 	@Override
-	public SecuredBag createBag() throws UpdateDeniedException,
-			AddDeniedException, AuthenticationRequiredException {
+	public SecuredBag createBag() throws UpdateDeniedException, AddDeniedException, AuthenticationRequiredException {
 		checkUpdate();
-		checkCreate(new Triple(SecurityEvaluator.FUTURE, RDF.type.asNode(),
-				RDF.Bag.asNode()));
-		return SecuredBagImpl.getInstance(holder.getSecuredItem(), holder
-				.getBaseItem().createBag());
+		checkCreate(new Triple(SecurityEvaluator.FUTURE, RDF.type.asNode(), RDF.Bag.asNode()));
+		return SecuredBagImpl.getInstance(holder.getSecuredItem(), holder.getBaseItem().createBag());
 	}
 
 	@Override
-	public SecuredBag createBag(final String uri) throws UpdateDeniedException,
-			AddDeniedException, AuthenticationRequiredException {
+	public SecuredBag createBag(final String uri)
+			throws UpdateDeniedException, AddDeniedException, AuthenticationRequiredException {
 		checkUpdate();
-		checkCreate(new Triple(NodeFactory.createURI(uri), RDF.type.asNode(),
-				RDF.Bag.asNode()));
-		return SecuredBagImpl.getInstance(holder.getSecuredItem(), holder
-				.getBaseItem().createBag(uri));
+		checkCreate(new Triple(NodeFactory.createURI(uri), RDF.type.asNode(), RDF.Bag.asNode()));
+		return SecuredBagImpl.getInstance(holder.getSecuredItem(), holder.getBaseItem().createBag(uri));
 	}
 
-	private Model createCopy() throws UpdateDeniedException,
-			AddDeniedException, AuthenticationRequiredException {
+	private Model createCopy() throws UpdateDeniedException, AddDeniedException, AuthenticationRequiredException {
 		return ModelFactory.createDefaultModel().add(holder.getSecuredItem());
 	}
 
 	@Override
-	public SecuredRDFList createList() throws UpdateDeniedException,
-			AddDeniedException, AuthenticationRequiredException {
+	public SecuredRDFList createList()
+			throws UpdateDeniedException, AddDeniedException, AuthenticationRequiredException {
 		checkUpdate();
-		checkCreate(new Triple(SecurityEvaluator.FUTURE, RDF.first.asNode(),
-				RDF.nil.asNode()));
-		return SecuredRDFListImpl.getInstance(holder.getSecuredItem(), holder
-				.getBaseItem().createList());
+		checkCreate(new Triple(SecurityEvaluator.FUTURE, RDF.first.asNode(), RDF.nil.asNode()));
+		return SecuredRDFListImpl.getInstance(holder.getSecuredItem(), holder.getBaseItem().createList());
 	}
 
 	@Override
 	public SecuredRDFList createList(final Iterator<? extends RDFNode> members)
-			throws UpdateDeniedException, AddDeniedException,
-			AuthenticationRequiredException {
+			throws UpdateDeniedException, AddDeniedException, AuthenticationRequiredException {
 		checkUpdate();
-		checkCreate(new Triple(SecurityEvaluator.FUTURE, RDF.rest.asNode(),
-				SecurityEvaluator.FUTURE));
+		checkCreate(new Triple(SecurityEvaluator.FUTURE, RDF.rest.asNode(), SecurityEvaluator.FUTURE));
 
-		boolean canCreateAny = canCreate(new Triple(SecurityEvaluator.FUTURE,
-				RDF.first.asNode(), Node.ANY));
+		boolean canCreateAny = canCreate(new Triple(SecurityEvaluator.FUTURE, RDF.first.asNode(), Node.ANY));
 		if (!canCreateAny) {
 			// have to check each of the possible entries in the list for
 			// creation.
@@ -790,104 +700,89 @@ public class SecuredModelImpl extends SecuredItemImpl implements SecuredModel {
 			while (members.hasNext()) {
 
 				final RDFNode n = members.next();
-				checkCreate(new Triple(SecurityEvaluator.FUTURE,
-						RDF.first.asNode(), n.asNode()));
+				checkCreate(new Triple(SecurityEvaluator.FUTURE, RDF.first.asNode(), n.asNode()));
 				nodes.add(n);
 			}
 			return SecuredRDFListImpl.getInstance(holder.getSecuredItem(),
 					holder.getBaseItem().createList(nodes.iterator()));
 
 		} else {
-			return SecuredRDFListImpl.getInstance(holder.getSecuredItem(),
-					holder.getBaseItem().createList(members));
+			return SecuredRDFListImpl.getInstance(holder.getSecuredItem(), holder.getBaseItem().createList(members));
 		}
 	}
 
 	@Override
 	public SecuredRDFList createList(final RDFNode[] members)
-			throws UpdateDeniedException, AddDeniedException,
-			AuthenticationRequiredException {
+			throws UpdateDeniedException, AddDeniedException, AuthenticationRequiredException {
 		return createList(Arrays.asList(members).iterator());
 	}
 
 	@Override
 	public SecuredLiteral createLiteral(final String v) {
-		return SecuredLiteralImpl.getInstance(holder.getSecuredItem(), holder
-				.getBaseItem().createLiteral(v));
+		return SecuredLiteralImpl.getInstance(holder.getSecuredItem(), holder.getBaseItem().createLiteral(v));
 	}
 
 	@Override
 	public SecuredLiteral createLiteral(final String v, final boolean wellFormed) {
-		return SecuredLiteralImpl.getInstance(holder.getSecuredItem(), holder
-				.getBaseItem().createLiteral(v, wellFormed));
+		return SecuredLiteralImpl.getInstance(holder.getSecuredItem(),
+				holder.getBaseItem().createLiteral(v, wellFormed));
 
 	}
 
 	@Override
 	public SecuredLiteral createLiteral(final String v, final String language) {
-		return SecuredLiteralImpl.getInstance(holder.getSecuredItem(), holder
-				.getBaseItem().createLiteral(v, language));
+		return SecuredLiteralImpl.getInstance(holder.getSecuredItem(), holder.getBaseItem().createLiteral(v, language));
 	}
 
 	@Override
-	public SecuredStatement createLiteralStatement(final Resource s,
-			final Property p, final boolean o) {
+	public SecuredStatement createLiteralStatement(final Resource s, final Property p, final boolean o) {
 		return createStatement(s, p, ResourceFactory.createTypedLiteral(o));
 	}
 
 	@Override
-	public SecuredStatement createLiteralStatement(final Resource s,
-			final Property p, final char o) {
+	public SecuredStatement createLiteralStatement(final Resource s, final Property p, final char o) {
 		return createStatement(s, p, ResourceFactory.createTypedLiteral(o));
 	}
 
 	@Override
-	public SecuredStatement createLiteralStatement(final Resource s,
-			final Property p, final double o) {
+	public SecuredStatement createLiteralStatement(final Resource s, final Property p, final double o) {
 		return createStatement(s, p, ResourceFactory.createTypedLiteral(o));
 	}
 
 	@Override
-	public SecuredStatement createLiteralStatement(final Resource s,
-			final Property p, final float o) {
+	public SecuredStatement createLiteralStatement(final Resource s, final Property p, final float o) {
 		return createStatement(s, p, ResourceFactory.createTypedLiteral(o));
 	}
 
 	@Override
-	public SecuredStatement createLiteralStatement(final Resource s,
-			final Property p, final int o) {
+	public SecuredStatement createLiteralStatement(final Resource s, final Property p, final int o) {
 		return createStatement(s, p, ResourceFactory.createTypedLiteral(o));
 	}
 
 	@Override
-	public SecuredStatement createLiteralStatement(final Resource s,
-			final Property p, final long o) {
+	public SecuredStatement createLiteralStatement(final Resource s, final Property p, final long o) {
 		return createStatement(s, p, ResourceFactory.createTypedLiteral(o));
 	}
 
 	@Override
-	public SecuredStatement createLiteralStatement(final Resource s,
-			final Property p, final Object o) {
+	public SecuredStatement createLiteralStatement(final Resource s, final Property p, final Object o) {
 		return createStatement(s, p, asObject(o));
 	}
 
 	@Override
 	public SecuredProperty createProperty(final String uri) {
-		return SecuredPropertyImpl.getInstance(holder.getSecuredItem(), holder
-				.getBaseItem().createProperty(uri));
+		return SecuredPropertyImpl.getInstance(holder.getSecuredItem(), holder.getBaseItem().createProperty(uri));
 	}
 
 	@Override
-	public SecuredProperty createProperty(final String nameSpace,
-			final String localName) {
-		return SecuredPropertyImpl.getInstance(holder.getSecuredItem(), holder
-				.getBaseItem().createProperty(nameSpace, localName));
+	public SecuredProperty createProperty(final String nameSpace, final String localName) {
+		return SecuredPropertyImpl.getInstance(holder.getSecuredItem(),
+				holder.getBaseItem().createProperty(nameSpace, localName));
 	}
 
 	@Override
 	public SecuredReifiedStatement createReifiedStatement(final Statement s)
-			throws UpdateDeniedException, AddDeniedException,
-			AuthenticationRequiredException {
+			throws UpdateDeniedException, AddDeniedException, AuthenticationRequiredException {
 		checkUpdate();
 		checkCreateReified(null, s);
 		return SecuredReifiedStatementImpl.getInstance(holder.getSecuredItem(),
@@ -895,9 +790,8 @@ public class SecuredModelImpl extends SecuredItemImpl implements SecuredModel {
 	}
 
 	@Override
-	public SecuredReifiedStatement createReifiedStatement(final String uri,
-			final Statement s) throws UpdateDeniedException,
-			AddDeniedException, AuthenticationRequiredException {
+	public SecuredReifiedStatement createReifiedStatement(final String uri, final Statement s)
+			throws UpdateDeniedException, AddDeniedException, AuthenticationRequiredException {
 		checkUpdate();
 		checkCreateReified(uri, s);
 		return SecuredReifiedStatementImpl.getInstance(holder.getSecuredItem(),
@@ -907,52 +801,43 @@ public class SecuredModelImpl extends SecuredItemImpl implements SecuredModel {
 	@Override
 	public SecuredResource createResource() {
 		// checkCreateAnonymousResource(SecurityEvaluator.FUTURE);
-		return SecuredResourceImpl.getInstance(holder.getSecuredItem(), holder
-				.getBaseItem().createResource());
+		return SecuredResourceImpl.getInstance(holder.getSecuredItem(), holder.getBaseItem().createResource());
 	}
 
 	@Override
 	public SecuredResource createResource(final AnonId id) {
 		// checkCreateAnonymousResource(new SecurityEvaluator.SecNode(
 		// SecurityEvaluator.SecNode.Type.Anonymous, id.getLabelString()));
-		return SecuredResourceImpl.getInstance(holder.getSecuredItem(), holder
-				.getBaseItem().createResource(id));
+		return SecuredResourceImpl.getInstance(holder.getSecuredItem(), holder.getBaseItem().createResource(id));
 	}
 
 	@Override
 	public SecuredResource createResource(final Resource type)
-			throws UpdateDeniedException, AddDeniedException,
-			AuthenticationRequiredException {
+			throws UpdateDeniedException, AddDeniedException, AuthenticationRequiredException {
 		checkUpdate();
-		final Triple t = new Triple(SecurityEvaluator.FUTURE,
-				RDF.type.asNode(), type.asNode());
+		final Triple t = new Triple(SecurityEvaluator.FUTURE, RDF.type.asNode(), type.asNode());
 		checkCreate(t);
 
-		return SecuredResourceImpl.getInstance(holder.getSecuredItem(), holder
-				.getBaseItem().createResource(type));
+		return SecuredResourceImpl.getInstance(holder.getSecuredItem(), holder.getBaseItem().createResource(type));
 	}
 
 	@Override
 	@Deprecated
-	public SecuredResource createResource(final ResourceF f)
-			throws AuthenticationRequiredException {
+	public SecuredResource createResource(final ResourceF f) throws AuthenticationRequiredException {
 		return createResource(null, f);
 	}
 
 	@Override
 	public SecuredResource createResource(final String uri) {
-		return SecuredResourceImpl.getInstance(holder.getSecuredItem(), holder
-				.getBaseItem().createResource(uri));
+		return SecuredResourceImpl.getInstance(holder.getSecuredItem(), holder.getBaseItem().createResource(uri));
 
 	}
 
 	@Override
 	public SecuredResource createResource(final String uri, final Resource type)
-			throws UpdateDeniedException, AddDeniedException,
-			AuthenticationRequiredException {
+			throws UpdateDeniedException, AddDeniedException, AuthenticationRequiredException {
 		final Resource r = ResourceFactory.createResource(uri);
-		final Triple t = new Triple(r.asNode(), RDF.type.asNode(),
-				type.asNode());
+		final Triple t = new Triple(r.asNode(), RDF.type.asNode(), type.asNode());
 		if (holder.getBaseItem().contains(r, RDF.type, type)) {
 			checkRead();
 			checkRead(t);
@@ -960,170 +845,141 @@ public class SecuredModelImpl extends SecuredItemImpl implements SecuredModel {
 			checkUpdate();
 			checkCreate(t);
 		}
-		return SecuredResourceImpl.getInstance(holder.getSecuredItem(), holder
-				.getBaseItem().createResource(uri, type));
+		return SecuredResourceImpl.getInstance(holder.getSecuredItem(), holder.getBaseItem().createResource(uri, type));
 
 	}
 
 	@Override
 	@Deprecated
 	public SecuredResource createResource(final String uri, final ResourceF f) {
-		return SecuredResourceImpl.getInstance(holder.getSecuredItem(), holder
-				.getBaseItem().createResource(uri, f));
+		return SecuredResourceImpl.getInstance(holder.getSecuredItem(), holder.getBaseItem().createResource(uri, f));
 	}
 
 	@Override
-	public SecuredSeq createSeq() throws UpdateDeniedException,
-			AddDeniedException, AuthenticationRequiredException {
+	public SecuredSeq createSeq() throws UpdateDeniedException, AddDeniedException, AuthenticationRequiredException {
 		checkUpdate();
-		checkCreate(new Triple(SecurityEvaluator.FUTURE, RDF.type.asNode(),
-				RDF.Alt.asNode()));
-		return SecuredSeqImpl.getInstance(holder.getSecuredItem(), holder
-				.getBaseItem().createSeq());
+		checkCreate(new Triple(SecurityEvaluator.FUTURE, RDF.type.asNode(), RDF.Alt.asNode()));
+		return SecuredSeqImpl.getInstance(holder.getSecuredItem(), holder.getBaseItem().createSeq());
 	}
 
 	@Override
-	public SecuredSeq createSeq(final String uri) throws UpdateDeniedException,
-			AddDeniedException, AuthenticationRequiredException {
+	public SecuredSeq createSeq(final String uri)
+			throws UpdateDeniedException, AddDeniedException, AuthenticationRequiredException {
 		checkUpdate();
-		checkCreate(new Triple(NodeFactory.createURI(uri), RDF.type.asNode(),
-				RDF.Alt.asNode()));
-		return SecuredSeqImpl.getInstance(holder.getSecuredItem(), holder
-				.getBaseItem().createSeq(uri));
+		checkCreate(new Triple(NodeFactory.createURI(uri), RDF.type.asNode(), RDF.Alt.asNode()));
+		return SecuredSeqImpl.getInstance(holder.getSecuredItem(), holder.getBaseItem().createSeq(uri));
 	}
 
 	@Override
-	public SecuredStatement createStatement(final Resource s, final Property p,
-			final RDFNode o) throws UpdateDeniedException, AddDeniedException,
-			AuthenticationRequiredException {
+	public SecuredStatement createStatement(final Resource s, final Property p, final RDFNode o)
+			throws UpdateDeniedException, AddDeniedException, AuthenticationRequiredException {
 		checkUpdate();
 		checkCreate(new Triple(s.asNode(), p.asNode(), o.asNode()));
-		return SecuredStatementImpl.getInstance(holder.getSecuredItem(), holder
-				.getBaseItem().createStatement(s, p, o));
+		return SecuredStatementImpl.getInstance(holder.getSecuredItem(), holder.getBaseItem().createStatement(s, p, o));
 	}
 
 	@Override
-	public SecuredStatement createStatement(final Resource s, final Property p,
-			final String o) throws UpdateDeniedException, AddDeniedException,
-			AuthenticationRequiredException {
+	public SecuredStatement createStatement(final Resource s, final Property p, final String o)
+			throws UpdateDeniedException, AddDeniedException, AuthenticationRequiredException {
 		checkUpdate();
 		checkCreate(new Triple(s.asNode(), p.asNode(), NodeFactory.createURI(o)));
-		return SecuredStatementImpl.getInstance(holder.getSecuredItem(), holder
-				.getBaseItem().createStatement(s, p, o));
+		return SecuredStatementImpl.getInstance(holder.getSecuredItem(), holder.getBaseItem().createStatement(s, p, o));
 	}
 
 	@Override
-	public SecuredStatement createStatement(final Resource s, final Property p,
-			final String o, final boolean wellFormed)
-			throws UpdateDeniedException, AddDeniedException,
-			AuthenticationRequiredException {
+	public SecuredStatement createStatement(final Resource s, final Property p, final String o,
+			final boolean wellFormed)
+			throws UpdateDeniedException, AddDeniedException, AuthenticationRequiredException {
 		return createStatement(s, p, o, "", wellFormed);
 	}
 
 	@Override
-	public SecuredStatement createStatement(final Resource s, final Property p,
-			final String o, final String l) throws UpdateDeniedException,
-			AddDeniedException, AuthenticationRequiredException {
+	public SecuredStatement createStatement(final Resource s, final Property p, final String o, final String l)
+			throws UpdateDeniedException, AddDeniedException, AuthenticationRequiredException {
 		return createStatement(s, p, o, l, false);
 	}
 
 	@Override
-	public SecuredStatement createStatement(final Resource s, final Property p,
-			final String o, final String l, final boolean wellFormed)
-			throws UpdateDeniedException, AddDeniedException,
-			AuthenticationRequiredException {
+	public SecuredStatement createStatement(final Resource s, final Property p, final String o, final String l,
+			final boolean wellFormed)
+			throws UpdateDeniedException, AddDeniedException, AuthenticationRequiredException {
 		checkUpdate();
-		checkCreate(new Triple(s.asNode(), p.asNode(),
-				NodeFactory.createLiteral(o, l, wellFormed)));
-		return SecuredStatementImpl.getInstance(holder.getSecuredItem(), holder
-				.getBaseItem().createStatement(s, p, o, l, wellFormed));
+		checkCreate(new Triple(s.asNode(), p.asNode(), NodeFactory.createLiteral(o, l, wellFormed)));
+		return SecuredStatementImpl.getInstance(holder.getSecuredItem(),
+				holder.getBaseItem().createStatement(s, p, o, l, wellFormed));
 	}
 
 	@Override
 	public SecuredLiteral createTypedLiteral(final boolean v) {
-		return SecuredLiteralImpl.getInstance(holder.getSecuredItem(), holder
-				.getBaseItem().createTypedLiteral(v));
+		return SecuredLiteralImpl.getInstance(holder.getSecuredItem(), holder.getBaseItem().createTypedLiteral(v));
 	}
 
 	@Override
 	public SecuredLiteral createTypedLiteral(final Calendar d) {
-		return SecuredLiteralImpl.getInstance(holder.getSecuredItem(), holder
-				.getBaseItem().createTypedLiteral(d));
+		return SecuredLiteralImpl.getInstance(holder.getSecuredItem(), holder.getBaseItem().createTypedLiteral(d));
 	}
 
 	@Override
 	public SecuredLiteral createTypedLiteral(final char v) {
-		return SecuredLiteralImpl.getInstance(holder.getSecuredItem(), holder
-				.getBaseItem().createTypedLiteral(v));
+		return SecuredLiteralImpl.getInstance(holder.getSecuredItem(), holder.getBaseItem().createTypedLiteral(v));
 	}
 
 	@Override
 	public SecuredLiteral createTypedLiteral(final double v) {
-		return SecuredLiteralImpl.getInstance(holder.getSecuredItem(), holder
-				.getBaseItem().createTypedLiteral(v));
+		return SecuredLiteralImpl.getInstance(holder.getSecuredItem(), holder.getBaseItem().createTypedLiteral(v));
 	}
 
 	@Override
 	public SecuredLiteral createTypedLiteral(final float v) {
-		return SecuredLiteralImpl.getInstance(holder.getSecuredItem(), holder
-				.getBaseItem().createTypedLiteral(v));
+		return SecuredLiteralImpl.getInstance(holder.getSecuredItem(), holder.getBaseItem().createTypedLiteral(v));
 	}
 
 	@Override
 	public SecuredLiteral createTypedLiteral(final int v) {
-		return SecuredLiteralImpl.getInstance(holder.getSecuredItem(), holder
-				.getBaseItem().createTypedLiteral(v));
+		return SecuredLiteralImpl.getInstance(holder.getSecuredItem(), holder.getBaseItem().createTypedLiteral(v));
 	}
 
 	@Override
 	public SecuredLiteral createTypedLiteral(final long v) {
-		return SecuredLiteralImpl.getInstance(holder.getSecuredItem(), holder
-				.getBaseItem().createTypedLiteral(v));
+		return SecuredLiteralImpl.getInstance(holder.getSecuredItem(), holder.getBaseItem().createTypedLiteral(v));
 	}
 
 	@Override
 	public SecuredLiteral createTypedLiteral(final Object value) {
-		return SecuredLiteralImpl.getInstance(holder.getSecuredItem(), holder
-				.getBaseItem().createTypedLiteral(value));
+		return SecuredLiteralImpl.getInstance(holder.getSecuredItem(), holder.getBaseItem().createTypedLiteral(value));
 	}
 
 	@Override
-	public SecuredLiteral createTypedLiteral(final Object value,
-			final RDFDatatype dtype) {
-		return SecuredLiteralImpl.getInstance(holder.getSecuredItem(), holder
-				.getBaseItem().createTypedLiteral(value, dtype));
+	public SecuredLiteral createTypedLiteral(final Object value, final RDFDatatype dtype) {
+		return SecuredLiteralImpl.getInstance(holder.getSecuredItem(),
+				holder.getBaseItem().createTypedLiteral(value, dtype));
 	}
 
 	@Override
-	public SecuredLiteral createTypedLiteral(final Object value,
-			final String typeURI) {
-		return SecuredLiteralImpl.getInstance(holder.getSecuredItem(), holder
-				.getBaseItem().createTypedLiteral(value, typeURI));
+	public SecuredLiteral createTypedLiteral(final Object value, final String typeURI) {
+		return SecuredLiteralImpl.getInstance(holder.getSecuredItem(),
+				holder.getBaseItem().createTypedLiteral(value, typeURI));
 	}
 
 	@Override
 	public SecuredLiteral createTypedLiteral(final String v) {
-		return SecuredLiteralImpl.getInstance(holder.getSecuredItem(), holder
-				.getBaseItem().createTypedLiteral(v));
+		return SecuredLiteralImpl.getInstance(holder.getSecuredItem(), holder.getBaseItem().createTypedLiteral(v));
 	}
 
 	@Override
-	public SecuredLiteral createTypedLiteral(final String lex,
-			final RDFDatatype dtype) {
-		return SecuredLiteralImpl.getInstance(holder.getSecuredItem(), holder
-				.getBaseItem().createTypedLiteral(lex, dtype));
+	public SecuredLiteral createTypedLiteral(final String lex, final RDFDatatype dtype) {
+		return SecuredLiteralImpl.getInstance(holder.getSecuredItem(),
+				holder.getBaseItem().createTypedLiteral(lex, dtype));
 	}
 
 	@Override
-	public SecuredLiteral createTypedLiteral(final String lex,
-			final String typeURI) {
-		return SecuredLiteralImpl.getInstance(holder.getSecuredItem(), holder
-				.getBaseItem().createTypedLiteral(lex, typeURI));
+	public SecuredLiteral createTypedLiteral(final String lex, final String typeURI) {
+		return SecuredLiteralImpl.getInstance(holder.getSecuredItem(),
+				holder.getBaseItem().createTypedLiteral(lex, typeURI));
 	}
 
 	@Override
-	public Model difference(final Model model) throws ReadDeniedException,
-			AuthenticationRequiredException {
+	public Model difference(final Model model) throws ReadDeniedException, AuthenticationRequiredException {
 		checkRead();
 		if (canRead(Triple.ANY)) {
 			return holder.getBaseItem().difference(model);
@@ -1134,8 +990,7 @@ public class SecuredModelImpl extends SecuredItemImpl implements SecuredModel {
 
 	@Override
 	public void enterCriticalSection(final boolean readLockRequested)
-			throws UpdateDeniedException, ReadDeniedException,
-			AuthenticationRequiredException {
+			throws UpdateDeniedException, ReadDeniedException, AuthenticationRequiredException {
 		if (readLockRequested) {
 			checkRead();
 		} else {
@@ -1152,75 +1007,61 @@ public class SecuredModelImpl extends SecuredItemImpl implements SecuredModel {
 
 	@Override
 	public void executeInTxn(Runnable action) {
-	    holder.getBaseItem().executeInTxn(action);
+		holder.getBaseItem().executeInTxn(action);
 	}
 
-    @Override
-    public <T> T calculateInTxn(Supplier<T> action) {
-        return holder.getBaseItem().calculateInTxn(action);
-    }
+	@Override
+	public <T> T calculateInTxn(Supplier<T> action) {
+		return holder.getBaseItem().calculateInTxn(action);
+	}
 
 	@Override
-	public String expandPrefix(final String prefixed)
-			throws ReadDeniedException, AuthenticationRequiredException {
+	public String expandPrefix(final String prefixed) throws ReadDeniedException, AuthenticationRequiredException {
 		checkRead();
 		return holder.getBaseItem().expandPrefix(prefixed);
 	}
 
 	@Override
-	public SecuredAlt getAlt(final Resource r) throws ReadDeniedException,
-			AuthenticationRequiredException {
+	public SecuredAlt getAlt(final Resource r) throws ReadDeniedException, AuthenticationRequiredException {
 		checkRead();
 		checkRead(new Triple(r.asNode(), RDF.type.asNode(), RDF.Alt.asNode()));
-		return SecuredAltImpl.getInstance(holder.getSecuredItem(), holder
-				.getBaseItem().getAlt(r));
+		return SecuredAltImpl.getInstance(holder.getSecuredItem(), holder.getBaseItem().getAlt(r));
 	}
 
 	@Override
-	public SecuredAlt getAlt(final String uri) throws ReadDeniedException,
-			AuthenticationRequiredException {
+	public SecuredAlt getAlt(final String uri) throws ReadDeniedException, AuthenticationRequiredException {
 		checkRead();
-		checkRead(new Triple(NodeFactory.createURI(uri), RDF.type.asNode(),
-				RDF.Alt.asNode()));
-		return SecuredAltImpl.getInstance(holder.getSecuredItem(), holder
-				.getBaseItem().getAlt(uri));
+		checkRead(new Triple(NodeFactory.createURI(uri), RDF.type.asNode(), RDF.Alt.asNode()));
+		return SecuredAltImpl.getInstance(holder.getSecuredItem(), holder.getBaseItem().getAlt(uri));
 	}
 
 	@Override
 	public SecuredResource getAnyReifiedStatement(final Statement s)
-			throws ReadDeniedException, UpdateDeniedException,
-			AddDeniedException, AuthenticationRequiredException {
+			throws ReadDeniedException, UpdateDeniedException, AddDeniedException, AuthenticationRequiredException {
 		final RSIterator it = listReifiedStatements(s);
 		if (it.hasNext()) {
 			try {
-				return SecuredReifiedStatementImpl.getInstance(
-						holder.getSecuredItem(), it.nextRS());
+				return SecuredReifiedStatementImpl.getInstance(holder.getSecuredItem(), it.nextRS());
 			} finally {
 				it.close();
 			}
 		} else {
-			return SecuredReifiedStatementImpl.getInstance(
-					holder.getSecuredItem(), createReifiedStatement(s));
+			return SecuredReifiedStatementImpl.getInstance(holder.getSecuredItem(), createReifiedStatement(s));
 		}
 	}
 
 	@Override
-	public SecuredBag getBag(final Resource r) throws ReadDeniedException,
-			AuthenticationRequiredException {
+	public SecuredBag getBag(final Resource r) throws ReadDeniedException, AuthenticationRequiredException {
 		checkRead();
 		checkRead(new Triple(r.asNode(), RDF.type.asNode(), RDF.Bag.asNode()));
-		return SecuredBagImpl.getInstance(holder.getSecuredItem(), holder
-				.getBaseItem().getBag(r));
+		return SecuredBagImpl.getInstance(holder.getSecuredItem(), holder.getBaseItem().getBag(r));
 	}
 
 	@Override
-	public SecuredBag getBag(final String uri) throws ReadDeniedException,
-			AuthenticationRequiredException {
+	public SecuredBag getBag(final String uri) throws ReadDeniedException, AuthenticationRequiredException {
 		checkRead();
-		checkRead(new Triple(NodeFactory.createURI(uri), RDF.type.asNode(),
-				RDF.Bag.asNode()));
-		return SecuredBagImpl.getInstance(holder.getSecuredItem(), holder
-				.getBaseItem().getBag(uri));
+		checkRead(new Triple(NodeFactory.createURI(uri), RDF.type.asNode(), RDF.Bag.asNode()));
+		return SecuredBagImpl.getInstance(holder.getSecuredItem(), holder.getBaseItem().getBag(uri));
 	}
 
 	@Override
@@ -1234,22 +1075,19 @@ public class SecuredModelImpl extends SecuredItemImpl implements SecuredModel {
 	}
 
 	@Override
-	public Map<String, String> getNsPrefixMap() throws ReadDeniedException,
-			AuthenticationRequiredException {
+	public Map<String, String> getNsPrefixMap() throws ReadDeniedException, AuthenticationRequiredException {
 		checkRead();
 		return holder.getBaseItem().getNsPrefixMap();
 	}
 
 	@Override
-	public String getNsPrefixURI(final String prefix)
-			throws ReadDeniedException, AuthenticationRequiredException {
+	public String getNsPrefixURI(final String prefix) throws ReadDeniedException, AuthenticationRequiredException {
 		checkRead();
 		return holder.getBaseItem().getNsPrefixURI(prefix);
 	}
 
 	@Override
-	public String getNsURIPrefix(final String uri) throws ReadDeniedException,
-			AuthenticationRequiredException {
+	public String getNsURIPrefix(final String uri) throws ReadDeniedException, AuthenticationRequiredException {
 		checkRead();
 		return holder.getBaseItem().getNsURIPrefix(uri);
 	}
@@ -1260,8 +1098,7 @@ public class SecuredModelImpl extends SecuredItemImpl implements SecuredModel {
 		final StmtIterator stmt = listStatements(s, p, (RDFNode) null);
 		try {
 			if (stmt.hasNext()) {
-				return SecuredStatementImpl.getInstance(
-						holder.getSecuredItem(), stmt.next());
+				return SecuredStatementImpl.getInstance(holder.getSecuredItem(), stmt.next());
 			}
 			return null;
 		} finally {
@@ -1270,55 +1107,49 @@ public class SecuredModelImpl extends SecuredItemImpl implements SecuredModel {
 			}
 		}
 	}
-	
-    @Override
-    public Statement getProperty(Resource s, Property p, String lang)
-        throws ReadDeniedException, AuthenticationRequiredException {
-        final StmtIterator stmt = listStatements(s, p, null, lang);
-        try {
-            if (stmt.hasNext()) {
-                return SecuredStatementImpl.getInstance(
-                                                        holder.getSecuredItem(), stmt.next());
-            }
-            return null;
-        } finally {
-            if (stmt != null) {
-                stmt.close();
-            }
-        }
-    }
-
-	@Override
-	public SecuredProperty getProperty(final String uri)
+
+	@Override
+	public SecuredStatement getProperty(Resource s, Property p, String lang)
 			throws ReadDeniedException, AuthenticationRequiredException {
+		final StmtIterator stmt = listStatements(s, p, null, lang);
+		try {
+			if (stmt.hasNext()) {
+				return SecuredStatementImpl.getInstance(holder.getSecuredItem(), stmt.next());
+			}
+			return null;
+		} finally {
+			if (stmt != null) {
+				stmt.close();
+			}
+		}
+	}
+
+	@Override
+	public SecuredProperty getProperty(final String uri) throws ReadDeniedException, AuthenticationRequiredException {
 		checkRead();
-		return SecuredPropertyImpl.getInstance(holder.getSecuredItem(), holder
-				.getBaseItem().getProperty(uri));
+		return SecuredPropertyImpl.getInstance(holder.getSecuredItem(), holder.getBaseItem().getProperty(uri));
 	}
 
 	@Override
-	public SecuredProperty getProperty(final String nameSpace, final String localName) throws ReadDeniedException,
-			AuthenticationRequiredException {
+	public SecuredProperty getProperty(final String nameSpace, final String localName)
+			throws ReadDeniedException, AuthenticationRequiredException {
 		checkRead();
-		return SecuredPropertyImpl.getInstance(holder.getSecuredItem(), holder
-				.getBaseItem().getProperty(nameSpace, localName));
+		return SecuredPropertyImpl.getInstance(holder.getSecuredItem(),
+				holder.getBaseItem().getProperty(nameSpace, localName));
 	}
 
 	@Override
-	public SecuredRDFNode getRDFNode(final Node n) throws ReadDeniedException,
-			UpdateDeniedException, AuthenticationRequiredException {
+	public SecuredRDFNode getRDFNode(final Node n)
+			throws ReadDeniedException, UpdateDeniedException, AuthenticationRequiredException {
 		RDFNode rdfNode = null;
 		if (n.isLiteral()) {
-			rdfNode = ResourceFactory.createTypedLiteral(
-					n.getLiteralLexicalForm(), n.getLiteralDatatype());
+			rdfNode = ResourceFactory.createTypedLiteral(n.getLiteralLexicalForm(), n.getLiteralDatatype());
 		} else if (n.isURI()) {
 			rdfNode = ResourceFactory.createProperty(n.getURI());
 		} else if (n.isBlank()) {
-			rdfNode = ResourceFactory.createResource(n.getBlankNodeId()
-					.toString());
+			rdfNode = ResourceFactory.createResource(n.getBlankNodeId().toString());
 		} else {
-			throw new IllegalArgumentException("Illegal Node type: "
-					+ n.getClass());
+			throw new IllegalArgumentException("Illegal Node type: " + n.getClass());
 		}
 
 		if (holder.getBaseItem().containsResource(rdfNode)) {
@@ -1359,14 +1190,13 @@ public class SecuredModelImpl extends SecuredItemImpl implements SecuredModel {
 
 	@Override
 	public SecuredStatement getRequiredProperty(final Resource s, final Property p)
-	    throws ReadDeniedException, AuthenticationRequiredException {
+			throws ReadDeniedException, AuthenticationRequiredException {
 		checkRead();
 		if (canRead(Triple.ANY)) {
 			return SecuredStatementImpl.getInstance(holder.getSecuredItem(),
 					holder.getBaseItem().getRequiredProperty(s, p));
 		} else {
-			final SecuredStatementIterator si = listStatements(s, p,
-					(RDFNode) null);
+			final SecuredStatementIterator si = listStatements(s, p, (RDFNode) null);
 			try {
 				if (si.hasNext()) {
 					return (SecuredStatement) si.next();
@@ -1380,28 +1210,26 @@ public class SecuredModelImpl extends SecuredItemImpl implements SecuredModel {
 	}
 
 	@Override
-	public SecuredStatement getRequiredProperty(final Resource s, final Property p, String lang) 
-	    throws ReadDeniedException, AuthenticationRequiredException {
-	    checkRead();
-	    if (canRead(Triple.ANY)) {
-	        return SecuredStatementImpl.getInstance(holder.getSecuredItem(),
-	                                                holder.getBaseItem().getRequiredProperty(s, p, lang));
-	    } else {
-	        final SecuredStatementIterator si = listStatements(s, p,
-	                                                           (RDFNode) null);
-	        try {
-	            if (si.hasNext()) {
-	                return (SecuredStatement) si.next();
-	            } else {
-	                throw new PropertyNotFoundException(p);
-	            }
-	        } finally {
-	            si.close();
-	        }
-	    }
+	public SecuredStatement getRequiredProperty(final Resource s, final Property p, String lang)
+			throws ReadDeniedException, AuthenticationRequiredException {
+		checkRead();
+		if (canRead(Triple.ANY)) {
+			return SecuredStatementImpl.getInstance(holder.getSecuredItem(),
+					holder.getBaseItem().getRequiredProperty(s, p, lang));
+		} else {
+			final SecuredStatementIterator si = listStatements(s, p, null, lang);
+			try {
+				if (si.hasNext()) {
+					return (SecuredStatement) si.next();
+				} else {
+					throw new PropertyNotFoundException(p);
+				}
+			} finally {
+				si.close();
+			}
+		}
 	}
 
-	
 	@Override
 	public SecuredResource getResource(final String uri) {
 		return createResource(uri);
@@ -1414,22 +1242,17 @@ public class SecuredModelImpl extends SecuredItemImpl implements SecuredModel {
 	}
 
 	@Override
-	public SecuredSeq getSeq(final Resource r) throws ReadDeniedException,
-			AuthenticationRequiredException {
+	public SecuredSeq getSeq(final Resource r) throws ReadDeniedException, AuthenticationRequiredException {
 		checkRead();
 		checkRead(new Triple(r.asNode(), RDF.type.asNode(), RDF.Seq.asNode()));
-		return SecuredSeqImpl.getInstance(holder.getSecuredItem(), holder
-				.getBaseItem().getSeq(r));
+		return SecuredSeqImpl.getInstance(holder.getSecuredItem(), holder.getBaseItem().getSeq(r));
 	}
 
 	@Override
-	public SecuredSeq getSeq(final String uri) throws ReadDeniedException,
-			AuthenticationRequiredException {
+	public SecuredSeq getSeq(final String uri) throws ReadDeniedException, AuthenticationRequiredException {
 		checkRead();
-		checkRead(new Triple(NodeFactory.createURI(uri), RDF.type.asNode(),
-				RDF.Seq.asNode()));
-		return SecuredSeqImpl.getInstance(holder.getSecuredItem(), holder
-				.getBaseItem().getSeq(uri));
+		checkRead(new Triple(NodeFactory.createURI(uri), RDF.type.asNode(), RDF.Seq.asNode()));
+		return SecuredSeqImpl.getInstance(holder.getSecuredItem(), holder.getBaseItem().getSeq(uri));
 	}
 
 	@Override
@@ -1460,8 +1283,7 @@ public class SecuredModelImpl extends SecuredItemImpl implements SecuredModel {
 	}
 
 	@Override
-	public Model intersection(final Model model) throws ReadDeniedException,
-			AuthenticationRequiredException {
+	public Model intersection(final Model model) throws ReadDeniedException, AuthenticationRequiredException {
 		checkRead();
 		if (!canRead(Triple.ANY)) {
 			return holder.getBaseItem().intersection(model);
@@ -1476,23 +1298,20 @@ public class SecuredModelImpl extends SecuredItemImpl implements SecuredModel {
 	}
 
 	@Override
-	public boolean isEmpty() throws ReadDeniedException,
-			AuthenticationRequiredException {
+	public boolean isEmpty() throws ReadDeniedException, AuthenticationRequiredException {
 		checkRead();
 		return holder.getBaseItem().isEmpty();
 	}
 
 	@Override
-	public boolean isIsomorphicWith(final Model g) throws ReadDeniedException,
-			AuthenticationRequiredException {
+	public boolean isIsomorphicWith(final Model g) throws ReadDeniedException, AuthenticationRequiredException {
 		checkRead();
 		final boolean retval = holder.getBaseItem().isIsomorphicWith(g);
 		if (retval && !canRead(Triple.ANY)) {
 			// in this case we have to check all the items in the graph to see
 			// if the user can read
 			// them all.
-			final ExtendedIterator<Statement> stmtIter = holder.getBaseItem()
-					.listStatements();
+			final ExtendedIterator<Statement> stmtIter = holder.getBaseItem().listStatements();
 			try {
 				while (stmtIter.hasNext()) {
 					if (!canRead(stmtIter.next())) {
@@ -1509,8 +1328,7 @@ public class SecuredModelImpl extends SecuredItemImpl implements SecuredModel {
 	}
 
 	@Override
-	public boolean isReified(final Statement s) throws ReadDeniedException,
-			AuthenticationRequiredException {
+	public boolean isReified(final Statement s) throws ReadDeniedException, AuthenticationRequiredException {
 		checkRead();
 		checkRead(s);
 
@@ -1528,77 +1346,61 @@ public class SecuredModelImpl extends SecuredItemImpl implements SecuredModel {
 	}
 
 	@Override
-	public SecuredStatementIterator listLiteralStatements(
-			final Resource subject, final Property predicate,
-			final boolean object) throws ReadDeniedException,
-			AuthenticationRequiredException {
+	public SecuredStatementIterator listLiteralStatements(final Resource subject, final Property predicate,
+			final boolean object) throws ReadDeniedException, AuthenticationRequiredException {
 		checkRead();
-		return new SecuredStatementIterator(holder.getSecuredItem(), holder
-				.getBaseItem()
-				.listLiteralStatements(subject, predicate, object));
+		return new SecuredStatementIterator(holder.getSecuredItem(),
+				holder.getBaseItem().listLiteralStatements(subject, predicate, object));
 	}
 
 	@Override
-	public SecuredStatementIterator listLiteralStatements(
-			final Resource subject, final Property predicate, final char object)
-			throws ReadDeniedException, AuthenticationRequiredException {
+	public SecuredStatementIterator listLiteralStatements(final Resource subject, final Property predicate,
+			final char object) throws ReadDeniedException, AuthenticationRequiredException {
 		checkRead();
-		return new SecuredStatementIterator(holder.getSecuredItem(), holder
-				.getBaseItem()
-				.listLiteralStatements(subject, predicate, object));
+		return new SecuredStatementIterator(holder.getSecuredItem(),
+				holder.getBaseItem().listLiteralStatements(subject, predicate, object));
 	}
 
 	@Override
-	public SecuredStatementIterator listLiteralStatements(
-			final Resource subject, final Property predicate,
-			final double object) throws ReadDeniedException,
-			AuthenticationRequiredException {
+	public SecuredStatementIterator listLiteralStatements(final Resource subject, final Property predicate,
+			final double object) throws ReadDeniedException, AuthenticationRequiredException {
 		checkRead();
-		return new SecuredStatementIterator(holder.getSecuredItem(), holder
-				.getBaseItem()
-				.listLiteralStatements(subject, predicate, object));
+		return new SecuredStatementIterator(holder.getSecuredItem(),
+				holder.getBaseItem().listLiteralStatements(subject, predicate, object));
 	}
 
 	@Override
-	public SecuredStatementIterator listLiteralStatements(
-			final Resource subject, final Property predicate, final float object)
-			throws ReadDeniedException, AuthenticationRequiredException {
+	public SecuredStatementIterator listLiteralStatements(final Resource subject, final Property predicate,
+			final float object) throws ReadDeniedException, AuthenticationRequiredException {
 		checkRead();
-		return new SecuredStatementIterator(holder.getSecuredItem(), holder
-				.getBaseItem()
-				.listLiteralStatements(subject, predicate, object));
+		return new SecuredStatementIterator(holder.getSecuredItem(),
+				holder.getBaseItem().listLiteralStatements(subject, predicate, object));
 	}
 
 	@Override
-	public SecuredStatementIterator listLiteralStatements(
-			final Resource subject, final Property predicate, final long object)
-			throws ReadDeniedException, AuthenticationRequiredException {
+	public SecuredStatementIterator listLiteralStatements(final Resource subject, final Property predicate,
+			final long object) throws ReadDeniedException, AuthenticationRequiredException {
 		checkRead();
-		return new SecuredStatementIterator(holder.getSecuredItem(), holder
-				.getBaseItem()
-				.listLiteralStatements(subject, predicate, object));
+		return new SecuredStatementIterator(holder.getSecuredItem(),
+				holder.getBaseItem().listLiteralStatements(subject, predicate, object));
 	}
 
-    @Override
-    public SecuredStatementIterator listLiteralStatements(
-            final Resource subject, final Property predicate, final int object)
-            throws ReadDeniedException, AuthenticationRequiredException {
-        checkRead();
-        return new SecuredStatementIterator(holder.getSecuredItem(), holder
-                .getBaseItem()
-                .listLiteralStatements(subject, predicate, object));
-    }
+	@Override
+	public SecuredStatementIterator listLiteralStatements(final Resource subject, final Property predicate,
+			final int object) throws ReadDeniedException, AuthenticationRequiredException {
+		checkRead();
+		return new SecuredStatementIterator(holder.getSecuredItem(),
+				holder.getBaseItem().listLiteralStatements(subject, predicate, object));
+	}
 
 	@Override
-	public NsIterator listNameSpaces() throws ReadDeniedException,
-			AuthenticationRequiredException {
+	public NsIterator listNameSpaces() throws ReadDeniedException, AuthenticationRequiredException {
 		checkRead();
 		return holder.getBaseItem().listNameSpaces();
 	}
 
 	@Override
-	public SecuredNodeIterator<RDFNode> listObjects()
-			throws ReadDeniedException, AuthenticationRequiredException {
+	public SecuredNodeIterator<RDFNode> listObjects() throws ReadDeniedException, AuthenticationRequiredException {
 		checkRead();
 		ExtendedIterator<RDFNode> nIter = holder.getBaseItem().listObjects();
 		if (!canRead(Triple.ANY)) {
@@ -1611,8 +1413,7 @@ public class SecuredModelImpl extends SecuredItemImpl implements SecuredModel {
 	public SecuredNodeIterator<RDFNode> listObjectsOfProperty(final Property p)
 			throws ReadDeniedException, AuthenticationRequiredException {
 		checkRead();
-		ExtendedIterator<RDFNode> nIter = holder.getBaseItem()
-				.listObjectsOfProperty(p);
+		ExtendedIterator<RDFNode> nIter = holder.getBaseItem().listObjectsOfProperty(p);
 		if (!canRead(Triple.ANY)) {
 			nIter = nIter.filterKeep(new ObjectFilter(p));
 		}
@@ -1620,12 +1421,10 @@ public class SecuredModelImpl extends SecuredItemImpl implements SecuredModel {
 	}
 
 	@Override
-	public SecuredNodeIterator<RDFNode> listObjectsOfProperty(final Resource s,
-			final Property p) throws ReadDeniedException,
-			AuthenticationRequiredException {
+	public SecuredNodeIterator<RDFNode> listObjectsOfProperty(final Resource s, final Property p)
+			throws ReadDeniedException, AuthenticationRequiredException {
 		checkRead();
-		ExtendedIterator<RDFNode> nIter = holder.getBaseItem()
-				.listObjectsOfProperty(s, p);
+		ExtendedIterator<RDFNode> nIter = holder.getBaseItem().listObjectsOfProperty(s, p);
 		if (!canRead(Triple.ANY)) {
 			nIter = nIter.filterKeep(new ObjectFilter(p));
 		}
@@ -1633,11 +1432,9 @@ public class SecuredModelImpl extends SecuredItemImpl implements SecuredModel {
 	}
 
 	@Override
-	public SecuredRSIterator listReifiedStatements()
-			throws ReadDeniedException, AuthenticationRequiredException {
+	public SecuredRSIterator listReifiedStatements() throws ReadDeniedException, AuthenticationRequiredException {
 		checkRead();
-		return new SecuredRSIterator(holder.getSecuredItem(), holder
-				.getBaseItem().listReifiedStatements());
+		return new SecuredRSIterator(holder.getSecuredItem(), holder.getBaseItem().listReifiedStatements());
 	}
 
 	@Override
@@ -1645,16 +1442,14 @@ public class SecuredModelImpl extends SecuredItemImpl implements SecuredModel {
 			throws ReadDeniedException, AuthenticationRequiredException {
 		checkRead();
 		checkRead(st);
-		return new SecuredRSIterator(holder.getSecuredItem(), holder
-				.getBaseItem().listReifiedStatements(st));
+		return new SecuredRSIterator(holder.getSecuredItem(), holder.getBaseItem().listReifiedStatements(st));
 	}
 
 	@Override
 	public SecuredResIterator listResourcesWithProperty(final Property p)
 			throws ReadDeniedException, AuthenticationRequiredException {
 		checkRead();
-		ExtendedIterator<Resource> rIter = holder.getBaseItem()
-				.listResourcesWithProperty(p);
+		ExtendedIterator<Resource> rIter = holder.getBaseItem().listResourcesWithProperty(p);
 		if (!canRead(Triple.ANY)) {
 			rIter = rIter.filterKeep(new ResourceFilter(p));
 		}
@@ -1663,96 +1458,76 @@ public class SecuredModelImpl extends SecuredItemImpl implements SecuredModel {
 	}
 
 	@Override
-	public SecuredResIterator listResourcesWithProperty(final Property p,
-			final boolean o) throws ReadDeniedException,
-			AuthenticationRequiredException {
+	public SecuredResIterator listResourcesWithProperty(final Property p, final boolean o)
+			throws ReadDeniedException, AuthenticationRequiredException {
 		checkRead();
-		ExtendedIterator<Resource> rIter = holder.getBaseItem()
-				.listResourcesWithProperty(p, o);
+		ExtendedIterator<Resource> rIter = holder.getBaseItem().listResourcesWithProperty(p, o);
 		if (!canRead(Triple.ANY)) {
-			rIter = rIter.filterKeep(new ResourceFilter(p, ResourceFactory
-					.createTypedLiteral(o)));
+			rIter = rIter.filterKeep(new ResourceFilter(p, ResourceFactory.createTypedLiteral(o)));
 		}
 		return new SecuredResIterator(holder.getSecuredItem(), rIter);
 	}
 
 	@Override
-	public SecuredResIterator listResourcesWithProperty(final Property p,
-			final char o) throws ReadDeniedException,
-			AuthenticationRequiredException {
+	public SecuredResIterator listResourcesWithProperty(final Property p, final char o)
+			throws ReadDeniedException, AuthenticationRequiredException {
 		checkRead();
-		ExtendedIterator<Resource> rIter = holder.getBaseItem()
-				.listResourcesWithProperty(p, o);
+		ExtendedIterator<Resource> rIter = holder.getBaseItem().listResourcesWithProperty(p, o);
 		if (!canRead(Triple.ANY)) {
-			rIter = rIter.filterKeep(new ResourceFilter(p, ResourceFactory
-					.createTypedLiteral(o)));
+			rIter = rIter.filterKeep(new ResourceFilter(p, ResourceFactory.createTypedLiteral(o)));
 		}
 		return new SecuredResIterator(holder.getSecuredItem(), rIter);
 	}
 
 	@Override
-	public SecuredResIterator listResourcesWithProperty(final Property p,
-			final double o) throws ReadDeniedException,
-			AuthenticationRequiredException {
+	public SecuredResIterator listResourcesWithProperty(final Property p, final double o)
+			throws ReadDeniedException, AuthenticationRequiredException {
 		checkRead();
-		ExtendedIterator<Resource> rIter = holder.getBaseItem()
-				.listResourcesWithProperty(p, o);
+		ExtendedIterator<Resource> rIter = holder.getBaseItem().listResourcesWithProperty(p, o);
 		if (!canRead(Triple.ANY)) {
-			rIter = rIter.filterKeep(new ResourceFilter(p, ResourceFactory
-					.createTypedLiteral(o)));
+			rIter = rIter.filterKeep(new ResourceFilter(p, ResourceFactory.createTypedLiteral(o)));
 		}
 		return new SecuredResIterator(holder.getSecuredItem(), rIter);
 	}
 
 	@Override
-	public SecuredResIterator listResourcesWithProperty(final Property p,
-			final float o) throws ReadDeniedException,
-			AuthenticationRequiredException {
+	public SecuredResIterator listResourcesWithProperty(final Property p, final float o)
+			throws ReadDeniedException, AuthenticationRequiredException {
 		checkRead();
-		ExtendedIterator<Resource> rIter = holder.getBaseItem()
-				.listResourcesWithProperty(p, o);
+		ExtendedIterator<Resource> rIter = holder.getBaseItem().listResourcesWithProperty(p, o);
 		if (!canRead(Triple.ANY)) {
-			rIter = rIter.filterKeep(new ResourceFilter(p, ResourceFactory
-					.createTypedLiteral(o)));
+			rIter = rIter.filterKeep(new ResourceFilter(p, ResourceFactory.createTypedLiteral(o)));
 		}
 		return new SecuredResIterator(holder.getSecuredItem(), rIter);
 	}
 
 	@Override
-	public SecuredResIterator listResourcesWithProperty(final Property p,
-			final long o) throws ReadDeniedException,
-			AuthenticationRequiredException {
+	public SecuredResIterator listResourcesWithProperty(final Property p, final long o)
+			throws ReadDeniedException, AuthenticationRequiredException {
 		checkRead();
-		ExtendedIterator<Resource> rIter = holder.getBaseItem()
-				.listResourcesWithProperty(p, o);
+		ExtendedIterator<Resource> rIter = holder.getBaseItem().listResourcesWithProperty(p, o);
 		if (!canRead(Triple.ANY)) {
-			rIter = rIter.filterKeep(new ResourceFilter(p, ResourceFactory
-					.createTypedLiteral(o)));
+			rIter = rIter.filterKeep(new ResourceFilter(p, ResourceFactory.createTypedLiteral(o)));
 		}
 		return new SecuredResIterator(holder.getSecuredItem(), rIter);
 	}
 
 	@Override
-	public SecuredResIterator listResourcesWithProperty(final Property p,
-			final Object o) throws ReadDeniedException,
-			AuthenticationRequiredException {
+	public SecuredResIterator listResourcesWithProperty(final Property p, final Object o)
+			throws ReadDeniedException, AuthenticationRequiredException {
 		checkRead();
-		ExtendedIterator<Resource> rIter = holder.getBaseItem()
-				.listResourcesWithProperty(p, o);
+		ExtendedIterator<Resource> rIter = holder.getBaseItem().listResourcesWithProperty(p, o);
 		if (!canRead(Triple.ANY)) {
-			rIter = rIter.filterKeep(new ResourceFilter(p, ResourceFactory
-					.createTypedLiteral(o)));
+			rIter = rIter.filterKeep(new ResourceFilter(p, ResourceFactory.createTypedLiteral(o)));
 		}
 		return new SecuredResIterator(holder.getSecuredItem(), rIter);
 	}
 
 	@Override
-	public SecuredResIterator listResourcesWithProperty(final Property p,
-			final RDFNode o) throws ReadDeniedException,
-			AuthenticationRequiredException {
+	public SecuredResIterator listResourcesWithProperty(final Property p, final RDFNode o)
+			throws ReadDeniedException, AuthenticationRequiredException {
 		checkRead();
-		ExtendedIterator<Resource> rIter = holder.getBaseItem()
-				.listResourcesWithProperty(p, o);
+		ExtendedIterator<Resource> rIter = holder.getBaseItem().listResourcesWithProperty(p, o);
 		if (!canRead(Triple.ANY)) {
 			rIter = rIter.filterKeep(new ResourceFilter(p, o));
 		}
@@ -1760,51 +1535,43 @@ public class SecuredModelImpl extends SecuredItemImpl implements SecuredModel {
 	}
 
 	@Override
-	public SecuredStatementIterator listStatements()
-			throws ReadDeniedException, AuthenticationRequiredException {
+	public SecuredStatementIterator listStatements() throws ReadDeniedException, AuthenticationRequiredException {
 		checkRead();
-		return new SecuredStatementIterator(holder.getSecuredItem(), holder
-				.getBaseItem().listStatements());
+		return new SecuredStatementIterator(holder.getSecuredItem(), holder.getBaseItem().listStatements());
 	}
 
 	@Override
-	public SecuredStatementIterator listStatements(final Resource s,
-			final Property p, final RDFNode o) throws ReadDeniedException,
-			AuthenticationRequiredException {
+	public SecuredStatementIterator listStatements(final Resource s, final Property p, final RDFNode o)
+			throws ReadDeniedException, AuthenticationRequiredException {
 		checkRead();
-		return new SecuredStatementIterator(holder.getSecuredItem(), holder
-				.getBaseItem().listStatements(s, p, o));
+		return new SecuredStatementIterator(holder.getSecuredItem(), holder.getBaseItem().listStatements(s, p, o));
 	}
 
 	@Override
-	public SecuredStatementIterator listStatements(final Resource subject,
-			final Property predicate, final String object)
-			throws ReadDeniedException, AuthenticationRequiredException {
+	public SecuredStatementIterator listStatements(final Resource subject, final Property predicate,
+			final String object) throws ReadDeniedException, AuthenticationRequiredException {
 		checkRead();
-		return new SecuredStatementIterator(holder.getSecuredItem(), holder
-				.getBaseItem().listStatements(subject, predicate, object));
+		return new SecuredStatementIterator(holder.getSecuredItem(),
+				holder.getBaseItem().listStatements(subject, predicate, object));
 	}
 
 	@Override
-	public SecuredStatementIterator listStatements(final Resource subject,
-			final Property predicate, final String object, final String lang)
-			throws ReadDeniedException, AuthenticationRequiredException {
+	public SecuredStatementIterator listStatements(final Resource subject, final Property predicate,
+			final String object, final String lang) throws ReadDeniedException, AuthenticationRequiredException {
 		checkRead();
-		return new SecuredStatementIterator(holder.getSecuredItem(), holder
-				.getBaseItem().listStatements(subject, predicate, object, lang));
+		return new SecuredStatementIterator(holder.getSecuredItem(),
+				holder.getBaseItem().listStatements(subject, predicate, object, lang));
 	}
 
 	@Override
 	public SecuredStatementIterator listStatements(final Selector s)
 			throws ReadDeniedException, AuthenticationRequiredException {
 		checkRead();
-		return new SecuredStatementIterator(holder.getSecuredItem(), holder
-				.getBaseItem().listStatements(s));
+		return new SecuredStatementIterator(holder.getSecuredItem(), holder.getBaseItem().listStatements(s));
 	}
 
 	@Override
-	public SecuredResIterator listSubjects() throws ReadDeniedException,
-			AuthenticationRequiredException {
+	public SecuredResIterator listSubjects() throws ReadDeniedException, AuthenticationRequiredException {
 		checkRead();
 		ExtendedIterator<Resource> rIter = holder.getBaseItem().listSubjects();
 		if (!canRead(Triple.ANY)) {
@@ -1817,8 +1584,7 @@ public class SecuredModelImpl extends SecuredItemImpl implements SecuredModel {
 	public SecuredResIterator listSubjectsWithProperty(final Property p)
 			throws ReadDeniedException, AuthenticationRequiredException {
 		checkRead();
-		ExtendedIterator<Resource> rIter = holder.getBaseItem()
-				.listSubjectsWithProperty(p);
+		ExtendedIterator<Resource> rIter = holder.getBaseItem().listSubjectsWithProperty(p);
 		if (!canRead(Triple.ANY)) {
 			rIter = rIter.filterKeep(new ResourceFilter(p));
 		}
@@ -1826,12 +1592,10 @@ public class SecuredModelImpl extends SecuredItemImpl implements SecuredModel {
 	}
 
 	@Override
-	public SecuredResIterator listSubjectsWithProperty(final Property p,
-			final RDFNode o) throws ReadDeniedException,
-			AuthenticationRequiredException {
+	public SecuredResIterator listSubjectsWithProperty(final Property p, final RDFNode o)
+			throws ReadDeniedException, AuthenticationRequiredException {
 		checkRead();
-		ExtendedIterator<Resource> rIter = holder.getBaseItem()
-				.listSubjectsWithProperty(p, o);
+		ExtendedIterator<Resource> rIter = holder.getBaseItem().listSubjectsWithProperty(p, o);
 		if (!canRead(Triple.ANY)) {
 			rIter = rIter.filterKeep(new ResourceFilter(p, o));
 		}
@@ -1839,36 +1603,29 @@ public class SecuredModelImpl extends SecuredItemImpl implements SecuredModel {
 	}
 
 	@Override
-	public SecuredResIterator listSubjectsWithProperty(final Property p,
-			final String o) throws ReadDeniedException,
-			AuthenticationRequiredException {
+	public SecuredResIterator listSubjectsWithProperty(final Property p, final String o)
+			throws ReadDeniedException, AuthenticationRequiredException {
 		checkRead();
-		ExtendedIterator<Resource> rIter = holder.getBaseItem()
-				.listSubjectsWithProperty(p, o);
+		ExtendedIterator<Resource> rIter = holder.getBaseItem().listSubjectsWithProperty(p, o);
 		if (!canRead(Triple.ANY)) {
-			rIter = rIter.filterKeep(new ResourceFilter(p, ResourceFactory
-					.createPlainLiteral(o)));
+			rIter = rIter.filterKeep(new ResourceFilter(p, ResourceFactory.createPlainLiteral(o)));
 		}
 		return new SecuredResIterator(holder.getSecuredItem(), rIter);
 	}
 
 	@Override
-	public SecuredResIterator listSubjectsWithProperty(final Property p,
-			final String o, final String l) throws ReadDeniedException,
-			AuthenticationRequiredException {
+	public SecuredResIterator listSubjectsWithProperty(final Property p, final String o, final String l)
+			throws ReadDeniedException, AuthenticationRequiredException {
 		checkRead();
-		ExtendedIterator<Resource> rIter = holder.getBaseItem()
-				.listSubjectsWithProperty(p, o, l);
+		ExtendedIterator<Resource> rIter = holder.getBaseItem().listSubjectsWithProperty(p, o, l);
 		if (!canRead(Triple.ANY)) {
-			rIter = rIter.filterKeep(new ResourceFilter(p, ResourceFactory
-					.createLangLiteral(o, l)));
+			rIter = rIter.filterKeep(new ResourceFilter(p, ResourceFactory.createLangLiteral(o, l)));
 		}
 		return new SecuredResIterator(holder.getSecuredItem(), rIter);
 	}
 
 	@Override
-	public SecuredPrefixMapping lock() throws UpdateDeniedException,
-			AuthenticationRequiredException {
+	public SecuredPrefixMapping lock() throws UpdateDeniedException, AuthenticationRequiredException {
 		checkUpdate();
 		holder.getBaseItem().lock();
 		return holder.getSecuredItem();
@@ -1881,38 +1638,31 @@ public class SecuredModelImpl extends SecuredItemImpl implements SecuredModel {
 	}
 
 	@Override
-	public String qnameFor(final String uri) throws ReadDeniedException,
-			AuthenticationRequiredException {
+	public String qnameFor(final String uri) throws ReadDeniedException, AuthenticationRequiredException {
 		checkRead();
 		return holder.getBaseItem().qnameFor(uri);
 	}
 
 	@Override
-	public SecuredModel query(final Selector s) throws ReadDeniedException,
-			AuthenticationRequiredException {
+	public SecuredModel query(final Selector s) throws ReadDeniedException, AuthenticationRequiredException {
 		checkRead();
-		return SecuredModelImpl.getInstance(
-				holder.getSecuredItem(),
-				holder.getBaseItem().query(
-						new SecuredSelector(holder.getSecuredItem(), s)));
+		return SecuredModelImpl.getInstance(holder.getSecuredItem(),
+				holder.getBaseItem().query(new SecuredSelector(holder.getSecuredItem(), s)));
 	}
 
 	@Override
 	public SecuredModel read(final InputStream in, final String base)
 			throws UpdateDeniedException, AuthenticationRequiredException {
 		checkUpdate();
-		SecuredModelImpl.readerFactory.getReader().read(
-				holder.getSecuredItem(), in, base);
+		SecuredModelImpl.readerFactory.getReader().read(holder.getSecur

<TRUNCATED>