diff --git a/pom.xml b/pom.xml
index 9d02313..4213539 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
org.edmcouncil
rdf-toolkit
- 1.14.0
+ 1.14.1
UTF-8
@@ -14,6 +14,7 @@
11
+ 2.0.4
1.4.4
5.9.0
@@ -39,6 +40,22 @@
+
+ org.slf4j
+ slf4j-api
+ ${slf4j.version}
+
+
+ ch.qos.logback
+ logback-core
+ ${logback.version}
+
+
+ ch.qos.logback
+ logback-classic
+ ${logback.version}
+
+
org.apache.commons
commons-lang3
@@ -47,14 +64,14 @@
org.apache.commons
commons-text
- 1.9
+ 1.10.0
-
commons-cli
commons-cli
1.5.0
+
org.eclipse.rdf4j
rdf4j-storage
@@ -83,12 +100,6 @@
2.3.3
-
- ch.qos.logback
- logback-classic
- ${logback.version}
-
-
org.junit.jupiter
junit-jupiter-api
diff --git a/src/main/java/org/edmcouncil/rdf_toolkit/writer/SortedTurtleWriter.java b/src/main/java/org/edmcouncil/rdf_toolkit/writer/SortedTurtleWriter.java
index 23c753d..0bb97dc 100644
--- a/src/main/java/org/edmcouncil/rdf_toolkit/writer/SortedTurtleWriter.java
+++ b/src/main/java/org/edmcouncil/rdf_toolkit/writer/SortedTurtleWriter.java
@@ -62,6 +62,11 @@ public class SortedTurtleWriter extends SortedRdfWriter {
// Turtle allows "values" in RDF collections
private static final Class COLLECTION_CLASS = Value.class;
+ /**
+ * RDF Types that are preferred to be used first.
+ */
+ private final List preferredRdfTypes = new ArrayList<>(PREFERRED_RDF_TYPES);
+
/** Output stream for this Turtle writer. */
private final IndentingWriter output;
@@ -143,6 +148,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(COLLECTION_CLASS, comparisonContext);
@@ -254,7 +263,7 @@ protected void writeSubjectTriples(Writer out, Resource subject) throws Exceptio
List valuesList = new ArrayList<>();
if (values != null && !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);