accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ctubb...@apache.org
Subject [6/9] accumulo git commit: ACCUMULO-4089 Apply autoformat to 1.6
Date Tue, 22 Dec 2015 23:37:15 GMT
ACCUMULO-4089 Apply autoformat to 1.6


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

Branch: refs/heads/master
Commit: da7aaeae9e4aed67981383b6d81aa1e1728fee85
Parents: 039a6af
Author: Christopher Tubbs <ctubbsii@apache.org>
Authored: Tue Dec 22 18:09:01 2015 -0500
Committer: Christopher Tubbs <ctubbsii@apache.org>
Committed: Tue Dec 22 18:19:16 2015 -0500

----------------------------------------------------------------------
 .../accumulo/core/client/BatchScanner.java      | 27 +++++++----------
 .../core/client/ClientConfiguration.java        |  8 ++---
 .../core/client/impl/ConditionalWriterImpl.java |  5 ++--
 .../core/client/impl/ThriftTransportPool.java   |  6 ++--
 .../client/mapreduce/AbstractInputFormat.java   |  4 +--
 .../core/client/mapreduce/InputFormatBase.java  |  3 +-
 .../accumulo/core/client/mock/MockShell.java    |  3 +-
 .../org/apache/accumulo/core/data/Mutation.java | 14 ++++-----
 .../core/file/blockfile/cache/HeapSize.java     |  1 -
 .../file/blockfile/cache/LruBlockCache.java     |  5 ++--
 .../accumulo/core/iterators/Combiner.java       | 14 +++++----
 .../accumulo/core/trace/ZooTraceClient.java     |  3 +-
 .../accumulo/core/util/HadoopCompatUtil.java    |  4 +--
 .../apache/accumulo/core/util/shell/Shell.java  |  2 +-
 .../core/util/shell/ShellOptionsJC.java         |  3 +-
 .../core/util/shell/commands/ScanCommand.java   |  8 ++---
 .../mapreduce/AccumuloInputFormatTest.java      |  6 ++--
 .../core/client/mock/MockNamespacesTest.java    |  5 ++--
 .../apache/accumulo/core/data/MutationTest.java | 16 +++++-----
 .../core/iterators/CombinerTestUtil.java        |  2 +-
 .../core/iterators/user/CombinerTest.java       | 15 +++++-----
 .../simple/mapreduce/TeraSortIngest.java        |  1 -
 .../accumulo/fate/zookeeper/ZooCache.java       |  6 ++--
 .../apache/accumulo/server/init/Initialize.java |  4 +--
 .../master/state/TabletStateChangeIterator.java |  2 +-
 .../server/problems/ProblemReports.java         |  7 ++---
 .../accumulo/server/util/CleanZookeeper.java    |  3 +-
 .../accumulo/server/util/FileSystemMonitor.java |  3 +-
 .../apache/accumulo/server/util/RpcWrapper.java |  8 ++---
 .../accumulo/server/util/SendLogToChainsaw.java |  4 +--
 .../accumulo/server/util/TabletIterator.java    |  6 ----
 .../server/util/FileSystemMonitorTest.java      | 31 +++++++-------------
 .../accumulo/gc/GarbageCollectionAlgorithm.java |  5 ++--
 .../java/org/apache/accumulo/master/Master.java |  6 ++--
 .../accumulo/master/tableOps/DeleteTable.java   |  5 ++--
 .../accumulo/monitor/servlets/BasicServlet.java |  4 +--
 .../org/apache/accumulo/tserver/Tablet.java     |  2 +-
 .../apache/accumulo/tserver/TabletServer.java   | 14 ++++-----
 .../tserver/TabletServerResourceManager.java    |  4 +--
 .../start/classloader/AccumuloClassLoader.java  |  4 +--
 .../test/continuous/ContinuousBatchWalker.java  | 10 -------
 .../concurrent/ConcurrentFixture.java           |  3 +-
 .../org/apache/accumulo/test/BalanceIT.java     |  2 +-
 .../test/DetectDeadTabletServersIT.java         |  1 -
 .../accumulo/test/functional/ConcurrencyIT.java |  5 ++--
 .../instrument/receivers/AsyncSpanReceiver.java |  4 +--
 .../instrument/receivers/ZooSpanClient.java     |  3 +-
 47 files changed, 125 insertions(+), 176 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/da7aaeae/core/src/main/java/org/apache/accumulo/core/client/BatchScanner.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/BatchScanner.java b/core/src/main/java/org/apache/accumulo/core/client/BatchScanner.java
