Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HADOOP-12940. Fix warnings from Spotbugs in hadoop-common.

This commit is contained in:
Akira Ajisaka 2017-06-23 10:28:58 +09:00
parent 8ceaac1877
commit 092ebdf885
No known key found for this signature in database
GPG Key ID: C1EDBB9CA400FD50
13 changed files with 70 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/server/MultiSchemeAuthenticationHandler.java
View File

@ -186,11 +186,12 @@ public class MultiSchemeAuthenticationHandler implements
String authorization =
request.getHeader(HttpConstants.AUTHORIZATION_HEADER);
if (authorization != null) {
for (String scheme : schemeToAuthHandlerMapping.keySet()) {
if (AuthenticationHandlerUtil.matchAuthScheme(scheme, authorization)) {
AuthenticationHandler handler =
schemeToAuthHandlerMapping.get(scheme);
AuthenticationToken token = handler.authenticate(request, response);
for (Map.Entry<String, AuthenticationHandler> entry :
schemeToAuthHandlerMapping.entrySet()) {
if (AuthenticationHandlerUtil.matchAuthScheme(
entry.getKey(), authorization)) {
AuthenticationToken token =
entry.getValue().authenticate(request, response);
logger.trace("Token generated with type {}", token.getType());
return token;
}

26
hadoop-common-project/hadoop-common/dev-support/findbugsExcludeFile.xml
View File

@ -416,4 +416,30 @@
<Method name="toString"/>
<Bug pattern="DM_DEFAULT_ENCODING"/>
</Match>
<!-- We need to make the methods public because PBHelperClient calls them. -->
<Match>
<Class name="org.apache.hadoop.crypto.CipherSuite"/>
<Method name="setUnknownValue"/>
<Bug pattern="ME_ENUM_FIELD_SETTER"/>
</Match>
<Match>
<Class name="org.apache.hadoop.crypto.CryptoProtocolVersion"/>
<Method name="setUnknownValue"/>
<Bug pattern="ME_ENUM_FIELD_SETTER"/>
</Match>
<!-- We need to make the method public for testing. -->
<Match>
<Class name="org.apache.hadoop.metrics2.lib.DefaultMetricsSystem"/>
<Method name="setMiniClusterMode"/>
<Bug pattern="ME_ENUM_FIELD_SETTER"/>
</Match>
<!-- Experimental interface. Ignore. -->
<Match>
<Class name="org.apache.hadoop.metrics2.lib.DefaultMetricsFactory"/>
<Method name="setInstance"/>
<Bug pattern="ME_ENUM_FIELD_SETTER"/>
</Match>
</FindBugsFilter>

6
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileUtil.java
View File

@ -115,8 +115,10 @@ public class FileUtil {
file.deleteOnExit();
if (file.isDirectory()) {
File[] files = file.listFiles();
for (File child : files) {
fullyDeleteOnExit(child);
if (files != null) {
for (File child : files) {
fullyDeleteOnExit(child);
}
}
}
}

17
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/RawLocalFileSystem.java
View File

@ -384,13 +384,16 @@ public class RawLocalFileSystem extends FileSystem {
// again.
try {
FileStatus sdst = this.getFileStatus(dst);
if (sdst.isDirectory() && dstFile.list().length == 0) {
if (LOG.isDebugEnabled()) {
LOG.debug("Deleting empty destination and renaming " + src + " to " +
dst);
}
if (this.delete(dst, false) && srcFile.renameTo(dstFile)) {
return true;
String[] dstFileList = dstFile.list();
if (dstFileList != null) {
if (sdst.isDirectory() && dstFileList.length == 0) {
if (LOG.isDebugEnabled()) {
LOG.debug("Deleting empty destination and renaming " + src +
" to " + dst);
}
if (this.delete(dst, false) && srcFile.renameTo(dstFile)) {
return true;
}
}
}
} catch (FileNotFoundException ignored) {

2
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/CommandWithDestination.java
View File

@ -501,7 +501,7 @@ abstract class CommandWithDestination extends FsCommand {
createFlags,
getConf().getInt(IO_FILE_BUFFER_SIZE_KEY,
IO_FILE_BUFFER_SIZE_DEFAULT),
lazyPersist ? 1 : getDefaultReplication(item.path),
(short) 1,
getDefaultBlockSize(),
null,
null);

4
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/DoubleWritable.java
View File

@ -75,7 +75,7 @@ public class DoubleWritable implements WritableComparable<DoubleWritable> {
@Override
public int compareTo(DoubleWritable o) {
return (value < o.value ? -1 : (value == o.value ? 0 : 1));
return Double.compare(value, o.value);
}
@Override
@ -94,7 +94,7 @@ public class DoubleWritable implements WritableComparable<DoubleWritable> {
byte[] b2, int s2, int l2) {
double thisValue = readDouble(b1, s1);
double thatValue = readDouble(b2, s2);
return (thisValue < thatValue ? -1 : (thisValue == thatValue ? 0 : 1));
return Double.compare(thisValue, thatValue);
}
}

6
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/FloatWritable.java
View File

@ -66,9 +66,7 @@ public class FloatWritable implements WritableComparable<FloatWritable> {
/** Compares two FloatWritables. */
@Override
public int compareTo(FloatWritable o) {
float thisValue = this.value;
float thatValue = o.value;
return (thisValue<thatValue ? -1 : (thisValue==thatValue ? 0 : 1));
return Float.compare(value, o.value);
}
@Override
@ -86,7 +84,7 @@ public class FloatWritable implements WritableComparable<FloatWritable> {
byte[] b2, int s2, int l2) {
float thisValue = readFloat(b1, s1);
float thatValue = readFloat(b2, s2);
return (thisValue<thatValue ? -1 : (thisValue==thatValue ? 0 : 1));
return Float.compare(thisValue, thatValue);
}
}

9
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/IOUtils.java
View File

@ -371,9 +371,12 @@ public class IOUtils {
try (DirectoryStream<Path> stream =
Files.newDirectoryStream(dir.toPath())) {
for (Path entry: stream) {
String fileName = entry.getFileName().toString();
if ((filter == null) || filter.accept(dir, fileName)) {
list.add(fileName);
Path fileName = entry.getFileName();
if (fileName != null) {
String fileNameStr = fileName.toString();
if ((filter == null) || filter.accept(dir, fileNameStr)) {
list.add(fileNameStr);
}
}
}
} catch (DirectoryIteratorException e) {

4
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/erasurecode/ECSchema.java
View File

@ -189,8 +189,8 @@ public final class ECSchema {
sb.append((extraOptions.isEmpty() ? "" : ", "));
int i = 0;
for (String opt : extraOptions.keySet()) {
sb.append(opt + "=" + extraOptions.get(opt) +
for (Map.Entry<String, String> entry : extraOptions.entrySet()) {
sb.append(entry.getKey() + "=" + entry.getValue() +
(++i < extraOptions.size() ? ", " : ""));
}

2
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/file/tfile/Utils.java
View File

@ -395,7 +395,7 @@ public final class Utils {
@Override
public int hashCode() {
return (major << 16 + minor);
return (major << 16) + minor;
}
}

8
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/token/delegation/ZKDelegationTokenSecretManager.java
View File

@ -881,11 +881,9 @@ public abstract class ZKDelegationTokenSecretManager<TokenIdent extends Abstract
String nodeCreatePath =
getNodePath(ZK_DTSM_TOKENS_ROOT, DELEGATION_TOKEN_PREFIX
+ ident.getSequenceNumber());
ByteArrayOutputStream tokenOs = new ByteArrayOutputStream();
DataOutputStream tokenOut = new DataOutputStream(tokenOs);
ByteArrayOutputStream seqOs = new ByteArrayOutputStream();
try {
try (ByteArrayOutputStream tokenOs = new ByteArrayOutputStream();
DataOutputStream tokenOut = new DataOutputStream(tokenOs)) {
ident.write(tokenOut);
tokenOut.writeLong(info.getRenewDate());
tokenOut.writeInt(info.getPassword().length);
@ -902,8 +900,6 @@ public abstract class ZKDelegationTokenSecretManager<TokenIdent extends Abstract
zkClient.create().withMode(CreateMode.PERSISTENT)
.forPath(nodeCreatePath, tokenOs.toByteArray());
}
} finally {
seqOs.close();
}
}

6
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/SysInfoWindows.java
View File

@ -169,7 +169,7 @@ public class SysInfoWindows extends SysInfo {
/** {@inheritDoc} */
@Override
public int getNumProcessors() {
public synchronized int getNumProcessors() {
refreshIfNeeded();
return numProcessors;
}
@ -196,7 +196,7 @@ public class SysInfoWindows extends SysInfo {
/** {@inheritDoc} */
@Override
public float getCpuUsagePercentage() {
public synchronized float getCpuUsagePercentage() {
refreshIfNeeded();
float ret = cpuUsage;
if (ret != -1) {
@ -207,7 +207,7 @@ public class SysInfoWindows extends SysInfo {
/** {@inheritDoc} */
@Override
public float getNumVCoresUsed() {
public synchronized float getNumVCoresUsed() {
refreshIfNeeded();
float ret = cpuUsage;
if (ret != -1) {

7
hadoop-common-project/hadoop-minikdc/src/main/java/org/apache/hadoop/minikdc/MiniKdc.java
View File

@ -365,8 +365,11 @@ public class MiniKdc {
LOG.warn("WARNING: cannot delete file " + f.getAbsolutePath());
}
} else {
for (File c: f.listFiles()) {
delete(c);
File[] fileList = f.listFiles();
if (fileList != null) {
for (File c : fileList) {
delete(c);
}
}
if (! f.delete()) {
LOG.warn("WARNING: cannot delete directory " + f.getAbsolutePath());