diff --git a/api/envoy/admin/v2alpha/certs.proto b/api/envoy/admin/v2alpha/certs.proto index ffcd069545399..bb8d173b97d43 100644 --- a/api/envoy/admin/v2alpha/certs.proto +++ b/api/envoy/admin/v2alpha/certs.proto @@ -2,7 +2,6 @@ syntax = "proto3"; package envoy.admin.v2alpha; option java_package = "io.envoyproxy.envoy.admin.v2alpha"; -option java_multiple_files = true; import "google/protobuf/timestamp.proto"; diff --git a/api/envoy/admin/v2alpha/clusters.proto b/api/envoy/admin/v2alpha/clusters.proto index b41d97335aaa7..68e3cb363df05 100644 --- a/api/envoy/admin/v2alpha/clusters.proto +++ b/api/envoy/admin/v2alpha/clusters.proto @@ -2,7 +2,6 @@ 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"; diff --git a/api/envoy/admin/v2alpha/config_dump.proto b/api/envoy/admin/v2alpha/config_dump.proto index f02acaffe5d57..0cb1ad21e11ca 100644 --- a/api/envoy/admin/v2alpha/config_dump.proto +++ b/api/envoy/admin/v2alpha/config_dump.proto @@ -2,7 +2,6 @@ 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"; diff --git a/api/envoy/admin/v2alpha/memory.proto b/api/envoy/admin/v2alpha/memory.proto index 556af7348764d..3e83811a75c4c 100644 --- a/api/envoy/admin/v2alpha/memory.proto +++ b/api/envoy/admin/v2alpha/memory.proto @@ -2,7 +2,6 @@ syntax = "proto3"; package envoy.admin.v2alpha; option java_package = "io.envoyproxy.envoy.admin.v2alpha"; -option java_multiple_files = true; // [#protodoc-title: Memory] diff --git a/api/envoy/admin/v2alpha/metrics.proto b/api/envoy/admin/v2alpha/metrics.proto index 936ef2181249d..f2a90b0bca0be 100644 --- a/api/envoy/admin/v2alpha/metrics.proto +++ b/api/envoy/admin/v2alpha/metrics.proto @@ -2,7 +2,6 @@ syntax = "proto3"; package envoy.admin.v2alpha; option java_package = "io.envoyproxy.envoy.admin.v2alpha"; -option java_multiple_files = true; // [#protodoc-title: Metrics] diff --git a/api/envoy/admin/v2alpha/mutex_stats.proto b/api/envoy/admin/v2alpha/mutex_stats.proto index 6b6b584513cfc..65f121cce398c 100644 --- a/api/envoy/admin/v2alpha/mutex_stats.proto +++ b/api/envoy/admin/v2alpha/mutex_stats.proto @@ -2,7 +2,6 @@ syntax = "proto3"; package envoy.admin.v2alpha; option java_package = "io.envoyproxy.envoy.admin.v2alpha"; -option java_multiple_files = true; // [#protodoc-title: MutexStats] diff --git a/api/envoy/admin/v2alpha/server_info.proto b/api/envoy/admin/v2alpha/server_info.proto index 51595efefc2f5..3feb5952b83a5 100644 --- a/api/envoy/admin/v2alpha/server_info.proto +++ b/api/envoy/admin/v2alpha/server_info.proto @@ -2,7 +2,6 @@ syntax = "proto3"; package envoy.admin.v2alpha; option java_package = "io.envoyproxy.envoy.admin.v2alpha"; -option java_multiple_files = true; import "google/protobuf/duration.proto"; diff --git a/api/envoy/api/v2/auth/cert.proto b/api/envoy/api/v2/auth/cert.proto index dd71da5cc5671..778c8c17ba0d0 100644 --- a/api/envoy/api/v2/auth/cert.proto +++ b/api/envoy/api/v2/auth/cert.proto @@ -2,7 +2,6 @@ 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"; diff --git a/api/envoy/api/v2/cds.proto b/api/envoy/api/v2/cds.proto index 840fd4cc0fa61..71d48e28bf9b9 100644 --- a/api/envoy/api/v2/cds.proto +++ b/api/envoy/api/v2/cds.proto @@ -2,7 +2,6 @@ syntax = "proto3"; package envoy.api.v2; option java_package = "io.envoyproxy.envoy.api.v2"; -option java_multiple_files = true; option java_generic_services = true; diff --git a/api/envoy/api/v2/cluster/circuit_breaker.proto b/api/envoy/api/v2/cluster/circuit_breaker.proto index 0571f90eec9be..a1193cc6b61f5 100644 --- a/api/envoy/api/v2/cluster/circuit_breaker.proto +++ b/api/envoy/api/v2/cluster/circuit_breaker.proto @@ -2,7 +2,6 @@ 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"; diff --git a/api/envoy/api/v2/cluster/outlier_detection.proto b/api/envoy/api/v2/cluster/outlier_detection.proto index c4fb9e8154640..dd373c2e29471 100644 --- a/api/envoy/api/v2/cluster/outlier_detection.proto +++ b/api/envoy/api/v2/cluster/outlier_detection.proto @@ -2,7 +2,6 @@ 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"; diff --git a/api/envoy/api/v2/core/address.proto b/api/envoy/api/v2/core/address.proto index 009def943d94b..44fdd8656c37a 100644 --- a/api/envoy/api/v2/core/address.proto +++ b/api/envoy/api/v2/core/address.proto @@ -2,7 +2,6 @@ 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"; diff --git a/api/envoy/api/v2/core/base.proto b/api/envoy/api/v2/core/base.proto index e764df9c487a0..23f525096c9b8 100644 --- a/api/envoy/api/v2/core/base.proto +++ b/api/envoy/api/v2/core/base.proto @@ -2,7 +2,6 @@ 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"; diff --git a/api/envoy/api/v2/core/config_source.proto b/api/envoy/api/v2/core/config_source.proto index 01194eb753db0..5f47da177ba98 100644 --- a/api/envoy/api/v2/core/config_source.proto +++ b/api/envoy/api/v2/core/config_source.proto @@ -2,7 +2,6 @@ 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"; diff --git a/api/envoy/api/v2/core/grpc_service.proto b/api/envoy/api/v2/core/grpc_service.proto index 923a9313a3e16..08672849ce69c 100644 --- a/api/envoy/api/v2/core/grpc_service.proto +++ b/api/envoy/api/v2/core/grpc_service.proto @@ -2,7 +2,6 @@ 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"; diff --git a/api/envoy/api/v2/core/health_check.proto b/api/envoy/api/v2/core/health_check.proto index 24082c1f0253e..9f4ca602950ee 100644 --- a/api/envoy/api/v2/core/health_check.proto +++ b/api/envoy/api/v2/core/health_check.proto @@ -2,7 +2,6 @@ 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"; diff --git a/api/envoy/api/v2/core/http_uri.proto b/api/envoy/api/v2/core/http_uri.proto index 5b48bdd5ed075..c0a007e10ee7e 100644 --- a/api/envoy/api/v2/core/http_uri.proto +++ b/api/envoy/api/v2/core/http_uri.proto @@ -2,7 +2,6 @@ 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"; diff --git a/api/envoy/api/v2/core/protocol.proto b/api/envoy/api/v2/core/protocol.proto index e8ddf0e7f1db2..69bddec072a5d 100644 --- a/api/envoy/api/v2/core/protocol.proto +++ b/api/envoy/api/v2/core/protocol.proto @@ -4,7 +4,6 @@ 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"; diff --git a/api/envoy/api/v2/discovery.proto b/api/envoy/api/v2/discovery.proto index 85fa34b90895a..aed7a5d03466e 100644 --- a/api/envoy/api/v2/discovery.proto +++ b/api/envoy/api/v2/discovery.proto @@ -2,7 +2,6 @@ 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"; diff --git a/api/envoy/api/v2/eds.proto b/api/envoy/api/v2/eds.proto index a4c1cc657f79b..afb932190d35b 100644 --- a/api/envoy/api/v2/eds.proto +++ b/api/envoy/api/v2/eds.proto @@ -2,7 +2,6 @@ syntax = "proto3"; package envoy.api.v2; option java_package = "io.envoyproxy.envoy.api.v2"; -option java_multiple_files = true; option java_generic_services = true; diff --git a/api/envoy/api/v2/endpoint/endpoint.proto b/api/envoy/api/v2/endpoint/endpoint.proto index 749dbe487ac63..b8e67ce5e5a38 100644 --- a/api/envoy/api/v2/endpoint/endpoint.proto +++ b/api/envoy/api/v2/endpoint/endpoint.proto @@ -2,7 +2,6 @@ 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"; diff --git a/api/envoy/api/v2/endpoint/load_report.proto b/api/envoy/api/v2/endpoint/load_report.proto index 832e8504dbbfe..cbb01d3271897 100644 --- a/api/envoy/api/v2/endpoint/load_report.proto +++ b/api/envoy/api/v2/endpoint/load_report.proto @@ -2,7 +2,6 @@ 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"; diff --git a/api/envoy/api/v2/lds.proto b/api/envoy/api/v2/lds.proto index d05e37e5b080a..7327022820e89 100644 --- a/api/envoy/api/v2/lds.proto +++ b/api/envoy/api/v2/lds.proto @@ -2,7 +2,6 @@ syntax = "proto3"; package envoy.api.v2; option java_package = "io.envoyproxy.envoy.api.v2"; -option java_multiple_files = true; option java_generic_services = true; diff --git a/api/envoy/api/v2/listener/listener.proto b/api/envoy/api/v2/listener/listener.proto index 6824de9631c9b..c919531c0f83e 100644 --- a/api/envoy/api/v2/listener/listener.proto +++ b/api/envoy/api/v2/listener/listener.proto @@ -2,7 +2,6 @@ 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"; diff --git a/api/envoy/api/v2/ratelimit/ratelimit.proto b/api/envoy/api/v2/ratelimit/ratelimit.proto index e60172d23a5dd..78bdc9c86463b 100644 --- a/api/envoy/api/v2/ratelimit/ratelimit.proto +++ b/api/envoy/api/v2/ratelimit/ratelimit.proto @@ -2,7 +2,6 @@ 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"; diff --git a/api/envoy/api/v2/rds.proto b/api/envoy/api/v2/rds.proto index 3671f359ba2c9..9699accf95ce2 100644 --- a/api/envoy/api/v2/rds.proto +++ b/api/envoy/api/v2/rds.proto @@ -2,7 +2,6 @@ syntax = "proto3"; package envoy.api.v2; option java_package = "io.envoyproxy.envoy.api.v2"; -option java_multiple_files = true; option java_generic_services = true; diff --git a/api/envoy/api/v2/route/route.proto b/api/envoy/api/v2/route/route.proto index 884bdfc62d30b..1075d9d74d250 100644 --- a/api/envoy/api/v2/route/route.proto +++ b/api/envoy/api/v2/route/route.proto @@ -2,7 +2,6 @@ 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; diff --git a/api/envoy/config/accesslog/v2/als.proto b/api/envoy/config/accesslog/v2/als.proto index 0c51d123cf4d4..fdc5fa12c8f50 100644 --- a/api/envoy/config/accesslog/v2/als.proto +++ b/api/envoy/config/accesslog/v2/als.proto @@ -2,7 +2,6 @@ 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"; diff --git a/api/envoy/config/accesslog/v2/file.proto b/api/envoy/config/accesslog/v2/file.proto index bd22ef2e92dfb..fb5bddcebdae6 100644 --- a/api/envoy/config/accesslog/v2/file.proto +++ b/api/envoy/config/accesslog/v2/file.proto @@ -2,7 +2,6 @@ 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"; diff --git a/api/envoy/config/bootstrap/v2/bootstrap.proto b/api/envoy/config/bootstrap/v2/bootstrap.proto index 13a88b95a1765..f6f883b822521 100644 --- a/api/envoy/config/bootstrap/v2/bootstrap.proto +++ b/api/envoy/config/bootstrap/v2/bootstrap.proto @@ -7,7 +7,6 @@ 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"; diff --git a/api/envoy/config/filter/accesslog/v2/accesslog.proto b/api/envoy/config/filter/accesslog/v2/accesslog.proto index 0ec539d1d66cd..c85f06efa3e1b 100644 --- a/api/envoy/config/filter/accesslog/v2/accesslog.proto +++ b/api/envoy/config/filter/accesslog/v2/accesslog.proto @@ -2,7 +2,6 @@ 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"; diff --git a/api/envoy/config/filter/fault/v2/fault.proto b/api/envoy/config/filter/fault/v2/fault.proto index 15eefbed79a08..8462a2f95c5d7 100644 --- a/api/envoy/config/filter/fault/v2/fault.proto +++ b/api/envoy/config/filter/fault/v2/fault.proto @@ -2,7 +2,6 @@ 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"; diff --git a/api/envoy/config/filter/http/buffer/v2/buffer.proto b/api/envoy/config/filter/http/buffer/v2/buffer.proto index c27e0ff3ec99a..fce389c68b0c2 100644 --- a/api/envoy/config/filter/http/buffer/v2/buffer.proto +++ b/api/envoy/config/filter/http/buffer/v2/buffer.proto @@ -2,7 +2,6 @@ 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"; diff --git a/api/envoy/config/filter/http/ext_authz/v2alpha/ext_authz.proto b/api/envoy/config/filter/http/ext_authz/v2alpha/ext_authz.proto index 50d5e9390bfbb..d9d476a904f43 100644 --- a/api/envoy/config/filter/http/ext_authz/v2alpha/ext_authz.proto +++ b/api/envoy/config/filter/http/ext_authz/v2alpha/ext_authz.proto @@ -2,7 +2,6 @@ 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"; diff --git a/api/envoy/config/filter/http/fault/v2/fault.proto b/api/envoy/config/filter/http/fault/v2/fault.proto index e1e24e6f9dd6a..134a5424cee14 100644 --- a/api/envoy/config/filter/http/fault/v2/fault.proto +++ b/api/envoy/config/filter/http/fault/v2/fault.proto @@ -2,7 +2,6 @@ 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"; diff --git a/api/envoy/config/filter/http/grpc_http1_reverse_bridge/v2alpha1/config.proto b/api/envoy/config/filter/http/grpc_http1_reverse_bridge/v2alpha1/config.proto index 5906ce57b7e01..5b236fff4f30f 100644 --- a/api/envoy/config/filter/http/grpc_http1_reverse_bridge/v2alpha1/config.proto +++ b/api/envoy/config/filter/http/grpc_http1_reverse_bridge/v2alpha1/config.proto @@ -2,7 +2,6 @@ syntax = "proto3"; package envoy.extensions.filter.http.grpc_http1_reverse_bridge.v2alpha1; option java_package = "io.envoyproxy.envoy.extensions.filter.http.grpc_http1_reverse_bridge.v2alpha1"; -option java_multiple_files = true; option go_package = "v2"; import "validate/validate.proto"; diff --git a/api/envoy/config/filter/http/gzip/v2/gzip.proto b/api/envoy/config/filter/http/gzip/v2/gzip.proto index 63216c54db588..e6609f171f34d 100644 --- a/api/envoy/config/filter/http/gzip/v2/gzip.proto +++ b/api/envoy/config/filter/http/gzip/v2/gzip.proto @@ -2,7 +2,6 @@ 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"; diff --git a/api/envoy/config/filter/http/header_to_metadata/v2/header_to_metadata.proto b/api/envoy/config/filter/http/header_to_metadata/v2/header_to_metadata.proto index 2adaa8dc7ec9a..af9a4d0cf0c3b 100644 --- a/api/envoy/config/filter/http/header_to_metadata/v2/header_to_metadata.proto +++ b/api/envoy/config/filter/http/header_to_metadata/v2/header_to_metadata.proto @@ -2,7 +2,6 @@ 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"; diff --git a/api/envoy/config/filter/http/health_check/v2/health_check.proto b/api/envoy/config/filter/http/health_check/v2/health_check.proto index c3c8290d90bca..5cb6a9d37265b 100644 --- a/api/envoy/config/filter/http/health_check/v2/health_check.proto +++ b/api/envoy/config/filter/http/health_check/v2/health_check.proto @@ -2,7 +2,6 @@ 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"; diff --git a/api/envoy/config/filter/http/ip_tagging/v2/ip_tagging.proto b/api/envoy/config/filter/http/ip_tagging/v2/ip_tagging.proto index a8d86d71dd463..aba17986ab739 100644 --- a/api/envoy/config/filter/http/ip_tagging/v2/ip_tagging.proto +++ b/api/envoy/config/filter/http/ip_tagging/v2/ip_tagging.proto @@ -2,7 +2,6 @@ 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"; diff --git a/api/envoy/config/filter/http/jwt_authn/v2alpha/config.proto b/api/envoy/config/filter/http/jwt_authn/v2alpha/config.proto index 1a52ae1ccf982..b585cb6dbde0b 100644 --- a/api/envoy/config/filter/http/jwt_authn/v2alpha/config.proto +++ b/api/envoy/config/filter/http/jwt_authn/v2alpha/config.proto @@ -3,7 +3,6 @@ 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"; diff --git a/api/envoy/config/filter/http/lua/v2/lua.proto b/api/envoy/config/filter/http/lua/v2/lua.proto index 3c0887b3dcd83..a2bbb3fc7c951 100644 --- a/api/envoy/config/filter/http/lua/v2/lua.proto +++ b/api/envoy/config/filter/http/lua/v2/lua.proto @@ -2,7 +2,6 @@ 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"; diff --git a/api/envoy/config/filter/http/rate_limit/v2/rate_limit.proto b/api/envoy/config/filter/http/rate_limit/v2/rate_limit.proto index a1cfabbfa63ef..f153e59bfc143 100644 --- a/api/envoy/config/filter/http/rate_limit/v2/rate_limit.proto +++ b/api/envoy/config/filter/http/rate_limit/v2/rate_limit.proto @@ -2,7 +2,6 @@ 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"; diff --git a/api/envoy/config/filter/http/rbac/v2/rbac.proto b/api/envoy/config/filter/http/rbac/v2/rbac.proto index 847372edf1a4a..82f92f6ef221e 100644 --- a/api/envoy/config/filter/http/rbac/v2/rbac.proto +++ b/api/envoy/config/filter/http/rbac/v2/rbac.proto @@ -2,7 +2,6 @@ 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"; diff --git a/api/envoy/config/filter/http/router/v2/router.proto b/api/envoy/config/filter/http/router/v2/router.proto index b8a394c4a0d08..b23624271dc28 100644 --- a/api/envoy/config/filter/http/router/v2/router.proto +++ b/api/envoy/config/filter/http/router/v2/router.proto @@ -2,7 +2,6 @@ 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"; diff --git a/api/envoy/config/filter/http/squash/v2/squash.proto b/api/envoy/config/filter/http/squash/v2/squash.proto index 472cc9331fcc2..f3bdd9d2e0679 100644 --- a/api/envoy/config/filter/http/squash/v2/squash.proto +++ b/api/envoy/config/filter/http/squash/v2/squash.proto @@ -2,7 +2,6 @@ syntax = "proto3"; package envoy.config.filter.http.squash.v2; option java_package = "io.envoyproxy.envoy.config.filter.http.squash.v2"; -option java_multiple_files = true; option go_package = "v2"; import "google/protobuf/duration.proto"; diff --git a/api/envoy/config/filter/http/transcoder/v2/transcoder.proto b/api/envoy/config/filter/http/transcoder/v2/transcoder.proto index 342a8b5c129d7..ccb455ac2168c 100644 --- a/api/envoy/config/filter/http/transcoder/v2/transcoder.proto +++ b/api/envoy/config/filter/http/transcoder/v2/transcoder.proto @@ -2,7 +2,6 @@ syntax = "proto3"; package envoy.config.filter.http.transcoder.v2; option java_package = "io.envoyproxy.envoy.config.filter.http.transcoder.v2"; -option java_multiple_files = true; option go_package = "v2"; import "validate/validate.proto"; diff --git a/api/envoy/config/filter/listener/original_src/v2alpha1/original_src.proto b/api/envoy/config/filter/listener/original_src/v2alpha1/original_src.proto index 8725ef500b2a7..644cf222b8256 100644 --- a/api/envoy/config/filter/listener/original_src/v2alpha1/original_src.proto +++ b/api/envoy/config/filter/listener/original_src/v2alpha1/original_src.proto @@ -2,7 +2,6 @@ syntax = "proto3"; package envoy.config.filter.listener.original_src.v2alpha1; option java_package = "io.envoyproxy.envoy.config.filter.listener.original_src.v2alpha1"; -option java_multiple_files = true; option go_package = "v2alpha1"; diff --git a/api/envoy/config/filter/network/client_ssl_auth/v2/client_ssl_auth.proto b/api/envoy/config/filter/network/client_ssl_auth/v2/client_ssl_auth.proto index 7a3a5487d1778..30bf9910fed64 100644 --- a/api/envoy/config/filter/network/client_ssl_auth/v2/client_ssl_auth.proto +++ b/api/envoy/config/filter/network/client_ssl_auth/v2/client_ssl_auth.proto @@ -2,7 +2,6 @@ syntax = "proto3"; package envoy.config.filter.network.client_ssl_auth.v2; option java_package = "io.envoyproxy.envoy.config.filter.network.client_ssl_auth.v2"; -option java_multiple_files = true; option go_package = "v2"; import "envoy/api/v2/core/address.proto"; diff --git a/api/envoy/config/filter/network/dubbo_proxy/v2alpha1/dubbo_proxy.proto b/api/envoy/config/filter/network/dubbo_proxy/v2alpha1/dubbo_proxy.proto index ea98392af9c0d..fd7a02009084a 100644 --- a/api/envoy/config/filter/network/dubbo_proxy/v2alpha1/dubbo_proxy.proto +++ b/api/envoy/config/filter/network/dubbo_proxy/v2alpha1/dubbo_proxy.proto @@ -2,7 +2,6 @@ syntax = "proto3"; package envoy.extensions.filters.network.dubbo_proxy.v2alpha1; option java_package = "io.envoyproxy.envoy.extensions.filters.network.dubbo_proxy.v2alpha1"; -option java_multiple_files = true; option go_package = "v2"; import "validate/validate.proto"; diff --git a/api/envoy/config/filter/network/ext_authz/v2/ext_authz.proto b/api/envoy/config/filter/network/ext_authz/v2/ext_authz.proto index 8bfd00df22d50..0b0346c509c18 100644 --- a/api/envoy/config/filter/network/ext_authz/v2/ext_authz.proto +++ b/api/envoy/config/filter/network/ext_authz/v2/ext_authz.proto @@ -2,7 +2,6 @@ syntax = "proto3"; package envoy.config.filter.network.ext_authz.v2; option java_package = "io.envoyproxy.envoy.config.filter.network.ext_authz.v2"; -option java_multiple_files = true; option go_package = "v2"; import "envoy/api/v2/core/grpc_service.proto"; diff --git a/api/envoy/config/filter/network/http_connection_manager/v2/http_connection_manager.proto b/api/envoy/config/filter/network/http_connection_manager/v2/http_connection_manager.proto index b6da80c647327..4357ee115c5dd 100644 --- a/api/envoy/config/filter/network/http_connection_manager/v2/http_connection_manager.proto +++ b/api/envoy/config/filter/network/http_connection_manager/v2/http_connection_manager.proto @@ -2,7 +2,6 @@ syntax = "proto3"; package envoy.config.filter.network.http_connection_manager.v2; option java_package = "io.envoyproxy.envoy.config.filter.network.http_connection_manager.v2"; -option java_multiple_files = true; option go_package = "v2"; import "envoy/api/v2/core/config_source.proto"; diff --git a/api/envoy/config/filter/network/mongo_proxy/v2/mongo_proxy.proto b/api/envoy/config/filter/network/mongo_proxy/v2/mongo_proxy.proto index c7756e47fc28a..1149a53ba0115 100644 --- a/api/envoy/config/filter/network/mongo_proxy/v2/mongo_proxy.proto +++ b/api/envoy/config/filter/network/mongo_proxy/v2/mongo_proxy.proto @@ -2,7 +2,6 @@ syntax = "proto3"; package envoy.config.filter.network.mongo_proxy.v2; option java_package = "io.envoyproxy.envoy.config.filter.network.mongo_proxy.v2"; -option java_multiple_files = true; option go_package = "v2"; import "envoy/config/filter/fault/v2/fault.proto"; diff --git a/api/envoy/config/filter/network/mysql_proxy/v1alpha1/mysql_proxy.proto b/api/envoy/config/filter/network/mysql_proxy/v1alpha1/mysql_proxy.proto index b43c176de787d..3f107057dc02f 100644 --- a/api/envoy/config/filter/network/mysql_proxy/v1alpha1/mysql_proxy.proto +++ b/api/envoy/config/filter/network/mysql_proxy/v1alpha1/mysql_proxy.proto @@ -2,7 +2,6 @@ syntax = "proto3"; package envoy.config.filter.network.mysql_proxy.v1alpha1; option java_package = "io.envoyproxy.envoy.config.filter.network.mysql_proxy.v1alpha1"; -option java_multiple_files = true; option go_package = "v1alpha1"; import "validate/validate.proto"; diff --git a/api/envoy/config/filter/network/rate_limit/v2/rate_limit.proto b/api/envoy/config/filter/network/rate_limit/v2/rate_limit.proto index cb390c1641728..9a89081bf98eb 100644 --- a/api/envoy/config/filter/network/rate_limit/v2/rate_limit.proto +++ b/api/envoy/config/filter/network/rate_limit/v2/rate_limit.proto @@ -2,7 +2,6 @@ syntax = "proto3"; package envoy.config.filter.network.rate_limit.v2; option java_package = "io.envoyproxy.envoy.config.filter.network.rate_limit.v2"; -option java_multiple_files = true; option go_package = "v2"; import "envoy/api/v2/ratelimit/ratelimit.proto"; diff --git a/api/envoy/config/filter/network/rbac/v2/rbac.proto b/api/envoy/config/filter/network/rbac/v2/rbac.proto index 171c17bcf5ab2..4441d5e4ebadc 100644 --- a/api/envoy/config/filter/network/rbac/v2/rbac.proto +++ b/api/envoy/config/filter/network/rbac/v2/rbac.proto @@ -2,7 +2,6 @@ syntax = "proto3"; package envoy.config.filter.network.rbac.v2; option java_package = "io.envoyproxy.envoy.config.filter.network.rbac.v2"; -option java_multiple_files = true; option go_package = "v2"; import "envoy/config/rbac/v2alpha/rbac.proto"; diff --git a/api/envoy/config/filter/network/redis_proxy/v2/redis_proxy.proto b/api/envoy/config/filter/network/redis_proxy/v2/redis_proxy.proto index 367999b336637..a7847be18dd4e 100644 --- a/api/envoy/config/filter/network/redis_proxy/v2/redis_proxy.proto +++ b/api/envoy/config/filter/network/redis_proxy/v2/redis_proxy.proto @@ -2,7 +2,6 @@ syntax = "proto3"; package envoy.config.filter.network.redis_proxy.v2; option java_package = "io.envoyproxy.envoy.config.filter.network.redis_proxy.v2"; -option java_multiple_files = true; option go_package = "v2"; import "google/protobuf/duration.proto"; diff --git a/api/envoy/config/filter/network/tcp_proxy/v2/tcp_proxy.proto b/api/envoy/config/filter/network/tcp_proxy/v2/tcp_proxy.proto index 0cb8c179d0dbb..4e1da6f321249 100644 --- a/api/envoy/config/filter/network/tcp_proxy/v2/tcp_proxy.proto +++ b/api/envoy/config/filter/network/tcp_proxy/v2/tcp_proxy.proto @@ -2,7 +2,6 @@ syntax = "proto3"; package envoy.config.filter.network.tcp_proxy.v2; option java_package = "io.envoyproxy.envoy.config.filter.network.tcp_proxy.v2"; -option java_multiple_files = true; option go_package = "v2"; import "envoy/config/filter/accesslog/v2/accesslog.proto"; diff --git a/api/envoy/config/filter/network/thrift_proxy/v2alpha1/route.proto b/api/envoy/config/filter/network/thrift_proxy/v2alpha1/route.proto index 2936f19996ae8..f1d4b457b42aa 100644 --- a/api/envoy/config/filter/network/thrift_proxy/v2alpha1/route.proto +++ b/api/envoy/config/filter/network/thrift_proxy/v2alpha1/route.proto @@ -2,7 +2,6 @@ syntax = "proto3"; package envoy.config.filter.network.thrift_proxy.v2alpha1; option java_package = "io.envoyproxy.envoy.config.filter.network.thrift_proxy.v2alpha1"; -option java_multiple_files = true; option go_package = "v2"; import "envoy/api/v2/core/base.proto"; diff --git a/api/envoy/config/filter/network/thrift_proxy/v2alpha1/thrift_proxy.proto b/api/envoy/config/filter/network/thrift_proxy/v2alpha1/thrift_proxy.proto index 4887bc11cb517..8ca4e64df1219 100644 --- a/api/envoy/config/filter/network/thrift_proxy/v2alpha1/thrift_proxy.proto +++ b/api/envoy/config/filter/network/thrift_proxy/v2alpha1/thrift_proxy.proto @@ -2,7 +2,6 @@ syntax = "proto3"; package envoy.config.filter.network.thrift_proxy.v2alpha1; option java_package = "io.envoyproxy.envoy.config.filter.network.thrift_proxy.v2alpha1"; -option java_multiple_files = true; option go_package = "v2"; import "envoy/config/filter/network/thrift_proxy/v2alpha1/route.proto"; diff --git a/api/envoy/config/filter/thrift/rate_limit/v2alpha1/rate_limit.proto b/api/envoy/config/filter/thrift/rate_limit/v2alpha1/rate_limit.proto index dedad645357c8..e3ced525ad1e5 100644 --- a/api/envoy/config/filter/thrift/rate_limit/v2alpha1/rate_limit.proto +++ b/api/envoy/config/filter/thrift/rate_limit/v2alpha1/rate_limit.proto @@ -2,7 +2,6 @@ syntax = "proto3"; package envoy.config.filter.thrift.rate_limit.v2alpha1; option java_package = "io.envoyproxy.envoy.config.filter.thrift.rate_limit.v2alpha1"; -option java_multiple_files = true; option go_package = "v2alpha1"; import "envoy/config/ratelimit/v2/rls.proto"; diff --git a/api/envoy/config/filter/thrift/router/v2alpha1/router.proto b/api/envoy/config/filter/thrift/router/v2alpha1/router.proto index 5c0b602381c0f..d7ac3b02e1ef9 100644 --- a/api/envoy/config/filter/thrift/router/v2alpha1/router.proto +++ b/api/envoy/config/filter/thrift/router/v2alpha1/router.proto @@ -2,7 +2,6 @@ syntax = "proto3"; package envoy.config.filter.thrift.router.v2alpha1; option java_package = "io.envoyproxy.envoy.config.filter.thrift.router.v2alpha1"; -option java_multiple_files = true; option go_package = "v2alpha1"; // [#protodoc-title: Router] diff --git a/api/envoy/config/grpc_credential/v2alpha/file_based_metadata.proto b/api/envoy/config/grpc_credential/v2alpha/file_based_metadata.proto index 9f1848a20b187..f210da30acf13 100644 --- a/api/envoy/config/grpc_credential/v2alpha/file_based_metadata.proto +++ b/api/envoy/config/grpc_credential/v2alpha/file_based_metadata.proto @@ -5,7 +5,6 @@ syntax = "proto3"; package envoy.config.grpc_credential.v2alpha; option java_package = "io.envoyproxy.envoy.config.grpc_credential.v2alpha"; -option java_multiple_files = true; option go_package = "v2alpha"; import "envoy/api/v2/core/base.proto"; diff --git a/api/envoy/config/health_checker/redis/v2/redis.proto b/api/envoy/config/health_checker/redis/v2/redis.proto index 9438ff66887fa..2aa32364773c1 100644 --- a/api/envoy/config/health_checker/redis/v2/redis.proto +++ b/api/envoy/config/health_checker/redis/v2/redis.proto @@ -2,7 +2,6 @@ syntax = "proto3"; package envoy.config.health_checker.redis.v2; option java_package = "io.envoyproxy.envoy.config.health_checker.redis.v2"; -option java_multiple_files = true; option go_package = "v2"; // [#protodoc-title: Redis] diff --git a/api/envoy/config/metrics/v2/metrics_service.proto b/api/envoy/config/metrics/v2/metrics_service.proto index fb3e88d34a719..ae78e8403e03a 100644 --- a/api/envoy/config/metrics/v2/metrics_service.proto +++ b/api/envoy/config/metrics/v2/metrics_service.proto @@ -4,7 +4,6 @@ syntax = "proto3"; package envoy.config.metrics.v2; option java_package = "io.envoyproxy.envoy.config.metrics.v2"; -option java_multiple_files = true; import "envoy/api/v2/core/grpc_service.proto"; diff --git a/api/envoy/config/metrics/v2/stats.proto b/api/envoy/config/metrics/v2/stats.proto index 3bd205401c989..0118bcccd8840 100644 --- a/api/envoy/config/metrics/v2/stats.proto +++ b/api/envoy/config/metrics/v2/stats.proto @@ -5,7 +5,6 @@ syntax = "proto3"; package envoy.config.metrics.v2; option java_package = "io.envoyproxy.envoy.config.metrics.v2"; -option java_multiple_files = true; option go_package = "v2"; import "envoy/api/v2/core/address.proto"; diff --git a/api/envoy/config/overload/v2alpha/overload.proto b/api/envoy/config/overload/v2alpha/overload.proto index a22b1679f4ebb..925bd9ddb6106 100644 --- a/api/envoy/config/overload/v2alpha/overload.proto +++ b/api/envoy/config/overload/v2alpha/overload.proto @@ -2,7 +2,6 @@ syntax = "proto3"; package envoy.config.overload.v2alpha; option java_package = "io.envoyproxy.envoy.config.overload.v2alpha"; -option java_multiple_files = true; option go_package = "v2alpha"; import "google/protobuf/any.proto"; diff --git a/api/envoy/config/ratelimit/v2/rls.proto b/api/envoy/config/ratelimit/v2/rls.proto index 7deeac9065a33..c0d615abcf5df 100644 --- a/api/envoy/config/ratelimit/v2/rls.proto +++ b/api/envoy/config/ratelimit/v2/rls.proto @@ -2,7 +2,6 @@ syntax = "proto3"; package envoy.config.ratelimit.v2; option java_package = "io.envoyproxy.envoy.config.ratelimit.v2"; -option java_multiple_files = true; option go_package = "v2"; import "envoy/api/v2/core/grpc_service.proto"; diff --git a/api/envoy/config/rbac/v2alpha/rbac.proto b/api/envoy/config/rbac/v2alpha/rbac.proto index 35aea0f04c7b7..2856dd0370bfe 100644 --- a/api/envoy/config/rbac/v2alpha/rbac.proto +++ b/api/envoy/config/rbac/v2alpha/rbac.proto @@ -8,7 +8,6 @@ import "envoy/type/matcher/string.proto"; package envoy.config.rbac.v2alpha; option java_package = "io.envoyproxy.envoy.config.rbac.v2alpha"; -option java_multiple_files = true; option go_package = "v2alpha"; // [#protodoc-title: Role Based Access Control (RBAC)] diff --git a/api/envoy/config/resource_monitor/fixed_heap/v2alpha/fixed_heap.proto b/api/envoy/config/resource_monitor/fixed_heap/v2alpha/fixed_heap.proto index 3483224405877..96d439c2afe30 100644 --- a/api/envoy/config/resource_monitor/fixed_heap/v2alpha/fixed_heap.proto +++ b/api/envoy/config/resource_monitor/fixed_heap/v2alpha/fixed_heap.proto @@ -2,7 +2,6 @@ syntax = "proto3"; package envoy.config.resource_monitor.fixed_heap.v2alpha; option java_package = "io.envoyproxy.envoy.config.resource_monitor.fixed_heap.v2alpha"; -option java_multiple_files = true; option go_package = "v2alpha"; // [#protodoc-title: Fixed heap] diff --git a/api/envoy/config/resource_monitor/injected_resource/v2alpha/injected_resource.proto b/api/envoy/config/resource_monitor/injected_resource/v2alpha/injected_resource.proto index beb8f467454c0..bd364ebbf333b 100644 --- a/api/envoy/config/resource_monitor/injected_resource/v2alpha/injected_resource.proto +++ b/api/envoy/config/resource_monitor/injected_resource/v2alpha/injected_resource.proto @@ -2,7 +2,6 @@ syntax = "proto3"; package envoy.config.resource_monitor.injected_resource.v2alpha; option java_package = "io.envoyproxy.envoy.config.resource_monitor.injected_resource.v2alpha"; -option java_multiple_files = true; option go_package = "v2alpha"; import "validate/validate.proto"; diff --git a/api/envoy/config/retry/previous_priorities/previous_priorities_config.proto b/api/envoy/config/retry/previous_priorities/previous_priorities_config.proto index ae3c3ea0b9971..0d84b929f2e56 100644 --- a/api/envoy/config/retry/previous_priorities/previous_priorities_config.proto +++ b/api/envoy/config/retry/previous_priorities/previous_priorities_config.proto @@ -2,7 +2,6 @@ syntax = "proto3"; package envoy.config.retry.previous_priorities; option java_package = "io.envoyproxy.envoy.config.retry.previous_priorities"; -option java_multiple_files = true; // A retry host selector that attempts to spread retries between priorities, even if certain // priorities would not normally be attempted due to higher priorities being available. diff --git a/api/envoy/config/trace/v2/trace.proto b/api/envoy/config/trace/v2/trace.proto index 607ce7e6a1840..4f25ec69bc4be 100644 --- a/api/envoy/config/trace/v2/trace.proto +++ b/api/envoy/config/trace/v2/trace.proto @@ -5,7 +5,6 @@ syntax = "proto3"; package envoy.config.trace.v2; option java_package = "io.envoyproxy.envoy.config.trace.v2"; -option java_multiple_files = true; option go_package = "v2"; import "envoy/api/v2/core/grpc_service.proto"; diff --git a/api/envoy/config/transport_socket/alts/v2alpha/alts.proto b/api/envoy/config/transport_socket/alts/v2alpha/alts.proto index 5286d94ad06aa..d9cf9b6fc96c7 100644 --- a/api/envoy/config/transport_socket/alts/v2alpha/alts.proto +++ b/api/envoy/config/transport_socket/alts/v2alpha/alts.proto @@ -2,7 +2,6 @@ syntax = "proto3"; package envoy.config.transport_socket.alts.v2alpha; option java_package = "io.envoyproxy.envoy.config.transport_socket.alts.v2alpha"; -option java_multiple_files = true; option go_package = "v2"; // [#protodoc-title: ALTS] diff --git a/api/envoy/config/transport_socket/capture/v2alpha/capture.proto b/api/envoy/config/transport_socket/capture/v2alpha/capture.proto index dda6602a89f3f..784905f472bf5 100644 --- a/api/envoy/config/transport_socket/capture/v2alpha/capture.proto +++ b/api/envoy/config/transport_socket/capture/v2alpha/capture.proto @@ -2,7 +2,6 @@ syntax = "proto3"; package envoy.config.transport_socket.capture.v2alpha; option java_package = "io.envoyproxy.envoy.config.transport_socket.capture.v2alpha"; -option java_multiple_files = true; option go_package = "v2"; // [#protodoc-title: Capture] diff --git a/api/envoy/data/accesslog/v2/accesslog.proto b/api/envoy/data/accesslog/v2/accesslog.proto index 621cf49eb585c..95763781b83f2 100644 --- a/api/envoy/data/accesslog/v2/accesslog.proto +++ b/api/envoy/data/accesslog/v2/accesslog.proto @@ -2,7 +2,6 @@ syntax = "proto3"; package envoy.data.accesslog.v2; option java_package = "io.envoyproxy.envoy.data.accesslog.v2"; -option java_multiple_files = true; import "envoy/api/v2/core/address.proto"; import "envoy/api/v2/core/base.proto"; diff --git a/api/envoy/data/core/v2alpha/health_check_event.proto b/api/envoy/data/core/v2alpha/health_check_event.proto index 29a625f8a8536..54dc8f38a1698 100644 --- a/api/envoy/data/core/v2alpha/health_check_event.proto +++ b/api/envoy/data/core/v2alpha/health_check_event.proto @@ -2,7 +2,6 @@ syntax = "proto3"; package envoy.data.core.v2alpha; option java_package = "io.envoyproxy.envoy.data.core.v2alpha"; -option java_multiple_files = true; import "envoy/api/v2/core/address.proto"; diff --git a/api/envoy/data/tap/v2alpha/capture.proto b/api/envoy/data/tap/v2alpha/capture.proto index aea51a19a594b..36f6e9b0b8b49 100644 --- a/api/envoy/data/tap/v2alpha/capture.proto +++ b/api/envoy/data/tap/v2alpha/capture.proto @@ -6,7 +6,6 @@ syntax = "proto3"; package envoy.data.tap.v2alpha; option java_package = "io.envoyproxy.envoy.data.tap.v2alpha"; -option java_multiple_files = true; option go_package = "v2"; import "envoy/api/v2/core/address.proto"; diff --git a/api/envoy/service/accesslog/v2/als.proto b/api/envoy/service/accesslog/v2/als.proto index aca6c938276f7..ebb7013ae2f8e 100644 --- a/api/envoy/service/accesslog/v2/als.proto +++ b/api/envoy/service/accesslog/v2/als.proto @@ -2,7 +2,6 @@ syntax = "proto3"; package envoy.service.accesslog.v2; option java_package = "io.envoyproxy.envoy.service.accesslog.v2"; -option java_multiple_files = true; option go_package = "v2"; option java_generic_services = true; diff --git a/api/envoy/service/auth/v2alpha/attribute_context.proto b/api/envoy/service/auth/v2alpha/attribute_context.proto index 8f2e2243acf3c..99e90b9cadaf2 100644 --- a/api/envoy/service/auth/v2alpha/attribute_context.proto +++ b/api/envoy/service/auth/v2alpha/attribute_context.proto @@ -2,7 +2,6 @@ syntax = "proto3"; package envoy.service.auth.v2alpha; option java_package = "io.envoyproxy.envoy.service.auth.v2alpha"; -option java_multiple_files = true; import "envoy/api/v2/core/address.proto"; diff --git a/api/envoy/service/auth/v2alpha/external_auth.proto b/api/envoy/service/auth/v2alpha/external_auth.proto index deca67ef0e43c..870de90c25ac3 100644 --- a/api/envoy/service/auth/v2alpha/external_auth.proto +++ b/api/envoy/service/auth/v2alpha/external_auth.proto @@ -2,7 +2,6 @@ syntax = "proto3"; package envoy.service.auth.v2alpha; option java_package = "io.envoyproxy.envoy.service.auth.v2alpha"; -option java_multiple_files = true; option go_package = "v2alpha"; option java_generic_services = true; diff --git a/api/envoy/service/discovery/v2/ads.proto b/api/envoy/service/discovery/v2/ads.proto index 108fb1da68c81..e8774dd291725 100644 --- a/api/envoy/service/discovery/v2/ads.proto +++ b/api/envoy/service/discovery/v2/ads.proto @@ -2,7 +2,6 @@ syntax = "proto3"; package envoy.service.discovery.v2; option java_package = "io.envoyproxy.envoy.service.discovery.v2"; -option java_multiple_files = true; option go_package = "v2"; option java_generic_services = true; diff --git a/api/envoy/service/discovery/v2/hds.proto b/api/envoy/service/discovery/v2/hds.proto index d19e3cb699d2f..13dd5db435fff 100644 --- a/api/envoy/service/discovery/v2/hds.proto +++ b/api/envoy/service/discovery/v2/hds.proto @@ -2,7 +2,6 @@ syntax = "proto3"; package envoy.service.discovery.v2; option java_package = "io.envoyproxy.envoy.service.discovery.v2"; -option java_multiple_files = true; option java_generic_services = true; diff --git a/api/envoy/service/discovery/v2/sds.proto b/api/envoy/service/discovery/v2/sds.proto index 51b699d6526c0..60d5d22812d55 100644 --- a/api/envoy/service/discovery/v2/sds.proto +++ b/api/envoy/service/discovery/v2/sds.proto @@ -2,7 +2,6 @@ syntax = "proto3"; package envoy.service.discovery.v2; option java_package = "io.envoyproxy.envoy.service.discovery.v2"; -option java_multiple_files = true; import "envoy/api/v2/discovery.proto"; diff --git a/api/envoy/service/load_stats/v2/lrs.proto b/api/envoy/service/load_stats/v2/lrs.proto index 849f69a7749ee..aa3638b63e6ef 100644 --- a/api/envoy/service/load_stats/v2/lrs.proto +++ b/api/envoy/service/load_stats/v2/lrs.proto @@ -2,7 +2,6 @@ syntax = "proto3"; package envoy.service.load_stats.v2; option java_package = "io.envoyproxy.envoy.service.load_stats.v2"; -option java_multiple_files = true; option go_package = "v2"; option java_generic_services = true; diff --git a/api/envoy/service/metrics/v2/metrics_service.proto b/api/envoy/service/metrics/v2/metrics_service.proto index 8f9e08c620d20..6b88148ecc2b7 100644 --- a/api/envoy/service/metrics/v2/metrics_service.proto +++ b/api/envoy/service/metrics/v2/metrics_service.proto @@ -2,7 +2,6 @@ syntax = "proto3"; package envoy.service.metrics.v2; option java_package = "io.envoyproxy.envoy.service.metrics.v2"; -option java_multiple_files = true; option go_package = "v2"; option java_generic_services = true; diff --git a/api/envoy/service/ratelimit/v2/rls.proto b/api/envoy/service/ratelimit/v2/rls.proto index 4d4f768a5bd11..07478d1983527 100644 --- a/api/envoy/service/ratelimit/v2/rls.proto +++ b/api/envoy/service/ratelimit/v2/rls.proto @@ -2,7 +2,6 @@ syntax = "proto3"; package envoy.service.ratelimit.v2; option java_package = "io.envoyproxy.envoy.service.ratelimit.v2"; -option java_multiple_files = true; option go_package = "v2"; import "envoy/api/v2/core/base.proto"; diff --git a/api/envoy/service/trace/v2/trace_service.proto b/api/envoy/service/trace/v2/trace_service.proto index 89ff50e1d853e..9ab4579a0cceb 100644 --- a/api/envoy/service/trace/v2/trace_service.proto +++ b/api/envoy/service/trace/v2/trace_service.proto @@ -4,7 +4,6 @@ syntax = "proto3"; package envoy.service.trace.v2; option java_package = "io.envoyproxy.envoy.service.trace.v2"; -option java_multiple_files = true; option go_package = "v2"; option java_generic_services = true; diff --git a/api/envoy/type/http_status.proto b/api/envoy/type/http_status.proto index b682ea05a3a89..626805b8d9cd6 100644 --- a/api/envoy/type/http_status.proto +++ b/api/envoy/type/http_status.proto @@ -2,7 +2,6 @@ syntax = "proto3"; package envoy.type; option java_package = "io.envoyproxy.envoy.type"; -option java_multiple_files = true; import "validate/validate.proto"; diff --git a/api/envoy/type/matcher/metadata.proto b/api/envoy/type/matcher/metadata.proto index d59f08ceeabc9..60df44d7c6dcc 100644 --- a/api/envoy/type/matcher/metadata.proto +++ b/api/envoy/type/matcher/metadata.proto @@ -2,7 +2,6 @@ syntax = "proto3"; package envoy.type.matcher; option java_package = "io.envoyproxy.envoy.type.matcher"; -option java_multiple_files = true; option go_package = "matcher"; import "envoy/type/matcher/value.proto"; diff --git a/api/envoy/type/matcher/number.proto b/api/envoy/type/matcher/number.proto index 78d4beb36f558..c6e6a26c29e06 100644 --- a/api/envoy/type/matcher/number.proto +++ b/api/envoy/type/matcher/number.proto @@ -2,7 +2,6 @@ syntax = "proto3"; package envoy.type.matcher; option java_package = "io.envoyproxy.envoy.type.matcher"; -option java_multiple_files = true; option go_package = "matcher"; import "envoy/type/range.proto"; diff --git a/api/envoy/type/matcher/string.proto b/api/envoy/type/matcher/string.proto index e22e6c7d277b5..44d4a53f51a1f 100644 --- a/api/envoy/type/matcher/string.proto +++ b/api/envoy/type/matcher/string.proto @@ -2,7 +2,6 @@ syntax = "proto3"; package envoy.type.matcher; option java_package = "io.envoyproxy.envoy.type.matcher"; -option java_multiple_files = true; option go_package = "matcher"; import "validate/validate.proto"; diff --git a/api/envoy/type/matcher/value.proto b/api/envoy/type/matcher/value.proto index dcd8db0174341..def4e49d53c2a 100644 --- a/api/envoy/type/matcher/value.proto +++ b/api/envoy/type/matcher/value.proto @@ -2,7 +2,6 @@ syntax = "proto3"; package envoy.type.matcher; option java_package = "io.envoyproxy.envoy.type.matcher"; -option java_multiple_files = true; option go_package = "matcher"; import "envoy/type/matcher/number.proto"; diff --git a/api/envoy/type/percent.proto b/api/envoy/type/percent.proto index fc12de753db45..543c0a0535c12 100644 --- a/api/envoy/type/percent.proto +++ b/api/envoy/type/percent.proto @@ -2,7 +2,6 @@ syntax = "proto3"; package envoy.type; option java_package = "io.envoyproxy.envoy.type"; -option java_multiple_files = true; import "validate/validate.proto"; import "gogoproto/gogo.proto"; diff --git a/api/envoy/type/range.proto b/api/envoy/type/range.proto index bb0fd19df5722..3ce3e32b7a372 100644 --- a/api/envoy/type/range.proto +++ b/api/envoy/type/range.proto @@ -2,7 +2,6 @@ syntax = "proto3"; package envoy.type; option java_package = "io.envoyproxy.envoy.type"; -option java_multiple_files = true; option go_package = "envoy_type"; import "gogoproto/gogo.proto"; diff --git a/tools/check_format.py b/tools/check_format.py index 3c1cd7abe7782..efd065eb4b320 100755 --- a/tools/check_format.py +++ b/tools/check_format.py @@ -148,8 +148,6 @@ def checkNamespace(file_path): def fixJavaProtoOptions(file_path): - java_multiple_files = False - java_package_correct = False package_name = None for line in fileinput.FileInput(file_path): if line.startswith("package "): @@ -158,21 +156,13 @@ def fixJavaProtoOptions(file_path): continue package_name = result.group(1) - if "option java_multiple_files = true;" in line: - java_multiple_files = True if "option java_package = \"io.envoyproxy.envoy" in line: - java_package_correct = True - if java_multiple_files and java_package_correct: return [] if package_name is None: return ["Unable to find package name for proto file: %s" % file_path] - to_add = "" - if not java_package_correct: - to_add = to_add + "option java_package = \"io.envoyproxy.{}\";\n".format(package_name) - if not java_multiple_files: - to_add = to_add + "option java_multiple_files = true;\n" + to_add = "option java_package = \"io.envoyproxy.{}\";\n".format(package_name) for line in fileinput.FileInput(file_path, inplace=True): if line.startswith("package "): @@ -183,24 +173,11 @@ def fixJavaProtoOptions(file_path): def checkJavaProtoOptions(file_path): - java_multiple_files = False - java_package_correct = False for line in fileinput.FileInput(file_path): - if "option java_multiple_files = true;" in line: - java_multiple_files = True if "option java_package = \"io.envoyproxy.envoy" in line: - java_package_correct = True - if java_multiple_files and java_package_correct: return [] - error_messages = [] - if not java_multiple_files: - error_messages.append( - "Java proto option 'java_multiple_files' not set correctly for file: %s" % file_path) - if not java_package_correct: - error_messages.append( - "Java proto option 'java_package' not set correctly for file: %s" % file_path) - return error_messages + return ["Java proto option 'java_package' not set correctly for file: %s" % file_path] # To avoid breaking the Lyft import, we just check for path inclusion here. diff --git a/tools/testdata/check_format/api/java_options.proto.gold b/tools/testdata/check_format/api/java_options.proto.gold index aaf202ec0aae0..ab524690ed71d 100644 --- a/tools/testdata/check_format/api/java_options.proto.gold +++ b/tools/testdata/check_format/api/java_options.proto.gold @@ -1,3 +1,2 @@ package envoy.foo; option java_package = "io.envoyproxy.envoy.foo"; -option java_multiple_files = true;