index af0fd85..80842ab 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/BatchScanner.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/BatchScanner.java
@@ -22,31 +22,26 @@ import java.util.Collection;
 import java.util.concurrent.TimeUnit;
 
 /**
- * In exchange for possibly <b>returning scanned entries out of order</b>,
- * BatchScanner implementations may scan an Accumulo table more efficiently by
+ * In exchange for possibly <b>returning scanned entries out of order</b>, BatchScanner implementations may scan an Accumulo table more efficiently by
  * <ul>
- *   <li>Looking up multiple ranges in parallel.
- *   Parallelism is constrained by the number of threads available to the BatchScanner, set in its constructor.</li>
- *   <li>Breaking up large ranges into subranges.
- *   Often the number and boundaries of subranges are determined by a table's split points.</li>
- *   <li>Combining multiple ranges into a single RPC call to a tablet server.</li>
+ * <li>Looking up multiple ranges in parallel. Parallelism is constrained by the number of threads available to the BatchScanner, set in its constructor.</li>
+ * <li>Breaking up large ranges into subranges. Often the number and boundaries of subranges are determined by a table's split points.</li>
+ * <li>Combining multiple ranges into a single RPC call to a tablet server.</li>
  * </ul>
  *
  * The above techniques lead to better performance than a {@link Scanner} in use cases such as
  * <ul>
- *   <li>Retrieving many small ranges</li>
- *   <li>Scanning a large range that returns many entries</li>
- *   <li>Running server-side iterators that perform computation,
- *   even if few entries are returned from the scan itself</li>
+ * <li>Retrieving many small ranges</li>
+ * <li>Scanning a large range that returns many entries</li>
+ * <li>Running server-side iterators that perform computation, even if few entries are returned from the scan itself</li>
  * </ul>
  *
- * To re-emphasize, only use a BatchScanner when you do not care whether returned data is in sorted order.
- * Use a {@link Scanner} instead when sorted order is important.
+ * To re-emphasize, only use a BatchScanner when you do not care whether returned data is in sorted order. Use a {@link Scanner} instead when sorted order is
+ * important.
  *
  * <p>
- * A BatchScanner instance will use no more threads than provided in the construction of the BatchScanner
- * implementation. Multiple invocations of <code>iterator()</code> will all share the same resources of the instance.
- * A new BatchScanner instance should be created to use allocate additional threads.
+ * A BatchScanner instance will use no more threads than provided in the construction of the BatchScanner implementation. Multiple invocations of
+ * <code>iterator()</code> will all share the same resources of the instance. A new BatchScanner instance should be created to use allocate additional threads.
  */
 
 public interface BatchScanner extends ScannerBase {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/da7aaeae/core/src/main/java/org/apache/accumulo/core/client/ClientConfiguration.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/ClientConfiguration.java b/core/src/main/java/org/apache/accumulo/core/client/ClientConfiguration.java
index 6bccc09..8770f38 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/ClientConfiguration.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/ClientConfiguration.java
@@ -171,11 +171,11 @@ public class ClientConfiguration extends CompositeConfiguration {
   }
 
   /**
-   * Muck the value of {@code clientConfPath} if it points to a directory by appending
-   * {@code client.conf} to the end of the file path. This is a no-op if the value is not a
-   * directory on the filesystem.
+   * Muck the value of {@code clientConfPath} if it points to a directory by appending {@code client.conf} to the end of the file path. This is a no-op if the
+   * value is not a directory on the filesystem.
    *
-   * @param clientConfPath The value of ACCUMULO_CLIENT_CONF_PATH.
+   * @param clientConfPath
+   *          The value of ACCUMULO_CLIENT_CONF_PATH.
    */
   static String getClientConfPath(String clientConfPath) {
     if (null == clientConfPath) {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/da7aaeae/core/src/main/java/org/apache/accumulo/core/client/impl/ConditionalWriterImpl.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/ConditionalWriterImpl.java b/core/src/main/java/org/apache/accumulo/core/client/impl/ConditionalWriterImpl.java
index b91b830..730cf08 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/impl/ConditionalWriterImpl.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/impl/ConditionalWriterImpl.java
@@ -650,9 +650,8 @@ class ConditionalWriterImpl implements ConditionalWriter {
 
   /*
    * The purpose of this code is to ensure that a conditional mutation will not execute when its status is unknown. This allows a user to read the row when the
-   * status is unknown and not have to worry about the tserver applying the mutation after the scan.
-   *
-   * If a conditional mutation is taking a long time to process, then this method will wait for it to finish... unless this exceeds timeout.
+   * status is unknown and not have to worry about the tserver applying the mutation after the scan. If a conditional mutation is taking a long time to process,
+   * then this method will wait for it to finish... unless this exceeds timeout.
    */
   private void invalidateSession(SessionID sessionId, String location) throws AccumuloException, AccumuloSecurityException, TableNotFoundException {
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/da7aaeae/core/src/main/java/org/apache/accumulo/core/client/impl/ThriftTransportPool.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/ThriftTransportPool.java b/core/src/main/java/org/apache/accumulo/core/client/impl/ThriftTransportPool.java
index 33997e0..d508da1 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/impl/ThriftTransportPool.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/impl/ThriftTransportPool.java
@@ -194,10 +194,8 @@ public class ThriftTransportPool {
 
     final void checkForStuckIO(long threshold) {
       /*
-       * checking for stuck io needs to be light weight.
-       *
-       * Tried to call System.currentTimeMillis() and Thread.currentThread() before every io operation.... this dramatically slowed things down. So switched to
-       * incrementing a counter before and after each io operation.
+       * checking for stuck io needs to be light weight. Tried to call System.currentTimeMillis() and Thread.currentThread() before every io operation.... this
+       * dramatically slowed things down. So switched to incrementing a counter before and after each io operation.
        */
 
       if ((ioCount & 1) == 1) {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/da7aaeae/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AbstractInputFormat.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AbstractInputFormat.java b/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AbstractInputFormat.java
index 112e6e5..99bab3f 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AbstractInputFormat.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AbstractInputFormat.java
@@ -71,7 +71,7 @@ import org.apache.log4j.Logger;
  * An abstract input format to provide shared methods common to all other input format classes. At the very least, any classes inheriting from this class will
  * need to define their own {@link RecordReader}.
  */
-public abstract class AbstractInputFormat<K, V> extends InputFormat<K,V> {
+public abstract class AbstractInputFormat<K,V> extends InputFormat<K,V> {
 
   protected static final Class<?> CLASS = AccumuloInputFormat.class;
   protected static final Logger log = Logger.getLogger(CLASS);
@@ -355,7 +355,7 @@ public abstract class AbstractInputFormat<K, V> extends InputFormat<K,V> {
    * <li>int {@link #numKeysRead} (used for progress reporting)</li>
    * </ul>
    */
-  protected abstract static class AbstractRecordReader<K, V> extends RecordReader<K,V> {
+  protected abstract static class AbstractRecordReader<K,V> extends RecordReader<K,V> {
     protected long numKeysRead;
     protected Iterator<Map.Entry<Key,Value>> scannerIterator;
     protected RangeInputSplit split;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/da7aaeae/core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputFormatBase.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputFormatBase.java b/core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputFormatBase.java
index de65f1d..a60cb80 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputFormatBase.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputFormatBase.java
@@ -308,8 +308,7 @@ public abstract class InputFormatBase<K,V> extends AbstractInputFormat<K,V> {
    */
   @Deprecated
   protected static TabletLocator getTabletLocator(JobContext context) throws TableNotFoundException {
-    return InputConfigurator.getTabletLocator(CLASS, getConfiguration(context), InputConfigurator.getInputTableName(CLASS,
-        getConfiguration(context)));
+    return InputConfigurator.getTabletLocator(CLASS, getConfiguration(context), InputConfigurator.getInputTableName(CLASS, getConfiguration(context)));
   }
 
   protected abstract static class RecordReaderBase<K,V> extends AbstractRecordReader<K,V> {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/da7aaeae/core/src/main/java/org/apache/accumulo/core/client/mock/MockShell.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/mock/MockShell.java b/core/src/main/java/org/apache/accumulo/core/client/mock/MockShell.java
index e4680bd..bcac7c8 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/mock/MockShell.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/mock/MockShell.java
@@ -169,7 +169,8 @@ public class MockShell extends Shell {
   }
 
   @Override
-  public ClassLoader getClassLoader(final CommandLine cl, final Shell shellState) throws AccumuloException, TableNotFoundException, AccumuloSecurityException, IOException, FileSystemException {
+  public ClassLoader getClassLoader(final CommandLine cl, final Shell shellState) throws AccumuloException, TableNotFoundException, AccumuloSecurityException,
+      IOException, FileSystemException {
     return MockShell.class.getClassLoader();
   }
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/da7aaeae/core/src/main/java/org/apache/accumulo/core/data/Mutation.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/data/Mutation.java b/core/src/main/java/org/apache/accumulo/core/data/Mutation.java
index e4e229c..6c33d5d 100644
--- a/core/src/main/java/org/apache/accumulo/core/data/Mutation.java
+++ b/core/src/main/java/org/apache/accumulo/core/data/Mutation.java
@@ -80,11 +80,9 @@ public class Mutation implements Writable {
     }
   }
 
-  /* This is so hashCode & equals can be called without changing this object.
-   *
-   * It will return a copy of the current data buffer if serialized has not been
-   * called previously. Otherwise, this.data will be returned since the buffer is
-   * null and will not change.
+  /*
+   * This is so hashCode & equals can be called without changing this object. It will return a copy of the current data buffer if serialized has not been called
+   * previously. Otherwise, this.data will be returned since the buffer is null and will not change.
    */
   private ByteBuffer serializedSnapshot() {
     if (buffer != null) {
@@ -635,11 +633,9 @@ public class Mutation implements Writable {
   }
 
   /**
-   * Creates a {@link org.apache.accumulo.core.data.thrift.TMutation} object
-   * containing this Mutation's data.
+   * Creates a {@link org.apache.accumulo.core.data.thrift.TMutation} object containing this Mutation's data.
    *
-   * Note that this method will move the Mutation into a "serialized" state
-   * that will prevent users from adding more data via Mutation#put().
+   * Note that this method will move the Mutation into a "serialized" state that will prevent users from adding more data via Mutation#put().
    *
    * @return a thrift form of this Mutation
    */

http://git-wip-us.apache.org/repos/asf/accumulo/blob/da7aaeae/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/HeapSize.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/HeapSize.java b/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/HeapSize.java
index 59e94dd..e6aef42 100644
--- a/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/HeapSize.java
+++ b/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/HeapSize.java
@@ -28,7 +28,6 @@ package org.apache.accumulo.core.file.blockfile.cache;
  *
  * <pre>
  * public class SampleObject implements HeapSize {
- *
  *   int[] numbers;
  *   int x;
  * }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/da7aaeae/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/LruBlockCache.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/LruBlockCache.java b/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/LruBlockCache.java
index cc9d94f..d1b9f34 100644
--- a/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/LruBlockCache.java
+++ b/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/LruBlockCache.java
@@ -500,9 +500,8 @@ public class LruBlockCache implements BlockCache, HeapSize {
   }
 
   /*
-   * Eviction thread. Sits in waiting state until an eviction is triggered when the cache size grows above the acceptable level.<p>
-   *
-   * Thread is triggered into action by {@link LruBlockCache#runEviction()}
+   * Eviction thread. Sits in waiting state until an eviction is triggered when the cache size grows above the acceptable level. Thread is triggered into action
+   * by {@link LruBlockCache#runEviction()}
    */
   private static class EvictionThread extends Thread {
     private WeakReference<LruBlockCache> cache;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/da7aaeae/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 5dd4f82..6d08e5e 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
@@ -67,7 +67,7 @@ import com.google.common.collect.Lists;
  * WARNING : Using deletes with Combiners may not work as intended. See {@link #setReduceOnFullCompactionOnly(IteratorSetting, boolean)}
  */
 public abstract class Combiner extends WrappingIterator implements OptionDescriber {
-  static final Logger sawDeleteLog = Logger.getLogger(Combiner.class.getName()+".SawDelete");
+  static final Logger sawDeleteLog = Logger.getLogger(Combiner.class.getName() + ".SawDelete");
   protected static final String COLUMNS_OPTION = "columns";
   protected static final String ALL_OPTION = "all";
   protected static final String REDUCE_ON_FULL_COMPACTION_ONLY_OPTION = "reduceOnFullCompactionOnly";
@@ -175,8 +175,10 @@ public abstract class Combiner extends WrappingIterator implements OptionDescrib
         loggedMsgCache.get(this.getClass().getName(), new Callable<Boolean>() {
           @Override
           public Boolean call() throws Exception {
-            sawDeleteLog.error("Combiner of type " + Combiner.this.getClass().getSimpleName()
-                + " saw a delete during a partial compaction.  This could cause undesired results.  See ACCUMULO-2232.  Will not log subsequent occurences for at least 1 hour.");
+            sawDeleteLog
+                .error("Combiner of type "
+                    + Combiner.this.getClass().getSimpleName()
+                    + " saw a delete during a partial compaction.  This could cause undesired results.  See ACCUMULO-2232.  Will not log subsequent occurences for at least 1 hour.");
             // the value is not used and does not matter
             return Boolean.TRUE;
           }
@@ -376,9 +378,9 @@ public abstract class Combiner extends WrappingIterator implements OptionDescrib
 
   /**
    * Combiners may not work correctly with deletes. Sometimes when Accumulo compacts the files in a tablet, it only compacts a subset of the files. If a delete
-   * marker exists in one of the files that is not being compacted, then data that should be deleted may be combined. See
-   * <a href="https://issues.apache.org/jira/browse/ACCUMULO-2232">ACCUMULO-2232</a> for more information. For correctness deletes should not be used with
-   * columns that are combined OR this option should be set to true.
+   * marker exists in one of the files that is not being compacted, then data that should be deleted may be combined. See <a
+   * href="https://issues.apache.org/jira/browse/ACCUMULO-2232">ACCUMULO-2232</a> for more information. For correctness deletes should not be used with columns
+   * that are combined OR this option should be set to true.
    *
    * <p>
    * When this method is set to true all data is passed through during partial major compactions and no reducing is done. Reducing is only done during scan and

http://git-wip-us.apache.org/repos/asf/accumulo/blob/da7aaeae/core/src/main/java/org/apache/accumulo/core/trace/ZooTraceClient.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/trace/ZooTraceClient.java b/core/src/main/java/org/apache/accumulo/core/trace/ZooTraceClient.java
index 58108fb..0da8ec5 100644
--- a/core/src/main/java/org/apache/accumulo/core/trace/ZooTraceClient.java
+++ b/core/src/main/java/org/apache/accumulo/core/trace/ZooTraceClient.java
@@ -44,7 +44,8 @@ public class ZooTraceClient extends SendSpansViaThrift implements Watcher {
   final Random random = new Random();
   final List<String> hosts = new ArrayList<String>();
 
-  public ZooTraceClient(ZooReader zoo, String path, String host, String service, long millis, int maxQueueSize) throws IOException, KeeperException, InterruptedException {
+  public ZooTraceClient(ZooReader zoo, String path, String host, String service, long millis, int maxQueueSize) throws IOException, KeeperException,
+      InterruptedException {
     super(host, service, millis, maxQueueSize);
     this.path = path;
     this.zoo = zoo;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/da7aaeae/core/src/main/java/org/apache/accumulo/core/util/HadoopCompatUtil.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/util/HadoopCompatUtil.java b/core/src/main/java/org/apache/accumulo/core/util/HadoopCompatUtil.java
index 27e07e1..3382731 100644
--- a/core/src/main/java/org/apache/accumulo/core/util/HadoopCompatUtil.java
+++ b/core/src/main/java/org/apache/accumulo/core/util/HadoopCompatUtil.java
@@ -28,10 +28,10 @@ public class HadoopCompatUtil {
 
   /**
    * Uses reflection to pull Configuration out of the JobContext for Hadoop 1 and Hadoop2 compatibility
+   *
    * @param context
    *          The job context for which to return the configuration
-   * @return
-   *          The Hadoop Configuration- irrespective of the version of Hadoop on the classpath.
+   * @return The Hadoop Configuration- irrespective of the version of Hadoop on the classpath.
    */
   public static Configuration getConfiguration(JobContext context) {
     try {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/da7aaeae/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java b/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java
index 143ce28..66dd7b2 100644
--- a/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java
+++ b/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java
@@ -537,7 +537,7 @@ public class Shell extends ShellOptions {
 
   public static void main(String args[]) throws IOException {
     Shell shell = new Shell();
-    try{
+    try {
       if (!shell.config(args)) {
         System.exit(shell.getExitCode());
       }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/da7aaeae/core/src/main/java/org/apache/accumulo/core/util/shell/ShellOptionsJC.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/util/shell/ShellOptionsJC.java b/core/src/main/java/org/apache/accumulo/core/util/shell/ShellOptionsJC.java
index ecb2695..2045eba 100644
--- a/core/src/main/java/org/apache/accumulo/core/util/shell/ShellOptionsJC.java
+++ b/core/src/main/java/org/apache/accumulo/core/util/shell/ShellOptionsJC.java
@@ -283,7 +283,8 @@ public class ShellOptionsJC {
 
     // Automatically try to add in the proper ZK from accumulo-site for backwards compat.
     if (!clientConfig.containsKey(ClientProperty.INSTANCE_ZK_HOST.getKey())) {
-      AccumuloConfiguration siteConf = SiteConfiguration.getInstance(ServerConfigurationUtil.convertClientConfig(DefaultConfiguration.getInstance(), clientConfig));
+      AccumuloConfiguration siteConf = SiteConfiguration.getInstance(ServerConfigurationUtil.convertClientConfig(DefaultConfiguration.getInstance(),
+          clientConfig));
       clientConfig.withZkHosts(siteConf.get(Property.INSTANCE_ZK_HOST));
     }
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/da7aaeae/core/src/main/java/org/apache/accumulo/core/util/shell/commands/ScanCommand.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/util/shell/commands/ScanCommand.java b/core/src/main/java/org/apache/accumulo/core/util/shell/commands/ScanCommand.java
index 78657b9..9a0026a 100644
--- a/core/src/main/java/org/apache/accumulo/core/util/shell/commands/ScanCommand.java
+++ b/core/src/main/java/org/apache/accumulo/core/util/shell/commands/ScanCommand.java
@@ -120,11 +120,11 @@ public class ScanCommand extends Command {
     return Long.MAX_VALUE;
   }
 
-  static void ensureTserversCanLoadIterator(final Shell shellState, String tableName, String classname)
-      throws AccumuloException, AccumuloSecurityException, TableNotFoundException, ShellCommandException {
+  static void ensureTserversCanLoadIterator(final Shell shellState, String tableName, String classname) throws AccumuloException, AccumuloSecurityException,
+      TableNotFoundException, ShellCommandException {
     if (!shellState.getConnector().tableOperations().testClassLoad(tableName, classname, SortedKeyValueIterator.class.getName())) {
-      throw new ShellCommandException(ErrorCode.INITIALIZATION_FAILURE,
-          "Servers are unable to load " + classname + " as type " + SortedKeyValueIterator.class.getName());
+      throw new ShellCommandException(ErrorCode.INITIALIZATION_FAILURE, "Servers are unable to load " + classname + " as type "
+          + SortedKeyValueIterator.class.getName());
     }
   }
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/da7aaeae/core/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloInputFormatTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloInputFormatTest.java b/core/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloInputFormatTest.java
index 1801b37..8c8e063 100644
--- a/core/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloInputFormatTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloInputFormatTest.java
@@ -364,10 +364,8 @@ public class AccumuloInputFormatTest {
     }
     bw.close();
 
-    Assert.assertEquals(
-        0,
-        MRTester.main(new String[] {user, "", "testtable", "testPartialInputSplitDelegationToConfiguration",
-            EmptySplitsAccumuloInputFormat.class.getName()}));
+    Assert.assertEquals(0,
+        MRTester.main(new String[] {user, "", "testtable", "testPartialInputSplitDelegationToConfiguration", EmptySplitsAccumuloInputFormat.class.getName()}));
     assertNull(e1);
     assertNull(e2);
   }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/da7aaeae/core/src/test/java/org/apache/accumulo/core/client/mock/MockNamespacesTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/client/mock/MockNamespacesTest.java b/core/src/test/java/org/apache/accumulo/core/client/mock/MockNamespacesTest.java
index c85c438..8a65920 100644
--- a/core/src/test/java/org/apache/accumulo/core/client/mock/MockNamespacesTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/client/mock/MockNamespacesTest.java
@@ -211,9 +211,8 @@ public class MockNamespacesTest {
 
     // TODO implement clone in mock
     /*
-     * c.tableOperations().clone(tableName1, tableName2, false, null, null);
-     *
-     * assertTrue(c.tableOperations().exists(tableName1)); assertTrue(c.tableOperations().exists(tableName2));
+     * c.tableOperations().clone(tableName1, tableName2, false, null, null); assertTrue(c.tableOperations().exists(tableName1));
+     * assertTrue(c.tableOperations().exists(tableName2));
      */
     return;
   }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/da7aaeae/core/src/test/java/org/apache/accumulo/core/data/MutationTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/data/MutationTest.java b/core/src/test/java/org/apache/accumulo/core/data/MutationTest.java
index 21272ff..7c84c40 100644
--- a/core/src/test/java/org/apache/accumulo/core/data/MutationTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/data/MutationTest.java
@@ -611,17 +611,17 @@ public class MutationTest {
     new Mutation(tm1);
   }
 
-  /* The following two tests assert that no exception is thrown after calling
-   * hashCode or equals on a Mutation. These guard against the condition noted
-   * in ACCUMULO-3718.
+  /*
+   * The following two tests assert that no exception is thrown after calling hashCode or equals on a Mutation. These guard against the condition noted in
+   * ACCUMULO-3718.
    */
   @Test
   public void testPutAfterHashCode() {
     Mutation m = new Mutation("r");
     m.hashCode();
     try {
-        m.put("cf", "cq", "v");
-    } catch(IllegalStateException e) {
+      m.put("cf", "cq", "v");
+    } catch (IllegalStateException e) {
       fail("Calling Mutation#hashCode then Mutation#put should not result in an IllegalStateException.");
     }
   }
@@ -632,9 +632,9 @@ public class MutationTest {
     Mutation m2 = new Mutation("r2");
     m.equals(m2);
     try {
-        m.put("cf", "cq", "v");
-        m2.put("cf", "cq", "v");
-    } catch(IllegalStateException e) {
+      m.put("cf", "cq", "v");
+      m2.put("cf", "cq", "v");
+    } catch (IllegalStateException e) {
       fail("Calling Mutation#equals then Mutation#put should not result in an IllegalStateException.");
     }
   }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/da7aaeae/core/src/test/java/org/apache/accumulo/core/iterators/CombinerTestUtil.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/iterators/CombinerTestUtil.java b/core/src/test/java/org/apache/accumulo/core/iterators/CombinerTestUtil.java
index f874173..f9ef933 100644
--- a/core/src/test/java/org/apache/accumulo/core/iterators/CombinerTestUtil.java
+++ b/core/src/test/java/org/apache/accumulo/core/iterators/CombinerTestUtil.java
@@ -17,7 +17,7 @@
 package org.apache.accumulo.core.iterators;
 
 public class CombinerTestUtil {
-  public static void clearLogCache(){
+  public static void clearLogCache() {
     Combiner.loggedMsgCache.invalidateAll();
   }
 }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/da7aaeae/core/src/test/java/org/apache/accumulo/core/iterators/user/CombinerTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/iterators/user/CombinerTest.java b/core/src/test/java/org/apache/accumulo/core/iterators/user/CombinerTest.java
index 152e12f..525f9a8 100644
--- a/core/src/test/java/org/apache/accumulo/core/iterators/user/CombinerTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/iterators/user/CombinerTest.java
@@ -688,8 +688,8 @@ public class CombinerTest {
       assertEquals(a[i], b[i]);
   }
 
-  public static void sumArray(Class<? extends Encoder<List<Long>>> encoderClass, SummingArrayCombiner.Type type)
-      throws IOException, InstantiationException, IllegalAccessException {
+  public static void sumArray(Class<? extends Encoder<List<Long>>> encoderClass, SummingArrayCombiner.Type type) throws IOException, InstantiationException,
+      IllegalAccessException {
     Encoder<List<Long>> encoder = encoderClass.newInstance();
 
     TreeMap<Key,Value> tm1 = new TreeMap<Key,Value>();
@@ -829,13 +829,12 @@ public class CombinerTest {
     return ret;
   }
 
-  private void runDeleteHandlingTest(TreeMap<Key,Value> input, TreeMap<Key,Value> expected, Boolean rofco, IteratorEnvironment env)
-      throws Exception {
+  private void runDeleteHandlingTest(TreeMap<Key,Value> input, TreeMap<Key,Value> expected, Boolean rofco, IteratorEnvironment env) throws Exception {
     runDeleteHandlingTest(input, expected, rofco, env, null, true);
   }
 
-  private void runDeleteHandlingTest(TreeMap<Key,Value> input, TreeMap<Key,Value> expected, Boolean rofco, IteratorEnvironment env,
-      String expectedLog) throws Exception {
+  private void runDeleteHandlingTest(TreeMap<Key,Value> input, TreeMap<Key,Value> expected, Boolean rofco, IteratorEnvironment env, String expectedLog)
+      throws Exception {
     runDeleteHandlingTest(input, expected, rofco, env, expectedLog, true);
     if (expectedLog != null) {
       // run test again... should not see log message again because cache is not cleared
@@ -843,8 +842,8 @@ public class CombinerTest {
     }
   }
 
-  private void runDeleteHandlingTest(TreeMap<Key,Value> input, TreeMap<Key,Value> expected, Boolean rofco, IteratorEnvironment env,
-      String expectedLog, boolean clearLogMsgCache) throws Exception {
+  private void runDeleteHandlingTest(TreeMap<Key,Value> input, TreeMap<Key,Value> expected, Boolean rofco, IteratorEnvironment env, String expectedLog,
+      boolean clearLogMsgCache) throws Exception {
     boolean deepCopy = expected == null;
 
     if (clearLogMsgCache) {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/da7aaeae/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/TeraSortIngest.java
----------------------------------------------------------------------
diff --git a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/TeraSortIngest.java b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/TeraSortIngest.java
index f591e2c..aa6cf0a 100644
--- a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/TeraSortIngest.java
+++ b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/TeraSortIngest.java
@@ -50,7 +50,6 @@ import org.apache.hadoop.util.ToolRunner;
 
 import com.beust.jcommander.Parameter;
 
-
 /**
  * Generate the *almost* official terasort input data set. (See below) The user specifies the number of rows and the output directory and this class runs a
  * map/reduce program to generate the data. The format of the data is:

http://git-wip-us.apache.org/repos/asf/accumulo/blob/da7aaeae/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooCache.java
----------------------------------------------------------------------
diff --git a/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooCache.java b/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooCache.java
index 32a6043..e13b2cc 100644
--- a/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooCache.java
+++ b/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooCache.java
@@ -257,10 +257,8 @@ public class ZooCache {
 
         /*
          * The following call to exists() is important, since we are caching that a node does not exist. Once the node comes into existence, it will be added to
-         * the cache. But this notification of a node coming into existence will only be given if exists() was previously called.
-         *
-         * If the call to exists() is bypassed and only getData() is called with a special case that looks for Code.NONODE in the KeeperException, then
-         * non-existence can not be cached.
+         * the cache. But this notification of a node coming into existence will only be given if exists() was previously called. If the call to exists() is
+         * bypassed and only getData() is called with a special case that looks for Code.NONODE in the KeeperException, then non-existence can not be cached.
          */
 
         Stat stat = zooKeeper.exists(zPath, watcher);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/da7aaeae/server/base/src/main/java/org/apache/accumulo/server/init/Initialize.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/init/Initialize.java b/server/base/src/main/java/org/apache/accumulo/server/init/Initialize.java
index fcc22c5..491dc25 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/init/Initialize.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/init/Initialize.java
@@ -534,8 +534,8 @@ public class Initialize {
 
     for (Pair<Path,Path> replacementVolume : ServerConstants.getVolumeReplacements()) {
       if (aBasePath.equals(replacementVolume.getFirst()))
-        log.error(aBasePath + " is set to be replaced in " + Property.INSTANCE_VOLUMES_REPLACEMENTS + " and should not appear in " +
-            Property.INSTANCE_VOLUMES + ". It is highly recommended that this property be removed as data could still be written to this volume.");
+        log.error(aBasePath + " is set to be replaced in " + Property.INSTANCE_VOLUMES_REPLACEMENTS + " and should not appear in " + Property.INSTANCE_VOLUMES
+            + ". It is highly recommended that this property be removed as data could still be written to this volume.");
     }
 
     UUID uuid = UUID.fromString(ZooUtil.getInstanceIDFromHdfs(iidPath, ServerConfiguration.getSiteConfiguration()));

http://git-wip-us.apache.org/repos/asf/accumulo/blob/da7aaeae/server/base/src/main/java/org/apache/accumulo/server/master/state/TabletStateChangeIterator.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/master/state/TabletStateChangeIterator.java b/server/base/src/main/java/org/apache/accumulo/server/master/state/TabletStateChangeIterator.java
index 133013c..d9e9ddf 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/master/state/TabletStateChangeIterator.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/master/state/TabletStateChangeIterator.java
@@ -230,7 +230,7 @@ public class TabletStateChangeIterator extends SkippingIterator {
   public static void setMigrations(IteratorSetting cfg, Collection<KeyExtent> migrations) {
     DataOutputBuffer buffer = new DataOutputBuffer();
     try {
-      for (KeyExtent  extent : migrations) {
+      for (KeyExtent extent : migrations) {
         extent.write(buffer);
       }
     } catch (Exception ex) {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/da7aaeae/server/base/src/main/java/org/apache/accumulo/server/problems/ProblemReports.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/problems/ProblemReports.java b/server/base/src/main/java/org/apache/accumulo/server/problems/ProblemReports.java
index f9391f9..0824ecf 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/problems/ProblemReports.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/problems/ProblemReports.java
@@ -61,10 +61,9 @@ public class ProblemReports implements Iterable<ProblemReport> {
   private final LRUMap problemReports = new LRUMap(1000);
 
   /*
-   * use a thread pool so that reporting a problem never blocks
-   *
-   * make the thread pool use a bounded queue to avoid the case where problem reports are not being processed because the whole system is in a really bad state
-   * (like HDFS is down) and everything is reporting lots of problems, but problem reports can not be processed
+   * use a thread pool so that reporting a problem never blocks make the thread pool use a bounded queue to avoid the case where problem reports are not being
+   * processed because the whole system is in a really bad state (like HDFS is down) and everything is reporting lots of problems, but problem reports can not
+   * be processed
    */
   private ExecutorService reportExecutor = new ThreadPoolExecutor(0, 1, 60, TimeUnit.SECONDS, new LinkedBlockingQueue<Runnable>(500), new NamingThreadFactory(
       "acu-problem-reporter"));

http://git-wip-us.apache.org/repos/asf/accumulo/blob/da7aaeae/server/base/src/main/java/org/apache/accumulo/server/util/CleanZookeeper.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/CleanZookeeper.java b/server/base/src/main/java/org/apache/accumulo/server/util/CleanZookeeper.java
index 46a82ab..0e89b41 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/util/CleanZookeeper.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/util/CleanZookeeper.java
@@ -36,7 +36,8 @@ public class CleanZookeeper {
   private static final Logger log = Logger.getLogger(CleanZookeeper.class);
 
   static class Opts extends Help {
-    @Parameter(names = {"-z", "--keepers"}, description = "Comma-separated list of zookeeper hosts, if different than instance.zookeeper.host in accumulo-site.xml")
+    @Parameter(names = {"-z", "--keepers"},
+        description = "Comma-separated list of zookeeper hosts, if different than instance.zookeeper.host in accumulo-site.xml")
     String keepers = "localhost:2181";
     @Parameter(names = {"--password"}, description = "The system secret, if different than instance.secret in accumulo-site.xml", password = true)
     String auth;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/da7aaeae/server/base/src/main/java/org/apache/accumulo/server/util/FileSystemMonitor.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/FileSystemMonitor.java b/server/base/src/main/java/org/apache/accumulo/server/util/FileSystemMonitor.java
index e2e1d46..04893d5 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/util/FileSystemMonitor.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/util/FileSystemMonitor.java
@@ -62,8 +62,7 @@ public class FileSystemMonitor {
     @Override
     public String toString() {
       StringBuilder sb = new StringBuilder(32);
-      sb.append(device).append(" on ").append(mountPoint).append(" as ").append(filesystemType)
-          .append(" with options ").append(options);
+      sb.append(device).append(" on ").append(mountPoint).append(" as ").append(filesystemType).append(" with options ").append(options);
       return sb.toString();
     }
   }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/da7aaeae/server/base/src/main/java/org/apache/accumulo/server/util/RpcWrapper.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/RpcWrapper.java b/server/base/src/main/java/org/apache/accumulo/server/util/RpcWrapper.java
index 78a9d4f..1f58488 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/util/RpcWrapper.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/util/RpcWrapper.java
@@ -39,10 +39,10 @@ import org.slf4j.LoggerFactory;
  * a network issue, but informs the client that a {@link TApplicationException} had occurred, as it did in Thrift 0.9.0. This performs similar functions as
  * {@link TraceWrap}, but with the additional action of translating exceptions. See also ACCUMULO-1691 and ACCUMULO-2950.
  *
- * ACCUMULO-4065 found that the above exception-wrapping is not appropriate for Thrift's implementation of oneway methods. Oneway methods are defined as
- * a method which the client does not wait for it to return. Normally, this is acceptable as these methods are void. Therefore, if another client reuses
- * the connection to send a new RPC, there is no "extra" data sitting on the InputStream from the Socket (that the server sent). However, the implementation
- * of a oneway method <em>does</em> send a response to the client when the implementation throws a {@link TException}. This message showing up on the client's
+ * ACCUMULO-4065 found that the above exception-wrapping is not appropriate for Thrift's implementation of oneway methods. Oneway methods are defined as a
+ * method which the client does not wait for it to return. Normally, this is acceptable as these methods are void. Therefore, if another client reuses the
+ * connection to send a new RPC, there is no "extra" data sitting on the InputStream from the Socket (that the server sent). However, the implementation of a
+ * oneway method <em>does</em> send a response to the client when the implementation throws a {@link TException}. This message showing up on the client's
  * InputStream causes future use of the Thrift Connection to become unusable. As long as the Thrift implementation sends a message back when oneway methods
  * throw a {@link TException}, we much make sure that we don't re-wrap-and-throw any exceptions as {@link TException}s.
  *

http://git-wip-us.apache.org/repos/asf/accumulo/blob/da7aaeae/server/base/src/main/java/org/apache/accumulo/server/util/SendLogToChainsaw.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/SendLogToChainsaw.java b/server/base/src/main/java/org/apache/accumulo/server/util/SendLogToChainsaw.java
index f38eb24..197a72e 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/util/SendLogToChainsaw.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/util/SendLogToChainsaw.java
@@ -56,8 +56,8 @@ import com.beust.jcommander.Parameter;
 
 public class SendLogToChainsaw extends XMLLayout {
 
-  private static Pattern logPattern = Pattern
-      .compile("^(\\d\\d)\\s(\\d\\d):(\\d\\d):(\\d\\d),(\\d\\d\\d)\\s\\[(.*)\\]\\s(TRACE|DEBUG|INFO|WARN|FATAL|ERROR)\\s*?:(.*)$", Pattern.UNIX_LINES);
+  private static Pattern logPattern = Pattern.compile(
+      "^(\\d\\d)\\s(\\d\\d):(\\d\\d):(\\d\\d),(\\d\\d\\d)\\s\\[(.*)\\]\\s(TRACE|DEBUG|INFO|WARN|FATAL|ERROR)\\s*?:(.*)$", Pattern.UNIX_LINES);
 
   private File[] logFiles = null;
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/da7aaeae/server/base/src/main/java/org/apache/accumulo/server/util/TabletIterator.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/TabletIterator.java b/server/base/src/main/java/org/apache/accumulo/server/util/TabletIterator.java
index 3bc6c96..fee2bc8 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/util/TabletIterator.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/util/TabletIterator.java
@@ -74,12 +74,6 @@ public class TabletIterator implements Iterator<Map<Key,Value>> {
     }
   }
 
-  /*
-   * public TabletIterator(String table, boolean returnPrevEndRow){
-   *
-   * }
-   */
-
   /**
    *
    * @param s

http://git-wip-us.apache.org/repos/asf/accumulo/blob/da7aaeae/server/base/src/test/java/org/apache/accumulo/server/util/FileSystemMonitorTest.java
----------------------------------------------------------------------
diff --git a/server/base/src/test/java/org/apache/accumulo/server/util/FileSystemMonitorTest.java b/server/base/src/test/java/org/apache/accumulo/server/util/FileSystemMonitorTest.java
index c8c9116..ec389fd 100644
--- a/server/base/src/test/java/org/apache/accumulo/server/util/FileSystemMonitorTest.java
+++ b/server/base/src/test/java/org/apache/accumulo/server/util/FileSystemMonitorTest.java
@@ -38,19 +38,14 @@ public class FileSystemMonitorTest {
 
   @Test
   public void testFilteredMountEntries() throws Exception {
-    String[] mountEntries = new String[] {
-        "rootfs / rootfs rw 0 0",
-        "proc /proc proc rw,nosuid,nodev,noexec,relatime 0 0",
+    String[] mountEntries = new String[] {"rootfs / rootfs rw 0 0", "proc /proc proc rw,nosuid,nodev,noexec,relatime 0 0",
         "sysfs /sys sysfs rw,seclabel,nosuid,nodev,noexec,relatime 0 0",
         "devtmpfs /dev devtmpfs rw,seclabel,nosuid,size=8119336k,nr_inodes=2029834,mode=755 0 0",
-        "securityfs /sys/kernel/security securityfs rw,nosuid,nodev,noexec,relatime 0 0",
-        "tmpfs /dev/shm tmpfs rw,seclabel,nosuid,nodev 0 0",
-        "devpts /dev/pts devpts rw,seclabel,nosuid,noexec,relatime,gid=5,mode=620,ptmxmode=000 0 0",
-        "tmpfs /run tmpfs rw,seclabel,nosuid,nodev,mode=755 0 0",
+        "securityfs /sys/kernel/security securityfs rw,nosuid,nodev,noexec,relatime 0 0", "tmpfs /dev/shm tmpfs rw,seclabel,nosuid,nodev 0 0",
+        "devpts /dev/pts devpts rw,seclabel,nosuid,noexec,relatime,gid=5,mode=620,ptmxmode=000 0 0", "tmpfs /run tmpfs rw,seclabel,nosuid,nodev,mode=755 0 0",
         "tmpfs /sys/fs/cgroup tmpfs ro,seclabel,nosuid,nodev,noexec,mode=755 0 0",
         "cgroup /sys/fs/cgroup/systemd cgroup rw,nosuid,nodev,noexec,relatime,xattr,release_agent=/usr/lib/systemd/systemd-cgroups-agent,name=systemd 0 0",
-        "pstore /sys/fs/pstore pstore rw,nosuid,nodev,noexec,relatime 0 0",
-        "cgroup /sys/fs/cgroup/cpuset cgroup rw,nosuid,nodev,noexec,relatime,cpuset 0 0",
+        "pstore /sys/fs/pstore pstore rw,nosuid,nodev,noexec,relatime 0 0", "cgroup /sys/fs/cgroup/cpuset cgroup rw,nosuid,nodev,noexec,relatime,cpuset 0 0",
         "cgroup /sys/fs/cgroup/cpu,cpuacct cgroup rw,nosuid,nodev,noexec,relatime,cpuacct,cpu 0 0",
         "cgroup /sys/fs/cgroup/memory cgroup rw,nosuid,nodev,noexec,relatime,memory 0 0",
         "cgroup /sys/fs/cgroup/devices cgroup rw,nosuid,nodev,noexec,relatime,devices 0 0",
@@ -58,19 +53,13 @@ public class FileSystemMonitorTest {
         "cgroup /sys/fs/cgroup/net_cls cgroup rw,nosuid,nodev,noexec,relatime,net_cls 0 0",
         "cgroup /sys/fs/cgroup/blkio cgroup rw,nosuid,nodev,noexec,relatime,blkio 0 0",
         "cgroup /sys/fs/cgroup/perf_event cgroup rw,nosuid,nodev,noexec,relatime,perf_event 0 0",
-        "cgroup /sys/fs/cgroup/hugetlb cgroup rw,nosuid,nodev,noexec,relatime,hugetlb 0 0",
-        "configfs /sys/kernel/config configfs rw,relatime 0 0",
-        "/dev/vda1 / xfs rw,seclabel,relatime,attr2,inode64,noquota 0 0",
-        "/dev/vda2 /ignoreme reiserfs rw 0 0",
-        "rpc_pipefs /var/lib/nfs/rpc_pipefs rpc_pipefs rw,relatime 0 0",
-        "selinuxfs /sys/fs/selinux selinuxfs rw,relatime 0 0",
+        "cgroup /sys/fs/cgroup/hugetlb cgroup rw,nosuid,nodev,noexec,relatime,hugetlb 0 0", "configfs /sys/kernel/config configfs rw,relatime 0 0",
+        "/dev/vda1 / xfs rw,seclabel,relatime,attr2,inode64,noquota 0 0", "/dev/vda2 /ignoreme reiserfs rw 0 0",
+        "rpc_pipefs /var/lib/nfs/rpc_pipefs rpc_pipefs rw,relatime 0 0", "selinuxfs /sys/fs/selinux selinuxfs rw,relatime 0 0",
         "systemd-1 /proc/sys/fs/binfmt_misc autofs rw,relatime,fd=32,pgrp=1,timeout=300,minproto=5,maxproto=5,direct 0 0",
-        "debugfs /sys/kernel/debug debugfs rw,relatime 0 0",
-        "mqueue /dev/mqueue mqueue rw,seclabel,relatime 0 0",
-        "hugetlbfs /dev/hugepages hugetlbfs rw,seclabel,relatime 0 0",
-        "sunrpc /proc/fs/nfsd nfsd rw,relatime 0 0",
-        "/dev/vdb /grid/0 ext4 rw,seclabel,relatime,data=ordered 0 0"
-    };
+        "debugfs /sys/kernel/debug debugfs rw,relatime 0 0", "mqueue /dev/mqueue mqueue rw,seclabel,relatime 0 0",
+        "hugetlbfs /dev/hugepages hugetlbfs rw,seclabel,relatime 0 0", "sunrpc /proc/fs/nfsd nfsd rw,relatime 0 0",
+        "/dev/vdb /grid/0 ext4 rw,seclabel,relatime,data=ordered 0 0"};
 
     StringBuilder sb = new StringBuilder(256);
     for (String mountEntry : mountEntries) {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/da7aaeae/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectionAlgorithm.java
----------------------------------------------------------------------
diff --git a/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectionAlgorithm.java b/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectionAlgorithm.java
index a8cde31..6605a8a 100644
--- a/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectionAlgorithm.java
+++ b/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectionAlgorithm.java
@@ -230,9 +230,8 @@ public class GarbageCollectionAlgorithm {
 
   }
 
-  private boolean getCandidates(GarbageCollectionEnvironment gce, String lastCandidate, List<String> candidates)
-      throws TableNotFoundException, AccumuloException,
-      AccumuloSecurityException {
+  private boolean getCandidates(GarbageCollectionEnvironment gce, String lastCandidate, List<String> candidates) throws TableNotFoundException,
+      AccumuloException, AccumuloSecurityException {
     Span candidatesSpan = Trace.start("getCandidates");
     try {
       return gce.getCandidates(lastCandidate, candidates);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/da7aaeae/server/master/src/main/java/org/apache/accumulo/master/Master.java
----------------------------------------------------------------------
diff --git a/server/master/src/main/java/org/apache/accumulo/master/Master.java b/server/master/src/main/java/org/apache/accumulo/master/Master.java
index 0434714..78d26bf 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/Master.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/Master.java
@@ -841,7 +841,7 @@ public class Master implements LiveTServerSet.Listener, TableObserver, CurrentSt
                   break;
               }
           }
-        }catch(Throwable t) {
+        } catch (Throwable t) {
           log.error("Error occurred reading / switching master goal state. Will continue with attempt to update status", t);
         }
 
@@ -1032,8 +1032,8 @@ public class Master implements LiveTServerSet.Listener, TableObserver, CurrentSt
       throw new IOException(e);
     }
 
-    Processor<Iface> processor = new Processor<Iface>(
-        RpcWrapper.service(new MasterClientServiceHandler(this), new Processor<Iface>(new MasterClientServiceHandler(this))));
+    Processor<Iface> processor = new Processor<Iface>(RpcWrapper.service(new MasterClientServiceHandler(this), new Processor<Iface>(
+        new MasterClientServiceHandler(this))));
     ServerAddress sa = TServerUtils.startServer(getSystemConfiguration(), hostname, Property.MASTER_CLIENTPORT, processor, "Master",
         "Master Client Service Handler", null, Property.MASTER_MINTHREADS, Property.MASTER_THREADCHECK, Property.GENERAL_MAX_MESSAGE_SIZE);
     clientService = sa.server;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/da7aaeae/server/master/src/main/java/org/apache/accumulo/master/tableOps/DeleteTable.java
----------------------------------------------------------------------
diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/DeleteTable.java b/server/master/src/main/java/org/apache/accumulo/master/tableOps/DeleteTable.java
index 960bc19..37b20b8 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/tableOps/DeleteTable.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/tableOps/DeleteTable.java
@@ -74,9 +74,8 @@ class CleanUp extends MasterRepo {
     in.defaultReadObject();
 
     /*
-     * handle the case where we start executing on a new machine where the current time is in the past relative to the previous machine
-     *
-     * if the new machine has time in the future, that will work ok w/ hasCycled
+     * handle the case where we start executing on a new machine where the current time is in the past relative to the previous machine if the new machine has
+     * time in the future, that will work ok w/ hasCycled
      */
     if (System.currentTimeMillis() < creationTime) {
       creationTime = System.currentTimeMillis();

http://git-wip-us.apache.org/repos/asf/accumulo/blob/da7aaeae/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/BasicServlet.java
----------------------------------------------------------------------
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/BasicServlet.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/BasicServlet.java
index f39fe4d..4b708c9 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/BasicServlet.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/BasicServlet.java
@@ -155,8 +155,8 @@ abstract public class BasicServlet extends HttpServlet {
     }
     sb.append("<div id='headertitle'>");
     sb.append("<h1>").append(getTitle(req)).append("</h1></div>\n");
-    sb.append("<div id='subheader'>Instance&nbsp;Name:&nbsp;").append(Monitor.cachedInstanceName.get()).append("&nbsp;&nbsp;&nbsp;Version:&nbsp;").append(Constants.VERSION)
-        .append("\n");
+    sb.append("<div id='subheader'>Instance&nbsp;Name:&nbsp;").append(Monitor.cachedInstanceName.get()).append("&nbsp;&nbsp;&nbsp;Version:&nbsp;")
+        .append(Constants.VERSION).append("\n");
     sb.append("<br><span class='smalltext'>Instance&nbsp;ID:&nbsp;").append(HdfsZooInstance.getInstance().getInstanceID()).append("</span>\n");
     sb.append("<br><span class='smalltext'>").append(new Date().toString().replace(" ", "&nbsp;")).append("</span>");
     sb.append("</div>\n"); // end <div id='subheader'>

http://git-wip-us.apache.org/repos/asf/accumulo/blob/da7aaeae/server/tserver/src/main/java/org/apache/accumulo/tserver/Tablet.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/Tablet.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/Tablet.java
index 8faa3dc..efed665 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/Tablet.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/Tablet.java
@@ -3363,7 +3363,7 @@ public class Tablet {
         this.notifyAll();
       }
 
-      if(span != null){
+      if (span != null) {
         span.data("extent", "" + getExtent());
         if (majCStats != null) {
           span.data("read", "" + majCStats.getEntriesRead());

http://git-wip-us.apache.org/repos/asf/accumulo/blob/da7aaeae/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
index dce66b0..0ec5339 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
@@ -2984,14 +2984,12 @@ public class TabletServer extends AbstractMetricsImpl implements org.apache.accu
         locationToOpen = VolumeUtil.switchRootTabletVolume(extent, locationToOpen);
         tablet = new Tablet(TabletServer.this, locationToOpen, extent, trm, tabletsKeyValues);
         /*
-         * If a minor compaction starts after a tablet opens, this indicates a log recovery occurred. This recovered data must be minor compacted.
-         *
-         * There are three reasons to wait for this minor compaction to finish before placing the tablet in online tablets.
-         *
-         * 1) The log recovery code does not handle data written to the tablet on multiple tablet servers. 2) The log recovery code does not block if memory is
-         * full. Therefore recovering lots of tablets that use a lot of memory could run out of memory. 3) The minor compaction finish event did not make it to
-         * the logs (the file will be in metadata, preventing replay of compacted data)... but do not want a majc to wipe the file out from metadata and then
-         * have another process failure... this could cause duplicate data to replay
+         * If a minor compaction starts after a tablet opens, this indicates a log recovery occurred. This recovered data must be minor compacted. There are
+         * three reasons to wait for this minor compaction to finish before placing the tablet in online tablets. 1) The log recovery code does not handle data
+         * written to the tablet on multiple tablet servers. 2) The log recovery code does not block if memory is full. Therefore recovering lots of tablets
+         * that use a lot of memory could run out of memory. 3) The minor compaction finish event did not make it to the logs (the file will be in metadata,
+         * preventing replay of compacted data)... but do not want a majc to wipe the file out from metadata and then have another process failure... this could
+         * cause duplicate data to replay
          */
         if (tablet.getNumEntriesInMemory() > 0 && !tablet.minorCompactNow(MinorCompactionReason.RECOVERY)) {
           throw new RuntimeException("Minor compaction after recovery fails for " + extent);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/da7aaeae/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServerResourceManager.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServerResourceManager.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServerResourceManager.java
index ccdee32..7b4f9f1 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServerResourceManager.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServerResourceManager.java
@@ -169,8 +169,8 @@ public class TabletServerResourceManager {
     if (usingNativeMap) {
       // Still check block cache sizes when using native maps.
       if (dCacheSize + iCacheSize > runtime.maxMemory()) {
-        throw new IllegalArgumentException(String.format(
-            "Block cache sizes %,d is too large for this JVM configuration %,d", dCacheSize + iCacheSize, runtime.maxMemory()));
+        throw new IllegalArgumentException(String.format("Block cache sizes %,d is too large for this JVM configuration %,d", dCacheSize + iCacheSize,
+            runtime.maxMemory()));
       }
     } else if (maxMemory + dCacheSize + iCacheSize > runtime.maxMemory()) {
       throw new IllegalArgumentException(String.format(

http://git-wip-us.apache.org/repos/asf/accumulo/blob/da7aaeae/start/src/main/java/org/apache/accumulo/start/classloader/AccumuloClassLoader.java
----------------------------------------------------------------------
diff --git a/start/src/main/java/org/apache/accumulo/start/classloader/AccumuloClassLoader.java b/start/src/main/java/org/apache/accumulo/start/classloader/AccumuloClassLoader.java
index b170eb0..26e9dfb 100644
--- a/start/src/main/java/org/apache/accumulo/start/classloader/AccumuloClassLoader.java
+++ b/start/src/main/java/org/apache/accumulo/start/classloader/AccumuloClassLoader.java
@@ -94,8 +94,8 @@ public class AccumuloClassLoader {
   }
 
   /**
-   * Parses and XML Document for a property node for a &lt;name&gt; with the value propertyName if it finds one the function return that property's value for its
-   * &lt;value&gt; node. If not found the function will return null
+   * Parses and XML Document for a property node for a &lt;name&gt; with the value propertyName if it finds one the function return that property's value for
+   * its &lt;value&gt; node. If not found the function will return null
    *
    * @param d
    *          XMLDocument to search through

http://git-wip-us.apache.org/repos/asf/accumulo/blob/da7aaeae/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousBatchWalker.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousBatchWalker.java b/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousBatchWalker.java
index a2687bb..65b6077 100644
--- a/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousBatchWalker.java
+++ b/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousBatchWalker.java
@@ -79,16 +79,6 @@ public class ContinuousBatchWalker {
 
   }
 
-  /*
-   * private static void runSequentialScan(Scanner scanner, List<Range> ranges) { Set<Text> srowsSeen = new HashSet<Text>(); long st1 =
-   * System.currentTimeMillis(); int scount = 0; for (Range range : ranges) { scanner.setRange(range);
-   *
-   * for (Entry<Key,Value> entry : scanner) { srowsSeen.add(entry.getKey().getRow()); scount++; } }
-   *
-   *
-   * long st2 = System.currentTimeMillis(); System.out.println("SRQ "+(st2 - st1)+" "+srowsSeen.size() +" "+scount); }
-   */
-
   private static void runBatchScan(int batchSize, BatchScanner bs, Set<Text> batch, List<Range> ranges) {
     bs.setRanges(ranges);
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/da7aaeae/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/ConcurrentFixture.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/ConcurrentFixture.java b/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/ConcurrentFixture.java
index 7963c8b..5b9a4bc 100644
--- a/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/ConcurrentFixture.java
+++ b/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/ConcurrentFixture.java
@@ -36,8 +36,7 @@ public class ConcurrentFixture extends Fixture {
   public void setUp(State state) throws Exception {}
 
   @Override
-  public void tearDown(State state) throws Exception {
-  }
+  public void tearDown(State state) throws Exception {}
 
   /**
    *

http://git-wip-us.apache.org/repos/asf/accumulo/blob/da7aaeae/test/src/test/java/org/apache/accumulo/test/BalanceIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/BalanceIT.java b/test/src/test/java/org/apache/accumulo/test/BalanceIT.java
index 7c8e452..c245e78 100644
--- a/test/src/test/java/org/apache/accumulo/test/BalanceIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/BalanceIT.java
@@ -60,7 +60,7 @@ public class BalanceIT extends ConfigurableMacIT {
   }
 
   private boolean isBalanced(Connector c) throws Exception {
-    Map<String, Integer> counts = new HashMap<String, Integer>();
+    Map<String,Integer> counts = new HashMap<String,Integer>();
     Scanner scanner = c.createScanner(MetadataTable.NAME, Authorizations.EMPTY);
     scanner.setRange(MetadataSchema.TabletsSection.getRange());
     scanner.fetchColumnFamily(MetadataSchema.TabletsSection.CurrentLocationColumnFamily.NAME);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/da7aaeae/test/src/test/java/org/apache/accumulo/test/DetectDeadTabletServersIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/DetectDeadTabletServersIT.java b/test/src/test/java/org/apache/accumulo/test/DetectDeadTabletServersIT.java
index 11fa06b..1e65601 100644
--- a/test/src/test/java/org/apache/accumulo/test/DetectDeadTabletServersIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/DetectDeadTabletServersIT.java
@@ -92,5 +92,4 @@ public class DetectDeadTabletServersIT extends ConfigurableMacIT {
     }
   }
 
-
 }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/da7aaeae/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 4134298..3647cb4 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
@@ -75,9 +75,8 @@ public class ConcurrencyIT extends AccumuloClusterIT {
   }
 
   /*
-   * Below is a diagram of the operations in this test over time.
-   *
-   * Scan 0 |------------------------------| Scan 1 |----------| Minc 1 |-----| Scan 2 |----------| Scan 3 |---------------| Minc 2 |-----| Majc 1 |-----|
+   * Below is a diagram of the operations in this test over time. Scan 0 |------------------------------| Scan 1 |----------| Minc 1 |-----| Scan 2 |----------|
+   * Scan 3 |---------------| Minc 2 |-----| Majc 1 |-----|
    */
 
   @Test

http://git-wip-us.apache.org/repos/asf/accumulo/blob/da7aaeae/trace/src/main/java/org/apache/accumulo/trace/instrument/receivers/AsyncSpanReceiver.java
----------------------------------------------------------------------
diff --git a/trace/src/main/java/org/apache/accumulo/trace/instrument/receivers/AsyncSpanReceiver.java b/trace/src/main/java/org/apache/accumulo/trace/instrument/receivers/AsyncSpanReceiver.java
index 5fe46c8..753a58c 100644
--- a/trace/src/main/java/org/apache/accumulo/trace/instrument/receivers/AsyncSpanReceiver.java
+++ b/trace/src/main/java/org/apache/accumulo/trace/instrument/receivers/AsyncSpanReceiver.java
@@ -107,8 +107,8 @@ public abstract class AsyncSpanReceiver<SpanKey,Destination> implements SpanRece
     if (sendQueue.size() > maxQueueSize) {
       long now = System.currentTimeMillis();
       if (now - lastNotificationOfDroppedSpans > 60 * 1000) {
-        log.warn("Tracing spans are being dropped because there are already " + maxQueueSize + " spans queued for delivery.\n" +
-            "This does not affect performance, security or data integrity, but distributed tracing information is being lost.");
+        log.warn("Tracing spans are being dropped because there are already " + maxQueueSize + " spans queued for delivery.\n"
+            + "This does not affect performance, security or data integrity, but distributed tracing information is being lost.");
         lastNotificationOfDroppedSpans = now;
       }
       return;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/da7aaeae/trace/src/main/java/org/apache/accumulo/trace/instrument/receivers/ZooSpanClient.java
----------------------------------------------------------------------
diff --git a/trace/src/main/java/org/apache/accumulo/trace/instrument/receivers/ZooSpanClient.java b/trace/src/main/java/org/apache/accumulo/trace/instrument/receivers/ZooSpanClient.java
index 7a6e44f..ce0a703 100644
--- a/trace/src/main/java/org/apache/accumulo/trace/instrument/receivers/ZooSpanClient.java
+++ b/trace/src/main/java/org/apache/accumulo/trace/instrument/receivers/ZooSpanClient.java
@@ -46,7 +46,8 @@ public class ZooSpanClient extends SendSpansViaThrift {
   final Random random = new Random();
   final List<String> hosts = new ArrayList<String>();
 
-  public ZooSpanClient(String keepers, final String path, String host, String service, long millis, int maxQueueSize) throws IOException, KeeperException, InterruptedException {
+  public ZooSpanClient(String keepers, final String path, String host, String service, long millis, int maxQueueSize) throws IOException, KeeperException,
+      InterruptedException {
     super(host, service, millis, maxQueueSize);
     this.path = path;
     zoo = new ZooKeeper(keepers, 30 * 1000, new Watcher() {


Mime
View raw message