accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ctubb...@apache.org
Subject [01/24] accumulo git commit: ACCUMULO-4682 Enforce import ordering
Date Tue, 25 Jul 2017 23:02:49 GMT
Repository: accumulo
Updated Branches:
  refs/heads/1.7 f78a5d96b -> 465f6c459
  refs/heads/1.8 0f061b99c -> 018c7fe55
  refs/heads/master ff55fab2f -> 3fcc76f8b


http://git-wip-us.apache.org/repos/asf/accumulo/blob/465f6c45/shell/src/test/java/org/apache/accumulo/shell/ShellConfigTest.java
----------------------------------------------------------------------
diff --git a/shell/src/test/java/org/apache/accumulo/shell/ShellConfigTest.java b/shell/src/test/java/org/apache/accumulo/shell/ShellConfigTest.java
index 7b9f72f..2edee43 100644
--- a/shell/src/test/java/org/apache/accumulo/shell/ShellConfigTest.java
+++ b/shell/src/test/java/org/apache/accumulo/shell/ShellConfigTest.java
@@ -28,8 +28,6 @@ import java.io.PrintStream;
 import java.io.PrintWriter;
 import java.nio.file.Files;
 
-import jline.console.ConsoleReader;
-
 import org.apache.accumulo.core.client.ClientConfiguration;
 import org.apache.accumulo.core.client.security.tokens.PasswordToken;
 import org.apache.accumulo.shell.ShellTest.TestOutputStream;
@@ -42,6 +40,8 @@ import org.slf4j.LoggerFactory;
 
 import com.beust.jcommander.ParameterException;
 
