Restore previous APIs for Writer

Author: Ostrzyciel

buildNumber.properties

@@ -1,3 +1,3 @@
 #maven.buildNumber.plugin properties file
-#Sun Jun 08 17:31:20 CEST 2025
-buildNumber0=375
+#Sun Jun 08 18:28:21 CEST 2025
+buildNumber0=378

src/main/java/be/ugent/rml/store/QuadStore.java

@@ -127,7 +127,20 @@ public abstract class QuadStore {
     public abstract void read(InputStream is, String base, RDFFormat format) throws Exception;
 
     /**
-     * Write out the QuadStore in given format
+     * Write out the QuadStore in given format.
+     * Deprecated, use write(OutputStream out, String format) instead.
+     * TODO remove this method in future versions, use write(OutputStream out, String format) instead.
+     *
+     * @param out    Writer output location
+     * @param format QuadStore format (.TTL)
+     * @throws Exception
+     */
+    @Deprecated
+    public abstract void write(Writer out, String format) throws Exception;
+
+    /**
+     * Write out the QuadStore in given format, using a binary output stream.
+     * Override this method if you want to support binary formats like Jelly.
      * TODO use class or enum for output format
      *
      * @param out    OutputStream to write to
@@ -138,7 +151,18 @@ public abstract class QuadStore {
 
     // END OF ABSTRACT METHODS
 
-    // following final methods use the abstract metho`ds to provide additional functionality or helper functions
+    // following final methods use the abstract methods to provide additional functionality or helper functions
+    /**
+     * Helper function
+     *
+     * @param out
+     * @param format
+     * @throws Exception
+     */
+    public final void write(PrintStream out, String format) throws Exception {
+        write(new PrintWriter(out), format);
+    }
+
     /**
      * Helper function
      *

src/main/java/be/ugent/rml/store/RDF4JStore.java

@@ -18,9 +18,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.Writer;
+import java.io.*;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
@@ -153,7 +151,7 @@ public void read(InputStream is, String base, RDFFormat format) throws Exception
     }
 
     @Override
-    public void write(OutputStream out, String format) throws Exception {
+    public void write(Writer out, String format) throws Exception {
         switch (format) {
             case "turtle":
                 Rio.write(model, out, RDFFormat.TURTLE);
@@ -177,16 +175,28 @@ public void write(OutputStream out, String format) throws Exception {
                 Rio.write(model, out, RDFFormat.NTRIPLES);
                 break;
             case "jelly":
-                var settings = JellyWriterSettings.empty();
-                // Mark RDF-star as not used
-                settings.setJellyOptions(JellyOptions.BIG_STRICT);
-                Rio.write(model, out, JellyFormat.JELLY, settings);
-                break;
+                throw new UnsupportedOperationException(
+                    "Writing Jelly format to a Writer is not supported. Use OutputStream instead."
+                );
             default:
                 throw new Exception("Serialization " + format + " not supported");
         }
     }
 
+    @Override
+    public void write(OutputStream out, String format) throws Exception {
+        // Jelly is the only format that requires a binary output stream
+        if (format.equals("jelly")) {
+            var settings = JellyWriterSettings.empty();
+            // Mark RDF-star as not used
+            settings.setJellyOptions(JellyOptions.BIG_STRICT);
+            Rio.write(model, out, JellyFormat.JELLY, settings);
+        } else {
+            // For all other formats, fall back to using the Writer
+            write(new BufferedWriter(new OutputStreamWriter(out)), format);
+        }
+    }
+
     public String getBase() {
         Optional<Namespace> base = model.getNamespace("");
         if (base.isPresent()) {

src/main/java/be/ugent/rml/store/SimpleQuadStore.java

@@ -108,16 +108,21 @@ public void read(InputStream is, String base, RDFFormat format) {
     }
 
     @Override
-    public void write(OutputStream out, String format) throws IOException {
+    public void write(Writer out, String format) throws IOException {
         switch (format) {
             case "nquads":
-                toNQuads(new BufferedWriter(new OutputStreamWriter(out)));
+                toNQuads(out);
                 break;
             default:
                 throw new Error("Serialization " + format + " not supported");
         }
     }
 
+    @Override
+    public void write(OutputStream out, String format) throws IOException {
+        write(new BufferedWriter(new OutputStreamWriter(out)), format);
+    }
+
     @Override
     public boolean equals(Object o) {
         throw new UnsupportedOperationException("Method not implemented.");