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

Eliminate MethodDescriptor from startCall and interceptCall for servers 

Make the MethodDescriptor a property of ServerCall
Move ServerMethodDefinition into ServerServiceDefinition
This commit is contained in:
Louis Ryan 2016-05-19 18:34:11 -07:00
parent 0b55c81548
commit 3df1446deb
46 changed files with 664 additions and 426 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -263,9 +263,15 @@ public class BenchmarkServiceGrpc {
} }
} }
public static io.grpc.ServiceDescriptor getServiceDescriptor() {
return new io.grpc.ServiceDescriptor(SERVICE_NAME,
METHOD_UNARY_CALL,
METHOD_STREAMING_CALL);
}
public static io.grpc.ServerServiceDefinition bindService( public static io.grpc.ServerServiceDefinition bindService(
final BenchmarkService serviceImpl) { final BenchmarkService serviceImpl) {
return io.grpc.ServerServiceDefinition.builder(SERVICE_NAME) return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor())
.addMethod( .addMethod(
METHOD_UNARY_CALL, METHOD_UNARY_CALL,
asyncUnaryCall( asyncUnaryCall(

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

@ -366,9 +366,17 @@ public class WorkerServiceGrpc {
} }
} }
public static io.grpc.ServiceDescriptor getServiceDescriptor() {
return new io.grpc.ServiceDescriptor(SERVICE_NAME,
METHOD_RUN_SERVER,
METHOD_RUN_CLIENT,
METHOD_CORE_COUNT,
METHOD_QUIT_WORKER);
}
public static io.grpc.ServerServiceDefinition bindService( public static io.grpc.ServerServiceDefinition bindService(
final WorkerService serviceImpl) { final WorkerService serviceImpl) {
return io.grpc.ServerServiceDefinition.builder(SERVICE_NAME) return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor())
.addMethod( .addMethod(
METHOD_RUN_SERVER, METHOD_RUN_SERVER,
asyncBidiStreamingCall( asyncBidiStreamingCall(

25
benchmarks/src/jmh/java/io/grpc/benchmarks/netty/AbstractBenchmark.java
View File

@ -41,6 +41,7 @@ import io.grpc.Server;
import io.grpc.ServerCall; import io.grpc.ServerCall;
import io.grpc.ServerCallHandler; import io.grpc.ServerCallHandler;
import io.grpc.ServerServiceDefinition; import io.grpc.ServerServiceDefinition;
import io.grpc.ServiceDescriptor;
import io.grpc.Status; import io.grpc.Status;
import io.grpc.benchmarks.ByteBufOutputMarshaller; import io.grpc.benchmarks.ByteBufOutputMarshaller;
import io.grpc.netty.NegotiationType; import io.grpc.netty.NegotiationType;
@ -258,13 +259,15 @@ public abstract class AbstractBenchmark {
// Server implementation of unary & streaming methods // Server implementation of unary & streaming methods
serverBuilder.addService( serverBuilder.addService(
ServerServiceDefinition.builder("benchmark") ServerServiceDefinition.builder(
.addMethod(unaryMethod, new ServiceDescriptor("benchmark",
new ServerCallHandler<ByteBuf, ByteBuf>() { unaryMethod,
pingPongMethod,
flowControlledStreaming))
.addMethod(unaryMethod, new ServerCallHandler<ByteBuf, ByteBuf>() {
@Override @Override
public ServerCall.Listener<ByteBuf> startCall( public ServerCall.Listener<ByteBuf> startCall(
MethodDescriptor<ByteBuf, ByteBuf> method, final ServerCall<ByteBuf, ByteBuf> call,
final ServerCall<ByteBuf> call,
Metadata headers) { Metadata headers) {
call.sendHeaders(new Metadata()); call.sendHeaders(new Metadata());
call.request(1); call.request(1);
@ -292,12 +295,10 @@ public abstract class AbstractBenchmark {
}; };
} }
}) })
.addMethod(pingPongMethod, .addMethod(pingPongMethod, new ServerCallHandler<ByteBuf, ByteBuf>() {
new ServerCallHandler<ByteBuf, ByteBuf>() {
@Override @Override
public ServerCall.Listener<ByteBuf> startCall( public ServerCall.Listener<ByteBuf> startCall(
MethodDescriptor<ByteBuf, ByteBuf> method, final ServerCall<ByteBuf, ByteBuf> call,
final ServerCall<ByteBuf> call,
Metadata headers) { Metadata headers) {
call.sendHeaders(new Metadata()); call.sendHeaders(new Metadata());
call.request(1); call.request(1);
@ -327,12 +328,10 @@ public abstract class AbstractBenchmark {
}; };
} }
}) })
.addMethod(flowControlledStreaming, .addMethod(flowControlledStreaming, new ServerCallHandler<ByteBuf, ByteBuf>() {
new ServerCallHandler<ByteBuf, ByteBuf>() {
@Override @Override
public ServerCall.Listener<ByteBuf> startCall( public ServerCall.Listener<ByteBuf> startCall(
MethodDescriptor<ByteBuf, ByteBuf> method, final ServerCall<ByteBuf, ByteBuf> call,
final ServerCall<ByteBuf> call,
Metadata headers) { Metadata headers) {
call.sendHeaders(new Metadata()); call.sendHeaders(new Metadata());
call.request(1); call.request(1);

20
benchmarks/src/jmh/java/io/grpc/benchmarks/netty/HandlerRegistryBenchmark.java
View File

@ -31,9 +31,13 @@
package io.grpc.benchmarks.netty; package io.grpc.benchmarks.netty;
import io.grpc.Metadata;
import io.grpc.MethodDescriptor; import io.grpc.MethodDescriptor;
import io.grpc.ServerMethodDefinition; import io.grpc.ServerCall;
import io.grpc.ServerCall.Listener;
import io.grpc.ServerCallHandler;
import io.grpc.ServerServiceDefinition; import io.grpc.ServerServiceDefinition;
import io.grpc.ServiceDescriptor;
import io.grpc.util.MutableHandlerRegistry; import io.grpc.util.MutableHandlerRegistry;
import org.openjdk.jmh.annotations.Benchmark; import org.openjdk.jmh.annotations.Benchmark;
@ -80,13 +84,21 @@ public class HandlerRegistryBenchmark {
fullMethodNames = new ArrayList<String>(serviceCount * methodCountPerService); fullMethodNames = new ArrayList<String>(serviceCount * methodCountPerService);
for (int serviceIndex = 0; serviceIndex < serviceCount; ++serviceIndex) { for (int serviceIndex = 0; serviceIndex < serviceCount; ++serviceIndex) {
String serviceName = randomString(); String serviceName = randomString();
ServerServiceDefinition.Builder serviceBuilder = ServerServiceDefinition.builder(serviceName); ServerServiceDefinition.Builder serviceBuilder = ServerServiceDefinition.builder(
new ServiceDescriptor(serviceName));
for (int methodIndex = 0; methodIndex < methodCountPerService; ++methodIndex) { for (int methodIndex = 0; methodIndex < methodCountPerService; ++methodIndex) {
String methodName = randomString(); String methodName = randomString();
MethodDescriptor<?, ?> methodDescriptor = MethodDescriptor.create( MethodDescriptor<Object, Object> methodDescriptor = MethodDescriptor.create(
MethodDescriptor.MethodType.UNKNOWN, MethodDescriptor.MethodType.UNKNOWN,
MethodDescriptor.generateFullMethodName(serviceName, methodName), null, null); MethodDescriptor.generateFullMethodName(serviceName, methodName), null, null);
serviceBuilder.addMethod(ServerMethodDefinition.create(methodDescriptor, null)); serviceBuilder.addMethod(methodDescriptor,
new ServerCallHandler<Object, Object>() {
@Override
public Listener<Object> startCall(ServerCall<Object, Object> call,
Metadata headers) {
return null;
}
});
fullMethodNames.add(methodDescriptor.getFullMethodName()); fullMethodNames.add(methodDescriptor.getFullMethodName());
} }
registry.addService(serviceBuilder.build()); registry.addService(serviceBuilder.build());

9
benchmarks/src/main/java/io/grpc/benchmarks/driver/LoadServer.java
View File

@ -40,6 +40,7 @@ import io.grpc.ServerBuilder;
import io.grpc.ServerCall; import io.grpc.ServerCall;
import io.grpc.ServerCallHandler; import io.grpc.ServerCallHandler;
import io.grpc.ServerServiceDefinition; import io.grpc.ServerServiceDefinition;
import io.grpc.ServiceDescriptor;
import io.grpc.Status; import io.grpc.Status;
import io.grpc.benchmarks.ByteBufOutputMarshaller; import io.grpc.benchmarks.ByteBufOutputMarshaller;
import io.grpc.benchmarks.Utils; import io.grpc.benchmarks.Utils;
@ -141,7 +142,8 @@ final class LoadServer {
if (config.getServerType() == Control.ServerType.ASYNC_GENERIC_SERVER) { if (config.getServerType() == Control.ServerType.ASYNC_GENERIC_SERVER) {
serverBuilder.addService( serverBuilder.addService(
ServerServiceDefinition ServerServiceDefinition
.builder(BenchmarkServiceGrpc.SERVICE_NAME) .builder(new ServiceDescriptor(BenchmarkServiceGrpc.SERVICE_NAME,
GENERIC_STREAMING_PING_PONG_METHOD))
.addMethod(GENERIC_STREAMING_PING_PONG_METHOD, new GenericServiceCallHandler()) .addMethod(GENERIC_STREAMING_PING_PONG_METHOD, new GenericServiceCallHandler())
.build()); .build());
} else { } else {
@ -230,9 +232,10 @@ final class LoadServer {
} }
private class GenericServiceCallHandler implements ServerCallHandler<ByteBuf, ByteBuf> { private class GenericServiceCallHandler implements ServerCallHandler<ByteBuf, ByteBuf> {
@Override @Override
public ServerCall.Listener<ByteBuf> startCall(MethodDescriptor<ByteBuf, ByteBuf> method, public ServerCall.Listener<ByteBuf> startCall(
final ServerCall<ByteBuf> call, Metadata headers) { final ServerCall<ByteBuf, ByteBuf> call, Metadata headers) {
call.sendHeaders(new Metadata()); call.sendHeaders(new Metadata());
call.request(1); call.request(1);
return new ServerCall.Listener<ByteBuf>() { return new ServerCall.Listener<ByteBuf>() {

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

@ -851,6 +851,31 @@ static void PrintMethodHandlerClass(const ServiceDescriptor* service,
p->Print("}\n\n"); p->Print("}\n\n");
} }
static void PrintGetServiceDescriptorMethod(const ServiceDescriptor* service,
map<string, string>* vars,
Printer* p,
bool generate_nano) {
(*vars)["service_name"] = service->name();
p->Print(
*vars,
"public static $ServiceDescriptor$ getServiceDescriptor() {\n");
p->Indent();
p->Print(*vars,
"return new $ServiceDescriptor$(SERVICE_NAME");
p->Indent();
p->Indent();
for (int i = 0; i < service->method_count(); ++i) {
const MethodDescriptor* method = service->method(i);
(*vars)["method_field_name"] = MethodPropertiesFieldName(method);
p->Print(*vars, ",\n$method_field_name$");
}
p->Print(");\n");
p->Outdent();
p->Outdent();
p->Outdent();
p->Print("}\n\n");
}
static void PrintBindServiceMethod(const ServiceDescriptor* service, static void PrintBindServiceMethod(const ServiceDescriptor* service,
map<string, string>* vars, map<string, string>* vars,
Printer* p, Printer* p,
@ -863,7 +888,7 @@ static void PrintBindServiceMethod(const ServiceDescriptor* service,
p->Indent(); p->Indent();
p->Print(*vars, p->Print(*vars,
"return " "return "
"$ServerServiceDefinition$.builder(SERVICE_NAME)\n"); "$ServerServiceDefinition$.builder(getServiceDescriptor())\n");
p->Indent(); p->Indent();
p->Indent(); p->Indent();
for (int i = 0; i < service->method_count(); ++i) { for (int i = 0; i < service->method_count(); ++i) {
@ -994,6 +1019,7 @@ static void PrintService(const ServiceDescriptor* service,
PrintStub(service, vars, p, BLOCKING_CLIENT_IMPL, generate_nano); PrintStub(service, vars, p, BLOCKING_CLIENT_IMPL, generate_nano);
PrintStub(service, vars, p, FUTURE_CLIENT_IMPL, generate_nano); PrintStub(service, vars, p, FUTURE_CLIENT_IMPL, generate_nano);
PrintMethodHandlerClass(service, vars, p, generate_nano); PrintMethodHandlerClass(service, vars, p, generate_nano);
PrintGetServiceDescriptorMethod(service, vars, p, generate_nano);
PrintBindServiceMethod(service, vars, p, generate_nano); PrintBindServiceMethod(service, vars, p, generate_nano);
p->Outdent(); p->Outdent();
p->Print("}\n"); p->Print("}\n");
@ -1050,6 +1076,8 @@ void GenerateService(const ServiceDescriptor* service,
vars["BindableService"] = "io.grpc.BindableService"; vars["BindableService"] = "io.grpc.BindableService";
vars["ServerServiceDefinition"] = vars["ServerServiceDefinition"] =
"io.grpc.ServerServiceDefinition"; "io.grpc.ServerServiceDefinition";
vars["ServiceDescriptor"] =
"io.grpc.ServiceDescriptor";
vars["AbstractStub"] = "io.grpc.stub.AbstractStub"; vars["AbstractStub"] = "io.grpc.stub.AbstractStub";
vars["ImmutableList"] = "com.google.common.collect.ImmutableList"; vars["ImmutableList"] = "com.google.common.collect.ImmutableList";
vars["Collection"] = "java.util.Collection"; vars["Collection"] = "java.util.Collection";

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

@ -400,9 +400,18 @@ public class TestServiceGrpc {
} }
} }
public static io.grpc.ServiceDescriptor getServiceDescriptor() {
return new io.grpc.ServiceDescriptor(SERVICE_NAME,
METHOD_UNARY_CALL,
METHOD_STREAMING_OUTPUT_CALL,
METHOD_STREAMING_INPUT_CALL,
METHOD_FULL_BIDI_CALL,
METHOD_HALF_BIDI_CALL);
}
public static io.grpc.ServerServiceDefinition bindService( public static io.grpc.ServerServiceDefinition bindService(
final TestService serviceImpl) { final TestService serviceImpl) {
return io.grpc.ServerServiceDefinition.builder(SERVICE_NAME) return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor())
.addMethod( .addMethod(
METHOD_UNARY_CALL, METHOD_UNARY_CALL,
asyncUnaryCall( asyncUnaryCall(

11
compiler/src/testLite/golden/TestService.java.txt
View File

@ -400,9 +400,18 @@ public class TestServiceGrpc {
} }
} }
public static io.grpc.ServiceDescriptor getServiceDescriptor() {
return new io.grpc.ServiceDescriptor(SERVICE_NAME,
METHOD_UNARY_CALL,
METHOD_STREAMING_OUTPUT_CALL,
METHOD_STREAMING_INPUT_CALL,
METHOD_FULL_BIDI_CALL,
METHOD_HALF_BIDI_CALL);
}
public static io.grpc.ServerServiceDefinition bindService( public static io.grpc.ServerServiceDefinition bindService(
final TestService serviceImpl) { final TestService serviceImpl) {
return io.grpc.ServerServiceDefinition.builder(SERVICE_NAME) return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor())
.addMethod( .addMethod(
METHOD_UNARY_CALL, METHOD_UNARY_CALL,
asyncUnaryCall( asyncUnaryCall(

11
compiler/src/testNano/golden/TestService.java.txt
View File

@ -478,9 +478,18 @@ public class TestServiceGrpc {
} }
} }
public static io.grpc.ServiceDescriptor getServiceDescriptor() {
return new io.grpc.ServiceDescriptor(SERVICE_NAME,
METHOD_UNARY_CALL,
METHOD_STREAMING_OUTPUT_CALL,
METHOD_STREAMING_INPUT_CALL,
METHOD_FULL_BIDI_CALL,
METHOD_HALF_BIDI_CALL);
}
public static io.grpc.ServerServiceDefinition bindService( public static io.grpc.ServerServiceDefinition bindService(
final TestService serviceImpl) { final TestService serviceImpl) {
return io.grpc.ServerServiceDefinition.builder(SERVICE_NAME) return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor())
.addMethod( .addMethod(
METHOD_UNARY_CALL, METHOD_UNARY_CALL,
asyncUnaryCall( asyncUnaryCall(

6
core/src/main/java/io/grpc/Contexts.java
View File

@ -53,7 +53,6 @@ public class Contexts {
* the client. * the client.
* *
* @param context to make {@link Context#current()}. * @param context to make {@link Context#current()}.
* @param method being requested by the client.
* @param call used to send responses to client. * @param call used to send responses to client.
* @param headers received from client. * @param headers received from client.
* @param next handler used to create the listener to be wrapped. * @param next handler used to create the listener to be wrapped.
@ -61,14 +60,13 @@ public class Contexts {
*/ */
public static <ReqT, RespT> ServerCall.Listener<ReqT> interceptCall( public static <ReqT, RespT> ServerCall.Listener<ReqT> interceptCall(
Context context, Context context,
MethodDescriptor<ReqT, RespT> method, ServerCall<ReqT, RespT> call,
ServerCall<RespT> call,
Metadata headers, Metadata headers,
ServerCallHandler<ReqT, RespT> next) { ServerCallHandler<ReqT, RespT> next) {
Context previous = context.attach(); Context previous = context.attach();
try { try {
return new ContextualizedServerCallListener<ReqT>( return new ContextualizedServerCallListener<ReqT>(
next.startCall(method, call, headers), next.startCall(call, headers),
context); context);
} finally { } finally {
context.detach(previous); context.detach(previous);

21
core/src/main/java/io/grpc/ForwardingServerCall.java
View File

@ -34,13 +34,13 @@ package io.grpc;
/** /**
* A {@link ServerCall} which forwards all of it's methods to another {@link ServerCall}. * A {@link ServerCall} which forwards all of it's methods to another {@link ServerCall}.
*/ */
public abstract class ForwardingServerCall<RespT> public abstract class ForwardingServerCall<ReqT, RespT>
extends PartialForwardingServerCall<RespT> { extends PartialForwardingServerCall<ReqT, RespT> {
/** /**
* Returns the delegated {@code ServerCall}. * Returns the delegated {@code ServerCall}.
*/ */
@Override @Override
protected abstract ServerCall<RespT> delegate(); protected abstract ServerCall<ReqT, RespT> delegate();
@Override @Override
public void sendMessage(RespT message) { public void sendMessage(RespT message) {
@ -51,18 +51,23 @@ public abstract class ForwardingServerCall<RespT>
* A simplified version of {@link ForwardingServerCall} where subclasses can pass in a {@link * A simplified version of {@link ForwardingServerCall} where subclasses can pass in a {@link
* ServerCall} as the delegate. * ServerCall} as the delegate.
*/ */
public abstract static class SimpleForwardingServerCall<RespT> public abstract static class SimpleForwardingServerCall<ReqT, RespT>
extends ForwardingServerCall<RespT> { extends ForwardingServerCall<ReqT, RespT> {
private final ServerCall<RespT> delegate; private final ServerCall<ReqT, RespT> delegate;
protected SimpleForwardingServerCall(ServerCall<RespT> delegate) { protected SimpleForwardingServerCall(ServerCall<ReqT, RespT> delegate) {
this.delegate = delegate; this.delegate = delegate;
} }
@Override @Override
protected ServerCall<RespT> delegate() { protected ServerCall<ReqT, RespT> delegate() {
return delegate; return delegate;
} }
@Override
public MethodDescriptor<ReqT, RespT> getMethodDescriptor() {
return delegate.getMethodDescriptor();
}
} }
} }

2
core/src/main/java/io/grpc/HandlerRegistry.java
View File

@ -31,6 +31,8 @@
package io.grpc; package io.grpc;
import io.grpc.ServerServiceDefinition.ServerMethodDefinition;
import javax.annotation.Nullable; import javax.annotation.Nullable;
import javax.annotation.concurrent.ThreadSafe; import javax.annotation.concurrent.ThreadSafe;

4
core/src/main/java/io/grpc/PartialForwardingServerCall.java
View File

@ -35,11 +35,11 @@ package io.grpc;
* A {@link ServerCall} which forwards all of it's methods to another {@link ServerCall} which * A {@link ServerCall} which forwards all of it's methods to another {@link ServerCall} which
* may have a different onMessage() message type. * may have a different onMessage() message type.
*/ */
abstract class PartialForwardingServerCall<RespT> extends ServerCall<RespT> { abstract class PartialForwardingServerCall<ReqT, RespT> extends ServerCall<ReqT, RespT> {
/** /**
* Returns the delegated {@code ServerCall}. * Returns the delegated {@code ServerCall}.
*/ */
protected abstract ServerCall<?> delegate(); protected abstract ServerCall<?, ?> delegate();
@Override @Override
public void request(int numMessages) { public void request(int numMessages) {

9
core/src/main/java/io/grpc/ServerCall.java
View File

@ -49,9 +49,10 @@ import javax.net.ssl.SSLSession;
* *
* <p>Methods are guaranteed to be non-blocking. Implementations are not required to be thread-safe. * <p>Methods are guaranteed to be non-blocking. Implementations are not required to be thread-safe.
* *
* @param <ReqT> parsed type of request message.
* @param <RespT> parsed type of response message. * @param <RespT> parsed type of response message.
*/ */
public abstract class ServerCall<RespT> { public abstract class ServerCall<ReqT, RespT> {
/** /**
* {@link Attributes.Key} for the remote address of server call attributes * {@link Attributes.Key} for the remote address of server call attributes
* {@link ServerCall#attributes()} * {@link ServerCall#attributes()}
@ -225,4 +226,10 @@ public abstract class ServerCall<RespT> {
public Attributes attributes() { public Attributes attributes() {
return Attributes.EMPTY; return Attributes.EMPTY;
} }
/**
* The {@link MethodDescriptor} for the call.
*/
public abstract MethodDescriptor<ReqT, RespT> getMethodDescriptor();
} }

4
core/src/main/java/io/grpc/ServerCallHandler.java
View File

@ -48,12 +48,10 @@ public interface ServerCallHandler<RequestT, ResponseT> {
* Implementations must not throw an exception if they started processing that may use {@code * Implementations must not throw an exception if they started processing that may use {@code
* call} on another thread. * call} on another thread.
* *
* @param method descriptor for the call
* @param call object for responding to the remote client. * @param call object for responding to the remote client.
* @return listener for processing incoming request messages for {@code call} * @return listener for processing incoming request messages for {@code call}
*/ */
ServerCall.Listener<RequestT> startCall( ServerCall.Listener<RequestT> startCall(
MethodDescriptor<RequestT, ResponseT> method, ServerCall<RequestT, ResponseT> call,
ServerCall<ResponseT> call,
Metadata headers); Metadata headers);
} }

4
core/src/main/java/io/grpc/ServerInterceptor.java
View File

@ -57,14 +57,12 @@ public interface ServerInterceptor {
* Implementations must not throw an exception if they started processing that may use {@code * Implementations must not throw an exception if they started processing that may use {@code
* call} on another thread. * call} on another thread.
* *
* @param method descriptor for method
* @param call object to receive response messages * @param call object to receive response messages
* @param next next processor in the interceptor chain * @param next next processor in the interceptor chain
* @return listener for processing incoming messages for {@code call}, never {@code null}. * @return listener for processing incoming messages for {@code call}, never {@code null}.
*/ */
<ReqT, RespT> ServerCall.Listener<ReqT> interceptCall( <ReqT, RespT> ServerCall.Listener<ReqT> interceptCall(
MethodDescriptor<ReqT, RespT> method, ServerCall<ReqT, RespT> call,
ServerCall<RespT> call,
Metadata headers, Metadata headers,
ServerCallHandler<ReqT, RespT> next); ServerCallHandler<ReqT, RespT> next);
} }

42
core/src/main/java/io/grpc/ServerInterceptors.java
View File

@ -33,6 +33,8 @@ package io.grpc;
import com.google.common.base.Preconditions; import com.google.common.base.Preconditions;
import io.grpc.ServerServiceDefinition.ServerMethodDefinition;
import java.io.BufferedInputStream; import java.io.BufferedInputStream;
import java.io.InputStream; import java.io.InputStream;
import java.util.ArrayList; import java.util.ArrayList;
@ -120,7 +122,7 @@ public class ServerInterceptors {
return serviceDef; return serviceDef;
} }
ServerServiceDefinition.Builder serviceDefBuilder ServerServiceDefinition.Builder serviceDefBuilder
= ServerServiceDefinition.builder(serviceDef.getName()); = ServerServiceDefinition.builder(serviceDef.getServiceDescriptor());
for (ServerMethodDefinition<?, ?> method : serviceDef.getMethods()) { for (ServerMethodDefinition<?, ?> method : serviceDef.getMethods()) {
wrapAndAddMethod(serviceDefBuilder, method, interceptors); wrapAndAddMethod(serviceDefBuilder, method, interceptors);
} }
@ -179,8 +181,11 @@ public class ServerInterceptors {
public static <T> ServerServiceDefinition useMarshalledMessages( public static <T> ServerServiceDefinition useMarshalledMessages(
final ServerServiceDefinition serviceDef, final ServerServiceDefinition serviceDef,
final MethodDescriptor.Marshaller<T> marshaller) { final MethodDescriptor.Marshaller<T> marshaller) {
final ServerServiceDefinition.Builder serviceBuilder = ServerServiceDefinition List<ServerMethodDefinition<?, ?>> wrappedMethods =
.builder(serviceDef.getName()); new ArrayList<ServerMethodDefinition<?, ?>>();
List<MethodDescriptor<?, ?>> wrappedDescriptors =
new ArrayList<MethodDescriptor<?, ?>>();
// Wrap the descriptors
for (final ServerMethodDefinition<?, ?> definition : serviceDef.getMethods()) { for (final ServerMethodDefinition<?, ?> definition : serviceDef.getMethods()) {
final MethodDescriptor<?, ?> originalMethodDescriptor = definition.getMethodDescriptor(); final MethodDescriptor<?, ?> originalMethodDescriptor = definition.getMethodDescriptor();
final MethodDescriptor<T, T> wrappedMethodDescriptor = MethodDescriptor final MethodDescriptor<T, T> wrappedMethodDescriptor = MethodDescriptor
@ -188,7 +193,16 @@ public class ServerInterceptors {
originalMethodDescriptor.getFullMethodName(), originalMethodDescriptor.getFullMethodName(),
marshaller, marshaller,
marshaller); marshaller);
serviceBuilder.addMethod(wrapMethod(definition, wrappedMethodDescriptor)); wrappedDescriptors.add(wrappedMethodDescriptor);
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);
} }
return serviceBuilder.build(); return serviceBuilder.build();
} }
@ -220,10 +234,9 @@ public class ServerInterceptors {
@Override @Override
public ServerCall.Listener<ReqT> startCall( public ServerCall.Listener<ReqT> startCall(
MethodDescriptor<ReqT, RespT> method, ServerCall<ReqT, RespT> call,
ServerCall<RespT> call,
Metadata headers) { Metadata headers) {
return interceptor.interceptCall(method, call, headers, callHandler); return interceptor.interceptCall(call, headers, callHandler);
} }
} }
@ -244,12 +257,12 @@ public class ServerInterceptors {
return new ServerCallHandler<WReqT, WRespT>() { return new ServerCallHandler<WReqT, WRespT>() {
@Override @Override
public ServerCall.Listener<WReqT> startCall( public ServerCall.Listener<WReqT> startCall(
final MethodDescriptor<WReqT, WRespT> method, final ServerCall<WReqT, WRespT> call,
final ServerCall<WRespT> call,
final Metadata headers) { final Metadata headers) {
final ServerCall<ORespT> unwrappedCall = new PartialForwardingServerCall<ORespT>() { final ServerCall<OReqT, ORespT> unwrappedCall =
new PartialForwardingServerCall<OReqT, ORespT>() {
@Override @Override
protected ServerCall<WRespT> delegate() { protected ServerCall<WReqT, WRespT> delegate() {
return call; return call;
} }
@ -259,10 +272,15 @@ public class ServerInterceptors {
final WRespT wrappedMessage = wrappedMethod.parseResponse(is); final WRespT wrappedMessage = wrappedMethod.parseResponse(is);
delegate().sendMessage(wrappedMessage); delegate().sendMessage(wrappedMessage);
} }
@Override
public MethodDescriptor<OReqT, ORespT> getMethodDescriptor() {
return originalMethod;
}
}; };
final ServerCall.Listener<OReqT> originalListener = originalHandler final ServerCall.Listener<OReqT> originalListener = originalHandler
.startCall(originalMethod, unwrappedCall, headers); .startCall(unwrappedCall, headers);
return new PartialForwardingServerCallListener<WReqT>() { return new PartialForwardingServerCallListener<WReqT>() {
@Override @Override

83
core/src/main/java/io/grpc/ServerMethodDefinition.java
View File

@ -1,83 +0,0 @@
/*
* Copyright 2014, Google Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
* met:
*
* * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* * Redistributions in binary form must reproduce the above
* copyright notice, this list of conditions and the following disclaimer
* in the documentation and/or other materials provided with the
* distribution.
*
* * Neither the name of Google Inc. nor the names of its
* contributors may be used to endorse or promote products derived from
* this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
package io.grpc;
/**
* Definition of a method exposed by a {@link Server}.
*
* @see ServerServiceDefinition
*/
@ExperimentalApi("https://github.com/grpc/grpc-java/issues/1774")
public final class ServerMethodDefinition<ReqT, RespT> {
private final MethodDescriptor<ReqT, RespT> method;
private final ServerCallHandler<ReqT, RespT> handler;
private ServerMethodDefinition(MethodDescriptor<ReqT, RespT> method,
ServerCallHandler<ReqT, RespT> handler) {
this.method = method;
this.handler = handler;
}
/**
* Create a new instance.
*
* @param method the {@link MethodDescriptor} for this method.
* @param handler to dispatch calls to.
* @return a new instance.
*/
public static <ReqT, RespT> ServerMethodDefinition<ReqT, RespT> create(
MethodDescriptor<ReqT, RespT> method,
ServerCallHandler<ReqT, RespT> handler) {
return new ServerMethodDefinition<ReqT, RespT>(method, handler);
}
/** The {@code MethodDescriptor} for this method. */
public MethodDescriptor<ReqT, RespT> getMethodDescriptor() {
return method;
}
/** Handler for incoming calls. */
public ServerCallHandler<ReqT, RespT> getServerCallHandler() {
return handler;
}
/**
* Create a new method definition with a different call handler.
*
* @param handler to bind to a cloned instance of this.
* @return a cloned instance of this with the new handler bound.
*/
public ServerMethodDefinition<ReqT, RespT> withServerCallHandler(
ServerCallHandler<ReqT, RespT> handler) {
return new ServerMethodDefinition<ReqT, RespT>(method, handler);
}
}

124
core/src/main/java/io/grpc/ServerServiceDefinition.java
View File

@ -43,26 +43,27 @@ import java.util.Map;
/** Definition of a service to be exposed via a Server. */ /** Definition of a service to be exposed via a Server. */
public final class ServerServiceDefinition { public final class ServerServiceDefinition {
@ExperimentalApi("https://github.com/grpc/grpc-java/issues/1774")
public static Builder builder(String serviceName) { public static Builder builder(ServiceDescriptor serviceDescriptor) {
return new Builder(serviceName); return new Builder(serviceDescriptor);
} }
private final String name; private final ServiceDescriptor serviceDescriptor;
private final ImmutableMap<String, ServerMethodDefinition<?, ?>> methods; private final ImmutableMap<String, ServerMethodDefinition<?, ?>> methods;
private ServerServiceDefinition( private ServerServiceDefinition(
String name, Map<String, ServerMethodDefinition<?, ?>> methods) { ServiceDescriptor serviceDescriptor, Map<String, ServerMethodDefinition<?, ?>> methods) {
this.name = checkNotNull(name); this.serviceDescriptor = checkNotNull(serviceDescriptor);
this.methods = ImmutableMap.copyOf(methods); this.methods = ImmutableMap.copyOf(methods);
} }
/** Simple name of the service. It is not an absolute path. */ /**
public String getName() { * The descriptor for the service.
return name; */
public ServiceDescriptor getServiceDescriptor() {
return serviceDescriptor;
} }
@ExperimentalApi("https://github.com/grpc/grpc-java/issues/1774")
public Collection<ServerMethodDefinition<?, ?>> getMethods() { public Collection<ServerMethodDefinition<?, ?>> getMethods() {
return methods.values(); return methods.values();
} }
@ -70,21 +71,24 @@ public final class ServerServiceDefinition {
/** /**
* Look up a method by its fully qualified name. * Look up a method by its fully qualified name.
* *
* @param name the fully qualified name without leading slash. E.g., "com.foo.Foo/Bar" * @param methodName the fully qualified name without leading slash. E.g., "com.foo.Foo/Bar"
*/ */
@Internal @Internal
public ServerMethodDefinition<?, ?> getMethod(String name) { public ServerMethodDefinition<?, ?> getMethod(String methodName) {
return methods.get(name); return methods.get(methodName);
} }
/** Builder for constructing Service instances. */ /**
* Builder for constructing Service instances.
*/
public static final class Builder { public static final class Builder {
private final String serviceName;
private final ServiceDescriptor serviceDescriptor;
private final Map<String, ServerMethodDefinition<?, ?>> methods = private final Map<String, ServerMethodDefinition<?, ?>> methods =
new HashMap<String, ServerMethodDefinition<?, ?>>(); new HashMap<String, ServerMethodDefinition<?, ?>>();
private Builder(String serviceName) { private Builder(ServiceDescriptor serviceDescriptor) {
this.serviceName = serviceName; this.serviceDescriptor = serviceDescriptor;
} }
/** /**
@ -93,7 +97,6 @@ public final class ServerServiceDefinition {
* @param method the {@link MethodDescriptor} of this method. * @param method the {@link MethodDescriptor} of this method.
* @param handler handler for incoming calls * @param handler handler for incoming calls
*/ */
@ExperimentalApi("https://github.com/grpc/grpc-java/issues/1774")
public <ReqT, RespT> Builder addMethod( public <ReqT, RespT> Builder addMethod(
MethodDescriptor<ReqT, RespT> method, ServerCallHandler<ReqT, RespT> handler) { MethodDescriptor<ReqT, RespT> method, ServerCallHandler<ReqT, RespT> handler) {
return addMethod(ServerMethodDefinition.create( return addMethod(ServerMethodDefinition.create(
@ -102,22 +105,97 @@ public final class ServerServiceDefinition {
} }
/** Add a method to be supported by the service. */ /** Add a method to be supported by the service. */
@ExperimentalApi("https://github.com/grpc/grpc-java/issues/1774")
public <ReqT, RespT> Builder addMethod(ServerMethodDefinition<ReqT, RespT> def) { public <ReqT, RespT> Builder addMethod(ServerMethodDefinition<ReqT, RespT> def) {
MethodDescriptor<ReqT, RespT> method = def.getMethodDescriptor(); MethodDescriptor<ReqT, RespT> method = def.getMethodDescriptor();
checkArgument( checkArgument(
serviceName.equals(MethodDescriptor.extractFullServiceName(method.getFullMethodName())), serviceDescriptor.getName().equals(
MethodDescriptor.extractFullServiceName(method.getFullMethodName())),
"Service name mismatch. Expected service name: '%s'. Actual method name: '%s'.", "Service name mismatch. Expected service name: '%s'. Actual method name: '%s'.",
this.serviceName, method.getFullMethodName()); serviceDescriptor.getName(), method.getFullMethodName());
String name = method.getFullMethodName(); String name = method.getFullMethodName();
checkState(!methods.containsKey(name), "Method by same name already registered: %s", name); checkState(!methods.containsKey(name), "Method by same name already registered: %s", name);
methods.put(name, def); methods.put(name, def);
return this; return this;
} }
/** Construct new ServerServiceDefinition. */ /**
* Construct new ServerServiceDefinition.
*/
public ServerServiceDefinition build() { public ServerServiceDefinition build() {
return new ServerServiceDefinition(serviceName, methods); Map<String, ServerMethodDefinition<?, ?>> tmpMethods =
new HashMap<String, ServerMethodDefinition<?, ?>>(methods);
for (MethodDescriptor<?, ?> descriptorMethod : serviceDescriptor.getMethods()) {
ServerMethodDefinition<?, ?> removed = tmpMethods.remove(
descriptorMethod.getFullMethodName());
if (removed == null) {
throw new IllegalStateException(
"No method bound for descriptor entry " + descriptorMethod.getFullMethodName());
}
if (removed.getMethodDescriptor() != descriptorMethod) {
throw new IllegalStateException(
"Bound method for " + descriptorMethod.getFullMethodName()
+ " not same instance as method in service descriptor");
}
}
if (tmpMethods.size() > 0) {
throw new IllegalStateException(
"No entry in descriptor matching bound method "
+ tmpMethods.values().iterator().next().getMethodDescriptor().getFullMethodName());
}
return new ServerServiceDefinition(serviceDescriptor, methods);
}
}
/**
* Definition of a method exposed by a {@link Server}.
*/
public static final class ServerMethodDefinition<ReqT, RespT> {
private final MethodDescriptor<ReqT, RespT> method;
private final ServerCallHandler<ReqT, RespT> handler;
private ServerMethodDefinition(MethodDescriptor<ReqT, RespT> method,
ServerCallHandler<ReqT, RespT> handler) {
this.method = method;
this.handler = handler;
}
/**
* Create a new instance.
*
* @param method the {@link MethodDescriptor} for this method.
* @param handler to dispatch calls to.
* @return a new instance.
*/
public static <ReqT, RespT> ServerMethodDefinition<ReqT, RespT> create(
MethodDescriptor<ReqT, RespT> method,
ServerCallHandler<ReqT, RespT> handler) {
return new ServerMethodDefinition<ReqT, RespT>(method, handler);
}
/**
* The {@code MethodDescriptor} for this method.
*/
public MethodDescriptor<ReqT, RespT> getMethodDescriptor() {
return method;
}
/**
* Handler for incoming calls.
*/
public ServerCallHandler<ReqT, RespT> getServerCallHandler() {
return handler;
}
/**
* Create a new method definition with a different call handler.
*
* @param handler to bind to a cloned instance of this.
* @return a cloned instance of this with the new handler bound.
*/
public ServerMethodDefinition<ReqT, RespT> withServerCallHandler(
ServerCallHandler<ReqT, RespT> handler) {
return new ServerMethodDefinition<ReqT, RespT>(method, handler);
} }
} }
} }

69
core/src/main/java/io/grpc/ServiceDescriptor.java Normal file
View File

@ -0,0 +1,69 @@
/*
* Copyright 2016, Google Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
* met:
*
* * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* * Redistributions in binary form must reproduce the above
* copyright notice, this list of conditions and the following disclaimer
* in the documentation and/or other materials provided with the
* distribution.
*
* * Neither the name of Google Inc. nor the names of its
* contributors may be used to endorse or promote products derived from
* this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
package io.grpc;
import com.google.common.base.Preconditions;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
/**
* Descriptor for a service.
*/
public class ServiceDescriptor {
private final String name;
private final List<MethodDescriptor<?, ?>> methods;
public ServiceDescriptor(String name, MethodDescriptor<?, ?>... methods) {
this(name, Arrays.asList(methods));
}
public ServiceDescriptor(String name, List<MethodDescriptor<?, ?>> methods) {
this.name = Preconditions.checkNotNull(name);
this.methods = Collections.unmodifiableList(new ArrayList<MethodDescriptor<?, ?>>(methods));
}
/** Simple name of the service. It is not an absolute path. */
public String getName() {
return name;
}
/**
* A list of {@link MethodDescriptor} instances describing the methods exposed by the service.
*/
public List<MethodDescriptor<?, ?>> getMethods() {
return methods;
}
}

7
core/src/main/java/io/grpc/internal/AbstractServerImplBuilder.java
View File

@ -42,8 +42,8 @@ import io.grpc.DecompressorRegistry;
import io.grpc.HandlerRegistry; import io.grpc.HandlerRegistry;
import io.grpc.Internal; import io.grpc.Internal;
import io.grpc.ServerBuilder; import io.grpc.ServerBuilder;
import io.grpc.ServerMethodDefinition;
import io.grpc.ServerServiceDefinition; import io.grpc.ServerServiceDefinition;
import io.grpc.ServerServiceDefinition.ServerMethodDefinition;
import java.util.concurrent.Executor; import java.util.concurrent.Executor;
@ -58,7 +58,10 @@ public abstract class AbstractServerImplBuilder<T extends AbstractServerImplBuil
extends ServerBuilder<T> { extends ServerBuilder<T> {
private static final HandlerRegistry EMPTY_FALLBACK_REGISTRY = new HandlerRegistry() { private static final HandlerRegistry EMPTY_FALLBACK_REGISTRY = new HandlerRegistry() {
@Override public ServerMethodDefinition<?, ?> lookupMethod(String method, String authority) {
@Override
public ServerMethodDefinition<?, ?> lookupMethod(String methodName,
@Nullable String authority) {
return null; return null;
} }
}; };

4
core/src/main/java/io/grpc/internal/InternalHandlerRegistry.java
View File

@ -33,8 +33,8 @@ package io.grpc.internal;
import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableMap;
import io.grpc.ServerMethodDefinition;
import io.grpc.ServerServiceDefinition; import io.grpc.ServerServiceDefinition;
import io.grpc.ServerServiceDefinition.ServerMethodDefinition;
import java.util.HashMap; import java.util.HashMap;
import javax.annotation.Nullable; import javax.annotation.Nullable;
@ -57,7 +57,7 @@ final class InternalHandlerRegistry {
new HashMap<String, ServerServiceDefinition>(); new HashMap<String, ServerServiceDefinition>();
Builder addService(ServerServiceDefinition service) { Builder addService(ServerServiceDefinition service) {
services.put(service.getName(), service); services.put(service.getServiceDescriptor().getName(), service);
return this; return this;
} }

7
core/src/main/java/io/grpc/internal/ServerCallImpl.java
View File

@ -58,7 +58,7 @@ import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.util.List; import java.util.List;
final class ServerCallImpl<ReqT, RespT> extends ServerCall<RespT> { final class ServerCallImpl<ReqT, RespT> extends ServerCall<ReqT, RespT> {
private final ServerStream stream; private final ServerStream stream;
private final MethodDescriptor<ReqT, RespT> method; private final MethodDescriptor<ReqT, RespT> method;
private final Context.CancellableContext context; private final Context.CancellableContext context;
@ -206,6 +206,11 @@ final class ServerCallImpl<ReqT, RespT> extends ServerCall<RespT> {
return stream.attributes(); return stream.attributes();
} }
@Override
public MethodDescriptor<ReqT, RespT> getMethodDescriptor() {
return method;
}
/** /**
* All of these callbacks are assumed to called on an application thread, and the caller is * All of these callbacks are assumed to called on an application thread, and the caller is
* responsible for handling thrown exceptions. * responsible for handling thrown exceptions.

6
core/src/main/java/io/grpc/internal/ServerImpl.java
View File

@ -47,7 +47,7 @@ import io.grpc.DecompressorRegistry;
import io.grpc.HandlerRegistry; import io.grpc.HandlerRegistry;
import io.grpc.Metadata; import io.grpc.Metadata;
import io.grpc.ServerCall; import io.grpc.ServerCall;
import io.grpc.ServerMethodDefinition; import io.grpc.ServerServiceDefinition.ServerMethodDefinition;
import io.grpc.Status; import io.grpc.Status;
import java.io.IOException; import java.io.IOException;
@ -404,8 +404,8 @@ public final class ServerImpl extends io.grpc.Server {
ServerCallImpl<ReqT, RespT> call = new ServerCallImpl<ReqT, RespT>( ServerCallImpl<ReqT, RespT> call = new ServerCallImpl<ReqT, RespT>(
stream, methodDef.getMethodDescriptor(), headers, context, decompressorRegistry, stream, methodDef.getMethodDescriptor(), headers, context, decompressorRegistry,
compressorRegistry); compressorRegistry);
ServerCall.Listener<ReqT> listener = methodDef.getServerCallHandler() ServerCall.Listener<ReqT> listener =
.startCall(methodDef.getMethodDescriptor(), call, headers); methodDef.getServerCallHandler().startCall(call, headers);
if (listener == null) { if (listener == null) {
throw new NullPointerException( throw new NullPointerException(
"startCall() returned a null listener for method " + fullMethodName); "startCall() returned a null listener for method " + fullMethodName);

6
core/src/main/java/io/grpc/util/MutableHandlerRegistry.java
View File

@ -34,8 +34,8 @@ package io.grpc.util;
import io.grpc.ExperimentalApi; import io.grpc.ExperimentalApi;
import io.grpc.HandlerRegistry; import io.grpc.HandlerRegistry;
import io.grpc.MethodDescriptor; import io.grpc.MethodDescriptor;
import io.grpc.ServerMethodDefinition;
import io.grpc.ServerServiceDefinition; import io.grpc.ServerServiceDefinition;
import io.grpc.ServerServiceDefinition.ServerMethodDefinition;
import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap; import java.util.concurrent.ConcurrentMap;
@ -57,11 +57,11 @@ public final class MutableHandlerRegistry extends HandlerRegistry {
@Nullable @Nullable
public ServerServiceDefinition addService(ServerServiceDefinition service) { public ServerServiceDefinition addService(ServerServiceDefinition service) {
return services.put(service.getName(), service); return services.put(service.getServiceDescriptor().getName(), service);
} }
public boolean removeService(ServerServiceDefinition service) { public boolean removeService(ServerServiceDefinition service) {
return services.remove(service.getName(), service); return services.remove(service.getServiceDescriptor().getName(), service);
} }
/** /**

20
core/src/test/java/io/grpc/ContextsTest.java
View File

@ -66,7 +66,7 @@ public class ContextsTest {
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
private MethodDescriptor<Object, Object> method = mock(MethodDescriptor.class); private MethodDescriptor<Object, Object> method = mock(MethodDescriptor.class);
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
private ServerCall<Object> call = mock(ServerCall.class); private ServerCall<Object, Object> call = mock(ServerCall.class);
private Metadata headers = new Metadata(); private Metadata headers = new Metadata();
@Test @Test
@ -101,11 +101,11 @@ public class ContextsTest {
methodCalls.add(5); methodCalls.add(5);
} }
}; };
ServerCall.Listener<Object> wrapped = interceptCall(uniqueContext, method, call, headers, ServerCall.Listener<Object> wrapped = interceptCall(uniqueContext, call, headers,
new ServerCallHandler<Object, Object>() { new ServerCallHandler<Object, Object>() {
@Override @Override
public ServerCall.Listener<Object> startCall(MethodDescriptor<Object, Object> method, public ServerCall.Listener<Object> startCall(
ServerCall<Object> call, Metadata headers) { ServerCall<Object, Object> call, Metadata headers) {
assertSame(ContextsTest.this.method, method); assertSame(ContextsTest.this.method, method);
assertSame(ContextsTest.this.call, call); assertSame(ContextsTest.this.call, call);
assertSame(ContextsTest.this.headers, headers); assertSame(ContextsTest.this.headers, headers);
@ -128,10 +128,10 @@ public class ContextsTest {
public void interceptCall_restoresIfNextThrows() { public void interceptCall_restoresIfNextThrows() {
Context origContext = Context.current(); Context origContext = Context.current();
try { try {
interceptCall(uniqueContext, method, call, headers, new ServerCallHandler<Object, Object>() { interceptCall(uniqueContext, call, headers, new ServerCallHandler<Object, Object>() {
@Override @Override
public ServerCall.Listener<Object> startCall(MethodDescriptor<Object, Object> method, public ServerCall.Listener<Object> startCall(
ServerCall<Object> call, Metadata headers) { ServerCall<Object, Object> call, Metadata headers) {
throw new RuntimeException(); throw new RuntimeException();
} }
}); });
@ -165,11 +165,11 @@ public class ContextsTest {
throw new RuntimeException(); throw new RuntimeException();
} }
}; };
ServerCall.Listener<Object> wrapped = interceptCall(uniqueContext, method, call, headers, ServerCall.Listener<Object> wrapped = interceptCall(uniqueContext, call, headers,
new ServerCallHandler<Object, Object>() { new ServerCallHandler<Object, Object>() {
@Override @Override
public ServerCall.Listener<Object> startCall(MethodDescriptor<Object, Object> method, public ServerCall.Listener<Object> startCall(
ServerCall<Object> call, Metadata headers) { ServerCall<Object, Object> call, Metadata headers) {
return listener; return listener;
} }
}); });

195
core/src/test/java/io/grpc/ServerInterceptorsTest.java
View File

@ -45,6 +45,7 @@ import static org.mockito.Mockito.verifyZeroInteractions;
import io.grpc.MethodDescriptor.Marshaller; import io.grpc.MethodDescriptor.Marshaller;
import io.grpc.MethodDescriptor.MethodType; import io.grpc.MethodDescriptor.MethodType;
import io.grpc.ServerCall.Listener; import io.grpc.ServerCall.Listener;
import io.grpc.ServerServiceDefinition.ServerMethodDefinition;
import org.junit.After; import org.junit.After;
import org.junit.Before; import org.junit.Before;
@ -64,34 +65,40 @@ import java.util.List;
/** Unit tests for {@link ServerInterceptors}. */ /** Unit tests for {@link ServerInterceptors}. */
@RunWith(JUnit4.class) @RunWith(JUnit4.class)
public class ServerInterceptorsTest { public class ServerInterceptorsTest {
@SuppressWarnings("unchecked") @Mock
private Marshaller<String> requestMarshaller = mock(Marshaller.class); private Marshaller<String> requestMarshaller;
@SuppressWarnings("unchecked")
private Marshaller<Integer> responseMarshaller = mock(Marshaller.class); @Mock
@SuppressWarnings("unchecked") private Marshaller<Integer> responseMarshaller;
private ServerCallHandler<String, Integer> handler = mock(ServerCallHandler.class);
@Mock private ServerCall.Listener<String> listener; @Mock
private MethodDescriptor<String, Integer> method = MethodDescriptor.create( private ServerCallHandler<String, Integer> handler;
MethodType.UNKNOWN,
"someRandom/Name", @Mock
requestMarshaller, private ServerCall.Listener<String> listener;
responseMarshaller);
@Mock private ServerCall<Integer> call; private MethodDescriptor<String, Integer> flowMethod;
private ServerServiceDefinition serviceDefinition = ServerServiceDefinition.builder("basic")
.addMethod( @Mock
MethodDescriptor.create( private ServerCall<String, Integer> call;
MethodType.UNKNOWN, "basic/flow", requestMarshaller, responseMarshaller),
handler).build(); private ServerServiceDefinition serviceDefinition;
private Metadata headers = new Metadata();
private final Metadata headers = new Metadata();
/** Set up for test. */ /** Set up for test. */
@Before @Before
public void setUp() { public void setUp() {
MockitoAnnotations.initMocks(this); MockitoAnnotations.initMocks(this);
flowMethod = MethodDescriptor.create(
MethodType.UNKNOWN, "basic/flow", requestMarshaller, responseMarshaller);
Mockito.when(handler.startCall( Mockito.when(handler.startCall(
Mockito.<MethodDescriptor<String, Integer>>any(), Mockito.<ServerCall<String, Integer>>any(), Mockito.<Metadata>any()))
Mockito.<ServerCall<Integer>>any(), Mockito.<Metadata>any()))
.thenReturn(listener); .thenReturn(listener);
serviceDefinition = ServerServiceDefinition.builder(new ServiceDescriptor("basic", flowMethod))
.addMethod(flowMethod, handler).build();
} }
/** Final checks for all tests. */ /** Final checks for all tests. */
@ -129,17 +136,16 @@ public class ServerInterceptorsTest {
ServerServiceDefinition intercepted ServerServiceDefinition intercepted
= ServerInterceptors.intercept(serviceDefinition, Arrays.asList(interceptor)); = ServerInterceptors.intercept(serviceDefinition, Arrays.asList(interceptor));
assertSame(listener, assertSame(listener,
getSoleMethod(intercepted).getServerCallHandler().startCall(method, call, headers)); getSoleMethod(intercepted).getServerCallHandler().startCall(call, headers));
verify(interceptor).interceptCall( verify(interceptor).interceptCall(same(call), same(headers), anyCallHandler());
same(method), same(call), same(headers), anyCallHandler()); verify(handler).startCall(call, headers);
verify(handler).startCall(method, call, headers);
verifyNoMoreInteractions(interceptor, handler); verifyNoMoreInteractions(interceptor, handler);
assertSame(listener, assertSame(listener,
getSoleMethod(intercepted).getServerCallHandler().startCall(method, call, headers)); getSoleMethod(intercepted).getServerCallHandler().startCall(call, headers));
verify(interceptor, times(2)) verify(interceptor, times(2))
.interceptCall(same(method), same(call), same(headers), anyCallHandler()); .interceptCall(same(call), same(headers), anyCallHandler());
verify(handler, times(2)).startCall(method, call, headers); verify(handler, times(2)).startCall(call, headers);
verifyNoMoreInteractions(interceptor, handler); verifyNoMoreInteractions(interceptor, handler);
} }
@ -147,22 +153,22 @@ public class ServerInterceptorsTest {
public void correctHandlerCalled() { public void correctHandlerCalled() {
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
ServerCallHandler<String, Integer> handler2 = mock(ServerCallHandler.class); ServerCallHandler<String, Integer> handler2 = mock(ServerCallHandler.class);
serviceDefinition = ServerServiceDefinition.builder("basic") MethodDescriptor<String, Integer> flowMethod2 = MethodDescriptor
.addMethod(MethodDescriptor.create(MethodType.UNKNOWN, "basic/flow", .create(MethodType.UNKNOWN, "basic/flow2",
requestMarshaller, responseMarshaller), handler) requestMarshaller, responseMarshaller);
.addMethod(MethodDescriptor.create(MethodType.UNKNOWN, "basic/flow2", serviceDefinition = ServerServiceDefinition.builder(
requestMarshaller, responseMarshaller), handler2).build(); new ServiceDescriptor("basic", flowMethod, flowMethod2))
.addMethod(flowMethod, handler)
.addMethod(flowMethod2, handler2).build();
ServerServiceDefinition intercepted = ServerInterceptors.intercept( ServerServiceDefinition intercepted = ServerInterceptors.intercept(
serviceDefinition, Arrays.<ServerInterceptor>asList(new NoopInterceptor())); serviceDefinition, Arrays.<ServerInterceptor>asList(new NoopInterceptor()));
getMethod(intercepted, "basic/flow").getServerCallHandler().startCall( getMethod(intercepted, "basic/flow").getServerCallHandler().startCall(call, headers);
method, call, headers); verify(handler).startCall(call, headers);
verify(handler).startCall(method, call, headers);
verifyNoMoreInteractions(handler); verifyNoMoreInteractions(handler);
verifyZeroInteractions(handler2); verifyNoMoreInteractions(handler2);
getMethod(intercepted, "basic/flow2").getServerCallHandler().startCall( getMethod(intercepted, "basic/flow2").getServerCallHandler().startCall(call, headers);
method, call, headers); verify(handler2).startCall(call, headers);
verify(handler2).startCall(method, call, headers);
verifyNoMoreInteractions(handler); verifyNoMoreInteractions(handler);
verifyNoMoreInteractions(handler2); verifyNoMoreInteractions(handler2);
} }
@ -172,20 +178,19 @@ public class ServerInterceptorsTest {
ServerInterceptor interceptor = new ServerInterceptor() { ServerInterceptor interceptor = new ServerInterceptor() {
@Override @Override
public <ReqT, RespT> ServerCall.Listener<ReqT> interceptCall( public <ReqT, RespT> ServerCall.Listener<ReqT> interceptCall(
MethodDescriptor<ReqT, RespT> method, ServerCall<ReqT, RespT> call,
ServerCall<RespT> call,
Metadata headers, Metadata headers,
ServerCallHandler<ReqT, RespT> next) { ServerCallHandler<ReqT, RespT> next) {
// Calling next twice is permitted, although should only rarely be useful. // Calling next twice is permitted, although should only rarely be useful.
assertSame(listener, next.startCall(method, call, headers)); assertSame(listener, next.startCall(call, headers));
return next.startCall(method, call, headers); return next.startCall(call, headers);
} }
}; };
ServerServiceDefinition intercepted = ServerInterceptors.intercept(serviceDefinition, ServerServiceDefinition intercepted = ServerInterceptors.intercept(serviceDefinition,
interceptor); interceptor);
assertSame(listener, assertSame(listener,
getSoleMethod(intercepted).getServerCallHandler().startCall(method, call, headers)); getSoleMethod(intercepted).getServerCallHandler().startCall(call, headers));
verify(handler, times(2)).startCall(same(method), same(call), same(headers)); verify(handler, times(2)).startCall(same(call), same(headers));
verifyNoMoreInteractions(handler); verifyNoMoreInteractions(handler);
} }
@ -195,8 +200,7 @@ public class ServerInterceptorsTest {
handler = new ServerCallHandler<String, Integer>() { handler = new ServerCallHandler<String, Integer>() {
@Override @Override
public ServerCall.Listener<String> startCall( public ServerCall.Listener<String> startCall(
MethodDescriptor<String, Integer> method, ServerCall<String, Integer> call,
ServerCall<Integer> call,
Metadata headers) { Metadata headers) {
order.add("handler"); order.add("handler");
return listener; return listener;
@ -205,32 +209,30 @@ public class ServerInterceptorsTest {
ServerInterceptor interceptor1 = new ServerInterceptor() { ServerInterceptor interceptor1 = new ServerInterceptor() {
@Override @Override
public <ReqT, RespT> ServerCall.Listener<ReqT> interceptCall( public <ReqT, RespT> ServerCall.Listener<ReqT> interceptCall(
MethodDescriptor<ReqT, RespT> method, ServerCall<ReqT, RespT> call,
ServerCall<RespT> call,
Metadata headers, Metadata headers,
ServerCallHandler<ReqT, RespT> next) { ServerCallHandler<ReqT, RespT> next) {
order.add("i1"); order.add("i1");
return next.startCall(method, call, headers); return next.startCall(call, headers);
} }
}; };
ServerInterceptor interceptor2 = new ServerInterceptor() { ServerInterceptor interceptor2 = new ServerInterceptor() {
@Override @Override
public <ReqT, RespT> ServerCall.Listener<ReqT> interceptCall( public <ReqT, RespT> ServerCall.Listener<ReqT> interceptCall(
MethodDescriptor<ReqT, RespT> method, ServerCall<ReqT, RespT> call,
ServerCall<RespT> call,
Metadata headers, Metadata headers,
ServerCallHandler<ReqT, RespT> next) { ServerCallHandler<ReqT, RespT> next) {
order.add("i2"); order.add("i2");
return next.startCall(method, call, headers); return next.startCall(call, headers);
} }
}; };
ServerServiceDefinition serviceDefinition = ServerServiceDefinition.builder("basic") ServerServiceDefinition serviceDefinition = ServerServiceDefinition.builder(
.addMethod(MethodDescriptor.create(MethodType.UNKNOWN, "basic/flow", new ServiceDescriptor("basic", flowMethod))
requestMarshaller, responseMarshaller), handler).build(); .addMethod(flowMethod, handler).build();
ServerServiceDefinition intercepted = ServerInterceptors.intercept( ServerServiceDefinition intercepted = ServerInterceptors.intercept(
serviceDefinition, Arrays.asList(interceptor1, interceptor2)); serviceDefinition, Arrays.asList(interceptor1, interceptor2));
assertSame(listener, assertSame(listener,
getSoleMethod(intercepted).getServerCallHandler().startCall(method, call, headers)); getSoleMethod(intercepted).getServerCallHandler().startCall(call, headers));
assertEquals(Arrays.asList("i2", "i1", "handler"), order); assertEquals(Arrays.asList("i2", "i1", "handler"), order);
} }
@ -240,8 +242,7 @@ public class ServerInterceptorsTest {
handler = new ServerCallHandler<String, Integer>() { handler = new ServerCallHandler<String, Integer>() {
@Override @Override
public ServerCall.Listener<String> startCall( public ServerCall.Listener<String> startCall(
MethodDescriptor<String, Integer> method, ServerCall<String, Integer> call,
ServerCall<Integer> call,
Metadata headers) { Metadata headers) {
order.add("handler"); order.add("handler");
return listener; return listener;
@ -250,41 +251,37 @@ public class ServerInterceptorsTest {
ServerInterceptor interceptor1 = new ServerInterceptor() { ServerInterceptor interceptor1 = new ServerInterceptor() {
@Override @Override
public <ReqT, RespT> ServerCall.Listener<ReqT> interceptCall( public <ReqT, RespT> ServerCall.Listener<ReqT> interceptCall(
MethodDescriptor<ReqT, RespT> method, ServerCall<ReqT, RespT> call,
ServerCall<RespT> call,
Metadata headers, Metadata headers,
ServerCallHandler<ReqT, RespT> next) { ServerCallHandler<ReqT, RespT> next) {
order.add("i1"); order.add("i1");
return next.startCall(method, call, headers); return next.startCall(call, headers);
} }
}; };
ServerInterceptor interceptor2 = new ServerInterceptor() { ServerInterceptor interceptor2 = new ServerInterceptor() {
@Override @Override
public <ReqT, RespT> ServerCall.Listener<ReqT> interceptCall( public <ReqT, RespT> ServerCall.Listener<ReqT> interceptCall(
MethodDescriptor<ReqT, RespT> method, ServerCall<ReqT, RespT> call,
ServerCall<RespT> call,
Metadata headers, Metadata headers,
ServerCallHandler<ReqT, RespT> next) { ServerCallHandler<ReqT, RespT> next) {
order.add("i2"); order.add("i2");
return next.startCall(method, call, headers); return next.startCall(call, headers);
} }
}; };
ServerServiceDefinition serviceDefinition = ServerServiceDefinition.builder("basic") ServerServiceDefinition serviceDefinition = ServerServiceDefinition.builder(
.addMethod(MethodDescriptor.create(MethodType.UNKNOWN, "basic/flow", new ServiceDescriptor("basic", flowMethod))
requestMarshaller, responseMarshaller), handler).build(); .addMethod(flowMethod, handler).build();
ServerServiceDefinition intercepted = ServerInterceptors.interceptForward( ServerServiceDefinition intercepted = ServerInterceptors.interceptForward(
serviceDefinition, interceptor1, interceptor2); serviceDefinition, interceptor1, interceptor2);
assertSame(listener, assertSame(listener,
getSoleMethod(intercepted).getServerCallHandler().startCall(method, call, headers)); getSoleMethod(intercepted).getServerCallHandler().startCall(call, headers));
assertEquals(Arrays.asList("i1", "i2", "handler"), order); assertEquals(Arrays.asList("i1", "i2", "handler"), order);
} }
@Test @Test
public void argumentsPassed() { public void argumentsPassed() {
final MethodDescriptor<String, Integer> method2 = MethodDescriptor.create(
MethodType.UNKNOWN, "someOtherRandom/Method", requestMarshaller, responseMarshaller);
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
final ServerCall<Integer> call2 = mock(ServerCall.class); final ServerCall<String, Integer> call2 = mock(ServerCall.class);
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
final ServerCall.Listener<String> listener2 = mock(ServerCall.Listener.class); final ServerCall.Listener<String> listener2 = mock(ServerCall.Listener.class);
@ -292,22 +289,20 @@ public class ServerInterceptorsTest {
@SuppressWarnings("unchecked") // Lot's of casting for no benefit. Not intended use. @SuppressWarnings("unchecked") // Lot's of casting for no benefit. Not intended use.
@Override @Override
public <R1, R2> ServerCall.Listener<R1> interceptCall( public <R1, R2> ServerCall.Listener<R1> interceptCall(
MethodDescriptor<R1, R2> methodDescriptor, ServerCall<R1, R2> call,
ServerCall<R2> call,
Metadata headers, Metadata headers,
ServerCallHandler<R1, R2> next) { ServerCallHandler<R1, R2> next) {
assertSame(method, methodDescriptor);
assertSame(call, ServerInterceptorsTest.this.call); assertSame(call, ServerInterceptorsTest.this.call);
assertSame(listener, assertSame(listener,
next.startCall((MethodDescriptor<R1, R2>)method2, (ServerCall<R2>)call2, headers)); next.startCall((ServerCall<R1, R2>)call2, headers));
return (ServerCall.Listener<R1>) listener2; return (ServerCall.Listener<R1>) listener2;
} }
}; };
ServerServiceDefinition intercepted = ServerInterceptors.intercept( ServerServiceDefinition intercepted = ServerInterceptors.intercept(
serviceDefinition, Arrays.asList(interceptor)); serviceDefinition, Arrays.asList(interceptor));
assertSame(listener2, assertSame(listener2,
getSoleMethod(intercepted).getServerCallHandler().startCall(method, call, headers)); getSoleMethod(intercepted).getServerCallHandler().startCall(call, headers));
verify(handler).startCall(method2, call2, headers); verify(handler).startCall(call2, headers);
} }
@Test @Test
@ -328,8 +323,7 @@ public class ServerInterceptorsTest {
ServerCallHandler<Holder, Holder> handler2 = new ServerCallHandler<Holder, Holder>() { ServerCallHandler<Holder, Holder> handler2 = new ServerCallHandler<Holder, Holder>() {
@Override @Override
public Listener<Holder> startCall(final MethodDescriptor<Holder, Holder> method, public Listener<Holder> startCall(final ServerCall<Holder, Holder> call,
final ServerCall<Holder> call,
final Metadata headers) { final Metadata headers) {
return new Listener<Holder>() { return new Listener<Holder>() {
@Override @Override
@ -341,20 +335,20 @@ public class ServerInterceptorsTest {
} }
}; };
ServerServiceDefinition serviceDef = ServerServiceDefinition.builder("basic") MethodDescriptor<Holder, Holder> wrappedMethod = MethodDescriptor
.addMethod( .create(MethodType.UNKNOWN, "basic/wrapped",
MethodDescriptor.create( marshaller, marshaller);
MethodType.UNKNOWN, "basic/wrapped", marshaller, marshaller), ServerServiceDefinition serviceDef = ServerServiceDefinition.builder(
handler2).build(); new ServiceDescriptor("basic", wrappedMethod))
.addMethod(wrappedMethod, handler2).build();
ServerInterceptor interceptor1 = new ServerInterceptor() { ServerInterceptor interceptor1 = new ServerInterceptor() {
@Override @Override
public <ReqT, RespT> Listener<ReqT> interceptCall(MethodDescriptor<ReqT, RespT> method, public <ReqT, RespT> Listener<ReqT> interceptCall(ServerCall<ReqT, RespT> call,
ServerCall<RespT> call,
Metadata headers, Metadata headers,
ServerCallHandler<ReqT, RespT> next) { ServerCallHandler<ReqT, RespT> next) {
ServerCall<RespT> interceptedCall = new ForwardingServerCall ServerCall<ReqT, RespT> interceptedCall = new ForwardingServerCall
.SimpleForwardingServerCall<RespT>(call) { .SimpleForwardingServerCall<ReqT, RespT>(call) {
@Override @Override
public void sendMessage(RespT message) { public void sendMessage(RespT message) {
order.add("i1sendMessage"); order.add("i1sendMessage");
@ -364,7 +358,7 @@ public class ServerInterceptorsTest {
}; };
ServerCall.Listener<ReqT> originalListener = next ServerCall.Listener<ReqT> originalListener = next
.startCall(method, interceptedCall, headers); .startCall(interceptedCall, headers);
return new ForwardingServerCallListener return new ForwardingServerCallListener
.SimpleForwardingServerCallListener<ReqT>(originalListener) { .SimpleForwardingServerCallListener<ReqT>(originalListener) {
@Override @Override
@ -379,12 +373,11 @@ public class ServerInterceptorsTest {
ServerInterceptor interceptor2 = new ServerInterceptor() { ServerInterceptor interceptor2 = new ServerInterceptor() {
@Override @Override
public <ReqT, RespT> Listener<ReqT> interceptCall(MethodDescriptor<ReqT, RespT> method, public <ReqT, RespT> Listener<ReqT> interceptCall(ServerCall<ReqT, RespT> call,
ServerCall<RespT> call,
Metadata headers, Metadata headers,
ServerCallHandler<ReqT, RespT> next) { ServerCallHandler<ReqT, RespT> next) {
ServerCall<RespT> interceptedCall = new ForwardingServerCall ServerCall<ReqT, RespT> interceptedCall = new ForwardingServerCall
.SimpleForwardingServerCall<RespT>(call) { .SimpleForwardingServerCall<ReqT, RespT>(call) {
@Override @Override
public void sendMessage(RespT message) { public void sendMessage(RespT message) {
order.add("i2sendMessage"); order.add("i2sendMessage");
@ -394,7 +387,7 @@ public class ServerInterceptorsTest {
}; };
ServerCall.Listener<ReqT> originalListener = next ServerCall.Listener<ReqT> originalListener = next
.startCall(method, interceptedCall, headers); .startCall(interceptedCall, headers);
return new ForwardingServerCallListener return new ForwardingServerCallListener
.SimpleForwardingServerCallListener<ReqT>(originalListener) { .SimpleForwardingServerCallListener<ReqT>(originalListener) {
@Override @Override
@ -414,12 +407,11 @@ public class ServerInterceptorsTest {
.intercept(inputStreamMessageService, interceptor2); .intercept(inputStreamMessageService, interceptor2);
ServerMethodDefinition<InputStream, InputStream> serverMethod = ServerMethodDefinition<InputStream, InputStream> serverMethod =
(ServerMethodDefinition<InputStream, InputStream>) intercepted2.getMethod("basic/wrapped"); (ServerMethodDefinition<InputStream, InputStream>) intercepted2.getMethod("basic/wrapped");
MethodDescriptor<InputStream, InputStream> method2 = serverMethod.getMethodDescriptor(); ServerCall<InputStream, InputStream> call2 = mock(ServerCall.class);
ServerCall<InputStream> call2 = mock(ServerCall.class);
byte[] bytes = {}; byte[] bytes = {};
serverMethod serverMethod
.getServerCallHandler() .getServerCallHandler()
.startCall(method2, call2, headers) .startCall(call2, headers)
.onMessage(new ByteArrayInputStream(bytes)); .onMessage(new ByteArrayInputStream(bytes));
assertEquals( assertEquals(
Arrays.asList("i2onMessage", "i1onMessage", "handler", "i1sendMessage", "i2sendMessage"), Arrays.asList("i2onMessage", "i1onMessage", "handler", "i1sendMessage", "i2sendMessage"),
@ -448,11 +440,10 @@ public class ServerInterceptorsTest {
private static class NoopInterceptor implements ServerInterceptor { private static class NoopInterceptor implements ServerInterceptor {
@Override @Override
public <ReqT, RespT> ServerCall.Listener<ReqT> interceptCall( public <ReqT, RespT> ServerCall.Listener<ReqT> interceptCall(
MethodDescriptor<ReqT, RespT> method, ServerCall<ReqT, RespT> call,
ServerCall<RespT> call,
Metadata headers, Metadata headers,
ServerCallHandler<ReqT, RespT> next) { ServerCallHandler<ReqT, RespT> next) {
return next.startCall(method, call, headers); return next.startCall(call, headers);
} }
} }

66
core/src/test/java/io/grpc/internal/ServerImplTest.java
View File

@ -63,6 +63,7 @@ import io.grpc.MethodDescriptor.MethodType;
import io.grpc.ServerCall; import io.grpc.ServerCall;
import io.grpc.ServerCallHandler; import io.grpc.ServerCallHandler;
import io.grpc.ServerServiceDefinition; import io.grpc.ServerServiceDefinition;
import io.grpc.ServiceDescriptor;
import io.grpc.Status; import io.grpc.Status;
import io.grpc.StringMarshaller; import io.grpc.StringMarshaller;
import io.grpc.util.MutableHandlerRegistry; import io.grpc.util.MutableHandlerRegistry;
@ -311,19 +312,20 @@ public class ServerImplTest {
public void basicExchangeSuccessful() throws Exception { public void basicExchangeSuccessful() throws Exception {
final Metadata.Key<String> metadataKey final Metadata.Key<String> metadataKey
= Metadata.Key.of("inception", Metadata.ASCII_STRING_MARSHALLER); = Metadata.Key.of("inception", Metadata.ASCII_STRING_MARSHALLER);
final AtomicReference<ServerCall<Integer>> callReference final AtomicReference<ServerCall<String, Integer>> callReference
= new AtomicReference<ServerCall<Integer>>(); = new AtomicReference<ServerCall<String, Integer>>();
fallbackRegistry.addService(ServerServiceDefinition.builder("Waiter") MethodDescriptor<String, Integer> method = MethodDescriptor.create(
MethodType.UNKNOWN, "Waiter/serve", STRING_MARSHALLER, INTEGER_MARSHALLER);
fallbackRegistry.addService(ServerServiceDefinition.builder(
new ServiceDescriptor("Waiter", method))
.addMethod( .addMethod(
MethodDescriptor.create( method,
MethodType.UNKNOWN, "Waiter/serve", STRING_MARSHALLER, INTEGER_MARSHALLER),
new ServerCallHandler<String, Integer>() { new ServerCallHandler<String, Integer>() {
@Override @Override
public ServerCall.Listener<String> startCall( public ServerCall.Listener<String> startCall(
MethodDescriptor<String, Integer> method, ServerCall<String, Integer> call,
ServerCall<Integer> call,
Metadata headers) { Metadata headers) {
assertEquals("Waiter/serve", method.getFullMethodName()); assertEquals("Waiter/serve", call.getMethodDescriptor().getFullMethodName());
assertNotNull(call); assertNotNull(call);
assertNotNull(headers); assertNotNull(headers);
assertEquals("value", headers.get(metadataKey)); assertEquals("value", headers.get(metadataKey));
@ -341,7 +343,7 @@ public class ServerImplTest {
assertNotNull(streamListener); assertNotNull(streamListener);
executeBarrier(executor).await(); executeBarrier(executor).await();
ServerCall<Integer> call = callReference.get(); ServerCall<String, Integer> call = callReference.get();
assertNotNull(call); assertNotNull(call);
String order = "Lots of pizza, please"; String order = "Lots of pizza, please";
@ -387,15 +389,16 @@ public class ServerImplTest {
public void exceptionInStartCallPropagatesToStream() throws Exception { public void exceptionInStartCallPropagatesToStream() throws Exception {
CyclicBarrier barrier = executeBarrier(executor); CyclicBarrier barrier = executeBarrier(executor);
final Status status = Status.ABORTED.withDescription("Oh, no!"); final Status status = Status.ABORTED.withDescription("Oh, no!");
fallbackRegistry.addService(ServerServiceDefinition.builder("Waiter") MethodDescriptor<String, Integer> method = MethodDescriptor
.addMethod( .create(MethodType.UNKNOWN, "Waiter/serve",
MethodDescriptor.create(MethodType.UNKNOWN, "Waiter/serve", STRING_MARSHALLER, INTEGER_MARSHALLER);
STRING_MARSHALLER, INTEGER_MARSHALLER), fallbackRegistry.addService(ServerServiceDefinition.builder(
new ServiceDescriptor("Waiter", method))
.addMethod(method,
new ServerCallHandler<String, Integer>() { new ServerCallHandler<String, Integer>() {
@Override @Override
public ServerCall.Listener<String> startCall( public ServerCall.Listener<String> startCall(
MethodDescriptor<String, Integer> method, ServerCall<String, Integer> call,
ServerCall<Integer> call,
Metadata headers) { Metadata headers) {
throw status.asRuntimeException(); throw status.asRuntimeException();
} }
@ -497,15 +500,16 @@ public class ServerImplTest {
@Test @Test
public void testCallContextIsBoundInListenerCallbacks() throws Exception { public void testCallContextIsBoundInListenerCallbacks() throws Exception {
fallbackRegistry.addService(ServerServiceDefinition.builder("Waiter") MethodDescriptor<String, Integer> method = MethodDescriptor.create(
MethodType.UNKNOWN, "Waiter/serve", STRING_MARSHALLER, INTEGER_MARSHALLER);
fallbackRegistry.addService(ServerServiceDefinition.builder(
new ServiceDescriptor("Waiter", method))
.addMethod( .addMethod(
MethodDescriptor.create( method,
MethodType.UNKNOWN, "Waiter/serve", STRING_MARSHALLER, INTEGER_MARSHALLER),
new ServerCallHandler<String, Integer>() { new ServerCallHandler<String, Integer>() {
@Override @Override
public ServerCall.Listener<String> startCall( public ServerCall.Listener<String> startCall(
MethodDescriptor<String, Integer> method, ServerCall<String, Integer> call,
ServerCall<Integer> call,
Metadata headers) { Metadata headers) {
// Check that the current context is a descendant of SERVER_CONTEXT // Check that the current context is a descendant of SERVER_CONTEXT
final Context initial = Context.current(); final Context initial = Context.current();
@ -582,17 +586,17 @@ public class ServerImplTest {
} }
}; };
final AtomicReference<ServerCall<Integer>> callReference final AtomicReference<ServerCall<String, Integer>> callReference
= new AtomicReference<ServerCall<Integer>>(); = new AtomicReference<ServerCall<String, Integer>>();
fallbackRegistry.addService(ServerServiceDefinition.builder("Waiter") MethodDescriptor<String, Integer> method = MethodDescriptor.create(
.addMethod( MethodType.UNKNOWN, "Waiter/serve", STRING_MARSHALLER, INTEGER_MARSHALLER);
MethodDescriptor.create( fallbackRegistry.addService(ServerServiceDefinition.builder(
MethodType.UNKNOWN, "Waiter/serve", STRING_MARSHALLER, INTEGER_MARSHALLER), new ServiceDescriptor("Waiter", method))
.addMethod(method,
new ServerCallHandler<String, Integer>() { new ServerCallHandler<String, Integer>() {
@Override @Override
public ServerCall.Listener<String> startCall( public ServerCall.Listener<String> startCall(
MethodDescriptor<String, Integer> method, ServerCall<String, Integer> call,
ServerCall<Integer> call,
Metadata headers) { Metadata headers) {
callReference.set(call); callReference.set(call);
return callListener; return callListener;
@ -655,7 +659,7 @@ public class ServerImplTest {
MethodDescriptor<String, Integer> method1 = MethodDescriptor.create( MethodDescriptor<String, Integer> method1 = MethodDescriptor.create(
MethodType.UNKNOWN, "Service1/Method1", STRING_MARSHALLER, INTEGER_MARSHALLER); MethodType.UNKNOWN, "Service1/Method1", STRING_MARSHALLER, INTEGER_MARSHALLER);
registry = new InternalHandlerRegistry.Builder() registry = new InternalHandlerRegistry.Builder()
.addService(ServerServiceDefinition.builder("Service1") .addService(ServerServiceDefinition.builder(new ServiceDescriptor("Service1", method1))
.addMethod(method1, callHandler).build()) .addMethod(method1, callHandler).build())
.build(); .build();
transportServer = new SimpleServer(); transportServer = new SimpleServer();
@ -671,8 +675,8 @@ public class ServerImplTest {
// registry. // registry.
transportListener.streamCreated(stream, "Service1/Method2", new Metadata()); transportListener.streamCreated(stream, "Service1/Method2", new Metadata());
verify(callHandler, timeout(2000)).startCall(same(method1), verify(callHandler, timeout(2000)).startCall(Matchers.<ServerCall<String, Integer>>anyObject(),
Matchers.<ServerCall<Integer>>anyObject(), Matchers.<Metadata>anyObject()); Matchers.<Metadata>anyObject());
verify(fallbackRegistry, timeout(2000)).lookupMethod("Service1/Method2", null); verify(fallbackRegistry, timeout(2000)).lookupMethod("Service1/Method2", null);
verifyNoMoreInteractions(callHandler); verifyNoMoreInteractions(callHandler);
verifyNoMoreInteractions(fallbackRegistry); verifyNoMoreInteractions(fallbackRegistry);

112
core/src/test/java/io/grpc/util/MutableHandlerRegistryTest.java
View File

@ -31,68 +31,90 @@
package io.grpc.util; package io.grpc.util;
import static com.google.common.base.Preconditions.checkNotNull;
import static com.google.common.collect.Iterables.getOnlyElement; import static com.google.common.collect.Iterables.getOnlyElement;
import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull; import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertSame; import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertTrue;
import static org.mockito.Mockito.mock;
import io.grpc.MethodDescriptor.Marshaller; import io.grpc.MethodDescriptor.Marshaller;
import io.grpc.MethodDescriptor.MethodType; import io.grpc.MethodDescriptor.MethodType;
import io.grpc.MethodDescriptor; import io.grpc.MethodDescriptor;
import io.grpc.ServerCallHandler; import io.grpc.ServerCallHandler;
import io.grpc.ServerMethodDefinition;
import io.grpc.ServerServiceDefinition; import io.grpc.ServerServiceDefinition;
import io.grpc.ServerServiceDefinition.ServerMethodDefinition;
import io.grpc.ServiceDescriptor;
import org.junit.After; import org.junit.After;
import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.junit.runners.JUnit4; import org.junit.runners.JUnit4;
import org.mockito.Mock;
import org.mockito.Mockito; import org.mockito.Mockito;
import org.mockito.MockitoAnnotations;
/** Unit tests for {@link MutableHandlerRegistry}. */ /** Unit tests for {@link MutableHandlerRegistry}. */
@RunWith(JUnit4.class) @RunWith(JUnit4.class)
public class MutableHandlerRegistryTest { public class MutableHandlerRegistryTest {
private MutableHandlerRegistry registry = new MutableHandlerRegistry(); private MutableHandlerRegistry registry = new MutableHandlerRegistry();
@SuppressWarnings("unchecked")
private Marshaller<String> requestMarshaller = mock(Marshaller.class); @Mock
@SuppressWarnings("unchecked") private Marshaller<String> requestMarshaller;
private Marshaller<Integer> responseMarshaller = mock(Marshaller.class);
@SuppressWarnings("unchecked") @Mock
private ServerCallHandler<String, Integer> handler = mock(ServerCallHandler.class); private Marshaller<Integer> responseMarshaller;
private ServerServiceDefinition basicServiceDefinition = ServerServiceDefinition.builder("basic")
.addMethod( @Mock
MethodDescriptor.create(MethodType.UNKNOWN, "basic/flow", private ServerCallHandler<String, Integer> flowHandler;
requestMarshaller, responseMarshaller),
handler).build(); @Mock
private ServerCallHandler<String, Integer> coupleHandler;
@Mock
private ServerCallHandler<String, Integer> fewHandler;
@Mock
private ServerCallHandler<String, Integer> otherFlowHandler;
private ServerServiceDefinition basicServiceDefinition;
private ServerServiceDefinition multiServiceDefinition;
@SuppressWarnings("rawtypes") @SuppressWarnings("rawtypes")
private ServerMethodDefinition flowMethodDefinition = private ServerMethodDefinition flowMethodDefinition;
getOnlyElement(basicServiceDefinition.getMethods());
private ServerServiceDefinition multiServiceDefinition = ServerServiceDefinition.builder("multi") @Before
.addMethod( public void setUp() throws Exception {
MethodDescriptor.create(MethodType.UNKNOWN, "multi/couple", MockitoAnnotations.initMocks(this);
requestMarshaller, responseMarshaller), MethodDescriptor<String, Integer> flowMethod = MethodDescriptor
handler) .create(MethodType.UNKNOWN, "basic/flow", requestMarshaller, responseMarshaller);
.addMethod( basicServiceDefinition = ServerServiceDefinition.builder(
MethodDescriptor.create(MethodType.UNKNOWN, "multi/few", new ServiceDescriptor("basic", flowMethod))
requestMarshaller, responseMarshaller), .addMethod(flowMethod, flowHandler)
handler).build(); .build();
@SuppressWarnings("rawtypes")
private ServerMethodDefinition coupleMethodDefinition = MethodDescriptor<String, Integer> coupleMethod = MethodDescriptor
checkNotNull(multiServiceDefinition.getMethod("multi/couple")); .create(MethodType.UNKNOWN, "multi/couple", requestMarshaller, responseMarshaller);
@SuppressWarnings("rawtypes") MethodDescriptor<String, Integer> fewMethod = MethodDescriptor
private ServerMethodDefinition fewMethodDefinition = .create(MethodType.UNKNOWN, "multi/few", requestMarshaller, responseMarshaller);
checkNotNull(multiServiceDefinition.getMethod("multi/few")); multiServiceDefinition = ServerServiceDefinition.builder(
new ServiceDescriptor("multi", coupleMethod, fewMethod))
.addMethod(coupleMethod, coupleHandler)
.addMethod(fewMethod, fewHandler)
.build();
flowMethodDefinition = getOnlyElement(basicServiceDefinition.getMethods());
}
/** Final checks for all tests. */ /** Final checks for all tests. */
@After @After
public void makeSureMocksUnused() { public void makeSureMocksUnused() {
Mockito.verifyZeroInteractions(requestMarshaller); Mockito.verifyZeroInteractions(requestMarshaller);
Mockito.verifyZeroInteractions(responseMarshaller); Mockito.verifyZeroInteractions(responseMarshaller);
Mockito.verifyZeroInteractions(handler); Mockito.verifyNoMoreInteractions(flowHandler);
Mockito.verifyNoMoreInteractions(coupleHandler);
Mockito.verifyNoMoreInteractions(fewHandler);
} }
@Test @Test
@ -112,12 +134,12 @@ public class MutableHandlerRegistryTest {
assertNull(registry.addService(basicServiceDefinition)); assertNull(registry.addService(basicServiceDefinition));
assertNull(registry.addService(multiServiceDefinition)); assertNull(registry.addService(multiServiceDefinition));
ServerMethodDefinition<?, ?> method = registry.lookupMethod("basic/flow"); ServerCallHandler<?, ?> handler = registry.lookupMethod("basic/flow").getServerCallHandler();
assertSame(flowMethodDefinition, method); assertSame(flowHandler, handler);
method = registry.lookupMethod("multi/couple"); handler = registry.lookupMethod("multi/couple").getServerCallHandler();
assertSame(coupleMethodDefinition, method); assertSame(coupleHandler, handler);
method = registry.lookupMethod("multi/few"); handler = registry.lookupMethod("multi/few").getServerCallHandler();
assertSame(fewMethodDefinition, method); assertSame(fewHandler, handler);
} }
@Test @Test
@ -134,9 +156,11 @@ public class MutableHandlerRegistryTest {
public void replaceAndLookup() { public void replaceAndLookup() {
assertNull(registry.addService(basicServiceDefinition)); assertNull(registry.addService(basicServiceDefinition));
assertNotNull(registry.lookupMethod("basic/flow")); assertNotNull(registry.lookupMethod("basic/flow"));
ServerServiceDefinition replaceServiceDefinition = ServerServiceDefinition.builder("basic") MethodDescriptor<String, Integer> anotherMethod = MethodDescriptor
.addMethod(MethodDescriptor.create(MethodType.UNKNOWN, "basic/another", .create(MethodType.UNKNOWN, "basic/another", requestMarshaller, responseMarshaller);
requestMarshaller, responseMarshaller), handler).build(); ServerServiceDefinition replaceServiceDefinition = ServerServiceDefinition.builder(
new ServiceDescriptor("basic", anotherMethod))
.addMethod(anotherMethod, flowHandler).build();
ServerMethodDefinition<?, ?> anotherMethodDefinition = ServerMethodDefinition<?, ?> anotherMethodDefinition =
replaceServiceDefinition.getMethod("basic/another"); replaceServiceDefinition.getMethod("basic/another");
assertSame(basicServiceDefinition, registry.addService(replaceServiceDefinition)); assertSame(basicServiceDefinition, registry.addService(replaceServiceDefinition));
@ -167,7 +191,8 @@ public class MutableHandlerRegistryTest {
@Test @Test
public void removeMissingNameConflictFails() { public void removeMissingNameConflictFails() {
assertNull(registry.addService(basicServiceDefinition)); assertNull(registry.addService(basicServiceDefinition));
assertFalse(registry.removeService(ServerServiceDefinition.builder("basic").build())); assertFalse(registry.removeService(ServerServiceDefinition.builder(
new ServiceDescriptor("basic")).build()));
} }
@Test @Test
@ -192,6 +217,7 @@ public class MutableHandlerRegistryTest {
public void addReturnsPrevious() { public void addReturnsPrevious() {
assertNull(registry.addService(basicServiceDefinition)); assertNull(registry.addService(basicServiceDefinition));
assertSame(basicServiceDefinition, assertSame(basicServiceDefinition,
registry.addService(ServerServiceDefinition.builder("basic").build())); registry.addService(ServerServiceDefinition.builder(
new ServiceDescriptor("basic")).build()));
} }
} }

7
examples/src/generated/main/grpc/io/grpc/examples/helloworld/GreeterGrpc.java
View File

@ -237,9 +237,14 @@ public class GreeterGrpc {
} }
} }
public static io.grpc.ServiceDescriptor getServiceDescriptor() {
return new io.grpc.ServiceDescriptor(SERVICE_NAME,
METHOD_SAY_HELLO);
}
public static io.grpc.ServerServiceDefinition bindService( public static io.grpc.ServerServiceDefinition bindService(
final Greeter serviceImpl) { final Greeter serviceImpl) {
return io.grpc.ServerServiceDefinition.builder(SERVICE_NAME) return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor())
.addMethod( .addMethod(
METHOD_SAY_HELLO, METHOD_SAY_HELLO,
asyncUnaryCall( asyncUnaryCall(

10
examples/src/generated/main/grpc/io/grpc/examples/routeguide/RouteGuideGrpc.java
View File

@ -376,9 +376,17 @@ public class RouteGuideGrpc {
} }
} }
public static io.grpc.ServiceDescriptor getServiceDescriptor() {
return new io.grpc.ServiceDescriptor(SERVICE_NAME,
METHOD_GET_FEATURE,
METHOD_LIST_FEATURES,
METHOD_RECORD_ROUTE,
METHOD_ROUTE_CHAT);
}
public static io.grpc.ServerServiceDefinition bindService( public static io.grpc.ServerServiceDefinition bindService(
final RouteGuide serviceImpl) { final RouteGuide serviceImpl) {
return io.grpc.ServerServiceDefinition.builder(SERVICE_NAME) return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor())
.addMethod( .addMethod(
METHOD_GET_FEATURE, METHOD_GET_FEATURE,
asyncUnaryCall( asyncUnaryCall(

6
examples/src/main/java/io/grpc/examples/header/HeaderServerInterceptor.java
View File

@ -33,7 +33,6 @@ package io.grpc.examples.header;
import io.grpc.ForwardingServerCall.SimpleForwardingServerCall; import io.grpc.ForwardingServerCall.SimpleForwardingServerCall;
import io.grpc.Metadata; import io.grpc.Metadata;
import io.grpc.MethodDescriptor;
import io.grpc.ServerCall; import io.grpc.ServerCall;
import io.grpc.ServerCallHandler; import io.grpc.ServerCallHandler;
import io.grpc.ServerInterceptor; import io.grpc.ServerInterceptor;
@ -53,12 +52,11 @@ public class HeaderServerInterceptor implements ServerInterceptor {
@Override @Override
public <ReqT, RespT> ServerCall.Listener<ReqT> interceptCall( public <ReqT, RespT> ServerCall.Listener<ReqT> interceptCall(
MethodDescriptor<ReqT, RespT> method, ServerCall<ReqT, RespT> call,
ServerCall<RespT> call,
final Metadata requestHeaders, final Metadata requestHeaders,
ServerCallHandler<ReqT, RespT> next) { ServerCallHandler<ReqT, RespT> next) {
logger.info("header received from client:" + requestHeaders); logger.info("header received from client:" + requestHeaders);
return next.startCall(method, new SimpleForwardingServerCall<RespT>(call) { return next.startCall(new SimpleForwardingServerCall<ReqT, RespT>(call) {
@Override @Override
public void sendHeaders(Metadata responseHeaders) { public void sendHeaders(Metadata responseHeaders) {
responseHeaders.put(customHeadKey, "customRespondValue"); responseHeaders.put(customHeadKey, "customRespondValue");

8
examples/src/main/java/io/grpc/examples/helloworld/HelloJsonServer.java
View File

@ -105,10 +105,10 @@ public class HelloJsonServer {
} }
private ServerServiceDefinition bindService(final Greeter serviceImpl) { private ServerServiceDefinition bindService(final Greeter serviceImpl) {
return io.grpc.ServerServiceDefinition.builder(GreeterGrpc.SERVICE_NAME) return io.grpc.ServerServiceDefinition
.addMethod( .builder(GreeterGrpc.getServiceDescriptor())
HelloJsonClient.HelloJsonStub.METHOD_SAY_HELLO, .addMethod(HelloJsonClient.HelloJsonStub.METHOD_SAY_HELLO,
asyncUnaryCall( asyncUnaryCall(
new UnaryMethod<HelloRequest, HelloReply>() { new UnaryMethod<HelloRequest, HelloReply>() {
@Override @Override
public void invoke( public void invoke(

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

@ -196,9 +196,14 @@ public class LoadBalancerGrpc {
} }
} }
public static io.grpc.ServiceDescriptor getServiceDescriptor() {
return new io.grpc.ServiceDescriptor(SERVICE_NAME,
METHOD_BALANCE_LOAD);
}
public static io.grpc.ServerServiceDefinition bindService( public static io.grpc.ServerServiceDefinition bindService(
final LoadBalancer serviceImpl) { final LoadBalancer serviceImpl) {
return io.grpc.ServerServiceDefinition.builder(SERVICE_NAME) return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor())
.addMethod( .addMethod(
METHOD_BALANCE_LOAD, METHOD_BALANCE_LOAD,
asyncBidiStreamingCall( asyncBidiStreamingCall(

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

@ -277,9 +277,15 @@ public class MetricsServiceGrpc {
} }
} }
public static io.grpc.ServiceDescriptor getServiceDescriptor() {
return new io.grpc.ServiceDescriptor(SERVICE_NAME,
METHOD_GET_ALL_GAUGES,
METHOD_GET_GAUGE);
}
public static io.grpc.ServerServiceDefinition bindService( public static io.grpc.ServerServiceDefinition bindService(
final MetricsService serviceImpl) { final MetricsService serviceImpl) {
return io.grpc.ServerServiceDefinition.builder(SERVICE_NAME) return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor())
.addMethod( .addMethod(
METHOD_GET_ALL_GAUGES, METHOD_GET_ALL_GAUGES,
asyncServerStreamingCall( asyncServerStreamingCall(

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

@ -282,9 +282,15 @@ public class ReconnectServiceGrpc {
} }
} }
public static io.grpc.ServiceDescriptor getServiceDescriptor() {
return new io.grpc.ServiceDescriptor(SERVICE_NAME,
METHOD_START,
METHOD_STOP);
}
public static io.grpc.ServerServiceDefinition bindService( public static io.grpc.ServerServiceDefinition bindService(
final ReconnectService serviceImpl) { final ReconnectService serviceImpl) {
return io.grpc.ServerServiceDefinition.builder(SERVICE_NAME) return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor())
.addMethod( .addMethod(
METHOD_START, METHOD_START,
asyncUnaryCall( asyncUnaryCall(

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

@ -464,9 +464,19 @@ public class TestServiceGrpc {
} }
} }
public static io.grpc.ServiceDescriptor getServiceDescriptor() {
return new io.grpc.ServiceDescriptor(SERVICE_NAME,
METHOD_EMPTY_CALL,
METHOD_UNARY_CALL,
METHOD_STREAMING_OUTPUT_CALL,
METHOD_STREAMING_INPUT_CALL,
METHOD_FULL_DUPLEX_CALL,
METHOD_HALF_DUPLEX_CALL);
}
public static io.grpc.ServerServiceDefinition bindService( public static io.grpc.ServerServiceDefinition bindService(
final TestService serviceImpl) { final TestService serviceImpl) {
return io.grpc.ServerServiceDefinition.builder(SERVICE_NAME) return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor())
.addMethod( .addMethod(
METHOD_EMPTY_CALL, METHOD_EMPTY_CALL,
asyncUnaryCall( asyncUnaryCall(

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

@ -241,9 +241,14 @@ public class UnimplementedServiceGrpc {
} }
} }
public static io.grpc.ServiceDescriptor getServiceDescriptor() {
return new io.grpc.ServiceDescriptor(SERVICE_NAME,
METHOD_UNIMPLEMENTED_CALL);
}
public static io.grpc.ServerServiceDefinition bindService( public static io.grpc.ServerServiceDefinition bindService(
final UnimplementedService serviceImpl) { final UnimplementedService serviceImpl) {
return io.grpc.ServerServiceDefinition.builder(SERVICE_NAME) return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor())
.addMethod( .addMethod(
METHOD_UNIMPLEMENTED_CALL, METHOD_UNIMPLEMENTED_CALL,
asyncUnaryCall( asyncUnaryCall(

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

@ -111,8 +111,8 @@ public abstract class AbstractInteropTest {
public static final Metadata.Key<Messages.SimpleContext> METADATA_KEY = public static final Metadata.Key<Messages.SimpleContext> METADATA_KEY =
ProtoUtils.keyForProto(Messages.SimpleContext.getDefaultInstance()); ProtoUtils.keyForProto(Messages.SimpleContext.getDefaultInstance());
private static final AtomicReference<ServerCall<?>> serverCallCapture = private static final AtomicReference<ServerCall<?, ?>> serverCallCapture =
new AtomicReference<ServerCall<?>>(); new AtomicReference<ServerCall<?, ?>>();
private static final AtomicReference<Metadata> requestHeadersCapture = private static final AtomicReference<Metadata> requestHeadersCapture =
new AtomicReference<Metadata>(); new AtomicReference<Metadata>();
private static ScheduledExecutorService testServiceExecutor; private static ScheduledExecutorService testServiceExecutor;

7
interop-testing/src/test/java/io/grpc/testing/integration/CascadingTest.java
View File

@ -36,7 +36,6 @@ import static org.junit.Assert.fail;
import io.grpc.Context; import io.grpc.Context;
import io.grpc.Metadata; import io.grpc.Metadata;
import io.grpc.MethodDescriptor;
import io.grpc.ServerCall; import io.grpc.ServerCall;
import io.grpc.ServerCallHandler; import io.grpc.ServerCallHandler;
import io.grpc.ServerInterceptor; import io.grpc.ServerInterceptor;
@ -207,8 +206,7 @@ public class CascadingTest {
new ServerInterceptor() { new ServerInterceptor() {
@Override @Override
public <ReqT, RespT> ServerCall.Listener<ReqT> interceptCall( public <ReqT, RespT> ServerCall.Listener<ReqT> interceptCall(
MethodDescriptor<ReqT, RespT> method, final ServerCall<ReqT, RespT> call,
final ServerCall<RespT> call,
Metadata headers, Metadata headers,
ServerCallHandler<ReqT, RespT> next) { ServerCallHandler<ReqT, RespT> next) {
// Respond with the headers but nothing else. // Respond with the headers but nothing else.
@ -264,8 +262,7 @@ public class CascadingTest {
new ServerInterceptor() { new ServerInterceptor() {
@Override @Override
public <ReqT, RespT> ServerCall.Listener<ReqT> interceptCall( public <ReqT, RespT> ServerCall.Listener<ReqT> interceptCall(
MethodDescriptor<ReqT, RespT> method, final ServerCall<ReqT, RespT> call,
final ServerCall<RespT> call,
Metadata headers, Metadata headers,
ServerCallHandler<ReqT, RespT> next) { ServerCallHandler<ReqT, RespT> next) {
// Respond with the headers but nothing else. // Respond with the headers but nothing else.

5
interop-testing/src/test/java/io/grpc/testing/integration/CompressionTest.java
View File

@ -278,11 +278,10 @@ public class CompressionTest {
private class ServerCompressorInterceptor implements ServerInterceptor { private class ServerCompressorInterceptor implements ServerInterceptor {
@Override @Override
public <ReqT, RespT> io.grpc.ServerCall.Listener<ReqT> interceptCall( public <ReqT, RespT> io.grpc.ServerCall.Listener<ReqT> interceptCall(
MethodDescriptor<ReqT, RespT> method, ServerCall<RespT> call, Metadata headers, ServerCall<ReqT, RespT> call, Metadata headers, ServerCallHandler<ReqT, RespT> next) {
ServerCallHandler<ReqT, RespT> next) {
call.setMessageCompression(enableServerMessageCompression); call.setMessageCompression(enableServerMessageCompression);
serverResponseHeaders = headers; serverResponseHeaders = headers;
return next.startCall(method, call, headers); return next.startCall(call, headers);
} }
} }

6
interop-testing/src/test/java/io/grpc/testing/integration/TransportCompressionTest.java
View File

@ -108,9 +108,9 @@ public class TransportCompressionTest extends AbstractInteropTest {
.decompressorRegistry(decompressors), .decompressorRegistry(decompressors),
new ServerInterceptor() { new ServerInterceptor() {
@Override @Override
public <ReqT, RespT> Listener<ReqT> interceptCall(MethodDescriptor<ReqT, RespT> method, public <ReqT, RespT> Listener<ReqT> interceptCall(ServerCall<ReqT, RespT> call,
ServerCall<RespT> call, Metadata headers, ServerCallHandler<ReqT, RespT> next) { Metadata headers, ServerCallHandler<ReqT, RespT> next) {
Listener<ReqT> listener = next.startCall(method, call, headers); Listener<ReqT> listener = next.startCall(call, headers);
// TODO(carl-mastrangelo): check that encoding was set. // TODO(carl-mastrangelo): check that encoding was set.
call.setMessageCompression(true); call.setMessageCompression(true);
return listener; return listener;

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

@ -216,9 +216,14 @@ public class HealthGrpc {
} }
} }
public static io.grpc.ServiceDescriptor getServiceDescriptor() {
return new io.grpc.ServiceDescriptor(SERVICE_NAME,
METHOD_CHECK);
}
public static io.grpc.ServerServiceDefinition bindService( public static io.grpc.ServerServiceDefinition bindService(
final Health serviceImpl) { final Health serviceImpl) {
return io.grpc.ServerServiceDefinition.builder(SERVICE_NAME) return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor())
.addMethod( .addMethod(
METHOD_CHECK, METHOD_CHECK,
asyncUnaryCall( asyncUnaryCall(

20
stub/src/main/java/io/grpc/stub/ServerCalls.java
View File

@ -127,11 +127,10 @@ public class ServerCalls {
return new ServerCallHandler<ReqT, RespT>() { return new ServerCallHandler<ReqT, RespT>() {
@Override @Override
public ServerCall.Listener<ReqT> startCall( public ServerCall.Listener<ReqT> startCall(
MethodDescriptor<ReqT, RespT> methodDescriptor, final ServerCall<ReqT, RespT> call,
final ServerCall<RespT> call,
Metadata headers) { Metadata headers) {
final ServerCallStreamObserverImpl<RespT> responseObserver = final ServerCallStreamObserverImpl<ReqT, RespT> responseObserver =
new ServerCallStreamObserverImpl<RespT>(call); new ServerCallStreamObserverImpl<ReqT, RespT>(call);
// We expect only 1 request, but we ask for 2 requests here so that if a misbehaving client // We expect only 1 request, but we ask for 2 requests here so that if a misbehaving client
// sends more than 1 requests, ServerCall will catch it. Note that disabling auto // sends more than 1 requests, ServerCall will catch it. Note that disabling auto
// inbound flow control has no effect on unary calls. // inbound flow control has no effect on unary calls.
@ -190,11 +189,10 @@ public class ServerCalls {
return new ServerCallHandler<ReqT, RespT>() { return new ServerCallHandler<ReqT, RespT>() {
@Override @Override
public ServerCall.Listener<ReqT> startCall( public ServerCall.Listener<ReqT> startCall(
MethodDescriptor<ReqT, RespT> methodDescriptor, final ServerCall<ReqT, RespT> call,
final ServerCall<RespT> call,
Metadata headers) { Metadata headers) {
final ServerCallStreamObserverImpl<RespT> responseObserver = final ServerCallStreamObserverImpl<ReqT, RespT> responseObserver =
new ServerCallStreamObserverImpl<RespT>(call); new ServerCallStreamObserverImpl<ReqT, RespT>(call);
final StreamObserver<ReqT> requestObserver = method.invoke(responseObserver); final StreamObserver<ReqT> requestObserver = method.invoke(responseObserver);
responseObserver.freeze(); responseObserver.freeze();
if (responseObserver.autoFlowControlEnabled) { if (responseObserver.autoFlowControlEnabled) {
@ -249,9 +247,9 @@ public class ServerCalls {
StreamObserver<ReqT> invoke(StreamObserver<RespT> responseObserver); StreamObserver<ReqT> invoke(StreamObserver<RespT> responseObserver);
} }
private static final class ServerCallStreamObserverImpl<RespT> private static final class ServerCallStreamObserverImpl<ReqT, RespT>
extends ServerCallStreamObserver<RespT> { extends ServerCallStreamObserver<RespT> {
final ServerCall<RespT> call; final ServerCall<ReqT, RespT> call;
volatile boolean cancelled; volatile boolean cancelled;
private boolean frozen; private boolean frozen;
private boolean autoFlowControlEnabled = true; private boolean autoFlowControlEnabled = true;
@ -259,7 +257,7 @@ public class ServerCalls {
private Runnable onReadyHandler; private Runnable onReadyHandler;
private Runnable onCancelHandler; private Runnable onCancelHandler;
ServerCallStreamObserverImpl(ServerCall<RespT> call) { ServerCallStreamObserverImpl(ServerCall<ReqT, RespT> call) {
this.call = call; this.call = call;
} }

23
stub/src/test/java/io/grpc/stub/ServerCallsTest.java
View File

@ -45,6 +45,7 @@ import io.grpc.MethodDescriptor;
import io.grpc.ServerCall; import io.grpc.ServerCall;
import io.grpc.ServerCallHandler; import io.grpc.ServerCallHandler;
import io.grpc.ServerServiceDefinition; import io.grpc.ServerServiceDefinition;
import io.grpc.ServiceDescriptor;
import io.grpc.Status; import io.grpc.Status;
import io.grpc.inprocess.InProcessChannelBuilder; import io.grpc.inprocess.InProcessChannelBuilder;
import io.grpc.inprocess.InProcessServerBuilder; import io.grpc.inprocess.InProcessServerBuilder;
@ -88,7 +89,7 @@ public class ServerCallsTest {
new IntegerMarshaller(), new IntegerMarshaller()); new IntegerMarshaller(), new IntegerMarshaller());
@Mock @Mock
ServerCall<Integer> serverCall; ServerCall<Integer, Integer> serverCall;
@Before @Before
public void setUp() throws Exception { public void setUp() throws Exception {
@ -128,7 +129,7 @@ public class ServerCallsTest {
} }
}); });
ServerCall.Listener<Integer> callListener = ServerCall.Listener<Integer> callListener =
callHandler.startCall(STREAMING_METHOD, serverCall, new Metadata()); callHandler.startCall(serverCall, new Metadata());
Mockito.when(serverCall.isReady()).thenReturn(true).thenReturn(false); Mockito.when(serverCall.isReady()).thenReturn(true).thenReturn(false);
Mockito.when(serverCall.isCancelled()).thenReturn(false).thenReturn(true); Mockito.when(serverCall.isCancelled()).thenReturn(false).thenReturn(true);
assertTrue(callObserver.get().isReady()); assertTrue(callObserver.get().isReady());
@ -160,7 +161,7 @@ public class ServerCallsTest {
} }
}); });
ServerCall.Listener<Integer> callListener = ServerCall.Listener<Integer> callListener =
callHandler.startCall(STREAMING_METHOD, serverCall, new Metadata()); callHandler.startCall(serverCall, new Metadata());
callListener.onMessage(1); callListener.onMessage(1);
try { try {
callObserver.get().setOnCancelHandler(new Runnable() { callObserver.get().setOnCancelHandler(new Runnable() {
@ -188,7 +189,7 @@ public class ServerCallsTest {
} }
}); });
ServerCall.Listener<Integer> callListener = ServerCall.Listener<Integer> callListener =
callHandler.startCall(STREAMING_METHOD, serverCall, new Metadata()); callHandler.startCall(serverCall, new Metadata());
callListener.onMessage(1); callListener.onMessage(1);
try { try {
callObserver.get().setOnReadyHandler(new Runnable() { callObserver.get().setOnReadyHandler(new Runnable() {
@ -216,7 +217,7 @@ public class ServerCallsTest {
} }
}); });
ServerCall.Listener<Integer> callListener = ServerCall.Listener<Integer> callListener =
callHandler.startCall(STREAMING_METHOD, serverCall, new Metadata()); callHandler.startCall(serverCall, new Metadata());
callListener.onMessage(1); callListener.onMessage(1);
try { try {
callObserver.get().disableAutoInboundFlowControl(); callObserver.get().disableAutoInboundFlowControl();
@ -240,7 +241,7 @@ public class ServerCallsTest {
} }
}); });
ServerCall.Listener<Integer> callListener = ServerCall.Listener<Integer> callListener =
callHandler.startCall(STREAMING_METHOD, serverCall, new Metadata()); callHandler.startCall(serverCall, new Metadata());
callListener.onReady(); callListener.onReady();
// Transport should not call this if nothing has been requested but forcing it here // Transport should not call this if nothing has been requested but forcing it here
// to verify that message delivery does not trigger a call to request(1). // to verify that message delivery does not trigger a call to request(1).
@ -261,8 +262,7 @@ public class ServerCallsTest {
serverCallObserver.disableAutoInboundFlowControl(); serverCallObserver.disableAutoInboundFlowControl();
} }
}); });
ServerCall.Listener<Integer> callListener = callHandler.startCall(serverCall, new Metadata());
callHandler.startCall(UNARY_METHOD, serverCall, new Metadata());
// Auto inbound flow-control always requests 2 messages for unary to detect a violation // Auto inbound flow-control always requests 2 messages for unary to detect a violation
// of the unary semantic. // of the unary semantic.
Mockito.verify(serverCall, times(1)).request(2); Mockito.verify(serverCall, times(1)).request(2);
@ -271,8 +271,6 @@ public class ServerCallsTest {
@Test @Test
public void onReadyHandlerCalledForUnaryRequest() throws Exception { public void onReadyHandlerCalledForUnaryRequest() throws Exception {
final AtomicInteger onReadyCalled = new AtomicInteger(); final AtomicInteger onReadyCalled = new AtomicInteger();
final AtomicReference<ServerCallStreamObserver<Integer>> callObserver =
new AtomicReference<ServerCallStreamObserver<Integer>>();
ServerCallHandler<Integer, Integer> callHandler = ServerCallHandler<Integer, Integer> callHandler =
ServerCalls.asyncServerStreamingCall( ServerCalls.asyncServerStreamingCall(
new ServerCalls.ServerStreamingMethod<Integer, Integer>() { new ServerCalls.ServerStreamingMethod<Integer, Integer>() {
@ -289,7 +287,7 @@ public class ServerCallsTest {
} }
}); });
ServerCall.Listener<Integer> callListener = ServerCall.Listener<Integer> callListener =
callHandler.startCall(STREAMING_METHOD, serverCall, new Metadata()); callHandler.startCall(serverCall, new Metadata());
Mockito.when(serverCall.isReady()).thenReturn(true).thenReturn(false); Mockito.when(serverCall.isReady()).thenReturn(true).thenReturn(false);
Mockito.when(serverCall.isCancelled()).thenReturn(false).thenReturn(true); Mockito.when(serverCall.isCancelled()).thenReturn(false).thenReturn(true);
callListener.onReady(); callListener.onReady();
@ -309,7 +307,8 @@ public class ServerCallsTest {
@Test @Test
public void inprocessTransportManualFlow() throws Exception { public void inprocessTransportManualFlow() throws Exception {
final Semaphore semaphore = new Semaphore(1); final Semaphore semaphore = new Semaphore(1);
ServerServiceDefinition service = ServerServiceDefinition.builder("some") ServerServiceDefinition service = ServerServiceDefinition.builder(
new ServiceDescriptor("some", STREAMING_METHOD))
.addMethod(STREAMING_METHOD, ServerCalls.asyncBidiStreamingCall( .addMethod(STREAMING_METHOD, ServerCalls.asyncBidiStreamingCall(
new ServerCalls.BidiStreamingMethod<Integer, Integer>() { new ServerCalls.BidiStreamingMethod<Integer, Integer>() {
int iteration; int iteration;

19
testing/src/main/java/io/grpc/testing/TestUtils.java
View File

@ -34,7 +34,6 @@ package io.grpc.testing;
import io.grpc.ExperimentalApi; import io.grpc.ExperimentalApi;
import io.grpc.ForwardingServerCall.SimpleForwardingServerCall; import io.grpc.ForwardingServerCall.SimpleForwardingServerCall;
import io.grpc.Metadata; import io.grpc.Metadata;
import io.grpc.MethodDescriptor;
import io.grpc.ServerCall; import io.grpc.ServerCall;
import io.grpc.ServerCallHandler; import io.grpc.ServerCallHandler;
import io.grpc.ServerInterceptor; import io.grpc.ServerInterceptor;
@ -85,12 +84,10 @@ public class TestUtils {
return new ServerInterceptor() { return new ServerInterceptor() {
@Override @Override
public <ReqT, RespT> ServerCall.Listener<ReqT> interceptCall( public <ReqT, RespT> ServerCall.Listener<ReqT> interceptCall(
MethodDescriptor<ReqT, RespT> method, ServerCall<ReqT, RespT> call,
ServerCall<RespT> call,
final Metadata requestHeaders, final Metadata requestHeaders,
ServerCallHandler<ReqT, RespT> next) { ServerCallHandler<ReqT, RespT> next) {
return next.startCall(method, return next.startCall(new SimpleForwardingServerCall<ReqT, RespT>(call) {
new SimpleForwardingServerCall<RespT>(call) {
@Override @Override
public void sendHeaders(Metadata responseHeaders) { public void sendHeaders(Metadata responseHeaders) {
responseHeaders.merge(requestHeaders, keySet); responseHeaders.merge(requestHeaders, keySet);
@ -117,12 +114,11 @@ public class TestUtils {
return new ServerInterceptor() { return new ServerInterceptor() {
@Override @Override
public <ReqT, RespT> ServerCall.Listener<ReqT> interceptCall( public <ReqT, RespT> ServerCall.Listener<ReqT> interceptCall(
MethodDescriptor<ReqT, RespT> method, ServerCall<ReqT, RespT> call,
ServerCall<RespT> call,
Metadata requestHeaders, Metadata requestHeaders,
ServerCallHandler<ReqT, RespT> next) { ServerCallHandler<ReqT, RespT> next) {
headersCapture.set(requestHeaders); headersCapture.set(requestHeaders);
return next.startCall(method, call, requestHeaders); return next.startCall(call, requestHeaders);
} }
}; };
} }
@ -132,16 +128,15 @@ public class TestUtils {
* {@link ServerCall#attributes()} * {@link ServerCall#attributes()}
*/ */
public static ServerInterceptor recordServerCallInterceptor( public static ServerInterceptor recordServerCallInterceptor(
final AtomicReference<ServerCall<?>> serverCallCapture) { final AtomicReference<ServerCall<?, ?>> serverCallCapture) {
return new ServerInterceptor() { return new ServerInterceptor() {
@Override @Override
public <ReqT, RespT> ServerCall.Listener<ReqT> interceptCall( public <ReqT, RespT> ServerCall.Listener<ReqT> interceptCall(
MethodDescriptor<ReqT, RespT> method, ServerCall<ReqT, RespT> call,
ServerCall<RespT> call,
Metadata requestHeaders, Metadata requestHeaders,
ServerCallHandler<ReqT, RespT> next) { ServerCallHandler<ReqT, RespT> next) {
serverCallCapture.set(call); serverCallCapture.set(call);
return next.startCall(method, call, requestHeaders); return next.startCall(call, requestHeaders);
} }
}; };
} }