Feature/literal classes 102 boolean

build.gradle.kts

@@ -75,7 +75,9 @@ dependencies {
     implementation("fr.inria.corese.org.semarglproject:semargl-core:${semargl_version}") // Semargl core for RDF parsing and transformation
     implementation("com.github.jsonld-java:jsonld-java:0.13.4")                          // JSON-LD processing for Linked Data in JSON format
     implementation("junit:junit:4.13.2")                                                 // JUnit framework for unit testing in Java
+    implementation("com.typesafe:config:1.4.3")                                          // Typesafe config
     api("org.slf4j:slf4j-api:2.0.9")                                                     // Simple Logging Facade for Java (SLF4J)
+    testImplementation("org.apache.logging.log4j:log4j-slf4j2-impl:2.24.3")
 }
 
 // Configure extra Java module information for dependencies without module-info
@@ -213,14 +215,14 @@ nexusPublishing {
 /////////////////////////
 
 // Set UTF-8 encoding for Java compilation tasks
-tasks.withType<JavaCompile>() {
+tasks.withType<JavaCompile> {
     options.encoding = "UTF-8"
     options.compilerArgs.add("-Xlint:none")
 }
 
 // Configure Javadoc tasks with UTF-8 encoding and disable failure on error.
 // This ensures that Javadoc generation won't fail due to minor issues.
-tasks.withType<Javadoc>() {
+tasks.withType<Javadoc> {
     options.encoding = "UTF-8"
     isFailOnError = false
 }

gradle/gradle-daemon-jvm.properties

@@ -0,0 +1,2 @@
+#This file is generated by updateDaemonJvm
+toolchainVersion=20

src/main/java/fr/inria/corese/core/CompareWithoutDatatypeEntailment.java

@@ -1,19 +1,20 @@
 package fr.inria.corese.core;
 
 import fr.inria.corese.core.sparql.api.IDatatype;
+
 import java.util.Comparator;
 
 
 /**
  * TreeMap Node index comparator without D-entailment
  * Assign Node index for:
  * 1) graph match node join without D-entailment
- * 2) sorting graph Index edge list 
+ * 2) sorting graph Index edge list
  * Assign same node index when same datatype and same value (and possibly
- * different labels) 
+ * different labels)
  * 1 and 01  have same index
  * integer|decimal and double|float have different index
- *'1'^^xsd:boolean and true have same index
+ * '1'^^xsd:boolean and true have same index
  */
 class CompareWithoutDatatypeEntailment implements Comparator<IDatatype> {
 

src/main/java/fr/inria/corese/core/Context.java

@@ -1,32 +1,31 @@
 package fr.inria.corese.core;
 
-import fr.inria.corese.core.sparql.api.IDatatype;
-import fr.inria.corese.core.sparql.datatype.DatatypeMap;
 import fr.inria.corese.core.kgram.api.core.Node;
 import fr.inria.corese.core.kgram.api.query.Graphable;
 import fr.inria.corese.core.kgram.core.Query;
+import fr.inria.corese.core.load.QueryLoad;
 import fr.inria.corese.core.query.RDFizer;
 import fr.inria.corese.core.rule.RuleEngine;
-import fr.inria.corese.core.load.QueryLoad;
+import fr.inria.corese.core.sparql.api.IDatatype;
+import fr.inria.corese.core.sparql.datatype.DatatypeMap;
+import org.slf4j.LoggerFactory;
+
 import java.io.IOException;
 import java.util.ArrayList;
-import org.slf4j.LoggerFactory;
 
 /**
  * Graph Execution Context
  * Store History
  *
  * @author Olivier Corby, Wimmics INRIA I3S, 2014
- *
  */
 public class Context implements Graphable {
 
-    private ArrayList<Node> queryNodes;
-    private Node ruleEngineNode;
+    private final ArrayList<Node> queryNodes;
     RuleEngine re;
-    private int max = 10;
-
     Graph graph;
+    private Node ruleEngineNode;
+    private int max = 10;
 
     Context(Graph g) {
         this.graph = g;
@@ -39,37 +38,36 @@ public class Context implements Graphable {
     public Node getQueryNode() {
         if (queryNodes.isEmpty()) {
             return null;
-        }       
+        }
         return queryNodes.get(queryNodes.size() - 1);
     }
-    
-    Node getRE(){
+
+    Node getRE() {
         RuleEngine re = RuleEngine.create(Graph.create());
-        for (Node n : queryNodes){
+        for (Node n : queryNodes) {
             Query q = (Query) n.getNodeObject();
             re.defRule(q);
         }
-        Node res = DatatypeMap.createObject("RuleEngine", re);
-        return res;
+        return DatatypeMap.createObject("RuleEngine", re);
     }
 
     /**
      * -1 is all queries
      * 0 is last, 1 is before last ...
      */
     public Node getQueryNode(int n) {
-        if (n == -1){
+        if (n == -1) {
             return getRE();
         }
-        int i = queryNodes.size() - 1 - n ;
-        if (i >= 0 && i < queryNodes.size()){
+        int i = queryNodes.size() - 1 - n;
+        if (i >= 0 && i < queryNodes.size()) {
             return queryNodes.get(i);
         }
         return null;
     }
 
     /**
-     * @param queryNode the queryNode to set
+     * @param q the queryNode to set
      */
     public void setQuery(Query q) {
         while (queryNodes.size() >= max) {
@@ -84,30 +82,30 @@ public void setQuery(Query q) {
     public Node getRuleEngineNode() {
         return ruleEngineNode;
     }
-    
+
     public Node getRecordNode() {
-        if (re == null){
+        if (re == null) {
             return null;
         }
         return create("Record", re.getRecord());
     }
 
     /**
-     * @param ruleEngineNode the ruleEngineNode to set
+     * @param re the ruleEngineNode to set
      */
     public void setRuleEngine(RuleEngine re) {
         this.re = re;
         this.ruleEngineNode = create("RuleEngine", re);
     }
-    
-    Node create(String name, Object obj){
+
+    Node create(String name, Object obj) {
         return DatatypeMap.createObject(name, obj);
     }
-    
-    Node create(String name, Object obj, String dt){
+
+    Node create(String name, Object obj, String dt) {
         return DatatypeMap.createObject(name, obj, dt);
     }
-    
+
     /**
      * @return the max
      */
@@ -121,32 +119,31 @@ public int getMax() {
     public void setMax(int max) {
         this.max = max;
     }
-    
-    public void storeIndex(String name){
+
+    public void storeIndex(String name) {
         Graph g = new RDFizer().getGraph(graph.describe());
         graph.setNamedGraph(name, g);
     }
 
     @Override
     public String toGraph() {
         StringBuilder sb = new StringBuilder();
-        //sb.append(toRDF());
         sb.append(graph.toRDF());
         return sb.toString();
     }
 
     @Override
-    public void setGraph(Object obj) {
+    public Object getGraph() {
+        return null;
     }
 
     @Override
-    public Object getGraph() {
-        return null;
+    public void setGraph(Object obj) {
     }
-    
-    String toRDF(){
+
+    String toRDF() {
         QueryLoad ql = QueryLoad.create();
-         String str = "";
+        String str = "";
         try {
             str = ql.getResource("/data/kgram.ttl");
         } catch (IOException ex) {

src/main/java/fr/inria/corese/core/DataStore.java

@@ -1,7 +1,8 @@
 package fr.inria.corese.core;
 
-import fr.inria.corese.core.producer.DataProducer;
 import fr.inria.corese.core.kgram.api.core.Node;
+import fr.inria.corese.core.producer.DataProducer;
+
 import java.util.ArrayList;
 import java.util.List;
 
@@ -12,14 +13,13 @@
  * Producer uses getDefault()
  * getDefault().iterate()
  * getNamed().iterate()
- * 
- * @author Olivier Corby, Wimmics INRIA I3S, 2016
  *
+ * @author Olivier Corby, Wimmics INRIA I3S, 2016
  */
 public class DataStore {
 
+    private final ArrayList<Node> defaultGraphList;
     Graph graph;
-    private ArrayList<Node> defaultGraphList;
 
     DataStore(Graph g) {
         graph = g;
@@ -40,11 +40,11 @@ public DataProducer getNamed(List<Node> list, Node source) {
     public DataProducer getDefaultBasic() {
         return new DataProducer(graph);
     }
-    
+
     public DataProducer getDefaultUnion() {
         return new DataProducer(graph);
     }
-    
+
     public DataProducer getDefaultGraph() {
         return getDefaultBasic().from(graph.getNodeDefault());
     }
@@ -69,7 +69,7 @@ public DataStore addDefaultGraph(Node node) {
         }
         return this;
     }
-    
+
     public DataStore addDefaultGraph() {
         return addDefaultGraph(graph.getNodeDefault());
     }