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 2023/11/07 16:49:54 UTC
(jena) branch main updated (d111e3e8cb -> 4f61526e1d)
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 d111e3e8cb [GH-2054] Disable wss, remove manual chunks (build error)
new 1bd2549916 Rename overloaded name 'TestPackage'
new dd5d50f77a Fix white space
new fef209ef07 Publish TDB2 test artifacts
new 35983ce8e7 Fix javadoc warnings
new b43add82ae GH-2077: Move NamedGraphWrapper into DatsetGraphMap
new 4f61526e1d GH-2078: Graph.sizeLong()
The 6 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:
.../process/normalize/StreamCanonicalLangTag.java | 14 +--
.../jena/sparql/core/DatasetGraphFactory.java | 45 ++++----
.../apache/jena/sparql/core/DatasetGraphMap.java | 126 ++++++++++++++-------
.../org/apache/jena/sparql/core/NamedGraph.java | 11 +-
.../apache/jena/sparql/core/NamedGraphWrapper.java | 49 --------
.../sparql/graph/AbstractTestGraphAddDelete.java | 41 +++----
.../src/main/java/org/apache/jena/graph/Graph.java | 17 ++-
.../{TestPackage.java => TestPackage_Rules.java} | 8 +-
.../jena/reasoner/test/TestPackage_reasoners.java | 2 +-
.../{TestPackage.java => TestPackage_core.java} | 2 +-
.../apache/jena/tdb1/store/DatasetPrefixesTDB.java | 2 +-
.../jena/tdb1/store/nodetable/NodeTable.java | 28 ++---
jena-tdb2/pom.xml | 12 ++
13 files changed, 180 insertions(+), 177 deletions(-)
delete mode 100644 jena-arq/src/main/java/org/apache/jena/sparql/core/NamedGraphWrapper.java
rename jena-core/src/test/java/org/apache/jena/reasoner/rulesys/test/{TestPackage.java => TestPackage_Rules.java} (95%)
rename jena-core/src/test/java/org/apache/jena/test/{TestPackage.java => TestPackage_core.java} (98%)
(jena) 06/06: GH-2078: Graph.sizeLong()
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 4f61526e1d072a18221a86a6ca96affed564c2be
Author: Andy Seaborne <an...@apache.org>
AuthorDate: Mon Nov 6 21:37:33 2023 +0000
GH-2078: Graph.sizeLong()
---
.../sparql/graph/AbstractTestGraphAddDelete.java | 41 +++++++++++-----------
.../src/main/java/org/apache/jena/graph/Graph.java | 17 ++++++---
2 files changed, 34 insertions(+), 24 deletions(-)
diff --git a/jena-arq/src/test/java/org/apache/jena/sparql/graph/AbstractTestGraphAddDelete.java b/jena-arq/src/test/java/org/apache/jena/sparql/graph/AbstractTestGraphAddDelete.java
index 34914c81f6..390b1127b1 100644
--- a/jena-arq/src/test/java/org/apache/jena/sparql/graph/AbstractTestGraphAddDelete.java
+++ b/jena-arq/src/test/java/org/apache/jena/sparql/graph/AbstractTestGraphAddDelete.java
@@ -39,24 +39,25 @@ public abstract class AbstractTestGraphAddDelete
protected static final Node s2 = NodeFactoryExtra.parseNode("<ex:s2>") ;
protected static final Node p2 = NodeFactoryExtra.parseNode("<ex:p2>") ;
protected static final Node o2 = NodeFactoryExtra.parseNode("<ex:o2>") ;
-
+
protected static final Node lit1 = NodeFactoryExtra.parseNode("'lex'") ;
protected static final Node lit2 = NodeFactoryExtra.parseNode("'lex'@en") ;
protected static final Node lit3 = NodeFactoryExtra.parseNode("123") ;
-
+
static Triple triple(Node s, Node p, Node o)
{ return Triple.create(s, p, o) ; }
-
+
protected abstract Graph emptyGraph() ;
protected abstract void returnGraph(Graph g) ;
-
+
@Test public void graph_01()
{
Graph g = emptyGraph() ;
assertEquals(0, g.size()) ;
+ assertEquals(0L, g.sizeLong()) ;
returnGraph(g) ;
}
-
+
@Test public void graph_add_01()
{
Graph g = emptyGraph() ;
@@ -67,7 +68,7 @@ public abstract class AbstractTestGraphAddDelete
assertTrue(g.contains(s1,p1,o1)) ;
returnGraph(g) ;
}
-
+
@Test public void graph_add_02()
{
Graph g = emptyGraph() ;
@@ -81,7 +82,7 @@ public abstract class AbstractTestGraphAddDelete
returnGraph(g) ;
}
-
+
@Test public void graph_add_03()
{
Graph g = emptyGraph() ;
@@ -89,11 +90,11 @@ public abstract class AbstractTestGraphAddDelete
Node ns1 = NodeFactoryExtra.parseNode("<ex:s>") ;
Node np1 = NodeFactoryExtra.parseNode("<ex:p>") ;
Node no1 = NodeFactoryExtra.parseNode("<ex:o>") ;
-
+
Node ns2 = NodeFactoryExtra.parseNode("<ex:s>") ;
Node np2 = NodeFactoryExtra.parseNode("<ex:p>") ;
Node no2 = NodeFactoryExtra.parseNode("<ex:o>") ;
-
+
Triple t1 = triple(ns1, np1, no1) ;
Triple t2 = triple(ns2, np2, no2) ;
g.add(t1) ;
@@ -123,8 +124,8 @@ public abstract class AbstractTestGraphAddDelete
assertFalse(g.contains(s1,p1,o)) ;
returnGraph(g) ;
- }
-
+ }
+
@Test public void graph_add_delete_01()
{
Graph g = emptyGraph() ;
@@ -135,7 +136,7 @@ public abstract class AbstractTestGraphAddDelete
assertFalse("g contains t", g.contains(t)) ;
returnGraph(g) ;
}
-
+
@Test public void graph_add_delete_02()
{
Graph g = emptyGraph() ;
@@ -160,13 +161,13 @@ public abstract class AbstractTestGraphAddDelete
assertFalse("g contains t", g.contains(t)) ;
returnGraph(g) ;
}
-
+
@Test public void graph_add_delete_04()
{
Graph g = emptyGraph() ;
Triple t1 = triple(s1, p1, o1) ;
Triple t2 = triple(s2, p2, o2) ;
-
+
g.add(t1) ;
g.add(t2) ;
g.delete(t1) ;
@@ -187,7 +188,7 @@ public abstract class AbstractTestGraphAddDelete
assertTrue(g.contains(t1)) ;
returnGraph(g) ;
}
-
+
@Test public void graph_add_find_02()
{
// Tests the "unknown node" handling
@@ -201,7 +202,7 @@ public abstract class AbstractTestGraphAddDelete
}
private static Node any = Node.ANY ;
-
+
@Test public void remove_01()
{
Graph g = emptyGraph() ;
@@ -211,7 +212,7 @@ public abstract class AbstractTestGraphAddDelete
assertEquals(0, g.size()) ;
returnGraph(g) ;
}
-
+
@Test public void remove_02()
{
Graph g = emptyGraph() ;
@@ -248,7 +249,7 @@ public abstract class AbstractTestGraphAddDelete
assertEquals(0, g.size()) ;
returnGraph(g) ;
}
-
+
@Test public void count_01()
{
Graph g = emptyGraph() ;
@@ -258,7 +259,7 @@ public abstract class AbstractTestGraphAddDelete
assertEquals(1, g.size()) ;
returnGraph(g) ;
}
-
+
// Tests : triples and values.
-
+
}
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 06903e4b10..330fd62356 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
@@ -47,8 +47,7 @@ import org.apache.jena.util.iterator.NullIterator ;
@see GraphBase for an implementation framework.
*/
-public interface Graph
- {
+public interface Graph {
/**
An immutable empty graph.
*/
@@ -211,14 +210,24 @@ public interface Graph
boolean isEmpty();
/**
- * For a concrete graph this returns the number of triples in the graph. For graphs which
+ * For a concrete graph, this returns the number of triples in the graph. For graphs which
* might infer additional triples it results an estimated lower bound of the number of triples.
* For example, an inference graph might return the number of triples in the raw data graph.
+ *
+ * @see #sizeLong
*/
int size();
+ /**
+ * For a concrete graph, this returns the number of triples in the graph. For graphs which
+ * might infer additional triples it results an estimated lower bound of the number of triples.
+ * For example, an inference graph might return the number of triples in the raw data graph.
+ * This method returns a long.
+ */
+ default long sizeLong() { return size(); }
+
/**
Answer true iff .close() has been called on this Graph.
*/
boolean isClosed();
- }
+}
(jena) 05/06: GH-2077: Move NamedGraphWrapper into DatsetGraphMap
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 b43add82aeb5631e6d6635e8ec50e36eee3839ca
Author: Andy Seaborne <an...@apache.org>
AuthorDate: Mon Nov 6 21:31:24 2023 +0000
GH-2077: Move NamedGraphWrapper into DatsetGraphMap
---
.../jena/sparql/core/DatasetGraphFactory.java | 45 ++++----
.../apache/jena/sparql/core/DatasetGraphMap.java | 126 ++++++++++++++-------
.../org/apache/jena/sparql/core/NamedGraph.java | 11 +-
.../apache/jena/sparql/core/NamedGraphWrapper.java | 49 --------
4 files changed, 107 insertions(+), 124 deletions(-)
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/core/DatasetGraphFactory.java b/jena-arq/src/main/java/org/apache/jena/sparql/core/DatasetGraphFactory.java
index 03b879801b..e4a865ce7e 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/core/DatasetGraphFactory.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/core/DatasetGraphFactory.java
@@ -18,15 +18,15 @@
package org.apache.jena.sparql.core;
-import java.util.Iterator ;
-import java.util.Objects ;
+import java.util.Iterator;
+import java.util.Objects;
-import org.apache.jena.graph.Graph ;
-import org.apache.jena.graph.Node ;
-import org.apache.jena.query.Dataset ;
-import org.apache.jena.rdf.model.Model ;
+import org.apache.jena.graph.Graph;
+import org.apache.jena.graph.Node;
+import org.apache.jena.query.Dataset;
+import org.apache.jena.rdf.model.Model;
import org.apache.jena.sparql.core.mem.DatasetGraphInMemory;
-import org.apache.jena.sparql.graph.GraphFactory ;
+import org.apache.jena.sparql.graph.GraphFactory;
import org.apache.jena.sys.JenaSystem;
public class DatasetGraphFactory
@@ -45,7 +45,7 @@ public class DatasetGraphFactory
* @see #createTxnMem
*/
public static DatasetGraph create() {
- return new DatasetGraphMap() ;
+ return new DatasetGraphMap();
}
/**
@@ -94,20 +94,20 @@ public class DatasetGraphFactory
* @return a general-purpose Dataset
*/
public static DatasetGraph createGeneral(Graph dftGraph) {
- return new DatasetGraphMapLink(dftGraph, graphMakerMem) ;
+ return new DatasetGraphMapLink(dftGraph, graphMakerMem);
}
/**
* Clone the structure of a {@link DatasetGraph}.
*/
public static DatasetGraph cloneStructure(DatasetGraph dsg) {
- Objects.requireNonNull(dsg, "DatasetGraph must be provided") ;
- DatasetGraphMapLink dsg2 = new DatasetGraphMapLink(dsg.getDefaultGraph()) ;
- for ( Iterator<Node> names = dsg.listGraphNodes() ; names.hasNext() ; ) {
- Node gn = names.next() ;
- dsg2.addGraph(gn, dsg.getGraph(gn)) ;
+ Objects.requireNonNull(dsg, "DatasetGraph must be provided");
+ DatasetGraphMapLink dsg2 = new DatasetGraphMapLink(dsg.getDefaultGraph());
+ for ( Iterator<Node> names = dsg.listGraphNodes(); names.hasNext(); ) {
+ Node gn = names.next();
+ dsg2.addGraph(gn, dsg.getGraph(gn));
}
- return dsg2 ;
+ return dsg2;
}
/**
@@ -121,7 +121,7 @@ public class DatasetGraphFactory
/**
* Create a DatasetGraph which only ever has a single default graph.
*/
- public static DatasetGraph wrap(Graph graph) { return DatasetGraphOne.create(graph) ; }
+ public static DatasetGraph wrap(Graph graph) { return DatasetGraphOne.create(graph); }
/**
* An always empty {@link DatasetGraph}.
@@ -130,21 +130,14 @@ public class DatasetGraphFactory
*/
public static DatasetGraph empty() { return DatasetGraphZero.create(); }
-
/** Interface for making graphs when a dataset needs to add a new graph.
* Return null for no graph created.
*/
- public interface GraphMaker { public Graph create(Node name) ; }
+ public interface GraphMaker { public Graph create(Node name); }
/** A graph maker that doesn't make graphs. */
- public static GraphMaker graphMakerNull = (name) -> null ;
+ public static GraphMaker graphMakerNull = (name) -> null;
/** A graph maker that creates unnamed Jena default graphs */
- public static GraphMaker graphMakerMem = (name) -> GraphFactory.createDefaultGraph() ;
-
- /** A graph maker that creates {@link NamedGraph}s around a Jena default graphs */
- public static GraphMaker graphMakerNamedGraphMem = (name) -> {
- Graph g = GraphFactory.createDefaultGraph() ;
- return new NamedGraphWrapper(name, g);
- };
+ public static GraphMaker graphMakerMem = (name) -> GraphFactory.createDefaultGraph();
}
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/core/DatasetGraphMap.java b/jena-arq/src/main/java/org/apache/jena/sparql/core/DatasetGraphMap.java
index 38fb05db60..ede679433e 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/core/DatasetGraphMap.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/core/DatasetGraphMap.java
@@ -18,22 +18,23 @@
package org.apache.jena.sparql.core;
-import java.util.HashMap ;
-import java.util.Iterator ;
-import java.util.Map ;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
import java.util.Map.Entry;
-import org.apache.jena.atlas.iterator.IteratorConcat ;
-import org.apache.jena.graph.Graph ;
-import org.apache.jena.graph.Node ;
-import org.apache.jena.graph.Triple ;
-import org.apache.jena.query.ReadWrite ;
+import org.apache.jena.atlas.iterator.IteratorConcat;
+import org.apache.jena.graph.Graph;
+import org.apache.jena.graph.Node;
+import org.apache.jena.graph.Triple;
+import org.apache.jena.query.ReadWrite;
import org.apache.jena.query.TxnType;
import org.apache.jena.riot.system.PrefixMap;
import org.apache.jena.riot.system.Prefixes;
-import org.apache.jena.sparql.ARQException ;
-import org.apache.jena.sparql.core.DatasetGraphFactory.GraphMaker ;
+import org.apache.jena.sparql.ARQException;
+import org.apache.jena.sparql.core.DatasetGraphFactory.GraphMaker;
import org.apache.jena.sparql.graph.GraphOps;
+import org.apache.jena.sparql.graph.GraphWrapper;
import org.apache.jena.system.G;
/** Implementation of a {@code DatasetGraph} as an extensible set of graphs.
@@ -47,32 +48,43 @@ import org.apache.jena.system.G;
*/
public class DatasetGraphMap extends DatasetGraphTriplesQuads
{
- private final GraphMaker graphMaker ;
- private final Map<Node, Graph> graphs = new HashMap<>() ;
- private final Graph defaultGraph ;
- private final PrefixMap prefixes ;
+ private final GraphMaker graphMaker;
+ private final Map<Node, Graph> graphs = new HashMap<>();
+ private final Graph defaultGraph;
+ private final PrefixMap prefixes;
/** DatasetGraphMap defaulting to storage in memory. */
public DatasetGraphMap() {
- this(DatasetGraphFactory.graphMakerNamedGraphMem) ;
+ this(null, DatasetGraphFactory.graphMakerMem);
}
- /** DatasetGraphMap with a specific policy for graph creation.
- * This allows control over the storage.
- */
- public DatasetGraphMap(GraphMaker graphMaker) {
- this(graphMaker.create(null), graphMaker) ;
+ public DatasetGraphMap(Graph defaultGraph) {
+ this(defaultGraph, DatasetGraphFactory.graphMakerMem);
}
- private DatasetGraphMap(Graph defaultGraph, GraphMaker graphMaker) {
- this.defaultGraph = defaultGraph ;
- this.graphMaker = graphMaker ;
- // Preserves legacy behaviour of "getDefaultGraph" having prefixes.
+ private DatasetGraphMap(Graph baseDefaultGraph, GraphMaker baseGraphMaker) {
+ this.graphMaker = namedGraphMaker(baseGraphMaker);
+ if ( baseDefaultGraph == null )
+ this.defaultGraph = this.graphMaker.create(null);
+ else if ( baseDefaultGraph instanceof NamedGraph )
+ this.defaultGraph = baseDefaultGraph;
+ else
+ this.defaultGraph = graphMaker.create(null);
this.prefixes = Prefixes.adapt(defaultGraph);
}
+ /* Ensure a GraphMaker returns {@link NamedGraph}. */
+ private static GraphMaker namedGraphMaker(GraphMaker baseMaker) {
+ return (name) -> {
+ Graph g = baseMaker.create(name);
+ if ( g instanceof NamedGraph )
+ return g;
+ return new NamedGraphWrapper(name, g);
+ };
+ }
+
// ----
- private final Transactional txn = TransactionalLock.createMRSW() ;
+ private final Transactional txn = TransactionalLock.createMRSW();
private final Transactional txn() { return txn; }
@Override public void begin() { txn().begin(); }
@Override public void begin(TxnType txnType) { txn().begin(txnType); }
@@ -112,49 +124,49 @@ public class DatasetGraphMap extends DatasetGraphTriplesQuads
@Override
protected void addToDftGraph(Node s, Node p, Node o) {
- getDefaultGraph().add(Triple.create(s, p, o)) ;
+ getDefaultGraph().add(Triple.create(s, p, o));
}
@Override
protected void addToNamedGraph(Node g, Node s, Node p, Node o) {
- getGraph(g).add(Triple.create(s, p, o)) ;
+ getGraph(g).add(Triple.create(s, p, o));
}
@Override
protected void deleteFromDftGraph(Node s, Node p, Node o) {
- getDefaultGraph().delete(Triple.create(s, p, o)) ;
+ getDefaultGraph().delete(Triple.create(s, p, o));
}
@Override
protected void deleteFromNamedGraph(Node g, Node s, Node p, Node o) {
- getGraph(g).delete(Triple.create(s, p, o)) ;
+ getGraph(g).delete(Triple.create(s, p, o));
}
@Override
protected Iterator<Quad> findInDftGraph(Node s, Node p, Node o) {
- Iterator<Triple> iter = getDefaultGraph().find(s, p, o) ;
- return G.triples2quadsDftGraph(iter) ;
+ Iterator<Triple> iter = getDefaultGraph().find(s, p, o);
+ return G.triples2quadsDftGraph(iter) ;
}
@Override
protected Iterator<Quad> findInSpecificNamedGraph(Node g, Node s, Node p, Node o) {
- Iterator<Triple> iter = getGraph(g).find(s, p, o) ;
- return G.triples2quads(g, iter) ;
+ Iterator<Triple> iter = getGraph(g).find(s, p, o);
+ return G.triples2quads(g, iter);
}
@Override
protected Iterator<Quad> findInAnyNamedGraphs(Node s, Node p, Node o) {
- Iterator<Node> gnames = listGraphNodes() ;
- IteratorConcat<Quad> iter = new IteratorConcat<>() ;
+ Iterator<Node> gnames = listGraphNodes();
+ IteratorConcat<Quad> iter = new IteratorConcat<>();
// Named graphs
- for ( ; gnames.hasNext() ; ) {
+ for (; gnames.hasNext(); ) {
Node gn = gnames.next();
- Iterator<Quad> qIter = findInSpecificNamedGraph(gn, s, p, o) ;
+ Iterator<Quad> qIter = findInSpecificNamedGraph(gn, s, p, o);
if ( qIter != null )
- iter.add(qIter) ;
+ iter.add(qIter);
}
- return iter ;
+ return iter;
}
@Override
@@ -165,9 +177,9 @@ public class DatasetGraphMap extends DatasetGraphTriplesQuads
@Override
public Graph getGraph(Node graphNode) {
if ( Quad.isUnionGraph(graphNode) )
- return GraphOps.unionGraph(this) ;
+ return GraphOps.unionGraph(this);
if ( Quad.isDefaultGraph(graphNode))
- return getDefaultGraph() ;
+ return getDefaultGraph();
// Not a special case.
Graph g = graphs.get(graphNode);
if ( g == null ) {
@@ -189,14 +201,40 @@ public class DatasetGraphMap extends DatasetGraphTriplesQuads
* Sub classes can reimplement this.
*/
protected Graph getGraphCreate(Node graphNode) {
- Graph g = graphMaker.create(graphNode) ;
+ Graph g = graphMaker.create(graphNode);
if ( g == null )
- throw new ARQException("Can't make new graphs") ;
- return g ;
+ throw new ARQException("Can't make new graphs");
+ return g;
}
@Override
public long size() {
return graphs.size();
}
+
+ /**
+ * Add a name to a graph.
+ *
+ * @see GraphView
+ */
+ private static class NamedGraphWrapper extends GraphWrapper implements NamedGraph {
+
+ private final Node graphName;
+
+ public NamedGraphWrapper(Node graphName, Graph graph) {
+ super(graph);
+ this.graphName = graphName;
+ }
+
+ @Override
+ public Node getGraphName() {
+ return graphName;
+ }
+
+ @Override
+ public String toString() {
+ return "NamedGraphWrapper("+graphName+")";
+ }
+ }
+
}
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/core/NamedGraph.java b/jena-arq/src/main/java/org/apache/jena/sparql/core/NamedGraph.java
index 77db174c0d..8ec566df9e 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/core/NamedGraph.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/core/NamedGraph.java
@@ -27,11 +27,12 @@ import org.apache.jena.graph.Node ;
* Sometimes there is an associated name with a graph, where it lives on the web,
* or the name in a dataset.
* <p>
- * This interface is for graph that have one associated name.
- * What "associated" means is left open.
- *
+ * This interface is for graph that has one associated name.
+ * What "associated" means is left open.
+ * <p>
+ * This interface is used be Jena Text.
+ *
* @see GraphView
- * @see NamedGraphWrapper
*/
public interface NamedGraph extends Graph {
@@ -39,7 +40,7 @@ public interface NamedGraph extends Graph {
* Return the graph name for this graph.
* Blank nodes can be used.
* <p>
- * A named graph of "null" is discouraged - use {@link Quad#defaultGraphIRI}
+ * A named graph of "null" is discouraged - use {@link Quad#defaultGraphIRI} - but is legal.
* for a default graph in the context of use.
*/
public Node getGraphName();
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/core/NamedGraphWrapper.java b/jena-arq/src/main/java/org/apache/jena/sparql/core/NamedGraphWrapper.java
deleted file mode 100644
index 110d1eaa3e..0000000000
--- a/jena-arq/src/main/java/org/apache/jena/sparql/core/NamedGraphWrapper.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.jena.sparql.core;
-
-import org.apache.jena.graph.Graph ;
-import org.apache.jena.graph.Node ;
-import org.apache.jena.sparql.graph.GraphWrapper ;
-
-/**
- * Add a name to a graph.
- *
- * @see GraphView
- */
-
-public class NamedGraphWrapper extends GraphWrapper implements NamedGraph {
-
- private final Node graphName;
-
- public NamedGraphWrapper(Node graphName, Graph graph) {
- super(graph);
- this.graphName = graphName;
- }
-
- @Override
- public Node getGraphName() {
- return graphName;
- }
-
- @Override
- public String toString() {
- return "NamedGraphWrapper("+graphName+")";
- }
-}
(jena) 03/06: Publish TDB2 test artifacts
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 fef209ef0778b5be2d2d843edca03188ed20c463
Author: Andy Seaborne <an...@apache.org>
AuthorDate: Thu Nov 2 11:24:09 2023 +0000
Publish TDB2 test artifacts
---
jena-tdb2/pom.xml | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/jena-tdb2/pom.xml b/jena-tdb2/pom.xml
index 25250c1d5f..961c1ef751 100644
--- a/jena-tdb2/pom.xml
+++ b/jena-tdb2/pom.xml
@@ -109,6 +109,18 @@
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>test-jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
</plugins>
</build>
</project>
(jena) 01/06: Rename overloaded name 'TestPackage'
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 1bd2549916810f72dbb91a1ecac48700839a5458
Author: Andy Seaborne <an...@apache.org>
AuthorDate: Thu Nov 2 18:13:38 2023 +0000
Rename overloaded name 'TestPackage'
---
.../rulesys/test/{TestPackage.java => TestPackage_Rules.java} | 8 ++++----
.../java/org/apache/jena/reasoner/test/TestPackage_reasoners.java | 2 +-
.../apache/jena/test/{TestPackage.java => TestPackage_core.java} | 2 +-
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/jena-core/src/test/java/org/apache/jena/reasoner/rulesys/test/TestPackage.java b/jena-core/src/test/java/org/apache/jena/reasoner/rulesys/test/TestPackage_Rules.java
similarity index 95%
rename from jena-core/src/test/java/org/apache/jena/reasoner/rulesys/test/TestPackage.java
rename to jena-core/src/test/java/org/apache/jena/reasoner/rulesys/test/TestPackage_Rules.java
index 43e50c9f83..1c71e1cb06 100755
--- a/jena-core/src/test/java/org/apache/jena/reasoner/rulesys/test/TestPackage.java
+++ b/jena-core/src/test/java/org/apache/jena/reasoner/rulesys/test/TestPackage_Rules.java
@@ -33,16 +33,16 @@ import org.slf4j.LoggerFactory ;
* Aggregate tester that runs all the test associated with the rulesys package.
*/
-public class TestPackage extends TestSuite {
+public class TestPackage_Rules extends TestSuite {
- protected static Logger logger = LoggerFactory.getLogger(TestPackage.class);
+ protected static Logger logger = LoggerFactory.getLogger(TestPackage_Rules.class);
static public TestSuite suite() {
- return new TestPackage();
+ return new TestPackage_Rules();
}
/** Creates new TestPackage */
- private TestPackage() {
+ private TestPackage_Rules() {
super("RuleSys");
addTestSuite( TestConfigVocabulary.class );
diff --git a/jena-core/src/test/java/org/apache/jena/reasoner/test/TestPackage_reasoners.java b/jena-core/src/test/java/org/apache/jena/reasoner/test/TestPackage_reasoners.java
index c845af0706..fca1dc41ce 100644
--- a/jena-core/src/test/java/org/apache/jena/reasoner/test/TestPackage_reasoners.java
+++ b/jena-core/src/test/java/org/apache/jena/reasoner/test/TestPackage_reasoners.java
@@ -36,7 +36,7 @@ public class TestPackage_reasoners extends TestSuite {
addTest( "TestTransitiveGraphCache", TestTransitiveGraphCache.suite() );
addTest( "TestReasoners", TestReasoners.suite() );
addTest( "TestRDFSReasoners", TestRDFSReasoners.suite() );
- addTest( "TestRuleReasoners", org.apache.jena.reasoner.rulesys.test.TestPackage.suite() );
+ addTest( "TestRuleReasoners", org.apache.jena.reasoner.rulesys.test.TestPackage_Rules.suite() );
addTest( "TestReasonerPrefixMapping", TestInfPrefixMapping.suite() );
addTest( "TestInfGraph", TestInfGraph.suite() );
addTest( "TestInfModel", TestInfModel.suite() );
diff --git a/jena-core/src/test/java/org/apache/jena/test/TestPackage.java b/jena-core/src/test/java/org/apache/jena/test/TestPackage_core.java
similarity index 98%
rename from jena-core/src/test/java/org/apache/jena/test/TestPackage.java
rename to jena-core/src/test/java/org/apache/jena/test/TestPackage_core.java
index 4969052286..a953267149 100644
--- a/jena-core/src/test/java/org/apache/jena/test/TestPackage.java
+++ b/jena-core/src/test/java/org/apache/jena/test/TestPackage_core.java
@@ -25,7 +25,7 @@ import org.apache.jena.rdf.model.impl.RDFReaderFImpl;
/**
* Jena core test suite.
*/
-public class TestPackage extends TestCase {
+public class TestPackage_core extends TestCase {
static public TestSuite suite() {
//JenaSystem.init();
(jena) 04/06: Fix javadoc warnings
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 35983ce8e780c87274b446a0dddb4ddb03c8ebeb
Author: Andy Seaborne <an...@apache.org>
AuthorDate: Thu Nov 2 11:37:49 2023 +0000
Fix javadoc warnings
---
.../apache/jena/tdb1/store/DatasetPrefixesTDB.java | 2 +-
.../jena/tdb1/store/nodetable/NodeTable.java | 28 +++++++++++-----------
2 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/jena-tdb1/src/main/java/org/apache/jena/tdb1/store/DatasetPrefixesTDB.java b/jena-tdb1/src/main/java/org/apache/jena/tdb1/store/DatasetPrefixesTDB.java
index 60d799cfb5..61d26e9f5f 100644
--- a/jena-tdb1/src/main/java/org/apache/jena/tdb1/store/DatasetPrefixesTDB.java
+++ b/jena-tdb1/src/main/java/org/apache/jena/tdb1/store/DatasetPrefixesTDB.java
@@ -31,7 +31,7 @@ import org.apache.jena.tdb1.store.nodetupletable.NodeTupleTable;
/**
* Dataset prefixes; a table of nodes with prefix-centric operations. The table is G-P-U
- * where G is a graph name as a URI (a URI for <> is used for the default graph), P is a
+ * where G is a graph name as a URI (a URI for {@literal <>} is used for the default graph), P is a
* string (the prefix) and U is the IRI.
*/
public class DatasetPrefixesTDB implements DatasetPrefixStorage
diff --git a/jena-tdb1/src/main/java/org/apache/jena/tdb1/store/nodetable/NodeTable.java b/jena-tdb1/src/main/java/org/apache/jena/tdb1/store/nodetable/NodeTable.java
index 7642da8bd5..3034b053d7 100644
--- a/jena-tdb1/src/main/java/org/apache/jena/tdb1/store/nodetable/NodeTable.java
+++ b/jena-tdb1/src/main/java/org/apache/jena/tdb1/store/nodetable/NodeTable.java
@@ -26,22 +26,22 @@ import org.apache.jena.atlas.lib.Sync ;
import org.apache.jena.graph.Node ;
import org.apache.jena.tdb1.store.NodeId;
-/** Node table - conceptually a two way mapping of Node<->NodeId
- * where Nodes can be stored and a NodeId allocated
+/** Node table - conceptually a two way mapping of Node {@literal <->} NodeId
+ * where Nodes can be stored and NodeIds allocated.
* @see NodeId
- */
+ */
public interface NodeTable extends Sync, Closeable
{
/** Store the node in the node table (if not already present) and return the allocated Id. */
public NodeId getAllocateNodeId(Node node) ;
-
+
/** Look up node and return the NodeId - return NodeId.NodeDoesNotExist if not found */
public NodeId getNodeIdForNode(Node node) ;
-
+
/** Look up node id and return the Node - return null if not found */
public Node getNodeForNodeId(NodeId id) ;
-
+
/** Test whether the node table contains an entry for node */
public boolean containsNode(Node node) ;
@@ -50,15 +50,15 @@ public interface NodeTable extends Sync, Closeable
/** Iterate over all nodes (not necessarily fast). Does not include inlined NodeIds */
public Iterator<Pair<NodeId, Node>> all() ;
-
- /** The offset needed to predicate allocation difference between persistent tables - internal function */
+
+ /** The offset needed to predicate allocation difference between persistent tables - internal function */
public NodeId allocOffset() ;
-
- /** Anything there? */
- public boolean isEmpty() ;
- /** Return a NodeTable if this instance wraps another, else return null */
- public NodeTable wrapped() ;
+ /** Anything there? */
+ public boolean isEmpty() ;
+
+ /** Return a NodeTable if this instance wraps another, else return null */
+ public NodeTable wrapped() ;
+
-
}
(jena) 02/06: Fix white space
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 dd5d50f77a80c72fce8e1391704eb5ae6474d975
Author: Andy Seaborne <an...@apache.org>
AuthorDate: Thu Nov 2 18:14:05 2023 +0000
Fix white space
---
.../riot/process/normalize/StreamCanonicalLangTag.java | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/process/normalize/StreamCanonicalLangTag.java b/jena-arq/src/main/java/org/apache/jena/riot/process/normalize/StreamCanonicalLangTag.java
index 95c21b91b0..d593c52edd 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/process/normalize/StreamCanonicalLangTag.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/process/normalize/StreamCanonicalLangTag.java
@@ -30,26 +30,24 @@ import org.apache.jena.sparql.util.NodeUtils;
/** {@link StreamRDF} that converts language tags to lower case o rto canokcal form (RFC 4646). */
public class StreamCanonicalLangTag extends StreamRDFApplyObject {
- /** Return a {@link StreamRDF} that converts language tags to lower case */
+ /** Return a {@link StreamRDF} that converts language tags to lower case */
public static StreamRDF toLC(StreamRDF other) {
Locale.Builder locBuild = new Locale.Builder();
return new StreamCanonicalLangTag(other, locBuild,
(b,n) -> canonical(locBuild, n, StreamCanonicalLangTag::langTagLC));
}
-
- /** Return a {@link StreamRDF} that converts language tags to canonical form (RFC 4646, 5646). */
+
+ /** Return a {@link StreamRDF} that converts language tags to canonical form (RFC 4646, 5646). */
public static StreamRDF toCanonical(StreamRDF other) {
Locale.Builder locBuild = new Locale.Builder();
- return new StreamCanonicalLangTag(other, locBuild,
+ return new StreamCanonicalLangTag(other, locBuild,
(b,n) -> canonical(locBuild, n, StreamCanonicalLangTag::langTagCanonical));
}
-
-
private StreamCanonicalLangTag(StreamRDF other, Locale.Builder locBuild, BiFunction<Locale.Builder, Node, Node> stringMapper) {
super(other, (n)->stringMapper.apply(locBuild, n));
}
-
+
private static Node canonical(Locale.Builder locBuild, Node n, BiFunction<Locale.Builder, String, String> tagMapper ) {
// If no change, return the original object; this prevents object churn.
if ( ! NodeUtils.hasLang(n) )
@@ -63,7 +61,7 @@ public class StreamCanonicalLangTag extends StreamRDFApplyObject {
Node obj2 = NodeFactory.createLiteral(n.getLiteralLexicalForm(), langTag2);
return obj2;
}
-
+
// From taken from "xsd4ld" (which has an Apache License).
public static String langTagCanonical(Locale.Builder locBuild, String str) {
try {