proposal to wrap corese.core.print.ResultFormat into a CoreseResultformat

Author: anquetil

src/main/java/fr/inria/corese/command/utils/coreseCoreWrapper/CoreseResultFormat.java

@@ -0,0 +1,38 @@
+package fr.inria.corese.command.utils.coreseCoreWrapper;
+
+import java.io.IOException;
+
+import fr.inria.corese.core.kgram.core.Mappings;
+import fr.inria.corese.core.print.ResultFormat;
+import fr.inria.corese.core.sparql.api.ResultFormatDef;
+
+public class CoreseResultFormat {
+
+    protected ResultFormat format;
+
+    public CoreseResultFormat(CoreseRdfGraph graph) {
+        format = ResultFormat.create(graph.getGraph());
+    }
+
+    public CoreseResultFormat(Mappings mappings) {
+        format = ResultFormat.create(mappings);
+    }
+
+    public void setSelectFormat(ResultFormatDef.format coreseFormat) {
+        format.setSelectFormat(coreseFormat);
+    }
+
+    public void setConstructFormat(ResultFormatDef.format coreseFormat) {
+        format.setConstructFormat(coreseFormat);
+    }
+
+    public void write(String path) {
+        try {
+            format.write(path);
+        } catch (IOException e) {
+            throw new IllegalArgumentException("Failed to open export file: " + path.toString(), e);
+        }
+    }
+
+    
+}

src/main/java/fr/inria/corese/command/utils/exporter/AbstractExporter.java

@@ -4,8 +4,8 @@
 import java.nio.file.Path;
 
 import fr.inria.corese.command.utils.coreseCoreWrapper.CoreseRdfGraph;
+import fr.inria.corese.command.utils.coreseCoreWrapper.CoreseResultFormat;
 import fr.inria.corese.core.kgram.core.Mappings;
-import fr.inria.corese.core.print.ResultFormat;
 import fr.inria.corese.core.sparql.api.ResultFormatDef;
 import picocli.CommandLine.Model.CommandSpec;
 
@@ -64,7 +64,7 @@ public AbstractExporter(CommandSpec spec, boolean verbose, Path output) throws I
      * @param graph        Graph to export.
      */
     protected void exportToFile(Path path, ResultFormatDef.format coreseFormat, String formatName, CoreseRdfGraph graph) {
-        ResultFormat resultFormater = ResultFormat.create(graph.getGraph());
+        CoreseResultFormat resultFormater = new CoreseResultFormat(graph);
         exportToFile(path, coreseFormat, formatName, resultFormater);
     }
 
@@ -76,7 +76,7 @@ protected void exportToFile(Path path, ResultFormatDef.format coreseFormat, Stri
      * @param graph        Graph to export.
      */
     protected void exportToStdout(ResultFormatDef.format coreseFormat, String formatName, CoreseRdfGraph graph) {
-        ResultFormat resultFormater = ResultFormat.create(graph.getGraph());
+        CoreseResultFormat resultFormater = new CoreseResultFormat(graph);
         exportToStdout(coreseFormat, formatName, resultFormater);
     }
 
@@ -89,7 +89,7 @@ protected void exportToStdout(ResultFormatDef.format coreseFormat, String format
      * @param mappings     Mappings to export.
      */
     protected void exportToFile(Path path, ResultFormatDef.format coreseFormat, String formatName, Mappings mappings) {
-        ResultFormat resultFormater = ResultFormat.create(mappings);
+        CoreseResultFormat resultFormater = new CoreseResultFormat(mappings);
         exportToFile(path, coreseFormat, formatName, resultFormater);
     }
 
@@ -101,7 +101,7 @@ protected void exportToFile(Path path, ResultFormatDef.format coreseFormat, Stri
      * @param mappings     Mappings to export.
      */
     protected void exportToStdout(ResultFormatDef.format coreseFormat, String formatName, Mappings mappings) {
-        ResultFormat resultFormater = ResultFormat.create(mappings);
+        CoreseResultFormat resultFormater = new CoreseResultFormat(mappings);
         exportToStdout(coreseFormat, formatName, resultFormater);
     }
 
@@ -118,16 +118,12 @@ protected void exportToStdout(ResultFormatDef.format coreseFormat, String format
      * @param ResultFormat Result formater.
      */
     private void exportToFile(Path path,
-            ResultFormatDef.format coreseFormat, String formatName, ResultFormat resultFormater) {
+            ResultFormatDef.format coreseFormat, String formatName, CoreseResultFormat resultFormater) {
 
         resultFormater.setSelectFormat(coreseFormat);
         resultFormater.setConstructFormat(coreseFormat);
 
-        try {
-            resultFormater.write(path.toString());
-        } catch (Exception e) {
-            throw new IllegalArgumentException("Failed to open export file: " + path.toString(), e);
-        }
+        resultFormater.write(path.toString());
 
         if (this.verbose) {
             this.spec.commandLine().getErr()
@@ -143,7 +139,7 @@ private void exportToFile(Path path,
      * @param formatName   Name of the format.
      * @param ResultFormat Result formater.
      */
-    private void exportToStdout(ResultFormatDef.format coreseFormat, String formatName, ResultFormat resultFormater) {
+    private void exportToStdout(ResultFormatDef.format coreseFormat, String formatName, CoreseResultFormat resultFormater) {
 
         // Configure the result formater
         resultFormater.setSelectFormat(coreseFormat);