From d35e77869e8dba0029ea3f798646224976d58bb3 Mon Sep 17 00:00:00 2001 From: Carl Mastrangelo Date: Mon, 30 Apr 2018 18:32:02 -0700 Subject: [PATCH] services: move health.proto to correct directory --- .../grpc/io/grpc/health/v1/HealthGrpc.java | 2 +- .../io/grpc/health/v1/HealthCheckRequest.java | 2 +- .../v1/HealthCheckRequestOrBuilder.java | 2 +- .../grpc/health/v1/HealthCheckResponse.java | 2 +- .../v1/HealthCheckResponseOrBuilder.java | 2 +- .../java/io/grpc/health/v1/HealthProto.java | 22 +++++++++---------- .../proto/{ => grpc/health/v1}/health.proto | 5 +++-- 7 files changed, 19 insertions(+), 18 deletions(-) rename services/src/main/proto/{ => grpc/health/v1}/health.proto (99%) diff --git a/services/src/generated/main/grpc/io/grpc/health/v1/HealthGrpc.java b/services/src/generated/main/grpc/io/grpc/health/v1/HealthGrpc.java index d2a62cd550..d9ac94a602 100644 --- a/services/src/generated/main/grpc/io/grpc/health/v1/HealthGrpc.java +++ b/services/src/generated/main/grpc/io/grpc/health/v1/HealthGrpc.java @@ -19,7 +19,7 @@ import static io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall; */ @javax.annotation.Generated( value = "by gRPC proto compiler", - comments = "Source: health.proto") + comments = "Source: grpc/health/v1/health.proto") public final class HealthGrpc { private HealthGrpc() {} diff --git a/services/src/generated/main/java/io/grpc/health/v1/HealthCheckRequest.java b/services/src/generated/main/java/io/grpc/health/v1/HealthCheckRequest.java index 4ae63729e5..ef6268aa3f 100644 --- a/services/src/generated/main/java/io/grpc/health/v1/HealthCheckRequest.java +++ b/services/src/generated/main/java/io/grpc/health/v1/HealthCheckRequest.java @@ -1,5 +1,5 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! -// source: health.proto +// source: grpc/health/v1/health.proto package io.grpc.health.v1; diff --git a/services/src/generated/main/java/io/grpc/health/v1/HealthCheckRequestOrBuilder.java b/services/src/generated/main/java/io/grpc/health/v1/HealthCheckRequestOrBuilder.java index 91fef89850..4613f1cb2e 100644 --- a/services/src/generated/main/java/io/grpc/health/v1/HealthCheckRequestOrBuilder.java +++ b/services/src/generated/main/java/io/grpc/health/v1/HealthCheckRequestOrBuilder.java @@ -1,5 +1,5 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! -// source: health.proto +// source: grpc/health/v1/health.proto package io.grpc.health.v1; diff --git a/services/src/generated/main/java/io/grpc/health/v1/HealthCheckResponse.java b/services/src/generated/main/java/io/grpc/health/v1/HealthCheckResponse.java index 1d69211ab6..efe312cad9 100644 --- a/services/src/generated/main/java/io/grpc/health/v1/HealthCheckResponse.java +++ b/services/src/generated/main/java/io/grpc/health/v1/HealthCheckResponse.java @@ -1,5 +1,5 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! -// source: health.proto +// source: grpc/health/v1/health.proto package io.grpc.health.v1; diff --git a/services/src/generated/main/java/io/grpc/health/v1/HealthCheckResponseOrBuilder.java b/services/src/generated/main/java/io/grpc/health/v1/HealthCheckResponseOrBuilder.java index a748b06842..1479a0810a 100644 --- a/services/src/generated/main/java/io/grpc/health/v1/HealthCheckResponseOrBuilder.java +++ b/services/src/generated/main/java/io/grpc/health/v1/HealthCheckResponseOrBuilder.java @@ -1,5 +1,5 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! -// source: health.proto +// source: grpc/health/v1/health.proto package io.grpc.health.v1; diff --git a/services/src/generated/main/java/io/grpc/health/v1/HealthProto.java b/services/src/generated/main/java/io/grpc/health/v1/HealthProto.java index 09ce4d0c6c..ce0d1bde10 100644 --- a/services/src/generated/main/java/io/grpc/health/v1/HealthProto.java +++ b/services/src/generated/main/java/io/grpc/health/v1/HealthProto.java @@ -1,5 +1,5 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! -// source: health.proto +// source: grpc/health/v1/health.proto package io.grpc.health.v1; @@ -33,16 +33,16 @@ public final class HealthProto { descriptor; static { java.lang.String[] descriptorData = { - "\n\014health.proto\022\016grpc.health.v1\"%\n\022Health" + - "CheckRequest\022\017\n\007service\030\001 \001(\t\"\224\001\n\023Health" + - "CheckResponse\022A\n\006status\030\001 \001(\01621.grpc.hea" + - "lth.v1.HealthCheckResponse.ServingStatus" + - "\":\n\rServingStatus\022\013\n\007UNKNOWN\020\000\022\013\n\007SERVIN" + - "G\020\001\022\017\n\013NOT_SERVING\020\0022Z\n\006Health\022P\n\005Check\022" + - "\".grpc.health.v1.HealthCheckRequest\032#.gr" + - "pc.health.v1.HealthCheckResponseB3\n\021io.g" + - "rpc.health.v1B\013HealthProtoP\001\252\002\016Grpc.Heal" + - "th.V1b\006proto3" + "\n\033grpc/health/v1/health.proto\022\016grpc.heal" + + "th.v1\"%\n\022HealthCheckRequest\022\017\n\007service\030\001" + + " \001(\t\"\224\001\n\023HealthCheckResponse\022A\n\006status\030\001" + + " \001(\01621.grpc.health.v1.HealthCheckRespons" + + "e.ServingStatus\":\n\rServingStatus\022\013\n\007UNKN" + + "OWN\020\000\022\013\n\007SERVING\020\001\022\017\n\013NOT_SERVING\020\0022Z\n\006H" + + "ealth\022P\n\005Check\022\".grpc.health.v1.HealthCh" + + "eckRequest\032#.grpc.health.v1.HealthCheckR" + + "esponseB3\n\021io.grpc.health.v1B\013HealthProt" + + "oP\001\252\002\016Grpc.Health.V1b\006proto3" }; com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = new com.google.protobuf.Descriptors.FileDescriptor. InternalDescriptorAssigner() { diff --git a/services/src/main/proto/health.proto b/services/src/main/proto/grpc/health/v1/health.proto similarity index 99% rename from services/src/main/proto/health.proto rename to services/src/main/proto/grpc/health/v1/health.proto index 126f6f5c31..5c727372a8 100644 --- a/services/src/main/proto/health.proto +++ b/services/src/main/proto/grpc/health/v1/health.proto @@ -12,14 +12,15 @@ // 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 = "proto3"; package grpc.health.v1; -option csharp_namespace = "Grpc.Health.V1"; +option csharp_namespace = "Grpc.Health.V1"; option java_multiple_files = true; -option java_package = "io.grpc.health.v1"; option java_outer_classname = "HealthProto"; +option java_package = "io.grpc.health.v1"; message HealthCheckRequest { string service = 1;