Skip to content

Commit 1dcdaaa

Browse files
snowphtuch
authored andcommitted
Add java_generic_services option to service proto files (envoyproxy#516)
This enables generating generic service stubs for all the data-plane-api proto services when generating Java classes with protoc. This is generally not needed when implementing a gRPC server but in our case we're implementing it behind our legacy protobuf RPC framework which rely on these stubs. As far as I know the only negative with enabling these is generating some potentially unnecessary Java classes. Signed-off-by: Snow Pettersen <[email protected]>
1 parent 60dc08d commit 1dcdaaa

File tree

12 files changed

+17
-0
lines changed

12 files changed

+17
-0
lines changed

envoy/api/v2/cds.proto

+2
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ syntax = "proto3";
22

33
package envoy.api.v2;
44

5+
option java_generic_services = true;
6+
57
import "envoy/api/v2/core/address.proto";
68
import "envoy/api/v2/auth/cert.proto";
79
import "envoy/api/v2/core/base.proto";

envoy/api/v2/eds.proto

+2
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ syntax = "proto3";
22

33
package envoy.api.v2;
44

5+
option java_generic_services = true;
6+
57
import "envoy/api/v2/discovery.proto";
68
import "envoy/api/v2/endpoint/endpoint.proto";
79

envoy/api/v2/lds.proto

+2
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ syntax = "proto3";
22

33
package envoy.api.v2;
44

5+
option java_generic_services = true;
6+
57
import "envoy/api/v2/core/address.proto";
68
import "envoy/api/v2/core/base.proto";
79
import "envoy/api/v2/discovery.proto";

envoy/api/v2/rds.proto

+2
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ syntax = "proto3";
22

33
package envoy.api.v2;
44

5+
option java_generic_services = true;
6+
57
import "envoy/api/v2/core/base.proto";
68
import "envoy/api/v2/discovery.proto";
79
import "envoy/api/v2/route/route.proto";

envoy/api/v2/route/route.proto

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ syntax = "proto3";
22

33
package envoy.api.v2.route;
44
option go_package = "route";
5+
option java_generic_services = true;
56

67
import "envoy/api/v2/core/base.proto";
78
import "envoy/api/v2/auth/auth.proto";

envoy/service/accesslog/v2/als.proto

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ syntax = "proto3";
22

33
package envoy.service.accesslog.v2;
44
option go_package = "v2";
5+
option java_generic_services = true;
56

67
import "envoy/api/v2/core/base.proto";
78
import "envoy/config/filter/accesslog/v2/accesslog.proto";

envoy/service/auth/v2/external_auth.proto

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ syntax = "proto3";
44

55
package envoy.service.auth.v2;
66
option go_package = "v2";
7+
option java_generic_services = true;
78

89
import "envoy/service/auth/v2/attribute_context.proto";
910

envoy/service/discovery/v2/ads.proto

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ syntax = "proto3";
22

33
package envoy.service.discovery.v2;
44
option go_package = "v2";
5+
option java_generic_services = true;
56

67
import "envoy/api/v2/discovery.proto";
78

envoy/service/discovery/v2/hds.proto

+2
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ syntax = "proto3";
22

33
package envoy.service.discovery.v2;
44

5+
option java_generic_services = true;
6+
57
import "envoy/api/v2/core/base.proto";
68
import "envoy/api/v2/core/health_check.proto";
79
import "envoy/api/v2/endpoint/endpoint.proto";

envoy/service/load_stats/v2/lrs.proto

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ syntax = "proto3";
22

33
package envoy.service.load_stats.v2;
44
option go_package = "v2";
5+
option java_generic_services = true;
56

67
import "envoy/api/v2/core/base.proto";
78
import "envoy/api/v2/endpoint/load_report.proto";

envoy/service/metrics/v2/metrics_service.proto

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ syntax = "proto3";
44

55
package envoy.service.metrics.v2;
66
option go_package = "v2";
7+
option java_generic_services = true;
78

89
import "envoy/api/v2/core/base.proto";
910

envoy/service/trace/v2/trace_service.proto

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ syntax = "proto3";
44

55
package envoy.service.trace.v2;
66
option go_package = "v2";
7+
option java_generic_services = true;
78

89
import "envoy/api/v2/core/base.proto";
910
import "trace.proto";

0 commit comments

Comments
 (0)