Merge branch 'master' into inprocess-transport

Author: ejona86

benchmarks/src/generated/main/grpc/io/grpc/testing/TestServiceGrpc.java

@@ -23,7 +23,6 @@ public class TestServiceGrpc {
           "grpc.testing.TestService", "UnaryCall",
           io.grpc.protobuf.ProtoUtils.marshaller(io.grpc.testing.SimpleRequest.parser()),
           io.grpc.protobuf.ProtoUtils.marshaller(io.grpc.testing.SimpleResponse.parser()));
-  // Static method descriptors that strictly reflect the proto.
   public static final io.grpc.MethodDescriptor<io.grpc.testing.SimpleRequest,
       io.grpc.testing.SimpleResponse> METHOD_STREAMING_CALL =
       io.grpc.MethodDescriptor.create(
@@ -33,59 +32,17 @@ public class TestServiceGrpc {
           io.grpc.protobuf.ProtoUtils.marshaller(io.grpc.testing.SimpleResponse.parser()));
 
   public static TestServiceStub newStub(io.grpc.Channel channel) {
-    return new TestServiceStub(channel, CONFIG);
+    return new TestServiceStub(channel);
   }
 
   public static TestServiceBlockingStub newBlockingStub(
       io.grpc.Channel channel) {
-    return new TestServiceBlockingStub(channel, CONFIG);
+    return new TestServiceBlockingStub(channel);
   }
 
   public static TestServiceFutureStub newFutureStub(
       io.grpc.Channel channel) {
-    return new TestServiceFutureStub(channel, CONFIG);
-  }
-
-  // The default service descriptor
-  private static final TestServiceServiceDescriptor CONFIG =
-      new TestServiceServiceDescriptor();
-
-  @javax.annotation.concurrent.Immutable
-  public static class TestServiceServiceDescriptor extends
-      io.grpc.stub.AbstractServiceDescriptor<TestServiceServiceDescriptor> {
-    public final io.grpc.MethodDescriptor<io.grpc.testing.SimpleRequest,
-        io.grpc.testing.SimpleResponse> unaryCall;
-    public final io.grpc.MethodDescriptor<io.grpc.testing.SimpleRequest,
-        io.grpc.testing.SimpleResponse> streamingCall;
-
-    private TestServiceServiceDescriptor() {
-      unaryCall = METHOD_UNARY_CALL;
-      streamingCall = METHOD_STREAMING_CALL;
-    }
-
-    @SuppressWarnings("unchecked")
-    private TestServiceServiceDescriptor(
-        java.util.Map<java.lang.String, io.grpc.MethodDescriptor<?, ?>> methodMap) {
-      unaryCall = (io.grpc.MethodDescriptor<io.grpc.testing.SimpleRequest,
-          io.grpc.testing.SimpleResponse>) methodMap.get(
-          CONFIG.unaryCall.getFullMethodName());
-      streamingCall = (io.grpc.MethodDescriptor<io.grpc.testing.SimpleRequest,
-          io.grpc.testing.SimpleResponse>) methodMap.get(
-          CONFIG.streamingCall.getFullMethodName());
-    }
-
-    @java.lang.Override
-    protected TestServiceServiceDescriptor build(
-        java.util.Map<java.lang.String, io.grpc.MethodDescriptor<?, ?>> methodMap) {
-      return new TestServiceServiceDescriptor(methodMap);
-    }
-
-    @java.lang.Override
-    public java.util.Collection<io.grpc.MethodDescriptor<?, ?>> methods() {
-      return com.google.common.collect.ImmutableList.<io.grpc.MethodDescriptor<?, ?>>of(
-          unaryCall,
-          streamingCall);
-    }
+    return new TestServiceFutureStub(channel);
   }
 
   public static interface TestService {
@@ -108,96 +65,84 @@ public com.google.common.util.concurrent.ListenableFuture<io.grpc.testing.Simple
         io.grpc.testing.SimpleRequest request);
   }
 
