maddingo
diff --git a/‎api/pom.xml‎
Lines changed: 4 additions & 0 deletions b/‎api/pom.xml‎
Lines changed: 4 additions & 0 deletions
diff --git a/‎api/src/main/java/com/inrupt/client/Resource.java‎
Lines changed: 12 additions & 4 deletions b/‎api/src/main/java/com/inrupt/client/Resource.java‎
Lines changed: 12 additions & 4 deletions
diff --git a/‎api/src/main/java/com/inrupt/client/rdf/Dataset.java‎
Lines changed: 0 additions & 78 deletions b/‎api/src/main/java/com/inrupt/client/rdf/Dataset.java‎
Lines changed: 0 additions & 78 deletions
diff --git a/‎api/src/main/java/com/inrupt/client/rdf/Graph.java‎
Lines changed: 0 additions & 75 deletions b/‎api/src/main/java/com/inrupt/client/rdf/Graph.java‎
Lines changed: 0 additions & 75 deletions
diff --git a/‎api/src/main/java/com/inrupt/client/rdf/RDFFactory.java‎
Lines changed: 0 additions & 93 deletions b/‎api/src/main/java/com/inrupt/client/rdf/RDFFactory.java‎
Lines changed: 0 additions & 93 deletions
@@ -23,6 +23,10 @@
       <groupId>commons-io</groupId>
       <artifactId>commons-io</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-rdf-api</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
 
@@ -20,15 +20,18 @@
  */
 package com.inrupt.client;
 
-import com.inrupt.client.rdf.Dataset;
-import com.inrupt.client.rdf.Syntax;
+import com.inrupt.client.spi.RDFFactory;
 import com.inrupt.client.spi.RdfService;
 import com.inrupt.client.spi.ServiceProvider;
 
 import java.io.IOException;
 import java.io.OutputStream;
 import java.net.URI;
 
+import org.apache.commons.rdf.api.Dataset;
+import org.apache.commons.rdf.api.RDF;
+import org.apache.commons.rdf.api.RDFSyntax;
+
 /**
  * A base class for resource mapping.
  *
@@ -38,6 +41,11 @@ public class Resource {
 
     private static final RdfService service = ServiceProvider.getRdfService();
 
+    /**
+     * The RDF Factory instance.
+     */
+    protected static final RDF rdf = RDFFactory.getInstance();
+
     private final Dataset dataset;
     private final URI identifier;
 
@@ -51,7 +59,7 @@ public class Resource {
      */
     protected Resource(final URI identifier, final Dataset dataset) {
         this.identifier = identifier;
-        this.dataset = dataset != null ? dataset : service.createDataset();
+        this.dataset = dataset != null ? dataset : rdf.createDataset();
     }
 
     /**
@@ -79,7 +87,7 @@ public Dataset getDataset() {
      * @param out the output stream
      * @throws IOException in the case of an I/O error
      */
-    public void serialize(final Syntax syntax, final OutputStream out) throws IOException {
+    public void serialize(final RDFSyntax syntax, final OutputStream out) throws IOException {
         service.fromDataset(getDataset(), syntax, out);
     }