From 5e952b270248c17a1e60a1ed58f6113f3eb2cbf1 Mon Sep 17 00:00:00 2001
From: "AD\\aabdoun" <abdessamad.abdoun@inria.fr>
Date: Fri, 4 Sep 2026 11:04:36 +0200
Subject: [PATCH 1/2] fix(javadoc): replace unknown Javadoc tags with standard
 equivalents

---
 .../fr/inria/corese/core/EdgeFactory.java     |   2 +-
 src/main/java/fr/inria/corese/core/Graph.java |   6 +-
 .../compiler/eval/QuerySolverVisitor.java     |   4 +-
 .../eval/QuerySolverVisitorBasic.java         |  10 +-
 .../compiler/federate/FederateVisitor.java    |  11 +-
 .../core/compiler/federate/RewriteList.java   |   2 +
 .../compiler/parser/FunctionCompiler.java     |   2 +-
 .../core/compiler/parser/Transformer.java     |   5 +-
 .../fr/inria/corese/core/edge/TripleNode.java |   2 +-
 .../inria/corese/core/extension/Report.java   |   2 +
 .../inria/corese/core/index/EdgeManager.java  |   4 +-
 .../corese/core/kgram/core/QuerySorter.java   |   2 +-
 .../corese/core/kgram/core/SorterNew.java     |   2 +-
 .../kgram/sorter/core/AbstractCostModel.java  |   2 +-
 .../corese/core/kgram/sorter/core/Const.java  |   2 +-
 .../core/kgram/sorter/core/IEstimate.java     |   2 +-
 .../core/kgram/sorter/core/IProducerQP.java   |   2 +-
 .../corese/core/kgram/sorter/core/ISort.java  |   2 +-
 .../core/kgram/sorter/core/QPGEdge.java       |   2 +-
 .../core/kgram/sorter/core/QPGNode.java       |   2 +-
 .../core/kgram/sorter/core/QPGraph.java       |   2 +-
 .../impl/qpv1/BasicPatternGenerator.java      |   2 +-
 .../impl/qpv1/DepthFirstBestSearch.java       |   2 +-
 .../sorter/impl/qpv1/DepthFirstSearch.java    |   2 +-
 .../impl/qpv1/HeuristicsBasedEstimation.java  |   2 +-
 .../sorter/impl/qpv1/QPGEdgeCostModel.java    |   2 +-
 .../sorter/impl/qpv1/QPGNodeCostModel.java    |   2 +-
 .../core/kgram/tool/ApproximateSearchEnv.java |   2 +-
 .../corese/core/load/AddTripleHelper.java     |   4 +-
 .../inria/corese/core/load/ServiceReport.java |   2 +-
 .../load/jsonld/CoreseJsonTripleCallback.java |   2 +-
 .../corese/core/load/jsonld/JsonldLoader.java | 122 +++++++++---------
 .../core/load/rdfa/CoreseRDFaTripleSink.java  |   2 +-
 .../corese/core/load/rdfa/RDFaLoader.java     | 116 ++++++++---------
 .../inria/corese/core/print/JSONLDFormat.java |   2 +-
 .../inria/corese/core/print/JSONLDObject.java |   2 +-
 .../producer/DataBrokerConstructExtern.java   |   2 +-
 .../inria/corese/core/query/QueryProcess.java |  11 +-
 .../fr/inria/corese/core/rule/RuleEngine.java |   2 +-
 .../core/sparql/datatype/CoreseDatatype.java  |   4 +-
 .../sparql/datatype/DatatypeHierarchy.java    |  10 +-
 .../core/sparql/datatype/DatatypeMap.java     |   4 +-
 .../core/sparql/storage/api/IStorage.java     |   2 +-
 .../core/sparql/storage/api/Parameters.java   |   2 +-
 .../core/sparql/storage/cache/ICache.java     |   2 +-
 .../core/sparql/storage/cache/LRUCache.java   |   2 +-
 .../core/sparql/storage/fs/Constants.java     |   2 +-
 .../core/sparql/storage/fs/FileHandler.java   |   2 +-
 .../storage/fs/FileHandlersManager.java       |   2 +-
 .../core/sparql/storage/fs/StringManager.java |   2 +-
 .../storage/fs/StringManagerDelegate.java     |   2 +-
 .../core/sparql/storage/fs/StringMeta.java    |   2 +-
 .../sparql/storage/util/StorageFactory.java   |   2 +-
 .../sparql/triple/function/script/Eval.java   |   4 +-
 .../core/sparql/triple/parser/Context.java    |   2 +-
 .../triple/parser/visitor/ASTParser.java      |   4 +-
 .../fr/inria/corese/core/stats/IStats.java    |   2 +-
 .../fr/inria/corese/core/stats/Options.java   |   2 +-
 .../core/stats/StatsBasedEstimation.java      |   2 +-
 .../inria/corese/core/stats/data/BaseMap.java |   2 +-
 .../corese/core/stats/data/HashBucket.java    |   2 +-
 .../corese/core/stats/data/ReducedMap.java    |   2 +-
 .../corese/core/stats/data/SimpleAverage.java |   2 +-
 .../core/stats/data/TripleHashTable.java      |   2 +-
 .../core/stats/data/TripleHashTable2.java     |   2 +-
 .../corese/core/stats/data/WrappedNode.java   |   2 +-
 .../fr/inria/corese/core/util/Property.java   |   4 +-
 .../java/fr/inria/corese/persistent/Test.java |   2 +-
 .../fr/inria/corese/persistent/TestSuite.java |   2 +-
 69 files changed, 219 insertions(+), 210 deletions(-)

