accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From e..@apache.org
Subject [07/10] git commit: ACCUMULO-1934 cleaning up imports, dead code, unused vars
Date Tue, 26 Nov 2013 21:06:07 GMT
ACCUMULO-1934 cleaning up imports, dead code, unused vars


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

Branch: refs/heads/master
Commit: 8d39b09b212a67ad0e8379ddf18cf3624d9d2152
Parents: 394b2b2
Author: Eric Newton <eric.newton@gmail.com>
Authored: Tue Nov 26 15:52:44 2013 -0500
Committer: Eric Newton <eric.newton@gmail.com>
Committed: Tue Nov 26 15:52:44 2013 -0500

----------------------------------------------------------------------
 .../core/client/mapreduce/InputFormatBase.java  |  5 ---
 .../core/client/IteratorSettingTest.java        |  4 +-
 .../user/IntersectingIteratorTest.java          |  2 +-
 .../core/util/LocalityGroupUtilTest.java        |  2 +-
 .../org/apache/accumulo/proxy/SimpleTest.java   |  6 +--
 .../accumulo/proxy/TestProxyReadWrite.java      | 10 -----
 .../monitor/servlets/GcStatusServlet.java       |  1 -
 .../accumulo/server/tabletserver/Tablet.java    |  2 -
 .../accumulo/server/util/MetadataTable.java     | 43 --------------------
 .../server/client/BulkImporterTest.java         |  3 +-
 .../accumulo/server/gc/TestConfirmDeletes.java  |  3 +-
 .../iterators/MetadataBulkLoadFilterTest.java   |  2 +-
 .../balancer/DefaultLoadBalancerTest.java       |  3 +-
 .../master/balancer/TableLoadBalancerTest.java  |  3 +-
 .../zookeeper/DistributedReadWriteLockTest.java |  2 +-
 .../zookeeper/TransactionWatcherTest.java       |  2 +-
 .../cloudtrace/instrument/CountSamplerTest.java |  2 +-
 17 files changed, 13 insertions(+), 82 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/8d39b09b/src/core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputFormatBase.java
----------------------------------------------------------------------
diff --git a/src/core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputFormatBase.java
b/src/core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputFormatBase.java
index bd90b8c..8fe0347 100644
--- a/src/core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputFormatBase.java
+++ b/src/core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputFormatBase.java
@@ -18,14 +18,11 @@ package org.apache.accumulo.core.client.mapreduce;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
-import java.io.DataInput;
 import java.io.DataInputStream;
-import java.io.DataOutput;
 import java.io.DataOutputStream;
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.lang.reflect.InvocationTargetException;
-import java.math.BigInteger;
 import java.net.InetAddress;
 import java.net.URLDecoder;
 import java.net.URLEncoder;
@@ -61,7 +58,6 @@ import org.apache.accumulo.core.client.impl.Tables;
 import org.apache.accumulo.core.client.impl.TabletLocator;
 import org.apache.accumulo.core.client.mock.MockInstance;
 import org.apache.accumulo.core.client.mock.MockTabletLocator;
-import org.apache.accumulo.core.data.ByteSequence;
 import org.apache.accumulo.core.data.Key;
 import org.apache.accumulo.core.data.KeyExtent;
 import org.apache.accumulo.core.data.PartialKey;
@@ -82,7 +78,6 @@ import org.apache.accumulo.core.util.UtilWaitThread;
 import org.apache.commons.codec.binary.Base64;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.io.Text;
-import org.apache.hadoop.io.Writable;
 import org.apache.hadoop.mapreduce.InputFormat;
 import org.apache.hadoop.mapreduce.InputSplit;
 import org.apache.hadoop.mapreduce.JobContext;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/8d39b09b/src/core/src/test/java/org/apache/accumulo/core/client/IteratorSettingTest.java
