This is an automated email from the ASF dual-hosted git repository.
ctubbsii pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/accumulo.git
The following commit(s) were added to refs/heads/main by this push:
new b570aec Use Java7 underscore instead of multiplying by 1000 (#2512)
b570aec is described below
commit b570aecdd82a353f10143f8c5951a282753cce1a
Author: Kylian Meulin <59285425+kikimanj...@users.noreply.github.com>
AuthorDate: Mon Feb 21 06:57:18 2022 +0100
Use Java7 underscore instead of multiplying by 1000 (#2512)
Making use of the new Java 7 feature to use underscores to separate
groups of digits in a numeric literal, replace several base-10
multiplications.
Replace `n * 1000` with `n_000` and `n * 1000 * 1000` with `n_000_000`
Co-authored-by: Jeffrey Manno <jeffreymann...@gmail.com>
---
.../core/clientImpl/ThriftTransportPool.java | 2 +-
.../spi/balancer/HostRegexTableLoadBalancer.java | 4 ++--
.../core/spi/balancer/SimpleLoadBalancer.java | 2 +-
.../core/spi/balancer/TableLoadBalancer.java | 2 +-
.../apache/accumulo/fate/zookeeper/ZooSession.java | 2 +-
.../accumulo/core/client/BatchWriterConfigTest.java | 4 ++--
.../core/clientImpl/ThriftTransportKeyTest.java | 4 ++--
.../core/file/rfile/bcfile/CompressionTest.java | 6 +++---
.../accumulo/core/rpc/TTimeoutTransportTest.java | 4 ++--
.../miniclusterImpl/MiniAccumuloConfigImpl.java | 2 +-
.../org/apache/accumulo/server/ServerContext.java | 4 ++--
.../apache/accumulo/server/client/BulkImporter.java | 4 ++--
.../accumulo/server/manager/LiveTServerSet.java | 2 +-
.../server/master/balancer/DefaultLoadBalancer.java | 4 ++--
.../master/balancer/HostRegexTableLoadBalancer.java | 4 ++--
.../server/master/balancer/TableLoadBalancer.java | 2 +-
.../org/apache/accumulo/server/rpc/TServerUtils.java | 2 +-
.../apache/accumulo/server/util/ListInstances.java | 2 +-
.../AuthenticationTokenKeyManagerTest.java | 14 +++++++-------
.../AuthenticationTokenSecretManagerTest.java | 20 ++++++++++----------
.../delegation/ZooAuthenticationKeyWatcherTest.java | 2 +-
.../org/apache/accumulo/compactor/Compactor.java | 2 +-
.../java/org/apache/accumulo/monitor/Monitor.java | 2 +-
.../apache/accumulo/tserver/AssignmentHandler.java | 2 +-
.../apache/accumulo/tserver/ThriftClientHandler.java | 2 +-
.../memory/LargestFirstMemoryManagerTest.java | 6 +++---
.../vfs/AccumuloReloadingVFSClassLoader.java | 2 +-
.../apache/accumulo/test/GarbageCollectWALIT.java | 2 +-
.../accumulo/test/InterruptibleScannersIT.java | 2 +-
.../org/apache/accumulo/test/LargeSplitRowIT.java | 8 ++++----
.../apache/accumulo/test/ScanFlushWithTimeIT.java | 2 +-
.../compaction/ConfigurableMajorCompactionIT.java | 2 +-
.../accumulo/test/compaction/SplitCancelsMajCIT.java | 2 +-
.../accumulo/test/functional/BackupManagerIT.java | 2 +-
.../test/functional/BalanceAfterCommsFailureIT.java | 4 ++--
.../BalanceInPresenceOfOfflineTableIT.java | 2 +-
.../accumulo/test/functional/ClassLoaderIT.java | 2 +-
.../accumulo/test/functional/ConstraintIT.java | 2 +-
.../accumulo/test/functional/HalfDeadTServerIT.java | 2 +-
.../apache/accumulo/test/functional/KerberosIT.java | 2 +-
.../accumulo/test/functional/KerberosRenewalIT.java | 8 ++++----
41 files changed, 75 insertions(+), 75 deletions(-)
diff --git
a/core/src/main/java/org/apache/accumulo/core/clientImpl/ThriftTransportPool.java
b/core/src/main/java/org/apache/accumulo/core/clientImpl/ThriftTransportPool.java
index 32ffb99..49641e2 100644
---
a/core/src/main/java/org/apache/accumulo/core/clientImpl/ThriftTransportPool.java
+++
b/core/src/main/java/org/apache/accumulo/core/clientImpl/ThriftTransportPool.java
@@ -371,7 +371,7 @@ public class ThriftTransportPool {
private static final Logger log =
LoggerFactory.getLogger(ThriftTransportPool.class);
private static final Long ERROR_THRESHOLD = 20L;
- private static final int STUCK_THRESHOLD = 2 * 60 * 1000;
+ private static final int STUCK_THRESHOLD = 2 * 60_000;
private static class CachedConnection {
diff --git
a/core/src/main/java/org/apache/accumulo/core/spi/balancer/HostRegexTableLoadBalancer.java
b/core/src/main/java/org/apache/accumulo/core/spi/balancer/HostRegexTableLoadBalancer.java
index 4d97787..d830ee8 100644
---
a/core/src/main/java/org/apache/accumulo/core/spi/balancer/HostRegexTableLoadBalancer.java
+++
b/core/src/main/java/org/apache/accumulo/core/spi/balancer/HostRegexTableLoadBalancer.java
@@ -175,7 +175,7 @@ public class HostRegexTableLoadBalancer extends
TableLoadBalancer {
}
}
- private static final long ONE_HOUR = 60 * 60 * 1000;
+ private static final long ONE_HOUR = 60 * 60_000;
private static final Set<TabletId> EMPTY_MIGRATIONS = Collections.emptySet();
private volatile long lastOOBCheck = System.currentTimeMillis();
private Map<String,SortedMap<TabletServerId,TServerStatus>> pools = new
HashMap<>();
@@ -376,7 +376,7 @@ public class HostRegexTableLoadBalancer extends
TableLoadBalancer {
@Override
public long balance(BalanceParameters params) {
- long minBalanceTime = 20 * 1000;
+ long minBalanceTime = 20_000;
// Iterate over the tables and balance each of them
Map<String,TableId> tableIdMap = environment.getTableIdMap();
Map<TableId,String> tableIdToTableName = tableIdMap.entrySet().stream()
diff --git
a/core/src/main/java/org/apache/accumulo/core/spi/balancer/SimpleLoadBalancer.java
b/core/src/main/java/org/apache/accumulo/core/spi/balancer/SimpleLoadBalancer.java
index 683f6cc..96aea38 100644
---
a/core/src/main/java/org/apache/accumulo/core/spi/balancer/SimpleLoadBalancer.java
+++
b/core/src/main/java/org/apache/accumulo/core/spi/balancer/SimpleLoadBalancer.java
@@ -380,7 +380,7 @@ public class SimpleLoadBalancer implements TabletBalancer {
problemReporter.reportProblem(outstandingMigrationsProblem);
}
}
- return 5 * 1000;
+ return 5_000;
}
}
diff --git
a/core/src/main/java/org/apache/accumulo/core/spi/balancer/TableLoadBalancer.java
b/core/src/main/java/org/apache/accumulo/core/spi/balancer/TableLoadBalancer.java
index 02aef99..c3fe690 100644
---
a/core/src/main/java/org/apache/accumulo/core/spi/balancer/TableLoadBalancer.java
+++
b/core/src/main/java/org/apache/accumulo/core/spi/balancer/TableLoadBalancer.java
@@ -120,7 +120,7 @@ public class TableLoadBalancer implements TabletBalancer {
@Override
public long balance(BalanceParameters params) {
- long minBalanceTime = 5 * 1000;
+ long minBalanceTime = 5_000;
// Iterate over the tables and balance each of them
for (TableId tableId : environment.getTableIdMap().values()) {
ArrayList<TabletMigration> newMigrations = new ArrayList<>();
diff --git
a/core/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java
b/core/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java
index f5221aa..76f608a 100644
--- a/core/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java
+++ b/core/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java
@@ -115,7 +115,7 @@ public class ZooSession {
*/
static ZooKeeper connect(String host, int timeout, String scheme, byte[]
auth, Watcher watcher) {
final int TIME_BETWEEN_CONNECT_CHECKS_MS = 100;
- int connectTimeWait = Math.min(10 * 1000, timeout);
+ int connectTimeWait = Math.min(10_000, timeout);
boolean tryAgain = true;
long sleepTime = 100;
ZooKeeper zooKeeper = null;
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 7a43795..9d71dcf 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
@@ -62,8 +62,8 @@ public class BatchWriterConfigTest {
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(22 * 60 * 60_000L,
bwConfig.getMaxLatency(TimeUnit.MILLISECONDS));
+ assertEquals(33 * 24 * 60 * 60_000L,
bwConfig.getTimeout(TimeUnit.MILLISECONDS));
assertEquals(42, bwConfig.getMaxWriteThreads());
assertEquals(Durability.NONE, bwConfig.getDurability());
}
diff --git
a/core/src/test/java/org/apache/accumulo/core/clientImpl/ThriftTransportKeyTest.java
b/core/src/test/java/org/apache/accumulo/core/clientImpl/ThriftTransportKeyTest.java
index 62eeb73..95abe2d 100644
---
a/core/src/test/java/org/apache/accumulo/core/clientImpl/ThriftTransportKeyTest.java
+++
b/core/src/test/java/org/apache/accumulo/core/clientImpl/ThriftTransportKeyTest.java
@@ -77,7 +77,7 @@ public class ThriftTransportKeyTest {
try {
assertThrows(RuntimeException.class,
- () -> new ThriftTransportKey(HostAndPort.fromParts("localhost",
9999), 120 * 1000,
+ () -> new ThriftTransportKey(HostAndPort.fromParts("localhost",
9999), 120_000,
clientCtx));
} finally {
verify(clientCtx);
@@ -137,7 +137,7 @@ public class ThriftTransportKeyTest {
replay(clientCtx);
ThriftTransportKey ttk =
- new ThriftTransportKey(HostAndPort.fromParts("localhost", 9999), 120 *
1000, clientCtx);
+ new ThriftTransportKey(HostAndPort.fromParts("localhost", 9999),
120_000, clientCtx);
assertEquals("Normal ThriftTransportKey doesn't equal itself", ttk, ttk);
}
diff --git
a/core/src/test/java/org/apache/accumulo/core/file/rfile/bcfile/CompressionTest.java
b/core/src/test/java/org/apache/accumulo/core/file/rfile/bcfile/CompressionTest.java
index bb76d39..84443c8 100644
---
a/core/src/test/java/org/apache/accumulo/core/file/rfile/bcfile/CompressionTest.java
+++
b/core/src/test/java/org/apache/accumulo/core/file/rfile/bcfile/CompressionTest.java
@@ -157,7 +157,7 @@ public class CompressionTest {
}
}
- @Test(timeout = 60 * 1000)
+ @Test(timeout = 60_000)
public void testManyStartNotNull() throws InterruptedException,
ExecutionException {
for (final Algorithm al : Algorithm.values()) {
@@ -199,7 +199,7 @@ public class CompressionTest {
}
// don't start until we have created the codec
- @Test(timeout = 60 * 1000)
+ @Test(timeout = 60_000)
public void testManyDontStartUntilThread() throws InterruptedException,
ExecutionException {
for (final Algorithm al : Algorithm.values()) {
@@ -235,7 +235,7 @@ public class CompressionTest {
}
- @Test(timeout = 60 * 1000)
+ @Test(timeout = 60_000)
public void testThereCanBeOnlyOne() throws InterruptedException,
ExecutionException {
for (final Algorithm al : Algorithm.values()) {
diff --git
a/core/src/test/java/org/apache/accumulo/core/rpc/TTimeoutTransportTest.java
b/core/src/test/java/org/apache/accumulo/core/rpc/TTimeoutTransportTest.java
index c024c4a..ad7fac5 100644
--- a/core/src/test/java/org/apache/accumulo/core/rpc/TTimeoutTransportTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/rpc/TTimeoutTransportTest.java
@@ -75,7 +75,7 @@ public class TTimeoutTransportTest {
@Test
public void testFailedInputStreamClosesSocket() throws IOException {
- long timeout = 2 * 60 * 1000; // 2 mins
+ long timeout = 2 * 60_000; // 2 mins
SocketAddress addr = createMock(SocketAddress.class);
Socket s = createMock(Socket.class);
TTimeoutTransport timeoutTransport =
createMockBuilder(TTimeoutTransport.class)
@@ -105,7 +105,7 @@ public class TTimeoutTransportTest {
@Test
public void testFailedOutputStreamClosesSocket() throws IOException {
- long timeout = 2 * 60 * 1000; // 2 mins
+ long timeout = 2 * 60_000; // 2 mins
SocketAddress addr = createMock(SocketAddress.class);
Socket s = createMock(Socket.class);
InputStream is = createMock(InputStream.class);
diff --git
a/minicluster/src/main/java/org/apache/accumulo/miniclusterImpl/MiniAccumuloConfigImpl.java
b/minicluster/src/main/java/org/apache/accumulo/miniclusterImpl/MiniAccumuloConfigImpl.java
index 8f51e6c..cf72054 100644
---
a/minicluster/src/main/java/org/apache/accumulo/miniclusterImpl/MiniAccumuloConfigImpl.java
+++
b/minicluster/src/main/java/org/apache/accumulo/miniclusterImpl/MiniAccumuloConfigImpl.java
@@ -74,7 +74,7 @@ public class MiniAccumuloConfigImpl {
private int zooKeeperPort = 0;
private int configuredZooKeeperPort = 0;
- private long zooKeeperStartupTime = 20 * 1000;
+ private long zooKeeperStartupTime = 20_000;
private String existingZooKeepers;
private long defaultMemorySize = 256 * 1024 * 1024;
diff --git
a/server/base/src/main/java/org/apache/accumulo/server/ServerContext.java
b/server/base/src/main/java/org/apache/accumulo/server/ServerContext.java
index a7ebfae..a225852 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/ServerContext.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/ServerContext.java
@@ -358,7 +358,7 @@ public class ServerContext extends ClientContext {
log.info("Backing off due to failure; current sleep period is {}
seconds", sleep / 1000.);
sleepUninterruptibly(sleep, TimeUnit.MILLISECONDS);
/* Back off to give transient failures more time to clear. */
- sleep = Math.min(60 * 1000, sleep * 2);
+ sleep = Math.min(60_000, sleep * 2);
}
log.info("Connected to HDFS");
}
@@ -434,7 +434,7 @@ public class ServerContext extends ClientContext {
} catch (Exception t) {
log.error("", t);
}
- }, 1000, 10 * 60 * 1000, TimeUnit.MILLISECONDS);
+ }, 1000, 10 * 60_000, TimeUnit.MILLISECONDS);
}
/**
diff --git
a/server/base/src/main/java/org/apache/accumulo/server/client/BulkImporter.java
b/server/base/src/main/java/org/apache/accumulo/server/client/BulkImporter.java
index 314707d..2737cda 100644
---
a/server/base/src/main/java/org/apache/accumulo/server/client/BulkImporter.java
+++
b/server/base/src/main/java/org/apache/accumulo/server/client/BulkImporter.java
@@ -174,9 +174,9 @@ public class BulkImporter {
for (Entry<Path,List<KeyExtent>> entry : assignmentFailures.entrySet())
failureCount.put(entry.getKey(), 1);
- long sleepTime = 2 * 1000;
+ long sleepTime = 2_000;
while (!assignmentFailures.isEmpty()) {
- sleepTime = Math.min(sleepTime * 2, 60 * 1000);
+ sleepTime = Math.min(sleepTime * 2, 60_000);
locator.invalidateCache();
// assumption about assignment failures is that it caused by a split
// happening or a missing location
diff --git
a/server/base/src/main/java/org/apache/accumulo/server/manager/LiveTServerSet.java
b/server/base/src/main/java/org/apache/accumulo/server/manager/LiveTServerSet.java
index 440ab77..c58069f 100644
---
a/server/base/src/main/java/org/apache/accumulo/server/manager/LiveTServerSet.java
+++
b/server/base/src/main/java/org/apache/accumulo/server/manager/LiveTServerSet.java
@@ -310,7 +310,7 @@ public class LiveTServerSet implements Watcher {
Long firstSeen = locklessServers.get(zPath);
if (firstSeen == null) {
locklessServers.put(zPath, System.currentTimeMillis());
- } else if (System.currentTimeMillis() - firstSeen > 10 * 60 * 1000) {
+ } else if (System.currentTimeMillis() - firstSeen > 10 * 60_000) {
deleteServerNode(path + "/" + zPath);
locklessServers.remove(zPath);
}
diff --git
a/server/base/src/main/java/org/apache/accumulo/server/master/balancer/DefaultLoadBalancer.java
b/server/base/src/main/java/org/apache/accumulo/server/master/balancer/DefaultLoadBalancer.java
index 3f681ff..e60bb67 100644
---
a/server/base/src/main/java/org/apache/accumulo/server/master/balancer/DefaultLoadBalancer.java
+++
b/server/base/src/main/java/org/apache/accumulo/server/master/balancer/DefaultLoadBalancer.java
@@ -352,13 +352,13 @@ public class DefaultLoadBalancer extends TabletBalancer {
if (migrations.isEmpty()) {
resetBalancerErrors();
if (getMigrations(current, migrationsOut))
- return 1 * 1000;
+ return 1_000;
} else {
outstandingMigrations.migrations = migrations;
constraintNotMet(outstandingMigrations);
}
}
- return 5 * 1000;
+ return 5_000;
}
}
diff --git
a/server/base/src/main/java/org/apache/accumulo/server/master/balancer/HostRegexTableLoadBalancer.java
b/server/base/src/main/java/org/apache/accumulo/server/master/balancer/HostRegexTableLoadBalancer.java
index 81167a8..9cfce8c 100644
---
a/server/base/src/main/java/org/apache/accumulo/server/master/balancer/HostRegexTableLoadBalancer.java
+++
b/server/base/src/main/java/org/apache/accumulo/server/master/balancer/HostRegexTableLoadBalancer.java
@@ -176,7 +176,7 @@ public class HostRegexTableLoadBalancer extends
TableLoadBalancer {
}
}
- private static final long ONE_HOUR = 60 * 60 * 1000;
+ private static final long ONE_HOUR = 60 * 60_000;
private static final Set<KeyExtent> EMPTY_MIGRATIONS =
Collections.emptySet();
private volatile long lastOOBCheck = System.currentTimeMillis();
private Map<String,SortedMap<TServerInstance,TabletServerStatus>> pools =
new HashMap<>();
@@ -384,7 +384,7 @@ public class HostRegexTableLoadBalancer extends
TableLoadBalancer {
@Override
public long balance(SortedMap<TServerInstance,TabletServerStatus> current,
Set<KeyExtent> migrations, List<TabletMigration> migrationsOut) {
- long minBalanceTime = 20 * 1000;
+ long minBalanceTime = 20_000;
// Iterate over the tables and balance each of them
TableOperations t = getTableOperations();
if (t == null) {
diff --git
a/server/base/src/main/java/org/apache/accumulo/server/master/balancer/TableLoadBalancer.java
b/server/base/src/main/java/org/apache/accumulo/server/master/balancer/TableLoadBalancer.java
index ca7bfd9..7f02e6c 100644
---
a/server/base/src/main/java/org/apache/accumulo/server/master/balancer/TableLoadBalancer.java
+++
b/server/base/src/main/java/org/apache/accumulo/server/master/balancer/TableLoadBalancer.java
@@ -143,7 +143,7 @@ public class TableLoadBalancer extends TabletBalancer {
@Override
public long balance(SortedMap<TServerInstance,TabletServerStatus> current,
Set<KeyExtent> migrations, List<TabletMigration> migrationsOut) {
- long minBalanceTime = 5 * 1000;
+ long minBalanceTime = 5_000;
// Iterate over the tables and balance each of them
TableOperations t = getTableOperations();
if (t == null)
diff --git
a/server/base/src/main/java/org/apache/accumulo/server/rpc/TServerUtils.java
b/server/base/src/main/java/org/apache/accumulo/server/rpc/TServerUtils.java
index f4bc078..eeccf7e 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/rpc/TServerUtils.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/rpc/TServerUtils.java
@@ -158,7 +158,7 @@ public class TServerUtils {
timeBetweenThreadChecks =
config.getTimeInMillis(timeBetweenThreadChecksProperty);
}
- long maxMessageSize = 10 * 1000 * 1000;
+ long maxMessageSize = 10_000_000;
if (maxMessageSizeProperty != null) {
maxMessageSize = config.getAsBytes(maxMessageSizeProperty);
}
diff --git
a/server/base/src/main/java/org/apache/accumulo/server/util/ListInstances.java
b/server/base/src/main/java/org/apache/accumulo/server/util/ListInstances.java
index d516539..014eb8f 100644
---
a/server/base/src/main/java/org/apache/accumulo/server/util/ListInstances.java
+++
b/server/base/src/main/java/org/apache/accumulo/server/util/ListInstances.java
@@ -48,7 +48,7 @@ public class ListInstances {
private static final int UUID_WIDTH = 37;
private static final int MANAGER_WIDTH = 30;
- private static final int ZOOKEEPER_TIMER_MILLIS = 30 * 1000;
+ private static final int ZOOKEEPER_TIMER_MILLIS = 30_000;
static class Opts extends Help {
@Parameter(names = "--print-errors", description = "display errors while
listing instances")
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 41eecaa..939d9dd 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
@@ -65,8 +65,8 @@ public class AuthenticationTokenKeyManagerTest {
@Test
public void testIntervalNotPassed() {
- long updateInterval = 5 * 1000L;
- long tokenLifetime = 100 * 1000L;
+ long updateInterval = 5_000L;
+ long tokenLifetime = 100_000L;
AuthenticationTokenKeyManager keyManager = new
AuthenticationTokenKeyManager(secretManager,
zooDistributor, updateInterval, tokenLifetime);
@@ -86,8 +86,8 @@ public class AuthenticationTokenKeyManagerTest {
@Test
public void testIntervalHasPassed() throws Exception {
- long updateInterval = 0 * 1000L;
- long tokenLifetime = 100 * 1000L;
+ long updateInterval = 0;
+ long tokenLifetime = 100_000L;
long runTime = 10L;
SecretKey secretKey = keyGen.generateKey();
@@ -138,7 +138,7 @@ public class AuthenticationTokenKeyManagerTest {
}
- @Test(timeout = 30 * 1000)
+ @Test(timeout = 30_000)
public void testStopLoop() throws InterruptedException {
final MockManager keyManager =
EasyMock.createMockBuilder(MockManager.class)
.addMockedMethod("_run").addMockedMethod("updateStateFromCurrentKeys").createMock();
@@ -183,8 +183,8 @@ public class AuthenticationTokenKeyManagerTest {
@Test
public void testExistingKeysAreAddedAtStartup() throws Exception {
- long updateInterval = 0 * 1000L;
- long tokenLifetime = 100 * 1000L;
+ long updateInterval = 0;
+ long tokenLifetime = 100_000L;
SecretKey secretKey1 = keyGen.generateKey(), secretKey2 =
keyGen.generateKey();
AuthenticationKey authKey1 = new AuthenticationKey(1, 0, tokenLifetime,
secretKey1),
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 422c9d3..7fcd911 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
@@ -81,7 +81,7 @@ public class AuthenticationTokenSecretManagerTest {
@Test
public void testAddKey() {
// 1 minute
- long tokenLifetime = 60 * 1000;
+ long tokenLifetime = 60_000;
AuthenticationTokenSecretManager secretManager =
new AuthenticationTokenSecretManager(instanceId, tokenLifetime);
@@ -108,7 +108,7 @@ public class AuthenticationTokenSecretManagerTest {
@Test
public void testRemoveKey() {
// 1 minute
- long tokenLifetime = 60 * 1000;
+ long tokenLifetime = 60_000;
AuthenticationTokenSecretManager secretManager =
new AuthenticationTokenSecretManager(instanceId, tokenLifetime);
@@ -132,7 +132,7 @@ public class AuthenticationTokenSecretManagerTest {
long then = System.currentTimeMillis();
// 1 minute
- long tokenLifetime = 60 * 1000;
+ long tokenLifetime = 60_000;
AuthenticationTokenSecretManager secretManager =
new AuthenticationTokenSecretManager(instanceId, tokenLifetime);
@@ -176,7 +176,7 @@ public class AuthenticationTokenSecretManagerTest {
long then = System.currentTimeMillis();
// 1 minute
- long tokenLifetime = 60 * 1000;
+ long tokenLifetime = 60_000;
AuthenticationTokenSecretManager secretManager =
new AuthenticationTokenSecretManager(instanceId, tokenLifetime);
@@ -247,7 +247,7 @@ public class AuthenticationTokenSecretManagerTest {
// start of the test
long then = System.currentTimeMillis();
- long tokenLifetime = 60 * 1000;
+ long tokenLifetime = 60_000;
AuthenticationTokenSecretManager secretManager =
new AuthenticationTokenSecretManager(instanceId, tokenLifetime);
@@ -275,7 +275,7 @@ public class AuthenticationTokenSecretManagerTest {
// start of the test
long then = System.currentTimeMillis();
- long tokenLifetime = 60 * 1000;
+ long tokenLifetime = 60_000;
AuthenticationTokenSecretManager secretManager =
new AuthenticationTokenSecretManager(instanceId, tokenLifetime);
@@ -305,7 +305,7 @@ public class AuthenticationTokenSecretManagerTest {
assertThrows(InvalidToken.class, () -> secretManager.retrievePassword(id));
}
- @Test(timeout = 20 * 1000)
+ @Test(timeout = 20_000)
public void testManagerKeyExpiration() throws Exception {
ZooAuthenticationKeyDistributor keyDistributor =
createMock(ZooAuthenticationKeyDistributor.class);
@@ -313,7 +313,7 @@ public class AuthenticationTokenSecretManagerTest {
long then = System.currentTimeMillis();
// 10s lifetime
- long tokenLifetime = 10 * 1000L;
+ long tokenLifetime = 10_000L;
AuthenticationTokenSecretManager secretManager =
new AuthenticationTokenSecretManager(instanceId, tokenLifetime);
@@ -363,7 +363,7 @@ public class AuthenticationTokenSecretManagerTest {
long then = System.currentTimeMillis();
// 1 hr
- long tokenLifetime = 60 * 60 * 1000;
+ long tokenLifetime = 60 * 60_000;
AuthenticationTokenSecretManager secretManager =
new AuthenticationTokenSecretManager(instanceId, tokenLifetime);
@@ -399,7 +399,7 @@ public class AuthenticationTokenSecretManagerTest {
long then = System.currentTimeMillis();
// 1 hr
- long tokenLifetime = 60 * 60 * 1000;
+ long tokenLifetime = 60 * 60_000;
AuthenticationTokenSecretManager secretManager =
new AuthenticationTokenSecretManager(instanceId, tokenLifetime);
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 669a0ed..3f830f4 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
@@ -66,7 +66,7 @@ public class ZooAuthenticationKeyWatcherTest {
private ZooReader zk;
private InstanceId instanceId;
private String baseNode;
- private long tokenLifetime = 7 * 24 * 60 * 60 * 1000; // 7days
+ private long tokenLifetime = 7 * 24 * 60 * 60_000; // 7days
private AuthenticationTokenSecretManager secretManager;
private ZooAuthenticationKeyWatcher keyWatcher;
diff --git
a/server/compactor/src/main/java/org/apache/accumulo/compactor/Compactor.java
b/server/compactor/src/main/java/org/apache/accumulo/compactor/Compactor.java
index 8701e33..de435c2 100644
---
a/server/compactor/src/main/java/org/apache/accumulo/compactor/Compactor.java
+++
b/server/compactor/src/main/java/org/apache/accumulo/compactor/Compactor.java
@@ -134,7 +134,7 @@ public class Compactor extends AbstractServer implements
MetricsProducer, Compac
private static final Logger LOG = LoggerFactory.getLogger(Compactor.class);
private static final long TIME_BETWEEN_GC_CHECKS = 5000;
- private static final long TIME_BETWEEN_CANCEL_CHECKS = 5 * 60 * 1000;
+ private static final long TIME_BETWEEN_CANCEL_CHECKS = 5 * 60_000;
private static final long TEN_MEGABYTES = 10485760;
private static final CompactionCoordinatorService.Client.Factory
COORDINATOR_CLIENT_FACTORY =
diff --git
a/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java
b/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java
index 6ded0a2..4de7e11 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java
@@ -134,7 +134,7 @@ public class Monitor extends AbstractServer implements
HighlyAvailableService {
return Collections.synchronizedList(new LinkedList<>() {
private static final long serialVersionUID = 1L;
- private final long maxDelta = 60 * 60 * 1000;
+ private final long maxDelta = 60 * 60_000;
@Override
public boolean add(Pair<Long,T> obj) {
diff --git
a/server/tserver/src/main/java/org/apache/accumulo/tserver/AssignmentHandler.java
b/server/tserver/src/main/java/org/apache/accumulo/tserver/AssignmentHandler.java
index fa69abe..1945f26 100644
---
a/server/tserver/src/main/java/org/apache/accumulo/tserver/AssignmentHandler.java
+++
b/server/tserver/src/main/java/org/apache/accumulo/tserver/AssignmentHandler.java
@@ -217,7 +217,7 @@ class AssignmentHandler implements Runnable {
}
log.warn("failed to open tablet {} reporting failure to manager",
extent);
server.enqueueManagerMessage(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_000L);
log.warn(String.format("rescheduling tablet load in %.2f seconds",
reschedule / 1000.));
this.server.getContext().getScheduledExecutor().schedule(new Runnable() {
@Override
diff --git
a/server/tserver/src/main/java/org/apache/accumulo/tserver/ThriftClientHandler.java
b/server/tserver/src/main/java/org/apache/accumulo/tserver/ThriftClientHandler.java
index d0bd619..bb4efe2 100644
---
a/server/tserver/src/main/java/org/apache/accumulo/tserver/ThriftClientHandler.java
+++
b/server/tserver/src/main/java/org/apache/accumulo/tserver/ThriftClientHandler.java
@@ -166,7 +166,7 @@ public class ThriftClientHandler extends
ClientServiceHandler implements TabletC
private static final Logger log =
LoggerFactory.getLogger(ThriftClientHandler.class);
private static final long MAX_TIME_TO_WAIT_FOR_SCAN_RESULT_MILLIS = 1000;
- private static final long RECENTLY_SPLIT_MILLIES = 60 * 1000;
+ private static final long RECENTLY_SPLIT_MILLIES = 60_000;
private final TabletServer server;
private final WriteTracker writeTracker = new WriteTracker();
private final RowLocks rowLocks = new RowLocks();
diff --git
a/server/tserver/src/test/java/org/apache/accumulo/tserver/memory/LargestFirstMemoryManagerTest.java
b/server/tserver/src/test/java/org/apache/accumulo/tserver/memory/LargestFirstMemoryManagerTest.java
index 16ee1b4..0216faf 100644
---
a/server/tserver/src/test/java/org/apache/accumulo/tserver/memory/LargestFirstMemoryManagerTest.java
+++
b/server/tserver/src/test/java/org/apache/accumulo/tserver/memory/LargestFirstMemoryManagerTest.java
@@ -43,12 +43,12 @@ public class LargestFirstMemoryManagerTest {
public Timeout timeout = Timeout.seconds(60);
private static final long ZERO = LargestFirstMemoryManager.ZERO_TIME;
- private static final long LATER = ZERO + 20 * 60 * 1000;
+ private static final long LATER = ZERO + 20 * 60_000;
private static final long ONE_GIG = 1024 * 1024 * 1024;
private static final long ONE_MEG = 1024 * 1024;
private static final long HALF_GIG = ONE_GIG / 2;
private static final long QGIG = ONE_GIG / 4;
- private static final long ONE_MINUTE = 60 * 1000;
+ private static final long ONE_MINUTE = 60_000;
private ServerContext context;
@@ -207,7 +207,7 @@ public class LargestFirstMemoryManagerTest {
@Override
protected long getMinCIdleThreshold(KeyExtent extent) {
- return 15 * 60 * 1000;
+ return 15 * 60_000;
}
@Override
diff --git
a/start/src/main/java/org/apache/accumulo/start/classloader/vfs/AccumuloReloadingVFSClassLoader.java
b/start/src/main/java/org/apache/accumulo/start/classloader/vfs/AccumuloReloadingVFSClassLoader.java
index cf21e5c..2f1baff 100644
---
a/start/src/main/java/org/apache/accumulo/start/classloader/vfs/AccumuloReloadingVFSClassLoader.java
+++
b/start/src/main/java/org/apache/accumulo/start/classloader/vfs/AccumuloReloadingVFSClassLoader.java
@@ -52,7 +52,7 @@ public class AccumuloReloadingVFSClassLoader implements
FileListener, ReloadingC
// set to 5 mins. The rationale behind this large time is to avoid a
gazillion tservers all asking
// the name node for info too frequently.
- private static final int DEFAULT_TIMEOUT = 5 * 60 * 1000;
+ private static final int DEFAULT_TIMEOUT = 5 * 60_000;
private volatile long maxWaitInterval = 60000;
diff --git
a/test/src/main/java/org/apache/accumulo/test/GarbageCollectWALIT.java
b/test/src/main/java/org/apache/accumulo/test/GarbageCollectWALIT.java
index 5687d51..52ce736 100644
--- a/test/src/main/java/org/apache/accumulo/test/GarbageCollectWALIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/GarbageCollectWALIT.java
@@ -70,7 +70,7 @@ public class GarbageCollectWALIT extends ConfigurableMacBase {
cluster.getClusterControl().start(ServerType.TABLET_SERVER);
Iterators.size(c.createScanner(MetadataTable.NAME,
Authorizations.EMPTY).iterator());
// let GC run
- UtilWaitThread.sleep(3 * 5 * 1000);
+ UtilWaitThread.sleep(3 * 5_000);
assertEquals(2, countWALsInFS(cluster));
}
}
diff --git
a/test/src/main/java/org/apache/accumulo/test/InterruptibleScannersIT.java
b/test/src/main/java/org/apache/accumulo/test/InterruptibleScannersIT.java
index 0533629..98b64ac 100644
--- a/test/src/main/java/org/apache/accumulo/test/InterruptibleScannersIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/InterruptibleScannersIT.java
@@ -60,7 +60,7 @@ public class InterruptibleScannersIT extends
AccumuloClusterHarness {
try (Scanner scanner = client.createScanner(tableName,
Authorizations.EMPTY)) {
final IteratorSetting cfg = new IteratorSetting(100,
SlowIterator.class);
// Wait long enough to be sure we can catch it, but not indefinitely.
- SlowIterator.setSeekSleepTime(cfg, 60 * 1000);
+ SlowIterator.setSeekSleepTime(cfg, 60_000);
scanner.addScanIterator(cfg);
// create a thread to interrupt the slow scan
final Thread scanThread = Thread.currentThread();
diff --git a/test/src/main/java/org/apache/accumulo/test/LargeSplitRowIT.java
b/test/src/main/java/org/apache/accumulo/test/LargeSplitRowIT.java
index b5a4680..6cf9ac8 100644
--- a/test/src/main/java/org/apache/accumulo/test/LargeSplitRowIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/LargeSplitRowIT.java
@@ -120,7 +120,7 @@ public class LargeSplitRowIT extends ConfigurableMacBase {
}
// Test tablet server split with 250 entries with all the same prefix
- @Test(timeout = 60 * 1000)
+ @Test(timeout = 60_000)
public void automaticSplitWith250Same() throws Exception {
log.info("Automatic with 250 with same prefix");
@@ -182,7 +182,7 @@ public class LargeSplitRowIT extends ConfigurableMacBase {
}
// 10 0's; 10 2's; 10 4's... 10 30's etc
- @Test(timeout = 60 * 1000)
+ @Test(timeout = 60_000)
public void automaticSplitWithGaps() throws Exception {
log.info("Automatic Split With Gaps");
try (AccumuloClient client =
Accumulo.newClient().from(getClientProperties()).build()) {
@@ -191,7 +191,7 @@ public class LargeSplitRowIT extends ConfigurableMacBase {
}
// 10 0's; 10 1's; 10 2's... 10 15's etc
- @Test(timeout = 60 * 1000)
+ @Test(timeout = 60_000)
public void automaticSplitWithoutGaps() throws Exception {
log.info("Automatic Split Without Gaps");
try (AccumuloClient client =
Accumulo.newClient().from(getClientProperties()).build()) {
@@ -199,7 +199,7 @@ public class LargeSplitRowIT extends ConfigurableMacBase {
}
}
- @Test(timeout = 60 * 1000)
+ @Test(timeout = 60_000)
public void automaticSplitLater() throws Exception {
log.info("Split later");
try (AccumuloClient client =
Accumulo.newClient().from(getClientProperties()).build()) {
diff --git
a/test/src/main/java/org/apache/accumulo/test/ScanFlushWithTimeIT.java
b/test/src/main/java/org/apache/accumulo/test/ScanFlushWithTimeIT.java
index 038bce3..847e3f0 100644
--- a/test/src/main/java/org/apache/accumulo/test/ScanFlushWithTimeIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/ScanFlushWithTimeIT.java
@@ -68,7 +68,7 @@ public class ScanFlushWithTimeIT extends
AccumuloClusterHarness {
partitionKeys.add(new Text("5"));
c.tableOperations().addSplits(tableName, partitionKeys);
log.info("waiting for zookeeper propagation");
- UtilWaitThread.sleep(5 * 1000);
+ UtilWaitThread.sleep(5_000);
log.info("Adding a few entries");
try (BatchWriter bw = c.createBatchWriter(tableName)) {
for (int i = 0; i < 10; i++) {
diff --git
a/test/src/main/java/org/apache/accumulo/test/compaction/ConfigurableMajorCompactionIT.java
b/test/src/main/java/org/apache/accumulo/test/compaction/ConfigurableMajorCompactionIT.java
index cb3ff82..4541441 100644
---
a/test/src/main/java/org/apache/accumulo/test/compaction/ConfigurableMajorCompactionIT.java
+++
b/test/src/main/java/org/apache/accumulo/test/compaction/ConfigurableMajorCompactionIT.java
@@ -93,7 +93,7 @@ public class ConfigurableMajorCompactionIT extends
ConfigurableMacBase {
writeFile(client, tableName);
writeFile(client, tableName);
writeFile(client, tableName);
- UtilWaitThread.sleep(2 * 1000);
+ UtilWaitThread.sleep(2_000);
assertEquals(4, countFiles(client));
writeFile(client, tableName);
int count = countFiles(client);
diff --git
a/test/src/main/java/org/apache/accumulo/test/compaction/SplitCancelsMajCIT.java
b/test/src/main/java/org/apache/accumulo/test/compaction/SplitCancelsMajCIT.java
index 316b88c..40a48f3 100644
---
a/test/src/main/java/org/apache/accumulo/test/compaction/SplitCancelsMajCIT.java
+++
b/test/src/main/java/org/apache/accumulo/test/compaction/SplitCancelsMajCIT.java
@@ -95,7 +95,7 @@ public class SplitCancelsMajCIT extends SharedMiniClusterBase
{
c.tableOperations().addSplits(tableName, partitionKeys);
thread.join();
// wait for the restarted compaction
- assertTrue(System.currentTimeMillis() - now > 59 * 1000);
+ assertTrue(System.currentTimeMillis() - now > 59_000);
if (ex.get() != null)
throw ex.get();
}
diff --git
a/test/src/main/java/org/apache/accumulo/test/functional/BackupManagerIT.java
b/test/src/main/java/org/apache/accumulo/test/functional/BackupManagerIT.java
index 518f2fa..bad2777 100644
---
a/test/src/main/java/org/apache/accumulo/test/functional/BackupManagerIT.java
+++
b/test/src/main/java/org/apache/accumulo/test/functional/BackupManagerIT.java
@@ -46,7 +46,7 @@ public class BackupManagerIT extends ConfigurableMacBase {
Process backup = exec(Manager.class);
try (AccumuloClient client =
Accumulo.newClient().from(getClientProperties()).build()) {
String secret =
getCluster().getSiteConfiguration().get(Property.INSTANCE_SECRET);
- ZooReaderWriter writer = new ZooReaderWriter(cluster.getZooKeepers(), 30
* 1000, secret);
+ ZooReaderWriter writer = new ZooReaderWriter(cluster.getZooKeepers(),
30_000, secret);
String root = "/accumulo/" + client.instanceOperations().getInstanceId();
List<String> children;
// wait for 2 lock entries
diff --git
a/test/src/main/java/org/apache/accumulo/test/functional/BalanceAfterCommsFailureIT.java
b/test/src/main/java/org/apache/accumulo/test/functional/BalanceAfterCommsFailureIT.java
index 350d0c0..cd24967 100644
---
a/test/src/main/java/org/apache/accumulo/test/functional/BalanceAfterCommsFailureIT.java
+++
b/test/src/main/java/org/apache/accumulo/test/functional/BalanceAfterCommsFailureIT.java
@@ -87,7 +87,7 @@ public class BalanceAfterCommsFailureIT extends
ConfigurableMacBase {
assertEquals(0, Runtime.getRuntime()
.exec(new String[] {"kill", "-SIGSTOP",
Integer.toString(pid)}).waitFor());
}
- UtilWaitThread.sleep(20 * 1000);
+ UtilWaitThread.sleep(20_000);
for (int pid : tserverPids) {
assertEquals(0, Runtime.getRuntime()
.exec(new String[] {"kill", "-SIGCONT",
Integer.toString(pid)}).waitFor());
@@ -99,7 +99,7 @@ public class BalanceAfterCommsFailureIT extends
ConfigurableMacBase {
c.tableOperations().addSplits("test", splits);
// Ensure all of the tablets are actually assigned
assertEquals(0, Iterables.size(c.createScanner("test",
Authorizations.EMPTY)));
- UtilWaitThread.sleep(30 * 1000);
+ UtilWaitThread.sleep(30_000);
checkBalance(c);
}
}
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 01f5d6a..8d319f2 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
@@ -145,7 +145,7 @@ public class BalanceInPresenceOfOfflineTableIT extends
AccumuloClusterHarness {
log.debug("waiting for balancing, up to ~5 minutes to allow for migration
cleanup.");
final long startTime = System.currentTimeMillis();
- long currentWait = 10 * 1000;
+ long currentWait = 10_000;
boolean balancingWorked = false;
Credentials creds = new Credentials(getAdminPrincipal(), getAdminToken());
diff --git
a/test/src/main/java/org/apache/accumulo/test/functional/ClassLoaderIT.java
b/test/src/main/java/org/apache/accumulo/test/functional/ClassLoaderIT.java
index f609870..674ab7b 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/ClassLoaderIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/ClassLoaderIT.java
@@ -56,7 +56,7 @@ import org.junit.experimental.categories.Category;
@Category(MiniClusterOnlyTests.class)
public class ClassLoaderIT extends AccumuloClusterHarness {
- private static final long ZOOKEEPER_PROPAGATION_TIME = 10 * 1000;
+ private static final long ZOOKEEPER_PROPAGATION_TIME = 10_000;
@Override
protected int defaultTimeoutSeconds() {
diff --git
a/test/src/main/java/org/apache/accumulo/test/functional/ConstraintIT.java
b/test/src/main/java/org/apache/accumulo/test/functional/ConstraintIT.java
index ca61f42..a3ee804 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/ConstraintIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/ConstraintIT.java
@@ -66,7 +66,7 @@ public class ConstraintIT extends AccumuloClusterHarness {
}
// A static sleep to just let ZK do its thing
- Thread.sleep(10 * 1000);
+ Thread.sleep(10_000);
// Then check that the client has at least gotten the updates
for (String table : tableNames) {
diff --git
a/test/src/main/java/org/apache/accumulo/test/functional/HalfDeadTServerIT.java
b/test/src/main/java/org/apache/accumulo/test/functional/HalfDeadTServerIT.java
index 310993f..e0c57da 100644
---
a/test/src/main/java/org/apache/accumulo/test/functional/HalfDeadTServerIT.java
+++
b/test/src/main/java/org/apache/accumulo/test/functional/HalfDeadTServerIT.java
@@ -196,7 +196,7 @@ public class HalfDeadTServerIT extends ConfigurableMacBase {
sleepUninterruptibly(1, TimeUnit.SECONDS);
client.tableOperations().create("test_ingest");
assertEquals(1, client.instanceOperations().getTabletServers().size());
- int rows = 100 * 1000;
+ int rows = 100_000;
ingest =
cluster.exec(TestIngest.class, "-c", cluster.getClientPropsPath(),
"--rows", rows + "")
.getProcess();
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 20b7295..28f7808 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
@@ -622,7 +622,7 @@ public class KerberosIT extends AccumuloITBase {
AuthenticationTokenIdentifier identifier = ((DelegationTokenImpl)
dt).getIdentifier();
assertTrue("Expected identifier to expire in no more than 5 minutes: " +
identifier,
- identifier.getExpirationDate() - identifier.getIssueDate() <= (5 * 60
* 1000));
+ identifier.getExpirationDate() - identifier.getIssueDate() <= (5 *
60_000));
}
@Test
diff --git
a/test/src/main/java/org/apache/accumulo/test/functional/KerberosRenewalIT.java
b/test/src/main/java/org/apache/accumulo/test/functional/KerberosRenewalIT.java
index 7cfaaf7..117eb9c 100644
---
a/test/src/main/java/org/apache/accumulo/test/functional/KerberosRenewalIT.java
+++
b/test/src/main/java/org/apache/accumulo/test/functional/KerberosRenewalIT.java
@@ -75,10 +75,10 @@ public class KerberosRenewalIT extends AccumuloITBase {
private static String krbEnabledForITs = null;
private static ClusterUser rootUser;
- private static final long TICKET_LIFETIME = 6 * 60 * 1000; // Anything less
seems to fail when
- // generating the
ticket
- private static final long TICKET_TEST_LIFETIME = 8 * 60 * 1000; // Run a
test for 8 mins
- private static final long TEST_DURATION = 9 * 60 * 1000; // The test should
finish within 9 mins
+ private static final long TICKET_LIFETIME = 6 * 60_000; // Anything less
seems to fail when
+ // generating the
ticket
+ private static final long TICKET_TEST_LIFETIME = 8 * 60_000; // Run a test
for 8 mins
+ private static final long TEST_DURATION = 9 * 60_000; // The test should
finish within 9 mins
@BeforeClass
public static void startKdc() throws Exception {
