Bump RDF4j version to 2.3.2. Provide details on supported formats in sesamize.

Author: joshsh

caching-sail/src/main/java/net/fortytwo/sesametools/caching/CachingSailConnection.java

@@ -231,4 +231,9 @@ private void cacheStatements(final Resource subj, final IRI pred, final Value ob
     public SailConnection getBaseConnection() {
         return baseSailConnection;
     }
+
+    @Override
+    public boolean pendingRemovals() {
+        return false;
+    }
 }

common/src/main/java/net/fortytwo/sesametools/SingleContextSailConnection.java

@@ -187,6 +187,11 @@ protected long sizeInternal(final Resource... contexts) throws SailException {
         }
     }
 
+    @Override
+    public boolean pendingRemovals() {
+        return false;
+    }
+
     private class SingleContextIteration implements CloseableIteration<Resource, SailException> {
         private Resource nextContext;
 

pom.xml

@@ -54,7 +54,7 @@
         <junit.version>4.12</junit.version>
         <log4j.version>1.2.17</log4j.version>
         <restlet.version>2.2.2</restlet.version>
-        <rdf4j.version>2.0M3</rdf4j.version>
+        <rdf4j.version>2.3.2</rdf4j.version>
         <slf4j.version>1.7.10</slf4j.version>
         <httpcomponents.version>4.5.2</httpcomponents.version>
 

readonly-sail/src/main/java/net/fortytwo/sesametools/readonly/ReadOnlySailConnection.java

@@ -104,4 +104,9 @@ protected void clearNamespacesInternal() throws SailException {
     protected void startTransactionInternal() throws SailException {
         baseSailConnection.begin();
     }
+
+    @Override
+    public boolean pendingRemovals() {
+        return false;
+    }
 }

replay-sail/src/main/java/net/fortytwo/sesametools/replay/RecorderSailConnection.java

@@ -207,4 +207,9 @@ protected void startTransactionInternal() throws SailException {
         }
         baseSailConnection.begin();
     }
+
+    @Override
+    public boolean pendingRemovals() {
+        return false;
+    }
 }

repository-sail/src/main/java/net/fortytwo/sesametools/reposail/RepositorySailConnection.java

@@ -178,4 +178,9 @@ protected void startTransactionInternal() throws SailException {
             throw new SailException(e);
         }
     }
+
+    @Override
+    public boolean pendingRemovals() {
+        return false;
+    }
 }

sesamize/src/main/java/net/fortytwo/sesametools/sesamize/SesamizeArgs.java

@@ -1,7 +1,6 @@
 package net.fortytwo.sesametools.sesamize;
 
 import org.apache.commons.io.FilenameUtils;
-import org.eclipse.rdf4j.common.lang.FileFormat;
 import org.eclipse.rdf4j.rio.RDFFormat;
 import org.eclipse.rdf4j.rio.RDFParserRegistry;
 
@@ -23,12 +22,16 @@ public class SesamizeArgs {
     public final List<String> nonOptions;
 
     private static final Map<String, RDFFormat> formatsByFileExtension;
+    private static final Map<String, RDFFormat> formatsByName;
+
     static {
         formatsByFileExtension = new HashMap<>();
+        formatsByName = new HashMap<>();
         for (RDFFormat format : RDFParserRegistry.getInstance().getKeys()) {
             for (String ext : format.getFileExtensions()) {
                 formatsByFileExtension.putIfAbsent(ext, format);
             }
+            formatsByName.put(format.getName().toLowerCase(), format);
         }
     }
 
@@ -119,21 +122,42 @@ public RDFFormat getRDFFormat(final File file,
     }
 
     private RDFFormat findRDFFormat(final String s) {
+        RDFFormat format = formatsByName.get(s.toLowerCase());
+        if (null != format) {
+            return format;
+        }
+
         Optional<RDFFormat> f;
 
-        f = RDFParserRegistry.getInstance().getFileFormatForMIMEType(s);
+        RDFParserRegistry registry = RDFParserRegistry.getInstance();
+        f = registry.getFileFormatForMIMEType(s);
 
         if (!f.isPresent()) {
-            f = RDFParserRegistry.getInstance().getFileFormatForFileName("example." + s);
+            f = registry.getFileFormatForFileName("example." + s);
         }
 
         if (!f.isPresent()) {
-            throw new IllegalArgumentException("no matching RDF format for '" + s + "'");
+            throw new IllegalArgumentException("no matching RDF format for '" + s + "' (" +
+                    "supported formats are: " + getFormats(registry) + ")");
         }
 
         return f.get();
     }
 
+    private String getFormats(final RDFParserRegistry registry) {
+        StringBuilder sb = new StringBuilder();
+        boolean first = true;
+        for (RDFFormat format : registry.getKeys()) {
+            if (first) {
+                first = false;
+            } else {
+                sb.append(", ");
+            }
+            sb.append(format.getName());
+        }
+        return sb.toString();
+    }
+
     private String getOptionName(final String option) {
         if (option.startsWith("--")) {
             return option.substring(2);
@@ -143,5 +167,4 @@ private String getOptionName(final String option) {
             return option;
         }
     }
-
 }

writeonly-sail/src/main/java/net/fortytwo/sesametools/writeonly/WriteOnlySailConnection.java

@@ -119,4 +119,9 @@ protected long sizeInternal(final Resource... contexts) throws SailException {
     protected void startTransactionInternal() throws SailException {
         // Does nothing.
     }
+
+    @Override
+    public boolean pendingRemovals() {
+        return false;
+    }
 }