You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by el...@apache.org on 2019/02/21 13:15:17 UTC
[hadoop] branch trunk updated: HDDS-1129. Fix findbug/checkstyle
errors hdds projects. Contributed by Elek, Marton.
This is an automated email from the ASF dual-hosted git repository.
elek pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/trunk by this push:
new 7c802c4 HDDS-1129. Fix findbug/checkstyle errors hdds projects. Contributed by Elek, Marton.
7c802c4 is described below
commit 7c802c42dc6ed3369e90e7acbbe308db98f3a316
Author: Márton Elek <el...@apache.org>
AuthorDate: Mon Feb 18 18:39:57 2019 +0100
HDDS-1129. Fix findbug/checkstyle errors hdds projects. Contributed by Elek, Marton.
---
.../apache/hadoop/hdds/scm/storage/BlockInputStream.java | 15 +++++++++------
hadoop-hdds/pom.xml | 7 +++++++
hadoop-hdds/server-scm/pom.xml | 5 +++++
.../apache/hadoop/hdds/scm/pipeline/PipelineStateMap.java | 8 +++++---
.../hadoop/hdds/scm/pipeline/RatisPipelineProvider.java | 4 ++++
.../hadoop/ozone/om/ratis/OzoneManagerRatisServer.java | 3 ++-
6 files changed, 32 insertions(+), 10 deletions(-)
diff --git a/hadoop-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/storage/BlockInputStream.java b/hadoop-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/storage/BlockInputStream.java
index d53d20e..0e2c471 100644
--- a/hadoop-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/storage/BlockInputStream.java
+++ b/hadoop-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/storage/BlockInputStream.java
@@ -109,7 +109,8 @@ public class BlockInputStream extends InputStream implements Seekable {
int dataout = EOF;
if (available == EOF) {
- Preconditions.checkState (buffers == null); //should have released by now, see below
+ Preconditions
+ .checkState(buffers == null); //should have released by now, see below
} else {
dataout = Byte.toUnsignedInt(buffers.get(bufferIndex).get());
}
@@ -149,7 +150,8 @@ public class BlockInputStream extends InputStream implements Seekable {
while (len > 0) {
int available = prepareRead(len);
if (available == EOF) {
- Preconditions.checkState(buffers == null); //should have been released by now
+ Preconditions
+ .checkState(buffers == null); //should have been released by now
return total != 0 ? total : EOF;
}
buffers.get(bufferIndex).get(b, off + total, available);
@@ -167,7 +169,7 @@ public class BlockInputStream extends InputStream implements Seekable {
}
/**
- * Determines if all data in the stream has been consumed
+ * Determines if all data in the stream has been consumed.
*
* @return true if EOF, false if more data is available
*/
@@ -176,8 +178,9 @@ public class BlockInputStream extends InputStream implements Seekable {
return false;
} else {
// if there are any chunks, we better be at the last chunk for EOF
- Preconditions.checkState (((chunks == null) || chunks.isEmpty() ||
- chunkIndex == (chunks.size() - 1)), "EOF detected, but not at the last chunk");
+ Preconditions.checkState(((chunks == null) || chunks.isEmpty() ||
+ chunkIndex == (chunks.size() - 1)),
+ "EOF detected, but not at the last chunk");
return true;
}
}
@@ -247,7 +250,7 @@ public class BlockInputStream extends InputStream implements Seekable {
if (buffersRemaining()) {
// move to next available buffer
++bufferIndex;
- Preconditions.checkState (bufferIndex < buffers.size());
+ Preconditions.checkState(bufferIndex < buffers.size());
} else {
// no more buffers remaining
break;
diff --git a/hadoop-hdds/pom.xml b/hadoop-hdds/pom.xml
index a4d77ac..e7cced8 100644
--- a/hadoop-hdds/pom.xml
+++ b/hadoop-hdds/pom.xml
@@ -189,6 +189,13 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd">
<version>${junit.jupiter.version}</version>
<scope>test</scope>
</dependency>
+
+ <dependency>
+ <groupId>com.google.code.findbugs</groupId>
+ <artifactId>findbugs</artifactId>
+ <version>3.0.1</version>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
</dependencyManagement>
<dependencies>
diff --git a/hadoop-hdds/server-scm/pom.xml b/hadoop-hdds/server-scm/pom.xml
index aff0d29..33534cd 100644
--- a/hadoop-hdds/server-scm/pom.xml
+++ b/hadoop-hdds/server-scm/pom.xml
@@ -100,6 +100,11 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd">
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk15on</artifactId>
</dependency>
+ <dependency>
+ <groupId>com.google.code.findbugs</groupId>
+ <artifactId>findbugs</artifactId>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
<build>
<plugins>
diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/pipeline/PipelineStateMap.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/pipeline/PipelineStateMap.java
index 2b6c61b..8e0b62b 100644
--- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/pipeline/PipelineStateMap.java
+++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/pipeline/PipelineStateMap.java
@@ -18,6 +18,7 @@
package org.apache.hadoop.hdds.scm.pipeline;
import com.google.common.base.Preconditions;
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
import org.apache.commons.lang3.builder.HashCodeBuilder;
import org.apache.hadoop.hdds.protocol.proto.HddsProtos.ReplicationFactor;
import org.apache.hadoop.hdds.protocol.proto.HddsProtos.ReplicationType;
@@ -328,13 +329,13 @@ class PipelineStateMap {
return updatedPipeline;
}
- private class PipelineQuery {
+ private static class PipelineQuery {
private ReplicationType type;
private ReplicationFactor factor;
PipelineQuery(ReplicationType type, ReplicationFactor factor) {
- this.type = type;
- this.factor = factor;
+ this.type = Preconditions.checkNotNull(type);
+ this.factor = Preconditions.checkNotNull(factor);
}
PipelineQuery(Pipeline pipeline) {
@@ -343,6 +344,7 @@ class PipelineStateMap {
}
@Override
+ @SuppressFBWarnings("NP_EQUALS_SHOULD_HANDLE_NULL_ARGUMENT")
public boolean equals(Object other) {
if (this == other) {
return true;
diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/pipeline/RatisPipelineProvider.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/pipeline/RatisPipelineProvider.java
index ea7d370..6126d58 100644
--- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/pipeline/RatisPipelineProvider.java
+++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/pipeline/RatisPipelineProvider.java
@@ -38,6 +38,8 @@ import java.util.List;
import java.util.Set;
import java.util.stream.Collectors;
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+
/**
* Implements Api for creating ratis pipelines.
*/
@@ -48,6 +50,8 @@ public class RatisPipelineProvider implements PipelineProvider {
private final Configuration conf;
private static Scheduler scheduler;
+ //TODO static Scheduler should be removed!!!! HDDS-1128
+ @SuppressFBWarnings("ST_WRITE_TO_STATIC_FROM_INSTANCE_METHOD")
RatisPipelineProvider(NodeManager nodeManager,
PipelineStateManager stateManager, Configuration conf) {
this.nodeManager = nodeManager;
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/ratis/OzoneManagerRatisServer.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/ratis/OzoneManagerRatisServer.java
index 8baa03b..e03293a 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/ratis/OzoneManagerRatisServer.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/ratis/OzoneManagerRatisServer.java
@@ -23,6 +23,7 @@ import com.google.common.base.Strings;
import java.io.File;
import java.io.IOException;
import java.net.InetSocketAddress;
+import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
@@ -357,6 +358,6 @@ public final class OzoneManagerRatisServer {
}
private UUID getRaftGroupIdFromOmServiceId(String omServiceId) {
- return UUID.nameUUIDFromBytes(omServiceId.getBytes());
+ return UUID.nameUUIDFromBytes(omServiceId.getBytes(StandardCharsets.UTF_8));
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org