Further improvements for suppressing named individuals

Author: Rafał Trójczak

src/main/java/org/edmcouncil/rdf_toolkit/writer/SortedJsonLdWriter.java

@@ -66,6 +66,11 @@ public class SortedJsonLdWriter extends SortedRdfWriter {
   // Turtle allows "values" in RDF collections
   private static final Class<Value> collectionClass = Value.class;
 
+    /**
+   * RDF Types that are preferred to be used first.
+   */
+  private final List<IRI> preferredRdfTypes = new ArrayList<>(PREFERRED_RDF_TYPES);
+
   /**
    * Output stream for this JSON-LD writer.
    */
@@ -147,6 +152,10 @@ public void startRDF() throws RDFHandlerException {
    */
   @Override
   public void endRDF() throws RDFHandlerException {
+    if (suppressNamedIndividuals) {
+      preferredRdfTypes.remove(Constants.owlNamedIndividual);
+    }
+
     try {
       // Sort triples, etc.
       sortedOntologies = unsortedOntologies.toSorted(collectionClass, comparisonContext);
@@ -297,11 +306,14 @@ protected void writeSubjectTriples(Writer out, Resource subject) throws Exceptio
         List<Value> valuesList = new ArrayList<>();
         if (!values.isEmpty()) {
           if (predicate == Constants.RDF_TYPE) {
-            for (IRI preferredType : PREFERRED_RDF_TYPES) {
+            for (IRI preferredType : preferredRdfTypes) {
               if (values.contains(preferredType)) {
                 valuesList.add(preferredType);
                 values.remove(preferredType);
               }
+              if (suppressNamedIndividuals) {
+                values.remove(Constants.owlNamedIndividual);
+              }
             }
           }
 

src/main/java/org/edmcouncil/rdf_toolkit/writer/SortedRdfXmlWriter.java

@@ -355,6 +355,9 @@ protected void writeSubjectTriples(Writer out, Resource subject) throws Exceptio
                 valuesList.add(preferredType);
                 values.remove(preferredType);
               }
+              if (suppressNamedIndividuals) {
+                values.remove(Constants.owlNamedIndividual);
+              }
             }
           }
           if (!values.isEmpty()) {