From 2b6edfc79dbf58ce07cf9f45ffd6a11583cbca22 Mon Sep 17 00:00:00 2001 From: Carl Mastrangelo Date: Mon, 30 Apr 2018 16:14:32 -0700 Subject: [PATCH] grpclb: move load balancer proto to package-matching directory --- grpclb/BUILD.bazel | 2 +- .../grpc/io/grpc/grpclb/LoadBalancerGrpc.java | 2 +- .../main/java/io/grpc/grpclb/ClientStats.java | 2 +- .../io/grpc/grpclb/ClientStatsOrBuilder.java | 2 +- .../io/grpc/grpclb/ClientStatsPerToken.java | 2 +- .../grpclb/ClientStatsPerTokenOrBuilder.java | 2 +- .../grpclb/InitialLoadBalanceRequest.java | 2 +- .../InitialLoadBalanceRequestOrBuilder.java | 2 +- .../grpclb/InitialLoadBalanceResponse.java | 2 +- .../InitialLoadBalanceResponseOrBuilder.java | 2 +- .../io/grpc/grpclb/LoadBalanceRequest.java | 2 +- .../grpclb/LoadBalanceRequestOrBuilder.java | 2 +- .../io/grpc/grpclb/LoadBalanceResponse.java | 2 +- .../grpclb/LoadBalanceResponseOrBuilder.java | 2 +- .../io/grpc/grpclb/LoadBalancerProto.java | 66 +++++++++---------- .../main/java/io/grpc/grpclb/Server.java | 2 +- .../main/java/io/grpc/grpclb/ServerList.java | 2 +- .../io/grpc/grpclb/ServerListOrBuilder.java | 2 +- .../java/io/grpc/grpclb/ServerOrBuilder.java | 2 +- .../{ => grpc/lb/v1}/load_balancer.proto | 0 20 files changed, 51 insertions(+), 51 deletions(-) rename grpclb/src/main/proto/{ => grpc/lb/v1}/load_balancer.proto (100%) diff --git a/grpclb/BUILD.bazel b/grpclb/BUILD.bazel index 7973636885..3fa78fae6d 100644 --- a/grpclb/BUILD.bazel +++ b/grpclb/BUILD.bazel @@ -21,7 +21,7 @@ java_library( proto_library( name = "load_balancer_proto", - srcs = ["src/main/proto/load_balancer.proto"], + srcs = ["src/main/proto/grpc/lb/v1/load_balancer.proto"], deps = [ "@com_google_protobuf//:timestamp_proto", "@com_google_protobuf//:duration_proto", diff --git a/grpclb/src/generated/main/grpc/io/grpc/grpclb/LoadBalancerGrpc.java b/grpclb/src/generated/main/grpc/io/grpc/grpclb/LoadBalancerGrpc.java index 73f95eb005..5c95023211 100644 --- a/grpclb/src/generated/main/grpc/io/grpc/grpclb/LoadBalancerGrpc.java +++ b/grpclb/src/generated/main/grpc/io/grpc/grpclb/LoadBalancerGrpc.java @@ -19,7 +19,7 @@ import static io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall; */ @javax.annotation.Generated( value = "by gRPC proto compiler", - comments = "Source: load_balancer.proto") + comments = "Source: grpc/lb/v1/load_balancer.proto") public final class LoadBalancerGrpc { private LoadBalancerGrpc() {} diff --git a/grpclb/src/generated/main/java/io/grpc/grpclb/ClientStats.java b/grpclb/src/generated/main/java/io/grpc/grpclb/ClientStats.java index c5b6f8d3f5..71129a1858 100644 --- a/grpclb/src/generated/main/java/io/grpc/grpclb/ClientStats.java +++ b/grpclb/src/generated/main/java/io/grpc/grpclb/ClientStats.java @@ -1,5 +1,5 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! -// source: load_balancer.proto +// source: grpc/lb/v1/load_balancer.proto package io.grpc.grpclb; diff --git a/grpclb/src/generated/main/java/io/grpc/grpclb/ClientStatsOrBuilder.java b/grpclb/src/generated/main/java/io/grpc/grpclb/ClientStatsOrBuilder.java index 60877e7e9c..08d0a70f60 100644 --- a/grpclb/src/generated/main/java/io/grpc/grpclb/ClientStatsOrBuilder.java +++ b/grpclb/src/generated/main/java/io/grpc/grpclb/ClientStatsOrBuilder.java @@ -1,5 +1,5 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! -// source: load_balancer.proto +// source: grpc/lb/v1/load_balancer.proto package io.grpc.grpclb; diff --git a/grpclb/src/generated/main/java/io/grpc/grpclb/ClientStatsPerToken.java b/grpclb/src/generated/main/java/io/grpc/grpclb/ClientStatsPerToken.java index c89c058ac0..0b646c48dc 100644 --- a/grpclb/src/generated/main/java/io/grpc/grpclb/ClientStatsPerToken.java +++ b/grpclb/src/generated/main/java/io/grpc/grpclb/ClientStatsPerToken.java @@ -1,5 +1,5 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! -// source: load_balancer.proto +// source: grpc/lb/v1/load_balancer.proto package io.grpc.grpclb; diff --git a/grpclb/src/generated/main/java/io/grpc/grpclb/ClientStatsPerTokenOrBuilder.java b/grpclb/src/generated/main/java/io/grpc/grpclb/ClientStatsPerTokenOrBuilder.java index 8efa30ed5c..5cd4204d3c 100644 --- a/grpclb/src/generated/main/java/io/grpc/grpclb/ClientStatsPerTokenOrBuilder.java +++ b/grpclb/src/generated/main/java/io/grpc/grpclb/ClientStatsPerTokenOrBuilder.java @@ -1,5 +1,5 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! -// source: load_balancer.proto +// source: grpc/lb/v1/load_balancer.proto package io.grpc.grpclb; diff --git a/grpclb/src/generated/main/java/io/grpc/grpclb/InitialLoadBalanceRequest.java b/grpclb/src/generated/main/java/io/grpc/grpclb/InitialLoadBalanceRequest.java index f16055d4e4..3c45cf6142 100644 --- a/grpclb/src/generated/main/java/io/grpc/grpclb/InitialLoadBalanceRequest.java +++ b/grpclb/src/generated/main/java/io/grpc/grpclb/InitialLoadBalanceRequest.java @@ -1,5 +1,5 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! -// source: load_balancer.proto +// source: grpc/lb/v1/load_balancer.proto package io.grpc.grpclb; diff --git a/grpclb/src/generated/main/java/io/grpc/grpclb/InitialLoadBalanceRequestOrBuilder.java b/grpclb/src/generated/main/java/io/grpc/grpclb/InitialLoadBalanceRequestOrBuilder.java index 1e12e3465b..f30257f28b 100644 --- a/grpclb/src/generated/main/java/io/grpc/grpclb/InitialLoadBalanceRequestOrBuilder.java +++ b/grpclb/src/generated/main/java/io/grpc/grpclb/InitialLoadBalanceRequestOrBuilder.java @@ -1,5 +1,5 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! -// source: load_balancer.proto +// source: grpc/lb/v1/load_balancer.proto package io.grpc.grpclb; diff --git a/grpclb/src/generated/main/java/io/grpc/grpclb/InitialLoadBalanceResponse.java b/grpclb/src/generated/main/java/io/grpc/grpclb/InitialLoadBalanceResponse.java index 79ed897414..5b2afad061 100644 --- a/grpclb/src/generated/main/java/io/grpc/grpclb/InitialLoadBalanceResponse.java +++ b/grpclb/src/generated/main/java/io/grpc/grpclb/InitialLoadBalanceResponse.java @@ -1,5 +1,5 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! -// source: load_balancer.proto +// source: grpc/lb/v1/load_balancer.proto package io.grpc.grpclb; diff --git a/grpclb/src/generated/main/java/io/grpc/grpclb/InitialLoadBalanceResponseOrBuilder.java b/grpclb/src/generated/main/java/io/grpc/grpclb/InitialLoadBalanceResponseOrBuilder.java index aca669e033..894e0a12b0 100644 --- a/grpclb/src/generated/main/java/io/grpc/grpclb/InitialLoadBalanceResponseOrBuilder.java +++ b/grpclb/src/generated/main/java/io/grpc/grpclb/InitialLoadBalanceResponseOrBuilder.java @@ -1,5 +1,5 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! -// source: load_balancer.proto +// source: grpc/lb/v1/load_balancer.proto package io.grpc.grpclb; diff --git a/grpclb/src/generated/main/java/io/grpc/grpclb/LoadBalanceRequest.java b/grpclb/src/generated/main/java/io/grpc/grpclb/LoadBalanceRequest.java index bdf27ef6af..a281b92590 100644 --- a/grpclb/src/generated/main/java/io/grpc/grpclb/LoadBalanceRequest.java +++ b/grpclb/src/generated/main/java/io/grpc/grpclb/LoadBalanceRequest.java @@ -1,5 +1,5 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! -// source: load_balancer.proto +// source: grpc/lb/v1/load_balancer.proto package io.grpc.grpclb; diff --git a/grpclb/src/generated/main/java/io/grpc/grpclb/LoadBalanceRequestOrBuilder.java b/grpclb/src/generated/main/java/io/grpc/grpclb/LoadBalanceRequestOrBuilder.java index b6dcd7eb4e..f33e6e55d1 100644 --- a/grpclb/src/generated/main/java/io/grpc/grpclb/LoadBalanceRequestOrBuilder.java +++ b/grpclb/src/generated/main/java/io/grpc/grpclb/LoadBalanceRequestOrBuilder.java @@ -1,5 +1,5 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! -// source: load_balancer.proto +// source: grpc/lb/v1/load_balancer.proto package io.grpc.grpclb; diff --git a/grpclb/src/generated/main/java/io/grpc/grpclb/LoadBalanceResponse.java b/grpclb/src/generated/main/java/io/grpc/grpclb/LoadBalanceResponse.java index aa223bb6c4..d4467cb310 100644 --- a/grpclb/src/generated/main/java/io/grpc/grpclb/LoadBalanceResponse.java +++ b/grpclb/src/generated/main/java/io/grpc/grpclb/LoadBalanceResponse.java @@ -1,5 +1,5 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! -// source: load_balancer.proto +// source: grpc/lb/v1/load_balancer.proto package io.grpc.grpclb; diff --git a/grpclb/src/generated/main/java/io/grpc/grpclb/LoadBalanceResponseOrBuilder.java b/grpclb/src/generated/main/java/io/grpc/grpclb/LoadBalanceResponseOrBuilder.java index 68ea194efb..67d9f45881 100644 --- a/grpclb/src/generated/main/java/io/grpc/grpclb/LoadBalanceResponseOrBuilder.java +++ b/grpclb/src/generated/main/java/io/grpc/grpclb/LoadBalanceResponseOrBuilder.java @@ -1,5 +1,5 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! -// source: load_balancer.proto +// source: grpc/lb/v1/load_balancer.proto package io.grpc.grpclb; diff --git a/grpclb/src/generated/main/java/io/grpc/grpclb/LoadBalancerProto.java b/grpclb/src/generated/main/java/io/grpc/grpclb/LoadBalancerProto.java index d7eafe1af1..7e6eaff066 100644 --- a/grpclb/src/generated/main/java/io/grpc/grpclb/LoadBalancerProto.java +++ b/grpclb/src/generated/main/java/io/grpc/grpclb/LoadBalancerProto.java @@ -1,5 +1,5 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! -// source: load_balancer.proto +// source: grpc/lb/v1/load_balancer.proto package io.grpc.grpclb; @@ -63,38 +63,38 @@ public final class LoadBalancerProto { descriptor; static { java.lang.String[] descriptorData = { - "\n\023load_balancer.proto\022\ngrpc.lb.v1\032\036googl" + - "e/protobuf/duration.proto\032\037google/protob" + - "uf/timestamp.proto\"\244\001\n\022LoadBalanceReques" + - "t\022@\n\017initial_request\030\001 \001(\0132%.grpc.lb.v1." + - "InitialLoadBalanceRequestH\000\022/\n\014client_st" + - "ats\030\002 \001(\0132\027.grpc.lb.v1.ClientStatsH\000B\033\n\031" + - "load_balance_request_type\")\n\031InitialLoad" + - "BalanceRequest\022\014\n\004name\030\001 \001(\t\"D\n\023ClientSt" + - "atsPerToken\022\032\n\022load_balance_token\030\001 \001(\t\022" + - "\021\n\tnum_calls\030\002 \001(\003\"\244\002\n\013ClientStats\022-\n\tti" + - "mestamp\030\001 \001(\0132\032.google.protobuf.Timestam" + - "p\022\031\n\021num_calls_started\030\002 \001(\003\022\032\n\022num_call" + - "s_finished\030\003 \001(\003\0225\n-num_calls_finished_w" + - "ith_client_failed_to_send\030\006 \001(\003\022)\n!num_c" + - "alls_finished_known_received\030\007 \001(\003\022A\n\030ca" + - "lls_finished_with_drop\030\010 \003(\0132\037.grpc.lb.v" + - "1.ClientStatsPerTokenJ\004\010\004\020\005J\004\010\005\020\006\"\246\001\n\023Lo" + - "adBalanceResponse\022B\n\020initial_response\030\001 " + - "\001(\0132&.grpc.lb.v1.InitialLoadBalanceRespo" + - "nseH\000\022-\n\013server_list\030\002 \001(\0132\026.grpc.lb.v1." + - "ServerListH\000B\034\n\032load_balance_response_ty" + - "pe\"}\n\032InitialLoadBalanceResponse\022\036\n\026load" + - "_balancer_delegate\030\001 \001(\t\022?\n\034client_stats" + - "_report_interval\030\002 \001(\0132\031.google.protobuf" + - ".Duration\"7\n\nServerList\022#\n\007servers\030\001 \003(\013" + - "2\022.grpc.lb.v1.ServerJ\004\010\003\020\004\"Z\n\006Server\022\022\n\n" + - "ip_address\030\001 \001(\014\022\014\n\004port\030\002 \001(\005\022\032\n\022load_b" + - "alance_token\030\003 \001(\t\022\014\n\004drop\030\004 \001(\010J\004\010\005\020\0062b" + - "\n\014LoadBalancer\022R\n\013BalanceLoad\022\036.grpc.lb." + - "v1.LoadBalanceRequest\032\037.grpc.lb.v1.LoadB" + - "alanceResponse(\0010\001B%\n\016io.grpc.grpclbB\021Lo" + - "adBalancerProtoP\001b\006proto3" + "\n\036grpc/lb/v1/load_balancer.proto\022\ngrpc.l" + + "b.v1\032\036google/protobuf/duration.proto\032\037go" + + "ogle/protobuf/timestamp.proto\"\244\001\n\022LoadBa" + + "lanceRequest\022@\n\017initial_request\030\001 \001(\0132%." + + "grpc.lb.v1.InitialLoadBalanceRequestH\000\022/" + + "\n\014client_stats\030\002 \001(\0132\027.grpc.lb.v1.Client" + + "StatsH\000B\033\n\031load_balance_request_type\")\n\031" + + "InitialLoadBalanceRequest\022\014\n\004name\030\001 \001(\t\"" + + "D\n\023ClientStatsPerToken\022\032\n\022load_balance_t" + + "oken\030\001 \001(\t\022\021\n\tnum_calls\030\002 \001(\003\"\244\002\n\013Client" + + "Stats\022-\n\ttimestamp\030\001 \001(\0132\032.google.protob" + + "uf.Timestamp\022\031\n\021num_calls_started\030\002 \001(\003\022" + + "\032\n\022num_calls_finished\030\003 \001(\003\0225\n-num_calls" + + "_finished_with_client_failed_to_send\030\006 \001" + + "(\003\022)\n!num_calls_finished_known_received\030" + + "\007 \001(\003\022A\n\030calls_finished_with_drop\030\010 \003(\0132" + + "\037.grpc.lb.v1.ClientStatsPerTokenJ\004\010\004\020\005J\004" + + "\010\005\020\006\"\246\001\n\023LoadBalanceResponse\022B\n\020initial_" + + "response\030\001 \001(\0132&.grpc.lb.v1.InitialLoadB" + + "alanceResponseH\000\022-\n\013server_list\030\002 \001(\0132\026." + + "grpc.lb.v1.ServerListH\000B\034\n\032load_balance_" + + "response_type\"}\n\032InitialLoadBalanceRespo" + + "nse\022\036\n\026load_balancer_delegate\030\001 \001(\t\022?\n\034c" + + "lient_stats_report_interval\030\002 \001(\0132\031.goog" + + "le.protobuf.Duration\"7\n\nServerList\022#\n\007se" + + "rvers\030\001 \003(\0132\022.grpc.lb.v1.ServerJ\004\010\003\020\004\"Z\n" + + "\006Server\022\022\n\nip_address\030\001 \001(\014\022\014\n\004port\030\002 \001(" + + "\005\022\032\n\022load_balance_token\030\003 \001(\t\022\014\n\004drop\030\004 " + + "\001(\010J\004\010\005\020\0062b\n\014LoadBalancer\022R\n\013BalanceLoad" + + "\022\036.grpc.lb.v1.LoadBalanceRequest\032\037.grpc." + + "lb.v1.LoadBalanceResponse(\0010\001B%\n\016io.grpc" + + ".grpclbB\021LoadBalancerProtoP\001b\006proto3" }; com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = new com.google.protobuf.Descriptors.FileDescriptor. InternalDescriptorAssigner() { diff --git a/grpclb/src/generated/main/java/io/grpc/grpclb/Server.java b/grpclb/src/generated/main/java/io/grpc/grpclb/Server.java index cf3eeeac05..c10e192516 100644 --- a/grpclb/src/generated/main/java/io/grpc/grpclb/Server.java +++ b/grpclb/src/generated/main/java/io/grpc/grpclb/Server.java @@ -1,5 +1,5 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! -// source: load_balancer.proto +// source: grpc/lb/v1/load_balancer.proto package io.grpc.grpclb; diff --git a/grpclb/src/generated/main/java/io/grpc/grpclb/ServerList.java b/grpclb/src/generated/main/java/io/grpc/grpclb/ServerList.java index 33fc04f4e2..95af7758a5 100644 --- a/grpclb/src/generated/main/java/io/grpc/grpclb/ServerList.java +++ b/grpclb/src/generated/main/java/io/grpc/grpclb/ServerList.java @@ -1,5 +1,5 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! -// source: load_balancer.proto +// source: grpc/lb/v1/load_balancer.proto package io.grpc.grpclb; diff --git a/grpclb/src/generated/main/java/io/grpc/grpclb/ServerListOrBuilder.java b/grpclb/src/generated/main/java/io/grpc/grpclb/ServerListOrBuilder.java index 4879fe3d23..23420b12a3 100644 --- a/grpclb/src/generated/main/java/io/grpc/grpclb/ServerListOrBuilder.java +++ b/grpclb/src/generated/main/java/io/grpc/grpclb/ServerListOrBuilder.java @@ -1,5 +1,5 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! -// source: load_balancer.proto +// source: grpc/lb/v1/load_balancer.proto package io.grpc.grpclb; diff --git a/grpclb/src/generated/main/java/io/grpc/grpclb/ServerOrBuilder.java b/grpclb/src/generated/main/java/io/grpc/grpclb/ServerOrBuilder.java index 33139f12e1..42a13c803c 100644 --- a/grpclb/src/generated/main/java/io/grpc/grpclb/ServerOrBuilder.java +++ b/grpclb/src/generated/main/java/io/grpc/grpclb/ServerOrBuilder.java @@ -1,5 +1,5 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! -// source: load_balancer.proto +// source: grpc/lb/v1/load_balancer.proto package io.grpc.grpclb; diff --git a/grpclb/src/main/proto/load_balancer.proto b/grpclb/src/main/proto/grpc/lb/v1/load_balancer.proto similarity index 100% rename from grpclb/src/main/proto/load_balancer.proto rename to grpclb/src/main/proto/grpc/lb/v1/load_balancer.proto