Skip to content

Commit df21e40

Browse files
authored
all: fix lint
1 parent 56e980c commit df21e40

File tree

9 files changed

+60
-57
lines changed

9 files changed

+60
-57
lines changed

alts/src/test/java/io/grpc/alts/HandshakerServiceChannelTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
public final class HandshakerServiceChannelTest {
3838
@Rule
3939
public final GrpcCleanupRule grpcCleanup = new GrpcCleanupRule();
40-
private Server server = grpcCleanup.register(
40+
private final Server server = grpcCleanup.register(
4141
ServerBuilder.forPort(0)
4242
.addService(new SimpleServiceGrpc.SimpleServiceImplBase() {
4343
@Override

alts/src/test/java/io/grpc/alts/internal/TsiFrameHandlerTest.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,8 @@ public void writeAndFlush_shouldBeIgnoredAfterClose() throws InterruptedExceptio
8787
try {
8888
channel.checkException();
8989
} catch (Exception e) {
90-
throw new AssertionError("Any attempt after close should be ignored without out exception");
90+
throw new AssertionError(
91+
"Any attempt after close should be ignored without out exception", e);
9192
}
9293
}
9394

core/src/main/java/io/grpc/Codec.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public interface Codec extends Compressor, Decompressor {
3232
* A gzip compressor and decompressor. In the future this will likely support other
3333
* compression methods, such as compression level.
3434
*/
35-
public static final class Gzip implements Codec {
35+
final class Gzip implements Codec {
3636
@Override
3737
public String getMessageEncoding() {
3838
return "gzip";
@@ -53,15 +53,15 @@ public InputStream decompress(InputStream is) throws IOException {
5353
* The "identity", or "none" codec. This codec is special in that it can be used to explicitly
5454
* disable Call compression on a Channel that by default compresses.
5555
*/
56-
public static final class Identity implements Codec {
56+
final class Identity implements Codec {
5757
/**
5858
* Special sentinel codec indicating that no compression should be used. Users should use
5959
* reference equality to see if compression is disabled.
6060
*/
6161
public static final Codec NONE = new Identity();
6262

6363
@Override
64-
public InputStream decompress(InputStream is) throws IOException {
64+
public InputStream decompress(InputStream is) {
6565
return is;
6666
}
6767

@@ -71,7 +71,7 @@ public String getMessageEncoding() {
7171
}
7272

7373
@Override
74-
public OutputStream compress(OutputStream os) throws IOException {
74+
public OutputStream compress(OutputStream os) {
7575
return os;
7676
}
7777

examples/src/test/java/io/grpc/examples/authentication/AuthClientTest.java

+41-39
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,25 @@
1616

1717
package io.grpc.examples.authentication;
1818

19-
import io.grpc.*;
19+
import static org.junit.Assert.assertEquals;
20+
import static org.mockito.AdditionalAnswers.delegatesTo;
21+
import static org.mockito.Mockito.mock;
22+
import static org.mockito.Mockito.verify;
23+
24+
import io.grpc.Metadata;
25+
import io.grpc.ServerCall;
26+
import io.grpc.ServerCallHandler;
27+
import io.grpc.ServerInterceptors;
2028
import io.grpc.examples.helloworld.GreeterGrpc;
2129
import io.grpc.examples.helloworld.HelloReply;
2230
import io.grpc.examples.helloworld.HelloRequest;
2331
import io.grpc.inprocess.InProcessChannelBuilder;
2432
import io.grpc.inprocess.InProcessServerBuilder;
2533
import io.grpc.ServerCall.Listener;
2634
import io.grpc.ServerInterceptor;
35+
import io.grpc.stub.StreamObserver;
2736
import io.grpc.testing.GrpcCleanupRule;
37+
import java.io.IOException;
2838
import org.junit.Before;
2939
import org.junit.Rule;
3040
import org.junit.Test;
@@ -33,13 +43,6 @@
3343
import org.mockito.ArgumentCaptor;
3444
import org.mockito.Matchers;
3545

36-
import java.io.IOException;
37-
38-
import static org.junit.Assert.assertEquals;
39-
import static org.mockito.AdditionalAnswers.delegatesTo;
40-
import static org.mockito.Mockito.mock;
41-
import static org.mockito.Mockito.verify;
42-
4346
/**
4447
* Unit tests for {@link AuthClient} testing the default and non-default tokens
4548
*
@@ -55,13 +58,13 @@ public class AuthClientTest {
5558
public final GrpcCleanupRule grpcCleanup = new GrpcCleanupRule();
5659

5760
private final ServerInterceptor mockServerInterceptor = mock(ServerInterceptor.class, delegatesTo(
58-
new ServerInterceptor() {
59-
@Override
60-
public <ReqT, RespT> Listener<ReqT> interceptCall(
61-
ServerCall<ReqT, RespT> call, Metadata headers, ServerCallHandler<ReqT, RespT> next) {
62-
return next.startCall(call, headers);
63-
}
64-
}));
61+
new ServerInterceptor() {
62+
@Override
63+
public <ReqT, RespT> Listener<ReqT> interceptCall(
64+
ServerCall<ReqT, RespT> call, Metadata headers, ServerCallHandler<ReqT, RespT> next) {
65+
return next.startCall(call, headers);
66+
}
67+
}));
6568

6669
private AuthClient client;
6770

@@ -73,64 +76,63 @@ public void setUp() throws IOException {
7376

7477
// Create a server, add service, start, and register for automatic graceful shutdown.
7578
grpcCleanup.register(InProcessServerBuilder.forName(serverName).directExecutor()
76-
.addService(ServerInterceptors.intercept(new GreeterGrpc.GreeterImplBase() {
79+
.addService(ServerInterceptors.intercept(
80+
new GreeterGrpc.GreeterImplBase() {
7781

7882
@Override
79-
public void sayHello(io.grpc.examples.helloworld.HelloRequest request,
80-
io.grpc.stub.StreamObserver<io.grpc.examples.helloworld.HelloReply> responseObserver) {
81-
HelloReply reply = HelloReply.newBuilder().setMessage("AuthClientTest user=" + request.getName()).build();
83+
public void sayHello(
84+
HelloRequest request, StreamObserver<HelloReply> responseObserver) {
85+
HelloReply reply = HelloReply.newBuilder()
86+
.setMessage("AuthClientTest user=" + request.getName()).build();
8287
responseObserver.onNext(reply);
8388
responseObserver.onCompleted();
8489
}
85-
}, mockServerInterceptor))
86-
.build().start());
90+
},
91+
mockServerInterceptor))
92+
.build().start());
8793

8894
// Create an AuthClient using the in-process channel;
8995
client = new AuthClient(InProcessChannelBuilder.forName(serverName).directExecutor());
9096
}
9197

9298
/**
93-
* Test default JWT token used
94-
*
95-
* @throws Exception
99+
* Test default JWT token used.
96100
*/
97101
@Test
98-
public void defaultTokenDeliveredToServer() throws Exception {
102+
public void defaultTokenDeliveredToServer() {
99103
ArgumentCaptor<Metadata> metadataCaptor = ArgumentCaptor.forClass(Metadata.class);
100104
ArgumentCaptor<HelloRequest> requestCaptor = ArgumentCaptor.forClass(HelloRequest.class);
101105

102106
String retVal = client.greet("default token test");
103107

104108
verify(mockServerInterceptor).interceptCall(
105-
Matchers.<ServerCall<HelloRequest, HelloReply>>any(),
106-
metadataCaptor.capture(),
107-
Matchers.<ServerCallHandler<HelloRequest, HelloReply>>any());
109+
Matchers.<ServerCall<HelloRequest, HelloReply>>any(),
110+
metadataCaptor.capture(),
111+
Matchers.<ServerCallHandler<HelloRequest, HelloReply>>any());
108112
assertEquals(
109-
"my-default-token",
110-
metadataCaptor.getValue().get(Constant.JWT_METADATA_KEY));
113+
"my-default-token",
114+
metadataCaptor.getValue().get(Constant.JWT_METADATA_KEY));
111115
assertEquals("AuthClientTest user=default token test", retVal);
112116
}
113117

114118
/**
115-
* Test non-default JWT token used
116-
*
117-
* @throws Exception
119+
* Test non-default JWT token used.
118120
*/
119121
@Test
120-
public void nonDefaultTokenDeliveredToServer() throws Exception {
122+
public void nonDefaultTokenDeliveredToServer() {
121123
ArgumentCaptor<Metadata> metadataCaptor = ArgumentCaptor.forClass(Metadata.class);
122124
ArgumentCaptor<HelloRequest> requestCaptor = ArgumentCaptor.forClass(HelloRequest.class);
123125

124126
client.setTokenValue("non-default-token");
125127
String retVal = client.greet("non default token test");
126128

127129
verify(mockServerInterceptor).interceptCall(
128-
Matchers.<ServerCall<HelloRequest, HelloReply>>any(),
129-
metadataCaptor.capture(),
130-
Matchers.<ServerCallHandler<HelloRequest, HelloReply>>any());
130+
Matchers.<ServerCall<HelloRequest, HelloReply>>any(),
131+
metadataCaptor.capture(),
132+
Matchers.<ServerCallHandler<HelloRequest, HelloReply>>any());
131133
assertEquals(
132-
"non-default-token",
133-
metadataCaptor.getValue().get(Constant.JWT_METADATA_KEY));
134+
"non-default-token",
135+
metadataCaptor.getValue().get(Constant.JWT_METADATA_KEY));
134136
assertEquals("AuthClientTest user=non default token test", retVal);
135137
}
136138
}

okhttp/src/main/java/io/grpc/okhttp/OkHttpClientTransport.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ private static Map<ErrorCode, Status> buildErrorCodeToStatusMap() {
182182
private int maxConcurrentStreams = 0;
183183
@SuppressWarnings("JdkObsolete") // Usage is bursty; want low memory usage when empty
184184
@GuardedBy("lock")
185-
private LinkedList<OkHttpClientStream> pendingStreams = new LinkedList<>();
185+
private final LinkedList<OkHttpClientStream> pendingStreams = new LinkedList<>();
186186
private final ConnectionSpec connectionSpec;
187187
private FrameWriter testFrameWriter;
188188
private ScheduledExecutorService scheduler;

okhttp/src/test/java/io/grpc/okhttp/AsyncSinkTest.java

+6-6
Original file line numberDiff line numberDiff line change
@@ -51,11 +51,11 @@
5151
@RunWith(JUnit4.class)
5252
public class AsyncSinkTest {
5353

54-
private Socket socket = mock(Socket.class);
55-
private Sink mockedSink = mock(VoidSink.class, CALLS_REAL_METHODS);
56-
private QueueingExecutor queueingExecutor = new QueueingExecutor();
57-
private TransportExceptionHandler exceptionHandler = mock(TransportExceptionHandler.class);
58-
private AsyncSink sink =
54+
private final Socket socket = mock(Socket.class);
55+
private final Sink mockedSink = mock(VoidSink.class, CALLS_REAL_METHODS);
56+
private final QueueingExecutor queueingExecutor = new QueueingExecutor();
57+
private final TransportExceptionHandler exceptionHandler = mock(TransportExceptionHandler.class);
58+
private final AsyncSink sink =
5959
AsyncSink.sink(new SerializingExecutor(queueingExecutor), exceptionHandler);
6060

6161
@Before
@@ -236,7 +236,7 @@ public void write_callSinkIfBufferIsLargerThanSegmentSize() throws IOException {
236236
// flush should write everything.
237237
sink.flush();
238238
queueingExecutor.runAll();
239-
verify(mockedSink).write(any(Buffer.class),eq((long) payloadSize - completeSegmentBytes));
239+
verify(mockedSink).write(any(Buffer.class), eq((long) payloadSize - completeSegmentBytes));
240240
verify(mockedSink).flush();
241241
}
242242

okhttp/src/test/java/io/grpc/okhttp/ExceptionHandlingFrameWriterTest.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,10 @@
3535
@RunWith(JUnit4.class)
3636
public class ExceptionHandlingFrameWriterTest {
3737

38-
private FrameWriter mockedFrameWriter = mock(FrameWriter.class);
39-
private TransportExceptionHandler transportExceptionHandler =
38+
private final FrameWriter mockedFrameWriter = mock(FrameWriter.class);
39+
private final TransportExceptionHandler transportExceptionHandler =
4040
mock(TransportExceptionHandler.class);
41-
private ExceptionHandlingFrameWriter exceptionHandlingFrameWriter =
41+
private final ExceptionHandlingFrameWriter exceptionHandlingFrameWriter =
4242
new ExceptionHandlingFrameWriter(transportExceptionHandler, mockedFrameWriter);
4343

4444
@Test

okhttp/src/test/java/io/grpc/okhttp/OkHttpClientTransportTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -2117,7 +2117,7 @@ private static TransportStats getTransportStats(InternalInstrumented<SocketStats
21172117
private static class MockFrameWriter implements FrameWriter {
21182118

21192119
private Socket socket;
2120-
private Queue<Buffer> capturedBuffer;
2120+
private final Queue<Buffer> capturedBuffer;
21212121

21222122
public MockFrameWriter(Socket socket, Queue<Buffer> capturedBuffer) {
21232123
// Sets a socket to close. Some tests assumes that FrameWriter will close underlying sink

protobuf-lite/src/main/java/io/grpc/protobuf/lite/ProtoInputStream.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ public int drainTo(OutputStream target) throws IOException {
6161
}
6262

6363
@Override
64-
public int read() throws IOException {
64+
public int read() {
6565
if (message != null) {
6666
partial = new ByteArrayInputStream(message.toByteArray());
6767
message = null;

0 commit comments

Comments
 (0)