Merge pull request #7 from corese-stack/new-wrapper

New core.Graph wrapper

Author: remiceres

src/main/java/fr/inria/corese/command/VersionProvider.java

@@ -1,6 +1,6 @@
 package fr.inria.corese.command;
 
-import fr.inria.corese.core.util.CoreseInfo;
+import fr.inria.corese.command.utils.coreseCoreWrapper.CoreseUtils;
 import picocli.CommandLine;
 
 /**
@@ -15,7 +15,7 @@ public class VersionProvider implements CommandLine.IVersionProvider {
     public String[] getVersion() {
         return new String[] {
                 commandVersion,
-                "Based on Corese-Core Version: " + CoreseInfo.getVersion()
+                "Based on Corese-Core Version: " + CoreseUtils.getCoreseVersion()
         };
     }
 

src/main/java/fr/inria/corese/command/programs/AbstractCommand.java

@@ -6,9 +6,9 @@
 
 import fr.inria.corese.command.VersionProvider;
 import fr.inria.corese.command.utils.ConfigManager;
+import fr.inria.corese.command.utils.coreseCoreWrapper.CoreseUtils;
 import fr.inria.corese.command.utils.exporter.rdf.RdfDataExporter;
 import fr.inria.corese.core.util.Property;
-import fr.inria.corese.core.util.Property.Value;
 import picocli.CommandLine.Command;
 import picocli.CommandLine.Model.CommandSpec;
 import picocli.CommandLine.Option;
@@ -77,7 +77,7 @@ public Integer call() {
         }
 
         // Set owl import
-        Property.set(Value.OWL_AUTO_IMPORT, this.owlImport);
+        CoreseUtils.setProperty(Property.Value.OWL_AUTO_IMPORT, this.owlImport);
 
         return 0;
     }

src/main/java/fr/inria/corese/command/programs/Canonicalize.java

@@ -1,10 +1,9 @@
 package fr.inria.corese.command.programs;
 
+import fr.inria.corese.command.utils.coreseCoreWrapper.CoreseRdfGraph;
 import fr.inria.corese.command.utils.exporter.rdf.EnumCanonicAlgo;
 import fr.inria.corese.command.utils.exporter.rdf.RdfDataCanonicalizer;
 import fr.inria.corese.command.utils.loader.rdf.EnumRdfInputFormat;
-import fr.inria.corese.command.utils.loader.rdf.RdfDataLoader;
-import fr.inria.corese.core.Graph;
 import picocli.CommandLine.Command;
 import picocli.CommandLine.Option;
 
@@ -29,8 +28,8 @@ public Integer call() {
 
         try {
             // Load the input file(s)
-            RdfDataLoader loader = new RdfDataLoader(this.spec, this.verbose);
-            Graph graph = loader.load(this.inputsRdfData, this.inputFormat, this.recursive);
+            CoreseRdfGraph graph = new CoreseRdfGraph(this.spec, this.verbose);
+            graph.load(this.inputsRdfData, this.inputFormat, this.recursive);
 
             // Canonicalize and export the graph
             RdfDataCanonicalizer rdfCanonicalizer = new RdfDataCanonicalizer(this.spec, this.verbose, this.output);

src/main/java/fr/inria/corese/command/programs/Convert.java

@@ -1,10 +1,9 @@
 package fr.inria.corese.command.programs;
 
+import fr.inria.corese.command.utils.coreseCoreWrapper.CoreseRdfGraph;
 import fr.inria.corese.command.utils.exporter.rdf.EnumRdfOutputFormat;
 import fr.inria.corese.command.utils.exporter.rdf.RdfDataExporter;
 import fr.inria.corese.command.utils.loader.rdf.EnumRdfInputFormat;
-import fr.inria.corese.command.utils.loader.rdf.RdfDataLoader;
-import fr.inria.corese.core.Graph;
 import picocli.CommandLine.Command;
 import picocli.CommandLine.Option;
 
@@ -29,8 +28,8 @@ public Integer call() {
 
         try {
             // Load the input file(s)
-            RdfDataLoader loader = new RdfDataLoader(this.spec, this.verbose);
-            Graph graph = loader.load(this.inputsRdfData, this.inputFormat, this.recursive);
+            CoreseRdfGraph graph = new CoreseRdfGraph(this.spec, this.verbose);
+            graph.load(this.inputsRdfData, this.inputFormat, this.recursive);
 
             // Export the graph
             RdfDataExporter rdfExporter = new RdfDataExporter(this.spec, this.verbose, this.output);

src/main/java/fr/inria/corese/command/programs/Query.java

@@ -1,13 +1,12 @@
 package fr.inria.corese.command.programs;
 
+import fr.inria.corese.command.utils.coreseCoreWrapper.CoreseRdfGraph;
+import fr.inria.corese.command.utils.coreseCoreWrapper.CoreseSparqlQuery;
 import fr.inria.corese.command.utils.exporter.sparql.EnumResultFormat;
 import fr.inria.corese.command.utils.exporter.sparql.SparqlResultExporter;
 import fr.inria.corese.command.utils.loader.rdf.EnumRdfInputFormat;
-import fr.inria.corese.command.utils.loader.rdf.RdfDataLoader;
 import fr.inria.corese.command.utils.loader.sparql.SparqlQueryLoader;
-import fr.inria.corese.core.Graph;
 import fr.inria.corese.core.kgram.core.Mappings;
-import fr.inria.corese.core.query.QueryProcess;
 import picocli.CommandLine.Command;
 import picocli.CommandLine.Option;
 
@@ -37,8 +36,8 @@ public Integer call() {
         try {
 
             // Load the input file(s)
-            RdfDataLoader loader = new RdfDataLoader(this.spec, this.verbose);
-            Graph graph = loader.load(this.inputsRdfData, this.inputFormat, this.recursive);
+            CoreseRdfGraph graph = new CoreseRdfGraph(this.spec, this.verbose);
+            graph.load(this.inputsRdfData, this.inputFormat, this.recursive);
 
             // Load the query
             SparqlQueryLoader queryLoader = new SparqlQueryLoader(this.spec, this.verbose);
@@ -58,18 +57,15 @@ public Integer call() {
         }
     }
 
-    private Mappings execute(Graph graph, String query) throws Exception {
-        QueryProcess exec = QueryProcess.create(graph);
+    private Mappings execute(CoreseRdfGraph graph, String query) throws Exception {
 
-        // Execute query
-        try {
-
-            if (this.verbose) {
-                this.spec.commandLine().getErr().println("Query: " + query);
-                this.spec.commandLine().getErr().println("Executing query...");
-            }
+        if (this.verbose) {
+            this.spec.commandLine().getErr().println("Query: " + query);
+            this.spec.commandLine().getErr().println("Executing query...");
+        }
 
-            return exec.query(query);
+        try {
+            return CoreseSparqlQuery.execute(graph, query);
         } catch (Exception e) {
             throw new Exception("Error when executing SPARQL query : " + e.getMessage(), e);
         }

src/main/java/fr/inria/corese/command/programs/Validate.java

@@ -1,11 +1,10 @@
 package fr.inria.corese.command.programs;
 
-import fr.inria.corese.command.utils.ContentValidator;
+import fr.inria.corese.command.utils.coreseCoreWrapper.CoreseRdfGraph;
+import fr.inria.corese.command.utils.coreseCoreWrapper.CoreseShacl;
 import fr.inria.corese.command.utils.exporter.rdf.EnumRdfOutputFormat;
 import fr.inria.corese.command.utils.exporter.rdf.RdfDataExporter;
 import fr.inria.corese.command.utils.loader.rdf.EnumRdfInputFormat;
-import fr.inria.corese.command.utils.loader.rdf.RdfDataLoader;
-import fr.inria.corese.core.Graph;
 import picocli.CommandLine.Command;
 import picocli.CommandLine.Option;
 
@@ -34,19 +33,20 @@ public Integer call() {
 
         try {
             // Load input file(s)
-            RdfDataLoader loader = new RdfDataLoader(this.spec, this.verbose);
-            Graph dataGraph = loader.load(this.inputsRdfData, this.inputFormat, this.recursive);
+            CoreseRdfGraph dataGraph = new CoreseRdfGraph(this.spec, this.verbose);
+            dataGraph.load(this.inputsRdfData, this.inputFormat, this.recursive);
 
             // Load shapes file(s)
-            Graph shapesGraph = loader.load(this.shaclShapes, this.reportFormat, this.recursive);
+            CoreseRdfGraph shapesGraph = new CoreseRdfGraph(this.spec, this.verbose);
+            shapesGraph.load(this.shaclShapes, this.reportFormat, this.recursive);
 
             // Check if shapes graph contains SHACL shapes
-            if (!ContentValidator.containsShaclShapes(shapesGraph)) {
+            if (! shapesGraph.containsShaclShapes()) {
                 throw new IllegalArgumentException("No SHACL shapes found in the input file(s).");
             }
 
             // Evaluation of SHACL shapes
-            Graph reportGraph = this.evaluateSHACLShapes(dataGraph, shapesGraph);
+            CoreseRdfGraph reportGraph = this.evaluateSHACLShapes(dataGraph, shapesGraph);
 
             // Export the report graph
             RdfDataExporter rdfExporter = new RdfDataExporter(this.spec, this.verbose, this.output);
@@ -67,15 +67,15 @@ public Integer call() {
      * @return The report graph.
      * @throws Exception If an error occurs while evaluating SHACL shapes.
      */
