Skip to content

api: add proto options for java #5369

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ggreenway merged 8 commits into from
Jan 2, 2019
Merged

api: add proto options for java #5369

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
1e82546
api: add proto options for java
dapengzhang0 Dec 20, 2018
b74551d
add ci for checking proto options
dapengzhang0 Dec 21, 2018
c12feff
Revert "add ci for checking proto options"
dapengzhang0 Dec 21, 2018
5000e4c
check_format for java proto options
dapengzhang0 Dec 21, 2018
59b795a
fix python format for check_format.py
dapengzhang0 Dec 21, 2018
5ca513c
Merge branch 'master' of https://github.com/envoyproxy/envoy into add…
dapengzhang0 Jan 2, 2019
5f7a826
more detailed error messages
dapengzhang0 Jan 2, 2019
88bc414
reformat check_format.py
dapengzhang0 Jan 2, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions api/envoy/admin/v2alpha/certs.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
syntax = "proto3";

package envoy.admin.v2alpha;
option java_package = "io.envoyproxy.envoy.admin.v2alpha";
option java_multiple_files = true;

import "google/protobuf/timestamp.proto";

Expand Down
2 changes: 2 additions & 0 deletions api/envoy/admin/v2alpha/clusters.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
syntax = "proto3";

package envoy.admin.v2alpha;
option java_package = "io.envoyproxy.envoy.admin.v2alpha";
option java_multiple_files = true;

import "envoy/admin/v2alpha/metrics.proto";
import "envoy/api/v2/core/address.proto";
Expand Down
2 changes: 2 additions & 0 deletions api/envoy/admin/v2alpha/config_dump.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
syntax = "proto3";

package envoy.admin.v2alpha;
option java_package = "io.envoyproxy.envoy.admin.v2alpha";
option java_multiple_files = true;

import "envoy/api/v2/cds.proto";
import "envoy/api/v2/lds.proto";
Expand Down
2 changes: 2 additions & 0 deletions api/envoy/admin/v2alpha/memory.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
syntax = "proto3";

package envoy.admin.v2alpha;
option java_package = "io.envoyproxy.envoy.admin.v2alpha";
option java_multiple_files = true;

// [#protodoc-title: Memory]

Expand Down
2 changes: 2 additions & 0 deletions api/envoy/admin/v2alpha/metrics.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
syntax = "proto3";

package envoy.admin.v2alpha;
option java_package = "io.envoyproxy.envoy.admin.v2alpha";
option java_multiple_files = true;

// [#protodoc-title: Metrics]

Expand Down
2 changes: 2 additions & 0 deletions api/envoy/admin/v2alpha/mutex_stats.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
syntax = "proto3";

package envoy.admin.v2alpha;
option java_package = "io.envoyproxy.envoy.admin.v2alpha";
option java_multiple_files = true;

// [#protodoc-title: MutexStats]

Expand Down
2 changes: 2 additions & 0 deletions api/envoy/admin/v2alpha/server_info.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
syntax = "proto3";

package envoy.admin.v2alpha;
option java_package = "io.envoyproxy.envoy.admin.v2alpha";
option java_multiple_files = true;

import "google/protobuf/duration.proto";

Expand Down
2 changes: 2 additions & 0 deletions api/envoy/api/v2/auth/cert.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
syntax = "proto3";

package envoy.api.v2.auth;
option java_package = "io.envoyproxy.envoy.api.v2.auth";
option java_multiple_files = true;
option go_package = "auth";

import "envoy/api/v2/core/base.proto";
Expand Down
2 changes: 2 additions & 0 deletions api/envoy/api/v2/cds.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
syntax = "proto3";

package envoy.api.v2;
option java_package = "io.envoyproxy.envoy.api.v2";
Copy link
Copy Markdown
Member