+import jline.console.ConsoleReader;
+
 public class ShellConfigTest {
   TestOutputStream output;
   Shell shell;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/465f6c45/shell/src/test/java/org/apache/accumulo/shell/ShellSetInstanceTest.java
----------------------------------------------------------------------
diff --git a/shell/src/test/java/org/apache/accumulo/shell/ShellSetInstanceTest.java b/shell/src/test/java/org/apache/accumulo/shell/ShellSetInstanceTest.java
index 40f3442..3505a0f 100644
--- a/shell/src/test/java/org/apache/accumulo/shell/ShellSetInstanceTest.java
+++ b/shell/src/test/java/org/apache/accumulo/shell/ShellSetInstanceTest.java
@@ -35,8 +35,6 @@ import java.util.Collections;
 import java.util.List;
 import java.util.UUID;
 
-import jline.console.ConsoleReader;
-
 import org.apache.accumulo.core.client.ClientConfiguration;
 import org.apache.accumulo.core.client.ClientConfiguration.ClientProperty;
 import org.apache.accumulo.core.client.ZooKeeperInstance;
@@ -60,6 +58,8 @@ import org.powermock.core.classloader.annotations.PowerMockIgnore;
 import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.junit4.PowerMockRunner;
 
+import jline.console.ConsoleReader;
+
 @RunWith(PowerMockRunner.class)
 @PowerMockIgnore("javax.security.*")
 @PrepareForTest({Shell.class, ZooUtil.class, ConfigSanityCheck.class})

http://git-wip-us.apache.org/repos/asf/accumulo/blob/465f6c45/shell/src/test/java/org/apache/accumulo/shell/ShellTest.java
----------------------------------------------------------------------
diff --git a/shell/src/test/java/org/apache/accumulo/shell/ShellTest.java b/shell/src/test/java/org/apache/accumulo/shell/ShellTest.java
index 7a4a87e..a9ad358 100644
--- a/shell/src/test/java/org/apache/accumulo/shell/ShellTest.java
+++ b/shell/src/test/java/org/apache/accumulo/shell/ShellTest.java
@@ -33,8 +33,6 @@ import java.util.Date;
 import java.util.List;
 import java.util.TimeZone;
 
-import jline.console.ConsoleReader;
-
 import org.apache.accumulo.core.util.format.DateStringFormatter;
 import org.apache.log4j.Level;
 import org.junit.After;
@@ -43,6 +41,8 @@ import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import jline.console.ConsoleReader;
+
 public class ShellTest {
   private static final Logger log = LoggerFactory.getLogger(ShellTest.class);
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/465f6c45/shell/src/test/java/org/apache/accumulo/shell/commands/CompactCommandTest.java
----------------------------------------------------------------------
diff --git a/shell/src/test/java/org/apache/accumulo/shell/commands/CompactCommandTest.java
b/shell/src/test/java/org/apache/accumulo/shell/commands/CompactCommandTest.java
index 928f7f2..8c2ddc8 100644
--- a/shell/src/test/java/org/apache/accumulo/shell/commands/CompactCommandTest.java
+++ b/shell/src/test/java/org/apache/accumulo/shell/commands/CompactCommandTest.java
@@ -17,6 +17,7 @@
 package org.apache.accumulo.shell.commands;
 
 import static org.junit.Assert.assertTrue;
+
 import org.junit.Test;
 
 public class CompactCommandTest {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/465f6c45/shell/src/test/java/org/apache/accumulo/shell/commands/DeleteManyCommandTest.java
----------------------------------------------------------------------
diff --git a/shell/src/test/java/org/apache/accumulo/shell/commands/DeleteManyCommandTest.java
b/shell/src/test/java/org/apache/accumulo/shell/commands/DeleteManyCommandTest.java
index bfe370b..5d1b58a 100644
--- a/shell/src/test/java/org/apache/accumulo/shell/commands/DeleteManyCommandTest.java
+++ b/shell/src/test/java/org/apache/accumulo/shell/commands/DeleteManyCommandTest.java
@@ -17,6 +17,7 @@
 package org.apache.accumulo.shell.commands;
 
 import static org.junit.Assert.assertTrue;
+
 import org.junit.Test;
 
 public class DeleteManyCommandTest {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/465f6c45/shell/src/test/java/org/apache/accumulo/shell/commands/DeleteRowsCommandTest.java
----------------------------------------------------------------------
diff --git a/shell/src/test/java/org/apache/accumulo/shell/commands/DeleteRowsCommandTest.java
b/shell/src/test/java/org/apache/accumulo/shell/commands/DeleteRowsCommandTest.java
index 0cf8c11..be3401d 100644
--- a/shell/src/test/java/org/apache/accumulo/shell/commands/DeleteRowsCommandTest.java
+++ b/shell/src/test/java/org/apache/accumulo/shell/commands/DeleteRowsCommandTest.java
@@ -17,6 +17,7 @@
 package org.apache.accumulo.shell.commands;
 
 import static org.junit.Assert.assertTrue;
+
 import org.junit.Test;
 
 public class DeleteRowsCommandTest {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/465f6c45/shell/src/test/java/org/apache/accumulo/shell/commands/DropUserCommandTest.java
----------------------------------------------------------------------
diff --git a/shell/src/test/java/org/apache/accumulo/shell/commands/DropUserCommandTest.java
b/shell/src/test/java/org/apache/accumulo/shell/commands/DropUserCommandTest.java
index a08edc5..c8f6d5e 100644
--- a/shell/src/test/java/org/apache/accumulo/shell/commands/DropUserCommandTest.java
+++ b/shell/src/test/java/org/apache/accumulo/shell/commands/DropUserCommandTest.java
@@ -16,8 +16,6 @@
  */
 package org.apache.accumulo.shell.commands;
 
-import jline.console.ConsoleReader;
-
 import org.apache.accumulo.core.client.Connector;
 import org.apache.accumulo.core.client.admin.SecurityOperations;
 import org.apache.accumulo.shell.Shell;
@@ -26,6 +24,8 @@ import org.easymock.EasyMock;
 import org.junit.Before;
 import org.junit.Test;
 
+import jline.console.ConsoleReader;
+
 /**
  *
  */

http://git-wip-us.apache.org/repos/asf/accumulo/blob/465f6c45/shell/src/test/java/org/apache/accumulo/shell/commands/FlushCommandTest.java
----------------------------------------------------------------------
diff --git a/shell/src/test/java/org/apache/accumulo/shell/commands/FlushCommandTest.java
b/shell/src/test/java/org/apache/accumulo/shell/commands/FlushCommandTest.java
index 7250427..6950cf4 100644
--- a/shell/src/test/java/org/apache/accumulo/shell/commands/FlushCommandTest.java
+++ b/shell/src/test/java/org/apache/accumulo/shell/commands/FlushCommandTest.java
@@ -17,6 +17,7 @@
 package org.apache.accumulo.shell.commands;
 
 import static org.junit.Assert.assertTrue;
+
 import org.junit.Test;
 
 public class FlushCommandTest {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/465f6c45/shell/src/test/java/org/apache/accumulo/shell/commands/HistoryCommandTest.java
----------------------------------------------------------------------
diff --git a/shell/src/test/java/org/apache/accumulo/shell/commands/HistoryCommandTest.java
b/shell/src/test/java/org/apache/accumulo/shell/commands/HistoryCommandTest.java
index 638af3f..71c4983 100644
--- a/shell/src/test/java/org/apache/accumulo/shell/commands/HistoryCommandTest.java
+++ b/shell/src/test/java/org/apache/accumulo/shell/commands/HistoryCommandTest.java
@@ -25,16 +25,16 @@ import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 
-import jline.console.ConsoleReader;
-import jline.console.history.History;
-import jline.console.history.MemoryHistory;
-
 import org.apache.accumulo.shell.Shell;
 import org.apache.commons.cli.CommandLine;
 import org.junit.Assume;
 import org.junit.Before;
 import org.junit.Test;
 
+import jline.console.ConsoleReader;
+import jline.console.history.History;
+import jline.console.history.MemoryHistory;
+
 public class HistoryCommandTest {
 
   HistoryCommand command;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/465f6c45/shell/src/test/java/org/apache/accumulo/shell/commands/MergeCommandTest.java
----------------------------------------------------------------------
diff --git a/shell/src/test/java/org/apache/accumulo/shell/commands/MergeCommandTest.java
b/shell/src/test/java/org/apache/accumulo/shell/commands/MergeCommandTest.java
index 5cd2f2e..91303eb 100644
--- a/shell/src/test/java/org/apache/accumulo/shell/commands/MergeCommandTest.java
+++ b/shell/src/test/java/org/apache/accumulo/shell/commands/MergeCommandTest.java
@@ -17,6 +17,7 @@
 package org.apache.accumulo.shell.commands;
 
 import static org.junit.Assert.assertTrue;
+
 import org.junit.Test;
 
 public class MergeCommandTest {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/465f6c45/shell/src/test/java/org/apache/accumulo/shell/commands/ScanCommandTest.java
----------------------------------------------------------------------
diff --git a/shell/src/test/java/org/apache/accumulo/shell/commands/ScanCommandTest.java b/shell/src/test/java/org/apache/accumulo/shell/commands/ScanCommandTest.java
index 173d8a1..94ecf45 100644
--- a/shell/src/test/java/org/apache/accumulo/shell/commands/ScanCommandTest.java
+++ b/shell/src/test/java/org/apache/accumulo/shell/commands/ScanCommandTest.java
@@ -17,6 +17,7 @@
 package org.apache.accumulo.shell.commands;
 
 import static org.junit.Assert.assertTrue;
+
 import org.junit.Test;
 
 public class ScanCommandTest {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/465f6c45/shell/src/test/java/org/apache/accumulo/shell/format/DeleterFormatterTest.java
----------------------------------------------------------------------
diff --git a/shell/src/test/java/org/apache/accumulo/shell/format/DeleterFormatterTest.java
b/shell/src/test/java/org/apache/accumulo/shell/format/DeleterFormatterTest.java
index f3ccaa4..5e3e01a 100644
--- a/shell/src/test/java/org/apache/accumulo/shell/format/DeleterFormatterTest.java
+++ b/shell/src/test/java/org/apache/accumulo/shell/format/DeleterFormatterTest.java
@@ -35,9 +35,6 @@ import java.util.Collections;
 import java.util.Map;
 import java.util.TreeMap;
 
-import jline.UnsupportedTerminal;
-import jline.console.ConsoleReader;
-
 import org.apache.accumulo.core.client.BatchWriter;
 import org.apache.accumulo.core.client.MutationsRejectedException;
 import org.apache.accumulo.core.data.Key;
@@ -47,6 +44,9 @@ import org.apache.accumulo.shell.Shell;
 import org.junit.Before;
 import org.junit.Test;
 
+import jline.UnsupportedTerminal;
+import jline.console.ConsoleReader;
+
 public class DeleterFormatterTest {
   DeleterFormatter formatter;
   Map<Key,Value> data;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/465f6c45/test/src/main/java/org/apache/accumulo/test/HardListIterator.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/HardListIterator.java b/test/src/main/java/org/apache/accumulo/test/HardListIterator.java
index bd9cbf1..56ad28c 100644
--- a/test/src/main/java/org/apache/accumulo/test/HardListIterator.java
+++ b/test/src/main/java/org/apache/accumulo/test/HardListIterator.java
@@ -16,6 +16,13 @@
  */
 package org.apache.accumulo.test;
 
+import java.io.IOException;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Map;
+import java.util.SortedMap;
+import java.util.TreeMap;
+
 import org.apache.accumulo.core.data.ByteSequence;
 import org.apache.accumulo.core.data.Key;
 import org.apache.accumulo.core.data.PartialKey;
@@ -28,13 +35,6 @@ import org.apache.accumulo.core.util.PeekingIterator;
 import org.apache.hadoop.io.Text;
 import org.apache.log4j.Logger;
 
-import java.io.IOException;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Map;
-import java.util.SortedMap;
-import java.util.TreeMap;
-
 /**
  * A wrapper making a list of hardcoded data into a SKVI. For testing.
  */

http://git-wip-us.apache.org/repos/asf/accumulo/blob/465f6c45/test/src/test/java/org/apache/accumulo/test/functional/TableChangeStateIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/TableChangeStateIT.java
b/test/src/test/java/org/apache/accumulo/test/functional/TableChangeStateIT.java
index 7372dc7..e123322 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/TableChangeStateIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/TableChangeStateIT.java
@@ -16,6 +16,19 @@
  */
 package org.apache.accumulo.test.functional;
 
+import static java.nio.charset.StandardCharsets.UTF_8;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
+
 import org.apache.accumulo.core.Constants;
 import org.apache.accumulo.core.client.AccumuloException;
 import org.apache.accumulo.core.client.AccumuloSecurityException;
@@ -47,19 +60,6 @@ import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.Callable;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
-import java.util.concurrent.TimeUnit;
-
-import static java.nio.charset.StandardCharsets.UTF_8;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
 /**
  * ACCUMULO-4574. Test to verify that changing table state to online / offline {@link org.apache.accumulo.core.client.admin.TableOperations#online(String)}
when
  * the table is already in that state returns without blocking.

http://git-wip-us.apache.org/repos/asf/accumulo/blob/465f6c45/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 eaea61c..7b33cf5 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
@@ -1,5 +1,3 @@
-package org.apache.accumulo.test.functional;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -16,6 +14,8 @@ package org.apache.accumulo.test.functional;
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+package org.apache.accumulo.test.functional;
+
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/465f6c45/test/src/test/java/org/apache/accumulo/test/performance/scan/CollectTabletStatsTest.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/performance/scan/CollectTabletStatsTest.java
b/test/src/test/java/org/apache/accumulo/test/performance/scan/CollectTabletStatsTest.java
index 9d2b3e6..ed96254 100644
--- a/test/src/test/java/org/apache/accumulo/test/performance/scan/CollectTabletStatsTest.java
+++ b/test/src/test/java/org/apache/accumulo/test/performance/scan/CollectTabletStatsTest.java
@@ -16,12 +16,11 @@
  */
 package org.apache.accumulo.test.performance.scan;
 
-import org.apache.accumulo.core.cli.ScannerOpts;
+import static org.junit.Assert.assertEquals;
 
+import org.apache.accumulo.core.cli.ScannerOpts;
 import org.junit.Test;
 
-import static org.junit.Assert.assertEquals;
-
 /**
  * Created by etcoleman on 10/11/16.
  */

http://git-wip-us.apache.org/repos/asf/accumulo/blob/465f6c45/test/src/test/java/org/apache/accumulo/test/proxy/ProxyDurabilityIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/proxy/ProxyDurabilityIT.java b/test/src/test/java/org/apache/accumulo/test/proxy/ProxyDurabilityIT.java
index e7be1c7..83b6654 100644
--- a/test/src/test/java/org/apache/accumulo/test/proxy/ProxyDurabilityIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/proxy/ProxyDurabilityIT.java
@@ -36,9 +36,9 @@ import org.apache.accumulo.core.util.UtilWaitThread;
 import org.apache.accumulo.minicluster.ServerType;
 import org.apache.accumulo.minicluster.impl.MiniAccumuloConfigImpl;
 import org.apache.accumulo.minicluster.impl.ProcessReference;
-import org.apache.accumulo.proxy.thrift.AccumuloProxy.Client;
 import org.apache.accumulo.proxy.Proxy;
 import org.apache.accumulo.proxy.TestProxyClient;
+import org.apache.accumulo.proxy.thrift.AccumuloProxy.Client;
 import org.apache.accumulo.proxy.thrift.Column;
 import org.apache.accumulo.proxy.thrift.ColumnUpdate;
 import org.apache.accumulo.proxy.thrift.Condition;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/465f6c45/test/src/test/java/org/apache/accumulo/test/proxy/SimpleProxyBase.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/proxy/SimpleProxyBase.java b/test/src/test/java/org/apache/accumulo/test/proxy/SimpleProxyBase.java
index cac578e..feaa860 100644
--- a/test/src/test/java/org/apache/accumulo/test/proxy/SimpleProxyBase.java
+++ b/test/src/test/java/org/apache/accumulo/test/proxy/SimpleProxyBase.java
@@ -65,9 +65,9 @@ import org.apache.accumulo.harness.MiniClusterHarness;
 import org.apache.accumulo.harness.SharedMiniClusterIT;
 import org.apache.accumulo.harness.TestingKdc;
 import org.apache.accumulo.minicluster.impl.MiniAccumuloClusterImpl;
-import org.apache.accumulo.proxy.thrift.AccumuloProxy.Client;
 import org.apache.accumulo.proxy.Proxy;
 import org.apache.accumulo.proxy.TestProxyClient;
+import org.apache.accumulo.proxy.thrift.AccumuloProxy.Client;
 import org.apache.accumulo.proxy.thrift.AccumuloSecurityException;
 import org.apache.accumulo.proxy.thrift.ActiveCompaction;
 import org.apache.accumulo.proxy.thrift.ActiveScan;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/465f6c45/trace/src/main/java/org/apache/accumulo/trace/instrument/CountSampler.java
----------------------------------------------------------------------
diff --git a/trace/src/main/java/org/apache/accumulo/trace/instrument/CountSampler.java b/trace/src/main/java/org/apache/accumulo/trace/instrument/CountSampler.java
index ad3acfc..791f666 100644
--- a/trace/src/main/java/org/apache/accumulo/trace/instrument/CountSampler.java
+++ b/trace/src/main/java/org/apache/accumulo/trace/instrument/CountSampler.java
@@ -16,10 +16,10 @@
  */
 package org.apache.accumulo.trace.instrument;
 
-import org.apache.htrace.HTraceConfiguration;
-
 import java.util.Collections;
 
+import org.apache.htrace.HTraceConfiguration;
+
 /**
  * @deprecated since 1.7, use org.apache.htrace.impl.CountSampler instead
  */


Mime
View raw message