grpc
/
grpc-java
mirror of https://github.com/grpc/grpc-java.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

all: update to guava 20

This commit is contained in:
Carl Mastrangelo 2016-12-16 15:15:17 -08:00 committed by GitHub
parent f8f569e078
commit ce9d152dff
6 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@ -61,7 +61,7 @@ subprojects {
protocPluginBaseName = 'protoc-gen-grpc-java' protocPluginBaseName = 'protoc-gen-grpc-java'
javaPluginPath = "$rootDir/compiler/build/exe/java_plugin/$protocPluginBaseName$exeSuffix" javaPluginPath = "$rootDir/compiler/build/exe/java_plugin/$protocPluginBaseName$exeSuffix"
guavaVersion = '19.0' guavaVersion = '20.0'
protobufVersion = '3.1.0' protobufVersion = '3.1.0'
protobufNanoVersion = '3.0.0-alpha-5' protobufNanoVersion = '3.0.0-alpha-5'

2
core/src/main/java/io/grpc/internal/LogExceptionRunnable.java
View File

@ -58,7 +58,7 @@ public final class LogExceptionRunnable implements Runnable {
task.run(); task.run();
} catch (Throwable t) { } catch (Throwable t) {
log.log(Level.SEVERE, "Exception while executing runnable " + task, t); log.log(Level.SEVERE, "Exception while executing runnable " + task, t);
Throwables.propagateIfPossible(t); Throwables.throwIfUnchecked(t);
throw new AssertionError(t); throw new AssertionError(t);
} }
} }

4
core/src/main/java/io/grpc/internal/ServerCallImpl.java
View File

@ -74,7 +74,7 @@ final class ServerCallImpl<ReqT, RespT> extends ServerCall<ReqT, RespT> {
private Compressor compressor; private Compressor compressor;
ServerCallImpl(ServerStream stream, MethodDescriptor<ReqT, RespT> method, ServerCallImpl(ServerStream stream, MethodDescriptor<ReqT, RespT> method,
Metadata inboundHeaders, Context.CancellableContext context, StatsTraceContext statsTraceCtx, Metadata inboundHeaders, Context.CancellableContext context, StatsTraceContext statsTraceCtx,
DecompressorRegistry decompressorRegistry, CompressorRegistry compressorRegistry) { DecompressorRegistry decompressorRegistry, CompressorRegistry compressorRegistry) {
this.stream = stream; this.stream = stream;
this.method = method; this.method = method;
@ -249,7 +249,7 @@ final class ServerCallImpl<ReqT, RespT> extends ServerCall<ReqT, RespT> {
} finally { } finally {
if (t != null) { if (t != null) {
// TODO(carl-mastrangelo): Maybe log e here. // TODO(carl-mastrangelo): Maybe log e here.
Throwables.propagateIfPossible(t); Throwables.throwIfUnchecked(t);
throw new RuntimeException(t); throw new RuntimeException(t);
} }
} }

2
examples/android/helloworld/app/build.gradle
View File

@ -53,7 +53,7 @@ protobuf {
dependencies { dependencies {
compile 'com.android.support:appcompat-v7:22.1.1' compile 'com.android.support:appcompat-v7:22.1.1'
compile 'com.google.code.findbugs:jsr305:3.0.0' compile 'com.google.code.findbugs:jsr305:3.0.0'
compile 'com.google.guava:guava:18.0' compile 'com.google.guava:guava:20.0'
compile 'com.squareup.okhttp:okhttp:2.2.0' compile 'com.squareup.okhttp:okhttp:2.2.0'
// You need to build grpc-java to obtain these libraries below. // You need to build grpc-java to obtain these libraries below.

2
examples/android/routeguide/app/build.gradle
View File

@ -51,7 +51,7 @@ protobuf {
dependencies { dependencies {
compile 'com.android.support:appcompat-v7:23.+' compile 'com.android.support:appcompat-v7:23.+'
compile 'com.google.code.findbugs:jsr305:3.0.0' compile 'com.google.code.findbugs:jsr305:3.0.0'
compile 'com.google.guava:guava:18.0' compile 'com.google.guava:guava:20.0'
compile 'com.squareup.okhttp:okhttp:2.2.0' compile 'com.squareup.okhttp:okhttp:2.2.0'
// You need to build grpc-java to obtain these libraries below. // You need to build grpc-java to obtain these libraries below.

2
interop-testing/src/main/java/io/grpc/testing/integration/AbstractInteropTest.java
View File

@ -1052,7 +1052,7 @@ public abstract class AbstractInteropTest {
HostAndPort remoteAddress = HostAndPort.fromString(serverCallCapture.get().attributes() HostAndPort remoteAddress = HostAndPort.fromString(serverCallCapture.get().attributes()
.get(Grpc.TRANSPORT_ATTR_REMOTE_ADDR).toString()); .get(Grpc.TRANSPORT_ATTR_REMOTE_ADDR).toString());
assertEquals(expectedRemoteAddress, remoteAddress.getHostText()); assertEquals(expectedRemoteAddress, remoteAddress.getHost());
} }
/** Helper for asserting TLS info in SSLSession {@link io.grpc.ServerCall#attributes()} */ /** Helper for asserting TLS info in SSLSession {@link io.grpc.ServerCall#attributes()} */