-  public static class TestServiceStub extends
-      io.grpc.stub.AbstractStub<TestServiceStub, TestServiceServiceDescriptor>
+  public static class TestServiceStub extends io.grpc.stub.AbstractStub<TestServiceStub>
       implements TestService {
-    private TestServiceStub(io.grpc.Channel channel,
-        TestServiceServiceDescriptor config) {
-      super(channel, config);
+    private TestServiceStub(io.grpc.Channel channel) {
+      super(channel);
     }
 
     private TestServiceStub(io.grpc.Channel channel,
-        TestServiceServiceDescriptor config,
         io.grpc.CallOptions callOptions) {
-      super(channel, config, callOptions);
+      super(channel, callOptions);
     }
 
     @java.lang.Override
     protected TestServiceStub build(io.grpc.Channel channel,
-        TestServiceServiceDescriptor config,
         io.grpc.CallOptions callOptions) {
-      return new TestServiceStub(channel, config, callOptions);
+      return new TestServiceStub(channel, callOptions);
     }
 
     @java.lang.Override
     public void unaryCall(io.grpc.testing.SimpleRequest request,
         io.grpc.stub.StreamObserver<io.grpc.testing.SimpleResponse> responseObserver) {
       asyncUnaryCall(
-          channel.newCall(config.unaryCall, callOptions), request, responseObserver);
+          channel.newCall(METHOD_UNARY_CALL, callOptions), request, responseObserver);
     }
 
     @java.lang.Override
     public io.grpc.stub.StreamObserver<io.grpc.testing.SimpleRequest> streamingCall(
         io.grpc.stub.StreamObserver<io.grpc.testing.SimpleResponse> responseObserver) {
       return asyncDuplexStreamingCall(
-          channel.newCall(config.streamingCall, callOptions), responseObserver);
+          channel.newCall(METHOD_STREAMING_CALL, callOptions), responseObserver);
     }
   }
 
-  public static class TestServiceBlockingStub extends
-      io.grpc.stub.AbstractStub<TestServiceBlockingStub, TestServiceServiceDescriptor>
+  public static class TestServiceBlockingStub extends io.grpc.stub.AbstractStub<TestServiceBlockingStub>
       implements TestServiceBlockingClient {
-    private TestServiceBlockingStub(io.grpc.Channel channel,
-        TestServiceServiceDescriptor config) {
-      super(channel, config);
+    private TestServiceBlockingStub(io.grpc.Channel channel) {
+      super(channel);
     }
 
     private TestServiceBlockingStub(io.grpc.Channel channel,
-        TestServiceServiceDescriptor config,
         io.grpc.CallOptions callOptions) {
-      super(channel, config, callOptions);
+      super(channel, callOptions);
     }
 
     @java.lang.Override
     protected TestServiceBlockingStub build(io.grpc.Channel channel,
-        TestServiceServiceDescriptor config,
         io.grpc.CallOptions callOptions) {
-      return new TestServiceBlockingStub(channel, config, callOptions);
+      return new TestServiceBlockingStub(channel, callOptions);
     }
 
     @java.lang.Override
     public io.grpc.testing.SimpleResponse unaryCall(io.grpc.testing.SimpleRequest request) {
       return blockingUnaryCall(
-          channel.newCall(config.unaryCall, callOptions), request);
+          channel.newCall(METHOD_UNARY_CALL, callOptions), request);
     }
   }
 
-  public static class TestServiceFutureStub extends
-      io.grpc.stub.AbstractStub<TestServiceFutureStub, TestServiceServiceDescriptor>
+  public static class TestServiceFutureStub extends io.grpc.stub.AbstractStub<TestServiceFutureStub>
       implements TestServiceFutureClient {
-    private TestServiceFutureStub(io.grpc.Channel channel,
-        TestServiceServiceDescriptor config) {
-      super(channel, config);
+    private TestServiceFutureStub(io.grpc.Channel channel) {
+      super(channel);
     }
 
     private TestServiceFutureStub(io.grpc.Channel channel,
-        TestServiceServiceDescriptor config,
         io.grpc.CallOptions callOptions) {
-      super(channel, config, callOptions);
+      super(channel, callOptions);
     }
 
     @java.lang.Override
     protected TestServiceFutureStub build(io.grpc.Channel channel,
-        TestServiceServiceDescriptor config,
         io.grpc.CallOptions callOptions) {
-      return new TestServiceFutureStub(channel, config, callOptions);
+      return new TestServiceFutureStub(channel, callOptions);
     }
 
     @java.lang.Override
     public com.google.common.util.concurrent.ListenableFuture<io.grpc.testing.SimpleResponse> unaryCall(
         io.grpc.testing.SimpleRequest request) {
       return futureUnaryCall(
-          channel.newCall(config.unaryCall, callOptions), request);
+          channel.newCall(METHOD_UNARY_CALL, callOptions), request);
     }
   }
 

