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

core, compiler, protobuf: introduce MethodDescriptor#setSchemaDescriptor

This commit is contained in:
Lukasz Strzalkowski 2017-06-11 22:00:07 -07:00 committed by Eric Anderson
parent 65530bb71b
commit 731bbefb17
20 changed files with 674 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
benchmarks/src/generated/main/grpc/io/grpc/benchmarks/proto/BenchmarkServiceGrpc.java
View File

@ -38,6 +38,7 @@ public final class BenchmarkServiceGrpc {
io.grpc.benchmarks.proto.Messages.SimpleRequest.getDefaultInstance()))
.setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
io.grpc.benchmarks.proto.Messages.SimpleResponse.getDefaultInstance()))
.setSchemaDescriptor(new BenchmarkServiceMethodDescriptorSupplier("UnaryCall"))
.build();
@io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901")
public static final io.grpc.MethodDescriptor<io.grpc.benchmarks.proto.Messages.SimpleRequest,
@ -50,6 +51,7 @@ public final class BenchmarkServiceGrpc {
io.grpc.benchmarks.proto.Messages.SimpleRequest.getDefaultInstance()))
.setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
io.grpc.benchmarks.proto.Messages.SimpleResponse.getDefaultInstance()))
.setSchemaDescriptor(new BenchmarkServiceMethodDescriptorSupplier("StreamingCall"))
.build();
@io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901")
public static final io.grpc.MethodDescriptor<io.grpc.benchmarks.proto.Messages.SimpleRequest,
@ -62,6 +64,7 @@ public final class BenchmarkServiceGrpc {
io.grpc.benchmarks.proto.Messages.SimpleRequest.getDefaultInstance()))
.setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
io.grpc.benchmarks.proto.Messages.SimpleResponse.getDefaultInstance()))
.setSchemaDescriptor(new BenchmarkServiceMethodDescriptorSupplier("StreamingFromClient"))
.build();
@io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901")
public static final io.grpc.MethodDescriptor<io.grpc.benchmarks.proto.Messages.SimpleRequest,
@ -74,6 +77,7 @@ public final class BenchmarkServiceGrpc {
io.grpc.benchmarks.proto.Messages.SimpleRequest.getDefaultInstance()))
.setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
io.grpc.benchmarks.proto.Messages.SimpleResponse.getDefaultInstance()))
.setSchemaDescriptor(new BenchmarkServiceMethodDescriptorSupplier("StreamingFromServer"))
.build();
@io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901")
public static final io.grpc.MethodDescriptor<io.grpc.benchmarks.proto.Messages.SimpleRequest,
@ -86,6 +90,7 @@ public final class BenchmarkServiceGrpc {
io.grpc.benchmarks.proto.Messages.SimpleRequest.getDefaultInstance()))
.setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
io.grpc.benchmarks.proto.Messages.SimpleResponse.getDefaultInstance()))
.setSchemaDescriptor(new BenchmarkServiceMethodDescriptorSupplier("StreamingBothWays"))
.build();
/**
@ -421,11 +426,39 @@ public final class BenchmarkServiceGrpc {
}
}
private static final class BenchmarkServiceDescriptorSupplier implements io.grpc.protobuf.ProtoFileDescriptorSupplier {
private static abstract class BenchmarkServiceBaseDescriptorSupplier
implements io.grpc.protobuf.ProtoFileDescriptorSupplier, io.grpc.protobuf.ProtoServiceDescriptorSupplier {
BenchmarkServiceBaseDescriptorSupplier() {}
@java.lang.Override
public com.google.protobuf.Descriptors.FileDescriptor getFileDescriptor() {
return io.grpc.benchmarks.proto.Services.getDescriptor();
}
@java.lang.Override
public com.google.protobuf.Descriptors.ServiceDescriptor getServiceDescriptor() {
return getFileDescriptor().findServiceByName("BenchmarkService");
}
}
private static final class BenchmarkServiceFileDescriptorSupplier
extends BenchmarkServiceBaseDescriptorSupplier {
BenchmarkServiceFileDescriptorSupplier() {}
}
private static final class BenchmarkServiceMethodDescriptorSupplier
extends BenchmarkServiceBaseDescriptorSupplier
implements io.grpc.protobuf.ProtoMethodDescriptorSupplier {
private final String methodName;
BenchmarkServiceMethodDescriptorSupplier(String methodName) {
this.methodName = methodName;
}
@java.lang.Override
public com.google.protobuf.Descriptors.MethodDescriptor getMethodDescriptor() {
return getServiceDescriptor().findMethodByName(methodName);
}
}
private static volatile io.grpc.ServiceDescriptor serviceDescriptor;
@ -437,7 +470,7 @@ public final class BenchmarkServiceGrpc {
result = serviceDescriptor;
if (result == null) {
serviceDescriptor = result = io.grpc.ServiceDescriptor.newBuilder(SERVICE_NAME)
.setSchemaDescriptor(new BenchmarkServiceDescriptorSupplier())
.setSchemaDescriptor(new BenchmarkServiceFileDescriptorSupplier())
.addMethod(METHOD_UNARY_CALL)
.addMethod(METHOD_STREAMING_CALL)
.addMethod(METHOD_STREAMING_FROM_CLIENT)

33
benchmarks/src/generated/main/grpc/io/grpc/benchmarks/proto/ReportQpsScenarioServiceGrpc.java
View File

@ -38,6 +38,7 @@ public final class ReportQpsScenarioServiceGrpc {
io.grpc.benchmarks.proto.Control.ScenarioResult.getDefaultInstance()))
.setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
io.grpc.benchmarks.proto.Control.Void.getDefaultInstance()))
.setSchemaDescriptor(new ReportQpsScenarioServiceMethodDescriptorSupplier("ReportScenario"))
.build();
/**
@ -218,11 +219,39 @@ public final class ReportQpsScenarioServiceGrpc {
}
}
private static final class ReportQpsScenarioServiceDescriptorSupplier implements io.grpc.protobuf.ProtoFileDescriptorSupplier {
private static abstract class ReportQpsScenarioServiceBaseDescriptorSupplier
implements io.grpc.protobuf.ProtoFileDescriptorSupplier, io.grpc.protobuf.ProtoServiceDescriptorSupplier {
ReportQpsScenarioServiceBaseDescriptorSupplier() {}
@java.lang.Override
public com.google.protobuf.Descriptors.FileDescriptor getFileDescriptor() {
return io.grpc.benchmarks.proto.Services.getDescriptor();
}
@java.lang.Override
public com.google.protobuf.Descriptors.ServiceDescriptor getServiceDescriptor() {
return getFileDescriptor().findServiceByName("ReportQpsScenarioService");
}
}
private static final class ReportQpsScenarioServiceFileDescriptorSupplier
extends ReportQpsScenarioServiceBaseDescriptorSupplier {
ReportQpsScenarioServiceFileDescriptorSupplier() {}
}
private static final class ReportQpsScenarioServiceMethodDescriptorSupplier
extends ReportQpsScenarioServiceBaseDescriptorSupplier
implements io.grpc.protobuf.ProtoMethodDescriptorSupplier {
private final String methodName;
ReportQpsScenarioServiceMethodDescriptorSupplier(String methodName) {
this.methodName = methodName;
}
@java.lang.Override
public com.google.protobuf.Descriptors.MethodDescriptor getMethodDescriptor() {
return getServiceDescriptor().findMethodByName(methodName);
}
}
private static volatile io.grpc.ServiceDescriptor serviceDescriptor;
@ -234,7 +263,7 @@ public final class ReportQpsScenarioServiceGrpc {
result = serviceDescriptor;
if (result == null) {
serviceDescriptor = result = io.grpc.ServiceDescriptor.newBuilder(SERVICE_NAME)
.setSchemaDescriptor(new ReportQpsScenarioServiceDescriptorSupplier())
.setSchemaDescriptor(new ReportQpsScenarioServiceFileDescriptorSupplier())
.addMethod(METHOD_REPORT_SCENARIO)
.build();
}

36
benchmarks/src/generated/main/grpc/io/grpc/benchmarks/proto/WorkerServiceGrpc.java
View File

@ -38,6 +38,7 @@ public final class WorkerServiceGrpc {
io.grpc.benchmarks.proto.Control.ServerArgs.getDefaultInstance()))
.setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
io.grpc.benchmarks.proto.Control.ServerStatus.getDefaultInstance()))
.setSchemaDescriptor(new WorkerServiceMethodDescriptorSupplier("RunServer"))
.build();
@io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901")
public static final io.grpc.MethodDescriptor<io.grpc.benchmarks.proto.Control.ClientArgs,
@ -50,6 +51,7 @@ public final class WorkerServiceGrpc {
io.grpc.benchmarks.proto.Control.ClientArgs.getDefaultInstance()))
.setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
io.grpc.benchmarks.proto.Control.ClientStatus.getDefaultInstance()))
.setSchemaDescriptor(new WorkerServiceMethodDescriptorSupplier("RunClient"))
.build();
@io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901")
public static final io.grpc.MethodDescriptor<io.grpc.benchmarks.proto.Control.CoreRequest,
@ -62,6 +64,7 @@ public final class WorkerServiceGrpc {
io.grpc.benchmarks.proto.Control.CoreRequest.getDefaultInstance()))
.setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
io.grpc.benchmarks.proto.Control.CoreResponse.getDefaultInstance()))
.setSchemaDescriptor(new WorkerServiceMethodDescriptorSupplier("CoreCount"))
.build();
@io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901")
public static final io.grpc.MethodDescriptor<io.grpc.benchmarks.proto.Control.Void,
@ -74,6 +77,7 @@ public final class WorkerServiceGrpc {
io.grpc.benchmarks.proto.Control.Void.getDefaultInstance()))
.setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
io.grpc.benchmarks.proto.Control.Void.getDefaultInstance()))
.setSchemaDescriptor(new WorkerServiceMethodDescriptorSupplier("QuitWorker"))
.build();
/**
@ -392,11 +396,39 @@ public final class WorkerServiceGrpc {
}
}
private static final class WorkerServiceDescriptorSupplier implements io.grpc.protobuf.ProtoFileDescriptorSupplier {
private static abstract class WorkerServiceBaseDescriptorSupplier
implements io.grpc.protobuf.ProtoFileDescriptorSupplier, io.grpc.protobuf.ProtoServiceDescriptorSupplier {
WorkerServiceBaseDescriptorSupplier() {}
@java.lang.Override
public com.google.protobuf.Descriptors.FileDescriptor getFileDescriptor() {
return io.grpc.benchmarks.proto.Services.getDescriptor();
}
@java.lang.Override
public com.google.protobuf.Descriptors.ServiceDescriptor getServiceDescriptor() {
return getFileDescriptor().findServiceByName("WorkerService");
}
}
private static final class WorkerServiceFileDescriptorSupplier
extends WorkerServiceBaseDescriptorSupplier {
WorkerServiceFileDescriptorSupplier() {}
}
private static final class WorkerServiceMethodDescriptorSupplier
extends WorkerServiceBaseDescriptorSupplier
implements io.grpc.protobuf.ProtoMethodDescriptorSupplier {
private final String methodName;
WorkerServiceMethodDescriptorSupplier(String methodName) {
this.methodName = methodName;
}
@java.lang.Override
public com.google.protobuf.Descriptors.MethodDescriptor getMethodDescriptor() {
return getServiceDescriptor().findMethodByName(methodName);
}
}
private static volatile io.grpc.ServiceDescriptor serviceDescriptor;
@ -408,7 +440,7 @@ public final class WorkerServiceGrpc {
result = serviceDescriptor;
if (result == null) {
serviceDescriptor = result = io.grpc.ServiceDescriptor.newBuilder(SERVICE_NAME)
.setSchemaDescriptor(new WorkerServiceDescriptorSupplier())
.setSchemaDescriptor(new WorkerServiceFileDescriptorSupplier())
.addMethod(METHOD_RUN_SERVER)
.addMethod(METHOD_RUN_CLIENT)
.addMethod(METHOD_CORE_COUNT)

68
compiler/src/java_plugin/cpp/java_generator.cpp
View File

@ -367,7 +367,17 @@ static void PrintMethodFields(
" .setRequestMarshaller($ProtoUtils$.marshaller(\n"
" $input_type$.getDefaultInstance()))\n"
" .setResponseMarshaller($ProtoUtils$.marshaller(\n"
" $output_type$.getDefaultInstance()))\n"
" $output_type$.getDefaultInstance()))\n");
(*vars)["proto_method_descriptor_supplier"] = service->name() + "MethodDescriptorSupplier";
if (flavor == ProtoFlavor::NORMAL) {
p->Print(
*vars,
" .setSchemaDescriptor(new $proto_method_descriptor_supplier$(\"$method_name$\"))\n");
}
p->Print(
*vars,
" .build();\n");
}
}
@ -893,22 +903,46 @@ static void PrintGetServiceDescriptorMethod(const ServiceDescriptor* service,
if (flavor == ProtoFlavor::NORMAL) {
(*vars)["proto_descriptor_supplier"] = service->name() + "DescriptorSupplier";
(*vars)["proto_base_descriptor_supplier"] = service->name() + "BaseDescriptorSupplier";
(*vars)["proto_file_descriptor_supplier"] = service->name() + "FileDescriptorSupplier";
(*vars)["proto_method_descriptor_supplier"] = service->name() + "MethodDescriptorSupplier";
(*vars)["proto_class_name"] = google::protobuf::compiler::java::ClassName(service->file());
p->Print(
*vars,
"private static final class $proto_descriptor_supplier$ implements $ProtoFileDescriptorSupplier$ {\n");
p->Indent();
p->Print(*vars, "@$Override$\n");
p->Print(
*vars,
"public com.google.protobuf.Descriptors.FileDescriptor getFileDescriptor() {\n");
p->Indent();
p->Print(*vars, "return $proto_class_name$.getDescriptor();\n");
p->Outdent();
p->Print(*vars, "}\n");
p->Outdent();
p->Print(*vars, "}\n\n");
"private static abstract class $proto_base_descriptor_supplier$\n"
" implements $ProtoFileDescriptorSupplier$, $ProtoServiceDescriptorSupplier$ {\n"
" $proto_base_descriptor_supplier$() {}\n"
"\n"
" @$Override$\n"
" public com.google.protobuf.Descriptors.FileDescriptor getFileDescriptor() {\n"
" return $proto_class_name$.getDescriptor();\n"
" }\n"
"\n"
" @$Override$\n"
" public com.google.protobuf.Descriptors.ServiceDescriptor getServiceDescriptor() {\n"
" return getFileDescriptor().findServiceByName(\"$service_name$\");\n"
" }\n"
"}\n"
"\n"
"private static final class $proto_file_descriptor_supplier$\n"
" extends $proto_base_descriptor_supplier$ {\n"
" $proto_file_descriptor_supplier$() {}\n"
"}\n"
"\n"
"private static final class $proto_method_descriptor_supplier$\n"
" extends $proto_base_descriptor_supplier$\n"
" implements $ProtoMethodDescriptorSupplier$ {\n"
" private final String methodName;\n"
"\n"
" $proto_method_descriptor_supplier$(String methodName) {\n"
" this.methodName = methodName;\n"
" }\n"
"\n"
" @$Override$\n"
" public com.google.protobuf.Descriptors.MethodDescriptor getMethodDescriptor() {\n"
" return getServiceDescriptor().findMethodByName(methodName);\n"
" }\n"
"}\n\n");
}
p->Print(
@ -940,7 +974,7 @@ static void PrintGetServiceDescriptorMethod(const ServiceDescriptor* service,
if (flavor == ProtoFlavor::NORMAL) {
p->Print(
*vars,
"\n.setSchemaDescriptor(new $proto_descriptor_supplier$())");
"\n.setSchemaDescriptor(new $proto_file_descriptor_supplier$())");
}
for (int i = 0; i < service->method_count(); ++i) {
const MethodDescriptor* method = service->method(i);
@ -1190,6 +1224,10 @@ void GenerateService(const ServiceDescriptor* service,
"io.grpc.ServiceDescriptor";
vars["ProtoFileDescriptorSupplier"] =
"io.grpc.protobuf.ProtoFileDescriptorSupplier";
vars["ProtoServiceDescriptorSupplier"] =
"io.grpc.protobuf.ProtoServiceDescriptorSupplier";
vars["ProtoMethodDescriptorSupplier"] =
"io.grpc.protobuf.ProtoMethodDescriptorSupplier";
vars["AbstractStub"] = "io.grpc.stub.AbstractStub";
vars["MethodDescriptor"] = "io.grpc.MethodDescriptor";
vars["NanoUtils"] = "io.grpc.protobuf.nano.NanoUtils";

37
compiler/src/test/golden/TestService.java.txt
View File

@ -41,6 +41,7 @@ public final class TestServiceGrpc {
io.grpc.testing.integration.Test.SimpleRequest.getDefaultInstance()))
.setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
io.grpc.testing.integration.Test.SimpleResponse.getDefaultInstance()))
.setSchemaDescriptor(new TestServiceMethodDescriptorSupplier("UnaryCall"))
.build();
@io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901")
public static final io.grpc.MethodDescriptor<io.grpc.testing.integration.Test.StreamingOutputCallRequest,
@ -53,6 +54,7 @@ public final class TestServiceGrpc {
io.grpc.testing.integration.Test.StreamingOutputCallRequest.getDefaultInstance()))
.setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
io.grpc.testing.integration.Test.StreamingOutputCallResponse.getDefaultInstance()))
.setSchemaDescriptor(new TestServiceMethodDescriptorSupplier("StreamingOutputCall"))
.build();
@io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901")
public static final io.grpc.MethodDescriptor<io.grpc.testing.integration.Test.StreamingInputCallRequest,
@ -65,6 +67,7 @@ public final class TestServiceGrpc {
io.grpc.testing.integration.Test.StreamingInputCallRequest.getDefaultInstance()))
.setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
io.grpc.testing.integration.Test.StreamingInputCallResponse.getDefaultInstance()))
.setSchemaDescriptor(new TestServiceMethodDescriptorSupplier("StreamingInputCall"))
.build();
@io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901")
public static final io.grpc.MethodDescriptor<io.grpc.testing.integration.Test.StreamingOutputCallRequest,
@ -77,6 +80,7 @@ public final class TestServiceGrpc {
io.grpc.testing.integration.Test.StreamingOutputCallRequest.getDefaultInstance()))
.setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
io.grpc.testing.integration.Test.StreamingOutputCallResponse.getDefaultInstance()))
.setSchemaDescriptor(new TestServiceMethodDescriptorSupplier("FullBidiCall"))
.build();
@io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901")
public static final io.grpc.MethodDescriptor<io.grpc.testing.integration.Test.StreamingOutputCallRequest,
@ -89,6 +93,7 @@ public final class TestServiceGrpc {
io.grpc.testing.integration.Test.StreamingOutputCallRequest.getDefaultInstance()))
.setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
io.grpc.testing.integration.Test.StreamingOutputCallResponse.getDefaultInstance()))
.setSchemaDescriptor(new TestServiceMethodDescriptorSupplier("HalfBidiCall"))
.build();
/**
@ -440,11 +445,39 @@ public final class TestServiceGrpc {
}
}
private static final class TestServiceDescriptorSupplier implements io.grpc.protobuf.ProtoFileDescriptorSupplier {
private static abstract class TestServiceBaseDescriptorSupplier
implements io.grpc.protobuf.ProtoFileDescriptorSupplier, io.grpc.protobuf.ProtoServiceDescriptorSupplier {
TestServiceBaseDescriptorSupplier() {}
@java.lang.Override
public com.google.protobuf.Descriptors.FileDescriptor getFileDescriptor() {
return io.grpc.testing.integration.Test.getDescriptor();
}
@java.lang.Override
public com.google.protobuf.Descriptors.ServiceDescriptor getServiceDescriptor() {
return getFileDescriptor().findServiceByName("TestService");
}
}
private static final class TestServiceFileDescriptorSupplier
extends TestServiceBaseDescriptorSupplier {
TestServiceFileDescriptorSupplier() {}
}
private static final class TestServiceMethodDescriptorSupplier
extends TestServiceBaseDescriptorSupplier
implements io.grpc.protobuf.ProtoMethodDescriptorSupplier {
private final String methodName;
TestServiceMethodDescriptorSupplier(String methodName) {
this.methodName = methodName;
}
@java.lang.Override
public com.google.protobuf.Descriptors.MethodDescriptor getMethodDescriptor() {
return getServiceDescriptor().findMethodByName(methodName);
}
}
private static volatile io.grpc.ServiceDescriptor serviceDescriptor;
@ -456,7 +489,7 @@ public final class TestServiceGrpc {
result = serviceDescriptor;
if (result == null) {
serviceDescriptor = result = io.grpc.ServiceDescriptor.newBuilder(SERVICE_NAME)
.setSchemaDescriptor(new TestServiceDescriptorSupplier())
.setSchemaDescriptor(new TestServiceFileDescriptorSupplier())
.addMethod(METHOD_UNARY_CALL)
.addMethod(METHOD_STREAMING_OUTPUT_CALL)
.addMethod(METHOD_STREAMING_INPUT_CALL)

35
core/src/main/java/io/grpc/MethodDescriptor.java
View File

@ -42,6 +42,7 @@ public final class MethodDescriptor<ReqT, RespT> {
private final String fullMethodName;
private final Marshaller<ReqT> requestMarshaller;
private final Marshaller<RespT> responseMarshaller;
private final @Nullable Object schemaDescriptor;
private final boolean idempotent;
private final boolean safe;
@ -208,7 +209,7 @@ public final class MethodDescriptor<ReqT, RespT> {
Marshaller<RequestT> requestMarshaller,
Marshaller<ResponseT> responseMarshaller) {
return new MethodDescriptor<RequestT, ResponseT>(
type, fullMethodName, requestMarshaller, responseMarshaller, false, false);
type, fullMethodName, requestMarshaller, responseMarshaller, null, false, false);
}
private MethodDescriptor(
@ -216,6 +217,7 @@ public final class MethodDescriptor<ReqT, RespT> {
String fullMethodName,
Marshaller<ReqT> requestMarshaller,
Marshaller<RespT> responseMarshaller,
Object schemaDescriptor,
boolean idempotent,
boolean safe) {
@ -223,6 +225,7 @@ public final class MethodDescriptor<ReqT, RespT> {
this.fullMethodName = Preconditions.checkNotNull(fullMethodName, "fullMethodName");
this.requestMarshaller = Preconditions.checkNotNull(requestMarshaller, "requestMarshaller");
this.responseMarshaller = Preconditions.checkNotNull(responseMarshaller, "responseMarshaller");
this.schemaDescriptor = schemaDescriptor;
this.idempotent = idempotent;
this.safe = safe;
Preconditions.checkArgument(!safe || type == MethodType.UNARY,
@ -311,6 +314,20 @@ public final class MethodDescriptor<ReqT, RespT> {
return responseMarshaller;
}
/**
* Returns the schema descriptor for this method. A schema descriptor is an object that is not
* used by gRPC core but includes information related to the service method. The type of the
* object is specific to the consumer, so both the code setting the schema descriptor and the code
* calling {@link #getSchemaDescriptor()} must coordinate. For example, protobuf generated code
* sets this value, in order to be consumed by the server reflection service. See also:
* {@code io.grpc.protobuf.ProtoMethodDescriptorSupplier}.
*
* @since 1.7.0
*/
public @Nullable Object getSchemaDescriptor() {
return schemaDescriptor;
}
/**
* Returns whether this method is idempotent.
*
@ -425,6 +442,7 @@ public final class MethodDescriptor<ReqT, RespT> {
private String fullMethodName;
private boolean idempotent;
private boolean safe;
private Object schemaDescriptor;
private Builder() {}
@ -473,6 +491,20 @@ public final class MethodDescriptor<ReqT, RespT> {
return this;
}
/**
* Sets the schema descriptor for this builder. A schema descriptor is an object that is not
* used by gRPC core but includes information related to the methods. The type of the object
* is specific to the consumer, so both the code calling this and the code calling
* {@link MethodDescriptor#getSchemaDescriptor()} must coordinate.
*
* @param schemaDescriptor an object that describes the service structure. Should be immutable.
* @since 1.7.0
*/
public Builder<ReqT, RespT> setSchemaDescriptor(@Nullable Object schemaDescriptor) {
this.schemaDescriptor = schemaDescriptor;
return this;
}
/**
* Sets whether the method is idempotent. If true, calling this method more than once doesn't
* have additional side effects.
@ -509,6 +541,7 @@ public final class MethodDescriptor<ReqT, RespT> {
fullMethodName,
requestMarshaller,
responseMarshaller,
schemaDescriptor,
idempotent,
safe);
}

33
grpclb/src/generated/main/grpc/io/grpc/grpclb/LoadBalancerGrpc.java
View File

@ -38,6 +38,7 @@ public final class LoadBalancerGrpc {
io.grpc.grpclb.LoadBalanceRequest.getDefaultInstance()))
.setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
io.grpc.grpclb.LoadBalanceResponse.getDefaultInstance()))
.setSchemaDescriptor(new LoadBalancerMethodDescriptorSupplier("BalanceLoad"))
.build();
/**
@ -196,11 +197,39 @@ public final class LoadBalancerGrpc {
}
}
private static final class LoadBalancerDescriptorSupplier implements io.grpc.protobuf.ProtoFileDescriptorSupplier {
private static abstract class LoadBalancerBaseDescriptorSupplier
implements io.grpc.protobuf.ProtoFileDescriptorSupplier, io.grpc.protobuf.ProtoServiceDescriptorSupplier {
LoadBalancerBaseDescriptorSupplier() {}
@java.lang.Override
public com.google.protobuf.Descriptors.FileDescriptor getFileDescriptor() {
return io.grpc.grpclb.LoadBalancerProto.getDescriptor();
}
@java.lang.Override
public com.google.protobuf.Descriptors.ServiceDescriptor getServiceDescriptor() {
return getFileDescriptor().findServiceByName("LoadBalancer");
}
}
private static final class LoadBalancerFileDescriptorSupplier
extends LoadBalancerBaseDescriptorSupplier {
LoadBalancerFileDescriptorSupplier() {}
}
private static final class LoadBalancerMethodDescriptorSupplier
extends LoadBalancerBaseDescriptorSupplier
implements io.grpc.protobuf.ProtoMethodDescriptorSupplier {
private final String methodName;
LoadBalancerMethodDescriptorSupplier(String methodName) {
this.methodName = methodName;
}
@java.lang.Override
public com.google.protobuf.Descriptors.MethodDescriptor getMethodDescriptor() {
return getServiceDescriptor().findMethodByName(methodName);
}
}
private static volatile io.grpc.ServiceDescriptor serviceDescriptor;
@ -212,7 +241,7 @@ public final class LoadBalancerGrpc {
result = serviceDescriptor;
if (result == null) {
serviceDescriptor = result = io.grpc.ServiceDescriptor.newBuilder(SERVICE_NAME)
.setSchemaDescriptor(new LoadBalancerDescriptorSupplier())
.setSchemaDescriptor(new LoadBalancerFileDescriptorSupplier())
.addMethod(METHOD_BALANCE_LOAD)
.build();
}

34
interop-testing/src/generated/main/grpc/io/grpc/testing/integration/MetricsServiceGrpc.java
View File

@ -38,6 +38,7 @@ public final class MetricsServiceGrpc {
io.grpc.testing.integration.Metrics.EmptyMessage.getDefaultInstance()))
.setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
io.grpc.testing.integration.Metrics.GaugeResponse.getDefaultInstance()))
.setSchemaDescriptor(new MetricsServiceMethodDescriptorSupplier("GetAllGauges"))
.build();
@io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901")
public static final io.grpc.MethodDescriptor<io.grpc.testing.integration.Metrics.GaugeRequest,
@ -50,6 +51,7 @@ public final class MetricsServiceGrpc {
io.grpc.testing.integration.Metrics.GaugeRequest.getDefaultInstance()))
.setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
io.grpc.testing.integration.Metrics.GaugeResponse.getDefaultInstance()))
.setSchemaDescriptor(new MetricsServiceMethodDescriptorSupplier("GetGauge"))
.build();
/**
@ -277,11 +279,39 @@ public final class MetricsServiceGrpc {
}
}
private static final class MetricsServiceDescriptorSupplier implements io.grpc.protobuf.ProtoFileDescriptorSupplier {
private static abstract class MetricsServiceBaseDescriptorSupplier
implements io.grpc.protobuf.ProtoFileDescriptorSupplier, io.grpc.protobuf.ProtoServiceDescriptorSupplier {
MetricsServiceBaseDescriptorSupplier() {}
@java.lang.Override
public com.google.protobuf.Descriptors.FileDescriptor getFileDescriptor() {
return io.grpc.testing.integration.Metrics.getDescriptor();
}
@java.lang.Override
public com.google.protobuf.Descriptors.ServiceDescriptor getServiceDescriptor() {
return getFileDescriptor().findServiceByName("MetricsService");
}
}
private static final class MetricsServiceFileDescriptorSupplier
extends MetricsServiceBaseDescriptorSupplier {
MetricsServiceFileDescriptorSupplier() {}
}
private static final class MetricsServiceMethodDescriptorSupplier
extends MetricsServiceBaseDescriptorSupplier
implements io.grpc.protobuf.ProtoMethodDescriptorSupplier {
private final String methodName;
MetricsServiceMethodDescriptorSupplier(String methodName) {
this.methodName = methodName;
}
@java.lang.Override
public com.google.protobuf.Descriptors.MethodDescriptor getMethodDescriptor() {
return getServiceDescriptor().findMethodByName(methodName);
}
}
private static volatile io.grpc.ServiceDescriptor serviceDescriptor;
@ -293,7 +323,7 @@ public final class MetricsServiceGrpc {
result = serviceDescriptor;
if (result == null) {
serviceDescriptor = result = io.grpc.ServiceDescriptor.newBuilder(SERVICE_NAME)
.setSchemaDescriptor(new MetricsServiceDescriptorSupplier())
.setSchemaDescriptor(new MetricsServiceFileDescriptorSupplier())
.addMethod(METHOD_GET_ALL_GAUGES)
.addMethod(METHOD_GET_GAUGE)
.build();

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

@ -41,6 +41,7 @@ public final class ReconnectServiceGrpc {
com.google.protobuf.EmptyProtos.Empty.getDefaultInstance()))
.setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
com.google.protobuf.EmptyProtos.Empty.getDefaultInstance()))
.setSchemaDescriptor(new ReconnectServiceMethodDescriptorSupplier("Start"))
.build();
@io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901")
public static final io.grpc.MethodDescriptor<com.google.protobuf.EmptyProtos.Empty,
@ -53,6 +54,7 @@ public final class ReconnectServiceGrpc {
com.google.protobuf.EmptyProtos.Empty.getDefaultInstance()))
.setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
io.grpc.testing.integration.Messages.ReconnectInfo.getDefaultInstance()))
.setSchemaDescriptor(new ReconnectServiceMethodDescriptorSupplier("Stop"))
.build();
/**
@ -275,11 +277,39 @@ public final class ReconnectServiceGrpc {
}
}
private static final class ReconnectServiceDescriptorSupplier implements io.grpc.protobuf.ProtoFileDescriptorSupplier {
private static abstract class ReconnectServiceBaseDescriptorSupplier
implements io.grpc.protobuf.ProtoFileDescriptorSupplier, io.grpc.protobuf.ProtoServiceDescriptorSupplier {
ReconnectServiceBaseDescriptorSupplier() {}
@java.lang.Override
public com.google.protobuf.Descriptors.FileDescriptor getFileDescriptor() {
return io.grpc.testing.integration.Test.getDescriptor();
}
@java.lang.Override
public com.google.protobuf.Descriptors.ServiceDescriptor getServiceDescriptor() {
return getFileDescriptor().findServiceByName("ReconnectService");
}
}
private static final class ReconnectServiceFileDescriptorSupplier
extends ReconnectServiceBaseDescriptorSupplier {
ReconnectServiceFileDescriptorSupplier() {}
}
private static final class ReconnectServiceMethodDescriptorSupplier
extends ReconnectServiceBaseDescriptorSupplier
implements io.grpc.protobuf.ProtoMethodDescriptorSupplier {
private final String methodName;
ReconnectServiceMethodDescriptorSupplier(String methodName) {
this.methodName = methodName;
}
@java.lang.Override
public com.google.protobuf.Descriptors.MethodDescriptor getMethodDescriptor() {
return getServiceDescriptor().findMethodByName(methodName);
}
}
private static volatile io.grpc.ServiceDescriptor serviceDescriptor;
@ -291,7 +321,7 @@ public final class ReconnectServiceGrpc {
result = serviceDescriptor;
if (result == null) {
serviceDescriptor = result = io.grpc.ServiceDescriptor.newBuilder(SERVICE_NAME)
.setSchemaDescriptor(new ReconnectServiceDescriptorSupplier())
.setSchemaDescriptor(new ReconnectServiceFileDescriptorSupplier())
.addMethod(METHOD_START)
.addMethod(METHOD_STOP)
.build();

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

@ -42,6 +42,7 @@ public final class TestServiceGrpc {
com.google.protobuf.EmptyProtos.Empty.getDefaultInstance()))
.setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
com.google.protobuf.EmptyProtos.Empty.getDefaultInstance()))
.setSchemaDescriptor(new TestServiceMethodDescriptorSupplier("EmptyCall"))
.build();
@io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901")
public static final io.grpc.MethodDescriptor<io.grpc.testing.integration.Messages.SimpleRequest,
@ -54,6 +55,7 @@ public final class TestServiceGrpc {
io.grpc.testing.integration.Messages.SimpleRequest.getDefaultInstance()))
.setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
io.grpc.testing.integration.Messages.SimpleResponse.getDefaultInstance()))
.setSchemaDescriptor(new TestServiceMethodDescriptorSupplier("UnaryCall"))
.build();
@io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901")
public static final io.grpc.MethodDescriptor<io.grpc.testing.integration.Messages.SimpleRequest,
@ -66,6 +68,7 @@ public final class TestServiceGrpc {
io.grpc.testing.integration.Messages.SimpleRequest.getDefaultInstance()))
.setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
io.grpc.testing.integration.Messages.SimpleResponse.getDefaultInstance()))
.setSchemaDescriptor(new TestServiceMethodDescriptorSupplier("CacheableUnaryCall"))
.build();
@io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901")
public static final io.grpc.MethodDescriptor<io.grpc.testing.integration.Messages.StreamingOutputCallRequest,
@ -78,6 +81,7 @@ public final class TestServiceGrpc {
io.grpc.testing.integration.Messages.StreamingOutputCallRequest.getDefaultInstance()))
.setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
io.grpc.testing.integration.Messages.StreamingOutputCallResponse.getDefaultInstance()))
.setSchemaDescriptor(new TestServiceMethodDescriptorSupplier("StreamingOutputCall"))
.build();
@io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901")
public static final io.grpc.MethodDescriptor<io.grpc.testing.integration.Messages.StreamingInputCallRequest,
@ -90,6 +94,7 @@ public final class TestServiceGrpc {
io.grpc.testing.integration.Messages.StreamingInputCallRequest.getDefaultInstance()))
.setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
io.grpc.testing.integration.Messages.StreamingInputCallResponse.getDefaultInstance()))
.setSchemaDescriptor(new TestServiceMethodDescriptorSupplier("StreamingInputCall"))
.build();
@io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901")
public static final io.grpc.MethodDescriptor<io.grpc.testing.integration.Messages.StreamingOutputCallRequest,
@ -102,6 +107,7 @@ public final class TestServiceGrpc {
io.grpc.testing.integration.Messages.StreamingOutputCallRequest.getDefaultInstance()))
.setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
io.grpc.testing.integration.Messages.StreamingOutputCallResponse.getDefaultInstance()))
.setSchemaDescriptor(new TestServiceMethodDescriptorSupplier("FullDuplexCall"))
.build();
@io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901")
public static final io.grpc.MethodDescriptor<io.grpc.testing.integration.Messages.StreamingOutputCallRequest,
@ -114,6 +120,7 @@ public final class TestServiceGrpc {
io.grpc.testing.integration.Messages.StreamingOutputCallRequest.getDefaultInstance()))
.setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
io.grpc.testing.integration.Messages.StreamingOutputCallResponse.getDefaultInstance()))
.setSchemaDescriptor(new TestServiceMethodDescriptorSupplier("HalfDuplexCall"))
.build();
@io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901")
public static final io.grpc.MethodDescriptor<com.google.protobuf.EmptyProtos.Empty,
@ -126,6 +133,7 @@ public final class TestServiceGrpc {
com.google.protobuf.EmptyProtos.Empty.getDefaultInstance()))
.setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
com.google.protobuf.EmptyProtos.Empty.getDefaultInstance()))
.setSchemaDescriptor(new TestServiceMethodDescriptorSupplier("UnimplementedCall"))
.build();
/**
@ -651,11 +659,39 @@ public final class TestServiceGrpc {
}
}
private static final class TestServiceDescriptorSupplier implements io.grpc.protobuf.ProtoFileDescriptorSupplier {
private static abstract class TestServiceBaseDescriptorSupplier
implements io.grpc.protobuf.ProtoFileDescriptorSupplier, io.grpc.protobuf.ProtoServiceDescriptorSupplier {
TestServiceBaseDescriptorSupplier() {}
@java.lang.Override
public com.google.protobuf.Descriptors.FileDescriptor getFileDescriptor() {
return io.grpc.testing.integration.Test.getDescriptor();
}
@java.lang.Override
public com.google.protobuf.Descriptors.ServiceDescriptor getServiceDescriptor() {
return getFileDescriptor().findServiceByName("TestService");
}
}
private static final class TestServiceFileDescriptorSupplier
extends TestServiceBaseDescriptorSupplier {
TestServiceFileDescriptorSupplier() {}
}
private static final class TestServiceMethodDescriptorSupplier
extends TestServiceBaseDescriptorSupplier
implements io.grpc.protobuf.ProtoMethodDescriptorSupplier {
private final String methodName;
TestServiceMethodDescriptorSupplier(String methodName) {
this.methodName = methodName;
}
@java.lang.Override
public com.google.protobuf.Descriptors.MethodDescriptor getMethodDescriptor() {
return getServiceDescriptor().findMethodByName(methodName);
}
}
private static volatile io.grpc.ServiceDescriptor serviceDescriptor;
@ -667,7 +703,7 @@ public final class TestServiceGrpc {
result = serviceDescriptor;
if (result == null) {
serviceDescriptor = result = io.grpc.ServiceDescriptor.newBuilder(SERVICE_NAME)
.setSchemaDescriptor(new TestServiceDescriptorSupplier())
.setSchemaDescriptor(new TestServiceFileDescriptorSupplier())
.addMethod(METHOD_EMPTY_CALL)
.addMethod(METHOD_UNARY_CALL)
.addMethod(METHOD_CACHEABLE_UNARY_CALL)

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

@ -42,6 +42,7 @@ public final class UnimplementedServiceGrpc {
com.google.protobuf.EmptyProtos.Empty.getDefaultInstance()))
.setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
com.google.protobuf.EmptyProtos.Empty.getDefaultInstance()))
.setSchemaDescriptor(new UnimplementedServiceMethodDescriptorSupplier("UnimplementedCall"))
.build();
/**
@ -238,11 +239,39 @@ public final class UnimplementedServiceGrpc {
}
}
private static final class UnimplementedServiceDescriptorSupplier implements io.grpc.protobuf.ProtoFileDescriptorSupplier {
private static abstract class UnimplementedServiceBaseDescriptorSupplier
implements io.grpc.protobuf.ProtoFileDescriptorSupplier, io.grpc.protobuf.ProtoServiceDescriptorSupplier {
UnimplementedServiceBaseDescriptorSupplier() {}
@java.lang.Override
public com.google.protobuf.Descriptors.FileDescriptor getFileDescriptor() {
return io.grpc.testing.integration.Test.getDescriptor();
}
@java.lang.Override
public com.google.protobuf.Descriptors.ServiceDescriptor getServiceDescriptor() {
return getFileDescriptor().findServiceByName("UnimplementedService");
}
}
private static final class UnimplementedServiceFileDescriptorSupplier
extends UnimplementedServiceBaseDescriptorSupplier {
UnimplementedServiceFileDescriptorSupplier() {}
}
private static final class UnimplementedServiceMethodDescriptorSupplier
extends UnimplementedServiceBaseDescriptorSupplier
implements io.grpc.protobuf.ProtoMethodDescriptorSupplier {
private final String methodName;
UnimplementedServiceMethodDescriptorSupplier(String methodName) {
this.methodName = methodName;
}
@java.lang.Override
public com.google.protobuf.Descriptors.MethodDescriptor getMethodDescriptor() {
return getServiceDescriptor().findMethodByName(methodName);
}
}
private static volatile io.grpc.ServiceDescriptor serviceDescriptor;
@ -254,7 +283,7 @@ public final class UnimplementedServiceGrpc {
result = serviceDescriptor;
if (result == null) {
serviceDescriptor = result = io.grpc.ServiceDescriptor.newBuilder(SERVICE_NAME)
.setSchemaDescriptor(new UnimplementedServiceDescriptorSupplier())
.setSchemaDescriptor(new UnimplementedServiceFileDescriptorSupplier())
.addMethod(METHOD_UNIMPLEMENTED_CALL)
.build();
}

33
protobuf/src/main/java/io/grpc/protobuf/ProtoMethodDescriptorSupplier.java Normal file
View File

@ -0,0 +1,33 @@
/*
* Copyright 2017, gRPC Authors All rights reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package io.grpc.protobuf;
import com.google.protobuf.Descriptors.MethodDescriptor;
import javax.annotation.CheckReturnValue;
/**
* Provides access to the underlying proto service method descriptor.
*
* @since 1.7.0
*/
public interface ProtoMethodDescriptorSupplier extends ProtoServiceDescriptorSupplier {
/**
* Returns method descriptor to the proto service method.
*/
@CheckReturnValue
MethodDescriptor getMethodDescriptor();
}

