You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by mw...@apache.org on 2019/02/22 00:50:08 UTC
[accumulo] branch master updated: Fixed more lgtm warnings (#977)
This is an automated email from the ASF dual-hosted git repository.
mwalch 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 13d2a7d Fixed more lgtm warnings (#977)
13d2a7d is described below
commit 13d2a7daf5b9e9cd2579e3d0cd031ef957fc8725
Author: Mike Walch <mw...@apache.org>
AuthorDate: Thu Feb 21 19:50:04 2019 -0500
Fixed more lgtm warnings (#977)
* Use primitive types if variable defined with a boxed/wrapper
type is never null
---
.../org/apache/accumulo/core/client/BatchWriterConfig.java | 11 ++++++-----
.../accumulo/core/clientImpl/ConditionalWriterImpl.java | 2 +-
.../core/file/streams/BoundedRangeFileInputStream.java | 2 +-
.../accumulo/core/iterators/system/VisibilityFilter.java | 2 +-
.../accumulo/core/iterators/user/VisibilityFilter.java | 2 +-
.../java/org/apache/accumulo/core/data/NamespaceIdTest.java | 4 ++--
.../test/java/org/apache/accumulo/core/data/TableIdTest.java | 4 ++--
.../org/apache/accumulo/core/file/FileOperationsTest.java | 2 +-
.../test/java/org/apache/accumulo/fate/AgeOffStoreTest.java | 12 ++++++------
.../accumulo/hadoop/its/mapred/AccumuloInputFormatIT.java | 2 +-
.../accumulo/hadoop/its/mapreduce/AccumuloInputFormatIT.java | 2 +-
.../accumulo/miniclusterImpl/MiniAccumuloClusterImpl.java | 4 ++--
.../java/org/apache/accumulo/server/ServerConstants.java | 4 ++--
.../server/rpc/TCredentialsUpdatingInvocationHandler.java | 2 +-
.../accumulo/master/tableOps/bulkVer2/BulkImportMove.java | 2 +-
.../apache/accumulo/monitor/rest/master/MasterResource.java | 8 ++++----
.../apache/accumulo/start/classloader/vfs/MiniDFSUtil.java | 2 +-
.../apache/accumulo/test/mapred/AccumuloInputFormatIT.java | 2 +-
.../accumulo/test/mapreduce/AccumuloInputFormatIT.java | 2 +-
19 files changed, 36 insertions(+), 35 deletions(-)
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 27ad00d..fe5eeef 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
@@ -50,7 +50,7 @@ public class BatchWriterConfig implements Writable {
.getTimeInMillis(BATCH_WRITER_LATENCY_MAX.getDefaultValue());
private Long maxLatency = null;
- private static final Long DEFAULT_TIMEOUT = getDefaultTimeout();
+ private static final long DEFAULT_TIMEOUT = getDefaultTimeout();
private Long timeout = null;
private static final Integer DEFAULT_MAX_WRITE_THREADS = Integer
@@ -60,12 +60,13 @@ public class BatchWriterConfig implements Writable {
private Durability durability = Durability.DEFAULT;
private boolean isDurabilitySet = false;
- private static Long getDefaultTimeout() {
- Long def = ConfigurationTypeHelper.getTimeInMillis(BATCH_WRITER_TIMEOUT_MAX.getDefaultValue());
- if (def.equals(0L))
+ private static long getDefaultTimeout() {
+ long defVal = ConfigurationTypeHelper
+ .getTimeInMillis(BATCH_WRITER_TIMEOUT_MAX.getDefaultValue());
+ if (defVal == 0L)
return Long.MAX_VALUE;
else
- return def;
+ return defVal;
}
/**
diff --git a/core/src/main/java/org/apache/accumulo/core/clientImpl/ConditionalWriterImpl.java b/core/src/main/java/org/apache/accumulo/core/clientImpl/ConditionalWriterImpl.java
index 88cad63..63990f5 100644
--- a/core/src/main/java/org/apache/accumulo/core/clientImpl/ConditionalWriterImpl.java
+++ b/core/src/main/java/org/apache/accumulo/core/clientImpl/ConditionalWriterImpl.java
@@ -817,7 +817,7 @@ class ConditionalWriterImpl implements ConditionalWriter {
return b;
try {
- Boolean bb = ve.evaluate(new ColumnVisibility(testVis));
+ boolean bb = ve.evaluate(new ColumnVisibility(testVis));
cache.put(new Text(testVis), bb);
return bb;
} catch (VisibilityParseException | BadArgumentException e) {
diff --git a/core/src/main/java/org/apache/accumulo/core/file/streams/BoundedRangeFileInputStream.java b/core/src/main/java/org/apache/accumulo/core/file/streams/BoundedRangeFileInputStream.java
index f40404c..0615313 100644
--- a/core/src/main/java/org/apache/accumulo/core/file/streams/BoundedRangeFileInputStream.java
+++ b/core/src/main/java/org/apache/accumulo/core/file/streams/BoundedRangeFileInputStream.java
@@ -87,7 +87,7 @@ public class BoundedRangeFileInputStream extends InputStream {
final int n = (int) Math.min(Integer.MAX_VALUE, Math.min(len, (end - pos)));
if (n == 0)
return -1;
- Integer ret = 0;
+ int ret = 0;
synchronized (in) {
// ensuring we are not closed which would be followed by someone else reusing the decompressor
if (closed) {
diff --git a/core/src/main/java/org/apache/accumulo/core/iterators/system/VisibilityFilter.java b/core/src/main/java/org/apache/accumulo/core/iterators/system/VisibilityFilter.java
index b0235d1..342ad03 100644
--- a/core/src/main/java/org/apache/accumulo/core/iterators/system/VisibilityFilter.java
+++ b/core/src/main/java/org/apache/accumulo/core/iterators/system/VisibilityFilter.java
@@ -76,7 +76,7 @@ public class VisibilityFilter extends SynchronizedServerFilter {
return b;
try {
- Boolean bb = ve.evaluate(new ColumnVisibility(testVis.toArray()));
+ boolean bb = ve.evaluate(new ColumnVisibility(testVis.toArray()));
cache.put(testVis, bb);
return bb;
} catch (VisibilityParseException e) {
diff --git a/core/src/main/java/org/apache/accumulo/core/iterators/user/VisibilityFilter.java b/core/src/main/java/org/apache/accumulo/core/iterators/user/VisibilityFilter.java
index 6fb8962..35d4a4e 100644
--- a/core/src/main/java/org/apache/accumulo/core/iterators/user/VisibilityFilter.java
+++ b/core/src/main/java/org/apache/accumulo/core/iterators/user/VisibilityFilter.java
@@ -94,7 +94,7 @@ public class VisibilityFilter extends Filter implements OptionDescriber {
return b;
try {
- Boolean bb = ve.evaluate(new ColumnVisibility(testVis.toArray()));
+ boolean bb = ve.evaluate(new ColumnVisibility(testVis.toArray()));
cache.put(testVis, bb);
return bb;
} catch (VisibilityParseException | BadArgumentException e) {
diff --git a/core/src/test/java/org/apache/accumulo/core/data/NamespaceIdTest.java b/core/src/test/java/org/apache/accumulo/core/data/NamespaceIdTest.java
index 3081299..f590944 100644
--- a/core/src/test/java/org/apache/accumulo/core/data/NamespaceIdTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/data/NamespaceIdTest.java
@@ -37,7 +37,7 @@ public class NamespaceIdTest {
@Test
public void testCacheIncreases() {
String namespaceString = "namespace-" + name.getMethodName();
- Long initialSize = NamespaceId.cache.asMap().entrySet().stream().count();
+ long initialSize = NamespaceId.cache.asMap().entrySet().stream().count();
NamespaceId nsId = NamespaceId.of(namespaceString);
assertEquals(initialSize + 1, NamespaceId.cache.asMap().entrySet().stream().count());
assertEquals(namespaceString, nsId.canonical());
@@ -50,7 +50,7 @@ public class NamespaceIdTest {
assertNotSame(Namespace.ACCUMULO.id(), Namespace.DEFAULT.id());
String namespaceString = "namespace-" + name.getMethodName();
- Long initialSize = NamespaceId.cache.asMap().entrySet().stream().count();
+ long initialSize = NamespaceId.cache.asMap().entrySet().stream().count();
NamespaceId nsId = NamespaceId.of(namespaceString);
assertEquals(initialSize + 1, NamespaceId.cache.asMap().entrySet().stream().count());
assertEquals(namespaceString, nsId.canonical());
diff --git a/core/src/test/java/org/apache/accumulo/core/data/TableIdTest.java b/core/src/test/java/org/apache/accumulo/core/data/TableIdTest.java
index b88c68d..8619285 100644
--- a/core/src/test/java/org/apache/accumulo/core/data/TableIdTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/data/TableIdTest.java
@@ -38,7 +38,7 @@ public class TableIdTest {
@Test
public void testCacheIncreases() {
- Long initialSize = TableId.cache.asMap().entrySet().stream().count();
+ long initialSize = TableId.cache.asMap().entrySet().stream().count();
String tableString = "table-" + name.getMethodName();
TableId table1 = TableId.of(tableString);
assertEquals(initialSize + 1, TableId.cache.asMap().entrySet().stream().count());
@@ -53,7 +53,7 @@ public class TableIdTest {
assertNotSame(RootTable.ID, ReplicationTable.ID);
String tableString = "table-" + name.getMethodName();
- Long initialSize = TableId.cache.asMap().entrySet().stream().count();
+ long initialSize = TableId.cache.asMap().entrySet().stream().count();
TableId table1 = TableId.of(tableString);
assertEquals(initialSize + 1, TableId.cache.asMap().entrySet().stream().count());
assertEquals(tableString, table1.canonical());
diff --git a/core/src/test/java/org/apache/accumulo/core/file/FileOperationsTest.java b/core/src/test/java/org/apache/accumulo/core/file/FileOperationsTest.java
index 97bc9a9..50e6eba 100644
--- a/core/src/test/java/org/apache/accumulo/core/file/FileOperationsTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/file/FileOperationsTest.java
@@ -39,7 +39,7 @@ public class FileOperationsTest {
@Test
public void handlesFilenamesWithMoreThanOneDot() throws IOException {
- Boolean caughtException = false;
+ boolean caughtException = false;
FileSKVWriter writer = null;
String filename = "target/test.file." + RFile.EXTENSION;
File testFile = new File(filename);
diff --git a/core/src/test/java/org/apache/accumulo/fate/AgeOffStoreTest.java b/core/src/test/java/org/apache/accumulo/fate/AgeOffStoreTest.java
index 5b97598..36c7510 100644
--- a/core/src/test/java/org/apache/accumulo/fate/AgeOffStoreTest.java
+++ b/core/src/test/java/org/apache/accumulo/fate/AgeOffStoreTest.java
@@ -46,14 +46,14 @@ public class AgeOffStoreTest {
aoStore.ageOff();
- Long txid1 = aoStore.create();
+ long txid1 = aoStore.create();
aoStore.reserve(txid1);
aoStore.setStatus(txid1, TStatus.IN_PROGRESS);
aoStore.unreserve(txid1, 0);
aoStore.ageOff();
- Long txid2 = aoStore.create();
+ long txid2 = aoStore.create();
aoStore.reserve(txid2);
aoStore.setStatus(txid2, TStatus.IN_PROGRESS);
aoStore.setStatus(txid2, TStatus.FAILED);
@@ -61,7 +61,7 @@ public class AgeOffStoreTest {
tts.time = 6;
- Long txid3 = aoStore.create();
+ long txid3 = aoStore.create();
aoStore.reserve(txid3);
aoStore.setStatus(txid3, TStatus.IN_PROGRESS);
aoStore.setStatus(txid3, TStatus.SUCCESSFUL);
@@ -96,18 +96,18 @@ public class AgeOffStoreTest {
TestTimeSource tts = new TestTimeSource();
SimpleStore<String> sstore = new SimpleStore<>();
- Long txid1 = sstore.create();
+ long txid1 = sstore.create();
sstore.reserve(txid1);
sstore.setStatus(txid1, TStatus.IN_PROGRESS);
sstore.unreserve(txid1, 0);
- Long txid2 = sstore.create();
+ long txid2 = sstore.create();
sstore.reserve(txid2);
sstore.setStatus(txid2, TStatus.IN_PROGRESS);
sstore.setStatus(txid2, TStatus.FAILED);
sstore.unreserve(txid2, 0);
- Long txid3 = sstore.create();
+ long txid3 = sstore.create();
sstore.reserve(txid3);
sstore.setStatus(txid3, TStatus.IN_PROGRESS);
sstore.setStatus(txid3, TStatus.SUCCESSFUL);
diff --git a/hadoop-mapreduce/src/test/java/org/apache/accumulo/hadoop/its/mapred/AccumuloInputFormatIT.java b/hadoop-mapreduce/src/test/java/org/apache/accumulo/hadoop/its/mapred/AccumuloInputFormatIT.java
index c79c440..68b7aad 100644
--- a/hadoop-mapreduce/src/test/java/org/apache/accumulo/hadoop/its/mapred/AccumuloInputFormatIT.java
+++ b/hadoop-mapreduce/src/test/java/org/apache/accumulo/hadoop/its/mapred/AccumuloInputFormatIT.java
@@ -110,7 +110,7 @@ public class AccumuloInputFormatIT extends AccumuloClusterHarness {
}
String table = args[0];
- Boolean batchScan = false;
+ boolean batchScan = false;
boolean sample = false;
if (args.length == 3) {
batchScan = Boolean.parseBoolean(args[1]);
diff --git a/hadoop-mapreduce/src/test/java/org/apache/accumulo/hadoop/its/mapreduce/AccumuloInputFormatIT.java b/hadoop-mapreduce/src/test/java/org/apache/accumulo/hadoop/its/mapreduce/AccumuloInputFormatIT.java
index 8b701a8..b2710f6 100644
--- a/hadoop-mapreduce/src/test/java/org/apache/accumulo/hadoop/its/mapreduce/AccumuloInputFormatIT.java
+++ b/hadoop-mapreduce/src/test/java/org/apache/accumulo/hadoop/its/mapreduce/AccumuloInputFormatIT.java
@@ -272,7 +272,7 @@ public class AccumuloInputFormatIT extends AccumuloClusterHarness {
String table = args[0];
String inputFormatClassName = args[1];
- Boolean batchScan = false;
+ boolean batchScan = false;
boolean sample = false;
if (args.length == 4) {
batchScan = Boolean.parseBoolean(args[2]);
diff --git a/minicluster/src/main/java/org/apache/accumulo/miniclusterImpl/MiniAccumuloClusterImpl.java b/minicluster/src/main/java/org/apache/accumulo/miniclusterImpl/MiniAccumuloClusterImpl.java
index 339eeda..a421b5a 100644
--- a/minicluster/src/main/java/org/apache/accumulo/miniclusterImpl/MiniAccumuloClusterImpl.java
+++ b/minicluster/src/main/java/org/apache/accumulo/miniclusterImpl/MiniAccumuloClusterImpl.java
@@ -249,7 +249,7 @@ public class MiniAccumuloClusterImpl implements AccumuloCluster {
+ "\n, jvmOpts: " + extraJvmOpts + "\n, classpath: " + classpath + "\n, args: " + argList
+ "\n, environment: " + builder.environment());
- Integer hashcode = builder.hashCode();
+ int hashcode = builder.hashCode();
File stdOut = new File(config.getLogDir(), clazz.getSimpleName() + "_" + hashcode + ".out");
File stdErr = new File(config.getLogDir(), clazz.getSimpleName() + "_" + hashcode + ".err");
@@ -276,7 +276,7 @@ public class MiniAccumuloClusterImpl implements AccumuloCluster {
}
if (config.isJDWPEnabled()) {
- Integer port = PortUtils.getRandomFreePort();
+ int port = PortUtils.getRandomFreePort();
jvmOpts.addAll(buildRemoteDebugParams(port));
debugPorts.add(new Pair<>(serverType, port));
}
diff --git a/server/base/src/main/java/org/apache/accumulo/server/ServerConstants.java b/server/base/src/main/java/org/apache/accumulo/server/ServerConstants.java
index fe70494..27d4a07 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/ServerConstants.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/ServerConstants.java
@@ -113,7 +113,7 @@ public class ServerConstants {
for (String baseDir : configuredBaseDirs) {
Path path = new Path(baseDir, INSTANCE_ID_DIR);
String currentIid;
- Integer currentVersion;
+ int currentVersion;
try {
currentIid = ZooUtil.getInstanceIDFromHdfs(path, conf, hadoopConf);
Path vpath = new Path(baseDir, VERSION_DIR);
@@ -134,7 +134,7 @@ public class ServerConstants {
throw new IllegalArgumentException("Configuration " + Property.INSTANCE_VOLUMES.getKey()
+ " contains paths that have different instance ids " + baseDir + " has " + currentIid
+ " and " + firstDir + " has " + firstIid);
- } else if (!currentVersion.equals(firstVersion)) {
+ } else if (currentVersion != firstVersion) {
throw new IllegalArgumentException("Configuration " + Property.INSTANCE_VOLUMES.getKey()
+ " contains paths that have different versions " + baseDir + " has " + currentVersion
+ " and " + firstDir + " has " + firstVersion);
diff --git a/server/base/src/main/java/org/apache/accumulo/server/rpc/TCredentialsUpdatingInvocationHandler.java b/server/base/src/main/java/org/apache/accumulo/server/rpc/TCredentialsUpdatingInvocationHandler.java
index c3da71a..e8acc29 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/rpc/TCredentialsUpdatingInvocationHandler.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/rpc/TCredentialsUpdatingInvocationHandler.java
@@ -99,7 +99,7 @@ public class TCredentialsUpdatingInvocationHandler<I> implements InvocationHandl
if (UGIAssumingProcessor.rpcMechanism() == SaslMechanism.DIGEST_MD5
&& DelegationTokenImpl.class.isAssignableFrom(tokenClass)) {
if (!principal.equals(tcreds.principal)) {
- log.warn("{} issued RPC with delegation token over DIGEST-MD5 as the"
+ log.warn("{} issued RPC with delegation token over DIGEST-MD5 as the "
+ "Accumulo principal {}. Disallowing RPC", principal, tcreds.principal);
throw new ThriftSecurityException("RPC principal did not match provided Accumulo principal",
SecurityErrorCode.BAD_CREDENTIALS);
diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/bulkVer2/BulkImportMove.java b/server/master/src/main/java/org/apache/accumulo/master/tableOps/bulkVer2/BulkImportMove.java
index c89558e..8a1818e 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/tableOps/bulkVer2/BulkImportMove.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/tableOps/bulkVer2/BulkImportMove.java
@@ -109,7 +109,7 @@ class BulkImportMove extends MasterRepo {
results.add(workers.submit(() -> {
final Path originalPath = new Path(sourceDir, renameEntry.getKey());
Path newPath = new Path(bulkDir, renameEntry.getValue());
- Boolean success = fs.rename(originalPath, newPath);
+ boolean success = fs.rename(originalPath, newPath);
if (success && log.isTraceEnabled())
log.trace("tid {} moved {} to {}", fmtTid, originalPath, newPath);
return success;
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/master/MasterResource.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/master/MasterResource.java
index 252a4d1..16322a4 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/master/MasterResource.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/master/MasterResource.java
@@ -101,10 +101,10 @@ public class MasterResource {
String master = masters.size() == 0 ? "Down"
: AddressUtil.parseAddress(masters.get(0), false).getHost();
- Integer onlineTabletServers = mmi.tServerInfo.size();
- Integer totalTabletServers = tservers.size();
- Integer tablets = Monitor.getTotalTabletCount();
- Integer unassignedTablets = mmi.unassignedTablets;
+ int onlineTabletServers = mmi.tServerInfo.size();
+ int totalTabletServers = tservers.size();
+ int tablets = Monitor.getTotalTabletCount();
+ int unassignedTablets = mmi.unassignedTablets;
long entries = Monitor.getTotalEntries();
double ingest = Monitor.getTotalIngestRate();
double entriesRead = Monitor.getTotalScanRate();
diff --git a/start/src/main/java/org/apache/accumulo/start/classloader/vfs/MiniDFSUtil.java b/start/src/main/java/org/apache/accumulo/start/classloader/vfs/MiniDFSUtil.java
index ebae7fd..2ede98d 100644
--- a/start/src/main/java/org/apache/accumulo/start/classloader/vfs/MiniDFSUtil.java
+++ b/start/src/main/java/org/apache/accumulo/start/classloader/vfs/MiniDFSUtil.java
@@ -36,7 +36,7 @@ public class MiniDFSUtil {
if (line == null) {
throw new IOException("umask input stream closed prematurely");
}
- Short umask = Short.parseShort(line.trim(), 8);
+ short umask = Short.parseShort(line.trim(), 8);
// Need to set permission to 777 xor umask
// leading zero makes java interpret as base 8
int newPermission = 0777 ^ umask;
diff --git a/test/src/main/java/org/apache/accumulo/test/mapred/AccumuloInputFormatIT.java b/test/src/main/java/org/apache/accumulo/test/mapred/AccumuloInputFormatIT.java
index 0b3c0da..80bd4f1 100644
--- a/test/src/main/java/org/apache/accumulo/test/mapred/AccumuloInputFormatIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/mapred/AccumuloInputFormatIT.java
@@ -112,7 +112,7 @@ public class AccumuloInputFormatIT extends AccumuloClusterHarness {
}
String table = args[0];
- Boolean batchScan = false;
+ boolean batchScan = false;
boolean sample = false;
if (args.length == 3) {
batchScan = Boolean.parseBoolean(args[1]);
diff --git a/test/src/main/java/org/apache/accumulo/test/mapreduce/AccumuloInputFormatIT.java b/test/src/main/java/org/apache/accumulo/test/mapreduce/AccumuloInputFormatIT.java
index a04c30d..da003a8 100644
--- a/test/src/main/java/org/apache/accumulo/test/mapreduce/AccumuloInputFormatIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/mapreduce/AccumuloInputFormatIT.java
@@ -266,7 +266,7 @@ public class AccumuloInputFormatIT extends AccumuloClusterHarness {
String table = args[0];
String inputFormatClassName = args[1];
- Boolean batchScan = false;
+ boolean batchScan = false;
boolean sample = false;
if (args.length == 4) {
batchScan = Boolean.parseBoolean(args[2]);