You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ratis.apache.org by ar...@apache.org on 2020/04/03 17:07:26 UTC
[incubator-ratis] branch master updated: RATIS-772. Fix checkstyle
violations in ratis-grpc. Contributed by Dinesh Chitlangia.
This is an automated email from the ASF dual-hosted git repository.
arp pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-ratis.git
The following commit(s) were added to refs/heads/master by this push:
new cfd7c06 RATIS-772. Fix checkstyle violations in ratis-grpc. Contributed by Dinesh Chitlangia.
cfd7c06 is described below
commit cfd7c06079a7e14ae0684f8a0482bd74b9b3fb47
Author: Arpit Agarwal <aa...@cloudera.com>
AuthorDate: Fri Apr 3 10:06:55 2020 -0700
RATIS-772. Fix checkstyle violations in ratis-grpc. Contributed by Dinesh Chitlangia.
Change-Id: I9395b27f208269f394f44b24c4ec6a8b673296ef
---
.../org/apache/ratis/grpc/client/GrpcClientProtocolClient.java | 4 +++-
.../src/main/java/org/apache/ratis/grpc/client/GrpcClientRpc.java | 3 ++-
.../main/java/org/apache/ratis/grpc/client/GrpcOutputStream.java | 4 ++--
.../org/apache/ratis/grpc/server/GrpcAdminProtocolService.java | 3 ++-
.../main/java/org/apache/ratis/grpc/server/GrpcLogAppender.java | 7 +++++--
.../src/main/java/org/apache/ratis/grpc/server/GrpcService.java | 5 +++--
6 files changed, 17 insertions(+), 9 deletions(-)
diff --git a/ratis-grpc/src/main/java/org/apache/ratis/grpc/client/GrpcClientProtocolClient.java b/ratis-grpc/src/main/java/org/apache/ratis/grpc/client/GrpcClientProtocolClient.java
index 5aec0b5..a65f0b7 100644
--- a/ratis-grpc/src/main/java/org/apache/ratis/grpc/client/GrpcClientProtocolClient.java
+++ b/ratis-grpc/src/main/java/org/apache/ratis/grpc/client/GrpcClientProtocolClient.java
@@ -264,7 +264,9 @@ public class GrpcClientProtocolClient implements Closeable {
class AsyncStreamObservers {
/** Request map: callId -> future */
private final ReplyMap replies = new ReplyMap();
- private final StreamObserver<RaftClientReplyProto> replyStreamObserver = new StreamObserver<RaftClientReplyProto>() {
+
+ private final StreamObserver<RaftClientReplyProto> replyStreamObserver
+ = new StreamObserver<RaftClientReplyProto>() {
@Override
public void onNext(RaftClientReplyProto proto) {
final long callId = proto.getRpcReply().getCallId();
diff --git a/ratis-grpc/src/main/java/org/apache/ratis/grpc/client/GrpcClientRpc.java b/ratis-grpc/src/main/java/org/apache/ratis/grpc/client/GrpcClientRpc.java
index 1fceb1b..0450fa0 100644
--- a/ratis-grpc/src/main/java/org/apache/ratis/grpc/client/GrpcClientRpc.java
+++ b/ratis-grpc/src/main/java/org/apache/ratis/grpc/client/GrpcClientRpc.java
@@ -90,7 +90,8 @@ public class GrpcClientRpc extends RaftClientRpcWithProxy<GrpcClientProtocolClie
final RaftPeerId serverId = request.getServerId();
final GrpcClientProtocolClient proxy = getProxies().getProxy(serverId);
if (request instanceof GroupManagementRequest) {
- final GroupManagementRequestProto proto = ClientProtoUtils.toGroupManagementRequestProto((GroupManagementRequest)request);
+ final GroupManagementRequestProto proto = ClientProtoUtils.toGroupManagementRequestProto(
+ (GroupManagementRequest)request);
return ClientProtoUtils.toRaftClientReply(proxy.groupAdd(proto));
} else if (request instanceof SetConfigurationRequest) {
final SetConfigurationRequestProto setConf = ClientProtoUtils.toSetConfigurationRequestProto(
diff --git a/ratis-grpc/src/main/java/org/apache/ratis/grpc/client/GrpcOutputStream.java b/ratis-grpc/src/main/java/org/apache/ratis/grpc/client/GrpcOutputStream.java
index 7158381..6025006 100644
--- a/ratis-grpc/src/main/java/org/apache/ratis/grpc/client/GrpcOutputStream.java
+++ b/ratis-grpc/src/main/java/org/apache/ratis/grpc/client/GrpcOutputStream.java
@@ -31,7 +31,7 @@ import java.util.concurrent.atomic.AtomicLong;
public class GrpcOutputStream extends OutputStream {
/** internal buffer */
- private final byte buf[];
+ private final byte[] buf;
private int count;
private final AtomicLong seqNum = new AtomicLong();
private final ClientId clientId;
@@ -62,7 +62,7 @@ public class GrpcOutputStream extends OutputStream {
}
@Override
- public void write(byte b[], int off, int len) throws IOException {
+ public void write(byte[] b, int off, int len) throws IOException {
checkClosed();
if (off < 0 || len < 0 || off > b.length - len) {
throw new ArrayIndexOutOfBoundsException();
diff --git a/ratis-grpc/src/main/java/org/apache/ratis/grpc/server/GrpcAdminProtocolService.java b/ratis-grpc/src/main/java/org/apache/ratis/grpc/server/GrpcAdminProtocolService.java
index f2bb8f6..199e38f 100644
--- a/ratis-grpc/src/main/java/org/apache/ratis/grpc/server/GrpcAdminProtocolService.java
+++ b/ratis-grpc/src/main/java/org/apache/ratis/grpc/server/GrpcAdminProtocolService.java
@@ -37,7 +37,8 @@ public class GrpcAdminProtocolService extends AdminProtocolServiceImplBase {
}
@Override
- public void groupManagement(GroupManagementRequestProto proto, StreamObserver<RaftClientReplyProto> responseObserver) {
+ public void groupManagement(GroupManagementRequestProto proto,
+ StreamObserver<RaftClientReplyProto> responseObserver) {
final GroupManagementRequest request = ClientProtoUtils.toGroupManagementRequest(proto);
GrpcUtil.asyncCall(responseObserver, () -> protocol.groupManagementAsync(request),
ClientProtoUtils::toRaftClientReplyProto);
diff --git a/ratis-grpc/src/main/java/org/apache/ratis/grpc/server/GrpcLogAppender.java b/ratis-grpc/src/main/java/org/apache/ratis/grpc/server/GrpcLogAppender.java
index 0e6b554..94f6b1c 100644
--- a/ratis-grpc/src/main/java/org/apache/ratis/grpc/server/GrpcLogAppender.java
+++ b/ratis-grpc/src/main/java/org/apache/ratis/grpc/server/GrpcLogAppender.java
@@ -195,7 +195,8 @@ public class GrpcLogAppender extends LogAppender {
}
}
- private void sendRequest(AppendEntriesRequest request, AppendEntriesRequestProto proto, StreamObserver<AppendEntriesRequestProto> s) {
+ private void sendRequest(AppendEntriesRequest request, AppendEntriesRequestProto proto,
+ StreamObserver<AppendEntriesRequestProto> s) {
CodeInjectionForTesting.execute(GrpcService.GRPC_SEND_SERVER_REQUEST,
server.getId(), null, proto);
request.startRequestTimer();
@@ -385,6 +386,7 @@ public class GrpcLogAppender extends LogAppender {
this, RaftServerConfigKeys.Log.Appender.INSTALL_SNAPSHOT_ENABLED_KEY,
server.getId(), installSnapshotEnabled, getFollowerId(), !installSnapshotEnabled);
case UNRECOGNIZED:
+ default:
break;
}
}
@@ -557,7 +559,8 @@ public class GrpcLogAppender extends LogAppender {
@Override
public String toString() {
- return getClass().getSimpleName() + ":cid=" + callId + ",entriesCount=" + entriesCount + ",lastEntry=" + lastEntry;
+ return getClass().getSimpleName() + ":cid=" + callId + ",entriesCount=" + entriesCount + ",lastEntry=" +
+ lastEntry;
}
}
diff --git a/ratis-grpc/src/main/java/org/apache/ratis/grpc/server/GrpcService.java b/ratis-grpc/src/main/java/org/apache/ratis/grpc/server/GrpcService.java
index ec60030..8032204 100644
--- a/ratis-grpc/src/main/java/org/apache/ratis/grpc/server/GrpcService.java
+++ b/ratis-grpc/src/main/java/org/apache/ratis/grpc/server/GrpcService.java
@@ -46,12 +46,13 @@ import java.util.function.Supplier;
import static org.apache.ratis.thirdparty.io.netty.handler.ssl.SslProvider.OPENSSL;
/** A grpc implementation of {@link RaftServerRpc}. */
-public class GrpcService extends RaftServerRpcWithProxy<GrpcServerProtocolClient, PeerProxyMap<GrpcServerProtocolClient>> {
+public final class GrpcService extends RaftServerRpcWithProxy<GrpcServerProtocolClient,
+ PeerProxyMap<GrpcServerProtocolClient>> {
static final Logger LOG = LoggerFactory.getLogger(GrpcService.class);
public static final String GRPC_SEND_SERVER_REQUEST =
GrpcService.class.getSimpleName() + ".sendRequest";
- public static class Builder extends RaftServerRpc.Builder<Builder, GrpcService> {
+ public static final class Builder extends RaftServerRpc.Builder<Builder, GrpcService> {
private GrpcTlsConfig tlsConfig;
private Builder() {}