31
protobuf/src/main/java/io/grpc/protobuf/ProtoServiceDescriptorSupplier.java Normal file
View File

@ -0,0 +1,31 @@
/*
* Copyright 2017, gRPC Authors All rights reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package io.grpc.protobuf;
import com.google.protobuf.Descriptors.ServiceDescriptor;
/**
* Provides access to the underlying proto service descriptor.
*
* @since 1.7.0
*/
public interface ProtoServiceDescriptorSupplier extends ProtoFileDescriptorSupplier {
/**
* Returns service descriptor to the proto service.
*/
ServiceDescriptor getServiceDescriptor();
}

33
services/src/generated/main/grpc/io/grpc/health/v1/HealthGrpc.java
View File

@ -38,6 +38,7 @@ public final class HealthGrpc {
io.grpc.health.v1.HealthCheckRequest.getDefaultInstance()))
.setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
io.grpc.health.v1.HealthCheckResponse.getDefaultInstance()))
.setSchemaDescriptor(new HealthMethodDescriptorSupplier("Check"))
.build();
/**
@ -206,11 +207,39 @@ public final class HealthGrpc {
}
}
private static final class HealthDescriptorSupplier implements io.grpc.protobuf.ProtoFileDescriptorSupplier {
private static abstract class HealthBaseDescriptorSupplier
implements io.grpc.protobuf.ProtoFileDescriptorSupplier, io.grpc.protobuf.ProtoServiceDescriptorSupplier {
HealthBaseDescriptorSupplier() {}
@java.lang.Override
public com.google.protobuf.Descriptors.FileDescriptor getFileDescriptor() {
return io.grpc.health.v1.HealthProto.getDescriptor();
}
@java.lang.Override
public com.google.protobuf.Descriptors.ServiceDescriptor getServiceDescriptor() {
return getFileDescriptor().findServiceByName("Health");
}
}
private static final class HealthFileDescriptorSupplier
extends HealthBaseDescriptorSupplier {
HealthFileDescriptorSupplier() {}
}
private static final class HealthMethodDescriptorSupplier
extends HealthBaseDescriptorSupplier
implements io.grpc.protobuf.ProtoMethodDescriptorSupplier {
private final String methodName;
HealthMethodDescriptorSupplier(String methodName) {
this.methodName = methodName;
}
@java.lang.Override
public com.google.protobuf.Descriptors.MethodDescriptor getMethodDescriptor() {
return getServiceDescriptor().findMethodByName(methodName);
}
}
private static volatile io.grpc.ServiceDescriptor serviceDescriptor;
@ -222,7 +251,7 @@ public final class HealthGrpc {
result = serviceDescriptor;
if (result == null) {
serviceDescriptor = result = io.grpc.ServiceDescriptor.newBuilder(SERVICE_NAME)
.setSchemaDescriptor(new HealthDescriptorSupplier())
.setSchemaDescriptor(new HealthFileDescriptorSupplier())
.addMethod(METHOD_CHECK)
.build();
}

37
services/src/generated/main/grpc/io/grpc/instrumentation/v1alpha/MonitoringGrpc.java
View File

@ -38,6 +38,7 @@ public final class MonitoringGrpc {
com.google.protobuf.Empty.getDefaultInstance()))
.setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
io.grpc.instrumentation.v1alpha.CanonicalRpcStats.getDefaultInstance()))
.setSchemaDescriptor(new MonitoringMethodDescriptorSupplier("GetCanonicalRpcStats"))
.build();
@io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901")
public static final io.grpc.MethodDescriptor<io.grpc.instrumentation.v1alpha.StatsRequest,
@ -50,6 +51,7 @@ public final class MonitoringGrpc {
io.grpc.instrumentation.v1alpha.StatsRequest.getDefaultInstance()))
.setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
io.grpc.instrumentation.v1alpha.StatsResponse.getDefaultInstance()))
.setSchemaDescriptor(new MonitoringMethodDescriptorSupplier("GetStats"))
.build();
@io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901")
public static final io.grpc.MethodDescriptor<io.grpc.instrumentation.v1alpha.StatsRequest,
@ -62,6 +64,7 @@ public final class MonitoringGrpc {
io.grpc.instrumentation.v1alpha.StatsRequest.getDefaultInstance()))
.setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
io.grpc.instrumentation.v1alpha.StatsResponse.getDefaultInstance()))
.setSchemaDescriptor(new MonitoringMethodDescriptorSupplier("WatchStats"))
.build();
@io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901")
public static final io.grpc.MethodDescriptor<io.grpc.instrumentation.v1alpha.TraceRequest,
@ -74,6 +77,7 @@ public final class MonitoringGrpc {
io.grpc.instrumentation.v1alpha.TraceRequest.getDefaultInstance()))
.setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
io.grpc.instrumentation.v1alpha.TraceResponse.getDefaultInstance()))
.setSchemaDescriptor(new MonitoringMethodDescriptorSupplier("GetRequestTraces"))
.build();
@io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901")
public static final io.grpc.MethodDescriptor<io.grpc.instrumentation.v1alpha.MonitoringDataGroup,
@ -86,6 +90,7 @@ public final class MonitoringGrpc {
io.grpc.instrumentation.v1alpha.MonitoringDataGroup.getDefaultInstance()))
.setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
io.grpc.instrumentation.v1alpha.CustomMonitoringData.getDefaultInstance()))
.setSchemaDescriptor(new MonitoringMethodDescriptorSupplier("GetCustomMonitoringData"))
.build();
/**
@ -484,11 +489,39 @@ public final class MonitoringGrpc {
}
}
private static final class MonitoringDescriptorSupplier implements io.grpc.protobuf.ProtoFileDescriptorSupplier {
private static abstract class MonitoringBaseDescriptorSupplier
implements io.grpc.protobuf.ProtoFileDescriptorSupplier, io.grpc.protobuf.ProtoServiceDescriptorSupplier {
MonitoringBaseDescriptorSupplier() {}
@java.lang.Override
public com.google.protobuf.Descriptors.FileDescriptor getFileDescriptor() {
return io.grpc.instrumentation.v1alpha.MonitoringProto.getDescriptor();
}
@java.lang.Override
public com.google.protobuf.Descriptors.ServiceDescriptor getServiceDescriptor() {
return getFileDescriptor().findServiceByName("Monitoring");
}
}
private static final class MonitoringFileDescriptorSupplier
extends MonitoringBaseDescriptorSupplier {
MonitoringFileDescriptorSupplier() {}
}
private static final class MonitoringMethodDescriptorSupplier
extends MonitoringBaseDescriptorSupplier
implements io.grpc.protobuf.ProtoMethodDescriptorSupplier {
private final String methodName;
MonitoringMethodDescriptorSupplier(String methodName) {
this.methodName = methodName;
}
@java.lang.Override
public com.google.protobuf.Descriptors.MethodDescriptor getMethodDescriptor() {
return getServiceDescriptor().findMethodByName(methodName);
}
}
private static volatile io.grpc.ServiceDescriptor serviceDescriptor;
@ -500,7 +533,7 @@ public final class MonitoringGrpc {
result = serviceDescriptor;
if (result == null) {
serviceDescriptor = result = io.grpc.ServiceDescriptor.newBuilder(SERVICE_NAME)
.setSchemaDescriptor(new MonitoringDescriptorSupplier())
.setSchemaDescriptor(new MonitoringFileDescriptorSupplier())
.addMethod(METHOD_GET_CANONICAL_RPC_STATS)
.addMethod(METHOD_GET_STATS)
.addMethod(METHOD_WATCH_STATS)

33
services/src/generated/main/grpc/io/grpc/reflection/v1alpha/ServerReflectionGrpc.java
View File

@ -38,6 +38,7 @@ public final class ServerReflectionGrpc {
io.grpc.reflection.v1alpha.ServerReflectionRequest.getDefaultInstance()))
.setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
io.grpc.reflection.v1alpha.ServerReflectionResponse.getDefaultInstance()))
.setSchemaDescriptor(new ServerReflectionMethodDescriptorSupplier("ServerReflectionInfo"))
.build();
/**
@ -198,11 +199,39 @@ public final class ServerReflectionGrpc {
}
}
private static final class ServerReflectionDescriptorSupplier implements io.grpc.protobuf.ProtoFileDescriptorSupplier {
private static abstract class ServerReflectionBaseDescriptorSupplier
implements io.grpc.protobuf.ProtoFileDescriptorSupplier, io.grpc.protobuf.ProtoServiceDescriptorSupplier {
ServerReflectionBaseDescriptorSupplier() {}
@java.lang.Override
public com.google.protobuf.Descriptors.FileDescriptor getFileDescriptor() {
return io.grpc.reflection.v1alpha.ServerReflectionProto.getDescriptor();
}
@java.lang.Override
public com.google.protobuf.Descriptors.ServiceDescriptor getServiceDescriptor() {
return getFileDescriptor().findServiceByName("ServerReflection");
}
}
private static final class ServerReflectionFileDescriptorSupplier
extends ServerReflectionBaseDescriptorSupplier {
ServerReflectionFileDescriptorSupplier() {}
}
private static final class ServerReflectionMethodDescriptorSupplier
extends ServerReflectionBaseDescriptorSupplier
implements io.grpc.protobuf.ProtoMethodDescriptorSupplier {
private final String methodName;
ServerReflectionMethodDescriptorSupplier(String methodName) {
this.methodName = methodName;
}
@java.lang.Override
public com.google.protobuf.Descriptors.MethodDescriptor getMethodDescriptor() {
return getServiceDescriptor().findMethodByName(methodName);
}
}
private static volatile io.grpc.ServiceDescriptor serviceDescriptor;
@ -214,7 +243,7 @@ public final class ServerReflectionGrpc {
result = serviceDescriptor;
if (result == null) {
serviceDescriptor = result = io.grpc.ServiceDescriptor.newBuilder(SERVICE_NAME)
.setSchemaDescriptor(new ServerReflectionDescriptorSupplier())
.setSchemaDescriptor(new ServerReflectionFileDescriptorSupplier())
.addMethod(METHOD_SERVER_REFLECTION_INFO)
.build();
}

33
services/src/generated/test/grpc/io/grpc/reflection/testing/AnotherDynamicServiceGrpc.java
View File

@ -41,6 +41,7 @@ public final class AnotherDynamicServiceGrpc {
io.grpc.reflection.testing.DynamicRequest.getDefaultInstance()))
.setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
io.grpc.reflection.testing.DynamicReply.getDefaultInstance()))
.setSchemaDescriptor(new AnotherDynamicServiceMethodDescriptorSupplier("Method"))
.build();
/**
@ -233,11 +234,39 @@ public final class AnotherDynamicServiceGrpc {
}
}
private static final class AnotherDynamicServiceDescriptorSupplier implements io.grpc.protobuf.ProtoFileDescriptorSupplier {
private static abstract class AnotherDynamicServiceBaseDescriptorSupplier
implements io.grpc.protobuf.ProtoFileDescriptorSupplier, io.grpc.protobuf.ProtoServiceDescriptorSupplier {
AnotherDynamicServiceBaseDescriptorSupplier() {}
@java.lang.Override
public com.google.protobuf.Descriptors.FileDescriptor getFileDescriptor() {
return io.grpc.reflection.testing.DynamicReflectionTestProto.getDescriptor();
}
@java.lang.Override
public com.google.protobuf.Descriptors.ServiceDescriptor getServiceDescriptor() {
return getFileDescriptor().findServiceByName("AnotherDynamicService");
}
}
private static final class AnotherDynamicServiceFileDescriptorSupplier
extends AnotherDynamicServiceBaseDescriptorSupplier {
AnotherDynamicServiceFileDescriptorSupplier() {}
}
private static final class AnotherDynamicServiceMethodDescriptorSupplier
extends AnotherDynamicServiceBaseDescriptorSupplier
implements io.grpc.protobuf.ProtoMethodDescriptorSupplier {
private final String methodName;
AnotherDynamicServiceMethodDescriptorSupplier(String methodName) {
this.methodName = methodName;
}
@java.lang.Override
public com.google.protobuf.Descriptors.MethodDescriptor getMethodDescriptor() {
return getServiceDescriptor().findMethodByName(methodName);
}
}
private static volatile io.grpc.ServiceDescriptor serviceDescriptor;
@ -249,7 +278,7 @@ public final class AnotherDynamicServiceGrpc {
result = serviceDescriptor;
if (result == null) {
serviceDescriptor = result = io.grpc.ServiceDescriptor.newBuilder(SERVICE_NAME)
.setSchemaDescriptor(new AnotherDynamicServiceDescriptorSupplier())
.setSchemaDescriptor(new AnotherDynamicServiceFileDescriptorSupplier())
.addMethod(METHOD_METHOD)
.build();
}

33
services/src/generated/test/grpc/io/grpc/reflection/testing/DynamicServiceGrpc.java
View File

@ -41,6 +41,7 @@ public final class DynamicServiceGrpc {
io.grpc.reflection.testing.DynamicRequest.getDefaultInstance()))
.setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
io.grpc.reflection.testing.DynamicReply.getDefaultInstance()))
.setSchemaDescriptor(new DynamicServiceMethodDescriptorSupplier("Method"))
.build();
/**
@ -233,11 +234,39 @@ public final class DynamicServiceGrpc {
}
}
private static final class DynamicServiceDescriptorSupplier implements io.grpc.protobuf.ProtoFileDescriptorSupplier {
private static abstract class DynamicServiceBaseDescriptorSupplier
implements io.grpc.protobuf.ProtoFileDescriptorSupplier, io.grpc.protobuf.ProtoServiceDescriptorSupplier {
DynamicServiceBaseDescriptorSupplier() {}
@java.lang.Override
public com.google.protobuf.Descriptors.FileDescriptor getFileDescriptor() {
return io.grpc.reflection.testing.DynamicReflectionTestProto.getDescriptor();
}
@java.lang.Override
public com.google.protobuf.Descriptors.ServiceDescriptor getServiceDescriptor() {
return getFileDescriptor().findServiceByName("DynamicService");
}
}
private static final class DynamicServiceFileDescriptorSupplier
extends DynamicServiceBaseDescriptorSupplier {
DynamicServiceFileDescriptorSupplier() {}
}
private static final class DynamicServiceMethodDescriptorSupplier
extends DynamicServiceBaseDescriptorSupplier
implements io.grpc.protobuf.ProtoMethodDescriptorSupplier {
private final String methodName;
DynamicServiceMethodDescriptorSupplier(String methodName) {
this.methodName = methodName;
}
@java.lang.Override
public com.google.protobuf.Descriptors.MethodDescriptor getMethodDescriptor() {
return getServiceDescriptor().findMethodByName(methodName);
}
}
private static volatile io.grpc.ServiceDescriptor serviceDescriptor;
@ -249,7 +278,7 @@ public final class DynamicServiceGrpc {
result = serviceDescriptor;
if (result == null) {
serviceDescriptor = result = io.grpc.ServiceDescriptor.newBuilder(SERVICE_NAME)
.setSchemaDescriptor(new DynamicServiceDescriptorSupplier())
.setSchemaDescriptor(new DynamicServiceFileDescriptorSupplier())
.addMethod(METHOD_METHOD)
.build();
}

33
services/src/generated/test/grpc/io/grpc/reflection/testing/ReflectableServiceGrpc.java
View File

@ -38,6 +38,7 @@ public final class ReflectableServiceGrpc {
io.grpc.reflection.testing.Request.getDefaultInstance()))
.setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
io.grpc.reflection.testing.Reply.getDefaultInstance()))
.setSchemaDescriptor(new ReflectableServiceMethodDescriptorSupplier("Method"))
.build();
/**
@ -206,11 +207,39 @@ public final class ReflectableServiceGrpc {
}
}
private static final class ReflectableServiceDescriptorSupplier implements io.grpc.protobuf.ProtoFileDescriptorSupplier {
private static abstract class ReflectableServiceBaseDescriptorSupplier
implements io.grpc.protobuf.ProtoFileDescriptorSupplier, io.grpc.protobuf.ProtoServiceDescriptorSupplier {
ReflectableServiceBaseDescriptorSupplier() {}
@java.lang.Override
public com.google.protobuf.Descriptors.FileDescriptor getFileDescriptor() {
return io.grpc.reflection.testing.ReflectionTestProto.getDescriptor();
}
@java.lang.Override
public com.google.protobuf.Descriptors.ServiceDescriptor getServiceDescriptor() {
return getFileDescriptor().findServiceByName("ReflectableService");
}
}
private static final class ReflectableServiceFileDescriptorSupplier
extends ReflectableServiceBaseDescriptorSupplier {
ReflectableServiceFileDescriptorSupplier() {}
}
private static final class ReflectableServiceMethodDescriptorSupplier
extends ReflectableServiceBaseDescriptorSupplier
implements io.grpc.protobuf.ProtoMethodDescriptorSupplier {
private final String methodName;
ReflectableServiceMethodDescriptorSupplier(String methodName) {
this.methodName = methodName;
}
@java.lang.Override
public com.google.protobuf.Descriptors.MethodDescriptor getMethodDescriptor() {
return getServiceDescriptor().findMethodByName(methodName);
}
}
private static volatile io.grpc.ServiceDescriptor serviceDescriptor;
@ -222,7 +251,7 @@ public final class ReflectableServiceGrpc {
result = serviceDescriptor;
if (result == null) {
serviceDescriptor = result = io.grpc.ServiceDescriptor.newBuilder(SERVICE_NAME)
.setSchemaDescriptor(new ReflectableServiceDescriptorSupplier())
.setSchemaDescriptor(new ReflectableServiceFileDescriptorSupplier())
.addMethod(METHOD_METHOD)
.build();
}

36
testing-proto/src/generated/main/grpc/io/grpc/testing/protobuf/SimpleServiceGrpc.java
View File

@ -41,6 +41,7 @@ public final class SimpleServiceGrpc {
io.grpc.testing.protobuf.SimpleRequest.getDefaultInstance()))
.setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
io.grpc.testing.protobuf.SimpleResponse.getDefaultInstance()))
.setSchemaDescriptor(new SimpleServiceMethodDescriptorSupplier("UnaryRpc"))
.build();
@io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901")
public static final io.grpc.MethodDescriptor<io.grpc.testing.protobuf.SimpleRequest,
@ -53,6 +54,7 @@ public final class SimpleServiceGrpc {
io.grpc.testing.protobuf.SimpleRequest.getDefaultInstance()))
.setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
io.grpc.testing.protobuf.SimpleResponse.getDefaultInstance()))
.setSchemaDescriptor(new SimpleServiceMethodDescriptorSupplier("ClientStreamingRpc"))
.build();
@io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901")
public static final io.grpc.MethodDescriptor<io.grpc.testing.protobuf.SimpleRequest,
@ -65,6 +67,7 @@ public final class SimpleServiceGrpc {
io.grpc.testing.protobuf.SimpleRequest.getDefaultInstance()))
.setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
io.grpc.testing.protobuf.SimpleResponse.getDefaultInstance()))
.setSchemaDescriptor(new SimpleServiceMethodDescriptorSupplier("ServerStreamingRpc"))
.build();
@io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901")
public static final io.grpc.MethodDescriptor<io.grpc.testing.protobuf.SimpleRequest,
@ -77,6 +80,7 @@ public final class SimpleServiceGrpc {
io.grpc.testing.protobuf.SimpleRequest.getDefaultInstance()))
.setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
io.grpc.testing.protobuf.SimpleResponse.getDefaultInstance()))
.setSchemaDescriptor(new SimpleServiceMethodDescriptorSupplier("BidiStreamingRpc"))
.build();
/**
@ -377,11 +381,39 @@ public final class SimpleServiceGrpc {
}
}
private static final class SimpleServiceDescriptorSupplier implements io.grpc.protobuf.ProtoFileDescriptorSupplier {
private static abstract class SimpleServiceBaseDescriptorSupplier
implements io.grpc.protobuf.ProtoFileDescriptorSupplier, io.grpc.protobuf.ProtoServiceDescriptorSupplier {
SimpleServiceBaseDescriptorSupplier() {}
@java.lang.Override
public com.google.protobuf.Descriptors.FileDescriptor getFileDescriptor() {
return io.grpc.testing.protobuf.SimpleServiceProto.getDescriptor();
}
@java.lang.Override
public com.google.protobuf.Descriptors.ServiceDescriptor getServiceDescriptor() {
return getFileDescriptor().findServiceByName("SimpleService");
}
}
private static final class SimpleServiceFileDescriptorSupplier
extends SimpleServiceBaseDescriptorSupplier {
SimpleServiceFileDescriptorSupplier() {}
}
private static final class SimpleServiceMethodDescriptorSupplier
extends SimpleServiceBaseDescriptorSupplier
implements io.grpc.protobuf.ProtoMethodDescriptorSupplier {
private final String methodName;
SimpleServiceMethodDescriptorSupplier(String methodName) {
this.methodName = methodName;
}
@java.lang.Override
public com.google.protobuf.Descriptors.MethodDescriptor getMethodDescriptor() {
return getServiceDescriptor().findMethodByName(methodName);
}
}
private static volatile io.grpc.ServiceDescriptor serviceDescriptor;
@ -393,7 +425,7 @@ public final class SimpleServiceGrpc {
result = serviceDescriptor;
if (result == null) {
serviceDescriptor = result = io.grpc.ServiceDescriptor.newBuilder(SERVICE_NAME)
.setSchemaDescriptor(new SimpleServiceDescriptorSupplier())
.setSchemaDescriptor(new SimpleServiceFileDescriptorSupplier())
.addMethod(METHOD_UNARY_RPC)
.addMethod(METHOD_CLIENT_STREAMING_RPC)
.addMethod(METHOD_SERVER_STREAMING_RPC)