accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ctubb...@apache.org
Subject [accumulo] branch master updated: Made all long literals end with 'L' (#431)
Date Wed, 18 Apr 2018 22:06:37 GMT
This is an automated email from the ASF dual-hosted git repository.

ctubbsii pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/accumulo.git


The following commit(s) were added to refs/heads/master by this push:
     new 70598ed  Made all long literals end with 'L' (#431)
70598ed is described below

commit 70598edf5e690991914b242d3548995abfe9d578
Author: Mike Walch <mwalch@apache.org>
AuthorDate: Wed Apr 18 18:06:35 2018 -0400

    Made all long literals end with 'L' (#431)
---
 .../mapred/AccumuloFileOutputFormatTest.java       |  24 ++--
 .../client/mapred/AccumuloOutputFormatTest.java    |  18 +--
 .../mapreduce/AccumuloFileOutputFormatTest.java    |  24 ++--
 .../client/mapreduce/AccumuloOutputFormatTest.java |  18 +--
 .../java/org/apache/accumulo/core/Constants.java   |   2 +-
 .../accumulo/core/client/BatchWriterConfig.java    |   4 +-
 .../accumulo/core/client/impl/ScannerIterator.java |   4 +-
 .../core/client/impl/ThriftTransportPool.java      |   4 +-
 .../core/client/lexicoder/DoubleLexicoder.java     |   4 +-
 .../core/client/lexicoder/LongLexicoder.java       |   4 +-
 .../core/client/lexicoder/UIntegerLexicoder.java   |   2 +-
 .../core/client/lexicoder/ULongLexicoder.java      |   4 +-
 .../core/client/lexicoder/UUIDLexicoder.java       |   6 +-
 .../core/client/mock/MockTableOperations.java      |   2 +-
 .../core/client/summary/CounterSummary.java        |  10 +-
 .../core/client/summary/CountingSummarizer.java    |   2 +-
 .../org/apache/accumulo/core/data/Mutation.java    |  28 ++--
 .../accumulo/core/file/rfile/MultiLevelIndex.java  |   4 +-
 .../accumulo/core/iterators/LongCombiner.java      |   2 +-
 .../core/iterators/aggregation/NumSummation.java   |   4 +-
 .../core/iterators/user/SummingArrayCombiner.java  |   4 +-
 .../accumulo/core/summary/SummaryCollection.java   |   2 +-
 .../org/apache/accumulo/core/util/MapCounter.java  |   2 +-
 .../accumulo/core/util/SimpleThreadPool.java       |   4 +-
 .../core/client/BatchWriterConfigTest.java         |  24 ++--
 .../core/client/impl/TableOperationsImplTest.java  |   2 +-
 .../core/client/impl/ThriftTransportKeyTest.java   |   8 +-
 .../core/client/lexicoder/ListLexicoderTest.java   |  20 +--
 .../core/client/lexicoder/LongLexicoderTest.java   |  16 +--
 .../core/client/lexicoder/PairLexicoderTest.java   |   4 +-
 .../client/lexicoder/ReverseLexicoderTest.java     |  14 +-
 .../core/client/lexicoder/ULongLexicoderTest.java  |  46 +++----
 .../core/client/lexicoder/UUIDLexicoderTest.java   |   4 +-
 .../core/client/mock/MockTableOperationsTest.java  |   2 +-
 .../accumulo/core/client/rfile/RFileTest.java      |  40 +++---
 .../security/tokens/DelegationTokenImplTest.java   |  12 +-
 .../client/summary/CountingSummarizerTest.java     | 146 ++++++++++-----------
 .../core/conf/ConfigurationTypeHelperTest.java     |  18 +--
 .../org/apache/accumulo/core/data/KeyTest.java     |   4 +-
 .../apache/accumulo/core/data/MutationTest.java    | 120 ++++++++---------
 .../org/apache/accumulo/core/data/OldMutation.java |  20 +--
 .../org/apache/accumulo/core/data/RangeTest.java   |  16 +--
 .../accumulo/core/file/rfile/RFileMetricsTest.java |  18 +--
 .../iterators/aggregation/NumSummationTest.java    |  14 +-
 .../iterators/system/TimeSettingIteratorTest.java  |  30 ++---
 .../accumulo/core/iterators/user/CombinerTest.java | 122 ++++++++---------
 .../accumulo/core/iterators/user/FilterTest.java   |  20 +--
 .../core/iterators/user/RegExFilterTest.java       |   2 +-
 .../core/iterators/user/TestCfCqSlice.java         |   2 +-
 .../iterators/user/TransformingIteratorTest.java   |   2 +-
 .../user/WholeColumnFamilyIteratorTest.java        |  22 ++--
 .../core/iterators/user/WholeRowIteratorTest.java  |  22 ++--
 .../core/rpc/SaslConnectionParamsTest.java         |   6 +-
 .../AuthenticationTokenIdentifierTest.java         |   8 +-
 .../org/apache/accumulo/core/util/NumUtilTest.java |   8 +-
 .../java/org/apache/accumulo/fate/ZooStore.java    |   2 +-
 .../apache/accumulo/fate/ReadOnlyStoreTest.java    |  32 ++---
 .../fate/zookeeper/ZooReaderWriterTest.java        |   2 +-
 .../apache/accumulo/minicluster/MemoryUnit.java    |   8 +-
 .../impl/MiniAccumuloConfigImplTest.java           |  12 +-
 .../main/java/org/apache/accumulo/proxy/Proxy.java |   4 +-
 .../accumulo/server/data/ServerMutation.java       |   2 +-
 .../server/master/balancer/TabletBalancer.java     |   4 +-
 .../server/replication/ReplicationUtil.java        |   2 +-
 .../accumulo/server/util/MetadataTableUtil.java    |   2 +-
 .../apache/accumulo/server/util/RandomWriter.java  |   2 +-
 .../accumulo/server/util/TableDiskUsage.java       |   2 +-
 .../accumulo/server/data/ServerMutationTest.java   |   4 +-
 .../master/balancer/ChaoticLoadBalancerTest.java   |   2 +-
 .../master/balancer/DefaultLoadBalancerTest.java   |   2 +-
 .../server/replication/StatusCombinerTest.java     |  12 +-
 .../server/replication/StatusUtilTest.java         |   2 +-
 .../server/rpc/SaslDigestCallbackHandlerTest.java  |  12 +-
 .../security/delegation/AuthenticationKeyTest.java |   4 +-
 .../AuthenticationTokenKeyManagerTest.java         |  20 +--
 .../AuthenticationTokenSecretManagerTest.java      |   2 +-
 .../ZooAuthenticationKeyDistributorTest.java       |  14 +-
 .../ZooAuthenticationKeyWatcherTest.java           |  34 ++---
 .../org/apache/accumulo/server/util/AdminTest.java |   2 +-
 .../java/org/apache/accumulo/master/Master.java    |   2 +-
 .../accumulo/master/recovery/RecoveryManager.java  |   2 +-
 .../replication/MasterReplicationCoordinator.java  |   2 +-
 .../RemoveCompleteReplicationRecords.java          |   4 +-
 .../master/tableOps/ShutdownTServerTest.java       |   2 +-
 .../apache/accumulo/monitor/ZooKeeperStatus.java   |   2 +-
 .../org/apache/accumulo/monitor/rest/Totals.java   |   2 +-
 .../monitor/rest/gc/GarbageCollectorCycle.java     |  12 +-
 .../monitor/rest/master/MasterInformation.java     |   6 +-
 .../rest/replication/ReplicationResource.java      |   2 +-
 .../rest/trace/RecentTracesInformation.java        |   4 +-
 .../accumulo/monitor/ShowTraceLinkTypeTest.java    |  42 +++---
 .../java/org/apache/accumulo/tracer/TraceDump.java |   2 +-
 .../org/apache/accumulo/tracer/TraceServer.java    |   2 +-
 .../apache/accumulo/tracer/TraceTableStats.java    |   6 +-
 .../org/apache/accumulo/tracer/ZooTraceClient.java |   2 +-
 .../apache/accumulo/tracer/ZooTraceClientTest.java |   2 +-
 .../org/apache/accumulo/tserver/TabletServer.java  |   4 +-
 .../tserver/TabletServerResourceManager.java       |   2 +-
 .../org/apache/accumulo/tserver/log/DfsLogger.java |   2 +-
 .../metrics/Metrics2TabletServerMetrics.java       |  22 ++--
 .../metrics/Metrics2TabletServerUpdateMetrics.java |   6 +-
 .../tserver/replication/AccumuloReplicaSystem.java |  10 +-
 .../BatchWriterReplicationReplayer.java            |   4 +-
 .../org/apache/accumulo/tserver/tablet/Tablet.java |   2 +-
 .../accumulo/tserver/AssignmentWatcherTest.java    |   4 +-
 .../replication/AccumuloReplicaSystemTest.java     |  14 +-
 .../BatchWriterReplicationReplayerTest.java        |   4 +-
 .../apache/accumulo/tserver/tablet/TabletTest.java |   2 +-
 .../apache/accumulo/test/ClientSideIteratorIT.java |  20 +--
 .../apache/accumulo/test/CreateRandomRFile.java    |   2 +-
 .../org/apache/accumulo/test/TestBinaryRows.java   |   2 +-
 .../accumulo/test/functional/AddSplitIT.java       |   8 +-
 .../BalanceInPresenceOfOfflineTableIT.java         |   2 +-
 .../accumulo/test/functional/BloomFilterIT.java    |   2 +-
 .../accumulo/test/functional/KerberosIT.java       |   2 +-
 .../accumulo/test/functional/LogicalTimeIT.java    |  38 +++---
 .../accumulo/test/functional/NativeMapIT.java      |   2 +-
 .../test/functional/RecoveryWithEmptyRFileIT.java  |   4 +-
 .../apache/accumulo/test/functional/ScannerIT.java |   8 +-
 .../accumulo/test/functional/SplitRecoveryIT.java  |   2 +-
 .../apache/accumulo/test/functional/SummaryIT.java | 112 ++++++++--------
 .../accumulo/test/functional/TooManyDeletesIT.java |   8 +-
 .../test/performance/ContinuousIngest.java         |   2 +-
 .../metadata/MetadataBatchScanTest.java            |   2 +-
 .../test/replication/KerberosReplicationIT.java    |   4 +-
 .../replication/MultiInstanceReplicationIT.java    |  16 +--
 .../RemoveCompleteReplicationRecordsIT.java        |   6 +-
 .../accumulo/test/replication/ReplicationIT.java   |   6 +-
 .../test/replication/UnorderedWorkAssignerIT.java  |   4 +-
 .../UnorderedWorkAssignerReplicationIT.java        |  16 +--
 .../UnusedWalDoesntCloseReplicationStatusIT.java   |   2 +-
 131 files changed, 800 insertions(+), 800 deletions(-)

diff --git a/client/mapreduce/src/test/java/org/apache/accumulo/core/client/mapred/AccumuloFileOutputFormatTest.java b/client/mapreduce/src/test/java/org/apache/accumulo/core/client/mapred/AccumuloFileOutputFormatTest.java
index 51093d8..1d6b47d 100644
--- a/client/mapreduce/src/test/java/org/apache/accumulo/core/client/mapred/AccumuloFileOutputFormatTest.java
+++ b/client/mapreduce/src/test/java/org/apache/accumulo/core/client/mapred/AccumuloFileOutputFormatTest.java
@@ -41,9 +41,9 @@ public class AccumuloFileOutputFormatTest {
   public void validateConfiguration() throws IOException, InterruptedException {
 
     int a = 7;
-    long b = 300l;
-    long c = 50l;
-    long d = 10l;
+    long b = 300L;
+    long c = 50L;
+    long d = 10L;
     String e = "snappy";
     SamplerConfiguration samplerConfig = new SamplerConfiguration(RowSampler.class.getName());
     samplerConfig.addOption("hasher", "murmur3_32");
@@ -67,9 +67,9 @@ public class AccumuloFileOutputFormatTest {
         .getAccumuloConfiguration(AccumuloFileOutputFormat.class, job);
 
     assertEquals(7, acuconf.getCount(Property.TABLE_FILE_REPLICATION));
-    assertEquals(300l, acuconf.getAsBytes(Property.TABLE_FILE_BLOCK_SIZE));
-    assertEquals(50l, acuconf.getAsBytes(Property.TABLE_FILE_COMPRESSED_BLOCK_SIZE));
-    assertEquals(10l, acuconf.getAsBytes(Property.TABLE_FILE_COMPRESSED_BLOCK_SIZE_INDEX));
+    assertEquals(300L, acuconf.getAsBytes(Property.TABLE_FILE_BLOCK_SIZE));
+    assertEquals(50L, acuconf.getAsBytes(Property.TABLE_FILE_COMPRESSED_BLOCK_SIZE));
+    assertEquals(10L, acuconf.getAsBytes(Property.TABLE_FILE_COMPRESSED_BLOCK_SIZE_INDEX));
     assertEquals("snappy", acuconf.get(Property.TABLE_FILE_COMPRESSION_TYPE));
     assertEquals(new SamplerConfigurationImpl(samplerConfig),
         SamplerConfigurationImpl.newSamplerConfig(acuconf));
@@ -81,9 +81,9 @@ public class AccumuloFileOutputFormatTest {
     assertTrue(summarizerConfigs.contains(sc2));
 
     a = 17;
-    b = 1300l;
-    c = 150l;
-    d = 110l;
+    b = 1300L;
+    c = 150L;
+    d = 110L;
     e = "lzo";
     samplerConfig = new SamplerConfiguration(RowSampler.class.getName());
     samplerConfig.addOption("hasher", "md5");
@@ -100,9 +100,9 @@ public class AccumuloFileOutputFormatTest {
     acuconf = FileOutputConfigurator.getAccumuloConfiguration(AccumuloFileOutputFormat.class, job);
 
     assertEquals(17, acuconf.getCount(Property.TABLE_FILE_REPLICATION));
-    assertEquals(1300l, acuconf.getAsBytes(Property.TABLE_FILE_BLOCK_SIZE));
-    assertEquals(150l, acuconf.getAsBytes(Property.TABLE_FILE_COMPRESSED_BLOCK_SIZE));
-    assertEquals(110l, acuconf.getAsBytes(Property.TABLE_FILE_COMPRESSED_BLOCK_SIZE_INDEX));
+    assertEquals(1300L, acuconf.getAsBytes(Property.TABLE_FILE_BLOCK_SIZE));
+    assertEquals(150L, acuconf.getAsBytes(Property.TABLE_FILE_COMPRESSED_BLOCK_SIZE));
+    assertEquals(110L, acuconf.getAsBytes(Property.TABLE_FILE_COMPRESSED_BLOCK_SIZE_INDEX));
     assertEquals("lzo", acuconf.get(Property.TABLE_FILE_COMPRESSION_TYPE));
     assertEquals(new SamplerConfigurationImpl(samplerConfig),
         SamplerConfigurationImpl.newSamplerConfig(acuconf));
diff --git a/client/mapreduce/src/test/java/org/apache/accumulo/core/client/mapred/AccumuloOutputFormatTest.java b/client/mapreduce/src/test/java/org/apache/accumulo/core/client/mapred/AccumuloOutputFormatTest.java
index 7d69701..c88bce8 100644
--- a/client/mapreduce/src/test/java/org/apache/accumulo/core/client/mapred/AccumuloOutputFormatTest.java
+++ b/client/mapreduce/src/test/java/org/apache/accumulo/core/client/mapred/AccumuloOutputFormatTest.java
@@ -35,16 +35,16 @@ public class AccumuloOutputFormatTest {
 
     // make sure we aren't testing defaults
     final BatchWriterConfig bwDefaults = new BatchWriterConfig();
-    assertNotEquals(7654321l, bwDefaults.getMaxLatency(TimeUnit.MILLISECONDS));
-    assertNotEquals(9898989l, bwDefaults.getTimeout(TimeUnit.MILLISECONDS));
+    assertNotEquals(7654321L, bwDefaults.getMaxLatency(TimeUnit.MILLISECONDS));
+    assertNotEquals(9898989L, bwDefaults.getTimeout(TimeUnit.MILLISECONDS));
     assertNotEquals(42, bwDefaults.getMaxWriteThreads());
-    assertNotEquals(1123581321l, bwDefaults.getMaxMemory());
+    assertNotEquals(1123581321L, bwDefaults.getMaxMemory());
 
     final BatchWriterConfig bwConfig = new BatchWriterConfig();
-    bwConfig.setMaxLatency(7654321l, TimeUnit.MILLISECONDS);
-    bwConfig.setTimeout(9898989l, TimeUnit.MILLISECONDS);
+    bwConfig.setMaxLatency(7654321L, TimeUnit.MILLISECONDS);
+    bwConfig.setTimeout(9898989L, TimeUnit.MILLISECONDS);
     bwConfig.setMaxWriteThreads(42);
-    bwConfig.setMaxMemory(1123581321l);
+    bwConfig.setMaxMemory(1123581321L);
     AccumuloOutputFormat.setBatchWriterOptions(job, bwConfig);
 
     AccumuloOutputFormat myAOF = new AccumuloOutputFormat() {
@@ -61,10 +61,10 @@ public class AccumuloOutputFormatTest {
         assertEquals(bwConfig.getMaxMemory(), bwOpts.getMaxMemory());
 
         // explicit check
-        assertEquals(7654321l, bwOpts.getMaxLatency(TimeUnit.MILLISECONDS));
-        assertEquals(9898989l, bwOpts.getTimeout(TimeUnit.MILLISECONDS));
+        assertEquals(7654321L, bwOpts.getMaxLatency(TimeUnit.MILLISECONDS));
+        assertEquals(9898989L, bwOpts.getTimeout(TimeUnit.MILLISECONDS));
         assertEquals(42, bwOpts.getMaxWriteThreads());
-        assertEquals(1123581321l, bwOpts.getMaxMemory());
+        assertEquals(1123581321L, bwOpts.getMaxMemory());
 
       }
     };
diff --git a/client/mapreduce/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloFileOutputFormatTest.java b/client/mapreduce/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloFileOutputFormatTest.java
index 286884a..95170f8 100644
--- a/client/mapreduce/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloFileOutputFormatTest.java
+++ b/client/mapreduce/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloFileOutputFormatTest.java
@@ -41,9 +41,9 @@ public class AccumuloFileOutputFormatTest {
   public void validateConfiguration() throws IOException, InterruptedException {
 
     int a = 7;
-    long b = 300l;
-    long c = 50l;
-    long d = 10l;
+    long b = 300L;
+    long c = 50L;
+    long d = 10L;
     String e = "snappy";
     SamplerConfiguration samplerConfig = new SamplerConfiguration(RowSampler.class.getName());
     samplerConfig.addOption("hasher", "murmur3_32");
@@ -67,9 +67,9 @@ public class AccumuloFileOutputFormatTest {
         .getAccumuloConfiguration(AccumuloFileOutputFormat.class, job1.getConfiguration());
 
     assertEquals(7, acuconf.getCount(Property.TABLE_FILE_REPLICATION));
-    assertEquals(300l, acuconf.getAsBytes(Property.TABLE_FILE_BLOCK_SIZE));
-    assertEquals(50l, acuconf.getAsBytes(Property.TABLE_FILE_COMPRESSED_BLOCK_SIZE));
-    assertEquals(10l, acuconf.getAsBytes(Property.TABLE_FILE_COMPRESSED_BLOCK_SIZE_INDEX));
+    assertEquals(300L, acuconf.getAsBytes(Property.TABLE_FILE_BLOCK_SIZE));
+    assertEquals(50L, acuconf.getAsBytes(Property.TABLE_FILE_COMPRESSED_BLOCK_SIZE));
+    assertEquals(10L, acuconf.getAsBytes(Property.TABLE_FILE_COMPRESSED_BLOCK_SIZE_INDEX));
     assertEquals("snappy", acuconf.get(Property.TABLE_FILE_COMPRESSION_TYPE));
     assertEquals(new SamplerConfigurationImpl(samplerConfig),
         SamplerConfigurationImpl.newSamplerConfig(acuconf));
@@ -81,9 +81,9 @@ public class AccumuloFileOutputFormatTest {
     assertTrue(summarizerConfigs.contains(sc2));
 
     a = 17;
-    b = 1300l;
-    c = 150l;
-    d = 110l;
+    b = 1300L;
+    c = 150L;
+    d = 110L;
     e = "lzo";
     samplerConfig = new SamplerConfiguration(RowSampler.class.getName());
     samplerConfig.addOption("hasher", "md5");
@@ -101,9 +101,9 @@ public class AccumuloFileOutputFormatTest {
         job2.getConfiguration());
 
     assertEquals(17, acuconf.getCount(Property.TABLE_FILE_REPLICATION));
-    assertEquals(1300l, acuconf.getAsBytes(Property.TABLE_FILE_BLOCK_SIZE));
-    assertEquals(150l, acuconf.getAsBytes(Property.TABLE_FILE_COMPRESSED_BLOCK_SIZE));
-    assertEquals(110l, acuconf.getAsBytes(Property.TABLE_FILE_COMPRESSED_BLOCK_SIZE_INDEX));
+    assertEquals(1300L, acuconf.getAsBytes(Property.TABLE_FILE_BLOCK_SIZE));
+    assertEquals(150L, acuconf.getAsBytes(Property.TABLE_FILE_COMPRESSED_BLOCK_SIZE));
+    assertEquals(110L, acuconf.getAsBytes(Property.TABLE_FILE_COMPRESSED_BLOCK_SIZE_INDEX));
     assertEquals("lzo", acuconf.get(Property.TABLE_FILE_COMPRESSION_TYPE));
     assertEquals(new SamplerConfigurationImpl(samplerConfig),
         SamplerConfigurationImpl.newSamplerConfig(acuconf));
diff --git a/client/mapreduce/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormatTest.java b/client/mapreduce/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormatTest.java
index ceb68b7..a62474a 100644
--- a/client/mapreduce/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormatTest.java
+++ b/client/mapreduce/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormatTest.java
@@ -35,16 +35,16 @@ public class AccumuloOutputFormatTest {
 
     // make sure we aren't testing defaults
     final BatchWriterConfig bwDefaults = new BatchWriterConfig();
-    assertNotEquals(7654321l, bwDefaults.getMaxLatency(TimeUnit.MILLISECONDS));
-    assertNotEquals(9898989l, bwDefaults.getTimeout(TimeUnit.MILLISECONDS));
+    assertNotEquals(7654321L, bwDefaults.getMaxLatency(TimeUnit.MILLISECONDS));
+    assertNotEquals(9898989L, bwDefaults.getTimeout(TimeUnit.MILLISECONDS));
     assertNotEquals(42, bwDefaults.getMaxWriteThreads());
-    assertNotEquals(1123581321l, bwDefaults.getMaxMemory());
+    assertNotEquals(1123581321L, bwDefaults.getMaxMemory());
 
     final BatchWriterConfig bwConfig = new BatchWriterConfig();
-    bwConfig.setMaxLatency(7654321l, TimeUnit.MILLISECONDS);
-    bwConfig.setTimeout(9898989l, TimeUnit.MILLISECONDS);
+    bwConfig.setMaxLatency(7654321L, TimeUnit.MILLISECONDS);
+    bwConfig.setTimeout(9898989L, TimeUnit.MILLISECONDS);
     bwConfig.setMaxWriteThreads(42);
-    bwConfig.setMaxMemory(1123581321l);
+    bwConfig.setMaxMemory(1123581321L);
     AccumuloOutputFormat.setBatchWriterOptions(job, bwConfig);
 
     AccumuloOutputFormat myAOF = new AccumuloOutputFormat() {
@@ -61,10 +61,10 @@ public class AccumuloOutputFormatTest {
         assertEquals(bwConfig.getMaxMemory(), bwOpts.getMaxMemory());
 
         // explicit check
-        assertEquals(7654321l, bwOpts.getMaxLatency(TimeUnit.MILLISECONDS));
-        assertEquals(9898989l, bwOpts.getTimeout(TimeUnit.MILLISECONDS));
+        assertEquals(7654321L, bwOpts.getMaxLatency(TimeUnit.MILLISECONDS));
+        assertEquals(9898989L, bwOpts.getTimeout(TimeUnit.MILLISECONDS));
         assertEquals(42, bwOpts.getMaxWriteThreads());
-        assertEquals(1123581321l, bwOpts.getMaxMemory());
+        assertEquals(1123581321L, bwOpts.getMaxMemory());
 
       }
     };
diff --git a/core/src/main/java/org/apache/accumulo/core/Constants.java b/core/src/main/java/org/apache/accumulo/core/Constants.java
index ed1680b..1a2a890 100644
--- a/core/src/main/java/org/apache/accumulo/core/Constants.java
+++ b/core/src/main/java/org/apache/accumulo/core/Constants.java
@@ -104,7 +104,7 @@ public class Constants {
 
   // Scanners will default to fetching 3 batches of Key/Value pairs before asynchronously
   // fetching the next batch.
-  public static final long SCANNER_DEFAULT_READAHEAD_THRESHOLD = 3l;
+  public static final long SCANNER_DEFAULT_READAHEAD_THRESHOLD = 3L;
 
   // Security configuration
   public static final String PW_HASH_ALGORITHM = "SHA-256";
diff --git a/core/src/main/java/org/apache/accumulo/core/client/BatchWriterConfig.java b/core/src/main/java/org/apache/accumulo/core/client/BatchWriterConfig.java
index cc6c082..aca697b 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/BatchWriterConfig.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/BatchWriterConfig.java
@@ -37,10 +37,10 @@ import org.apache.hadoop.util.StringUtils;
  */
 public class BatchWriterConfig implements Writable {
 
-  private static final Long DEFAULT_MAX_MEMORY = 50 * 1024 * 1024l;
+  private static final Long DEFAULT_MAX_MEMORY = 50 * 1024 * 1024L;
   private Long maxMemory = null;
 
-  private static final Long DEFAULT_MAX_LATENCY = 2 * 60 * 1000l;
+  private static final Long DEFAULT_MAX_LATENCY = 2 * 60 * 1000L;
   private Long maxLatency = null;
 
   private static final Long DEFAULT_TIMEOUT = Long.MAX_VALUE;
diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/ScannerIterator.java b/core/src/main/java/org/apache/accumulo/core/client/impl/ScannerIterator.java
index a588ea3..48d6ba7 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/impl/ScannerIterator.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/impl/ScannerIterator.java
@@ -66,7 +66,7 @@ public class ScannerIterator implements Iterator<Entry<Key,Value>> {
 
   private static final List<KeyValue> EMPTY_LIST = Collections.emptyList();
 
-  private static ThreadPoolExecutor readaheadPool = new ThreadPoolExecutor(0, Integer.MAX_VALUE, 3l,
+  private static ThreadPoolExecutor readaheadPool = new ThreadPoolExecutor(0, Integer.MAX_VALUE, 3L,
       TimeUnit.SECONDS, new SynchronousQueue<>(),
       new NamingThreadFactory("Accumulo scanner read ahead thread"));
 
@@ -126,7 +126,7 @@ public class ScannerIterator implements Iterator<Entry<Key,Value>> {
         options.getSamplerConfiguration(), options.batchTimeOut, options.classLoaderContext);
 
     // If we want to start readahead immediately, don't wait for hasNext to be called
-    if (0l == readaheadThreshold) {
+    if (0L == readaheadThreshold) {
       initiateReadAhead();
     }
     iter = null;
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 879728b..9ab7dce 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
@@ -76,7 +76,7 @@ public class ThriftTransportPool {
 
   private static final Logger log = LoggerFactory.getLogger(ThriftTransportPool.class);
 
-  private static final Long ERROR_THRESHOLD = 20l;
+  private static final Long ERROR_THRESHOLD = 20L;
   private static final int STUCK_THRESHOLD = 2 * 60 * 1000;
 
   private static class CachedConnection {
@@ -545,7 +545,7 @@ public class ThriftTransportPool {
 
             Long ecount = errorCount.get(ctsc.getCacheKey());
             if (ecount == null)
-              ecount = 0l;
+              ecount = 0L;
             ecount++;
             errorCount.put(ctsc.getCacheKey(), ecount);
 
diff --git a/core/src/main/java/org/apache/accumulo/core/client/lexicoder/DoubleLexicoder.java b/core/src/main/java/org/apache/accumulo/core/client/lexicoder/DoubleLexicoder.java
index 07d0595..6878623 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/lexicoder/DoubleLexicoder.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/lexicoder/DoubleLexicoder.java
@@ -33,7 +33,7 @@ public class DoubleLexicoder extends AbstractLexicoder<Double> {
     if (l < 0)
       l = ~l;
     else
-      l = l ^ 0x8000000000000000l;
+      l = l ^ 0x8000000000000000L;
 
     return longEncoder.encode(l);
   }
@@ -49,7 +49,7 @@ public class DoubleLexicoder extends AbstractLexicoder<Double> {
   protected Double decodeUnchecked(byte[] data, int offset, int len) {
     long l = longEncoder.decodeUnchecked(data, offset, len);
     if (l < 0)
-      l = l ^ 0x8000000000000000l;
+      l = l ^ 0x8000000000000000L;
     else
       l = ~l;
     return Double.longBitsToDouble(l);
diff --git a/core/src/main/java/org/apache/accumulo/core/client/lexicoder/LongLexicoder.java b/core/src/main/java/org/apache/accumulo/core/client/lexicoder/LongLexicoder.java
index 9a465de..4bbb497 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/lexicoder/LongLexicoder.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/lexicoder/LongLexicoder.java
@@ -25,11 +25,11 @@ package org.apache.accumulo.core.client.lexicoder;
 public class LongLexicoder extends ULongLexicoder {
   @Override
   public byte[] encode(Long l) {
-    return super.encode(l ^ 0x8000000000000000l);
+    return super.encode(l ^ 0x8000000000000000L);
   }
 
   @Override
   protected Long decodeUnchecked(byte[] data, int offset, int len) {
-    return super.decodeUnchecked(data, offset, len) ^ 0x8000000000000000l;
+    return super.decodeUnchecked(data, offset, len) ^ 0x8000000000000000L;
   }
 }
diff --git a/core/src/main/java/org/apache/accumulo/core/client/lexicoder/UIntegerLexicoder.java b/core/src/main/java/org/apache/accumulo/core/client/lexicoder/UIntegerLexicoder.java
index 3d57260..e0b706c 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/lexicoder/UIntegerLexicoder.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/lexicoder/UIntegerLexicoder.java
@@ -71,7 +71,7 @@ public class UIntegerLexicoder extends AbstractLexicoder<Integer> {
     int shift = 0;
 
     for (int idx = (offset + len) - 1; idx >= offset + 1; idx--) {
-      i += (data[idx] & 0xffl) << shift;
+      i += (data[idx] & 0xffL) << shift;
       shift += 8;
     }
 
diff --git a/core/src/main/java/org/apache/accumulo/core/client/lexicoder/ULongLexicoder.java b/core/src/main/java/org/apache/accumulo/core/client/lexicoder/ULongLexicoder.java
index 095cd48..963bafd 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/lexicoder/ULongLexicoder.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/lexicoder/ULongLexicoder.java
@@ -64,13 +64,13 @@ public class ULongLexicoder extends AbstractLexicoder<Long> {
       throw new IllegalArgumentException("Unexpected length " + (0xff & data[offset]));
 
     for (int i = (offset + len) - 1; i >= offset + 1; i--) {
-      l += (data[i] & 0xffl) << shift;
+      l += (data[i] & 0xffL) << shift;
       shift += 8;
     }
 
     // fill in 0xff prefix
     if (data[offset] > 8)
-      l |= -1l << ((16 - data[offset]) << 3);
+      l |= -1L << ((16 - data[offset]) << 3);
 
     return l;
   }
diff --git a/core/src/main/java/org/apache/accumulo/core/client/lexicoder/UUIDLexicoder.java b/core/src/main/java/org/apache/accumulo/core/client/lexicoder/UUIDLexicoder.java
index d62c6f8..743ce57 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/lexicoder/UUIDLexicoder.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/lexicoder/UUIDLexicoder.java
@@ -45,8 +45,8 @@ public class UUIDLexicoder extends AbstractLexicoder<UUID> {
       byte ret[] = new byte[16];
       DataOutputStream out = new DataOutputStream(new FixedByteArrayOutputStream(ret));
 
-      out.writeLong(uuid.getMostSignificantBits() ^ 0x8000000000000000l);
-      out.writeLong(uuid.getLeastSignificantBits() ^ 0x8000000000000000l);
+      out.writeLong(uuid.getMostSignificantBits() ^ 0x8000000000000000L);
+      out.writeLong(uuid.getLeastSignificantBits() ^ 0x8000000000000000L);
 
       out.close();
 
@@ -67,7 +67,7 @@ public class UUIDLexicoder extends AbstractLexicoder<UUID> {
   protected UUID decodeUnchecked(byte[] b, int offset, int len) throws ValueFormatException {
     try {
       DataInputStream in = new DataInputStream(new ByteArrayInputStream(b, offset, len));
-      return new UUID(in.readLong() ^ 0x8000000000000000l, in.readLong() ^ 0x8000000000000000l);
+      return new UUID(in.readLong() ^ 0x8000000000000000L, in.readLong() ^ 0x8000000000000000L);
     } catch (IOException e) {
       throw new RuntimeException(e);
     }
diff --git a/core/src/main/java/org/apache/accumulo/core/client/mock/MockTableOperations.java b/core/src/main/java/org/apache/accumulo/core/client/mock/MockTableOperations.java
index fcf3d03..36d11f1 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/mock/MockTableOperations.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/mock/MockTableOperations.java
@@ -402,7 +402,7 @@ class MockTableOperations extends TableOperationsHelper {
       throws AccumuloException, AccumuloSecurityException {
 
     List<DiskUsage> diskUsages = new ArrayList<>();
-    diskUsages.add(new DiskUsage(new TreeSet<>(tables), 0l));
+    diskUsages.add(new DiskUsage(new TreeSet<>(tables), 0L));
 
     return diskUsages;
   }
diff --git a/core/src/main/java/org/apache/accumulo/core/client/summary/CounterSummary.java b/core/src/main/java/org/apache/accumulo/core/client/summary/CounterSummary.java
index b5a5cca..c36c18e 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/summary/CounterSummary.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/summary/CounterSummary.java
@@ -76,14 +76,14 @@ public class CounterSummary {
    * @return statistic for {@link CountingSummarizer#SEEN_STAT}
    */
   public long getSeen() {
-    return stats.getOrDefault(CountingSummarizer.SEEN_STAT, 0l);
+    return stats.getOrDefault(CountingSummarizer.SEEN_STAT, 0L);
   }
 
   /**
    * @return statistic for {@link CountingSummarizer#EMITTED_STAT}
    */
   public long getEmitted() {
-    return stats.getOrDefault(CountingSummarizer.EMITTED_STAT, 0l);
+    return stats.getOrDefault(CountingSummarizer.EMITTED_STAT, 0L);
   }
 
   /**
@@ -97,21 +97,21 @@ public class CounterSummary {
    * @return statistic for {@link CountingSummarizer#TOO_LONG_STAT}
    */
   public long getTooLong() {
-    return stats.getOrDefault(CountingSummarizer.TOO_LONG_STAT, 0l);
+    return stats.getOrDefault(CountingSummarizer.TOO_LONG_STAT, 0L);
   }
 
   /**
    * @return statistic for {@link CountingSummarizer#TOO_MANY_STAT}
    */
   public long getTooMany() {
-    return stats.getOrDefault(CountingSummarizer.TOO_MANY_STAT, 0l);
+    return stats.getOrDefault(CountingSummarizer.TOO_MANY_STAT, 0L);
   }
 
   /**
    * @return statistic for {@link CountingSummarizer#DELETES_IGNORED_STAT}
    */
   public long getDeletesIgnored() {
-    return stats.getOrDefault(CountingSummarizer.DELETES_IGNORED_STAT, 0l);
+    return stats.getOrDefault(CountingSummarizer.DELETES_IGNORED_STAT, 0L);
   }
 
   /**
diff --git a/core/src/main/java/org/apache/accumulo/core/client/summary/CountingSummarizer.java b/core/src/main/java/org/apache/accumulo/core/client/summary/CountingSummarizer.java
index ffb26ff..3837d5a 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/summary/CountingSummarizer.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/summary/CountingSummarizer.java
@@ -288,7 +288,7 @@ public abstract class CountingSummarizer<K> implements Summarizer {
       public void merge(Map<String,Long> summary1, Map<String,Long> summary2) {
 
         for (String key : ALL_STATS) {
-          summary1.merge(key, summary2.getOrDefault(key, 0l), Long::sum);
+          summary1.merge(key, summary2.getOrDefault(key, 0L), Long::sum);
         }
 
         for (Entry<String,Long> entry : summary2.entrySet()) {
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 ccf01d9..ae95687 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
@@ -388,7 +388,7 @@ public class Mutation implements Writable {
    *          cell value
    */
   public void put(Text columnFamily, Text columnQualifier, Value value) {
-    put(columnFamily, columnQualifier, EMPTY_BYTES, false, 0l, false, value.get());
+    put(columnFamily, columnQualifier, EMPTY_BYTES, false, 0L, false, value.get());
   }
 
   /**
@@ -406,7 +406,7 @@ public class Mutation implements Writable {
    */
   public void put(Text columnFamily, Text columnQualifier, ColumnVisibility columnVisibility,
       Value value) {
-    put(columnFamily, columnQualifier, columnVisibility.getExpression(), false, 0l, false,
+    put(columnFamily, columnQualifier, columnVisibility.getExpression(), false, 0L, false,
         value.get());
   }
 
@@ -457,7 +457,7 @@ public class Mutation implements Writable {
    *          column qualifier
    */
   public void putDelete(Text columnFamily, Text columnQualifier) {
-    put(columnFamily, columnQualifier, EMPTY_BYTES, false, 0l, true, EMPTY_BYTES);
+    put(columnFamily, columnQualifier, EMPTY_BYTES, false, 0L, true, EMPTY_BYTES);
   }
 
   /**
@@ -472,7 +472,7 @@ public class Mutation implements Writable {
    */
   public void putDelete(Text columnFamily, Text columnQualifier,
       ColumnVisibility columnVisibility) {
-    put(columnFamily, columnQualifier, columnVisibility.getExpression(), false, 0l, true,
+    put(columnFamily, columnQualifier, columnVisibility.getExpression(), false, 0L, true,
         EMPTY_BYTES);
   }
 
@@ -519,7 +519,7 @@ public class Mutation implements Writable {
    *          column qualifier
    */
   public void put(CharSequence columnFamily, CharSequence columnQualifier, Value value) {
-    put(columnFamily, columnQualifier, EMPTY_BYTES, false, 0l, false, value.get());
+    put(columnFamily, columnQualifier, EMPTY_BYTES, false, 0L, false, value.get());
   }
 
   /**
@@ -537,7 +537,7 @@ public class Mutation implements Writable {
    */
   public void put(CharSequence columnFamily, CharSequence columnQualifier,
       ColumnVisibility columnVisibility, Value value) {
-    put(columnFamily, columnQualifier, columnVisibility.getExpression(), false, 0l, false,
+    put(columnFamily, columnQualifier, columnVisibility.getExpression(), false, 0L, false,
         value.get());
   }
 
@@ -589,7 +589,7 @@ public class Mutation implements Writable {
    *          column qualifier
    */
   public void putDelete(CharSequence columnFamily, CharSequence columnQualifier) {
-    put(columnFamily, columnQualifier, EMPTY_BYTES, false, 0l, true, EMPTY_BYTES);
+    put(columnFamily, columnQualifier, EMPTY_BYTES, false, 0L, true, EMPTY_BYTES);
   }
 
   /**
@@ -605,7 +605,7 @@ public class Mutation implements Writable {
    */
   public void putDelete(CharSequence columnFamily, CharSequence columnQualifier,
       ColumnVisibility columnVisibility) {
-    put(columnFamily, columnQualifier, columnVisibility.getExpression(), false, 0l, true,
+    put(columnFamily, columnQualifier, columnVisibility.getExpression(), false, 0L, true,
         EMPTY_BYTES);
   }
 
@@ -654,7 +654,7 @@ public class Mutation implements Writable {
    *          cell value
    */
   public void put(CharSequence columnFamily, CharSequence columnQualifier, CharSequence value) {
-    put(columnFamily, columnQualifier, EMPTY_BYTES, false, 0l, false, value);
+    put(columnFamily, columnQualifier, EMPTY_BYTES, false, 0L, false, value);
   }
 
   /**
@@ -672,7 +672,7 @@ public class Mutation implements Writable {
    */
   public void put(CharSequence columnFamily, CharSequence columnQualifier,
       ColumnVisibility columnVisibility, CharSequence value) {
-    put(columnFamily, columnQualifier, columnVisibility.getExpression(), false, 0l, false, value);
+    put(columnFamily, columnQualifier, columnVisibility.getExpression(), false, 0L, false, value);
   }
 
   /**
@@ -726,7 +726,7 @@ public class Mutation implements Writable {
    * @since 1.5.0
    */
   public void put(byte[] columnFamily, byte[] columnQualifier, byte[] value) {
-    put(columnFamily, columnQualifier, EMPTY_BYTES, false, 0l, false, value);
+    put(columnFamily, columnQualifier, EMPTY_BYTES, false, 0L, false, value);
   }
 
   /**
@@ -745,7 +745,7 @@ public class Mutation implements Writable {
    */
   public void put(byte[] columnFamily, byte[] columnQualifier, ColumnVisibility columnVisibility,
       byte[] value) {
-    put(columnFamily, columnQualifier, columnVisibility.getExpression(), false, 0l, false, value);
+    put(columnFamily, columnQualifier, columnVisibility.getExpression(), false, 0L, false, value);
   }
 
   /**
@@ -798,7 +798,7 @@ public class Mutation implements Writable {
    * @since 1.5.0
    */
   public void putDelete(byte[] columnFamily, byte[] columnQualifier) {
-    put(columnFamily, columnQualifier, EMPTY_BYTES, false, 0l, true, EMPTY_BYTES);
+    put(columnFamily, columnQualifier, EMPTY_BYTES, false, 0L, true, EMPTY_BYTES);
   }
 
   /**
@@ -814,7 +814,7 @@ public class Mutation implements Writable {
    */
   public void putDelete(byte[] columnFamily, byte[] columnQualifier,
       ColumnVisibility columnVisibility) {
-    put(columnFamily, columnQualifier, columnVisibility.getExpression(), false, 0l, true,
+    put(columnFamily, columnQualifier, columnVisibility.getExpression(), false, 0L, true,
         EMPTY_BYTES);
   }
 
diff --git a/core/src/main/java/org/apache/accumulo/core/file/rfile/MultiLevelIndex.java b/core/src/main/java/org/apache/accumulo/core/file/rfile/MultiLevelIndex.java
index de611f7..2151ccb 100644
--- a/core/src/main/java/org/apache/accumulo/core/file/rfile/MultiLevelIndex.java
+++ b/core/src/main/java/org/apache/accumulo/core/file/rfile/MultiLevelIndex.java
@@ -848,11 +848,11 @@ public class MultiLevelIndex {
         Map<Integer,Long> countsByLevel) throws IOException {
       Long size = sizesByLevel.get(ib.getLevel());
       if (size == null)
-        size = 0l;
+        size = 0L;
 
       Long count = countsByLevel.get(ib.getLevel());
       if (count == null)
-        count = 0l;
+        count = 0L;
 
       List<IndexEntry> index = ib.getIndex();
       size += ((SerializedIndex) index).sizeInBytes();
diff --git a/core/src/main/java/org/apache/accumulo/core/iterators/LongCombiner.java b/core/src/main/java/org/apache/accumulo/core/iterators/LongCombiner.java
index 56c19ce..02ab75d 100644
--- a/core/src/main/java/org/apache/accumulo/core/iterators/LongCombiner.java
+++ b/core/src/main/java/org/apache/accumulo/core/iterators/LongCombiner.java
@@ -82,7 +82,7 @@ public abstract class LongCombiner extends TypedValueCombiner<Long> {
       throw new IllegalArgumentException("no type specified");
     if (type.startsWith(CLASS_PREFIX)) {
       setEncoder(type.substring(CLASS_PREFIX.length()));
-      testEncoder(42l);
+      testEncoder(42L);
     } else {
       switch (Type.valueOf(type)) {
         case VARLEN:
diff --git a/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/NumSummation.java b/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/NumSummation.java
index 40fdd28..2501a26 100644
--- a/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/NumSummation.java
+++ b/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/NumSummation.java
@@ -32,7 +32,7 @@ import org.apache.hadoop.io.WritableUtils;
  */
 @Deprecated
 public class NumSummation implements Aggregator {
-  long sum = 0l;
+  long sum = 0L;
 
   @Override
   public Value aggregate() {
@@ -86,7 +86,7 @@ public class NumSummation implements Aggregator {
 
   @Override
   public void reset() {
-    sum = 0l;
+    sum = 0L;
   }
 
 }
diff --git a/core/src/main/java/org/apache/accumulo/core/iterators/user/SummingArrayCombiner.java b/core/src/main/java/org/apache/accumulo/core/iterators/user/SummingArrayCombiner.java
index 074c09f..cdd286c 100644
--- a/core/src/main/java/org/apache/accumulo/core/iterators/user/SummingArrayCombiner.java
+++ b/core/src/main/java/org/apache/accumulo/core/iterators/user/SummingArrayCombiner.java
@@ -106,7 +106,7 @@ public class SummingArrayCombiner extends TypedValueCombiner<List<Long>> {
       throw new IllegalArgumentException("no type specified");
     if (type.startsWith(CLASS_PREFIX)) {
       setEncoder(type.substring(CLASS_PREFIX.length()));
-      testEncoder(Arrays.asList(0l, 1l));
+      testEncoder(Arrays.asList(0L, 1L));
     } else {
       switch (Type.valueOf(options.get(TYPE))) {
         case VARLEN:
@@ -240,7 +240,7 @@ public class SummingArrayCombiner extends TypedValueCombiner<List<Long>> {
       List<Long> la = new ArrayList<>(longstrs.length);
       for (String s : longstrs) {
         if (s.length() == 0)
-          la.add(0l);
+          la.add(0L);
         else
           try {
             la.add(Long.parseLong(s));
diff --git a/core/src/main/java/org/apache/accumulo/core/summary/SummaryCollection.java b/core/src/main/java/org/apache/accumulo/core/summary/SummaryCollection.java
index d42e0f5..cd7cf5e 100644
--- a/core/src/main/java/org/apache/accumulo/core/summary/SummaryCollection.java
+++ b/core/src/main/java/org/apache/accumulo/core/summary/SummaryCollection.java
@@ -186,6 +186,6 @@ public class SummaryCollection {
       summaries.add(entry.getValue().toThrift(entry.getKey()));
     }
 
-    return new TSummaries(true, -1l, totalFiles, deletedFiles, summaries);
+    return new TSummaries(true, -1L, totalFiles, deletedFiles, summaries);
   }
 }
diff --git a/core/src/main/java/org/apache/accumulo/core/util/MapCounter.java b/core/src/main/java/org/apache/accumulo/core/util/MapCounter.java
index 9c504e9..a2d4656 100644
--- a/core/src/main/java/org/apache/accumulo/core/util/MapCounter.java
+++ b/core/src/main/java/org/apache/accumulo/core/util/MapCounter.java
@@ -24,7 +24,7 @@ import java.util.Set;
 public class MapCounter<KT> {
 
   static class MutableLong {
-    long l = 0l;
+    long l = 0L;
   }
 
   private HashMap<KT,MutableLong> map;
diff --git a/core/src/main/java/org/apache/accumulo/core/util/SimpleThreadPool.java b/core/src/main/java/org/apache/accumulo/core/util/SimpleThreadPool.java
index 457e623..91fedf0 100644
--- a/core/src/main/java/org/apache/accumulo/core/util/SimpleThreadPool.java
+++ b/core/src/main/java/org/apache/accumulo/core/util/SimpleThreadPool.java
@@ -27,13 +27,13 @@ import java.util.concurrent.TimeUnit;
 public class SimpleThreadPool extends ThreadPoolExecutor {
 
   public SimpleThreadPool(int max, final String name) {
-    super(max, max, 4l, TimeUnit.SECONDS, new LinkedBlockingQueue<>(),
+    super(max, max, 4L, TimeUnit.SECONDS, new LinkedBlockingQueue<>(),
         new NamingThreadFactory(name));
     allowCoreThreadTimeOut(true);
   }
 
   public SimpleThreadPool(int max, final String name, BlockingQueue<Runnable> queue) {
-    super(max, max, 4l, TimeUnit.SECONDS, queue, new NamingThreadFactory(name));
+    super(max, max, 4L, TimeUnit.SECONDS, queue, new NamingThreadFactory(name));
     allowCoreThreadTimeOut(true);
   }
 
diff --git a/core/src/test/java/org/apache/accumulo/core/client/BatchWriterConfigTest.java b/core/src/test/java/org/apache/accumulo/core/client/BatchWriterConfigTest.java
index 50dcd81..5c02311 100644
--- a/core/src/test/java/org/apache/accumulo/core/client/BatchWriterConfigTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/client/BatchWriterConfigTest.java
@@ -37,8 +37,8 @@ public class BatchWriterConfigTest {
 
   @Test
   public void testReasonableDefaults() {
-    long expectedMaxMemory = 50 * 1024 * 1024l;
-    long expectedMaxLatency = 120000l;
+    long expectedMaxMemory = 50 * 1024 * 1024L;
+    long expectedMaxLatency = 120000L;
     long expectedTimeout = Long.MAX_VALUE;
     int expectedMaxWriteThreads = 3;
     Durability expectedDurability = Durability.DEFAULT;
@@ -54,15 +54,15 @@ public class BatchWriterConfigTest {
   @Test
   public void testOverridingDefaults() {
     BatchWriterConfig bwConfig = new BatchWriterConfig();
-    bwConfig.setMaxMemory(1123581321l);
+    bwConfig.setMaxMemory(1123581321L);
     bwConfig.setMaxLatency(22, TimeUnit.HOURS);
     bwConfig.setTimeout(33, TimeUnit.DAYS);
     bwConfig.setMaxWriteThreads(42);
     bwConfig.setDurability(Durability.NONE);
 
-    assertEquals(1123581321l, bwConfig.getMaxMemory());
-    assertEquals(22 * 60 * 60 * 1000l, bwConfig.getMaxLatency(TimeUnit.MILLISECONDS));
-    assertEquals(33 * 24 * 60 * 60 * 1000l, bwConfig.getTimeout(TimeUnit.MILLISECONDS));
+    assertEquals(1123581321L, bwConfig.getMaxMemory());
+    assertEquals(22 * 60 * 60 * 1000L, bwConfig.getMaxLatency(TimeUnit.MILLISECONDS));
+    assertEquals(33 * 24 * 60 * 60 * 1000L, bwConfig.getTimeout(TimeUnit.MILLISECONDS));
     assertEquals(42, bwConfig.getMaxWriteThreads());
     assertEquals(Durability.NONE, bwConfig.getDurability());
   }
@@ -134,18 +134,18 @@ public class BatchWriterConfigTest {
   public void testSerialize() throws IOException {
     // make sure we aren't testing defaults
     final BatchWriterConfig bwDefaults = new BatchWriterConfig();
-    assertNotEquals(7654321l, bwDefaults.getMaxLatency(TimeUnit.MILLISECONDS));
-    assertNotEquals(9898989l, bwDefaults.getTimeout(TimeUnit.MILLISECONDS));
+    assertNotEquals(7654321L, bwDefaults.getMaxLatency(TimeUnit.MILLISECONDS));
+    assertNotEquals(9898989L, bwDefaults.getTimeout(TimeUnit.MILLISECONDS));
     assertNotEquals(42, bwDefaults.getMaxWriteThreads());
-    assertNotEquals(1123581321l, bwDefaults.getMaxMemory());
+    assertNotEquals(1123581321L, bwDefaults.getMaxMemory());
     assertNotEquals(Durability.FLUSH, bwDefaults.getDurability());
 
     // test setting all fields
     BatchWriterConfig bwConfig = new BatchWriterConfig();
-    bwConfig.setMaxLatency(7654321l, TimeUnit.MILLISECONDS);
-    bwConfig.setTimeout(9898989l, TimeUnit.MILLISECONDS);
+    bwConfig.setMaxLatency(7654321L, TimeUnit.MILLISECONDS);
+    bwConfig.setTimeout(9898989L, TimeUnit.MILLISECONDS);
     bwConfig.setMaxWriteThreads(42);
-    bwConfig.setMaxMemory(1123581321l);
+    bwConfig.setMaxMemory(1123581321L);
     bwConfig.setDurability(Durability.FLUSH);
     byte[] bytes = createBytes(bwConfig);
     checkBytes(bwConfig, bytes);
diff --git a/core/src/test/java/org/apache/accumulo/core/client/impl/TableOperationsImplTest.java b/core/src/test/java/org/apache/accumulo/core/client/impl/TableOperationsImplTest.java
index 42e7e5f..47b9093 100644
--- a/core/src/test/java/org/apache/accumulo/core/client/impl/TableOperationsImplTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/client/impl/TableOperationsImplTest.java
@@ -76,7 +76,7 @@ public class TableOperationsImplTest {
     EasyMock.expect(scanner.getTimeout(TimeUnit.MILLISECONDS)).andReturn(Long.MAX_VALUE);
     EasyMock.expect(scanner.getBatchTimeout(TimeUnit.MILLISECONDS)).andReturn(Long.MAX_VALUE);
     EasyMock.expect(scanner.getBatchSize()).andReturn(1000);
-    EasyMock.expect(scanner.getReadaheadThreshold()).andReturn(100l);
+    EasyMock.expect(scanner.getReadaheadThreshold()).andReturn(100L);
 
     EasyMock.replay(instance, credentials, connector, scanner);
 
diff --git a/core/src/test/java/org/apache/accumulo/core/client/impl/ThriftTransportKeyTest.java b/core/src/test/java/org/apache/accumulo/core/client/impl/ThriftTransportKeyTest.java
index 9afe22a..fe0ce45 100644
--- a/core/src/test/java/org/apache/accumulo/core/client/impl/ThriftTransportKeyTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/client/impl/ThriftTransportKeyTest.java
@@ -97,9 +97,9 @@ public class ThriftTransportKeyTest {
           }
         });
 
-    ThriftTransportKey ttk1 = new ThriftTransportKey(HostAndPort.fromParts("localhost", 9997), 1l,
+    ThriftTransportKey ttk1 = new ThriftTransportKey(HostAndPort.fromParts("localhost", 9997), 1L,
         null, saslParams1),
-        ttk2 = new ThriftTransportKey(HostAndPort.fromParts("localhost", 9997), 1l, null,
+        ttk2 = new ThriftTransportKey(HostAndPort.fromParts("localhost", 9997), 1L, null,
             saslParams2);
 
     // Should equals() and hashCode() to make sure we don't throw away thrift cnxns
@@ -144,9 +144,9 @@ public class ThriftTransportKeyTest {
           }
         });
 
-    ThriftTransportKey ttk1 = new ThriftTransportKey(HostAndPort.fromParts("localhost", 9997), 1l,
+    ThriftTransportKey ttk1 = new ThriftTransportKey(HostAndPort.fromParts("localhost", 9997), 1L,
         null, saslParams1),
-        ttk2 = new ThriftTransportKey(HostAndPort.fromParts("localhost", 9997), 1l, null,
+        ttk2 = new ThriftTransportKey(HostAndPort.fromParts("localhost", 9997), 1L, null,
             saslParams2);
 
     assertNotEquals(ttk1, ttk2);
diff --git a/core/src/test/java/org/apache/accumulo/core/client/lexicoder/ListLexicoderTest.java b/core/src/test/java/org/apache/accumulo/core/client/lexicoder/ListLexicoderTest.java
index 22cdc50..33fd6d9 100644
--- a/core/src/test/java/org/apache/accumulo/core/client/lexicoder/ListLexicoderTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/client/lexicoder/ListLexicoderTest.java
@@ -35,20 +35,20 @@ public class ListLexicoderTest extends AbstractLexicoderTest {
   @Override
   public void setUp() {
 
-    data1.add(1l);
-    data1.add(2l);
+    data1.add(1L);
+    data1.add(2L);
 
-    data2.add(1l);
+    data2.add(1L);
 
-    data3.add(1l);
-    data3.add(3l);
+    data3.add(1L);
+    data3.add(3L);
 
-    data4.add(1l);
-    data4.add(2l);
-    data4.add(3l);
+    data4.add(1L);
+    data4.add(2L);
+    data4.add(3L);
 
-    data5.add(2l);
-    data5.add(1l);
+    data5.add(2L);
+    data5.add(1L);
   }
 
   public void testSortOrder() {
diff --git a/core/src/test/java/org/apache/accumulo/core/client/lexicoder/LongLexicoderTest.java b/core/src/test/java/org/apache/accumulo/core/client/lexicoder/LongLexicoderTest.java
index e60c1fb..a5f1596 100644
--- a/core/src/test/java/org/apache/accumulo/core/client/lexicoder/LongLexicoderTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/client/lexicoder/LongLexicoderTest.java
@@ -24,18 +24,18 @@ public class LongLexicoderTest extends AbstractLexicoderTest {
   public void testSortOrder() {
 
     assertSortOrder(new LongLexicoder(),
-        Arrays.asList(Long.MIN_VALUE, 0xff1234567890abcdl, 0xffff1234567890abl, 0xffffff567890abcdl,
-            0xffffffff7890abcdl, 0xffffffffff90abcdl, 0xffffffffffffabcdl, 0xffffffffffffffcdl, -1l,
-            0l, 0x01l, 0x1234l, 0x123456l, 0x12345678l, 0x1234567890l, 0x1234567890abl,
-            0x1234567890abcdl, 0x1234567890abcdefl, Long.MAX_VALUE));
+        Arrays.asList(Long.MIN_VALUE, 0xff1234567890abcdL, 0xffff1234567890abL, 0xffffff567890abcdL,
+            0xffffffff7890abcdL, 0xffffffffff90abcdL, 0xffffffffffffabcdL, 0xffffffffffffffcdL, -1L,
+            0L, 0x01L, 0x1234L, 0x123456L, 0x12345678L, 0x1234567890L, 0x1234567890abL,
+            0x1234567890abcdL, 0x1234567890abcdefL, Long.MAX_VALUE));
   }
 
   public void testDecodes() {
     assertDecodes(new LongLexicoder(), Long.MIN_VALUE);
-    assertDecodes(new LongLexicoder(), -1l);
-    assertDecodes(new LongLexicoder(), 0l);
-    assertDecodes(new LongLexicoder(), 1l);
-    assertDecodes(new LongLexicoder(), 2l);
+    assertDecodes(new LongLexicoder(), -1L);
+    assertDecodes(new LongLexicoder(), 0L);
+    assertDecodes(new LongLexicoder(), 1L);
+    assertDecodes(new LongLexicoder(), 2L);
     assertDecodes(new LongLexicoder(), Long.MAX_VALUE);
   }
 }
diff --git a/core/src/test/java/org/apache/accumulo/core/client/lexicoder/PairLexicoderTest.java b/core/src/test/java/org/apache/accumulo/core/client/lexicoder/PairLexicoderTest.java
index 2cfa7eb..8ce0ec6 100644
--- a/core/src/test/java/org/apache/accumulo/core/client/lexicoder/PairLexicoderTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/client/lexicoder/PairLexicoderTest.java
@@ -39,8 +39,8 @@ public class PairLexicoderTest extends AbstractLexicoderTest {
         new StringLexicoder());
 
     assertSortOrder(plexc2,
-        Arrays.asList(new ComparablePair<>(0x100l, "a"), new ComparablePair<>(0x100l, "ab"),
-            new ComparablePair<>(0xf0l, "a"), new ComparablePair<>(0xf0l, "ab")));
+        Arrays.asList(new ComparablePair<>(0x100L, "a"), new ComparablePair<>(0x100L, "ab"),
+            new ComparablePair<>(0xf0L, "a"), new ComparablePair<>(0xf0L, "ab")));
   }
 
   public void testDecodes() {
diff --git a/core/src/test/java/org/apache/accumulo/core/client/lexicoder/ReverseLexicoderTest.java b/core/src/test/java/org/apache/accumulo/core/client/lexicoder/ReverseLexicoderTest.java
index 0b0a574..ca733f3 100644
--- a/core/src/test/java/org/apache/accumulo/core/client/lexicoder/ReverseLexicoderTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/client/lexicoder/ReverseLexicoderTest.java
@@ -30,10 +30,10 @@ public class ReverseLexicoderTest extends AbstractLexicoderTest {
   public void testSortOrder() {
     Comparator<Long> comp = Collections.reverseOrder();
     assertSortOrder(new ReverseLexicoder<>(new LongLexicoder()), comp,
-        Arrays.asList(Long.MIN_VALUE, 0xff1234567890abcdl, 0xffff1234567890abl, 0xffffff567890abcdl,
-            0xffffffff7890abcdl, 0xffffffffff90abcdl, 0xffffffffffffabcdl, 0xffffffffffffffcdl, -1l,
-            0l, 0x01l, 0x1234l, 0x123456l, 0x12345678l, 0x1234567890l, 0x1234567890abl,
-            0x1234567890abcdl, 0x1234567890abcdefl, Long.MAX_VALUE));
+        Arrays.asList(Long.MIN_VALUE, 0xff1234567890abcdL, 0xffff1234567890abL, 0xffffff567890abcdL,
+            0xffffffff7890abcdL, 0xffffffffff90abcdL, 0xffffffffffffabcdL, 0xffffffffffffffcdL, -1L,
+            0L, 0x01L, 0x1234L, 0x123456L, 0x12345678L, 0x1234567890L, 0x1234567890abL,
+            0x1234567890abcdL, 0x1234567890abcdefL, Long.MAX_VALUE));
 
     Comparator<String> comp2 = Collections.reverseOrder();
     assertSortOrder(new ReverseLexicoder<>(new StringLexicoder()), comp2,
@@ -69,9 +69,9 @@ public class ReverseLexicoderTest extends AbstractLexicoderTest {
 
   public void testDecodes() {
     assertDecodes(new ReverseLexicoder<>(new LongLexicoder()), Long.MIN_VALUE);
-    assertDecodes(new ReverseLexicoder<>(new LongLexicoder()), -1l);
-    assertDecodes(new ReverseLexicoder<>(new LongLexicoder()), 0l);
-    assertDecodes(new ReverseLexicoder<>(new LongLexicoder()), 1l);
+    assertDecodes(new ReverseLexicoder<>(new LongLexicoder()), -1L);
+    assertDecodes(new ReverseLexicoder<>(new LongLexicoder()), 0L);
+    assertDecodes(new ReverseLexicoder<>(new LongLexicoder()), 1L);
     assertDecodes(new ReverseLexicoder<>(new LongLexicoder()), Long.MAX_VALUE);
   }
 }
diff --git a/core/src/test/java/org/apache/accumulo/core/client/lexicoder/ULongLexicoderTest.java b/core/src/test/java/org/apache/accumulo/core/client/lexicoder/ULongLexicoderTest.java
index be0b91f..5a6c037 100644
--- a/core/src/test/java/org/apache/accumulo/core/client/lexicoder/ULongLexicoderTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/client/lexicoder/ULongLexicoderTest.java
@@ -25,48 +25,48 @@ public class ULongLexicoderTest extends AbstractLexicoderTest {
   public void testEncoding() {
     ULongLexicoder ull = new ULongLexicoder();
 
-    assertEqualsB(ull.encode(0l), new byte[] {0x00});
-    assertEqualsB(ull.encode(0x01l), new byte[] {0x01, 0x01});
-    assertEqualsB(ull.encode(0x1234l), new byte[] {0x02, 0x12, 0x34});
-    assertEqualsB(ull.encode(0x123456l), new byte[] {0x03, 0x12, 0x34, 0x56});
-    assertEqualsB(ull.encode(0x12345678l), new byte[] {0x04, 0x12, 0x34, 0x56, 0x78});
-    assertEqualsB(ull.encode(0x1234567890l),
+    assertEqualsB(ull.encode(0L), new byte[] {0x00});
+    assertEqualsB(ull.encode(0x01L), new byte[] {0x01, 0x01});
+    assertEqualsB(ull.encode(0x1234L), new byte[] {0x02, 0x12, 0x34});
+    assertEqualsB(ull.encode(0x123456L), new byte[] {0x03, 0x12, 0x34, 0x56});
+    assertEqualsB(ull.encode(0x12345678L), new byte[] {0x04, 0x12, 0x34, 0x56, 0x78});
+    assertEqualsB(ull.encode(0x1234567890L),
         new byte[] {0x05, 0x12, 0x34, 0x56, 0x78, (byte) 0x90});
-    assertEqualsB(ull.encode(0x1234567890abl),
+    assertEqualsB(ull.encode(0x1234567890abL),
         new byte[] {0x06, 0x12, 0x34, 0x56, 0x78, (byte) 0x90, (byte) 0xab});
-    assertEqualsB(ull.encode(0x1234567890abcdl),
+    assertEqualsB(ull.encode(0x1234567890abcdL),
         new byte[] {0x07, 0x12, 0x34, 0x56, 0x78, (byte) 0x90, (byte) 0xab, (byte) 0xcd});
-    assertEqualsB(ull.encode(0x1234567890abcdefl), new byte[] {0x08, 0x12, 0x34, 0x56, 0x78,
+    assertEqualsB(ull.encode(0x1234567890abcdefL), new byte[] {0x08, 0x12, 0x34, 0x56, 0x78,
         (byte) 0x90, (byte) 0xab, (byte) 0xcd, (byte) 0xef});
 
-    assertEqualsB(ull.encode(0xff34567890abcdefl),
+    assertEqualsB(ull.encode(0xff34567890abcdefL),
         new byte[] {0x09, 0x34, 0x56, 0x78, (byte) 0x90, (byte) 0xab, (byte) 0xcd, (byte) 0xef});
-    assertEqualsB(ull.encode(0xffff567890abcdefl),
+    assertEqualsB(ull.encode(0xffff567890abcdefL),
         new byte[] {0x0a, 0x56, 0x78, (byte) 0x90, (byte) 0xab, (byte) 0xcd, (byte) 0xef});
-    assertEqualsB(ull.encode(0xffffff7890abcdefl),
+    assertEqualsB(ull.encode(0xffffff7890abcdefL),
         new byte[] {0x0b, 0x78, (byte) 0x90, (byte) 0xab, (byte) 0xcd, (byte) 0xef});
-    assertEqualsB(ull.encode(0xffffffff90abcdefl),
+    assertEqualsB(ull.encode(0xffffffff90abcdefL),
         new byte[] {0x0c, (byte) 0x90, (byte) 0xab, (byte) 0xcd, (byte) 0xef});
-    assertEqualsB(ull.encode(0xffffffffffabcdefl),
+    assertEqualsB(ull.encode(0xffffffffffabcdefL),
         new byte[] {0x0d, (byte) 0xab, (byte) 0xcd, (byte) 0xef});
-    assertEqualsB(ull.encode(0xffffffffffffcdefl), new byte[] {0x0e, (byte) 0xcd, (byte) 0xef});
-    assertEqualsB(ull.encode(0xffffffffffffffefl), new byte[] {0x0f, (byte) 0xef});
+    assertEqualsB(ull.encode(0xffffffffffffcdefL), new byte[] {0x0e, (byte) 0xcd, (byte) 0xef});
+    assertEqualsB(ull.encode(0xffffffffffffffefL), new byte[] {0x0f, (byte) 0xef});
 
-    assertEqualsB(ull.encode(-1l), new byte[] {16});
+    assertEqualsB(ull.encode(-1L), new byte[] {16});
   }
 
   public void testSortOrder() {
     // only testing non negative
-    assertSortOrder(new ULongLexicoder(), Arrays.asList(0l, 0x01l, 0x1234l, 0x123456l, 0x12345678l,
-        0x1234567890l, 0x1234567890abl, 0x1234567890abcdl, 0x1234567890abcdefl, Long.MAX_VALUE));
+    assertSortOrder(new ULongLexicoder(), Arrays.asList(0L, 0x01L, 0x1234L, 0x123456L, 0x12345678L,
+        0x1234567890L, 0x1234567890abL, 0x1234567890abcdL, 0x1234567890abcdefL, Long.MAX_VALUE));
   }
 
   public void testDecodes() {
     assertDecodes(new ULongLexicoder(), Long.MIN_VALUE);
-    assertDecodes(new ULongLexicoder(), -1l);
-    assertDecodes(new ULongLexicoder(), 0l);
-    assertDecodes(new ULongLexicoder(), 1l);
-    assertDecodes(new ULongLexicoder(), 2l);
+    assertDecodes(new ULongLexicoder(), -1L);
+    assertDecodes(new ULongLexicoder(), 0L);
+    assertDecodes(new ULongLexicoder(), 1L);
+    assertDecodes(new ULongLexicoder(), 2L);
     assertDecodes(new ULongLexicoder(), Long.MAX_VALUE);
   }
 
diff --git a/core/src/test/java/org/apache/accumulo/core/client/lexicoder/UUIDLexicoderTest.java b/core/src/test/java/org/apache/accumulo/core/client/lexicoder/UUIDLexicoderTest.java
index 3d3b102..f8b3e97 100644
--- a/core/src/test/java/org/apache/accumulo/core/client/lexicoder/UUIDLexicoderTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/client/lexicoder/UUIDLexicoderTest.java
@@ -30,8 +30,8 @@ public class UUIDLexicoderTest extends AbstractLexicoderTest {
 
     ArrayList<UUID> uuids = new ArrayList<>();
 
-    for (long ms = -260l; ms < 260l; ms++) {
-      for (long ls = -2l; ls < 2; ls++) {
+    for (long ms = -260L; ms < 260L; ms++) {
+      for (long ls = -2L; ls < 2; ls++) {
         uuids.add(new UUID(ms, ls));
       }
     }
diff --git a/core/src/test/java/org/apache/accumulo/core/client/mock/MockTableOperationsTest.java b/core/src/test/java/org/apache/accumulo/core/client/mock/MockTableOperationsTest.java
index dfe4ea5..10a3f80 100644
--- a/core/src/test/java/org/apache/accumulo/core/client/mock/MockTableOperationsTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/client/mock/MockTableOperationsTest.java
@@ -238,7 +238,7 @@ public class MockTableOperationsTest {
     List<Pair<Key,Value>> keyVals = new ArrayList<>();
     for (int i = 0; i < 5; i++) {
       keyVals
-          .add(new Pair<>(new Key("a" + i, "b" + i, "c" + i, new ColumnVisibility(""), 1000l + i),
+          .add(new Pair<>(new Key("a" + i, "b" + i, "c" + i, new ColumnVisibility(""), 1000L + i),
               new Value(Integer.toString(i).getBytes())));
     }
     for (Pair<Key,Value> keyVal : keyVals) {
diff --git a/core/src/test/java/org/apache/accumulo/core/client/rfile/RFileTest.java b/core/src/test/java/org/apache/accumulo/core/client/rfile/RFileTest.java
index bb381c7..4a82919 100644
--- a/core/src/test/java/org/apache/accumulo/core/client/rfile/RFileTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/client/rfile/RFileTest.java
@@ -552,12 +552,12 @@ public class RFileTest {
       CounterSummary counterSummary = new CounterSummary(summary);
       if (className.equals(FamilySummarizer.class.getName())) {
         Map<String,Long> counters = counterSummary.getCounters();
-        Map<String,Long> expected = ImmutableMap.of("0000", 200l, "0001", 200l, "0002", 200l,
-            "0003", 200l);
+        Map<String,Long> expected = ImmutableMap.of("0000", 200L, "0001", 200L, "0002", 200L,
+            "0003", 200L);
         Assert.assertEquals(expected, counters);
       } else if (className.equals(VisibilitySummarizer.class.getName())) {
         Map<String,Long> counters = counterSummary.getCounters();
-        Map<String,Long> expected = ImmutableMap.of("A&B", 400l, "A&B&C", 400l);
+        Map<String,Long> expected = ImmutableMap.of("A&B", 400L, "A&B&C", 400L);
         Assert.assertEquals(expected, counters);
       } else {
         Assert.fail("Unexpected classname " + className);
@@ -587,12 +587,12 @@ public class RFileTest {
       CounterSummary counterSummary = new CounterSummary(summary);
       if (className.equals(FamilySummarizer.class.getName())) {
         Map<String,Long> counters = counterSummary.getCounters();
-        Map<String,Long> expected = ImmutableMap.of("0000", 400l, "0001", 400l, "0002", 400l,
-            "0003", 400l);
+        Map<String,Long> expected = ImmutableMap.of("0000", 400L, "0001", 400L, "0002", 400L,
+            "0003", 400L);
         Assert.assertEquals(expected, counters);
       } else if (className.equals(VisibilitySummarizer.class.getName())) {
         Map<String,Long> counters = counterSummary.getCounters();
-        Map<String,Long> expected = ImmutableMap.of("A&B", 800l, "A&B&C", 800l);
+        Map<String,Long> expected = ImmutableMap.of("A&B", 800L, "A&B&C", 800L);
         Assert.assertEquals(expected, counters);
       } else {
         Assert.fail("Unexpected classname " + className);
@@ -602,56 +602,56 @@ public class RFileTest {
     // verify reading a subset of summaries works
     summaries = RFile.summaries().from(testFile, testFile2).withFileSystem(localFs)
         .selectSummaries(sc -> sc.equals(sc1)).read();
-    checkSummaries(summaries, ImmutableMap.of("A&B", 800l, "A&B&C", 800l), 0);
+    checkSummaries(summaries, ImmutableMap.of("A&B", 800L, "A&B&C", 800L), 0);
 
     // the following test check boundry conditions for start row and end row
     summaries = RFile.summaries().from(testFile, testFile2).withFileSystem(localFs)
         .selectSummaries(sc -> sc.equals(sc1)).startRow(rowStr(99)).read();
-    checkSummaries(summaries, ImmutableMap.of("A&B", 400l, "A&B&C", 400l), 0);
+    checkSummaries(summaries, ImmutableMap.of("A&B", 400L, "A&B&C", 400L), 0);
 
     summaries = RFile.summaries().from(testFile, testFile2).withFileSystem(localFs)
         .selectSummaries(sc -> sc.equals(sc1)).startRow(rowStr(98)).read();
-    checkSummaries(summaries, ImmutableMap.of("A&B", 800l, "A&B&C", 800l), 1);
+    checkSummaries(summaries, ImmutableMap.of("A&B", 800L, "A&B&C", 800L), 1);
 
     summaries = RFile.summaries().from(testFile, testFile2).withFileSystem(localFs)
         .selectSummaries(sc -> sc.equals(sc1)).startRow(rowStr(0)).read();
-    checkSummaries(summaries, ImmutableMap.of("A&B", 800l, "A&B&C", 800l), 1);
+    checkSummaries(summaries, ImmutableMap.of("A&B", 800L, "A&B&C", 800L), 1);
 
     summaries = RFile.summaries().from(testFile, testFile2).withFileSystem(localFs)
         .selectSummaries(sc -> sc.equals(sc1)).startRow("#").read();
-    checkSummaries(summaries, ImmutableMap.of("A&B", 800l, "A&B&C", 800l), 0);
+    checkSummaries(summaries, ImmutableMap.of("A&B", 800L, "A&B&C", 800L), 0);
 
     summaries = RFile.summaries().from(testFile, testFile2).withFileSystem(localFs)
         .selectSummaries(sc -> sc.equals(sc1)).startRow(rowStr(100)).read();
-    checkSummaries(summaries, ImmutableMap.of("A&B", 400l, "A&B&C", 400l), 1);
+    checkSummaries(summaries, ImmutableMap.of("A&B", 400L, "A&B&C", 400L), 1);
 
     summaries = RFile.summaries().from(testFile, testFile2).withFileSystem(localFs)
         .selectSummaries(sc -> sc.equals(sc1)).endRow(rowStr(99)).read();
-    checkSummaries(summaries, ImmutableMap.of("A&B", 400l, "A&B&C", 400l), 0);
+    checkSummaries(summaries, ImmutableMap.of("A&B", 400L, "A&B&C", 400L), 0);
 
     summaries = RFile.summaries().from(testFile, testFile2).withFileSystem(localFs)
         .selectSummaries(sc -> sc.equals(sc1)).endRow(rowStr(100)).read();
-    checkSummaries(summaries, ImmutableMap.of("A&B", 800l, "A&B&C", 800l), 1);
+    checkSummaries(summaries, ImmutableMap.of("A&B", 800L, "A&B&C", 800L), 1);
 
     summaries = RFile.summaries().from(testFile, testFile2).withFileSystem(localFs)
         .selectSummaries(sc -> sc.equals(sc1)).endRow(rowStr(199)).read();
-    checkSummaries(summaries, ImmutableMap.of("A&B", 800l, "A&B&C", 800l), 0);
+    checkSummaries(summaries, ImmutableMap.of("A&B", 800L, "A&B&C", 800L), 0);
 
     summaries = RFile.summaries().from(testFile, testFile2).withFileSystem(localFs)
         .selectSummaries(sc -> sc.equals(sc1)).startRow(rowStr(50)).endRow(rowStr(150)).read();
-    checkSummaries(summaries, ImmutableMap.of("A&B", 800l, "A&B&C", 800l), 2);
+    checkSummaries(summaries, ImmutableMap.of("A&B", 800L, "A&B&C", 800L), 2);
 
     summaries = RFile.summaries().from(testFile, testFile2).withFileSystem(localFs)
         .selectSummaries(sc -> sc.equals(sc1)).startRow(rowStr(120)).endRow(rowStr(150)).read();
-    checkSummaries(summaries, ImmutableMap.of("A&B", 400l, "A&B&C", 400l), 1);
+    checkSummaries(summaries, ImmutableMap.of("A&B", 400L, "A&B&C", 400L), 1);
 
     summaries = RFile.summaries().from(testFile, testFile2).withFileSystem(localFs)
         .selectSummaries(sc -> sc.equals(sc1)).startRow(rowStr(50)).endRow(rowStr(199)).read();
-    checkSummaries(summaries, ImmutableMap.of("A&B", 800l, "A&B&C", 800l), 1);
+    checkSummaries(summaries, ImmutableMap.of("A&B", 800L, "A&B&C", 800L), 1);
 
     summaries = RFile.summaries().from(testFile, testFile2).withFileSystem(localFs)
         .selectSummaries(sc -> sc.equals(sc1)).startRow("#").endRow(rowStr(150)).read();
-    checkSummaries(summaries, ImmutableMap.of("A&B", 800l, "A&B&C", 800l), 1);
+    checkSummaries(summaries, ImmutableMap.of("A&B", 800L, "A&B&C", 800L), 1);
 
     summaries = RFile.summaries().from(testFile, testFile2).withFileSystem(localFs)
         .selectSummaries(sc -> sc.equals(sc1)).startRow(rowStr(199)).read();
@@ -666,7 +666,7 @@ public class RFileTest {
 
     summaries = RFile.summaries().from(testFile, testFile2).withFileSystem(localFs)
         .selectSummaries(sc -> sc.equals(sc1)).endRow(rowStr(0)).read();
-    checkSummaries(summaries, ImmutableMap.of("A&B", 400l, "A&B&C", 400l), 1);
+    checkSummaries(summaries, ImmutableMap.of("A&B", 400L, "A&B&C", 400L), 1);
   }
 
   private void checkSummaries(Collection<Summary> summaries, Map<String,Long> expected, int extra) {
diff --git a/core/src/test/java/org/apache/accumulo/core/client/security/tokens/DelegationTokenImplTest.java b/core/src/test/java/org/apache/accumulo/core/client/security/tokens/DelegationTokenImplTest.java
index 57f67b6..0ae390b 100644
--- a/core/src/test/java/org/apache/accumulo/core/client/security/tokens/DelegationTokenImplTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/client/security/tokens/DelegationTokenImplTest.java
@@ -33,8 +33,8 @@ public class DelegationTokenImplTest {
 
   @Test
   public void testSerialization() throws IOException {
-    AuthenticationTokenIdentifier identifier = new AuthenticationTokenIdentifier("user", 1, 1000l,
-        2000l, "instanceid");
+    AuthenticationTokenIdentifier identifier = new AuthenticationTokenIdentifier("user", 1, 1000L,
+        2000L, "instanceid");
     // We don't need a real serialized Token for the password
     DelegationTokenImpl token = new DelegationTokenImpl(new byte[] {'f', 'a', 'k', 'e'},
         identifier);
@@ -53,14 +53,14 @@ public class DelegationTokenImplTest {
 
   @Test
   public void testEquality() throws IOException {
-    AuthenticationTokenIdentifier identifier = new AuthenticationTokenIdentifier("user", 1, 1000l,
-        2000l, "instanceid");
+    AuthenticationTokenIdentifier identifier = new AuthenticationTokenIdentifier("user", 1, 1000L,
+        2000L, "instanceid");
     // We don't need a real serialized Token for the password
     DelegationTokenImpl token = new DelegationTokenImpl(new byte[] {'f', 'a', 'k', 'e'},
         identifier);
 
-    AuthenticationTokenIdentifier identifier2 = new AuthenticationTokenIdentifier("user1", 1, 1000l,
-        2000l, "instanceid");
+    AuthenticationTokenIdentifier identifier2 = new AuthenticationTokenIdentifier("user1", 1, 1000L,
+        2000L, "instanceid");
     // We don't need a real serialized Token for the password
     DelegationTokenImpl token2 = new DelegationTokenImpl(new byte[] {'f', 'a', 'k', 'e'},
         identifier2);
diff --git a/core/src/test/java/org/apache/accumulo/core/client/summary/CountingSummarizerTest.java b/core/src/test/java/org/apache/accumulo/core/client/summary/CountingSummarizerTest.java
index 728d308..df0b3cb 100644
--- a/core/src/test/java/org/apache/accumulo/core/client/summary/CountingSummarizerTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/client/summary/CountingSummarizerTest.java
@@ -71,9 +71,9 @@ public class CountingSummarizerTest {
         for (String qual : new String[] {"mad", "lad", "lab", "map"}) {
           collector.accept(new Key(row, fam, qual), val);
 
-          expected.merge("rp:" + row.substring(0, 2), 1l, Long::sum);
-          expected.merge("fp:" + fam.substring(0, 2), 1l, Long::sum);
-          expected.merge("qp:" + qual.substring(0, 2), 1l, Long::sum);
+          expected.merge("rp:" + row.substring(0, 2), 1L, Long::sum);
+          expected.merge("fp:" + fam.substring(0, 2), 1L, Long::sum);
+          expected.merge("qp:" + qual.substring(0, 2), 1L, Long::sum);
         }
       }
     }
@@ -113,16 +113,16 @@ public class CountingSummarizerTest {
     String p = COUNTER_STAT_PREFIX;
 
     HashMap<String,Long> expected = new HashMap<>();
-    expected.put(p + "f1", 4l);
-    expected.put(p + "f2", 2l);
-    expected.put(p + "f3", 2l);
-    expected.put(p + "f4", 1l);
-    expected.put(p + "f5", 1l);
-    expected.put(TOO_LONG_STAT, 2l);
-    expected.put(TOO_MANY_STAT, 3l);
-    expected.put(SEEN_STAT, 16l);
-    expected.put(EMITTED_STAT, 15l);
-    expected.put(DELETES_IGNORED_STAT, 1l);
+    expected.put(p + "f1", 4L);
+    expected.put(p + "f2", 2L);
+    expected.put(p + "f3", 2L);
+    expected.put(p + "f4", 1L);
+    expected.put(p + "f5", 1L);
+    expected.put(TOO_LONG_STAT, 2L);
+    expected.put(TOO_MANY_STAT, 3L);
+    expected.put(SEEN_STAT, 16L);
+    expected.put(EMITTED_STAT, 15L);
+    expected.put(DELETES_IGNORED_STAT, 1L);
 
     Assert.assertEquals(expected, stats);
 
@@ -135,11 +135,11 @@ public class CountingSummarizerTest {
     Assert.assertEquals(1, csum.getDeletesIgnored());
 
     expected.clear();
-    expected.put("f1", 4l);
-    expected.put("f2", 2l);
-    expected.put("f3", 2l);
-    expected.put("f4", 1l);
-    expected.put("f5", 1l);
+    expected.put("f1", 4L);
+    expected.put("f2", 2L);
+    expected.put("f3", 2L);
+    expected.put("f4", 1L);
+    expected.put("f5", 1L);
     Assert.assertEquals(expected, csum.getCounters());
 
   }
@@ -153,66 +153,66 @@ public class CountingSummarizerTest {
     String p = COUNTER_STAT_PREFIX;
 
     HashMap<String,Long> sm1 = new HashMap<>();
-    sm1.put(p + "f001", 9l);
-    sm1.put(p + "f002", 4l);
-    sm1.put(p + "f003", 2l);
-    sm1.put(p + "f004", 1l);
-    sm1.put(p + "f005", 19l);
-    sm1.put(EMITTED_STAT, 15l);
-    sm1.put(SEEN_STAT, 5l);
-    sm1.put(DELETES_IGNORED_STAT, 1l);
+    sm1.put(p + "f001", 9L);
+    sm1.put(p + "f002", 4L);
+    sm1.put(p + "f003", 2L);
+    sm1.put(p + "f004", 1L);
+    sm1.put(p + "f005", 19L);
+    sm1.put(EMITTED_STAT, 15L);
+    sm1.put(SEEN_STAT, 5L);
+    sm1.put(DELETES_IGNORED_STAT, 1L);
 
     HashMap<String,Long> sm2 = new HashMap<>();
-    sm2.put(p + "f001", 1l);
-    sm2.put(p + "f002", 2l);
-    sm2.put(p + "f00a", 7l);
-    sm2.put(p + "f00b", 1l);
-    sm2.put(p + "f00c", 17l);
-    sm2.put(EMITTED_STAT, 18l);
-    sm2.put(SEEN_STAT, 6l);
-    sm2.put(DELETES_IGNORED_STAT, 2l);
+    sm2.put(p + "f001", 1L);
+    sm2.put(p + "f002", 2L);
+    sm2.put(p + "f00a", 7L);
+    sm2.put(p + "f00b", 1L);
+    sm2.put(p + "f00c", 17L);
+    sm2.put(EMITTED_STAT, 18L);
+    sm2.put(SEEN_STAT, 6L);
+    sm2.put(DELETES_IGNORED_STAT, 2L);
 
     countSum.combiner(sc).merge(sm1, sm2);
 
     HashMap<String,Long> expected = new HashMap<>();
-    expected.put(p + "f001", 10l);
-    expected.put(p + "f002", 6l);
-    expected.put(p + "f005", 19l);
-    expected.put(p + "f00a", 7l);
-    expected.put(p + "f00c", 17l);
-    expected.put(TOO_LONG_STAT, 0l);
-    expected.put(TOO_MANY_STAT, 4l);
-    expected.put(EMITTED_STAT, 18l + 15l);
-    expected.put(SEEN_STAT, 6l + 5l);
-    expected.put(DELETES_IGNORED_STAT, 3l);
+    expected.put(p + "f001", 10L);
+    expected.put(p + "f002", 6L);
+    expected.put(p + "f005", 19L);
+    expected.put(p + "f00a", 7L);
+    expected.put(p + "f00c", 17L);
+    expected.put(TOO_LONG_STAT, 0L);
+    expected.put(TOO_MANY_STAT, 4L);
+    expected.put(EMITTED_STAT, 18L + 15L);
+    expected.put(SEEN_STAT, 6L + 5L);
+    expected.put(DELETES_IGNORED_STAT, 3L);
 
     Assert.assertEquals(expected, sm1);
 
     sm2.clear();
-    sm2.put(p + "f001", 19l);
-    sm2.put(p + "f002", 2l);
-    sm2.put(p + "f003", 3l);
-    sm2.put(p + "f00b", 13l);
-    sm2.put(p + "f00c", 2l);
-    sm2.put(TOO_LONG_STAT, 1l);
-    sm2.put(TOO_MANY_STAT, 3l);
-    sm2.put(EMITTED_STAT, 21l);
-    sm2.put(SEEN_STAT, 7l);
-    sm2.put(DELETES_IGNORED_STAT, 5l);
+    sm2.put(p + "f001", 19L);
+    sm2.put(p + "f002", 2L);
+    sm2.put(p + "f003", 3L);
+    sm2.put(p + "f00b", 13L);
+    sm2.put(p + "f00c", 2L);
+    sm2.put(TOO_LONG_STAT, 1L);
+    sm2.put(TOO_MANY_STAT, 3L);
+    sm2.put(EMITTED_STAT, 21L);
+    sm2.put(SEEN_STAT, 7L);
+    sm2.put(DELETES_IGNORED_STAT, 5L);
 
     countSum.combiner(sc).merge(sm1, sm2);
 
     expected.clear();
-    expected.put(p + "f001", 29l);
-    expected.put(p + "f002", 8l);
-    expected.put(p + "f005", 19l);
-    expected.put(p + "f00b", 13l);
-    expected.put(p + "f00c", 19l);
-    expected.put(TOO_LONG_STAT, 1l);
-    expected.put(TOO_MANY_STAT, 17l);
-    expected.put(EMITTED_STAT, 21l + 18 + 15);
-    expected.put(SEEN_STAT, 7l + 6 + 5);
-    expected.put(DELETES_IGNORED_STAT, 8l);
+    expected.put(p + "f001", 29L);
+    expected.put(p + "f002", 8L);
+    expected.put(p + "f005", 19L);
+    expected.put(p + "f00b", 13L);
+    expected.put(p + "f00c", 19L);
+    expected.put(TOO_LONG_STAT, 1L);
+    expected.put(TOO_MANY_STAT, 17L);
+    expected.put(EMITTED_STAT, 21L + 18 + 15);
+    expected.put(SEEN_STAT, 7L + 6 + 5);
+    expected.put(DELETES_IGNORED_STAT, 8L);
   }
 
   @Test
@@ -234,13 +234,13 @@ public class CountingSummarizerTest {
     String p = COUNTER_STAT_PREFIX;
 
     HashMap<String,Long> expected = new HashMap<>();
-    expected.put(p + "f1", 2l);
-    expected.put(p + "f2", 1l);
-    expected.put(TOO_LONG_STAT, 0l);
-    expected.put(TOO_MANY_STAT, 0l);
-    expected.put(SEEN_STAT, 3l);
-    expected.put(EMITTED_STAT, 3l);
-    expected.put(DELETES_IGNORED_STAT, 0l);
+    expected.put(p + "f1", 2L);
+    expected.put(p + "f2", 1L);
+    expected.put(TOO_LONG_STAT, 0L);
+    expected.put(TOO_MANY_STAT, 0L);
+    expected.put(SEEN_STAT, 3L);
+    expected.put(EMITTED_STAT, 3L);
+    expected.put(DELETES_IGNORED_STAT, 0L);
 
     HashMap<String,Long> stats = new HashMap<>();
     collector.summarize(stats::put);
@@ -255,8 +255,8 @@ public class CountingSummarizerTest {
     Assert.assertEquals(0, csum.getDeletesIgnored());
 
     expected.clear();
-    expected.put("f1", 2l);
-    expected.put("f2", 1l);
+    expected.put("f1", 2L);
+    expected.put("f2", 1L);
     Assert.assertEquals(expected, csum.getCounters());
   }
 }
diff --git a/core/src/test/java/org/apache/accumulo/core/conf/ConfigurationTypeHelperTest.java b/core/src/test/java/org/apache/accumulo/core/conf/ConfigurationTypeHelperTest.java
index 007a2d0..1a386f6 100644
--- a/core/src/test/java/org/apache/accumulo/core/conf/ConfigurationTypeHelperTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/conf/ConfigurationTypeHelperTest.java
@@ -29,15 +29,15 @@ public class ConfigurationTypeHelperTest {
   public void testGetMemoryInBytes() throws Exception {
     Arrays.<Function<String,Long>> asList(ConfigurationTypeHelper::getFixedMemoryAsBytes,
         ConfigurationTypeHelper::getMemoryAsBytes).stream().forEach(memFunc -> {
-          assertEquals(42l, memFunc.apply("42").longValue());
-          assertEquals(42l, memFunc.apply("42b").longValue());
-          assertEquals(42l, memFunc.apply("42B").longValue());
-          assertEquals(42l * 1024l, memFunc.apply("42K").longValue());
-          assertEquals(42l * 1024l, memFunc.apply("42k").longValue());
-          assertEquals(42l * 1024l * 1024l, memFunc.apply("42M").longValue());
-          assertEquals(42l * 1024l * 1024l, memFunc.apply("42m").longValue());
-          assertEquals(42l * 1024l * 1024l * 1024l, memFunc.apply("42G").longValue());
-          assertEquals(42l * 1024l * 1024l * 1024l, memFunc.apply("42g").longValue());
+          assertEquals(42L, memFunc.apply("42").longValue());
+          assertEquals(42L, memFunc.apply("42b").longValue());
+          assertEquals(42L, memFunc.apply("42B").longValue());
+          assertEquals(42L * 1024L, memFunc.apply("42K").longValue());
+          assertEquals(42L * 1024L, memFunc.apply("42k").longValue());
+          assertEquals(42L * 1024L * 1024L, memFunc.apply("42M").longValue());
+          assertEquals(42L * 1024L * 1024L, memFunc.apply("42m").longValue());
+          assertEquals(42L * 1024L * 1024L * 1024L, memFunc.apply("42G").longValue());
+          assertEquals(42L * 1024L * 1024L * 1024L, memFunc.apply("42g").longValue());
         });
     assertEquals(Runtime.getRuntime().maxMemory() / 10,
         ConfigurationTypeHelper.getMemoryAsBytes("10%"));
diff --git a/core/src/test/java/org/apache/accumulo/core/data/KeyTest.java b/core/src/test/java/org/apache/accumulo/core/data/KeyTest.java
index 7c83cdc..188409a 100644
--- a/core/src/test/java/org/apache/accumulo/core/data/KeyTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/data/KeyTest.java
@@ -53,8 +53,8 @@ public class KeyTest {
     byte cq[] = "cq".getBytes();
     byte cv[] = "cv".getBytes();
 
-    Key k1 = new Key(row, cf, cq, cv, 5l, false, false);
-    Key k2 = new Key(row, cf, cq, cv, 5l, false, true);
+    Key k1 = new Key(row, cf, cq, cv, 5L, false, false);
+    Key k2 = new Key(row, cf, cq, cv, 5L, false, true);
 
     assertSame(row, k1.getRowBytes());
     assertSame(cf, k1.getColFamily());
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 a190c17..9d751ee 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
@@ -190,13 +190,13 @@ public class MutationTest {
 
     m.put(nt("cf1"), nt("cq1"), nv("v1"));
     m.put(nt("cf2"), nt("cq2"), new ColumnVisibility("cv2"), nv("v2"));
-    m.put(nt("cf3"), nt("cq3"), 3l, nv("v3"));
-    m.put(nt("cf4"), nt("cq4"), new ColumnVisibility("cv4"), 4l, nv("v4"));
+    m.put(nt("cf3"), nt("cq3"), 3L, nv("v3"));
+    m.put(nt("cf4"), nt("cq4"), new ColumnVisibility("cv4"), 4L, nv("v4"));
 
     m.putDelete(nt("cf5"), nt("cq5"));
     m.putDelete(nt("cf6"), nt("cq6"), new ColumnVisibility("cv6"));
-    m.putDelete(nt("cf7"), nt("cq7"), 7l);
-    m.putDelete(nt("cf8"), nt("cq8"), new ColumnVisibility("cv8"), 8l);
+    m.putDelete(nt("cf7"), nt("cq7"), 7L);
+    m.putDelete(nt("cf8"), nt("cq8"), new ColumnVisibility("cv8"), 8L);
 
     assertEquals(8, m.size());
 
@@ -205,15 +205,15 @@ public class MutationTest {
     assertEquals(8, m.size());
     assertEquals(8, updates.size());
 
-    verifyColumnUpdate(updates.get(0), "cf1", "cq1", "", 0l, false, false, "v1");
-    verifyColumnUpdate(updates.get(1), "cf2", "cq2", "cv2", 0l, false, false, "v2");
-    verifyColumnUpdate(updates.get(2), "cf3", "cq3", "", 3l, true, false, "v3");
-    verifyColumnUpdate(updates.get(3), "cf4", "cq4", "cv4", 4l, true, false, "v4");
+    verifyColumnUpdate(updates.get(0), "cf1", "cq1", "", 0L, false, false, "v1");
+    verifyColumnUpdate(updates.get(1), "cf2", "cq2", "cv2", 0L, false, false, "v2");
+    verifyColumnUpdate(updates.get(2), "cf3", "cq3", "", 3L, true, false, "v3");
+    verifyColumnUpdate(updates.get(3), "cf4", "cq4", "cv4", 4L, true, false, "v4");
 
-    verifyColumnUpdate(updates.get(4), "cf5", "cq5", "", 0l, false, true, "");
-    verifyColumnUpdate(updates.get(5), "cf6", "cq6", "cv6", 0l, false, true, "");
-    verifyColumnUpdate(updates.get(6), "cf7", "cq7", "", 7l, true, true, "");
-    verifyColumnUpdate(updates.get(7), "cf8", "cq8", "cv8", 8l, true, true, "");
+    verifyColumnUpdate(updates.get(4), "cf5", "cq5", "", 0L, false, true, "");
+    verifyColumnUpdate(updates.get(5), "cf6", "cq6", "cv6", 0L, false, true, "");
+    verifyColumnUpdate(updates.get(6), "cf7", "cq7", "", 7L, true, true, "");
+    verifyColumnUpdate(updates.get(7), "cf8", "cq8", "cv8", 8L, true, true, "");
 
   }
 
@@ -223,13 +223,13 @@ public class MutationTest {
 
     m.put("cf1", "cq1", nv("v1"));
     m.put("cf2", "cq2", new ColumnVisibility("cv2"), nv("v2"));
-    m.put("cf3", "cq3", 3l, nv("v3"));
-    m.put("cf4", "cq4", new ColumnVisibility("cv4"), 4l, nv("v4"));
+    m.put("cf3", "cq3", 3L, nv("v3"));
+    m.put("cf4", "cq4", new ColumnVisibility("cv4"), 4L, nv("v4"));
 
     m.putDelete("cf5", "cq5");
     m.putDelete("cf6", "cq6", new ColumnVisibility("cv6"));
-    m.putDelete("cf7", "cq7", 7l);
-    m.putDelete("cf8", "cq8", new ColumnVisibility("cv8"), 8l);
+    m.putDelete("cf7", "cq7", 7L);
+    m.putDelete("cf8", "cq8", new ColumnVisibility("cv8"), 8L);
 
     assertEquals(8, m.size());
 
@@ -238,15 +238,15 @@ public class MutationTest {
     assertEquals(8, m.size());
     assertEquals(8, updates.size());
 
-    verifyColumnUpdate(updates.get(0), "cf1", "cq1", "", 0l, false, false, "v1");
-    verifyColumnUpdate(updates.get(1), "cf2", "cq2", "cv2", 0l, false, false, "v2");
-    verifyColumnUpdate(updates.get(2), "cf3", "cq3", "", 3l, true, false, "v3");
-    verifyColumnUpdate(updates.get(3), "cf4", "cq4", "cv4", 4l, true, false, "v4");
+    verifyColumnUpdate(updates.get(0), "cf1", "cq1", "", 0L, false, false, "v1");
+    verifyColumnUpdate(updates.get(1), "cf2", "cq2", "cv2", 0L, false, false, "v2");
+    verifyColumnUpdate(updates.get(2), "cf3", "cq3", "", 3L, true, false, "v3");
+    verifyColumnUpdate(updates.get(3), "cf4", "cq4", "cv4", 4L, true, false, "v4");
 
-    verifyColumnUpdate(updates.get(4), "cf5", "cq5", "", 0l, false, true, "");
-    verifyColumnUpdate(updates.get(5), "cf6", "cq6", "cv6", 0l, false, true, "");
-    verifyColumnUpdate(updates.get(6), "cf7", "cq7", "", 7l, true, true, "");
-    verifyColumnUpdate(updates.get(7), "cf8", "cq8", "cv8", 8l, true, true, "");
+    verifyColumnUpdate(updates.get(4), "cf5", "cq5", "", 0L, false, true, "");
+    verifyColumnUpdate(updates.get(5), "cf6", "cq6", "cv6", 0L, false, true, "");
+    verifyColumnUpdate(updates.get(6), "cf7", "cq7", "", 7L, true, true, "");
+    verifyColumnUpdate(updates.get(7), "cf8", "cq8", "cv8", 8L, true, true, "");
   }
 
   @Test
@@ -255,13 +255,13 @@ public class MutationTest {
 
     m.put("cf1", "cq1", "v1");
     m.put("cf2", "cq2", new ColumnVisibility("cv2"), "v2");
-    m.put("cf3", "cq3", 3l, "v3");
-    m.put("cf4", "cq4", new ColumnVisibility("cv4"), 4l, "v4");
+    m.put("cf3", "cq3", 3L, "v3");
+    m.put("cf4", "cq4", new ColumnVisibility("cv4"), 4L, "v4");
 
     m.putDelete("cf5", "cq5");
     m.putDelete("cf6", "cq6", new ColumnVisibility("cv6"));
-    m.putDelete("cf7", "cq7", 7l);
-    m.putDelete("cf8", "cq8", new ColumnVisibility("cv8"), 8l);
+    m.putDelete("cf7", "cq7", 7L);
+    m.putDelete("cf8", "cq8", new ColumnVisibility("cv8"), 8L);
 
     assertEquals(8, m.size());
     assertEquals("r1", new String(m.getRow()));
@@ -271,15 +271,15 @@ public class MutationTest {
     assertEquals(8, m.size());
     assertEquals(8, updates.size());
 
-    verifyColumnUpdate(updates.get(0), "cf1", "cq1", "", 0l, false, false, "v1");
-    verifyColumnUpdate(updates.get(1), "cf2", "cq2", "cv2", 0l, false, false, "v2");
-    verifyColumnUpdate(updates.get(2), "cf3", "cq3", "", 3l, true, false, "v3");
-    verifyColumnUpdate(updates.get(3), "cf4", "cq4", "cv4", 4l, true, false, "v4");
+    verifyColumnUpdate(updates.get(0), "cf1", "cq1", "", 0L, false, false, "v1");
+    verifyColumnUpdate(updates.get(1), "cf2", "cq2", "cv2", 0L, false, false, "v2");
+    verifyColumnUpdate(updates.get(2), "cf3", "cq3", "", 3L, true, false, "v3");
+    verifyColumnUpdate(updates.get(3), "cf4", "cq4", "cv4", 4L, true, false, "v4");
 
-    verifyColumnUpdate(updates.get(4), "cf5", "cq5", "", 0l, false, true, "");
-    verifyColumnUpdate(updates.get(5), "cf6", "cq6", "cv6", 0l, false, true, "");
-    verifyColumnUpdate(updates.get(6), "cf7", "cq7", "", 7l, true, true, "");
-    verifyColumnUpdate(updates.get(7), "cf8", "cq8", "cv8", 8l, true, true, "");
+    verifyColumnUpdate(updates.get(4), "cf5", "cq5", "", 0L, false, true, "");
+    verifyColumnUpdate(updates.get(5), "cf6", "cq6", "cv6", 0L, false, true, "");
+    verifyColumnUpdate(updates.get(6), "cf7", "cq7", "", 7L, true, true, "");
+    verifyColumnUpdate(updates.get(7), "cf8", "cq8", "cv8", 8L, true, true, "");
   }
 
   public void testByteArrays() {
@@ -287,13 +287,13 @@ public class MutationTest {
 
     m.put("cf1".getBytes(), "cq1".getBytes(), "v1".getBytes());
     m.put("cf2".getBytes(), "cq2".getBytes(), new ColumnVisibility("cv2"), "v2".getBytes());
-    m.put("cf3".getBytes(), "cq3".getBytes(), 3l, "v3".getBytes());
-    m.put("cf4".getBytes(), "cq4".getBytes(), new ColumnVisibility("cv4"), 4l, "v4".getBytes());
+    m.put("cf3".getBytes(), "cq3".getBytes(), 3L, "v3".getBytes());
+    m.put("cf4".getBytes(), "cq4".getBytes(), new ColumnVisibility("cv4"), 4L, "v4".getBytes());
 
     m.putDelete("cf5".getBytes(), "cq5".getBytes());
     m.putDelete("cf6".getBytes(), "cq6".getBytes(), new ColumnVisibility("cv6"));
-    m.putDelete("cf7".getBytes(), "cq7".getBytes(), 7l);
-    m.putDelete("cf8".getBytes(), "cq8".getBytes(), new ColumnVisibility("cv8"), 8l);
+    m.putDelete("cf7".getBytes(), "cq7".getBytes(), 7L);
+    m.putDelete("cf8".getBytes(), "cq8".getBytes(), new ColumnVisibility("cv8"), 8L);
 
     assertEquals(8, m.size());
 
@@ -302,15 +302,15 @@ public class MutationTest {
     assertEquals(8, m.size());
     assertEquals(8, updates.size());
 
-    verifyColumnUpdate(updates.get(0), "cf1", "cq1", "", 0l, false, false, "v1");
-    verifyColumnUpdate(updates.get(1), "cf2", "cq2", "cv2", 0l, false, false, "v2");
-    verifyColumnUpdate(updates.get(2), "cf3", "cq3", "", 3l, true, false, "v3");
-    verifyColumnUpdate(updates.get(3), "cf4", "cq4", "cv4", 4l, true, false, "v4");
+    verifyColumnUpdate(updates.get(0), "cf1", "cq1", "", 0L, false, false, "v1");
+    verifyColumnUpdate(updates.get(1), "cf2", "cq2", "cv2", 0L, false, false, "v2");
+    verifyColumnUpdate(updates.get(2), "cf3", "cq3", "", 3L, true, false, "v3");
+    verifyColumnUpdate(updates.get(3), "cf4", "cq4", "cv4", 4L, true, false, "v4");
 
-    verifyColumnUpdate(updates.get(4), "cf5", "cq5", "", 0l, false, true, "");
-    verifyColumnUpdate(updates.get(5), "cf6", "cq6", "cv6", 0l, false, true, "");
-    verifyColumnUpdate(updates.get(6), "cf7", "cq7", "", 7l, true, true, "");
-    verifyColumnUpdate(updates.get(7), "cf8", "cq8", "cv8", 8l, true, true, "");
+    verifyColumnUpdate(updates.get(4), "cf5", "cq5", "", 0L, false, true, "");
+    verifyColumnUpdate(updates.get(5), "cf6", "cq6", "cv6", 0L, false, true, "");
+    verifyColumnUpdate(updates.get(6), "cf7", "cq7", "", 7L, true, true, "");
+    verifyColumnUpdate(updates.get(7), "cf8", "cq8", "cv8", 8L, true, true, "");
   }
 
   /**
@@ -414,8 +414,8 @@ public class MutationTest {
     assertEquals("r1", new String(m2.getRow()));
     assertEquals(2, m2.getUpdates().size());
     assertEquals(2, m2.size());
-    verifyColumnUpdate(m2.getUpdates().get(0), "cf1", "cq1", "", 0l, false, false, "v1");
-    verifyColumnUpdate(m2.getUpdates().get(1), "cf2", "cq2", "cv2", 0l, false, false, "v2");
+    verifyColumnUpdate(m2.getUpdates().get(0), "cf1", "cq1", "", 0L, false, false, "v1");
+    verifyColumnUpdate(m2.getUpdates().get(1), "cf2", "cq2", "cv2", 0L, false, false, "v2");
   }
 
   Mutation convert(OldMutation old) throws IOException {
@@ -452,18 +452,18 @@ public class MutationTest {
     assertEquals("r1", new String(m2.getRow()));
     assertEquals(3, m2.getUpdates().size());
     assertEquals(3, m2.size());
-    verifyColumnUpdate(m2.getUpdates().get(0), "cf1", "cq1", "", 0l, false, false, "v1");
-    verifyColumnUpdate(m2.getUpdates().get(1), "cf2", "cq2", "cv2", 0l, false, false, "v2");
-    verifyColumnUpdate(m2.getUpdates().get(2), "cf3", "cq3", "", 0l, false, true, "");
+    verifyColumnUpdate(m2.getUpdates().get(0), "cf1", "cq1", "", 0L, false, false, "v1");
+    verifyColumnUpdate(m2.getUpdates().get(1), "cf2", "cq2", "cv2", 0L, false, false, "v2");
+    verifyColumnUpdate(m2.getUpdates().get(2), "cf3", "cq3", "", 0L, false, true, "");
 
     Mutation m1 = convert(m2);
 
     assertEquals("r1", new String(m1.getRow()));
     assertEquals(3, m1.getUpdates().size());
     assertEquals(3, m1.size());
-    verifyColumnUpdate(m1.getUpdates().get(0), "cf1", "cq1", "", 0l, false, false, "v1");
-    verifyColumnUpdate(m1.getUpdates().get(1), "cf2", "cq2", "cv2", 0l, false, false, "v2");
-    verifyColumnUpdate(m1.getUpdates().get(2), "cf3", "cq3", "", 0l, false, true, "");
+    verifyColumnUpdate(m1.getUpdates().get(0), "cf1", "cq1", "", 0L, false, false, "v1");
+    verifyColumnUpdate(m1.getUpdates().get(1), "cf2", "cq2", "cv2", 0L, false, false, "v2");
+    verifyColumnUpdate(m1.getUpdates().get(2), "cf3", "cq3", "", 0L, false, true, "");
 
     Text exampleRow = new Text(" 123456789 123456789 123456789 123456789 123456789");
     int exampleLen = exampleRow.getLength();
@@ -524,10 +524,10 @@ public class MutationTest {
     assertEquals("r1", new String(m1.getRow()));
     assertEquals(4, m2.getUpdates().size());
     assertEquals(4, m2.size());
-    verifyColumnUpdate(m2.getUpdates().get(0), "cf1", "cq1", "", 0l, false, false, "v1");
-    verifyColumnUpdate(m2.getUpdates().get(1), "cf2", "cq2", "cv2", 0l, false, false, "v2");
-    verifyColumnUpdate(m2.getUpdates().get(2), "cf3", "cq3", "", 0l, false, true, "");
-    verifyColumnUpdate(m2.getUpdates().get(3), "cf2", "big", "", 0l, false, false,
+    verifyColumnUpdate(m2.getUpdates().get(0), "cf1", "cq1", "", 0L, false, false, "v1");
+    verifyColumnUpdate(m2.getUpdates().get(1), "cf2", "cq2", "cv2", 0L, false, false, "v2");
+    verifyColumnUpdate(m2.getUpdates().get(2), "cf3", "cq3", "", 0L, false, true, "");
+    verifyColumnUpdate(m2.getUpdates().get(3), "cf2", "big", "", 0L, false, false,
         bigVal.toString());
   }
 
diff --git a/core/src/test/java/org/apache/accumulo/core/data/OldMutation.java b/core/src/test/java/org/apache/accumulo/core/data/OldMutation.java
index c46a4eb..cbf6679 100644
--- a/core/src/test/java/org/apache/accumulo/core/data/OldMutation.java
+++ b/core/src/test/java/org/apache/accumulo/core/data/OldMutation.java
@@ -246,12 +246,12 @@ public class OldMutation implements Writable {
   }
 
   public void put(Text columnFamily, Text columnQualifier, Value value) {
-    put(columnFamily, columnQualifier, EMPTY_BYTES, false, 0l, false, value.get());
+    put(columnFamily, columnQualifier, EMPTY_BYTES, false, 0L, false, value.get());
   }
 
   public void put(Text columnFamily, Text columnQualifier, ColumnVisibility columnVisibility,
       Value value) {
-    put(columnFamily, columnQualifier, columnVisibility.getExpression(), false, 0l, false,
+    put(columnFamily, columnQualifier, columnVisibility.getExpression(), false, 0L, false,
         value.get());
   }
 
@@ -266,12 +266,12 @@ public class OldMutation implements Writable {
   }
 
   public void putDelete(Text columnFamily, Text columnQualifier) {
-    put(columnFamily, columnQualifier, EMPTY_BYTES, false, 0l, true, EMPTY_BYTES);
+    put(columnFamily, columnQualifier, EMPTY_BYTES, false, 0L, true, EMPTY_BYTES);
   }
 
   public void putDelete(Text columnFamily, Text columnQualifier,
       ColumnVisibility columnVisibility) {
-    put(columnFamily, columnQualifier, columnVisibility.getExpression(), false, 0l, true,
+    put(columnFamily, columnQualifier, columnVisibility.getExpression(), false, 0L, true,
         EMPTY_BYTES);
   }
 
@@ -286,12 +286,12 @@ public class OldMutation implements Writable {
   }
 
   public void put(CharSequence columnFamily, CharSequence columnQualifier, Value value) {
-    put(columnFamily, columnQualifier, EMPTY_BYTES, false, 0l, false, value.get());
+    put(columnFamily, columnQualifier, EMPTY_BYTES, false, 0L, false, value.get());
   }
 
   public void put(CharSequence columnFamily, CharSequence columnQualifier,
       ColumnVisibility columnVisibility, Value value) {
-    put(columnFamily, columnQualifier, columnVisibility.getExpression(), false, 0l, false,
+    put(columnFamily, columnQualifier, columnVisibility.getExpression(), false, 0L, false,
         value.get());
   }
 
@@ -307,12 +307,12 @@ public class OldMutation implements Writable {
   }
 
   public void putDelete(CharSequence columnFamily, CharSequence columnQualifier) {
-    put(columnFamily, columnQualifier, EMPTY_BYTES, false, 0l, true, EMPTY_BYTES);
+    put(columnFamily, columnQualifier, EMPTY_BYTES, false, 0L, true, EMPTY_BYTES);
   }
 
   public void putDelete(CharSequence columnFamily, CharSequence columnQualifier,
       ColumnVisibility columnVisibility) {
-    put(columnFamily, columnQualifier, columnVisibility.getExpression(), false, 0l, true,
+    put(columnFamily, columnQualifier, columnVisibility.getExpression(), false, 0L, true,
         EMPTY_BYTES);
   }
 
@@ -327,12 +327,12 @@ public class OldMutation implements Writable {
   }
 
   public void put(CharSequence columnFamily, CharSequence columnQualifier, CharSequence value) {
-    put(columnFamily, columnQualifier, EMPTY_BYTES, false, 0l, false, value);
+    put(columnFamily, columnQualifier, EMPTY_BYTES, false, 0L, false, value);
   }
 
   public void put(CharSequence columnFamily, CharSequence columnQualifier,
       ColumnVisibility columnVisibility, CharSequence value) {
-    put(columnFamily, columnQualifier, columnVisibility.getExpression(), false, 0l, false, value);
+    put(columnFamily, columnQualifier, columnVisibility.getExpression(), false, 0L, false, value);
   }
 
   public void put(CharSequence columnFamily, CharSequence columnQualifier, long timestamp,
diff --git a/core/src/test/java/org/apache/accumulo/core/data/RangeTest.java b/core/src/test/java/org/apache/accumulo/core/data/RangeTest.java
index 6211e92..f5b0117 100644
--- a/core/src/test/java/org/apache/accumulo/core/data/RangeTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/data/RangeTest.java
@@ -36,11 +36,11 @@ public class RangeTest extends TestCase {
   private Range newRange(String k1, String k2) {
     Key ik1 = null;
     if (k1 != null)
-      ik1 = new Key(new Text(k1), 0l);
+      ik1 = new Key(new Text(k1), 0L);
 
     Key ik2 = null;
     if (k2 != null)
-      ik2 = new Key(new Text(k2), 0l);
+      ik2 = new Key(new Text(k2), 0L);
 
     return new Range(ik1, ik2);
   }
@@ -724,15 +724,15 @@ public class RangeTest extends TestCase {
     assertFalse(r.contains(new Key("abc", "def", "ghj")));
 
     r = Range.exact("abc", "def", "ghi", "j&k");
-    assertTrue(r.contains(new Key("abc", "def", "ghi", "j&k", 7l)));
+    assertTrue(r.contains(new Key("abc", "def", "ghi", "j&k", 7L)));
     assertFalse(r.contains(new Key("abc", "def", "ghi", "j&kl")));
     assertFalse(r.contains(new Key("abc", "def", "ghi", "j&j")));
     assertFalse(r.contains(new Key("abc", "def", "ghi", "j&l")));
 
-    r = Range.exact("abc", "def", "ghi", "j&k", 7l);
-    assertTrue(r.contains(new Key("abc", "def", "ghi", "j&k", 7l)));
-    assertFalse(r.contains(new Key("abc", "def", "ghi", "j&k", 6l)));
-    assertFalse(r.contains(new Key("abc", "def", "ghi", "j&k", 8l)));
+    r = Range.exact("abc", "def", "ghi", "j&k", 7L);
+    assertTrue(r.contains(new Key("abc", "def", "ghi", "j&k", 7L)));
+    assertFalse(r.contains(new Key("abc", "def", "ghi", "j&k", 6L)));
+    assertFalse(r.contains(new Key("abc", "def", "ghi", "j&k", 8L)));
   }
 
   public void testPrefixRange() {
@@ -756,7 +756,7 @@ public class RangeTest extends TestCase {
     assertFalse(r.contains(new Key("abc", "def", "ghj")));
 
     r = Range.prefix("abc", "def", "ghi", "j&k");
-    assertTrue(r.contains(new Key("abc", "def", "ghi", "j&k", 7l)));
+    assertTrue(r.contains(new Key("abc", "def", "ghi", "j&k", 7L)));
     assertTrue(r.contains(new Key("abc", "def", "ghi", "j&kl")));
     assertFalse(r.contains(new Key("abc", "def", "ghi", "j&j")));
     assertFalse(r.contains(new Key("abc", "def", "ghi", "j&l")));
diff --git a/core/src/test/java/org/apache/accumulo/core/file/rfile/RFileMetricsTest.java b/core/src/test/java/org/apache/accumulo/core/file/rfile/RFileMetricsTest.java
index db058f9..ec8a499 100644
--- a/core/src/test/java/org/apache/accumulo/core/file/rfile/RFileMetricsTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/file/rfile/RFileMetricsTest.java
@@ -526,8 +526,8 @@ public class RFileMetricsTest {
 
     for (int row = 0; row < 1100; row++) {
       String rs = String.format("%06x", row);
-      trf.writer.append(new Key(rs, fam1, "q4", "A", 42l), new Value("v".getBytes()));
-      trf.writer.append(new Key(rs, fam2, "q4", "A|B", 42l), new Value("v".getBytes()));
+      trf.writer.append(new Key(rs, fam1, "q4", "A", 42L), new Value("v".getBytes()));
+      trf.writer.append(new Key(rs, fam2, "q4", "A|B", 42L), new Value("v".getBytes()));
     }
 
     trf.writer.startDefaultLocalityGroup();
@@ -539,7 +539,7 @@ public class RFileMetricsTest {
       String rs = String.format("%06x", row);
       for (int v = 0; v < 5; v++) {
         String fs = String.format("%06x", fam++);
-        trf.writer.append(new Key(rs, fs, "q4", vis[v], 42l), new Value("v".getBytes()));
+        trf.writer.append(new Key(rs, fs, "q4", vis[v], 42L), new Value("v".getBytes()));
       }
     }
 
@@ -552,18 +552,18 @@ public class RFileMetricsTest {
     Map<String,Long> expected = new HashMap<>();
     Map<String,Long> expectedBlocks = new HashMap<>();
     for (String v : vis) {
-      expected.put(v, 1000l);
-      expectedBlocks.put(v, 71l);
+      expected.put(v, 1000L);
+      expectedBlocks.put(v, 71L);
     }
     assertEquals(expected, vmg.metric.get(null).asMap());
     assertEquals(expectedBlocks, vmg.blocks.get(null).asMap());
 
     expected.clear();
     expectedBlocks.clear();
-    expected.put("A", 1100l);
-    expected.put("A|B", 1100l);
-    expectedBlocks.put("A", 32l);
-    expectedBlocks.put("A|B", 32l);
+    expected.put("A", 1100L);
+    expected.put("A|B", 1100L);
+    expectedBlocks.put("A", 32L);
+    expectedBlocks.put("A|B", 32L);
     assertEquals(expected, vmg.metric.get("lg1").asMap());
     assertEquals(expectedBlocks, vmg.blocks.get("lg1").asMap());
 
diff --git a/core/src/test/java/org/apache/accumulo/core/iterators/aggregation/NumSummationTest.java b/core/src/test/java/org/apache/accumulo/core/iterators/aggregation/NumSummationTest.java
index 5a56ead..cf9057a 100644
--- a/core/src/test/java/org/apache/accumulo/core/iterators/aggregation/NumSummationTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/iterators/aggregation/NumSummationTest.java
@@ -44,7 +44,7 @@ public class NumSummationTest {
   @Test
   public void test1() {
     try {
-      long[] la = {1l, 2l, 3l};
+      long[] la = {1L, 2L, 3L};
       byte[] b = NumArraySummation.longArrayToBytes(la);
       long[] la2 = NumArraySummation.bytesToLongArray(b);
 
@@ -61,9 +61,9 @@ public class NumSummationTest {
   public void test2() {
     try {
       NumArraySummation nas = new NumArraySummation();
-      long[] la = {1l, 2l, 3l};
+      long[] la = {1L, 2L, 3L};
       nas.collect(new Value(NumArraySummation.longArrayToBytes(la)));
-      long[] la2 = {3l, 2l, 1l, 0l};
+      long[] la2 = {3L, 2L, 1L, 0L};
       nas.collect(new Value(NumArraySummation.longArrayToBytes(la2)));
       la = NumArraySummation.bytesToLongArray(nas.aggregate().get());
       assertTrue(la.length == 4);
@@ -84,9 +84,9 @@ public class NumSummationTest {
   public void test3() {
     try {
       NumArraySummation nas = new NumArraySummation();
-      long[] la = {Long.MAX_VALUE, Long.MIN_VALUE, 3l, -5l, 5l, 5l};
+      long[] la = {Long.MAX_VALUE, Long.MIN_VALUE, 3L, -5L, 5L, 5L};
       nas.collect(new Value(NumArraySummation.longArrayToBytes(la)));
-      long[] la2 = {1l, -3l, 2l, 10l};
+      long[] la2 = {1L, -3L, 2L, 10L};
       nas.collect(new Value(NumArraySummation.longArrayToBytes(la2)));
       la = NumArraySummation.bytesToLongArray(nas.aggregate().get());
       assertTrue(la.length == 6);
@@ -103,7 +103,7 @@ public class NumSummationTest {
   @Test
   public void test4() {
     try {
-      long l = 5l;
+      long l = 5L;
       byte[] b = NumSummation.longToBytes(l);
       long l2 = NumSummation.bytesToLong(b);
 
@@ -117,7 +117,7 @@ public class NumSummationTest {
   public void test5() {
     try {
       NumSummation ns = new NumSummation();
-      for (long l = -5l; l < 8l; l++) {
+      for (long l = -5L; l < 8L; l++) {
         ns.collect(new Value(NumSummation.longToBytes(l)));
       }
       long l = NumSummation.bytesToLong(ns.aggregate().get());
diff --git a/core/src/test/java/org/apache/accumulo/core/iterators/system/TimeSettingIteratorTest.java b/core/src/test/java/org/apache/accumulo/core/iterators/system/TimeSettingIteratorTest.java
index 7e07a53..aa2178e 100644
--- a/core/src/test/java/org/apache/accumulo/core/iterators/system/TimeSettingIteratorTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/iterators/system/TimeSettingIteratorTest.java
@@ -38,57 +38,57 @@ public class TimeSettingIteratorTest {
   public void test1() throws Exception {
     TreeMap<Key,Value> tm1 = new TreeMap<>();
 
-    tm1.put(new Key("r0", "cf1", "cq1", 9l), new Value("v0".getBytes()));
+    tm1.put(new Key("r0", "cf1", "cq1", 9L), new Value("v0".getBytes()));
     tm1.put(new Key("r1", "cf1", "cq1", Long.MAX_VALUE), new Value("v1".getBytes()));
-    tm1.put(new Key("r1", "cf1", "cq1", 90l), new Value("v2".getBytes()));
-    tm1.put(new Key("r1", "cf1", "cq1", 0l), new Value("v3".getBytes()));
-    tm1.put(new Key("r2", "cf1", "cq1", 6l), new Value("v4".getBytes()));
+    tm1.put(new Key("r1", "cf1", "cq1", 90L), new Value("v2".getBytes()));
+    tm1.put(new Key("r1", "cf1", "cq1", 0L), new Value("v3".getBytes()));
+    tm1.put(new Key("r2", "cf1", "cq1", 6L), new Value("v4".getBytes()));
 
     TimeSettingIterator tsi = new TimeSettingIterator(new SortedMapIterator(tm1), 50);
 
     tsi.seek(
-        new Range(new Key("r1", "cf1", "cq1", 50l), true, new Key("r1", "cf1", "cq1", 50l), true),
+        new Range(new Key("r1", "cf1", "cq1", 50L), true, new Key("r1", "cf1", "cq1", 50L), true),
         new HashSet<>(), false);
 
     assertTrue(tsi.hasTop());
-    assertEquals(new Key("r1", "cf1", "cq1", 50l), tsi.getTopKey());
+    assertEquals(new Key("r1", "cf1", "cq1", 50L), tsi.getTopKey());
     assertEquals("v1", tsi.getTopValue().toString());
     tsi.next();
 
     assertTrue(tsi.hasTop());
-    assertEquals(new Key("r1", "cf1", "cq1", 50l), tsi.getTopKey());
+    assertEquals(new Key("r1", "cf1", "cq1", 50L), tsi.getTopKey());
     assertEquals("v2", tsi.getTopValue().toString());
     tsi.next();
 
     assertTrue(tsi.hasTop());
-    assertEquals(new Key("r1", "cf1", "cq1", 50l), tsi.getTopKey());
+    assertEquals(new Key("r1", "cf1", "cq1", 50L), tsi.getTopKey());
     assertEquals("v3", tsi.getTopValue().toString());
     tsi.next();
 
     assertFalse(tsi.hasTop());
 
-    tsi.seek(new Range(new Key("r1", "cf1", "cq1", 50l), false, null, true), new HashSet<>(),
+    tsi.seek(new Range(new Key("r1", "cf1", "cq1", 50L), false, null, true), new HashSet<>(),
         false);
 
     assertTrue(tsi.hasTop());
-    assertEquals(new Key("r2", "cf1", "cq1", 50l), tsi.getTopKey());
+    assertEquals(new Key("r2", "cf1", "cq1", 50L), tsi.getTopKey());
     assertEquals("v4", tsi.getTopValue().toString());
     tsi.next();
 
     assertFalse(tsi.hasTop());
 
-    tsi.seek(new Range(null, true, new Key("r1", "cf1", "cq1", 50l), false), new HashSet<>(),
+    tsi.seek(new Range(null, true, new Key("r1", "cf1", "cq1", 50L), false), new HashSet<>(),
         false);
 
     assertTrue(tsi.hasTop());
-    assertEquals(new Key("r0", "cf1", "cq1", 50l), tsi.getTopKey());
+    assertEquals(new Key("r0", "cf1", "cq1", 50L), tsi.getTopKey());
     assertEquals("v0", tsi.getTopValue().toString());
     tsi.next();
 
     assertFalse(tsi.hasTop());
 
     tsi.seek(
-        new Range(new Key("r1", "cf1", "cq1", 51l), true, new Key("r1", "cf1", "cq1", 50l), false),
+        new Range(new Key("r1", "cf1", "cq1", 51L), true, new Key("r1", "cf1", "cq1", 50L), false),
         new HashSet<>(), false);
     assertFalse(tsi.hasTop());
   }
@@ -96,7 +96,7 @@ public class TimeSettingIteratorTest {
   @Test
   public void testAvoidKeyCopy() throws Exception {
     TreeMap<Key,Value> tm1 = new TreeMap<>();
-    final Key k = new Key("r0", "cf1", "cq1", 9l);
+    final Key k = new Key("r0", "cf1", "cq1", 9L);
 
     tm1.put(k, new Value("v0".getBytes()));
 
@@ -107,7 +107,7 @@ public class TimeSettingIteratorTest {
     assertTrue(tsi.hasTop());
     final Key topKey = tsi.getTopKey();
     assertTrue("Expected the topKey to be the same object", k == topKey);
-    assertEquals(new Key("r0", "cf1", "cq1", 50l), topKey);
+    assertEquals(new Key("r0", "cf1", "cq1", 50L), topKey);
     assertEquals("v0", tsi.getTopValue().toString());
     tsi.next();
 
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 55866f3..9ebbc55 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
@@ -122,9 +122,9 @@ public class CombinerTest {
     TreeMap<Key,Value> tm1 = new TreeMap<>();
 
     // keys that do not aggregate
-    newKeyValue(tm1, 1, 1, 1, 1, false, 2l, encoder);
-    newKeyValue(tm1, 1, 1, 1, 2, false, 3l, encoder);
-    newKeyValue(tm1, 1, 1, 1, 3, false, 4l, encoder);
+    newKeyValue(tm1, 1, 1, 1, 1, false, 2L, encoder);
+    newKeyValue(tm1, 1, 1, 1, 2, false, 3L, encoder);
+    newKeyValue(tm1, 1, 1, 1, 3, false, 4L, encoder);
 
     Combiner ai = new SummingCombiner();
 
@@ -187,9 +187,9 @@ public class CombinerTest {
     TreeMap<Key,Value> tm1 = new TreeMap<>();
 
     // keys that aggregate
-    newKeyValue(tm1, 1, 1, 1, 1, false, 2l, encoder);
-    newKeyValue(tm1, 1, 1, 1, 2, false, 3l, encoder);
-    newKeyValue(tm1, 1, 1, 1, 3, false, 4l, encoder);
+    newKeyValue(tm1, 1, 1, 1, 1, false, 2L, encoder);
+    newKeyValue(tm1, 1, 1, 1, 2, false, 3L, encoder);
+    newKeyValue(tm1, 1, 1, 1, 3, false, 4L, encoder);
 
     Combiner ai = new SummingCombiner();
 
@@ -249,13 +249,13 @@ public class CombinerTest {
     TreeMap<Key,Value> tm1 = new TreeMap<>();
 
     // keys that aggregate
-    newKeyValue(tm1, 1, 1, 1, 1, false, 2l, encoder);
-    newKeyValue(tm1, 1, 1, 1, 2, false, 3l, encoder);
-    newKeyValue(tm1, 1, 1, 1, 3, false, 4l, encoder);
+    newKeyValue(tm1, 1, 1, 1, 1, false, 2L, encoder);
+    newKeyValue(tm1, 1, 1, 1, 2, false, 3L, encoder);
+    newKeyValue(tm1, 1, 1, 1, 3, false, 4L, encoder);
 
     // keys that do not aggregate
-    newKeyValue(tm1, 2, 2, 1, 1, false, 2l, encoder);
-    newKeyValue(tm1, 2, 2, 1, 2, false, 3l, encoder);
+    newKeyValue(tm1, 2, 2, 1, 1, false, 2L, encoder);
+    newKeyValue(tm1, 2, 2, 1, 2, false, 3L, encoder);
 
     Combiner ai = new SummingCombiner();
 
@@ -315,13 +315,13 @@ public class CombinerTest {
     TreeMap<Key,Value> tm1 = new TreeMap<>();
 
     // keys that aggregate
-    newKeyValue(tm1, 1, 1, 1, 1, false, 2l, encoder);
-    newKeyValue(tm1, 1, 1, 1, 2, false, 3l, encoder);
-    newKeyValue(tm1, 1, 1, 1, 3, false, 4l, encoder);
+    newKeyValue(tm1, 1, 1, 1, 1, false, 2L, encoder);
+    newKeyValue(tm1, 1, 1, 1, 2, false, 3L, encoder);
+    newKeyValue(tm1, 1, 1, 1, 3, false, 4L, encoder);
 
     // keys that do not aggregate
-    newKeyValue(tm1, 2, 2, 1, 1, false, 2l, encoder);
-    newKeyValue(tm1, 2, 2, 1, 2, false, 3l, encoder);
+    newKeyValue(tm1, 2, 2, 1, 1, false, 2L, encoder);
+    newKeyValue(tm1, 2, 2, 1, 2, false, 3L, encoder);
 
     Combiner ai = new SummingCombiner();
 
@@ -383,16 +383,16 @@ public class CombinerTest {
     TreeMap<Key,Value> tm1 = new TreeMap<>();
 
     // keys that do not aggregate
-    newKeyValue(tm1, 0, 0, 1, 1, false, 7l, encoder);
+    newKeyValue(tm1, 0, 0, 1, 1, false, 7L, encoder);
 
     // keys that aggregate
-    newKeyValue(tm1, 1, 1, 1, 1, false, 2l, encoder);
-    newKeyValue(tm1, 1, 1, 1, 2, false, 3l, encoder);
-    newKeyValue(tm1, 1, 1, 1, 3, false, 4l, encoder);
+    newKeyValue(tm1, 1, 1, 1, 1, false, 2L, encoder);
+    newKeyValue(tm1, 1, 1, 1, 2, false, 3L, encoder);
+    newKeyValue(tm1, 1, 1, 1, 3, false, 4L, encoder);
 
     // keys that do not aggregate
-    newKeyValue(tm1, 2, 2, 1, 1, false, 2l, encoder);
-    newKeyValue(tm1, 2, 2, 1, 2, false, 3l, encoder);
+    newKeyValue(tm1, 2, 2, 1, 1, false, 2L, encoder);
+    newKeyValue(tm1, 2, 2, 1, 2, false, 3L, encoder);
 
     Combiner ai = new SummingCombiner();
 
@@ -486,13 +486,13 @@ public class CombinerTest {
     // the exact same keys w/ different values
 
     TreeMap<Key,Value> tm1 = new TreeMap<>();
-    newKeyValue(tm1, 1, 1, 1, 1, false, 2l, encoder);
+    newKeyValue(tm1, 1, 1, 1, 1, false, 2L, encoder);
 
     TreeMap<Key,Value> tm2 = new TreeMap<>();
-    newKeyValue(tm2, 1, 1, 1, 1, false, 3l, encoder);
+    newKeyValue(tm2, 1, 1, 1, 1, false, 3L, encoder);
 
     TreeMap<Key,Value> tm3 = new TreeMap<>();
-    newKeyValue(tm3, 1, 1, 1, 1, false, 4l, encoder);
+    newKeyValue(tm3, 1, 1, 1, 1, false, 4L, encoder);
 
     Combiner ai = new SummingCombiner();
 
@@ -520,9 +520,9 @@ public class CombinerTest {
     TreeMap<Key,Value> tm1 = new TreeMap<>();
 
     // keys that aggregate
-    newKeyValue(tm1, 1, 1, 1, 1, false, 2l, encoder);
-    newKeyValue(tm1, 1, 1, 1, 2, false, 3l, encoder);
-    newKeyValue(tm1, 1, 1, 1, 3, false, 4l, encoder);
+    newKeyValue(tm1, 1, 1, 1, 1, false, 2L, encoder);
+    newKeyValue(tm1, 1, 1, 1, 2, false, 3L, encoder);
+    newKeyValue(tm1, 1, 1, 1, 3, false, 4L, encoder);
 
     Combiner ai = new SummingCombiner();
 
@@ -548,9 +548,9 @@ public class CombinerTest {
 
     TreeMap<Key,Value> tm1 = new TreeMap<>();
 
-    newKeyValue(tm1, 1, 1, 1, 2, true, 0l, encoder);
-    newKeyValue(tm1, 1, 1, 1, 3, false, 4l, encoder);
-    newKeyValue(tm1, 1, 1, 1, 4, false, 3l, encoder);
+    newKeyValue(tm1, 1, 1, 1, 2, true, 0L, encoder);
+    newKeyValue(tm1, 1, 1, 1, 3, false, 4L, encoder);
+    newKeyValue(tm1, 1, 1, 1, 4, false, 3L, encoder);
 
     Combiner ai = new SummingCombiner();
 
@@ -575,7 +575,7 @@ public class CombinerTest {
     assertFalse(ai.hasTop());
 
     tm1 = new TreeMap<>();
-    newKeyValue(tm1, 1, 1, 1, 2, true, 0l, encoder);
+    newKeyValue(tm1, 1, 1, 1, 2, true, 0L, encoder);
     ai = new SummingCombiner();
     ai.init(new SortedMapIterator(tm1), is.getOptions(), SCAN_IE);
 
@@ -644,9 +644,9 @@ public class CombinerTest {
     TreeMap<Key,Value> tm1 = new TreeMap<>();
 
     // keys that aggregate
-    newKeyValue(tm1, 1, 1, 1, 1, false, 4l, encoder);
-    newKeyValue(tm1, 1, 1, 1, 2, false, 3l, encoder);
-    newKeyValue(tm1, 1, 1, 1, 3, false, 2l, encoder);
+    newKeyValue(tm1, 1, 1, 1, 1, false, 4L, encoder);
+    newKeyValue(tm1, 1, 1, 1, 2, false, 3L, encoder);
+    newKeyValue(tm1, 1, 1, 1, 3, false, 2L, encoder);
 
     Combiner ai = new MaxCombiner();
 
@@ -701,8 +701,8 @@ public class CombinerTest {
     TreeMap<Key,Value> tm1 = new TreeMap<>();
 
     // keys that aggregate
-    newKeyValue(tm1, 1, 1, 1, 1, false, nal(1l, 2l), encoder);
-    newKeyValue(tm1, 1, 1, 1, 2, false, nal(3l, 4l, 5l), encoder);
+    newKeyValue(tm1, 1, 1, 1, 1, false, nal(1L, 2L), encoder);
+    newKeyValue(tm1, 1, 1, 1, 2, false, nal(3L, 4L, 5L), encoder);
     newKeyValue(tm1, 1, 1, 1, 3, false, nal(), encoder);
 
     Combiner ai = new SummingArrayCombiner();
@@ -716,7 +716,7 @@ public class CombinerTest {
 
     assertTrue(ai.hasTop());
     assertEquals(newKey(1, 1, 1, 3), ai.getTopKey());
-    assertBytesEqual(encoder.encode(nal(4l, 6l, 5l)), ai.getTopValue().get());
+    assertBytesEqual(encoder.encode(nal(4L, 6L, 5L)), ai.getTopValue().get());
 
     ai.next();
 
@@ -731,7 +731,7 @@ public class CombinerTest {
 
     assertTrue(ai.hasTop());
     assertEquals(newKey(1, 1, 1, 3), ai.getTopKey());
-    assertBytesEqual(encoder.encode(nal(4l, 6l, 5l)), ai.getTopValue().get());
+    assertBytesEqual(encoder.encode(nal(4L, 6L, 5L)), ai.getTopValue().get());
 
     ai.next();
 
@@ -746,7 +746,7 @@ public class CombinerTest {
 
     assertTrue(ai.hasTop());
     assertEquals(newKey(1, 1, 1, 3), ai.getTopKey());
-    assertBytesEqual(encoder.encode(nal(4l, 6l, 5l)), ai.getTopValue().get());
+    assertBytesEqual(encoder.encode(nal(4L, 6L, 5L)), ai.getTopValue().get());
 
     ai.next();
 
@@ -799,26 +799,26 @@ public class CombinerTest {
   public void testEncoders() {
     TypedValueCombiner.testEncoder(SummingCombiner.FIXED_LEN_ENCODER, Long.MAX_VALUE);
     TypedValueCombiner.testEncoder(SummingCombiner.FIXED_LEN_ENCODER, Long.MIN_VALUE);
-    TypedValueCombiner.testEncoder(SummingCombiner.FIXED_LEN_ENCODER, 42l);
-    TypedValueCombiner.testEncoder(SummingCombiner.FIXED_LEN_ENCODER, -42l);
-    TypedValueCombiner.testEncoder(SummingCombiner.FIXED_LEN_ENCODER, 0l);
+    TypedValueCombiner.testEncoder(SummingCombiner.FIXED_LEN_ENCODER, 42L);
+    TypedValueCombiner.testEncoder(SummingCombiner.FIXED_LEN_ENCODER, -42L);
+    TypedValueCombiner.testEncoder(SummingCombiner.FIXED_LEN_ENCODER, 0L);
     TypedValueCombiner.testEncoder(SummingCombiner.VAR_LEN_ENCODER, Long.MAX_VALUE);
     TypedValueCombiner.testEncoder(SummingCombiner.VAR_LEN_ENCODER, Long.MIN_VALUE);
-    TypedValueCombiner.testEncoder(SummingCombiner.VAR_LEN_ENCODER, 42l);
-    TypedValueCombiner.testEncoder(SummingCombiner.VAR_LEN_ENCODER, -42l);
-    TypedValueCombiner.testEncoder(SummingCombiner.VAR_LEN_ENCODER, 0l);
+    TypedValueCombiner.testEncoder(SummingCombiner.VAR_LEN_ENCODER, 42L);
+    TypedValueCombiner.testEncoder(SummingCombiner.VAR_LEN_ENCODER, -42L);
+    TypedValueCombiner.testEncoder(SummingCombiner.VAR_LEN_ENCODER, 0L);
     TypedValueCombiner.testEncoder(SummingCombiner.STRING_ENCODER, Long.MAX_VALUE);
     TypedValueCombiner.testEncoder(SummingCombiner.STRING_ENCODER, Long.MIN_VALUE);
-    TypedValueCombiner.testEncoder(SummingCombiner.STRING_ENCODER, 42l);
-    TypedValueCombiner.testEncoder(SummingCombiner.STRING_ENCODER, -42l);
-    TypedValueCombiner.testEncoder(SummingCombiner.STRING_ENCODER, 0l);
+    TypedValueCombiner.testEncoder(SummingCombiner.STRING_ENCODER, 42L);
+    TypedValueCombiner.testEncoder(SummingCombiner.STRING_ENCODER, -42L);
+    TypedValueCombiner.testEncoder(SummingCombiner.STRING_ENCODER, 0L);
 
     TypedValueCombiner.testEncoder(SummingArrayCombiner.FIXED_LONG_ARRAY_ENCODER,
-        Arrays.asList(0l, -1l, 10l, Long.MAX_VALUE, Long.MIN_VALUE));
+        Arrays.asList(0L, -1L, 10L, Long.MAX_VALUE, Long.MIN_VALUE));
     TypedValueCombiner.testEncoder(SummingArrayCombiner.VAR_LONG_ARRAY_ENCODER,
-        Arrays.asList(0l, -1l, 10l, Long.MAX_VALUE, Long.MIN_VALUE));
+        Arrays.asList(0L, -1L, 10L, Long.MAX_VALUE, Long.MIN_VALUE));
     TypedValueCombiner.testEncoder(SummingArrayCombiner.STRING_ARRAY_ENCODER,
-        Arrays.asList(0l, -1l, 10l, Long.MAX_VALUE, Long.MIN_VALUE));
+        Arrays.asList(0L, -1L, 10L, Long.MAX_VALUE, Long.MIN_VALUE));
   }
 
   @Test
@@ -914,15 +914,15 @@ public class CombinerTest {
     IteratorEnvironment fullMajcIe = new CombinerIteratorEnvironment(IteratorScope.majc, true);
 
     // keys that aggregate
-    newKeyValue(input, 1, 1, 1, 1, false, 4l, encoder);
-    newKeyValue(input, 1, 1, 1, 2, true, 0l, encoder);
-    newKeyValue(input, 1, 1, 1, 3, false, 2l, encoder);
-    newKeyValue(input, 1, 1, 1, 4, false, 9l, encoder);
+    newKeyValue(input, 1, 1, 1, 1, false, 4L, encoder);
+    newKeyValue(input, 1, 1, 1, 2, true, 0L, encoder);
+    newKeyValue(input, 1, 1, 1, 3, false, 2L, encoder);
+    newKeyValue(input, 1, 1, 1, 4, false, 9L, encoder);
 
     TreeMap<Key,Value> expected = new TreeMap<>();
-    newKeyValue(expected, 1, 1, 1, 1, false, 4l, encoder);
-    newKeyValue(expected, 1, 1, 1, 2, true, 0l, encoder);
-    newKeyValue(expected, 1, 1, 1, 4, false, 11l, encoder);
+    newKeyValue(expected, 1, 1, 1, 1, false, 4L, encoder);
+    newKeyValue(expected, 1, 1, 1, 2, true, 0L, encoder);
+    newKeyValue(expected, 1, 1, 1, 4, false, 11L, encoder);
 
     runDeleteHandlingTest(input, input, true, paritalMajcIe);
     runDeleteHandlingTest(input, expected, true, fullMajcIe);
@@ -951,7 +951,7 @@ public class CombinerTest {
 
     // keys that aggregate
     tm1.put(newKey(1, 1, 1, 1, false), new Value("badValue"));
-    newKeyValue(tm1, 1, 1, 1, 2, false, nal(3l, 4l, 5l), encoder);
+    newKeyValue(tm1, 1, 1, 1, 2, false, nal(3L, 4L, 5L), encoder);
     newKeyValue(tm1, 1, 1, 1, 3, false, nal(), encoder);
 
     SummingArrayCombiner summingArrayCombiner = new SummingArrayCombiner();
@@ -969,7 +969,7 @@ public class CombinerTest {
 
     assertTrue(summingArrayCombiner.hasTop());
     assertEquals(newKey(1, 1, 1, 3), summingArrayCombiner.getTopKey());
-    assertBytesEqual(encoder.encode(nal(3l, 4l, 5l)), summingArrayCombiner.getTopValue().get());
+    assertBytesEqual(encoder.encode(nal(3L, 4L, 5L)), summingArrayCombiner.getTopValue().get());
 
     summingArrayCombiner.next();
 
diff --git a/core/src/test/java/org/apache/accumulo/core/iterators/user/FilterTest.java b/core/src/test/java/org/apache/accumulo/core/iterators/user/FilterTest.java
index bc780bd..843a5d0 100644
--- a/core/src/test/java/org/apache/accumulo/core/iterators/user/FilterTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/iterators/user/FilterTest.java
@@ -196,8 +196,8 @@ public class FilterTest {
 
     SortedKeyValueIterator<Key,Value> a = new AgeOffFilter();
     IteratorSetting is = new IteratorSetting(1, AgeOffFilter.class);
-    AgeOffFilter.setTTL(is, 101l);
-    AgeOffFilter.setCurrentTime(is, 1001l);
+    AgeOffFilter.setTTL(is, 101L);
+    AgeOffFilter.setCurrentTime(is, 1001L);
     AgeOffFilter.setNegate(is, true);
     assertTrue(((AgeOffFilter) a).validateOptions(is.getOptions()));
     try {
@@ -220,7 +220,7 @@ public class FilterTest {
     Value dv = new Value();
     TreeMap<Key,Value> tm = new TreeMap<>();
     IteratorSetting is = new IteratorSetting(1, ColumnAgeOffFilter.class);
-    ColumnAgeOffFilter.addTTL(is, new IteratorSetting.Column("a"), 901l);
+    ColumnAgeOffFilter.addTTL(is, new IteratorSetting.Column("a"), 901L);
     long ts = System.currentTimeMillis();
 
     for (long i = 0; i < 1000; i++) {
@@ -236,7 +236,7 @@ public class FilterTest {
     a.seek(new Range(), EMPTY_COL_FAMS, false);
     assertEquals(902, size(a));
 
-    ColumnAgeOffFilter.addTTL(is, new IteratorSetting.Column("a", "b"), 101l);
+    ColumnAgeOffFilter.addTTL(is, new IteratorSetting.Column("a", "b"), 101L);
     a.init(new SortedMapIterator(tm), is.getOptions(), new DefaultIteratorEnvironment());
     a.overrideCurrentTime(ts);
     a.seek(new Range(), EMPTY_COL_FAMS, false);
@@ -260,7 +260,7 @@ public class FilterTest {
     Value dv = new Value();
     TreeMap<Key,Value> tm = new TreeMap<>();
     IteratorSetting is = new IteratorSetting(1, ColumnAgeOffFilter.class);
-    ColumnAgeOffFilter.addTTL(is, new IteratorSetting.Column("a"), 901l);
+    ColumnAgeOffFilter.addTTL(is, new IteratorSetting.Column("a"), 901L);
     ColumnAgeOffFilter.setNegate(is, true);
     long ts = System.currentTimeMillis();
 
@@ -277,7 +277,7 @@ public class FilterTest {
     a.seek(new Range(), EMPTY_COL_FAMS, false);
     assertEquals(98, size(a));
 
-    ColumnAgeOffFilter.addTTL(is, new IteratorSetting.Column("a", "b"), 101l);
+    ColumnAgeOffFilter.addTTL(is, new IteratorSetting.Column("a", "b"), 101L);
     a.init(new SortedMapIterator(tm), is.getOptions(), new DefaultIteratorEnvironment());
     a.overrideCurrentTime(ts);
     a.seek(new Range(), EMPTY_COL_FAMS, false);
@@ -302,7 +302,7 @@ public class FilterTest {
     Value dv = new Value();
     TreeMap<Key,Value> tm = new TreeMap<>();
     IteratorSetting is = new IteratorSetting(1, ColumnAgeOffFilter.class);
-    ColumnAgeOffFilter.addTTL(is, new IteratorSetting.Column("negate"), 901l);
+    ColumnAgeOffFilter.addTTL(is, new IteratorSetting.Column("negate"), 901L);
     long ts = System.currentTimeMillis();
 
     for (long i = 0; i < 1000; i++) {
@@ -318,7 +318,7 @@ public class FilterTest {
     a.seek(new Range(), EMPTY_COL_FAMS, false);
     assertEquals(902, size(a));
 
-    ColumnAgeOffFilter.addTTL(is, new IteratorSetting.Column("negate", "b"), 101l);
+    ColumnAgeOffFilter.addTTL(is, new IteratorSetting.Column("negate", "b"), 101L);
     a.init(new SortedMapIterator(tm), is.getOptions(), new DefaultIteratorEnvironment());
     a.overrideCurrentTime(ts);
     a.seek(new Range(), EMPTY_COL_FAMS, false);
@@ -354,7 +354,7 @@ public class FilterTest {
         colq = colq2;
       }
       Key k = new Key(new Text(String.format("%03d", i)), colf, colq);
-      k.setTimestamp(157l);
+      k.setTimestamp(157L);
       tm.put(k, dv);
     }
     assertEquals(1000, tm.size());
@@ -544,7 +544,7 @@ public class FilterTest {
     a.seek(new Range(), EMPTY_COL_FAMS, false);
     assertEquals(31, size(a));
 
-    TimestampFilter.setEnd(is, 253402300800001l, true);
+    TimestampFilter.setEnd(is, 253402300800001L, true);
     a.init(new SortedMapIterator(tm), is.getOptions(), null);
 
     is.clearOptions();
diff --git a/core/src/test/java/org/apache/accumulo/core/iterators/user/RegExFilterTest.java b/core/src/test/java/org/apache/accumulo/core/iterators/user/RegExFilterTest.java
index 9b24491..181c46b 100644
--- a/core/src/test/java/org/apache/accumulo/core/iterators/user/RegExFilterTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/iterators/user/RegExFilterTest.java
@@ -223,7 +223,7 @@ public class RegExFilterTest {
     String multiByteText = new String("\u6d67" + "\u6F68" + "\u7067");
     String multiByteRegex = new String(".*" + "\u6F68" + ".*");
 
-    Key k4 = new Key("boo4".getBytes(), "hoo".getBytes(), "20080203".getBytes(), "".getBytes(), 1l);
+    Key k4 = new Key("boo4".getBytes(), "hoo".getBytes(), "20080203".getBytes(), "".getBytes(), 1L);
     Value inVal = new Value(multiByteText.getBytes(UTF_8));
     tm.put(k4, inVal);
 
diff --git a/core/src/test/java/org/apache/accumulo/core/iterators/user/TestCfCqSlice.java b/core/src/test/java/org/apache/accumulo/core/iterators/user/TestCfCqSlice.java
index 8def4a3..df18005 100644
--- a/core/src/test/java/org/apache/accumulo/core/iterators/user/TestCfCqSlice.java
+++ b/core/src/test/java/org/apache/accumulo/core/iterators/user/TestCfCqSlice.java
@@ -323,7 +323,7 @@ public abstract class TestCfCqSlice {
     opts.put(CfCqSliceOpts.OPT_MIN_CQ, new String(LONG_LEX.encode(sliceMinCq), UTF_8));
     opts.put(CfCqSliceOpts.OPT_MAX_CF, new String(LONG_LEX.encode(sliceMaxCf), UTF_8));
     opts.put(CfCqSliceOpts.OPT_MAX_CQ, new String(LONG_LEX.encode(sliceMaxCq), UTF_8));
-    Range startsAtMinCf = new Range(new Key(LONG_LEX.encode(0l), LONG_LEX.encode(sliceMinCf),
+    Range startsAtMinCf = new Range(new Key(LONG_LEX.encode(0L), LONG_LEX.encode(sliceMinCf),
         LONG_LEX.encode(sliceMinCq), new byte[] {}, Long.MAX_VALUE), null);
     loadKvs(foundKvs, opts, startsAtMinCf);
     for (int i = 0; i < LR_DIM; i++) {
diff --git a/core/src/test/java/org/apache/accumulo/core/iterators/user/TransformingIteratorTest.java b/core/src/test/java/org/apache/accumulo/core/iterators/user/TransformingIteratorTest.java
index 63751af..04c1641 100644
--- a/core/src/test/java/org/apache/accumulo/core/iterators/user/TransformingIteratorTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/iterators/user/TransformingIteratorTest.java
@@ -387,7 +387,7 @@ public class TransformingIteratorTest {
       assertEquals("cf1", key.getColumnFamily().toString());
       assertEquals("cq1", key.getColumnQualifier().toString());
       assertEquals("", key.getColumnVisibility().toString());
-      assertEquals(5l, key.getTimestamp());
+      assertEquals(5L, key.getTimestamp());
       count++;
     }
 
diff --git a/core/src/test/java/org/apache/accumulo/core/iterators/user/WholeColumnFamilyIteratorTest.java b/core/src/test/java/org/apache/accumulo/core/iterators/user/WholeColumnFamilyIteratorTest.java
index 819971b..e016c69 100644
--- a/core/src/test/java/org/apache/accumulo/core/iterators/user/WholeColumnFamilyIteratorTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/iterators/user/WholeColumnFamilyIteratorTest.java
@@ -57,27 +57,27 @@ public class WholeColumnFamilyIteratorTest extends TestCase {
     SortedMap<Key,Value> map = new TreeMap<>();
     SortedMap<Key,Value> map2 = new TreeMap<>();
     final Map<Text,Boolean> toInclude = new HashMap<>();
-    map.put(new Key(new Text("r1"), new Text("cf1"), new Text("cq1"), new Text("cv1"), 1l),
+    map.put(new Key(new Text("r1"), new Text("cf1"), new Text("cq1"), new Text("cv1"), 1L),
         new Value("val1".getBytes()));
-    map.put(new Key(new Text("r1"), new Text("cf1"), new Text("cq2"), new Text("cv1"), 2l),
+    map.put(new Key(new Text("r1"), new Text("cf1"), new Text("cq2"), new Text("cv1"), 2L),
         new Value("val2".getBytes()));
-    map.put(new Key(new Text("r2"), new Text("cf1"), new Text("cq1"), new Text("cv1"), 3l),
+    map.put(new Key(new Text("r2"), new Text("cf1"), new Text("cq1"), new Text("cv1"), 3L),
         new Value("val3".getBytes()));
-    map.put(new Key(new Text("r2"), new Text("cf2"), new Text("cq1"), new Text("cv1"), 4l),
+    map.put(new Key(new Text("r2"), new Text("cf2"), new Text("cq1"), new Text("cv1"), 4L),
         new Value("val4".getBytes()));
-    map.put(new Key(new Text("r3"), new Text("cf1"), new Text("cq1"), new Text("cv1"), 5l),
+    map.put(new Key(new Text("r3"), new Text("cf1"), new Text("cq1"), new Text("cv1"), 5L),
         new Value("val4".getBytes()));
-    map.put(new Key(new Text("r3"), new Text("cf1"), new Text("cq1"), new Text("cv2"), 6l),
+    map.put(new Key(new Text("r3"), new Text("cf1"), new Text("cq1"), new Text("cv2"), 6L),
         new Value("val4".getBytes()));
-    map.put(new Key(new Text("r4"), new Text("cf1"), new Text("cq1"), new Text("cv1"), 7l),
+    map.put(new Key(new Text("r4"), new Text("cf1"), new Text("cq1"), new Text("cv1"), 7L),
         new Value("".getBytes()));
-    map.put(new Key(new Text("r4"), new Text("cf1"), new Text("cq1"), new Text(""), 8l),
+    map.put(new Key(new Text("r4"), new Text("cf1"), new Text("cq1"), new Text(""), 8L),
         new Value("val1".getBytes()));
-    map.put(new Key(new Text("r4"), new Text("cf1"), new Text(""), new Text("cv1"), 9l),
+    map.put(new Key(new Text("r4"), new Text("cf1"), new Text(""), new Text("cv1"), 9L),
         new Value("val1".getBytes()));
-    map.put(new Key(new Text("r4"), new Text(""), new Text("cq1"), new Text("cv1"), 10l),
+    map.put(new Key(new Text("r4"), new Text(""), new Text("cq1"), new Text("cv1"), 10L),
         new Value("val1".getBytes()));
-    map.put(new Key(new Text(""), new Text("cf1"), new Text("cq1"), new Text("cv1"), 11l),
+    map.put(new Key(new Text(""), new Text("cf1"), new Text("cq1"), new Text("cv1"), 11L),
         new Value("val1".getBytes()));
     boolean b = true;
     int trueCount = 0;
diff --git a/core/src/test/java/org/apache/accumulo/core/iterators/user/WholeRowIteratorTest.java b/core/src/test/java/org/apache/accumulo/core/iterators/user/WholeRowIteratorTest.java
index dc742fa..8aad1e3 100644
--- a/core/src/test/java/org/apache/accumulo/core/iterators/user/WholeRowIteratorTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/iterators/user/WholeRowIteratorTest.java
@@ -56,27 +56,27 @@ public class WholeRowIteratorTest {
     SortedMap<Key,Value> map = new TreeMap<>();
     SortedMap<Key,Value> map2 = new TreeMap<>();
     final Map<Text,Boolean> toInclude = new HashMap<>();
-    map.put(new Key(new Text("r1"), new Text("cf1"), new Text("cq1"), new Text("cv1"), 1l),
+    map.put(new Key(new Text("r1"), new Text("cf1"), new Text("cq1"), new Text("cv1"), 1L),
         new Value("val1".getBytes()));
-    map.put(new Key(new Text("r1"), new Text("cf1"), new Text("cq2"), new Text("cv1"), 2l),
+    map.put(new Key(new Text("r1"), new Text("cf1"), new Text("cq2"), new Text("cv1"), 2L),
         new Value("val2".getBytes()));
-    map.put(new Key(new Text("r2"), new Text("cf1"), new Text("cq1"), new Text("cv1"), 3l),
+    map.put(new Key(new Text("r2"), new Text("cf1"), new Text("cq1"), new Text("cv1"), 3L),
         new Value("val3".getBytes()));
-    map.put(new Key(new Text("r2"), new Text("cf2"), new Text("cq1"), new Text("cv1"), 4l),
+    map.put(new Key(new Text("r2"), new Text("cf2"), new Text("cq1"), new Text("cv1"), 4L),
         new Value("val4".getBytes()));
-    map.put(new Key(new Text("r3"), new Text("cf1"), new Text("cq1"), new Text("cv1"), 5l),
+    map.put(new Key(new Text("r3"), new Text("cf1"), new Text("cq1"), new Text("cv1"), 5L),
         new Value("val4".getBytes()));
-    map.put(new Key(new Text("r3"), new Text("cf1"), new Text("cq1"), new Text("cv2"), 6l),
+    map.put(new Key(new Text("r3"), new Text("cf1"), new Text("cq1"), new Text("cv2"), 6L),
         new Value("val4".getBytes()));
-    map.put(new Key(new Text("r4"), new Text("cf1"), new Text("cq1"), new Text("cv1"), 7l),
+    map.put(new Key(new Text("r4"), new Text("cf1"), new Text("cq1"), new Text("cv1"), 7L),
         new Value("".getBytes()));
-    map.put(new Key(new Text("r4"), new Text("cf1"), new Text("cq1"), new Text(""), 8l),
+    map.put(new Key(new Text("r4"), new Text("cf1"), new Text("cq1"), new Text(""), 8L),
         new Value("val1".getBytes()));
-    map.put(new Key(new Text("r4"), new Text("cf1"), new Text(""), new Text("cv1"), 9l),
+    map.put(new Key(new Text("r4"), new Text("cf1"), new Text(""), new Text("cv1"), 9L),
         new Value("val1".getBytes()));
-    map.put(new Key(new Text("r4"), new Text(""), new Text("cq1"), new Text("cv1"), 10l),
+    map.put(new Key(new Text("r4"), new Text(""), new Text("cq1"), new Text("cv1"), 10L),
         new Value("val1".getBytes()));
-    map.put(new Key(new Text(""), new Text("cf1"), new Text("cq1"), new Text("cv1"), 11l),
+    map.put(new Key(new Text(""), new Text("cf1"), new Text("cq1"), new Text("cv1"), 11L),
         new Value("val1".getBytes()));
     boolean b = true;
     int trueCount = 0;
diff --git a/core/src/test/java/org/apache/accumulo/core/rpc/SaslConnectionParamsTest.java b/core/src/test/java/org/apache/accumulo/core/rpc/SaslConnectionParamsTest.java
index 98868db..a93f80f 100644
--- a/core/src/test/java/org/apache/accumulo/core/rpc/SaslConnectionParamsTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/rpc/SaslConnectionParamsTest.java
@@ -122,7 +122,7 @@ public class SaslConnectionParamsTest {
   @Test
   public void testDelegationTokenImpl() throws Exception {
     final DelegationTokenImpl token = new DelegationTokenImpl(new byte[0],
-        new AuthenticationTokenIdentifier("user", 1, 10l, 20l, "instanceid"));
+        new AuthenticationTokenIdentifier("user", 1, 10L, 20L, "instanceid"));
     testUser.doAs(new PrivilegedExceptionAction<Void>() {
       @Override
       public Void run() throws Exception {
@@ -197,7 +197,7 @@ public class SaslConnectionParamsTest {
     assertEquals(params1.hashCode(), params2.hashCode());
 
     final DelegationTokenImpl delToken1 = new DelegationTokenImpl(new byte[0],
-        new AuthenticationTokenIdentifier("user", 1, 10l, 20l, "instanceid"));
+        new AuthenticationTokenIdentifier("user", 1, 10L, 20L, "instanceid"));
     SaslConnectionParams params3 = testUser
         .doAs(new PrivilegedExceptionAction<SaslConnectionParams>() {
           @Override
@@ -221,7 +221,7 @@ public class SaslConnectionParamsTest {
     assertNotEquals(params2.hashCode(), params3.hashCode());
 
     final DelegationTokenImpl delToken2 = new DelegationTokenImpl(new byte[0],
-        new AuthenticationTokenIdentifier("user", 1, 10l, 20l, "instanceid"));
+        new AuthenticationTokenIdentifier("user", 1, 10L, 20L, "instanceid"));
     SaslConnectionParams params4 = testUser
         .doAs(new PrivilegedExceptionAction<SaslConnectionParams>() {
           @Override
diff --git a/core/src/test/java/org/apache/accumulo/core/security/AuthenticationTokenIdentifierTest.java b/core/src/test/java/org/apache/accumulo/core/security/AuthenticationTokenIdentifierTest.java
index 72d80c0..668cdf7 100644
--- a/core/src/test/java/org/apache/accumulo/core/security/AuthenticationTokenIdentifierTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/security/AuthenticationTokenIdentifierTest.java
@@ -57,14 +57,14 @@ public class AuthenticationTokenIdentifierTest {
     String principal = "user";
     AuthenticationTokenIdentifier token = new AuthenticationTokenIdentifier(principal);
     assertEquals(token, token);
-    AuthenticationTokenIdentifier newToken = new AuthenticationTokenIdentifier(principal, 1, 5l,
-        10l, "uuid");
+    AuthenticationTokenIdentifier newToken = new AuthenticationTokenIdentifier(principal, 1, 5L,
+        10L, "uuid");
     assertNotEquals(token, newToken);
     assertNotEquals(token.hashCode(), newToken.hashCode());
     AuthenticationTokenIdentifier dblNewToken = new AuthenticationTokenIdentifier(principal);
     dblNewToken.setKeyId(1);
-    dblNewToken.setIssueDate(5l);
-    dblNewToken.setExpirationDate(10l);
+    dblNewToken.setIssueDate(5L);
+    dblNewToken.setExpirationDate(10L);
     dblNewToken.setInstanceId("uuid");
   }
 
diff --git a/core/src/test/java/org/apache/accumulo/core/util/NumUtilTest.java b/core/src/test/java/org/apache/accumulo/core/util/NumUtilTest.java
index 017f3a2..99a4452 100644
--- a/core/src/test/java/org/apache/accumulo/core/util/NumUtilTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/util/NumUtilTest.java
@@ -34,8 +34,8 @@ public class NumUtilTest {
     assertEquals("1.50M", bigNumberForSize(1024 * 1024 + (1024 * 1024 / 2)));
     assertEquals("1,024.00M", bigNumberForSize(1073741823));
     assertEquals("1.00G", bigNumberForSize(1073741824));
-    assertEquals("1,024.00G", bigNumberForSize(1099511627775l));
-    assertEquals("1.00T", bigNumberForSize(1099511627776l));
+    assertEquals("1,024.00G", bigNumberForSize(1099511627775L));
+    assertEquals("1.00T", bigNumberForSize(1099511627776L));
   }
 
   @Test
@@ -46,7 +46,7 @@ public class NumUtilTest {
     assertEquals("5.00K", bigNumberForQuantity(5000));
     assertEquals("50.00K", bigNumberForQuantity(50000));
     assertEquals("5.00M", bigNumberForQuantity(5000000));
-    assertEquals("5.00B", bigNumberForQuantity(5000000000l));
-    assertEquals("5.00T", bigNumberForQuantity(5000000000000l));
+    assertEquals("5.00B", bigNumberForQuantity(5000000000L));
+    assertEquals("5.00T", bigNumberForQuantity(5000000000000L));
   }
 }
diff --git a/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java b/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java
index 08b66bc..cd560e5 100644
--- a/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java
+++ b/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java
@@ -109,7 +109,7 @@ public class ZooStore<T> implements TStore<T> {
     while (true) {
       try {
         // looking at the code for SecureRandom, it appears to be thread safe
-        long tid = idgenerator.nextLong() & 0x7fffffffffffffffl;
+        long tid = idgenerator.nextLong() & 0x7fffffffffffffffL;
         zk.putPersistentData(getTXPath(tid), TStatus.NEW.name().getBytes(UTF_8),
             NodeExistsPolicy.FAIL);
         return tid;
diff --git a/fate/src/test/java/org/apache/accumulo/fate/ReadOnlyStoreTest.java b/fate/src/test/java/org/apache/accumulo/fate/ReadOnlyStoreTest.java
index 56c62f9..532fa41 100644
--- a/fate/src/test/java/org/apache/accumulo/fate/ReadOnlyStoreTest.java
+++ b/fate/src/test/java/org/apache/accumulo/fate/ReadOnlyStoreTest.java
@@ -34,37 +34,37 @@ public class ReadOnlyStoreTest {
     @SuppressWarnings("unchecked")
     Repo<String> repo = EasyMock.createMock(Repo.class);
     EasyMock.expect(repo.getDescription()).andReturn("description");
-    EasyMock.expect(repo.isReady(0xdeadbeefl, null)).andReturn(0x0l);
+    EasyMock.expect(repo.isReady(0xdeadbeefL, null)).andReturn(0x0L);
 
     @SuppressWarnings("unchecked")
     TStore<String> mock = EasyMock.createNiceMock(TStore.class);
-    EasyMock.expect(mock.reserve()).andReturn(0xdeadbeefl);
-    mock.reserve(0xdeadbeefl);
-    EasyMock.expect(mock.top(0xdeadbeefl)).andReturn(repo);
-    EasyMock.expect(mock.getStatus(0xdeadbeefl)).andReturn(TStatus.UNKNOWN);
-    mock.unreserve(0xdeadbeefl, 30);
+    EasyMock.expect(mock.reserve()).andReturn(0xdeadbeefL);
+    mock.reserve(0xdeadbeefL);
+    EasyMock.expect(mock.top(0xdeadbeefL)).andReturn(repo);
+    EasyMock.expect(mock.getStatus(0xdeadbeefL)).andReturn(TStatus.UNKNOWN);
+    mock.unreserve(0xdeadbeefL, 30);
 
-    EasyMock.expect(mock.waitForStatusChange(0xdeadbeefl, EnumSet.allOf(TStatus.class)))
+    EasyMock.expect(mock.waitForStatusChange(0xdeadbeefL, EnumSet.allOf(TStatus.class)))
         .andReturn(TStatus.UNKNOWN);
-    EasyMock.expect(mock.getProperty(0xdeadbeefl, "com.example.anyproperty")).andReturn("property");
+    EasyMock.expect(mock.getProperty(0xdeadbeefL, "com.example.anyproperty")).andReturn("property");
     EasyMock.expect(mock.list()).andReturn(Collections.emptyList());
 
     EasyMock.replay(repo);
     EasyMock.replay(mock);
 
     ReadOnlyTStore<String> store = new ReadOnlyStore<>(mock);
-    Assert.assertEquals(0xdeadbeefl, store.reserve());
-    store.reserve(0xdeadbeefl);
-    ReadOnlyRepo<String> top = store.top(0xdeadbeefl);
+    Assert.assertEquals(0xdeadbeefL, store.reserve());
+    store.reserve(0xdeadbeefL);
+    ReadOnlyRepo<String> top = store.top(0xdeadbeefL);
     Assert.assertFalse(top instanceof Repo);
     Assert.assertEquals("description", top.getDescription());
-    Assert.assertEquals(0x0l, top.isReady(0xdeadbeefl, null));
-    Assert.assertEquals(TStatus.UNKNOWN, store.getStatus(0xdeadbeefl));
-    store.unreserve(0xdeadbeefl, 30);
+    Assert.assertEquals(0x0L, top.isReady(0xdeadbeefL, null));
+    Assert.assertEquals(TStatus.UNKNOWN, store.getStatus(0xdeadbeefL));
+    store.unreserve(0xdeadbeefL, 30);
 
     Assert.assertEquals(TStatus.UNKNOWN,
-        store.waitForStatusChange(0xdeadbeefl, EnumSet.allOf(TStatus.class)));
-    Assert.assertEquals("property", store.getProperty(0xdeadbeefl, "com.example.anyproperty"));
+        store.waitForStatusChange(0xdeadbeefL, EnumSet.allOf(TStatus.class)));
+    Assert.assertEquals("property", store.getProperty(0xdeadbeefL, "com.example.anyproperty"));
     Assert.assertEquals(Collections.<Long> emptyList(), store.list());
 
     EasyMock.verify(repo);
diff --git a/fate/src/test/java/org/apache/accumulo/fate/zookeeper/ZooReaderWriterTest.java b/fate/src/test/java/org/apache/accumulo/fate/zookeeper/ZooReaderWriterTest.java
index 319175e..b1e0531 100644
--- a/fate/src/test/java/org/apache/accumulo/fate/zookeeper/ZooReaderWriterTest.java
+++ b/fate/src/test/java/org/apache/accumulo/fate/zookeeper/ZooReaderWriterTest.java
@@ -111,7 +111,7 @@ public class ZooReaderWriterTest {
     zk.create(path, value, acls, CreateMode.PERSISTENT);
     EasyMock.expectLastCall().andThrow(new SessionExpiredException()).once();
     EasyMock.expect(retry.canRetry()).andReturn(false);
-    EasyMock.expect(retry.retriesCompleted()).andReturn(1l).once();
+    EasyMock.expect(retry.retriesCompleted()).andReturn(1L).once();
 
     EasyMock.replay(zk, zrw, retryFactory, retry);
 
diff --git a/minicluster/src/main/java/org/apache/accumulo/minicluster/MemoryUnit.java b/minicluster/src/main/java/org/apache/accumulo/minicluster/MemoryUnit.java
index 34c6e9f..fa3fc16 100644
--- a/minicluster/src/main/java/org/apache/accumulo/minicluster/MemoryUnit.java
+++ b/minicluster/src/main/java/org/apache/accumulo/minicluster/MemoryUnit.java
@@ -22,10 +22,10 @@ package org.apache.accumulo.minicluster;
 
 public enum MemoryUnit {
 
-  BYTE(1l, ""),
-  KILOBYTE(1024l, "K"),
-  MEGABYTE(1024 * 1024l, "M"),
-  GIGABYTE(1024 * 1024 * 1024l, "G");
+  BYTE(1L, ""),
+  KILOBYTE(1024L, "K"),
+  MEGABYTE(1024 * 1024L, "M"),
+  GIGABYTE(1024 * 1024 * 1024L, "G");
 
   private final long multiplier;
   private final String suffix;
diff --git a/minicluster/src/test/java/org/apache/accumulo/minicluster/impl/MiniAccumuloConfigImplTest.java b/minicluster/src/test/java/org/apache/accumulo/minicluster/impl/MiniAccumuloConfigImplTest.java
index 9b2569e..eac6cd6 100644
--- a/minicluster/src/test/java/org/apache/accumulo/minicluster/impl/MiniAccumuloConfigImplTest.java
+++ b/minicluster/src/test/java/org/apache/accumulo/minicluster/impl/MiniAccumuloConfigImplTest.java
@@ -84,13 +84,13 @@ public class MiniAccumuloConfigImplTest {
     MiniAccumuloConfigImpl config = new MiniAccumuloConfigImpl(tempFolder.getRoot(), "password")
         .initialize();
     config.setDefaultMemory(96, MemoryUnit.MEGABYTE);
-    assertEquals(96 * 1024 * 1024l, config.getMemory(ServerType.MASTER));
-    assertEquals(96 * 1024 * 1024l, config.getMemory(ServerType.TABLET_SERVER));
-    assertEquals(96 * 1024 * 1024l, config.getDefaultMemory());
+    assertEquals(96 * 1024 * 1024L, config.getMemory(ServerType.MASTER));
+    assertEquals(96 * 1024 * 1024L, config.getMemory(ServerType.TABLET_SERVER));
+    assertEquals(96 * 1024 * 1024L, config.getDefaultMemory());
     config.setMemory(ServerType.MASTER, 256, MemoryUnit.MEGABYTE);
-    assertEquals(256 * 1024 * 1024l, config.getMemory(ServerType.MASTER));
-    assertEquals(96 * 1024 * 1024l, config.getDefaultMemory());
-    assertEquals(96 * 1024 * 1024l, config.getMemory(ServerType.TABLET_SERVER));
+    assertEquals(256 * 1024 * 1024L, config.getMemory(ServerType.MASTER));
+    assertEquals(96 * 1024 * 1024L, config.getDefaultMemory());
+    assertEquals(96 * 1024 * 1024L, config.getMemory(ServerType.TABLET_SERVER));
   }
 
   @AfterClass
diff --git a/proxy/src/main/java/org/apache/accumulo/proxy/Proxy.java b/proxy/src/main/java/org/apache/accumulo/proxy/Proxy.java
index 30a696b..ef84f79 100644
--- a/proxy/src/main/java/org/apache/accumulo/proxy/Proxy.java
+++ b/proxy/src/main/java/org/apache/accumulo/proxy/Proxy.java
@@ -227,9 +227,9 @@ public class Proxy implements KeywordExecutable {
     final int simpleTimerThreadpoolSize = Integer
         .parseInt(Property.GENERAL_SIMPLETIMER_THREADPOOL_SIZE.getDefaultValue());
     // How frequently to try to resize the thread pool
-    final long threadpoolResizeInterval = 1000l * 5;
+    final long threadpoolResizeInterval = 1000L * 5;
     // No timeout
-    final long serverSocketTimeout = 0l;
+    final long serverSocketTimeout = 0L;
     // Use the new hadoop metrics2 support
     final MetricsFactory metricsFactory = new MetricsFactory(false);
     final String serverName = "Proxy", threadName = "Accumulo Thrift Proxy";
diff --git a/server/base/src/main/java/org/apache/accumulo/server/data/ServerMutation.java b/server/base/src/main/java/org/apache/accumulo/server/data/ServerMutation.java
index a86fd85..461e48f 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/data/ServerMutation.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/data/ServerMutation.java
@@ -30,7 +30,7 @@ import org.apache.hadoop.io.WritableUtils;
  * Mutation that holds system time as computed by the tablet server when not provided by the user.
  */
 public class ServerMutation extends Mutation {
-  private long systemTime = 0l;
+  private long systemTime = 0L;
 
   public ServerMutation(TMutation tmutation) {
     super(tmutation);
diff --git a/server/base/src/main/java/org/apache/accumulo/server/master/balancer/TabletBalancer.java b/server/base/src/main/java/org/apache/accumulo/server/master/balancer/TabletBalancer.java
index 028cbbf..8bd85db 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/master/balancer/TabletBalancer.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/master/balancer/TabletBalancer.java
@@ -122,9 +122,9 @@ public abstract class TabletBalancer {
   public abstract long balance(SortedMap<TServerInstance,TabletServerStatus> current,
       Set<KeyExtent> migrations, List<TabletMigration> migrationsOut);
 
-  private static final long ONE_SECOND = 1000l;
+  private static final long ONE_SECOND = 1000L;
   private boolean stuck = false;
-  private long stuckNotificationTime = -1l;
+  private long stuckNotificationTime = -1L;
 
   protected static final long TIME_BETWEEN_BALANCER_WARNINGS = 60 * ONE_SECOND;
 
diff --git a/server/base/src/main/java/org/apache/accumulo/server/replication/ReplicationUtil.java b/server/base/src/main/java/org/apache/accumulo/server/replication/ReplicationUtil.java
index 28b2e8e..c019631 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/replication/ReplicationUtil.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/replication/ReplicationUtil.java
@@ -185,7 +185,7 @@ public class ReplicationUtil {
         // instead of just file-based
         Long count = counts.get(target);
         if (null == count) {
-          counts.put(target, 1l);
+          counts.put(target, 1L);
         } else {
           counts.put(target, count + 1);
         }
diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/MetadataTableUtil.java b/server/base/src/main/java/org/apache/accumulo/server/util/MetadataTableUtil.java
index 331663c..82cf846 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/util/MetadataTableUtil.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/util/MetadataTableUtil.java
@@ -450,7 +450,7 @@ public class MetadataTableUtil {
     try (Scanner ms = new ScannerImpl(context, MetadataTable.ID, Authorizations.EMPTY);
         BatchWriter bw = new BatchWriterImpl(context, MetadataTable.ID,
             new BatchWriterConfig().setMaxMemory(1000000)
-                .setMaxLatency(120000l, TimeUnit.MILLISECONDS).setMaxWriteThreads(2))) {
+                .setMaxLatency(120000L, TimeUnit.MILLISECONDS).setMaxWriteThreads(2))) {
 
       // scan metadata for our table and delete everything we find
       Mutation m = null;
diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/RandomWriter.java b/server/base/src/main/java/org/apache/accumulo/server/util/RandomWriter.java
index b309971..bbeaac9 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/util/RandomWriter.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/util/RandomWriter.java
@@ -56,7 +56,7 @@ public class RandomWriter {
     @Override
     public Mutation next() {
       Text row_value = new Text(
-          Long.toString(((r.nextLong() & 0x7fffffffffffffffl) / 177) % 100000000000l));
+          Long.toString(((r.nextLong() & 0x7fffffffffffffffL) / 177) % 100000000000L));
       Mutation m = new Mutation(row_value);
       for (int column = 0; column < num_columns_per_row; column++) {
         Text column_fam = new Text("col_fam");
diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/TableDiskUsage.java b/server/base/src/main/java/org/apache/accumulo/server/util/TableDiskUsage.java
index 07bc1fb..5edcc7b 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/util/TableDiskUsage.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/util/TableDiskUsage.java
@@ -114,7 +114,7 @@ public class TableDiskUsage {
 
       Long tablesUsage = usage.get(key);
       if (tablesUsage == null)
-        tablesUsage = 0l;
+        tablesUsage = 0L;
 
       tablesUsage += size;
 
diff --git a/server/base/src/test/java/org/apache/accumulo/server/data/ServerMutationTest.java b/server/base/src/test/java/org/apache/accumulo/server/data/ServerMutationTest.java
index 52d3164..4129a51 100644
--- a/server/base/src/test/java/org/apache/accumulo/server/data/ServerMutationTest.java
+++ b/server/base/src/test/java/org/apache/accumulo/server/data/ServerMutationTest.java
@@ -49,7 +49,7 @@ public class ServerMutationTest {
     assertEquals("cq1", new String(cu.getColumnQualifier()));
     assertEquals("", new String(cu.getColumnVisibility()));
     assertFalse(cu.hasTimestamp());
-    assertEquals(42l, cu.getTimestamp());
+    assertEquals(42L, cu.getTimestamp());
 
     ServerMutation m2 = new ServerMutation();
     ReflectionUtils.copy(CachedConfiguration.getInstance(), m, m2);
@@ -63,7 +63,7 @@ public class ServerMutationTest {
     assertEquals("cf1", new String(cu.getColumnFamily()));
     assertEquals("cq1", new String(cu.getColumnQualifier()));
     assertFalse(cu.hasTimestamp());
-    assertEquals(42l, cu.getTimestamp());
+    assertEquals(42L, cu.getTimestamp());
 
     cu = updates.get(1);
 
diff --git a/server/base/src/test/java/org/apache/accumulo/server/master/balancer/ChaoticLoadBalancerTest.java b/server/base/src/test/java/org/apache/accumulo/server/master/balancer/ChaoticLoadBalancerTest.java
index 4f1dac0..e6423ee 100644
--- a/server/base/src/test/java/org/apache/accumulo/server/master/balancer/ChaoticLoadBalancerTest.java
+++ b/server/base/src/test/java/org/apache/accumulo/server/master/balancer/ChaoticLoadBalancerTest.java
@@ -73,7 +73,7 @@ public class ChaoticLoadBalancerTest {
       List<TabletStats> result = new ArrayList<>();
       for (KeyExtent extent : servers.get(tserver).extents) {
         if (extent.getTableId().equals(table)) {
-          result.add(new TabletStats(extent.toThrift(), null, null, null, 0l, 0., 0., 0));
+          result.add(new TabletStats(extent.toThrift(), null, null, null, 0L, 0., 0., 0));
         }
       }
       return result;
diff --git a/server/base/src/test/java/org/apache/accumulo/server/master/balancer/DefaultLoadBalancerTest.java b/server/base/src/test/java/org/apache/accumulo/server/master/balancer/DefaultLoadBalancerTest.java
index 071b330..f6bbc67 100644
--- a/server/base/src/test/java/org/apache/accumulo/server/master/balancer/DefaultLoadBalancerTest.java
+++ b/server/base/src/test/java/org/apache/accumulo/server/master/balancer/DefaultLoadBalancerTest.java
@@ -78,7 +78,7 @@ public class DefaultLoadBalancerTest {
       List<TabletStats> result = new ArrayList<>();
       for (KeyExtent extent : servers.get(tserver).extents) {
         if (extent.getTableId().equals(table)) {
-          result.add(new TabletStats(extent.toThrift(), null, null, null, 0l, 0., 0., 0));
+          result.add(new TabletStats(extent.toThrift(), null, null, null, 0L, 0., 0., 0));
         }
       }
       return result;
diff --git a/server/base/src/test/java/org/apache/accumulo/server/replication/StatusCombinerTest.java b/server/base/src/test/java/org/apache/accumulo/server/replication/StatusCombinerTest.java
index 7286e10..f27c5f3 100644
--- a/server/base/src/test/java/org/apache/accumulo/server/replication/StatusCombinerTest.java
+++ b/server/base/src/test/java/org/apache/accumulo/server/replication/StatusCombinerTest.java
@@ -72,9 +72,9 @@ public class StatusCombinerTest {
     Status orig = StatusUtil.fileCreated(100);
     Status status = StatusUtil.replicatedAndIngested(10, 20);
     Status ret = combiner.typedReduce(key, Arrays.asList(orig, status).iterator());
-    Assert.assertEquals(10l, ret.getBegin());
-    Assert.assertEquals(20l, ret.getEnd());
-    Assert.assertEquals(100l, ret.getCreatedTime());
+    Assert.assertEquals(10L, ret.getBegin());
+    Assert.assertEquals(20L, ret.getEnd());
+    Assert.assertEquals(100L, ret.getCreatedTime());
     Assert.assertEquals(false, ret.getClosed());
   }
 
@@ -83,9 +83,9 @@ public class StatusCombinerTest {
     Status orig = StatusUtil.fileCreated(100);
     Status status = StatusUtil.replicatedAndIngested(builder, 10, 20);
     Status ret = combiner.typedReduce(key, Arrays.asList(orig, status).iterator());
-    Assert.assertEquals(10l, ret.getBegin());
-    Assert.assertEquals(20l, ret.getEnd());
-    Assert.assertEquals(100l, ret.getCreatedTime());
+    Assert.assertEquals(10L, ret.getBegin());
+    Assert.assertEquals(20L, ret.getEnd());
+    Assert.assertEquals(100L, ret.getCreatedTime());
     Assert.assertEquals(false, ret.getClosed());
   }
 
diff --git a/server/base/src/test/java/org/apache/accumulo/server/replication/StatusUtilTest.java b/server/base/src/test/java/org/apache/accumulo/server/replication/StatusUtilTest.java
index 62bb16a..5e24051 100644
--- a/server/base/src/test/java/org/apache/accumulo/server/replication/StatusUtilTest.java
+++ b/server/base/src/test/java/org/apache/accumulo/server/replication/StatusUtilTest.java
@@ -24,7 +24,7 @@ public class StatusUtilTest {
 
   @Test
   public void newFileIsNotCompletelyReplicated() {
-    Assert.assertFalse(StatusUtil.isSafeForRemoval(StatusUtil.fileCreated(0l)));
+    Assert.assertFalse(StatusUtil.isSafeForRemoval(StatusUtil.fileCreated(0L)));
   }
 
   @Test
diff --git a/server/base/src/test/java/org/apache/accumulo/server/rpc/SaslDigestCallbackHandlerTest.java b/server/base/src/test/java/org/apache/accumulo/server/rpc/SaslDigestCallbackHandlerTest.java
index 895116e..0aa2ae1 100644
--- a/server/base/src/test/java/org/apache/accumulo/server/rpc/SaslDigestCallbackHandlerTest.java
+++ b/server/base/src/test/java/org/apache/accumulo/server/rpc/SaslDigestCallbackHandlerTest.java
@@ -78,8 +78,8 @@ public class SaslDigestCallbackHandlerTest {
 
   @Test
   public void testIdentifierSerialization() throws IOException {
-    AuthenticationTokenIdentifier identifier = new AuthenticationTokenIdentifier("user", 1, 100l,
-        1000l, "instanceid");
+    AuthenticationTokenIdentifier identifier = new AuthenticationTokenIdentifier("user", 1, 100L,
+        1000L, "instanceid");
     byte[] serialized = identifier.getBytes();
     String name = handler.encodeIdentifier(serialized);
 
@@ -96,12 +96,12 @@ public class SaslDigestCallbackHandlerTest {
   public void testTokenSerialization() throws Exception {
     Instance instance = createMock(Instance.class);
     AuthenticationTokenSecretManager secretManager = new AuthenticationTokenSecretManager(instance,
-        1000l);
+        1000L);
     expect(instance.getInstanceID()).andReturn("instanceid");
 
     replay(instance);
 
-    secretManager.addKey(new AuthenticationKey(1, 0l, 100l, keyGen.generateKey()));
+    secretManager.addKey(new AuthenticationKey(1, 0L, 100L, keyGen.generateKey()));
     Entry<Token<AuthenticationTokenIdentifier>,AuthenticationTokenIdentifier> entry = secretManager
         .generateToken("user", cfg);
     byte[] password = entry.getKey().getPassword();
@@ -118,12 +118,12 @@ public class SaslDigestCallbackHandlerTest {
   public void testTokenAndIdentifierSerialization() throws Exception {
     Instance instance = createMock(Instance.class);
     AuthenticationTokenSecretManager secretManager = new AuthenticationTokenSecretManager(instance,
-        1000l);
+        1000L);
     expect(instance.getInstanceID()).andReturn("instanceid");
 
     replay(instance);
 
-    secretManager.addKey(new AuthenticationKey(1, 0l, 1000 * 100l, keyGen.generateKey()));
+    secretManager.addKey(new AuthenticationKey(1, 0L, 1000 * 100L, keyGen.generateKey()));
     Entry<Token<AuthenticationTokenIdentifier>,AuthenticationTokenIdentifier> entry = secretManager
         .generateToken("user", cfg);
     byte[] password = entry.getKey().getPassword();
diff --git a/server/base/src/test/java/org/apache/accumulo/server/security/delegation/AuthenticationKeyTest.java b/server/base/src/test/java/org/apache/accumulo/server/security/delegation/AuthenticationKeyTest.java
index 7025647..a247c8c 100644
--- a/server/base/src/test/java/org/apache/accumulo/server/security/delegation/AuthenticationKeyTest.java
+++ b/server/base/src/test/java/org/apache/accumulo/server/security/delegation/AuthenticationKeyTest.java
@@ -53,7 +53,7 @@ public class AuthenticationKeyTest {
   public void testAuthKey() {
     SecretKey secretKey = keyGen.generateKey();
     int keyId = 20;
-    long creationDate = 38383838l, expirationDate = 83838383l;
+    long creationDate = 38383838L, expirationDate = 83838383L;
     AuthenticationKey authKey = new AuthenticationKey(keyId, creationDate, expirationDate,
         secretKey);
     assertEquals(secretKey, authKey.getKey());
@@ -77,7 +77,7 @@ public class AuthenticationKeyTest {
   public void testWritable() throws IOException {
     SecretKey secretKey = keyGen.generateKey();
     int keyId = 20;
-    long creationDate = 38383838l, expirationDate = 83838383l;
+    long creationDate = 38383838L, expirationDate = 83838383L;
     AuthenticationKey authKey = new AuthenticationKey(keyId, creationDate, expirationDate,
         secretKey);
     ByteArrayOutputStream baos = new ByteArrayOutputStream();
diff --git a/server/base/src/test/java/org/apache/accumulo/server/security/delegation/AuthenticationTokenKeyManagerTest.java b/server/base/src/test/java/org/apache/accumulo/server/security/delegation/AuthenticationTokenKeyManagerTest.java
index 5d291a6..86e8947 100644
--- a/server/base/src/test/java/org/apache/accumulo/server/security/delegation/AuthenticationTokenKeyManagerTest.java
+++ b/server/base/src/test/java/org/apache/accumulo/server/security/delegation/AuthenticationTokenKeyManagerTest.java
@@ -63,13 +63,13 @@ public class AuthenticationTokenKeyManagerTest {
 
   @Test
   public void testIntervalNotPassed() {
-    long updateInterval = 5 * 1000l;
-    long tokenLifetime = 100 * 1000l;
+    long updateInterval = 5 * 1000L;
+    long tokenLifetime = 100 * 1000L;
     AuthenticationTokenKeyManager keyManager = new AuthenticationTokenKeyManager(secretManager,
         zooDistributor, updateInterval, tokenLifetime);
 
     // Have never updated the key
-    assertEquals(0l, keyManager.getLastKeyUpdate());
+    assertEquals(0L, keyManager.getLastKeyUpdate());
 
     // Always check for expired keys to remove
     expect(secretManager.removeExpiredKeys(zooDistributor)).andReturn(0);
@@ -84,9 +84,9 @@ public class AuthenticationTokenKeyManagerTest {
 
   @Test
   public void testIntervalHasPassed() throws Exception {
-    long updateInterval = 0 * 1000l;
-    long tokenLifetime = 100 * 1000l;
-    long runTime = 10l;
+    long updateInterval = 0 * 1000L;
+    long tokenLifetime = 100 * 1000L;
+    long runTime = 10L;
     SecretKey secretKey = keyGen.generateKey();
 
     AuthenticationKey authKey = new AuthenticationKey(1, runTime, runTime + tokenLifetime,
@@ -95,7 +95,7 @@ public class AuthenticationTokenKeyManagerTest {
         zooDistributor, updateInterval, tokenLifetime);
 
     // Have never updated the key
-    assertEquals(0l, keyManager.getLastKeyUpdate());
+    assertEquals(0L, keyManager.getLastKeyUpdate());
 
     // Always check for expired keys to remove
     expect(secretManager.removeExpiredKeys(zooDistributor)).andReturn(0);
@@ -181,8 +181,8 @@ public class AuthenticationTokenKeyManagerTest {
 
   @Test
   public void testExistingKeysAreAddedAtStartup() throws Exception {
-    long updateInterval = 0 * 1000l;
-    long tokenLifetime = 100 * 1000l;
+    long updateInterval = 0 * 1000L;
+    long tokenLifetime = 100 * 1000L;
     SecretKey secretKey1 = keyGen.generateKey(), secretKey2 = keyGen.generateKey();
 
     AuthenticationKey authKey1 = new AuthenticationKey(1, 0, tokenLifetime, secretKey1),
@@ -191,7 +191,7 @@ public class AuthenticationTokenKeyManagerTest {
         zooDistributor, updateInterval, tokenLifetime);
 
     // Have never updated the key
-    assertEquals(0l, keyManager.getLastKeyUpdate());
+    assertEquals(0L, keyManager.getLastKeyUpdate());
 
     // Always check for expired keys to remove
     expect(zooDistributor.getCurrentKeys()).andReturn(Arrays.asList(authKey1, authKey2));
diff --git a/server/base/src/test/java/org/apache/accumulo/server/security/delegation/AuthenticationTokenSecretManagerTest.java b/server/base/src/test/java/org/apache/accumulo/server/security/delegation/AuthenticationTokenSecretManagerTest.java
index 82cf3be..1addbe2 100644
--- a/server/base/src/test/java/org/apache/accumulo/server/security/delegation/AuthenticationTokenSecretManagerTest.java
+++ b/server/base/src/test/java/org/apache/accumulo/server/security/delegation/AuthenticationTokenSecretManagerTest.java
@@ -321,7 +321,7 @@ public class AuthenticationTokenSecretManagerTest {
     long then = System.currentTimeMillis();
 
     // 10s lifetime
-    long tokenLifetime = 10 * 1000l;
+    long tokenLifetime = 10 * 1000L;
     AuthenticationTokenSecretManager secretManager = new AuthenticationTokenSecretManager(instance,
         tokenLifetime);
 
diff --git a/server/base/src/test/java/org/apache/accumulo/server/security/delegation/ZooAuthenticationKeyDistributorTest.java b/server/base/src/test/java/org/apache/accumulo/server/security/delegation/ZooAuthenticationKeyDistributorTest.java
index 6ed81dc..fb1ca5f 100644
--- a/server/base/src/test/java/org/apache/accumulo/server/security/delegation/ZooAuthenticationKeyDistributorTest.java
+++ b/server/base/src/test/java/org/apache/accumulo/server/security/delegation/ZooAuthenticationKeyDistributorTest.java
@@ -107,7 +107,7 @@ public class ZooAuthenticationKeyDistributorTest {
   public void testInitializedNotCalledAdvertise() throws Exception {
     ZooAuthenticationKeyDistributor distributor = new ZooAuthenticationKeyDistributor(zrw,
         baseNode);
-    distributor.advertise(new AuthenticationKey(1, 0l, 5l, keyGen.generateKey()));
+    distributor.advertise(new AuthenticationKey(1, 0L, 5L, keyGen.generateKey()));
   }
 
   @Test(expected = IllegalStateException.class)
@@ -121,7 +121,7 @@ public class ZooAuthenticationKeyDistributorTest {
   public void testInitializedNotCalledRemove() throws Exception {
     ZooAuthenticationKeyDistributor distributor = new ZooAuthenticationKeyDistributor(zrw,
         baseNode);
-    distributor.remove(new AuthenticationKey(1, 0l, 5l, keyGen.generateKey()));
+    distributor.remove(new AuthenticationKey(1, 0L, 5L, keyGen.generateKey()));
   }
 
   @Test(expected = IllegalStateException.class)
@@ -165,7 +165,7 @@ public class ZooAuthenticationKeyDistributorTest {
   public void testAdvertiseKey() throws Exception {
     ZooAuthenticationKeyDistributor distributor = new ZooAuthenticationKeyDistributor(zrw,
         baseNode);
-    AuthenticationKey key = new AuthenticationKey(1, 0l, 10l, keyGen.generateKey());
+    AuthenticationKey key = new AuthenticationKey(1, 0L, 10L, keyGen.generateKey());
     ByteArrayOutputStream baos = new ByteArrayOutputStream();
     key.write(new DataOutputStream(baos));
     byte[] serialized = baos.toByteArray();
@@ -191,7 +191,7 @@ public class ZooAuthenticationKeyDistributorTest {
   public void testAlreadyAdvertisedKey() throws Exception {
     ZooAuthenticationKeyDistributor distributor = new ZooAuthenticationKeyDistributor(zrw,
         baseNode);
-    AuthenticationKey key = new AuthenticationKey(1, 0l, 10l, keyGen.generateKey());
+    AuthenticationKey key = new AuthenticationKey(1, 0L, 10L, keyGen.generateKey());
     String path = baseNode + "/" + key.getKeyId();
 
     // Attempt to create the directory and fail
@@ -212,7 +212,7 @@ public class ZooAuthenticationKeyDistributorTest {
   public void testRemoveKey() throws Exception {
     ZooAuthenticationKeyDistributor distributor = new ZooAuthenticationKeyDistributor(zrw,
         baseNode);
-    AuthenticationKey key = new AuthenticationKey(1, 0l, 10l, keyGen.generateKey());
+    AuthenticationKey key = new AuthenticationKey(1, 0L, 10L, keyGen.generateKey());
     String path = baseNode + "/" + key.getKeyId();
 
     // Attempt to create the directory and fail
@@ -235,7 +235,7 @@ public class ZooAuthenticationKeyDistributorTest {
   public void testRemoveMissingKey() throws Exception {
     ZooAuthenticationKeyDistributor distributor = new ZooAuthenticationKeyDistributor(zrw,
         baseNode);
-    AuthenticationKey key = new AuthenticationKey(1, 0l, 10l, keyGen.generateKey());
+    AuthenticationKey key = new AuthenticationKey(1, 0L, 10L, keyGen.generateKey());
     String path = baseNode + "/" + key.getKeyId();
 
     // Attempt to create the directory and fail
@@ -261,7 +261,7 @@ public class ZooAuthenticationKeyDistributorTest {
     List<String> children = new ArrayList<>(5);
     for (int i = 1; i < 6; i++) {
       children.add(Integer.toString(i));
-      AuthenticationKey key = new AuthenticationKey(i, 0l, 10l, keyGen.generateKey());
+      AuthenticationKey key = new AuthenticationKey(i, 0L, 10L, keyGen.generateKey());
       keys.add(key);
       ByteArrayOutputStream baos = new ByteArrayOutputStream();
       key.write(new DataOutputStream(baos));
diff --git a/server/base/src/test/java/org/apache/accumulo/server/security/delegation/ZooAuthenticationKeyWatcherTest.java b/server/base/src/test/java/org/apache/accumulo/server/security/delegation/ZooAuthenticationKeyWatcherTest.java
index 654733d..8df552f 100644
--- a/server/base/src/test/java/org/apache/accumulo/server/security/delegation/ZooAuthenticationKeyWatcherTest.java
+++ b/server/base/src/test/java/org/apache/accumulo/server/security/delegation/ZooAuthenticationKeyWatcherTest.java
@@ -96,8 +96,8 @@ public class ZooAuthenticationKeyWatcherTest {
   @Test
   public void testBaseNodeCreatedWithChildren() throws Exception {
     WatchedEvent event = new WatchedEvent(EventType.NodeCreated, null, baseNode);
-    AuthenticationKey key1 = new AuthenticationKey(1, 0l, 10000l, keyGen.generateKey()),
-        key2 = new AuthenticationKey(2, key1.getExpirationDate(), 20000l, keyGen.generateKey());
+    AuthenticationKey key1 = new AuthenticationKey(1, 0L, 10000L, keyGen.generateKey()),
+        key2 = new AuthenticationKey(2, key1.getExpirationDate(), 20000L, keyGen.generateKey());
     byte[] serializedKey1 = serialize(key1), serializedKey2 = serialize(key2);
     List<String> children = Arrays.asList("1", "2");
 
@@ -117,8 +117,8 @@ public class ZooAuthenticationKeyWatcherTest {
   @Test
   public void testBaseNodeChildrenChanged() throws Exception {
     WatchedEvent event = new WatchedEvent(EventType.NodeChildrenChanged, null, baseNode);
-    AuthenticationKey key1 = new AuthenticationKey(1, 0l, 10000l, keyGen.generateKey()),
-        key2 = new AuthenticationKey(2, key1.getExpirationDate(), 20000l, keyGen.generateKey());
+    AuthenticationKey key1 = new AuthenticationKey(1, 0L, 10000L, keyGen.generateKey()),
+        key2 = new AuthenticationKey(2, key1.getExpirationDate(), 20000L, keyGen.generateKey());
     byte[] serializedKey1 = serialize(key1), serializedKey2 = serialize(key2);
     List<String> children = Arrays.asList("1", "2");
 
@@ -138,8 +138,8 @@ public class ZooAuthenticationKeyWatcherTest {
   @Test
   public void testBaseNodeDeleted() throws Exception {
     WatchedEvent event = new WatchedEvent(EventType.NodeDeleted, null, baseNode);
-    AuthenticationKey key1 = new AuthenticationKey(1, 0l, 10000l, keyGen.generateKey()),
-        key2 = new AuthenticationKey(2, key1.getExpirationDate(), 20000l, keyGen.generateKey());
+    AuthenticationKey key1 = new AuthenticationKey(1, 0L, 10000L, keyGen.generateKey()),
+        key2 = new AuthenticationKey(2, key1.getExpirationDate(), 20000L, keyGen.generateKey());
 
     secretManager.addKey(key1);
     secretManager.addKey(key2);
@@ -170,8 +170,8 @@ public class ZooAuthenticationKeyWatcherTest {
   @Test
   public void testChildChanged() throws Exception {
     WatchedEvent event = new WatchedEvent(EventType.NodeCreated, null, baseNode + "/2");
-    AuthenticationKey key1 = new AuthenticationKey(1, 0l, 10000l, keyGen.generateKey()),
-        key2 = new AuthenticationKey(2, key1.getExpirationDate(), 20000l, keyGen.generateKey());
+    AuthenticationKey key1 = new AuthenticationKey(1, 0L, 10000L, keyGen.generateKey()),
+        key2 = new AuthenticationKey(2, key1.getExpirationDate(), 20000L, keyGen.generateKey());
     secretManager.addKey(key1);
     assertEquals(1, secretManager.getKeys().size());
     byte[] serializedKey2 = serialize(key2);
@@ -191,8 +191,8 @@ public class ZooAuthenticationKeyWatcherTest {
   @Test
   public void testChildDeleted() throws Exception {
     WatchedEvent event = new WatchedEvent(EventType.NodeDeleted, null, baseNode + "/1");
-    AuthenticationKey key1 = new AuthenticationKey(1, 0l, 10000l, keyGen.generateKey()),
-        key2 = new AuthenticationKey(2, key1.getExpirationDate(), 20000l, keyGen.generateKey());
+    AuthenticationKey key1 = new AuthenticationKey(1, 0L, 10000L, keyGen.generateKey()),
+        key2 = new AuthenticationKey(2, key1.getExpirationDate(), 20000L, keyGen.generateKey());
     secretManager.addKey(key1);
     secretManager.addKey(key2);
     assertEquals(2, secretManager.getKeys().size());
@@ -210,8 +210,8 @@ public class ZooAuthenticationKeyWatcherTest {
   @Test
   public void testChildChildrenChanged() throws Exception {
     WatchedEvent event = new WatchedEvent(EventType.NodeChildrenChanged, null, baseNode + "/2");
-    AuthenticationKey key1 = new AuthenticationKey(1, 0l, 10000l, keyGen.generateKey()),
-        key2 = new AuthenticationKey(2, key1.getExpirationDate(), 20000l, keyGen.generateKey());
+    AuthenticationKey key1 = new AuthenticationKey(1, 0L, 10000L, keyGen.generateKey()),
+        key2 = new AuthenticationKey(2, key1.getExpirationDate(), 20000L, keyGen.generateKey());
     secretManager.addKey(key1);
     secretManager.addKey(key2);
     assertEquals(2, secretManager.getKeys().size());
@@ -244,8 +244,8 @@ public class ZooAuthenticationKeyWatcherTest {
   @Test
   public void testInitialUpdateWithKeys() throws Exception {
     List<String> children = Arrays.asList("1", "5");
-    AuthenticationKey key1 = new AuthenticationKey(1, 0l, 10000l, keyGen.generateKey()),
-        key2 = new AuthenticationKey(5, key1.getExpirationDate(), 20000l, keyGen.generateKey());
+    AuthenticationKey key1 = new AuthenticationKey(1, 0L, 10000L, keyGen.generateKey()),
+        key2 = new AuthenticationKey(5, key1.getExpirationDate(), 20000L, keyGen.generateKey());
 
     expect(zk.exists(baseNode, keyWatcher)).andReturn(true);
     expect(zk.getChildren(baseNode, keyWatcher)).andReturn(children);
@@ -281,8 +281,8 @@ public class ZooAuthenticationKeyWatcherTest {
       throws Exception {
 
     List<String> children = Arrays.asList("1", "5");
-    AuthenticationKey key1 = new AuthenticationKey(1, 0l, 10000l, keyGen.generateKey()),
-        key2 = new AuthenticationKey(5, key1.getExpirationDate(), 20000l, keyGen.generateKey());
+    AuthenticationKey key1 = new AuthenticationKey(1, 0L, 10000L, keyGen.generateKey()),
+        key2 = new AuthenticationKey(5, key1.getExpirationDate(), 20000L, keyGen.generateKey());
 
     expect(zk.exists(baseNode, keyWatcher)).andReturn(true);
     expect(zk.getChildren(baseNode, keyWatcher)).andReturn(children);
@@ -329,7 +329,7 @@ public class ZooAuthenticationKeyWatcherTest {
   @Test
   public void missingKeyAfterGetChildren() throws Exception {
     List<String> children = Arrays.asList("1");
-    AuthenticationKey key1 = new AuthenticationKey(1, 0l, 10000l, keyGen.generateKey());
+    AuthenticationKey key1 = new AuthenticationKey(1, 0L, 10000L, keyGen.generateKey());
 
     expect(zk.exists(baseNode, keyWatcher)).andReturn(true);
     // We saw key1
diff --git a/server/base/src/test/java/org/apache/accumulo/server/util/AdminTest.java b/server/base/src/test/java/org/apache/accumulo/server/util/AdminTest.java
index 07f00f2..ab60b67 100644
--- a/server/base/src/test/java/org/apache/accumulo/server/util/AdminTest.java
+++ b/server/base/src/test/java/org/apache/accumulo/server/util/AdminTest.java
@@ -52,7 +52,7 @@ public class AdminTest {
 
     String root = "/accumulo/id/tservers";
     String server = "localhost:12345";
-    final long session = 123456789l;
+    final long session = 123456789L;
 
     String serverPath = root + "/" + server;
     EasyMock.expect(zc.getChildren(serverPath)).andReturn(Collections.singletonList("child"));
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 c006b7e..6fc40f8 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
@@ -270,7 +270,7 @@ public class Master extends AccumuloServerContext
           Master.this.nextEvent.event("stopped event loop");
         }
 
-      }, 100l, 1000l);
+      }, 100L, 1000L);
     }
 
     if (oldState != newState && (newState == MasterState.HAVE_LOCK)) {
diff --git a/server/master/src/main/java/org/apache/accumulo/master/recovery/RecoveryManager.java b/server/master/src/main/java/org/apache/accumulo/master/recovery/RecoveryManager.java
index ab767b0..d81c221 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/recovery/RecoveryManager.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/recovery/RecoveryManager.java
@@ -186,7 +186,7 @@ public class RecoveryManager {
             if (delay == null) {
               delay = aconf.getTimeInMillis(Property.MASTER_RECOVERY_DELAY);
             } else {
-              delay = Math.min(2 * delay, 1000 * 60 * 5l);
+              delay = Math.min(2 * delay, 1000 * 60 * 5L);
             }
 
             log.info("Starting recovery of {} (in : {}s), tablet {} holds a reference", filename,
diff --git a/server/master/src/main/java/org/apache/accumulo/master/replication/MasterReplicationCoordinator.java b/server/master/src/main/java/org/apache/accumulo/master/replication/MasterReplicationCoordinator.java
index e9af5a6..3453f24 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/replication/MasterReplicationCoordinator.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/replication/MasterReplicationCoordinator.java
@@ -59,7 +59,7 @@ public class MasterReplicationCoordinator implements ReplicationCoordinator.Ifac
 
   protected MasterReplicationCoordinator(Master master, ZooReader reader) {
     this.master = master;
-    this.rand = new Random(358923462l);
+    this.rand = new Random(358923462L);
     this.inst = master.getInstance();
     this.reader = reader;
     this.security = SecurityOperation.getInstance(master, false);
diff --git a/server/master/src/main/java/org/apache/accumulo/master/replication/RemoveCompleteReplicationRecords.java b/server/master/src/main/java/org/apache/accumulo/master/replication/RemoveCompleteReplicationRecords.java
index ff6ccff..067136f 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/replication/RemoveCompleteReplicationRecords.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/replication/RemoveCompleteReplicationRecords.java
@@ -167,7 +167,7 @@ public class RemoveCompleteReplicationRecords implements Runnable {
 
       // If a column in the row isn't ready for removal, we keep the whole row
       if (!StatusUtil.isSafeForRemoval(status)) {
-        return 0l;
+        return 0L;
       }
 
       Key k = entry.getKey();
@@ -221,7 +221,7 @@ public class RemoveCompleteReplicationRecords implements Runnable {
       bw.flush();
     } catch (MutationsRejectedException e) {
       log.error("Could not submit mutation to remove columns for {} in replication table", row, e);
-      return 0l;
+      return 0L;
     }
 
     return recordsRemoved;
diff --git a/server/master/src/test/java/org/apache/accumulo/master/tableOps/ShutdownTServerTest.java b/server/master/src/test/java/org/apache/accumulo/master/tableOps/ShutdownTServerTest.java
index 2fc51b8..eceaec3 100644
--- a/server/master/src/test/java/org/apache/accumulo/master/tableOps/ShutdownTServerTest.java
+++ b/server/master/src/test/java/org/apache/accumulo/master/tableOps/ShutdownTServerTest.java
@@ -40,7 +40,7 @@ public class ShutdownTServerTest {
     final ShutdownTServer op = new ShutdownTServer(tserver, force);
 
     final Master master = EasyMock.createMock(Master.class);
-    final long tid = 1l;
+    final long tid = 1L;
 
     final TServerConnection tserverCnxn = EasyMock.createMock(TServerConnection.class);
     final TabletServerStatus status = new TabletServerStatus();
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/ZooKeeperStatus.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/ZooKeeperStatus.java
index 33b2061..1f5f0eb 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/ZooKeeperStatus.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/ZooKeeperStatus.java
@@ -110,7 +110,7 @@ public class ZooKeeperStatus implements Runnable {
           else
             addr = HostAndPort.fromParts(parts[0], 2181);
 
-          transport = TTimeoutTransport.create(addr, 10 * 1000l);
+          transport = TTimeoutTransport.create(addr, 10 * 1000L);
           transport.write("stat\n".getBytes(UTF_8), 0, 5);
           StringBuilder response = new StringBuilder();
           try {
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/Totals.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/Totals.java
index 283e923..ae9d4fc 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/Totals.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/Totals.java
@@ -29,7 +29,7 @@ public class Totals {
   public double ingestrate = 0.0;
   public double queryrate = 0.0;
   public double diskrate = 0.0;
-  public long numentries = 0l;
+  public long numentries = 0L;
 
   public Totals() {}
 
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/gc/GarbageCollectorCycle.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/gc/GarbageCollectorCycle.java
index 3e27d16..933b119 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/gc/GarbageCollectorCycle.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/gc/GarbageCollectorCycle.java
@@ -30,12 +30,12 @@ public class GarbageCollectorCycle {
   private static final GarbageCollectorCycle EMPTY = new GarbageCollectorCycle();
 
   // Variable names become JSON key
-  public long started = 0l;
-  public long finished = 0l;
-  public long candidates = 0l;
-  public long inUse = 0l;
-  public long deleted = 0l;
-  public long errors = 0l;
+  public long started = 0L;
+  public long finished = 0L;
+  public long candidates = 0L;
+  public long inUse = 0L;
+  public long deleted = 0L;
+  public long errors = 0L;
 
   public GarbageCollectorCycle() {}
 
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/master/MasterInformation.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/master/MasterInformation.java
index 28b767b..6f132ac 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/master/MasterInformation.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/master/MasterInformation.java
@@ -42,13 +42,13 @@ public class MasterInformation {
   public Integer tablets = 0;
   public Integer unassignedTablets = 0;
 
-  public long numentries = 0l;
-  public double osload = 0l;
+  public long numentries = 0L;
+  public double osload = 0L;
   public double ingestrate = 0d;
   public double entriesRead = 0d;
   public double queryrate = 0d; // entriesReturned same as queryrate
 
-  public long holdTime = 0l;
+  public long holdTime = 0L;
 
   public int tables;
   public int deadTabletServersCount;
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/replication/ReplicationResource.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/replication/ReplicationResource.java
index be7a34d..ea06023 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/replication/ReplicationResource.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/replication/ReplicationResource.java
@@ -168,7 +168,7 @@ public class ReplicationResource {
         // instead of just file-based
         Long count = targetCounts.get(target);
         if (null == count) {
-          targetCounts.put(target, 1l);
+          targetCounts.put(target, 1L);
         } else {
           targetCounts.put(target, count + 1);
         }
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/trace/RecentTracesInformation.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/trace/RecentTracesInformation.java
index 95b5e0b..822e9f7 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/trace/RecentTracesInformation.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/trace/RecentTracesInformation.java
@@ -36,8 +36,8 @@ public class RecentTracesInformation {
   public long min = Long.MAX_VALUE;
   public long max = Long.MIN_VALUE;
 
-  private long totalMS = 0l;
-  public long histogram[] = new long[] {0l, 0l, 0l, 0l, 0l, 0l};
+  private long totalMS = 0L;
+  public long histogram[] = new long[] {0L, 0L, 0L, 0L, 0L, 0L};
 
   public RecentTracesInformation() {}
 
diff --git a/server/monitor/src/test/java/org/apache/accumulo/monitor/ShowTraceLinkTypeTest.java b/server/monitor/src/test/java/org/apache/accumulo/monitor/ShowTraceLinkTypeTest.java
index 687e2de..2b52853 100644
--- a/server/monitor/src/test/java/org/apache/accumulo/monitor/ShowTraceLinkTypeTest.java
+++ b/server/monitor/src/test/java/org/apache/accumulo/monitor/ShowTraceLinkTypeTest.java
@@ -25,7 +25,7 @@ import org.junit.Test;
 
 public class ShowTraceLinkTypeTest {
   private static RemoteSpan rs(long start, long stop, String description) {
-    return new RemoteSpan("sender", "svc", 0l, 0l, 0l, start, stop, description,
+    return new RemoteSpan("sender", "svc", 0L, 0L, 0L, start, stop, description,
         Collections.emptyMap(), Collections.emptyList());
   }
 
@@ -34,28 +34,28 @@ public class ShowTraceLinkTypeTest {
     ArrayList<RemoteSpan> spans = new ArrayList<>(10), expectedOrdering = new ArrayList<>(10);
 
     // "Random" ordering
-    spans.add(rs(55l, 75l, "desc5"));
-    spans.add(rs(25l, 30l, "desc2"));
-    spans.add(rs(85l, 90l, "desc8"));
-    spans.add(rs(45l, 60l, "desc4"));
-    spans.add(rs(35l, 55l, "desc3"));
-    spans.add(rs(95l, 110l, "desc9"));
-    spans.add(rs(65l, 80l, "desc6"));
-    spans.add(rs(100l, 120l, "desc10"));
-    spans.add(rs(15l, 25l, "desc1"));
-    spans.add(rs(75l, 100l, "desc7"));
+    spans.add(rs(55L, 75L, "desc5"));
+    spans.add(rs(25L, 30L, "desc2"));
+    spans.add(rs(85L, 90L, "desc8"));
+    spans.add(rs(45L, 60L, "desc4"));
+    spans.add(rs(35L, 55L, "desc3"));
+    spans.add(rs(95L, 110L, "desc9"));
+    spans.add(rs(65L, 80L, "desc6"));
+    spans.add(rs(100L, 120L, "desc10"));
+    spans.add(rs(15L, 25L, "desc1"));
+    spans.add(rs(75L, 100L, "desc7"));
 
     // We expect them to be sorted by 'start'
-    expectedOrdering.add(rs(15l, 25l, "desc1"));
-    expectedOrdering.add(rs(25l, 30l, "desc2"));
-    expectedOrdering.add(rs(35l, 55l, "desc3"));
-    expectedOrdering.add(rs(45l, 60l, "desc4"));
-    expectedOrdering.add(rs(55l, 75l, "desc5"));
-    expectedOrdering.add(rs(65l, 80l, "desc6"));
-    expectedOrdering.add(rs(75l, 100l, "desc7"));
-    expectedOrdering.add(rs(85l, 90l, "desc8"));
-    expectedOrdering.add(rs(95l, 110l, "desc9"));
-    expectedOrdering.add(rs(100l, 120l, "desc10"));
+    expectedOrdering.add(rs(15L, 25L, "desc1"));
+    expectedOrdering.add(rs(25L, 30L, "desc2"));
+    expectedOrdering.add(rs(35L, 55L, "desc3"));
+    expectedOrdering.add(rs(45L, 60L, "desc4"));
+    expectedOrdering.add(rs(55L, 75L, "desc5"));
+    expectedOrdering.add(rs(65L, 80L, "desc6"));
+    expectedOrdering.add(rs(75L, 100L, "desc7"));
+    expectedOrdering.add(rs(85L, 90L, "desc8"));
+    expectedOrdering.add(rs(95L, 110L, "desc9"));
+    expectedOrdering.add(rs(100L, 120L, "desc10"));
 
     Collections.sort(spans);
 
diff --git a/server/tracer/src/main/java/org/apache/accumulo/tracer/TraceDump.java b/server/tracer/src/main/java/org/apache/accumulo/tracer/TraceDump.java
index 64118ef..2451d88 100644
--- a/server/tracer/src/main/java/org/apache/accumulo/tracer/TraceDump.java
+++ b/server/tracer/src/main/java/org/apache/accumulo/tracer/TraceDump.java
@@ -42,7 +42,7 @@ import org.apache.htrace.Span;
 import com.beust.jcommander.Parameter;
 
 public class TraceDump {
-  static final long DEFAULT_TIME_IN_MILLIS = 10 * 60 * 1000l;
+  static final long DEFAULT_TIME_IN_MILLIS = 10 * 60 * 1000L;
 
   static class Opts extends ClientOnDefaultTable {
     @Parameter(names = {"-r", "--recent"}, description = "List recent traces")
diff --git a/server/tracer/src/main/java/org/apache/accumulo/tracer/TraceServer.java b/server/tracer/src/main/java/org/apache/accumulo/tracer/TraceServer.java
index aa33da1..3521f31 100644
--- a/server/tracer/src/main/java/org/apache/accumulo/tracer/TraceServer.java
+++ b/server/tracer/src/main/java/org/apache/accumulo/tracer/TraceServer.java
@@ -282,7 +282,7 @@ public class TraceServer implements Watcher {
         if (!connector.tableOperations().exists(tableName)) {
           connector.tableOperations().create(tableName);
           IteratorSetting setting = new IteratorSetting(10, "ageoff", AgeOffFilter.class.getName());
-          AgeOffFilter.setTTL(setting, 7 * 24 * 60 * 60 * 1000l);
+          AgeOffFilter.setTTL(setting, 7 * 24 * 60 * 60 * 1000L);
           connector.tableOperations().attachIterator(tableName, setting);
         }
         connector.tableOperations().setProperty(tableName, Property.TABLE_FORMATTER_CLASS.getKey(),
diff --git a/server/tracer/src/main/java/org/apache/accumulo/tracer/TraceTableStats.java b/server/tracer/src/main/java/org/apache/accumulo/tracer/TraceTableStats.java
index 4662162..bd8d4f0 100644
--- a/server/tracer/src/main/java/org/apache/accumulo/tracer/TraceTableStats.java
+++ b/server/tracer/src/main/java/org/apache/accumulo/tracer/TraceTableStats.java
@@ -47,14 +47,14 @@ public class TraceTableStats {
 
   static class SpanTypeCount {
     String type;
-    long nonzeroCount = 0l;
-    long zeroCount = 0l;
+    long nonzeroCount = 0L;
+    long zeroCount = 0L;
     ArrayList<Long> log10SpanLength = new ArrayList<>();
     Set<Long> traceIds = new HashSet<>();
 
     public SpanTypeCount() {
       for (int i = 0; i < 7; i++)
-        log10SpanLength.add(0l);
+        log10SpanLength.add(0L);
     }
 
     @Override
diff --git a/server/tracer/src/main/java/org/apache/accumulo/tracer/ZooTraceClient.java b/server/tracer/src/main/java/org/apache/accumulo/tracer/ZooTraceClient.java
index f7611b8..fb6b6dc 100644
--- a/server/tracer/src/main/java/org/apache/accumulo/tracer/ZooTraceClient.java
+++ b/server/tracer/src/main/java/org/apache/accumulo/tracer/ZooTraceClient.java
@@ -52,7 +52,7 @@ public class ZooTraceClient extends SendSpansViaThrift implements Watcher {
   boolean pathExists = false;
   final Random random = new Random();
   final List<String> hosts = new ArrayList<>();
-  long retryPause = 5000l;
+  long retryPause = 5000L;
 
   // Visible for testing
   ZooTraceClient() {}
diff --git a/server/tracer/src/test/java/org/apache/accumulo/tracer/ZooTraceClientTest.java b/server/tracer/src/test/java/org/apache/accumulo/tracer/ZooTraceClientTest.java
index 3661195..926cc13 100644
--- a/server/tracer/src/test/java/org/apache/accumulo/tracer/ZooTraceClientTest.java
+++ b/server/tracer/src/test/java/org/apache/accumulo/tracer/ZooTraceClientTest.java
@@ -44,7 +44,7 @@ public class ZooTraceClientTest {
   public void testConnectFailureRetries() throws Exception {
     ZooTraceClient client = EasyMock.createMockBuilder(ZooTraceClient.class)
         .addMockedMethod("updateHostsFromZooKeeper").createStrictMock();
-    client.setRetryPause(0l);
+    client.setRetryPause(0L);
     AtomicBoolean done = new AtomicBoolean(false);
 
     client.updateHostsFromZooKeeper();
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 9926295..2dc559e 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
@@ -879,7 +879,7 @@ public class TabletServer extends AccumuloServerContext implements Runnable {
           } else {
             // not serving tablet, so report all mutations as
             // failures
-            us.failures.put(keyExtent, 0l);
+            us.failures.put(keyExtent, 0L);
             if (updateMetrics.isEnabled())
               updateMetrics.add(TabletServerUpdateMetrics.UNKNOWN_TABLET_ERRORS, 0);
           }
@@ -2519,7 +2519,7 @@ public class TabletServer extends AccumuloServerContext implements Runnable {
         }
         log.warn("failed to open tablet {} reporting failure to master", extent);
         enqueueMasterMessage(new TabletStatusMessage(TabletLoadState.LOAD_FAILURE, extent));
-        long reschedule = Math.min((1l << Math.min(32, retryAttempt)) * 1000, 10 * 60 * 1000l);
+        long reschedule = Math.min((1L << Math.min(32, retryAttempt)) * 1000, 10 * 60 * 1000L);
         log.warn(String.format("rescheduling tablet load in %.2f seconds", reschedule / 1000.));
         SimpleTimer.getInstance(getConfiguration()).schedule(new TimerTask() {
           @Override
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 224cf31..92e6777 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
@@ -321,7 +321,7 @@ public class TabletServerResourceManager {
         log.warn("Caught exception checking active assignments", e);
       } finally {
         // Don't run more often than every 5s
-        long delay = Math.max((long) (millisBeforeWarning * 0.5), 5000l);
+        long delay = Math.max((long) (millisBeforeWarning * 0.5), 5000L);
         if (log.isTraceEnabled()) {
           log.trace("Rescheduling assignment watcher to run in {}ms", delay);
         }
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/log/DfsLogger.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/log/DfsLogger.java
index 70bc779..7af202a 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/log/DfsLogger.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/log/DfsLogger.java
@@ -96,7 +96,7 @@ public class DfsLogger implements Comparable<DfsLogger> {
    * happen when the tserver dies as described.
    */
   public static class LogHeaderIncompleteException extends IOException {
-    private static final long serialVersionUID = 1l;
+    private static final long serialVersionUID = 1L;
 
     public LogHeaderIncompleteException(Throwable cause) {
       super(cause);
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/metrics/Metrics2TabletServerMetrics.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/metrics/Metrics2TabletServerMetrics.java
index 3e78e47..c092039 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/metrics/Metrics2TabletServerMetrics.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/metrics/Metrics2TabletServerMetrics.java
@@ -50,25 +50,25 @@ public class Metrics2TabletServerMetrics
     this.registry = new MetricsRegistry(Interns.info(NAME, DESCRIPTION));
     this.registry.tag(MsInfo.ProcessName, MetricsSystemHelper.getProcessName());
 
-    entries = registry.newGauge(Interns.info(ENTRIES, "Number of entries"), 0l);
+    entries = registry.newGauge(Interns.info(ENTRIES, "Number of entries"), 0L);
     entriesInMemory = registry.newGauge(Interns.info(ENTRIES_IN_MEM, "Number of entries in memory"),
-        0l);
+        0L);
     activeMajcs = registry
-        .newGauge(Interns.info(ACTIVE_MAJCS, "Number of active major compactions"), 0l);
+        .newGauge(Interns.info(ACTIVE_MAJCS, "Number of active major compactions"), 0L);
     queuedMajcs = registry
-        .newGauge(Interns.info(QUEUED_MAJCS, "Number of queued major compactions"), 0l);
+        .newGauge(Interns.info(QUEUED_MAJCS, "Number of queued major compactions"), 0L);
     activeMincs = registry
-        .newGauge(Interns.info(ACTIVE_MINCS, "Number of active minor compactions"), 0l);
+        .newGauge(Interns.info(ACTIVE_MINCS, "Number of active minor compactions"), 0L);
     queuedMincs = registry
-        .newGauge(Interns.info(QUEUED_MINCS, "Number of queued minor compactions"), 0l);
-    onlineTablets = registry.newGauge(Interns.info(ONLINE_TABLETS, "Number of online tablets"), 0l);
+        .newGauge(Interns.info(QUEUED_MINCS, "Number of queued minor compactions"), 0L);
+    onlineTablets = registry.newGauge(Interns.info(ONLINE_TABLETS, "Number of online tablets"), 0L);
     openingTablets = registry.newGauge(Interns.info(OPENING_TABLETS, "Number of opening tablets"),
-        0l);
+        0L);
     unopenedTablets = registry
-        .newGauge(Interns.info(UNOPENED_TABLETS, "Number of unopened tablets"), 0l);
-    queries = registry.newGauge(Interns.info(QUERIES, "Number of queries"), 0l);
+        .newGauge(Interns.info(UNOPENED_TABLETS, "Number of unopened tablets"), 0L);
+    queries = registry.newGauge(Interns.info(QUERIES, "Number of queries"), 0L);
     totalMincs = registry
-        .newGauge(Interns.info(TOTAL_MINCS, "Total number of minor compactions performed"), 0l);
+        .newGauge(Interns.info(TOTAL_MINCS, "Total number of minor compactions performed"), 0L);
   }
 
   @Override
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/metrics/Metrics2TabletServerUpdateMetrics.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/metrics/Metrics2TabletServerUpdateMetrics.java
index 55cbae7..2022de4 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/metrics/Metrics2TabletServerUpdateMetrics.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/metrics/Metrics2TabletServerUpdateMetrics.java
@@ -51,11 +51,11 @@ public class Metrics2TabletServerUpdateMetrics
     this.registry.tag(MsInfo.ProcessName, MetricsSystemHelper.getProcessName());
 
     permissionErrorsCounter = registry
-        .newCounter(Interns.info(PERMISSION_ERRORS, "Permission Errors"), 0l);
+        .newCounter(Interns.info(PERMISSION_ERRORS, "Permission Errors"), 0L);
     unknownTabletErrorsCounter = registry
-        .newCounter(Interns.info(UNKNOWN_TABLET_ERRORS, "Unknown Tablet Errors"), 0l);
+        .newCounter(Interns.info(UNKNOWN_TABLET_ERRORS, "Unknown Tablet Errors"), 0L);
     constraintViolationsCounter = registry
-        .newCounter(Interns.info(CONSTRAINT_VIOLATIONS, "Table Constraint Violations"), 0l);
+        .newCounter(Interns.info(CONSTRAINT_VIOLATIONS, "Table Constraint Violations"), 0L);
 
     commitPrepStat = registry.newStat(COMMIT_PREP, "preparing to commit mutations", "Ops", "Time",
         true);
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/replication/AccumuloReplicaSystem.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/replication/AccumuloReplicaSystem.java
index 3e2de91..25d342c 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/replication/AccumuloReplicaSystem.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/replication/AccumuloReplicaSystem.java
@@ -592,7 +592,7 @@ public class AccumuloReplicaSystem implements ReplicaSystem {
       }
 
       // No data sent (bytes nor records) and no progress made
-      return new ReplicationStats(0l, 0l, 0l);
+      return new ReplicationStats(0L, 0L, 0L);
     }
   }
 
@@ -634,7 +634,7 @@ public class AccumuloReplicaSystem implements ReplicaSystem {
       }
 
       // No data sent (bytes nor records) and no progress made
-      return new ReplicationStats(0l, 0l, 0l);
+      return new ReplicationStats(0L, 0L, 0L);
     }
   }
 
@@ -746,9 +746,9 @@ public class AccumuloReplicaSystem implements ReplicaSystem {
       Status status, long sizeLimit, Set<Integer> desiredTids) throws IOException {
     WalEdits edits = new WalEdits();
     edits.edits = new ArrayList<>();
-    long size = 0l;
-    long entriesConsumed = 0l;
-    long numUpdates = 0l;
+    long size = 0L;
+    long entriesConsumed = 0L;
+    long numUpdates = 0L;
     LogFileKey key = new LogFileKey();
     LogFileValue value = new LogFileValue();
 
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/replication/BatchWriterReplicationReplayer.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/replication/BatchWriterReplicationReplayer.java
index 5656f25..48575d0 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/replication/BatchWriterReplicationReplayer.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/replication/BatchWriterReplicationReplayer.java
@@ -62,7 +62,7 @@ public class BatchWriterReplicationReplayer implements AccumuloReplicationReplay
         .getAsBytes(Property.TSERV_REPLICATION_BW_REPLAYER_MEMORY);
 
     BatchWriter bw = null;
-    long mutationsApplied = 0l;
+    long mutationsApplied = 0L;
     try {
       for (ByteBuffer edit : data.getEdits()) {
         DataInputStream dis = new DataInputStream(ByteBufferUtil.toByteArrayInputStream(edit));
@@ -97,7 +97,7 @@ public class BatchWriterReplicationReplayer implements AccumuloReplicationReplay
         // otherwise
         // the local system will assign a new timestamp.
         List<Mutation> mutationsCopy = new ArrayList<>(value.mutations.size());
-        long mutationsCopied = 0l;
+        long mutationsCopied = 0L;
         for (Mutation orig : value.mutations) {
           if (orig instanceof ServerMutation) {
             mutationsCopied++;
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java
index 14836be..44c0f72 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java
@@ -2368,7 +2368,7 @@ public class Tablet implements TabletCommitter {
     List<String> files = new ArrayList<>();
 
     for (Entry<FileRef,MapFileInfo> entry : fileMap.entrySet()) {
-      entries.put(entry.getKey(), new DataFileValue(entry.getValue().estimatedSize, 0l));
+      entries.put(entry.getKey(), new DataFileValue(entry.getValue().estimatedSize, 0L));
       files.add(entry.getKey().path().toString());
     }
 
diff --git a/server/tserver/src/test/java/org/apache/accumulo/tserver/AssignmentWatcherTest.java b/server/tserver/src/test/java/org/apache/accumulo/tserver/AssignmentWatcherTest.java
index 0d4df45..a06980f 100644
--- a/server/tserver/src/test/java/org/apache/accumulo/tserver/AssignmentWatcherTest.java
+++ b/server/tserver/src/test/java/org/apache/accumulo/tserver/AssignmentWatcherTest.java
@@ -48,12 +48,12 @@ public class AssignmentWatcherTest {
   public void testAssignmentWarning() {
     ActiveAssignmentRunnable task = EasyMock.createMock(ActiveAssignmentRunnable.class);
     RunnableStartedAt run = new RunnableStartedAt(task, System.currentTimeMillis());
-    EasyMock.expect(conf.getTimeInMillis(Property.TSERV_ASSIGNMENT_DURATION_WARNING)).andReturn(0l);
+    EasyMock.expect(conf.getTimeInMillis(Property.TSERV_ASSIGNMENT_DURATION_WARNING)).andReturn(0L);
 
     assignments.put(new KeyExtent(Table.ID.of("1"), null, null), run);
 
     EasyMock.expect(task.getException()).andReturn(new Exception("Assignment warning happened"));
-    EasyMock.expect(timer.schedule(watcher, 5000l)).andReturn(null);
+    EasyMock.expect(timer.schedule(watcher, 5000L)).andReturn(null);
 
     EasyMock.replay(timer, conf, task);
 
diff --git a/server/tserver/src/test/java/org/apache/accumulo/tserver/replication/AccumuloReplicaSystemTest.java b/server/tserver/src/test/java/org/apache/accumulo/tserver/replication/AccumuloReplicaSystemTest.java
index cb69e02..b270428 100644
--- a/server/tserver/src/test/java/org/apache/accumulo/tserver/replication/AccumuloReplicaSystemTest.java
+++ b/server/tserver/src/test/java/org/apache/accumulo/tserver/replication/AccumuloReplicaSystemTest.java
@@ -70,7 +70,7 @@ public class AccumuloReplicaSystemTest {
     LogFileValue value = new LogFileValue();
 
     // What is seq used for?
-    key.seq = 1l;
+    key.seq = 1L;
 
     /*
      * Disclaimer: the following series of LogFileKey and LogFileValue pairs have *no* bearing
@@ -178,7 +178,7 @@ public class AccumuloReplicaSystemTest {
     LogFileValue value = new LogFileValue();
 
     // What is seq used for?
-    key.seq = 1l;
+    key.seq = 1L;
 
     /*
      * Disclaimer: the following series of LogFileKey and LogFileValue pairs have *no* bearing
@@ -384,7 +384,7 @@ public class AccumuloReplicaSystemTest {
     LogFileValue value = new LogFileValue();
 
     // What is seq used for?
-    key.seq = 1l;
+    key.seq = 1L;
 
     /*
      * Disclaimer: the following series of LogFileKey and LogFileValue pairs have *no* bearing
@@ -432,7 +432,7 @@ public class AccumuloReplicaSystemTest {
 
     // Only consume the first mutation, not the second
     WalReplication repl = ars.getWalEdits(new ReplicationTarget("peer", "1", Table.ID.of("1")), dis,
-        new Path("/accumulo/wals/tserver+port/wal"), status, 1l, tids);
+        new Path("/accumulo/wals/tserver+port/wal"), status, 1L, tids);
 
     // We stopped because we got to the end of the file
     Assert.assertEquals(2, repl.entriesConsumed);
@@ -444,7 +444,7 @@ public class AccumuloReplicaSystemTest {
 
     // Consume the rest of the mutations
     repl = ars.getWalEdits(new ReplicationTarget("peer", "1", Table.ID.of("1")), dis,
-        new Path("/accumulo/wals/tserver+port/wal"), status, 1l, tids);
+        new Path("/accumulo/wals/tserver+port/wal"), status, 1L, tids);
 
     // We stopped because we got to the end of the file
     Assert.assertEquals(1, repl.entriesConsumed);
@@ -480,7 +480,7 @@ public class AccumuloReplicaSystemTest {
 
     verify(replClient, ars);
 
-    Assert.assertEquals(new ReplicationStats(0l, 0l, 0l), stats);
+    Assert.assertEquals(new ReplicationStats(0L, 0L, 0L), stats);
   }
 
   @Test
@@ -510,7 +510,7 @@ public class AccumuloReplicaSystemTest {
 
     verify(replClient, ars);
 
-    Assert.assertEquals(new ReplicationStats(0l, 0l, 5l), stats);
+    Assert.assertEquals(new ReplicationStats(0L, 0L, 5L), stats);
   }
 
   @Test
diff --git a/server/tserver/src/test/java/org/apache/accumulo/tserver/replication/BatchWriterReplicationReplayerTest.java b/server/tserver/src/test/java/org/apache/accumulo/tserver/replication/BatchWriterReplicationReplayerTest.java
index 7f33d5c..c00dd8c 100644
--- a/server/tserver/src/test/java/org/apache/accumulo/tserver/replication/BatchWriterReplicationReplayerTest.java
+++ b/server/tserver/src/test/java/org/apache/accumulo/tserver/replication/BatchWriterReplicationReplayerTest.java
@@ -78,7 +78,7 @@ public class BatchWriterReplicationReplayerTest {
     final String tableName = "foo";
     final long systemTimestamp = 1000;
     final BatchWriterConfig bwCfg = new BatchWriterConfig();
-    bwCfg.setMaxMemory(1l);
+    bwCfg.setMaxMemory(1L);
 
     LogFileKey key = new LogFileKey();
     key.event = LogEvents.MANY_MUTATIONS;
@@ -144,7 +144,7 @@ public class BatchWriterReplicationReplayerTest {
     final long systemTimestamp = 1000;
     final String peerName = "peer";
     final BatchWriterConfig bwCfg = new BatchWriterConfig();
-    bwCfg.setMaxMemory(1l);
+    bwCfg.setMaxMemory(1L);
 
     LogFileKey key = new LogFileKey();
     key.event = LogEvents.MANY_MUTATIONS;
diff --git a/server/tserver/src/test/java/org/apache/accumulo/tserver/tablet/TabletTest.java b/server/tserver/src/test/java/org/apache/accumulo/tserver/tablet/TabletTest.java
index b120598..1ca3247 100644
--- a/server/tserver/src/test/java/org/apache/accumulo/tserver/tablet/TabletTest.java
+++ b/server/tserver/src/test/java/org/apache/accumulo/tserver/tablet/TabletTest.java
@@ -55,7 +55,7 @@ public class TabletTest {
     Tablet tablet = new Tablet(time, "", 0, new Path("/foo"), dfm, tserver, tserverResourceManager,
         tabletMemory, tableConf, extent, obs);
 
-    long hdfsBlockSize = 10000l, blockSize = 5000l, indexBlockSize = 500l;
+    long hdfsBlockSize = 10000L, blockSize = 5000L, indexBlockSize = 500L;
     int replication = 5;
     String compressType = "snappy";
 
diff --git a/test/src/main/java/org/apache/accumulo/test/ClientSideIteratorIT.java b/test/src/main/java/org/apache/accumulo/test/ClientSideIteratorIT.java
index d87a1d4..ad67a35 100644
--- a/test/src/main/java/org/apache/accumulo/test/ClientSideIteratorIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/ClientSideIteratorIT.java
@@ -50,13 +50,13 @@ public class ClientSideIteratorIT extends AccumuloClusterHarness {
   @Before
   public void setupData() {
     resultSet1 = new ArrayList<>();
-    resultSet1.add(new Key("row1", "colf", "colq", 4l));
-    resultSet1.add(new Key("row1", "colf", "colq", 3l));
+    resultSet1.add(new Key("row1", "colf", "colq", 4L));
+    resultSet1.add(new Key("row1", "colf", "colq", 3L));
     resultSet2 = new ArrayList<>();
-    resultSet2.add(new Key("row1", "colf", "colq", 4l));
-    resultSet2.add(new Key("row1", "colf", "colq", 3l));
-    resultSet2.add(new Key("row1", "colf", "colq", 2l));
-    resultSet2.add(new Key("row1", "colf", "colq", 1l));
+    resultSet2.add(new Key("row1", "colf", "colq", 4L));
+    resultSet2.add(new Key("row1", "colf", "colq", 3L));
+    resultSet2.add(new Key("row1", "colf", "colq", 2L));
+    resultSet2.add(new Key("row1", "colf", "colq", 1L));
     resultSet3 = new ArrayList<>();
     resultSet3.add(new Key("part1", "", "doc2"));
     resultSet3.add(new Key("part2", "", "DOC2"));
@@ -117,13 +117,13 @@ public class ClientSideIteratorIT extends AccumuloClusterHarness {
     conn.tableOperations().removeProperty(tableName, "table.iterator.minc.vers");
     final BatchWriter bw = conn.createBatchWriter(tableName, new BatchWriterConfig());
     Mutation m = new Mutation("row1");
-    m.put("colf", "colq", 1l, "value");
-    m.put("colf", "colq", 2l, "value");
+    m.put("colf", "colq", 1L, "value");
+    m.put("colf", "colq", 2L, "value");
     bw.addMutation(m);
     bw.flush();
     m = new Mutation("row1");
-    m.put("colf", "colq", 3l, "value");
-    m.put("colf", "colq", 4l, "value");
+    m.put("colf", "colq", 3L, "value");
+    m.put("colf", "colq", 4L, "value");
     bw.addMutation(m);
     bw.flush();
 
diff --git a/test/src/main/java/org/apache/accumulo/test/CreateRandomRFile.java b/test/src/main/java/org/apache/accumulo/test/CreateRandomRFile.java
index 263f979..6cca4e1 100644
--- a/test/src/main/java/org/apache/accumulo/test/CreateRandomRFile.java
+++ b/test/src/main/java/org/apache/accumulo/test/CreateRandomRFile.java
@@ -60,7 +60,7 @@ public class CreateRandomRFile {
     Random r = new Random();
 
     for (int i = 0; i < rands.length; i++) {
-      rands[i] = (r.nextLong() & 0x7fffffffffffffffl) % 10000000000l;
+      rands[i] = (r.nextLong() & 0x7fffffffffffffffL) % 10000000000L;
     }
 
     Arrays.sort(rands);
diff --git a/test/src/main/java/org/apache/accumulo/test/TestBinaryRows.java b/test/src/main/java/org/apache/accumulo/test/TestBinaryRows.java
index c3238cf..8f22c9f 100644
--- a/test/src/main/java/org/apache/accumulo/test/TestBinaryRows.java
+++ b/test/src/main/java/org/apache/accumulo/test/TestBinaryRows.java
@@ -165,7 +165,7 @@ public class TestBinaryRows {
       long t1 = System.currentTimeMillis();
 
       for (int i = 0; i < numLookups; i++) {
-        long row = ((r.nextLong() & 0x7fffffffffffffffl) % opts.num) + opts.start;
+        long row = ((r.nextLong() & 0x7fffffffffffffffL) % opts.num) + opts.start;
 
         try (Scanner s = connector.createScanner(opts.getTableName(), opts.auths)) {
           s.setBatchSize(scanOpts.scanBatchSize);
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/AddSplitIT.java b/test/src/main/java/org/apache/accumulo/test/functional/AddSplitIT.java
index fc15817..b2d0070 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/AddSplitIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/AddSplitIT.java
@@ -54,7 +54,7 @@ public class AddSplitIT extends AccumuloClusterHarness {
     Connector c = getConnector();
     c.tableOperations().create(tableName);
 
-    insertData(tableName, 1l);
+    insertData(tableName, 1L);
 
     TreeSet<Text> splits = new TreeSet<>();
     splits.add(new Text(String.format("%09d", 333)));
@@ -70,8 +70,8 @@ public class AddSplitIT extends AccumuloClusterHarness {
       throw new Exception(splits + " != " + actualSplits);
     }
 
-    verifyData(tableName, 1l);
-    insertData(tableName, 2l);
+    verifyData(tableName, 1L);
+    insertData(tableName, 2L);
 
     // did not clear splits on purpose, it should ignore existing split points
     // and still create the three additional split points
@@ -90,7 +90,7 @@ public class AddSplitIT extends AccumuloClusterHarness {
       throw new Exception(splits + " != " + actualSplits);
     }
 
-    verifyData(tableName, 2l);
+    verifyData(tableName, 2L);
   }
 
   private void verifyData(String tableName, long ts) throws Exception {
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/BalanceInPresenceOfOfflineTableIT.java b/test/src/main/java/org/apache/accumulo/test/functional/BalanceInPresenceOfOfflineTableIT.java
index 24fad5f..9c21971 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/BalanceInPresenceOfOfflineTableIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/BalanceInPresenceOfOfflineTableIT.java
@@ -181,7 +181,7 @@ public class BalanceInPresenceOfOfflineTableIT extends AccumuloClusterHarness {
       }
 
       long[] tabletsPerServer = new long[stats.getTServerInfoSize()];
-      Arrays.fill(tabletsPerServer, 0l);
+      Arrays.fill(tabletsPerServer, 0L);
       for (int i = 0; i < stats.getTServerInfoSize(); i++) {
         for (Map.Entry<String,TableInfo> entry : stats.getTServerInfo().get(i).getTableMap()
             .entrySet()) {
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/BloomFilterIT.java b/test/src/main/java/org/apache/accumulo/test/functional/BloomFilterIT.java
index 6537ec6..7a0f848 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/BloomFilterIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/BloomFilterIT.java
@@ -184,7 +184,7 @@ public class BloomFilterIT extends AccumuloClusterHarness {
     Text row = new Text("row"), cq = new Text("cq"), cf = new Text("cf");
 
     for (int i = 0; i < num; ++i) {
-      Long k = ((r.nextLong() & 0x7fffffffffffffffl) % (end - start)) + start;
+      Long k = ((r.nextLong() & 0x7fffffffffffffffL) % (end - start)) + start;
       key.set(String.format("k_%010d", k));
       Range range = null;
       Key acuKey;
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/KerberosIT.java b/test/src/main/java/org/apache/accumulo/test/functional/KerberosIT.java
index c87cdd7..6636f0e 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/KerberosIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/KerberosIT.java
@@ -380,7 +380,7 @@ public class KerberosIT extends AccumuloITBase {
         // Make sure we can actually use the table we made
 
         // Write data
-        final long ts = 1000l;
+        final long ts = 1000L;
         BatchWriter bw = conn.createBatchWriter(table, new BatchWriterConfig());
         Mutation m = new Mutation("a");
         m.put("b", "c", new ColumnVisibility(viz.getBytes()), ts, "d");
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/LogicalTimeIT.java b/test/src/main/java/org/apache/accumulo/test/functional/LogicalTimeIT.java
index 6d1474c..f4d7598 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/LogicalTimeIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/LogicalTimeIT.java
@@ -46,44 +46,44 @@ public class LogicalTimeIT extends AccumuloClusterHarness {
     int tc = 0;
     String tableName = getUniqueNames(1)[0];
     Connector c = getConnector();
-    runMergeTest(c, tableName + tc++, new String[] {"m"}, new String[] {"a"}, null, null, "b", 2l);
-    runMergeTest(c, tableName + tc++, new String[] {"m"}, new String[] {"z"}, null, null, "b", 2l);
+    runMergeTest(c, tableName + tc++, new String[] {"m"}, new String[] {"a"}, null, null, "b", 2L);
+    runMergeTest(c, tableName + tc++, new String[] {"m"}, new String[] {"z"}, null, null, "b", 2L);
     runMergeTest(c, tableName + tc++, new String[] {"m"}, new String[] {"a", "z"}, null, null, "b",
-        2l);
+        2L);
     runMergeTest(c, tableName + tc++, new String[] {"m"}, new String[] {"a", "c", "z"}, null, null,
-        "b", 3l);
+        "b", 3L);
     runMergeTest(c, tableName + tc++, new String[] {"m"}, new String[] {"a", "y", "z"}, null, null,
-        "b", 3l);
+        "b", 3L);
 
     runMergeTest(c, tableName + tc++, new String[] {"g", "r"}, new String[] {"a"}, null, null, "b",
-        2l);
+        2L);
     runMergeTest(c, tableName + tc++, new String[] {"g", "r"}, new String[] {"h"}, null, null, "b",
-        2l);
+        2L);
     runMergeTest(c, tableName + tc++, new String[] {"g", "r"}, new String[] {"s"}, null, null, "b",
-        2l);
+        2L);
     runMergeTest(c, tableName + tc++, new String[] {"g", "r"}, new String[] {"a", "h", "s"}, null,
-        null, "b", 2l);
+        null, "b", 2L);
     runMergeTest(c, tableName + tc++, new String[] {"g", "r"}, new String[] {"a", "c", "h", "s"},
-        null, null, "b", 3l);
+        null, null, "b", 3L);
     runMergeTest(c, tableName + tc++, new String[] {"g", "r"}, new String[] {"a", "h", "s", "i"},
-        null, null, "b", 3l);
+        null, null, "b", 3L);
     runMergeTest(c, tableName + tc++, new String[] {"g", "r"}, new String[] {"t", "a", "h", "s"},
-        null, null, "b", 3l);
+        null, null, "b", 3L);
 
     runMergeTest(c, tableName + tc++, new String[] {"g", "r"}, new String[] {"a"}, null, "h", "b",
-        2l);
+        2L);
     runMergeTest(c, tableName + tc++, new String[] {"g", "r"}, new String[] {"h"}, null, "h", "b",
-        2l);
+        2L);
     runMergeTest(c, tableName + tc++, new String[] {"g", "r"}, new String[] {"s"}, null, "h", "b",
-        1l);
+        1L);
     runMergeTest(c, tableName + tc++, new String[] {"g", "r"}, new String[] {"a", "h", "s"}, null,
-        "h", "b", 2l);
+        "h", "b", 2L);
     runMergeTest(c, tableName + tc++, new String[] {"g", "r"}, new String[] {"a", "c", "h", "s"},
-        null, "h", "b", 3l);
+        null, "h", "b", 3L);
     runMergeTest(c, tableName + tc++, new String[] {"g", "r"}, new String[] {"a", "h", "s", "i"},
-        null, "h", "b", 3l);
+        null, "h", "b", 3L);
     runMergeTest(c, tableName + tc++, new String[] {"g", "r"}, new String[] {"t", "a", "h", "s"},
-        null, "h", "b", 2l);
+        null, "h", "b", 2L);
 
   }
 
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/NativeMapIT.java b/test/src/main/java/org/apache/accumulo/test/functional/NativeMapIT.java
index 9a7a5e8..20ef885 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/NativeMapIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/NativeMapIT.java
@@ -478,7 +478,7 @@ public class NativeMapIT {
     for (int i = 0; i < 100000; i++) {
 
       Key k = new Key(getRandomBytes(r, 97), getRandomBytes(r, 13), getRandomBytes(r, 31),
-          getRandomBytes(r, 11), (r.nextLong() & 0x7fffffffffffffffl), false, false);
+          getRandomBytes(r, 11), (r.nextLong() & 0x7fffffffffffffffL), false, false);
       Value v = new Value(getRandomBytes(r, 511));
 
       testData.add(new Pair<>(k, v));
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/RecoveryWithEmptyRFileIT.java b/test/src/main/java/org/apache/accumulo/test/functional/RecoveryWithEmptyRFileIT.java
index 1eeebb9..946619e 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/RecoveryWithEmptyRFileIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/RecoveryWithEmptyRFileIT.java
@@ -101,12 +101,12 @@ public class RecoveryWithEmptyRFileIT extends ConfigurableMacBase {
     log.debug("make sure we can still scan");
     try (Scanner scan = connector.createScanner(tableName, Authorizations.EMPTY)) {
       scan.setRange(new Range());
-      long cells = 0l;
+      long cells = 0L;
       for (Entry<Key,Value> entry : scan) {
         if (entry != null)
           cells++;
       }
-      assertEquals(0l, cells);
+      assertEquals(0L, cells);
     }
   }
 
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/ScannerIT.java b/test/src/main/java/org/apache/accumulo/test/functional/ScannerIT.java
index 94226c4..bd656c0 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/ScannerIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/ScannerIT.java
@@ -70,7 +70,7 @@ public class ScannerIT extends AccumuloClusterHarness {
 
       cfg = new IteratorSetting(100, SlowIterator.class);
       // A batch size of one will end up calling seek() for each element with no calls to next()
-      SlowIterator.setSeekSleepTime(cfg, 100l);
+      SlowIterator.setSeekSleepTime(cfg, 100L);
 
       s.addScanIterator(cfg);
       // Never start readahead
@@ -86,7 +86,7 @@ public class ScannerIT extends AccumuloClusterHarness {
         sw.stop();
 
         // While we "do work" in the client, we should be fetching the next result
-        UtilWaitThread.sleep(100l);
+        UtilWaitThread.sleep(100L);
         iterator.next();
         sw.start();
       }
@@ -99,7 +99,7 @@ public class ScannerIT extends AccumuloClusterHarness {
       s.addScanIterator(cfg);
       s.setRange(new Range());
       s.setBatchSize(1);
-      s.setReadaheadThreshold(0l);
+      s.setReadaheadThreshold(0L);
 
       sw = new Stopwatch();
       iterator = s.iterator();
@@ -109,7 +109,7 @@ public class ScannerIT extends AccumuloClusterHarness {
         sw.stop();
 
         // While we "do work" in the client, we should be fetching the next result
-        UtilWaitThread.sleep(100l);
+        UtilWaitThread.sleep(100L);
         iterator.next();
         sw.start();
       }
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/SplitRecoveryIT.java b/test/src/main/java/org/apache/accumulo/test/functional/SplitRecoveryIT.java
index be61a2f..78088d8 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/SplitRecoveryIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/SplitRecoveryIT.java
@@ -191,7 +191,7 @@ public class SplitRecoveryIT extends ConfigurableMacBase {
       Map<Long,? extends Collection<FileRef>> bulkFiles = MetadataTableUtil
           .getBulkFilesLoaded(context, extent);
       MasterMetadataUtil.addNewTablet(context, low, "/lowDir", instance, lowDatafileSizes,
-          bulkFiles, TabletTime.LOGICAL_TIME_ID + "0", -1l, -1l, zl);
+          bulkFiles, TabletTime.LOGICAL_TIME_ID + "0", -1L, -1L, zl);
     }
     if (steps >= 2) {
       MetadataTableUtil.finishSplit(high, highDatafileSizes, highDatafilesToRemove, context, zl);
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/SummaryIT.java b/test/src/main/java/org/apache/accumulo/test/functional/SummaryIT.java
index 4e6e9a8..50ff90e 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/SummaryIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/SummaryIT.java
@@ -155,8 +155,8 @@ public class SummaryIT extends AccumuloClusterHarness {
     LongSummaryStatistics stats = getTimestampStats(table, c);
 
     summaries = c.tableOperations().summaries(table).flush(true).retrieve();
-    checkSummaries(summaries, sc1, 1, 0, 0, TOTAL_STAT, 100_000l, MIN_TIMESTAMP_STAT,
-        stats.getMin(), MAX_TIMESTAMP_STAT, stats.getMax(), DELETES_STAT, 0l);
+    checkSummaries(summaries, sc1, 1, 0, 0, TOTAL_STAT, 100_000L, MIN_TIMESTAMP_STAT,
+        stats.getMin(), MAX_TIMESTAMP_STAT, stats.getMax(), DELETES_STAT, 0L);
 
     Mutation m = new Mutation(String.format("r%09x", 999));
     m.put("f1", "q1", "999-0");
@@ -170,16 +170,16 @@ public class SummaryIT extends AccumuloClusterHarness {
 
     summaries = c.tableOperations().summaries(table).retrieve();
 
-    checkSummaries(summaries, sc1, 2, 0, 0, TOTAL_STAT, 100_002l, MIN_TIMESTAMP_STAT,
-        stats.getMin(), MAX_TIMESTAMP_STAT, stats.getMax(), DELETES_STAT, 1l);
+    checkSummaries(summaries, sc1, 2, 0, 0, TOTAL_STAT, 100_002L, MIN_TIMESTAMP_STAT,
+        stats.getMin(), MAX_TIMESTAMP_STAT, stats.getMax(), DELETES_STAT, 1L);
 
     bw.close();
 
     c.tableOperations().compact(table, new CompactionConfig().setWait(true));
 
     summaries = c.tableOperations().summaries(table).retrieve();
-    checkSummaries(summaries, sc1, 1, 0, 0, TOTAL_STAT, 100_000l, MIN_TIMESTAMP_STAT,
-        stats.getMin(), MAX_TIMESTAMP_STAT, stats.getMax(), DELETES_STAT, 0l);
+    checkSummaries(summaries, sc1, 1, 0, 0, TOTAL_STAT, 100_000L, MIN_TIMESTAMP_STAT,
+        stats.getMin(), MAX_TIMESTAMP_STAT, stats.getMax(), DELETES_STAT, 0L);
 
     // split tablet into two
     String sp1 = String.format("r%09x", 50_000);
@@ -187,30 +187,30 @@ public class SummaryIT extends AccumuloClusterHarness {
 
     summaries = c.tableOperations().summaries(table).retrieve();
 
-    checkSummaries(summaries, sc1, 1, 0, 0, TOTAL_STAT, 100_000l, MIN_TIMESTAMP_STAT,
-        stats.getMin(), MAX_TIMESTAMP_STAT, stats.getMax(), DELETES_STAT, 0l);
+    checkSummaries(summaries, sc1, 1, 0, 0, TOTAL_STAT, 100_000L, MIN_TIMESTAMP_STAT,
+        stats.getMin(), MAX_TIMESTAMP_STAT, stats.getMax(), DELETES_STAT, 0L);
 
     // compact 2nd tablet
     c.tableOperations().compact(table,
         new CompactionConfig().setStartRow(new Text(sp1)).setWait(true));
 
     summaries = c.tableOperations().summaries(table).retrieve();
-    checkSummaries(summaries, sc1, 2, 0, 1, TOTAL_STAT, 113_999l, MIN_TIMESTAMP_STAT,
-        stats.getMin(), MAX_TIMESTAMP_STAT, stats.getMax(), DELETES_STAT, 0l);
+    checkSummaries(summaries, sc1, 2, 0, 1, TOTAL_STAT, 113_999L, MIN_TIMESTAMP_STAT,
+        stats.getMin(), MAX_TIMESTAMP_STAT, stats.getMax(), DELETES_STAT, 0L);
 
     // get summaries for first tablet
     stats = getTimestampStats(table, c, sp1, null);
     summaries = c.tableOperations().summaries(table).startRow(sp1).retrieve();
-    checkSummaries(summaries, sc1, 1, 0, 0, TOTAL_STAT, 49_999l, MIN_TIMESTAMP_STAT, stats.getMin(),
-        MAX_TIMESTAMP_STAT, stats.getMax(), DELETES_STAT, 0l);
+    checkSummaries(summaries, sc1, 1, 0, 0, TOTAL_STAT, 49_999L, MIN_TIMESTAMP_STAT, stats.getMin(),
+        MAX_TIMESTAMP_STAT, stats.getMax(), DELETES_STAT, 0L);
 
     // compact all tablets and regenerate all summaries
     c.tableOperations().compact(table, new CompactionConfig());
 
     summaries = c.tableOperations().summaries(table).retrieve();
     stats = getTimestampStats(table, c);
-    checkSummaries(summaries, sc1, 2, 0, 0, TOTAL_STAT, 100_000l, MIN_TIMESTAMP_STAT,
-        stats.getMin(), MAX_TIMESTAMP_STAT, stats.getMax(), DELETES_STAT, 0l);
+    checkSummaries(summaries, sc1, 2, 0, 0, TOTAL_STAT, 100_000L, MIN_TIMESTAMP_STAT,
+        stats.getMin(), MAX_TIMESTAMP_STAT, stats.getMax(), DELETES_STAT, 0L);
 
     summaries = c.tableOperations().summaries(table).startRow(String.format("r%09x", 75_000))
         .endRow(String.format("r%09x", 80_000)).retrieve();
@@ -240,8 +240,8 @@ public class SummaryIT extends AccumuloClusterHarness {
     c.tableOperations().addSummarizers(table, sc1);
     c.tableOperations().compact(table, new CompactionConfig().setWait(true));
     summaries = c.tableOperations().summaries(table).retrieve();
-    checkSummaries(summaries, sc1, 2, 0, 0, TOTAL_STAT, 100_000l, MIN_TIMESTAMP_STAT,
-        stats.getMin(), MAX_TIMESTAMP_STAT, stats.getMax(), DELETES_STAT, 0l);
+    checkSummaries(summaries, sc1, 2, 0, 0, TOTAL_STAT, 100_000L, MIN_TIMESTAMP_STAT,
+        stats.getMin(), MAX_TIMESTAMP_STAT, stats.getMax(), DELETES_STAT, 0L);
   }
 
   private BatchWriter writeData(final String table, Connector c)
@@ -334,12 +334,12 @@ public class SummaryIT extends AccumuloClusterHarness {
     Collection<Summary> summaries = c.tableOperations().summaries(table).withConfiguration(sc2)
         .retrieve();
     Assert.assertEquals(1, summaries.size());
-    checkSummary(summaries, sc2, "len=14", 100_000l);
+    checkSummary(summaries, sc2, "len=14", 100_000L);
 
     summaries = c.tableOperations().summaries(table).withConfiguration(sc1).retrieve();
     Assert.assertEquals(1, summaries.size());
-    checkSummary(summaries, sc1, TOTAL_STAT, 100_000l, MIN_TIMESTAMP_STAT, stats.getMin(),
-        MAX_TIMESTAMP_STAT, stats.getMax(), DELETES_STAT, 0l);
+    checkSummary(summaries, sc1, TOTAL_STAT, 100_000L, MIN_TIMESTAMP_STAT, stats.getMin(),
+        MAX_TIMESTAMP_STAT, stats.getMax(), DELETES_STAT, 0L);
 
     // retrieve a non-existant summary
     SummarizerConfiguration sc3 = SummarizerConfiguration.builder(KeySizeSummarizer.class.getName())
@@ -349,26 +349,26 @@ public class SummaryIT extends AccumuloClusterHarness {
 
     summaries = c.tableOperations().summaries(table).withConfiguration(sc1, sc2).retrieve();
     Assert.assertEquals(2, summaries.size());
-    checkSummary(summaries, sc1, TOTAL_STAT, 100_000l, MIN_TIMESTAMP_STAT, stats.getMin(),
-        MAX_TIMESTAMP_STAT, stats.getMax(), DELETES_STAT, 0l);
-    checkSummary(summaries, sc2, "len=14", 100_000l);
+    checkSummary(summaries, sc1, TOTAL_STAT, 100_000L, MIN_TIMESTAMP_STAT, stats.getMin(),
+        MAX_TIMESTAMP_STAT, stats.getMax(), DELETES_STAT, 0L);
+    checkSummary(summaries, sc2, "len=14", 100_000L);
 
     summaries = c.tableOperations().summaries(table).retrieve();
     Assert.assertEquals(2, summaries.size());
-    checkSummary(summaries, sc1, TOTAL_STAT, 100_000l, MIN_TIMESTAMP_STAT, stats.getMin(),
-        MAX_TIMESTAMP_STAT, stats.getMax(), DELETES_STAT, 0l);
-    checkSummary(summaries, sc2, "len=14", 100_000l);
+    checkSummary(summaries, sc1, TOTAL_STAT, 100_000L, MIN_TIMESTAMP_STAT, stats.getMin(),
+        MAX_TIMESTAMP_STAT, stats.getMax(), DELETES_STAT, 0L);
+    checkSummary(summaries, sc2, "len=14", 100_000L);
 
     summaries = c.tableOperations().summaries(table)
         .withMatchingConfiguration(".*BasicSummarizer \\{\\}.*").retrieve();
     Assert.assertEquals(1, summaries.size());
-    checkSummary(summaries, sc1, TOTAL_STAT, 100_000l, MIN_TIMESTAMP_STAT, stats.getMin(),
-        MAX_TIMESTAMP_STAT, stats.getMax(), DELETES_STAT, 0l);
+    checkSummary(summaries, sc1, TOTAL_STAT, 100_000L, MIN_TIMESTAMP_STAT, stats.getMin(),
+        MAX_TIMESTAMP_STAT, stats.getMax(), DELETES_STAT, 0L);
 
     summaries = c.tableOperations().summaries(table)
         .withMatchingConfiguration(".*KeySizeSummarizer \\{maxLen=512\\}.*").retrieve();
     Assert.assertEquals(1, summaries.size());
-    checkSummary(summaries, sc2, "len=14", 100_000l);
+    checkSummary(summaries, sc2, "len=14", 100_000L);
 
     summaries = c.tableOperations().summaries(table)
         .withMatchingConfiguration(".*KeySizeSummarizer \\{maxLen=256\\}.*").retrieve();
@@ -377,9 +377,9 @@ public class SummaryIT extends AccumuloClusterHarness {
     summaries = c.tableOperations().summaries(table)
         .withMatchingConfiguration(".*BasicSummarizer \\{\\}.*").withConfiguration(sc2).retrieve();
     Assert.assertEquals(2, summaries.size());
-    checkSummary(summaries, sc1, TOTAL_STAT, 100_000l, MIN_TIMESTAMP_STAT, stats.getMin(),
-        MAX_TIMESTAMP_STAT, stats.getMax(), DELETES_STAT, 0l);
-    checkSummary(summaries, sc2, "len=14", 100_000l);
+    checkSummary(summaries, sc1, TOTAL_STAT, 100_000L, MIN_TIMESTAMP_STAT, stats.getMin(),
+        MAX_TIMESTAMP_STAT, stats.getMax(), DELETES_STAT, 0L);
+    checkSummary(summaries, sc2, "len=14", 100_000L);
 
     // Ensure a bad regex fails fast.
     try {
@@ -455,8 +455,8 @@ public class SummaryIT extends AccumuloClusterHarness {
           conf -> conf.getClassName().contains("FooCounter"));
       if (summaries.size() == 1) {
         Summary summary = summaries.get(0);
-        Long foos = summary.getStatistics().getOrDefault("foos", 0l);
-        Long bars = summary.getStatistics().getOrDefault("bars", 0l);
+        Long foos = summary.getStatistics().getOrDefault("foos", 0L);
+        Long bars = summary.getStatistics().getOrDefault("bars", 0L);
 
         compact = foos > bars;
       }
@@ -507,8 +507,8 @@ public class SummaryIT extends AccumuloClusterHarness {
                                                                                     // row
           .map(r -> r.replaceAll("[0-9]+", "")) // strip numbers off row
           .collect(groupingBy(identity(), counting())); // count different row types
-      Assert.assertEquals(1l, (long) counts.getOrDefault("foo", 0l));
-      Assert.assertEquals(2l, (long) counts.getOrDefault("bar", 0l));
+      Assert.assertEquals(1L, (long) counts.getOrDefault("foo", 0L));
+      Assert.assertEquals(2L, (long) counts.getOrDefault("bar", 0L));
       Assert.assertEquals(2, counts.size());
     }
 
@@ -527,8 +527,8 @@ public class SummaryIT extends AccumuloClusterHarness {
                                                                                     // row
           .map(r -> r.replaceAll("[0-9]+", "")) // strip numbers off row
           .collect(groupingBy(identity(), counting())); // count different row types
-      Assert.assertEquals(0l, (long) counts.getOrDefault("foo", 0l));
-      Assert.assertEquals(2l, (long) counts.getOrDefault("bar", 0l));
+      Assert.assertEquals(0L, (long) counts.getOrDefault("foo", 0L));
+      Assert.assertEquals(2L, (long) counts.getOrDefault("bar", 0L));
       Assert.assertEquals(1, counts.size());
     }
   }
@@ -606,8 +606,8 @@ public class SummaryIT extends AccumuloClusterHarness {
       try {
         Summary summary = c2.tableOperations().summaries(table).retrieve().get(0);
         Assert.assertEquals(2, summary.getStatistics().size());
-        Assert.assertEquals(2l, (long) summary.getStatistics().getOrDefault("bars", 0l));
-        Assert.assertEquals(1l, (long) summary.getStatistics().getOrDefault("foos", 0l));
+        Assert.assertEquals(2L, (long) summary.getStatistics().getOrDefault("bars", 0L));
+        Assert.assertEquals(1L, (long) summary.getStatistics().getOrDefault("foos", 0L));
         break;
       } catch (AccumuloSecurityException ase) {
         UtilWaitThread.sleep(500);
@@ -683,7 +683,7 @@ public class SummaryIT extends AccumuloClusterHarness {
 
     HashMap<String,Long> expected = new HashMap<>();
     for (int i = 0; i < 10; i++) {
-      expected.put(String.format("%09x", i), i * 19l);
+      expected.put(String.format("%09x", i), i * 19L);
     }
 
     Assert.assertEquals(expected, summary.getStatistics());
@@ -731,18 +731,18 @@ public class SummaryIT extends AccumuloClusterHarness {
 
     Map<Key,Value> expected = new HashMap<>();
     try (BatchWriter bw = c.createBatchWriter(table, new BatchWriterConfig())) {
-      write(bw, expected, "order:001", "chocolate", "dark", 3l, "99kg");
-      write(bw, expected, "order:001", "chocolate", "light", 4l, "94kg");
-      write(bw, expected, "order:001", "coffee", "dark", 5l, "33kg");
-      write(bw, expected, "order:001", "broccoli", "crowns", 6l, "2kg");
-      write(bw, expected, "order:001", "cheddar", "canadian", 7l, "40kg");
+      write(bw, expected, "order:001", "chocolate", "dark", 3L, "99kg");
+      write(bw, expected, "order:001", "chocolate", "light", 4L, "94kg");
+      write(bw, expected, "order:001", "coffee", "dark", 5L, "33kg");
+      write(bw, expected, "order:001", "broccoli", "crowns", 6L, "2kg");
+      write(bw, expected, "order:001", "cheddar", "canadian", 7L, "40kg");
 
-      write(bw, expected, "order:653", "chocolate", "dark", 3l, "3kg");
-      write(bw, expected, "order:653", "chocolate", "light", 4l, "4kg");
-      write(bw, expected, "order:653", "coffee", "dark", 5l, "2kg");
-      write(bw, expected, "order:653", "broccoli", "crowns", 6l, "105kg");
-      write(bw, expected, "order:653", "cabbage", "heads", 7l, "199kg");
-      write(bw, expected, "order:653", "cheddar", "canadian", 8l, "43kg");
+      write(bw, expected, "order:653", "chocolate", "dark", 3L, "3kg");
+      write(bw, expected, "order:653", "chocolate", "light", 4L, "4kg");
+      write(bw, expected, "order:653", "coffee", "dark", 5L, "2kg");
+      write(bw, expected, "order:653", "broccoli", "crowns", 6L, "105kg");
+      write(bw, expected, "order:653", "cabbage", "heads", 7L, "199kg");
+      write(bw, expected, "order:653", "cheddar", "canadian", 8L, "43kg");
     }
 
     List<Summary> summaries = c.tableOperations().summaries(table).flush(true).retrieve();
@@ -750,15 +750,15 @@ public class SummaryIT extends AccumuloClusterHarness {
         summaries.stream().map(Summary::getSummarizerConfiguration).distinct().count());
     for (Summary summary : summaries) {
       if (summary.getSummarizerConfiguration().equals(sc1)) {
-        Map<String,Long> expectedStats = nm("c:chocolate", 4l, "c:coffee", 2l, "c:broccoli", 2l,
-            "c:cheddar", 2l, "c:cabbage", 1l, TOO_LONG_STAT, 0l, TOO_MANY_STAT, 0l, SEEN_STAT, 11l,
-            EMITTED_STAT, 11l, DELETES_IGNORED_STAT, 0l);
+        Map<String,Long> expectedStats = nm("c:chocolate", 4L, "c:coffee", 2L, "c:broccoli", 2L,
+            "c:cheddar", 2L, "c:cabbage", 1L, TOO_LONG_STAT, 0L, TOO_MANY_STAT, 0L, SEEN_STAT, 11L,
+            EMITTED_STAT, 11L, DELETES_IGNORED_STAT, 0L);
         Assert.assertEquals(expectedStats, summary.getStatistics());
         Assert.assertEquals(0, summary.getFileStatistics().getInaccurate());
         Assert.assertEquals(1, summary.getFileStatistics().getTotal());
       } else if (summary.getSummarizerConfiguration().equals(sc2)) {
-        Map<String,Long> expectedStats = nm(DELETES_STAT, 0l, TOTAL_STAT, 11l, MIN_TIMESTAMP_STAT,
-            3l, MAX_TIMESTAMP_STAT, 8l);
+        Map<String,Long> expectedStats = nm(DELETES_STAT, 0L, TOTAL_STAT, 11L, MIN_TIMESTAMP_STAT,
+            3L, MAX_TIMESTAMP_STAT, 8L);
         Assert.assertEquals(expectedStats, summary.getStatistics());
         Assert.assertEquals(0, summary.getFileStatistics().getInaccurate());
         Assert.assertEquals(1, summary.getFileStatistics().getTotal());
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/TooManyDeletesIT.java b/test/src/main/java/org/apache/accumulo/test/functional/TooManyDeletesIT.java
index da7a2f2..5c2902f 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/TooManyDeletesIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/TooManyDeletesIT.java
@@ -72,8 +72,8 @@ public class TooManyDeletesIT extends AccumuloClusterHarness {
 
     Summary summary = summaries.get(0);
 
-    Assert.assertEquals(1000l, (long) summary.getStatistics().get(DeletesSummarizer.TOTAL_STAT));
-    Assert.assertEquals(0l, (long) summary.getStatistics().get(DeletesSummarizer.DELETES_STAT));
+    Assert.assertEquals(1000L, (long) summary.getStatistics().get(DeletesSummarizer.TOTAL_STAT));
+    Assert.assertEquals(0L, (long) summary.getStatistics().get(DeletesSummarizer.DELETES_STAT));
 
     try (BatchWriter bw = c.createBatchWriter(table, new BatchWriterConfig())) {
       for (int i = 0; i < 100; i++) {
@@ -88,8 +88,8 @@ public class TooManyDeletesIT extends AccumuloClusterHarness {
 
     summary = summaries.get(0);
 
-    Assert.assertEquals(1100l, (long) summary.getStatistics().get(DeletesSummarizer.TOTAL_STAT));
-    Assert.assertEquals(100l, (long) summary.getStatistics().get(DeletesSummarizer.DELETES_STAT));
+    Assert.assertEquals(1100L, (long) summary.getStatistics().get(DeletesSummarizer.TOTAL_STAT));
+    Assert.assertEquals(100L, (long) summary.getStatistics().get(DeletesSummarizer.DELETES_STAT));
 
     try (BatchWriter bw = c.createBatchWriter(table, new BatchWriterConfig())) {
       for (int i = 100; i < 300; i++) {
diff --git a/test/src/main/java/org/apache/accumulo/test/performance/ContinuousIngest.java b/test/src/main/java/org/apache/accumulo/test/performance/ContinuousIngest.java
index ba36210..ba356f4 100644
--- a/test/src/main/java/org/apache/accumulo/test/performance/ContinuousIngest.java
+++ b/test/src/main/java/org/apache/accumulo/test/performance/ContinuousIngest.java
@@ -218,7 +218,7 @@ public class ContinuousIngest {
   }
 
   public static final long genLong(long min, long max, Random r) {
-    return ((r.nextLong() & 0x7fffffffffffffffl) % (max - min)) + min;
+    return ((r.nextLong() & 0x7fffffffffffffffL) % (max - min)) + min;
   }
 
   static final byte[] genRow(long min, long max, Random r) {
diff --git a/test/src/main/java/org/apache/accumulo/test/performance/metadata/MetadataBatchScanTest.java b/test/src/main/java/org/apache/accumulo/test/performance/metadata/MetadataBatchScanTest.java
index a769692..833a95a 100644
--- a/test/src/main/java/org/apache/accumulo/test/performance/metadata/MetadataBatchScanTest.java
+++ b/test/src/main/java/org/apache/accumulo/test/performance/metadata/MetadataBatchScanTest.java
@@ -74,7 +74,7 @@ public class MetadataBatchScanTest {
     Random r = new Random(42);
 
     while (splits.size() < 99999) {
-      splits.add((r.nextLong() & 0x7fffffffffffffffl) % 1000000000000l);
+      splits.add((r.nextLong() & 0x7fffffffffffffffL) % 1000000000000L);
     }
 
     Table.ID tid = Table.ID.of("8");
diff --git a/test/src/main/java/org/apache/accumulo/test/replication/KerberosReplicationIT.java b/test/src/main/java/org/apache/accumulo/test/replication/KerberosReplicationIT.java
index abafe4f..1eb27ec 100644
--- a/test/src/main/java/org/apache/accumulo/test/replication/KerberosReplicationIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/replication/KerberosReplicationIT.java
@@ -207,7 +207,7 @@ public class KerberosReplicationIT extends AccumuloITBase {
 
         // Write some data to table1
         BatchWriter bw = primaryConn.createBatchWriter(primaryTable1, new BatchWriterConfig());
-        long masterTable1Records = 0l;
+        long masterTable1Records = 0L;
         for (int rows = 0; rows < 2500; rows++) {
           Mutation m = new Mutation(primaryTable1 + rows);
           for (int cols = 0; cols < 100; cols++) {
@@ -239,7 +239,7 @@ public class KerberosReplicationIT extends AccumuloITBase {
         log.info("Waiting for {} for {}", filesFor1, primaryTable1);
         primaryConn.replicationOperations().drain(primaryTable1, filesFor1);
 
-        long countTable = 0l;
+        long countTable = 0L;
         for (Entry<Key,Value> entry : peerConn.createScanner(peerTable1, Authorizations.EMPTY)) {
           countTable++;
           Assert.assertTrue("Found unexpected key-value" + entry.getKey().toStringNoTruncate() + " "
diff --git a/test/src/main/java/org/apache/accumulo/test/replication/MultiInstanceReplicationIT.java b/test/src/main/java/org/apache/accumulo/test/replication/MultiInstanceReplicationIT.java
index cfd0794..51275c3 100644
--- a/test/src/main/java/org/apache/accumulo/test/replication/MultiInstanceReplicationIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/replication/MultiInstanceReplicationIT.java
@@ -408,7 +408,7 @@ public class MultiInstanceReplicationIT extends ConfigurableMacBase {
 
       // Write some data to table1
       BatchWriter bw = connMaster.createBatchWriter(masterTable1, new BatchWriterConfig());
-      long masterTable1Records = 0l;
+      long masterTable1Records = 0L;
       for (int rows = 0; rows < 2500; rows++) {
         Mutation m = new Mutation(masterTable1 + rows);
         for (int cols = 0; cols < 100; cols++) {
@@ -423,7 +423,7 @@ public class MultiInstanceReplicationIT extends ConfigurableMacBase {
 
       // Write some data to table2
       bw = connMaster.createBatchWriter(masterTable2, new BatchWriterConfig());
-      long masterTable2Records = 0l;
+      long masterTable2Records = 0L;
       for (int rows = 0; rows < 2500; rows++) {
         Mutation m = new Mutation(masterTable2 + rows);
         for (int cols = 0; cols < 100; cols++) {
@@ -467,7 +467,7 @@ public class MultiInstanceReplicationIT extends ConfigurableMacBase {
       log.info("Waiting for {} for {}", filesFor2, masterTable2);
       connMaster.replicationOperations().drain(masterTable2, filesFor2);
 
-      long countTable = 0l;
+      long countTable = 0L;
       for (Entry<Key,Value> entry : connPeer.createScanner(peerTable1, Authorizations.EMPTY)) {
         countTable++;
         Assert.assertTrue("Found unexpected key-value" + entry.getKey().toStringNoTruncate() + " "
@@ -477,7 +477,7 @@ public class MultiInstanceReplicationIT extends ConfigurableMacBase {
       log.info("Found {} records in {}", countTable, peerTable1);
       Assert.assertEquals(masterTable1Records, countTable);
 
-      countTable = 0l;
+      countTable = 0L;
       for (Entry<Key,Value> entry : connPeer.createScanner(peerTable2, Authorizations.EMPTY)) {
         countTable++;
         Assert.assertTrue("Found unexpected key-value" + entry.getKey().toStringNoTruncate() + " "
@@ -744,7 +744,7 @@ public class MultiInstanceReplicationIT extends ConfigurableMacBase {
       // We have to wait for the master to assign the replication work, a local tserver to process
       // it, and then the remote tserver to replay it
       // Be cautious in how quickly we assert that the data is present on the peer
-      long countTable = 0l;
+      long countTable = 0L;
       for (int i = 0; i < 10; i++) {
         for (Entry<Key,Value> entry : connPeer.createScanner(peerTable1, Authorizations.EMPTY)) {
           countTable++;
@@ -754,7 +754,7 @@ public class MultiInstanceReplicationIT extends ConfigurableMacBase {
 
         log.info("Found {} records in {}", countTable, peerTable1);
 
-        if (0l == countTable) {
+        if (0L == countTable) {
           Thread.sleep(5000);
         } else {
           break;
@@ -768,7 +768,7 @@ public class MultiInstanceReplicationIT extends ConfigurableMacBase {
       // it, and then the remote tserver to replay it
       // Be cautious in how quickly we assert that the data is present on the peer
       for (int i = 0; i < 10; i++) {
-        countTable = 0l;
+        countTable = 0L;
         for (Entry<Key,Value> entry : connPeer.createScanner(peerTable2, Authorizations.EMPTY)) {
           countTable++;
           Assert.assertTrue("Found unexpected key-value" + entry.getKey().toStringNoTruncate() + " "
@@ -777,7 +777,7 @@ public class MultiInstanceReplicationIT extends ConfigurableMacBase {
 
         log.info("Found {} records in {}", countTable, peerTable2);
 
-        if (0l == countTable) {
+        if (0L == countTable) {
           Thread.sleep(5000);
         } else {
           break;
diff --git a/test/src/main/java/org/apache/accumulo/test/replication/RemoveCompleteReplicationRecordsIT.java b/test/src/main/java/org/apache/accumulo/test/replication/RemoveCompleteReplicationRecordsIT.java
index fc6a0ea..9662967 100644
--- a/test/src/main/java/org/apache/accumulo/test/replication/RemoveCompleteReplicationRecordsIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/replication/RemoveCompleteReplicationRecordsIT.java
@@ -196,7 +196,7 @@ public class RemoveCompleteReplicationRecordsIT extends ConfigurableMacBase {
       bs.addScanIterator(cfg);
 
       try {
-        Assert.assertEquals(0l, rcrr.removeCompleteRecords(conn, bs, replBw));
+        Assert.assertEquals(0L, rcrr.removeCompleteRecords(conn, bs, replBw));
       } finally {
         replBw.close();
       }
@@ -282,7 +282,7 @@ public class RemoveCompleteReplicationRecordsIT extends ConfigurableMacBase {
       bs.addScanIterator(cfg);
 
       try {
-        Assert.assertEquals(4l, rcrr.removeCompleteRecords(conn, bs, replBw));
+        Assert.assertEquals(4L, rcrr.removeCompleteRecords(conn, bs, replBw));
       } finally {
         replBw.close();
       }
@@ -345,7 +345,7 @@ public class RemoveCompleteReplicationRecordsIT extends ConfigurableMacBase {
       bs.addScanIterator(cfg);
 
       try {
-        Assert.assertEquals(0l, rcrr.removeCompleteRecords(conn, bs, replBw));
+        Assert.assertEquals(0L, rcrr.removeCompleteRecords(conn, bs, replBw));
       } finally {
         replBw.close();
       }
diff --git a/test/src/main/java/org/apache/accumulo/test/replication/ReplicationIT.java b/test/src/main/java/org/apache/accumulo/test/replication/ReplicationIT.java
index 26bef9c..3a3eed3 100644
--- a/test/src/main/java/org/apache/accumulo/test/replication/ReplicationIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/replication/ReplicationIT.java
@@ -116,7 +116,7 @@ import com.google.protobuf.TextFormat;
  */
 public class ReplicationIT extends ConfigurableMacBase {
   private static final Logger log = LoggerFactory.getLogger(ReplicationIT.class);
-  private static final long MILLIS_BETWEEN_REPLICATION_TABLE_ONLINE_CHECKS = 5000l;
+  private static final long MILLIS_BETWEEN_REPLICATION_TABLE_ONLINE_CHECKS = 5000L;
 
   @Override
   public int defaultTimeoutSeconds() {
@@ -1196,7 +1196,7 @@ public class ReplicationIT extends ConfigurableMacBase {
           s.setRange(Range.prefix(ReplicationSection.getRowPrefix()));
           Iterator<Entry<Key,Value>> iter = s.iterator();
 
-          long recordsFound = 0l;
+          long recordsFound = 0L;
           while (allClosed && iter.hasNext()) {
             Entry<Key,Value> entry = iter.next();
             String wal = entry.getKey().getRow().toString();
@@ -1233,7 +1233,7 @@ public class ReplicationIT extends ConfigurableMacBase {
         try (Scanner s = ReplicationTable.getScanner(conn)) {
           Iterator<Entry<Key,Value>> iter = s.iterator();
 
-          long recordsFound = 0l;
+          long recordsFound = 0L;
           while (allClosed && iter.hasNext()) {
             Entry<Key,Value> entry = iter.next();
             String wal = entry.getKey().getRow().toString();
diff --git a/test/src/main/java/org/apache/accumulo/test/replication/UnorderedWorkAssignerIT.java b/test/src/main/java/org/apache/accumulo/test/replication/UnorderedWorkAssignerIT.java
index 15d928a..5f6d2be 100644
--- a/test/src/main/java/org/apache/accumulo/test/replication/UnorderedWorkAssignerIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/replication/UnorderedWorkAssignerIT.java
@@ -132,9 +132,9 @@ public class UnorderedWorkAssignerIT extends ConfigurableMacBase {
             + target2.getSourceTableId();
 
     Status.Builder builder = Status.newBuilder().setBegin(0).setEnd(0).setInfiniteEnd(true)
-        .setClosed(false).setCreatedTime(5l);
+        .setClosed(false).setCreatedTime(5L);
     Status status1 = builder.build();
-    builder.setCreatedTime(10l);
+    builder.setCreatedTime(10L);
     Status status2 = builder.build();
 
     // Create two mutations, both of which need replication work done
diff --git a/test/src/main/java/org/apache/accumulo/test/replication/UnorderedWorkAssignerReplicationIT.java b/test/src/main/java/org/apache/accumulo/test/replication/UnorderedWorkAssignerReplicationIT.java
index fd43596..9c0cb46 100644
--- a/test/src/main/java/org/apache/accumulo/test/replication/UnorderedWorkAssignerReplicationIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/replication/UnorderedWorkAssignerReplicationIT.java
@@ -407,7 +407,7 @@ public class UnorderedWorkAssignerReplicationIT extends ConfigurableMacBase {
 
       // Write some data to table1
       BatchWriter bw = connMaster.createBatchWriter(masterTable1, new BatchWriterConfig());
-      long masterTable1Records = 0l;
+      long masterTable1Records = 0L;
       for (int rows = 0; rows < 2500; rows++) {
         Mutation m = new Mutation(masterTable1 + rows);
         for (int cols = 0; cols < 100; cols++) {
@@ -422,7 +422,7 @@ public class UnorderedWorkAssignerReplicationIT extends ConfigurableMacBase {
 
       // Write some data to table2
       bw = connMaster.createBatchWriter(masterTable2, new BatchWriterConfig());
-      long masterTable2Records = 0l;
+      long masterTable2Records = 0L;
       for (int rows = 0; rows < 2500; rows++) {
         Mutation m = new Mutation(masterTable2 + rows);
         for (int cols = 0; cols < 100; cols++) {
@@ -462,9 +462,9 @@ public class UnorderedWorkAssignerReplicationIT extends ConfigurableMacBase {
       log.info("Waiting for {} for {}", filesFor2, masterTable2);
       connMaster.replicationOperations().drain(masterTable2, filesFor2);
 
-      long countTable = 0l;
+      long countTable = 0L;
       for (int i = 0; i < 5; i++) {
-        countTable = 0l;
+        countTable = 0L;
         for (Entry<Key,Value> entry : connPeer.createScanner(peerTable1, Authorizations.EMPTY)) {
           countTable++;
           Assert.assertTrue("Found unexpected key-value" + entry.getKey().toStringNoTruncate() + " "
@@ -482,7 +482,7 @@ public class UnorderedWorkAssignerReplicationIT extends ConfigurableMacBase {
       Assert.assertEquals(masterTable1Records, countTable);
 
       for (int i = 0; i < 5; i++) {
-        countTable = 0l;
+        countTable = 0L;
         for (Entry<Key,Value> entry : connPeer.createScanner(peerTable2, Authorizations.EMPTY)) {
           countTable++;
           Assert.assertTrue("Found unexpected key-value" + entry.getKey().toStringNoTruncate() + " "
@@ -750,11 +750,11 @@ public class UnorderedWorkAssignerReplicationIT extends ConfigurableMacBase {
 
       Assert.assertNotEquals(0, fullyReplicated);
 
-      long countTable = 0l;
+      long countTable = 0L;
 
       // Check a few times
       for (int i = 0; i < 10; i++) {
-        countTable = 0l;
+        countTable = 0L;
         for (Entry<Key,Value> entry : connPeer.createScanner(peerTable1, Authorizations.EMPTY)) {
           countTable++;
           Assert.assertTrue("Found unexpected key-value" + entry.getKey().toStringNoTruncate() + " "
@@ -770,7 +770,7 @@ public class UnorderedWorkAssignerReplicationIT extends ConfigurableMacBase {
       Assert.assertTrue("Did not find any records in " + peerTable1 + " on peer", countTable > 0);
 
       for (int i = 0; i < 10; i++) {
-        countTable = 0l;
+        countTable = 0L;
         for (Entry<Key,Value> entry : connPeer.createScanner(peerTable2, Authorizations.EMPTY)) {
           countTable++;
           Assert.assertTrue("Found unexpected key-value" + entry.getKey().toStringNoTruncate() + " "
diff --git a/test/src/main/java/org/apache/accumulo/test/replication/UnusedWalDoesntCloseReplicationStatusIT.java b/test/src/main/java/org/apache/accumulo/test/replication/UnusedWalDoesntCloseReplicationStatusIT.java
index 43c0482..a2025bf 100644
--- a/test/src/main/java/org/apache/accumulo/test/replication/UnusedWalDoesntCloseReplicationStatusIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/replication/UnusedWalDoesntCloseReplicationStatusIT.java
@@ -118,7 +118,7 @@ public class UnusedWalDoesntCloseReplicationStatusIT extends ConfigurableMacBase
 
     key.event = LogEvents.DEFINE_TABLET;
     key.tablet = new KeyExtent(Table.ID.of(Integer.toString(fakeTableId)), null, null);
-    key.seq = 1l;
+    key.seq = 1L;
     key.tid = 1;
 
     key.write(dos);

-- 
To stop receiving notification emails like this one, please contact
ctubbsii@apache.org.

Mime
View raw message