----------------------------------------------------------------------
diff --git a/src/core/src/test/java/org/apache/accumulo/core/client/IteratorSettingTest.java
b/src/core/src/test/java/org/apache/accumulo/core/client/IteratorSettingTest.java
index 69bf1b5..ccb3cd6 100644
--- a/src/core/src/test/java/org/apache/accumulo/core/client/IteratorSettingTest.java
+++ b/src/core/src/test/java/org/apache/accumulo/core/client/IteratorSettingTest.java
@@ -1,10 +1,10 @@
 package org.apache.accumulo.core.client;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotEquals;
 
 import org.apache.accumulo.core.iterators.Combiner;
 import org.apache.accumulo.core.iterators.DevNull;
-import org.apache.hadoop.io.Writable;
 import org.junit.Test;
 
 /**

http://git-wip-us.apache.org/repos/asf/accumulo/blob/8d39b09b/src/core/src/test/java/org/apache/accumulo/core/iterators/user/IntersectingIteratorTest.java
----------------------------------------------------------------------
diff --git a/src/core/src/test/java/org/apache/accumulo/core/iterators/user/IntersectingIteratorTest.java
b/src/core/src/test/java/org/apache/accumulo/core/iterators/user/IntersectingIteratorTest.java
index df34b3c..a6b94d5 100644
--- a/src/core/src/test/java/org/apache/accumulo/core/iterators/user/IntersectingIteratorTest.java
+++ b/src/core/src/test/java/org/apache/accumulo/core/iterators/user/IntersectingIteratorTest.java
@@ -26,7 +26,7 @@ import java.util.Map.Entry;
 import java.util.Random;
 import java.util.TreeMap;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 import junit.framework.TestCase;
 
 import org.apache.accumulo.core.Constants;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/8d39b09b/src/core/src/test/java/org/apache/accumulo/core/util/LocalityGroupUtilTest.java
----------------------------------------------------------------------
diff --git a/src/core/src/test/java/org/apache/accumulo/core/util/LocalityGroupUtilTest.java
b/src/core/src/test/java/org/apache/accumulo/core/util/LocalityGroupUtilTest.java
index a1eb9e8..526e57a 100644
--- a/src/core/src/test/java/org/apache/accumulo/core/util/LocalityGroupUtilTest.java
+++ b/src/core/src/test/java/org/apache/accumulo/core/util/LocalityGroupUtilTest.java
@@ -20,7 +20,7 @@ import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.apache.accumulo.core.conf.ConfigurationCopy;
 import org.apache.accumulo.core.data.ArrayByteSequence;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/8d39b09b/src/proxy/src/test/java/org/apache/accumulo/proxy/SimpleTest.java
----------------------------------------------------------------------
diff --git a/src/proxy/src/test/java/org/apache/accumulo/proxy/SimpleTest.java b/src/proxy/src/test/java/org/apache/accumulo/proxy/SimpleTest.java
index f6533c2..d3b45ae 100644
--- a/src/proxy/src/test/java/org/apache/accumulo/proxy/SimpleTest.java
+++ b/src/proxy/src/test/java/org/apache/accumulo/proxy/SimpleTest.java
@@ -411,11 +411,7 @@ public class SimpleTest {
 
   @Test(timeout = 10000)
   public void testInstanceOperations() throws Exception {
-    int tservers = 0;
-    for (String tserver : client.getTabletServers(creds)) {
-      tservers++;
-    }
-    assertTrue(tservers > 0);
+    assertTrue(client.getTabletServers(creds).size() > 0);
     
     // get something we know is in the site config
     Map<String,String> cfg = client.getSiteConfiguration(creds);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/8d39b09b/src/proxy/src/test/java/org/apache/accumulo/proxy/TestProxyReadWrite.java
----------------------------------------------------------------------
diff --git a/src/proxy/src/test/java/org/apache/accumulo/proxy/TestProxyReadWrite.java b/src/proxy/src/test/java/org/apache/accumulo/proxy/TestProxyReadWrite.java
index cb4d364..97c2384 100644
--- a/src/proxy/src/test/java/org/apache/accumulo/proxy/TestProxyReadWrite.java
+++ b/src/proxy/src/test/java/org/apache/accumulo/proxy/TestProxyReadWrite.java
@@ -29,14 +29,12 @@ import java.util.Properties;
 import java.util.Set;
 import java.util.TreeMap;
 
-import org.apache.accumulo.core.data.Mutation;
 import org.apache.accumulo.core.iterators.user.RegExFilter;
 import org.apache.accumulo.proxy.thrift.BatchScanOptions;
 import org.apache.accumulo.proxy.thrift.ColumnUpdate;
 import org.apache.accumulo.proxy.thrift.IteratorSetting;
 import org.apache.accumulo.proxy.thrift.Key;
 import org.apache.accumulo.proxy.thrift.KeyValue;
-import org.apache.accumulo.proxy.thrift.MutationsRejectedException;
 import org.apache.accumulo.proxy.thrift.Range;
 import org.apache.accumulo.proxy.thrift.ScanColumn;
 import org.apache.accumulo.proxy.thrift.ScanOptions;
@@ -148,14 +146,6 @@ public class TestProxyReadWrite {
     assertEquals(i, 50000);
   }
 
-    private class MyTest {
-
-        public void addMutation(Mutation m) throws MutationsRejectedException {
-            throw new MutationsRejectedException();
-        }
-    }
-
-
   /**
    * Insert 100000 cells which have as the row [0..99999] (padded with zeros). Set a columnFamily
so only the entries with specified column family come back (there should be
    * 50,000)

http://git-wip-us.apache.org/repos/asf/accumulo/blob/8d39b09b/src/server/src/main/java/org/apache/accumulo/server/monitor/servlets/GcStatusServlet.java
----------------------------------------------------------------------
diff --git a/src/server/src/main/java/org/apache/accumulo/server/monitor/servlets/GcStatusServlet.java
b/src/server/src/main/java/org/apache/accumulo/server/monitor/servlets/GcStatusServlet.java
index 3c2626e..b7795fb 100644
--- a/src/server/src/main/java/org/apache/accumulo/server/monitor/servlets/GcStatusServlet.java
+++ b/src/server/src/main/java/org/apache/accumulo/server/monitor/servlets/GcStatusServlet.java
@@ -16,7 +16,6 @@
  */
 package org.apache.accumulo.server.monitor.servlets;
 
