From 3c98d9322cfd0a933e59277e3f4223dd54f3b2fe Mon Sep 17 00:00:00 2001 From: Chris Nokleberg Date: Mon, 23 Mar 2020 09:43:27 -0700 Subject: [PATCH] core: copy the SchemaDescriptor when rebuilding descriptor useMarshalledMessages works by duplicating a ServerServiceDefinition while replacing just the marshallers. It currently does not copy over the SchemaDescriptors, which breaks at least the ProtoReflectionService. --- api/src/main/java/io/grpc/ServerInterceptors.java | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/api/src/main/java/io/grpc/ServerInterceptors.java b/api/src/main/java/io/grpc/ServerInterceptors.java index dc1b0609d9b6..6d925caeedbd 100644 --- a/api/src/main/java/io/grpc/ServerInterceptors.java +++ b/api/src/main/java/io/grpc/ServerInterceptors.java @@ -187,13 +187,15 @@ public static ServerServiceDefinition useMarshalledMessages( wrappedMethods.add(wrapMethod(definition, wrappedMethodDescriptor)); } // Build the new service descriptor - final ServerServiceDefinition.Builder serviceBuilder = ServerServiceDefinition - .builder(new ServiceDescriptor(serviceDef.getServiceDescriptor().getName(), - wrappedDescriptors)); - // Create the new service definiton. - for (ServerMethodDefinition definition : wrappedMethods) { - serviceBuilder.addMethod(definition); + final ServiceDescriptor.Builder serviceDescriptorBuilder = + ServiceDescriptor.newBuilder(serviceDef.getServiceDescriptor().getName()) + .setSchemaDescriptor(serviceDef.getServiceDescriptor().getSchemaDescriptor()); + for (MethodDescriptor wrappedDescriptor : wrappedDescriptors) { + serviceDescriptorBuilder.addMethod(wrappedDescriptor); } + // Create the new service definition. + final ServerServiceDefinition.Builder serviceBuilder = + ServerServiceDefinition.builder(serviceDescriptorBuilder.build()); return serviceBuilder.build(); }