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 2015/05/13 23:16:07 UTC
[01/16] jena git commit: JENA-926: Remove GraphStore operations
Repository: jena
Updated Branches:
refs/heads/master ce240bdf4 -> 710084c1d
JENA-926: Remove GraphStore operations
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/2aefcbf5
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/2aefcbf5
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/2aefcbf5
Branch: refs/heads/master
Commit: 2aefcbf560caf3482e4ba2431048c3d477d68670
Parents: 103776e
Author: Andy Seaborne <an...@apache.org>
Authored: Fri May 1 16:53:10 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Fri May 1 16:54:35 2015 +0100
----------------------------------------------------------------------
.../jena/sparql/modify/GraphStoreBasic.java | 15 --
.../jena/sparql/modify/GraphStoreNull.java | 20 +-
.../jena/sparql/modify/GraphStoreWrapper.java | 13 --
.../jena/sparql/modify/UpdateEngineMain.java | 10 +-
.../sparql/modify/UpdateEngineNonStreaming.java | 10 +-
.../java/org/apache/jena/update/GraphStore.java | 15 +-
.../apache/jena/sdb/store/DatasetGraphSDB.java | 17 --
.../apache/jena/tdb/store/DatasetGraphTDB.java | 14 --
.../transaction/DatasetGraphTransaction.java | 190 ++++++++-----------
9 files changed, 91 insertions(+), 213 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/2aefcbf5/jena-arq/src/main/java/org/apache/jena/sparql/modify/GraphStoreBasic.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/modify/GraphStoreBasic.java b/jena-arq/src/main/java/org/apache/jena/sparql/modify/GraphStoreBasic.java
index e67ff05..ca7e503 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/modify/GraphStoreBasic.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/modify/GraphStoreBasic.java
@@ -19,7 +19,6 @@
package org.apache.jena.sparql.modify;
import org.apache.jena.query.Dataset ;
-import org.apache.jena.query.DatasetFactory ;
import org.apache.jena.sparql.core.DatasetGraph ;
import org.apache.jena.sparql.core.DatasetGraphWrapper ;
import org.apache.jena.update.GraphStore ;
@@ -37,20 +36,6 @@ public class GraphStoreBasic extends DatasetGraphWrapper implements GraphStore
}
@Override
- public Dataset toDataset()
- {
- return DatasetFactory.create(getWrapped()) ;
- }
-
- @Override
- public void startRequest()
- {}
-
- @Override
- public void finishRequest()
- {}
-
- @Override
public void close()
{}
}
http://git-wip-us.apache.org/repos/asf/jena/blob/2aefcbf5/jena-arq/src/main/java/org/apache/jena/sparql/modify/GraphStoreNull.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/modify/GraphStoreNull.java b/jena-arq/src/main/java/org/apache/jena/sparql/modify/GraphStoreNull.java
index f144e88..cfe1968 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/modify/GraphStoreNull.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/modify/GraphStoreNull.java
@@ -21,9 +21,9 @@ package org.apache.jena.sparql.modify;
import java.util.Iterator ;
import org.apache.jena.atlas.iterator.Iter ;
-import org.apache.jena.graph.* ;
-import org.apache.jena.query.Dataset ;
-import org.apache.jena.query.DatasetFactory ;
+import org.apache.jena.graph.Factory ;
+import org.apache.jena.graph.Graph ;
+import org.apache.jena.graph.Node ;
import org.apache.jena.sparql.core.DatasetGraphQuad ;
import org.apache.jena.sparql.core.Quad ;
import org.apache.jena.update.GraphStore ;
@@ -67,18 +67,4 @@ public class GraphStoreNull extends DatasetGraphQuad implements GraphStore
{
return Factory.empty() ;
}
-
- @Override
- public Dataset toDataset()
- {
- return DatasetFactory.create(this);
- }
-
- @Override
- public void startRequest()
- { }
-
- @Override
- public void finishRequest()
- { }
}
http://git-wip-us.apache.org/repos/asf/jena/blob/2aefcbf5/jena-arq/src/main/java/org/apache/jena/sparql/modify/GraphStoreWrapper.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/modify/GraphStoreWrapper.java b/jena-arq/src/main/java/org/apache/jena/sparql/modify/GraphStoreWrapper.java
index 8c28d67..e315f1f 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/modify/GraphStoreWrapper.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/modify/GraphStoreWrapper.java
@@ -18,7 +18,6 @@
package org.apache.jena.sparql.modify;
-import org.apache.jena.query.Dataset ;
import org.apache.jena.sparql.core.DatasetGraphWrapper ;
import org.apache.jena.update.GraphStore ;
@@ -31,17 +30,5 @@ public class GraphStoreWrapper extends DatasetGraphWrapper implements GraphStore
super(graphStore) ;
this.graphStore = graphStore ;
}
-
- @Override
- public Dataset toDataset()
- { return graphStore.toDataset() ; }
-
- @Override
- public void startRequest()
- { graphStore.startRequest() ; }
-
- @Override
- public void finishRequest()
- { graphStore.finishRequest() ; }
}
http://git-wip-us.apache.org/repos/asf/jena/blob/2aefcbf5/jena-arq/src/main/java/org/apache/jena/sparql/modify/UpdateEngineMain.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/modify/UpdateEngineMain.java b/jena-arq/src/main/java/org/apache/jena/sparql/modify/UpdateEngineMain.java
index 2a551ff..9ce5ffd 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/modify/UpdateEngineMain.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/modify/UpdateEngineMain.java
@@ -43,16 +43,10 @@ public class UpdateEngineMain extends UpdateEngineBase
}
@Override
- public void startRequest()
- {
- graphStore.startRequest();
- }
+ public void startRequest() {}
@Override
- public void finishRequest()
- {
- graphStore.finishRequest();
- }
+ public void finishRequest() {}
private UpdateSink updateSink = null ;
http://git-wip-us.apache.org/repos/asf/jena/blob/2aefcbf5/jena-arq/src/main/java/org/apache/jena/sparql/modify/UpdateEngineNonStreaming.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/modify/UpdateEngineNonStreaming.java b/jena-arq/src/main/java/org/apache/jena/sparql/modify/UpdateEngineNonStreaming.java
index 558e5d8..dfffb5b 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/modify/UpdateEngineNonStreaming.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/modify/UpdateEngineNonStreaming.java
@@ -60,16 +60,10 @@ public class UpdateEngineNonStreaming extends UpdateEngineMain
}
@Override
- public void startRequest()
- {
- graphStore.startRequest() ;
- }
+ public void startRequest() {}
@Override
- public void finishRequest()
- {
- graphStore.finishRequest();
- }
+ public void finishRequest() {}
/**
* Returns an {@link UpdateSink} that adds all update operations into an internal {@link UpdateRequest} object.
http://git-wip-us.apache.org/repos/asf/jena/blob/2aefcbf5/jena-arq/src/main/java/org/apache/jena/update/GraphStore.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/update/GraphStore.java b/jena-arq/src/main/java/org/apache/jena/update/GraphStore.java
index 7bfef3c..440b4b1 100644
--- a/jena-arq/src/main/java/org/apache/jena/update/GraphStore.java
+++ b/jena-arq/src/main/java/org/apache/jena/update/GraphStore.java
@@ -18,7 +18,6 @@
package org.apache.jena.update;
-import org.apache.jena.query.Dataset ;
import org.apache.jena.sparql.core.DatasetGraph ;
/** A collection of graphs that an update can be applied to.
@@ -26,13 +25,13 @@ import org.apache.jena.sparql.core.DatasetGraph ;
* a SPARQL dataset. */
public interface GraphStore extends DatasetGraph
{
- /** Convert to a dataset (for query) */
- public Dataset toDataset() ;
-
- /** Signal start of a request being executed */
- public void startRequest() ;
- /** Signal end of a request being executed */
- public void finishRequest() ;
+// /** Convert to a dataset (for query) */
+// public Dataset toDataset() ;
+//
+// /** Signal start of a request being executed */
+// public void startRequest() ;
+// /** Signal end of a request being executed */
+// public void finishRequest() ;
// public void sync() ;
// public void close() ;
http://git-wip-us.apache.org/repos/asf/jena/blob/2aefcbf5/jena-sdb/src/main/java/org/apache/jena/sdb/store/DatasetGraphSDB.java
----------------------------------------------------------------------
diff --git a/jena-sdb/src/main/java/org/apache/jena/sdb/store/DatasetGraphSDB.java b/jena-sdb/src/main/java/org/apache/jena/sdb/store/DatasetGraphSDB.java
index 60d736f..83d2040 100644
--- a/jena-sdb/src/main/java/org/apache/jena/sdb/store/DatasetGraphSDB.java
+++ b/jena-sdb/src/main/java/org/apache/jena/sdb/store/DatasetGraphSDB.java
@@ -23,8 +23,6 @@ import java.util.Iterator ;
import org.apache.jena.atlas.lib.Closeable ;
import org.apache.jena.graph.Graph ;
import org.apache.jena.graph.Node ;
-import org.apache.jena.query.Dataset ;
-import org.apache.jena.query.DatasetFactory ;
import org.apache.jena.sdb.Store ;
import org.apache.jena.sdb.graph.GraphSDB ;
import org.apache.jena.sdb.util.StoreUtils ;
@@ -64,21 +62,6 @@ public class DatasetGraphSDB extends DatasetGraphCaching
return StoreUtils.storeGraphNames(store) ;
}
- //---- Update
-
- @Override
- public void startRequest()
- {}
-
- @Override
- public void finishRequest()
- {}
-
-
- @Override
- public Dataset toDataset()
- { return DatasetFactory.create(this) ; }
-
@Override
protected boolean _containsGraph(Node graphNode)
{
http://git-wip-us.apache.org/repos/asf/jena/blob/2aefcbf5/jena-tdb/src/main/java/org/apache/jena/tdb/store/DatasetGraphTDB.java
----------------------------------------------------------------------
diff --git a/jena-tdb/src/main/java/org/apache/jena/tdb/store/DatasetGraphTDB.java b/jena-tdb/src/main/java/org/apache/jena/tdb/store/DatasetGraphTDB.java
index c577861..5ad86b0 100644
--- a/jena-tdb/src/main/java/org/apache/jena/tdb/store/DatasetGraphTDB.java
+++ b/jena-tdb/src/main/java/org/apache/jena/tdb/store/DatasetGraphTDB.java
@@ -29,9 +29,7 @@ import org.apache.jena.atlas.lib.Tuple ;
import org.apache.jena.graph.Graph ;
import org.apache.jena.graph.Node ;
import org.apache.jena.graph.Triple ;
-import org.apache.jena.query.Dataset ;
import org.apache.jena.sparql.core.DatasetGraphCaching ;
-import org.apache.jena.sparql.core.DatasetImpl ;
import org.apache.jena.sparql.core.Quad ;
import org.apache.jena.sparql.engine.optimizer.reorder.ReorderTransformation ;
import org.apache.jena.tdb.base.file.Location ;
@@ -268,18 +266,6 @@ public class DatasetGraphTDB extends DatasetGraphCaching
prefixes.sync() ;
}
- // --- GraphStore
- @Override
- public void startRequest()
- { }
-
- @Override
- public void finishRequest()
- { }
-
- @Override
- public Dataset toDataset() { return DatasetImpl.wrap(this) ; }
-
@Override
public void setDefaultGraph(Graph g) {
throw new UnsupportedOperationException("Can't set default graph via GraphStore on a TDB-backed dataset") ;
http://git-wip-us.apache.org/repos/asf/jena/blob/2aefcbf5/jena-tdb/src/main/java/org/apache/jena/tdb/transaction/DatasetGraphTransaction.java
----------------------------------------------------------------------
diff --git a/jena-tdb/src/main/java/org/apache/jena/tdb/transaction/DatasetGraphTransaction.java b/jena-tdb/src/main/java/org/apache/jena/tdb/transaction/DatasetGraphTransaction.java
index 00d3d13..f5a8674 100644
--- a/jena-tdb/src/main/java/org/apache/jena/tdb/transaction/DatasetGraphTransaction.java
+++ b/jena-tdb/src/main/java/org/apache/jena/tdb/transaction/DatasetGraphTransaction.java
@@ -16,11 +16,9 @@
* limitations under the License.
*/
-package org.apache.jena.tdb.transaction;
+package org.apache.jena.tdb.transaction ;
import org.apache.jena.atlas.lib.Sync ;
-import org.apache.jena.query.Dataset ;
-import org.apache.jena.query.DatasetFactory ;
import org.apache.jena.query.ReadWrite ;
import org.apache.jena.sparql.JenaTransactionException ;
import org.apache.jena.sparql.core.DatasetGraphTrackActive ;
@@ -31,125 +29,120 @@ import org.apache.jena.tdb.base.file.Location ;
import org.apache.jena.tdb.store.DatasetGraphTDB ;
import org.apache.jena.update.GraphStore ;
-/** Transactional DatasetGraph that allows one active transaction.
- * For multiple read transactions, create multiple DatasetGraphTransaction objects.
- * This is analogous to a "connection" in JDBC.
+/**
+ * Transactional DatasetGraph that allows one active transaction. For multiple
+ * read transactions, create multiple DatasetGraphTransaction objects. This is
+ * analogous to a "connection" in JDBC.
*/
-public class DatasetGraphTransaction extends DatasetGraphTrackActive implements GraphStore, Sync
-{
- /* Initially, the app can use this DatasetGraph non-transactionally.
- * But as soon as it starts a transaction, the dataset can only be used
- * inside transactions.
+public class DatasetGraphTransaction extends DatasetGraphTrackActive implements GraphStore, Sync {
+ /*
+ * Initially, the app can use this DatasetGraph non-transactionally. But as
+ * soon as it starts a transaction, the dataset can only be used inside
+ * transactions.
*
- * There are two per-thread state variables:
- * txn: ThreadLocalTxn -- the transactional , one time use dataset
- * isInTransactionB: ThreadLocalBoolean -- flags true between begin and commit/abort, and end for read transactions.
+ * There are two per-thread state variables: txn: ThreadLocalTxn -- the
+ * transactional , one time use dataset isInTransactionB: ThreadLocalBoolean
+ * -- flags true between begin and commit/abort, and end for read
+ * transactions.
*/
- static class ThreadLocalTxn extends ThreadLocal<DatasetGraphTxn>
- {
- // This is the default - but nice to give it a name and to set it clearly.
- @Override protected DatasetGraphTxn initialValue() {
+ static class ThreadLocalTxn extends ThreadLocal<DatasetGraphTxn> {
+ // This is the default - but nice to give it a name and to set it
+ // clearly.
+ @Override
+ protected DatasetGraphTxn initialValue() {
return null ;
}
}
- static class ThreadLocalBoolean extends ThreadLocal<Boolean>
- {
- @Override protected Boolean initialValue() {
+ static class ThreadLocalBoolean extends ThreadLocal<Boolean> {
+ @Override
+ protected Boolean initialValue() {
return false ;
}
}
// Transaction per thread per DatasetGraphTransaction object.
- private ThreadLocalTxn txn = new ThreadLocalTxn() ;
- private ThreadLocalBoolean inTransaction = new ThreadLocalBoolean() ;
-
+ private ThreadLocalTxn txn = new ThreadLocalTxn() ;
+ private ThreadLocalBoolean inTransaction = new ThreadLocalBoolean() ;
+
private final StoreConnection sConn ;
- private boolean isClosed = false ;
+ private boolean isClosed = false ;
- public DatasetGraphTransaction(Location location)
- {
+ public DatasetGraphTransaction(Location location) {
sConn = StoreConnection.make(location) ;
}
- public Location getLocation() { return sConn.getLocation() ; }
-
- public DatasetGraphTDB getDatasetGraphToQuery()
- {
+ public Location getLocation() {
+ return sConn.getLocation() ;
+ }
+
+ public DatasetGraphTDB getDatasetGraphToQuery() {
checkNotClosed() ;
return get() ;
}
-
+
/** Access the base storage - use with care */
- public DatasetGraphTDB getBaseDatasetGraph()
- {
+ public DatasetGraphTDB getBaseDatasetGraph() {
checkNotClosed() ;
return sConn.getBaseDataset() ;
}
/** Get the current DatasetGraphTDB */
@Override
- public DatasetGraphTDB get()
- {
- if ( isInTransaction() )
- {
+ public DatasetGraphTDB get() {
+ if ( isInTransaction() ) {
DatasetGraphTxn dsgTxn = txn.get() ;
if ( dsgTxn == null )
throw new TDBTransactionException("In a transaction but no transactional DatasetGraph") ;
return dsgTxn.getView() ;
}
-
+
if ( sConn.haveUsedInTransaction() )
throw new TDBTransactionException("Not in a transaction") ;
- // Never used in a transaction - return underlying database for old style (non-transactional) usage.
+ // Never used in a transaction - return underlying database for old
+ // style (non-transactional) usage.
return sConn.getBaseDataset() ;
}
@Override
- protected void checkActive()
- {
+ protected void checkActive() {
checkNotClosed() ;
- if ( sConn.haveUsedInTransaction() && ! isInTransaction() )
- throw new JenaTransactionException("Not in a transaction ("+getLocation()+")") ;
+ if ( sConn.haveUsedInTransaction() && !isInTransaction() )
+ throw new JenaTransactionException("Not in a transaction (" + getLocation() + ")") ;
}
@Override
- protected void checkNotActive()
- {
+ protected void checkNotActive() {
checkNotClosed() ;
if ( sConn.haveUsedInTransaction() && isInTransaction() )
- throw new JenaTransactionException("Currently in a transaction ("+getLocation()+")") ;
+ throw new JenaTransactionException("Currently in a transaction (" + getLocation() + ")") ;
}
-
- protected void checkNotClosed()
- {
+
+ protected void checkNotClosed() {
if ( isClosed )
throw new JenaTransactionException("Already closed") ;
}
-
+
@Override
- public boolean isInTransaction()
- {
+ public boolean isInTransaction() {
checkNotClosed() ;
return inTransaction.get() ;
}
- public boolean isClosed()
- { return isClosed ; }
-
- public void syncIfNotTransactional()
- {
- if ( ! sConn.haveUsedInTransaction() )
+ public boolean isClosed() {
+ return isClosed ;
+ }
+
+ public void syncIfNotTransactional() {
+ if ( !sConn.haveUsedInTransaction() )
sConn.getBaseDataset().sync() ;
}
-
@Override
- protected void _begin(ReadWrite readWrite)
- {
+ protected void _begin(ReadWrite readWrite) {
checkNotClosed() ;
DatasetGraphTxn dsgTxn = sConn.begin(readWrite) ;
txn.set(dsgTxn) ;
@@ -157,29 +150,25 @@ public class DatasetGraphTransaction extends DatasetGraphTrackActive implements
}
@Override
- protected void _commit()
- {
+ protected void _commit() {
checkNotClosed() ;
txn.get().commit() ;
inTransaction.set(false) ;
}
@Override
- protected void _abort()
- {
+ protected void _abort() {
checkNotClosed() ;
txn.get().abort() ;
inTransaction.set(false) ;
}
@Override
- protected void _end()
- {
+ protected void _end() {
checkNotClosed() ;
DatasetGraphTxn dsg = txn.get() ;
// It's null if end() already called.
- if ( dsg == null )
- {
+ if ( dsg == null ) {
TDB.logInfo.warn("Transaction already ended") ;
return ;
}
@@ -190,25 +179,25 @@ public class DatasetGraphTransaction extends DatasetGraphTrackActive implements
}
@Override
- public String toString()
- {
+ public String toString() {
try {
if ( isInTransaction() )
- // Risky ...
+ // Risky ...
return get().toString() ;
// Hence ...
return getBaseDatasetGraph().toString() ;
- } catch (Throwable th) { return "DatasetGraphTransaction" ; }
+ }
+ catch (Throwable th) {
+ return "DatasetGraphTransaction" ;
+ }
}
-
+
@Override
- protected void _close()
- {
+ protected void _close() {
if ( isClosed )
return ;
-
- if ( ! sConn.haveUsedInTransaction() && get() != null )
- {
+
+ if ( !sConn.haveUsedInTransaction() && get() != null ) {
// Non-transactional behaviour.
DatasetGraphTDB dsg = get() ;
dsg.sync() ;
@@ -217,11 +206,11 @@ public class DatasetGraphTransaction extends DatasetGraphTrackActive implements
isClosed = true ;
return ;
}
-
- if ( isInTransaction() )
- {
- TDB.logInfo.warn("Attempt to close a DatasetGraphTransaction while a transaction is active - ignored close ("+getLocation()+")") ;
- return ;
+
+ if ( isInTransaction() ) {
+ TDB.logInfo.warn("Attempt to close a DatasetGraphTransaction while a transaction is active - ignored close (" + getLocation()
+ + ")") ;
+ return ;
}
isClosed = true ;
txn.remove() ;
@@ -229,14 +218,7 @@ public class DatasetGraphTransaction extends DatasetGraphTrackActive implements
}
@Override
- public Dataset toDataset()
- {
- return DatasetFactory.create(getDatasetGraphToQuery()) ;
- }
-
- @Override
- public Context getContext()
- {
+ public Context getContext() {
// Not the transactional dataset.
return getBaseDatasetGraph().getContext() ;
}
@@ -249,27 +231,9 @@ public class DatasetGraphTransaction extends DatasetGraphTrackActive implements
return sConn.getTransMgrState() ;
}
- // Bypasses just about everything!
-// /**
-// * Return the StoreConnection - primarily for debugging; do not use if at all possible.
-// * This access to internal state.
-// */
-// public StoreConnection getStoreConnection() {
-// return sConn ;
-// }
-
- @Override
- public void startRequest()
- {}
-
- @Override
- public void finishRequest()
- {}
-
@Override
- public void sync()
- {
- if ( ! sConn.haveUsedInTransaction() && get() != null )
+ public void sync() {
+ if ( !sConn.haveUsedInTransaction() && get() != null )
get().sync() ;
}
}
[05/16] jena git commit: JENA-929: Migrate Filter to Java 8 Predicate
Posted by an...@apache.org.
JENA-929: Migrate Filter to Java 8 Predicate
This closes #55
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/b2a1953b
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/b2a1953b
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/b2a1953b
Branch: refs/heads/master
Commit: b2a1953b9dc50babbafafed6dfedcdec2b465ee4
Parents: 08355d2
Author: ajs6f <aj...@virginia.edu>
Authored: Fri May 1 12:20:17 2015 -0400
Committer: Andy Seaborne <an...@apache.org>
Committed: Mon May 4 18:04:17 2015 +0100
----------------------------------------------------------------------
.../apache/jena/sparql/graph/GraphMemPlain.java | 6 +-
.../sparql/util/graph/GraphContainerUtils.java | 6 +-
.../main/java/org/apache/jena/graph/Triple.java | 26 ++-
.../jena/graph/compose/CompositionBase.java | 47 ++----
.../apache/jena/graph/impl/CollectionGraph.java | 21 +--
.../apache/jena/graph/impl/GraphMatcher.java | 34 ++--
.../org/apache/jena/mem/NodeToTriplesMap.java | 25 ++-
.../apache/jena/mem/NodeToTriplesMapMem.java | 11 +-
.../java/org/apache/jena/ontology/OntTools.java | 8 +-
.../apache/jena/ontology/impl/OntClassImpl.java | 14 +-
.../apache/jena/ontology/impl/OntModelImpl.java | 33 +---
.../jena/ontology/impl/OntPropertyImpl.java | 14 +-
.../jena/ontology/impl/OntResourceImpl.java | 17 +-
.../org/apache/jena/rdf/model/Selector.java | 9 +-
.../apache/jena/rdf/model/impl/ModelCom.java | 70 +++-----
.../apache/jena/rdf/model/impl/ReifierStd.java | 10 +-
.../jena/rdfxml/xmloutput/impl/Unparser.java | 69 ++++----
.../jena/reasoner/rulesys/FBRuleInfGraph.java | 5 +-
.../apache/jena/reasoner/rulesys/Functor.java | 9 +-
.../jena/reasoner/rulesys/impl/SafeGraph.java | 11 +-
.../jena/util/iterator/ExtendedIterator.java | 5 +-
.../org/apache/jena/util/iterator/Filter.java | 165 ++++++++++++-------
.../jena/util/iterator/FilterDropIterator.java | 34 ----
.../jena/util/iterator/FilterIterator.java | 14 +-
.../jena/util/iterator/FilterKeepIterator.java | 34 ----
.../apache/jena/util/iterator/LazyIterator.java | 5 +-
.../apache/jena/util/iterator/NiceIterator.java | 9 +-
.../apache/jena/util/iterator/UniqueFilter.java | 5 +-
.../apache/jena/graph/test/TestTripleField.java | 23 +--
.../apache/jena/ontology/impl/TestOntTools.java | 5 +-
.../jena/util/iterator/test/TestFilters.java | 82 +--------
.../propertytable/graph/GraphPropertyTable.java | 10 +-
.../model/impl/SecuredModelImpl.java | 12 +-
.../model/impl/SecuredNodeIterator.java | 6 +-
.../model/impl/SecuredRSIterator.java | 10 +-
.../model/impl/SecuredResIterator.java | 6 +-
.../permissions/model/impl/SecuredSeqImpl.java | 7 +-
.../model/impl/SecuredStatementIterator.java | 6 +-
.../jena/permissions/utils/ContainerFilter.java | 7 +-
.../permissions/utils/PermStatementFilter.java | 6 +-
.../permissions/utils/PermTripleFilter.java | 6 +-
.../permissions/utils/RDFListSecFilter.java | 6 +-
42 files changed, 338 insertions(+), 570 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/b2a1953b/jena-arq/src/main/java/org/apache/jena/sparql/graph/GraphMemPlain.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/graph/GraphMemPlain.java b/jena-arq/src/main/java/org/apache/jena/sparql/graph/GraphMemPlain.java
index bd8fd10..8630b8b 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/graph/GraphMemPlain.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/graph/GraphMemPlain.java
@@ -22,6 +22,7 @@ import java.util.HashSet ;
import java.util.Iterator ;
import java.util.Locale ;
import java.util.Set ;
+import java.util.function.Predicate;
import org.apache.jena.graph.Capabilities ;
import org.apache.jena.graph.Node ;
@@ -31,7 +32,6 @@ import org.apache.jena.graph.impl.GraphBase ;
import org.apache.jena.graph.impl.SimpleEventManager ;
import org.apache.jena.util.iterator.ClosableIterator ;
import org.apache.jena.util.iterator.ExtendedIterator ;
-import org.apache.jena.util.iterator.Filter ;
/**
* A version of Graph that does term equality only
@@ -114,7 +114,7 @@ public class GraphMemPlain extends GraphBase
return node ;
}
- static class TripleMatchFilterEquality extends Filter<Triple>
+ static class TripleMatchFilterEquality implements Predicate<Triple>
{
final protected Triple tMatch;
@@ -123,7 +123,7 @@ public class GraphMemPlain extends GraphBase
{ this.tMatch = tMatch; }
@Override
- public boolean accept(Triple t)
+ public boolean test(Triple t)
{
return tripleContained(tMatch, t) ;
}
http://git-wip-us.apache.org/repos/asf/jena/blob/b2a1953b/jena-arq/src/main/java/org/apache/jena/sparql/util/graph/GraphContainerUtils.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/util/graph/GraphContainerUtils.java b/jena-arq/src/main/java/org/apache/jena/sparql/util/graph/GraphContainerUtils.java
index f35fb25..c3ea9e6 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/util/graph/GraphContainerUtils.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/util/graph/GraphContainerUtils.java
@@ -22,6 +22,7 @@ import java.util.Collection ;
import java.util.Iterator ;
import java.util.SortedMap ;
import java.util.TreeMap ;
+import java.util.function.Predicate;
import java.util.regex.Matcher ;
import java.util.regex.Pattern ;
@@ -31,7 +32,6 @@ import org.apache.jena.graph.Node ;
import org.apache.jena.graph.Triple ;
import org.apache.jena.sparql.expr.Expr ;
import org.apache.jena.util.iterator.ExtendedIterator ;
-import org.apache.jena.util.iterator.Filter ;
import org.apache.jena.vocabulary.RDF ;
import org.apache.jena.vocabulary.RDFS ;
@@ -98,9 +98,9 @@ public class GraphContainerUtils
}
private static Node RDFSmember = RDFS.member.asNode() ;
- private static Filter<Triple> filterRDFSmember = new Filter<Triple>() {
+ private static Predicate<Triple> filterRDFSmember = new Predicate<Triple>() {
@Override
- public boolean accept(Triple triple) {
+ public boolean test(Triple triple) {
Node p = triple.getPredicate() ;
if ( ! triple.getPredicate().isURI() )
return false ;
http://git-wip-us.apache.org/repos/asf/jena/blob/b2a1953b/jena-core/src/main/java/org/apache/jena/graph/Triple.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/graph/Triple.java b/jena-core/src/main/java/org/apache/jena/graph/Triple.java
index 89d7238..ee3f0e2 100644
--- a/jena-core/src/main/java/org/apache/jena/graph/Triple.java
+++ b/jena-core/src/main/java/org/apache/jena/graph/Triple.java
@@ -18,9 +18,10 @@
package org.apache.jena.graph;
+import java.util.function.Predicate;
+
import org.apache.jena.shared.PrefixMapping ;
import org.apache.jena.util.iterator.ExtendedIterator ;
-import org.apache.jena.util.iterator.Filter ;
import org.apache.jena.util.iterator.NullIterator ;
/**
@@ -173,23 +174,22 @@ public class Triple
{
public abstract Node getField( Triple t );
- public abstract Filter<Triple> filterOn( Node n );
+ public abstract Predicate<Triple> filterOn( Node n );
- public final Filter<Triple> filterOn( Triple t )
+ public final Predicate<Triple> filterOn( Triple t )
{ return filterOn( getField( t ) ); }
- protected static final Filter<Triple> anyTriple = Filter.any();
+ protected static final Predicate<Triple> anyTriple = t -> true;
public static final Field fieldSubject = new Field()
{
@Override public Node getField( Triple t )
{ return t.subj; }
- @Override public Filter<Triple> filterOn( final Node n )
+ @Override public Predicate<Triple> filterOn( final Node n )
{
return n.isConcrete()
- ? new Filter<Triple>()
- { @Override public boolean accept( Triple x ) { return n.equals( x.subj ); } }
+ ? x -> n.equals( x.subj )
: anyTriple
;
}
@@ -200,11 +200,9 @@ public class Triple
@Override public Node getField( Triple t )
{ return t.obj; }
- @Override public Filter<Triple> filterOn( final Node n )
+ @Override public Predicate<Triple> filterOn( final Node n )
{ return n.isConcrete()
- ? new Filter<Triple>()
- { @Override public boolean accept( Triple x )
- { return n.sameValueAs( x.obj ); } }
+ ? x -> n.sameValueAs( x.obj )
: anyTriple;
}
};
@@ -214,11 +212,9 @@ public class Triple
@Override public Node getField( Triple t )
{ return t.pred; }
- @Override public Filter<Triple> filterOn( final Node n )
+ @Override public Predicate<Triple> filterOn( final Node n )
{ return n.isConcrete()
- ? new Filter<Triple>()
- { @Override
- public boolean accept( Triple x ) { return n.equals( x.pred ); } }
+ ? x -> n.equals( x.pred )
: anyTriple;
}
};
http://git-wip-us.apache.org/repos/asf/jena/blob/b2a1953b/jena-core/src/main/java/org/apache/jena/graph/compose/CompositionBase.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/graph/compose/CompositionBase.java b/jena-core/src/main/java/org/apache/jena/graph/compose/CompositionBase.java
index 7c02bca..a28fec4 100755
--- a/jena-core/src/main/java/org/apache/jena/graph/compose/CompositionBase.java
+++ b/jena-core/src/main/java/org/apache/jena/graph/compose/CompositionBase.java
@@ -24,6 +24,7 @@ package org.apache.jena.graph.compose;
// Imports
///////////////
import java.util.*;
+import java.util.function.Predicate;
import org.apache.jena.graph.* ;
import org.apache.jena.graph.impl.* ;
@@ -42,18 +43,17 @@ public abstract class CompositionBase extends GraphBase
{
/**
* <p>
- * Answer a {@link Filter} that will reject any element that is a member of iterator i.
+ * Answer a {@link Predicate} that will reject any element that is a member of iterator i.
* As a side-effect, i will be closed.
* </p>
*
* @param i A closable iterator
- * @return A Filter that will accept any object not a member of i.
+ * @return A Predicate that will accept any object not a member of i.
*/
- public static <T> Filter<T> reject( final ClosableIterator<? extends T> i )
+ public static <T> Predicate<T> reject( final ClosableIterator<? extends T> i )
{
final Set< ? extends T> suppress = IteratorCollection.iteratorToSet( i );
- return new Filter<T>()
- { @Override public boolean accept( T o ) { return !suppress.contains( o ); } };
+ return o -> !suppress.contains( o );
}
/**
@@ -117,10 +117,7 @@ public abstract class CompositionBase extends GraphBase
*/
public static ExtendedIterator<Triple> rejecting( final ExtendedIterator<Triple> i, final Set<Triple> seen )
{
- Filter<Triple> seenFilter = new Filter<Triple>()
- { @Override
- public boolean accept( Triple x ) { return seen.contains( x ); } };
- return i.filterDrop( seenFilter );
+ return i.filterDrop( seen::contains );
}
/**
@@ -129,50 +126,36 @@ public abstract class CompositionBase extends GraphBase
*/
public static ExtendedIterator<Triple> rejecting( final ExtendedIterator<Triple> i, final Graph seen )
{
- Filter<Triple> seenFilter = new Filter<Triple>()
- { @Override public boolean accept( Triple x ) { return seen.contains( x ); } };
- return i.filterDrop( seenFilter );
+ return i.filterDrop( seen::contains );
}
/**
* <p>
- * Answer a {@link Filter} that will accept any object that is an element of
+ * Answer a {@link Predicate} that will accept any object that is an element of
* iterator i. As a side-effect, i will be evaluated and closed.
* </p>
*
* @param i A closable iterator
- * @return A Filter that will accept any object in iterator i.
+ * @return A Predicate that will accept any object in iterator i.
*/
- public static <T> Filter<T> ifIn( final ClosableIterator<T> i )
+ public static <T> Predicate<T> ifIn( final ClosableIterator<T> i )
{
final Set<T> allow = IteratorCollection.iteratorToSet( i );
- return new Filter<T>()
- { @Override public boolean accept( T x ) { return allow.contains( x ); } };
+ return allow::contains;
}
/**
* <p>
- * Answer a {@link Filter} that will accept any triple that is an edge of
+ * Answer a {@link Predicate} that will accept any triple that is an edge of
* graph g.
* </p>
*
* @param g A graph
- * @return A Filter that will accept any triple that is an edge in g.
+ * @return A Predicate that will accept any triple that is an edge in g.
*/
- public static Filter<Triple> ifIn( final Graph g )
+ public static Predicate<Triple> ifIn( final Graph g )
{
- return new Filter<Triple>()
- { @Override public boolean accept( Triple x ) { return g.contains( x ); } };
+ return g::contains;
}
-
- // Internal implementation methods
- //////////////////////////////////
-
-
- //==============================================================================
- // Inner class definitions
- //==============================================================================
-
-
}
http://git-wip-us.apache.org/repos/asf/jena/blob/b2a1953b/jena-core/src/main/java/org/apache/jena/graph/impl/CollectionGraph.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/graph/impl/CollectionGraph.java b/jena-core/src/main/java/org/apache/jena/graph/impl/CollectionGraph.java
index 8fd02f8..f20e41f 100644
--- a/jena-core/src/main/java/org/apache/jena/graph/impl/CollectionGraph.java
+++ b/jena-core/src/main/java/org/apache/jena/graph/impl/CollectionGraph.java
@@ -21,13 +21,11 @@ import java.util.Collection ;
import java.util.HashSet ;
import java.util.Locale ;
import java.util.Set ;
-
import org.apache.jena.graph.Capabilities ;
import org.apache.jena.graph.Node ;
import org.apache.jena.graph.NodeFactory ;
import org.apache.jena.graph.Triple ;
import org.apache.jena.util.iterator.ExtendedIterator ;
-import org.apache.jena.util.iterator.Filter ;
import org.apache.jena.util.iterator.WrappedIterator ;
/**
@@ -64,21 +62,6 @@ public class CollectionGraph extends GraphBase
};
- static class TripleMatchFilterEquality extends Filter<Triple>
- {
- final protected Triple tMatch;
-
- /** Creates new TripleMatchFilter */
- public TripleMatchFilterEquality(Triple tMatch)
- { this.tMatch = tMatch; }
-
- @Override
- public boolean accept(Triple t)
- {
- return tripleContained(tMatch, t) ;
- }
-
- }
static boolean tripleContained(Triple patternTriple, Triple dataTriple)
{
return
@@ -122,7 +105,7 @@ public class CollectionGraph extends GraphBase
*/
public CollectionGraph()
{
- this(new HashSet<Triple>(), true);
+ this(new HashSet<>(), true);
}
/**
@@ -163,7 +146,7 @@ public class CollectionGraph extends GraphBase
{
iter = WrappedIterator.createNoRemove( triples.iterator() );
}
- return iter.filterKeep ( new TripleMatchFilterEquality( m ) );
+ return iter.filterKeep ( t -> tripleContained(m, t) );
}
@Override
http://git-wip-us.apache.org/repos/asf/jena/blob/b2a1953b/jena-core/src/main/java/org/apache/jena/graph/impl/GraphMatcher.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/graph/impl/GraphMatcher.java b/jena-core/src/main/java/org/apache/jena/graph/impl/GraphMatcher.java
index 6268283..55c9f85 100644
--- a/jena-core/src/main/java/org/apache/jena/graph/impl/GraphMatcher.java
+++ b/jena-core/src/main/java/org/apache/jena/graph/impl/GraphMatcher.java
@@ -17,6 +17,8 @@
*/
package org.apache.jena.graph.impl;
+import static org.apache.jena.util.iterator.WrappedIterator.create;
+
import java.util.*;
import org.apache.jena.graph.* ;
@@ -256,25 +258,19 @@ public class GraphMatcher extends java.lang.Object {
// Otherwise if some member of the bucket has friends
// we can refine the hash, and we set refinableHash.
check(HASH_OK);
- return new FilterIterator<>(
- new Filter<Bucket>() {
- @Override public boolean accept(Bucket o) {
- Bucket b = o;
- if (b.size()==1)
- return true;
- if (!refinableHash) {
- Iterator<AnonResource> it = b.members();
- while ( it.hasNext() )
- if (!it.next()
- .friends.isEmpty()) {
- refinableHash = true;
- break;
- }
- }
- return false;
- }
- },table.values().iterator());
-
+ return create(table.values().iterator()).filterKeep(b -> {
+ if (b.size() == 1)
+ return true;
+ if (!refinableHash) {
+ Iterator<AnonResource> it = b.members();
+ while (it.hasNext())
+ if (!it.next().friends.isEmpty()) {
+ refinableHash = true;
+ break;
+ }
+ }
+ return false;
+ });
}
private void unbindAll(Set<AnonResource> s) {
for ( AnonResource value : s )
http://git-wip-us.apache.org/repos/asf/jena/blob/b2a1953b/jena-core/src/main/java/org/apache/jena/mem/NodeToTriplesMap.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/mem/NodeToTriplesMap.java b/jena-core/src/main/java/org/apache/jena/mem/NodeToTriplesMap.java
index a31a186..3342241 100644
--- a/jena-core/src/main/java/org/apache/jena/mem/NodeToTriplesMap.java
+++ b/jena-core/src/main/java/org/apache/jena/mem/NodeToTriplesMap.java
@@ -18,7 +18,10 @@
package org.apache.jena.mem;
+import static org.apache.jena.util.iterator.WrappedIterator.create;
+
import java.util.*;
+import java.util.function.Predicate;
import org.apache.jena.graph.* ;
import org.apache.jena.graph.Triple.* ;
@@ -106,24 +109,18 @@ public class NodeToTriplesMap extends NodeToTriplesMapBase
}
}
- public ExtendedIterator<Triple> iterateAll( Triple pattern )
- {
- return
- indexField.filterOn( pattern )
- .and( f2.filterOn( pattern ) )
- .and( f3.filterOn( pattern ) )
- .filterKeep( iterateAll() )
- ;
- }
+ public ExtendedIterator<Triple> iterateAll(Triple pattern) {
+ Predicate<Triple> filter = indexField.filterOn(pattern)
+ .and(f2.filterOn(pattern)).and(f3.filterOn(pattern));
+ return create(iterateAll()).filterKeep(filter);
+ }
@Override public ExtendedIterator<Triple> iterator( Node index, Node n2, Node n3 )
{
TripleBunch s = bunchMap.get( index.getIndexingValue() );
- return s == null
- ? NullIterator.<Triple>instance()
- : f2.filterOn( n2 ).and( f3.filterOn( n3 ) )
- .filterKeep( s.iterator() )
- ;
+ if (s == null) return NullIterator.<Triple>instance();
+ final Predicate<Triple> filter = f2.filterOn( n2 ).and( f3.filterOn( n3 ) );
+ return create(s.iterator()).filterKeep(filter);
}
/**
http://git-wip-us.apache.org/repos/asf/jena/blob/b2a1953b/jena-core/src/main/java/org/apache/jena/mem/NodeToTriplesMapMem.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/mem/NodeToTriplesMapMem.java b/jena-core/src/main/java/org/apache/jena/mem/NodeToTriplesMapMem.java
index 43e528e..107cf3b 100644
--- a/jena-core/src/main/java/org/apache/jena/mem/NodeToTriplesMapMem.java
+++ b/jena-core/src/main/java/org/apache/jena/mem/NodeToTriplesMapMem.java
@@ -18,7 +18,10 @@
package org.apache.jena.mem;
+import static org.apache.jena.util.iterator.WrappedIterator.create;
+
import java.util.Iterator ;
+import java.util.function.Predicate;
import org.apache.jena.graph.Node ;
import org.apache.jena.graph.Triple ;
@@ -122,11 +125,9 @@ public class NodeToTriplesMapMem extends NodeToTriplesMapBase
Object indexValue = index.getIndexingValue();
TripleBunch s = bunchMap.get( indexValue );
// System.err.println( ">> ntmf::iterator: " + (s == null ? (Object) "None" : s.getClass()) );
- return s == null
- ? NullIterator.<Triple>instance()
- : f2.filterOn( n2 ).and( f3.filterOn( n3 ) )
- .filterKeep( s.iterator( new NotifyMe( indexValue ) ) )
- ;
+ if (s == null) return NullIterator.<Triple>instance();
+ final Predicate<Triple> filter = f2.filterOn( n2 ).and( f3.filterOn( n3 ) );
+ return create(s.iterator( new NotifyMe( indexValue ))).filterKeep(filter);
}
protected TripleBunch get( Object index )
http://git-wip-us.apache.org/repos/asf/jena/blob/b2a1953b/jena-core/src/main/java/org/apache/jena/ontology/OntTools.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/ontology/OntTools.java b/jena-core/src/main/java/org/apache/jena/ontology/OntTools.java
index 594321a..bb3b2a3 100755
--- a/jena-core/src/main/java/org/apache/jena/ontology/OntTools.java
+++ b/jena-core/src/main/java/org/apache/jena/ontology/OntTools.java
@@ -24,10 +24,10 @@ package org.apache.jena.ontology;
// Imports
///////////////
import java.util.*;
+import java.util.function.Predicate;
import org.apache.jena.rdf.model.* ;
import org.apache.jena.shared.JenaException ;
-import org.apache.jena.util.iterator.Filter ;
/**
@@ -152,7 +152,7 @@ public class OntTools
* @return A path, consisting of a list of statements whose first subject is <code>start</code>,
* and whose last object is <code>end</code>, or null if no such path exists.
*/
- public static Path findShortestPath( Model m, Resource start, RDFNode end, Filter<Statement> onPath ) {
+ public static Path findShortestPath( Model m, Resource start, RDFNode end, Predicate<Statement> onPath ) {
List<Path> bfs = new LinkedList<>();
Set<Resource> seen = new HashSet<>();
@@ -585,7 +585,7 @@ public class OntTools
* A filter which accepts statements whose predicate matches one of a collection
* of predicates held by the filter object.
*/
- public static class PredicatesFilter extends Filter<Statement>
+ public static class PredicatesFilter implements Predicate<Statement>
{
public Collection<Property> m_preds;
@@ -609,7 +609,7 @@ public class OntTools
m_preds.add( pred );
}
- @Override public boolean accept( Statement s ) {
+ @Override public boolean test( Statement s ) {
return m_preds.contains( s.getPredicate() );
}
}
http://git-wip-us.apache.org/repos/asf/jena/blob/b2a1953b/jena-core/src/main/java/org/apache/jena/ontology/impl/OntClassImpl.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/ontology/impl/OntClassImpl.java b/jena-core/src/main/java/org/apache/jena/ontology/impl/OntClassImpl.java
index 8397e1f..e2aae36 100644
--- a/jena-core/src/main/java/org/apache/jena/ontology/impl/OntClassImpl.java
+++ b/jena-core/src/main/java/org/apache/jena/ontology/impl/OntClassImpl.java
@@ -34,7 +34,6 @@ import org.apache.jena.ontology.* ;
import org.apache.jena.rdf.model.* ;
import org.apache.jena.reasoner.InfGraph ;
import org.apache.jena.util.iterator.ExtendedIterator ;
-import org.apache.jena.util.iterator.Filter ;
import org.apache.jena.util.iterator.UniqueFilter ;
import org.apache.jena.util.iterator.WrappedIterator ;
import org.apache.jena.vocabulary.OWL ;
@@ -72,7 +71,6 @@ public class OntClassImpl
* Note: should not be invoked directly by user code: use
* {@link org.apache.jena.rdf.model.RDFNode#as as()} instead.
*/
- @SuppressWarnings("hiding")
public static Implementation factory = new Implementation() {
@Override
public EnhNode wrap( Node n, EnhGraph eg ) {
@@ -177,7 +175,7 @@ public class OntClassImpl
@Override
public ExtendedIterator<OntClass> listSuperClasses( boolean direct ) {
return listDirectPropertyValues( getProfile().SUB_CLASS_OF(), "SUB_CLASS_OF", OntClass.class, getProfile().SUB_CLASS_OF(), direct, false )
- .filterDrop( new SingleEqualityFilter<OntClass>( this ) ).filterKeep( new UniqueFilter<OntClass>());
+ .filterDrop( this::equals ).filterKeep( new UniqueFilter<OntClass>());
}
/**
@@ -367,7 +365,7 @@ public class OntClassImpl
@Override
public ExtendedIterator<OntClass> listSubClasses( boolean direct ) {
return listDirectPropertyValues( getProfile().SUB_CLASS_OF(), "SUB_CLASS_OF", OntClass.class, getProfile().SUB_CLASS_OF(), direct, true )
- .filterDrop( new SingleEqualityFilter<OntClass>( this ) ).filterKeep( new UniqueFilter<OntClass>());
+ .filterDrop( this::equals ).filterKeep( new UniqueFilter<OntClass>());
}
@@ -670,12 +668,8 @@ public class OntClassImpl
return getModel()
.listStatements( null, RDF.type, this )
.mapWith( s -> s.getSubject().as( Individual.class ) )
- .filterKeep( new Filter<Individual>() {
- @Override
- public boolean accept( Individual o ) {
- // if direct, ignore the sub-class typed resources
- return o.hasRDFType( OntClassImpl.this, direct );
- }} ).filterKeep( new UniqueFilter<Individual>());
+ .filterKeep( o -> o.hasRDFType( OntClassImpl.this, direct ))
+ .filterKeep( new UniqueFilter<Individual>());
}
http://git-wip-us.apache.org/repos/asf/jena/blob/b2a1953b/jena-core/src/main/java/org/apache/jena/ontology/impl/OntModelImpl.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/ontology/impl/OntModelImpl.java b/jena-core/src/main/java/org/apache/jena/ontology/impl/OntModelImpl.java
index 458a945..0aac74a 100644
--- a/jena-core/src/main/java/org/apache/jena/ontology/impl/OntModelImpl.java
+++ b/jena-core/src/main/java/org/apache/jena/ontology/impl/OntModelImpl.java
@@ -28,6 +28,7 @@ import java.io.OutputStream ;
import java.io.Reader ;
import java.io.Writer ;
import java.util.* ;
+import java.util.function.Predicate;
import org.apache.jena.enhanced.BuiltinPersonalities ;
import org.apache.jena.enhanced.EnhNode ;
@@ -536,17 +537,8 @@ public class OntModelImpl extends ModelCom implements OntModel
// no easy shortcut, so we use brute force
return listClasses()
- .filterDrop( new Filter<OntClass>() {
- @Override
- public boolean accept( OntClass o ) {
- return ((OntResource) o).isOntLanguageTerm();
- }} )
- .filterKeep( new Filter<OntClass>() {
- @Override
- public boolean accept( OntClass o ) {
- return o.isHierarchyRoot();
- }} )
- ;
+ .filterDrop( OntResource::isOntLanguageTerm )
+ .filterKeep( OntClass::isHierarchyRoot );
}
@@ -658,14 +650,7 @@ public class OntModelImpl extends ModelCom implements OntModel
*/
@Override
public ExtendedIterator<OntClass> listNamedClasses() {
- return listClasses().filterDrop(
- new Filter<OntClass>() {
- @Override
- public boolean accept( OntClass x ) {
- return x.isAnon();
- }
- }
- );
+ return listClasses().filterDrop( OntClass::isAnon );
}
@@ -3112,13 +3097,13 @@ public class OntModelImpl extends ModelCom implements OntModel
// Inner class definitions
//==============================================================================
- protected class NodeCanAs<T extends RDFNode> extends Filter<Node>
+ protected class NodeCanAs<T extends RDFNode> implements Predicate<Node>
{
protected Class<T> m_asKey;
protected NodeCanAs( Class<T> asKey ) { m_asKey = asKey; }
@Override
- public boolean accept( Node x ) {
+ public boolean test( Node x ) {
try { getNodeAs( x, m_asKey ); }
catch (Exception ignore) { return false; }
return true;
@@ -3127,14 +3112,14 @@ public class OntModelImpl extends ModelCom implements OntModel
}
- /** Filter that accepts nodes that can be mapped to the given facet */
- protected class SubjectNodeCanAs<T extends RDFNode> extends Filter<T>
+ /** Predicate that accepts nodes that can be mapped to the given facet */
+ protected class SubjectNodeCanAs<T extends RDFNode> implements Predicate<T>
{
protected Class<T> m_asKey;
protected SubjectNodeCanAs( Class<T> asKey ) { m_asKey = asKey; }
@Override
- public boolean accept( T x ) {
+ public boolean test( T x ) {
Node n = (x instanceof Triple)
? ((Triple) x).getSubject()
: ((x instanceof EnhNode) ? ((EnhNode) x).asNode() : (Node) x);
http://git-wip-us.apache.org/repos/asf/jena/blob/b2a1953b/jena-core/src/main/java/org/apache/jena/ontology/impl/OntPropertyImpl.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/ontology/impl/OntPropertyImpl.java b/jena-core/src/main/java/org/apache/jena/ontology/impl/OntPropertyImpl.java
index 8d11a72..2280299 100644
--- a/jena-core/src/main/java/org/apache/jena/ontology/impl/OntPropertyImpl.java
+++ b/jena-core/src/main/java/org/apache/jena/ontology/impl/OntPropertyImpl.java
@@ -24,6 +24,7 @@ package org.apache.jena.ontology.impl;
// Imports
///////////////
import java.util.*;
+import java.util.function.Predicate;
import org.apache.jena.enhanced.* ;
import org.apache.jena.graph.* ;
@@ -53,7 +54,6 @@ public class OntPropertyImpl
* Note: should not be invoked directly by user code: use
* {@link org.apache.jena.rdf.model.RDFNode#as as()} instead.
*/
- @SuppressWarnings("hiding")
public static Implementation factory = new Implementation() {
@Override
public EnhNode wrap( Node n, EnhGraph eg ) {
@@ -175,7 +175,7 @@ public class OntPropertyImpl
@Override
public ExtendedIterator<OntProperty> listSuperProperties( boolean direct ) {
return listDirectPropertyValues( getProfile().SUB_PROPERTY_OF(), "SUB_PROPERTY_OF", OntProperty.class, getProfile().SUB_PROPERTY_OF(), direct, false )
- .filterDrop( new SingleEqualityFilter<OntProperty>( this ) );
+ .filterDrop( this::equals );
}
/**
@@ -835,11 +835,7 @@ public class OntPropertyImpl
// in the non-direct case, global properties appear in the ldp
// of all classes, but we ignore the built-in classes
return ((OntModel) getModel()).listClasses()
- .filterDrop( new Filter<OntClass>() {
- @Override
- public boolean accept( OntClass c ) {
- return c.isOntLanguageTerm();
- }} );
+ .filterDrop( OntClass::isOntLanguageTerm );
}
else {
// in the direct case, global properties only attach to the
@@ -902,7 +898,7 @@ public class OntPropertyImpl
* <p>Filter that accepts classes which have the given property as one of
* their declared properties.</p>
*/
- private class FilterDeclaringClass extends Filter<OntClass>
+ private class FilterDeclaringClass implements Predicate<OntClass>
{
private boolean m_direct;
private Property m_prop;
@@ -912,7 +908,7 @@ public class OntPropertyImpl
m_direct = direct;
}
- @Override public boolean accept( OntClass o ) {
+ @Override public boolean test( OntClass o ) {
return o.hasDeclaredProperty( m_prop, m_direct );
}
http://git-wip-us.apache.org/repos/asf/jena/blob/b2a1953b/jena-core/src/main/java/org/apache/jena/ontology/impl/OntResourceImpl.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/ontology/impl/OntResourceImpl.java b/jena-core/src/main/java/org/apache/jena/ontology/impl/OntResourceImpl.java
index cdd18fe..97911de 100644
--- a/jena-core/src/main/java/org/apache/jena/ontology/impl/OntResourceImpl.java
+++ b/jena-core/src/main/java/org/apache/jena/ontology/impl/OntResourceImpl.java
@@ -25,6 +25,7 @@ package org.apache.jena.ontology.impl;
///////////////
import java.util.*;
import java.util.function.Function;
+import java.util.function.Predicate;
import org.apache.jena.datatypes.xsd.XSDDatatype ;
import org.apache.jena.enhanced.* ;
@@ -68,7 +69,6 @@ public class OntResourceImpl
* Note: should not be invoked directly by user code: use
* {@link org.apache.jena.rdf.model.RDFNode#as as()} instead.
*/
- @SuppressWarnings("hiding")
public static Implementation factory = new Implementation() {
@Override
public EnhNode wrap( Node n, EnhGraph eg ) {
@@ -1654,23 +1654,14 @@ public class OntResourceImpl
/** Filter for matching language tags on the objects of statements */
- protected class LangTagFilter extends Filter<Statement>
+ protected class LangTagFilter implements Predicate<Statement>
{
protected String m_lang;
public LangTagFilter( String lang ) { m_lang = lang; }
@Override
- public boolean accept( Statement x ) {
+ public boolean test( Statement x ) {
RDFNode o = x.getObject();
- return o.isLiteral() && langTagMatch( m_lang, ((Literal) o).getLanguage() );
+ return o.isLiteral() && langTagMatch( m_lang, o.asLiteral().getLanguage() );
}
}
-
- /** Filter for accepting only the given value, based on .equals() */
- protected class SingleEqualityFilter<T>
- extends Filter<T>
- {
- private T m_obj;
- public SingleEqualityFilter( T x ) { m_obj = x; }
- @Override public boolean accept( T x ) {return m_obj.equals( x );}
- }
}
http://git-wip-us.apache.org/repos/asf/jena/blob/b2a1953b/jena-core/src/main/java/org/apache/jena/rdf/model/Selector.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/rdf/model/Selector.java b/jena-core/src/main/java/org/apache/jena/rdf/model/Selector.java
index 7bf1125..415c596 100644
--- a/jena-core/src/main/java/org/apache/jena/rdf/model/Selector.java
+++ b/jena-core/src/main/java/org/apache/jena/rdf/model/Selector.java
@@ -18,6 +18,8 @@
package org.apache.jena.rdf.model;
+import java.util.function.Predicate;
+
/** A Statement selector.
*
* <p>Model includes list and query methods which will return all the
@@ -26,12 +28,7 @@ package org.apache.jena.rdf.model;
*
*/
-public interface Selector {
- /** Determine whether a Statement should be selected.
- * @param s The statement to be considered.
- * @return true if the statement has been selected.
- */
- boolean test( Statement s );
+public interface Selector extends Predicate<Statement> {
/**
Answer true iff this Selector is completely characterised by its subject,
http://git-wip-us.apache.org/repos/asf/jena/blob/b2a1953b/jena-core/src/main/java/org/apache/jena/rdf/model/impl/ModelCom.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/rdf/model/impl/ModelCom.java b/jena-core/src/main/java/org/apache/jena/rdf/model/impl/ModelCom.java
index a0ed407..e644f55 100644
--- a/jena-core/src/main/java/org/apache/jena/rdf/model/impl/ModelCom.java
+++ b/jena-core/src/main/java/org/apache/jena/rdf/model/impl/ModelCom.java
@@ -21,7 +21,6 @@ package org.apache.jena.rdf.model.impl;
import java.io.* ;
import java.net.URL ;
import java.util.* ;
-
import org.apache.jena.datatypes.DatatypeFormatException ;
import org.apache.jena.datatypes.RDFDatatype ;
import org.apache.jena.datatypes.TypeMapper ;
@@ -494,39 +493,34 @@ implements Model, PrefixMapping, Lock
}
}
- private class StringFilteredStmtIterator extends FilterKeepIterator<Statement> implements StmtIterator {
- public StringFilteredStmtIterator(final String str, Iterator<Statement> it ) {
- super(
- new Filter<Statement>() {
- @Override public boolean accept(Statement s) {
- RDFNode o = s.getObject();
- if (o instanceof Literal) {
- if (str == null) return true; // should not happen
- return (str.equals(((Literal) o).getString()));
- }
- return false;
- }
- },
- it );
- }
+ private class StringFilteredStmtIterator extends FilterIterator<Statement>
+ implements StmtIterator {
+ public StringFilteredStmtIterator(final String str, Iterator<Statement> it) {
+ super(s -> {
+ RDFNode o = s.getObject();
+ if (o instanceof Literal) {
+ if (str == null)
+ return true; // should not happen
+ return (str.equals(o.asLiteral().getString()));
+ }
+ return false;
+ }, it);
+ }
@Override public Statement nextStatement() { return next(); }
}
- private class LangFilteredStmtIterator extends FilterKeepIterator<Statement> implements StmtIterator {
- public LangFilteredStmtIterator(final String l, Iterator<Statement> it ) {
- super(
- new Filter<Statement>() {
- @Override public boolean accept(Statement s) {
- RDFNode o = s.getObject();
- if (o instanceof Literal) {
- if (l == null) return true;
- return (l.equals(((Literal) o).getLanguage()));
- }
- return false;
- }
- },
- it );
- }
+ private class LangFilteredStmtIterator extends FilterIterator<Statement> implements StmtIterator {
+ public LangFilteredStmtIterator(final String l, Iterator<Statement> it) {
+ super(s -> {
+ RDFNode o = s.getObject();
+ if (o instanceof Literal) {
+ if (l == null)
+ return true;
+ return (l.equals(o.asLiteral().getLanguage()));
+ }
+ return false;
+ }, it);
+ }
@Override public Statement nextStatement() { return next(); }
}
@@ -1286,22 +1280,10 @@ implements Model, PrefixMapping, Lock
StmtIterator sts = IteratorFactory.asStmtIterator( findTriplesFrom( selector ), this );
return selector.isSimple()
? sts
- : new StmtIteratorImpl( sts .filterKeep ( asFilter( selector ) ) )
+ : new StmtIteratorImpl( sts .filterKeep ( selector ) )
;
}
- /**
- Answer a Filter that filters exactly those things the Selector selects.
-
- @param s a Selector on statements
- @return a Filter that accepts statements that s passes tests on
- */
- public Filter<Statement> asFilter( final Selector s )
- { return new Filter<Statement>()
- { @Override public boolean accept( Statement x ) { return s.test( x ); } };
- }
-
-
/**
Answer an [extended] iterator which returns the triples in this graph which
are selected by the (S, P, O) triple in the selector, ignoring any special
http://git-wip-us.apache.org/repos/asf/jena/blob/b2a1953b/jena-core/src/main/java/org/apache/jena/rdf/model/impl/ReifierStd.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/rdf/model/impl/ReifierStd.java b/jena-core/src/main/java/org/apache/jena/rdf/model/impl/ReifierStd.java
index 5180d7a..0bf7d26 100644
--- a/jena-core/src/main/java/org/apache/jena/rdf/model/impl/ReifierStd.java
+++ b/jena-core/src/main/java/org/apache/jena/rdf/model/impl/ReifierStd.java
@@ -20,12 +20,12 @@ package org.apache.jena.rdf.model.impl;
import java.util.* ;
+import java.util.function.Predicate;
import org.apache.jena.graph.* ;
import org.apache.jena.shared.AlreadyReifiedException ;
import org.apache.jena.shared.CannotReifyException ;
import org.apache.jena.util.iterator.ExtendedIterator ;
-import org.apache.jena.util.iterator.Filter ;
import org.apache.jena.util.iterator.NullIterator ;
import org.apache.jena.util.iterator.WrappedIterator ;
import org.apache.jena.vocabulary.RDF ;
@@ -60,16 +60,10 @@ public class ReifierStd
return graph.find(match) ;
}
- static Filter<Triple> filterReif = new Filter<Triple>() {
- @Override
- public boolean accept(Triple triple)
- {
- return triple.getPredicate().equals(subject) ||
+ static Predicate<Triple> filterReif = triple -> triple.getPredicate().equals(subject) ||
triple.getPredicate().equals(predicate) ||
triple.getPredicate().equals(object) ||
( triple.getPredicate().equals(rdfType) && triple.getObject().equals(statement) ) ;
- }
- } ;
/**
Answer an iterator over all the reification triples that this Reifier exposes
http://git-wip-us.apache.org/repos/asf/jena/blob/b2a1953b/jena-core/src/main/java/org/apache/jena/rdfxml/xmloutput/impl/Unparser.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/rdfxml/xmloutput/impl/Unparser.java b/jena-core/src/main/java/org/apache/jena/rdfxml/xmloutput/impl/Unparser.java
index 409bbd9..8e6d765 100644
--- a/jena-core/src/main/java/org/apache/jena/rdfxml/xmloutput/impl/Unparser.java
+++ b/jena-core/src/main/java/org/apache/jena/rdfxml/xmloutput/impl/Unparser.java
@@ -115,6 +115,8 @@ package org.apache.jena.rdfxml.xmloutput.impl;
*
* [6.34] literal ::= (any well-formed XML)
*/
+import static org.apache.jena.util.iterator.WrappedIterator.create;
+
import java.io.PrintWriter ;
import java.util.* ;
@@ -1542,12 +1544,12 @@ class Unparser {
* This class is an iterator over the set infinite, but we wait until it is
* used before instantiating the underlying iterator.
*/
- private Iterator<Resource> allInfiniteLeft() {
- return new LateBindingIterator<Resource>() {
+ private ExtendedIterator<Resource> allInfiniteLeft() {
+ return create(new LateBindingIterator<Resource>() {
@Override public Iterator<Resource> create() {
return infinite.iterator();
}
- };
+ });
}
private Iterator<Resource> pleasingTypeIterator() {
@@ -1630,13 +1632,14 @@ class Unparser {
// Subjects that are not objects of anything.
// Iterator<Resource> nonObjects = new FilterIterator<Resource>(new Filter<Resource>() {
-// @Override public boolean accept( Resource o ) {
+// @Override public boolean test( Resource o ) {
// return (!objectTable.containsKey(o))
// && (!wantReification(o));
// }
// }, modelListSubjects());
- Iterator<Resource> nonObjects = modelListSubjects().filterKeep( new Filter<Resource>() {@Override public boolean accept( Resource o ) { return (!objectTable.containsKey(o)) && (!wantReification(o) ); } } );
-
+ Iterator<Resource> nonObjects = modelListSubjects()
+ .filterKeep( o -> !objectTable.containsKey(o) && !wantReification(o));
+
// At these stage we evaluate a dependency graph of the remaining
// resources.
// This is stuck in the master iterator so that it's hasNext is called
@@ -1652,26 +1655,22 @@ class Unparser {
};
// non-anonymous resources that are the object of more than one
// triple that are in infinite cycles.
- Iterator<Resource> firstChoiceCyclic = new FilterIterator<>(new Filter<Resource>() {
- @Override
- public boolean accept(Resource r) {
- codeCoverage[4]++;
- if (r.isAnon())
- return false;
- Integer cnt = objectTable.get(r);
- if (cnt == null || cnt.intValue() <= 1)
- return false;
- return true;
- }
- }, this.allInfiniteLeft());
+ Iterator<Resource> firstChoiceCyclic = allInfiniteLeft()
+ .filterKeep(r -> {
+ codeCoverage[4]++;
+ if (r.isAnon())
+ return false;
+ Integer cnt = objectTable.get(r);
+ if (cnt == null || cnt.intValue() <= 1)
+ return false;
+ return true;
+ });
// any non genuinely anonymous resources that are in infinite cycles
- Iterator<Resource> nonAnonInfinite = new FilterIterator<>(new Filter<Resource>() {
- @Override
- public boolean accept(Resource r) {
- codeCoverage[5]++;
- return !isGenuineAnon(r);
- }
- }, allInfiniteLeft());
+ Iterator<Resource> nonAnonInfinite = allInfiniteLeft()
+ .filterKeep(r -> {
+ codeCoverage[5]++;
+ return !isGenuineAnon(r);
+ });
// any other resource in an infinite cyle
Iterator<Resource> inf = allInfiniteLeft();
Iterator<Resource> anotherFake = new NullIterator<Resource>() {
@@ -1681,13 +1680,10 @@ class Unparser {
return false;
}
};
- Iterator<Resource> reifications = new FilterIterator<>(new Filter<Resource>() {
- @Override
- public boolean accept(Resource r) {
- codeCoverage[6]++;
- return res2statement.containsKey(r);
- }
- }, allInfiniteLeft());
+ Iterator<Resource> reifications = allInfiniteLeft().filterKeep(r -> {
+ codeCoverage[6]++;
+ return res2statement.containsKey(r);
+ });
// any other resource.
Iterator<Resource> backStop = modelListSubjects();
@@ -1703,15 +1699,10 @@ class Unparser {
return false;
}
}, backStop };
- Iterator<Resource> allAsOne = WrappedIterator.createIteratorIterator( Arrays.asList(all).iterator() );
+ ExtendedIterator<Resource> allAsOne = WrappedIterator.createIteratorIterator( Arrays.asList(all).iterator() );
// Filter for those that still have something to list.
- return new FilterIterator<>(new Filter<Resource>() {
- @Override
- public boolean accept(Resource r) {
- return hasProperties(r);
- }
- }, allAsOne);
+ return allAsOne.filterKeep(this::hasProperties);
}
private Set<ResIterator> openResIterators = new HashSet<>();
http://git-wip-us.apache.org/repos/asf/jena/blob/b2a1953b/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/FBRuleInfGraph.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/FBRuleInfGraph.java b/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/FBRuleInfGraph.java
index 6aa6a85..34f2e72 100644
--- a/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/FBRuleInfGraph.java
+++ b/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/FBRuleInfGraph.java
@@ -36,7 +36,6 @@ import org.apache.jena.shared.impl.JenaParameters ;
import org.apache.jena.util.OneToManyMap ;
import org.apache.jena.util.PrintUtil ;
import org.apache.jena.util.iterator.ExtendedIterator ;
-import org.apache.jena.util.iterator.Filter ;
import org.apache.jena.util.iterator.UniqueFilter ;
import org.apache.jena.vocabulary.RDFS ;
import org.apache.jena.vocabulary.ReasonerVocabulary ;
@@ -562,9 +561,7 @@ public class FBRuleInfGraph extends BasicForwardRuleInfGraph implements Backwar
}
if (filterFunctors) {
// return result.filterDrop(Functor.acceptFilter);
- return result.filterDrop( new Filter<Triple>() {
- @Override public boolean accept( Triple o )
- { return FBRuleInfGraph.this.accept( o ); }} );
+ return result.filterDrop( t -> FBRuleInfGraph.this.accept( t ) );
} else {
return result;
}
http://git-wip-us.apache.org/repos/asf/jena/blob/b2a1953b/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/Functor.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/Functor.java b/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/Functor.java
index b6054cf..27217e6 100755
--- a/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/Functor.java
+++ b/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/Functor.java
@@ -21,11 +21,11 @@ package org.apache.jena.reasoner.rulesys;
import org.apache.jena.datatypes.* ;
import org.apache.jena.graph.* ;
import org.apache.jena.util.PrintUtil ;
-import org.apache.jena.util.iterator.Filter ;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.util.*;
+import java.util.function.Predicate;
/**
* A functor comprises a functor name and a list of
@@ -46,14 +46,11 @@ public class Functor implements ClauseEntry {
/** A built in that implements the functor */
protected Builtin implementor;
- /** A static Filter instance that detects triples with Functor objects */
- public static final Filter<Triple> acceptFilter = new Filter<Triple>() {
- @Override
- public boolean accept( Triple t) {
+ /** A static Predicate instance that detects triples with Functor objects */
+ public static final Predicate<Triple> acceptFilter = t -> {
if (t.getSubject().isLiteral()) return true;
Node n = t.getObject();
return n.isLiteral() && n.getLiteralDatatype() == FunctorDatatype.theFunctorDatatype;
- }
};
protected static Logger logger = LoggerFactory.getLogger(Functor.class);
http://git-wip-us.apache.org/repos/asf/jena/blob/b2a1953b/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/impl/SafeGraph.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/impl/SafeGraph.java b/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/impl/SafeGraph.java
index 8a545fa..cc05561 100644
--- a/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/impl/SafeGraph.java
+++ b/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/impl/SafeGraph.java
@@ -24,7 +24,6 @@ import org.apache.jena.graph.Triple ;
import org.apache.jena.graph.impl.SimpleEventManager ;
import org.apache.jena.graph.impl.WrappedGraph ;
import org.apache.jena.util.iterator.ExtendedIterator ;
-import org.apache.jena.util.iterator.Filter ;
/**
* A SafeGraph wraps a graph which might contain generalized RDF
@@ -46,14 +45,8 @@ public class SafeGraph extends WrappedGraph implements Graph {
@Override
public ExtendedIterator<Triple> find( Node s, Node p, Node o ) {
return SimpleEventManager.notifyingRemove( this,
- base.find( s, p, o ).filterDrop( new Filter<Triple>() {
- @Override
- public boolean accept(Triple t) {
- if (t.getSubject().isLiteral()) return true;
- if (t.getPredicate().isBlank() || t.getPredicate().isLiteral()) return true;
- return false;
- }
- } ) );
+ base.find( s, p, o ).filterDrop( t -> t.getSubject().isLiteral() ||
+ t.getPredicate().isBlank() || t.getPredicate().isLiteral() ) );
}
/**
http://git-wip-us.apache.org/repos/asf/jena/blob/b2a1953b/jena-core/src/main/java/org/apache/jena/util/iterator/ExtendedIterator.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/util/iterator/ExtendedIterator.java b/jena-core/src/main/java/org/apache/jena/util/iterator/ExtendedIterator.java
index 2a0eeb6..9953286 100644
--- a/jena-core/src/main/java/org/apache/jena/util/iterator/ExtendedIterator.java
+++ b/jena-core/src/main/java/org/apache/jena/util/iterator/ExtendedIterator.java
@@ -20,6 +20,7 @@ package org.apache.jena.util.iterator;
import java.util.*;
import java.util.function.Function;
+import java.util.function.Predicate;
/**
an ExtendedIterator is a ClosableIterator on which other operations are
@@ -54,14 +55,14 @@ public interface ExtendedIterator<T> extends ClosableIterator<T>
pass the filter _f_. The order of the elements is preserved. Does not
copy _this_, which is consumed as the result is consumed.
*/
- public ExtendedIterator<T> filterKeep( Filter<T> f );
+ public ExtendedIterator<T> filterKeep( Predicate<T> f );
/**
return a new iterator containing only the elements of _this_ which
are rejected by the filter _f_. The order of the elements is preserved.
Does not copy _this_, which is consumed as the result is consumed.
*/
- public ExtendedIterator<T> filterDrop( Filter<T> f );
+ public ExtendedIterator<T> filterDrop( Predicate<T> f );
/**
return a new iterator where each element is the result of applying
http://git-wip-us.apache.org/repos/asf/jena/blob/b2a1953b/jena-core/src/main/java/org/apache/jena/util/iterator/Filter.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/util/iterator/Filter.java b/jena-core/src/main/java/org/apache/jena/util/iterator/Filter.java
index 5c7faaf..6c85c28 100644
--- a/jena-core/src/main/java/org/apache/jena/util/iterator/Filter.java
+++ b/jena-core/src/main/java/org/apache/jena/util/iterator/Filter.java
@@ -19,66 +19,107 @@
package org.apache.jena.util.iterator;
import java.util.Iterator;
+import java.util.function.Predicate;
-/**
- boolean functions wrapped to be used in filtering iterators.
-*/
-public abstract class Filter<T>
- {
- /**
- Answer true iff the object <code>o</code> is acceptable. This method
- may also throw an exception if the argument is of a wrong type; it
- is not required to return <code>false</code> in such a case.
- */
- public abstract boolean accept( T o );
-
- public ExtendedIterator<T> filterKeep( Iterator<T> it )
- { return new FilterKeepIterator<>( this, it ); }
-
- public Filter<T> and( final Filter<T> other )
- { return other.isAny() ? this : new Filter<T>()
- { @Override public boolean accept( T x )
- { return Filter.this.accept( x ) && other.accept( x ); }
- };
- }
-
- /**
- Answer true iff this filter will deliver true for any argument. Should never
- be overridden except by classes generated by any() below.
- */
- public boolean isAny()
- { return false; }
-
- /**
- A Filter that accepts everything it's offered.
- @deprecated use Filter.any()
- */
- @SuppressWarnings({"unchecked", "rawtypes"})
- // Knowingly suppressed - maximum backward compatibility.
- @Deprecated public static final Filter any = new Filter()
- {
- @Override public final boolean isAny() { return true; }
-
- @Override public final boolean accept( Object o ) { return true; }
-
- @Override public Filter and( Filter other ) { return other; }
-
- @Override public ExtendedIterator filterKeep( Iterator it )
- { return WrappedIterator.create( it ); }
- };
-
- public static <T> Filter<T> any()
- {
- return new Filter<T>()
- {
- @Override public final boolean isAny() { return true; }
-
- @Override public final boolean accept( T o ) { return true; }
-
- @Override public Filter<T> and( Filter<T> other ) { return other; }
-
- @Override public ExtendedIterator<T> filterKeep( Iterator<T> it )
- { return WrappedIterator.create( it ); }
- };
- }
- }
+/**
+ * boolean functions wrapped to be used in filtering iterators.
+ *
+ * Deprecated in favor of {@link Predicate}.
+ */
+@Deprecated
+public abstract class Filter<T> implements Predicate<T> {
+
+ public boolean test(T o) {
+ return accept(o);
+ }
+
+ @Deprecated
+ public abstract boolean accept(T o);
+
+ @Deprecated
+ public ExtendedIterator<T> filterKeep(Iterator<T> it) {
+ return new FilterIterator<>(this, it);
+ }
+
+ /**
+ * Use {@link #and(Predicate)} instead.
+ */
+ @Deprecated
+ public Filter<T> and(final Filter<T> other) {
+ return other.isAny() ? this : new Filter<T>() {
+ @Override
+ public boolean accept(T x) {
+ return Filter.this.accept(x) && other.accept(x);
+ }
+ };
+ }
+
+ /**
+ * Answer true iff this filter will deliver true for any argument. Should
+ * never be overridden except by classes generated by any() below.
+ *
+ * No longer needed after Java 8: optimizations of this kind are now a compiler/JVM concern.
+ */
+ @Deprecated
+ public boolean isAny() {
+ return false;
+ }
+
+ /**
+ * A Filter that accepts everything it's offered.
+ *
+ * @deprecated use Filter.any()
+ */
+ @SuppressWarnings({ "unchecked", "rawtypes" })
+ // Knowingly suppressed - maximum backward compatibility.
+ @Deprecated
+ public static final Filter any = new Filter() {
+ @Override
+ public final boolean isAny() {
+ return true;
+ }
+
+ @Override
+ public final boolean accept(Object o) {
+ return true;
+ }
+
+ @Override
+ public Filter and(Filter other) {
+ return other;
+ }
+
+ @Override
+ public ExtendedIterator filterKeep(Iterator it) {
+ return WrappedIterator.create(it);
+ }
+ };
+
+ /**
+ * Use Java 8's lambda syntax, e.g. x -> true.
+ */
+ @Deprecated
+ public static <T> Filter<T> any() {
+ return new Filter<T>() {
+ @Override
+ public final boolean isAny() {
+ return true;
+ }
+
+ @Override
+ public final boolean accept(T o) {
+ return true;
+ }
+
+ @Override
+ public Filter<T> and(Filter<T> other) {
+ return other;
+ }
+
+ @Override
+ public ExtendedIterator<T> filterKeep(Iterator<T> it) {
+ return WrappedIterator.create(it);
+ }
+ };
+ }
+}
http://git-wip-us.apache.org/repos/asf/jena/blob/b2a1953b/jena-core/src/main/java/org/apache/jena/util/iterator/FilterDropIterator.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/util/iterator/FilterDropIterator.java b/jena-core/src/main/java/org/apache/jena/util/iterator/FilterDropIterator.java
deleted file mode 100644
index 3c442a4..0000000
--- a/jena-core/src/main/java/org/apache/jena/util/iterator/FilterDropIterator.java
+++ /dev/null
@@ -1,34 +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.util.iterator;
-
-import java.util.Iterator;
-
-/**
- A subclass of FiterIterator which discards the elements that pass the
- filter.
- */
-public class FilterDropIterator<T> extends FilterIterator<T> implements Iterator<T>
- {
- public FilterDropIterator( Filter<T> f, Iterator<T> it )
- { super( f, it ); }
-
- @Override protected boolean accept( T x )
- { return !f.accept( x ); }
- }
http://git-wip-us.apache.org/repos/asf/jena/blob/b2a1953b/jena-core/src/main/java/org/apache/jena/util/iterator/FilterIterator.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/util/iterator/FilterIterator.java b/jena-core/src/main/java/org/apache/jena/util/iterator/FilterIterator.java
index 6ae9042..c5ddb83 100644
--- a/jena-core/src/main/java/org/apache/jena/util/iterator/FilterIterator.java
+++ b/jena-core/src/main/java/org/apache/jena/util/iterator/FilterIterator.java
@@ -20,6 +20,7 @@ package org.apache.jena.util.iterator;
import java.util.Iterator;
import java.util.NoSuchElementException;
+import java.util.function.Predicate;
/**
Creates a sub-Iterator by filtering. This class should not be used
@@ -28,7 +29,7 @@ import java.util.NoSuchElementException;
*/
public class FilterIterator<T> extends WrappedIterator<T>
{
- protected final Filter<T> f;
+ protected final Predicate<T> f;
protected T current;
protected boolean canRemove;
protected boolean hasCurrent;
@@ -38,7 +39,7 @@ public class FilterIterator<T> extends WrappedIterator<T>
@param fl An object is included if it is accepted by this Filter.
@param e The base Iterator.
*/
- public FilterIterator( Filter<T> fl, Iterator<T> e )
+ public FilterIterator( Predicate<T> fl, Iterator<T> e )
{
super( e );
f = fl;
@@ -52,18 +53,11 @@ public class FilterIterator<T> extends WrappedIterator<T>
@Override public boolean hasNext()
{
while (!hasCurrent && super.hasNext())
- hasCurrent = accept( current = super.next() );
+ hasCurrent = f.test( current = super.next() );
canRemove = false;
return hasCurrent;
}
- /**
- Overridden in Drop/Keep as appropriate. Answer true if the object is
- to be kept in the output, false if it is to be dropped.
- */
- protected boolean accept( T x )
- { return f.accept( x ); }
-
/**
Remove the current member from the underlying iterator. Legal only
after a .next() but before any subsequent .hasNext(), because that
http://git-wip-us.apache.org/repos/asf/jena/blob/b2a1953b/jena-core/src/main/java/org/apache/jena/util/iterator/FilterKeepIterator.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/util/iterator/FilterKeepIterator.java b/jena-core/src/main/java/org/apache/jena/util/iterator/FilterKeepIterator.java
deleted file mode 100644
index 10220d8..0000000
--- a/jena-core/src/main/java/org/apache/jena/util/iterator/FilterKeepIterator.java
+++ /dev/null
@@ -1,34 +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.util.iterator;
-
-import java.util.Iterator;
-
-/**
- A subclass of FilterIterator which keeps the elements that pass the
- test.
-*/
-public class FilterKeepIterator<T> extends FilterIterator<T> implements Iterator<T>
- {
- public FilterKeepIterator( Filter<T> f, Iterator<T> it )
- { super( f, it ); }
-
- @Override protected boolean accept( T x )
- { return f.accept( x ); }
- }
http://git-wip-us.apache.org/repos/asf/jena/blob/b2a1953b/jena-core/src/main/java/org/apache/jena/util/iterator/LazyIterator.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/util/iterator/LazyIterator.java b/jena-core/src/main/java/org/apache/jena/util/iterator/LazyIterator.java
index 2411413..8a26180 100644
--- a/jena-core/src/main/java/org/apache/jena/util/iterator/LazyIterator.java
+++ b/jena-core/src/main/java/org/apache/jena/util/iterator/LazyIterator.java
@@ -19,6 +19,7 @@
package org.apache.jena.util.iterator;
import java.util.function.Function;
+import java.util.function.Predicate;
/** An ExtendedIterator that is created lazily.
* This is useful when constructing an iterator is expensive and
@@ -64,13 +65,13 @@ abstract public class LazyIterator<T> implements ExtendedIterator<T> {
}
@Override
- public ExtendedIterator<T> filterKeep(Filter<T> f) {
+ public ExtendedIterator<T> filterKeep(Predicate<T> f) {
lazy();
return it.filterKeep(f);
}
@Override
- public ExtendedIterator<T> filterDrop(Filter<T> f) {
+ public ExtendedIterator<T> filterDrop(Predicate<T> f) {
lazy();
return it.filterDrop(f);
}
http://git-wip-us.apache.org/repos/asf/jena/blob/b2a1953b/jena-core/src/main/java/org/apache/jena/util/iterator/NiceIterator.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/util/iterator/NiceIterator.java b/jena-core/src/main/java/org/apache/jena/util/iterator/NiceIterator.java
index 6e0432f..5ebfee1 100644
--- a/jena-core/src/main/java/org/apache/jena/util/iterator/NiceIterator.java
+++ b/jena-core/src/main/java/org/apache/jena/util/iterator/NiceIterator.java
@@ -20,6 +20,7 @@ package org.apache.jena.util.iterator;
import java.util.*;
import java.util.function.Function;
+import java.util.function.Predicate;
/**
NiceIterator is the standard base class implementing ExtendedIterator. It provides
@@ -152,15 +153,15 @@ public class NiceIterator<T> implements ExtendedIterator<T>
make a new iterator, which is our elements that pass the filter
*/
@Override
- public ExtendedIterator<T> filterKeep( Filter<T> f )
- { return new FilterKeepIterator<>( f, this ); }
+ public FilterIterator<T> filterKeep( Predicate<T> f )
+ { return new FilterIterator<>( f, this ); }
/**
make a new iterator, which is our elements that do not pass the filter
*/
@Override
- public ExtendedIterator<T> filterDrop( final Filter<T> f )
- { return new FilterDropIterator<>( f, this ); }
+ public FilterIterator<T> filterDrop( final Predicate<T> f )
+ { return new FilterIterator<>( f.negate(), this ); }
/**
make a new iterator which is the elementwise _map1_ of the base iterator.
http://git-wip-us.apache.org/repos/asf/jena/blob/b2a1953b/jena-core/src/main/java/org/apache/jena/util/iterator/UniqueFilter.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/util/iterator/UniqueFilter.java b/jena-core/src/main/java/org/apache/jena/util/iterator/UniqueFilter.java
index 1e82306..bc3be53 100644
--- a/jena-core/src/main/java/org/apache/jena/util/iterator/UniqueFilter.java
+++ b/jena-core/src/main/java/org/apache/jena/util/iterator/UniqueFilter.java
@@ -20,17 +20,18 @@ package org.apache.jena.util.iterator;
import java.util.HashSet;
import java.util.Set;
+import java.util.function.Predicate;
/**
* A Filter that filters out duplicate values.
*/
-public class UniqueFilter<T> extends Filter<T> {
+public class UniqueFilter<T> implements Predicate<T> {
/** The set of objects already seen */
protected Set<T> seen = new HashSet<>();
@Override
- public boolean accept(T o) {
+ public boolean test(T o) {
boolean retval = !seen.contains(o);
if (retval)
{
http://git-wip-us.apache.org/repos/asf/jena/blob/b2a1953b/jena-core/src/test/java/org/apache/jena/graph/test/TestTripleField.java
----------------------------------------------------------------------
diff --git a/jena-core/src/test/java/org/apache/jena/graph/test/TestTripleField.java b/jena-core/src/test/java/org/apache/jena/graph/test/TestTripleField.java
index 80147ba..46d3b6d 100644
--- a/jena-core/src/test/java/org/apache/jena/graph/test/TestTripleField.java
+++ b/jena-core/src/test/java/org/apache/jena/graph/test/TestTripleField.java
@@ -54,32 +54,25 @@ public class TestTripleField extends GraphTestBase
public void testFilterSubject()
{
- assertTrue( Field.fieldSubject.filterOn( node( "a" ) ).accept( triple( "a P b" ) ) );
- assertFalse( Field.fieldSubject.filterOn( node( "x" ) ).accept( triple( "a P b" ) ) );
+ assertTrue( Field.fieldSubject.filterOn( node( "a" ) ).test( triple( "a P b" ) ) );
+ assertFalse( Field.fieldSubject.filterOn( node( "x" ) ).test( triple( "a P b" ) ) );
}
public void testFilterObject()
{
- assertTrue( Field.fieldObject.filterOn( node( "b" ) ).accept( triple( "a P b" ) ) );
- assertFalse( Field.fieldObject.filterOn( node( "c" ) ).accept( triple( "a P b" ) ) );
+ assertTrue( Field.fieldObject.filterOn( node( "b" ) ).test( triple( "a P b" ) ) );
+ assertFalse( Field.fieldObject.filterOn( node( "c" ) ).test( triple( "a P b" ) ) );
}
public void testFilterPredicate()
{
- assertTrue( Field.fieldPredicate.filterOn( node( "P" ) ).accept( triple( "a P b" ) ) );
- assertFalse( Field.fieldPredicate.filterOn( node( "Q" ) ).accept( triple( "a P b" ) ) );
+ assertTrue( Field.fieldPredicate.filterOn( node( "P" ) ).test( triple( "a P b" ) ) );
+ assertFalse( Field.fieldPredicate.filterOn( node( "Q" ) ).test( triple( "a P b" ) ) );
}
public void testFilterByTriple()
{
- assertTrue( Field.fieldSubject.filterOn( triple( "s P o" ) ).accept( triple( "s Q p" ) ) );
- assertFalse( Field.fieldSubject.filterOn( triple( "s P o" ) ).accept( triple( "x Q p" ) ) );
- }
-
- public void testWildcardFilterIsAny()
- {
- assertTrue( Field.fieldSubject.filterOn( triple( "?x R s" ) ).isAny() );
- assertTrue( Field.fieldObject.filterOn( triple( "x R ?s" ) ).isAny() );
- assertTrue( Field.fieldPredicate.filterOn( triple( "x ?R s" ) ).isAny() );
+ assertTrue( Field.fieldSubject.filterOn( triple( "s P o" ) ).test( triple( "s Q p" ) ) );
+ assertFalse( Field.fieldSubject.filterOn( triple( "s P o" ) ).test( triple( "x Q p" ) ) );
}
}
http://git-wip-us.apache.org/repos/asf/jena/blob/b2a1953b/jena-core/src/test/java/org/apache/jena/ontology/impl/TestOntTools.java
----------------------------------------------------------------------
diff --git a/jena-core/src/test/java/org/apache/jena/ontology/impl/TestOntTools.java b/jena-core/src/test/java/org/apache/jena/ontology/impl/TestOntTools.java
index 7bef377..f57a48d 100644
--- a/jena-core/src/test/java/org/apache/jena/ontology/impl/TestOntTools.java
+++ b/jena-core/src/test/java/org/apache/jena/ontology/impl/TestOntTools.java
@@ -24,8 +24,10 @@ package org.apache.jena.ontology.impl;
// Imports
///////////////
import java.util.List ;
+import java.util.function.Predicate;
import junit.framework.TestCase ;
+
import org.apache.jena.ontology.OntClass ;
import org.apache.jena.ontology.OntModel ;
import org.apache.jena.ontology.OntModelSpec ;
@@ -34,7 +36,6 @@ import org.apache.jena.rdf.model.ModelFactory ;
import org.apache.jena.rdf.model.Property ;
import org.apache.jena.rdf.model.ResourceFactory ;
import org.apache.jena.rdf.model.Statement ;
-import org.apache.jena.util.iterator.Filter ;
import org.apache.jena.vocabulary.OWL ;
@@ -227,7 +228,7 @@ public class TestOntTools
/** Shortest path tests */
- static final Filter<Statement> ANY = Filter.any();
+ static final Predicate<Statement> ANY = s -> true;
public void testShortestPath0() {
Property p = m_model.createProperty( NS + "p" );
http://git-wip-us.apache.org/repos/asf/jena/blob/b2a1953b/jena-core/src/test/java/org/apache/jena/util/iterator/test/TestFilters.java
----------------------------------------------------------------------
diff --git a/jena-core/src/test/java/org/apache/jena/util/iterator/test/TestFilters.java b/jena-core/src/test/java/org/apache/jena/util/iterator/test/TestFilters.java
index ac984c5..66e589c 100644
--- a/jena-core/src/test/java/org/apache/jena/util/iterator/test/TestFilters.java
+++ b/jena-core/src/test/java/org/apache/jena/util/iterator/test/TestFilters.java
@@ -19,10 +19,11 @@
package org.apache.jena.util.iterator.test;
import java.util.*;
+import java.util.function.Predicate;
import junit.framework.TestSuite;
+
import org.apache.jena.rdf.model.test.ModelTestBase ;
-import org.apache.jena.shared.JenaException ;
import org.apache.jena.util.iterator.* ;
public class TestFilters extends ModelTestBase
@@ -32,86 +33,13 @@ public class TestFilters extends ModelTestBase
public static TestSuite suite()
{ return new TestSuite( TestFilters.class ); }
-
- public void testFilterAnyExists()
- { assertInstanceOf( Filter.class, Filter.any() ); }
-
- public void testFilterAnyAcceptsThings()
- {
- assertTrue( Filter.any().accept( "hello" ) );
- assertTrue( Filter.any().accept( 17 ) );
- assertTrue( Filter.any().accept( node( "frodo" ) ) );
- assertTrue( Filter.any().accept( node( "_cheshire" ) ) );
- assertTrue( Filter.any().accept( node( "17" ) ) );
- assertTrue( Filter.any().accept( triple( "s p o" ) ) );
- assertTrue( Filter.any().accept( Filter.any() ) );
- assertTrue( Filter.any().accept( this ) );
- }
-
- public void testFilterFilterMethod()
- {
- assertFalse( Filter.any().filterKeep( NullIterator.instance() ).hasNext() );
- }
-
- public void testFilteringThings()
- {
- ExtendedIterator<String> it = iteratorOfStrings( "gab geb bag big lava hall end" );
- Filter<String> f = new Filter<String>()
- {
- @Override public boolean accept( String o )
- { return o.charAt( 1 ) == 'a'; }
- };
- assertEquals( listOfStrings( "gab bag lava hall" ), iteratorToList( f.filterKeep( it ) ) );
- }
-
- public void testAnyFilterSimple()
- {
- ExtendedIterator<String> it = iteratorOfStrings( "" );
- assertSame( it, Filter.<String>any().filterKeep( it ) );
- }
- protected Filter<String> containsA = new Filter<String>()
- { @Override public boolean accept( String o ) { return contains( o, 'a' ); } };
-
- public void testFilterAnd()
- {
- Filter<String> containsB = new Filter<String>()
- { @Override public boolean accept( String o ) { return contains( o, 'b' ); } };
- Filter<String> f12 = containsA.and( containsB );
- assertFalse( f12.accept( "a" ) );
- assertFalse( f12.accept( "b" ) );
- assertTrue( f12.accept( "ab" ) );
- assertTrue( f12.accept( "xyzapqrbijk" ) );
- assertTrue( f12.accept( "ba" ) );
- }
-
- public void testFilterShortcircuit()
- {
- Filter<String> oops = new Filter<String>()
- { @Override public boolean accept( String o ) { throw new JenaException( "oops" ); } };
- Filter<String> f12 = containsA.and( oops );
- assertFalse( f12.accept( "z" ) );
- try { f12.accept( "a" ); fail( "oops" ); }
- catch (JenaException e) { assertEquals( "oops", e.getMessage() ); }
- }
-
- public void testAnyAndTrivial()
- { assertSame( containsA, Filter.<String>any().and( containsA ) ); }
-
- public void testSomethingAndAny()
- { assertSame( containsA, containsA.and( Filter.<String>any() ) ); }
-
- public void testFilterDropIterator()
- {
- Iterator<String> i = iteratorOfStrings( "there's an a in some animals" );
- Iterator<String> it = new FilterDropIterator<>( containsA, i );
- assertEquals( listOfStrings( "there's in some" ), iteratorToList( it ) );
- }
+ protected Predicate<String> containsA = o -> contains( o, 'a' );
- public void testFilterKeepIterator()
+ public void testFilterIterator()
{
Iterator<String> i = iteratorOfStrings( "there's an a in some animals" );
- Iterator<String> it = new FilterKeepIterator<>( containsA, i );
+ Iterator<String> it = new FilterIterator<>( containsA, i );
assertEquals( listOfStrings( "an a animals" ), iteratorToList( it ) );
}
http://git-wip-us.apache.org/repos/asf/jena/blob/b2a1953b/jena-csv/src/main/java/org/apache/jena/propertytable/graph/GraphPropertyTable.java
----------------------------------------------------------------------
diff --git a/jena-csv/src/main/java/org/apache/jena/propertytable/graph/GraphPropertyTable.java b/jena-csv/src/main/java/org/apache/jena/propertytable/graph/GraphPropertyTable.java
index 3a5b2af..7e5e5b5 100644
--- a/jena-csv/src/main/java/org/apache/jena/propertytable/graph/GraphPropertyTable.java
+++ b/jena-csv/src/main/java/org/apache/jena/propertytable/graph/GraphPropertyTable.java
@@ -20,6 +20,7 @@ package org.apache.jena.propertytable.graph;
import java.util.ArrayList ;
import java.util.Locale ;
+import java.util.function.Predicate;
import org.apache.jena.graph.Node ;
import org.apache.jena.graph.NodeFactory ;
@@ -30,7 +31,6 @@ import org.apache.jena.propertytable.PropertyTable ;
import org.apache.jena.propertytable.Row ;
import org.apache.jena.sparql.core.BasicPattern ;
import org.apache.jena.util.iterator.ExtendedIterator ;
-import org.apache.jena.util.iterator.Filter ;
import org.apache.jena.util.iterator.NullIterator ;
import org.apache.jena.util.iterator.WrappedIterator ;
@@ -117,7 +117,7 @@ public class GraphPropertyTable extends GraphBase {
}
- static class RowMatchFilterEquality extends Filter<Row> {
+ static class RowMatchFilterEquality implements Predicate<Row> {
final protected RowMatch rMatch;
public RowMatchFilterEquality(RowMatch rMatch) {
@@ -125,7 +125,7 @@ public class GraphPropertyTable extends GraphBase {
}
@Override
- public boolean accept(Row r) {
+ public boolean test(Row r) {
return rowContained(rMatch, r);
}
@@ -147,7 +147,7 @@ public class GraphPropertyTable extends GraphBase {
}
- static class TripleMatchFilterEquality extends Filter<Triple> {
+ static class TripleMatchFilterEquality implements Predicate<Triple> {
final protected Triple tMatch;
/** Creates new TripleMatchFilter */
@@ -156,7 +156,7 @@ public class GraphPropertyTable extends GraphBase {
}
@Override
- public boolean accept(Triple t) {
+ public boolean test(Triple t) {
return tripleContained(tMatch, t);
}
http://git-wip-us.apache.org/repos/asf/jena/blob/b2a1953b/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredModelImpl.java
----------------------------------------------------------------------
diff --git a/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredModelImpl.java b/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredModelImpl.java
index 072396f..37d856b 100644
--- a/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredModelImpl.java
+++ b/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredModelImpl.java
@@ -20,6 +20,7 @@ package org.apache.jena.permissions.model.impl;
import java.io.* ;
import java.net.URL ;
import java.util.* ;
+import java.util.function.Predicate;
import org.apache.jena.datatypes.RDFDatatype ;
import org.apache.jena.graph.Node ;
@@ -40,7 +41,6 @@ import org.apache.jena.rdf.model.* ;
import org.apache.jena.rdf.model.impl.RDFReaderFImpl ;
import org.apache.jena.shared.* ;
import org.apache.jena.util.iterator.ExtendedIterator ;
-import org.apache.jena.util.iterator.Filter ;
import org.apache.jena.util.iterator.WrappedIterator ;
import org.apache.jena.vocabulary.RDF ;
@@ -265,7 +265,7 @@ public class SecuredModelImpl extends SecuredItemImpl implements SecuredModel
this.p = p;
}
@Override
- public boolean accept(Resource o) {
+ public boolean test(Resource o) {
Triple t = new Triple( r.asNode(), p.asNode(), o.asNode());
return si.canRead( SecuredItemImpl.convert( t ) );
}};
@@ -2673,7 +2673,7 @@ public class SecuredModelImpl extends SecuredItemImpl implements SecuredModel
}
- private class ResourceFilter extends Filter<Resource> {
+ private class ResourceFilter implements Predicate<Resource> {
Property p;
RDFNode o;
@@ -2693,7 +2693,7 @@ public class SecuredModelImpl extends SecuredItemImpl implements SecuredModel
}
@Override
- public boolean accept(Resource s) {
+ public boolean test(Resource s) {
StmtIterator iter = listStatements(s, p, o);
try {
return iter.hasNext();
@@ -2705,7 +2705,7 @@ public class SecuredModelImpl extends SecuredItemImpl implements SecuredModel
}
- private class ObjectFilter extends Filter<RDFNode> {
+ private class ObjectFilter implements Predicate<RDFNode> {
Resource s;
Property p;
@@ -2725,7 +2725,7 @@ public class SecuredModelImpl extends SecuredItemImpl implements SecuredModel
}
@Override
- public boolean accept(RDFNode o) {
+ public boolean test(RDFNode o) {
StmtIterator iter = listStatements(s, p, o);
try {
return iter.hasNext();
http://git-wip-us.apache.org/repos/asf/jena/blob/b2a1953b/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredNodeIterator.java
----------------------------------------------------------------------
diff --git a/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredNodeIterator.java b/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredNodeIterator.java
index 558f184..c9df0ba 100644
--- a/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredNodeIterator.java
+++ b/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredNodeIterator.java
@@ -22,13 +22,13 @@ import java.util.List;
import java.util.NoSuchElementException;
import java.util.Set;
import java.util.function.Function;
+import java.util.function.Predicate;
import org.apache.jena.permissions.model.SecuredModel;
import org.apache.jena.permissions.model.SecuredRDFNode;
import org.apache.jena.rdf.model.NodeIterator ;
import org.apache.jena.rdf.model.RDFNode ;
import org.apache.jena.util.iterator.ExtendedIterator ;
-import org.apache.jena.util.iterator.Filter ;
/**
* A secured RDFNode iterator implementation
@@ -82,13 +82,13 @@ public class SecuredNodeIterator<T extends RDFNode> implements NodeIterator
}
@Override
- public ExtendedIterator<RDFNode> filterDrop( final Filter<RDFNode> f )
+ public ExtendedIterator<RDFNode> filterDrop( final Predicate<RDFNode> f )
{
return iter.filterDrop(f);
}
@Override
- public ExtendedIterator<RDFNode> filterKeep( final Filter<RDFNode> f )
+ public ExtendedIterator<RDFNode> filterKeep( final Predicate<RDFNode> f )
{
return iter.filterKeep(f);
}
http://git-wip-us.apache.org/repos/asf/jena/blob/b2a1953b/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredRSIterator.java
----------------------------------------------------------------------
diff --git a/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredRSIterator.java b/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredRSIterator.java
index 2160880..2fbbb40 100644
--- a/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredRSIterator.java
+++ b/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredRSIterator.java
@@ -21,6 +21,7 @@ import java.util.Iterator;
import java.util.List;
import java.util.Set;
import java.util.function.Function;
+import java.util.function.Predicate;
import org.apache.jena.permissions.SecurityEvaluator;
import org.apache.jena.permissions.SecurityEvaluator.Action;
@@ -30,14 +31,13 @@ import org.apache.jena.permissions.model.SecuredModel;
import org.apache.jena.rdf.model.RSIterator ;
import org.apache.jena.rdf.model.ReifiedStatement ;
import org.apache.jena.util.iterator.ExtendedIterator ;
-import org.apache.jena.util.iterator.Filter ;
/**
* A secured RSIterator implementation
*/
public class SecuredRSIterator implements RSIterator
{
- private class PermReifiedStatementFilter extends Filter<ReifiedStatement>
+ private class PermReifiedStatementFilter implements Predicate<ReifiedStatement>
{
private final SecurityEvaluator evaluator;
private final SecNode modelNode;
@@ -52,7 +52,7 @@ public class SecuredRSIterator implements RSIterator
}
@Override
- public boolean accept( final ReifiedStatement t )
+ public boolean test( final ReifiedStatement t )
{
return evaluator.evaluateAny(evaluator.getPrincipal(), actions, modelNode,
SecuredItemImpl.convert(t.getStatement().asTriple()));
@@ -111,14 +111,14 @@ public class SecuredRSIterator implements RSIterator
@Override
public ExtendedIterator<ReifiedStatement> filterDrop(
- final Filter<ReifiedStatement> f )
+ final Predicate<ReifiedStatement> f )
{
return iter.filterDrop(f);
}
@Override
public ExtendedIterator<ReifiedStatement> filterKeep(
- final Filter<ReifiedStatement> f )
+ final Predicate<ReifiedStatement> f )
{
return iter.filterKeep(f);
}
[08/16] jena git commit: JENA-926: Deprecate GraphStoreFactory
operations
Posted by an...@apache.org.
JENA-926: Deprecate GraphStoreFactory operations
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/4c1d85d7
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/4c1d85d7
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/4c1d85d7
Branch: refs/heads/master
Commit: 4c1d85d7273f860dd3bf9c29adbb6def3878d3cb
Parents: d0e4f58
Author: Andy Seaborne <an...@apache.org>
Authored: Mon May 4 10:05:41 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Mon May 4 18:04:26 2015 +0100
----------------------------------------------------------------------
.../java/org/apache/jena/sparql/modify/GraphStoreBasic.java | 4 ----
.../src/main/java/org/apache/jena/update/GraphStoreFactory.java | 5 +++++
jena-arq/src/main/java/org/apache/jena/update/UpdateAction.java | 1 +
3 files changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/4c1d85d7/jena-arq/src/main/java/org/apache/jena/sparql/modify/GraphStoreBasic.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/modify/GraphStoreBasic.java b/jena-arq/src/main/java/org/apache/jena/sparql/modify/GraphStoreBasic.java
index ca7e503..48c82cf 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/modify/GraphStoreBasic.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/modify/GraphStoreBasic.java
@@ -34,8 +34,4 @@ public class GraphStoreBasic extends DatasetGraphWrapper implements GraphStore
{
super(dsg) ;
}
-
- @Override
- public void close()
- {}
}
http://git-wip-us.apache.org/repos/asf/jena/blob/4c1d85d7/jena-arq/src/main/java/org/apache/jena/update/GraphStoreFactory.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/update/GraphStoreFactory.java b/jena-arq/src/main/java/org/apache/jena/update/GraphStoreFactory.java
index e5844af..e36e082 100644
--- a/jena-arq/src/main/java/org/apache/jena/update/GraphStoreFactory.java
+++ b/jena-arq/src/main/java/org/apache/jena/update/GraphStoreFactory.java
@@ -30,18 +30,21 @@ import org.apache.jena.sparql.modify.GraphStoreBasic ;
public class GraphStoreFactory
{
/** Create an empty GraphStore with an empty default graph (in-memory) */
+ @Deprecated
public static GraphStore create() { return new GraphStoreBasic(DatasetGraphFactory.createMem()) ; }
/** Create a GraphStore from a Model
* @param model
* @return GraphStore
*/
+ @Deprecated
public static GraphStore create(Model model) { return create(model.getGraph()) ; }
/** Create a GraphStore from a Graph
* @param graph
* @return GraphStore
*/
+ @Deprecated
public static GraphStore create(Graph graph) { return new GraphStoreBasic(DatasetGraphFactory.create(graph)) ; }
/** Create a GraphStore from a dataset so that updates apply to the graphs in the dataset.
@@ -51,6 +54,7 @@ public class GraphStoreFactory
* @param dataset
* @throws UpdateException
*/
+ @Deprecated
public static GraphStore create(Dataset dataset)
{
return create(dataset.asDatasetGraph()) ;
@@ -60,6 +64,7 @@ public class GraphStoreFactory
* @param datasetGraph
* @throws UpdateException
*/
+ @Deprecated
public static GraphStore create(DatasetGraph datasetGraph)
{
if ( datasetGraph instanceof GraphStore )
http://git-wip-us.apache.org/repos/asf/jena/blob/4c1d85d7/jena-arq/src/main/java/org/apache/jena/update/UpdateAction.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/update/UpdateAction.java b/jena-arq/src/main/java/org/apache/jena/update/UpdateAction.java
index 013ebe6..78be9b6 100644
--- a/jena-arq/src/main/java/org/apache/jena/update/UpdateAction.java
+++ b/jena-arq/src/main/java/org/apache/jena/update/UpdateAction.java
@@ -83,6 +83,7 @@ public class UpdateAction
* @param filename
* @param graphStore
*/
+ @Deprecated
public static void readExecute(String filename, GraphStore graphStore)
{
readExecute(filename, graphStore, (Binding)null);
[02/16] jena git commit: Merge branch 'master' into
jena926-remove-graphstore
Posted by an...@apache.org.
Merge branch 'master' into jena926-remove-graphstore
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/08355d25
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/08355d25
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/08355d25
Branch: refs/heads/master
Commit: 08355d2584625a9bcdb9e85e33697e5b95cb0ea8
Parents: 2aefcbf b4b5c1d
Author: Andy Seaborne <an...@apache.org>
Authored: Fri May 1 18:13:35 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Fri May 1 18:13:35 2015 +0100
----------------------------------------------------------------------
.../main/java/org/apache/jena/graph/Node.java | 126 -------------------
.../model/impl/SecuredLiteralImpl.java | 15 ++-
2 files changed, 7 insertions(+), 134 deletions(-)
----------------------------------------------------------------------
[14/16] jena git commit: Merge branch 'master' into
jena926-remove-graphstore
Posted by an...@apache.org.
Merge branch 'master' into jena926-remove-graphstore
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/00d5cd76
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/00d5cd76
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/00d5cd76
Branch: refs/heads/master
Commit: 00d5cd76b6a96852258c66cfe353389e35a1d49f
Parents: 8eeb060 d2da6f7
Author: Andy Seaborne <an...@apache.org>
Authored: Fri May 8 14:07:31 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Fri May 8 14:07:31 2015 +0100
----------------------------------------------------------------------
jena-arq/Grammar/BinaryRDF.thrift | 2 +-
.../org/apache/jena/atlas/csv/CSVParser.java | 9 +-
.../jena/atlas/data/ThresholdPolicyCount.java | 10 -
.../jena/atlas/data/ThresholdPolicyMemory.java | 5 -
.../org/apache/jena/atlas/json/JsonBuilder.java | 4 +-
.../org/apache/jena/atlas/web/MediaType.java | 4 +-
.../org/apache/jena/query/SortCondition.java | 5 +-
.../java/org/apache/jena/riot/RDFFormat.java | 7 +-
.../org/apache/jena/riot/RDFFormatVariant.java | 5 +-
.../org/apache/jena/riot/RDFWriterRegistry.java | 29 ++-
.../jena/riot/adapters/RDFReaderRIOT_Web.java | 4 +-
.../org/apache/jena/riot/lang/JsonLDReader.java | 4 +-
.../org/apache/jena/riot/lang/LangRDFJSON.java | 2 +-
.../jena/riot/other/BatchedStreamRDF.java | 6 +-
.../java/org/apache/jena/riot/other/GLib.java | 58 +----
.../org/apache/jena/riot/out/JsonLDWriter.java | 8 +-
.../jena/riot/out/SinkQuadBracedOutput.java | 4 +-
.../process/normalize/CanonicalizeLiteral.java | 6 +-
.../apache/jena/riot/system/PrefixMapBase.java | 25 +--
.../org/apache/jena/riot/thrift/BinRDF.java | 12 +-
.../java/org/apache/jena/riot/tokens/Token.java | 10 +-
.../apache/jena/riot/writer/TurtleShell.java | 5 +-
.../riot/writer/WriterStreamRDFBatched.java | 6 +-
.../jena/riot/writer/WriterStreamRDFBlocks.java | 8 +-
.../apache/jena/sparql/algebra/op/OpAssign.java | 5 +-
.../apache/jena/sparql/algebra/op/OpExtend.java | 5 +-
.../apache/jena/sparql/algebra/op/OpGroup.java | 6 +-
.../apache/jena/sparql/algebra/op/OpLabel.java | 6 +-
.../jena/sparql/algebra/op/OpProject.java | 4 +-
.../optimize/TransformFilterPlacement.java | 3 +-
.../jena/sparql/core/DatasetChangesBatched.java | 8 +-
.../jena/sparql/core/DatasetGraphBase.java | 12 +-
.../sparql/core/DatasetGraphCollection.java | 4 +-
.../jena/sparql/core/DatasetGraphQuad.java | 13 +-
.../org/apache/jena/sparql/core/Prologue.java | 7 +-
.../java/org/apache/jena/sparql/core/Quad.java | 7 +-
.../apache/jena/sparql/core/QueryCompare.java | 4 +-
.../apache/jena/sparql/core/VarExprList.java | 4 +-
.../org/apache/jena/sparql/engine/Rename.java | 19 +-
.../jena/sparql/engine/binding/BindingBase.java | 4 +-
.../sparql/engine/iterator/QueryIterGroup.java | 21 +-
.../sparql/engine/iterator/QueryIterTopN.java | 8 +-
.../engine/iterator/QueryIterTriplePattern.java | 18 +-
.../ReorderTransformationSubstitution.java | 12 +-
.../org/apache/jena/sparql/expr/E_Exists.java | 2 +-
.../apache/jena/sparql/expr/E_NotExists.java | 2 +-
.../java/org/apache/jena/sparql/expr/Expr.java | 3 +-
.../apache/jena/sparql/expr/ExprAggregator.java | 10 +-
.../apache/jena/sparql/expr/ExprFunction.java | 4 +-
.../apache/jena/sparql/expr/ExprFunction0.java | 2 +-
.../apache/jena/sparql/expr/ExprFunction1.java | 2 +-
.../apache/jena/sparql/expr/ExprFunction2.java | 2 +-
.../apache/jena/sparql/expr/ExprFunction3.java | 2 +-
.../apache/jena/sparql/expr/ExprFunctionN.java | 3 +-
.../org/apache/jena/sparql/expr/ExprList.java | 3 +-
.../org/apache/jena/sparql/expr/ExprNode.java | 3 +-
.../org/apache/jena/sparql/expr/ExprVar.java | 4 +-
.../org/apache/jena/sparql/expr/NodeValue.java | 5 +-
.../jena/sparql/expr/aggregate/AggCustom.java | 6 +-
.../sparql/expr/aggregate/AggGroupConcat.java | 5 +-
.../expr/aggregate/AggGroupConcatDistinct.java | 5 +-
.../jena/sparql/expr/aggregate/AggMax.java | 5 +-
.../sparql/expr/aggregate/AggMaxDistinct.java | 5 +-
.../jena/sparql/expr/aggregate/AggMin.java | 5 +-
.../sparql/expr/aggregate/AggMinDistinct.java | 5 +-
.../jena/sparql/expr/aggregate/AggSample.java | 5 +-
.../jena/sparql/expr/aggregate/Aggregator.java | 2 +-
.../sparql/expr/aggregate/AggregatorBase.java | 3 +-
.../apache/jena/sparql/graph/NodeTransform.java | 8 +-
.../jena/sparql/graph/NodeTransformLib.java | 27 ++-
.../jena/sparql/graph/NodeTransformOp.java | 11 +-
.../modify/NodeTransformBNodesToVariables.java | 5 +-
.../apache/jena/sparql/modify/TemplateLib.java | 31 ++-
.../jena/sparql/modify/UpdateEngineWorker.java | 5 +-
.../jena/sparql/modify/request/UpdateLoad.java | 5 +-
.../org/apache/jena/sparql/path/PathLib.java | 6 +-
.../jena/sparql/path/eval/PathEngine.java | 25 +--
.../jena/sparql/path/eval/PathEngine1.java | 2 -
.../jena/sparql/path/eval/PathEngineSPARQL.java | 2 -
.../jena/sparql/path/eval/PathEvaluator.java | 6 +-
.../jena/sparql/pfunction/library/strSplit.java | 12 +-
.../apache/jena/sparql/resultset/CSVInput.java | 6 +-
.../jena/sparql/resultset/ResultSetCompare.java | 25 +--
.../org/apache/jena/sparql/util/Context.java | 2 +-
.../org/apache/jena/sparql/util/ModelUtils.java | 19 +-
.../org/apache/jena/sparql/util/NodeUtils.java | 7 +-
.../jena/sparql/util/graph/GraphList.java | 12 +-
.../jena/riot/process/TestNormalization.java | 4 +-
.../jena/riot/thrift/TestResultSetThrift.java | 11 -
.../jena/riot/thrift/TestStreamRDFThrift.java | 13 +-
.../jena/riot/writer/TestRiotWriterDataset.java | 5 -
.../apache/jena/sparql/util/TestFmtUtils.java | 10 +-
.../src/test/resources/log4j-testing.properties | 9 +-
jena-arq/src/test/resources/log4j.properties | 3 +-
.../org/apache/jena/atlas/iterator/Action.java | 10 +-
.../apache/jena/atlas/iterator/ActionCount.java | 6 +-
.../jena/atlas/iterator/ActionNothing.java | 26 ---
.../org/apache/jena/atlas/iterator/Filter.java | 9 +-
.../atlas/iterator/FilterDistinctAdjacent.java | 11 +-
.../jena/atlas/iterator/FilterOutNulls.java | 32 ---
.../apache/jena/atlas/iterator/FilterStack.java | 16 +-
.../jena/atlas/iterator/FilterUnique.java | 12 +-
.../org/apache/jena/atlas/iterator/Iter.java | 211 +++++-------------
.../jena/atlas/iterator/IteratorArray.java | 7 +
.../apache/jena/atlas/iterator/MapUtils.java | 36 ---
.../apache/jena/atlas/iterator/Transform.java | 9 +-
.../apache/jena/atlas/lib/ActionKeyValue.java | 9 +-
.../org/apache/jena/atlas/lib/Allocator.java | 28 ---
.../java/org/apache/jena/atlas/lib/Cache.java | 5 +-
.../org/apache/jena/atlas/lib/CacheSet.java | 4 +-
.../org/apache/jena/atlas/lib/Callback.java | 5 +-
.../java/org/apache/jena/atlas/lib/Cell.java | 99 ---------
.../apache/jena/atlas/lib/CollectionUtils.java | 27 +--
.../java/org/apache/jena/atlas/lib/FileOps.java | 18 +-
.../java/org/apache/jena/atlas/lib/Lib.java | 14 +-
.../org/apache/jena/atlas/lib/ListUtils.java | 66 ++----
.../org/apache/jena/atlas/lib/MapUtils.java | 45 ----
.../org/apache/jena/atlas/lib/MultiMap.java | 146 -------------
.../apache/jena/atlas/lib/MultiMapToList.java | 43 ----
.../apache/jena/atlas/lib/MultiMapToSet.java | 47 ----
.../org/apache/jena/atlas/lib/MultiSet.java | 218 -------------------
.../java/org/apache/jena/atlas/lib/Pair.java | 4 +-
.../java/org/apache/jena/atlas/lib/Problem.java | 25 ---
.../apache/jena/atlas/lib/PropertyUtils.java | 4 +-
.../org/apache/jena/atlas/lib/SetUtils.java | 26 +--
.../org/apache/jena/atlas/lib/StrUtils.java | 41 +---
.../java/org/apache/jena/atlas/lib/Tuple.java | 28 +--
.../org/apache/jena/atlas/lib/TupleBuilder.java | 50 -----
.../org/apache/jena/atlas/lib/cache/Cache0.java | 4 +-
.../org/apache/jena/atlas/lib/cache/Cache1.java | 12 +-
.../apache/jena/atlas/lib/cache/CacheGuava.java | 25 +--
.../jena/atlas/lib/cache/CacheSetImpl.java | 16 +-
.../jena/atlas/lib/cache/CacheSetSync.java | 5 +-
.../jena/atlas/lib/cache/CacheSetWrapper.java | 5 +-
.../jena/atlas/lib/cache/CacheSimple.java | 13 +-
.../jena/atlas/lib/cache/CacheWrapper.java | 4 +-
.../org/apache/jena/atlas/lib/cache/Getter.java | 25 ---
.../org/apache/jena/atlas/logging/LogCtl.java | 3 +-
.../java/org/apache/jena/base/Closeable.java | 27 ---
.../apache/jena/atlas/iterator/TestIter.java | 134 +-----------
.../jena/atlas/iterator/TestIteratorArray.java | 3 +
.../jena/atlas/iterator/TestIteratorPeek.java | 6 +-
.../java/org/apache/jena/atlas/lib/TS_Lib.java | 1 -
.../org/apache/jena/atlas/lib/TestMultiSet.java | 143 ------------
.../java/org/apache/jena/graph/NodeFactory.java | 39 +++-
.../jena/graph/impl/LiteralLabelFactory.java | 6 +-
.../apache/jena/rdf/model/ResourceFactory.java | 2 +-
.../apache/jena/rdf/model/impl/ModelCom.java | 6 +-
.../apache/jena/reasoner/rulesys/Functor.java | 2 +-
.../jena/graph/test/TestLiteralLabels.java | 10 +-
.../org/apache/jena/graph/test/TestNode.java | 4 +-
.../jena/graph/test/TestTypedLiterals.java | 2 +-
.../reasoners/bugs/layeredValidation.owl | 2 +-
.../impl/PropertyTableHashMapImpl.java | 19 +-
jena-csv/src/test/resources/log4j.properties | 3 +-
.../src/test/resources/log4j.properties | 3 +-
.../java/org/apache/jena/fuseki/FusekiCmd.java | 6 +-
.../java/org/apache/jena/fuseki/FusekiLib.java | 8 +-
.../jena/fuseki/servlets/ResponseResultSet.java | 16 +-
.../jena/fuseki/servlets/SPARQL_Protocol.java | 12 +-
.../java/org/apache/jena/fuseki/FusekiLib.java | 8 +-
.../org/apache/jena/fuseki/FusekiLogging.java | 1 -
.../apache/jena/fuseki/server/DataService.java | 6 +-
.../apache/jena/fuseki/server/FusekiServer.java | 5 +-
.../jena/fuseki/servlets/ResponseResultSet.java | 16 +-
.../jena/fuseki/servlets/SPARQL_Protocol.java | 10 +-
jena-maven-tools/README | 2 +-
.../src/it/schemagen-integration-0/pom.xml | 2 +-
.../src/it/schemagen-integration-1/pom.xml | 2 +-
.../src/it/schemagen-integration-2/pom.xml | 2 +-
.../src/it/schemagen-integration-3/pom.xml | 2 +-
.../query/rewriter/SecuredFunction.java | 3 +-
.../org/apache/jena/sdb/compiler/QuadBlock.java | 6 +-
.../org/apache/jena/sdb/compiler/SDB_QC.java | 14 +-
.../apache/jena/sdb/compiler/TransformSDB.java | 4 +-
.../org/apache/jena/sdb/core/ScopeEntry.java | 28 +--
.../org/apache/jena/sdb/core/ScopeRename.java | 21 --
.../sdb/core/sqlnode/GenerateSQLVisitor.java | 9 +-
.../org/apache/jena/sdb/print/ActionPrint.java | 7 +-
.../java/org/apache/jena/sdb/util/Pair.java | 5 +-
.../jena/sdb/test/junit/ParamAllStoreDesc.java | 11 +-
.../jena/sdb/test/junit/ParamAllStores.java | 11 +-
.../apache/jena/sdb/test/junit/StoreList.java | 21 +-
.../spatial/SpatialDocProducerTriples.java | 19 --
.../src/test/resources/geoarq-query-1.rq | 2 +-
jena-tdb/src-dev/dev/Tests.java | 32 ---
jena-tdb/src-dev/test/BPlusTreeRun.java | 74 -------
jena-tdb/src-dev/test/ByteBufferTest.java | 78 -------
jena-tdb/src-dev/test/ExtHashRun.java | 200 -----------------
jena-tdb/src-dev/test/RunnerExecute.java | 119 ----------
jena-tdb/src-dev/test/RunnerRangeIndex.java | 149 -------------
.../jena/tdb/base/block/BlockMgrCache.java | 6 +-
.../jena/tdb/base/block/BlockMgrTracker.java | 31 +--
.../org/apache/jena/tdb/base/file/Location.java | 4 +-
.../org/apache/jena/tdb/base/file/MetaFile.java | 5 +-
.../tdb/index/bplustree/BPlusTreeRewriter.java | 10 +-
.../java/org/apache/jena/tdb/lib/NodeLib.java | 9 +-
.../java/org/apache/jena/tdb/lib/TupleLib.java | 34 +--
.../apache/jena/tdb/solver/OpExecutorTDB1.java | 11 +-
.../java/org/apache/jena/tdb/solver/QC2.java | 9 +-
.../org/apache/jena/tdb/solver/SolverLib.java | 52 ++---
.../tdb/solver/StageGeneratorDirectTDB.java | 9 +-
.../apache/jena/tdb/solver/StageMatchTuple.java | 34 +--
.../tdb/solver/stats/StatsCollectorBase.java | 5 +-
.../apache/jena/tdb/store/DatasetGraphTDB.java | 13 +-
.../org/apache/jena/tdb/store/GraphTDB.java | 19 +-
.../org/apache/jena/tdb/store/QuadTable.java | 9 -
.../org/apache/jena/tdb/store/TripleTable.java | 9 -
.../jena/tdb/store/bulkloader/BulkLoader.java | 6 +-
.../store/bulkloader2/CmdNodeTableBuilder.java | 8 +-
.../tdb/store/nodetable/NodeTableNative.java | 35 +--
.../tdb/store/tupletable/TupleIndexRecord.java | 18 +-
.../java/org/apache/jena/tdb/sys/FileRef.java | 4 +-
.../apache/jena/tdb/base/record/RecordLib.java | 9 +-
.../jena/tdb/extra/T_TxnDeadlockTest.java | 8 +-
.../jena/tdb/index/bplustree/TestBPlusTree.java | 2 +-
.../apache/jena/tdb/store/TestQuadFilter.java | 20 +-
.../jena/query/text/EntityDefinition.java | 5 +-
.../assembler/EntityDefinitionAssembler.java | 18 +-
219 files changed, 756 insertions(+), 3190 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/00d5cd76/jena-arq/src/main/java/org/apache/jena/sparql/modify/UpdateEngineWorker.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/00d5cd76/jena-tdb/src/main/java/org/apache/jena/tdb/store/DatasetGraphTDB.java
----------------------------------------------------------------------
[07/16] jena git commit: Clean javadoc
Posted by an...@apache.org.
Clean javadoc
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/17472426
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/17472426
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/17472426
Branch: refs/heads/master
Commit: 1747242679d76a3c43c2dbcc03764dd6dc823fd2
Parents: b2a1953
Author: Andy Seaborne <an...@apache.org>
Authored: Sat May 2 18:21:29 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Mon May 4 18:04:17 2015 +0100
----------------------------------------------------------------------
jena-core/src/main/java/org/apache/jena/ontology/OntTools.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/17472426/jena-core/src/main/java/org/apache/jena/ontology/OntTools.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/ontology/OntTools.java b/jena-core/src/main/java/org/apache/jena/ontology/OntTools.java
index bb3b2a3..1f80448 100755
--- a/jena-core/src/main/java/org/apache/jena/ontology/OntTools.java
+++ b/jena-core/src/main/java/org/apache/jena/ontology/OntTools.java
@@ -136,9 +136,9 @@ public class OntTools
* such that every step on the path is accepted by the given filter. A path is a {@link List}
* of RDF {@link Statement}s. The subject of the first statement in the list is <code>start</code>,
* and the object of the last statement in the list is <code>end</code>.</p>
- * <p>The <code>onPath</code> argument is a {@link Filter}, which accepts a statement and returns
+ * <p>The <code>onPath</code> argument is a {@link Predicate}, which accepts a statement and returns
* true if the statement should be considered to be on the path. To search for an unconstrained
- * path, pass {@link Filter#any} as an argument. To search for a path whose predicates match a
+ * path, pass <code>()->true</code> as an argument. To search for a path whose predicates match a
* fixed restricted set of property names, pass an instance of {@link PredicatesFilter}.</p>
* <p>If there is more than one path of minimal length from <code>start</code> to <code>end</code>,
* this method returns an arbitrary one. The algorithm is blind breadth-first search,
[16/16] jena git commit: Merge branch 'master' into
jena926-remove-graphstore
Posted by an...@apache.org.
Merge branch 'master' into jena926-remove-graphstore
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/710084c1
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/710084c1
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/710084c1
Branch: refs/heads/master
Commit: 710084c1d9ca472e322ac02bb5b94752de7fbda3
Parents: eae6a3d ce240bd
Author: Andy Seaborne <an...@apache.org>
Authored: Wed May 13 22:14:50 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Wed May 13 22:14:50 2015 +0100
----------------------------------------------------------------------
.../apache/jena/query/ResultSetFormatter.java | 8 +-
.../java/org/apache/jena/riot/web/HttpOp.java | 102 +++++-------
.../apache/jena/riot/web/HttpResponseLib.java | 3 +-
.../org/apache/jena/sparql/ARQConstants.java | 11 +-
.../jena/sparql/engine/http/HttpQuery.java | 2 -
.../apache/jena/sparql/engine/http/Service.java | 2 -
.../org/apache/jena/sparql/expr/ExprDigest.java | 3 +-
.../jena/sparql/resultset/OutputBase.java | 18 +--
.../sparql/serializer/FormatterElement.java | 8 +-
.../serializer/QuerySerializerFactory.java | 29 +++-
.../sparql/serializer/SerializerRegistry.java | 18 ++-
.../apache/jena/sparql/util/MappedLoader.java | 2 +
.../org/apache/jena/riot/TestRiotReader.java | 14 +-
jena-arq/testing/ARQ/README | 3 +
jena-arq/testing/ARQ/Serialization/manifest.ttl | 110 ++++++-------
jena-arq/testing/ARQ/Serialization/serial.sh | 0
.../ARQ/Serialization/syntax-subselect-01.arq | 3 -
.../ARQ/Serialization/syntax-subselect-01.rq | 3 +
.../ARQ/Serialization/syntax-subselect-02.arq | 3 -
.../ARQ/Serialization/syntax-subselect-02.rq | 3 +
.../ARQ/Serialization/syntax-subselect-03.arq | 7 -
.../ARQ/Serialization/syntax-subselect-03.rq | 7 +
.../ARQ/Serialization/syntax-subselect-04.arq | 9 --
.../ARQ/Serialization/syntax-subselect-04.rq | 7 +
.../ARQ/Serialization/syntax-subselect-10.arq | 3 +
.../ARQ/Serialization/syntax-subselect-11.arq | 3 +
.../ARQ/Serialization/syntax-subselect-12.arq | 7 +
.../ARQ/Serialization/syntax-subselect-13.arq | 9 ++
.../org/apache/jena/atlas/io/InStreamUTF8.java | 1 -
.../apache/jena/atlas/io/IndentedWriter.java | 2 -
.../java/org/apache/jena/atlas/lib/Chars.java | 2 -
.../java/org/apache/jena/atlas/lib/IRILib.java | 1 -
.../apache/jena/atlas/lib/cache/CacheGuava.java | 14 +-
.../jena/atlas/lib/cache/CacheSetImpl.java | 3 +-
.../jena/atlas/lib/cache/CacheSimple.java | 33 ++--
.../java/org/apache/jena/atlas/lib/TS_Lib.java | 2 +
.../org/apache/jena/atlas/lib/TestCache2.java | 13 +-
.../jena/atlas/lib/cache/CacheSimpleTest.java | 43 +++++
.../jena/atlas/lib/cache/TestCacheSimple.java | 57 +++++++
.../apache/jena/assembler/AssemblerHelp.java | 33 +++-
.../apache/jena/datatypes/xsd/XSDDatatype.java | 2 +-
.../java/org/apache/jena/enhanced/EnhGraph.java | 22 +--
.../org/apache/jena/n3/N3IndentedWriter.java | 1 -
.../org/apache/jena/n3/N3JenaWriterCommon.java | 17 +-
.../java/org/apache/jena/n3/N3JenaWriterPP.java | 10 +-
.../jena/n3/turtle/parser/TurtleParser.java | 7 +-
.../jena/ontology/impl/OWLLiteProfile.java | 2 -
.../rdfxml/xmlinput/impl/AbsXMLContext.java | 7 -
.../jena/reasoner/rulesys/FBRuleInfGraph.java | 4 +-
.../jena/reasoner/rulesys/builtins/Bound.java | 1 -
.../jena/reasoner/rulesys/builtins/Drop.java | 1 -
.../jena/reasoner/rulesys/builtins/Remove.java | 1 -
.../jena/reasoner/rulesys/builtins/Unbound.java | 1 -
.../jena/reasoner/rulesys/impl/Generator.java | 1 -
.../jena/reasoner/rulesys/impl/LPRuleStore.java | 1 -
.../reasoner/rulesys/impl/RuleClauseCode.java | 4 +-
.../jena/shared/impl/PrefixMappingImpl.java | 2 +-
.../java/org/apache/jena/util/cache/Cache.java | 49 ------
.../apache/jena/util/cache/CacheControl.java | 70 --------
.../apache/jena/util/cache/CacheManager.java | 53 ------
.../jena/util/cache/EnhancedNodeCache.java | 120 --------------
.../org/apache/jena/util/cache/RandCache.java | 162 -------------------
.../apache/jena/enhanced/test/TestPackage.java | 33 +---
.../java/org/apache/jena/util/TestCache.java | 125 --------------
.../java/org/apache/jena/util/TestPackage.java | 1 -
jena-permissions/NOTICE | 6 +-
jena-permissions/pom.xml | 15 --
.../jena/tdb/setup/DatasetBuilderStd.java | 25 ++-
.../store/bulkloader2/CmdNodeTableBuilder.java | 10 +-
69 files changed, 411 insertions(+), 943 deletions(-)
----------------------------------------------------------------------
[15/16] jena git commit: Merge branch 'master' into
jena926-remove-graphstore
Posted by an...@apache.org.
Merge branch 'master' into jena926-remove-graphstore
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/eae6a3d2
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/eae6a3d2
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/eae6a3d2
Branch: refs/heads/master
Commit: eae6a3d257ef23b3034343da0a826a60019c53b7
Parents: 00d5cd7 1cad38a
Author: Andy Seaborne <an...@apache.org>
Authored: Sat May 9 11:47:22 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Sat May 9 11:47:22 2015 +0100
----------------------------------------------------------------------
.../java/org/apache/jena/tdb/assembler/SettingAssembler.java | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
----------------------------------------------------------------------
[10/16] jena git commit: JENA-926: Remove all use of GraphStore.
Posted by an...@apache.org.
http://git-wip-us.apache.org/repos/asf/jena/blob/bb8d6f3b/jena-arq/src/main/java/org/apache/jena/update/UpdateExecutionFactory.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/update/UpdateExecutionFactory.java b/jena-arq/src/main/java/org/apache/jena/update/UpdateExecutionFactory.java
index eaa106a..38da497 100644
--- a/jena-arq/src/main/java/org/apache/jena/update/UpdateExecutionFactory.java
+++ b/jena-arq/src/main/java/org/apache/jena/update/UpdateExecutionFactory.java
@@ -18,9 +18,11 @@
package org.apache.jena.update;
-import org.apache.jena.atlas.web.auth.HttpAuthenticator;
+import org.apache.jena.atlas.web.auth.HttpAuthenticator ;
import org.apache.jena.query.ARQ ;
+import org.apache.jena.query.Dataset ;
import org.apache.jena.query.QuerySolution ;
+import org.apache.jena.sparql.core.DatasetGraph ;
import org.apache.jena.sparql.engine.binding.Binding ;
import org.apache.jena.sparql.engine.binding.BindingUtils ;
import org.apache.jena.sparql.modify.* ;
@@ -29,200 +31,247 @@ import org.apache.jena.sparql.util.Context ;
/** Create UpdateProcessors (one-time executions of a SPARQL Update request) */
public class UpdateExecutionFactory
{
-
- /** Create an UpdateProcessor appropriate to the GraphStore, or null if no available factory to make an UpdateProcessor
+ /** Create an UpdateProcessor appropriate to the datasetGraph, or null if no available factory to make an UpdateProcessor
* @param update
- * @param graphStore
+ * @param dataset
* @return UpdateProcessor or null
*/
- public static UpdateProcessor create(Update update, GraphStore graphStore)
+ public static UpdateProcessor create(Update update, Dataset dataset)
{
- return create(new UpdateRequest(update), graphStore, (Binding)null) ;
+ return create(new UpdateRequest(update), dataset) ;
}
- /** Create an UpdateProcessor appropriate to the GraphStore, or null if no available factory to make an UpdateProcessor
+ /** Create an UpdateProcessor appropriate to the datasetGraph, or null if no available factory to make an UpdateProcessor
* @param update
- * @param graphStore
- * @param inputBinding Initial binding to be applied to Update operations that can apply an initial binding (i.e. UpdateDeleteWhere, UpdateModify)
+ * @param datasetGraph
* @return UpdateProcessor or null
*/
- public static UpdateProcessor create(Update update, GraphStore graphStore, QuerySolution inputBinding)
+ public static UpdateProcessor create(Update update, DatasetGraph datasetGraph)
{
- return create(update, graphStore, BindingUtils.asBinding(inputBinding)) ;
+ return create(new UpdateRequest(update), datasetGraph) ;
}
- /** Create an UpdateProcessor appropriate to the GraphStore, or null if no available factory to make an UpdateProcessor
+ /** Create an UpdateProcessor appropriate to the datasetGraph, or null if no available factory to make an UpdateProcessor
* @param update
- * @param graphStore
+ * @param dataset
* @param inputBinding Initial binding to be applied to Update operations that can apply an initial binding (i.e. UpdateDeleteWhere, UpdateModify)
* @return UpdateProcessor or null
*/
- public static UpdateProcessor create(Update update, GraphStore graphStore, Binding inputBinding)
+ public static UpdateProcessor create(Update update, Dataset dataset, QuerySolution inputBinding)
{
- return create(new UpdateRequest(update), graphStore, inputBinding) ;
+ return create(update, dataset.asDatasetGraph(), BindingUtils.asBinding(inputBinding)) ;
}
+ /** Create an UpdateProcessor appropriate to the datasetGraph, or null if no available factory to make an UpdateProcessor
+ * @param update
+ * @param datasetGraph
+ * @param inputBinding Initial binding to be applied to Update operations that can apply an initial binding (i.e. UpdateDeleteWhere, UpdateModify)
+ * @return UpdateProcessor or null
+ */
+ public static UpdateProcessor create(Update update, DatasetGraph datasetGraph, Binding inputBinding)
+ {
+ return create(new UpdateRequest(update), datasetGraph, inputBinding) ;
+ }
- /** Create an UpdateProcessor appropriate to the GraphStore, or null if no available factory to make an UpdateProcessor
+ /** Create an UpdateProcessor appropriate to the datasetGraph, or null if no available factory to make an UpdateProcessor
* @param updateRequest
- * @param graphStore
+ * @param dataset
* @return UpdateProcessor or null
*/
- public static UpdateProcessor create(UpdateRequest updateRequest, GraphStore graphStore)
+ public static UpdateProcessor create(UpdateRequest updateRequest, Dataset dataset)
{
- return make(updateRequest, graphStore, null, null) ;
+ return make(updateRequest, dataset.asDatasetGraph(), null, null) ;
}
- /** Create an UpdateProcessor appropriate to the GraphStore, or null if no available factory to make an UpdateProcessor
+ /** Create an UpdateProcessor appropriate to the datasetGraph, or null if no available factory to make an UpdateProcessor
* @param updateRequest
- * @param graphStore
+ * @param datasetGraph
+ * @return UpdateProcessor or null
+ */
+ public static UpdateProcessor create(UpdateRequest updateRequest, DatasetGraph datasetGraph)
+ {
+ return make(updateRequest, datasetGraph, null, null) ;
+ }
+
+ /** Create an UpdateProcessor appropriate to the datasetGraph, or null if no available factory to make an UpdateProcessor
+ * @param updateRequest
+ * @param dataset
* @param inputBinding Initial binding to be applied to Update operations that can apply an initial binding (i.e. UpdateDeleteWhere, UpdateModify)
* @return UpdateProcessor or null
*/
- public static UpdateProcessor create(UpdateRequest updateRequest, GraphStore graphStore, QuerySolution inputBinding)
+ public static UpdateProcessor create(UpdateRequest updateRequest, Dataset dataset, QuerySolution inputBinding)
{
- return create(updateRequest, graphStore, BindingUtils.asBinding(inputBinding)) ;
+ return create(updateRequest, dataset.asDatasetGraph(), BindingUtils.asBinding(inputBinding)) ;
}
- /** Create an UpdateProcessor appropriate to the GraphStore, or null if no available factory to make an UpdateProcessor
+ /** Create an UpdateProcessor appropriate to the datasetGraph, or null if no available factory to make an UpdateProcessor
* @param updateRequest
- * @param graphStore
+ * @param datasetGraph
* @param inputBinding Initial binding to be applied to Update operations that can apply an initial binding (i.e. UpdateDeleteWhere, UpdateModify)
* @return UpdateProcessor or null
*/
- public static UpdateProcessor create(UpdateRequest updateRequest, GraphStore graphStore, Binding inputBinding)
+ public static UpdateProcessor create(UpdateRequest updateRequest, DatasetGraph datasetGraph, Binding inputBinding)
{
- return make(updateRequest, graphStore, inputBinding, null) ;
+ return make(updateRequest, datasetGraph, inputBinding, null) ;
}
- /** Create an UpdateProcessor appropriate to the GraphStore, or null if no available factory to make an UpdateProcessor
- * @param graphStore
+ /** Create an UpdateProcessor appropriate to the datasetGraph, or null if no available factory to make an UpdateProcessor
+ * @param dataset
* @return UpdateProcessor or null
*/
- public static UpdateProcessorStreaming createStreaming(GraphStore graphStore)
+ public static UpdateProcessorStreaming createStreaming(Dataset dataset)
{
- return makeStreaming(graphStore, null, null) ;
+ return makeStreaming(dataset.asDatasetGraph(), null, null) ;
}
-
- /** Create an UpdateProcessor appropriate to the GraphStore, or null if no available factory to make an UpdateProcessor
- * @param graphStore
+ /** Create an UpdateProcessor appropriate to the datasetGraph, or null if no available factory to make an UpdateProcessor
+ * @param datasetGraph
+ * @return UpdateProcessor or null
+ */
+ public static UpdateProcessorStreaming createStreaming(DatasetGraph datasetGraph)
+ {
+ return makeStreaming(datasetGraph, null, null) ;
+ }
+
+ /** Create an UpdateProcessor appropriate to the datasetGraph, or null if no available factory to make an UpdateProcessor
+ * @param dataset
* @param inputBinding Initial binding to be applied to Update operations that can apply an initial binding (i.e. UpdateDeleteWhere, UpdateModify)
* @return UpdateProcessor or null
*/
- public static UpdateProcessorStreaming createStreaming(GraphStore graphStore, QuerySolution inputBinding)
+ public static UpdateProcessorStreaming createStreaming(Dataset dataset, QuerySolution inputBinding)
{
- return createStreaming(graphStore, BindingUtils.asBinding(inputBinding)) ;
+ return createStreaming(dataset.asDatasetGraph(), BindingUtils.asBinding(inputBinding)) ;
}
- /** Create an UpdateProcessor appropriate to the GraphStore, or null if no available factory to make an UpdateProcessor
- * @param graphStore
+ /** Create an UpdateProcessor appropriate to the datasetGraph, or null if no available factory to make an UpdateProcessor
+ * @param datasetGraph
* @param inputBinding Initial binding to be applied to Update operations that can apply an initial binding (i.e. UpdateDeleteWhere, UpdateModify)
* @return UpdateProcessor or null
*/
- public static UpdateProcessorStreaming createStreaming(GraphStore graphStore, Binding inputBinding)
+ public static UpdateProcessorStreaming createStreaming(DatasetGraph datasetGraph, Binding inputBinding)
+ {
+ return makeStreaming(datasetGraph, inputBinding, null) ;
+ }
+
+ /** Create an UpdateProcessor appropriate to the datasetGraph, or null if no available factory to make an UpdateProcessor
+ * @param dataset
+ * @param context (null means use merge of global and graph store context))
+ * @return UpdateProcessor or null
+ */
+ public static UpdateProcessorStreaming createStreaming(Dataset dataset, Context context)
{
- return makeStreaming(graphStore, inputBinding, null) ;
+ return makeStreaming(dataset.asDatasetGraph(), null, context) ;
}
- /** Create an UpdateProcessor appropriate to the GraphStore, or null if no available factory to make an UpdateProcessor
- * @param graphStore
+ /** Create an UpdateProcessor appropriate to the datasetGraph, or null if no available factory to make an UpdateProcessor
+ * @param datasetGraph
* @param context (null means use merge of global and graph store context))
* @return UpdateProcessor or null
*/
- public static UpdateProcessorStreaming createStreaming(GraphStore graphStore, Context context)
+ public static UpdateProcessorStreaming createStreaming(DatasetGraph datasetGraph, Context context)
{
- return makeStreaming(graphStore, null, context) ;
+ return makeStreaming(datasetGraph, null, context) ;
}
- /** Create an UpdateProcessor appropriate to the GraphStore, or null if no available factory to make an UpdateProcessor
- * @param graphStore
+ /** Create an UpdateProcessor appropriate to the datasetGraph, or null if no available factory to make an UpdateProcessor
+ * @param dataset
* @param inputBinding Initial binding to be applied to Update operations that can apply an initial binding (i.e. UpdateDeleteWhere, UpdateModify)
* @param context (null means use merge of global and graph store context))
* @return UpdateProcessor or null
*/
- public static UpdateProcessorStreaming createStreaming(GraphStore graphStore, QuerySolution inputBinding, Context context)
+ public static UpdateProcessorStreaming createStreaming(Dataset dataset, QuerySolution inputBinding, Context context)
{
- return createStreaming(graphStore, BindingUtils.asBinding(inputBinding), context) ;
+ return createStreaming(dataset.asDatasetGraph(), BindingUtils.asBinding(inputBinding), context) ;
}
- /** Create an UpdateProcessor appropriate to the GraphStore, or null if no available factory to make an UpdateProcessor
- * @param graphStore
+ /** Create an UpdateProcessor appropriate to the datasetGraph, or null if no available factory to make an UpdateProcessor
+ * @param datasetGraph
* @param inputBinding Initial binding to be applied to Update operations that can apply an initial binding (i.e. UpdateDeleteWhere, UpdateModify)
* @param context (null means use merge of global and graph store context))
* @return UpdateProcessor or null
*/
- public static UpdateProcessorStreaming createStreaming(GraphStore graphStore, Binding inputBinding, Context context)
+ public static UpdateProcessorStreaming createStreaming(DatasetGraph datasetGraph, Binding inputBinding, Context context)
{
- return makeStreaming(graphStore, inputBinding, context) ;
+ return makeStreaming(datasetGraph, inputBinding, context) ;
}
- /** Create an UpdateProcessor appropriate to the GraphStore, or null if no available factory to make an UpdateProcessor
+ /** Create an UpdateProcessor appropriate to the datasetGraph, or null if no available factory to make an UpdateProcessor
* @param updateRequest
- * @param graphStore
+ * @param dataset
* @param context (null means use merge of global and graph store context))
* @return UpdateProcessor or null
*/
- public static UpdateProcessor create(UpdateRequest updateRequest, GraphStore graphStore, Context context)
+ public static UpdateProcessor create(UpdateRequest updateRequest, Dataset dataset, Context context)
{
- return make(updateRequest, graphStore, null, context) ;
+ return make(updateRequest, dataset.asDatasetGraph(), null, context) ;
}
- /** Create an UpdateProcessor appropriate to the GraphStore, or null if no available factory to make an UpdateProcessor
+ /** Create an UpdateProcessor appropriate to the datasetGraph, or null if no available factory to make an UpdateProcessor
+ * @param updateRequest
+ * @param datasetGraph
+ * @param context (null means use merge of global and graph store context))
+ * @return UpdateProcessor or null
+ */
+ public static UpdateProcessor create(UpdateRequest updateRequest, DatasetGraph datasetGraph, Context context)
+ {
+ return make(updateRequest, datasetGraph, null, context) ;
+ }
+
+ /** Create an UpdateProcessor appropriate to the datasetGraph, or null if no available factory to make an UpdateProcessor
* @param updateRequest
- * @param graphStore
+ * @param dataset
* @param inputBinding Initial binding to be applied to Update operations that can apply an initial binding (i.e. UpdateDeleteWhere, UpdateModify)
* @param context (null means use merge of global and graph store context))
* @return UpdateProcessor or null
*/
- public static UpdateProcessor create(UpdateRequest updateRequest, GraphStore graphStore, QuerySolution inputBinding, Context context)
+ public static UpdateProcessor create(UpdateRequest updateRequest, Dataset dataset, QuerySolution inputBinding, Context context)
{
- return create(updateRequest, graphStore, BindingUtils.asBinding(inputBinding), context) ;
+ return create(updateRequest, dataset.asDatasetGraph(), BindingUtils.asBinding(inputBinding), context) ;
}
- /** Create an UpdateProcessor appropriate to the GraphStore, or null if no available factory to make an UpdateProcessor
+ /** Create an UpdateProcessor appropriate to the datasetGraph, or null if no available factory to make an UpdateProcessor
* @param updateRequest
- * @param graphStore
+ * @param datasetGraph
* @param inputBinding Initial binding to be applied to Update operations that can apply an initial binding (i.e. UpdateDeleteWhere, UpdateModify)
* @param context (null means use merge of global and graph store context))
* @return UpdateProcessor or null
*/
- public static UpdateProcessor create(UpdateRequest updateRequest, GraphStore graphStore, Binding inputBinding, Context context)
+ public static UpdateProcessor create(UpdateRequest updateRequest, DatasetGraph datasetGraph, Binding inputBinding, Context context)
{
- return make(updateRequest, graphStore, inputBinding, context) ;
+ return make(updateRequest, datasetGraph, inputBinding, context) ;
}
// Everything comes through one of these two make methods
- private static UpdateProcessor make(UpdateRequest updateRequest, GraphStore graphStore, Binding inputBinding, Context context)
+ private static UpdateProcessor make(UpdateRequest updateRequest, DatasetGraph datasetGraph, Binding inputBinding, Context context)
{
if ( context == null )
{
context = ARQ.getContext().copy();
- context.putAll(graphStore.getContext()) ;
+ context.putAll(datasetGraph.getContext()) ;
}
- UpdateEngineFactory f = UpdateEngineRegistry.get().find(graphStore, context) ;
+ UpdateEngineFactory f = UpdateEngineRegistry.get().find(datasetGraph, context) ;
if ( f == null )
return null ;
- UpdateProcessorBase uProc = new UpdateProcessorBase(updateRequest, graphStore, inputBinding, context, f) ;
+ UpdateProcessorBase uProc = new UpdateProcessorBase(updateRequest, datasetGraph, inputBinding, context, f) ;
return uProc ;
}
// Everything comes through one of these two make methods
- private static UpdateProcessorStreaming makeStreaming(GraphStore graphStore, Binding inputBinding, Context context)
+ private static UpdateProcessorStreaming makeStreaming(DatasetGraph datasetGraph, Binding inputBinding, Context context)
{
if ( context == null )
{
context = ARQ.getContext().copy();
- context.putAll(graphStore.getContext()) ;
+ context.putAll(datasetGraph.getContext()) ;
}
- UpdateEngineFactory f = UpdateEngineRegistry.get().find(graphStore, context) ;
+ UpdateEngineFactory f = UpdateEngineRegistry.get().find(datasetGraph, context) ;
if ( f == null )
return null ;
- UpdateProcessorStreamingBase uProc = new UpdateProcessorStreamingBase(graphStore, inputBinding, context, f) ;
+ UpdateProcessorStreamingBase uProc = new UpdateProcessorStreamingBase(datasetGraph, inputBinding, context, f) ;
return uProc;
}
http://git-wip-us.apache.org/repos/asf/jena/blob/bb8d6f3b/jena-arq/src/main/java/org/apache/jena/update/UpdateProcessor.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/update/UpdateProcessor.java b/jena-arq/src/main/java/org/apache/jena/update/UpdateProcessor.java
index d864b05..393aa31 100644
--- a/jena-arq/src/main/java/org/apache/jena/update/UpdateProcessor.java
+++ b/jena-arq/src/main/java/org/apache/jena/update/UpdateProcessor.java
@@ -18,6 +18,7 @@
package org.apache.jena.update;
+import org.apache.jena.sparql.core.DatasetGraph ;
import org.apache.jena.sparql.util.Context ;
/** An instance of a execution of an UpdateRequest */
@@ -35,8 +36,18 @@ public interface UpdateProcessor
* The dataset against which the query will execute.
* May be null, implying the there isn't a local GraphStore target for this UpdateProcessor.
*/
- public GraphStore getGraphStore() ;
+ public DatasetGraph getDatasetGraph() ;
+ /**
+ * The dataset against which the query will execute.
+ * May be null, implying the there isn't a local GraphStore target for this UpdateProcessor.
+ * @deprecated Use {@link #getDatasetGraph()}
+ */
+ @Deprecated
+ public default DatasetGraph getGraphStore() {
+ return getDatasetGraph() ;
+ }
+
/** Execute */
public void execute() ;
}
http://git-wip-us.apache.org/repos/asf/jena/blob/bb8d6f3b/jena-arq/src/main/java/org/apache/jena/update/UpdateProcessorStreaming.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/update/UpdateProcessorStreaming.java b/jena-arq/src/main/java/org/apache/jena/update/UpdateProcessorStreaming.java
index 7b5a5b1..4c45252 100644
--- a/jena-arq/src/main/java/org/apache/jena/update/UpdateProcessorStreaming.java
+++ b/jena-arq/src/main/java/org/apache/jena/update/UpdateProcessorStreaming.java
@@ -18,6 +18,7 @@
package org.apache.jena.update;
+import org.apache.jena.sparql.core.DatasetGraph ;
import org.apache.jena.sparql.modify.UpdateSink ;
import org.apache.jena.sparql.util.Context ;
@@ -36,8 +37,14 @@ public interface UpdateProcessorStreaming
* The dataset against which the query will execute.
* May be null, implying the there isn't a local GraphStore target for this UpdateProcessor.
*/
- public GraphStore getGraphStore() ;
+ public DatasetGraph getDatasetGraph() ;
+ /** @deprecated Use {@link #getDatasetGraph()} */
+ @Deprecated
+ public default DatasetGraph getGraphStore() {
+ return getDatasetGraph() ;
+ }
+
/** Start the request, call before putting updates into the Sink */
public void startRequest() ;
http://git-wip-us.apache.org/repos/asf/jena/blob/bb8d6f3b/jena-arq/src/test/java/org/apache/jena/query/TestParameterizedSparqlString.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/org/apache/jena/query/TestParameterizedSparqlString.java b/jena-arq/src/test/java/org/apache/jena/query/TestParameterizedSparqlString.java
index 250437d..0f07a2a 100644
--- a/jena-arq/src/test/java/org/apache/jena/query/TestParameterizedSparqlString.java
+++ b/jena-arq/src/test/java/org/apache/jena/query/TestParameterizedSparqlString.java
@@ -32,7 +32,6 @@ import org.apache.jena.sparql.ARQException ;
import org.apache.jena.sparql.syntax.Element ;
import org.apache.jena.sparql.syntax.ElementGroup ;
import org.apache.jena.sparql.syntax.ElementTriplesBlock ;
-import org.apache.jena.update.GraphStoreFactory ;
import org.apache.jena.update.UpdateExecutionFactory ;
import org.apache.jena.update.UpdateProcessor ;
import org.apache.jena.update.UpdateRequest ;
@@ -263,7 +262,7 @@ public class TestParameterizedSparqlString {
s.setCommandText("INSERT { ?o ?p ?s } WHERE { ?s ?p ?o }");
s.setIri("s", "_:" + bnode.getId());
UpdateRequest query = s.asUpdate();
- UpdateProcessor proc = UpdateExecutionFactory.create(query, GraphStoreFactory.create(ds));
+ UpdateProcessor proc = UpdateExecutionFactory.create(query, ds);
proc.execute();
// This should be true because this was present in the intial model set
http://git-wip-us.apache.org/repos/asf/jena/blob/bb8d6f3b/jena-arq/src/test/java/org/apache/jena/sparql/graph/TestDatasets.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/org/apache/jena/sparql/graph/TestDatasets.java b/jena-arq/src/test/java/org/apache/jena/sparql/graph/TestDatasets.java
index 1a38543..c8dc89e 100644
--- a/jena-arq/src/test/java/org/apache/jena/sparql/graph/TestDatasets.java
+++ b/jena-arq/src/test/java/org/apache/jena/sparql/graph/TestDatasets.java
@@ -18,15 +18,19 @@
package org.apache.jena.sparql.graph;
-import java.util.ArrayList;
-import java.util.List;
+import java.util.ArrayList ;
+import java.util.List ;
import org.apache.jena.query.* ;
+import org.apache.jena.sparql.core.DatasetGraph ;
import org.apache.jena.sparql.core.DynamicDatasets ;
-import org.apache.jena.update.* ;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
+import org.apache.jena.update.UpdateExecutionFactory ;
+import org.apache.jena.update.UpdateFactory ;
+import org.apache.jena.update.UpdateProcessor ;
+import org.apache.jena.update.UpdateRequest ;
+import org.junit.Assert ;
+import org.junit.Before ;
+import org.junit.Test ;
public class TestDatasets {
@@ -37,12 +41,12 @@ public class TestDatasets {
+ "}";
private Dataset ds;
- private GraphStore gs;
+ private DatasetGraph gs;
@Before
public void setup() {
this.ds = DatasetFactory.createMem();
- this.gs = GraphStoreFactory.create(this.ds);
+ this.gs = ds.asDatasetGraph() ;
UpdateRequest up = UpdateFactory.create(TestDatasets.data);
UpdateProcessor processor = UpdateExecutionFactory.create(up, this.gs);
http://git-wip-us.apache.org/repos/asf/jena/blob/bb8d6f3b/jena-arq/src/test/java/org/apache/jena/sparql/modify/AbstractTestUpdateBase.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/org/apache/jena/sparql/modify/AbstractTestUpdateBase.java b/jena-arq/src/test/java/org/apache/jena/sparql/modify/AbstractTestUpdateBase.java
index 12f05a9..8e09adb 100644
--- a/jena-arq/src/test/java/org/apache/jena/sparql/modify/AbstractTestUpdateBase.java
+++ b/jena-arq/src/test/java/org/apache/jena/sparql/modify/AbstractTestUpdateBase.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.jena.sparql.modify;
+package org.apache.jena.sparql.modify ;
import org.apache.jena.atlas.junit.BaseTest ;
import org.apache.jena.graph.Graph ;
@@ -24,48 +24,40 @@ import org.apache.jena.graph.GraphUtil ;
import org.apache.jena.graph.Node ;
import org.apache.jena.graph.Triple ;
import org.apache.jena.sparql.ARQTestSuite ;
+import org.apache.jena.sparql.core.DatasetGraph ;
import org.apache.jena.sparql.graph.GraphFactory ;
-import org.apache.jena.update.GraphStore ;
import org.apache.jena.update.UpdateAction ;
-public abstract class AbstractTestUpdateBase extends BaseTest
-{
- protected abstract GraphStore getEmptyGraphStore() ;
-
- protected void defaultGraphData(GraphStore gStore, Graph data)
- {
+public abstract class AbstractTestUpdateBase extends BaseTest {
+ protected abstract DatasetGraph getEmptyDatasetGraph() ;
+
+ protected void defaultGraphData(DatasetGraph gStore, Graph data) {
Graph g = gStore.getDefaultGraph() ;
g.clear() ;
GraphUtil.addInto(g, data) ;
}
-
- protected void namedGraphData(GraphStore gStore, Node uri, Graph data)
- {
+
+ protected void namedGraphData(DatasetGraph gStore, Node uri, Graph data) {
Graph g = gStore.getGraph(uri) ;
- if ( g == null )
- {
+ if ( g == null ) {
gStore.addGraph(uri, GraphFactory.createJenaDefaultGraph()) ;
g = gStore.getGraph(uri) ;
- }
- else
+ } else
g.clear() ;
- GraphUtil.addInto(g,data) ;
+ GraphUtil.addInto(g, data) ;
}
-
+
protected static final String FileBase = ARQTestSuite.testDirUpdate ;
-
- protected static void script(GraphStore gStore, String filename)
- {
- UpdateAction.readExecute(FileBase+"/"+filename, gStore) ;
+
+ protected static void script(DatasetGraph gStore, String filename) {
+ UpdateAction.readExecute(FileBase + "/" + filename, gStore) ;
}
-
- protected static boolean graphEmpty(Graph graph)
- {
- return graph.isEmpty() ;
+
+ protected static boolean graphEmpty(Graph graph) {
+ return graph.isEmpty() ;
}
-
- protected static boolean graphContains(Graph graph, Triple triple)
- {
- return graph.contains(triple) ;
+
+ protected static boolean graphContains(Graph graph, Triple triple) {
+ return graph.contains(triple) ;
}
}
http://git-wip-us.apache.org/repos/asf/jena/blob/bb8d6f3b/jena-arq/src/test/java/org/apache/jena/sparql/modify/AbstractTestUpdateGraph.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/org/apache/jena/sparql/modify/AbstractTestUpdateGraph.java b/jena-arq/src/test/java/org/apache/jena/sparql/modify/AbstractTestUpdateGraph.java
index f99576b..2220f03 100644
--- a/jena-arq/src/test/java/org/apache/jena/sparql/modify/AbstractTestUpdateGraph.java
+++ b/jena-arq/src/test/java/org/apache/jena/sparql/modify/AbstractTestUpdateGraph.java
@@ -37,7 +37,6 @@ import org.apache.jena.sparql.modify.request.* ;
import org.apache.jena.sparql.sse.SSE ;
import org.apache.jena.sparql.syntax.Element ;
import org.apache.jena.sparql.util.NodeFactoryExtra ;
-import org.apache.jena.update.GraphStore ;
import org.apache.jena.update.UpdateAction ;
import org.apache.jena.update.UpdateExecutionFactory ;
import org.apache.jena.update.UpdateProcessor ;
@@ -59,7 +58,7 @@ public abstract class AbstractTestUpdateGraph extends AbstractTestUpdateBase
@Test public void testInsertData1()
{
- GraphStore gStore = getEmptyGraphStore() ;
+ DatasetGraph gStore = getEmptyDatasetGraph() ;
defaultGraphData(gStore, graph1) ;
QuadDataAcc acc = new QuadDataAcc() ;
acc.addTriple(triple2) ;
@@ -74,7 +73,7 @@ public abstract class AbstractTestUpdateGraph extends AbstractTestUpdateBase
@Test public void testDeleteData1()
{
- GraphStore gStore = getEmptyGraphStore() ;
+ DatasetGraph gStore = getEmptyDatasetGraph() ;
defaultGraphData(gStore, graph1) ;
QuadDataAcc acc = new QuadDataAcc() ;
acc.addTriple(triple2) ;
@@ -89,7 +88,7 @@ public abstract class AbstractTestUpdateGraph extends AbstractTestUpdateBase
@Test public void testDeleteData2()
{
- GraphStore gStore = getEmptyGraphStore() ;
+ DatasetGraph gStore = getEmptyDatasetGraph() ;
defaultGraphData(gStore, graph1) ;
QuadDataAcc acc = new QuadDataAcc() ;
acc.addTriple(triple1) ;
@@ -103,7 +102,7 @@ public abstract class AbstractTestUpdateGraph extends AbstractTestUpdateBase
@Test public void testInsert1()
{
- GraphStore gStore = getEmptyGraphStore() ;
+ DatasetGraph gStore = getEmptyDatasetGraph() ;
UpdateModify insert = new UpdateModify() ;
UpdateAction.execute(insert, gStore) ;
assertTrue(graphEmpty(gStore.getDefaultGraph())) ;
@@ -111,7 +110,7 @@ public abstract class AbstractTestUpdateGraph extends AbstractTestUpdateBase
@Test public void testInsert2()
{
- GraphStore gStore = getEmptyGraphStore() ;
+ DatasetGraph gStore = getEmptyDatasetGraph() ;
UpdateModify insert = new UpdateModify() ;
insert.getInsertAcc().addTriple(triple1) ;
UpdateAction.execute(insert, gStore) ;
@@ -120,7 +119,7 @@ public abstract class AbstractTestUpdateGraph extends AbstractTestUpdateBase
@Test public void testInsert3()
{
- GraphStore gStore = getEmptyGraphStore() ;
+ DatasetGraph gStore = getEmptyDatasetGraph() ;
gStore.addGraph(graphIRI, Factory.createDefaultGraph()) ;
UpdateModify insert = new UpdateModify() ;
insert.getInsertAcc().addQuad(new Quad(graphIRI, triple1)) ;
@@ -130,7 +129,7 @@ public abstract class AbstractTestUpdateGraph extends AbstractTestUpdateBase
@Test public void testInsert4()
{
- GraphStore gStore = getEmptyGraphStore() ;
+ DatasetGraph gStore = getEmptyDatasetGraph() ;
defaultGraphData(gStore, graph1) ;
UpdateModify insert = new UpdateModify() ;
insert.getInsertAcc().addTriple(SSE.parseTriple("(?s <http://example/p> 1066)")) ;
@@ -142,7 +141,7 @@ public abstract class AbstractTestUpdateGraph extends AbstractTestUpdateBase
@Test public void testDelete1()
{
- GraphStore gStore = getEmptyGraphStore() ;
+ DatasetGraph gStore = getEmptyDatasetGraph() ;
QuadAcc acc = new QuadAcc() ;
UpdateDeleteWhere delete = new UpdateDeleteWhere(acc) ;
UpdateAction.execute(delete, gStore) ;
@@ -151,7 +150,7 @@ public abstract class AbstractTestUpdateGraph extends AbstractTestUpdateBase
@Test public void testDelete2()
{
- GraphStore gStore = getEmptyGraphStore() ;
+ DatasetGraph gStore = getEmptyDatasetGraph() ;
defaultGraphData(gStore, graph1) ;
QuadAcc acc = new QuadAcc() ;
UpdateDeleteWhere delete = new UpdateDeleteWhere(acc) ;
@@ -162,7 +161,7 @@ public abstract class AbstractTestUpdateGraph extends AbstractTestUpdateBase
@Test public void testDelete3()
{
- GraphStore gStore = getEmptyGraphStore() ;
+ DatasetGraph gStore = getEmptyDatasetGraph() ;
defaultGraphData(gStore, graph1) ;
QuadDataAcc acc = new QuadDataAcc() ;
UpdateDataDelete delete = new UpdateDataDelete(acc) ;
@@ -174,7 +173,7 @@ public abstract class AbstractTestUpdateGraph extends AbstractTestUpdateBase
@Test public void testDelete4()
{
- GraphStore gStore = getEmptyGraphStore() ;
+ DatasetGraph gStore = getEmptyDatasetGraph() ;
namedGraphData(gStore, graphIRI, data1()) ;
QuadDataAcc acc = new QuadDataAcc() ;
@@ -188,7 +187,7 @@ public abstract class AbstractTestUpdateGraph extends AbstractTestUpdateBase
@Test public void testDelete5()
{
- GraphStore gStore = getEmptyGraphStore() ;
+ DatasetGraph gStore = getEmptyDatasetGraph() ;
defaultGraphData(gStore, data2()) ;
namedGraphData(gStore, graphIRI, data1()) ;
@@ -204,7 +203,7 @@ public abstract class AbstractTestUpdateGraph extends AbstractTestUpdateBase
@Test public void testModify1()
{
- GraphStore gStore = getEmptyGraphStore() ;
+ DatasetGraph gStore = getEmptyDatasetGraph() ;
defaultGraphData(gStore, data2()) ;
namedGraphData(gStore, graphIRI, Factory.createDefaultGraph()) ;
@@ -226,7 +225,7 @@ public abstract class AbstractTestUpdateGraph extends AbstractTestUpdateBase
// Use blank nodes (will expose any problems in serialization when spill occurs)
Triple t = new Triple(org.apache.jena.graph.NodeFactory.createAnon(),p,o2);
- GraphStore gStore = getEmptyGraphStore() ;
+ DatasetGraph gStore = getEmptyDatasetGraph() ;
// Set the threshold to in order to force spill to disk
gStore.getContext().set(ARQ.spillToDiskThreshold, 0L) ;
@@ -249,7 +248,7 @@ public abstract class AbstractTestUpdateGraph extends AbstractTestUpdateBase
@Test public void testModifyInitialBindings()
{
- GraphStore gStore = getEmptyGraphStore() ;
+ DatasetGraph gStore = getEmptyDatasetGraph() ;
defaultGraphData(gStore, data12()) ;
namedGraphData(gStore, graphIRI, Factory.createDefaultGraph()) ;
@@ -276,7 +275,7 @@ public abstract class AbstractTestUpdateGraph extends AbstractTestUpdateBase
Triple t = new Triple(org.apache.jena.graph.NodeFactory.createAnon(),p,o2);
Triple t2 = new Triple(org.apache.jena.graph.NodeFactory.createAnon(),p,o1);
- GraphStore gStore = getEmptyGraphStore() ;
+ DatasetGraph gStore = getEmptyDatasetGraph() ;
// Set the threshold to in order to force spill to disk
gStore.getContext().set(ARQ.spillToDiskThreshold, 0L) ;
@@ -297,14 +296,14 @@ public abstract class AbstractTestUpdateGraph extends AbstractTestUpdateBase
@Test public void testUpdateScript1()
{
- GraphStore gStore = getEmptyGraphStore() ;
+ DatasetGraph gStore = getEmptyDatasetGraph() ;
script(gStore, "update-1.ru") ;
assertTrue(graphContains(gStore.getDefaultGraph(), new Triple(s,p,NodeFactoryExtra.parseNode("123")))) ;
}
@Test public void testUpdateScript2()
{
- GraphStore gStore = getEmptyGraphStore() ;
+ DatasetGraph gStore = getEmptyDatasetGraph() ;
script(gStore, "update-2.ru") ;
assertTrue(graphContains(gStore.getGraph(org.apache.jena.graph.NodeFactory.createURI("http://example/g1")),
new Triple(s,p,NodeFactoryExtra.parseNode("123")))) ;
@@ -313,7 +312,7 @@ public abstract class AbstractTestUpdateGraph extends AbstractTestUpdateBase
@Test public void testUpdateScript3()
{
- GraphStore gStore = getEmptyGraphStore() ;
+ DatasetGraph gStore = getEmptyDatasetGraph() ;
script(gStore, "update-3.ru") ;
assertTrue(graphEmpty(gStore.getGraph(org.apache.jena.graph.NodeFactory.createURI("http://example/g1")))) ;
assertTrue(graphEmpty(gStore.getDefaultGraph())) ;
@@ -321,7 +320,7 @@ public abstract class AbstractTestUpdateGraph extends AbstractTestUpdateBase
@Test public void testUpdateScript4()
{
- GraphStore gStore = getEmptyGraphStore() ;
+ DatasetGraph gStore = getEmptyDatasetGraph() ;
script(gStore, "data-1.ru") ;
assertTrue(graphContains(gStore.getDefaultGraph(),
new Triple(s,p,NodeFactoryExtra.parseNode("123")))) ;
@@ -329,7 +328,7 @@ public abstract class AbstractTestUpdateGraph extends AbstractTestUpdateBase
@Test public void testUpdateScript5()
{
- GraphStore gStore = getEmptyGraphStore() ;
+ DatasetGraph gStore = getEmptyDatasetGraph() ;
script(gStore, "data-2.ru") ;
@@ -343,7 +342,7 @@ public abstract class AbstractTestUpdateGraph extends AbstractTestUpdateBase
@Test public void testUpdateScript6()
{
- GraphStore gStore = getEmptyGraphStore() ;
+ DatasetGraph gStore = getEmptyDatasetGraph() ;
script(gStore, "data-3.ru") ;
assertTrue(graphContains(gStore.getGraph(graphIRI),
new Triple(s,p,NodeFactoryExtra.parseNode("123")))) ;
@@ -351,7 +350,7 @@ public abstract class AbstractTestUpdateGraph extends AbstractTestUpdateBase
@Test public void testUpdateScript7()
{
- GraphStore gStore = getEmptyGraphStore() ;
+ DatasetGraph gStore = getEmptyDatasetGraph() ;
script(gStore, "data-4.ru") ;
assertTrue(graphContains(gStore.getDefaultGraph(),
new Triple(s,p,NodeFactoryExtra.parseNode("123")))) ;
@@ -366,7 +365,7 @@ public abstract class AbstractTestUpdateGraph extends AbstractTestUpdateBase
private void testBad(String file, int expectedSize)
{
- GraphStore gStore = getEmptyGraphStore() ;
+ DatasetGraph gStore = getEmptyDatasetGraph() ;
script(gStore, file) ;
assertEquals(expectedSize, countQuads(gStore)) ;
}
http://git-wip-us.apache.org/repos/asf/jena/blob/bb8d6f3b/jena-arq/src/test/java/org/apache/jena/sparql/modify/AbstractTestUpdateGraphMgt.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/org/apache/jena/sparql/modify/AbstractTestUpdateGraphMgt.java b/jena-arq/src/test/java/org/apache/jena/sparql/modify/AbstractTestUpdateGraphMgt.java
index fb0cd21..328004d 100644
--- a/jena-arq/src/test/java/org/apache/jena/sparql/modify/AbstractTestUpdateGraphMgt.java
+++ b/jena-arq/src/test/java/org/apache/jena/sparql/modify/AbstractTestUpdateGraphMgt.java
@@ -20,10 +20,10 @@ package org.apache.jena.sparql.modify;
import org.apache.jena.graph.Node ;
import org.apache.jena.graph.NodeFactory ;
+import org.apache.jena.sparql.core.DatasetGraph ;
import org.apache.jena.sparql.graph.GraphFactory ;
import org.apache.jena.sparql.modify.request.UpdateCreate ;
import org.apache.jena.sparql.modify.request.UpdateDrop ;
-import org.apache.jena.update.GraphStore ;
import org.apache.jena.update.Update ;
import org.apache.jena.update.UpdateAction ;
import org.apache.jena.update.UpdateException ;
@@ -35,7 +35,7 @@ public abstract class AbstractTestUpdateGraphMgt extends AbstractTestUpdateBase
@Test public void testCreateDrop1()
{
- GraphStore gStore = getEmptyGraphStore() ;
+ DatasetGraph gStore = getEmptyDatasetGraph() ;
Update u = new UpdateCreate(graphIRI) ;
UpdateAction.execute(u, gStore) ;
assertTrue(gStore.containsGraph(graphIRI)) ;
@@ -71,7 +71,7 @@ public abstract class AbstractTestUpdateGraphMgt extends AbstractTestUpdateBase
@Test public void testCreateDrop2()
{
- GraphStore gStore = getEmptyGraphStore() ;
+ DatasetGraph gStore = getEmptyDatasetGraph() ;
Update u = new UpdateCreate(graphIRI) ;
UpdateAction.execute(u, gStore) ;
@@ -91,7 +91,7 @@ public abstract class AbstractTestUpdateGraphMgt extends AbstractTestUpdateBase
@Test public void testCreateDrop3()
{
- GraphStore gStore = getEmptyGraphStore() ;
+ DatasetGraph gStore = getEmptyDatasetGraph() ;
script(gStore, "create-1.ru") ;
assertTrue(gStore.containsGraph(graphIRI)) ;
assertTrue(graphEmpty(gStore.getGraph(graphIRI))) ;
@@ -99,7 +99,7 @@ public abstract class AbstractTestUpdateGraphMgt extends AbstractTestUpdateBase
@Test public void testCreateDrop4()
{
- GraphStore gStore = getEmptyGraphStore() ;
+ DatasetGraph gStore = getEmptyDatasetGraph() ;
gStore.addGraph(graphIRI, GraphFactory.createDefaultGraph()) ;
script(gStore, "drop-1.ru") ;
assertFalse(gStore.containsGraph(graphIRI)) ;
http://git-wip-us.apache.org/repos/asf/jena/blob/bb8d6f3b/jena-arq/src/test/java/org/apache/jena/sparql/modify/TestUpdateGraphMem.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/org/apache/jena/sparql/modify/TestUpdateGraphMem.java b/jena-arq/src/test/java/org/apache/jena/sparql/modify/TestUpdateGraphMem.java
index 3b88b83..804df4e 100644
--- a/jena-arq/src/test/java/org/apache/jena/sparql/modify/TestUpdateGraphMem.java
+++ b/jena-arq/src/test/java/org/apache/jena/sparql/modify/TestUpdateGraphMem.java
@@ -18,15 +18,14 @@
package org.apache.jena.sparql.modify;
-import org.apache.jena.update.GraphStore ;
-import org.apache.jena.update.GraphStoreFactory ;
+import org.apache.jena.sparql.core.DatasetGraph ;
+import org.apache.jena.sparql.core.DatasetGraphFactory ;
public class TestUpdateGraphMem extends AbstractTestUpdateGraph
{
@Override
- protected GraphStore getEmptyGraphStore()
+ protected DatasetGraph getEmptyDatasetGraph()
{
- GraphStore gStore = GraphStoreFactory.create() ;
- return gStore ;
+ return DatasetGraphFactory.createMem() ;
}
}
http://git-wip-us.apache.org/repos/asf/jena/blob/bb8d6f3b/jena-arq/src/test/java/org/apache/jena/sparql/modify/TestUpdateGraphMgtMem.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/org/apache/jena/sparql/modify/TestUpdateGraphMgtMem.java b/jena-arq/src/test/java/org/apache/jena/sparql/modify/TestUpdateGraphMgtMem.java
index 92dcd05..7c8b34f 100644
--- a/jena-arq/src/test/java/org/apache/jena/sparql/modify/TestUpdateGraphMgtMem.java
+++ b/jena-arq/src/test/java/org/apache/jena/sparql/modify/TestUpdateGraphMgtMem.java
@@ -16,17 +16,14 @@
* limitations under the License.
*/
-package org.apache.jena.sparql.modify;
+package org.apache.jena.sparql.modify ;
-import org.apache.jena.update.GraphStore ;
-import org.apache.jena.update.GraphStoreFactory ;
+import org.apache.jena.sparql.core.DatasetGraph ;
+import org.apache.jena.sparql.core.DatasetGraphFactory ;
-public class TestUpdateGraphMgtMem extends AbstractTestUpdateGraphMgt
-{
+public class TestUpdateGraphMgtMem extends AbstractTestUpdateGraphMgt {
@Override
- protected GraphStore getEmptyGraphStore()
- {
- GraphStore gStore = GraphStoreFactory.create() ;
- return gStore ;
+ protected DatasetGraph getEmptyDatasetGraph() {
+ return DatasetGraphFactory.createMem() ;
}
}
http://git-wip-us.apache.org/repos/asf/jena/blob/bb8d6f3b/jena-arq/src/test/java/org/apache/jena/sparql/modify/TestUpdateOperations.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/org/apache/jena/sparql/modify/TestUpdateOperations.java b/jena-arq/src/test/java/org/apache/jena/sparql/modify/TestUpdateOperations.java
index f4b65fb..ead8940 100644
--- a/jena-arq/src/test/java/org/apache/jena/sparql/modify/TestUpdateOperations.java
+++ b/jena-arq/src/test/java/org/apache/jena/sparql/modify/TestUpdateOperations.java
@@ -26,6 +26,8 @@ import org.apache.jena.rdf.model.Model ;
import org.apache.jena.rdf.model.ModelFactory ;
import org.apache.jena.rdf.model.RDFNode ;
import org.apache.jena.rdf.model.Resource ;
+import org.apache.jena.sparql.core.DatasetGraph ;
+import org.apache.jena.sparql.core.DatasetGraphFactory ;
import org.apache.jena.sparql.sse.SSE ;
import org.apache.jena.update.* ;
import org.apache.jena.vocabulary.OWL ;
@@ -37,11 +39,11 @@ import org.junit.Test ;
public class TestUpdateOperations extends BaseTest
{
private static final String DIR = "testing/Update" ;
- private GraphStore graphStore() { return GraphStoreFactory.create() ; }
+ private DatasetGraph graphStore() { return DatasetGraphFactory.createMem() ; }
private Node gName = SSE.parseNode("<http://example/g>") ;
@Test public void load1() {
- GraphStore gs = graphStore() ;
+ DatasetGraph gs = graphStore() ;
UpdateRequest req = UpdateFactory.create("LOAD <"+DIR+"/D.nt>") ;
UpdateAction.execute(req, gs) ;
assertEquals(1, gs.getDefaultGraph().size()) ;
@@ -49,7 +51,7 @@ public class TestUpdateOperations extends BaseTest
}
@Test public void load2() {
- GraphStore gs = graphStore() ;
+ DatasetGraph gs = graphStore() ;
UpdateRequest req = UpdateFactory.create("LOAD <"+DIR+"/D.nt> INTO GRAPH <"+gName.getURI()+">") ;
UpdateAction.execute(req, gs) ;
}
@@ -57,7 +59,7 @@ public class TestUpdateOperations extends BaseTest
// Quad loading
@Test public void load3() {
- GraphStore gs = graphStore() ;
+ DatasetGraph gs = graphStore() ;
UpdateRequest req = UpdateFactory.create("LOAD <"+DIR+"/D.nq>") ;
UpdateAction.execute(req, gs) ;
assertEquals(0, gs.getDefaultGraph().size()) ;
@@ -68,13 +70,13 @@ public class TestUpdateOperations extends BaseTest
// Bad: loading quads into a named graph
@Test(expected=UpdateException.class)
public void load4() {
- GraphStore gs = graphStore() ;
+ DatasetGraph gs = graphStore() ;
UpdateRequest req = UpdateFactory.create("LOAD <"+DIR+"/D.nq> INTO GRAPH <"+gName.getURI()+">") ;
UpdateAction.execute(req, gs) ;
}
@Test public void load5() {
- GraphStore gs = graphStore() ;
+ DatasetGraph gs = graphStore() ;
UpdateRequest req = UpdateFactory.create("LOAD SILENT <"+DIR+"/D.nq> INTO GRAPH <"+gName.getURI()+">") ;
UpdateAction.execute(req, gs) ;
assertEquals(0, Iter.count(gs.find())) ;
@@ -86,9 +88,8 @@ public class TestUpdateOperations extends BaseTest
anon.addProperty(RDF.type, OWL.Thing);
assertEquals(1, m.size());
- GraphStore gs = GraphStoreFactory.create(m);
UpdateRequest req = UpdateFactory.create("INSERT { ?s ?p ?o } WHERE { ?o ?p ?s }");
- UpdateAction.execute(req, gs);
+ UpdateAction.execute(req, m);
assertEquals(2, m.size());
assertEquals(1, m.listStatements(anon, null, (RDFNode)null).toList().size());
http://git-wip-us.apache.org/repos/asf/jena/blob/bb8d6f3b/jena-sdb/src/main/java/org/apache/jena/sdb/SDBFactory.java
----------------------------------------------------------------------
diff --git a/jena-sdb/src/main/java/org/apache/jena/sdb/SDBFactory.java b/jena-sdb/src/main/java/org/apache/jena/sdb/SDBFactory.java
index c172bad..3b88775 100644
--- a/jena-sdb/src/main/java/org/apache/jena/sdb/SDBFactory.java
+++ b/jena-sdb/src/main/java/org/apache/jena/sdb/SDBFactory.java
@@ -189,7 +189,7 @@ public class SDBFactory
* @param store
* @return GraphStore
*/
- public static GraphStore connectGraphStore(Store store)
+ public static DatasetGraphSDB connectGraphStore(Store store)
{
return new DatasetGraphSDB(store, SDB.getContext().copy()) ;
}
http://git-wip-us.apache.org/repos/asf/jena/blob/bb8d6f3b/jena-sdb/src/main/java/org/apache/jena/sdb/modify/UpdateEngineSDB.java
----------------------------------------------------------------------
diff --git a/jena-sdb/src/main/java/org/apache/jena/sdb/modify/UpdateEngineSDB.java b/jena-sdb/src/main/java/org/apache/jena/sdb/modify/UpdateEngineSDB.java
index 4377c0a..7680e04 100644
--- a/jena-sdb/src/main/java/org/apache/jena/sdb/modify/UpdateEngineSDB.java
+++ b/jena-sdb/src/main/java/org/apache/jena/sdb/modify/UpdateEngineSDB.java
@@ -19,13 +19,13 @@
package org.apache.jena.sdb.modify;
import org.apache.jena.sdb.store.DatasetGraphSDB ;
+import org.apache.jena.sparql.core.DatasetGraph ;
import org.apache.jena.sparql.engine.binding.Binding ;
import org.apache.jena.sparql.modify.UpdateEngine ;
import org.apache.jena.sparql.modify.UpdateEngineFactory ;
import org.apache.jena.sparql.modify.UpdateEngineMain ;
import org.apache.jena.sparql.modify.UpdateEngineRegistry ;
import org.apache.jena.sparql.util.Context ;
-import org.apache.jena.update.GraphStore ;
public class UpdateEngineSDB extends UpdateEngineMain
{
@@ -40,13 +40,13 @@ public class UpdateEngineSDB extends UpdateEngineMain
return new UpdateEngineFactory()
{
@Override
- public boolean accept(GraphStore graphStore, Context context)
+ public boolean accept(DatasetGraph graphStore, Context context)
{
return (graphStore instanceof DatasetGraphSDB) ;
}
@Override
- public UpdateEngine create(GraphStore graphStore, Binding inputBinding, Context context)
+ public UpdateEngine create(DatasetGraph graphStore, Binding inputBinding, Context context)
{
return new UpdateEngineSDB((DatasetGraphSDB)graphStore, inputBinding, context);
}
http://git-wip-us.apache.org/repos/asf/jena/blob/bb8d6f3b/jena-sdb/src/test/java/org/apache/jena/sdb/test/modify/TestSPARQLUpdate.java
----------------------------------------------------------------------
diff --git a/jena-sdb/src/test/java/org/apache/jena/sdb/test/modify/TestSPARQLUpdate.java b/jena-sdb/src/test/java/org/apache/jena/sdb/test/modify/TestSPARQLUpdate.java
index 3173600..2c016e0 100644
--- a/jena-sdb/src/test/java/org/apache/jena/sdb/test/modify/TestSPARQLUpdate.java
+++ b/jena-sdb/src/test/java/org/apache/jena/sdb/test/modify/TestSPARQLUpdate.java
@@ -23,8 +23,8 @@ import junit.framework.TestSuite ;
import org.apache.jena.sdb.SDBFactory ;
import org.apache.jena.sdb.Store ;
import org.apache.jena.sdb.test.junit.SDBTestUtils ;
+import org.apache.jena.sparql.core.DatasetGraph ;
import org.apache.jena.sparql.modify.AbstractTestUpdateGraph ;
-import org.apache.jena.update.GraphStore ;
public class TestSPARQLUpdate extends AbstractTestUpdateGraph
{
@@ -35,10 +35,9 @@ public class TestSPARQLUpdate extends AbstractTestUpdateGraph
}
@Override
- protected GraphStore getEmptyGraphStore()
+ protected DatasetGraph getEmptyDatasetGraph()
{
Store store = SDBTestUtils.createInMemoryStore() ;
- GraphStore graphStore = SDBFactory.connectGraphStore(store) ;
- return graphStore ;
+ return SDBFactory.connectDataset(store).asDatasetGraph() ;
}
}
http://git-wip-us.apache.org/repos/asf/jena/blob/bb8d6f3b/jena-sdb/src/test/java/org/apache/jena/sdb/test/modify/TestSPARQLUpdateMgt.java
----------------------------------------------------------------------
diff --git a/jena-sdb/src/test/java/org/apache/jena/sdb/test/modify/TestSPARQLUpdateMgt.java b/jena-sdb/src/test/java/org/apache/jena/sdb/test/modify/TestSPARQLUpdateMgt.java
index e46cb2b..2c876df 100644
--- a/jena-sdb/src/test/java/org/apache/jena/sdb/test/modify/TestSPARQLUpdateMgt.java
+++ b/jena-sdb/src/test/java/org/apache/jena/sdb/test/modify/TestSPARQLUpdateMgt.java
@@ -23,8 +23,8 @@ import junit.framework.TestSuite ;
import org.apache.jena.sdb.SDBFactory ;
import org.apache.jena.sdb.Store ;
import org.apache.jena.sdb.test.junit.SDBTestUtils ;
+import org.apache.jena.sparql.core.DatasetGraph ;
import org.apache.jena.sparql.modify.AbstractTestUpdateGraphMgt ;
-import org.apache.jena.update.GraphStore ;
public class TestSPARQLUpdateMgt extends AbstractTestUpdateGraphMgt
{
@@ -36,10 +36,8 @@ public class TestSPARQLUpdateMgt extends AbstractTestUpdateGraphMgt
}
@Override
- protected GraphStore getEmptyGraphStore()
- {
+ protected DatasetGraph getEmptyDatasetGraph() {
Store store = SDBTestUtils.createInMemoryStore() ;
- GraphStore graphStore = SDBFactory.connectGraphStore(store) ;
- return graphStore ;
+ return SDBFactory.connectDataset(store).asDatasetGraph() ;
}
}
http://git-wip-us.apache.org/repos/asf/jena/blob/bb8d6f3b/jena-tdb/src/main/java/org/apache/jena/tdb/modify/UpdateEngineTDB.java
----------------------------------------------------------------------
diff --git a/jena-tdb/src/main/java/org/apache/jena/tdb/modify/UpdateEngineTDB.java b/jena-tdb/src/main/java/org/apache/jena/tdb/modify/UpdateEngineTDB.java
index d811e6f..b3515f1 100644
--- a/jena-tdb/src/main/java/org/apache/jena/tdb/modify/UpdateEngineTDB.java
+++ b/jena-tdb/src/main/java/org/apache/jena/tdb/modify/UpdateEngineTDB.java
@@ -18,6 +18,7 @@
package org.apache.jena.tdb.modify;
+import org.apache.jena.sparql.core.DatasetGraph ;
import org.apache.jena.sparql.engine.binding.Binding ;
import org.apache.jena.sparql.modify.UpdateEngine ;
import org.apache.jena.sparql.modify.UpdateEngineFactory ;
@@ -25,7 +26,6 @@ import org.apache.jena.sparql.modify.UpdateEngineMain ;
import org.apache.jena.sparql.modify.UpdateEngineRegistry ;
import org.apache.jena.sparql.util.Context ;
import org.apache.jena.tdb.store.DatasetGraphTDB ;
-import org.apache.jena.update.GraphStore ;
public class UpdateEngineTDB extends UpdateEngineMain
{
@@ -38,15 +38,13 @@ public class UpdateEngineTDB extends UpdateEngineMain
return new UpdateEngineFactory()
{
@Override
- public boolean accept(GraphStore graphStore, Context context)
- {
+ public boolean accept(DatasetGraph graphStore, Context context) {
return (graphStore instanceof DatasetGraphTDB) ;
}
-
+
@Override
- public UpdateEngine create(GraphStore graphStore, Binding inputBinding, Context context)
- {
- return new UpdateEngineTDB((DatasetGraphTDB)graphStore, inputBinding, context);
+ public UpdateEngine create(DatasetGraph graphStore, Binding inputBinding, Context context) {
+ return new UpdateEngineTDB((DatasetGraphTDB)graphStore, inputBinding, context) ;
}
} ;
}
http://git-wip-us.apache.org/repos/asf/jena/blob/bb8d6f3b/jena-tdb/src/main/java/tdb/cmdline/ModTDBGraphStore.java
----------------------------------------------------------------------
diff --git a/jena-tdb/src/main/java/tdb/cmdline/ModTDBGraphStore.java b/jena-tdb/src/main/java/tdb/cmdline/ModTDBGraphStore.java
deleted file mode 100644
index 513c252..0000000
--- a/jena-tdb/src/main/java/tdb/cmdline/ModTDBGraphStore.java
+++ /dev/null
@@ -1,51 +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 tdb.cmdline;
-
-import org.apache.jena.update.GraphStore ;
-import org.apache.jena.update.GraphStoreFactory ;
-import arq.cmd.CmdArgModule ;
-import arq.cmdline.CmdGeneral ;
-import arq.cmdline.ModGraphStore ;
-
-public class ModTDBGraphStore extends ModGraphStore
-{
- private ModTDBDataset modTDBDataset = new ModTDBDataset() ;
-
- public ModTDBGraphStore() { super() ; }
-
- @Override
- public void registerWith(CmdGeneral cmdLine)
- {
- modTDBDataset.registerWith(cmdLine) ;
- }
-
- @Override
- public void processArgs(CmdArgModule cmdLine)
- {
- modTDBDataset.processArgs(cmdLine) ;
- }
-
- @Override
- public GraphStore createGraphStore()
- {
- // Simply return the DatasetGraphTDB
- return GraphStoreFactory.create(modTDBDataset.createDataset()) ;
- }
-}
http://git-wip-us.apache.org/repos/asf/jena/blob/bb8d6f3b/jena-tdb/src/main/java/tdb/tdbupdate.java
----------------------------------------------------------------------
diff --git a/jena-tdb/src/main/java/tdb/tdbupdate.java b/jena-tdb/src/main/java/tdb/tdbupdate.java
index 1d4cc71..2d25620 100644
--- a/jena-tdb/src/main/java/tdb/tdbupdate.java
+++ b/jena-tdb/src/main/java/tdb/tdbupdate.java
@@ -21,8 +21,6 @@ package tdb;
import org.apache.jena.tdb.TDB ;
import org.apache.jena.tdb.transaction.TransactionManager ;
import tdb.cmdline.CmdTDB ;
-import tdb.cmdline.ModTDBGraphStore ;
-import arq.cmdline.ModGraphStore ;
public class tdbupdate extends arq.update
{
@@ -35,7 +33,7 @@ public class tdbupdate extends arq.update
new tdbupdate(argv).mainRun() ;
}
- public tdbupdate(String[] argv)
+ public tdbupdate(String[] argv)
{
super(argv) ;
// Because this inherits from an ARQ command
@@ -44,16 +42,7 @@ public class tdbupdate extends arq.update
}
@Override
- protected void processModulesAndArgs()
- {
+ protected void processModulesAndArgs() {
super.processModulesAndArgs() ;
}
-
- @Override
- protected ModGraphStore setModGraphStore()
- {
- return new ModTDBGraphStore();
- }
-
-
}
http://git-wip-us.apache.org/repos/asf/jena/blob/bb8d6f3b/jena-tdb/src/test/java/org/apache/jena/tdb/store/Test_SPARQL_TDB.java
----------------------------------------------------------------------
diff --git a/jena-tdb/src/test/java/org/apache/jena/tdb/store/Test_SPARQL_TDB.java b/jena-tdb/src/test/java/org/apache/jena/tdb/store/Test_SPARQL_TDB.java
index 512a8f7..3d0315f 100644
--- a/jena-tdb/src/test/java/org/apache/jena/tdb/store/Test_SPARQL_TDB.java
+++ b/jena-tdb/src/test/java/org/apache/jena/tdb/store/Test_SPARQL_TDB.java
@@ -224,8 +224,7 @@ public class Test_SPARQL_TDB extends BaseTest
private void update(Dataset dataset, String string)
{
UpdateRequest req = UpdateFactory.create(string) ;
- GraphStore gs = GraphStoreFactory.create(dataset) ;
- UpdateProcessor proc = UpdateExecutionFactory.create(req, gs) ;
+ UpdateProcessor proc = UpdateExecutionFactory.create(req, dataset.asDatasetGraph()) ;
proc.execute() ;
}
}
[04/16] jena git commit: JENA-929: Migrate Filter to Java 8 Predicate
Posted by an...@apache.org.
http://git-wip-us.apache.org/repos/asf/jena/blob/b2a1953b/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredResIterator.java
----------------------------------------------------------------------
diff --git a/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredResIterator.java b/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredResIterator.java
index 4baa134..86599e0 100644
--- a/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredResIterator.java
+++ b/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredResIterator.java
@@ -21,13 +21,13 @@ import java.util.Iterator;
import java.util.List;
import java.util.Set;
import java.util.function.Function;
+import java.util.function.Predicate;
import org.apache.jena.permissions.model.SecuredModel;
import org.apache.jena.permissions.model.SecuredResource;
import org.apache.jena.rdf.model.ResIterator ;
import org.apache.jena.rdf.model.Resource ;
import org.apache.jena.util.iterator.ExtendedIterator ;
-import org.apache.jena.util.iterator.Filter ;
public class SecuredResIterator implements ResIterator
{
@@ -72,13 +72,13 @@ public class SecuredResIterator implements ResIterator
}
@Override
- public ExtendedIterator<Resource> filterDrop( final Filter<Resource> f )
+ public ExtendedIterator<Resource> filterDrop( final Predicate<Resource> f )
{
return iter.filterDrop(f);
}
@Override
- public ExtendedIterator<Resource> filterKeep( final Filter<Resource> f )
+ public ExtendedIterator<Resource> filterKeep( final Predicate<Resource> f )
{
return iter.filterKeep(f);
}
http://git-wip-us.apache.org/repos/asf/jena/blob/b2a1953b/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredSeqImpl.java
----------------------------------------------------------------------
diff --git a/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredSeqImpl.java b/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredSeqImpl.java
index c85ea19..d2515b8 100644
--- a/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredSeqImpl.java
+++ b/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredSeqImpl.java
@@ -17,13 +17,14 @@
*/
package org.apache.jena.permissions.model.impl;
+import java.util.function.Predicate;
+
import org.apache.jena.graph.Triple ;
import org.apache.jena.permissions.impl.ItemHolder;
import org.apache.jena.permissions.impl.SecuredItemInvoker;
import org.apache.jena.permissions.model.*;
import org.apache.jena.rdf.model.* ;
import org.apache.jena.util.iterator.ExtendedIterator ;
-import org.apache.jena.util.iterator.Filter ;
import org.apache.jena.vocabulary.RDF ;
/**
@@ -35,7 +36,7 @@ import org.apache.jena.vocabulary.RDF ;
*/
public class SecuredSeqImpl extends SecuredContainerImpl implements SecuredSeq
{
- private class RDFNodeFilter extends Filter<Statement>
+ private class RDFNodeFilter implements Predicate<Statement>
{
private final RDFNode n;
@@ -45,7 +46,7 @@ public class SecuredSeqImpl extends SecuredContainerImpl implements SecuredSeq
}
@Override
- public boolean accept( final Statement o )
+ public boolean test( final Statement o )
{
return (o.getPredicate().getOrdinal() != 0)
&& n.equals(o.getObject());
http://git-wip-us.apache.org/repos/asf/jena/blob/b2a1953b/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredStatementIterator.java
----------------------------------------------------------------------
diff --git a/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredStatementIterator.java b/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredStatementIterator.java
index 81df811..29a54c4 100644
--- a/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredStatementIterator.java
+++ b/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredStatementIterator.java
@@ -22,6 +22,7 @@ import java.util.List;
import java.util.NoSuchElementException;
import java.util.Set;
import java.util.function.Function;
+import java.util.function.Predicate;
import org.apache.jena.permissions.SecurityEvaluator.Action;
import org.apache.jena.permissions.model.SecuredModel;
@@ -30,7 +31,6 @@ import org.apache.jena.permissions.utils.PermStatementFilter;
import org.apache.jena.rdf.model.Statement ;
import org.apache.jena.rdf.model.StmtIterator ;
import org.apache.jena.util.iterator.ExtendedIterator ;
-import org.apache.jena.util.iterator.Filter ;
/**
* A secured StatementIterator implementation
@@ -87,13 +87,13 @@ public class SecuredStatementIterator implements StmtIterator
}
@Override
- public ExtendedIterator<Statement> filterDrop( final Filter<Statement> f )
+ public ExtendedIterator<Statement> filterDrop( final Predicate<Statement> f )
{
return iter.filterDrop(f);
}
@Override
- public ExtendedIterator<Statement> filterKeep( final Filter<Statement> f )
+ public ExtendedIterator<Statement> filterKeep( final Predicate<Statement> f )
{
return iter.filterKeep(f);
}
http://git-wip-us.apache.org/repos/asf/jena/blob/b2a1953b/jena-permissions/src/main/java/org/apache/jena/permissions/utils/ContainerFilter.java
----------------------------------------------------------------------
diff --git a/jena-permissions/src/main/java/org/apache/jena/permissions/utils/ContainerFilter.java b/jena-permissions/src/main/java/org/apache/jena/permissions/utils/ContainerFilter.java
index f9ae910..7b6e74f 100644
--- a/jena-permissions/src/main/java/org/apache/jena/permissions/utils/ContainerFilter.java
+++ b/jena-permissions/src/main/java/org/apache/jena/permissions/utils/ContainerFilter.java
@@ -17,16 +17,17 @@
*/
package org.apache.jena.permissions.utils;
+import java.util.function.Predicate;
+
import org.apache.jena.rdf.model.Property ;
import org.apache.jena.rdf.model.Statement ;
-import org.apache.jena.util.iterator.Filter ;
import org.apache.jena.vocabulary.RDF ;
-public class ContainerFilter extends Filter<Statement>
+public class ContainerFilter implements Predicate<Statement>
{
@Override
- public boolean accept( final Statement o )
+ public boolean test( final Statement o )
{
final Property p = o.getPredicate();
if (p.getNameSpace().equals(RDF.getURI())
http://git-wip-us.apache.org/repos/asf/jena/blob/b2a1953b/jena-permissions/src/main/java/org/apache/jena/permissions/utils/PermStatementFilter.java
----------------------------------------------------------------------
diff --git a/jena-permissions/src/main/java/org/apache/jena/permissions/utils/PermStatementFilter.java b/jena-permissions/src/main/java/org/apache/jena/permissions/utils/PermStatementFilter.java
index b8549bb..ba03fd8 100644
--- a/jena-permissions/src/main/java/org/apache/jena/permissions/utils/PermStatementFilter.java
+++ b/jena-permissions/src/main/java/org/apache/jena/permissions/utils/PermStatementFilter.java
@@ -19,6 +19,7 @@ package org.apache.jena.permissions.utils;
import java.util.Collection;
import java.util.Set;
+import java.util.function.Predicate;
import org.apache.jena.permissions.SecurityEvaluator;
import org.apache.jena.permissions.SecurityEvaluator.Action;
@@ -26,14 +27,13 @@ import org.apache.jena.permissions.SecurityEvaluator.SecNode;
import org.apache.jena.permissions.impl.SecuredItem;
import org.apache.jena.permissions.impl.SecuredItemImpl;
import org.apache.jena.rdf.model.Statement ;
-import org.apache.jena.util.iterator.Filter ;
/**
* A filter for to filter ExtendedIterators on Statements.
* This filter removes any triple that the user can not perform all
* the actions on.
*/
-public class PermStatementFilter extends Filter<Statement>
+public class PermStatementFilter implements Predicate<Statement>
{
private final SecurityEvaluator evaluator;
private final SecNode modelNode;
@@ -155,7 +155,7 @@ public class PermStatementFilter extends Filter<Statement>
}
@Override
- public boolean accept( final Statement s )
+ public boolean test( final Statement s )
{
return evaluator.evaluateAny(principal, actions, modelNode,
SecuredItemImpl.convert(s.asTriple()));
http://git-wip-us.apache.org/repos/asf/jena/blob/b2a1953b/jena-permissions/src/main/java/org/apache/jena/permissions/utils/PermTripleFilter.java
----------------------------------------------------------------------
diff --git a/jena-permissions/src/main/java/org/apache/jena/permissions/utils/PermTripleFilter.java b/jena-permissions/src/main/java/org/apache/jena/permissions/utils/PermTripleFilter.java
index a96a2cc..5f54814 100644
--- a/jena-permissions/src/main/java/org/apache/jena/permissions/utils/PermTripleFilter.java
+++ b/jena-permissions/src/main/java/org/apache/jena/permissions/utils/PermTripleFilter.java
@@ -19,6 +19,7 @@ package org.apache.jena.permissions.utils;
import java.util.Collection;
import java.util.Set;
+import java.util.function.Predicate;
import org.apache.jena.graph.Triple ;
import org.apache.jena.permissions.SecurityEvaluator;
@@ -26,14 +27,13 @@ import org.apache.jena.permissions.SecurityEvaluator.Action;
import org.apache.jena.permissions.SecurityEvaluator.SecNode;
import org.apache.jena.permissions.impl.SecuredItem;
import org.apache.jena.permissions.impl.SecuredItemImpl;
-import org.apache.jena.util.iterator.Filter ;
/**
* A filter for to filter ExtendedIterators on Triples.
* This filter removes any triple that the user can not perform all
* the actions on.
*/
-public class PermTripleFilter extends Filter<Triple>
+public class PermTripleFilter implements Predicate<Triple>
{
private final SecurityEvaluator evaluator;
private final SecNode modelNode;
@@ -154,7 +154,7 @@ public class PermTripleFilter extends Filter<Triple>
}
@Override
- public boolean accept( final Triple t )
+ public boolean test( final Triple t )
{
return evaluator.evaluateAny(principal, actions, modelNode,
SecuredItemImpl.convert(t));
http://git-wip-us.apache.org/repos/asf/jena/blob/b2a1953b/jena-permissions/src/main/java/org/apache/jena/permissions/utils/RDFListSecFilter.java
----------------------------------------------------------------------
diff --git a/jena-permissions/src/main/java/org/apache/jena/permissions/utils/RDFListSecFilter.java b/jena-permissions/src/main/java/org/apache/jena/permissions/utils/RDFListSecFilter.java
index efa87a1..7d08a21 100644
--- a/jena-permissions/src/main/java/org/apache/jena/permissions/utils/RDFListSecFilter.java
+++ b/jena-permissions/src/main/java/org/apache/jena/permissions/utils/RDFListSecFilter.java
@@ -18,6 +18,7 @@
package org.apache.jena.permissions.utils;
import java.util.Set;
+import java.util.function.Predicate;
import org.apache.jena.permissions.SecurityEvaluator;
import org.apache.jena.permissions.SecurityEvaluator.Action;
@@ -25,10 +26,9 @@ import org.apache.jena.permissions.impl.SecuredItem;
import org.apache.jena.permissions.impl.SecuredItemImpl;
import org.apache.jena.rdf.model.RDFList ;
import org.apache.jena.rdf.model.Statement ;
-import org.apache.jena.util.iterator.Filter ;
import org.apache.jena.vocabulary.RDF ;
-public class RDFListSecFilter<T extends RDFList> extends Filter<T>
+public class RDFListSecFilter<T extends RDFList> implements Predicate<T>
{
private final SecuredItem securedItem;
private final Set<Action> perms;
@@ -48,7 +48,7 @@ public class RDFListSecFilter<T extends RDFList> extends Filter<T>
}
@Override
- public boolean accept( final RDFList o )
+ public boolean test( final RDFList o )
{
final Statement s = o.getRequiredProperty(RDF.first);
return securedItem.getSecurityEvaluator().evaluate(principal, perms,
[06/16] jena git commit: Add @Override
Posted by an...@apache.org.
Add @Override
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/593961ce
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/593961ce
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/593961ce
Branch: refs/heads/master
Commit: 593961ce4cf5de8273b2878cda09d44bcb8bef5e
Parents: 1747242
Author: Andy Seaborne <an...@apache.org>
Authored: Sat May 2 18:21:48 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Mon May 4 18:04:17 2015 +0100
----------------------------------------------------------------------
.../src/main/java/org/apache/jena/util/iterator/Filter.java | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/593961ce/jena-core/src/main/java/org/apache/jena/util/iterator/Filter.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/util/iterator/Filter.java b/jena-core/src/main/java/org/apache/jena/util/iterator/Filter.java
index 6c85c28..427a047 100644
--- a/jena-core/src/main/java/org/apache/jena/util/iterator/Filter.java
+++ b/jena-core/src/main/java/org/apache/jena/util/iterator/Filter.java
@@ -27,9 +27,10 @@ import java.util.function.Predicate;
* Deprecated in favor of {@link Predicate}.
*/
@Deprecated
-public abstract class Filter<T> implements Predicate<T> {
-
- public boolean test(T o) {
+public abstract class Filter<T> implements Predicate<T>
+{
+ @Override
+ public boolean test(T o) {
return accept(o);
}
[03/16] jena git commit: Surppress hiding warnings
Posted by an...@apache.org.
Surppress hiding warnings
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/d0e4f58f
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/d0e4f58f
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/d0e4f58f
Branch: refs/heads/master
Commit: d0e4f58fb934b3893f22ec5c7750fa486504a7ce
Parents: 593961c
Author: Andy Seaborne <an...@apache.org>
Authored: Sat May 2 18:22:29 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Mon May 4 18:04:17 2015 +0100
----------------------------------------------------------------------
.../src/main/java/org/apache/jena/ontology/impl/OntClassImpl.java | 1 +
.../main/java/org/apache/jena/ontology/impl/OntPropertyImpl.java | 1 +
.../main/java/org/apache/jena/ontology/impl/OntResourceImpl.java | 1 +
3 files changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/d0e4f58f/jena-core/src/main/java/org/apache/jena/ontology/impl/OntClassImpl.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/ontology/impl/OntClassImpl.java b/jena-core/src/main/java/org/apache/jena/ontology/impl/OntClassImpl.java
index e2aae36..bbbe316 100644
--- a/jena-core/src/main/java/org/apache/jena/ontology/impl/OntClassImpl.java
+++ b/jena-core/src/main/java/org/apache/jena/ontology/impl/OntClassImpl.java
@@ -71,6 +71,7 @@ public class OntClassImpl
* Note: should not be invoked directly by user code: use
* {@link org.apache.jena.rdf.model.RDFNode#as as()} instead.
*/
+ @SuppressWarnings("hiding")
public static Implementation factory = new Implementation() {
@Override
public EnhNode wrap( Node n, EnhGraph eg ) {
http://git-wip-us.apache.org/repos/asf/jena/blob/d0e4f58f/jena-core/src/main/java/org/apache/jena/ontology/impl/OntPropertyImpl.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/ontology/impl/OntPropertyImpl.java b/jena-core/src/main/java/org/apache/jena/ontology/impl/OntPropertyImpl.java
index 2280299..1b9400a 100644
--- a/jena-core/src/main/java/org/apache/jena/ontology/impl/OntPropertyImpl.java
+++ b/jena-core/src/main/java/org/apache/jena/ontology/impl/OntPropertyImpl.java
@@ -54,6 +54,7 @@ public class OntPropertyImpl
* Note: should not be invoked directly by user code: use
* {@link org.apache.jena.rdf.model.RDFNode#as as()} instead.
*/
+ @SuppressWarnings("hiding")
public static Implementation factory = new Implementation() {
@Override
public EnhNode wrap( Node n, EnhGraph eg ) {
http://git-wip-us.apache.org/repos/asf/jena/blob/d0e4f58f/jena-core/src/main/java/org/apache/jena/ontology/impl/OntResourceImpl.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/ontology/impl/OntResourceImpl.java b/jena-core/src/main/java/org/apache/jena/ontology/impl/OntResourceImpl.java
index 97911de..fe9038b 100644
--- a/jena-core/src/main/java/org/apache/jena/ontology/impl/OntResourceImpl.java
+++ b/jena-core/src/main/java/org/apache/jena/ontology/impl/OntResourceImpl.java
@@ -69,6 +69,7 @@ public class OntResourceImpl
* Note: should not be invoked directly by user code: use
* {@link org.apache.jena.rdf.model.RDFNode#as as()} instead.
*/
+ @SuppressWarnings("hiding")
public static Implementation factory = new Implementation() {
@Override
public EnhNode wrap( Node n, EnhGraph eg ) {
[11/16] jena git commit: JENA-926: Remove all use of GraphStore.
Posted by an...@apache.org.
JENA-926: Remove all use of GraphStore.
Add "Dataset" variants of operations in UpdateExecutionFactory
and UpdateAction.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/bb8d6f3b
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/bb8d6f3b
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/bb8d6f3b
Branch: refs/heads/master
Commit: bb8d6f3bc3ed7d4270a7b816e442638c5ee49782
Parents: f138e29
Author: Andy Seaborne <an...@apache.org>
Authored: Mon May 4 18:02:10 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Mon May 4 18:04:42 2015 +0100
----------------------------------------------------------------------
.../update/UpdateExecuteOperations.java | 17 +-
.../arq/examples/update/UpdateProgrammatic.java | 4 +-
.../arq/examples/update/UpdateReadFromFile.java | 4 +-
.../src/main/java/arq/cmdline/CmdUpdate.java | 19 +-
.../src/main/java/arq/cmdline/ModDataset.java | 7 +-
.../main/java/arq/cmdline/ModGraphStore.java | 95 ---------
jena-arq/src/main/java/arq/load.java | 4 +-
jena-arq/src/main/java/arq/update.java | 69 +++----
.../sparql/core/assembler/AssemblerUtils.java | 1 -
.../core/assembler/GraphStoreAssembler.java | 47 -----
.../jena/sparql/modify/UpdateEngineBase.java | 9 +-
.../jena/sparql/modify/UpdateEngineFactory.java | 6 +-
.../jena/sparql/modify/UpdateEngineMain.java | 21 +-
.../sparql/modify/UpdateEngineNonStreaming.java | 22 +--
.../sparql/modify/UpdateEngineRegistry.java | 6 +-
.../jena/sparql/modify/UpdateEngineWorker.java | 117 ++++++-----
.../sparql/modify/UpdateProcessRemoteBase.java | 22 +--
.../jena/sparql/modify/UpdateProcessorBase.java | 23 +--
.../modify/UpdateProcessorStreamingBase.java | 42 ++--
.../apache/jena/update/GraphStoreFactory.java | 2 +
.../org/apache/jena/update/UpdateAction.java | 173 ++++++++---------
.../jena/update/UpdateExecutionFactory.java | 193 ++++++++++++-------
.../org/apache/jena/update/UpdateProcessor.java | 13 +-
.../jena/update/UpdateProcessorStreaming.java | 9 +-
.../query/TestParameterizedSparqlString.java | 3 +-
.../apache/jena/sparql/graph/TestDatasets.java | 20 +-
.../sparql/modify/AbstractTestUpdateBase.java | 50 ++---
.../sparql/modify/AbstractTestUpdateGraph.java | 49 +++--
.../modify/AbstractTestUpdateGraphMgt.java | 10 +-
.../jena/sparql/modify/TestUpdateGraphMem.java | 9 +-
.../sparql/modify/TestUpdateGraphMgtMem.java | 15 +-
.../sparql/modify/TestUpdateOperations.java | 17 +-
.../java/org/apache/jena/sdb/SDBFactory.java | 2 +-
.../apache/jena/sdb/modify/UpdateEngineSDB.java | 6 +-
.../jena/sdb/test/modify/TestSPARQLUpdate.java | 7 +-
.../sdb/test/modify/TestSPARQLUpdateMgt.java | 8 +-
.../apache/jena/tdb/modify/UpdateEngineTDB.java | 12 +-
.../main/java/tdb/cmdline/ModTDBGraphStore.java | 51 -----
jena-tdb/src/main/java/tdb/tdbupdate.java | 15 +-
.../apache/jena/tdb/store/Test_SPARQL_TDB.java | 3 +-
40 files changed, 509 insertions(+), 693 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/bb8d6f3b/jena-arq/src-examples/arq/examples/update/UpdateExecuteOperations.java
----------------------------------------------------------------------
diff --git a/jena-arq/src-examples/arq/examples/update/UpdateExecuteOperations.java b/jena-arq/src-examples/arq/examples/update/UpdateExecuteOperations.java
index 9c62b20..63e530b 100644
--- a/jena-arq/src-examples/arq/examples/update/UpdateExecuteOperations.java
+++ b/jena-arq/src-examples/arq/examples/update/UpdateExecuteOperations.java
@@ -19,10 +19,14 @@
package arq.examples.update;
import org.apache.jena.atlas.lib.StrUtils ;
+import org.apache.jena.query.Dataset ;
+import org.apache.jena.query.DatasetFactory ;
import org.apache.jena.riot.Lang ;
import org.apache.jena.riot.RDFDataMgr ;
import org.apache.jena.sparql.sse.SSE ;
-import org.apache.jena.update.* ;
+import org.apache.jena.update.UpdateAction ;
+import org.apache.jena.update.UpdateFactory ;
+import org.apache.jena.update.UpdateRequest ;
/** Build an update request up out of indvidiual Updates specified as strings.
* See UpdatePorgrammatic for another way to build up a request.
@@ -33,20 +37,21 @@ public class UpdateExecuteOperations
{
public static void main(String []args)
{
- // Create an empty GraphStore (has an empty default graph and no named graphs)
- GraphStore graphStore = GraphStoreFactory.create() ;
+ // Create an empty DatasetGraph (has an empty default graph and no named graphs)
+ Dataset graphStore = DatasetFactory.createMem() ;
+
ex1(graphStore) ;
ex2(graphStore) ;
ex3(graphStore) ;
}
- public static void ex1(GraphStore graphStore)
+ public static void ex1(Dataset graphStore)
{
// Execute one operation.
UpdateAction.parseExecute("LOAD <file:etc/update-data.ttl>", graphStore) ;
}
- public static void ex2(GraphStore graphStore)
+ public static void ex2(Dataset graphStore)
{
// Execute a series of operations at once.
// See ex3 for a better way to build up a request
@@ -61,7 +66,7 @@ public class UpdateExecuteOperations
UpdateAction.parseExecute(cmd, graphStore) ;
}
- public static void ex3(GraphStore graphStore)
+ public static void ex3(Dataset graphStore)
{
// Build up the request then execute it.
// This is the preferred way for complex sequences of operations.
http://git-wip-us.apache.org/repos/asf/jena/blob/bb8d6f3b/jena-arq/src-examples/arq/examples/update/UpdateProgrammatic.java
----------------------------------------------------------------------
diff --git a/jena-arq/src-examples/arq/examples/update/UpdateProgrammatic.java b/jena-arq/src-examples/arq/examples/update/UpdateProgrammatic.java
index 8a99a5e..d354365 100644
--- a/jena-arq/src-examples/arq/examples/update/UpdateProgrammatic.java
+++ b/jena-arq/src-examples/arq/examples/update/UpdateProgrammatic.java
@@ -18,6 +18,8 @@
package arq.examples.update;
+import org.apache.jena.query.Dataset ;
+import org.apache.jena.query.DatasetFactory ;
import org.apache.jena.riot.Lang ;
import org.apache.jena.riot.RDFDataMgr ;
import org.apache.jena.sparql.modify.request.Target ;
@@ -37,7 +39,7 @@ public class UpdateProgrammatic
{
public static void main(String []args)
{
- GraphStore graphStore = GraphStoreFactory.create() ;
+ Dataset graphStore = DatasetFactory.createMem() ;
UpdateRequest request = UpdateFactory.create() ;
http://git-wip-us.apache.org/repos/asf/jena/blob/bb8d6f3b/jena-arq/src-examples/arq/examples/update/UpdateReadFromFile.java
----------------------------------------------------------------------
diff --git a/jena-arq/src-examples/arq/examples/update/UpdateReadFromFile.java b/jena-arq/src-examples/arq/examples/update/UpdateReadFromFile.java
index 6f03013..da1012d 100644
--- a/jena-arq/src-examples/arq/examples/update/UpdateReadFromFile.java
+++ b/jena-arq/src-examples/arq/examples/update/UpdateReadFromFile.java
@@ -18,6 +18,8 @@
package arq.examples.update;
+import org.apache.jena.query.Dataset ;
+import org.apache.jena.query.DatasetFactory ;
import org.apache.jena.riot.Lang ;
import org.apache.jena.riot.RDFDataMgr ;
import org.apache.jena.sparql.sse.SSE ;
@@ -29,7 +31,7 @@ public class UpdateReadFromFile
public static void main(String []args)
{
// Create an empty GraphStore (has an empty default graph and no named graphs)
- GraphStore graphStore = GraphStoreFactory.create() ;
+ Dataset graphStore = DatasetFactory.createMem() ;
// ---- Read and update script in one step.
UpdateAction.readExecute("update.ru", graphStore) ;
http://git-wip-us.apache.org/repos/asf/jena/blob/bb8d6f3b/jena-arq/src/main/java/arq/cmdline/CmdUpdate.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/arq/cmdline/CmdUpdate.java b/jena-arq/src/main/java/arq/cmdline/CmdUpdate.java
index f2c95a9..d06f480 100644
--- a/jena-arq/src/main/java/arq/cmdline/CmdUpdate.java
+++ b/jena-arq/src/main/java/arq/cmdline/CmdUpdate.java
@@ -20,11 +20,11 @@ package arq.cmdline;
import org.apache.jena.query.Syntax ;
import org.apache.jena.rdf.model.ModelFactory ;
-import org.apache.jena.update.GraphStore ;
+import org.apache.jena.sparql.core.DatasetGraph ;
public abstract class CmdUpdate extends CmdARQ
{
- protected ModGraphStore modGraphStore = new ModGraphStore() ;
+ protected ModDatasetGeneralAssembler modGraphStore = new ModDatasetGeneralAssembler() ;
protected Syntax updateSyntax = Syntax.defaultUpdateSyntax ;
protected CmdUpdate(String[] argv)
@@ -35,9 +35,9 @@ public abstract class CmdUpdate extends CmdARQ
}
- protected ModGraphStore setModGraphStore()
+ protected ModDatasetGeneralAssembler setModGraphStore()
{
- return new ModGraphStore() ;
+ return new ModDatasetGeneralAssembler() ;
}
@@ -50,13 +50,12 @@ public abstract class CmdUpdate extends CmdARQ
}
@Override
- protected final void exec()
- {
- GraphStore graphStore = modGraphStore.getGraphStore() ;
+ protected final void exec() {
+ DatasetGraph graphStore = modGraphStore.getDatasetGraph() ;
if ( graphStore.getDefaultGraph() == null )
- graphStore.setDefaultGraph(ModelFactory.createDefaultModel().getGraph());
- execUpdate(graphStore) ;
+ graphStore.setDefaultGraph(ModelFactory.createDefaultModel().getGraph()) ;
+ execUpdate(graphStore) ;
}
- protected abstract void execUpdate(GraphStore graphStore) ;
+ protected abstract void execUpdate(DatasetGraph graphStore) ;
}
http://git-wip-us.apache.org/repos/asf/jena/blob/bb8d6f3b/jena-arq/src/main/java/arq/cmdline/ModDataset.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/arq/cmdline/ModDataset.java b/jena-arq/src/main/java/arq/cmdline/ModDataset.java
index 2357d7e..78a1d01 100644
--- a/jena-arq/src/main/java/arq/cmdline/ModDataset.java
+++ b/jena-arq/src/main/java/arq/cmdline/ModDataset.java
@@ -19,6 +19,7 @@
package arq.cmdline;
import org.apache.jena.query.Dataset ;
+import org.apache.jena.sparql.core.DatasetGraph ;
public abstract class ModDataset extends ModBase
{
@@ -29,12 +30,14 @@ public abstract class ModDataset extends ModBase
final
public Dataset getDataset()
- {
- if ( ! createAttempted )
+ { if ( ! createAttempted )
dataset = createDataset() ;
createAttempted = true ;
return dataset ;
}
+ public DatasetGraph getDatasetGraph()
+ { return dataset.asDatasetGraph() ; }
+
public abstract Dataset createDataset() ;
}
http://git-wip-us.apache.org/repos/asf/jena/blob/bb8d6f3b/jena-arq/src/main/java/arq/cmdline/ModGraphStore.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/arq/cmdline/ModGraphStore.java b/jena-arq/src/main/java/arq/cmdline/ModGraphStore.java
deleted file mode 100644
index e9980f6..0000000
--- a/jena-arq/src/main/java/arq/cmdline/ModGraphStore.java
+++ /dev/null
@@ -1,95 +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 arq.cmdline;
-
-import arq.cmd.CmdArgModule ;
-import org.apache.jena.query.Dataset ;
-import org.apache.jena.sparql.core.assembler.AssemblerUtils ;
-import org.apache.jena.update.GraphStore ;
-import org.apache.jena.update.GraphStoreFactory ;
-
-public class ModGraphStore extends ModDatasetGeneralAssembler
-{
- GraphStore graphStore = null ;
-
- @Override
- public void registerWith(CmdGeneral cmdLine)
- {
- super.registerWith(cmdLine) ;
- }
-
- @Override
- public void processArgs(CmdArgModule cmdLine)
- {
- super.processArgs(cmdLine) ;
- }
-
- public ModGraphStore()
- {
- // Wire in assmebler implementations
- AssemblerUtils.init() ;
- }
-
- public GraphStore getGraphStore()
- {
- if ( graphStore == null )
- graphStore = createGraphStore() ;
- return graphStore ;
- }
-
- public GraphStore createGraphStore()
- {
- Dataset ds = createDataset() ;
- if ( ds == null )
- return GraphStoreFactory.create() ;
- return GraphStoreFactory.create(ds) ;
-//
-// // Default to a simple in-memory one.
-// if ( getAssemblerFile() == null )
-// return GraphStoreFactory.create() ;
-//
-// try {
-// // Try as graph store.
-// graphStore = (GraphStore)create(DatasetAssemblerVocab.tGraphStore) ;
-// }
-// catch (AssemblerException ex) {}
-// catch (ARQException ex)
-// {
-// ex.printStackTrace(System.err) ;
-// }
-//
-// // Try as dataset
-// if ( graphStore == null )
-// {
-// try {
-// Dataset ds = (Dataset)create(DatasetAssemblerVocab.tDataset) ;
-// if ( ds != null )
-// graphStore = GraphStoreFactory.create(ds) ;
-// } catch (AssemblerException ex) { ex.printStackTrace(System.err) ;}
-// catch (ARQException ex)
-// {
-// ex.printStackTrace(System.err) ;
-// }
-// }
-// if ( graphStore == null )
-// throw new CmdException("Failed to find a dataset or graph store assembler description") ;
-// return graphStore ;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/jena/blob/bb8d6f3b/jena-arq/src/main/java/arq/load.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/arq/load.java b/jena-arq/src/main/java/arq/load.java
index 0085fe0..47c7a25 100644
--- a/jena-arq/src/main/java/arq/load.java
+++ b/jena-arq/src/main/java/arq/load.java
@@ -25,10 +25,10 @@ import org.apache.jena.atlas.io.IndentedWriter ;
import org.apache.jena.atlas.lib.Lib ;
import org.apache.jena.graph.Graph ;
import org.apache.jena.graph.Node ;
+import org.apache.jena.sparql.core.DatasetGraph ;
import org.apache.jena.sparql.modify.request.UpdateLoad ;
import org.apache.jena.sparql.sse.SSE ;
import org.apache.jena.sparql.util.graph.GraphLoadMonitor ;
-import org.apache.jena.update.GraphStore ;
import org.apache.jena.update.UpdateExecutionFactory ;
import org.apache.jena.update.UpdateRequest ;
import arq.cmd.ArgDecl ;
@@ -73,7 +73,7 @@ public class load extends CmdUpdate
protected String getSummary() { return getCommandName()+" --desc=assembler [--dump] --update=<request file>" ; }
@Override
- protected void execUpdate(GraphStore graphStore)
+ protected void execUpdate(DatasetGraph graphStore)
{
if ( loadFiles.size() == 0 )
throw new CmdException("Nothing to do") ;
http://git-wip-us.apache.org/repos/asf/jena/blob/bb8d6f3b/jena-arq/src/main/java/arq/update.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/arq/update.java b/jena-arq/src/main/java/arq/update.java
index affa880..0354a54 100644
--- a/jena-arq/src/main/java/arq/update.java
+++ b/jena-arq/src/main/java/arq/update.java
@@ -25,9 +25,9 @@ import org.apache.jena.query.ReadWrite ;
import org.apache.jena.riot.Lang ;
import org.apache.jena.riot.RDFDataMgr ;
import org.apache.jena.sparql.SystemARQ ;
+import org.apache.jena.sparql.core.DatasetGraph ;
import org.apache.jena.sparql.core.Transactional ;
import org.apache.jena.sparql.core.TransactionalNull ;
-import org.apache.jena.update.GraphStore ;
import org.apache.jena.update.UpdateExecutionFactory ;
import org.apache.jena.update.UpdateFactory ;
import org.apache.jena.update.UpdateRequest ;
@@ -46,22 +46,20 @@ public class update extends CmdUpdate
public static void main (String... argv)
{ new update(argv).mainRun() ; }
- protected update(String[] argv)
- {
+ protected update(String[] argv) {
super(argv) ;
super.add(updateArg, "--update=FILE", "Update commands to execute") ;
super.add(dumpArg, "--dump", "Dump the resulting graph store") ;
}
@Override
- protected void processModulesAndArgs()
- {
- requestFiles = getValues(updateArg) ; // ????
+ protected void processModulesAndArgs() {
+ requestFiles = getValues(updateArg) ; // ????
dump = contains(dumpArg) ;
-
+
super.processModulesAndArgs() ;
}
-
+
@Override
protected String getCommandName() { return Lib.className(this) ; }
@@ -70,43 +68,35 @@ public class update extends CmdUpdate
// Subclass for specialised commands making common updates more convenient
@Override
- protected void execUpdate(GraphStore graphStore)
- {
+ protected void execUpdate(DatasetGraph graphStore) {
if ( requestFiles.size() == 0 && getPositional().size() == 0 )
throw new CmdException("Nothing to do") ;
-
- Transactional transactional = (graphStore instanceof Transactional ) ? (Transactional)graphStore : new TransactionalNull() ;
-
- for ( String filename : requestFiles )
- {
- try
- {
- transactional.begin( ReadWrite.WRITE );
- execOneFile( filename, graphStore );
- transactional.commit();
+
+ Transactional transactional = (graphStore instanceof Transactional) ? (Transactional)graphStore : new TransactionalNull() ;
+
+ for ( String filename : requestFiles ) {
+ try {
+ transactional.begin(ReadWrite.WRITE) ;
+ execOneFile(filename, graphStore) ;
+ transactional.commit() ;
}
- finally
- {
- transactional.end();
+ finally {
+ transactional.end() ;
}
}
- for ( String requestString : super.getPositional() )
- {
- requestString = indirect( requestString );
+ for ( String requestString : super.getPositional() ) {
+ requestString = indirect(requestString) ;
- try
- {
- transactional.begin( ReadWrite.WRITE );
- execOne( requestString, graphStore );
- transactional.commit();
+ try {
+ transactional.begin(ReadWrite.WRITE) ;
+ execOne(requestString, graphStore) ;
+ transactional.commit() ;
}
- finally
- {
- transactional.end();
+ finally {
+ transactional.end() ;
}
-
}
SystemARQ.sync(graphStore) ;
@@ -114,15 +104,12 @@ public class update extends CmdUpdate
RDFDataMgr.write(System.out, graphStore, Lang.NQUADS) ;
}
-
- private void execOneFile(String filename, GraphStore store)
- {
+ private void execOneFile(String filename, DatasetGraph store) {
UpdateRequest req = UpdateFactory.read(filename, updateSyntax) ;
UpdateExecutionFactory.create(req, store).execute() ;
}
-
- private void execOne(String requestString, GraphStore store)
- {
+
+ private void execOne(String requestString, DatasetGraph store) {
UpdateRequest req = UpdateFactory.create(requestString, updateSyntax) ;
UpdateExecutionFactory.create(req, store).execute() ;
}
http://git-wip-us.apache.org/repos/asf/jena/blob/bb8d6f3b/jena-arq/src/main/java/org/apache/jena/sparql/core/assembler/AssemblerUtils.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/core/assembler/AssemblerUtils.java b/jena-arq/src/main/java/org/apache/jena/sparql/core/assembler/AssemblerUtils.java
index d8e7fff..eb4fde5 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/core/assembler/AssemblerUtils.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/core/assembler/AssemblerUtils.java
@@ -60,7 +60,6 @@ public class AssemblerUtils
{
// Wire in the extension assemblers (extensions relative to the Jena assembler framework)
g.implementWith(DatasetAssembler.getType(), new DatasetAssembler()) ;
- g.implementWith(GraphStoreAssembler.getType(), new GraphStoreAssembler()) ;
g.implementWith(DatasetNullAssembler.getType(), new DatasetNullAssembler()) ;
}
http://git-wip-us.apache.org/repos/asf/jena/blob/bb8d6f3b/jena-arq/src/main/java/org/apache/jena/sparql/core/assembler/GraphStoreAssembler.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/core/assembler/GraphStoreAssembler.java b/jena-arq/src/main/java/org/apache/jena/sparql/core/assembler/GraphStoreAssembler.java
deleted file mode 100644
index 9b8506b..0000000
--- a/jena-arq/src/main/java/org/apache/jena/sparql/core/assembler/GraphStoreAssembler.java
+++ /dev/null
@@ -1,47 +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.assembler;
-
-import org.apache.jena.assembler.Assembler ;
-import org.apache.jena.assembler.Mode ;
-import org.apache.jena.query.Dataset ;
-import org.apache.jena.rdf.model.Resource ;
-import org.apache.jena.update.GraphStore ;
-import org.apache.jena.update.GraphStoreFactory ;
-
-public class GraphStoreAssembler extends DatasetAssembler
-{
- public static Resource getType() { return DatasetAssemblerVocab.tGraphStore ; }
-
- @Override
- public Object open(Assembler a, Resource root, Mode mode)
- {
- // Same vocabulary as datasets.
- // Have dispatched on type by now so can just call the dataset code to build a Dataset.
-
- GraphStore gs = null ;
- Object ds = super.open(a, root, mode) ;
- if ( ds instanceof Dataset )
- gs = GraphStoreFactory.create((Dataset)ds) ;
- else
- throw new DatasetAssemblerException(root, "Not a graph store") ;
-
- return gs ;
- }
-}
http://git-wip-us.apache.org/repos/asf/jena/blob/bb8d6f3b/jena-arq/src/main/java/org/apache/jena/sparql/modify/UpdateEngineBase.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/modify/UpdateEngineBase.java b/jena-arq/src/main/java/org/apache/jena/sparql/modify/UpdateEngineBase.java
index 9cafab6..1849822 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/modify/UpdateEngineBase.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/modify/UpdateEngineBase.java
@@ -24,21 +24,20 @@ import org.apache.jena.sparql.core.DatasetGraph ;
import org.apache.jena.sparql.engine.binding.Binding ;
import org.apache.jena.sparql.util.Context ;
import org.apache.jena.sparql.util.NodeFactoryExtra ;
-import org.apache.jena.update.GraphStore ;
public abstract class UpdateEngineBase implements UpdateEngine
{
- protected final GraphStore graphStore ;
+ protected final DatasetGraph datasetGraph ;
protected final Binding inputBinding;
protected final Context context ;
- public UpdateEngineBase(GraphStore graphStore,
+ public UpdateEngineBase(DatasetGraph datasetGraph,
Binding inputBinding,
Context context)
{
- this.graphStore = graphStore ;
+ this.datasetGraph = datasetGraph ;
this.inputBinding = inputBinding ;
- this.context = setupContext(context, graphStore) ;
+ this.context = setupContext(context, datasetGraph) ;
}
private static Context setupContext(Context context, DatasetGraph dataset)
http://git-wip-us.apache.org/repos/asf/jena/blob/bb8d6f3b/jena-arq/src/main/java/org/apache/jena/sparql/modify/UpdateEngineFactory.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/modify/UpdateEngineFactory.java b/jena-arq/src/main/java/org/apache/jena/sparql/modify/UpdateEngineFactory.java
index 24ae07e..9c05997 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/modify/UpdateEngineFactory.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/modify/UpdateEngineFactory.java
@@ -18,9 +18,9 @@
package org.apache.jena.sparql.modify;
+import org.apache.jena.sparql.core.DatasetGraph ;
import org.apache.jena.sparql.engine.binding.Binding ;
import org.apache.jena.sparql.util.Context ;
-import org.apache.jena.update.GraphStore ;
/**
* Interface for factories that accept and process SPARQL update requests.
@@ -28,8 +28,8 @@ import org.apache.jena.update.GraphStore ;
public interface UpdateEngineFactory
{
/** Answer whether this factory can produce an UpdateEngine for the specified GraphStore */
- public boolean accept(GraphStore graphStore, Context context) ;
+ public boolean accept(DatasetGraph datasetGraph, Context context) ;
/** Create the update engine - having returned true to accept, should not fail */
- public UpdateEngine create(GraphStore graphStore, Binding inputBinding, Context context);
+ public UpdateEngine create(DatasetGraph datasetGraph, Binding inputBinding, Context context);
}
http://git-wip-us.apache.org/repos/asf/jena/blob/bb8d6f3b/jena-arq/src/main/java/org/apache/jena/sparql/modify/UpdateEngineMain.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/modify/UpdateEngineMain.java b/jena-arq/src/main/java/org/apache/jena/sparql/modify/UpdateEngineMain.java
index 9ce5ffd..8afd963 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/modify/UpdateEngineMain.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/modify/UpdateEngineMain.java
@@ -18,10 +18,10 @@
package org.apache.jena.sparql.modify;
+import org.apache.jena.sparql.core.DatasetGraph ;
import org.apache.jena.sparql.engine.binding.Binding ;
import org.apache.jena.sparql.modify.request.UpdateVisitor ;
import org.apache.jena.sparql.util.Context ;
-import org.apache.jena.update.GraphStore ;
/**
* Default implementation of an update engine
@@ -33,13 +33,13 @@ public class UpdateEngineMain extends UpdateEngineBase
{
/**
* Creates a new Update Engine
- * @param graphStore Graph Store the updates operate over
+ * @param datasetGraph DatasetGraph the updates operate over
* @param inputBinding Initial binding to be applied to Update operations that can apply an initial binding (i.e. UpdateDeleteWhere, UpdateModify)
* @param context Execution Context
*/
- public UpdateEngineMain(GraphStore graphStore, Binding inputBinding, Context context)
+ public UpdateEngineMain(DatasetGraph datasetGraph, Binding inputBinding, Context context)
{
- super(graphStore, inputBinding, context) ;
+ super(datasetGraph, inputBinding, context) ;
}
@Override
@@ -68,21 +68,20 @@ public class UpdateEngineMain extends UpdateEngineBase
* @return The update visitor to be used to apply the updates
*/
protected UpdateVisitor prepareWorker() {
- return new UpdateEngineWorker(graphStore, inputBinding, context) ;
+ return new UpdateEngineWorker(datasetGraph, inputBinding, context) ;
}
private static UpdateEngineFactory factory = new UpdateEngineFactory()
{
@Override
- public boolean accept(GraphStore graphStore, Context context)
- {
+ public boolean accept(DatasetGraph datasetGraph, Context context) {
return true ;
}
-
+
@Override
- public UpdateEngine create(GraphStore graphStore, Binding inputBinding, Context context)
- {
- return new UpdateEngineMain(graphStore, inputBinding, context);
+ public UpdateEngine create(DatasetGraph datasetGraph, Binding inputBinding,
+ Context context) {
+ return new UpdateEngineMain(datasetGraph, inputBinding, context) ;
}
} ;
http://git-wip-us.apache.org/repos/asf/jena/blob/bb8d6f3b/jena-arq/src/main/java/org/apache/jena/sparql/modify/UpdateEngineNonStreaming.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/modify/UpdateEngineNonStreaming.java b/jena-arq/src/main/java/org/apache/jena/sparql/modify/UpdateEngineNonStreaming.java
index dfffb5b..e9c2855 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/modify/UpdateEngineNonStreaming.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/modify/UpdateEngineNonStreaming.java
@@ -18,10 +18,10 @@
package org.apache.jena.sparql.modify;
+import org.apache.jena.sparql.core.DatasetGraph ;
import org.apache.jena.sparql.engine.binding.Binding ;
import org.apache.jena.sparql.modify.request.UpdateVisitor ;
import org.apache.jena.sparql.util.Context ;
-import org.apache.jena.update.GraphStore ;
import org.apache.jena.update.Update ;
import org.apache.jena.update.UpdateRequest ;
@@ -39,13 +39,13 @@ public class UpdateEngineNonStreaming extends UpdateEngineMain
/**
* Creates a new Update Engine
- * @param graphStore Graph Store the updates operate over
+ * @param datasetGraph Store the updates operate over
* @param inputBinding Initial binding to be applied to Update operations that can apply an initial binding (i.e. UpdateDeleteWhere, UpdateModify)
* @param context Execution Context
*/
- public UpdateEngineNonStreaming(GraphStore graphStore, Binding inputBinding, Context context)
+ public UpdateEngineNonStreaming(DatasetGraph datasetGraph, Binding inputBinding, Context context)
{
- super(graphStore, inputBinding, context) ;
+ super(datasetGraph, inputBinding, context) ;
accRequests = new UpdateRequest();
updateSink = new UpdateRequestSink(accRequests)
{
@@ -84,18 +84,16 @@ public class UpdateEngineNonStreaming extends UpdateEngineMain
}
}
- private static UpdateEngineFactory factory = new UpdateEngineFactory()
- {
+ private static UpdateEngineFactory factory = new UpdateEngineFactory() {
@Override
- public boolean accept(GraphStore graphStore, Context context)
- {
+ public boolean accept(DatasetGraph datasetGraph, Context context) {
return true ;
}
-
+
@Override
- public UpdateEngine create(GraphStore graphStore, Binding inputBinding, Context context)
- {
- return new UpdateEngineNonStreaming(graphStore, inputBinding, context);
+ public UpdateEngine create(DatasetGraph datasetGraph, Binding inputBinding,
+ Context context) {
+ return new UpdateEngineNonStreaming(datasetGraph, inputBinding, context) ;
}
} ;
http://git-wip-us.apache.org/repos/asf/jena/blob/bb8d6f3b/jena-arq/src/main/java/org/apache/jena/sparql/modify/UpdateEngineRegistry.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/modify/UpdateEngineRegistry.java b/jena-arq/src/main/java/org/apache/jena/sparql/modify/UpdateEngineRegistry.java
index 5576d95..0747898 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/modify/UpdateEngineRegistry.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/modify/UpdateEngineRegistry.java
@@ -21,8 +21,8 @@ package org.apache.jena.sparql.modify;
import java.util.ArrayList ;
import java.util.List ;
+import org.apache.jena.sparql.core.DatasetGraph ;
import org.apache.jena.sparql.util.Context ;
-import org.apache.jena.update.GraphStore ;
public class UpdateEngineRegistry
{
@@ -51,7 +51,7 @@ public class UpdateEngineRegistry
* @param graphStore The graph store
* @return A QueryExecutionFactory or null if none accept the request
*/
- public static UpdateEngineFactory findFactory(GraphStore graphStore, Context context)
+ public static UpdateEngineFactory findFactory(DatasetGraph graphStore, Context context)
{ return get().find(graphStore, context) ; }
/** Locate a suitable factory for this dataset
@@ -59,7 +59,7 @@ public class UpdateEngineRegistry
* @param graphStore A GraphStore
* @return A UpdateProcessorFactroy or null if none accept the request
*/
- public UpdateEngineFactory find(GraphStore graphStore, Context context)
+ public UpdateEngineFactory find(DatasetGraph graphStore, Context context)
{
for ( UpdateEngineFactory f : factories )
{
http://git-wip-us.apache.org/repos/asf/jena/blob/bb8d6f3b/jena-arq/src/main/java/org/apache/jena/sparql/modify/UpdateEngineWorker.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/modify/UpdateEngineWorker.java b/jena-arq/src/main/java/org/apache/jena/sparql/modify/UpdateEngineWorker.java
index f0af38f..d572309 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/modify/UpdateEngineWorker.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/modify/UpdateEngineWorker.java
@@ -58,20 +58,19 @@ import org.apache.jena.sparql.syntax.ElementGroup ;
import org.apache.jena.sparql.syntax.ElementNamedGraph ;
import org.apache.jena.sparql.syntax.ElementTriplesBlock ;
import org.apache.jena.sparql.util.Context ;
-import org.apache.jena.update.GraphStore ;
import org.apache.jena.update.UpdateException ;
/** Implementation of general purpose update request execution */
public class UpdateEngineWorker implements UpdateVisitor
{
- protected final GraphStore graphStore ;
+ protected final DatasetGraph datasetGraph ;
protected final boolean alwaysSilent = true ;
protected final Binding inputBinding; // Used for UpdateModify and UpdateDeleteWhere only
protected final Context context ;
- public UpdateEngineWorker(GraphStore graphStore, Binding inputBinding, Context context)
+ public UpdateEngineWorker(DatasetGraph datasetGraph, Binding inputBinding, Context context)
{
- this.graphStore = graphStore ;
+ this.datasetGraph = datasetGraph ;
this.inputBinding = inputBinding ;
this.context = context ;
}
@@ -105,23 +104,23 @@ public class UpdateEngineWorker implements UpdateVisitor
{
if ( ! alwaysSilent )
{
- if ( g != null && ! graphStore.containsGraph(g) && ! update.isSilent())
+ if ( g != null && ! datasetGraph.containsGraph(g) && ! update.isSilent())
error("No such graph: "+g) ;
}
if ( isClear )
{
- if ( g == null || graphStore.containsGraph(g) )
- graph(graphStore, g).clear() ;
+ if ( g == null || datasetGraph.containsGraph(g) )
+ graph(datasetGraph, g).clear() ;
}
else
- graphStore.removeGraph(g) ;
+ datasetGraph.removeGraph(g) ;
}
protected void execDropClearAllNamed(UpdateDropClear update, boolean isClear)
{
// Avoid ConcurrentModificationException
- List<Node> list = Iter.toList(graphStore.listGraphNodes()) ;
+ List<Node> list = Iter.toList(datasetGraph.listGraphNodes()) ;
for ( Node gn : list )
execDropClear(update, gn, isClear) ;
@@ -133,14 +132,14 @@ public class UpdateEngineWorker implements UpdateVisitor
Node g = update.getGraph() ;
if ( g == null )
return ;
- if ( graphStore.containsGraph(g) )
+ if ( datasetGraph.containsGraph(g) )
{
if ( ! alwaysSilent && ! update.isSilent() )
error("Graph store already contains graph : "+g) ;
return ;
}
// In-memory specific
- graphStore.addGraph(g, GraphFactory.createDefaultGraph()) ;
+ datasetGraph.addGraph(g, GraphFactory.createDefaultGraph()) ;
}
@Override
@@ -158,7 +157,7 @@ public class UpdateEngineWorker implements UpdateVisitor
Graph g = GraphFactory.createGraphMem() ;
StreamRDF stream = StreamRDFLib.graph(g) ;
RDFDataMgr.parse(stream, s, source) ;
- Graph g2 = graph(graphStore, dest) ;
+ Graph g2 = graph(datasetGraph, dest) ;
GraphUtil.addInto(g2, g) ;
} else {
// Quads
@@ -171,7 +170,7 @@ public class UpdateEngineWorker implements UpdateVisitor
for ( ; iter.hasNext() ; )
{
Quad q = iter.next() ;
- graphStore.add(q) ;
+ datasetGraph.add(q) ;
}
}
} catch (RuntimeException ex)
@@ -193,7 +192,7 @@ public class UpdateEngineWorker implements UpdateVisitor
return ;
// ADD (DEFAULT or GRAPH) TO (DEFAULT or GRAPH)
// Different source and destination.
- gsCopyTriples(graphStore, update.getSrc(), update.getDest()) ;
+ gsCopyTriples(datasetGraph, update.getSrc(), update.getDest()) ;
}
@Override
@@ -203,7 +202,7 @@ public class UpdateEngineWorker implements UpdateVisitor
if ( update.getSrc().equals(update.getDest()) )
return ;
// COPY (DEFAULT or GRAPH) TO (DEFAULT or GRAPH)
- gsCopy(graphStore, update.getSrc(), update.getDest(), update.getSilent()) ;
+ gsCopy(datasetGraph, update.getSrc(), update.getDest(), update.getSilent()) ;
}
@Override
@@ -214,8 +213,8 @@ public class UpdateEngineWorker implements UpdateVisitor
return ;
// MOVE (DEFAULT or GRAPH) TO (DEFAULT or GRAPH)
// Difefrent source and destination.
- gsCopy(graphStore, update.getSrc(), update.getDest(), update.getSilent()) ;
- gsDrop(graphStore, update.getSrc(), true) ;
+ gsCopy(datasetGraph, update.getSrc(), update.getDest(), update.getSilent()) ;
+ gsDrop(datasetGraph, update.getSrc(), true) ;
}
private boolean validBinaryGraphOp(UpdateBinaryOp update)
@@ -226,7 +225,7 @@ public class UpdateEngineWorker implements UpdateVisitor
if ( update.getSrc().isOneNamedGraph() )
{
Node gn = update.getSrc().getGraph() ;
- if ( ! graphStore.containsGraph(gn) )
+ if ( ! datasetGraph.containsGraph(gn) )
{
if ( ! update.getSilent() )
error("No such graph: "+gn) ;
@@ -241,21 +240,21 @@ public class UpdateEngineWorker implements UpdateVisitor
// ----
// Core operations
- protected static void gsCopy(GraphStore gStore, Target src, Target dest, boolean isSilent)
+ protected static void gsCopy(DatasetGraph dsg, Target src, Target dest, boolean isSilent)
{
if ( dest.equals(src) )
return ;
- gsClear(gStore, dest, true) ;
- gsCopyTriples(gStore, src, dest) ;
+ gsClear(dsg, dest, true) ;
+ gsCopyTriples(dsg, src, dest) ;
}
- protected static void gsCopyTriples(GraphStore gStore, Target src, Target dest)
+ protected static void gsCopyTriples(DatasetGraph dsg, Target src, Target dest)
{
- Graph gSrc = graph(gStore, src) ;
- Graph gDest = graph(gStore, dest) ;
+ Graph gSrc = graph(dsg, src) ;
+ Graph gDest = graph(dsg, dest) ;
// Avoids concurrency problems by reading fully before writing
- ThresholdPolicy<Triple> policy = ThresholdPolicyFactory.policyFromContext(gStore.getContext());
+ ThresholdPolicy<Triple> policy = ThresholdPolicyFactory.policyFromContext(dsg.getContext());
DataBag<Triple> db = BagFactory.newDefaultBag(policy, SerializationFactoryFinder.tripleSerializationFactory()) ;
try
{
@@ -267,19 +266,19 @@ public class UpdateEngineWorker implements UpdateVisitor
finally { db.close() ; }
}
- protected static void gsClear(GraphStore gStore, Target target, boolean isSilent)
+ protected static void gsClear(DatasetGraph dsg, Target target, boolean isSilent)
{
// No create - we tested earlier.
- Graph g = graph(gStore, target) ;
+ Graph g = graph(dsg, target) ;
g.clear() ;
}
- protected static void gsDrop(GraphStore gStore, Target target, boolean isSilent)
+ protected static void gsDrop(DatasetGraph dsg, Target target, boolean isSilent)
{
if ( target.isDefault() )
- gStore.getDefaultGraph().clear() ;
+ dsg.getDefaultGraph().clear() ;
else
- gStore.removeGraph(target.getGraph()) ;
+ dsg.removeGraph(target.getGraph()) ;
}
// ----
@@ -292,13 +291,13 @@ public class UpdateEngineWorker implements UpdateVisitor
@Override
public void send(Quad quad)
{
- addToGraphStore(graphStore, quad);
+ addTodatasetGraph(datasetGraph, quad);
}
@Override
public void flush()
{
- SystemARQ.sync(graphStore);
+ SystemARQ.sync(datasetGraph);
}
@Override
@@ -311,7 +310,7 @@ public class UpdateEngineWorker implements UpdateVisitor
public void visit(UpdateDataInsert update)
{
for ( Quad quad : update.getQuads() )
- addToGraphStore(graphStore, quad) ;
+ addTodatasetGraph(datasetGraph, quad) ;
}
@Override
@@ -322,13 +321,13 @@ public class UpdateEngineWorker implements UpdateVisitor
@Override
public void send(Quad quad)
{
- deleteFromGraphStore(graphStore, quad);
+ deleteFromdatasetGraph(datasetGraph, quad);
}
@Override
public void flush()
{
- SystemARQ.sync(graphStore);
+ SystemARQ.sync(datasetGraph);
}
@Override
@@ -341,7 +340,7 @@ public class UpdateEngineWorker implements UpdateVisitor
public void visit(UpdateDataDelete update)
{
for ( Quad quad : update.getQuads() )
- deleteFromGraphStore(graphStore, quad) ;
+ deleteFromdatasetGraph(datasetGraph, quad) ;
}
@Override
@@ -358,7 +357,7 @@ public class UpdateEngineWorker implements UpdateVisitor
// Decided to serialize the bindings, but could also have decided to
// serialize the quads after applying the template instead.
- ThresholdPolicy<Binding> policy = ThresholdPolicyFactory.policyFromContext(graphStore.getContext());
+ ThresholdPolicy<Binding> policy = ThresholdPolicyFactory.policyFromContext(datasetGraph.getContext());
DataBag<Binding> db = BagFactory.newDefaultBag(policy, SerializationFactoryFinder.bindingSerializationFactory()) ;
try
{
@@ -408,10 +407,10 @@ public class UpdateEngineWorker implements UpdateVisitor
// -------------------
if ( dsg == null )
- dsg = graphStore ;
+ dsg = datasetGraph ;
Query query = elementToQuery(elt) ;
- ThresholdPolicy<Binding> policy = ThresholdPolicyFactory.policyFromContext(graphStore.getContext());
+ ThresholdPolicy<Binding> policy = ThresholdPolicyFactory.policyFromContext(datasetGraph.getContext());
DataBag<Binding> db = BagFactory.newDefaultBag(policy, SerializationFactoryFinder.bindingSerializationFactory()) ;
try
{
@@ -420,7 +419,7 @@ public class UpdateEngineWorker implements UpdateVisitor
if ( false )
{
// System.out.println("=======================================") ;
-// System.out.println(graphStore) ;
+// System.out.println(datasetGraph) ;
List<Binding> x = Iter.toList(bindings) ;
System.out.printf("====>> Bindings (%d)\n", x.size()) ;
Iter.print(System.out, x.iterator()) ;
@@ -451,7 +450,7 @@ public class UpdateEngineWorker implements UpdateVisitor
if ( update.getUsing().size() == 0 && update.getUsingNamed().size() == 0 )
return null ;
- return DynamicDatasets.dynamicDataset(update.getUsing(), update.getUsingNamed(), graphStore, false) ;
+ return DynamicDatasets.dynamicDataset(update.getUsing(), update.getUsingNamed(), datasetGraph, false) ;
}
protected DatasetGraph processWith(UpdateModify update)
@@ -459,14 +458,14 @@ public class UpdateEngineWorker implements UpdateVisitor
Node withGraph = update.getWithIRI() ;
if ( withGraph == null )
return null ;
- Graph g = graphOrDummy(graphStore, withGraph) ;
- DatasetGraph dsg = new DatasetGraphAltDefaultGraph(graphStore, g) ;
+ Graph g = graphOrDummy(datasetGraph, withGraph) ;
+ DatasetGraph dsg = new DatasetGraphAltDefaultGraph(datasetGraph, g) ;
return dsg ;
}
private Graph graphOrDummy(DatasetGraph dsg, Node gn)
{
- Graph g = graph(graphStore, gn) ;
+ Graph g = graph(datasetGraph, gn) ;
if ( g == null )
g = GraphFactory.createGraphMem() ;
return g ;
@@ -513,14 +512,14 @@ public class UpdateEngineWorker implements UpdateVisitor
while (it.hasNext())
{
Quad q = it.next();
- graphStore.delete(q);
+ datasetGraph.delete(q);
}
// Alternate implementation that can use the graph BulkUpdateHandler, but forces all quads into
// memory (we don't want that!). The issue is that all of the quads can be mixed up based on the
// user supplied template. If graph stores can benefit from bulk insert/delete operations, then we
- // need to expose a bulk update interface on GraphStore, not just Graph.
+ // need to expose a bulk update interface on datasetGraph, not just Graph.
// MultiMap<Node, Triple> acc = MultiMap.createMapList() ;
// while (it.hasNext())
// {
@@ -530,7 +529,7 @@ public class UpdateEngineWorker implements UpdateVisitor
// for ( Node gn : acc.keys() )
// {
// Collection<Triple> triples = acc.get(gn) ;
-// graph(graphStore, gn).getBulkUpdateHandler().delete(triples.iterator()) ;
+// graph(datasetGraph, gn).getBulkUpdateHandler().delete(triples.iterator()) ;
// }
}
@@ -542,23 +541,23 @@ public class UpdateEngineWorker implements UpdateVisitor
while (it.hasNext())
{
Quad q = it.next();
- addToGraphStore(graphStore, q);
+ addTodatasetGraph(datasetGraph, q);
}
}
// Catch all individual adds of quads (and deletes - mainly for symmetry).
- private static void addToGraphStore(GraphStore graphStore, Quad quad)
+ private static void addTodatasetGraph(DatasetGraph datasetGraph, Quad quad)
{
// Check legal triple.
if ( quad.isLegalAsData() )
- graphStore.add(quad);
+ datasetGraph.add(quad);
// Else drop.
//Log.warn(UpdateEngineWorker.class, "Bad quad as data: "+quad) ;
}
- private static void deleteFromGraphStore(GraphStore graphStore, Quad quad)
+ private static void deleteFromdatasetGraph(DatasetGraph datasetGraph, Quad quad)
{
- graphStore.delete(quad) ;
+ datasetGraph.delete(quad) ;
}
protected Query elementToQuery(Element pattern)
@@ -580,7 +579,7 @@ public class UpdateEngineWorker implements UpdateVisitor
protected Iterator<Binding> evalBindings(Query query, Node dftGraph)
{
- DatasetGraph dsg = graphStore ;
+ DatasetGraph dsg = datasetGraph ;
if ( query != null )
{
if ( dftGraph != null )
@@ -613,20 +612,20 @@ public class UpdateEngineWorker implements UpdateVisitor
return toReturn ;
}
- protected static Graph graph(GraphStore graphStore, Node gn)
+ protected static Graph graph(DatasetGraph datasetGraph, Node gn)
{
if ( gn == null || gn == Quad.defaultGraphNodeGenerated )
- return graphStore.getDefaultGraph() ;
+ return datasetGraph.getDefaultGraph() ;
else
- return graphStore.getGraph(gn) ;
+ return datasetGraph.getGraph(gn) ;
}
- protected static Graph graph(GraphStore graphStore, Target target)
+ protected static Graph graph(DatasetGraph datasetGraph, Target target)
{
if ( target.isDefault() )
- return graphStore.getDefaultGraph() ;
+ return datasetGraph.getDefaultGraph() ;
if ( target.isOneNamedGraph() )
- return graph(graphStore, target.getGraph()) ;
+ return graph(datasetGraph, target.getGraph()) ;
error("Target does not name one graph: "+target) ;
return null ;
}
http://git-wip-us.apache.org/repos/asf/jena/blob/bb8d6f3b/jena-arq/src/main/java/org/apache/jena/sparql/modify/UpdateProcessRemoteBase.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/modify/UpdateProcessRemoteBase.java b/jena-arq/src/main/java/org/apache/jena/sparql/modify/UpdateProcessRemoteBase.java
index 0e6de13..1e3aa53 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/modify/UpdateProcessRemoteBase.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/modify/UpdateProcessRemoteBase.java
@@ -18,25 +18,25 @@
package org.apache.jena.sparql.modify;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
+import java.util.ArrayList ;
+import java.util.List ;
+import java.util.Map ;
-import org.apache.http.protocol.HttpContext;
-import org.apache.jena.atlas.web.auth.HttpAuthenticator;
-import org.apache.jena.atlas.web.auth.SimpleAuthenticator;
-import org.apache.jena.riot.web.HttpOp;
+import org.apache.http.protocol.HttpContext ;
+import org.apache.jena.atlas.web.auth.HttpAuthenticator ;
+import org.apache.jena.atlas.web.auth.SimpleAuthenticator ;
+import org.apache.jena.riot.web.HttpOp ;
+import org.apache.jena.sparql.core.DatasetGraph ;
import org.apache.jena.sparql.engine.http.HttpParams ;
import org.apache.jena.sparql.engine.http.Params ;
import org.apache.jena.sparql.engine.http.QueryEngineHTTP ;
import org.apache.jena.sparql.engine.http.Service ;
import org.apache.jena.sparql.util.Context ;
import org.apache.jena.sparql.util.Symbol ;
-import org.apache.jena.update.GraphStore ;
import org.apache.jena.update.UpdateProcessor ;
import org.apache.jena.update.UpdateRequest ;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.slf4j.Logger ;
+import org.slf4j.LoggerFactory ;
/**
* Abstract base class for update processors that perform remote updates over
@@ -122,7 +122,7 @@ public abstract class UpdateProcessRemoteBase implements UpdateProcessor {
}
@Override
- public GraphStore getGraphStore() {
+ public DatasetGraph getDatasetGraph() {
return null;
}
http://git-wip-us.apache.org/repos/asf/jena/blob/bb8d6f3b/jena-arq/src/main/java/org/apache/jena/sparql/modify/UpdateProcessorBase.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/modify/UpdateProcessorBase.java b/jena-arq/src/main/java/org/apache/jena/sparql/modify/UpdateProcessorBase.java
index b244d6b..fd00fca 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/modify/UpdateProcessorBase.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/modify/UpdateProcessorBase.java
@@ -19,9 +19,9 @@
package org.apache.jena.sparql.modify;
import org.apache.jena.atlas.iterator.Iter ;
+import org.apache.jena.sparql.core.DatasetGraph ;
import org.apache.jena.sparql.engine.binding.Binding ;
import org.apache.jena.sparql.util.Context ;
-import org.apache.jena.update.GraphStore ;
import org.apache.jena.update.UpdateProcessor ;
import org.apache.jena.update.UpdateRequest ;
@@ -31,28 +31,27 @@ import org.apache.jena.update.UpdateRequest ;
public class UpdateProcessorBase implements UpdateProcessor
{
protected final UpdateRequest request ;
- protected final GraphStore graphStore ;
+ protected final DatasetGraph datasetGraph ;
protected final Binding inputBinding;
protected final UpdateEngineFactory factory ;
protected final Context context ;
public UpdateProcessorBase(UpdateRequest request,
- GraphStore graphStore,
+ DatasetGraph datasetGraph,
Binding inputBinding,
Context context,
UpdateEngineFactory factory)
{
this.request = request ;
- this.graphStore = graphStore ;
+ this.datasetGraph = datasetGraph ;
this.inputBinding = inputBinding;
- this.context = Context.setupContext(context, graphStore) ;
+ this.context = Context.setupContext(context, datasetGraph) ;
this.factory = factory ;
}
@Override
- public void execute()
- {
- UpdateEngine uProc = factory.create(graphStore, inputBinding, context);
+ public void execute() {
+ UpdateEngine uProc = factory.create(datasetGraph, inputBinding, context);
uProc.startRequest();
try {
@@ -64,14 +63,12 @@ public class UpdateProcessorBase implements UpdateProcessor
}
@Override
- public GraphStore getGraphStore()
- {
- return graphStore ;
+ public DatasetGraph getDatasetGraph() {
+ return datasetGraph ;
}
@Override
- public Context getContext()
- {
+ public Context getContext() {
return context ;
}
}
http://git-wip-us.apache.org/repos/asf/jena/blob/bb8d6f3b/jena-arq/src/main/java/org/apache/jena/sparql/modify/UpdateProcessorStreamingBase.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/modify/UpdateProcessorStreamingBase.java b/jena-arq/src/main/java/org/apache/jena/sparql/modify/UpdateProcessorStreamingBase.java
index 53606b1..48569e0 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/modify/UpdateProcessorStreamingBase.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/modify/UpdateProcessorStreamingBase.java
@@ -18,9 +18,9 @@
package org.apache.jena.sparql.modify;
+import org.apache.jena.sparql.core.DatasetGraph ;
import org.apache.jena.sparql.engine.binding.Binding ;
import org.apache.jena.sparql.util.Context ;
-import org.apache.jena.update.GraphStore ;
import org.apache.jena.update.UpdateProcessorStreaming ;
/** Class to hold the general state of a update request execution.
@@ -28,46 +28,40 @@ import org.apache.jena.update.UpdateProcessorStreaming ;
*/
public class UpdateProcessorStreamingBase implements UpdateProcessorStreaming
{
- protected final GraphStore graphStore ;
+ protected final DatasetGraph datasetGraph ;
protected final Context context ;
protected final UpdateEngine proc;
- public UpdateProcessorStreamingBase(GraphStore graphStore, Binding inputBinding, Context context, UpdateEngineFactory factory)
+ public UpdateProcessorStreamingBase(DatasetGraph datasetGraph, Binding inputBinding, Context context, UpdateEngineFactory factory)
{
- this.graphStore = graphStore ;
- this.context = Context.setupContext(context, graphStore) ;
-
- proc = factory.create(graphStore, inputBinding, context) ;
+ this.datasetGraph = datasetGraph ;
+ this.context = Context.setupContext(context, datasetGraph) ;
+ proc = factory.create(datasetGraph, inputBinding, context) ;
}
@Override
- public void startRequest()
- {
- proc.startRequest();
+ public void startRequest() {
+ proc.startRequest() ;
}
-
+
@Override
- public void finishRequest()
- {
- proc.finishRequest();
+ public void finishRequest() {
+ proc.finishRequest() ;
}
-
+
@Override
- public UpdateSink getUpdateSink()
- {
- return proc.getUpdateSink();
+ public UpdateSink getUpdateSink() {
+ return proc.getUpdateSink() ;
}
@Override
- public GraphStore getGraphStore()
- {
- return graphStore ;
+ public DatasetGraph getDatasetGraph() {
+ return datasetGraph ;
}
-
+
@Override
- public Context getContext()
- {
+ public Context getContext() {
return context ;
}
}
http://git-wip-us.apache.org/repos/asf/jena/blob/bb8d6f3b/jena-arq/src/main/java/org/apache/jena/update/GraphStoreFactory.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/update/GraphStoreFactory.java b/jena-arq/src/main/java/org/apache/jena/update/GraphStoreFactory.java
index e36e082..9d3f0a3 100644
--- a/jena-arq/src/main/java/org/apache/jena/update/GraphStoreFactory.java
+++ b/jena-arq/src/main/java/org/apache/jena/update/GraphStoreFactory.java
@@ -26,7 +26,9 @@ import org.apache.jena.sparql.core.DatasetGraphFactory ;
import org.apache.jena.sparql.modify.GraphStoreBasic ;
/** Operations to create a GraphStore
+ * @deprecated Use a {@link DatasetGraph} directly. many operations also accept a {@link Dataset}.
*/
+@Deprecated
public class GraphStoreFactory
{
/** Create an empty GraphStore with an empty default graph (in-memory) */
http://git-wip-us.apache.org/repos/asf/jena/blob/bb8d6f3b/jena-arq/src/main/java/org/apache/jena/update/UpdateAction.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/update/UpdateAction.java b/jena-arq/src/main/java/org/apache/jena/update/UpdateAction.java
index 78be9b6..97dfc77 100644
--- a/jena-arq/src/main/java/org/apache/jena/update/UpdateAction.java
+++ b/jena-arq/src/main/java/org/apache/jena/update/UpdateAction.java
@@ -28,6 +28,7 @@ import org.apache.jena.query.Syntax ;
import org.apache.jena.rdf.model.Model ;
import org.apache.jena.sparql.ARQException ;
import org.apache.jena.sparql.core.DatasetGraph ;
+import org.apache.jena.sparql.core.DatasetGraphFactory ;
import org.apache.jena.sparql.engine.binding.Binding ;
import org.apache.jena.sparql.engine.binding.BindingUtils ;
import org.apache.jena.sparql.lang.UpdateParser ;
@@ -49,84 +50,81 @@ public class UpdateAction
*/
public static void readExecute(String filename, Model model)
{
- readExecute(filename, GraphStoreFactory.create(model)) ;
+ readExecute(filename, toDatasetGraph(model.getGraph())) ;
}
/** Read a file containing SPARQL Update operations, and execute the operations.
* @param filename
- * @param dataset
+ * @param graph
*/
- public static void readExecute(String filename, Dataset dataset)
+ public static void readExecute(String filename, Graph graph)
{
- readExecute(filename, GraphStoreFactory.create(dataset)) ;
+ readExecute(filename, toDatasetGraph(graph)) ;
}
/** Read a file containing SPARQL Update operations, and execute the operations.
* @param filename
* @param dataset
*/
- public static void readExecute(String filename, DatasetGraph dataset)
+ public static void readExecute(String filename, Dataset dataset)
{
- readExecute(filename, GraphStoreFactory.create(dataset)) ;
+ readExecute(filename, dataset.asDatasetGraph()) ;
}
/** Read a file containing SPARQL Update operations, and execute the operations.
* @param filename
- * @param graph
- */
- public static void readExecute(String filename, Graph graph)
- {
- readExecute(filename, GraphStoreFactory.create(graph)) ;
- }
-
- /** Read a file containing SPARQL Update operations, and execute the operations.
- * @param filename
- * @param graphStore
+ * @param dataset
*/
- @Deprecated
- public static void readExecute(String filename, GraphStore graphStore)
+ public static void readExecute(String filename, DatasetGraph dataset)
{
- readExecute(filename, graphStore, (Binding)null);
+ readExecute(filename, dataset, null) ;
}
/** Read a file containing SPARQL Update operations, and execute the operations.
* @param filename
- * @param graphStore
+ * @param dataset
* @param inputBinding
*/
- public static void readExecute(String filename, GraphStore graphStore, QuerySolution inputBinding)
- {
- readExecute(filename, graphStore, BindingUtils.asBinding(inputBinding)) ;
+ public static void readExecute(String filename, Dataset dataset, QuerySolution inputBinding) {
+ UpdateRequest req = UpdateFactory.read(filename) ;
+ execute(req, dataset, inputBinding) ;
}
-
/** Read a file containing SPARQL Update operations, and execute the operations.
* @param filename
- * @param graphStore
+ * @param datasetGraph
* @param inputBinding
*/
- public static void readExecute(String filename, GraphStore graphStore, Binding inputBinding)
- {
+ public static void readExecute(String filename, DatasetGraph datasetGraph, Binding inputBinding) {
UpdateRequest req = UpdateFactory.read(filename) ;
- execute(req, graphStore, inputBinding) ;
+ execute$(req, datasetGraph, inputBinding) ;
}
-
+
/** Parse a string containing SPARQL Update operations, and execute the operations.
* @param updateString
* @param model
*/
public static void parseExecute(String updateString, Model model)
{
- parseExecute(updateString, GraphStoreFactory.create(model)) ;
+ parseExecute(updateString, model.getGraph()) ;
}
/** Parse a string containing SPARQL Update operations, and execute the operations.
* @param updateString
+ * @param graph
+ */
+ public static void parseExecute(String updateString, Graph graph)
+ {
+ parseExecute(updateString, toDatasetGraph(graph)) ;
+ }
+
+ /** Parse a string containing SPARQL Update operations, and execute the operations.
+ * @param updateString
* @param dataset
*/
public static void parseExecute(String updateString, Dataset dataset)
{
- parseExecute(updateString, GraphStoreFactory.create(dataset)) ;
+ parseExecute(updateString, dataset.asDatasetGraph()) ;
}
/** Parse a string containing SPARQL Update operations, and execute the operations.
@@ -135,29 +133,30 @@ public class UpdateAction
*/
public static void parseExecute(String updateString, DatasetGraph dataset)
{
- parseExecute(updateString, GraphStoreFactory.create(dataset)) ;
+ UpdateRequest req = UpdateFactory.create(updateString) ;
+ execute(req, dataset) ;
}
-
/** Parse a string containing SPARQL Update operations, and execute the operations.
* @param updateString
- * @param graph
+ * @param dataset
+ * @param inputBinding
*/
- public static void parseExecute(String updateString, Graph graph)
+ public static void parseExecute(String updateString, Dataset dataset, QuerySolution inputBinding)
{
- parseExecute(updateString, GraphStoreFactory.create(graph)) ;
+ parseExecute(updateString, dataset.asDatasetGraph(), BindingUtils.asBinding(inputBinding)) ;
}
/** Parse a string containing SPARQL Update operations, and execute the operations.
* @param updateString
- * @param graphStore
+ * @param dataset
+ * @param inputBinding
*/
- public static void parseExecute(String updateString, GraphStore graphStore)
+ public static void parseExecute(String updateString, DatasetGraph dataset, Binding inputBinding)
{
UpdateRequest req = UpdateFactory.create(updateString) ;
- execute(req, graphStore) ;
+ execute(req, dataset, inputBinding) ;
}
-
/** Execute SPARQL Update operations.
* @param request
@@ -165,70 +164,65 @@ public class UpdateAction
*/
public static void execute(UpdateRequest request, Model model)
{
- execute(request, GraphStoreFactory.create(model)) ;
+ execute(request, model.getGraph()) ;
}
/** Execute SPARQL Update operations.
* @param request
- * @param dataset
+ * @param graph
*/
- public static void execute(UpdateRequest request, Dataset dataset)
+ public static void execute(UpdateRequest request, Graph graph)
{
- execute(request, GraphStoreFactory.create(dataset)) ;
+ execute(request, toDatasetGraph(graph)) ;
}
/** Execute SPARQL Update operations.
* @param request
* @param dataset
*/
- public static void execute(UpdateRequest request, DatasetGraph dataset)
+ public static void execute(UpdateRequest request, Dataset dataset)
{
- execute(request, GraphStoreFactory.create(dataset)) ;
+ execute(request, dataset.asDatasetGraph()) ;
}
/** Execute SPARQL Update operations.
* @param request
- * @param graph
- */
- public static void execute(UpdateRequest request, Graph graph)
- {
- execute(request, GraphStoreFactory.create(graph)) ;
- }
-
- /** Execute SPARQL Update operations.
- * @param request
- * @param graphStore
+ * @param dataset
*/
- public static void execute(UpdateRequest request, GraphStore graphStore)
+ public static void execute(UpdateRequest request, DatasetGraph dataset)
{
- execute(request, graphStore, (Binding)null);
+ execute$(request, dataset, null) ;
}
/** Execute SPARQL Update operations.
* @param request
- * @param graphStore
+ * @param dataset
* @param inputBinding
*/
- public static void execute(UpdateRequest request, GraphStore graphStore, QuerySolution inputBinding)
+ public static void execute(UpdateRequest request, Dataset dataset, QuerySolution inputBinding)
{
- execute(request, graphStore, BindingUtils.asBinding(inputBinding)) ;
+ execute(request, dataset.asDatasetGraph(), BindingUtils.asBinding(inputBinding)) ;
}
/** Execute SPARQL Update operations.
* @param request
- * @param graphStore
+ * @param datasetGraph
* @param inputBinding
*/
- public static void execute(UpdateRequest request, GraphStore graphStore, Binding inputBinding)
+ public static void execute(UpdateRequest request, DatasetGraph datasetGraph, Binding inputBinding)
{
- execute$(request, graphStore, inputBinding) ;
+ execute$(request, datasetGraph, inputBinding) ;
}
+ private static DatasetGraph toDatasetGraph(Graph graph) {
+ return DatasetGraphFactory.create(graph) ;
+ }
+
// All non-streaming updates come through here.
- private static void execute$(UpdateRequest request, GraphStore graphStore, Binding inputBinding)
+ private static void execute$(UpdateRequest request, DatasetGraph datasetGraph, Binding inputBinding)
{
- UpdateProcessor uProc = UpdateExecutionFactory.create(request, graphStore, inputBinding);
+ UpdateProcessor uProc = UpdateExecutionFactory.create(request, datasetGraph, inputBinding);
if (uProc == null)
throw new ARQException("No suitable update procesors are registered/able to execute your updates");
uProc.execute();
@@ -241,70 +235,61 @@ public class UpdateAction
*/
public static void execute(Update update, Model model)
{
- execute(update, GraphStoreFactory.create(model)) ;
+ execute(update, model.getGraph()) ;
}
/** Execute a single SPARQL Update operation.
* @param update
- * @param dataset
+ * @param graph
*/
- public static void execute(Update update, Dataset dataset)
+ public static void execute(Update update, Graph graph)
{
- execute(update, GraphStoreFactory.create(dataset)) ;
+ execute(update, toDatasetGraph(graph)) ;
}
/** Execute a single SPARQL Update operation.
* @param update
* @param dataset
*/
- public static void execute(Update update, DatasetGraph dataset)
+ public static void execute(Update update, Dataset dataset)
{
- execute(update, GraphStoreFactory.create(dataset)) ;
+ execute(update, dataset.asDatasetGraph()) ;
}
/** Execute a single SPARQL Update operation.
* @param update
- * @param graph
- */
- public static void execute(Update update, Graph graph)
- {
- execute(update, GraphStoreFactory.create(graph)) ;
- }
-
- /** Execute a single SPARQL Update operation.
- * @param update
- * @param graphStore
+ * @param dataset
*/
- public static void execute(Update update, GraphStore graphStore)
+ public static void execute(Update update, DatasetGraph dataset)
{
- execute(update, graphStore, (Binding)null);
+ execute(update, dataset, null) ;
}
/** Execute a single SPARQL Update operation.
* @param update
- * @param graphStore
+ * @param dataset
* @param inputBinding
*/
- public static void execute(Update update, GraphStore graphStore, QuerySolution inputBinding)
+ public static void execute(Update update, Dataset dataset, QuerySolution inputBinding)
{
- execute(update, graphStore, BindingUtils.asBinding(inputBinding)) ;
+ execute(update, dataset.asDatasetGraph(), BindingUtils.asBinding(inputBinding)) ;
}
/** Execute a single SPARQL Update operation.
* @param update
- * @param graphStore
+ * @param datasetGraph
* @param inputBinding
*/
- public static void execute(Update update, GraphStore graphStore, Binding inputBinding)
+ public static void execute(Update update, DatasetGraph datasetGraph, Binding inputBinding)
{
- execute$(update, graphStore, inputBinding) ;
+ execute$(update, datasetGraph, inputBinding) ;
}
- private static void execute$(Update update, GraphStore graphStore, Binding inputBinding)
+ private static void execute$(Update update, DatasetGraph datasetGraph, Binding inputBinding)
{
UpdateRequest request = new UpdateRequest() ;
request.add(update) ;
- execute$(request, graphStore, inputBinding) ;
+ execute$(request, datasetGraph, inputBinding) ;
}
// Streaming Updates:
@@ -422,9 +407,7 @@ public class UpdateAction
*/
public static void parseExecute(UsingList usingList, DatasetGraph dataset, InputStream input, Binding inputBinding, String baseURI, Syntax syntax)
{
- GraphStore graphStore = GraphStoreFactory.create(dataset);
-
- UpdateProcessorStreaming uProc = UpdateExecutionFactory.createStreaming(graphStore, inputBinding) ;
+ UpdateProcessorStreaming uProc = UpdateExecutionFactory.createStreaming(dataset, inputBinding) ;
if (uProc == null)
throw new ARQException("No suitable update procesors are registered/able to execute your updates");
[12/16] jena git commit: Merge in changes from master.
Posted by an...@apache.org.
Merge in changes from master.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/ff8439ed
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/ff8439ed
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/ff8439ed
Branch: refs/heads/master
Commit: ff8439ed243f42cc1c42365d0b6dfcc005d5fe73
Parents: bb8d6f3 2257377
Author: Andy Seaborne <an...@apache.org>
Authored: Mon May 4 20:05:58 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Mon May 4 20:05:58 2015 +0100
----------------------------------------------------------------------
.../test/java/org/apache/jena/util/TestOneToManyMap.java | 4 ++--
.../apache/jena/util/iterator/test/TestResourceUtils.java | 3 +++
.../java/org/apache/jena/fuseki/build/FusekiConfig.java | 10 ++++++++--
.../main/java/org/apache/jena/fuseki/cmd/FusekiCmd.java | 6 +++---
4 files changed, 16 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
[09/16] jena git commit: Use StandardCharsets where possible.
Posted by an...@apache.org.
Use StandardCharsets where possible.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/f138e29d
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/f138e29d
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/f138e29d
Branch: refs/heads/master
Commit: f138e29d1e18d3b7699e52eb0b924e7ff5277ce0
Parents: 4c1d85d
Author: Andy Seaborne <an...@apache.org>
Authored: Mon May 4 10:12:15 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Mon May 4 18:04:42 2015 +0100
----------------------------------------------------------------------
.../apache/jena/riot/lang/TestPipedRDFIterators.java | 3 ++-
.../org/apache/jena/riot/writer/TestTurtleWriter.java | 1 -
.../main/java/org/apache/jena/atlas/lib/Chars.java | 14 +++-----------
jena-sdb/src/test/java/sdb/test/TestStringBase.java | 3 ---
4 files changed, 5 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/f138e29d/jena-arq/src/test/java/org/apache/jena/riot/lang/TestPipedRDFIterators.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/org/apache/jena/riot/lang/TestPipedRDFIterators.java b/jena-arq/src/test/java/org/apache/jena/riot/lang/TestPipedRDFIterators.java
index d94fd9e..aaff63d 100644
--- a/jena-arq/src/test/java/org/apache/jena/riot/lang/TestPipedRDFIterators.java
+++ b/jena-arq/src/test/java/org/apache/jena/riot/lang/TestPipedRDFIterators.java
@@ -20,6 +20,7 @@ package org.apache.jena.riot.lang;
import java.io.ByteArrayInputStream ;
import java.nio.charset.Charset ;
+import java.nio.charset.StandardCharsets ;
import java.util.concurrent.* ;
import org.apache.jena.graph.Triple ;
@@ -392,7 +393,7 @@ public class TestPipedRDFIterators {
@Override
public void run() {
- Charset utf8 = Charset.forName("utf8");
+ Charset utf8 = StandardCharsets.UTF_8 ;
ByteArrayInputStream input = new ByteArrayInputStream(data.getBytes(utf8));
try {
RDFDataMgr.parse(out, input, null, RDFLanguages.TURTLE, null);
http://git-wip-us.apache.org/repos/asf/jena/blob/f138e29d/jena-arq/src/test/java/org/apache/jena/riot/writer/TestTurtleWriter.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/org/apache/jena/riot/writer/TestTurtleWriter.java b/jena-arq/src/test/java/org/apache/jena/riot/writer/TestTurtleWriter.java
index 3d2c65f..1bb0567 100644
--- a/jena-arq/src/test/java/org/apache/jena/riot/writer/TestTurtleWriter.java
+++ b/jena-arq/src/test/java/org/apache/jena/riot/writer/TestTurtleWriter.java
@@ -94,7 +94,6 @@ public class TestTurtleWriter {
RDFDataMgr.write(output, m, Lang.TURTLE);
ByteArrayInputStream input = new ByteArrayInputStream(output.toByteArray());
- //System.out.println(new String(output.toByteArray(), Charset.forName("utf-8")));
Model m2 = ModelFactory.createDefaultModel();
RDFDataMgr.read(m2, input, Lang.TURTLE);
Assert.assertTrue(m2.size() > 0);
http://git-wip-us.apache.org/repos/asf/jena/blob/f138e29d/jena-base/src/main/java/org/apache/jena/atlas/lib/Chars.java
----------------------------------------------------------------------
diff --git a/jena-base/src/main/java/org/apache/jena/atlas/lib/Chars.java b/jena-base/src/main/java/org/apache/jena/atlas/lib/Chars.java
index e9d4f55..d8a6dbc 100644
--- a/jena-base/src/main/java/org/apache/jena/atlas/lib/Chars.java
+++ b/jena-base/src/main/java/org/apache/jena/atlas/lib/Chars.java
@@ -18,10 +18,7 @@
package org.apache.jena.atlas.lib;
-import java.nio.charset.Charset ;
-import java.nio.charset.CharsetDecoder ;
-import java.nio.charset.CharsetEncoder ;
-import java.nio.charset.CodingErrorAction ;
+import java.nio.charset.* ;
public class Chars
{
@@ -48,13 +45,8 @@ public class Chars
// 'o' , 'p' , 'q' , 'r' , 's' , 't' ,
// 'u' , 'v' , 'w' , 'x' , 'y' , 'z'
- /** Java name for UTF-8 encoding */
- private static final String encodingUTF8 = "utf-8" ;
- /** Java name for ASCII encoding */
- private static final String encodingASCII = "ascii" ;
-
- public static final Charset charsetUTF8 = Charset.forName(encodingUTF8) ;
- public static final Charset charsetASCII = Charset.forName(encodingASCII) ;
+ public static final Charset charsetUTF8 = StandardCharsets.UTF_8 ;
+ public static final Charset charsetASCII = StandardCharsets.US_ASCII ;
// Pools for encoders/decoder.
// Better? use a ThreadLocal.
http://git-wip-us.apache.org/repos/asf/jena/blob/f138e29d/jena-sdb/src/test/java/sdb/test/TestStringBase.java
----------------------------------------------------------------------
diff --git a/jena-sdb/src/test/java/sdb/test/TestStringBase.java b/jena-sdb/src/test/java/sdb/test/TestStringBase.java
index 2cb693e..acd5f12 100644
--- a/jena-sdb/src/test/java/sdb/test/TestStringBase.java
+++ b/jena-sdb/src/test/java/sdb/test/TestStringBase.java
@@ -39,9 +39,6 @@ public class TestStringBase extends TestDB
private String baseString ;
- //static Charset csUTF8 = Charset.forName("UTF-8") ;
-
-
public TestStringBase(String testLabel, String baseString,
Connection jdbc, Params params, boolean verbose)
{
[13/16] jena git commit: JENA-934: Skip a prefix of the empty string
- not allowed in JSON-LD
Posted by an...@apache.org.
JENA-934: Skip a prefix of the empty string - not allowed in JSON-LD
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/8eeb060c
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/8eeb060c
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/8eeb060c
Branch: refs/heads/master
Commit: 8eeb060c3df48881ac98747d8e024ff89047ede3
Parents: ff8439e
Author: Andy Seaborne <an...@apache.org>
Authored: Tue May 5 18:39:57 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Tue May 5 18:39:57 2015 +0100
----------------------------------------------------------------------
.../org/apache/jena/riot/out/JsonLDWriter.java | 3 +
.../jena/riot/system/TestJsonLDReadWrite.java | 7 +-
jena-arq/testing/RIOT/jsonld/graph1.jsonld | 108 ++++++++++---------
jena-arq/testing/RIOT/jsonld/graph2.jsonld | 63 +++++++++++
jena-arq/testing/RIOT/jsonld/graph2.ttl | 15 +++
5 files changed, 147 insertions(+), 49 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/8eeb060c/jena-arq/src/main/java/org/apache/jena/riot/out/JsonLDWriter.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/out/JsonLDWriter.java b/jena-arq/src/main/java/org/apache/jena/riot/out/JsonLDWriter.java
index dbd8fff..c7ed85a 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/out/JsonLDWriter.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/out/JsonLDWriter.java
@@ -115,6 +115,9 @@ public class JsonLDWriter extends WriterDatasetRIOTBase
Map<String, IRI> pmap = prefixMap.getMapping() ;
for ( Entry<String, IRI> e : pmap.entrySet() ) {
String key = e.getKey() ;
+ if ( key.isEmpty() )
+ // Prefix "" is not allowed in JSON-LD
+ continue ;
IRI iri = e.getValue() ;
ctx.put(e.getKey(), e.getValue().toString()) ;
}
http://git-wip-us.apache.org/repos/asf/jena/blob/8eeb060c/jena-arq/src/test/java/org/apache/jena/riot/system/TestJsonLDReadWrite.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/org/apache/jena/riot/system/TestJsonLDReadWrite.java b/jena-arq/src/test/java/org/apache/jena/riot/system/TestJsonLDReadWrite.java
index 3f3e949..b83e666 100644
--- a/jena-arq/src/test/java/org/apache/jena/riot/system/TestJsonLDReadWrite.java
+++ b/jena-arq/src/test/java/org/apache/jena/riot/system/TestJsonLDReadWrite.java
@@ -43,9 +43,13 @@ public class TestJsonLDReadWrite extends BaseTest
@Test public void read_g01() { graphJ2R("graph1.jsonld", "graph1.ttl") ; }
+ @Test public void read_g02() { graphJ2R("graph2.jsonld", "graph2.ttl") ; }
+
@Test public void read_ds01() { datasetJ2R("graph1.jsonld", "graph1.ttl") ; }
- @Test public void read_ds02() { datasetJ2R("dataset1.jsonld", "dataset1.trig") ; }
+ @Test public void read_ds02() { datasetJ2R("graph2.jsonld", "graph2.ttl") ; }
+
+ @Test public void read_ds03() { datasetJ2R("dataset1.jsonld", "dataset1.trig") ; }
private void graphJ2R(String inFile, String outFile)
{
@@ -144,6 +148,7 @@ public class TestJsonLDReadWrite extends BaseTest
if (namespaces == null) return;
for (String prefix : namespaces.keySet()) {
+ if ( ! prefix.isEmpty() )
Assert.assertEquals("Model does contain expected namespace " + prefix + ": <" + namespaces.get(prefix) + ">", namespaces.get(prefix), m.getNsPrefixURI(prefix));
}
}
http://git-wip-us.apache.org/repos/asf/jena/blob/8eeb060c/jena-arq/testing/RIOT/jsonld/graph1.jsonld
----------------------------------------------------------------------
diff --git a/jena-arq/testing/RIOT/jsonld/graph1.jsonld b/jena-arq/testing/RIOT/jsonld/graph1.jsonld
index 0f092dc..9b60955 100644
--- a/jena-arq/testing/RIOT/jsonld/graph1.jsonld
+++ b/jena-arq/testing/RIOT/jsonld/graph1.jsonld
@@ -1,50 +1,62 @@
-[ {
- "@id" : "_:b0",
- "http://example/r" : [ {
- "@value" : "4.5",
- "@type" : "http://www.w3.org/2001/XMLSchema#decimal"
- } ]
-}, {
- "@id" : "_:b3"
-}, {
- "@id" : "http://example/a"
-}, {
- "@id" : "http://example/s",
- "http://example/p" : [ {
- "@value" : 2
+{
+ "@graph" : [ {
+ "@id" : "_:b2",
+ "r" : "4.5"
}, {
- "@value" : 1
- } ]
-}, {
- "@id" : "http://example/s1",
- "http://example/b" : [ {
- "@id" : "http://example/a"
- } ]
-}, {
- "@id" : "http://example/s2",
- "http://example/b2" : [ {
- "@id" : "_:b3"
+ "@id" : "http://example/s",
+ "http://example/p" : [ 2, 1 ]
+ }, {
+ "@id" : "http://example/s1",
+ "b" : "http://example/a"
+ }, {
+ "@id" : "http://example/s2",
+ "b" : "http://example/a",
+ "b2" : "_:b3"
+ }, {
+ "@id" : "http://example/s3",
+ "b1" : "_:b3"
+ }, {
+ "@id" : "http://example/x1",
+ "http://example/q" : {
+ "@list" : [ "a", "b" ]
+ }
+ }, {
+ "@id" : "http://example/x2",
+ "q" : "_:b2"
} ],
- "http://example/b" : [ {
- "@id" : "http://example/a"
- } ]
-}, {
- "@id" : "http://example/s3",
- "http://example/b1" : [ {
- "@id" : "_:b3"
- } ]
-}, {
- "@id" : "http://example/x1",
- "http://example/q" : [ {
- "@list" : [ {
- "@value" : "a"
- }, {
- "@value" : "b"
- } ]
- } ]
-}, {
- "@id" : "http://example/x2",
- "http://example/q" : [ {
- "@id" : "_:b0"
- } ]
-} ]
+ "@context" : {
+ "rest" : {
+ "@id" : "http://www.w3.org/1999/02/22-rdf-syntax-ns#rest",
+ "@type" : "@id"
+ },
+ "first" : {
+ "@id" : "http://www.w3.org/1999/02/22-rdf-syntax-ns#first",
+ "@type" : "http://www.w3.org/2001/XMLSchema#string"
+ },
+ "q" : {
+ "@id" : "http://example/q",
+ "@type" : "@id"
+ },
+ "r" : {
+ "@id" : "http://example/r",
+ "@type" : "http://www.w3.org/2001/XMLSchema#decimal"
+ },
+ "b2" : {
+ "@id" : "http://example/b2",
+ "@type" : "@id"
+ },
+ "b" : {
+ "@id" : "http://example/b",
+ "@type" : "@id"
+ },
+ "p" : {
+ "@id" : "http://example/p",
+ "@type" : "http://www.w3.org/2001/XMLSchema#integer"
+ },
+ "b1" : {
+ "@id" : "http://example/b1",
+ "@type" : "@id"
+ },
+ "xsd" : "http://www.w3.org/2001/XMLSchema#"
+ }
+}
http://git-wip-us.apache.org/repos/asf/jena/blob/8eeb060c/jena-arq/testing/RIOT/jsonld/graph2.jsonld
----------------------------------------------------------------------
diff --git a/jena-arq/testing/RIOT/jsonld/graph2.jsonld b/jena-arq/testing/RIOT/jsonld/graph2.jsonld
new file mode 100644
index 0000000..60fbd22
--- /dev/null
+++ b/jena-arq/testing/RIOT/jsonld/graph2.jsonld
@@ -0,0 +1,63 @@
+{
+ "@graph" : [ {
+ "@id" : "_:b1",
+ "r" : "4.5"
+ }, {
+ "@id" : "http://example/s",
+ "ns:p" : [ 2, 1 ]
+ }, {
+ "@id" : "http://example/s1",
+ "b" : "ns:a"
+ }, {
+ "@id" : "http://example/s2",
+ "b2" : "_:b2",
+ "b" : "ns:a"
+ }, {
+ "@id" : "http://example/s3",
+ "b1" : "_:b2"
+ }, {
+ "@id" : "http://example/x1",
+ "ns:q" : {
+ "@list" : [ "a", "b" ]
+ }
+ }, {
+ "@id" : "http://example/x2",
+ "q" : "_:b1"
+ } ],
+ "@context" : {
+ "rest" : {
+ "@id" : "http://www.w3.org/1999/02/22-rdf-syntax-ns#rest",
+ "@type" : "@id"
+ },
+ "first" : {
+ "@id" : "http://www.w3.org/1999/02/22-rdf-syntax-ns#first",
+ "@type" : "http://www.w3.org/2001/XMLSchema#string"
+ },
+ "q" : {
+ "@id" : "http://example/q",
+ "@type" : "@id"
+ },
+ "b2" : {
+ "@id" : "http://example/b2",
+ "@type" : "@id"
+ },
+ "b" : {
+ "@id" : "http://example/ns#b",
+ "@type" : "@id"
+ },
+ "r" : {
+ "@id" : "http://example/r",
+ "@type" : "http://www.w3.org/2001/XMLSchema#decimal"
+ },
+ "p" : {
+ "@id" : "http://example/ns#p",
+ "@type" : "http://www.w3.org/2001/XMLSchema#integer"
+ },
+ "b1" : {
+ "@id" : "http://example/b1",
+ "@type" : "@id"
+ },
+ "ns" : "http://example/ns#",
+ "xsd" : "http://www.w3.org/2001/XMLSchema#"
+ }
+}
http://git-wip-us.apache.org/repos/asf/jena/blob/8eeb060c/jena-arq/testing/RIOT/jsonld/graph2.ttl
----------------------------------------------------------------------
diff --git a/jena-arq/testing/RIOT/jsonld/graph2.ttl b/jena-arq/testing/RIOT/jsonld/graph2.ttl
new file mode 100644
index 0000000..4a3277c
--- /dev/null
+++ b/jena-arq/testing/RIOT/jsonld/graph2.ttl
@@ -0,0 +1,15 @@
+@prefix : <http://example/> .
+@prefix ns: <http://example/ns#> .
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+
+:s ns:p 1 , 2 .
+
+:x1 ns:q ("a" "b") .
+
+:s1 ns:b ns:a .
+:s2 ns:b ns:a .
+
+:s3 :b1 _:aa .
+:s2 :b2 _:aa .
+
+:x2 :q [ :r 4.5 ] .