Load FOAF separately and add as import (avoids printing all of foaf!)

stain · May 24, 2013 · b6f91eb · b6f91eb
1 parent cbfd2fc
commit b6f91eb
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 24 deletions.
diff --git a/orcid-api-common/src/main/java/org/orcid/api/common/writer/rdf/RDFMessageBodyWriter.java b/orcid-api-common/src/main/java/org/orcid/api/common/writer/rdf/RDFMessageBodyWriter.java
@@ -53,7 +53,6 @@
 public class RDFMessageBodyWriter implements MessageBodyWriter<OrcidMessage> {
 
     private static final String FOAF_0_1 = "http://xmlns.com/foaf/0.1/";
-    private OntModel ontModel;
     @SuppressWarnings("unused")
     private Ontology foaf;
     private DatatypeProperty foafName;
@@ -187,28 +186,33 @@ public void writeTo(OrcidMessage xml, Class<?> type, Type genericType, Annotatio
     }
 
     protected OntModel getOntModel() {
-        if (ontModel != null) {
-            return ontModel;
+        if (foaf == null) {
+            loadFoaf();
         }
-        // No.. Let's go thread-safe and make it
-        synchronized (this) {
-            if (ontModel == null) {
-                // Create RDF model
-                ontModel = ModelFactory.createOntologyModel();
-                ontModel.setDynamicImports(true);
-                InputStream foafOnt = getClass().getResourceAsStream("foaf.rdf");
-                ontModel.setNsPrefix("foaf", FOAF_0_1);
-                ontModel.read(foafOnt, FOAF_0_1);
-
-                // The loaded ontology
-                foaf = ontModel.getOntology(FOAF_0_1);
-
-                // properties from foaf
-                foafName = ontModel.getDatatypeProperty(FOAF_0_1 + "name");
-                foafGivenName = ontModel.getDatatypeProperty(FOAF_0_1 + "givenName");
-                familyName = ontModel.getDatatypeProperty(FOAF_0_1 + "familyName");
-            }
-            return ontModel;
+
+        OntModel ontModel = ModelFactory.createOntologyModel();
+        ontModel.setNsPrefix("foaf", FOAF_0_1);
+        ontModel.getDocumentManager().loadImports(foaf.getOntModel());
+        return ontModel;
+    }
+
+    protected synchronized void loadFoaf() {
+        if (foaf != null) {
+            return;
         }
+        OntModel ontModel = ModelFactory.createOntologyModel();
+
+        // Load from classpath
+        InputStream foafOnt = getClass().getResourceAsStream("foaf.rdf");
+        foaf = ontModel.createOntology(FOAF_0_1);
+        foaf.getModel().read(foafOnt, FOAF_0_1);
+
+        // // The loaded ontology
+        // foaf = ontModel.getOntology(FOAF_0_1);
+
+        // properties from foaf
+        foafName = ontModel.getDatatypeProperty(FOAF_0_1 + "name");
+        foafGivenName = ontModel.getDatatypeProperty(FOAF_0_1 + "givenName");
+        familyName = ontModel.getDatatypeProperty(FOAF_0_1 + "familyName");
     }
 }
diff --git a/orcid-api-common/src/test/java/org/orcid/api/common/writer/rdf/RDFWriterTest.java b/orcid-api-common/src/test/java/org/orcid/api/common/writer/rdf/RDFWriterTest.java
@@ -78,7 +78,7 @@ public void writeRdfXML() throws Exception {
         assertTrue(str.contains("http://orcid.example.com/000-1337"));
         assertTrue(str.contains("foaf:name>John"));
         assertTrue(str.contains("rdf:about"));
-//        assertFalse(str.contains("subClassOf"));
+        assertFalse(str.contains("subClassOf"));
     }
 
     @Test
@@ -92,7 +92,7 @@ public void writeTurte() throws Exception {
         assertTrue(str.contains("<http://orcid.example.com/000-1337>"));
         assertTrue(str.contains("foaf:Person"));
         assertTrue(str.contains("foaf:name \"John F"));
-//        assertFalse(str.contains("subClassOf"));
+        assertFalse(str.contains("subClassOf"));
     }