[4/9] git commit: ACCUMULO-2663 Fix some compilation issues from guava deps

[el...@apache.org]

ACCUMULO-2663 Fix some compilation issues from guava deps


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/3d469eb8
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/3d469eb8
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/3d469eb8

Branch: refs/heads/1.5.2-SNAPSHOT
Commit: 3d469eb853a56ea5e1d0e15c049eb0284d2046c3
Parents: 5959127
Author: Josh Elser <el...@apache.org>
Authored: Thu Jun 12 22:28:56 2014 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Thu Jun 12 22:28:56 2014 -0400

----------------------------------------------------------------------
 .../java/org/apache/accumulo/core/iterators/Combiner.java | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/3d469eb8/core/src/main/java/org/apache/accumulo/core/iterators/Combiner.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/iterators/Combiner.java b/core/src/main/java/org/apache/accumulo/core/iterators/Combiner.java
index dd215cc..8ec22fe 100644
--- a/core/src/main/java/org/apache/accumulo/core/iterators/Combiner.java
+++ b/core/src/main/java/org/apache/accumulo/core/iterators/Combiner.java
@@ -16,15 +16,12 @@
  */
 package org.apache.accumulo.core.iterators;
 
-import com.google.common.base.Splitter;
 import java.io.IOException;
-import java.util.Arrays;
 import java.util.Collection;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.NoSuchElementException;
-import java.util.StringTokenizer;
 
 import org.apache.accumulo.core.client.IteratorSetting;
 import org.apache.accumulo.core.client.IteratorSetting.Column;
@@ -38,6 +35,9 @@ import org.apache.accumulo.core.iterators.conf.ColumnSet;
 import org.apache.hadoop.io.Text;
 import org.apache.log4j.Logger;
 
+import com.google.common.base.Splitter;
+import com.google.common.collect.Lists;
+
 /**
  * A SortedKeyValueIterator that combines the Values for different versions (timestamp) of a Key within a row into a single Value. Combiner will replace one or
  * more versions of a Key and their Values with the most recent Key and a Value which is the result of the reduce method. An {@link Column}
@@ -235,7 +235,7 @@ public abstract class Combiner extends WrappingIterator implements OptionDescrib
     if (encodedColumns.length() == 0)
       throw new IllegalArgumentException("The " + COLUMNS_OPTION + " must not be empty");
 
-    combiners = new ColumnSet(Splitter.on(",").splitToList(encodedColumns));
+    combiners = new ColumnSet(Lists.newArrayList(Splitter.on(",").split(encodedColumns)));
   }
 
   @Override
@@ -279,7 +279,7 @@ public abstract class Combiner extends WrappingIterator implements OptionDescrib
     if (encodedColumns.length() == 0)
       throw new IllegalArgumentException("empty columns specified in option " + COLUMNS_OPTION);
 
-    for (String columns : Splitter.on(",").splitToList(encodedColumns)) {
+    for (String columns : Splitter.on(",").split(encodedColumns)) {
       if (!ColumnSet.isValidEncoding(columns))
         throw new IllegalArgumentException("invalid column encoding " + encodedColumns);
     }