-import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 
 import javax.servlet.http.HttpServletRequest;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/8d39b09b/src/server/src/main/java/org/apache/accumulo/server/tabletserver/Tablet.java
----------------------------------------------------------------------
diff --git a/src/server/src/main/java/org/apache/accumulo/server/tabletserver/Tablet.java
b/src/server/src/main/java/org/apache/accumulo/server/tabletserver/Tablet.java
index 09903bf..f2d9b1d 100644
--- a/src/server/src/main/java/org/apache/accumulo/server/tabletserver/Tablet.java
+++ b/src/server/src/main/java/org/apache/accumulo/server/tabletserver/Tablet.java
@@ -23,8 +23,6 @@ package org.apache.accumulo.server.tabletserver;
  * 
  */
 
-import java.io.ByteArrayInputStream;
-import java.io.DataInputStream;
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.util.ArrayList;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/8d39b09b/src/server/src/main/java/org/apache/accumulo/server/util/MetadataTable.java
----------------------------------------------------------------------
diff --git a/src/server/src/main/java/org/apache/accumulo/server/util/MetadataTable.java b/src/server/src/main/java/org/apache/accumulo/server/util/MetadataTable.java
index a9b72e0..df3e7c1 100644
--- a/src/server/src/main/java/org/apache/accumulo/server/util/MetadataTable.java
+++ b/src/server/src/main/java/org/apache/accumulo/server/util/MetadataTable.java
@@ -35,7 +35,6 @@ import java.util.Set;
 import java.util.SortedMap;
 import java.util.SortedSet;
 import java.util.TreeMap;
