You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by an...@apache.org on 2025/07/11 08:13:51 UTC
(jena) branch main updated (277fcfec69 -> 610e7ed444)
This is an automated email from the ASF dual-hosted git repository.
andy pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/jena.git
from 277fcfec69 Bump @babel/preset-env in /jena-fuseki2/jena-fuseki-ui
new 0341afcd5c Remove unused import
new 692daaf0dc GH-3296: Add --base to uparse
new f2ebda7cc7 Add concat(Stream,Stream); handled nulls
new f71ccc4c1d Deprecate ElementGroup.addFilterElement
new e9646012d3 Update ExProg2.java
new e81942a084 Provide Collection<Triple> iso-matching
new ccf793da50 Align naming of IsoAlgRows and IsoAlgTuples
new 58de521d54 GH-3304: Fix private use parsing; refactor code; use JUnit5 exclusively
new 98fd2eee1f Top of jena tests is JenaCoreTestAll.java
new 7588c3896c GH-3303: Deal with bad URIs as namespaces when writing RDF/XML
new 610e7ed444 NodeValue - code format
The 11 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../main/java/org/apache/jena/riot/RDFFormat.java | 2 +-
.../apache/jena/riot/system/ParserProfileStd.java | 1 -
.../org/apache/jena/sparql/expr/NodeValue.java | 13 +-
.../jena/sparql/resultset/ResultsCompare.java | 6 +-
.../apache/jena/sparql/syntax/ElementGroup.java | 2 +
.../org/apache/jena/sparql/util/IsoMatcher.java | 28 ++-
.../apache/jena/sparql/util/iso/IsoAlgRows.java | 4 +-
.../apache/jena/sparql/util/iso/IsoAlgTuple.java | 56 -----
.../jena/sparql/util/iso/TestIsoMatcher.java | 4 +-
.../java/org/apache/jena/atlas/lib/StreamOps.java | 12 +
jena-cmds/src/main/java/arq/uparse.java | 36 ++-
jena-core/pom.xml | 2 +-
.../src/main/java/org/apache/jena/irix/IRIs.java | 3 +-
.../jena/rdfxml/xmloutput/impl/BaseXMLWriter.java | 7 +
...{TestPackage_core.java => JenaCoreTestAll.java} | 4 +-
.../src/main/java/arq/examples/ExProg2.java | 151 ++++++------
.../org/apache/jena/fuseki/servlets/ActionLib.java | 4 +-
jena-langtag/pom.xml | 10 -
.../org/apache/jena/langtag/InternalLangTag.java | 15 +-
.../org/apache/jena/langtag/LangTagRFC5646.java | 272 ++++++++++++---------
.../java/org/apache/jena/langtag/TestLangTag.java | 20 +-
.../org/apache/jena/langtag/TestLangTagFormat.java | 39 +--
22 files changed, 368 insertions(+), 323 deletions(-)
rename jena-core/src/test/java/org/apache/jena/test/{TestPackage_core.java => JenaCoreTestAll.java} (97%)
(jena) 07/11: Align naming of IsoAlgRows and IsoAlgTuples
Posted by an...@apache.org.
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
commit ccf793da50eb04c4f538c7231324e08b203a533b
Author: Andy Seaborne <an...@apache.org>
AuthorDate: Tue Jul 8 12:48:47 2025 +0100
Align naming of IsoAlgRows and IsoAlgTuples
---
.../jena/sparql/resultset/ResultsCompare.java | 6 +--
.../apache/jena/sparql/util/iso/IsoAlgRows.java | 4 +-
.../apache/jena/sparql/util/iso/IsoAlgTuple.java | 56 ----------------------
3 files changed, 5 insertions(+), 61 deletions(-)
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/resultset/ResultsCompare.java b/jena-arq/src/main/java/org/apache/jena/sparql/resultset/ResultsCompare.java
index f5e7726548..6810406f78 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/resultset/ResultsCompare.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/resultset/ResultsCompare.java
@@ -59,7 +59,7 @@ public class ResultsCompare {
/** See {@link #equalsByValue(ResultSet, ResultSet)} */
public static boolean equalsByValue(RowSet rs1, RowSet rs2) {
- return IsoAlgRows.isIsomorphic(rs1, rs2, BNodeIso.Match.BNODES_VALUE);
+ return IsoAlgRows.isomorphic(rs1, rs2, BNodeIso.Match.BNODES_VALUE);
}
/**
@@ -90,12 +90,12 @@ public class ResultsCompare {
* @return true if they are equivalent
*/
public static boolean equalsByTerm(RowSet rs1, RowSet rs2) {
- return IsoAlgRows.isIsomorphic(rs1, rs2, BNodeIso.Match.BNODES_TERM);
+ return IsoAlgRows.isomorphic(rs1, rs2, BNodeIso.Match.BNODES_TERM);
}
/** Compare two list - unordered */
public static boolean equalsByTerm(List<Binding> list1, List<Binding> list2) {
- return IsoAlgRows.isIsomorphic(list1, list2, BNodeIso.Match.BNODES_TERM);
+ return IsoAlgRows.isomorphic(list1, list2, BNodeIso.Match.BNODES_TERM);
}
/**
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/util/iso/IsoAlgRows.java b/jena-arq/src/main/java/org/apache/jena/sparql/util/iso/IsoAlgRows.java
index 220de7a008..2d5ef1933c 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/util/iso/IsoAlgRows.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/util/iso/IsoAlgRows.java
@@ -48,7 +48,7 @@ public class IsoAlgRows {
return iout;
}
- public static boolean isIsomorphic(RowSet rowset1, RowSet rowset2, BNodeIso.Match matching) {
+ public static boolean isomorphic(RowSet rowset1, RowSet rowset2, BNodeIso.Match matching) {
Objects.requireNonNull(rowset1);
Objects.requireNonNull(rowset2);
if ( rowset1 == rowset2 )
@@ -66,7 +66,7 @@ public class IsoAlgRows {
return matcher(rows1, rows2, matching);
}
- public static boolean isIsomorphic(List<Binding> list1, List<Binding> list2, BNodeIso.Match matching) {
+ public static boolean isomorphic(List<Binding> list1, List<Binding> list2, BNodeIso.Match matching) {
if ( list1.size() != list2.size() )
return false;
return matcher(list1, list2, matching);
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/util/iso/IsoAlgTuple.java b/jena-arq/src/main/java/org/apache/jena/sparql/util/iso/IsoAlgTuple.java
index 42a5f709ab..97cec4c06d 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/util/iso/IsoAlgTuple.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/util/iso/IsoAlgTuple.java
@@ -41,62 +41,6 @@ import org.apache.jena.sparql.util.NodeUtils;
*/
public class IsoAlgTuple {
-// /** Record the IsoMapping of a node. This is a one-way linked list. */
-// private static class IsoMapping {
-// final Node node1;
-// final Node node2;
-// final IsoMapping parent;
-//
-// static final IsoMapping rootIsoMapping = new Mapping(null, null, null);
-//
-// Mapping(IsoMapping parent, Node node1, Node node2) {
-// super();
-// this.parent = parent;
-// this.node1 = node1;
-// this.node2 = node2;
-// }
-//
-// boolean mapped(Node node) {
-// return map(node) != null;
-// }
-//
-// Node map(Node node) {
-// IsoMapping IsoMapping = this;
-// while (IsoMapping != rootMapping) {
-// if ( mapping.node1.equals(node) )
-// return mapping.node2;
-// IsoMapping = mapping.parent;
-// }
-// return null;
-// }
-//
-// boolean reverseMapped(Node node) {
-// return reverseMap(node) != null;
-// }
-//
-// Node reverseMap(Node node) {
-// IsoMapping IsoMapping = this;
-// while (IsoMapping != rootMapping) {
-// if ( mapping.node2.equals(node) )
-// return mapping.node1;
-// IsoMapping = mapping.parent;
-// }
-// return null;
-// }
-//
-// @Override
-// public String toString() {
-// StringBuilder sbuff = new StringBuilder();
-// IsoMapping IsoMapping = this;
-// while (IsoMapping != rootMapping) {
-// sbuff.append("{" + mapping.node1 + " => " + mapping.node2 + "}");
-// IsoMapping = mapping.parent;
-// }
-// sbuff.append("{}");
-// return sbuff.toString();
-// }
-// }
-
private record Possibility(Tuple<Node> tuple, IsoMapping mapping) {
@Override
public String toString() {
(jena) 06/11: Provide Collection iso-matching
Posted by an...@apache.org.
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
commit e81942a084a1015e9192bdd24db32327658623a1
Author: Andy Seaborne <an...@apache.org>
AuthorDate: Tue Jul 8 09:41:42 2025 +0100
Provide Collection<Triple> iso-matching
---
.../org/apache/jena/sparql/util/IsoMatcher.java | 28 +++++++++++++---------
.../jena/sparql/util/iso/TestIsoMatcher.java | 4 ++--
2 files changed, 19 insertions(+), 13 deletions(-)
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/util/IsoMatcher.java b/jena-arq/src/main/java/org/apache/jena/sparql/util/IsoMatcher.java
index 6e3ba9581d..71ec7d5ea1 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/util/IsoMatcher.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/util/IsoMatcher.java
@@ -33,7 +33,6 @@ import org.apache.jena.sparql.core.DatasetGraph ;
import org.apache.jena.sparql.core.Quad ;
import org.apache.jena.sparql.util.iso.IsoAlgRows;
import org.apache.jena.sparql.util.iso.IsoAlgTuple;
-import org.apache.jena.util.iterator.ExtendedIterator;
/**
* Simple isomorphism testing for on unordered collections.
@@ -48,22 +47,29 @@ import org.apache.jena.util.iterator.ExtendedIterator;
public class IsoMatcher
{
/** Graph isomorphism */
- public static boolean isomorphic(Graph g1, Graph g2) {
- List<Tuple<Node>> x1 = tuplesTriples(g1.find());
- List<Tuple<Node>> x2 = tuplesTriples(g2.find());
- return isomorphic(x1, x2, NodeUtils.sameRdfTerm);
+ public static boolean isomorphic(Graph graph1, Graph graph2) {
+ List<Tuple<Node>> x1 = tuplesTriples(graph1.find());
+ List<Tuple<Node>> x2 = tuplesTriples(graph2.find());
+ return isomorphicTuples(x1, x2, NodeUtils.sameRdfTerm);
}
/** Dataset isomorphism */
public static boolean isomorphic(DatasetGraph dsg1, DatasetGraph dsg2) {
List<Tuple<Node>> x1 = tuplesQuads(dsg1.find());
List<Tuple<Node>> x2 = tuplesQuads(dsg2.find());
- return isomorphic(x1, x2, NodeUtils.sameRdfTerm);
+ return isomorphicTuples(x1, x2, NodeUtils.sameRdfTerm);
+ }
+
+ /** Collection of triples isomorphism */
+ public static boolean isomorphic(Collection<Triple> triples1, Collection<Triple> triples2) {
+ List<Tuple<Node>> x1 = tuplesTriples(triples1.iterator());
+ List<Tuple<Node>> x2 = tuplesTriples(triples2.iterator());
+ return isomorphicTuples(x1, x2, NodeUtils.sameRdfTerm);
}
/** Collection of tuples isomorphism */
- public static boolean isomorphic(Collection<Tuple<Node>> x1, Collection<Tuple<Node>> x2) {
- return isomorphic(x1, x2, NodeUtils.sameRdfTerm);
+ public static boolean isomorphicTuples(Collection<Tuple<Node>> x1, Collection<Tuple<Node>> x2) {
+ return isomorphicTuples(x1, x2, NodeUtils.sameRdfTerm);
}
/** Helper - convert to {@code List<Tuple<Node>>} */
@@ -72,18 +78,18 @@ public class IsoMatcher
}
/** Helper - convert to {@code List<Tuple<Node>>} */
- private static List<Tuple<Node>> tuplesTriples(ExtendedIterator<Triple> iter) {
+ private static List<Tuple<Node>> tuplesTriples(Iterator<Triple> iter) {
try {
return Iter.iter(iter).map(t->tuple(t.getSubject(), t.getPredicate(), t.getObject())).toList();
}
- finally { iter.close(); }
+ finally { Iter.close(iter); }
}
/** Collection of tuples isomorphism, with choice of when two nodes are "equal".
* See also {@link IsoAlgTuple#isIsomorphic(Collection, Collection, org.apache.jena.sparql.util.Iso.Mappable, EqualityTest)}
* for isomorphisms testing for more than just blank nodes.
*/
- private static boolean isomorphic(Collection<Tuple<Node>> x1, Collection<Tuple<Node>> x2, EqualityTest nodeTest) {
+ private static boolean isomorphicTuples(Collection<Tuple<Node>> x1, Collection<Tuple<Node>> x2, EqualityTest nodeTest) {
return IsoAlgTuple.isIsomorphic(x1, x2, nodeTest);
}
}
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 0d2ff1a911..3f059a6355 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
@@ -257,7 +257,7 @@ public class TestIsoMatcher
}
private void test$(List<Tuple<Node>> t1, List<Tuple<Node>> t2, boolean iso) {
- boolean b = IsoMatcher.isomorphic(t1, t2);
+ boolean b = IsoMatcher.isomorphicTuples(t1, t2);
if ( b != iso ) {
System.out.println("====");
System.out.println(t1);
@@ -286,7 +286,7 @@ public class TestIsoMatcher
Collection<Tuple<Node>> x1 = Collections.singletonList(TupleFactory.create1(n1));
Collection<Tuple<Node>> x2 = Collections.singletonList(TupleFactory.create1(n2));
- boolean b = IsoMatcher.isomorphic(x1, x2);
+ boolean b = IsoMatcher.isomorphicTuples(x1, x2);
if ( b != expected ) {
System.out.println("====");
System.out.println(n1);
(jena) 01/11: Remove unused import
Posted by an...@apache.org.
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
commit 0341afcd5c393fd27b26d73a759611dde2a2038f
Author: Andy Seaborne <an...@apache.org>
AuthorDate: Sat Jul 5 10:42:11 2025 +0100
Remove unused import
---
jena-arq/src/main/java/org/apache/jena/riot/system/ParserProfileStd.java | 1 -
1 file changed, 1 deletion(-)
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/system/ParserProfileStd.java b/jena-arq/src/main/java/org/apache/jena/riot/system/ParserProfileStd.java
index 55696e9268..333526e9fb 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/system/ParserProfileStd.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/system/ParserProfileStd.java
@@ -29,7 +29,6 @@ import org.apache.jena.irix.IRIxResolver;
import org.apache.jena.irix.RelativeIRIException;
import org.apache.jena.query.ARQ;
import org.apache.jena.riot.RiotException;
-import org.apache.jena.riot.RiotParseException;
import org.apache.jena.riot.tokens.Token;
import org.apache.jena.riot.tokens.TokenType;
import org.apache.jena.sparql.core.Quad;
(jena) 11/11: NodeValue - code format
Posted by an...@apache.org.
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
commit 610e7ed44467982aada4a551ad447f69ecab2431
Author: Andy Seaborne <an...@apache.org>
AuthorDate: Thu Jul 10 13:44:49 2025 +0100
NodeValue - code format
---
.../main/java/org/apache/jena/sparql/expr/NodeValue.java | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/expr/NodeValue.java b/jena-arq/src/main/java/org/apache/jena/sparql/expr/NodeValue.java
index 69c4315fa9..f4a5fe04e3 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/expr/NodeValue.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/expr/NodeValue.java
@@ -592,14 +592,13 @@ public abstract class NodeValue extends ExprNode
LiteralLabel lit = node.getLiteral();
// This includes type testing
- //if ( ! lit.getDatatype().isValidLiteral(lit) )
+ // if ( ! lit.getDatatype().isValidLiteral(lit) )
+
// Use this - already calculated when the node is formed.
- if ( !lit.isWellFormed() )
- {
- if ( NodeValue.VerboseWarnings )
- {
- String tmp = FmtUtils.stringForNode(node);
- Log.warn(NodeValue.class, "Datatype format exception: "+tmp);
+ if ( !lit.isWellFormed() ) {
+ if ( NodeValue.VerboseWarnings ) {
+ String tmp = FmtUtils.stringForNode(node);
+ Log.warn(NodeValue.class, "Datatype format exception: " + tmp);
}
// Invalid lexical form.
return new NodeValueNode(node);
(jena) 03/11: Add concat(Stream,Stream); handled nulls
Posted by an...@apache.org.
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
commit f2ebda7cc7aefa790004c40979183ecf767ec6b9
Author: Andy Seaborne <an...@apache.org>
AuthorDate: Fri Jul 4 12:04:49 2025 +0100
Add concat(Stream,Stream); handled nulls
---
.../src/main/java/org/apache/jena/atlas/lib/StreamOps.java | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/jena-base/src/main/java/org/apache/jena/atlas/lib/StreamOps.java b/jena-base/src/main/java/org/apache/jena/atlas/lib/StreamOps.java
index 0d55e0f731..9fc2793dbb 100644
--- a/jena-base/src/main/java/org/apache/jena/atlas/lib/StreamOps.java
+++ b/jena-base/src/main/java/org/apache/jena/atlas/lib/StreamOps.java
@@ -59,6 +59,18 @@ public class StreamOps {
return first(collection.stream());
}
+ /**
+ * Join two streams. This is the function to accumulate stream from a loop.
+ * If either stream is null, then return the other which may also be null.
+ */
+ public static <X> Stream<X> concat(Stream<X> stream1, Stream<X> stream2) {
+ if ( stream1 == null )
+ return stream2;
+ if ( stream2 == null )
+ return stream1;
+ return Stream.concat(stream1, stream2);
+ }
+
/** Debug : print stream.
* This operation prints the whole stream at the point it is used,
* and then returns a new stream of the same elements.
(jena) 08/11: GH-3304: Fix private use parsing; refactor code; use JUnit5 exclusively
Posted by an...@apache.org.
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
commit 58de521d54d622daaa2df120306c4e2e29382fd8
Author: Andy Seaborne <an...@apache.org>
AuthorDate: Thu Jul 10 12:22:25 2025 +0100
GH-3304: Fix private use parsing; refactor code; use JUnit5 exclusively
---
.../{TestPackage_core.java => JenaCoreTest.java} | 0
jena-langtag/pom.xml | 10 -
.../org/apache/jena/langtag/InternalLangTag.java | 15 +-
.../org/apache/jena/langtag/LangTagRFC5646.java | 272 ++++++++++++---------
.../java/org/apache/jena/langtag/TestLangTag.java | 20 +-
.../org/apache/jena/langtag/TestLangTagFormat.java | 39 +--
6 files changed, 215 insertions(+), 141 deletions(-)
diff --git a/jena-core/src/test/java/org/apache/jena/test/TestPackage_core.java b/jena-core/src/test/java/org/apache/jena/test/JenaCoreTest.java
similarity index 100%
rename from jena-core/src/test/java/org/apache/jena/test/TestPackage_core.java
rename to jena-core/src/test/java/org/apache/jena/test/JenaCoreTest.java
diff --git a/jena-langtag/pom.xml b/jena-langtag/pom.xml
index ac3ae08791..8610b5000e 100644
--- a/jena-langtag/pom.xml
+++ b/jena-langtag/pom.xml
@@ -54,16 +54,6 @@
<scope>test</scope>
</dependency>
- <!--
- Needed for @Parameterized test suite
- JUnit5 will eventually have @ParameterizedClass.
- -->
- <dependency>
- <groupId>org.junit.vintage</groupId>
- <artifactId>junit-vintage-engine</artifactId>
- <scope>test</scope>
- </dependency>
-
</dependencies>
<build>
diff --git a/jena-langtag/src/main/java/org/apache/jena/langtag/InternalLangTag.java b/jena-langtag/src/main/java/org/apache/jena/langtag/InternalLangTag.java
index 93281be82a..a6e75ebb1a 100644
--- a/jena-langtag/src/main/java/org/apache/jena/langtag/InternalLangTag.java
+++ b/jena-langtag/src/main/java/org/apache/jena/langtag/InternalLangTag.java
@@ -123,6 +123,15 @@ class InternalLangTag {
return true;
}
+ static boolean isAlphaNum(String string, int start, int end) {
+ for ( int i = start ; i < end ; i++ ) {
+ char ch = string.charAt(i);
+ if ( ! isAlphaNum(ch) )
+ return false;
+ }
+ return true;
+ }
+
static void checkAlphaMinus(String string, int N, int start, int end) {
for ( int i = start ; i < end ; i++ ) {
char ch = string.charAt(i);
@@ -147,7 +156,7 @@ class InternalLangTag {
}
}
- /*package*/ static String str(char ch) {
+ static String str(char ch) {
return String.format("'%s' U+%04X", Character.valueOf(ch), (int)ch);
}
@@ -159,6 +168,10 @@ class InternalLangTag {
return ( ch >= '0' && ch <= '9' );
}
+ static boolean isAlphaNum(char ch) {
+ return isAlpha(ch) || isNum(ch);
+ }
+
static boolean isMinus(char ch) {
return ( ch == '-' );
}
diff --git a/jena-langtag/src/main/java/org/apache/jena/langtag/LangTagRFC5646.java b/jena-langtag/src/main/java/org/apache/jena/langtag/LangTagRFC5646.java
index 23e33a62f4..99a009863e 100644
--- a/jena-langtag/src/main/java/org/apache/jena/langtag/LangTagRFC5646.java
+++ b/jena-langtag/src/main/java/org/apache/jena/langtag/LangTagRFC5646.java
@@ -34,56 +34,52 @@ import java.util.Set;
* <a href="https://www.rfc-editor.org/info/rfc5646">RFC 5646: Tags for Identifying Languages</a>
* </p>
*/
-public final class LangTagRFC5646 implements LangTag{
- // The language tag as given.
- private final String langTagString;
-
- // Grandfathered
- private boolean isGrandfathered = false;
- // Private use of the whole Language-Tag
- private boolean isPrivateUseLanguage = false;
-
- /* Formatting: https://datatracker.ietf.org/doc/html/rfc5646#section-2.1.1
- *
- * All subtags, including extension and private use subtags,
- * use lowercase letters with two exceptions: two-letter
- * and four-letter subtags that neither appear at the start of the tag
- * nor occur after singletons. Such two-letter subtags are all
- * uppercase (as in the tags "en-CA-x-ca" or "sgn-BE-FR") and four-
- * letter subtags are titlecase (as in the tag "az-Latn-x-latn").
- *
- * See str()
- */
-
- // Helpers
- private enum CaseRule { TITLE, LOWER, UPPER }
- private enum CharSet { ALPHA, ALPHANUM }
+public final class LangTagRFC5646 implements LangTag {
public static LangTag create(String string) {
LangTagRFC5646 langtag = parser(string);
return langtag;
}
+ // The language tag as given.
+ private final String langTagString;
+
+ /* Formatting: https://datatracker.ietf.org/doc/html/rfc5646#section-2.1.1
+ *
+ * All subtags, including extension and private use subtags,
+ * use lowercase letters with two exceptions: two-letter
+ * and four-letter subtags that neither appear at the start of the tag
+ * nor occur after singletons. Such two-letter subtags are all
+ * uppercase (as in the tags "en-CA-x-ca" or "sgn-BE-FR") and four-
+ * letter subtags are titlecase (as in the tag "az-Latn-x-latn").
+ *
+ * See str()
+ */
+
+ private final boolean isGrandfathered;
+ // Private use of the whole Language-Tag
+ private final boolean isPrivateUseLanguage;
+
// Start/Finish indexes, excluding the initial '-'
- private int language0 = -1 ;
- private int language1 = -1 ;
+ private final int language0;
+ private final int language1;
- private int script0 = -1 ;
- private int script1 = -1 ;
+ private final int script0;
+ private final int script1;
- private int region0 = -1 ;
- private int region1 = -1 ;
+ private final int region0;
+ private final int region1;
- private int variant0 = -1 ;
- private int variant1 = -1 ;
+ private final int variant0;
+ private final int variant1;
// All extensions.
- private int extension0 = -1 ;
- private int extension1 = -1 ;
+ private final int extension0;
+ private final int extension1;
// Private use sub tag (not private use of the whole language tag, which starts "x-").
- private int privateuse0 = -1 ;
- private int privateuse1 = -1 ;
+ private final int privateuse0;
+ private final int privateuse1;
@Override
public String getLanguage() {
@@ -232,12 +228,64 @@ public final class LangTagRFC5646 implements LangTag{
}
private static LangTagRFC5646 parser(String string) {
+ LangTagRFC5646 langtag = new Builder().parse(string).build();
+ return langtag;
+ }
+
+ // Builder helps tidy the code.
+ // It allowing the LangTagRFC5646 object to have final fields.
+ // It means there is one place calling the constructor with its many arguments.
+
+ private static class Builder {
+ // All members of LangTagRFC
+ String langTagString = null;
+ boolean isGrandfathered = false;
+ boolean isPrivateUseLanguage = false;
+ int language0 = -1;
+ int language1 = -1;
+ int script0 = -1;
+ int script1 = -1;
+ int region0 = -1;
+ int region1 = -1;
+ int variant0 = -1;
+ int variant1 = -1;
+ int extension0 = -1;
+ int extension1 = -1;
+ int privateuse0 = -1;
+ int privateuse1 = -1;
+
+ Builder() {}
+
+ private Builder parse(String string) {
+ final Builder builder = this;
+ LangTagRFC5646.parse(builder, string);
+ return this;
+ }
+
+ private LangTagRFC5646 build() {
+ return new LangTagRFC5646(langTagString, language0, language1,
+ script0, script1, region0, region1, variant0, variant1,
+ extension0, extension1, privateuse0, privateuse1,
+ isGrandfathered, isPrivateUseLanguage);
+ }
+ }
+ // Helpers
+ private enum CaseRule { TITLE, LOWER, UPPER }
+ private enum CharRange { ALPHA, ALPHANUM }
+
+ // The whole of function 'parse' is enclosed in formatter:off
+ // @formatter:off
+ static void parse(Builder builder, String string) {
// A segment is a sequence of A2ZN characters separated by '-'.
- LangTagRFC5646 langtag = new LangTagRFC5646(string);
+ builder.langTagString = string;
final int N = string.length();
- // @formatter:off
+
+ // Language-Tag = langtag ; normal language tags
+ // / privateuse ; private use tag
+ // / grandfathered ; grandfathered tags
+
// langtag = language
// ["-" script]
// ["-" region]
@@ -273,7 +321,6 @@ public final class LangTagRFC5646 implements LangTag{
// / %x79-7A ; y - z
//
// privateuse = "x" 1*("-" (1*8alphanum))
- // @formatter:on
if ( N == 0 )
InternalLangTag.error("Empty string");
@@ -297,22 +344,22 @@ public final class LangTagRFC5646 implements LangTag{
// variant of "en-GB", each of them, in its entirety,
// represents a language.
//
- langtag.language0 = 0;
- langtag.language1 = N;
- langtag.isGrandfathered = true;
+ builder.language0 = 0;
+ builder.language1 = N;
+ builder.isGrandfathered = true;
// Exception.
if ( string.equalsIgnoreCase("en-GB-oed") ) {
// "oed" is "Oxford English Dictionary spelling"
// Better is the replacement "en-GB-oxendict"
- langtag.language0 = 0;
- langtag.language1 = 2;
- langtag.region0 = 3;
- langtag.region1 = 5;
+ builder.language0 = 0;
+ builder.language1 = 2;
+ builder.region0 = 3;
+ builder.region1 = 5;
// Non-standard variant.
- langtag.variant0 = 6;
- langtag.variant1 = N;
+ builder.variant0 = 6;
+ builder.variant1 = N;
}
- return langtag;
+ return;
}
// -- language
@@ -335,15 +382,15 @@ public final class LangTagRFC5646 implements LangTag{
the country of Switzerland (or any other value in the IANA
registry) unless there is a private agreement in place to do so.
See Section 4.6.
- */
- langtag.isPrivateUseLanguage = true;
+ */
+ builder.isPrivateUseLanguage = true;
int idxPrivateUseStart = 0;
- int idxPrivateUseEnd = maybeSubtags(string, N, idxPrivateUseStart+segLen, 1, 8);
- langtag.privateuse0 = idxPrivateUseStart;
- langtag.privateuse1 = idxPrivateUseEnd;
- if ( langtag.privateuse1 < N )
- InternalLangTag.error("Trailing characters in private langtag: '%s'", string.substring(langtag.privateuse1));
- return langtag;
+ int idxPrivateUseEnd = maybeSubtags(string, N, idxPrivateUseStart+segLen, CharRange.ALPHANUM, 1, 8);
+ builder.privateuse0 = idxPrivateUseStart;
+ builder.privateuse1 = idxPrivateUseEnd;
+ if ( builder.privateuse1 < N )
+ InternalLangTag.error("Trailing characters in private langtag: '%s'", string.substring(builder.privateuse1));
+ return;
}
// else
InternalLangTag.error("Language part is 1 character: it must be 2-3 characters (4-8 reserved for future use), \"x-\", or a recognized grandfathered tag");
@@ -354,43 +401,43 @@ public final class LangTagRFC5646 implements LangTag{
if ( idx2 < 0 ) {
// language only.
- langtag.language0 = 0;
- langtag.language1 = N;
- InternalLangTag.checkAlpha(string, N, langtag.language0, langtag.language1);
- return langtag;
+ builder.language0 = 0;
+ builder.language1 = N;
+ InternalLangTag.checkAlpha(string, N, builder.language0, builder.language1);
+ return;
}
if ( idx == idx2 )
InternalLangTag.error("Can not find the language subtag: '%s'", string);
- langtag.language0 = idx;
+ builder.language0 = idx;
if ( segLen == 2 || segLen == 3 ) {
- // -- Language extension subtags/
+ // -- Language extension subtags
// language = 2*3ALPHA ; shortest ISO 639 code
// ["-" extlang]
// extlang = 3ALPHA ; selected ISO 639 codes
// *2("-" 3ALPHA) ; permanently reserved
int extStart = idx+segLen;
- InternalLangTag.checkAlpha(string, N, langtag.language0, extStart);
+ InternalLangTag.checkAlpha(string, N, builder.language0, extStart);
// Extensions are 1 to 3 3ALPHA subtags
- int extEnd = maybeSubtags(string, N, extStart, 3, 3);
+ int extEnd = maybeSubtags(string, N, extStart, CharRange.ALPHA, 3, 3);
if ( extEnd > extStart ) {
idx2 = extEnd;
- InternalLangTag.checkAlphaMinus(string, N, extStart, langtag.language1);
+ InternalLangTag.checkAlphaMinus(string, N, extStart, builder.language1);
}
} else if ( segLen >= 4 && segLen <= 8 ) {
// / 4ALPHA ; or reserved for future use
// / 5*8ALPHA ; or registered language subtag
// Dubious.
- InternalLangTag.checkAlpha(string, N, langtag.language0, idx2);
+ InternalLangTag.checkAlpha(string, N, builder.language0, idx2);
} else {
InternalLangTag.error("Language too long (2-3 characters, 4-8 reserved for future use)");
}
- langtag.language1 = idx2;
+ builder.language1 = idx2;
// Info
- noteSegment("language", string, langtag.language0, langtag.language1);
+ noteSegment("language", string, builder.language0, builder.language1);
// Move on - next subtag
idx = segmentNextStart(N, idx, idx2);
@@ -407,10 +454,10 @@ public final class LangTagRFC5646 implements LangTag{
int start = idx;
int finish = idx+segLen;
- langtag.script0 = idx;
- langtag.script1 = idx+segLen;
- InternalLangTag.checkAlpha(string, N, langtag.script0, langtag.script1);
- noteSegment("script", string, langtag.script0, langtag.script1);
+ builder.script0 = idx;
+ builder.script1 = idx+segLen;
+ InternalLangTag.checkAlpha(string, N, builder.script0, builder.script1);
+ noteSegment("script", string, builder.script0, builder.script1);
// Move on.
idx = segmentNextStart(N, idx, idx2);
@@ -424,13 +471,13 @@ public final class LangTagRFC5646 implements LangTag{
// / 3DIGIT ; UN M.49 code
if ( segLen == 2 || segLen == 3 ) {
// Region
- langtag.region0 = idx;
- langtag.region1 = idx+segLen;
+ builder.region0 = idx;
+ builder.region1 = idx+segLen;
if ( segLen == 2 )
- InternalLangTag.checkAlpha(string, N, langtag.region0, langtag.region1);
+ InternalLangTag.checkAlpha(string, N, builder.region0, builder.region1);
else
- InternalLangTag.checkDigits(string, N, langtag.region0, langtag.region1);
- noteSegment("region", string, langtag.region0, langtag.region1);
+ InternalLangTag.checkDigits(string, N, builder.region0, builder.region1);
+ noteSegment("region", string, builder.region0, builder.region1);
// Move on.
idx = segmentNextStart(N, idx, idx2);
@@ -445,11 +492,11 @@ public final class LangTagRFC5646 implements LangTag{
for ( ;; ) {
if ( segLen >= 5 && segLen <= 8) {
// variant 5*8alphanum
- if ( langtag.variant0 == -1 )
- langtag.variant0 = idx;
- langtag.variant1 = idx+segLen;
- InternalLangTag.checkAlphaNum(string, N, idx, langtag.variant1);
- noteSegment("variant", string, langtag.variant0, langtag.variant1);
+ if ( builder.variant0 == -1 )
+ builder.variant0 = idx;
+ builder.variant1 = idx+segLen;
+ InternalLangTag.checkAlphaNum(string, N, idx, builder.variant1);
+ noteSegment("variant", string, builder.variant0, builder.variant1);
// Move on.
idx = segmentNextStart(N, idx, idx2);
idx2 = segmentNextFinish(string, N, idx);
@@ -462,11 +509,11 @@ public final class LangTagRFC5646 implements LangTag{
// DIGIT 3alphanum
char ch = string.charAt(idx);
if ( ch >= '0' || ch <= '9' ) {
- if ( langtag.variant0 == -1 )
- langtag.variant0 = idx;
- langtag.variant1 = idx+segLen;
- InternalLangTag.checkAlphaNum(string, N, idx, langtag.variant1);
- noteSegment("variant", string, langtag.variant0, langtag.variant1);
+ if ( builder.variant0 == -1 )
+ builder.variant0 = idx;
+ builder.variant1 = idx+segLen;
+ InternalLangTag.checkAlphaNum(string, N, idx, builder.variant1);
+ noteSegment("variant", string, builder.variant0, builder.variant1);
}
// Move on.
idx = segmentNextStart(N, idx, idx2);
@@ -498,12 +545,12 @@ public final class LangTagRFC5646 implements LangTag{
InternalLangTag.error("Duplicate extension singleton: '"+singleton+"'");
}
- if ( langtag.extension0 == -1 )
- langtag.extension0 = idx;
+ if ( builder.extension0 == -1 )
+ builder.extension0 = idx;
// Extension.
// 2*8 alphanum
int idxExtStart = idx+segLen;
- int idxEndExtra = maybeSubtags(string, N, idxExtStart, 2, 8);
+ int idxEndExtra = maybeSubtags(string, N, idxExtStart, CharRange.ALPHANUM, 2, 8);
// Expecting at least one subtag.
if ( idxExtStart == idxEndExtra )
@@ -511,10 +558,10 @@ public final class LangTagRFC5646 implements LangTag{
if ( idxEndExtra > idxExtStart )
idx2 = idxEndExtra;
- langtag.extension1 = idx2;
- InternalLangTag.checkAlphaNumMinus(string, N, langtag.extension0, langtag.extension1);
+ builder.extension1 = idx2;
+ InternalLangTag.checkAlphaNumMinus(string, N, builder.extension0, builder.extension1);
- noteSegment("extension", string, langtag.extension0, langtag.extension1);
+ noteSegment("extension", string, builder.extension0, builder.extension1);
// Move on.
idx = segmentNextStart(N, idx, idx2);
idx2 = segmentNextFinish(string, N, idx);
@@ -525,10 +572,10 @@ public final class LangTagRFC5646 implements LangTag{
// ---- private use
if ( inPrivateUseSubtag ) {
- langtag.privateuse0 = idx;
+ builder.privateuse0 = idx;
// privateuse = "x" 1*("-" (1*8alphanum))
int idxPrivateUseStart = idx+segLen;
- int idxPrivateUseEnd = maybeSubtags(string, N, idxPrivateUseStart, 1, 8);
+ int idxPrivateUseEnd = maybeSubtags(string, N, idxPrivateUseStart, CharRange.ALPHANUM, 1, 8);
// Expecting at least one subtag.
if ( idxPrivateUseStart == idxPrivateUseEnd )
@@ -536,10 +583,10 @@ public final class LangTagRFC5646 implements LangTag{
if ( idxPrivateUseEnd > idxPrivateUseStart )
idx2 = idxPrivateUseEnd;
- langtag.privateuse1 = idx2;
- InternalLangTag.checkAlphaNumMinus(string, N, langtag.privateuse0, langtag.privateuse1);
+ builder.privateuse1 = idx2;
+ InternalLangTag.checkAlphaNumMinus(string, N, builder.privateuse0, builder.privateuse1);
- noteSegment("private use", string, langtag.privateuse0, langtag.privateuse1);
+ noteSegment("private use", string, builder.privateuse0, builder.privateuse1);
// Private use runs to end of string. But do checking.
// Move on.
idx = segmentNextStart(N, idx, idx2);
@@ -557,12 +604,8 @@ public final class LangTagRFC5646 implements LangTag{
InternalLangTag.error("Trailing characters: '%s'", string.substring(idx));
if ( idx2 >= 0 )
InternalLangTag.error("Bad string: '%s'", string);
- return langtag;
- }
-
- private LangTagRFC5646(String string) {
- this.langTagString = string;
}
+ // @formatter:on
private LangTagRFC5646(String string,
int language0, int language1,
@@ -571,13 +614,17 @@ public final class LangTagRFC5646 implements LangTag{
int variant0, int variant1,
int extension0, int extension1,
int privateuse0, int privateuse1,
- boolean isGrandfathered) {
+ boolean isGrandfathered,
+ boolean isPrivateUseLanguage) {
this.langTagString = string;
this.isGrandfathered = isGrandfathered;
+ this.isPrivateUseLanguage = isPrivateUseLanguage;
this.language0 = language0;
this.language1 = language1;
this.script0 = script0;
this.script1 = script1;
+ this.region0 = region0;
+ this.region1 = region1;
this.variant0 = variant0;
this.variant1 = variant1;
this.extension0 = extension0;
@@ -587,7 +634,7 @@ public final class LangTagRFC5646 implements LangTag{
}
/** Zero or more subtags, each between min and max length. */
- private static int maybeSubtags(String string, int N, int idxStart, int min, int max) {
+ private static int maybeSubtags(String string, int N, int idxStart, CharRange charRange, int min, int max) {
// Looking at the '-' or end of string.
int numExt = 0;
int count = 0;
@@ -597,7 +644,7 @@ public final class LangTagRFC5646 implements LangTag{
char ch = string.charAt(x);
if ( ch != '-' )
break;
- int x1 = maybeOneSubtag(string, N, x+1, min, max);
+ int x1 = maybeOneSubtag(string, N, x+1, charRange, min, max);
if ( x1 <= 0 )
break;
if ( x1 == N ) {
@@ -613,18 +660,23 @@ public final class LangTagRFC5646 implements LangTag{
* Peek for a segment between min and max in length.
* The initial "-" has been read.
*/
- private static int maybeOneSubtag(String string, int N, int idxStart, int min, int max) {
+ private static int maybeOneSubtag(String string, int N, int idxStart, CharRange charRange, int min, int max) {
int idx = idxStart;
if ( idx >= N )
return -1;
int idx2 = segmentNextFinish(string, N, idx);
int segLen = segmentLength(N, idx, idx2);
if ( segLen == 0 )
- InternalLangTag.error("Bad langtag. Found '--'");
+ InternalLangTag.error("Bad builder. Found '--'");
if ( segLen < min || segLen > max )
return -1;
- if ( ! InternalLangTag.isAlpha(string, idxStart, idxStart+segLen) )
+ boolean valid =
+ switch (charRange) {
+ case ALPHA -> InternalLangTag.isAlpha(string, idxStart, idxStart+segLen);
+ case ALPHANUM -> InternalLangTag.isAlphaNum(string, idxStart, idxStart+segLen);
+ };
+ if ( !valid )
return -1;
return idxStart+segLen;
}
diff --git a/jena-langtag/src/test/java/org/apache/jena/langtag/TestLangTag.java b/jena-langtag/src/test/java/org/apache/jena/langtag/TestLangTag.java
index 2b2c35bddd..bb9b443dc2 100644
--- a/jena-langtag/src/test/java/org/apache/jena/langtag/TestLangTag.java
+++ b/jena-langtag/src/test/java/org/apache/jena/langtag/TestLangTag.java
@@ -43,12 +43,27 @@ public class TestLangTag {
@Test public void test_lang_basic_09() { testRFC5646("de-CH-w-extend", "de-CH-w-extend", "de", null, "CH", null, "w-extend"); }
@Test public void test_lang_basic_10() { testRFC5646("de-CH-w-extend-extend", "de-CH-w-extend-extend", "de", null, "CH", null, "w-extend-extend"); }
+ //String langString, String formatted, String lang, String script, String region, String variant, String extension)
+
+ // Alignment : region is 3 num, variant is 5-8 num.
+ @Test public void test_lang_basic_11() { testRFC5646("en-123", "en-123", "en", null, "123", null, null); }
+ @Test public void test_lang_basic_12() { testRFC5646("en-12345", "en-12345", "en", null, null, "12345", null); }
+ @Test public void test_lang_basic_13() { testRFC5646("en-123-12345678", "en-123-12345678", "en", null, "123", "12345678", null); }
+ // Extension is "s-XX" (2 to 8).
+ @Test public void test_lang_basic_14() { testRFC5646("en-s-12", "en-s-12", "en", null, null, null, "s-12"); }
+ @Test public void test_lang_basic_15() { testRFC5646("en-s-12345678", "en-s-12345678", "en", null, null, null, "s-12345678"); }
+
@Test public void test_lang_basic_20() { testPrivateUse("de-CH-x-phonebk-morech", "de-CH-x-phonebk-morech", "de", null, "CH", null, null, "x-phonebk-morech"); }
- // Private use language tag. No language!
+ // Private use language tag.
@Test public void test_lang_basic_21() { testPrivateUse("x-private", "x-private", null, null, null, null, null, "x-private"); }
+ // Private use subtag.
@Test public void test_lang_basic_22() { testPrivateUse("az-Latn-x-latn", "az-Latn-x-latn", "az", "Latn", null, null, null, "x-latn"); }
@Test public void test_lang_basic_23() { testPrivateUse("sss-x-y", "sss-x-y", "sss", null, null, null, null, "x-y"); }
+ @Test public void test_lang_basic_24() { testPrivateUse("sss-x-1", "sss-x-1", "sss", null, null, null, null, "x-1"); }
+ @Test public void test_lang_basic_25() { testPrivateUse("sss-x-12345678", "sss-x-12345678", "sss", null, null, null, null, "x-12345678"); }
+ // Private use language: not language, only a private use section.
+ @Test public void test_lang_basic_26() { testPrivateUse("x-12345678", "x-12345678", null, null, null, null, null, "x-12345678"); }
// 4 chars reserved
// 5-8 characters
@@ -73,6 +88,8 @@ public class TestLangTag {
@Test public void test_lang_bad_21() { testBad("abcdefghz"); }
@Test public void test_lang_bad_22() { testBad("en-abcdefghz"); }
@Test public void test_lang_bad_23() { testBad("en-Latn-x-abcdefghz"); }
+ @Test public void test_lang_bad_24() { testBad("en-123456789"); }
+
// Bad extension
@Test public void test_lang_bad_31() { testBad("sss-d"); }
@@ -84,6 +101,7 @@ public class TestLangTag {
@Test public void test_lang_bad_45() { testBad("sss-x"); }
@Test public void test_lang_bad_46() { testBad("sss-x-"); }
@Test public void test_lang_bad_47() { testBad("sss-x-part-"); }
+ @Test public void test_lang_bad_48() { testBad("sss-x-part-Q12345678"); }
@Test public void test_lang_bad_repeated_extension() {
// "en-a-bbb-a-ccc" is invalid because the subtag 'a' appears twice.
diff --git a/jena-langtag/src/test/java/org/apache/jena/langtag/TestLangTagFormat.java b/jena-langtag/src/test/java/org/apache/jena/langtag/TestLangTagFormat.java
index c4c33c96bf..906bf2e4d5 100644
--- a/jena-langtag/src/test/java/org/apache/jena/langtag/TestLangTagFormat.java
+++ b/jena-langtag/src/test/java/org/apache/jena/langtag/TestLangTagFormat.java
@@ -18,38 +18,39 @@
package org.apache.jena.langtag;
-import java.util.ArrayList;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
import java.util.List;
import java.util.function.Function;
+import java.util.stream.Stream;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedClass;
+import org.junit.jupiter.params.provider.MethodSource;
-// JUnit4
-// Junit5 is missing @ParameterizedClass which may arrive eventually
-@RunWith(Parameterized.class)
+@ParameterizedClass
+@MethodSource("provideArgs")
public class TestLangTagFormat {
+
private static Function<String, String> formatter1 = (s)-> LangTagRFC5646.create(s).str();
private static Function<String, String> formatter2 = (s)-> LangTags.basicFormat(s);
- @Parameters(name = "{index}: {0}")
- public static Iterable<Object[]> data() {
- List<Object[]> x = new ArrayList<>() ;
-
- x.add(new Object[] {"LangTagRFC5646", formatter1});
- x.add(new Object[] {"LangTagOps", formatter2});
- return x ;
+ private record ArgPair(String name, Function<String, String> formatter) {}
+ private static Stream<ArgPair> provideArgs() {
+ return List.of
+ (new ArgPair("LangTagRFC5646", formatter1),
+ new ArgPair("LangTagOps", formatter2)
+ ).stream();
}
private final String formatterName;
private final Function<String, String> formatter;
- public TestLangTagFormat(String name, Function<String, String> formatter) {
- this.formatterName = name;
- this.formatter = formatter;
+ public TestLangTagFormat(@SuppressWarnings("exports") ArgPair args) {
+ this.formatterName = args.name;
+ this.formatter = args.formatter;
+
}
@Test public void testBasicFormat01() { test("de", "de"); }
@@ -137,6 +138,6 @@ public class TestLangTagFormat {
private void test(String langString, String expected) {
String result = formatter.apply(langString);
// JUnit4 argument order.
- org.junit.Assert.assertEquals(formatterName+"("+langString+"): ", expected, result);
+ assertEquals(expected, result, ()->formatterName+"("+langString+")");
}
}
(jena) 02/11: GH-3296: Add --base to uparse
Posted by an...@apache.org.
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
commit 692daaf0dc81a92a0af78bfea493926457ea179a
Author: Andy Seaborne <an...@apache.org>
AuthorDate: Sat Jul 5 10:41:53 2025 +0100
GH-3296: Add --base to uparse
---
jena-cmds/src/main/java/arq/uparse.java | 36 +++++++++++++++++++++------------
1 file changed, 23 insertions(+), 13 deletions(-)
diff --git a/jena-cmds/src/main/java/arq/uparse.java b/jena-cmds/src/main/java/arq/uparse.java
index ae6d1938e0..8ac71c360a 100644
--- a/jena-cmds/src/main/java/arq/uparse.java
+++ b/jena-cmds/src/main/java/arq/uparse.java
@@ -40,13 +40,16 @@ import org.apache.jena.util.FileUtils ;
public class uparse extends CmdARQ
{
- protected static final ArgDecl fileArg = new ArgDecl(ArgDecl.HasValue, "file", "update") ;
- protected static final ArgDecl syntaxArg = new ArgDecl(ArgDecl.HasValue, "syntax", "syn") ;
+ protected static final ArgDecl argFile = new ArgDecl(ArgDecl.HasValue, "file", "update") ;
+ protected static final ArgDecl argSyntax = new ArgDecl(ArgDecl.HasValue, "syntax", "syn") ;
+ protected static final ArgDecl argBase = new ArgDecl(ArgDecl.HasValue, "base") ;
protected static final ArgDecl argDeclPrint = new ArgDecl(ArgDecl.HasValue, "print") ;
protected static final ArgDecl argDeclFixup = new ArgDecl(ArgDecl.NoValue, "fixup") ;
List<String> requestFiles = null ;
protected Syntax updateSyntax = null ;
+ protected String baseURI = null;
+ protected boolean fixup = false;
private boolean printUpdate = false ;
private boolean printNone = false ;
@@ -55,27 +58,27 @@ public class uparse extends CmdARQ
protected uparse(String[] argv) {
super(argv) ;
- super.add(fileArg, "--file=FILE", "Update commands to parse") ;
- super.add(syntaxArg, "--syntax=name", "Update syntax") ;
+ super.add(argFile, "--file=FILE", "Update commands to parse") ;
+ super.add(argSyntax, "--syntax=name", "Update syntax") ;
+ super.add(argBase, "--base=IRI", "Base URI");
super.add(argDeclPrint, "--print", "Print in various forms [update, none]") ;
super.add(argDeclFixup, "--fixup", "Convert undeclared prefix names to URIs") ;
}
@Override
protected void processModulesAndArgs() {
- requestFiles = getValues(fileArg) ;
+ requestFiles = getValues(argFile) ;
super.processModulesAndArgs() ;
if ( super.cmdStrictMode )
- updateSyntax = Syntax.syntaxSPARQL_11 ;
+ updateSyntax = Syntax.syntaxSPARQL_12 ;
- if ( contains(argDeclFixup) )
- // Fixup undeclared prefix names.
- ARQ.set(ARQ.fixupUndefinedPrefixes, true);
+ if ( super.contains(argDeclFixup) )
+ fixup = true;
// Set syntax
- if ( super.contains(syntaxArg) ) {
+ if ( super.contains(argSyntax) ) {
// short name
- String s = super.getValue(syntaxArg) ;
+ String s = super.getValue(argSyntax) ;
Syntax syn = Syntax.lookup(s) ;
if ( syn == null )
super.cmdError("Unrecognized syntax: " + s + " ; Choices are: arq, sparql, sparql10, sparql11)") ;
@@ -91,6 +94,9 @@ public class uparse extends CmdARQ
throw new CmdException("Not a recognized print form: " + arg + " : Choices are: update, none" );
}
+ if ( super.contains(argBase) )
+ baseURI = super.getValue(argBase);
+
if ( !printUpdate && ! printNone )
printUpdate = true ;
}
@@ -103,6 +109,11 @@ public class uparse extends CmdARQ
@Override
protected void exec() {
+ if ( fixup )
+ // Fixup undeclared prefix names.
+ ARQ.set(ARQ.fixupUndefinedPrefixes, true);
+
+
for ( String filename : requestFiles ) {
Syntax syntax = updateSyntax;
if ( syntax == null )
@@ -138,7 +149,7 @@ public class uparse extends CmdARQ
private void execOne(String updateString, Syntax syntax) {
UpdateRequest req;
try {
- req = UpdateFactory.create(updateString, syntax);
+ req = UpdateFactory.create(updateString, baseURI, syntax);
} catch (QueryParseException ex) {
System.err.print("Parse error: ");
System.err.println(ex.getMessage());
@@ -170,7 +181,6 @@ public class uparse extends CmdARQ
public UpdateCheckException(String msg, Throwable cause) { super(msg, cause) ; }
}
-
public static void checkUpdate(UpdateRequest req, Syntax syntax) {
IndentedLineBuffer w = new IndentedLineBuffer() ;
UpdateWriter.output(req, w) ;
(jena) 09/11: Top of jena tests is JenaCoreTestAll.java
Posted by an...@apache.org.
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
commit 98fd2eee1fd86410cabcf69e419fec50239b873f
Author: Andy Seaborne <an...@apache.org>
AuthorDate: Thu Jul 10 12:26:44 2025 +0100
Top of jena tests is JenaCoreTestAll.java
---
jena-core/pom.xml | 2 +-
jena-core/src/main/java/org/apache/jena/irix/IRIs.java | 3 +--
.../org/apache/jena/test/{JenaCoreTest.java => JenaCoreTestAll.java} | 4 ++--
3 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/jena-core/pom.xml b/jena-core/pom.xml
index c474b6f52e..5c357d39cc 100644
--- a/jena-core/pom.xml
+++ b/jena-core/pom.xml
@@ -174,7 +174,7 @@
<configuration>
<argLine>-javaagent:${org.mockito:mockito-core:jar} -Xshare:off</argLine>
<includes>
- <include>org/apache/jena/test/TestPackage_core.java</include>
+ <include>org/apache/jena/test/JenaCoreTestAll.java</include>
</includes>
</configuration>
</plugin>
diff --git a/jena-core/src/main/java/org/apache/jena/irix/IRIs.java b/jena-core/src/main/java/org/apache/jena/irix/IRIs.java
index c8b5a6d41f..a603f38cd4 100644
--- a/jena-core/src/main/java/org/apache/jena/irix/IRIs.java
+++ b/jena-core/src/main/java/org/apache/jena/irix/IRIs.java
@@ -55,8 +55,7 @@ public class IRIs {
/**
* Check a string is valid syntax for an IRI,
- * is an absolute IRI (resolve if necessary)
- * and normalize (e.g. remove "./.." and "/../").
+ * is an absolute IRI (resolve if necessary).
*/
static public String checkEx(String iriStr) {
Objects.requireNonNull(iriStr);
diff --git a/jena-core/src/test/java/org/apache/jena/test/JenaCoreTest.java b/jena-core/src/test/java/org/apache/jena/test/JenaCoreTestAll.java
similarity index 97%
rename from jena-core/src/test/java/org/apache/jena/test/JenaCoreTest.java
rename to jena-core/src/test/java/org/apache/jena/test/JenaCoreTestAll.java
index c5bcdc6e0f..6c460926dc 100644
--- a/jena-core/src/test/java/org/apache/jena/test/JenaCoreTest.java
+++ b/jena-core/src/test/java/org/apache/jena/test/JenaCoreTestAll.java
@@ -25,11 +25,11 @@ import org.apache.jena.sys.JenaSystem;
/**
* Jena core test suite.
*/
-public class TestPackage_core extends TestCase {
+public class JenaCoreTestAll extends TestCase {
static public TestSuite suite() {
JenaSystem.init();
- // Include old Turtle parser - not up-to-date but enouhg to read test input files
+ // Include old Turtle parser - not up-to-date but enough to read test input files
RDFReaderFImpl.alternative(new X_RDFReaderF());
TestSuite ts = new TestSuite() ;
(jena) 05/11: Update ExProg2.java
Posted by an...@apache.org.
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
commit e9646012d3a0cb8b742e36a9314700deeea95a85
Author: Andy Seaborne <an...@apache.org>
AuthorDate: Mon Jul 7 17:41:25 2025 +0100
Update ExProg2.java
---
.../src/main/java/arq/examples/ExProg2.java | 151 ++++++++++-----------
1 file changed, 72 insertions(+), 79 deletions(-)
diff --git a/jena-examples/src/main/java/arq/examples/ExProg2.java b/jena-examples/src/main/java/arq/examples/ExProg2.java
index cf54fed371..c3a4b817ca 100644
--- a/jena-examples/src/main/java/arq/examples/ExProg2.java
+++ b/jena-examples/src/main/java/arq/examples/ExProg2.java
@@ -20,101 +20,94 @@ package arq.examples;
// The ARQ application API.
-import org.apache.jena.atlas.io.IndentedWriter ;
-import org.apache.jena.graph.Triple ;
-import org.apache.jena.query.* ;
-import org.apache.jena.rdf.model.* ;
-import org.apache.jena.sparql.core.Var ;
-import org.apache.jena.sparql.expr.E_Regex ;
-import org.apache.jena.sparql.expr.Expr ;
-import org.apache.jena.sparql.expr.ExprVar ;
-import org.apache.jena.sparql.syntax.ElementFilter ;
-import org.apache.jena.sparql.syntax.ElementGroup ;
-import org.apache.jena.vocabulary.DC ;
+import org.apache.jena.atlas.io.IndentedWriter;
+import org.apache.jena.graph.Triple;
+import org.apache.jena.query.*;
+import org.apache.jena.rdf.model.*;
+import org.apache.jena.sparql.core.Var;
+import org.apache.jena.sparql.expr.E_Regex;
+import org.apache.jena.sparql.expr.Expr;
+import org.apache.jena.sparql.expr.ExprVar;
+import org.apache.jena.sparql.syntax.ElementFilter;
+import org.apache.jena.sparql.syntax.ElementGroup;
+import org.apache.jena.vocabulary.DC;
/** Example : Build a query with a filter programmatically.
* Note: it is often better to build and execute an algebra expression. See other examples. */
public class ExProg2
{
- static public final String NL = System.getProperty("line.separator") ;
-
- public static void main(String[] args)
- {
- Model model = createModel() ;
-
- Query query = QueryFactory.make() ;
- query.setQuerySelectType() ;
-
+ static public final String NL = System.getProperty("line.separator");
+
+ public static void main(String[] args) {
+ Model model = createModel();
+
+ Query query = QueryFactory.make();
+ query.setQuerySelectType();
+
// See also ExProg1
-
- ElementGroup elg = new ElementGroup() ;
-
- Var varTitle = Var.alloc("title") ;
- Var varX = Var.alloc("x") ;
-
- Triple t1 = Triple.create(varX, DC.title.asNode(), varTitle) ;
- elg.addTriplePattern(t1) ;
-
- // Adds a filter. Need to wrap variable in a NodeVar.
- Expr expr = new E_Regex(new ExprVar(varTitle), "sparql", "i") ;
- ElementFilter filter = new ElementFilter(expr) ;
- elg.addElementFilter(filter) ;
-
- // Attach the group to query.
- query.setQueryPattern(elg) ;
-
+
+ ElementGroup elg = new ElementGroup();
+
+ Var varTitle = Var.alloc("title");
+ Var varX = Var.alloc("x");
+
+ Triple t1 = Triple.create(varX, DC.title.asNode(), varTitle);
+ elg.addTriplePattern(t1);
+
+ // Adds a filter. Need to wrap variable in a NodeVar.
+ Expr expr = new E_Regex(new ExprVar(varTitle), "sparql", "i");
+ ElementFilter filter = new ElementFilter(expr);
+ elg.addElement(filter);
+
+ // Attach the group to query.
+ query.setQueryPattern(elg);
+
// Choose what we want - SELECT ?title
- query.addResultVar(varTitle) ;
-
+ query.addResultVar(varTitle);
+
// Print query with line numbers
// Prefix mapping just helps serialization
- query.getPrefixMapping().setNsPrefix("dc" , DC.getURI()) ;
- query.serialize(new IndentedWriter(System.out,true)) ;
- System.out.println() ;
-
- try(QueryExecution qexec = QueryExecutionFactory.create(query, model)) {
+ query.getPrefixMapping().setNsPrefix("dc", DC.getURI());
+ query.serialize(new IndentedWriter(System.out, true));
+ System.out.println();
+
+ try (QueryExecution qexec = QueryExecutionFactory.create(query, model)) {
// Assumption: it's a SELECT query.
- ResultSet rs = qexec.execSelect() ;
-
+ ResultSet rs = qexec.execSelect();
+
// The order of results is undefined.
- System.out.println("Titles: ") ;
- for ( ; rs.hasNext() ; )
- {
- QuerySolution rb = rs.nextSolution() ;
-
+ System.out.println("Titles: ");
+ for ( ; rs.hasNext() ; ) {
+ QuerySolution rb = rs.nextSolution();
+
// Get title - variable names do not include the '?' (or '$')
- RDFNode x = rb.get("title") ;
-
+ RDFNode x = rb.get("title");
+
// Check the type of the result value
- if ( x instanceof Literal )
- {
- Literal titleStr = (Literal)x ;
- System.out.println(" "+titleStr) ;
- }
- else
- System.out.println("Strange - not a literal: "+x) ;
-
+ if ( x instanceof Literal ) {
+ Literal titleStr = (Literal)x;
+ System.out.println(" " + titleStr);
+ } else
+ System.out.println("Strange - not a literal: " + x);
+
}
}
}
-
- public static Model createModel()
- {
- Model model = ModelFactory.createDefaultModel() ;
-
- Resource r1 = model.createResource("http://example.org/book#1") ;
- Resource r2 = model.createResource("http://example.org/book#2") ;
- Resource r3 = model.createResource("http://example.org/book#3") ;
-
- r1.addProperty(DC.title, "SPARQL - the book")
- .addProperty(DC.description, "A book about SPARQL") ;
-
- r2.addProperty(DC.title, "Advanced techniques for SPARQL") ;
-
- r3.addProperty(DC.title, "Jena - an RDF framework for Java")
- .addProperty(DC.description, "A book about Jena") ;
-
- return model ;
+
+ public static Model createModel() {
+ Model model = ModelFactory.createDefaultModel();
+
+ Resource r1 = model.createResource("http://example.org/book#1");
+ Resource r2 = model.createResource("http://example.org/book#2");
+ Resource r3 = model.createResource("http://example.org/book#3");
+
+ r1.addProperty(DC.title, "SPARQL - the book").addProperty(DC.description, "A book about SPARQL");
+
+ r2.addProperty(DC.title, "Advanced techniques for SPARQL");
+
+ r3.addProperty(DC.title, "Jena - an RDF framework for Java").addProperty(DC.description, "A book about Jena");
+
+ return model;
}
}
(jena) 10/11: GH-3303: Deal with bad URIs as namespaces when writing RDF/XML
Posted by an...@apache.org.
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
commit 7588c3896c35c257e0c9cbbb97c306de67ec70e5
Author: Andy Seaborne <an...@apache.org>
AuthorDate: Thu Jul 10 12:37:29 2025 +0100
GH-3303: Deal with bad URIs as namespaces when writing RDF/XML
---
jena-arq/src/main/java/org/apache/jena/riot/RDFFormat.java | 2 +-
.../java/org/apache/jena/rdfxml/xmloutput/impl/BaseXMLWriter.java | 7 +++++++
.../src/main/java/org/apache/jena/fuseki/servlets/ActionLib.java | 4 ++--
3 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/RDFFormat.java b/jena-arq/src/main/java/org/apache/jena/riot/RDFFormat.java
index b65fe3de88..5ddcdca52b 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/RDFFormat.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/RDFFormat.java
@@ -271,6 +271,6 @@ public class RDFFormat {
public String toString() {
if ( variant == null )
return lang.getName() ;
- return lang.getName() + "/" + variant ;
+ return lang.getName() + "_" + variant ;
}
}
diff --git a/jena-core/src/main/java/org/apache/jena/rdfxml/xmloutput/impl/BaseXMLWriter.java b/jena-core/src/main/java/org/apache/jena/rdfxml/xmloutput/impl/BaseXMLWriter.java
index 07eac7411e..045e168658 100644
--- a/jena-core/src/main/java/org/apache/jena/rdfxml/xmloutput/impl/BaseXMLWriter.java
+++ b/jena-core/src/main/java/org/apache/jena/rdfxml/xmloutput/impl/BaseXMLWriter.java
@@ -221,6 +221,13 @@ abstract public class BaseXMLWriter implements RDFXMLWriterI {
String value = e.getValue();
String already = this.getPrefixFor(value);
if ( already == null ) {
+ try {
+ checkURI(value);
+ } catch(IRIException ex) {
+ // If it is a bad URI, skip don't use it.
+ // j.N may be generated.
+ continue;
+ }
this.setNsPrefix(model.getNsURIPrefix(value), value);
if ( writingAllModelPrefixNamespaces ) {
this.addNameSpace(value);
diff --git a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/ActionLib.java b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/ActionLib.java
index c274db9422..099a6afea9 100644
--- a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/ActionLib.java
+++ b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/ActionLib.java
@@ -338,7 +338,7 @@ public class ActionLib {
* One of {@code lang} and {@code fmt} maybe null and will be calculated.
* {@code actualContentType} maybe null in which case the standard content type for the syntax is used.
*/
- private static void writeResponse(HttpAction action, BiConsumer<OutputStream, RDFFormat> writeAction,RDFFormat fmt, String actualContentType) {
+ private static void writeResponse(HttpAction action, BiConsumer<OutputStream, RDFFormat> writeAction, RDFFormat fmt, String actualContentType) {
String ct = actualContentType;
Lang lang = fmt.getLang();
if ( ct == null )
@@ -356,7 +356,7 @@ public class ActionLib {
writeAction.accept(bout, fmt);
bytes = bout.toByteArray();
} catch (JenaException ex) {
- // Problems formatting.
+ // Problems formatting in RDF/XML.
action.log.warn(format("[%d] Failed to produce %s: %s", action.id, lang.getLabel(), ex.getMessage()));
ServletOps.error(HttpSC.NOT_ACCEPTABLE_406);
return;
(jena) 04/11: Deprecate ElementGroup.addFilterElement
Posted by an...@apache.org.
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
commit f71ccc4c1d0c757e74327eae6cbf1c2926d989e7
Author: Andy Seaborne <an...@apache.org>
AuthorDate: Mon Jul 7 17:41:04 2025 +0100
Deprecate ElementGroup.addFilterElement
---
jena-arq/src/main/java/org/apache/jena/sparql/syntax/ElementGroup.java | 2 ++
1 file changed, 2 insertions(+)
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/syntax/ElementGroup.java b/jena-arq/src/main/java/org/apache/jena/sparql/syntax/ElementGroup.java
index 35cd652762..af68c551e3 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/syntax/ElementGroup.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/syntax/ElementGroup.java
@@ -43,6 +43,8 @@ public class ElementGroup extends Element {
ensureBGP().addTriple(t);
}
+ /** @deprecated Use {@link #addElement} */
+ @Deprecated(forRemoval = true)
public void addElementFilter(ElementFilter el) {
addElement(el);
}