issue #834 : Use NamespaceAware in place of Model where practical

Signed-off-by: Peter Ansell <p_ansell@yahoo.com>

Author: ansell

core/rio/api/src/main/java/org/eclipse/rdf4j/rio/Rio.java

@@ -19,6 +19,7 @@
 
 import org.eclipse.rdf4j.model.Model;
 import org.eclipse.rdf4j.model.Namespace;
+import org.eclipse.rdf4j.model.NamespaceAware;
 import org.eclipse.rdf4j.model.Resource;
 import org.eclipse.rdf4j.model.Statement;
 import org.eclipse.rdf4j.model.ValueFactory;
@@ -415,8 +416,8 @@ public static void write(Iterable<Statement> model, RDFHandler writer)
 	{
 		writer.startRDF();
 
-		if (model instanceof Model) {
-			for (Namespace nextNamespace : ((Model)model).getNamespaces()) {
+		if (model instanceof NamespaceAware) {
+			for (Namespace nextNamespace : ((NamespaceAware)model).getNamespaces()) {
 				writer.handleNamespace(nextNamespace.getPrefix(), nextNamespace.getName());
 			}
 		}

core/rio/api/src/main/java/org/eclipse/rdf4j/rio/helpers/ContextStatementCollector.java

@@ -14,6 +14,7 @@
 
 import org.eclipse.rdf4j.OpenRDFUtil;
 import org.eclipse.rdf4j.model.Model;
+import org.eclipse.rdf4j.model.NamespaceAware;
 import org.eclipse.rdf4j.model.Resource;
 import org.eclipse.rdf4j.model.Statement;
 import org.eclipse.rdf4j.model.ValueFactory;
@@ -59,8 +60,8 @@ public ContextStatementCollector(Collection<Statement> statements, ValueFactory
 			Resource... contexts)
 	{
 		OpenRDFUtil.verifyContextNotNull(contexts);
-		if (statements instanceof Model) {
-			this.namespaces = Namespaces.wrap(((Model)statements).getNamespaces());
+		if (statements instanceof NamespaceAware) {
+			this.namespaces = Namespaces.wrap(((NamespaceAware)statements).getNamespaces());
 		}
 		else {
 			this.namespaces = new LinkedHashMap<String, String>();

core/rio/jsonld/src/main/java/org/eclipse/rdf4j/rio/jsonld/JSONLDInternalRDFParser.java

@@ -15,6 +15,7 @@
 import org.eclipse.rdf4j.model.Literal;
 import org.eclipse.rdf4j.model.Model;
 import org.eclipse.rdf4j.model.Namespace;
+import org.eclipse.rdf4j.model.NamespaceAware;
 import org.eclipse.rdf4j.model.Resource;
 import org.eclipse.rdf4j.model.Statement;
 import org.eclipse.rdf4j.model.Value;
@@ -95,8 +96,8 @@ public RDFDataset parse(Object input)
 			handleStatement(result, (Statement)input);
 		}
 		else if (input instanceof Graph) {
-			if (input instanceof Model) {
-				final Set<Namespace> namespaces = ((Model)input).getNamespaces();
+			if (input instanceof NamespaceAware) {
+				final Set<Namespace> namespaces = ((NamespaceAware)input).getNamespaces();
 				for (final Namespace nextNs : namespaces) {
 					result.setNamespace(nextNs.getName(), nextNs.getPrefix());
 				}