-import java.util.TreeSet;
 
 import org.apache.accumulo.core.Constants;
 import org.apache.accumulo.core.client.AccumuloException;
@@ -66,7 +65,6 @@ import org.apache.accumulo.core.util.CachedConfiguration;
 import org.apache.accumulo.core.util.ColumnFQ;
 import org.apache.accumulo.core.util.Pair;
 import org.apache.accumulo.core.util.StringUtil;
-import org.apache.accumulo.core.util.TextUtil;
 import org.apache.accumulo.core.util.UtilWaitThread;
 import org.apache.accumulo.core.zookeeper.ZooUtil;
 import org.apache.accumulo.core.zookeeper.ZooUtil.NodeExistsPolicy;
@@ -337,47 +335,6 @@ public class MetadataTable extends org.apache.accumulo.core.util.MetadataTable
{
     
   }
   
-  /**
-   * convenience method for reading a metadata tablet's data file entries from the root tablet
-   * 
-   */
-  private static SortedMap<Key,Value> getRootMetadataDataFileEntries(KeyExtent extent,
AuthInfo credentials) {
-    SortedSet<Column> columns = new TreeSet<Column>();
-    columns.add(new Column(TextUtil.getBytes(Constants.METADATA_DATAFILE_COLUMN_FAMILY),
null, null));
-    return getRootMetadataDataEntries(extent, columns, credentials);
-  }
-  
-  private static SortedMap<Key,Value> getRootMetadataDataEntries(KeyExtent extent,
SortedSet<Column> columns, AuthInfo credentials) {
-    
-    try {
-      SortedMap<Key,Value> entries = new TreeMap<Key,Value>();
-      
-      Text metadataEntry = extent.getMetadataEntry();
-      Text startRow;
-      boolean more = getBatchFromRootTablet(credentials, metadataEntry, entries, columns,
false, Constants.SCAN_BATCH_SIZE);
-      
-      while (more) {
-        startRow = entries.lastKey().getRow(); // set end row
-        more = getBatchFromRootTablet(credentials, startRow, entries, columns, false, Constants.SCAN_BATCH_SIZE);
-      }
-      
-      Iterator<Key> iter = entries.keySet().iterator();
-      while (iter.hasNext()) {
-        Key key = iter.next();
-        if (key.compareRow(metadataEntry) != 0) {
-          iter.remove();
-        }
-      }
-      
-      return entries;
-      
-    } catch (AccumuloSecurityException e) {
-      log.warn("Unauthorized access...");
-      return new TreeMap<Key,Value>();
-    }
-    
-  }
-  
   public static boolean recordRootTabletLocation(String address) {
     IZooReaderWriter zoo = ZooReaderWriter.getInstance();
     for (int i = 0; i < SAVE_ROOT_TABLET_RETRIES; i++) {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/8d39b09b/src/server/src/test/java/org/apache/accumulo/server/client/BulkImporterTest.java
----------------------------------------------------------------------
diff --git a/src/server/src/test/java/org/apache/accumulo/server/client/BulkImporterTest.java
b/src/server/src/test/java/org/apache/accumulo/server/client/BulkImporterTest.java
index 9e9e80f..d5f8739 100644
--- a/src/server/src/test/java/org/apache/accumulo/server/client/BulkImporterTest.java
+++ b/src/server/src/test/java/org/apache/accumulo/server/client/BulkImporterTest.java
@@ -23,8 +23,6 @@ import java.util.Map;
 import java.util.SortedSet;
 import java.util.TreeSet;
 
-import junit.framework.Assert;
-
 import org.apache.accumulo.core.client.AccumuloException;
 import org.apache.accumulo.core.client.AccumuloSecurityException;
 import org.apache.accumulo.core.client.TableNotFoundException;
@@ -43,6 +41,7 @@ import org.apache.commons.lang.NotImplementedException;
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.io.Text;
+import org.junit.Assert;
 import org.junit.Test;
 
 public class BulkImporterTest {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/8d39b09b/src/server/src/test/java/org/apache/accumulo/server/gc/TestConfirmDeletes.java
----------------------------------------------------------------------
diff --git a/src/server/src/test/java/org/apache/accumulo/server/gc/TestConfirmDeletes.java
b/src/server/src/test/java/org/apache/accumulo/server/gc/TestConfirmDeletes.java
index f3e992e..be444dd 100644
--- a/src/server/src/test/java/org/apache/accumulo/server/gc/TestConfirmDeletes.java
+++ b/src/server/src/test/java/org/apache/accumulo/server/gc/TestConfirmDeletes.java
@@ -22,8 +22,6 @@ import java.util.Map.Entry;
 import java.util.SortedSet;
 import java.util.TreeSet;
 
-import junit.framework.Assert;
-
 import org.apache.accumulo.core.Constants;
 import org.apache.accumulo.core.client.BatchWriter;
 import org.apache.accumulo.core.client.Connector;
@@ -39,6 +37,7 @@ import org.apache.accumulo.core.security.thrift.AuthInfo;
 import org.apache.accumulo.core.util.CachedConfiguration;
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.io.Text;
+import org.junit.Assert;
 import org.junit.Test;
 
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/8d39b09b/src/server/src/test/java/org/apache/accumulo/server/iterators/MetadataBulkLoadFilterTest.java
----------------------------------------------------------------------
diff --git a/src/server/src/test/java/org/apache/accumulo/server/iterators/MetadataBulkLoadFilterTest.java
b/src/server/src/test/java/org/apache/accumulo/server/iterators/MetadataBulkLoadFilterTest.java
index 6233828..2ce25cc 100644
--- a/src/server/src/test/java/org/apache/accumulo/server/iterators/MetadataBulkLoadFilterTest.java
+++ b/src/server/src/test/java/org/apache/accumulo/server/iterators/MetadataBulkLoadFilterTest.java
@@ -21,7 +21,7 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.TreeMap;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.apache.accumulo.core.Constants;
 import org.apache.accumulo.core.conf.AccumuloConfiguration;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/8d39b09b/src/server/src/test/java/org/apache/accumulo/server/master/balancer/DefaultLoadBalancerTest.java
----------------------------------------------------------------------
diff --git a/src/server/src/test/java/org/apache/accumulo/server/master/balancer/DefaultLoadBalancerTest.java
b/src/server/src/test/java/org/apache/accumulo/server/master/balancer/DefaultLoadBalancerTest.java
index 7e715af..2c55f5d 100644
--- a/src/server/src/test/java/org/apache/accumulo/server/master/balancer/DefaultLoadBalancerTest.java
+++ b/src/server/src/test/java/org/apache/accumulo/server/master/balancer/DefaultLoadBalancerTest.java
@@ -32,8 +32,6 @@ import java.util.SortedMap;
 import java.util.TreeMap;
 import java.util.Map.Entry;
 
-import junit.framework.Assert;
-
 import org.apache.accumulo.core.data.KeyExtent;
 import org.apache.accumulo.core.master.thrift.TableInfo;
 import org.apache.accumulo.core.master.thrift.TabletServerStatus;
@@ -45,6 +43,7 @@ import org.apache.accumulo.server.master.state.TServerInstance;
 import org.apache.accumulo.server.master.state.TabletMigration;
 import org.apache.hadoop.io.Text;
 import org.apache.thrift.TException;
+import org.junit.Assert;
 import org.junit.Test;
 
 public class DefaultLoadBalancerTest {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/8d39b09b/src/server/src/test/java/org/apache/accumulo/server/master/balancer/TableLoadBalancerTest.java
----------------------------------------------------------------------
diff --git a/src/server/src/test/java/org/apache/accumulo/server/master/balancer/TableLoadBalancerTest.java
b/src/server/src/test/java/org/apache/accumulo/server/master/balancer/TableLoadBalancerTest.java
index 684c851..662b66d 100644
--- a/src/server/src/test/java/org/apache/accumulo/server/master/balancer/TableLoadBalancerTest.java
+++ b/src/server/src/test/java/org/apache/accumulo/server/master/balancer/TableLoadBalancerTest.java
@@ -25,8 +25,6 @@ import java.util.Set;
 import java.util.SortedMap;
 import java.util.TreeMap;
 
-import junit.framework.Assert;
-
 import org.apache.accumulo.core.client.Connector;
 import org.apache.accumulo.core.client.admin.TableOperations;
 import org.apache.accumulo.core.client.mock.MockInstance;
@@ -40,6 +38,7 @@ import org.apache.accumulo.server.master.state.TServerInstance;
 import org.apache.accumulo.server.master.state.TabletMigration;
 import org.apache.hadoop.io.Text;
 import org.apache.thrift.TException;
+import org.junit.Assert;
 import org.junit.Test;
 
 public class TableLoadBalancerTest {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/8d39b09b/src/server/src/test/java/org/apache/accumulo/server/zookeeper/DistributedReadWriteLockTest.java
----------------------------------------------------------------------
diff --git a/src/server/src/test/java/org/apache/accumulo/server/zookeeper/DistributedReadWriteLockTest.java
b/src/server/src/test/java/org/apache/accumulo/server/zookeeper/DistributedReadWriteLockTest.java
index b77a3ea..3964090 100644
--- a/src/server/src/test/java/org/apache/accumulo/server/zookeeper/DistributedReadWriteLockTest.java
+++ b/src/server/src/test/java/org/apache/accumulo/server/zookeeper/DistributedReadWriteLockTest.java
@@ -21,7 +21,7 @@ import java.util.TreeMap;
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReadWriteLock;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.apache.accumulo.server.zookeeper.DistributedReadWriteLock;
 import org.apache.accumulo.server.zookeeper.DistributedReadWriteLock.QueueLock;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/8d39b09b/src/server/src/test/java/org/apache/accumulo/server/zookeeper/TransactionWatcherTest.java
----------------------------------------------------------------------
diff --git a/src/server/src/test/java/org/apache/accumulo/server/zookeeper/TransactionWatcherTest.java
b/src/server/src/test/java/org/apache/accumulo/server/zookeeper/TransactionWatcherTest.java
index ced70ea..f45e780 100644
--- a/src/server/src/test/java/org/apache/accumulo/server/zookeeper/TransactionWatcherTest.java
+++ b/src/server/src/test/java/org/apache/accumulo/server/zookeeper/TransactionWatcherTest.java
@@ -22,7 +22,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.concurrent.Callable;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.apache.accumulo.server.zookeeper.TransactionWatcher;
 import org.junit.Test;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/8d39b09b/src/trace/src/test/java/org/apache/accumulo/cloudtrace/instrument/CountSamplerTest.java
----------------------------------------------------------------------
diff --git a/src/trace/src/test/java/org/apache/accumulo/cloudtrace/instrument/CountSamplerTest.java
b/src/trace/src/test/java/org/apache/accumulo/cloudtrace/instrument/CountSamplerTest.java
index df7a831..baf1618 100644
--- a/src/trace/src/test/java/org/apache/accumulo/cloudtrace/instrument/CountSamplerTest.java
+++ b/src/trace/src/test/java/org/apache/accumulo/cloudtrace/instrument/CountSamplerTest.java
@@ -16,9 +16,9 @@
  */
 package org.apache.accumulo.cloudtrace.instrument;
 
-import junit.framework.Assert;
 
 import org.apache.accumulo.cloudtrace.instrument.CountSampler;
+import org.junit.Assert;
 import org.junit.Test;
 
 public class CountSamplerTest {


Mime
View raw message