Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 11 additions & 4 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ plugins {

// Tooling plugins
`jacoco` // For code coverage reports
id("org.gradlex.extra-java-module-info") version "1.9" // Module metadata for JARs without module info
id("org.gradlex.extra-java-module-info") version "1.11" // Module metadata for JARs without module info
id("com.gradleup.shadow") version "8.3.5" // Bundles dependencies into a single JAR
id("org.sonarqube") version "6.0.1.5171" // SonarQube integration
id("com.intershop.gradle.javacc") version "5.0.0" // JavaCC plugin for parsing JavaCC files
Expand All @@ -29,6 +29,7 @@ sonar {
property("sonar.login", System.getenv("SONAR_TOKEN"))
property("sonar.coverage.jacoco.xmlReportPaths", "build/reports/jacoco/test/jacocoTestReport.xml")
property("sonar.sourceEncoding", "UTF-8")
property("sonar.projectDate", currentDate)
}
}

Expand All @@ -46,7 +47,7 @@ javacc {
sourceSets {
main {
java {
srcDir("$buildDir/generated-src/javacc")
srcDir(layout.buildDirectory.dir("generated-src/javacc"))
}
}
}
Expand Down Expand Up @@ -87,7 +88,9 @@ object Meta {
java {
withJavadocJar() // Include Javadoc JAR in publications
withSourcesJar() // Include sources JAR in publications
sourceCompatibility = JavaVersion.VERSION_11 // Configure minimum Java version
toolchain {
languageVersion.set(JavaLanguageVersion.of(21))
}
}

/////////////////////////
Expand All @@ -102,7 +105,7 @@ repositories {

// Define dependencies
dependencies {
val jersey_version = "3.0.4"
val jersey_version = "3.1.3"
val semargl_version = "0.7.1"

// === Public API (Corese-Core users must see these classes) ===
Expand Down Expand Up @@ -321,6 +324,10 @@ tasks.jacocoTestReport {
// This ensures that test coverage reports are always generated after tests.
tasks.test {
useJUnitPlatform()
testLogging {
events("passed", "skipped", "failed")
}
systemProperty("java.util.logging.config.file", "src/test/resources/logging.properties")
finalizedBy(tasks.jacocoTestReport)
}

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/fr/inria/corese/core/Graph.java
Original file line number Diff line number Diff line change
Expand Up @@ -2626,7 +2626,7 @@ public Hashtable<String, Node> getTripleNodeMap() {
}

/**
* resource & blank TODO: a node may have been deleted (by a delete triple)
* resource &amp; blank TODO: a node may have been deleted (by a delete triple)
* but still be in the table
*/
public Iterable<Node> getRBNodes() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ default boolean exist(Node property, Node subject, Node object) {
/**
* Edge may be an rdf star triple, asserted or nested
* RDF star triple design
* <<s p o>> q v -> <<edge(s p o t)>> t q v
* &lt;&lt;s p o>> q v -> &lt;&lt;edge(s p o t)>> t q v
* s p o {| q v |} -> edge(s p o t) t q v
* g1 s p o t g2 s p o t
* t is additional Node, similar to subject/object
Expand All @@ -77,8 +77,8 @@ default boolean exist(Node property, Node subject, Node object) {
* where subject/object may be a reference node and/or edge may have reference
* node
* DataManager must process these subject/object/reference using the api above
* for example: find/insert/delete t q v where t = <<s p o>>
* Note that it can be recursive: t = <<<<s p o>> r u>>
* for example: find/insert/delete t q v where t = &lt;&lt;s p o>>
* Note that it can be recursive: t = &lt;&lt;&lt;&lt;s p o>> r u>>
* .
*/

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
/**
* SPARQL Java extension functions
* cs:test()
* prefix cs: <http://ns.inria.fr/sparql-custom/>
* prefix cs: &lt;http://ns.inria.fr/sparql-custom/>
*
* @author Olivier Corby, Wimmics INRIA I3S, 2015
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
import org.slf4j.LoggerFactory;

/**
* Evaluator of operators & functions of filter language
* Evaluator of operators &amp; functions of filter language
* implemented by fr.inria.corese.core.query.PluginImpl
*
* @author Olivier Corby, Edelweiss, INRIA 2010
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@

/**
* Evaluator of SPARQL query by KGRAM Ready to use Package with KGRAM and SPARQL
* Parser & Transformer
* Parser &amp; Transformer
*
* @author Olivier Corby, Edelweiss, INRIA 2010
*/
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/fr/inria/corese/core/edge/EdgeImpl.java
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
/**
* Graph Edge with n nodes (not only triple)
* RDF star triple with reference node t
* g <<s p o t>>
* g &lt;&lt;s p o t>>
*
* @author Olivier Corby, Edelweiss INRIA 2010
*/
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/fr/inria/corese/core/extension/Agent.java
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* It has a singleton, hence each ag:fun() function call is performed on the same object
* The singleton can be accessed in LDScript using xt:agent()
* <p>
* prefix ag: <function://fr.inria.corese.core.extension.Agent>
* prefix ag: &lt;function://fr.inria.corese.core.extension.Agent>
* <p>
* IDatatype ag:functionName(IDatatype arg)
* <p>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@

/**
* Generic Java Extension function public class
* prefix fun: <function://fr.inria.corese.core.extension.Extension>
* prefix fun: &lt;function://fr.inria.corese.core.extension.Extension>
* fun:test(xt:graph())
* <p>
* Provide access to query execution environment
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/fr/inria/corese/core/extension/Report.java
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* execution Service Report is the value of a variable ?_service_report_n where
* n is the number of the service Variable ?_service_report_n is bound in the
* environment Variable value is a LDScript JSON object, with dt:json datatype
* prefix js: <function://fr.inria.corese.core.extension.Report>
* prefix js: &lt;function://fr.inria.corese.core.extension.Report>
*
* @report @header [@enum]
* values (?akey ?aval) { unnest(js:report()) }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ public IDatatype maplist(IDatatype fun, IDatatype... ldt) {

/**
* This PluginImpl was created for executing a Method such as java:report()
* where java: = <function:// ...>
* where java: = &lt;function:// ...>
* This PluginImpl contains Environment and Producer use case: JavaCompiler
* external function
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ default PointerType pointerType() {
/**
* Query nodes have an index computed by KGRAM
*
* @return
*/
void setIndex(int n);

Expand Down
4 changes: 2 additions & 2 deletions src/main/java/fr/inria/corese/core/kgram/core/Exp.java
Original file line number Diff line number Diff line change
Expand Up @@ -1484,7 +1484,7 @@ boolean match(Node node, Filter f) {
}

/**
* this is FILTER with TEST ?x < ?y
* this is FILTER with TEST ?x &lt; ?y
*/
public int oper() {
return getFilter().getExp().oper();
Expand Down Expand Up @@ -1526,7 +1526,7 @@ public int indexNode(Node node) {
}

/**
* index of node in FILTER ?x < ?y
* index of node in FILTER ?x &lt; ?y
*/
public int indexVar(Node node) {
Expr ee = getFilter().getExp();
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/fr/inria/corese/core/kgram/core/Query.java
Original file line number Diff line number Diff line change
Expand Up @@ -1079,7 +1079,7 @@ public int nbFun() {

/**
* Check that select variables and expressions are compatible with group by
* & aggregates use case:
* &amp; aggregates use case:
*
* SELECT ?P (COUNT(?O) AS ?C) WHERE { ?S ?P ?O }
*
Expand Down Expand Up @@ -1319,7 +1319,7 @@ public Node getNode(String name) {
* get node with going in select sub query
* go into its own select because
* order by may reuse a select variable use case: transformer find node for
* select & group by
* select &amp; group by
*/
public Node getProperAndSubSelectNode(String name) {
return getExtNode(name, true);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -387,7 +387,7 @@ void sortFilter(Exp exp, VString varList) {
}

/**
* Identify remarkable filter ?x < ?y ?x = ?y or ?x = cst or !bound() filter
* Identify remarkable filter ?x &lt; ?y ?x = ?y or ?x = cst or !bound() filter
* is tagged
*/
public List<Exp> findBindings(Exp exp) {
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/fr/inria/corese/core/kgram/filter/Checker.java
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@

/**
* Filter Exp Checker
*
*
* Check presence of patterns that are always true or always false
* Such as:
* ?x != ?x
* ?x > ?y && ?x < ?y
*
* ?x &gt; ?y &amp;&amp; ?x &lt; ?y
*
* @author Olivier Corby, Edelweiss, INRIA 2010
*
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -412,7 +412,7 @@ public void interrupt() {
}

/**
* init at creation time, no need to change. pmax comes from pathLength() <=
* init at creation time, no need to change. pmax comes from pathLength() &lt;=
* pmax
*/
public void init(Regex exp, Object smode, int pmin, int pmax) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ public class BasicPatternGenerator {
private final static int TRIPLE_LEN = 3, PATTERN_LEN = 8;

/**
* Generate the default basic pattern orders using Np < Ns < No
* Generate the default basic pattern orders using Np &lt; Ns &lt; No
*
* @return
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
import static fr.inria.corese.core.kgram.api.core.ExpType.*;

/**
* An implementation for sorting the triple pattern depth-first & best greedy
* An implementation for sorting the triple pattern depth-first &amp; best greedy
* algorithm
*
* 1 start with the one with least cost, if there are more than 2 with same cost
Expand All @@ -21,7 +21,7 @@
*
* 3 recursively search until all nodes have been visited
*
* 4 every time one node is added to visited, check FILTER & VALUES
* 4 every time one node is added to visited, check FILTER &amp; VALUES
* ++ 4.1 now also check BIND 20Jan2015
*
* @author Fuqi Song, Wimmics Inria I3S
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,6 @@ String blankNode() {
/**
* Get the default graph source according to the status of graph and source
*
* @param graph Graph that will be filled in
* @param source The particular name to add nodes to
*
* @return
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/fr/inria/corese/core/logic/Distance.java
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@
import fr.inria.corese.core.kgram.api.core.Node;

/**
* Semantic distance & similarity with Corese 2.4 Algorithm Extended to property
* Semantic distance &amp; similarity with Corese 2.4 Algorithm Extended to property
* hierarchy distance: kg:pSimilarity
*
* PRAGMA: need a graph with Node set/get Depth need a root class, default is
* rdfs:Resource or owl:Thing
*
* If a class is not subClassOf root, depth simulate to 1 Exploit owl:sameAs &
* If a class is not subClassOf root, depth simulate to 1 Exploit owl:sameAs &amp;
* owl:equivalentClass/Property
*
* Generalized to property hierarchy with a step of 1/8^n instead of 1/2^n steps
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/fr/inria/corese/core/logic/Entailment.java
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
* rdfs:domain rdfs:range rdfs:subPropertyOf rdfs:subClassOf
* owl:SymmetricProperty owl:inverseOf
*
* subPropertyOf & subClassOf are not transitive in the graph but their
* subPropertyOf &amp; subClassOf are not transitive in the graph but their
* instances are typed according to transitivity
*
* @author Olivier Corby, Edelweiss INRIA 2010
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ public enum XSD implements CoreDatatype {
POSITIVE_INTEGER(fr.inria.corese.core.next.impl.common.vocabulary.XSD.xsdPositiveInteger.getIRI()),

/**
* Integer numbers <0
* Integer numbers &lt;0
*/
NEGATIVE_INTEGER(fr.inria.corese.core.next.impl.common.vocabulary.XSD.xsdNegativeInteger.getIRI()),

Expand Down Expand Up @@ -178,7 +178,7 @@ public enum XSD implements CoreDatatype {
TOKEN(fr.inria.corese.core.next.impl.common.vocabulary.XSD.xsdToken.getIRI()),

/**
* Language tags per <a href="https://www.rfc-editor.org/rfc/rfc5646">rfc5646</>
* Language tags per &lt;a href="https://www.rfc-editor.org/rfc/rfc5646">rfc5646&lt;/>
*/
LANGUAGE(fr.inria.corese.core.next.impl.common.vocabulary.XSD.xsdLanguage.getIRI()),

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/fr/inria/corese/core/print/TripleFormat.java
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
import java.util.List;

/**
* Turtle & Trig Format
* Turtle &amp; Trig Format
*
* Olivier Corby, Wimmics INRIA 2013
*/
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/fr/inria/corese/core/print/XSLTQuery.java
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@
* extension-element-prefixes="server"
*
* Exec query using this code:
* <xsl:variable name='res' select='server:sparql($engine, $query)' />
* &lt;xsl:variable name='res' select='server:sparql($engine, $query)' />
*
* Olivier Corby & Fabien Gandon, Edelweiss INRIA 2011
* Olivier Corby &amp; Fabien Gandon, Edelweiss INRIA 2011
*
*/
public class XSLTQuery {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,6 @@ public void associateHashWithBlankNode(String hash, String blankNodeId) {
* Retrieves blanks nodes associated with a specific hash value.
*
* @param hash The hash value.
* @return A list of blank nodes associated with the hash value.
*/
public void removeHash(String hash) {
this.hashToBlankNode.remove(hash);
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/fr/inria/corese/core/query/PluginImpl.java
Original file line number Diff line number Diff line change
Expand Up @@ -706,7 +706,7 @@ public Graph getGraph() {
/**
* rdf star
* triple(s, p, o)
* filter bind <<s p o>>
* filter bind &lt;&lt;s p o&gt;&gt;
*/
// @todo DataManager
@Override
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/fr/inria/corese/core/rule/Rule.java
Original file line number Diff line number Diff line change
Expand Up @@ -213,8 +213,8 @@ public boolean isPseudoTransitive() {
}

/**
* this = x type c2 :- x type c1 & c1 subclassof c2
* r = c1 subclassof c3 :- c1 subclassof c2 & c2 subclassof c3
* this = x type c2 :- x type c1 &amp; c1 subclassof c2
* r = c1 subclassof c3 :- c1 subclassof c2 &amp; c2 subclassof c3
*/
public boolean isPseudoTransitive(Rule r) {
if (isPseudoTransitive() && r.isTransitive()) {
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/fr/inria/corese/core/rule/RuleEngine.java
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
* Focus on new triples using specific Graph Index sorted by timestamp
* Eval transitive rule at saturation using specific Java code
* Eval pseudo transitive rule just after it's transitive rule
* (cf rdf:type & rdfs:subClassOf)
* (cf rdf:type &amp; rdfs:subClassOf)
* <p>
* OWL_RL profile load specific rule base
*
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/fr/inria/corese/core/sparql/api/IDatatype.java
Original file line number Diff line number Diff line change
Expand Up @@ -322,7 +322,7 @@ default boolean isTripleWithEdge() {
*
* @param dt another datatype
* @return 0 if they are equals, an int > 0 if the datatype is greater than
* dt2, an int < 0 if the datatype is lesser
* dt2, an int &lt; 0 if the datatype is lesser
*/
int compareTo(IDatatype dt);

Expand Down Expand Up @@ -438,13 +438,13 @@ default String pretty() {

/**
* @param iod
* @return iod.getValue() < this.getValue() @throws Core seDatatypeException
* @return iod.getValue() &lt; this.getValue() @throws Core seDatatypeException
*/
boolean less(IDatatype iod) throws CoreseDatatypeException;

/**
* @param iod
* @return iod.getValue() <= to this.getValue() @throws CoreseDa
* @return iod.getValue() &lt;= to this.getValue() @throws CoreseDa
* tatypeException
*/
boolean lessOrEqual(IDatatype iod)
Expand Down
Loading