@htuch htuch Dec 24, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Out of curiosity, is there no way to have the Java protoc plugin take the organizational package prefix (in this case 'io.envoyproxy) as a CLI arguement and prefix it automatically? It seems this would be a common case thing to want to do.

option java_multiple_files = true;

option java_generic_services = true;

Expand Down
2 changes: 2 additions & 0 deletions api/envoy/api/v2/cluster/circuit_breaker.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
syntax = "proto3";

package envoy.api.v2.cluster;
option java_package = "io.envoyproxy.envoy.api.v2.cluster";
option java_multiple_files = true;
option go_package = "cluster";
option csharp_namespace = "Envoy.Api.V2.ClusterNS";

Expand Down
2 changes: 2 additions & 0 deletions api/envoy/api/v2/cluster/outlier_detection.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
syntax = "proto3";

package envoy.api.v2.cluster;
option java_package = "io.envoyproxy.envoy.api.v2.cluster";
option java_multiple_files = true;
option csharp_namespace = "Envoy.Api.V2.ClusterNS";

import "google/protobuf/duration.proto";
Expand Down
2 changes: 2 additions & 0 deletions api/envoy/api/v2/core/address.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
syntax = "proto3";

package envoy.api.v2.core;
option java_package = "io.envoyproxy.envoy.api.v2.core";
option java_multiple_files = true;

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

Expand Down
2 changes: 2 additions & 0 deletions api/envoy/api/v2/core/base.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
syntax = "proto3";

package envoy.api.v2.core;
option java_package = "io.envoyproxy.envoy.api.v2.core";
option java_multiple_files = true;
option go_package = "core";

import "google/protobuf/any.proto";
Expand Down
2 changes: 2 additions & 0 deletions api/envoy/api/v2/core/config_source.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
syntax = "proto3";

package envoy.api.v2.core;
option java_package = "io.envoyproxy.envoy.api.v2.core";
option java_multiple_files = true;

import "envoy/api/v2/core/grpc_service.proto";

Expand Down
2 changes: 2 additions & 0 deletions api/envoy/api/v2/core/grpc_service.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
syntax = "proto3";

package envoy.api.v2.core;
option java_package = "io.envoyproxy.envoy.api.v2.core";
option java_multiple_files = true;

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

Expand Down
2 changes: 2 additions & 0 deletions api/envoy/api/v2/core/health_check.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
syntax = "proto3";

package envoy.api.v2.core;
option java_package = "io.envoyproxy.envoy.api.v2.core";
option java_multiple_files = true;

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

Expand Down
2 changes: 2 additions & 0 deletions api/envoy/api/v2/core/http_uri.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
syntax = "proto3";

package envoy.api.v2.core;
option java_package = "io.envoyproxy.envoy.api.v2.core";
option java_multiple_files = true;

import "google/protobuf/duration.proto";
import "gogoproto/gogo.proto";
Expand Down
2 changes: 2 additions & 0 deletions api/envoy/api/v2/core/protocol.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
syntax = "proto3";

package envoy.api.v2.core;
option java_package = "io.envoyproxy.envoy.api.v2.core";
option java_multiple_files = true;

import "google/protobuf/duration.proto";
import "google/protobuf/wrappers.proto";
Expand Down
2 changes: 2 additions & 0 deletions api/envoy/api/v2/discovery.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
syntax = "proto3";

package envoy.api.v2;
option java_package = "io.envoyproxy.envoy.api.v2";
option java_multiple_files = true;
option go_package = "v2";

import "envoy/api/v2/core/base.proto";
Expand Down
2 changes: 2 additions & 0 deletions api/envoy/api/v2/eds.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
syntax = "proto3";

package envoy.api.v2;
option java_package = "io.envoyproxy.envoy.api.v2";
option java_multiple_files = true;

option java_generic_services = true;

Expand Down
2 changes: 2 additions & 0 deletions api/envoy/api/v2/endpoint/endpoint.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
syntax = "proto3";

package envoy.api.v2.endpoint;
option java_package = "io.envoyproxy.envoy.api.v2.endpoint";
option java_multiple_files = true;
option go_package = "endpoint";

import "envoy/api/v2/core/address.proto";
Expand Down
2 changes: 2 additions & 0 deletions api/envoy/api/v2/endpoint/load_report.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
syntax = "proto3";

package envoy.api.v2.endpoint;
option java_package = "io.envoyproxy.envoy.api.v2.endpoint";
option java_multiple_files = true;

import "envoy/api/v2/core/address.proto";
import "envoy/api/v2/core/base.proto";
Expand Down
2 changes: 2 additions & 0 deletions api/envoy/api/v2/lds.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
syntax = "proto3";

package envoy.api.v2;
option java_package = "io.envoyproxy.envoy.api.v2";
option java_multiple_files = true;

option java_generic_services = true;

Expand Down
2 changes: 2 additions & 0 deletions api/envoy/api/v2/listener/listener.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
syntax = "proto3";

package envoy.api.v2.listener;
option java_package = "io.envoyproxy.envoy.api.v2.listener";
option java_multiple_files = true;
option go_package = "listener";
option csharp_namespace = "Envoy.Api.V2.ListenerNS";

Expand Down
2 changes: 2 additions & 0 deletions api/envoy/api/v2/ratelimit/ratelimit.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
syntax = "proto3";

package envoy.api.v2.ratelimit;
option java_package = "io.envoyproxy.envoy.api.v2.ratelimit";
option java_multiple_files = true;
option go_package = "ratelimit";

import "validate/validate.proto";
Expand Down
2 changes: 2 additions & 0 deletions api/envoy/api/v2/rds.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
syntax = "proto3";

package envoy.api.v2;
option java_package = "io.envoyproxy.envoy.api.v2";
option java_multiple_files = true;

option java_generic_services = true;

Expand Down
2 changes: 2 additions & 0 deletions api/envoy/api/v2/route/route.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
syntax = "proto3";

package envoy.api.v2.route;
option java_package = "io.envoyproxy.envoy.api.v2.route";
option java_multiple_files = true;
option go_package = "route";
option java_generic_services = true;

Expand Down
2 changes: 2 additions & 0 deletions api/envoy/config/accesslog/v2/als.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
syntax = "proto3";

package envoy.config.accesslog.v2;
option java_package = "io.envoyproxy.envoy.config.accesslog.v2";
option java_multiple_files = true;
option go_package = "v2";

import "envoy/api/v2/core/grpc_service.proto";
Expand Down
2 changes: 2 additions & 0 deletions api/envoy/config/accesslog/v2/file.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
syntax = "proto3";

package envoy.config.accesslog.v2;
option java_package = "io.envoyproxy.envoy.config.accesslog.v2";
option java_multiple_files = true;
option go_package = "v2";

import "validate/validate.proto";
Expand Down
2 changes: 2 additions & 0 deletions api/envoy/config/bootstrap/v2/bootstrap.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
syntax = "proto3";

package envoy.config.bootstrap.v2;
option java_package = "io.envoyproxy.envoy.config.bootstrap.v2";
option java_multiple_files = true;
option go_package = "v2";

import "envoy/api/v2/core/address.proto";
Expand Down
2 changes: 2 additions & 0 deletions api/envoy/config/filter/accesslog/v2/accesslog.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
syntax = "proto3";

package envoy.config.filter.accesslog.v2;
option java_package = "io.envoyproxy.envoy.config.filter.accesslog.v2";
option java_multiple_files = true;
option go_package = "v2";

import "envoy/api/v2/core/base.proto";
Expand Down
2 changes: 2 additions & 0 deletions api/envoy/config/filter/fault/v2/fault.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
syntax = "proto3";

package envoy.config.filter.fault.v2;
option java_package = "io.envoyproxy.envoy.config.filter.fault.v2";
option java_multiple_files = true;
option go_package = "v2";

import "envoy/type/percent.proto";
Expand Down
2 changes: 2 additions & 0 deletions api/envoy/config/filter/http/buffer/v2/buffer.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
syntax = "proto3";

package envoy.config.filter.http.buffer.v2;
option java_package = "io.envoyproxy.envoy.config.filter.http.buffer.v2";
option java_multiple_files = true;
option go_package = "v2";

import "google/protobuf/duration.proto";
Expand Down
2 changes: 2 additions & 0 deletions api/envoy/config/filter/http/ext_authz/v2alpha/ext_authz.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
syntax = "proto3";

package envoy.config.filter.http.ext_authz.v2alpha;
option java_package = "io.envoyproxy.envoy.config.filter.http.ext_authz.v2alpha";
option java_multiple_files = true;
option go_package = "v2alpha";

import "envoy/api/v2/core/base.proto";
Expand Down
2 changes: 2 additions & 0 deletions api/envoy/config/filter/http/fault/v2/fault.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
syntax = "proto3";

package envoy.config.filter.http.fault.v2;
option java_package = "io.envoyproxy.envoy.config.filter.http.fault.v2";
option java_multiple_files = true;
option go_package = "v2";

import "envoy/api/v2/route/route.proto";
Expand Down
2 changes: 2 additions & 0 deletions api/envoy/config/filter/http/gzip/v2/gzip.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
syntax = "proto3";

package envoy.config.filter.http.gzip.v2;
option java_package = "io.envoyproxy.envoy.config.filter.http.gzip.v2";
option java_multiple_files = true;
option go_package = "v2";

import "google/protobuf/wrappers.proto";
Expand Down
2 changes: 2 additions & 0 deletions api/envoy/config/filter/http/header_to_metadata/v2/header_to_metadata.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
syntax = "proto3";

package envoy.config.filter.http.header_to_metadata.v2;
option java_package = "io.envoyproxy.envoy.config.filter.http.header_to_metadata.v2";
option java_multiple_files = true;
option go_package = "v2";

import "validate/validate.proto";
Expand Down
2 changes: 2 additions & 0 deletions api/envoy/config/filter/http/health_check/v2/health_check.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
syntax = "proto3";

package envoy.config.filter.http.health_check.v2;
option java_package = "io.envoyproxy.envoy.config.filter.http.health_check.v2";
option java_multiple_files = true;
option go_package = "v2";

import "google/protobuf/duration.proto";
Expand Down
2 changes: 2 additions & 0 deletions api/envoy/config/filter/http/ip_tagging/v2/ip_tagging.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
syntax = "proto3";

package envoy.config.filter.http.ip_tagging.v2;
option java_package = "io.envoyproxy.envoy.config.filter.http.ip_tagging.v2";
option java_multiple_files = true;
option go_package = "v2";

import "envoy/api/v2/core/address.proto";
Expand Down
2 changes: 2 additions & 0 deletions api/envoy/config/filter/http/jwt_authn/v2alpha/config.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
syntax = "proto3";

package envoy.config.filter.http.jwt_authn.v2alpha;
option java_package = "io.envoyproxy.envoy.config.filter.http.jwt_authn.v2alpha";
option java_multiple_files = true;

import "envoy/api/v2/core/base.proto";
import "envoy/api/v2/core/http_uri.proto";
Expand Down
2 changes: 2 additions & 0 deletions api/envoy/config/filter/http/lua/v2/lua.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
syntax = "proto3";

package envoy.config.filter.http.lua.v2;
option java_package = "io.envoyproxy.envoy.config.filter.http.lua.v2";
option java_multiple_files = true;
option go_package = "v2";

import "validate/validate.proto";
Expand Down
2 changes: 2 additions & 0 deletions api/envoy/config/filter/http/rate_limit/v2/rate_limit.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
syntax = "proto3";

package envoy.config.filter.http.rate_limit.v2;
option java_package = "io.envoyproxy.envoy.config.filter.http.rate_limit.v2";
option java_multiple_files = true;
option go_package = "v2";

import "envoy/config/ratelimit/v2/rls.proto";
Expand Down
2 changes: 2 additions & 0 deletions api/envoy/config/filter/http/rbac/v2/rbac.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
syntax = "proto3";

package envoy.config.filter.http.rbac.v2;
option java_package = "io.envoyproxy.envoy.config.filter.http.rbac.v2";
option java_multiple_files = true;
option go_package = "v2";

import "envoy/config/rbac/v2alpha/rbac.proto";
Expand Down
2 changes: 2 additions & 0 deletions api/envoy/config/filter/http/router/v2/router.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
syntax = "proto3";

package envoy.config.filter.http.router.v2;
option java_package = "io.envoyproxy.envoy.config.filter.http.router.v2";
option java_multiple_files = true;
option go_package = "v2";

import "envoy/config/filter/accesslog/v2/accesslog.proto";
Expand Down
Loading