You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jb...@apache.org on 2014/03/13 00:30:27 UTC
[2/5] git commit: prefer Iterators to CollectionUtils
prefer Iterators to CollectionUtils
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/60414331
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/60414331
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/60414331
Branch: refs/heads/cassandra-2.1
Commit: 6041433108e9968f0612378c22cd96c274554ac5
Parents: caf609c
Author: Jonathan Ellis <jb...@apache.org>
Authored: Wed Mar 12 18:28:11 2014 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Wed Mar 12 18:30:04 2014 -0500
----------------------------------------------------------------------
test/unit/org/apache/cassandra/db/RangeTombstoneTest.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/60414331/test/unit/org/apache/cassandra/db/RangeTombstoneTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/db/RangeTombstoneTest.java b/test/unit/org/apache/cassandra/db/RangeTombstoneTest.java
index 15ef19a..8502dd5 100644
--- a/test/unit/org/apache/cassandra/db/RangeTombstoneTest.java
+++ b/test/unit/org/apache/cassandra/db/RangeTombstoneTest.java
@@ -26,7 +26,7 @@ import org.apache.cassandra.utils.memory.AbstractAllocator;
import org.junit.Test;
import com.google.common.collect.ImmutableMap;
-import org.apache.commons.collections.CollectionUtils;
+import com.google.common.collect.Iterators;
import org.apache.cassandra.SchemaLoader;
import org.apache.cassandra.config.ColumnDefinition;
@@ -208,9 +208,9 @@ public class RangeTombstoneTest extends SchemaLoader
private Collection<RangeTombstone> rangeTombstones(ColumnFamily cf)
{
- List <RangeTombstone> res = new ArrayList<RangeTombstone>();
- CollectionUtils.addAll(res, cf.deletionInfo().rangeIterator());
- return res;
+ List<RangeTombstone> tombstones = new ArrayList<RangeTombstone>();
+ Iterators.addAll(tombstones, cf.deletionInfo().rangeIterator());
+ return tombstones;
}
@Test