update to MethodDescriptor methods instead of fields @buchgr Closes #4790. PiperOrigin-RevId: 188332795
diff --git a/src/main/java/com/google/devtools/build/lib/remote/ByteStreamUploader.java b/src/main/java/com/google/devtools/build/lib/remote/ByteStreamUploader.java index 000bfc3..75d58ad 100644 --- a/src/main/java/com/google/devtools/build/lib/remote/ByteStreamUploader.java +++ b/src/main/java/com/google/devtools/build/lib/remote/ByteStreamUploader.java
@@ -342,7 +342,7 @@ CallOptions.DEFAULT .withCallCredentials(callCredentials) .withDeadlineAfter(callTimeoutSecs, SECONDS); - call = channel.newCall(ByteStreamGrpc.METHOD_WRITE, callOptions); + call = channel.newCall(ByteStreamGrpc.getWriteMethod(), callOptions); ClientCall.Listener<WriteResponse> callListener = new ClientCall.Listener<WriteResponse>() {
diff --git a/src/test/java/com/google/devtools/build/lib/remote/ByteStreamUploaderTest.java b/src/test/java/com/google/devtools/build/lib/remote/ByteStreamUploaderTest.java index 80febbc..01bb2f1 100644 --- a/src/test/java/com/google/devtools/build/lib/remote/ByteStreamUploaderTest.java +++ b/src/test/java/com/google/devtools/build/lib/remote/ByteStreamUploaderTest.java
@@ -468,23 +468,26 @@ ServerServiceDefinition service = ServerServiceDefinition.builder(ByteStreamGrpc.SERVICE_NAME) - .addMethod(ByteStreamGrpc.METHOD_WRITE, - new ServerCallHandler<WriteRequest, WriteResponse>() { - @Override - public Listener<WriteRequest> startCall(ServerCall<WriteRequest, WriteResponse> call, - Metadata headers) { - // Don't request() any messages from the client, so that the client will be blocked - // on flow control and thus the call will sit there idle long enough to receive the - // cancellation. - return new Listener<WriteRequest>() { + .addMethod( + ByteStreamGrpc.getWriteMethod(), + new ServerCallHandler<WriteRequest, WriteResponse>() { @Override - public void onCancel() { - cancellations.countDown(); + public Listener<WriteRequest> startCall( + ServerCall<WriteRequest, WriteResponse> call, Metadata headers) { + // Don't request() any messages from the client, so that the client will be + // blocked + // on flow control and thus the call will sit there idle long enough to receive + // the + // cancellation. + return new Listener<WriteRequest>() { + @Override + public void onCancel() { + cancellations.countDown(); + } + }; } - }; - } - }) - .build(); + }) + .build(); serviceRegistry.addService(service);