Repository: jena Updated Branches: refs/heads/master 0ca10b775 -> c0c294da4
Adding more public API Project: http://git-wip-us.apache.org/repos/asf/jena/repo Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/08a559bb Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/08a559bb Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/08a559bb Branch: refs/heads/master Commit: 08a559bb31002f3bb1a413f288ae4d0a8cd179ce Parents: 516d0c2 Author: ajs6f <[email protected]> Authored: Fri Dec 29 10:37:28 2017 -0500 Committer: ajs6f <[email protected]> Committed: Fri Jan 5 09:26:07 2018 -0500 ---------------------------------------------------------------------- .../apache/jena/query/util/DatasetCollector.java | 8 ++++++++ .../org/apache/jena/query/util/DatasetLib.java | 19 ++++++++++++++++++- .../org/apache/jena/util/TestModelCollector.java | 4 ---- 3 files changed, 26 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jena/blob/08a559bb/jena-arq/src/main/java/org/apache/jena/query/util/DatasetCollector.java ---------------------------------------------------------------------- diff --git a/jena-arq/src/main/java/org/apache/jena/query/util/DatasetCollector.java b/jena-arq/src/main/java/org/apache/jena/query/util/DatasetCollector.java index dfcc2c5..492e06f 100644 --- a/jena-arq/src/main/java/org/apache/jena/query/util/DatasetCollector.java +++ b/jena-arq/src/main/java/org/apache/jena/query/util/DatasetCollector.java @@ -100,4 +100,12 @@ public abstract class DatasetCollector implements UnorderedIdentityFinishCollect }; } } + + static DatasetCollector union() { + return new UnionDatasetCollector(); + } + + static DatasetCollector intersect() { + return new IntersectionDatasetCollector(); + } } http://git-wip-us.apache.org/repos/asf/jena/blob/08a559bb/jena-arq/src/main/java/org/apache/jena/query/util/DatasetLib.java ---------------------------------------------------------------------- diff --git a/jena-arq/src/main/java/org/apache/jena/query/util/DatasetLib.java b/jena-arq/src/main/java/org/apache/jena/query/util/DatasetLib.java index 5c82dbc..cdb2fcf 100644 --- a/jena-arq/src/main/java/org/apache/jena/query/util/DatasetLib.java +++ b/jena-arq/src/main/java/org/apache/jena/query/util/DatasetLib.java @@ -48,8 +48,25 @@ public class DatasetLib { public static Dataset difference(final Dataset d1, final Dataset d2, Context c) { return DatasetFactory.wrap(new DifferenceDatasetGraph(d1.asDatasetGraph(), d2.asDatasetGraph(), c)); } - + public static Dataset difference(final Dataset d1, final Dataset d2) { return DatasetFactory.wrap(new DifferenceDatasetGraph(d1.asDatasetGraph(), d2.asDatasetGraph(), emptyContext)); } + + public static Collectors collectors() { + return Collectors.instance; + } + + static class Collectors { + + static Collectors instance = new Collectors(); + + public DatasetCollector union() { + return DatasetCollector.union(); + } + + public DatasetCollector intersect() { + return DatasetCollector.intersect(); + } + } } http://git-wip-us.apache.org/repos/asf/jena/blob/08a559bb/jena-core/src/test/java/org/apache/jena/util/TestModelCollector.java ---------------------------------------------------------------------- diff --git a/jena-core/src/test/java/org/apache/jena/util/TestModelCollector.java b/jena-core/src/test/java/org/apache/jena/util/TestModelCollector.java index 33fe10c..d2c8f97 100644 --- a/jena-core/src/test/java/org/apache/jena/util/TestModelCollector.java +++ b/jena-core/src/test/java/org/apache/jena/util/TestModelCollector.java @@ -80,10 +80,6 @@ public class TestModelCollector extends BaseTest { assertTrue(Stream.<Model>empty().collect(testCollector).isEmpty()); } - private static ArrayList<ModelCollector> concurrentCollectors() { - return newArrayList(new UnionModelCollector().concurrent(), new IntersectionModelCollector().concurrent()); - } - private static ArrayList<ModelCollector> collectors() { return newArrayList(new UnionModelCollector(), new IntersectionModelCollector()); }
