This is an automated email from the ASF dual-hosted git repository. iemejia pushed a commit to branch branch-1.9 in repository https://gitbox.apache.org/repos/asf/avro.git
commit 1219f3e5e3904a02d3969ff8c0cd1cb485adf10e Author: Fokko Driesprong <[email protected]> AuthorDate: Sun Sep 1 20:34:26 2019 +0200 AVRO-2543: Bump grpc.version from 1.19.0 to 1.23.0 (#635) * AVRO-2543: Bump grpc.version from 1.19.0 to 1.23.0 * Import it from Guava instead --- .../src/main/java/org/apache/avro/grpc/AvroRequestMarshaller.java | 4 ++-- .../src/main/java/org/apache/avro/grpc/AvroResponseMarshaller.java | 4 ++-- lang/java/pom.xml | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lang/java/grpc/src/main/java/org/apache/avro/grpc/AvroRequestMarshaller.java b/lang/java/grpc/src/main/java/org/apache/avro/grpc/AvroRequestMarshaller.java index 61bb185..1eddc80 100644 --- a/lang/java/grpc/src/main/java/org/apache/avro/grpc/AvroRequestMarshaller.java +++ b/lang/java/grpc/src/main/java/org/apache/avro/grpc/AvroRequestMarshaller.java @@ -18,6 +18,7 @@ package org.apache.avro.grpc; +import com.google.common.io.ByteStreams; import org.apache.avro.Protocol; import org.apache.avro.Schema; import org.apache.avro.generic.GenericRecord; @@ -34,7 +35,6 @@ import java.io.OutputStream; import io.grpc.MethodDescriptor; import io.grpc.Status; -import io.grpc.internal.IoUtils; /** Marshaller for Avro RPC request. */ public class AvroRequestMarshaller implements MethodDescriptor.Marshaller<Object[]> { @@ -84,7 +84,7 @@ public class AvroRequestMarshaller implements MethodDescriptor.Marshaller<Object public int drainTo(OutputStream target) throws IOException { int written; if (getPartial() != null) { - written = (int) IoUtils.copy(getPartial(), target); + written = (int) ByteStreams.copy(getPartial(), target); } else { Schema reqSchema = message.getRequest(); CountingOutputStream outputStream = new CountingOutputStream(target); diff --git a/lang/java/grpc/src/main/java/org/apache/avro/grpc/AvroResponseMarshaller.java b/lang/java/grpc/src/main/java/org/apache/avro/grpc/AvroResponseMarshaller.java index 171a106..ab51f24 100644 --- a/lang/java/grpc/src/main/java/org/apache/avro/grpc/AvroResponseMarshaller.java +++ b/lang/java/grpc/src/main/java/org/apache/avro/grpc/AvroResponseMarshaller.java @@ -18,6 +18,7 @@ package org.apache.avro.grpc; +import com.google.common.io.ByteStreams; import org.apache.avro.AvroRuntimeException; import org.apache.avro.Protocol; import org.apache.avro.io.BinaryDecoder; @@ -35,7 +36,6 @@ import java.io.OutputStream; import io.grpc.MethodDescriptor; import io.grpc.Status; -import io.grpc.internal.IoUtils; /** Marshaller for Avro RPC response. */ public class AvroResponseMarshaller implements MethodDescriptor.Marshaller<Object> { @@ -88,7 +88,7 @@ public class AvroResponseMarshaller implements MethodDescriptor.Marshaller<Objec public int drainTo(OutputStream target) throws IOException { int written; if (getPartial() != null) { - written = (int) IoUtils.copy(getPartial(), target); + written = (int) ByteStreams.copy(getPartial(), target); } else { written = writeResponse(target); } diff --git a/lang/java/pom.xml b/lang/java/pom.xml index f1dd42a..4b6c24f 100644 --- a/lang/java/pom.xml +++ b/lang/java/pom.xml @@ -60,7 +60,7 @@ <easymock.version>4.0.2</easymock.version> <hamcrest.version>2.1</hamcrest.version> <joda.version>2.10.1</joda.version> - <grpc.version>1.19.0</grpc.version> + <grpc.version>1.23.0</grpc.version> <netty-codec-http2.version>4.1.45.Final</netty-codec-http2.version> <zstd-jni.version>1.4.3-1</zstd-jni.version> <!-- version properties for plugins -->
