Use TxnType::convert facility
Project: http://git-wip-us.apache.org/repos/asf/jena/repo Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/09e47699 Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/09e47699 Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/09e47699 Branch: refs/heads/master Commit: 09e47699fd35df2c6dd9b37f613d43f2bba0c785 Parents: 0515165 Author: ajs6f <[email protected]> Authored: Fri Jan 5 10:49:03 2018 -0500 Committer: ajs6f <[email protected]> Committed: Fri Jan 5 10:49:03 2018 -0500 ---------------------------------------------------------------------- .../jena/sparql/util/DyadicDatasetGraph.java | 21 +++++++++----------- 1 file changed, 9 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jena/blob/09e47699/jena-arq/src/main/java/org/apache/jena/sparql/util/DyadicDatasetGraph.java ---------------------------------------------------------------------- diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/util/DyadicDatasetGraph.java b/jena-arq/src/main/java/org/apache/jena/sparql/util/DyadicDatasetGraph.java index 346ab5c..439e6c8 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/util/DyadicDatasetGraph.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/util/DyadicDatasetGraph.java @@ -23,7 +23,7 @@ import static org.apache.jena.atlas.iterator.Iter.count; import static org.apache.jena.atlas.iterator.Iter.map; import static org.apache.jena.ext.com.google.common.collect.Iterators.concat; import static org.apache.jena.graph.Node.ANY; -import static org.apache.jena.query.ReadWrite.READ; +import static org.apache.jena.query.TxnType.READ; import static org.apache.jena.sparql.core.Quad.defaultGraphIRI; import static org.apache.jena.sparql.util.graph.GraphUtils.triples2quads; @@ -63,36 +63,33 @@ public abstract class DyadicDatasetGraph extends PairOfSameType<DatasetGraph> im @Override public void begin(TxnType type) { switch (type) { - case WRITE: - throwNoMutationAllowed(); - default: + case READ: forEach(dsg -> dsg.begin(type)); + break; + default: + throwNoMutationAllowed(); } } @Override public boolean promote() { + // no mutation allowed return false; } @Override public ReadWrite transactionMode() { - return apply((rw1, rw2) -> rw1 == rw2 ? rw1 : null, DatasetGraph::transactionMode); + return TxnType.convert(transactionType()); } @Override public TxnType transactionType() { - return apply((t1, t2) -> t1 == t2 ? t1 : null, DatasetGraph::transactionType); + return both(dsg -> dsg.transactionType() == READ) ? READ : null; } @Override public synchronized void begin(ReadWrite readWrite) { - switch (readWrite) { - case WRITE: - throwNoMutationAllowed(); - case READ: - forEach(dsg -> dsg.begin(READ)); - } + begin(TxnType.convert(readWrite)); } @Override
