accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From e..@apache.org
Subject [1/2] accumulo git commit: ACCUMULO-3754 remove very unfortunate syntax from Eclipse refactoring
Date Mon, 27 Apr 2015 21:02:38 GMT
Repository: accumulo
Updated Branches:
  refs/heads/master b87fd2362 -> 45e316f56


ACCUMULO-3754 remove very unfortunate syntax from Eclipse refactoring


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

Branch: refs/heads/master
Commit: f74946d7f1c9b1f4235da7a30cc2d4192f8ee0be
Parents: ba7fb3e
Author: Eric C. Newton <eric.newton@gmail.com>
Authored: Mon Apr 27 17:01:53 2015 -0400
Committer: Eric C. Newton <eric.newton@gmail.com>
Committed: Mon Apr 27 17:01:53 2015 -0400

----------------------------------------------------------------------
 .../test/java/org/apache/accumulo/proxy/ProxyDurabilityIT.java | 3 +--
 test/src/test/java/org/apache/accumulo/test/CleanWalIT.java    | 2 +-
 .../apache/accumulo/test/ConfigurableMajorCompactionIT.java    | 2 +-
 .../apache/accumulo/test/MasterRepairsDualAssignmentIT.java    | 2 +-
 test/src/test/java/org/apache/accumulo/test/ShellServerIT.java | 2 +-
 .../test/java/org/apache/accumulo/test/SplitRecoveryIT.java    | 2 +-
 .../org/apache/accumulo/test/functional/BadIteratorMincIT.java | 2 +-
 .../org/apache/accumulo/test/functional/BigRootTabletIT.java   | 2 +-
 .../java/org/apache/accumulo/test/functional/CleanTmpIT.java   | 2 +-
 .../java/org/apache/accumulo/test/functional/CompactionIT.java | 2 +-
 .../org/apache/accumulo/test/functional/ConcurrencyIT.java     | 2 +-
 .../accumulo/test/functional/ConfigurableCompactionIT.java     | 2 +-
 .../apache/accumulo/test/functional/DeleteEverythingIT.java    | 2 +-
 .../java/org/apache/accumulo/test/functional/DeleteRowsIT.java | 2 +-
 .../java/org/apache/accumulo/test/functional/DurabilityIT.java | 2 +-
 .../java/org/apache/accumulo/test/functional/ExamplesIT.java   | 2 +-
 .../apache/accumulo/test/functional/FunctionalTestUtils.java   | 2 +-
 .../apache/accumulo/test/functional/GarbageCollectorIT.java    | 2 +-
 .../java/org/apache/accumulo/test/functional/MetadataIT.java   | 2 +-
 .../java/org/apache/accumulo/test/functional/ReadWriteIT.java  | 4 ++--
 .../java/org/apache/accumulo/test/functional/RowDeleteIT.java  | 6 +++---
 .../apache/accumulo/test/functional/SessionDurabilityIT.java   | 2 +-
 .../test/java/org/apache/accumulo/test/functional/TableIT.java | 4 ++--
 23 files changed, 27 insertions(+), 28 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/f74946d7/test/src/test/java/org/apache/accumulo/proxy/ProxyDurabilityIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/proxy/ProxyDurabilityIT.java b/test/src/test/java/org/apache/accumulo/proxy/ProxyDurabilityIT.java
index 9c524be..53653da 100644
--- a/test/src/test/java/org/apache/accumulo/proxy/ProxyDurabilityIT.java
+++ b/test/src/test/java/org/apache/accumulo/proxy/ProxyDurabilityIT.java
@@ -138,8 +138,7 @@ public class ProxyDurabilityIT extends ConfigurableMacIT {
   }
 
   private int count(String tableName) throws Exception {
-    Connector c = getConnector();
-    return Iterators.size(((Iterable<?>) c.createScanner(tableName, Authorizations.EMPTY)).iterator());
+    return Iterators.size((getConnector().createScanner(tableName, Authorizations.EMPTY)).iterator());
   }
 
 }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/f74946d7/test/src/test/java/org/apache/accumulo/test/CleanWalIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/CleanWalIT.java b/test/src/test/java/org/apache/accumulo/test/CleanWalIT.java
