mirror of https://github.com/grpc/grpc-java.git
protobuf-nano: do not use preexisting IoUtils internal class #3450
This reverts commit 671783f
The dependency on core caused some problems with
Proguard. There are android builds that should include
protobuf-* but expect the rest of gRPC to be bundled with the
runtime environment. In that case, when Proguard inspects the
output, it will find a reference to IoUtil but fail to find the
class itself. It makes the builds easier to just avoid this
dependency.
This commit is contained in:
parent
53f56a32f1
commit
b8b5f5e046
|
|
@ -344,7 +344,7 @@ subprojects {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (!(project.name in
|
if (!(project.name in
|
||||||
["grpc-stub", "grpc-protobuf", "grpc-protobuf-lite", "grpc-thrift"])) {
|
["grpc-stub", "grpc-protobuf", "grpc-protobuf-lite", "grpc-protobuf-nano", "grpc-thrift"])) {
|
||||||
def core = pom.dependencies.find {dep -> dep.artifactId == 'grpc-core'}
|
def core = pom.dependencies.find {dep -> dep.artifactId == 'grpc-core'}
|
||||||
if (core != null) {
|
if (core != null) {
|
||||||
// Depend on specific version of grpc-core because internal package is unstable
|
// Depend on specific version of grpc-core because internal package is unstable
|
||||||
|
|
|
||||||
|
|
@ -16,14 +16,16 @@
|
||||||
|
|
||||||
package io.grpc.protobuf.nano;
|
package io.grpc.protobuf.nano;
|
||||||
|
|
||||||
|
import static com.google.common.base.Preconditions.checkNotNull;
|
||||||
|
|
||||||
import com.google.protobuf.nano.CodedInputByteBufferNano;
|
import com.google.protobuf.nano.CodedInputByteBufferNano;
|
||||||
import com.google.protobuf.nano.MessageNano;
|
import com.google.protobuf.nano.MessageNano;
|
||||||
import io.grpc.MethodDescriptor.Marshaller;
|
import io.grpc.MethodDescriptor.Marshaller;
|
||||||
import io.grpc.Status;
|
import io.grpc.Status;
|
||||||
import io.grpc.internal.IoUtils;
|
import java.io.ByteArrayOutputStream;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.io.InputStream;
|
import java.io.InputStream;
|
||||||
|
import java.io.OutputStream;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Utility methods for using nano proto with grpc.
|
* Utility methods for using nano proto with grpc.
|
||||||
|
|
@ -48,7 +50,7 @@ public class NanoUtils {
|
||||||
try {
|
try {
|
||||||
// TODO(simonma): Investigate whether we can do 0-copy here.
|
// TODO(simonma): Investigate whether we can do 0-copy here.
|
||||||
CodedInputByteBufferNano input =
|
CodedInputByteBufferNano input =
|
||||||
CodedInputByteBufferNano.newInstance(IoUtils.toByteArray(stream));
|
CodedInputByteBufferNano.newInstance(toByteArray(stream));
|
||||||
input.setSizeLimit(Integer.MAX_VALUE);
|
input.setSizeLimit(Integer.MAX_VALUE);
|
||||||
T message = factory.newInstance();
|
T message = factory.newInstance();
|
||||||
message.mergeFrom(input);
|
message.mergeFrom(input);
|
||||||
|
|
@ -60,4 +62,28 @@ public class NanoUtils {
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Copied from guava com.google.common.io.ByteStreams because its API is unstable (beta)
|
||||||
|
private static byte[] toByteArray(InputStream in) throws IOException {
|
||||||
|
ByteArrayOutputStream out = new ByteArrayOutputStream();
|
||||||
|
copy(in, out);
|
||||||
|
return out.toByteArray();
|
||||||
|
}
|
||||||
|
|
||||||
|
// Copied from guava com.google.common.io.ByteStreams because its API is unstable (beta)
|
||||||
|
private static long copy(InputStream from, OutputStream to) throws IOException {
|
||||||
|
checkNotNull(from);
|
||||||
|
checkNotNull(to);
|
||||||
|
byte[] buf = new byte[BUF_SIZE];
|
||||||
|
long total = 0;
|
||||||
|
while (true) {
|
||||||
|
int r = from.read(buf);
|
||||||
|
if (r == -1) {
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
to.write(buf, 0, r);
|
||||||
|
total += r;
|
||||||
|
}
|
||||||
|
return total;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue