HDDS-1129. Fix findbug/checkstyle errors hdds projects. Contributed by Elek, Marton.

This commit is contained in:
Márton Elek 2019-02-18 18:39:57 +01:00
parent eedcc8e26e
commit 7c802c42dc
No known key found for this signature in database
GPG Key ID: D51EA8F00EE79B28
6 changed files with 32 additions and 10 deletions

View File

@ -109,7 +109,8 @@ public synchronized int read()
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 synchronized int read(byte[] b, int off, int len) throws IOException {
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 synchronized int read(byte[] b, int off, int len) throws IOException {
}
/**
* 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 @@ private boolean blockStreamEOF() {
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 @@ private boolean buffersHaveData() {
if (buffersRemaining()) {
// move to next available buffer
++bufferIndex;
Preconditions.checkState (bufferIndex < buffers.size());
Preconditions.checkState(bufferIndex < buffers.size());
} else {
// no more buffers remaining
break;

View File

@ -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>

View File

@ -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>

View File

@ -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 @@ Pipeline updatePipelineState(PipelineID pipelineID, PipelineState state)
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 @@ private class PipelineQuery {
}
@Override
@SuppressFBWarnings("NP_EQUALS_SHOULD_HANDLE_NULL_ARGUMENT")
public boolean equals(Object other) {
if (this == other) {
return true;

View File

@ -38,6 +38,8 @@
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;

View File

@ -23,6 +23,7 @@
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 static String getOMRatisDirectory(Configuration conf) {
}
private UUID getRaftGroupIdFromOmServiceId(String omServiceId) {
return UUID.nameUUIDFromBytes(omServiceId.getBytes());
return UUID.nameUUIDFromBytes(omServiceId.getBytes(StandardCharsets.UTF_8));
}
}