benchmarks/src/generated/main/grpc/io/grpc/testing/WorkerGrpc.java

@@ -23,7 +23,6 @@ public class WorkerGrpc {
           "grpc.testing.Worker", "RunTest",
           io.grpc.protobuf.ProtoUtils.marshaller(io.grpc.testing.ClientArgs.parser()),
           io.grpc.protobuf.ProtoUtils.marshaller(io.grpc.testing.ClientStatus.parser()));
-  // Static method descriptors that strictly reflect the proto.
   public static final io.grpc.MethodDescriptor<io.grpc.testing.ServerArgs,
       io.grpc.testing.ServerStatus> METHOD_RUN_SERVER =
       io.grpc.MethodDescriptor.create(
@@ -33,59 +32,17 @@ public class WorkerGrpc {
           io.grpc.protobuf.ProtoUtils.marshaller(io.grpc.testing.ServerStatus.parser()));
 
   public static WorkerStub newStub(io.grpc.Channel channel) {
-    return new WorkerStub(channel, CONFIG);
+    return new WorkerStub(channel);
   }
 
   public static WorkerBlockingStub newBlockingStub(
       io.grpc.Channel channel) {
-    return new WorkerBlockingStub(channel, CONFIG);
+    return new WorkerBlockingStub(channel);
   }
 
   public static WorkerFutureStub newFutureStub(
       io.grpc.Channel channel) {
-    return new WorkerFutureStub(channel, CONFIG);
-  }
-
-  // The default service descriptor
-  private static final WorkerServiceDescriptor CONFIG =
-      new WorkerServiceDescriptor();
-
-  @javax.annotation.concurrent.Immutable
-  public static class WorkerServiceDescriptor extends
-      io.grpc.stub.AbstractServiceDescriptor<WorkerServiceDescriptor> {
-    public final io.grpc.MethodDescriptor<io.grpc.testing.ClientArgs,
-        io.grpc.testing.ClientStatus> runTest;
-    public final io.grpc.MethodDescriptor<io.grpc.testing.ServerArgs,
-        io.grpc.testing.ServerStatus> runServer;
-
-    private WorkerServiceDescriptor() {
-      runTest = METHOD_RUN_TEST;
-      runServer = METHOD_RUN_SERVER;
-    }
-
-    @SuppressWarnings("unchecked")
-    private WorkerServiceDescriptor(
-        java.util.Map<java.lang.String, io.grpc.MethodDescriptor<?, ?>> methodMap) {
-      runTest = (io.grpc.MethodDescriptor<io.grpc.testing.ClientArgs,
-          io.grpc.testing.ClientStatus>) methodMap.get(
-          CONFIG.runTest.getFullMethodName());
-      runServer = (io.grpc.MethodDescriptor<io.grpc.testing.ServerArgs,
-          io.grpc.testing.ServerStatus>) methodMap.get(
-          CONFIG.runServer.getFullMethodName());
-    }
-
-    @java.lang.Override
-    protected WorkerServiceDescriptor build(
-        java.util.Map<java.lang.String, io.grpc.MethodDescriptor<?, ?>> methodMap) {
-      return new WorkerServiceDescriptor(methodMap);
-    }
-
-    @java.lang.Override
-    public java.util.Collection<io.grpc.MethodDescriptor<?, ?>> methods() {
-      return com.google.common.collect.ImmutableList.<io.grpc.MethodDescriptor<?, ?>>of(
-          runTest,
-          runServer);
-    }
+    return new WorkerFutureStub(channel);
   }
 
   public static interface Worker {
@@ -103,83 +60,71 @@ public static interface WorkerBlockingClient {
   public static interface WorkerFutureClient {
   }
 
-  public static class WorkerStub extends
-      io.grpc.stub.AbstractStub<WorkerStub, WorkerServiceDescriptor>
+  public static class WorkerStub extends io.grpc.stub.AbstractStub<WorkerStub>
       implements Worker {
-    private WorkerStub(io.grpc.Channel channel,
-        WorkerServiceDescriptor config) {
-      super(channel, config);
+    private WorkerStub(io.grpc.Channel channel) {
+      super(channel);
     }
 
     private WorkerStub(io.grpc.Channel channel,
-        WorkerServiceDescriptor config,
         io.grpc.CallOptions callOptions) {
-      super(channel, config, callOptions);
+      super(channel, callOptions);
     }
 
     @java.lang.Override
     protected WorkerStub build(io.grpc.Channel channel,
-        WorkerServiceDescriptor config,
         io.grpc.CallOptions callOptions) {
-      return new WorkerStub(channel, config, callOptions);
+      return new WorkerStub(channel, callOptions);
     }
 
     @java.lang.Override
     public io.grpc.stub.StreamObserver<io.grpc.testing.ClientArgs> runTest(
         io.grpc.stub.StreamObserver<io.grpc.testing.ClientStatus> responseObserver) {
       return asyncDuplexStreamingCall(
-          channel.newCall(config.runTest, callOptions), responseObserver);
+          channel.newCall(METHOD_RUN_TEST, callOptions), responseObserver);
     }
 
     @java.lang.Override
     public io.grpc.stub.StreamObserver<io.grpc.testing.ServerArgs> runServer(
         io.grpc.stub.StreamObserver<io.grpc.testing.ServerStatus> responseObserver) {
       return asyncDuplexStreamingCall(
-          channel.newCall(config.runServer, callOptions), responseObserver);
+          channel.newCall(METHOD_RUN_SERVER, callOptions), responseObserver);
     }
   }
 
-  public static class WorkerBlockingStub extends
-      io.grpc.stub.AbstractStub<WorkerBlockingStub, WorkerServiceDescriptor>
+  public static class WorkerBlockingStub extends io.grpc.stub.AbstractStub<WorkerBlockingStub>
       implements WorkerBlockingClient {
-    private WorkerBlockingStub(io.grpc.Channel channel,
-        WorkerServiceDescriptor config) {
-      super(channel, config);
+    private WorkerBlockingStub(io.grpc.Channel channel) {
+      super(channel);
     }
 
     private WorkerBlockingStub(io.grpc.Channel channel,
-        WorkerServiceDescriptor config,
         io.grpc.CallOptions callOptions) {
-      super(channel, config, callOptions);
+      super(channel, callOptions);
     }
 
     @java.lang.Override
     protected WorkerBlockingStub build(io.grpc.Channel channel,
-        WorkerServiceDescriptor config,
         io.grpc.CallOptions callOptions) {
-      return new WorkerBlockingStub(channel, config, callOptions);
+      return new WorkerBlockingStub(channel, callOptions);
     }
   }
 
-  public static class WorkerFutureStub extends
-      io.grpc.stub.AbstractStub<WorkerFutureStub, WorkerServiceDescriptor>
+  public static class WorkerFutureStub extends io.grpc.stub.AbstractStub<WorkerFutureStub>
       implements WorkerFutureClient {
-    private WorkerFutureStub(io.grpc.Channel channel,
-        WorkerServiceDescriptor config) {
-      super(channel, config);
+    private WorkerFutureStub(io.grpc.Channel channel) {
+      super(channel);
     }
 
     private WorkerFutureStub(io.grpc.Channel channel,
-        WorkerServiceDescriptor config,
         io.grpc.CallOptions callOptions) {
-      super(channel, config, callOptions);
+      super(channel, callOptions);
     }
 
     @java.lang.Override
     protected WorkerFutureStub build(io.grpc.Channel channel,
-        WorkerServiceDescriptor config,
         io.grpc.CallOptions callOptions) {
-      return new WorkerFutureStub(channel, config, callOptions);
+      return new WorkerFutureStub(channel, callOptions);
     }
   }