index 57fad5d..3f9e1cc 100644
--- a/test/src/test/java/org/apache/accumulo/test/CleanWalIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/CleanWalIT.java
@@ -140,7 +140,7 @@ public class CleanWalIT extends AccumuloClusterIT {
 
   int count(String tableName, Connector conn) throws Exception {
     Scanner s = conn.createScanner(tableName, Authorizations.EMPTY);
-    return Iterators.size(((Iterable<?>) s).iterator());
+    return Iterators.size(s.iterator());
   }
 
 }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/f74946d7/test/src/test/java/org/apache/accumulo/test/ConfigurableMajorCompactionIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/ConfigurableMajorCompactionIT.java
b/test/src/test/java/org/apache/accumulo/test/ConfigurableMajorCompactionIT.java
index e2ec222..2a13aed 100644
--- a/test/src/test/java/org/apache/accumulo/test/ConfigurableMajorCompactionIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/ConfigurableMajorCompactionIT.java
@@ -104,7 +104,7 @@ public class ConfigurableMajorCompactionIT extends ConfigurableMacIT {
     Scanner s = conn.createScanner(MetadataTable.NAME, Authorizations.EMPTY);
     s.setRange(MetadataSchema.TabletsSection.getRange());
     s.fetchColumnFamily(MetadataSchema.TabletsSection.DataFileColumnFamily.NAME);
-    return Iterators.size(((Iterable<?>) s).iterator());
+    return Iterators.size(s.iterator());
   }
 
   private void writeFile(Connector conn, String tableName) throws Exception {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/f74946d7/test/src/test/java/org/apache/accumulo/test/MasterRepairsDualAssignmentIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/MasterRepairsDualAssignmentIT.java
b/test/src/test/java/org/apache/accumulo/test/MasterRepairsDualAssignmentIT.java
index 44d7af0..fb99a24 100644
--- a/test/src/test/java/org/apache/accumulo/test/MasterRepairsDualAssignmentIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/MasterRepairsDualAssignmentIT.java
@@ -148,7 +148,7 @@ public class MasterRepairsDualAssignmentIT extends ConfigurableMacIT {
   private void waitForCleanStore(MetaDataStateStore store) {
     while (true) {
       try {
-        Iterators.size(((Iterable<?>) store).iterator());
+        Iterators.size(store.iterator());
       } catch (Exception ex) {
         System.out.println(ex);
         UtilWaitThread.sleep(250);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/f74946d7/test/src/test/java/org/apache/accumulo/test/ShellServerIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/ShellServerIT.java b/test/src/test/java/org/apache/accumulo/test/ShellServerIT.java
index bef59ab..6618a65 100644
--- a/test/src/test/java/org/apache/accumulo/test/ShellServerIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/ShellServerIT.java
@@ -1324,7 +1324,7 @@ public class ShellServerIT extends SharedMiniClusterIT {
       @Override
       public void run() {
         try {
-          Iterators.size(((Iterable<?>) s).iterator());
+          Iterators.size(s.iterator());
         } catch (Exception ex) {
           throw new RuntimeException(ex);
         }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/f74946d7/test/src/test/java/org/apache/accumulo/test/SplitRecoveryIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/SplitRecoveryIT.java b/test/src/test/java/org/apache/accumulo/test/SplitRecoveryIT.java
index 9c6d05c..8fe8471 100644
--- a/test/src/test/java/org/apache/accumulo/test/SplitRecoveryIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/SplitRecoveryIT.java
@@ -55,7 +55,7 @@ public class SplitRecoveryIT extends AccumuloClusterIT {
     Scanner scanner = connector.createScanner(MetadataTable.NAME, Authorizations.EMPTY);
     scanner.setRange(new Range(new Text(tableId + ";"), new Text(tableId + "<")));
     scanner.fetchColumnFamily(TabletsSection.CurrentLocationColumnFamily.NAME);
-    return Iterators.size(((Iterable<?>) scanner).iterator()) == 0;
+    return Iterators.size(scanner.iterator()) == 0;
   }
 
   @Override

http://git-wip-us.apache.org/repos/asf/accumulo/blob/f74946d7/test/src/test/java/org/apache/accumulo/test/functional/BadIteratorMincIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/BadIteratorMincIT.java
b/test/src/test/java/org/apache/accumulo/test/functional/BadIteratorMincIT.java
index df5fa93..14561c2 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/BadIteratorMincIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/BadIteratorMincIT.java
@@ -68,7 +68,7 @@ public class BadIteratorMincIT extends AccumuloClusterIT {
 
     // try to scan table
     Scanner scanner = c.createScanner(tableName, Authorizations.EMPTY);
-    int count = Iterators.size(((Iterable<?>) scanner).iterator());
+    int count = Iterators.size(scanner.iterator());
     assertEquals("Did not see expected # entries " + count, 1, count);
 
     // remove the bad iterator

http://git-wip-us.apache.org/repos/asf/accumulo/blob/f74946d7/test/src/test/java/org/apache/accumulo/test/functional/BigRootTabletIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/BigRootTabletIT.java b/test/src/test/java/org/apache/accumulo/test/functional/BigRootTabletIT.java
index 97270b1..f08ea00 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/BigRootTabletIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/BigRootTabletIT.java
@@ -60,7 +60,7 @@ public class BigRootTabletIT extends AccumuloClusterIT {
     }
     cluster.stop();
     cluster.start();
-    assertTrue(Iterators.size(((Iterable<?>) c.createScanner(RootTable.NAME, Authorizations.EMPTY)).iterator())
> 0);
+    assertTrue(Iterators.size(c.createScanner(RootTable.NAME, Authorizations.EMPTY).iterator())
> 0);
   }
 
 }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/f74946d7/test/src/test/java/org/apache/accumulo/test/functional/CleanTmpIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/CleanTmpIT.java b/test/src/test/java/org/apache/accumulo/test/functional/CleanTmpIT.java
index bb52a94..d384ca4 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/CleanTmpIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/CleanTmpIT.java
@@ -107,7 +107,7 @@ public class CleanTmpIT extends AccumuloClusterIT {
     getClusterControl().startAllServers(ServerType.TABLET_SERVER);
 
     Scanner scanner = c.createScanner(tableName, Authorizations.EMPTY);
-    assertEquals(2, Iterators.size(((Iterable<?>) scanner).iterator()));
+    assertEquals(2, Iterators.size(scanner.iterator()));
     // If we performed log recovery, we should have cleaned up any stray files
     assertFalse("File still exists: " + tmp, fs.exists(tmp));
   }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/f74946d7/test/src/test/java/org/apache/accumulo/test/functional/CompactionIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/CompactionIT.java b/test/src/test/java/org/apache/accumulo/test/functional/CompactionIT.java
index a9f93e7..2fe5470 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/CompactionIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/CompactionIT.java
@@ -178,7 +178,7 @@ public class CompactionIT extends AccumuloClusterIT {
     Scanner s = c.createScanner(MetadataTable.NAME, Authorizations.EMPTY);
     s.fetchColumnFamily(MetadataSchema.TabletsSection.TabletColumnFamily.NAME);
     s.fetchColumnFamily(MetadataSchema.TabletsSection.DataFileColumnFamily.NAME);
-    return Iterators.size(((Iterable<?>) s).iterator());
+    return Iterators.size(s.iterator());
   }
 
 }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/f74946d7/test/src/test/java/org/apache/accumulo/test/functional/ConcurrencyIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/ConcurrencyIT.java b/test/src/test/java/org/apache/accumulo/test/functional/ConcurrencyIT.java
index 3699ef6..31437cc 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/ConcurrencyIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/ConcurrencyIT.java
@@ -61,7 +61,7 @@ public class ConcurrencyIT extends AccumuloClusterIT {
 
     @Override
     public void run() {
-      count = Iterators.size(((Iterable<?>) scanner).iterator());
+      count = Iterators.size(scanner.iterator());
     }
 
   }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/f74946d7/test/src/test/java/org/apache/accumulo/test/functional/ConfigurableCompactionIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/ConfigurableCompactionIT.java
b/test/src/test/java/org/apache/accumulo/test/functional/ConfigurableCompactionIT.java
index 80a6b76..a33322c 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/ConfigurableCompactionIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/ConfigurableCompactionIT.java
@@ -158,7 +158,7 @@ public class ConfigurableCompactionIT extends ConfigurableMacIT {
   private int countFiles(Connector c, String tableName) throws Exception {
     Scanner s = c.createScanner(MetadataTable.NAME, Authorizations.EMPTY);
     s.fetchColumnFamily(MetadataSchema.TabletsSection.DataFileColumnFamily.NAME);
-    return Iterators.size(((Iterable<?>) s).iterator());
+    return Iterators.size(s.iterator());
   }
 
 }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/f74946d7/test/src/test/java/org/apache/accumulo/test/functional/DeleteEverythingIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/DeleteEverythingIT.java
b/test/src/test/java/org/apache/accumulo/test/functional/DeleteEverythingIT.java
index 9112669..d51de6e 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/DeleteEverythingIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/DeleteEverythingIT.java
@@ -98,7 +98,7 @@ public class DeleteEverythingIT extends AccumuloClusterIT {
 
     Scanner scanner = getConnector().createScanner(tableName, Authorizations.EMPTY);
     scanner.setRange(new Range());
-    int count = Iterators.size(((Iterable<?>) scanner).iterator());
+    int count = Iterators.size(scanner.iterator());
     assertEquals("count == " + count, 0, count);
     getConnector().tableOperations().flush(tableName, null, null, true);
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/f74946d7/test/src/test/java/org/apache/accumulo/test/functional/DeleteRowsIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/DeleteRowsIT.java b/test/src/test/java/org/apache/accumulo/test/functional/DeleteRowsIT.java
index 12d52c2..6e67f9b 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/DeleteRowsIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/DeleteRowsIT.java
@@ -75,7 +75,7 @@ public class DeleteRowsIT extends AccumuloClusterIT {
       c.tableOperations().create(tableName);
       c.tableOperations().deleteRows(tableName, null, null);
       Scanner scanner = c.createScanner(tableName, Authorizations.EMPTY);
-      assertEquals(0, Iterators.size(((Iterable<?>) scanner).iterator()));
+      assertEquals(0, Iterators.size(scanner.iterator()));
     }
   }
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/f74946d7/test/src/test/java/org/apache/accumulo/test/functional/DurabilityIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/DurabilityIT.java b/test/src/test/java/org/apache/accumulo/test/functional/DurabilityIT.java
index 236fc6b..f2ba949 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/DurabilityIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/DurabilityIT.java
@@ -174,7 +174,7 @@ public class DurabilityIT extends ConfigurableMacIT {
   }
 
   private long readSome(String table) throws Exception {
-    return Iterators.size(((Iterable<?>) getConnector().createScanner(table, Authorizations.EMPTY)).iterator());
+    return Iterators.size(getConnector().createScanner(table, Authorizations.EMPTY).iterator());
   }
 
   private void restartTServer() throws Exception {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/f74946d7/test/src/test/java/org/apache/accumulo/test/functional/ExamplesIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/ExamplesIT.java b/test/src/test/java/org/apache/accumulo/test/functional/ExamplesIT.java
index 8fb7e8f..ef610ca 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/ExamplesIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/ExamplesIT.java
@@ -290,7 +290,7 @@ public class ExamplesIT extends AccumuloClusterIT {
     bw.addMutation(m);
     bw.close();
     UtilWaitThread.sleep(1000);
-    assertEquals(0, Iterators.size(((Iterable<?>) c.createScanner(tableName, Authorizations.EMPTY)).iterator()));
+    assertEquals(0, Iterators.size(c.createScanner(tableName, Authorizations.EMPTY).iterator()));
   }
 
   @Test

http://git-wip-us.apache.org/repos/asf/accumulo/blob/f74946d7/test/src/test/java/org/apache/accumulo/test/functional/FunctionalTestUtils.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/FunctionalTestUtils.java
b/test/src/test/java/org/apache/accumulo/test/functional/FunctionalTestUtils.java
index d215af6..05d0562 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/FunctionalTestUtils.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/FunctionalTestUtils.java
@@ -61,7 +61,7 @@ public class FunctionalTestUtils {
     scanner.setRange(MetadataSchema.TabletsSection.getRange(tableId));
     scanner.fetchColumnFamily(MetadataSchema.TabletsSection.DataFileColumnFamily.NAME);
 
-    return Iterators.size(((Iterable<?>) scanner).iterator());
+    return Iterators.size(scanner.iterator());
   }
 
   static void checkRFiles(Connector c, String tableName, int minTablets, int maxTablets,
int minRFiles, int maxRFiles) throws Exception {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/f74946d7/test/src/test/java/org/apache/accumulo/test/functional/GarbageCollectorIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/GarbageCollectorIT.java
b/test/src/test/java/org/apache/accumulo/test/functional/GarbageCollectorIT.java
index e7839ec..132cbcc 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/GarbageCollectorIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/GarbageCollectorIT.java
@@ -172,7 +172,7 @@ public class GarbageCollectorIT extends ConfigurableMacIT {
     cluster.start();
     // did it recover?
     Scanner scanner = c.createScanner(MetadataTable.NAME, Authorizations.EMPTY);
-    Iterators.size(((Iterable<?>) scanner).iterator());
+    Iterators.size(scanner.iterator());
   }
 
   private Mutation createDelMutation(String path, String cf, String cq, String val) {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/f74946d7/test/src/test/java/org/apache/accumulo/test/functional/MetadataIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/MetadataIT.java b/test/src/test/java/org/apache/accumulo/test/functional/MetadataIT.java
index 4b23463..09e6ecc 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/MetadataIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/MetadataIT.java
@@ -110,7 +110,7 @@ public class MetadataIT extends AccumuloClusterIT {
     c.tableOperations().merge(MetadataTable.NAME, null, null);
     Scanner s = c.createScanner(RootTable.NAME, Authorizations.EMPTY);
     s.setRange(MetadataSchema.DeletesSection.getRange());
-    while (Iterators.size(((Iterable<?>) s).iterator()) == 0) {
+    while (Iterators.size(s.iterator()) == 0) {
       UtilWaitThread.sleep(100);
     }
     assertEquals(0, c.tableOperations().listSplits(MetadataTable.NAME).size());

http://git-wip-us.apache.org/repos/asf/accumulo/blob/f74946d7/test/src/test/java/org/apache/accumulo/test/functional/ReadWriteIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/ReadWriteIT.java b/test/src/test/java/org/apache/accumulo/test/functional/ReadWriteIT.java
index 12e7656..75fd4e1 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/ReadWriteIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/ReadWriteIT.java
@@ -348,12 +348,12 @@ public class ReadWriteIT extends AccumuloClusterIT {
     long now = System.currentTimeMillis();
     Scanner scanner = connector.createScanner(tableName, Authorizations.EMPTY);
     scanner.fetchColumnFamily(new Text("colf"));
-    Iterators.size(((Iterable<?>) scanner).iterator());
+    Iterators.size(scanner.iterator());
     long diff = System.currentTimeMillis() - now;
     now = System.currentTimeMillis();
     scanner = connector.createScanner(tableName, Authorizations.EMPTY);
     scanner.fetchColumnFamily(new Text("colf2"));
-    Iterators.size(((Iterable<?>) scanner).iterator());
+    Iterators.size(scanner.iterator());
     bw.close();
     long diff2 = System.currentTimeMillis() - now;
     assertTrue(diff2 < diff);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/f74946d7/test/src/test/java/org/apache/accumulo/test/functional/RowDeleteIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/RowDeleteIT.java b/test/src/test/java/org/apache/accumulo/test/functional/RowDeleteIT.java
index 19ee6d2..06039af 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/RowDeleteIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/RowDeleteIT.java
@@ -81,7 +81,7 @@ public class RowDeleteIT extends AccumuloClusterIT {
     checkRFiles(c, tableName, 1, 1, 1, 1);
 
     Scanner scanner = c.createScanner(tableName, Authorizations.EMPTY);
-    int count = Iterators.size(((Iterable<?>) scanner).iterator());
+    int count = Iterators.size(scanner.iterator());
     assertEquals("count == " + count, 2, count);
 
     bw.addMutation(nm("r1", "", "", RowDeletingIterator.DELETE_ROW_VALUE));
@@ -92,7 +92,7 @@ public class RowDeleteIT extends AccumuloClusterIT {
     checkRFiles(c, tableName, 1, 1, 2, 2);
 
     scanner = c.createScanner(tableName, Authorizations.EMPTY);
-    count = Iterators.size(((Iterable<?>) scanner).iterator());
+    count = Iterators.size(scanner.iterator());
     assertEquals("count == " + count, 3, count);
 
     c.tableOperations().compact(tableName, null, null, false, true);
@@ -100,7 +100,7 @@ public class RowDeleteIT extends AccumuloClusterIT {
     checkRFiles(c, tableName, 1, 1, 0, 0);
 
     scanner = c.createScanner(tableName, Authorizations.EMPTY);
-    count = Iterators.size(((Iterable<?>) scanner).iterator());
+    count = Iterators.size(scanner.iterator());
     assertEquals("count == " + count, 0, count);
     bw.close();
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/f74946d7/test/src/test/java/org/apache/accumulo/test/functional/SessionDurabilityIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/SessionDurabilityIT.java
b/test/src/test/java/org/apache/accumulo/test/functional/SessionDurabilityIT.java
index ebb48c1..aec6bae 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/SessionDurabilityIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/SessionDurabilityIT.java
@@ -83,7 +83,7 @@ public class SessionDurabilityIT extends ConfigurableMacIT {
   }
 
   private int count(String tableName) throws Exception {
-    return Iterators.size(((Iterable<?>) getConnector().createScanner(tableName, Authorizations.EMPTY)).iterator());
+    return Iterators.size(getConnector().createScanner(tableName, Authorizations.EMPTY).iterator());
   }
 
   private void writeSome(String tableName, int n, BatchWriterConfig cfg) throws Exception
{

http://git-wip-us.apache.org/repos/asf/accumulo/blob/f74946d7/test/src/test/java/org/apache/accumulo/test/functional/TableIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/TableIT.java b/test/src/test/java/org/apache/accumulo/test/functional/TableIT.java
index 3a248d4..3061b87 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/TableIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/TableIT.java
@@ -88,12 +88,12 @@ public class TableIT extends AccumuloClusterIT {
     Scanner s = c.createScanner(MetadataTable.NAME, Authorizations.EMPTY);
     s.setRange(new KeyExtent(new Text(id), null, null).toMetadataRange());
     s.fetchColumnFamily(MetadataSchema.TabletsSection.DataFileColumnFamily.NAME);
-    assertTrue(Iterators.size(((Iterable<?>) s).iterator()) > 0);
+    assertTrue(Iterators.size(s.iterator()) > 0);
 
     FileSystem fs = FileSystem.get(CachedConfiguration.getInstance());
     assertTrue(fs.listStatus(new Path(rootPath + "/accumulo/tables/" + id)).length > 0);
     to.delete(tableName);
-    assertEquals(0, Iterators.size(((Iterable<?>) s).iterator()));
+    assertEquals(0, Iterators.size(s.iterator()));
     try {
       assertEquals(0, fs.listStatus(new Path(rootPath + "/accumulo/tables/" + id)).length);
     } catch (FileNotFoundException ex) {


Mime
View raw message