change back to use custom Empty, BoolValue.

Author: creamsoup

BUILD.bazel

@@ -24,7 +24,6 @@ proto_library(
 proto_library(
     name = "messages_proto",
     srcs = ["grpc/testing/messages.proto"],
-    deps = ["@com_google_protobuf//:wrappers_proto"],
 )
 
 proto_library(
@@ -117,11 +116,16 @@ proto_library(
     srcs = ["grpc/testing/test.proto"],
     visibility = ["//visibility:public"],
     deps = [
+        ":empty_proto",
         ":messages_proto",
-        "@com_google_protobuf//:empty_proto",
     ],
 )
 
+proto_library(
+    name = "empty_proto",
+    srcs = ["grpc/testing/empty.proto"],
+)
+
 # Deprecated: do not use
 proto_library(
     name = "reflection_proto_deprecated",

grpc/testing/empty.proto

@@ -0,0 +1,29 @@
+// Copyright 2015 The gRPC Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+syntax = "proto2";
+
+package grpc.testing;
+
+option java_package = "io.grpc.testing.integration";
+option java_outer_classname = "EmptyProtos";
+
+// An empty message that you can re-use to avoid defining duplicated empty
+// messages in your project. A typical example is to use it as argument or the
+// return value of a service API. For instance:
+//
+//   service Foo {
+//     rpc Bar (grpc.testing.Empty) returns (grpc.testing.Empty) { };
+//   };
+//
+message Empty {}

grpc/testing/messages.proto

@@ -21,7 +21,13 @@ package grpc.testing;
 
 option java_package = "io.grpc.testing.integration";
 
-import "google/protobuf/wrappers.proto";
+// TODO(dgq): Go back to using well-known types once
+// https://github.com/grpc/grpc/issues/6980 has been fixed.
+// import "google/protobuf/wrappers.proto";
+message BoolValue {
+  // The bool value.
+  bool value = 1;
+}
 
 // The type of payload that should be returned.
 enum PayloadType {
@@ -72,13 +78,13 @@ message SimpleRequest {
   // "nullable" in order to interoperate seamlessly with clients not able to
   // implement the full compression tests by introspecting the call to verify
   // the response's compression status.
-  google.protobuf.BoolValue response_compressed = 6;
+  BoolValue response_compressed = 6;
 
   // Whether server should return a given status
   EchoStatus response_status = 7;
 
   // Whether the server should expect this request to be compressed.
-  google.protobuf.BoolValue expect_compressed = 8;
+  BoolValue expect_compressed = 8;
 }
 
 // Unary response, as configured by the request.
@@ -105,7 +111,7 @@ message StreamingInputCallRequest {
   // is "nullable" in order to interoperate seamlessly with servers not able to
   // implement the full compression tests by introspecting the call to verify
   // the request's compression status.
-  google.protobuf.BoolValue expect_compressed = 2;
+  BoolValue expect_compressed = 2;
 
   // Not expecting any payload from the response.
 }
@@ -129,7 +135,7 @@ message ResponseParameters {
   // "nullable" in order to interoperate seamlessly with clients not able to
   // implement the full compression tests by introspecting the call to verify
   // the response's compression status.
-  google.protobuf.BoolValue compressed = 3;
+  BoolValue compressed = 3;
 }
 
 // Server-streaming request.

grpc/testing/test.proto

@@ -15,7 +15,7 @@
 // of unary/streaming requests/responses.
 syntax = "proto3";
 
-import "google/protobuf/empty.proto";
+import "grpc/testing/empty.proto";
 import "grpc/testing/messages.proto";
 
 package grpc.testing;
@@ -26,7 +26,7 @@ option java_package = "io.grpc.testing.integration";
 // performance with various types of payload.
 service TestService {
   // One empty request followed by one empty response.
-  rpc EmptyCall(google.protobuf.Empty) returns (google.protobuf.Empty);
+  rpc EmptyCall(grpc.testing.Empty) returns (grpc.testing.Empty);
 
   // One request followed by one response.
   rpc UnaryCall(SimpleRequest) returns (SimpleResponse);
@@ -61,21 +61,21 @@ service TestService {
 
   // The test server will not implement this method. It will be used
   // to test the behavior when clients call unimplemented methods.
-  rpc UnimplementedCall(google.protobuf.Empty) returns (google.protobuf.Empty);
+  rpc UnimplementedCall(grpc.testing.Empty) returns (grpc.testing.Empty);
 }
 
 // A simple service NOT implemented at servers so clients can test for
 // that case.
 service UnimplementedService {
   // A call that no server should implement
-  rpc UnimplementedCall(google.protobuf.Empty) returns (google.protobuf.Empty);
+  rpc UnimplementedCall(grpc.testing.Empty) returns (grpc.testing.Empty);
 }
 
 // A service used to control reconnect server.
 service ReconnectService {
   // Starts ReconnectService
-  rpc Start(google.protobuf.Empty) returns (google.protobuf.Empty);
+  rpc Start(grpc.testing.Empty) returns (grpc.testing.Empty);
 
   // Stops ReconnectService
-  rpc Stop(google.protobuf.Empty) returns (grpc.testing.ReconnectInfo);
+  rpc Stop(grpc.testing.Empty) returns (grpc.testing.ReconnectInfo);
 }