You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by aj...@apache.org on 2016/10/08 14:08:02 UTC
[3/4] jena git commit: Using default methods for DataBag and other
minor cleanup
Using default methods for DataBag and other minor cleanup
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/424e7f3f
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/424e7f3f
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/424e7f3f
Branch: refs/heads/master
Commit: 424e7f3f630bdf8f98237e0d7f8765d941ca5202
Parents: a5671d4
Author: ajs6f <aj...@virginia.edu>
Authored: Fri Sep 23 21:04:19 2016 -0400
Committer: ajs6f <aj...@virginia.edu>
Committed: Sat Oct 8 10:03:22 2016 -0400
----------------------------------------------------------------------
.../apache/jena/atlas/data/AbstractDataBag.java | 27 ++------------------
.../org/apache/jena/atlas/data/DataBag.java | 8 ++++--
.../jena/atlas/data/TestDistinctDataNet.java | 2 +-
3 files changed, 9 insertions(+), 28 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/424e7f3f/jena-arq/src/main/java/org/apache/jena/atlas/data/AbstractDataBag.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/atlas/data/AbstractDataBag.java b/jena-arq/src/main/java/org/apache/jena/atlas/data/AbstractDataBag.java
index d91e8f6..7706e2e 100644
--- a/jena-arq/src/main/java/org/apache/jena/atlas/data/AbstractDataBag.java
+++ b/jena-arq/src/main/java/org/apache/jena/atlas/data/AbstractDataBag.java
@@ -30,8 +30,8 @@ import java.io.OutputStream ;
import java.lang.ref.WeakReference ;
import java.util.ArrayList ;
import java.util.Collection ;
-import java.util.Iterator ;
import java.util.List ;
+import java.util.Objects;
import java.util.UUID ;
import org.apache.jena.atlas.lib.Closeable ;
@@ -63,22 +63,6 @@ public abstract class AbstractDataBag<E> implements DataBag<E>
}
@Override
- public void addAll(Iterable<? extends E> c)
- {
- addAll(c.iterator());
- }
-
- @Override
- public void addAll(Iterator<? extends E> it)
- {
- while (it.hasNext())
- {
- E item = it.next();
- add(item);
- }
- }
-
- @Override
public void send(E item)
{
add(item);
@@ -145,14 +129,7 @@ public abstract class AbstractDataBag<E> implements DataBag<E>
*/
protected void closeIterators()
{
- for (WeakReference<Closeable> wr : closeableIterators)
- {
- Closeable c = wr.get();
- if (null != c)
- {
- c.close();
- }
- }
+ closeableIterators.stream().map(WeakReference::get).filter(Objects::nonNull).forEach(Closeable::close);
}
protected List<File> getSpillFiles()
http://git-wip-us.apache.org/repos/asf/jena/blob/424e7f3f/jena-arq/src/main/java/org/apache/jena/atlas/data/DataBag.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/atlas/data/DataBag.java b/jena-arq/src/main/java/org/apache/jena/atlas/data/DataBag.java
index a059bdf..40d6805 100644
--- a/jena-arq/src/main/java/org/apache/jena/atlas/data/DataBag.java
+++ b/jena-arq/src/main/java/org/apache/jena/atlas/data/DataBag.java
@@ -82,11 +82,15 @@ public interface DataBag<T> extends Sink<T>, Iterable<T>, Closeable
* Add contents of an Iterable to the bag.
* @param it iterable to add contents of.
*/
- void addAll(Iterable<? extends T> it);
+ default void addAll(Iterable<? extends T> it) {
+ addAll(it.iterator());
+ }
/**
* Add contents of an Iterator to the bag.
* @param it iterator to add contents of.
*/
- void addAll(Iterator<? extends T> it);
+ default void addAll(Iterator<? extends T> it) {
+ it.forEachRemaining(this::add);
+ }
}
http://git-wip-us.apache.org/repos/asf/jena/blob/424e7f3f/jena-arq/src/test/java/org/apache/jena/atlas/data/TestDistinctDataNet.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/org/apache/jena/atlas/data/TestDistinctDataNet.java b/jena-arq/src/test/java/org/apache/jena/atlas/data/TestDistinctDataNet.java
index af2e9d9..9b95560 100644
--- a/jena-arq/src/test/java/org/apache/jena/atlas/data/TestDistinctDataNet.java
+++ b/jena-arq/src/test/java/org/apache/jena/atlas/data/TestDistinctDataNet.java
@@ -207,7 +207,7 @@ public class TestDistinctDataNet extends TestCase
private void testDiff(String first, String second, String expected)
{
- DistinctDataNet.SortedDiffIterator<String> sdi = DistinctDataNet.SortedDiffIterator.create(
+ DistinctDataNet.SortedDiffIterator.create(
Arrays.asList(first.split(" ")).iterator(),
Arrays.asList(second.split(" ")).iterator());