diff --git a/src/main/java/fr/inria/corese/core/EdgeFactory.java b/src/main/java/fr/inria/corese/core/EdgeFactory.java
index 5618f09b8..3d90ac921 100644
--- a/src/main/java/fr/inria/corese/core/EdgeFactory.java
+++ b/src/main/java/fr/inria/corese/core/EdgeFactory.java
@@ -286,7 +286,7 @@ public Edge name(Edge edge, Node predicate, Node name) {
      * to be inserted in same Graph
      * edge nodes are already inserted
      *
-     * @pragma: pred == edge.getPredicate()
+     * Pragma: pred == edge.getPredicate()
      */
     public Edge copy(Node graphNode, Node pred, Edge edge) {
         Edge copy;
diff --git a/src/main/java/fr/inria/corese/core/Graph.java b/src/main/java/fr/inria/corese/core/Graph.java
index 0e7495e3c..a7c52bd4b 100755
--- a/src/main/java/fr/inria/corese/core/Graph.java
+++ b/src/main/java/fr/inria/corese/core/Graph.java
@@ -2681,7 +2681,7 @@ public Iterable<Node> getAllNodeIterator2() {
      * Iterate nodes from basic graph node tables
      * not exactly graph vertex with rdf star
      *
-     * @note: consider nodes from nested triple
+     * Note: consider nodes from nested triple
      *        although they are just quoted
      */
     public Iterable<Node> getNodeIterator() {
@@ -3786,9 +3786,9 @@ public boolean isFormerMetadata() {
     }
 
     /**
-     * @Draft For each triple pattern: Search if there exists graph name,
+     * Draft: For each triple pattern: Search if there exists graph name,
      *        subject, property, object in the graph with similar URI
-     *        mode=message&param=sv:distance~n => levenshtein distance <= n
+     *        mode=message&amp;param=sv:distance~n =&gt; levenshtein distance &lt;= n
      */
     public JSONObject match(ASTQuery ast) {
         return match(ast, 1);
diff --git a/src/main/java/fr/inria/corese/core/compiler/eval/QuerySolverVisitor.java b/src/main/java/fr/inria/corese/core/compiler/eval/QuerySolverVisitor.java
index 7e6cb6ae0..33aef0041 100644
--- a/src/main/java/fr/inria/corese/core/compiler/eval/QuerySolverVisitor.java
+++ b/src/main/java/fr/inria/corese/core/compiler/eval/QuerySolverVisitor.java
@@ -16,13 +16,15 @@
  * Callback manager for LDScript functions with specific annotations Eval SPARQL
  * processor calls before() and after()
  *
+ * <pre>{@code
  * @before      function us:before(?q) {}
  * @after       function us:after(?m) {}
  * @produce     function us:produce(?q) {}
  * @candidate   function us:candidate(?q, ?e) {}
  * @result      function us:result(?m) {}
  * @solution    function us:solution(?m) {}
-
+ * }</pre>
+ *
  * @author Olivier Corby, Wimmics INRIA I3S, 2018
  *
  */
diff --git a/src/main/java/fr/inria/corese/core/compiler/eval/QuerySolverVisitorBasic.java b/src/main/java/fr/inria/corese/core/compiler/eval/QuerySolverVisitorBasic.java
index ff333b6cf..c88781fb1 100644
--- a/src/main/java/fr/inria/corese/core/compiler/eval/QuerySolverVisitorBasic.java
+++ b/src/main/java/fr/inria/corese/core/compiler/eval/QuerySolverVisitorBasic.java
@@ -26,12 +26,14 @@
  * processor calls before() and after()
  *
  * @author Olivier Corby, Wimmics INRIA I3S, 2018
+ * <pre>{@code
  * @before function us:before(?q) {}
  * @after function us:after(?m) {}
  * @produce function us:produce(?q) {}
  * @candidate function us:candidate(?q, ?e) {}
  * @result function us:result(?m) {}
  * @solution function us:solution(?m) {}
+ * }</pre>
  */
 public class QuerySolverVisitorBasic extends PointerObject implements ProcessVisitor {
 
@@ -216,7 +218,7 @@ public boolean define(String name, int arity) {
     }
 
     /**
-     * @before function us:before(?q) call function us:before set Visitor as
+     * {@code @before function us:before(?q)} call function us:before set Visitor as
      * inactive during function call to prevent loop and also in case where
      * function execute a query (which would trigger Visitor recursively)
      */
@@ -240,10 +242,10 @@ public IDatatype callback(Eval ev, String metadata, IDatatype[] param) {
     }
 
     /**
-     * @eq function us:eq(?e, ?x, ?y)
-     * @error function us:error(?e, ?x, ?y) Function call is performed even if
+     * {@code @eq function us:eq(?e, ?x, ?y)}
+     * {@code @error function us:error(?e, ?x, ?y)} Function call is performed even if
      * Visitor is inactive use case: @select function execute ?a = ?b on
-     * extension datatype we want @eq function us:eq(?e, ?x, ?y) to handle ?a =
+     * extension datatype we want {@code @eq function us:eq(?e, ?x, ?y)} to handle ?a =
      * ?b
      */
     public IDatatype callbackBasic(Eval ev, String metadata, IDatatype[] param) {
diff --git a/src/main/java/fr/inria/corese/core/compiler/federate/FederateVisitor.java b/src/main/java/fr/inria/corese/core/compiler/federate/FederateVisitor.java
index 0b4e79ee0..afbd266a9 100644
--- a/src/main/java/fr/inria/corese/core/compiler/federate/FederateVisitor.java
+++ b/src/main/java/fr/inria/corese/core/compiler/federate/FederateVisitor.java
@@ -22,16 +22,18 @@
  * Prototype for federated query
  *
  * @author Olivier Corby, Wimmics INRIA I3S, 2018
+ * <pre>{@code
  * @federate <s1> <s2>
  * select * where { }
+ * }</pre>
  * Recursively rewrite every triple t as:
- * service <s1> <s2> { t } Generalized service statement with several URI
+ * service &lt;s1&gt; &lt;s2&gt; { t } Generalized service statement with several URI
  * Returns the union of Mappings
  * PRAGMA:
  * Property Path evaluated in each of the services but not on the union
  * (hence PP is not federated)
  * graph ?g { } by default is evaluated as federated onto servers
- * @skip kg:distributeNamed :
+ * <pre>{@code @skip kg:distributeNamed :}</pre>
  * named graph as a whole on each server
  */
 public class FederateVisitor implements QueryVisitor, URLParam {
@@ -414,10 +416,9 @@ public Provenance getProvenance(Mappings map) {
     /**
      * Metadata:
      * default is true:
-     *
-     * @skip kg:select kg:group kg:simplify kg:distributeNamed
+     * <pre>{@code @skip kg:select kg:group kg:simplify kg:distributeNamed}</pre>
      * default is false:
-     * @type kg:exist kg:verbose
+     * <pre>{@code @type kg:exist kg:verbose}</pre>
      */
     void option() {
         logger.info(ast.getMetadata().toString());
diff --git a/src/main/java/fr/inria/corese/core/compiler/federate/RewriteList.java b/src/main/java/fr/inria/corese/core/compiler/federate/RewriteList.java
index 4811ff4f2..e92dea54f 100644
--- a/src/main/java/fr/inria/corese/core/compiler/federate/RewriteList.java
+++ b/src/main/java/fr/inria/corese/core/compiler/federate/RewriteList.java
@@ -13,10 +13,12 @@
  * Rewrite rdf list into one service bgp
  * Rewrite bgp with bnode into one service bgp: ?s :p [ :q ?v ]
  *
+ * <pre>{@code
  * @focus "?var" -> merge triple with variable var in bgp with bnode and var
  * @focus "?s"
  * ?s p [q u] . ?s p v
  * -> add ?s p v in bgp because it share variable ?s
+ * }</pre>
  */
 public class RewriteList implements FederateMerge {
 
diff --git a/src/main/java/fr/inria/corese/core/compiler/parser/FunctionCompiler.java b/src/main/java/fr/inria/corese/core/compiler/parser/FunctionCompiler.java
index 4f9ce4825..597f99ed2 100644
--- a/src/main/java/fr/inria/corese/core/compiler/parser/FunctionCompiler.java
+++ b/src/main/java/fr/inria/corese/core/compiler/parser/FunctionCompiler.java
@@ -20,7 +20,7 @@
 
 /**
  * @author Olivier Corby, INRIA I3S 2020
- * @import <url>
+ * <pre>{@code @import <url>}</pre>
  * dereference URL at compile time
  * LinkedFunction:
  * 1) ff:foo() undefined extension function:         dereference  URL at compile time
diff --git a/src/main/java/fr/inria/corese/core/compiler/parser/Transformer.java b/src/main/java/fr/inria/corese/core/compiler/parser/Transformer.java
index b4ee704b9..f8bc3b481 100755
--- a/src/main/java/fr/inria/corese/core/compiler/parser/Transformer.java
+++ b/src/main/java/fr/inria/corese/core/compiler/parser/Transformer.java
@@ -418,11 +418,12 @@ void visitor(ASTQuery ast) {
 
     /**
      * use case:
-     *
+     * <pre>{@code
      * @federate <s1>
      * @federate <s2>
      * select * where { }
-     * Rewrite every triple t as: service <s1> <s2> { t }
+     * }</pre>
+     * Rewrite every triple t as: service &lt;s1&gt; &lt;s2&gt; { t }
      */
     void federate(ASTQuery ast) {
         if (ast.hasMetadata(Metadata.Type.FEDERATION) && !ast.hasMetadata(Metadata.Type.FEDERATE)) {
diff --git a/src/main/java/fr/inria/corese/core/edge/TripleNode.java b/src/main/java/fr/inria/corese/core/edge/TripleNode.java
index 7f14fc480..4bfe4472c 100644
--- a/src/main/java/fr/inria/corese/core/edge/TripleNode.java
+++ b/src/main/java/fr/inria/corese/core/edge/TripleNode.java
@@ -11,7 +11,7 @@
  * Can be used as Node in the graph
  * Can be subject/object of an Edge
  *
- * @todo: function getIndex() is the same here for Node and Edge ->
+ * TODO: function getIndex() is the same here for Node and Edge ->
  * rename to getEdgeIndex() or getNodeIndex()
  * It is not a pb because it is mostly used as Node
  */
diff --git a/src/main/java/fr/inria/corese/core/extension/Report.java b/src/main/java/fr/inria/corese/core/extension/Report.java
index 08df2a246..856d539be 100644
--- a/src/main/java/fr/inria/corese/core/extension/Report.java
+++ b/src/main/java/fr/inria/corese/core/extension/Report.java
@@ -16,9 +16,11 @@
  * environment Variable value is a LDScript JSON object, with dt:json datatype
  * prefix js: &lt;function://fr.inria.corese.core.extension.Report>
  *
+ * <pre>{@code
  * @report @header [@enum]
  * values (?akey ?aval) { unnest(js:report()) }
  * values (?akey ?aval) { unnest(js:header()) }
+ * }</pre>
  */
 public class Report extends Extension implements URLParam {
 
diff --git a/src/main/java/fr/inria/corese/core/index/EdgeManager.java b/src/main/java/fr/inria/corese/core/index/EdgeManager.java
index 440cde04f..9b94b2443 100644
--- a/src/main/java/fr/inria/corese/core/index/EdgeManager.java
+++ b/src/main/java/fr/inria/corese/core/index/EdgeManager.java
@@ -387,7 +387,7 @@ int find(Edge edge) {
     /**
      * use case: Construct find occurrence of edge for rdf star
      *
-     * @todo: Index is sorted and reduced ?
+     * TODO: Index is sorted and reduced ?
      */
     Edge findEdge(Edge edge) {
         int i = findEdgeEqualWithoutMetadata(edge);
@@ -687,7 +687,7 @@ void setComparator(Comparator<Edge> c) {
      * not considering triple ref id
      * g s p o = g s p o t
      *
-     * @note: sort is not deterministic for rdf star triple with same g s p o
+     * Note: sort is not deterministic for rdf star triple with same g s p o
      * list will be reduced by metadata()
      */
 
diff --git a/src/main/java/fr/inria/corese/core/kgram/core/QuerySorter.java b/src/main/java/fr/inria/corese/core/kgram/core/QuerySorter.java
index 4ca35caa9..001d3ae7e 100644
--- a/src/main/java/fr/inria/corese/core/kgram/core/QuerySorter.java
+++ b/src/main/java/fr/inria/corese/core/kgram/core/QuerySorter.java
@@ -295,7 +295,7 @@ void compile(List<Exp> list) {
     /**
      * Move filter at place where variables are bound in exp 
      * @varList: list of bound variables 
-     * @todo: exists {} could be eval earlier
+     * TODO: exists {} could be eval earlier
      */
     void sortFilter(Exp exp, VString varList) {
         int size = varList.size();
diff --git a/src/main/java/fr/inria/corese/core/kgram/core/SorterNew.java b/src/main/java/fr/inria/corese/core/kgram/core/SorterNew.java
index 34b647c6e..352da4235 100644
--- a/src/main/java/fr/inria/corese/core/kgram/core/SorterNew.java
+++ b/src/main/java/fr/inria/corese/core/kgram/core/SorterNew.java
@@ -17,7 +17,7 @@
  * A new sorter for QP
  *
  * @author Fuqi Song, Wimmics Inria I3S
- * @date 5 juin 2014
+ * @since 5 juin 2014
  */
 public class SorterNew extends Sorter {
 
diff --git a/src/main/java/fr/inria/corese/core/kgram/sorter/core/AbstractCostModel.java b/src/main/java/fr/inria/corese/core/kgram/sorter/core/AbstractCostModel.java
index fc6fa3b87..26e0f6107 100644
--- a/src/main/java/fr/inria/corese/core/kgram/sorter/core/AbstractCostModel.java
+++ b/src/main/java/fr/inria/corese/core/kgram/sorter/core/AbstractCostModel.java
@@ -7,7 +7,7 @@
  * Cost model used to estimate the cost for node or edge in a QPG
  *
  * @author Fuqi Song, Wimmics Inria I3S
- * @date 20 oct. 2014 added
+ * @since 20 oct. 2014 added
  */
 public abstract class AbstractCostModel {
 
diff --git a/src/main/java/fr/inria/corese/core/kgram/sorter/core/Const.java b/src/main/java/fr/inria/corese/core/kgram/sorter/core/Const.java
index 6801b5788..7c0796d90 100644
--- a/src/main/java/fr/inria/corese/core/kgram/sorter/core/Const.java
+++ b/src/main/java/fr/inria/corese/core/kgram/sorter/core/Const.java
@@ -6,7 +6,7 @@
  * Constants
  *
  * @author Fuqi Song, Wimmics Inria I3S
- * @date 27 oct. 2014
+ * @since 27 oct. 2014
  */
 public final class Const {
 
diff --git a/src/main/java/fr/inria/corese/core/kgram/sorter/core/IEstimate.java b/src/main/java/fr/inria/corese/core/kgram/sorter/core/IEstimate.java
index 2f16310f1..2331f0b75 100644
--- a/src/main/java/fr/inria/corese/core/kgram/sorter/core/IEstimate.java
+++ b/src/main/java/fr/inria/corese/core/kgram/sorter/core/IEstimate.java
@@ -6,7 +6,7 @@
  * Interface for estimating the cost of nodes and edges in QPGraph
  *
  * @author Fuqi Song, WImmics Inria I3S
- * @date 19 mai 2014
+ * @since 19 mai 2014
  */
 public interface IEstimate {
 
diff --git a/src/main/java/fr/inria/corese/core/kgram/sorter/core/IProducerQP.java b/src/main/java/fr/inria/corese/core/kgram/sorter/core/IProducerQP.java
index 23170dc89..c4a5be20d 100644
--- a/src/main/java/fr/inria/corese/core/kgram/sorter/core/IProducerQP.java
+++ b/src/main/java/fr/inria/corese/core/kgram/sorter/core/IProducerQP.java
@@ -6,7 +6,7 @@
  * graph
  *
  * @author Fuqi Song, WImmics Inria I3S
- * @date 4 juin 2014
+ * @since 4 juin 2014
  */
 public interface IProducerQP {
 
diff --git a/src/main/java/fr/inria/corese/core/kgram/sorter/core/ISort.java b/src/main/java/fr/inria/corese/core/kgram/sorter/core/ISort.java
index 1c9398a4a..c328a5e98 100644
--- a/src/main/java/fr/inria/corese/core/kgram/sorter/core/ISort.java
+++ b/src/main/java/fr/inria/corese/core/kgram/sorter/core/ISort.java
@@ -7,7 +7,7 @@
  * Interface for sorting and rewriting the QPG nodes
  * 
  * @author Fuqi Song, WImmics Inria I3S
- * @date 19 mai 2014
+ * @since 19 mai 2014
  */
 public interface ISort {
 
diff --git a/src/main/java/fr/inria/corese/core/kgram/sorter/core/QPGEdge.java b/src/main/java/fr/inria/corese/core/kgram/sorter/core/QPGEdge.java
index e43990369..1df83b3e8 100644
--- a/src/main/java/fr/inria/corese/core/kgram/sorter/core/QPGEdge.java
+++ b/src/main/java/fr/inria/corese/core/kgram/sorter/core/QPGEdge.java
@@ -8,7 +8,7 @@
  * Basic Query triple Pattern Graph edge used to connect two QPG nodes
  *
  * @author Fuqi Song, Wimmics Inria I3S
- * @date 27 juin 2014
+ * @since 27 juin 2014
  */
 public class QPGEdge {
 
diff --git a/src/main/java/fr/inria/corese/core/kgram/sorter/core/QPGNode.java b/src/main/java/fr/inria/corese/core/kgram/sorter/core/QPGNode.java
index 763b19449..4794357c1 100644
--- a/src/main/java/fr/inria/corese/core/kgram/sorter/core/QPGNode.java
+++ b/src/main/java/fr/inria/corese/core/kgram/sorter/core/QPGNode.java
@@ -18,7 +18,7 @@
  * an object exp) with cost
  *
  * @author Fuqi Song, Wimmics Inria I3S
- * @date 19 mai 2014
+ * @since 19 mai 2014
  */
 public class QPGNode {
 
diff --git a/src/main/java/fr/inria/corese/core/kgram/sorter/core/QPGraph.java b/src/main/java/fr/inria/corese/core/kgram/sorter/core/QPGraph.java
index 0f8a0ae8d..71a9f221c 100644
--- a/src/main/java/fr/inria/corese/core/kgram/sorter/core/QPGraph.java
+++ b/src/main/java/fr/inria/corese/core/kgram/sorter/core/QPGraph.java
@@ -12,7 +12,7 @@
  * represent exp in a graph
  *
  * @author Fuqi Song, Wimmics Inria I3S
- * @date 19 mai 2014
+ * @since 19 mai 2014
  */
 public class QPGraph {
 
diff --git a/src/main/java/fr/inria/corese/core/kgram/sorter/impl/qpv1/BasicPatternGenerator.java b/src/main/java/fr/inria/corese/core/kgram/sorter/impl/qpv1/BasicPatternGenerator.java
index 72f102be3..a6dff6160 100644
--- a/src/main/java/fr/inria/corese/core/kgram/sorter/impl/qpv1/BasicPatternGenerator.java
+++ b/src/main/java/fr/inria/corese/core/kgram/sorter/impl/qpv1/BasicPatternGenerator.java
@@ -13,7 +13,7 @@
  * of Subject, Predicate and Object Ns, Np and No
  *
  * @author Fuqi Song, Wimmics Inria I3S
- * @date 8 août 2014
+ * @since 8 août 2014
  */
 public class BasicPatternGenerator {
 
diff --git a/src/main/java/fr/inria/corese/core/kgram/sorter/impl/qpv1/DepthFirstBestSearch.java b/src/main/java/fr/inria/corese/core/kgram/sorter/impl/qpv1/DepthFirstBestSearch.java
index 3c16dc223..5bc04efaf 100644
--- a/src/main/java/fr/inria/corese/core/kgram/sorter/impl/qpv1/DepthFirstBestSearch.java
+++ b/src/main/java/fr/inria/corese/core/kgram/sorter/impl/qpv1/DepthFirstBestSearch.java
@@ -25,7 +25,7 @@
  * ++ 4.1 now also check BIND 20Jan2015
  *
  * @author Fuqi Song, Wimmics Inria I3S
- * @date 23 Oct. 2014
+ * @since 23 Oct. 2014
  */
 public class DepthFirstBestSearch implements ISort {
 
diff --git a/src/main/java/fr/inria/corese/core/kgram/sorter/impl/qpv1/DepthFirstSearch.java b/src/main/java/fr/inria/corese/core/kgram/sorter/impl/qpv1/DepthFirstSearch.java
index a8f9f7ac5..9b98888bf 100644
--- a/src/main/java/fr/inria/corese/core/kgram/sorter/impl/qpv1/DepthFirstSearch.java
+++ b/src/main/java/fr/inria/corese/core/kgram/sorter/impl/qpv1/DepthFirstSearch.java
@@ -13,7 +13,7 @@
  * algorithm
  *
  * @author Fuqi Song, Wimmics Inria I3S
- * @date 19 mai 2014
+ * @since 19 mai 2014
  */
 public class DepthFirstSearch implements ISort {
 
diff --git a/src/main/java/fr/inria/corese/core/kgram/sorter/impl/qpv1/HeuristicsBasedEstimation.java b/src/main/java/fr/inria/corese/core/kgram/sorter/impl/qpv1/HeuristicsBasedEstimation.java
index e2cd26a90..a7397f3fc 100644
--- a/src/main/java/fr/inria/corese/core/kgram/sorter/impl/qpv1/HeuristicsBasedEstimation.java
+++ b/src/main/java/fr/inria/corese/core/kgram/sorter/impl/qpv1/HeuristicsBasedEstimation.java
@@ -12,7 +12,7 @@
  * Estimate the selectivity of triple pattern by heuristics
  *
  * @author Fuqi Song, Wimmics Inria I3S
- * @date 23 juin 2014
+ * @since 23 juin 2014
  */
 public class HeuristicsBasedEstimation implements IEstimate {
 
diff --git a/src/main/java/fr/inria/corese/core/kgram/sorter/impl/qpv1/QPGEdgeCostModel.java b/src/main/java/fr/inria/corese/core/kgram/sorter/impl/qpv1/QPGEdgeCostModel.java
index ba7061eed..2873c396f 100644
--- a/src/main/java/fr/inria/corese/core/kgram/sorter/impl/qpv1/QPGEdgeCostModel.java
+++ b/src/main/java/fr/inria/corese/core/kgram/sorter/impl/qpv1/QPGEdgeCostModel.java
@@ -11,7 +11,7 @@
  * Cost model for QPG edge 
  *
  * @author Fuqi Song, Wimmics Inria I3S
- * @date 20 oct. 2014
+ * @since 20 oct. 2014
  */
 public class QPGEdgeCostModel extends AbstractCostModel {
 
diff --git a/src/main/java/fr/inria/corese/core/kgram/sorter/impl/qpv1/QPGNodeCostModel.java b/src/main/java/fr/inria/corese/core/kgram/sorter/impl/qpv1/QPGNodeCostModel.java
index 7f099a43b..23c02b1f3 100644
--- a/src/main/java/fr/inria/corese/core/kgram/sorter/impl/qpv1/QPGNodeCostModel.java
+++ b/src/main/java/fr/inria/corese/core/kgram/sorter/impl/qpv1/QPGNodeCostModel.java
@@ -26,7 +26,7 @@
  * Class for constructing the pattern of a triple, including many parameters
  *
  * @author Fuqi Song, Wimmics Inria I3S
- * @date 25 juin 2014 new
+ * @since 25 juin 2014 new
  */
 public class QPGNodeCostModel extends AbstractCostModel {
 
diff --git a/src/main/java/fr/inria/corese/core/kgram/tool/ApproximateSearchEnv.java b/src/main/java/fr/inria/corese/core/kgram/tool/ApproximateSearchEnv.java
index de9347d3b..e7f99582e 100644
--- a/src/main/java/fr/inria/corese/core/kgram/tool/ApproximateSearchEnv.java
+++ b/src/main/java/fr/inria/corese/core/kgram/tool/ApproximateSearchEnv.java
@@ -14,7 +14,7 @@
  * Key: (?var, <uri>) Value: (node, similarity, algs)
  *
  * @author Fuqi Song, Wimmics Inria I3S
- * @date 29 oct. 2015
+ * @since 29 oct. 2015
  */
 public class ApproximateSearchEnv {
 
diff --git a/src/main/java/fr/inria/corese/core/load/AddTripleHelper.java b/src/main/java/fr/inria/corese/core/load/AddTripleHelper.java
index ba1f76433..784a428d5 100644
--- a/src/main/java/fr/inria/corese/core/load/AddTripleHelper.java
+++ b/src/main/java/fr/inria/corese/core/load/AddTripleHelper.java
@@ -17,8 +17,8 @@
  * corese graph
  *
  * @author Fuqi Song, wimmics inria i3s
- * @date Jan 28 2014 new
- * @date Feb 12 2014 re-factored
+ * @since Jan 28 2014 new
+ * @since Feb 12 2014 re-factored
  */
 public class AddTripleHelper implements ILoadSerialization {
     private final static String JSONLD_BNODE_PREFIX = ":_";
diff --git a/src/main/java/fr/inria/corese/core/load/ServiceReport.java b/src/main/java/fr/inria/corese/core/load/ServiceReport.java
index cd9a02d1b..80925ffee 100644
--- a/src/main/java/fr/inria/corese/core/load/ServiceReport.java
+++ b/src/main/java/fr/inria/corese/core/load/ServiceReport.java
@@ -281,7 +281,7 @@ void set(IDatatype dt, String key, Date value) {
     }
     
     /**
-     * @report server -> record server only
+     * {@code @report} server -&gt; record server only
      */
     boolean hasKey(String key) {
         if (getQuery() == null) {
diff --git a/src/main/java/fr/inria/corese/core/load/jsonld/CoreseJsonTripleCallback.java b/src/main/java/fr/inria/corese/core/load/jsonld/CoreseJsonTripleCallback.java
index 8195fbc80..98b86b34a 100644
--- a/src/main/java/fr/inria/corese/core/load/jsonld/CoreseJsonTripleCallback.java
+++ b/src/main/java/fr/inria/corese/core/load/jsonld/CoreseJsonTripleCallback.java
@@ -18,7 +18,7 @@
  * triples to corese graph
  *
  * @author Fuqi Song, Wimmics inria i3s
- * @date 10 Feb. 2014 new
+ * @since 10 Feb. 2014 new
  */
 public class CoreseJsonTripleCallback implements JsonLdTripleCallback {
 
diff --git a/src/main/java/fr/inria/corese/core/load/jsonld/JsonldLoader.java b/src/main/java/fr/inria/corese/core/load/jsonld/JsonldLoader.java
index ec2f3e347..7c95e2be5 100644
--- a/src/main/java/fr/inria/corese/core/load/jsonld/JsonldLoader.java
+++ b/src/main/java/fr/inria/corese/core/load/jsonld/JsonldLoader.java
@@ -1,61 +1,61 @@
-package fr.inria.corese.core.load.jsonld;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.Reader;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.github.jsonldjava.core.JsonLdError;
-import com.github.jsonldjava.core.JsonLdProcessor;
-import com.github.jsonldjava.core.JsonLdTripleCallback;
-import com.github.jsonldjava.utils.JsonUtils;
-
-
-/**
- * Load JSON-LD
- *
- * @author Fuqi Song, wimmics inria i3s
- * @date 12 Feb 2014 new
- */
-public class JsonldLoader {
-
-    /**
-     * logger from log4j
-     */
-    private static final Logger logger = LoggerFactory.getLogger(JsonldLoader.class);
-
-    private Reader reader;
-    private InputStream is;
-    private final String base;
-
-    JsonldLoader(InputStream r, String base) {
-        this.is = r;
-        this.base = base;
-    }
-
-    JsonldLoader(Reader r, String base) {
-        this.reader = r;
-        this.base = base;
-    }
-
-    public static JsonldLoader create(Reader read, String base) {
-        JsonldLoader p = new JsonldLoader(read, base);
-        return p;
-    }
-
-    /**
-     * Load triples from JSON-LD to graph
-     *
-     * @param callback
-     * @throws java.io.IOException
-     * @throws com.github.jsonldjava.core.JsonLdError
-     */
-    public void load(JsonLdTripleCallback callback) throws IOException, JsonLdError {
-        // resolve the "reader" to JSON objects using parser
-        Object jsonObject = JsonUtils.fromReader(this.reader);
-        
-        JsonLdProcessor.toRDF(jsonObject, callback);
-    }
-}
+package fr.inria.corese.core.load.jsonld;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.Reader;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.github.jsonldjava.core.JsonLdError;
+import com.github.jsonldjava.core.JsonLdProcessor;
+import com.github.jsonldjava.core.JsonLdTripleCallback;
+import com.github.jsonldjava.utils.JsonUtils;
+
+
+/**
+ * Load JSON-LD
+ *
+ * @author Fuqi Song, wimmics inria i3s
+ * @since 12 Feb 2014 new
+ */
+public class JsonldLoader {
+
+    /**
+     * logger from log4j
+     */
+    private static final Logger logger = LoggerFactory.getLogger(JsonldLoader.class);
+
+    private Reader reader;
+    private InputStream is;
+    private final String base;
+
+    JsonldLoader(InputStream r, String base) {
+        this.is = r;
+        this.base = base;
+    }
+
+    JsonldLoader(Reader r, String base) {
+        this.reader = r;
+        this.base = base;
+    }
+
+    public static JsonldLoader create(Reader read, String base) {
+        JsonldLoader p = new JsonldLoader(read, base);
+        return p;
+    }
+
+    /**
+     * Load triples from JSON-LD to graph
+     *
+     * @param callback
+     * @throws java.io.IOException
+     * @throws com.github.jsonldjava.core.JsonLdError
+     */
+    public void load(JsonLdTripleCallback callback) throws IOException, JsonLdError {
+        // resolve the "reader" to JSON objects using parser
+        Object jsonObject = JsonUtils.fromReader(this.reader);
+        
+        JsonLdProcessor.toRDF(jsonObject, callback);
+    }
+}
diff --git a/src/main/java/fr/inria/corese/core/load/rdfa/CoreseRDFaTripleSink.java b/src/main/java/fr/inria/corese/core/load/rdfa/CoreseRDFaTripleSink.java
index 9fe91e94e..46c17fbaa 100644
--- a/src/main/java/fr/inria/corese/core/load/rdfa/CoreseRDFaTripleSink.java
+++ b/src/main/java/fr/inria/corese/core/load/rdfa/CoreseRDFaTripleSink.java
@@ -16,7 +16,7 @@
  * triples (that are parsed by parser of semargl) to the graph of corese system
  *
  * @author Fuqi Song, wimmics inria i3s
- * @date Jan 2014 new
+ * @since Jan 2014 new
  */
 public class CoreseRDFaTripleSink implements TripleSink {
 
diff --git a/src/main/java/fr/inria/corese/core/load/rdfa/RDFaLoader.java b/src/main/java/fr/inria/corese/core/load/rdfa/RDFaLoader.java
index d5ed8ae1b..6189adb47 100644
--- a/src/main/java/fr/inria/corese/core/load/rdfa/RDFaLoader.java
+++ b/src/main/java/fr/inria/corese/core/load/rdfa/RDFaLoader.java
@@ -1,58 +1,58 @@
-package fr.inria.corese.core.load.rdfa;
-
-import java.io.InputStream;
-import java.io.Reader;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import org.semarglproject.rdf.core.ParseException;
-import org.semarglproject.rdf.rdfa.RdfaParser;
-import org.semarglproject.source.StreamProcessor;
-
-/**
- * Load RDFa
- *
- * @author Fuqi Song, wimmics inria i3s
- * @date 27 Jan 2014 new
- */
-public class RDFaLoader {
-
-    /**
-     * logger from log4j
-     */
-    private static final Logger logger = LoggerFactory.getLogger(RDFaLoader.class);
-
-    private Reader reader;
-    private InputStream is;
-    private final String base;
-
-    RDFaLoader(InputStream r, String base) {
-        this.is = r;
-        this.base = base;
-    }
-
-    RDFaLoader(Reader r, String base) {
-        this.reader = r;
-        this.base = base;
-    }
-
-    public static RDFaLoader create(Reader read, String base) {
-        RDFaLoader p = new RDFaLoader(read, base);
-        return p;
-    }
-
-
-    /**
-     * Load triples from RDFa file to graph
-     *
-     * @param sink
-     * @throws ParseException
-     */
-    public void load(CoreseRDFaTripleSink sink) throws ParseException {
-
-        StreamProcessor processor = new StreamProcessor(RdfaParser.connect(sink));
-        processor.process(this.reader, this.base);
-    }
-
-}
+package fr.inria.corese.core.load.rdfa;
+
+import java.io.InputStream;
+import java.io.Reader;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import org.semarglproject.rdf.core.ParseException;
+import org.semarglproject.rdf.rdfa.RdfaParser;
+import org.semarglproject.source.StreamProcessor;
+
+/**
+ * Load RDFa
+ *
+ * @author Fuqi Song, wimmics inria i3s
+ * @since 27 Jan 2014 new
+ */
+public class RDFaLoader {
+
+    /**
+     * logger from log4j
+     */
+    private static final Logger logger = LoggerFactory.getLogger(RDFaLoader.class);
+
+    private Reader reader;
+    private InputStream is;
+    private final String base;
+
+    RDFaLoader(InputStream r, String base) {
+        this.is = r;
+        this.base = base;
+    }
+
+    RDFaLoader(Reader r, String base) {
+        this.reader = r;
+        this.base = base;
+    }
+
+    public static RDFaLoader create(Reader read, String base) {
+        RDFaLoader p = new RDFaLoader(read, base);
+        return p;
+    }
+
+
+    /**
+     * Load triples from RDFa file to graph
+     *
+     * @param sink
+     * @throws ParseException
+     */
+    public void load(CoreseRDFaTripleSink sink) throws ParseException {
+
+        StreamProcessor processor = new StreamProcessor(RdfaParser.connect(sink));
+        processor.process(this.reader, this.base);
+    }
+
+}
diff --git a/src/main/java/fr/inria/corese/core/print/JSONLDFormat.java b/src/main/java/fr/inria/corese/core/print/JSONLDFormat.java
index 13a58017d..6bdfbac15 100644
--- a/src/main/java/fr/inria/corese/core/print/JSONLDFormat.java
+++ b/src/main/java/fr/inria/corese/core/print/JSONLDFormat.java
@@ -21,7 +21,7 @@
  * Pretty printing for JSON-LD format
  *
  * @author Fuqi Song wimmics inria i3s
- * @date Feb 2014
+ * @since Feb 2014
  */
 public class JSONLDFormat extends RDFFormat {
 
diff --git a/src/main/java/fr/inria/corese/core/print/JSONLDObject.java b/src/main/java/fr/inria/corese/core/print/JSONLDObject.java
index 4d1b080b5..528058ea8 100644
--- a/src/main/java/fr/inria/corese/core/print/JSONLDObject.java
+++ b/src/main/java/fr/inria/corese/core/print/JSONLDObject.java
@@ -21,7 +21,7 @@
  * Object class for Json-ld Object
  *
  * @author Fuqi Song, Wimmics - Inria I3S
- * @date Feb. 2014
+ * @since Feb. 2014
  */
 /**
  * Class of JSON Object including pair {key, object}, and modular type, which is
diff --git a/src/main/java/fr/inria/corese/core/producer/DataBrokerConstructExtern.java b/src/main/java/fr/inria/corese/core/producer/DataBrokerConstructExtern.java
index a16a41e9b..a4608be77 100644
--- a/src/main/java/fr/inria/corese/core/producer/DataBrokerConstructExtern.java
+++ b/src/main/java/fr/inria/corese/core/producer/DataBrokerConstructExtern.java
@@ -74,7 +74,7 @@ public String blankNode() {
      * edge has no named graph
      * Return list of deleted edges
      * 
-     * @todo: Constant -> IDatatype as Node
+     * TODO: Constant -> IDatatype as Node
      */
     @Override
     public List<Edge> delete(Edge edge, List<Constant> from) {
diff --git a/src/main/java/fr/inria/corese/core/query/QueryProcess.java b/src/main/java/fr/inria/corese/core/query/QueryProcess.java
index 79249f8a7..bd2a16d23 100644
--- a/src/main/java/fr/inria/corese/core/query/QueryProcess.java
+++ b/src/main/java/fr/inria/corese/core/query/QueryProcess.java
@@ -824,11 +824,10 @@ Level getLevel(Mapping m, Dataset ds) {
 
     /**
      * Annotated query with a service send query to server
-     *
-     * @federate <http://dbpedia.org/sparql>
-     * select where {}
+     * <pre>{@code @federate <http://dbpedia.org/sparql>
+     * select where {}}</pre>
      * Mapping m may contain Binding which may contain Log
-     * use case: xt:sparql("@federate <uri> select where")
+     * use case: xt:sparql("@federate &lt;uri&gt; select where")
      */
     Mappings service(Query q, Mapping m) throws EngineException {
         Service serv = new Service(q.getService());
@@ -1184,8 +1183,8 @@ Function getFunction(String name, String type, IDatatype[] param) {
     }
 
     /**
-     * @import <uri>
-     * use case: FunctionCompiler @import <uri>
+     * <pre>{@code @import <uri>}</pre>
+     * use case: FunctionCompiler {@code @import <uri>}
      */
     @Override
     public ASTQuery parse(String path, Level level) throws EngineException {
diff --git a/src/main/java/fr/inria/corese/core/rule/RuleEngine.java b/src/main/java/fr/inria/corese/core/rule/RuleEngine.java
index 5371611ea..12ca711f9 100644
--- a/src/main/java/fr/inria/corese/core/rule/RuleEngine.java
+++ b/src/main/java/fr/inria/corese/core/rule/RuleEngine.java
@@ -362,7 +362,7 @@ public boolean success() {
 
     /**
      * @return a Graph of Constraint Violation, may be empty
-     * @todo: DataManager
+     * TODO: DataManager
      */
     public Graph constraint() {
         try {
diff --git a/src/main/java/fr/inria/corese/core/sparql/datatype/CoreseDatatype.java b/src/main/java/fr/inria/corese/core/sparql/datatype/CoreseDatatype.java
index 1fa9dbb2f..c0a353413 100644
--- a/src/main/java/fr/inria/corese/core/sparql/datatype/CoreseDatatype.java
+++ b/src/main/java/fr/inria/corese/core/sparql/datatype/CoreseDatatype.java
@@ -308,7 +308,7 @@ public IDatatype intGetDataLang(String lang) {
     }
 
     /**
-     * @todo: leverage extension and pointer datatype
+     * TODO: leverage extension and pointer datatype
      */
     @Override
     public IDatatype copy() {
@@ -769,7 +769,7 @@ public float floatValue() {
      * string/literal/XMLLiteral/undef/boolean are sorted alphabetically then by
      * datatypes (by their code) literals are sorted with their lang if any
      *
-     * @todo: the primary order (Lit URI BN) is inverse of SPARQL !!!
+     * TODO: the primary order (Lit URI BN) is inverse of SPARQL !!!
      * used for select distinct, group by (sameTerm semantics)
      * used by Graph Node table to retrieve an existing Node
      * Distinguish 1 01 1.0 '1'^^xsd:long (does not return 0 but -1 or +1)
diff --git a/src/main/java/fr/inria/corese/core/sparql/datatype/DatatypeHierarchy.java b/src/main/java/fr/inria/corese/core/sparql/datatype/DatatypeHierarchy.java
index a856d8e08..b57bce91e 100644
--- a/src/main/java/fr/inria/corese/core/sparql/datatype/DatatypeHierarchy.java
+++ b/src/main/java/fr/inria/corese/core/sparql/datatype/DatatypeHierarchy.java
@@ -25,11 +25,11 @@
  * xsd datatype hierarchy is not defined yet, it is flat under dt:standard
  * 
  * method is attached to datatype like this:
- * @type dt:literal
- * @type dt:standard
- * @type xsd:int
- * 
- * method is available for datatypes equal or under the @type
+ * Type: dt:literal
+ * Type: dt:standard
+ * Type: xsd:int
+ *
+ * method is available for datatypes equal or under the Type
  * 
  * @author Olivier Corby, Wimmics INRIA I3S, 2017
  *
diff --git a/src/main/java/fr/inria/corese/core/sparql/datatype/DatatypeMap.java b/src/main/java/fr/inria/corese/core/sparql/datatype/DatatypeMap.java
index 04949a688..e6ff176a6 100644
--- a/src/main/java/fr/inria/corese/core/sparql/datatype/DatatypeMap.java
+++ b/src/main/java/fr/inria/corese/core/sparql/datatype/DatatypeMap.java
@@ -156,8 +156,8 @@ public static boolean isUndefined(IDatatype dt) {
     }
 
     /**
-     * @todo: leverage extension and pointer datatype
-     * @todo: isTriple()
+     * TODO: leverage extension and pointer datatype
+     * TODO: isTriple()
      */
     public static IDatatype copy(IDatatype dt) {
         if (dt.isBlank()) {
diff --git a/src/main/java/fr/inria/corese/core/sparql/storage/api/IStorage.java b/src/main/java/fr/inria/corese/core/sparql/storage/api/IStorage.java
index 43d29a3ef..0145b2f0c 100644
--- a/src/main/java/fr/inria/corese/core/sparql/storage/api/IStorage.java
+++ b/src/main/java/fr/inria/corese/core/sparql/storage/api/IStorage.java
@@ -5,7 +5,7 @@
  * Interface that needs to be implemented for persistenting literal/string
  * 
  * @author Fuqi Song, WImmics Inria I3S
- * @date 13 janv. 2015
+ * @since 13 janv. 2015
  */
 public interface IStorage {
 
diff --git a/src/main/java/fr/inria/corese/core/sparql/storage/api/Parameters.java b/src/main/java/fr/inria/corese/core/sparql/storage/api/Parameters.java
index 51e5f9efe..8ce3f97a1 100644
--- a/src/main/java/fr/inria/corese/core/sparql/storage/api/Parameters.java
+++ b/src/main/java/fr/inria/corese/core/sparql/storage/api/Parameters.java
@@ -11,7 +11,7 @@
  * Parameters.java
  *
  * @author Fuqi Song, Wimmics Inria I3S
- * @date 13 févr. 2015
+ * @since 13 févr. 2015
  */
 public class Parameters {
 
diff --git a/src/main/java/fr/inria/corese/core/sparql/storage/cache/ICache.java b/src/main/java/fr/inria/corese/core/sparql/storage/cache/ICache.java
index 1ea00f8a8..1b25d2359 100644
--- a/src/main/java/fr/inria/corese/core/sparql/storage/cache/ICache.java
+++ b/src/main/java/fr/inria/corese/core/sparql/storage/cache/ICache.java
@@ -6,7 +6,7 @@
  * @author Fuqi Song, Wimmics Inria I3S
  * @param <K>
  * @param <V>
- * @date 4 févr. 2015
+ * @since 4 févr. 2015
  */
 public interface ICache<K, V> {
 
diff --git a/src/main/java/fr/inria/corese/core/sparql/storage/cache/LRUCache.java b/src/main/java/fr/inria/corese/core/sparql/storage/cache/LRUCache.java
index d75e60bc1..18a9f7f78 100644
--- a/src/main/java/fr/inria/corese/core/sparql/storage/cache/LRUCache.java
+++ b/src/main/java/fr/inria/corese/core/sparql/storage/cache/LRUCache.java
@@ -9,7 +9,7 @@
  * @author Fuqi Song, Wimmics Inria I3S
  * @param <K>
  * @param <V>
- * @date 2 févr. 2015
+ * @since 2 févr. 2015
  */
 public class LRUCache<K, V> extends LinkedHashMap<K, V> implements ICache<K, V> {
 
diff --git a/src/main/java/fr/inria/corese/core/sparql/storage/fs/Constants.java b/src/main/java/fr/inria/corese/core/sparql/storage/fs/Constants.java
index aa41a5b03..a0e0cbf31 100644
--- a/src/main/java/fr/inria/corese/core/sparql/storage/fs/Constants.java
+++ b/src/main/java/fr/inria/corese/core/sparql/storage/fs/Constants.java
@@ -4,7 +4,7 @@
  * Constants
  *
  * @author Fuqi Song, Wimmics Inria I3S
- * @date 13 janv. 2015 new
+ * @since 13 janv. 2015 new
  */
 public class Constants {
     public final static int BEGIN = 0;
diff --git a/src/main/java/fr/inria/corese/core/sparql/storage/fs/FileHandler.java b/src/main/java/fr/inria/corese/core/sparql/storage/fs/FileHandler.java
index 034e9341b..b4ab8426e 100644
--- a/src/main/java/fr/inria/corese/core/sparql/storage/fs/FileHandler.java
+++ b/src/main/java/fr/inria/corese/core/sparql/storage/fs/FileHandler.java
@@ -18,7 +18,7 @@
  * FileHandler.java
  *
  * @author Fuqi Song, Wimmics Inria I3S
- * @date 3 févr. 2015 new
+ * @since 3 févr. 2015 new
  */
 public class FileHandler {
 
diff --git a/src/main/java/fr/inria/corese/core/sparql/storage/fs/FileHandlersManager.java b/src/main/java/fr/inria/corese/core/sparql/storage/fs/FileHandlersManager.java
index 0cac24857..43be68256 100644
--- a/src/main/java/fr/inria/corese/core/sparql/storage/fs/FileHandlersManager.java
+++ b/src/main/java/fr/inria/corese/core/sparql/storage/fs/FileHandlersManager.java
@@ -15,7 +15,7 @@
  * FileHandlerCache.java
  *
  * @author Fuqi Song, Wimmics Inria I3S
- * @date 3 févr. 2015
+ * @since 3 févr. 2015
  */
 public class FileHandlersManager extends LRUCache<Integer, FileHandler> {
 
diff --git a/src/main/java/fr/inria/corese/core/sparql/storage/fs/StringManager.java b/src/main/java/fr/inria/corese/core/sparql/storage/fs/StringManager.java
index 38aef1591..775e16e50 100644
--- a/src/main/java/fr/inria/corese/core/sparql/storage/fs/StringManager.java
+++ b/src/main/java/fr/inria/corese/core/sparql/storage/fs/StringManager.java
@@ -13,7 +13,7 @@
  * quick access the read strings
  *
  * @author Fuqi Song, Wimmics Inria I3S
- * @date 13 janv. 2015 new
+ * @since 13 janv. 2015 new
  */
 public final class StringManager implements IStorage {
 
diff --git a/src/main/java/fr/inria/corese/core/sparql/storage/fs/StringManagerDelegate.java b/src/main/java/fr/inria/corese/core/sparql/storage/fs/StringManagerDelegate.java
index ef4282897..379bcbc1c 100644
--- a/src/main/java/fr/inria/corese/core/sparql/storage/fs/StringManagerDelegate.java
+++ b/src/main/java/fr/inria/corese/core/sparql/storage/fs/StringManagerDelegate.java
@@ -16,7 +16,7 @@
  * delegate class for read/write/delete string from file via file handler
  *
  * @author Fuqi Song, Wimmics Inria I3S
- * @date 13 janv. 2015
+ * @since 13 janv. 2015
  */
 public class StringManagerDelegate {
 
diff --git a/src/main/java/fr/inria/corese/core/sparql/storage/fs/StringMeta.java b/src/main/java/fr/inria/corese/core/sparql/storage/fs/StringMeta.java
index 4aff47033..b2f246ea8 100644
--- a/src/main/java/fr/inria/corese/core/sparql/storage/fs/StringMeta.java
+++ b/src/main/java/fr/inria/corese/core/sparql/storage/fs/StringMeta.java
@@ -6,7 +6,7 @@
  * StringMeta.java
  *
  * @author Fuqi Song, Wimmics Inria I3S
- * @date 13 janv. 2015
+ * @since 13 janv. 2015
  */
 public class StringMeta {
 
diff --git a/src/main/java/fr/inria/corese/core/sparql/storage/util/StorageFactory.java b/src/main/java/fr/inria/corese/core/sparql/storage/util/StorageFactory.java
index 66c78ede2..279d55018 100644
--- a/src/main/java/fr/inria/corese/core/sparql/storage/util/StorageFactory.java
+++ b/src/main/java/fr/inria/corese/core/sparql/storage/util/StorageFactory.java
@@ -8,7 +8,7 @@
  * Generate the persistent manager
  *
  * @author Fuqi Song, Wimmics Inria I3S
- * @date 29 janv. 2015
+ * @since 29 janv. 2015
  */
 public class StorageFactory {
 
diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/function/script/Eval.java b/src/main/java/fr/inria/corese/core/sparql/triple/function/script/Eval.java
index 0cc6bb472..93dccf353 100644
--- a/src/main/java/fr/inria/corese/core/sparql/triple/function/script/Eval.java
+++ b/src/main/java/fr/inria/corese/core/sparql/triple/function/script/Eval.java
@@ -24,9 +24,9 @@ public Eval(String name) {
     }
     
     /**
-     * eval(?e) where ?e is a IDatatype Pointer which contains an expression  
+     * eval(?e) where ?e is a IDatatype Pointer which contains an expression
      * use case:
-     * @error function us:error(?e) { eval(?e) }
+     * <pre>{@code @error function us:error(?e) { eval(?e) }}</pre>
      */
     @Override
     public IDatatype eval(Computer eval, Binding b, Environment env, Producer p) throws EngineException {
diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/parser/Context.java b/src/main/java/fr/inria/corese/core/sparql/triple/parser/Context.java
index 48bd4ff4b..78caa6992 100644
--- a/src/main/java/fr/inria/corese/core/sparql/triple/parser/Context.java
+++ b/src/main/java/fr/inria/corese/core/sparql/triple/parser/Context.java
@@ -672,7 +672,7 @@ public Context inherit(Context ct) {
      * a) url = http://corese.inria.fr/psparql          -> name = url
      * b) url = http://corese.inria.fr/sparql?mode=demo -> name = demo
      * 
-     * @fixit: may loop when mode recursively refers to mode.
+     * Fixit: may loop when mode recursively refers to mode.
      */
     public void context(Context gc, String name) {
         // Consult Profile Context to get predefined parameters associated to name
diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/parser/visitor/ASTParser.java b/src/main/java/fr/inria/corese/core/sparql/triple/parser/visitor/ASTParser.java
index 26348ebdf..ad7da4f04 100644
--- a/src/main/java/fr/inria/corese/core/sparql/triple/parser/visitor/ASTParser.java
+++ b/src/main/java/fr/inria/corese/core/sparql/triple/parser/visitor/ASTParser.java
@@ -207,7 +207,7 @@ void serviceReportMain(ASTQuery ast) {
 
     /**
      *
-     * @report @enum generate values (?key ?val) {unnest(js:reportsEnum())}
+     * <pre>{@code @report @enum}</pre> generate values (?key ?val) {unnest(js:reportsEnum())}
      * js:reportsEnum() ::= (key_i (val_i1 .. val_in))
      *
      */
@@ -296,7 +296,7 @@ void processEnter(Service exp) {
     }
 
     /**
-     * @report Generate service number on leave when nested services: inner
+     * {@code @report} Generate service number on leave when nested services: inner
      * service is 0 and outer service is 1
      */
     void processLeave(Service exp) {
diff --git a/src/main/java/fr/inria/corese/core/stats/IStats.java b/src/main/java/fr/inria/corese/core/stats/IStats.java
index 25ff01846..691a95315 100644
--- a/src/main/java/fr/inria/corese/core/stats/IStats.java
+++ b/src/main/java/fr/inria/corese/core/stats/IStats.java
@@ -7,7 +7,7 @@
  * Interface for calling Producer from kgraph to do statistics
  *
  * @author Fuqi Song, WImmics Inria I3S
- * @date 4 juin 2014
+ * @since 4 juin 2014
  * @deprecated 21.10.2014 F. Song
  */
 public interface IStats {
diff --git a/src/main/java/fr/inria/corese/core/stats/Options.java b/src/main/java/fr/inria/corese/core/stats/Options.java
index d78a94ce9..bd3ed0b51 100644
--- a/src/main/java/fr/inria/corese/core/stats/Options.java
+++ b/src/main/java/fr/inria/corese/core/stats/Options.java
@@ -4,7 +4,7 @@
  * Options and parameters for setting meta data statistics 
  *
  * @author Fuqi Song, Wimmics Inria I3S
- * @date 17 juin 2014
+ * @since 17 juin 2014
  */
 public class Options {
 
diff --git a/src/main/java/fr/inria/corese/core/stats/StatsBasedEstimation.java b/src/main/java/fr/inria/corese/core/stats/StatsBasedEstimation.java
index b6c20776a..271098eab 100644
--- a/src/main/java/fr/inria/corese/core/stats/StatsBasedEstimation.java
+++ b/src/main/java/fr/inria/corese/core/stats/StatsBasedEstimation.java
@@ -31,7 +31,7 @@
  *
  * @deprecated stats-based QP is not supported and not recommended to use 22 Oct. 2014
  * @author Fuqi Song, Wimmics Inria I3S
- * @date 19 mai 2014
+ * @since 19 mai 2014
  */
 public class StatsBasedEstimation implements IEstimate {
 
diff --git a/src/main/java/fr/inria/corese/core/stats/data/BaseMap.java b/src/main/java/fr/inria/corese/core/stats/data/BaseMap.java
index 4d739d7b7..ad1250d9c 100644
--- a/src/main/java/fr/inria/corese/core/stats/data/BaseMap.java
+++ b/src/main/java/fr/inria/corese/core/stats/data/BaseMap.java
@@ -9,7 +9,7 @@
  * map between distinct node and its number
  *
  * @author Fuqi Song, Wimmics Inria I3S
- * @date 17 juin 2014
+ * @since 17 juin 2014
  */
 public class BaseMap {
 
diff --git a/src/main/java/fr/inria/corese/core/stats/data/HashBucket.java b/src/main/java/fr/inria/corese/core/stats/data/HashBucket.java
index 62c6071b9..8275e52e5 100644
--- a/src/main/java/fr/inria/corese/core/stats/data/HashBucket.java
+++ b/src/main/java/fr/inria/corese/core/stats/data/HashBucket.java
@@ -9,7 +9,7 @@
  * Save map between nodes ( convert to hash code) and their count
  *
  * @author Fuqi Song, Wimmics Inria I3S
- * @date 4 juin 2014
+ * @since 4 juin 2014
  */
 public class HashBucket extends BaseMap {
 
diff --git a/src/main/java/fr/inria/corese/core/stats/data/ReducedMap.java b/src/main/java/fr/inria/corese/core/stats/data/ReducedMap.java
index dffdbd838..536da5797 100644
--- a/src/main/java/fr/inria/corese/core/stats/data/ReducedMap.java
+++ b/src/main/java/fr/inria/corese/core/stats/data/ReducedMap.java
@@ -14,7 +14,7 @@
  * size of mapping
  *
  * @author Fuqi Song, Wimmics Inria I3S
- * @date 4 juin 2014
+ * @since 4 juin 2014
  */
 public class ReducedMap extends BaseMap {
 
diff --git a/src/main/java/fr/inria/corese/core/stats/data/SimpleAverage.java b/src/main/java/fr/inria/corese/core/stats/data/SimpleAverage.java
index a8811f40f..98d89a3e5 100644
--- a/src/main/java/fr/inria/corese/core/stats/data/SimpleAverage.java
+++ b/src/main/java/fr/inria/corese/core/stats/data/SimpleAverage.java
@@ -6,7 +6,7 @@
  * Simple average, number of all triples/number of distinct resources
  *
  * @author Fuqi Song, Wimmics Inria I3S
- * @date 10 juin 2014
+ * @since 10 juin 2014
  */
 public class SimpleAverage extends BaseMap {
 
diff --git a/src/main/java/fr/inria/corese/core/stats/data/TripleHashTable.java b/src/main/java/fr/inria/corese/core/stats/data/TripleHashTable.java
index d9c27b9b3..7e9d690aa 100644
--- a/src/main/java/fr/inria/corese/core/stats/data/TripleHashTable.java
+++ b/src/main/java/fr/inria/corese/core/stats/data/TripleHashTable.java
@@ -14,7 +14,7 @@
  * TripleHashTable.java
  *
  * @author Fuqi Song, Wimmics Inria I3S
- * @date 20 juin 2014
+ * @since 20 juin 2014
  */
 public class TripleHashTable {
 
diff --git a/src/main/java/fr/inria/corese/core/stats/data/TripleHashTable2.java b/src/main/java/fr/inria/corese/core/stats/data/TripleHashTable2.java
index 7d00f71df..8715efcd8 100644
--- a/src/main/java/fr/inria/corese/core/stats/data/TripleHashTable2.java
+++ b/src/main/java/fr/inria/corese/core/stats/data/TripleHashTable2.java
@@ -13,7 +13,7 @@
  * TripleHashTable.java
  *
  * @author Fuqi Song, Wimmics Inria I3S
- * @date 20 juin 2014
+ * @since 20 juin 2014
  */
 public class TripleHashTable2 {
 
diff --git a/src/main/java/fr/inria/corese/core/stats/data/WrappedNode.java b/src/main/java/fr/inria/corese/core/stats/data/WrappedNode.java
index 53cec5bd0..70197e968 100644
--- a/src/main/java/fr/inria/corese/core/stats/data/WrappedNode.java
+++ b/src/main/java/fr/inria/corese/core/stats/data/WrappedNode.java
@@ -7,7 +7,7 @@
  * with same label, that is all
  *
  * @author Fuqi Song, Wimmics Inria I3S
- * @date 4 juil. 2014
+ * @since 4 juil. 2014
  */
 public class WrappedNode {
 
diff --git a/src/main/java/fr/inria/corese/core/util/Property.java b/src/main/java/fr/inria/corese/core/util/Property.java
index 54362e6b1..ec5869d28 100644
--- a/src/main/java/fr/inria/corese/core/util/Property.java
+++ b/src/main/java/fr/inria/corese/core/util/Property.java
@@ -597,8 +597,8 @@ void basicLoad(String path) throws IOException {
     }
 
     /**
-     * @todo: ./ in imported file is the path of main property file
-     * @todo: there is no recursive import
+     * TODO: ./ in imported file is the path of main property file
+     * TODO: there is no recursive import
      */
     private void imports() throws IOException {
         if (getProperties().containsKey(IMPORT.toString())) {
diff --git a/src/test/java/fr/inria/corese/persistent/Test.java b/src/test/java/fr/inria/corese/persistent/Test.java
index fe3c044c7..05137fda2 100644
--- a/src/test/java/fr/inria/corese/persistent/Test.java
+++ b/src/test/java/fr/inria/corese/persistent/Test.java
@@ -16,7 +16,7 @@
  * Test.java
  *
  * @author Fuqi Song, Wimmics Inria I3S
- * @date 13 janv. 2015
+ * @since 13 janv. 2015
  */
 public class Test {
 
diff --git a/src/test/java/fr/inria/corese/persistent/TestSuite.java b/src/test/java/fr/inria/corese/persistent/TestSuite.java
index 939969a0b..1dd529ffc 100644
--- a/src/test/java/fr/inria/corese/persistent/TestSuite.java
+++ b/src/test/java/fr/inria/corese/persistent/TestSuite.java
@@ -9,7 +9,7 @@
  * TestSuite.java
  *
  * @author Fuqi Song, Wimmics Inria I3S
- * @date 26 janv. 2015
+ * @since 26 janv. 2015
  */
 public class TestSuite {
 

From 533de5a44f43b7ec3b970b532b5a445b430166cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20C=C3=A9r=C3=A8s?= <remi.ceres@inria.fr>
Date: Fri, 4 Sep 2026 15:11:20 +0200
Subject: [PATCH 2/2] fix(javadoc): resolve remaining custom tags

---
 .../eval/QuerySolverVisitorBasic.java         |   3 +-
 .../compiler/federate/FederateVisitor.java    |   3 +-
 .../compiler/parser/FunctionCompiler.java     |   3 +-
 .../corese/core/kgram/path/PathFinder.java    |   4 +-
 .../inria/corese/core/load/ServiceReport.java |   4 +-
 .../corese/core/load/jsonld/JsonldLoader.java | 122 +++++++++---------
 .../corese/core/load/rdfa/RDFaLoader.java     | 116 ++++++++---------
 .../corese/core/sparql/api/IDatatype.java     |   2 +-
 .../sparql/datatype/extension/CoreseMap.java  |   2 +-
 9 files changed, 131 insertions(+), 128 deletions(-)

diff --git a/src/main/java/fr/inria/corese/core/compiler/eval/QuerySolverVisitorBasic.java b/src/main/java/fr/inria/corese/core/compiler/eval/QuerySolverVisitorBasic.java
index c88781fb1..4e73ad751 100644
--- a/src/main/java/fr/inria/corese/core/compiler/eval/QuerySolverVisitorBasic.java
+++ b/src/main/java/fr/inria/corese/core/compiler/eval/QuerySolverVisitorBasic.java
@@ -25,7 +25,6 @@
  * Callback manager for LDScript functions with specific annotations Eval SPARQL
  * processor calls before() and after()
  *
- * @author Olivier Corby, Wimmics INRIA I3S, 2018
  * <pre>{@code
  * @before function us:before(?q) {}
  * @after function us:after(?m) {}
@@ -34,6 +33,8 @@
  * @result function us:result(?m) {}
  * @solution function us:solution(?m) {}
  * }</pre>
+ *
+ * @author Olivier Corby, Wimmics INRIA I3S, 2018
  */
 public class QuerySolverVisitorBasic extends PointerObject implements ProcessVisitor {
 
diff --git a/src/main/java/fr/inria/corese/core/compiler/federate/FederateVisitor.java b/src/main/java/fr/inria/corese/core/compiler/federate/FederateVisitor.java
index afbd266a9..53dfbf6c3 100644
--- a/src/main/java/fr/inria/corese/core/compiler/federate/FederateVisitor.java
+++ b/src/main/java/fr/inria/corese/core/compiler/federate/FederateVisitor.java
@@ -21,7 +21,6 @@
 /**
  * Prototype for federated query
  *
- * @author Olivier Corby, Wimmics INRIA I3S, 2018
  * <pre>{@code
  * @federate <s1> <s2>
  * select * where { }
@@ -35,6 +34,8 @@
  * graph ?g { } by default is evaluated as federated onto servers
  * <pre>{@code @skip kg:distributeNamed :}</pre>
  * named graph as a whole on each server
+ *
+ * @author Olivier Corby, Wimmics INRIA I3S, 2018
  */
 public class FederateVisitor implements QueryVisitor, URLParam {
 
diff --git a/src/main/java/fr/inria/corese/core/compiler/parser/FunctionCompiler.java b/src/main/java/fr/inria/corese/core/compiler/parser/FunctionCompiler.java
index 597f99ed2..543962b10 100644
--- a/src/main/java/fr/inria/corese/core/compiler/parser/FunctionCompiler.java
+++ b/src/main/java/fr/inria/corese/core/compiler/parser/FunctionCompiler.java
@@ -19,7 +19,6 @@
 import java.util.Map;
 
 /**
- * @author Olivier Corby, INRIA I3S 2020
  * <pre>{@code @import <url>}</pre>
  * dereference URL at compile time
  * LinkedFunction:
@@ -31,6 +30,8 @@
  * <p>
  * Accept/reject namespace for import and LinkedFunction:
  * AccessNamespace.define(namespace, true|false)
+ *
+ * @author Olivier Corby, INRIA I3S 2020
  */
 public class FunctionCompiler {
 
diff --git a/src/main/java/fr/inria/corese/core/kgram/path/PathFinder.java b/src/main/java/fr/inria/corese/core/kgram/path/PathFinder.java
index 087151095..9bf0bab7a 100644
--- a/src/main/java/fr/inria/corese/core/kgram/path/PathFinder.java
+++ b/src/main/java/fr/inria/corese/core/kgram/path/PathFinder.java
@@ -67,9 +67,9 @@
  * Check Loop: pf.setCheckLoop(true) => exp+ exp{n,m} without loop
  * exec.setPathLoop(false) pragma {kg:path kg:loop false}
  *
- * @author Olivier Corby, Edelweiss, INRIA 2010
- * @thanx Corentin Follenfant for the idea of property weight into the regex
+ * Thanks to Corentin Follenfant for the idea of property weight into the regex.
  *
+ * @author Olivier Corby, Edelweiss, INRIA 2010
  ********************************************************
  */
 public class PathFinder {
diff --git a/src/main/java/fr/inria/corese/core/load/ServiceReport.java b/src/main/java/fr/inria/corese/core/load/ServiceReport.java
index 80925ffee..dc02c024a 100644
--- a/src/main/java/fr/inria/corese/core/load/ServiceReport.java
+++ b/src/main/java/fr/inria/corese/core/load/ServiceReport.java
@@ -25,9 +25,9 @@
  * or Property SERVICE_REPORT = true
  * or url parameter mode=report 
  * record subset of key value:
- * @record server url 
+ * {@code @record server url}
  * generate record when service return empty results:
- * @record empty
+ * {@code @record empty}
  */
 public class ServiceReport implements URLParam {
     
diff --git a/src/main/java/fr/inria/corese/core/load/jsonld/JsonldLoader.java b/src/main/java/fr/inria/corese/core/load/jsonld/JsonldLoader.java
index 7c95e2be5..d873b57ab 100644
--- a/src/main/java/fr/inria/corese/core/load/jsonld/JsonldLoader.java
+++ b/src/main/java/fr/inria/corese/core/load/jsonld/JsonldLoader.java
@@ -1,61 +1,61 @@
-package fr.inria.corese.core.load.jsonld;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.Reader;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.github.jsonldjava.core.JsonLdError;
-import com.github.jsonldjava.core.JsonLdProcessor;
-import com.github.jsonldjava.core.JsonLdTripleCallback;
-import com.github.jsonldjava.utils.JsonUtils;
-
-
-/**
- * Load JSON-LD
- *
- * @author Fuqi Song, wimmics inria i3s
- * @since 12 Feb 2014 new
- */
-public class JsonldLoader {
-
-    /**
-     * logger from log4j
-     */
-    private static final Logger logger = LoggerFactory.getLogger(JsonldLoader.class);
-
-    private Reader reader;
-    private InputStream is;
-    private final String base;
-
-    JsonldLoader(InputStream r, String base) {
-        this.is = r;
-        this.base = base;
-    }
-
-    JsonldLoader(Reader r, String base) {
-        this.reader = r;
-        this.base = base;
-    }
-
-    public static JsonldLoader create(Reader read, String base) {
-        JsonldLoader p = new JsonldLoader(read, base);
-        return p;
-    }
-
-    /**
-     * Load triples from JSON-LD to graph
-     *
-     * @param callback
-     * @throws java.io.IOException
-     * @throws com.github.jsonldjava.core.JsonLdError
-     */
-    public void load(JsonLdTripleCallback callback) throws IOException, JsonLdError {
-        // resolve the "reader" to JSON objects using parser
-        Object jsonObject = JsonUtils.fromReader(this.reader);
-        
-        JsonLdProcessor.toRDF(jsonObject, callback);
-    }
-}
+package fr.inria.corese.core.load.jsonld;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.Reader;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.github.jsonldjava.core.JsonLdError;
+import com.github.jsonldjava.core.JsonLdProcessor;
+import com.github.jsonldjava.core.JsonLdTripleCallback;
+import com.github.jsonldjava.utils.JsonUtils;
+
+
+/**
+ * Load JSON-LD
+ *
+ * @author Fuqi Song, wimmics inria i3s
+ * @since 12 Feb 2014 new
+ */
+public class JsonldLoader {
+
+    /**
+     * logger from log4j
+     */
+    private static final Logger logger = LoggerFactory.getLogger(JsonldLoader.class);
+
+    private Reader reader;
+    private InputStream is;
+    private final String base;
+
+    JsonldLoader(InputStream r, String base) {
+        this.is = r;
+        this.base = base;
+    }
+
+    JsonldLoader(Reader r, String base) {
+        this.reader = r;
+        this.base = base;
+    }
+
+    public static JsonldLoader create(Reader read, String base) {
+        JsonldLoader p = new JsonldLoader(read, base);
+        return p;
+    }
+
+    /**
+     * Load triples from JSON-LD to graph
+     *
+     * @param callback
+     * @throws java.io.IOException
+     * @throws com.github.jsonldjava.core.JsonLdError
+     */
+    public void load(JsonLdTripleCallback callback) throws IOException, JsonLdError {
+        // resolve the "reader" to JSON objects using parser
+        Object jsonObject = JsonUtils.fromReader(this.reader);
+
+        JsonLdProcessor.toRDF(jsonObject, callback);
+    }
+}
diff --git a/src/main/java/fr/inria/corese/core/load/rdfa/RDFaLoader.java b/src/main/java/fr/inria/corese/core/load/rdfa/RDFaLoader.java
index 6189adb47..cfdf2edfe 100644
--- a/src/main/java/fr/inria/corese/core/load/rdfa/RDFaLoader.java
+++ b/src/main/java/fr/inria/corese/core/load/rdfa/RDFaLoader.java
@@ -1,58 +1,58 @@
-package fr.inria.corese.core.load.rdfa;
-
-import java.io.InputStream;
-import java.io.Reader;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import org.semarglproject.rdf.core.ParseException;
-import org.semarglproject.rdf.rdfa.RdfaParser;
-import org.semarglproject.source.StreamProcessor;
-
-/**
- * Load RDFa
- *
- * @author Fuqi Song, wimmics inria i3s
- * @since 27 Jan 2014 new
- */
-public class RDFaLoader {
-
-    /**
-     * logger from log4j
-     */
-    private static final Logger logger = LoggerFactory.getLogger(RDFaLoader.class);
-
-    private Reader reader;
-    private InputStream is;
-    private final String base;
-
-    RDFaLoader(InputStream r, String base) {
-        this.is = r;
-        this.base = base;
-    }
-
-    RDFaLoader(Reader r, String base) {
-        this.reader = r;
-        this.base = base;
-    }
-
-    public static RDFaLoader create(Reader read, String base) {
-        RDFaLoader p = new RDFaLoader(read, base);
-        return p;
-    }
-
-
-    /**
-     * Load triples from RDFa file to graph
-     *
-     * @param sink
-     * @throws ParseException
-     */
-    public void load(CoreseRDFaTripleSink sink) throws ParseException {
-
-        StreamProcessor processor = new StreamProcessor(RdfaParser.connect(sink));
-        processor.process(this.reader, this.base);
-    }
-
-}
+package fr.inria.corese.core.load.rdfa;
+
+import java.io.InputStream;
+import java.io.Reader;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import org.semarglproject.rdf.core.ParseException;
+import org.semarglproject.rdf.rdfa.RdfaParser;
+import org.semarglproject.source.StreamProcessor;
+
+/**
+ * Load RDFa
+ *
+ * @author Fuqi Song, wimmics inria i3s
+ * @since 27 Jan 2014 new
+ */
+public class RDFaLoader {
+
+    /**
+     * logger from log4j
+     */
+    private static final Logger logger = LoggerFactory.getLogger(RDFaLoader.class);
+
+    private Reader reader;
+    private InputStream is;
+    private final String base;
+
+    RDFaLoader(InputStream r, String base) {
+        this.is = r;
+        this.base = base;
+    }
+
+    RDFaLoader(Reader r, String base) {
+        this.reader = r;
+        this.base = base;
+    }
+
+    public static RDFaLoader create(Reader read, String base) {
+        RDFaLoader p = new RDFaLoader(read, base);
+        return p;
+    }
+
+
+    /**
+     * Load triples from RDFa file to graph
+     *
+     * @param sink
+     * @throws ParseException
+     */
+    public void load(CoreseRDFaTripleSink sink) throws ParseException {
+
+        StreamProcessor processor = new StreamProcessor(RdfaParser.connect(sink));
+        processor.process(this.reader, this.base);
+    }
+
+}
diff --git a/src/main/java/fr/inria/corese/core/sparql/api/IDatatype.java b/src/main/java/fr/inria/corese/core/sparql/api/IDatatype.java
index a7470762e..3e367a695 100644
--- a/src/main/java/fr/inria/corese/core/sparql/api/IDatatype.java
+++ b/src/main/java/fr/inria/corese/core/sparql/api/IDatatype.java
@@ -169,7 +169,7 @@ default IDatatype set(String name, Object value) {
     }
 
     /**
-     * @todo CoreseMap set(name, value) use newResource(name)
+     * TODO: CoreseMap set(name, value) use newResource(name)
      * whereas here we use key/newInstance(name)
      * ServiceReport make the assumption that it is key/newInstance
      */
diff --git a/src/main/java/fr/inria/corese/core/sparql/datatype/extension/CoreseMap.java b/src/main/java/fr/inria/corese/core/sparql/datatype/extension/CoreseMap.java
index dd30b092a..0782b6447 100644
--- a/src/main/java/fr/inria/corese/core/sparql/datatype/extension/CoreseMap.java
+++ b/src/main/java/fr/inria/corese/core/sparql/datatype/extension/CoreseMap.java
@@ -75,7 +75,7 @@ public void set(IDatatype key, int val) {
     }
 
     /**
-     * @todo check IDatatype set(name,value) use newInstance instead of newResource.
+     * TODO: check IDatatype set(name,value) use newInstance instead of newResource.
      */
     @Override
     public IDatatype set(String key, IDatatype val) {