-    private Graph evaluateSHACLShapes(Graph dataGraph, Graph shapesGraph) throws Exception {
+    private CoreseRdfGraph evaluateSHACLShapes(CoreseRdfGraph dataGraph, CoreseRdfGraph shapesGraph) throws Exception {
 
         if (this.verbose) {
             this.spec.commandLine().getErr().println("Evaluating SHACL shapes...");
         }
 
-        fr.inria.corese.core.shacl.Shacl shacl = new fr.inria.corese.core.shacl.Shacl(dataGraph, shapesGraph);
+        CoreseShacl shacl = new CoreseShacl(dataGraph.getGraph(), shapesGraph.getGraph());
         try {
-            return shacl.eval();
+            return new CoreseRdfGraph(shacl.eval());
         } catch (Exception e) {
             throw new Exception("Error while evaluating SHACL shapes: " + e.getMessage(), e);
         }

src/main/java/fr/inria/corese/command/utils/ConfigManager.java

@@ -2,7 +2,7 @@
 
 import java.nio.file.Path;
 
-import fr.inria.corese.core.util.Property;
+import fr.inria.corese.command.utils.coreseCoreWrapper.CoreseUtils;
 import picocli.CommandLine.Model.CommandSpec;
 
 /**
@@ -19,11 +19,7 @@ public class ConfigManager {
      */
     public static void loadFromFile(Path path, CommandSpec spec, boolean verbose) {
 
-        try {
-            Property.load(path.toString());
-        } catch (Exception e) {
-            throw new IllegalArgumentException("Failed to open config file: " + path.toString(), e);
-        }
+        CoreseUtils.loadProperty(path.toString());
 
         if (verbose) {
             spec.commandLine().getErr().println("Loaded config file: " + path.toString());

src/main/java/fr/inria/corese/command/utils/ContentValidator.java

@@ -0,0 +1,40 @@
+package fr.inria.corese.command.utils.coreseCoreWrapper;
+
+import fr.inria.corese.core.kgram.core.Mappings;
+import fr.inria.corese.core.sparql.triple.parser.ASTQuery;
+
+/**
+ * Wrapper class for corese.core.kgram.core.Mappings
+ */
+public class CoreseMappingType {
+
+    /**
+     * AST of the Mapping wrapped
+     */
+    private ASTQuery mappingAST;
+
+    public CoreseMappingType(Mappings map) {
+        mappingAST = map.getAST();
+    }
+
+    public boolean isUpdate() {
+        return mappingAST.isUpdate();
+    }
+
+    public boolean isConstruct() {
+        return mappingAST.isConstruct();
+    }
+
+    public boolean isAsk() {
+        return mappingAST.isAsk();
+    }
+
+    public boolean isSelect() {
+        return mappingAST.isSelect();
+    }
+
+    public boolean isDescribe() {
+        return mappingAST.isDescribe();
+    }
+    
+}