jena-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aj...@apache.org
Subject [16/44] jena git commit: Cleanup between DatasetLib and DatasetCollector
Date Sat, 06 Jan 2018 15:17:40 GMT
Cleanup between DatasetLib and DatasetCollector


Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/29dc64f1
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/29dc64f1
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/29dc64f1

Branch: refs/heads/master
Commit: 29dc64f12230cf4feb52f1da2cdb1404afe8ef72
Parents: a533aef
Author: ajs6f <ajs6f@apache.org>
Authored: Sat Nov 4 14:11:46 2017 -0400
Committer: ajs6f <ajs6f@apache.org>
Committed: Fri Jan 5 09:26:07 2018 -0500

----------------------------------------------------------------------
 .../java/org/apache/jena/query/util/DatasetCollector.java     | 7 ++++++-
 .../org/apache/jena/atlas/lib/IdentityFinishCollector.java    | 1 -
 2 files changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/jena/blob/29dc64f1/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 140c3fc..cda5ef9 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
@@ -6,6 +6,7 @@ import java.util.function.Supplier;
 import org.apache.jena.atlas.lib.IdentityFinishCollector;
 import org.apache.jena.query.Dataset;
 import org.apache.jena.query.DatasetFactory;
+import org.apache.jena.sparql.util.Context;
 
 public interface DatasetCollector<Input> extends IdentityFinishCollector<Input,
Dataset> {
 
@@ -16,6 +17,10 @@ public interface DatasetCollector<Input> extends IdentityFinishCollector<Input,
 
     @Override
     default BinaryOperator<Dataset> combiner() {
-        return DatasetLib::union;
+        return DatasetCollector::union;
     }
+    
+	static Dataset union(final Dataset d1, final Dataset d2) {
+		return DatasetLib.union(d1, d2, Context.emptyContext);
+	}
 }

http://git-wip-us.apache.org/repos/asf/jena/blob/29dc64f1/jena-base/src/main/java/org/apache/jena/atlas/lib/IdentityFinishCollector.java
----------------------------------------------------------------------
diff --git a/jena-base/src/main/java/org/apache/jena/atlas/lib/IdentityFinishCollector.java
b/jena-base/src/main/java/org/apache/jena/atlas/lib/IdentityFinishCollector.java
index 472b73e..4c801c5 100644
--- a/jena-base/src/main/java/org/apache/jena/atlas/lib/IdentityFinishCollector.java
+++ b/jena-base/src/main/java/org/apache/jena/atlas/lib/IdentityFinishCollector.java
@@ -9,5 +9,4 @@ public interface IdentityFinishCollector<T, A> extends Collector<T,
A, A> {
     default Function<A, A> finisher() {
         return Function.identity();
     }
-
 }


Mime
View raw message