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

interop-testing: fix empty proto package name 

Intended to resolve #4241
grpc-java has already diverged this proto file, so changing the
this package name is reasonable for now.
This commit is contained in:
Shohei Kamimori 2018-03-30 02:37:53 +09:00 committed by Carl Mastrangelo
parent 5780743be4
commit 156cc44c5f
10 changed files with 154 additions and 155 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
interop-testing/src/generated/main/grpc/io/grpc/testing/integration/ReconnectServiceGrpc.java
View File

@ -32,34 +32,34 @@ public final class ReconnectServiceGrpc {
// Static method descriptors that strictly reflect the proto.
@io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901")
@java.lang.Deprecated // Use {@link #getStartMethod()} instead.
public static final io.grpc.MethodDescriptor<com.google.protobuf.EmptyProtos.Empty,
com.google.protobuf.EmptyProtos.Empty> METHOD_START = getStartMethodHelper();
public static final io.grpc.MethodDescriptor<io.grpc.testing.integration.EmptyProtos.Empty,
io.grpc.testing.integration.EmptyProtos.Empty> METHOD_START = getStartMethodHelper();
private static volatile io.grpc.MethodDescriptor<com.google.protobuf.EmptyProtos.Empty,
com.google.protobuf.EmptyProtos.Empty> getStartMethod;
private static volatile io.grpc.MethodDescriptor<io.grpc.testing.integration.EmptyProtos.Empty,
io.grpc.testing.integration.EmptyProtos.Empty> getStartMethod;
@io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901")
public static io.grpc.MethodDescriptor<com.google.protobuf.EmptyProtos.Empty,
com.google.protobuf.EmptyProtos.Empty> getStartMethod() {
public static io.grpc.MethodDescriptor<io.grpc.testing.integration.EmptyProtos.Empty,
io.grpc.testing.integration.EmptyProtos.Empty> getStartMethod() {
return getStartMethodHelper();
}
private static io.grpc.MethodDescriptor<com.google.protobuf.EmptyProtos.Empty,
com.google.protobuf.EmptyProtos.Empty> getStartMethodHelper() {
io.grpc.MethodDescriptor<com.google.protobuf.EmptyProtos.Empty, com.google.protobuf.EmptyProtos.Empty> getStartMethod;
private static io.grpc.MethodDescriptor<io.grpc.testing.integration.EmptyProtos.Empty,
io.grpc.testing.integration.EmptyProtos.Empty> getStartMethodHelper() {
io.grpc.MethodDescriptor<io.grpc.testing.integration.EmptyProtos.Empty, io.grpc.testing.integration.EmptyProtos.Empty> getStartMethod;
if ((getStartMethod = ReconnectServiceGrpc.getStartMethod) == null) {
synchronized (ReconnectServiceGrpc.class) {
if ((getStartMethod = ReconnectServiceGrpc.getStartMethod) == null) {
ReconnectServiceGrpc.getStartMethod = getStartMethod =
io.grpc.MethodDescriptor.<com.google.protobuf.EmptyProtos.Empty, com.google.protobuf.EmptyProtos.Empty>newBuilder()
io.grpc.MethodDescriptor.<io.grpc.testing.integration.EmptyProtos.Empty, io.grpc.testing.integration.EmptyProtos.Empty>newBuilder()
.setType(io.grpc.MethodDescriptor.MethodType.UNARY)
.setFullMethodName(generateFullMethodName(
"grpc.testing.ReconnectService", "Start"))
.setSampledToLocalTracing(true)
.setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
com.google.protobuf.EmptyProtos.Empty.getDefaultInstance()))
io.grpc.testing.integration.EmptyProtos.Empty.getDefaultInstance()))
.setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
com.google.protobuf.EmptyProtos.Empty.getDefaultInstance()))
io.grpc.testing.integration.EmptyProtos.Empty.getDefaultInstance()))
.setSchemaDescriptor(new ReconnectServiceMethodDescriptorSupplier("Start"))
.build();
}
@ -69,32 +69,32 @@ public final class ReconnectServiceGrpc {
}
@io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901")
@java.lang.Deprecated // Use {@link #getStopMethod()} instead.
public static final io.grpc.MethodDescriptor<com.google.protobuf.EmptyProtos.Empty,
public static final io.grpc.MethodDescriptor<io.grpc.testing.integration.EmptyProtos.Empty,
io.grpc.testing.integration.Messages.ReconnectInfo> METHOD_STOP = getStopMethodHelper();
private static volatile io.grpc.MethodDescriptor<com.google.protobuf.EmptyProtos.Empty,
private static volatile io.grpc.MethodDescriptor<io.grpc.testing.integration.EmptyProtos.Empty,
io.grpc.testing.integration.Messages.ReconnectInfo> getStopMethod;
@io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901")
public static io.grpc.MethodDescriptor<com.google.protobuf.EmptyProtos.Empty,
public static io.grpc.MethodDescriptor<io.grpc.testing.integration.EmptyProtos.Empty,
io.grpc.testing.integration.Messages.ReconnectInfo> getStopMethod() {
return getStopMethodHelper();
}
private static io.grpc.MethodDescriptor<com.google.protobuf.EmptyProtos.Empty,
private static io.grpc.MethodDescriptor<io.grpc.testing.integration.EmptyProtos.Empty,
io.grpc.testing.integration.Messages.ReconnectInfo> getStopMethodHelper() {
io.grpc.MethodDescriptor<com.google.protobuf.EmptyProtos.Empty, io.grpc.testing.integration.Messages.ReconnectInfo> getStopMethod;
io.grpc.MethodDescriptor<io.grpc.testing.integration.EmptyProtos.Empty, io.grpc.testing.integration.Messages.ReconnectInfo> getStopMethod;
if ((getStopMethod = ReconnectServiceGrpc.getStopMethod) == null) {
synchronized (ReconnectServiceGrpc.class) {
if ((getStopMethod = ReconnectServiceGrpc.getStopMethod) == null) {
ReconnectServiceGrpc.getStopMethod = getStopMethod =
io.grpc.MethodDescriptor.<com.google.protobuf.EmptyProtos.Empty, io.grpc.testing.integration.Messages.ReconnectInfo>newBuilder()
io.grpc.MethodDescriptor.<io.grpc.testing.integration.EmptyProtos.Empty, io.grpc.testing.integration.Messages.ReconnectInfo>newBuilder()
.setType(io.grpc.MethodDescriptor.MethodType.UNARY)
.setFullMethodName(generateFullMethodName(
"grpc.testing.ReconnectService", "Stop"))
.setSampledToLocalTracing(true)
.setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
com.google.protobuf.EmptyProtos.Empty.getDefaultInstance()))
io.grpc.testing.integration.EmptyProtos.Empty.getDefaultInstance()))
.setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
io.grpc.testing.integration.Messages.ReconnectInfo.getDefaultInstance()))
.setSchemaDescriptor(new ReconnectServiceMethodDescriptorSupplier("Stop"))
@ -137,14 +137,14 @@ public final class ReconnectServiceGrpc {
/**
*/
public void start(com.google.protobuf.EmptyProtos.Empty request,
io.grpc.stub.StreamObserver<com.google.protobuf.EmptyProtos.Empty> responseObserver) {
public void start(io.grpc.testing.integration.EmptyProtos.Empty request,
io.grpc.stub.StreamObserver<io.grpc.testing.integration.EmptyProtos.Empty> responseObserver) {
asyncUnimplementedUnaryCall(getStartMethodHelper(), responseObserver);
}
/**
*/
public void stop(com.google.protobuf.EmptyProtos.Empty request,
public void stop(io.grpc.testing.integration.EmptyProtos.Empty request,
io.grpc.stub.StreamObserver<io.grpc.testing.integration.Messages.ReconnectInfo> responseObserver) {
asyncUnimplementedUnaryCall(getStopMethodHelper(), responseObserver);
}
@ -155,14 +155,14 @@ public final class ReconnectServiceGrpc {
getStartMethodHelper(),
asyncUnaryCall(
new MethodHandlers<
com.google.protobuf.EmptyProtos.Empty,
com.google.protobuf.EmptyProtos.Empty>(
io.grpc.testing.integration.EmptyProtos.Empty,
io.grpc.testing.integration.EmptyProtos.Empty>(
this, METHODID_START)))
.addMethod(
getStopMethodHelper(),
asyncUnaryCall(
new MethodHandlers<
com.google.protobuf.EmptyProtos.Empty,
io.grpc.testing.integration.EmptyProtos.Empty,
io.grpc.testing.integration.Messages.ReconnectInfo>(
this, METHODID_STOP)))
.build();
@ -192,15 +192,15 @@ public final class ReconnectServiceGrpc {
/**
*/
public void start(com.google.protobuf.EmptyProtos.Empty request,
io.grpc.stub.StreamObserver<com.google.protobuf.EmptyProtos.Empty> responseObserver) {
public void start(io.grpc.testing.integration.EmptyProtos.Empty request,
io.grpc.stub.StreamObserver<io.grpc.testing.integration.EmptyProtos.Empty> responseObserver) {
asyncUnaryCall(
getChannel().newCall(getStartMethodHelper(), getCallOptions()), request, responseObserver);
}
/**
*/
public void stop(com.google.protobuf.EmptyProtos.Empty request,
public void stop(io.grpc.testing.integration.EmptyProtos.Empty request,
io.grpc.stub.StreamObserver<io.grpc.testing.integration.Messages.ReconnectInfo> responseObserver) {
asyncUnaryCall(
getChannel().newCall(getStopMethodHelper(), getCallOptions()), request, responseObserver);
@ -230,14 +230,14 @@ public final class ReconnectServiceGrpc {
/**
*/
public com.google.protobuf.EmptyProtos.Empty start(com.google.protobuf.EmptyProtos.Empty request) {
public io.grpc.testing.integration.EmptyProtos.Empty start(io.grpc.testing.integration.EmptyProtos.Empty request) {
return blockingUnaryCall(
getChannel(), getStartMethodHelper(), getCallOptions(), request);
}
/**
*/
public io.grpc.testing.integration.Messages.ReconnectInfo stop(com.google.protobuf.EmptyProtos.Empty request) {
public io.grpc.testing.integration.Messages.ReconnectInfo stop(io.grpc.testing.integration.EmptyProtos.Empty request) {
return blockingUnaryCall(
getChannel(), getStopMethodHelper(), getCallOptions(), request);
}
@ -266,8 +266,8 @@ public final class ReconnectServiceGrpc {
/**
*/
public com.google.common.util.concurrent.ListenableFuture<com.google.protobuf.EmptyProtos.Empty> start(
com.google.protobuf.EmptyProtos.Empty request) {
public com.google.common.util.concurrent.ListenableFuture<io.grpc.testing.integration.EmptyProtos.Empty> start(
io.grpc.testing.integration.EmptyProtos.Empty request) {
return futureUnaryCall(
getChannel().newCall(getStartMethodHelper(), getCallOptions()), request);
}
@ -275,7 +275,7 @@ public final class ReconnectServiceGrpc {
/**
*/
public com.google.common.util.concurrent.ListenableFuture<io.grpc.testing.integration.Messages.ReconnectInfo> stop(
com.google.protobuf.EmptyProtos.Empty request) {
io.grpc.testing.integration.EmptyProtos.Empty request) {
return futureUnaryCall(
getChannel().newCall(getStopMethodHelper(), getCallOptions()), request);
}
@ -302,11 +302,11 @@ public final class ReconnectServiceGrpc {
public void invoke(Req request, io.grpc.stub.StreamObserver<Resp> responseObserver) {
switch (methodId) {
case METHODID_START:
serviceImpl.start((com.google.protobuf.EmptyProtos.Empty) request,
(io.grpc.stub.StreamObserver<com.google.protobuf.EmptyProtos.Empty>) responseObserver);
serviceImpl.start((io.grpc.testing.integration.EmptyProtos.Empty) request,
(io.grpc.stub.StreamObserver<io.grpc.testing.integration.EmptyProtos.Empty>) responseObserver);
break;
case METHODID_STOP:
serviceImpl.stop((com.google.protobuf.EmptyProtos.Empty) request,
serviceImpl.stop((io.grpc.testing.integration.EmptyProtos.Empty) request,
(io.grpc.stub.StreamObserver<io.grpc.testing.integration.Messages.ReconnectInfo>) responseObserver);
break;
default:

92
interop-testing/src/generated/main/grpc/io/grpc/testing/integration/TestServiceGrpc.java
View File

@ -33,34 +33,34 @@ public final class TestServiceGrpc {
// Static method descriptors that strictly reflect the proto.
@io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901")
@java.lang.Deprecated // Use {@link #getEmptyCallMethod()} instead.
public static final io.grpc.MethodDescriptor<com.google.protobuf.EmptyProtos.Empty,
com.google.protobuf.EmptyProtos.Empty> METHOD_EMPTY_CALL = getEmptyCallMethodHelper();
public static final io.grpc.MethodDescriptor<io.grpc.testing.integration.EmptyProtos.Empty,
io.grpc.testing.integration.EmptyProtos.Empty> METHOD_EMPTY_CALL = getEmptyCallMethodHelper();
private static volatile io.grpc.MethodDescriptor<com.google.protobuf.EmptyProtos.Empty,
com.google.protobuf.EmptyProtos.Empty> getEmptyCallMethod;
private static volatile io.grpc.MethodDescriptor<io.grpc.testing.integration.EmptyProtos.Empty,
io.grpc.testing.integration.EmptyProtos.Empty> getEmptyCallMethod;
@io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901")
public static io.grpc.MethodDescriptor<com.google.protobuf.EmptyProtos.Empty,
com.google.protobuf.EmptyProtos.Empty> getEmptyCallMethod() {
public static io.grpc.MethodDescriptor<io.grpc.testing.integration.EmptyProtos.Empty,
io.grpc.testing.integration.EmptyProtos.Empty> getEmptyCallMethod() {
return getEmptyCallMethodHelper();
}
private static io.grpc.MethodDescriptor<com.google.protobuf.EmptyProtos.Empty,
com.google.protobuf.EmptyProtos.Empty> getEmptyCallMethodHelper() {
io.grpc.MethodDescriptor<com.google.protobuf.EmptyProtos.Empty, com.google.protobuf.EmptyProtos.Empty> getEmptyCallMethod;
private static io.grpc.MethodDescriptor<io.grpc.testing.integration.EmptyProtos.Empty,
io.grpc.testing.integration.EmptyProtos.Empty> getEmptyCallMethodHelper() {
io.grpc.MethodDescriptor<io.grpc.testing.integration.EmptyProtos.Empty, io.grpc.testing.integration.EmptyProtos.Empty> getEmptyCallMethod;
if ((getEmptyCallMethod = TestServiceGrpc.getEmptyCallMethod) == null) {
synchronized (TestServiceGrpc.class) {
if ((getEmptyCallMethod = TestServiceGrpc.getEmptyCallMethod) == null) {
TestServiceGrpc.getEmptyCallMethod = getEmptyCallMethod =
io.grpc.MethodDescriptor.<com.google.protobuf.EmptyProtos.Empty, com.google.protobuf.EmptyProtos.Empty>newBuilder()
io.grpc.MethodDescriptor.<io.grpc.testing.integration.EmptyProtos.Empty, io.grpc.testing.integration.EmptyProtos.Empty>newBuilder()
.setType(io.grpc.MethodDescriptor.MethodType.UNARY)
.setFullMethodName(generateFullMethodName(
"grpc.testing.TestService", "EmptyCall"))
.setSampledToLocalTracing(true)
.setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
com.google.protobuf.EmptyProtos.Empty.getDefaultInstance()))
io.grpc.testing.integration.EmptyProtos.Empty.getDefaultInstance()))
.setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
com.google.protobuf.EmptyProtos.Empty.getDefaultInstance()))
io.grpc.testing.integration.EmptyProtos.Empty.getDefaultInstance()))
.setSchemaDescriptor(new TestServiceMethodDescriptorSupplier("EmptyCall"))
.build();
}
@ -292,34 +292,34 @@ public final class TestServiceGrpc {
}
@io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901")
@java.lang.Deprecated // Use {@link #getUnimplementedCallMethod()} instead.
public static final io.grpc.MethodDescriptor<com.google.protobuf.EmptyProtos.Empty,
com.google.protobuf.EmptyProtos.Empty> METHOD_UNIMPLEMENTED_CALL = getUnimplementedCallMethodHelper();
public static final io.grpc.MethodDescriptor<io.grpc.testing.integration.EmptyProtos.Empty,
io.grpc.testing.integration.EmptyProtos.Empty> METHOD_UNIMPLEMENTED_CALL = getUnimplementedCallMethodHelper();
private static volatile io.grpc.MethodDescriptor<com.google.protobuf.EmptyProtos.Empty,
com.google.protobuf.EmptyProtos.Empty> getUnimplementedCallMethod;
private static volatile io.grpc.MethodDescriptor<io.grpc.testing.integration.EmptyProtos.Empty,
io.grpc.testing.integration.EmptyProtos.Empty> getUnimplementedCallMethod;
@io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901")
public static io.grpc.MethodDescriptor<com.google.protobuf.EmptyProtos.Empty,
com.google.protobuf.EmptyProtos.Empty> getUnimplementedCallMethod() {
public static io.grpc.MethodDescriptor<io.grpc.testing.integration.EmptyProtos.Empty,
io.grpc.testing.integration.EmptyProtos.Empty> getUnimplementedCallMethod() {
return getUnimplementedCallMethodHelper();
}
private static io.grpc.MethodDescriptor<com.google.protobuf.EmptyProtos.Empty,
com.google.protobuf.EmptyProtos.Empty> getUnimplementedCallMethodHelper() {
io.grpc.MethodDescriptor<com.google.protobuf.EmptyProtos.Empty, com.google.protobuf.EmptyProtos.Empty> getUnimplementedCallMethod;
private static io.grpc.MethodDescriptor<io.grpc.testing.integration.EmptyProtos.Empty,
io.grpc.testing.integration.EmptyProtos.Empty> getUnimplementedCallMethodHelper() {
io.grpc.MethodDescriptor<io.grpc.testing.integration.EmptyProtos.Empty, io.grpc.testing.integration.EmptyProtos.Empty> getUnimplementedCallMethod;
if ((getUnimplementedCallMethod = TestServiceGrpc.getUnimplementedCallMethod) == null) {
synchronized (TestServiceGrpc.class) {
if ((getUnimplementedCallMethod = TestServiceGrpc.getUnimplementedCallMethod) == null) {
TestServiceGrpc.getUnimplementedCallMethod = getUnimplementedCallMethod =
io.grpc.MethodDescriptor.<com.google.protobuf.EmptyProtos.Empty, com.google.protobuf.EmptyProtos.Empty>newBuilder()
io.grpc.MethodDescriptor.<io.grpc.testing.integration.EmptyProtos.Empty, io.grpc.testing.integration.EmptyProtos.Empty>newBuilder()
.setType(io.grpc.MethodDescriptor.MethodType.UNARY)
.setFullMethodName(generateFullMethodName(
"grpc.testing.TestService", "UnimplementedCall"))
.setSampledToLocalTracing(true)
.setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
com.google.protobuf.EmptyProtos.Empty.getDefaultInstance()))
io.grpc.testing.integration.EmptyProtos.Empty.getDefaultInstance()))
.setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
com.google.protobuf.EmptyProtos.Empty.getDefaultInstance()))
io.grpc.testing.integration.EmptyProtos.Empty.getDefaultInstance()))
.setSchemaDescriptor(new TestServiceMethodDescriptorSupplier("UnimplementedCall"))
.build();
}
@ -364,8 +364,8 @@ public final class TestServiceGrpc {
* One empty request followed by one empty response.
* </pre>
*/
public void emptyCall(com.google.protobuf.EmptyProtos.Empty request,
io.grpc.stub.StreamObserver<com.google.protobuf.EmptyProtos.Empty> responseObserver) {
public void emptyCall(io.grpc.testing.integration.EmptyProtos.Empty request,
io.grpc.stub.StreamObserver<io.grpc.testing.integration.EmptyProtos.Empty> responseObserver) {
asyncUnimplementedUnaryCall(getEmptyCallMethodHelper(), responseObserver);
}
@ -444,8 +444,8 @@ public final class TestServiceGrpc {
* to test the behavior when clients call unimplemented methods.
* </pre>
*/
public void unimplementedCall(com.google.protobuf.EmptyProtos.Empty request,
io.grpc.stub.StreamObserver<com.google.protobuf.EmptyProtos.Empty> responseObserver) {
public void unimplementedCall(io.grpc.testing.integration.EmptyProtos.Empty request,
io.grpc.stub.StreamObserver<io.grpc.testing.integration.EmptyProtos.Empty> responseObserver) {
asyncUnimplementedUnaryCall(getUnimplementedCallMethodHelper(), responseObserver);
}
@ -455,8 +455,8 @@ public final class TestServiceGrpc {
getEmptyCallMethodHelper(),
asyncUnaryCall(
new MethodHandlers<
com.google.protobuf.EmptyProtos.Empty,
com.google.protobuf.EmptyProtos.Empty>(
io.grpc.testing.integration.EmptyProtos.Empty,
io.grpc.testing.integration.EmptyProtos.Empty>(
this, METHODID_EMPTY_CALL)))
.addMethod(
getUnaryCallMethodHelper(),
@ -504,8 +504,8 @@ public final class TestServiceGrpc {
getUnimplementedCallMethodHelper(),
asyncUnaryCall(
new MethodHandlers<
com.google.protobuf.EmptyProtos.Empty,
com.google.protobuf.EmptyProtos.Empty>(
io.grpc.testing.integration.EmptyProtos.Empty,
io.grpc.testing.integration.EmptyProtos.Empty>(
this, METHODID_UNIMPLEMENTED_CALL)))
.build();
}
@ -538,8 +538,8 @@ public final class TestServiceGrpc {
* One empty request followed by one empty response.
* </pre>
*/
public void emptyCall(com.google.protobuf.EmptyProtos.Empty request,
io.grpc.stub.StreamObserver<com.google.protobuf.EmptyProtos.Empty> responseObserver) {
public void emptyCall(io.grpc.testing.integration.EmptyProtos.Empty request,
io.grpc.stub.StreamObserver<io.grpc.testing.integration.EmptyProtos.Empty> responseObserver) {
asyncUnaryCall(
getChannel().newCall(getEmptyCallMethodHelper(), getCallOptions()), request, responseObserver);
}
@ -625,8 +625,8 @@ public final class TestServiceGrpc {
* to test the behavior when clients call unimplemented methods.
* </pre>
*/
public void unimplementedCall(com.google.protobuf.EmptyProtos.Empty request,
io.grpc.stub.StreamObserver<com.google.protobuf.EmptyProtos.Empty> responseObserver) {
public void unimplementedCall(io.grpc.testing.integration.EmptyProtos.Empty request,
io.grpc.stub.StreamObserver<io.grpc.testing.integration.EmptyProtos.Empty> responseObserver) {
asyncUnaryCall(
getChannel().newCall(getUnimplementedCallMethodHelper(), getCallOptions()), request, responseObserver);
}
@ -659,7 +659,7 @@ public final class TestServiceGrpc {
* One empty request followed by one empty response.
* </pre>
*/
public com.google.protobuf.EmptyProtos.Empty emptyCall(com.google.protobuf.EmptyProtos.Empty request) {
public io.grpc.testing.integration.EmptyProtos.Empty emptyCall(io.grpc.testing.integration.EmptyProtos.Empty request) {
return blockingUnaryCall(
getChannel(), getEmptyCallMethodHelper(), getCallOptions(), request);
}
@ -704,7 +704,7 @@ public final class TestServiceGrpc {
* to test the behavior when clients call unimplemented methods.
* </pre>
*/
public com.google.protobuf.EmptyProtos.Empty unimplementedCall(com.google.protobuf.EmptyProtos.Empty request) {
public io.grpc.testing.integration.EmptyProtos.Empty unimplementedCall(io.grpc.testing.integration.EmptyProtos.Empty request) {
return blockingUnaryCall(
getChannel(), getUnimplementedCallMethodHelper(), getCallOptions(), request);
}
@ -737,8 +737,8 @@ public final class TestServiceGrpc {
* One empty request followed by one empty response.
* </pre>
*/
public com.google.common.util.concurrent.ListenableFuture<com.google.protobuf.EmptyProtos.Empty> emptyCall(
com.google.protobuf.EmptyProtos.Empty request) {
public com.google.common.util.concurrent.ListenableFuture<io.grpc.testing.integration.EmptyProtos.Empty> emptyCall(
io.grpc.testing.integration.EmptyProtos.Empty request) {
return futureUnaryCall(
getChannel().newCall(getEmptyCallMethodHelper(), getCallOptions()), request);
}
@ -773,8 +773,8 @@ public final class TestServiceGrpc {
* to test the behavior when clients call unimplemented methods.
* </pre>
*/
public com.google.common.util.concurrent.ListenableFuture<com.google.protobuf.EmptyProtos.Empty> unimplementedCall(
com.google.protobuf.EmptyProtos.Empty request) {
public com.google.common.util.concurrent.ListenableFuture<io.grpc.testing.integration.EmptyProtos.Empty> unimplementedCall(
io.grpc.testing.integration.EmptyProtos.Empty request) {
return futureUnaryCall(
getChannel().newCall(getUnimplementedCallMethodHelper(), getCallOptions()), request);
}
@ -807,8 +807,8 @@ public final class TestServiceGrpc {
public void invoke(Req request, io.grpc.stub.StreamObserver<Resp> responseObserver) {
switch (methodId) {
case METHODID_EMPTY_CALL:
serviceImpl.emptyCall((com.google.protobuf.EmptyProtos.Empty) request,
(io.grpc.stub.StreamObserver<com.google.protobuf.EmptyProtos.Empty>) responseObserver);
serviceImpl.emptyCall((io.grpc.testing.integration.EmptyProtos.Empty) request,
(io.grpc.stub.StreamObserver<io.grpc.testing.integration.EmptyProtos.Empty>) responseObserver);
break;
case METHODID_UNARY_CALL:
serviceImpl.unaryCall((io.grpc.testing.integration.Messages.SimpleRequest) request,
@ -823,8 +823,8 @@ public final class TestServiceGrpc {
(io.grpc.stub.StreamObserver<io.grpc.testing.integration.Messages.StreamingOutputCallResponse>) responseObserver);
break;
case METHODID_UNIMPLEMENTED_CALL:
serviceImpl.unimplementedCall((com.google.protobuf.EmptyProtos.Empty) request,
(io.grpc.stub.StreamObserver<com.google.protobuf.EmptyProtos.Empty>) responseObserver);
serviceImpl.unimplementedCall((io.grpc.testing.integration.EmptyProtos.Empty) request,
(io.grpc.stub.StreamObserver<io.grpc.testing.integration.EmptyProtos.Empty>) responseObserver);
break;
default:
throw new AssertionError();

46
interop-testing/src/generated/main/grpc/io/grpc/testing/integration/UnimplementedServiceGrpc.java
View File

@ -33,34 +33,34 @@ public final class UnimplementedServiceGrpc {
// Static method descriptors that strictly reflect the proto.
@io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901")
@java.lang.Deprecated // Use {@link #getUnimplementedCallMethod()} instead.
public static final io.grpc.MethodDescriptor<com.google.protobuf.EmptyProtos.Empty,
com.google.protobuf.EmptyProtos.Empty> METHOD_UNIMPLEMENTED_CALL = getUnimplementedCallMethodHelper();
public static final io.grpc.MethodDescriptor<io.grpc.testing.integration.EmptyProtos.Empty,
io.grpc.testing.integration.EmptyProtos.Empty> METHOD_UNIMPLEMENTED_CALL = getUnimplementedCallMethodHelper();
private static volatile io.grpc.MethodDescriptor<com.google.protobuf.EmptyProtos.Empty,
com.google.protobuf.EmptyProtos.Empty> getUnimplementedCallMethod;
private static volatile io.grpc.MethodDescriptor<io.grpc.testing.integration.EmptyProtos.Empty,
io.grpc.testing.integration.EmptyProtos.Empty> getUnimplementedCallMethod;
@io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901")
public static io.grpc.MethodDescriptor<com.google.protobuf.EmptyProtos.Empty,
com.google.protobuf.EmptyProtos.Empty> getUnimplementedCallMethod() {
public static io.grpc.MethodDescriptor<io.grpc.testing.integration.EmptyProtos.Empty,
io.grpc.testing.integration.EmptyProtos.Empty> getUnimplementedCallMethod() {
return getUnimplementedCallMethodHelper();
}
private static io.grpc.MethodDescriptor<com.google.protobuf.EmptyProtos.Empty,
com.google.protobuf.EmptyProtos.Empty> getUnimplementedCallMethodHelper() {
io.grpc.MethodDescriptor<com.google.protobuf.EmptyProtos.Empty, com.google.protobuf.EmptyProtos.Empty> getUnimplementedCallMethod;
private static io.grpc.MethodDescriptor<io.grpc.testing.integration.EmptyProtos.Empty,
io.grpc.testing.integration.EmptyProtos.Empty> getUnimplementedCallMethodHelper() {
io.grpc.MethodDescriptor<io.grpc.testing.integration.EmptyProtos.Empty, io.grpc.testing.integration.EmptyProtos.Empty> getUnimplementedCallMethod;
if ((getUnimplementedCallMethod = UnimplementedServiceGrpc.getUnimplementedCallMethod) == null) {
synchronized (UnimplementedServiceGrpc.class) {
if ((getUnimplementedCallMethod = UnimplementedServiceGrpc.getUnimplementedCallMethod) == null) {
UnimplementedServiceGrpc.getUnimplementedCallMethod = getUnimplementedCallMethod =
io.grpc.MethodDescriptor.<com.google.protobuf.EmptyProtos.Empty, com.google.protobuf.EmptyProtos.Empty>newBuilder()
io.grpc.MethodDescriptor.<io.grpc.testing.integration.EmptyProtos.Empty, io.grpc.testing.integration.EmptyProtos.Empty>newBuilder()
.setType(io.grpc.MethodDescriptor.MethodType.UNARY)
.setFullMethodName(generateFullMethodName(
"grpc.testing.UnimplementedService", "UnimplementedCall"))
.setSampledToLocalTracing(true)
.setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
com.google.protobuf.EmptyProtos.Empty.getDefaultInstance()))
io.grpc.testing.integration.EmptyProtos.Empty.getDefaultInstance()))
.setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
com.google.protobuf.EmptyProtos.Empty.getDefaultInstance()))
io.grpc.testing.integration.EmptyProtos.Empty.getDefaultInstance()))
.setSchemaDescriptor(new UnimplementedServiceMethodDescriptorSupplier("UnimplementedCall"))
.build();
}
@ -105,8 +105,8 @@ public final class UnimplementedServiceGrpc {
* A call that no server should implement
* </pre>
*/
public void unimplementedCall(com.google.protobuf.EmptyProtos.Empty request,
io.grpc.stub.StreamObserver<com.google.protobuf.EmptyProtos.Empty> responseObserver) {
public void unimplementedCall(io.grpc.testing.integration.EmptyProtos.Empty request,
io.grpc.stub.StreamObserver<io.grpc.testing.integration.EmptyProtos.Empty> responseObserver) {
asyncUnimplementedUnaryCall(getUnimplementedCallMethodHelper(), responseObserver);
}
@ -116,8 +116,8 @@ public final class UnimplementedServiceGrpc {
getUnimplementedCallMethodHelper(),
asyncUnaryCall(
new MethodHandlers<
com.google.protobuf.EmptyProtos.Empty,
com.google.protobuf.EmptyProtos.Empty>(
io.grpc.testing.integration.EmptyProtos.Empty,
io.grpc.testing.integration.EmptyProtos.Empty>(
this, METHODID_UNIMPLEMENTED_CALL)))
.build();
}
@ -150,8 +150,8 @@ public final class UnimplementedServiceGrpc {
* A call that no server should implement
* </pre>
*/
public void unimplementedCall(com.google.protobuf.EmptyProtos.Empty request,
io.grpc.stub.StreamObserver<com.google.protobuf.EmptyProtos.Empty> responseObserver) {
public void unimplementedCall(io.grpc.testing.integration.EmptyProtos.Empty request,
io.grpc.stub.StreamObserver<io.grpc.testing.integration.EmptyProtos.Empty> responseObserver) {
asyncUnaryCall(
getChannel().newCall(getUnimplementedCallMethodHelper(), getCallOptions()), request, responseObserver);
}
@ -184,7 +184,7 @@ public final class UnimplementedServiceGrpc {
* A call that no server should implement
* </pre>
*/
public com.google.protobuf.EmptyProtos.Empty unimplementedCall(com.google.protobuf.EmptyProtos.Empty request) {
public io.grpc.testing.integration.EmptyProtos.Empty unimplementedCall(io.grpc.testing.integration.EmptyProtos.Empty request) {
return blockingUnaryCall(
getChannel(), getUnimplementedCallMethodHelper(), getCallOptions(), request);
}
@ -217,8 +217,8 @@ public final class UnimplementedServiceGrpc {
* A call that no server should implement
* </pre>
*/
public com.google.common.util.concurrent.ListenableFuture<com.google.protobuf.EmptyProtos.Empty> unimplementedCall(
com.google.protobuf.EmptyProtos.Empty request) {
public com.google.common.util.concurrent.ListenableFuture<io.grpc.testing.integration.EmptyProtos.Empty> unimplementedCall(
io.grpc.testing.integration.EmptyProtos.Empty request) {
return futureUnaryCall(
getChannel().newCall(getUnimplementedCallMethodHelper(), getCallOptions()), request);
}
@ -244,8 +244,8 @@ public final class UnimplementedServiceGrpc {
public void invoke(Req request, io.grpc.stub.StreamObserver<Resp> responseObserver) {
switch (methodId) {
case METHODID_UNIMPLEMENTED_CALL:
serviceImpl.unimplementedCall((com.google.protobuf.EmptyProtos.Empty) request,
(io.grpc.stub.StreamObserver<com.google.protobuf.EmptyProtos.Empty>) responseObserver);
serviceImpl.unimplementedCall((io.grpc.testing.integration.EmptyProtos.Empty) request,
(io.grpc.stub.StreamObserver<io.grpc.testing.integration.EmptyProtos.Empty>) responseObserver);
break;
default:
throw new AssertionError();

86
interop-testing/src/generated/main/java/com/google/protobuf/EmptyProtos.java → interop-testing/src/generated/main/java/io/grpc/testing/integration/EmptyProtos.java
View File

@ -1,7 +1,7 @@
// Generated by the protocol buffer compiler. DO NOT EDIT!
// source: io/grpc/testing/integration/empty.proto
package com.google.protobuf;
package io.grpc.testing.integration;
public final class EmptyProtos {
private EmptyProtos() {}
@ -86,14 +86,14 @@ public final class EmptyProtos {
}
public static final com.google.protobuf.Descriptors.Descriptor
getDescriptor() {
return com.google.protobuf.EmptyProtos.internal_static_grpc_testing_Empty_descriptor;
return io.grpc.testing.integration.EmptyProtos.internal_static_grpc_testing_Empty_descriptor;
}
protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
internalGetFieldAccessorTable() {
return com.google.protobuf.EmptyProtos.internal_static_grpc_testing_Empty_fieldAccessorTable
return io.grpc.testing.integration.EmptyProtos.internal_static_grpc_testing_Empty_fieldAccessorTable
.ensureFieldAccessorsInitialized(
com.google.protobuf.EmptyProtos.Empty.class, com.google.protobuf.EmptyProtos.Empty.Builder.class);
io.grpc.testing.integration.EmptyProtos.Empty.class, io.grpc.testing.integration.EmptyProtos.Empty.Builder.class);
}
private byte memoizedIsInitialized = -1;
@ -126,10 +126,10 @@ public final class EmptyProtos {
if (obj == this) {
return true;
}
if (!(obj instanceof com.google.protobuf.EmptyProtos.Empty)) {
if (!(obj instanceof io.grpc.testing.integration.EmptyProtos.Empty)) {
return super.equals(obj);
}
com.google.protobuf.EmptyProtos.Empty other = (com.google.protobuf.EmptyProtos.Empty) obj;
io.grpc.testing.integration.EmptyProtos.Empty other = (io.grpc.testing.integration.EmptyProtos.Empty) obj;
boolean result = true;
result = result && unknownFields.equals(other.unknownFields);
@ -148,69 +148,69 @@ public final class EmptyProtos {
return hash;
}
public static com.google.protobuf.EmptyProtos.Empty parseFrom(
public static io.grpc.testing.integration.EmptyProtos.Empty parseFrom(
java.nio.ByteBuffer data)
throws com.google.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data);
}
public static com.google.protobuf.EmptyProtos.Empty parseFrom(
public static io.grpc.testing.integration.EmptyProtos.Empty parseFrom(
java.nio.ByteBuffer data,
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
throws com.google.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data, extensionRegistry);
}
public static com.google.protobuf.EmptyProtos.Empty parseFrom(
public static io.grpc.testing.integration.EmptyProtos.Empty parseFrom(
com.google.protobuf.ByteString data)
throws com.google.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data);
}
public static com.google.protobuf.EmptyProtos.Empty parseFrom(
public static io.grpc.testing.integration.EmptyProtos.Empty parseFrom(
com.google.protobuf.ByteString data,
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
throws com.google.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data, extensionRegistry);
}
public static com.google.protobuf.EmptyProtos.Empty parseFrom(byte[] data)
public static io.grpc.testing.integration.EmptyProtos.Empty parseFrom(byte[] data)
throws com.google.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data);
}
public static com.google.protobuf.EmptyProtos.Empty parseFrom(
public static io.grpc.testing.integration.EmptyProtos.Empty parseFrom(
byte[] data,
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
throws com.google.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data, extensionRegistry);
}
public static com.google.protobuf.EmptyProtos.Empty parseFrom(java.io.InputStream input)
public static io.grpc.testing.integration.EmptyProtos.Empty parseFrom(java.io.InputStream input)
throws java.io.IOException {
return com.google.protobuf.GeneratedMessageV3
.parseWithIOException(PARSER, input);
}
public static com.google.protobuf.EmptyProtos.Empty parseFrom(
public static io.grpc.testing.integration.EmptyProtos.Empty parseFrom(
java.io.InputStream input,
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
return com.google.protobuf.GeneratedMessageV3
.parseWithIOException(PARSER, input, extensionRegistry);
}
public static com.google.protobuf.EmptyProtos.Empty parseDelimitedFrom(java.io.InputStream input)
public static io.grpc.testing.integration.EmptyProtos.Empty parseDelimitedFrom(java.io.InputStream input)
throws java.io.IOException {
return com.google.protobuf.GeneratedMessageV3
.parseDelimitedWithIOException(PARSER, input);
}
public static com.google.protobuf.EmptyProtos.Empty parseDelimitedFrom(
public static io.grpc.testing.integration.EmptyProtos.Empty parseDelimitedFrom(
java.io.InputStream input,
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
return com.google.protobuf.GeneratedMessageV3
.parseDelimitedWithIOException(PARSER, input, extensionRegistry);
}
public static com.google.protobuf.EmptyProtos.Empty parseFrom(
public static io.grpc.testing.integration.EmptyProtos.Empty parseFrom(
com.google.protobuf.CodedInputStream input)
throws java.io.IOException {
return com.google.protobuf.GeneratedMessageV3
.parseWithIOException(PARSER, input);
}
public static com.google.protobuf.EmptyProtos.Empty parseFrom(
public static io.grpc.testing.integration.EmptyProtos.Empty parseFrom(
com.google.protobuf.CodedInputStream input,
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
@ -222,7 +222,7 @@ public final class EmptyProtos {
public static Builder newBuilder() {
return DEFAULT_INSTANCE.toBuilder();
}
public static Builder newBuilder(com.google.protobuf.EmptyProtos.Empty prototype) {
public static Builder newBuilder(io.grpc.testing.integration.EmptyProtos.Empty prototype) {
return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
}
public Builder toBuilder() {
@ -251,20 +251,20 @@ public final class EmptyProtos {
public static final class Builder extends
com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
// @@protoc_insertion_point(builder_implements:grpc.testing.Empty)
com.google.protobuf.EmptyProtos.EmptyOrBuilder {
io.grpc.testing.integration.EmptyProtos.EmptyOrBuilder {
public static final com.google.protobuf.Descriptors.Descriptor
getDescriptor() {
return com.google.protobuf.EmptyProtos.internal_static_grpc_testing_Empty_descriptor;
return io.grpc.testing.integration.EmptyProtos.internal_static_grpc_testing_Empty_descriptor;
}
protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
internalGetFieldAccessorTable() {
return com.google.protobuf.EmptyProtos.internal_static_grpc_testing_Empty_fieldAccessorTable
return io.grpc.testing.integration.EmptyProtos.internal_static_grpc_testing_Empty_fieldAccessorTable
.ensureFieldAccessorsInitialized(
com.google.protobuf.EmptyProtos.Empty.class, com.google.protobuf.EmptyProtos.Empty.Builder.class);
io.grpc.testing.integration.EmptyProtos.Empty.class, io.grpc.testing.integration.EmptyProtos.Empty.Builder.class);
}
// Construct using com.google.protobuf.EmptyProtos.Empty.newBuilder()
// Construct using io.grpc.testing.integration.EmptyProtos.Empty.newBuilder()
private Builder() {
maybeForceBuilderInitialization();
}
@ -286,23 +286,23 @@ public final class EmptyProtos {
public com.google.protobuf.Descriptors.Descriptor
getDescriptorForType() {
return com.google.protobuf.EmptyProtos.internal_static_grpc_testing_Empty_descriptor;
return io.grpc.testing.integration.EmptyProtos.internal_static_grpc_testing_Empty_descriptor;
}
public com.google.protobuf.EmptyProtos.Empty getDefaultInstanceForType() {
return com.google.protobuf.EmptyProtos.Empty.getDefaultInstance();
public io.grpc.testing.integration.EmptyProtos.Empty getDefaultInstanceForType() {
return io.grpc.testing.integration.EmptyProtos.Empty.getDefaultInstance();
}
public com.google.protobuf.EmptyProtos.Empty build() {
com.google.protobuf.EmptyProtos.Empty result = buildPartial();
public io.grpc.testing.integration.EmptyProtos.Empty build() {
io.grpc.testing.integration.EmptyProtos.Empty result = buildPartial();
if (!result.isInitialized()) {
throw newUninitializedMessageException(result);
}
return result;
}
public com.google.protobuf.EmptyProtos.Empty buildPartial() {
com.google.protobuf.EmptyProtos.Empty result = new com.google.protobuf.EmptyProtos.Empty(this);
public io.grpc.testing.integration.EmptyProtos.Empty buildPartial() {
io.grpc.testing.integration.EmptyProtos.Empty result = new io.grpc.testing.integration.EmptyProtos.Empty(this);
onBuilt();
return result;
}
@ -334,16 +334,16 @@ public final class EmptyProtos {
return (Builder) super.addRepeatedField(field, value);
}
public Builder mergeFrom(com.google.protobuf.Message other) {
if (other instanceof com.google.protobuf.EmptyProtos.Empty) {
return mergeFrom((com.google.protobuf.EmptyProtos.Empty)other);
if (other instanceof io.grpc.testing.integration.EmptyProtos.Empty) {
return mergeFrom((io.grpc.testing.integration.EmptyProtos.Empty)other);
} else {
super.mergeFrom(other);
return this;
}
}
public Builder mergeFrom(com.google.protobuf.EmptyProtos.Empty other) {
if (other == com.google.protobuf.EmptyProtos.Empty.getDefaultInstance()) return this;
public Builder mergeFrom(io.grpc.testing.integration.EmptyProtos.Empty other) {
if (other == io.grpc.testing.integration.EmptyProtos.Empty.getDefaultInstance()) return this;
this.mergeUnknownFields(other.unknownFields);
onChanged();
return this;
@ -357,11 +357,11 @@ public final class EmptyProtos {
com.google.protobuf.CodedInputStream input,
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
com.google.protobuf.EmptyProtos.Empty parsedMessage = null;
io.grpc.testing.integration.EmptyProtos.Empty parsedMessage = null;
try {
parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
} catch (com.google.protobuf.InvalidProtocolBufferException e) {
parsedMessage = (com.google.protobuf.EmptyProtos.Empty) e.getUnfinishedMessage();
parsedMessage = (io.grpc.testing.integration.EmptyProtos.Empty) e.getUnfinishedMessage();
throw e.unwrapIOException();
} finally {
if (parsedMessage != null) {
@ -385,12 +385,12 @@ public final class EmptyProtos {
}
// @@protoc_insertion_point(class_scope:grpc.testing.Empty)
private static final com.google.protobuf.EmptyProtos.Empty DEFAULT_INSTANCE;
private static final io.grpc.testing.integration.EmptyProtos.Empty DEFAULT_INSTANCE;
static {
DEFAULT_INSTANCE = new com.google.protobuf.EmptyProtos.Empty();
DEFAULT_INSTANCE = new io.grpc.testing.integration.EmptyProtos.Empty();
}
public static com.google.protobuf.EmptyProtos.Empty getDefaultInstance() {
public static io.grpc.testing.integration.EmptyProtos.Empty getDefaultInstance() {
return DEFAULT_INSTANCE;
}
@ -413,7 +413,7 @@ public final class EmptyProtos {
return PARSER;
}
public com.google.protobuf.EmptyProtos.Empty getDefaultInstanceForType() {
public io.grpc.testing.integration.EmptyProtos.Empty getDefaultInstanceForType() {
return DEFAULT_INSTANCE;
}
@ -434,8 +434,8 @@ public final class EmptyProtos {
static {
java.lang.String[] descriptorData = {
"\n\'io/grpc/testing/integration/empty.prot" +
"o\022\014grpc.testing\"\007\n\005EmptyB\"\n\023com.google.p" +
"rotobufB\013EmptyProtos"
"o\022\014grpc.testing\"\007\n\005EmptyB*\n\033io.grpc.test" +
"ing.integrationB\013EmptyProtos"
};
com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
new com.google.protobuf.Descriptors.FileDescriptor. InternalDescriptorAssigner() {

4
interop-testing/src/generated/main/java/io/grpc/testing/integration/Test.java
View File

@ -63,10 +63,10 @@ public final class Test {
com.google.protobuf.Descriptors.FileDescriptor
.internalBuildGeneratedFileFrom(descriptorData,
new com.google.protobuf.Descriptors.FileDescriptor[] {
com.google.protobuf.EmptyProtos.getDescriptor(),
io.grpc.testing.integration.EmptyProtos.getDescriptor(),
io.grpc.testing.integration.Messages.getDescriptor(),
}, assigner);
com.google.protobuf.EmptyProtos.getDescriptor();
io.grpc.testing.integration.EmptyProtos.getDescriptor();
io.grpc.testing.integration.Messages.getDescriptor();
}

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

@ -44,7 +44,6 @@ import com.google.common.io.ByteStreams;
import com.google.common.util.concurrent.SettableFuture;
import com.google.protobuf.BoolValue;
import com.google.protobuf.ByteString;
import com.google.protobuf.EmptyProtos.Empty;
import com.google.protobuf.MessageLite;
import io.grpc.CallOptions;
import io.grpc.Channel;
@ -85,6 +84,7 @@ import io.grpc.stub.ClientCalls;
import io.grpc.stub.MetadataUtils;
import io.grpc.stub.StreamObserver;
import io.grpc.testing.TestUtils;
import io.grpc.testing.integration.EmptyProtos.Empty;
import io.grpc.testing.integration.Messages.EchoStatus;
import io.grpc.testing.integration.Messages.Payload;
import io.grpc.testing.integration.Messages.PayloadType;

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

@ -18,12 +18,12 @@ package io.grpc.testing.integration;
import static org.junit.Assert.assertTrue;
import com.google.protobuf.EmptyProtos.Empty;
import io.grpc.ManagedChannel;
import io.grpc.StatusRuntimeException;
import io.grpc.netty.NegotiationType;
import io.grpc.netty.NettyChannelBuilder;
import io.grpc.okhttp.OkHttpChannelBuilder;
import io.grpc.testing.integration.EmptyProtos.Empty;
import io.grpc.testing.integration.Messages.ReconnectInfo;
/**

1
interop-testing/src/main/java/io/grpc/testing/integration/TestServiceImpl.java
View File

@ -19,7 +19,6 @@ package io.grpc.testing.integration;
import com.google.common.base.Preconditions;
import com.google.common.collect.Queues;
import com.google.protobuf.ByteString;
import com.google.protobuf.EmptyProtos;
import io.grpc.ForwardingServerCall.SimpleForwardingServerCall;
import io.grpc.Metadata;
import io.grpc.ServerCall;

2
interop-testing/src/main/proto/io/grpc/testing/integration/empty.proto
View File

@ -16,7 +16,7 @@ syntax = "proto2";
package grpc.testing;
option java_package = "com.google.protobuf";
option java_package = "io.grpc.testing.integration";
option java_outer_classname = "EmptyProtos";
// An empty message that you can re-use to avoid defining duplicated empty

2
interop-testing/src/test/java/io/grpc/testing/integration/Http2OkHttpTest.java
View File

@ -21,7 +21,6 @@ import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import com.google.common.base.Throwables;
import com.google.protobuf.EmptyProtos.Empty;
import com.squareup.okhttp.ConnectionSpec;
import io.grpc.ManagedChannel;
import io.grpc.internal.AbstractServerImplBuilder;
@ -33,6 +32,7 @@ import io.grpc.netty.NettyServerBuilder;
import io.grpc.okhttp.OkHttpChannelBuilder;
import io.grpc.okhttp.internal.Platform;
import io.grpc.stub.StreamObserver;
import io.grpc.testing.integration.EmptyProtos.Empty;
import io.netty.handler.ssl.OpenSsl;
import io.netty.handler.ssl.SslContext;
import io.netty.handler.ssl.SslContextBuilder;