Skip to content

Commit 76d0955

Browse files
ejona86ejona86
committed
Clean up warnings
-Xlint:-options is not available on some earlier JDK 7s, but won't fail if unsupported. It prevents the warning wanting bootclasspath specified since target/source is 1.6.
1 parent 7e8a02c commit 76d0955

File tree

10 files changed

+21
-9
lines changed

10 files changed

+21
-9
lines changed

‎auth/src/test/java/io/grpc/auth/ClientAuthInterceptorTests.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,16 +48,16 @@ public class ClientAuthInterceptorTests {
4848
Credentials credentials;
4949

5050
@Mock
51-
MethodDescriptor descriptor;
51+
MethodDescriptor<String, Integer> descriptor;
5252

5353
@Mock
54-
Call.Listener listener;
54+
Call.Listener<Integer> listener;
5555

5656
@Mock
5757
Channel channel;
5858

5959
@Mock
60-
Call call;
60+
Call<String, Integer> call;
6161

6262
ClientAuthInterceptor interceptor;
6363

@@ -117,7 +117,7 @@ public AccessToken refreshAccessToken() throws IOException {
117117
}
118118
};
119119
interceptor = new ClientAuthInterceptor(oAuth2Credentials, Executors.newSingleThreadExecutor());
120-
Call interceptedCall = interceptor.interceptCall(descriptor, channel);
120+
Call<String, Integer> interceptedCall = interceptor.interceptCall(descriptor, channel);
121121
Metadata.Headers headers = new Metadata.Headers();
122122
interceptedCall.start(listener, headers);
123123
verify(call).start(listener, headers);

‎build.gradle‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ subprojects {
1717
mavenLocal()
1818
}
1919

20-
compileJava {
21-
options.compilerArgs << "-Xlint:unchecked"
22-
options.encoding = "UTF-8"
20+
[compileJava, compileTestJava].each() {
21+
it.options.compilerArgs += ["-Xlint:unchecked", "-Xlint:deprecation", "-Xlint:-options"]
22+
it.options.encoding = "UTF-8"
2323
}
2424

2525
javadoc.options.encoding = "UTF-8"

‎compiler/src/java_plugin/cpp/java_generator.cpp‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,8 @@ static void PrintServiceDescriptor(
167167
// The reconfiguring constructor
168168
p->Print(
169169
*vars,
170-
"\nprivate $service_name$ServiceDescriptor(\n"
170+
"\n@SuppressWarnings(\"unchecked\")\n"
171+
"private $service_name$ServiceDescriptor(\n"
171172
" $Map$<$String$, $MethodDescriptor$<?, ?>> methodMap) {\n");
172173
p->Indent();
173174
for (int i = 0; i < service->method_count(); ++i) {

‎compiler/src/test/golden/TestService.java.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,7 @@ public class TestServiceGrpc {
9090
"grpc.testing.TestService", METHOD_HALF_DUPLEX_CALL);
9191
}
9292

93+
@SuppressWarnings("unchecked")
9394
private TestServiceServiceDescriptor(
9495
java.util.Map<java.lang.String, io.grpc.MethodDescriptor<?, ?>> methodMap) {
9596
unaryCall = (io.grpc.MethodDescriptor<io.grpc.testing.integration.Test.SimpleRequest,

‎compiler/src/test/golden/TestServiceNano.java.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,7 @@ public class TestServiceGrpc {
152152
"grpc.testing.TestService", METHOD_HALF_DUPLEX_CALL);
153153
}
154154

155+
@SuppressWarnings("unchecked")
155156
private TestServiceServiceDescriptor(
156157
java.util.Map<java.lang.String, io.grpc.MethodDescriptor<?, ?>> methodMap) {
157158
unaryCall = (io.grpc.MethodDescriptor<io.grpc.testing.integration.Test.SimpleRequest,

‎core/src/main/java/io/grpc/Status.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -430,6 +430,8 @@ public Status getStatus() {
430430
}
431431
}
432432

433+
// We support Guava 14
434+
@SuppressWarnings("deprecation")
433435
@Override
434436
public String toString() {
435437
return Objects.toStringHelper(this)

‎core/src/main/java/io/grpc/transport/AbstractClientStream.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -289,6 +289,8 @@ public void cancel() {
289289
*/
290290
protected abstract void sendCancel();
291291

292+
// We support Guava 14
293+
@SuppressWarnings("deprecation")
292294
@Override
293295
protected Objects.ToStringHelper toStringHelper() {
294296
Objects.ToStringHelper toStringHelper = super.toStringHelper();

‎core/src/main/java/io/grpc/transport/AbstractStream.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -306,6 +306,8 @@ public String toString() {
306306
return toStringHelper().toString();
307307
}
308308

309+
// We support Guava 14
310+
@SuppressWarnings("deprecation")
309311
protected Objects.ToStringHelper toStringHelper() {
310312
return Objects.toStringHelper(this)
311313
.add("id", id())

‎core/src/test/java/io/grpc/ClientInterceptorsTest.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,6 +175,7 @@ public void start(Call.Listener<RespT> responseListener, Metadata.Headers header
175175
}
176176
};
177177
Channel intercepted = ClientInterceptors.intercept(channel, interceptor);
178+
@SuppressWarnings("unchecked")
178179
Call.Listener<Integer> listener = mock(Call.Listener.class);
179180
Call<String, Integer> interceptedCall = intercepted.newCall(method);
180181
// start() on the intercepted call will eventually reach the call created by the real channel
@@ -209,11 +210,12 @@ public void onHeaders(Metadata.Headers headers) {
209210
}
210211
};
211212
Channel intercepted = ClientInterceptors.intercept(channel, interceptor);
213+
@SuppressWarnings("unchecked")
212214
Call.Listener<Integer> listener = mock(Call.Listener.class);
213215
Call<String, Integer> interceptedCall = intercepted.newCall(method);
214216
interceptedCall.start(listener, new Metadata.Headers());
215217
// Capture the underlying call listener that will receive headers from the transport.
216-
ArgumentCaptor<Call.Listener> captor = ArgumentCaptor.forClass(Call.Listener.class);
218+
ArgumentCaptor<Call.Listener<Integer>> captor = ArgumentCaptor.forClass(null);
217219
verify(call).start(captor.capture(), Mockito.<Metadata.Headers>any());
218220
Metadata.Headers inboundHeaders = new Metadata.Headers();
219221
// Simulate that a headers arrives on the underlying call listener.

‎integration-testing/src/main/java/io/grpc/testing/integration/TestServiceGrpc.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,7 @@ private TestServiceServiceDescriptor() {
100100
"grpc.testing.TestService", METHOD_HALF_DUPLEX_CALL);
101101
}
102102

103+
@SuppressWarnings("unchecked")
103104
private TestServiceServiceDescriptor(
104105
java.util.Map<java.lang.String, io.grpc.MethodDescriptor<?, ?>> methodMap) {
105106
emptyCall = (io.grpc.MethodDescriptor<com.google.protobuf.EmptyProtos.Empty,

0 commit comments

Comments
 (0)