This is an automated email from the ASF dual-hosted git repository.
andy pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/jena.git
The following commit(s) were added to refs/heads/main by this push:
new 332b337019 Update use of 'RDF-star' name and terminology
332b337019 is described below
commit 332b337019411783e39cdaed02093af6a1ddda02
Author: Andy Seaborne <[email protected]>
AuthorDate: Fri Dec 19 09:53:18 2025 +0000
Update use of 'RDF-star' name and terminology
---
jena-arq/src/main/java/org/apache/jena/query/Syntax.java | 2 +-
.../main/java/org/apache/jena/riot/lang/LangTurtleBase.java | 5 ++---
.../src/main/java/org/apache/jena/riot/lang/ReaderTriX.java | 2 +-
.../java/org/apache/jena/riot/rowset/rw/JSONResultsKW.java | 6 +++---
.../src/main/java/org/apache/jena/riot/system/Checker.java | 4 ++--
.../java/org/apache/jena/riot/system/ParserProfile.java | 6 +++---
.../java/org/apache/jena/riot/tokens/TokenizerText.java | 4 ++--
.../main/java/org/apache/jena/riot/writer/TurtleShell.java | 4 ++--
.../src/main/java/org/apache/jena/sparql/ARQConstants.java | 3 ---
.../main/java/org/apache/jena/sparql/engine/main/QC.java | 2 +-
.../jena/sparql/engine/main/solver/PatternMatchData.java | 4 ++--
.../org/apache/jena/sparql/engine/main/solver/RX_PG.java | 6 ++++--
.../apache/jena/sparql/engine/main/solver/SolverLib.java | 8 ++++----
.../apache/jena/sparql/engine/main/solver/SolverRX3.java | 7 +++----
.../apache/jena/sparql/engine/main/solver/SolverRX4.java | 4 ++--
.../jena/sparql/engine/main/solver/StageMatchData.java | 4 ++--
.../jena/sparql/engine/main/solver/StageMatchTriple.java | 4 ++--
.../main/java/org/apache/jena/sparql/expr/ValueSpace.java | 2 +-
.../java/org/apache/jena/sparql/function/scripting/NV.java | 1 -
jena-arq/src/main/java/org/apache/jena/sparql/sse/SSE.java | 2 --
jena-arq/src/main/java/org/apache/jena/sparql/sse/Tags.java | 2 +-
jena-arq/src/main/java/org/apache/jena/system/RDFStar.java | 2 +-
.../apache/jena/arq/junit/sparql/tests/SparqlTestLib.java | 3 ---
.../java/org/apache/jena/rdf12/TestSPARQL12Results.java | 2 +-
.../java/org/apache/jena/rdf12/parse/TS_RDFStar_Parse.java | 9 ++++-----
...{TestNQuadsStarParse.java => TestNQuadsTripleTerms.java} | 4 ++--
...tNTriplesStarParse.java => TestNTriplesTripleTerms.java} | 4 ++--
.../java/org/apache/jena/rdf12/parse/TestSPARQL12Parse.java | 2 --
...TestTrigStarParse.java => TestTrigParseTripleTerms.java} | 4 ++--
.../org/apache/jena/rdf12/parse/TestTurtleStarParse.java | 2 +-
.../test/java/org/apache/jena/riot/lang/TestTriXReader.java | 1 -
.../java/org/apache/jena/riot/tokens/TestTokenizerText.java | 5 -----
.../java/org/apache/jena/sparql/expr/TestExpressions2.java | 1 -
.../org/apache/jena/sparql/util/iso/TestIsoMatcher.java | 1 -
.../java/org/apache/jena/system/TestRDFStarTranslation.java | 2 +-
.../testing/ARQ/{RDF-star/Other => OtherSystems}/README | 0
.../Other => OtherSystems}/alternate-results-1.srj | 0
.../Other => OtherSystems}/alternate-results-2.srj | 0
.../src/main/java/org/apache/jena/enhanced/EnhNode.java | 2 +-
jena-core/src/main/java/org/apache/jena/graph/Graph.java | 4 ++--
jena-core/src/main/java/org/apache/jena/graph/Node.java | 6 +++---
.../src/main/java/org/apache/jena/graph/NodeFactory.java | 4 ++--
.../src/main/java/org/apache/jena/graph/Node_Triple.java | 2 +-
.../main/java/org/apache/jena/fuseki/main/FusekiServer.java | 2 +-
.../spatial/index/v2/KryoRegistratorSpatialIndexV2.java | 2 +-
.../java/org/apache/jena/tdb1/solver/PatternMatchTDB1.java | 7 ++-----
.../src/main/java/org/apache/jena/tdb1/solver/SolverRX.java | 8 ++++----
.../org/apache/jena/tdb1/store/nodetable/DecoderSSE.java | 2 +-
.../java/org/apache/jena/tdb2/solver/PatternMatchTDB2.java | 13 ++++++-------
.../src/main/java/org/apache/jena/tdb2/solver/SolverRX.java | 9 +++++----
50 files changed, 81 insertions(+), 104 deletions(-)
diff --git a/jena-arq/src/main/java/org/apache/jena/query/Syntax.java
b/jena-arq/src/main/java/org/apache/jena/query/Syntax.java
index 0f803bc7ea..b3c83962cd 100644
--- a/jena-arq/src/main/java/org/apache/jena/query/Syntax.java
+++ b/jena-arq/src/main/java/org/apache/jena/query/Syntax.java
@@ -31,7 +31,7 @@ public class Syntax extends Symbol {
/** The syntax that the SPARQL 1.1 working group has defined. */
public static final Syntax syntaxSPARQL_11 = new
Syntax("http://jena.hpl.hp.com/2003/07/query/SPARQL_11";);
- /** The syntax that is SPARQL 1.2 from the RDF-star working group. */
+ /** The syntax that is SPARQL 1.2 */
public static final Syntax syntaxSPARQL_12 = new
Syntax("http://jena.hpl.hp.com/2003/07/query/SPARQL_12";);
/** The query syntax for extended SPARQL. */
diff --git
a/jena-arq/src/main/java/org/apache/jena/riot/lang/LangTurtleBase.java
b/jena-arq/src/main/java/org/apache/jena/riot/lang/LangTurtleBase.java
index 3af05be580..d5e31bf425 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/lang/LangTurtleBase.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/lang/LangTurtleBase.java
@@ -500,7 +500,6 @@ public abstract class LangTurtleBase extends LangBase {
// is at least one predicate /object.
// Method triplesNodeCompound ()-> triplesBlankNode(subject)
// can cope with zero length, covering grammar token ANON and rule
[7] predicateObjectList cases
- // But here, in RDF-star, only [] is legal.
// XXX Generalize and reuse in Reifier.
// []
@@ -515,7 +514,7 @@ public abstract class LangTurtleBase extends LangBase {
// Single token terms
if ( ! lookingAt(NODE) )
- exception(peekToken(), "Bad %s in RDF-star triple: %s", posnLabel,
peekToken().text());
+ exception(peekToken(), "Bad %s in triple term: %s", posnLabel,
peekToken().text());
Node node = node();
return node;
}
@@ -673,7 +672,7 @@ public abstract class LangTurtleBase extends LangBase {
Node tripleTerm = profile.createTripleTerm(subject, predicate,
object, tokenReifer.getLine(), tokenReifer.getColumn());
emit(reif, NodeConst.nodeReifies, tripleTerm);
- // RDF-star annotation syntax
+ // Annotation syntax
if ( lookingAt(L_ANN) ) {
Token tNext = nextToken();
if ( lookingAt(R_ANN) )
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/lang/ReaderTriX.java
b/jena-arq/src/main/java/org/apache/jena/riot/lang/ReaderTriX.java
index da67af96f6..aedcc79a8f 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/lang/ReaderTriX.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/lang/ReaderTriX.java
@@ -81,7 +81,7 @@ public class ReaderTriX implements ReaderRIOT {
<!ELEMENT typedLiteral (#PCDATA)>
<!ATTLIST typedLiteral datatype CDATA #REQUIRED>
- Extended for RDF-star.
+ Extended for triple terms
<!ELEMENT triple ((id|uri|plainLiteral|typedLiteral|triple), uri,
(id|uri|plainLiteral|typedLiteral|triple))>
*/
diff --git
a/jena-arq/src/main/java/org/apache/jena/riot/rowset/rw/JSONResultsKW.java
b/jena-arq/src/main/java/org/apache/jena/riot/rowset/rw/JSONResultsKW.java
index b5edefff66..cd53200f69 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/rowset/rw/JSONResultsKW.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/rowset/rw/JSONResultsKW.java
@@ -44,15 +44,15 @@ public class JSONResultsKW
public static final String kBnode = "bnode" ;
public static final String kBoolean = "boolean" ;
- // RDF-star Triple terms
+ // Triple terms
public static final String kTriple = "triple" ;
- // Alternative type for RDF-star triple terms.
+ // Alternative type for triple terms.
public static final String kStatement = "statement" ;
public static final String kSubject = "subject" ;
public static final String kPredicate = "predicate" ;
public static final String kProperty = "property" ;
public static final String kObject = "object" ;
- // RDF-star Triple terms - alternative keywords
+ // Triple terms - alternative keywords
public static final String kSubjectAlt = "s" ;
public static final String kPredicateAlt = "p" ;
public static final String kObjectAlt = "o" ;
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/system/Checker.java
b/jena-arq/src/main/java/org/apache/jena/riot/system/Checker.java
index 4c588b88c8..81ede9518f 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/system/Checker.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/system/Checker.java
@@ -340,7 +340,7 @@ public class Checker {
}
if ( subject == null || (!subject.isURI() && !subject.isBlank() &&
!subject.isTripleTerm()) ) {
- errorHandler(errorHandler).error("Subject is not a URI, blank node
or RDF-star triple term", line, col);
+ errorHandler(errorHandler).error("Subject is not a URI, blank node
or triple term", line, col);
rc = false;
}
if ( predicate == null || (!predicate.isURI()) ) {
@@ -348,7 +348,7 @@ public class Checker {
rc = false;
}
if ( object == null || (!object.isURI() && !object.isBlank() &&
!object.isLiteral() && !subject.isTripleTerm()) ) {
- errorHandler(errorHandler).error("Object is not a URI, blank node,
literal or RDF-star triple term", line, col);
+ errorHandler(errorHandler).error("Object is not a URI, blank node,
literal or triple term", line, col);
rc = false;
}
return rc;
diff --git
a/jena-arq/src/main/java/org/apache/jena/riot/system/ParserProfile.java
b/jena-arq/src/main/java/org/apache/jena/riot/system/ParserProfile.java
index b52fa54555..bfd7424506 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/system/ParserProfile.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/system/ParserProfile.java
@@ -74,13 +74,13 @@ public interface ParserProfile {
/** Create a fresh blank node */
public Node createBlankNode(Node scope, long line, long col);
- /** Create a triple term (RDF-star) */
+ /** Create a triple term (RDF-1.2) */
public Node createTripleTerm(Node subject, Node predicate, Node object,
long line, long col);
- /** Create a triple node (RDF-star) */
+ /** Create a triple node (RDF-1.2) */
public Node createTripleTerm(Triple triple, long line, long col);
- /** Create a graph node. This is an N3-formula and not named graphs */
+ /** Create a graph node. This is an N3-formula, not a named graph. */
public Node createGraphNode(Graph graph, long line, long col);
/**
diff --git
a/jena-arq/src/main/java/org/apache/jena/riot/tokens/TokenizerText.java
b/jena-arq/src/main/java/org/apache/jena/riot/tokens/TokenizerText.java
index 1750f84b97..1ec209025d 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/tokens/TokenizerText.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/tokens/TokenizerText.java
@@ -442,7 +442,7 @@ public final class TokenizerText implements Tokenizer
case CH_SEMICOLON: reader.readChar();
token.setType(TokenType.SEMICOLON); /*token.setImage(CH_SEMICOLON);*/ return
token;
case CH_COMMA: reader.readChar();
token.setType(TokenType.COMMA); /*token.setImage(CH_COMMA);*/ return token;
- // {| for RDF-star annotation syntax.
+ // {| for RDF-1.2 annotation syntax.
// case CH_LBRACE: reader.readChar();
token.setType(TokenType.LBRACE); /*token.setImage(CH_LBRACE);*/ return token;
case CH_LBRACE: {
reader.readChar();
@@ -490,7 +490,7 @@ public final class TokenizerText implements Tokenizer
case CH_RSLASH: reader.readChar();
token.setType(TokenType.RSLASH); /*token.setImage(CH_RSLASH);*/ return token;
// case CH_VBAR: reader.readChar();
token.setType(TokenType.VBAR); /*token.setImage(CH_VBAR);*/ return token;
- // |} for RDF-star annotation syntax.
+ // |} for RDF-1.2 annotation syntax.
case CH_VBAR: {
reader.readChar();
int chPeek = reader.peekChar();
diff --git
a/jena-arq/src/main/java/org/apache/jena/riot/writer/TurtleShell.java
b/jena-arq/src/main/java/org/apache/jena/riot/writer/TurtleShell.java
index 161dd24252..20da68b1be 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/writer/TurtleShell.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/writer/TurtleShell.java
@@ -840,7 +840,7 @@ public abstract class TurtleShell {
* triple term must refer to a triple in the graph so blank node
used elsewhere.)
*/
private void findBNodesSyntax1() {
- // Set of all bnodes used into triple terms (RDF-star)
+ // Set of all bnodes used into triple terms
Set<Node> blankNodesInTripleTerms = new HashSet<>();
// Nodes known not to meet the requirement.
Set<Node> rejects = new HashSet<>();
@@ -1036,7 +1036,7 @@ public abstract class TurtleShell {
// some other triple. Turtle does not allow free standing (... ) .
// so write as a predicateObjectList for one element.
// Later:
- // RDF-star does not allow list syntax in quoted triples.
+ // Triple terms do not allow list syntax in quoted triples.
// (All that can go there are RDF terms).
// so write the head as a labelled bnode and the rest as a list.
private boolean writeRemainingFreeLists(boolean somethingWritten) {
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/ARQConstants.java
b/jena-arq/src/main/java/org/apache/jena/sparql/ARQConstants.java
index e3c0cf0a5b..3d7c39b12a 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/ARQConstants.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/ARQConstants.java
@@ -209,9 +209,6 @@ public class ARQConstants
public static final String allocPathVariables =
allocVarAnonMarker+"P" ; // PathCompiler
public static final String allocQueryVariables = allocVarMarker ;
// Query
- /** Marker for RDF-star variables */
- public static final String allocVarTripleTerm = "~";
// RX, SolverRX
-
public static final String allocParserAnonVars = allocVarAnonMarker ;
// LabelToModeMap
// SSE
public static final String allocSSEUnamedVars = "_" ;
// ParseHandlerPlain - SSE token "?" - legal SPARQL
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/engine/main/QC.java
b/jena-arq/src/main/java/org/apache/jena/sparql/engine/main/QC.java
index 2cb4fb6d2a..93e847dcbb 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/engine/main/QC.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/engine/main/QC.java
@@ -64,7 +64,7 @@ public class QC
}
/**
- * Execute a triple pattern - top level variables only (no variables in
RDF-star triple terms).
+ * Execute a triple pattern - top level variables only (no variables in
RDF triple terms).
* This is data access to asserted triples.
*/
public static QueryIterator executeFlat(QueryIterator input, Triple
pattern, ExecutionContext execCxt) {
diff --git
a/jena-arq/src/main/java/org/apache/jena/sparql/engine/main/solver/PatternMatchData.java
b/jena-arq/src/main/java/org/apache/jena/sparql/engine/main/solver/PatternMatchData.java
index 45b8b025b8..dd76050195 100644
---
a/jena-arq/src/main/java/org/apache/jena/sparql/engine/main/solver/PatternMatchData.java
+++
b/jena-arq/src/main/java/org/apache/jena/sparql/engine/main/solver/PatternMatchData.java
@@ -54,7 +54,7 @@ public class PatternMatchData {
List<Abortable> killList = new ArrayList<>();
for ( Triple triple : triples ) {
- // Plain, no RDF-star
+ // Plain, no RDF triple terms.
//chain = StageMatchTriple.accessTriple(chain, graph, triple,
filter, execCxt);
// [Match] Missing filter.
@@ -93,7 +93,7 @@ public class PatternMatchData {
List<Abortable> killList = new ArrayList<>();
for ( Triple triple : triples ) {
- // Plain - no RDF-star.
+ // Plain - no triple terms with variables.
//chain = StageMatchData.accessQuad(chain, graphNode, triple,
filter, anyGraph, execCxt);
// [Match] Missing filter.
diff --git
a/jena-arq/src/main/java/org/apache/jena/sparql/engine/main/solver/RX_PG.java
b/jena-arq/src/main/java/org/apache/jena/sparql/engine/main/solver/RX_PG.java
index b1e67811e4..df3818f237 100644
---
a/jena-arq/src/main/java/org/apache/jena/sparql/engine/main/solver/RX_PG.java
+++
b/jena-arq/src/main/java/org/apache/jena/sparql/engine/main/solver/RX_PG.java
@@ -34,7 +34,7 @@ import org.apache.jena.sparql.util.Context;
* For reference only: this code uses the triple index for matching and it is
PG mode.
*/
/*
- * Solver library for RDF-star.
+ * Solver library for RDF-star (<em>not</em> RDF 1.2)
* <p>
* There are two entry points.
* <p>
@@ -48,6 +48,8 @@ import org.apache.jena.sparql.util.Context;
*/
/*ARCHIVE*/ class RX_PG {
+ private static final String allocVarTripleTerm = "~";
+
// ---- PG mode ----
// This code implements RDF-star in "PG mode" (the embedded triple also
exists as
// an asserted triple in the same graph). With this assumption, pattern
matching
@@ -176,7 +178,7 @@ import org.apache.jena.sparql.util.Context;
Context context = execCxt.getContext();
VarAlloc varAlloc = VarAlloc.get(context,
ARQConstants.sysVarAllocRDFStar);
if ( varAlloc == null ) {
- varAlloc = new VarAlloc(ARQConstants.allocVarTripleTerm);
+ varAlloc = new VarAlloc(allocVarTripleTerm);
context.set(ARQConstants.sysVarAllocRDFStar, varAlloc);
}
return varAlloc;
diff --git
a/jena-arq/src/main/java/org/apache/jena/sparql/engine/main/solver/SolverLib.java
b/jena-arq/src/main/java/org/apache/jena/sparql/engine/main/solver/SolverLib.java
index a6cc359093..627ca36f90 100644
---
a/jena-arq/src/main/java/org/apache/jena/sparql/engine/main/solver/SolverLib.java
+++
b/jena-arq/src/main/java/org/apache/jena/sparql/engine/main/solver/SolverLib.java
@@ -64,8 +64,8 @@ public class SolverLib {
}
/**
- * Test whether a triple has a triple term (RDF-star) as one of its
components
- * and that embedded triple term has variables.
+ * Test whether a triple has a triple term as one of its components
+ * and that the nest triple term has variables.
*/
public static boolean tripleHasEmbTripleWithVars(Triple triple) {
return isTripleTermWithVars(triple.getSubject())
@@ -74,8 +74,8 @@ public class SolverLib {
}
/**
- * Test whether a quad has a triple term (RDF-star) as one of its
components
- * and that embedded triple term has variables.
+ * Test whether a quad has a triple term as one of its components
+ * and that triple term has variables.
*/
public static boolean quadHasEmbTripleWithVars(Quad quad) {
return isTripleTermWithVars(quad.getSubject())
diff --git
a/jena-arq/src/main/java/org/apache/jena/sparql/engine/main/solver/SolverRX3.java
b/jena-arq/src/main/java/org/apache/jena/sparql/engine/main/solver/SolverRX3.java
index 8534bcbf51..ff5683357b 100644
---
a/jena-arq/src/main/java/org/apache/jena/sparql/engine/main/solver/SolverRX3.java
+++
b/jena-arq/src/main/java/org/apache/jena/sparql/engine/main/solver/SolverRX3.java
@@ -36,7 +36,7 @@ import org.apache.jena.sparql.engine.binding.Binding;
import org.apache.jena.sparql.engine.binding.BindingBuilder;
import org.apache.jena.util.iterator.ExtendedIterator;
-/** RDF-star - triple form. Solve patterns when there is an embedded triple
with variables. */
+/** Solve patterns when there may be a triple term with variables. */
public class SolverRX3 {
/**
@@ -48,9 +48,9 @@ public class SolverRX3 {
public static Iterator<Binding> rdfStarTriple(Iterator<Binding> chain,
Triple tPattern, ExecutionContext execCxt) {
// Should all work without this trap for plain RDF.
if ( DATAPATH ) {
- // No variables inside <<>>
+ // No variables inside triple terms
if ( ! tripleHasEmbTripleWithVars(tPattern) )
- // No RDF-star : direct to data.
+ // direct to data.
return matchData(chain, tPattern, execCxt);
}
return rdfStarTripleMatch(chain, tPattern, execCxt);
@@ -94,7 +94,6 @@ public class SolverRX3 {
return r ? bb.build() : null;
}
- // Used in matching a triple in an embedded triple term.
/*package*/ static boolean bindTriple(BindingBuilder bb, Triple tData,
Triple tPattern) {
Node sPattern = tPattern.getSubject();
Node pPattern = tPattern.getPredicate();
diff --git
a/jena-arq/src/main/java/org/apache/jena/sparql/engine/main/solver/SolverRX4.java
b/jena-arq/src/main/java/org/apache/jena/sparql/engine/main/solver/SolverRX4.java
index 7c14490e28..a58be6209b 100644
---
a/jena-arq/src/main/java/org/apache/jena/sparql/engine/main/solver/SolverRX4.java
+++
b/jena-arq/src/main/java/org/apache/jena/sparql/engine/main/solver/SolverRX4.java
@@ -37,7 +37,7 @@ import org.apache.jena.sparql.engine.ExecutionContext;
import org.apache.jena.sparql.engine.binding.Binding;
import org.apache.jena.sparql.engine.binding.BindingBuilder;
-/** RDF-star - quad form. Solve patterns when there is an embedded triple with
variables. */
+/** Solve patterns when there may be a triple term with variables. */
public class SolverRX4 {
/**
@@ -55,7 +55,7 @@ public class SolverRX4 {
if ( DATAPATH ) {
if ( ! tripleHasEmbTripleWithVars(pattern) &&
(graphName == null || ! graphName.isTripleTerm() ) )
- // No variables inside <<>>
+ // No variables inside <<()>>
return matchDataQuad(chain, graphName, pattern, execCxt);
}
return rdfStarQuadSub(chain, graphName, pattern, execCxt);
diff --git
a/jena-arq/src/main/java/org/apache/jena/sparql/engine/main/solver/StageMatchData.java
b/jena-arq/src/main/java/org/apache/jena/sparql/engine/main/solver/StageMatchData.java
index 446c71b36f..0a37b291f3 100644
---
a/jena-arq/src/main/java/org/apache/jena/sparql/engine/main/solver/StageMatchData.java
+++
b/jena-arq/src/main/java/org/apache/jena/sparql/engine/main/solver/StageMatchData.java
@@ -37,8 +37,8 @@ import org.apache.jena.sparql.engine.binding.BindingFactory;
/**
* This is the data access step of quads and datasets.
* <p>
- * Plain matching - see {@link SolverRX4#rdfStarQuad} for matching with
variables
- * in RDF-star triple terms.
+ * Plain matching - see {@link SolverRX4#rdfStarQuad} for matching
+ * with variables in triple terms.
*/
public class StageMatchData {
diff --git
a/jena-arq/src/main/java/org/apache/jena/sparql/engine/main/solver/StageMatchTriple.java
b/jena-arq/src/main/java/org/apache/jena/sparql/engine/main/solver/StageMatchTriple.java
index 1a537cab2b..4180591cd3 100644
---
a/jena-arq/src/main/java/org/apache/jena/sparql/engine/main/solver/StageMatchTriple.java
+++
b/jena-arq/src/main/java/org/apache/jena/sparql/engine/main/solver/StageMatchTriple.java
@@ -38,8 +38,8 @@ import org.apache.jena.util.iterator.ExtendedIterator;
/**
* Triple version of {@link StageMatchData}. This goes directly to the graph.
* <p>
- * Plain matching - see {@link SolverRX3#rdfStarTriple} for matching with
variables
- * in RDF-star embedded triples.
+ * Plain matching - see {@link SolverRX3#rdfStarTriple}
+ * for matching with variables in triple terms.
*/
public class StageMatchTriple {
public static Iterator<Binding> accessTriple(Iterator<Binding> input,
Graph graph, Triple pattern,
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/expr/ValueSpace.java
b/jena-arq/src/main/java/org/apache/jena/sparql/expr/ValueSpace.java
index 8cbd552687..9ac375a2e7 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/expr/ValueSpace.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/expr/ValueSpace.java
@@ -101,7 +101,7 @@ public enum ValueSpace {
VSPACE_CDT_MAP(301),
VSPACE_SORTKEY(900),
- VSPACE_TRIPLE_TERM(999), // RDF-star : Last recognized value space.
+ VSPACE_TRIPLE_TERM(999), // Last recognized value space.
// Unknown RDF term value space.
VSPACE_UNKNOWN(6000),
diff --git
a/jena-arq/src/main/java/org/apache/jena/sparql/function/scripting/NV.java
b/jena-arq/src/main/java/org/apache/jena/sparql/function/scripting/NV.java
index b6904b5249..f5bb5e52ac 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/function/scripting/NV.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/function/scripting/NV.java
@@ -167,7 +167,6 @@ public class NV implements RDFJS {
if ( isLiteral() )
return "Literal";
if ( isTripleTerm() )
- // RDF-star embedded triple.
return "Triple";
return null;
}
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/sse/SSE.java
b/jena-arq/src/main/java/org/apache/jena/sparql/sse/SSE.java
index 18150f0c59..c664c6d2dc 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/sse/SSE.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/sse/SSE.java
@@ -74,8 +74,6 @@ import org.apache.jena.vocabulary.*;
* "()" and "[]" are interchangeable and used for visual effect. Expressions
are
* parsed and printed in prefix notation e.g. {@code (+ 1 ?x)}.
* <p>
- * RDF-star quoted triples are This mean "item.getNode"
- * <p>
* The operations are grouped into:
* <ul>
* <li>{@code parseTYPE} – parse a string to object of a specific kind.
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/sse/Tags.java
b/jena-arq/src/main/java/org/apache/jena/sparql/sse/Tags.java
index e78ff95da3..179b65be6e 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/sse/Tags.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/sse/Tags.java
@@ -246,7 +246,7 @@ public class Tags
public static final String tagSubject = "subject";
public static final String tagPredicate = "predicate";
public static final String tagObject = "object";
- // This the SPARQL function for RDF-star: TRIPLE(expr_s, expr_p, expr_o)
+ // This the SPARQL function TRIPLE(expr_s, expr_p, expr_o)
public static final String tagFnTriple = Tags.tagTriple;
public static final String tagIn = "in";
diff --git a/jena-arq/src/main/java/org/apache/jena/system/RDFStar.java
b/jena-arq/src/main/java/org/apache/jena/system/RDFStar.java
index deb60689da..cfb04ae1bc 100644
--- a/jena-arq/src/main/java/org/apache/jena/system/RDFStar.java
+++ b/jena-arq/src/main/java/org/apache/jena/system/RDFStar.java
@@ -38,7 +38,7 @@ import org.apache.jena.vocabulary.RDF;
* Library for RDF-star translation to and from reification form.
* There is one reification for each unique quoted triple term.
* This is especially important when decoding.
- * @deprecated Do not use this class. It is related to RDF-star Community
Group, not RDF 1.2.
+ * @deprecated Do NOT use this class. It is related to RDF-star Community
Group, not RDF 1.2.
*/
@Deprecated(forRemoval = true)
public class RDFStar {
diff --git
a/jena-arq/src/test/java/org/apache/jena/arq/junit/sparql/tests/SparqlTestLib.java
b/jena-arq/src/test/java/org/apache/jena/arq/junit/sparql/tests/SparqlTestLib.java
index 0af820b747..b31577abaf 100644
---
a/jena-arq/src/test/java/org/apache/jena/arq/junit/sparql/tests/SparqlTestLib.java
+++
b/jena-arq/src/test/java/org/apache/jena/arq/junit/sparql/tests/SparqlTestLib.java
@@ -149,14 +149,11 @@ class SparqlTestLib {
return def;
}
- // Allow *.rq is strictly SPARQL 1.1 tests.
- // but RDF-star test may fail.
protected static Syntax guessFileSyntax(String filename) {
// if ( filename.endsWith(".rq") )
// return Syntax.syntaxSPARQL_11;
// if ( filename.endsWith(".ru") )
// return Syntax.syntaxSPARQL_11;
-
return Syntax.guessFileSyntax(filename);
}
//
diff --git
a/jena-arq/src/test/java/org/apache/jena/rdf12/TestSPARQL12Results.java
b/jena-arq/src/test/java/org/apache/jena/rdf12/TestSPARQL12Results.java
index ac42ab0f33..0ae411e1ba 100644
--- a/jena-arq/src/test/java/org/apache/jena/rdf12/TestSPARQL12Results.java
+++ b/jena-arq/src/test/java/org/apache/jena/rdf12/TestSPARQL12Results.java
@@ -30,7 +30,7 @@ import org.apache.jena.sparql.resultset.ResultsReader;
*/
public class TestSPARQL12Results {
- private static String FILES = "testing/ARQ/RDF-star/Other/";
+ private static String FILES = "testing/ARQ/OtherSystems/";
// RDF4J format JSON results.
// It uses "s", "p" and "o" for the RDF term results.
diff --git
a/jena-arq/src/test/java/org/apache/jena/rdf12/parse/TS_RDFStar_Parse.java
b/jena-arq/src/test/java/org/apache/jena/rdf12/parse/TS_RDFStar_Parse.java
index a208f2d83b..000fb65b3e 100644
--- a/jena-arq/src/test/java/org/apache/jena/rdf12/parse/TS_RDFStar_Parse.java
+++ b/jena-arq/src/test/java/org/apache/jena/rdf12/parse/TS_RDFStar_Parse.java
@@ -23,11 +23,10 @@ import org.junit.platform.suite.api.Suite;
@Suite
@SelectClasses({
- // Old basic tests,
- // ** To be removed.
- TestNQuadsStarParse.class,
- TestNTriplesStarParse.class,
- TestTrigStarParse.class,
+ // ** To be removed?
+ TestNQuadsTripleTerms.class,
+ TestNTriplesTripleTerms.class,
+ TestTrigParseTripleTerms.class,
TestTurtleStarParse.class,
TestSPARQL12Parse.class
})
diff --git
a/jena-arq/src/test/java/org/apache/jena/rdf12/parse/TestNQuadsStarParse.java
b/jena-arq/src/test/java/org/apache/jena/rdf12/parse/TestNQuadsTripleTerms.java
similarity index 96%
rename from
jena-arq/src/test/java/org/apache/jena/rdf12/parse/TestNQuadsStarParse.java
rename to
jena-arq/src/test/java/org/apache/jena/rdf12/parse/TestNQuadsTripleTerms.java
index 63a9f24710..cfd2857266 100644
---
a/jena-arq/src/test/java/org/apache/jena/rdf12/parse/TestNQuadsStarParse.java
+++
b/jena-arq/src/test/java/org/apache/jena/rdf12/parse/TestNQuadsTripleTerms.java
@@ -31,9 +31,9 @@ import org.apache.jena.riot.system.StreamRDF;
import org.apache.jena.riot.system.StreamRDFLib;
/**
- * Basic parsing tests of RDF-star constructs for N-Quads
+ * Basic parsing tests of RDF triple term constructs for N-Quads
*/
-public class TestNQuadsStarParse {
+public class TestNQuadsTripleTerms {
private ErrorHandler silent =
ErrorHandlerFactory.errorHandlerStrictNoLogging;
private static StreamRDF sink = StreamRDFLib.sinkNull();
diff --git
a/jena-arq/src/test/java/org/apache/jena/rdf12/parse/TestNTriplesStarParse.java
b/jena-arq/src/test/java/org/apache/jena/rdf12/parse/TestNTriplesTripleTerms.java
similarity index 95%
rename from
jena-arq/src/test/java/org/apache/jena/rdf12/parse/TestNTriplesStarParse.java
rename to
jena-arq/src/test/java/org/apache/jena/rdf12/parse/TestNTriplesTripleTerms.java
index 070903910e..ef01ffef44 100644
---
a/jena-arq/src/test/java/org/apache/jena/rdf12/parse/TestNTriplesStarParse.java
+++
b/jena-arq/src/test/java/org/apache/jena/rdf12/parse/TestNTriplesTripleTerms.java
@@ -31,9 +31,9 @@ import org.apache.jena.riot.system.StreamRDF;
import org.apache.jena.riot.system.StreamRDFLib;
/**
- * Basic parsing tests of RDF-star constructs for N-Triples
+ * Basic parsing tests of triple terms
*/
-public class TestNTriplesStarParse {
+public class TestNTriplesTripleTerms {
private ErrorHandler silent =
ErrorHandlerFactory.errorHandlerStrictNoLogging;
private static StreamRDF sink = StreamRDFLib.sinkNull();
diff --git
a/jena-arq/src/test/java/org/apache/jena/rdf12/parse/TestSPARQL12Parse.java
b/jena-arq/src/test/java/org/apache/jena/rdf12/parse/TestSPARQL12Parse.java
index 8c0cb3b3a6..84d3fbba77 100644
--- a/jena-arq/src/test/java/org/apache/jena/rdf12/parse/TestSPARQL12Parse.java
+++ b/jena-arq/src/test/java/org/apache/jena/rdf12/parse/TestSPARQL12Parse.java
@@ -42,8 +42,6 @@ import org.apache.jena.sparql.core.BasicPattern;
import org.apache.jena.sys.JenaSystem;
import org.apache.jena.vocabulary.RDF;
-// RDF Star CG tests, converted to SPARQL 1.2
-
public class TestSPARQL12Parse {
static { JenaSystem.init(); }
diff --git
a/jena-arq/src/test/java/org/apache/jena/rdf12/parse/TestTrigStarParse.java
b/jena-arq/src/test/java/org/apache/jena/rdf12/parse/TestTrigParseTripleTerms.java
similarity index 96%
rename from
jena-arq/src/test/java/org/apache/jena/rdf12/parse/TestTrigStarParse.java
rename to
jena-arq/src/test/java/org/apache/jena/rdf12/parse/TestTrigParseTripleTerms.java
index 2000db7755..c165ff4218 100644
--- a/jena-arq/src/test/java/org/apache/jena/rdf12/parse/TestTrigStarParse.java
+++
b/jena-arq/src/test/java/org/apache/jena/rdf12/parse/TestTrigParseTripleTerms.java
@@ -32,9 +32,9 @@ import org.apache.jena.riot.system.StreamRDFLib;
/**
- * Test parsing of RDF-star constructs for TriG.
+ * Test parsing of triple term constructs for TriG.
*/
-public class TestTrigStarParse {
+public class TestTrigParseTripleTerms {
private ErrorHandler silent =
ErrorHandlerFactory.errorHandlerStrictNoLogging;
private static StreamRDF sink = StreamRDFLib.sinkNull();
diff --git
a/jena-arq/src/test/java/org/apache/jena/rdf12/parse/TestTurtleStarParse.java
b/jena-arq/src/test/java/org/apache/jena/rdf12/parse/TestTurtleStarParse.java
index e4fa20f2a9..67add7c7e7 100644
---
a/jena-arq/src/test/java/org/apache/jena/rdf12/parse/TestTurtleStarParse.java
+++
b/jena-arq/src/test/java/org/apache/jena/rdf12/parse/TestTurtleStarParse.java
@@ -32,7 +32,7 @@ import org.apache.jena.riot.system.StreamRDF;
import org.apache.jena.riot.system.StreamRDFLib;
/**
- * Test parsing of RDF-star constructs for Turtle.
+ * Test parsing of occurrences and triple terms in Turtle.
*/
public class TestTurtleStarParse {
diff --git
a/jena-arq/src/test/java/org/apache/jena/riot/lang/TestTriXReader.java
b/jena-arq/src/test/java/org/apache/jena/riot/lang/TestTriXReader.java
index cf94ea7ccc..32921a024b 100644
--- a/jena-arq/src/test/java/org/apache/jena/riot/lang/TestTriXReader.java
+++ b/jena-arq/src/test/java/org/apache/jena/riot/lang/TestTriXReader.java
@@ -74,7 +74,6 @@ public class TestTriXReader {
Arguments.of(DIR+"/trix-w3c-1.trix", DIR+"/trix-w3c-1.nq"),
Arguments.of(DIR+"/trix-w3c-2.trix", DIR+"/trix-w3c-2.nq"),
- // RDF-star
Arguments.of(DIR+"/trix-star-1.trix", DIR+"/trix-star-1.nq"),
Arguments.of(DIR+"/trix-star-2.trix", DIR+"/trix-star-2.nq")
);
diff --git
a/jena-arq/src/test/java/org/apache/jena/riot/tokens/TestTokenizerText.java
b/jena-arq/src/test/java/org/apache/jena/riot/tokens/TestTokenizerText.java
index 2b1abd8bfd..83ad9ea1b1 100644
--- a/jena-arq/src/test/java/org/apache/jena/riot/tokens/TestTokenizerText.java
+++ b/jena-arq/src/test/java/org/apache/jena/riot/tokens/TestTokenizerText.java
@@ -801,11 +801,6 @@ public class TestTokenizerText {
tokenizeAndTestExact("?" + ARQConstants.allocVarAnonMarker + "0",
TokenType.VAR, ARQConstants.allocVarAnonMarker + "0");
}
- @Test
- public void tokenUnit_var9() {
- tokenizeAndTestExact("?" + ARQConstants.allocVarTripleTerm + "9",
TokenType.VAR, ARQConstants.allocVarTripleTerm + "9");
- }
-
@Test
public void tokenUnit_hex1() {
tokenizeAndTestExact("0xABC", TokenType.HEX, "0xABC");
diff --git
a/jena-arq/src/test/java/org/apache/jena/sparql/expr/TestExpressions2.java
b/jena-arq/src/test/java/org/apache/jena/sparql/expr/TestExpressions2.java
index 718bd8083d..06fd93c3cc 100644
--- a/jena-arq/src/test/java/org/apache/jena/sparql/expr/TestExpressions2.java
+++ b/jena-arq/src/test/java/org/apache/jena/sparql/expr/TestExpressions2.java
@@ -231,7 +231,6 @@ public class TestExpressions2
@Test public void term_constructor_strlang_02() {
assertThrows(ExprEvalException.class, ()-> eval("STRLANG(<http://example/>,
'en') = 'abc'@en") ); }
@Test public void term_constructor_strlang_03() {
assertThrows(ExprEvalException.class, ()-> eval("STRLANG('abc'@en, 'en') =
'abc'@en") ); }
- // RDF-star
@Test public void triple_term_cmp_01()
{ eval("<<(<ex:s> <ex:p> <ex:p>)>> = <<(<ex:s> <ex:p> <ex:p>)>>"); }
diff --git
a/jena-arq/src/test/java/org/apache/jena/sparql/util/iso/TestIsoMatcher.java
b/jena-arq/src/test/java/org/apache/jena/sparql/util/iso/TestIsoMatcher.java
index e378630a23..ab45f13db0 100644
--- a/jena-arq/src/test/java/org/apache/jena/sparql/util/iso/TestIsoMatcher.java
+++ b/jena-arq/src/test/java/org/apache/jena/sparql/util/iso/TestIsoMatcher.java
@@ -154,7 +154,6 @@ public class TestIsoMatcher
"(<_:a> :p1 <_:b>) (<_:b> :p2
<_:a>)",
true); }
- // RDF-star terms
@Test public void iso_graph_40() { testGraphIso("(<<(:s :p :o)>> :q1 :z1)
(<<(_:a :p :o)>> :q2 :z2)",
"(<<(_:a :p :o)>> :q2 :z2)
(<<(:s :p :o)>> :q1 :z1)",
true); }
diff --git
a/jena-arq/src/test/java/org/apache/jena/system/TestRDFStarTranslation.java
b/jena-arq/src/test/java/org/apache/jena/system/TestRDFStarTranslation.java
index 810645cb64..2b804ce5aa 100644
--- a/jena-arq/src/test/java/org/apache/jena/system/TestRDFStarTranslation.java
+++ b/jena-arq/src/test/java/org/apache/jena/system/TestRDFStarTranslation.java
@@ -36,6 +36,7 @@ import org.apache.jena.sparql.sse.SSE;
import org.apache.jena.sparql.util.IsoMatcher;
import org.apache.jena.vocabulary.RDF;
+/** This is RDF-star - the pre-RDF-1.2 work. */
@SuppressWarnings("removal")
public class TestRDFStarTranslation {
@@ -56,7 +57,6 @@ public class TestRDFStarTranslation {
}
@Test public void rdfx_basic() {
- // No RDF-star triple terms - no change.
Graph g = data("(graph (:s :p :o))");
Graph g1 = RDFStar.encodeAsRDF(g);
diff --git a/jena-arq/testing/ARQ/RDF-star/Other/README
b/jena-arq/testing/ARQ/OtherSystems/README
similarity index 100%
rename from jena-arq/testing/ARQ/RDF-star/Other/README
rename to jena-arq/testing/ARQ/OtherSystems/README
diff --git a/jena-arq/testing/ARQ/RDF-star/Other/alternate-results-1.srj
b/jena-arq/testing/ARQ/OtherSystems/alternate-results-1.srj
similarity index 100%
rename from jena-arq/testing/ARQ/RDF-star/Other/alternate-results-1.srj
rename to jena-arq/testing/ARQ/OtherSystems/alternate-results-1.srj
diff --git a/jena-arq/testing/ARQ/RDF-star/Other/alternate-results-2.srj
b/jena-arq/testing/ARQ/OtherSystems/alternate-results-2.srj
similarity index 100%
rename from jena-arq/testing/ARQ/RDF-star/Other/alternate-results-2.srj
rename to jena-arq/testing/ARQ/OtherSystems/alternate-results-2.srj
diff --git a/jena-core/src/main/java/org/apache/jena/enhanced/EnhNode.java
b/jena-core/src/main/java/org/apache/jena/enhanced/EnhNode.java
index 11cfcfcca0..be61665c92 100644
--- a/jena-core/src/main/java/org/apache/jena/enhanced/EnhNode.java
+++ b/jena-core/src/main/java/org/apache/jena/enhanced/EnhNode.java
@@ -84,7 +84,7 @@ public class EnhNode extends Polymorphic<RDFNode> implements
FrontsNode
}
/**
- An enhanced node is a statement resource iff its underlying node is a
triple term (RDF-star).
+ An enhanced node is a statement resource iff its underlying node is a
triple term (RDF 1.2).
*/
public final boolean isStatementTerm() {
return node.isTripleTerm();
diff --git a/jena-core/src/main/java/org/apache/jena/graph/Graph.java
b/jena-core/src/main/java/org/apache/jena/graph/Graph.java
index 48d2a9cd77..b64b248715 100644
--- a/jena-core/src/main/java/org/apache/jena/graph/Graph.java
+++ b/jena-core/src/main/java/org/apache/jena/graph/Graph.java
@@ -156,8 +156,8 @@ public interface Graph {
* </a>
*
* Note: this implementation does not handle correctly blank nodes in
- * quoted triples (RDF-star). If you need to work with RDF-star,
- * use the slower implementation in
+ * triple terms (RDF 1.2). If you need to work with triple terms
+ * use the potentially slower implementation in
* {@code org.apache.jena.sparql.util.IsoMatcher}.
*
* @param g Compare against this.
diff --git a/jena-core/src/main/java/org/apache/jena/graph/Node.java
b/jena-core/src/main/java/org/apache/jena/graph/Node.java
index 80d5ceb4bd..007b13b51f 100644
--- a/jena-core/src/main/java/org/apache/jena/graph/Node.java
+++ b/jena-core/src/main/java/org/apache/jena/graph/Node.java
@@ -116,7 +116,7 @@ public abstract class Node implements Serializable {
{ return false; }
/**
- * Answer true iff this node is an "triple node" (RDF-star)
+ * Answer true iff this node is a triple term
*/
public boolean isTripleTerm()
{ return false; }
@@ -223,9 +223,9 @@ public abstract class Node implements Serializable {
public String getName()
{ throw new UnsupportedOperationException( "this (" + this.getClass() + ")
is not a variable node" ); }
- /** Get the triple for a triple term (embedded triple), otherwise die
horribly */
+ /** Get the triple for a triple term, otherwise die horribly */
public Triple getTriple()
- { throw new UnsupportedOperationException( "this (" + this.getClass() + ")
is not a embedded triple node" ); }
+ { throw new UnsupportedOperationException( "this (" + this.getClass() + ")
is not a triple term node" ); }
/** Get the graph for a graph term (N3 formula), otherwise die horribly */
public Graph getGraph()
diff --git a/jena-core/src/main/java/org/apache/jena/graph/NodeFactory.java
b/jena-core/src/main/java/org/apache/jena/graph/NodeFactory.java
index c919787098..70bd1a12f0 100644
--- a/jena-core/src/main/java/org/apache/jena/graph/NodeFactory.java
+++ b/jena-core/src/main/java/org/apache/jena/graph/NodeFactory.java
@@ -303,12 +303,12 @@ public class NodeFactory {
return new Node_Literal(LiteralLabelFactory.createByValue(value,
dtype));
}
- /** Create a triple node (RDF-star) */
+ /** Create a triple term */
public static Node createTripleTerm(Node s, Node p, Node o) {
return new Node_Triple(s, p, o);
}
- /** Create a triple term (RDF-star) */
+ /** Create a triple term */
public static Node createTripleTerm(Triple triple) {
return new Node_Triple(triple);
}
diff --git a/jena-core/src/main/java/org/apache/jena/graph/Node_Triple.java
b/jena-core/src/main/java/org/apache/jena/graph/Node_Triple.java
index 881e27651e..f8b7d80c3a 100644
--- a/jena-core/src/main/java/org/apache/jena/graph/Node_Triple.java
+++ b/jena-core/src/main/java/org/apache/jena/graph/Node_Triple.java
@@ -22,7 +22,7 @@ import java.util.Objects;
import org.apache.jena.shared.PrefixMapping;
-/** RDF triples as RDF terms for RDF-star quoted triples. */
+/** RDF triples as triple terms (RDF-1.2) */
public class Node_Triple extends Node {
private final Triple triple;
diff --git
a/jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/main/FusekiServer.java
b/jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/main/FusekiServer.java
index df2e6fdc54..3672084eae 100644
---
a/jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/main/FusekiServer.java
+++
b/jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/main/FusekiServer.java
@@ -85,7 +85,7 @@ import org.slf4j.Logger;
* This is a Fuseki server running with a pre-configured set
* of datasets and services.
* <p>
- * To create a embedded sever, use {@link FusekiServer} ({@link #make} is a
packaging
+ * To create a embedded server, use {@link FusekiServer} ({@link #make} is a
packaging
* of a call to {@link FusekiServer} for the case of one dataset, responding to
* localhost only).
* <p>
diff --git
a/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/index/v2/KryoRegistratorSpatialIndexV2.java
b/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/index/v2/KryoRegistratorSpatialIndexV2.java
index 77d82d0ade..b2f41f08be 100644
---
a/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/index/v2/KryoRegistratorSpatialIndexV2.java
+++
b/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/index/v2/KryoRegistratorSpatialIndexV2.java
@@ -84,7 +84,7 @@ public class KryoRegistratorSpatialIndexV2 {
/**
* The default serializer for {@link Triple}.
- * Must be registered in addition to node serializers for RDF-Star
(triples-in-nodes).
+ * Must be registered in addition to node serializers for triple terms.
*/
public static void registerTripleSerializer(Kryo kryo) {
kryo.register(Triple.class, new TripleSerializer());
diff --git
a/jena-tdb1/src/main/java/org/apache/jena/tdb1/solver/PatternMatchTDB1.java
b/jena-tdb1/src/main/java/org/apache/jena/tdb1/solver/PatternMatchTDB1.java
index d9597d729f..1b95fd9fc3 100644
--- a/jena-tdb1/src/main/java/org/apache/jena/tdb1/solver/PatternMatchTDB1.java
+++ b/jena-tdb1/src/main/java/org/apache/jena/tdb1/solver/PatternMatchTDB1.java
@@ -46,7 +46,6 @@ import
org.apache.jena.tdb1.store.nodetupletable.NodeTupleTable;
/**
* Entry to the basic pattern solver for TDB1.
- * {@link SolverRX} is the single stage and include RDF-star.
*/
public class PatternMatchTDB1 {
@@ -111,10 +110,8 @@ public class PatternMatchTDB1 {
else
// 4-tuples.
patternTuple = TupleFactory.create4(graphNode,
triple.getSubject(), triple.getPredicate(), triple.getObject());
- // Plain RDF, no RDF-star
- // chain = solve(nodeTupleTable, tuple, anyGraph, chain, filter,
execCxt)
- // ;
- // RDF-star SA
+ // Plain - no triple terms with variables.
+ // chain = solve(nodeTupleTable, tuple, anyGraph, chain, filter,
execCxt);
chain = matchQuadPattern(chain, graphNode, triple, nodeTupleTable,
patternTuple, anyGraph, filter, execCxt);
chain = makeAbortable(chain, killList, execCxt.getCancelSignal());
diff --git a/jena-tdb1/src/main/java/org/apache/jena/tdb1/solver/SolverRX.java
b/jena-tdb1/src/main/java/org/apache/jena/tdb1/solver/SolverRX.java
index e956878200..7c967e91e3 100644
--- a/jena-tdb1/src/main/java/org/apache/jena/tdb1/solver/SolverRX.java
+++ b/jena-tdb1/src/main/java/org/apache/jena/tdb1/solver/SolverRX.java
@@ -45,10 +45,10 @@ import org.apache.jena.tdb1.store.NodeId;
import org.apache.jena.tdb1.store.nodetable.NodeTable;
import org.apache.jena.tdb1.store.nodetupletable.NodeTupleTable;
-/** RDF-star processing for matching an individual triple/quad pattern. */
+/** Processing for matching an individual triple/quad pattern including triple
terms with variables. */
public class SolverRX {
/**
- * Control whether to check for embedded triple terms with variables or to
act in a direct manner.
+ * Control whether to check for triple terms with variables or to act in a
direct manner.
* <p>
* This constant is not public API. It is exposed only so integration
testing can
* check the value for a release build.
@@ -62,11 +62,11 @@ public class SolverRX {
boolean anyGraph,
Predicate<Tuple<NodeId>> filter, ExecutionContext execCxt) {
if ( DATAPATH ) {
if ( ! tripleHasEmbTripleWithVars(tPattern) )
- // No RDF-star <<>> with variables which are wildcards at this
point.
+ // No RDF triple terms <<()>> with variables which are
wildcards at this point.
return StageMatchTuple.access(nodeTupleTable, chain,
patternTuple, filter, anyGraph, execCxt);
}
- // RDF-star <<>> with wildcards.
+ // RDF triple terms <<()>> with wildcards.
// This path should work regardless.
boolean isTriple = (patternTuple.len() == 3);
diff --git
a/jena-tdb1/src/main/java/org/apache/jena/tdb1/store/nodetable/DecoderSSE.java
b/jena-tdb1/src/main/java/org/apache/jena/tdb1/store/nodetable/DecoderSSE.java
index 9444f05564..d82cc28361 100644
---
a/jena-tdb1/src/main/java/org/apache/jena/tdb1/store/nodetable/DecoderSSE.java
+++
b/jena-tdb1/src/main/java/org/apache/jena/tdb1/store/nodetable/DecoderSSE.java
@@ -33,7 +33,7 @@ import org.apache.jena.riot.tokens.TokenizerText;
import org.apache.jena.tdb1.TDB1Exception;
/**
- * This decode is specific to TDB1. With {@link NodecSSE}, RDF-star triple
terms are
+ * This decode is specific to TDB1. With {@link NodecSSE}, triple terms are
* encoded with {@link NodeFmtLib#str(Node)}. The format for encodes blank node
* labels (e.g. "-" character and adds a leading "B") using
* {@link NodeFmtLib#encodeBNodeLabel}.
diff --git
a/jena-tdb2/src/main/java/org/apache/jena/tdb2/solver/PatternMatchTDB2.java
b/jena-tdb2/src/main/java/org/apache/jena/tdb2/solver/PatternMatchTDB2.java
index 05e3a3d7d4..7bed45c8bb 100644
--- a/jena-tdb2/src/main/java/org/apache/jena/tdb2/solver/PatternMatchTDB2.java
+++ b/jena-tdb2/src/main/java/org/apache/jena/tdb2/solver/PatternMatchTDB2.java
@@ -46,7 +46,6 @@ import
org.apache.jena.tdb2.store.nodetupletable.NodeTupleTable;
/**
* Entry to the basic pattern solver for TDB2.
- * {@link SolverRX} is the single stage and include RDF-star.
*/
public class PatternMatchTDB2 {
@@ -105,16 +104,16 @@ public class PatternMatchTDB2 {
for ( Triple triple : triples ) {
Tuple<Node> patternTuple = null;
- if ( graphNode == null )
+ if ( graphNode == null ) {
// 3-tuples
patternTuple = TupleFactory.create3(triple.getSubject(),
triple.getPredicate(), triple.getObject());
- else
+ } else {
// 4-tuples.
patternTuple = TupleFactory.create4(graphNode,
triple.getSubject(), triple.getPredicate(), triple.getObject());
- // Plain RDF, no RDF-star
- // chain = solve(nodeTupleTable, tuple, anyGraph, chain, filter,
execCxt)
- // ;
- // RDF-star SA
+ }
+ // Plain RDF, triple terms
+ // chain = solve(nodeTupleTable, tuple, anyGraph, chain, filter,
execCxt);
+
chain = matchQuadPattern(chain, graphNode, triple, nodeTupleTable,
patternTuple, anyGraph, filter, execCxt);
chain = makeAbortable(chain, killList, execCxt.getCancelSignal());
diff --git a/jena-tdb2/src/main/java/org/apache/jena/tdb2/solver/SolverRX.java
b/jena-tdb2/src/main/java/org/apache/jena/tdb2/solver/SolverRX.java
index 8464789fa5..a421c32d29 100644
--- a/jena-tdb2/src/main/java/org/apache/jena/tdb2/solver/SolverRX.java
+++ b/jena-tdb2/src/main/java/org/apache/jena/tdb2/solver/SolverRX.java
@@ -45,10 +45,10 @@ import org.apache.jena.tdb2.store.NodeId;
import org.apache.jena.tdb2.store.nodetable.NodeTable;
import org.apache.jena.tdb2.store.nodetupletable.NodeTupleTable;
-/** RDF-star processing for matching a triple/quad pattern. */
+/** Processing for matching an individual triple/quad pattern including triple
terms with variables. */
public class SolverRX {
/**
- * Control whether to check for embedded triple terms with variables or to
act in a direct manner.
+ * Control whether to check for triple terms with variables or to act in a
direct manner.
* <p>
* This constant is not public API. It is exposed only so integration
testing can
* check the value for a release build.
@@ -62,13 +62,14 @@ public class SolverRX {
boolean anyGraph,
Predicate<Tuple<NodeId>> filter, ExecutionContext execCxt) {
if ( DATAPATH ) {
if ( ! tripleHasEmbTripleWithVars(tPattern) )
- // No RDF-star <<>> with variables which are wildcards at this
point.
+ // No RDF triple terms <<()>> with variables which are wildcards
at this point.
return StageMatchTuple.access(nodeTupleTable, chain,
patternTuple, filter, anyGraph, execCxt);
}
- // RDF-star <<>> with wildcards.
+ // RDF triple terms <<()>> with wildcards.
// This path should work regardless.
+
boolean isTriple = (patternTuple.len() == 3);
NodeTable nodeTable = nodeTupleTable.getNodeTable();
