Skip to content

Upgrade to Jena v5.4.0 #192

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
costas80 wants to merge 1 commit into from
Closed

Upgrade to Jena v5.4.0 #192

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<ver.jena>5.2.0</ver.jena>
<ver.jena>5.4.0</ver.jena>
<ver.junit>4.13.2</ver.junit>
<ver.slf4j>2.0.17</ver.slf4j>
<ver.log4j2>2.24.3</ver.log4j2>
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/topbraid/jenax/util/QueryExecutionFactoryFilter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ public QueryExecution create(Query query, Model model, QuerySolution initialBind
return QueryExecution.create()
.query(query)
.model(model)
.initialBinding(initialBinding)
.substitution(initialBinding)
.build();
}

Expand Down
4 changes: 2 additions & 2 deletions src/main/java/org/topbraid/shacl/arq/functions/IsValidLangTagFunction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package org.topbraid.shacl.arq.functions;

import org.apache.jena.graph.Node;
import org.apache.jena.riot.web.LangTag;
import org.apache.jena.langtagx.LangTagX;
import org.apache.jena.sparql.expr.ExprEvalException;
import org.apache.jena.sparql.expr.NodeValue;
import org.apache.jena.sparql.function.FunctionEnv;
Expand All @@ -19,6 +19,6 @@ protected NodeValue exec(Node arg, FunctionEnv env) {
if(arg == null || !arg.isLiteral()) {
throw new ExprEvalException("Argument must be a (string) literal");
}
return NodeValue.makeBoolean(LangTag.check(arg.getLiteralLexicalForm()));
return NodeValue.makeBoolean(LangTagX.checkLanguageTag(arg.getLiteralLexicalForm()));
}
}
4 changes: 2 additions & 2 deletions src/main/java/org/topbraid/shacl/validation/java/PatternConstraintExecutor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import java.util.regex.Pattern;

import org.apache.jena.rdf.model.RDFNode;
import org.apache.jena.sparql.expr.RegexJava;
import org.apache.jena.sparql.expr.RegexEngine;
import org.apache.jena.sparql.expr.nodevalue.NodeFunctions;
import org.topbraid.jenax.util.JenaUtil;
import org.topbraid.shacl.engine.Constraint;
Expand All @@ -29,7 +29,7 @@ class PatternConstraintExecutor extends AbstractNativeConstraintExecutor {
PatternConstraintExecutor(Constraint constraint) {
flagsStr = JenaUtil.getStringProperty(constraint.getShapeResource(), SH.flags);
patternString = JenaUtil.getStringProperty(constraint.getShapeResource(), SH.pattern);
int flags = RegexJava.makeMask(flagsStr);
int flags = RegexEngine.RegexJava.makeMask(flagsStr);
if (flagsStr != null && flagsStr.contains("q")) {
patternString = Pattern.quote(patternString);
}
Expand Down