api: add java proto options to avoid risk of future breakage (#5764)

As discussed with @snowp in [envoyproxy/java-control-plane#87 (comment)](https://github.com/envoyproxy/java-control-plane/issues/87#issuecomment-456537248) and [envoyproxy/java-control-plane#87 (comment)](https://github.com/envoyproxy/java-control-plane/issues/87#issuecomment-457649859), adding these options will avoid the risk of having API breaking changes on the generated java code as the proto files evolve.

Risk Level_: Medium
Note that e.g. [envoyproxy/java-control-plane](https://github.com/envoyproxy/java-control-plane) will have to do a refactoring when they sync the proto files next time.

Signed-off-by: Penn (Dapeng) Zhang <zdapeng@google.com>

Mirrored from https://github.com/envoyproxy/envoy @ 4a5f85809cef13be47873483789a5a7bb64ded7c

envoy/admin/v2alpha/certs.proto

@@ -1,6 +1,9 @@
 syntax = "proto3";
 
 package envoy.admin.v2alpha;
+
+option java_outer_classname = "CertsProto";
+option java_multiple_files = true;
 option java_package = "io.envoyproxy.envoy.admin.v2alpha";
 
 import "google/protobuf/timestamp.proto";

envoy/admin/v2alpha/clusters.proto

@@ -1,6 +1,9 @@
 syntax = "proto3";
 
 package envoy.admin.v2alpha;
+
+option java_outer_classname = "ClustersProto";
+option java_multiple_files = true;
 option java_package = "io.envoyproxy.envoy.admin.v2alpha";
 
 import "envoy/admin/v2alpha/metrics.proto";

envoy/admin/v2alpha/config_dump.proto

@@ -1,6 +1,9 @@
 syntax = "proto3";
 
 package envoy.admin.v2alpha;
+
+option java_outer_classname = "ConfigDumpProto";
+option java_multiple_files = true;
 option java_package = "io.envoyproxy.envoy.admin.v2alpha";
 
 import "envoy/api/v2/cds.proto";

envoy/admin/v2alpha/memory.proto

@@ -1,6 +1,9 @@
 syntax = "proto3";
 
 package envoy.admin.v2alpha;
+
+option java_outer_classname = "MemoryProto";
+option java_multiple_files = true;
 option java_package = "io.envoyproxy.envoy.admin.v2alpha";
 
 // [#protodoc-title: Memory]

envoy/admin/v2alpha/metrics.proto

@@ -1,6 +1,9 @@
 syntax = "proto3";
 
 package envoy.admin.v2alpha;
+
+option java_outer_classname = "MetricsProto";
+option java_multiple_files = true;
 option java_package = "io.envoyproxy.envoy.admin.v2alpha";
 
 // [#protodoc-title: Metrics]

envoy/admin/v2alpha/mutex_stats.proto

@@ -1,6 +1,9 @@
 syntax = "proto3";
 
 package envoy.admin.v2alpha;
+
+option java_outer_classname = "MutexStatsProto";
+option java_multiple_files = true;
 option java_package = "io.envoyproxy.envoy.admin.v2alpha";
 
 // [#protodoc-title: MutexStats]

envoy/admin/v2alpha/server_info.proto

@@ -1,6 +1,9 @@
 syntax = "proto3";
 
 package envoy.admin.v2alpha;
+
+option java_outer_classname = "ServerInfoProto";
+option java_multiple_files = true;
 option java_package = "io.envoyproxy.envoy.admin.v2alpha";
 
 import "google/protobuf/duration.proto";

envoy/admin/v2alpha/tap.proto

@@ -4,6 +4,9 @@ import "envoy/service/tap/v2alpha/common.proto";
 import "validate/validate.proto";
 
 package envoy.admin.v2alpha;
+
+option java_outer_classname = "TapProto";
+option java_multiple_files = true;
 option java_package = "io.envoyproxy.envoy.admin.v2alpha";
 
 // The /tap admin request body that is used to configure an active tap session.

envoy/api/v2/auth/cert.proto

@@ -1,6 +1,9 @@
 syntax = "proto3";
 
 package envoy.api.v2.auth;
+
+option java_outer_classname = "CertProto";
+option java_multiple_files = true;
 option java_package = "io.envoyproxy.envoy.api.v2.auth";
 option go_package = "auth";
 

envoy/api/v2/cds.proto

@@ -1,6 +1,9 @@
 syntax = "proto3";
 
 package envoy.api.v2;
+
+option java_outer_classname = "CdsProto";
+option java_multiple_files = true;
 option java_package = "io.envoyproxy.envoy.api.v2";
 
 option java_generic_services = true;

envoy/api/v2/cluster/circuit_breaker.proto

@@ -1,6 +1,9 @@
 syntax = "proto3";
 
 package envoy.api.v2.cluster;
+
+option java_outer_classname = "CircuitBreakerProto";
+option java_multiple_files = true;
 option java_package = "io.envoyproxy.envoy.api.v2.cluster";
 option go_package = "cluster";
 option csharp_namespace = "Envoy.Api.V2.ClusterNS";

envoy/api/v2/cluster/outlier_detection.proto

@@ -1,6 +1,9 @@
 syntax = "proto3";
 
 package envoy.api.v2.cluster;
+
+option java_outer_classname = "OutlierDetectionProto";
+option java_multiple_files = true;
 option java_package = "io.envoyproxy.envoy.api.v2.cluster";
 option csharp_namespace = "Envoy.Api.V2.ClusterNS";
 

envoy/api/v2/core/address.proto

@@ -1,6 +1,9 @@
 syntax = "proto3";
 
 package envoy.api.v2.core;
+
+option java_outer_classname = "AddressProto";
+option java_multiple_files = true;
 option java_package = "io.envoyproxy.envoy.api.v2.core";
 
 import "envoy/api/v2/core/base.proto";

envoy/api/v2/core/base.proto

@@ -1,6 +1,9 @@
 syntax = "proto3";
 
 package envoy.api.v2.core;
+
+option java_outer_classname = "BaseProto";
+option java_multiple_files = true;
 option java_package = "io.envoyproxy.envoy.api.v2.core";
 option go_package = "core";
 

envoy/api/v2/core/config_source.proto

@@ -1,6 +1,9 @@
 syntax = "proto3";
 
 package envoy.api.v2.core;
+
+option java_outer_classname = "ConfigSourceProto";
+option java_multiple_files = true;
 option java_package = "io.envoyproxy.envoy.api.v2.core";
 
 import "envoy/api/v2/core/grpc_service.proto";

envoy/api/v2/core/grpc_service.proto

@@ -1,6 +1,9 @@
 syntax = "proto3";
 
 package envoy.api.v2.core;
+
+option java_outer_classname = "GrpcServiceProto";
+option java_multiple_files = true;
 option java_package = "io.envoyproxy.envoy.api.v2.core";
 
 import "envoy/api/v2/core/base.proto";

envoy/api/v2/core/health_check.proto

@@ -1,6 +1,9 @@
 syntax = "proto3";
 
 package envoy.api.v2.core;
+
+option java_outer_classname = "HealthCheckProto";
+option java_multiple_files = true;
 option java_package = "io.envoyproxy.envoy.api.v2.core";
 
 import "envoy/api/v2/core/base.proto";

envoy/api/v2/core/http_uri.proto

@@ -1,6 +1,9 @@
 syntax = "proto3";
 
 package envoy.api.v2.core;
+
+option java_outer_classname = "HttpUriProto";
+option java_multiple_files = true;
 option java_package = "io.envoyproxy.envoy.api.v2.core";
 
 import "google/protobuf/duration.proto";

envoy/api/v2/core/protocol.proto

@@ -3,6 +3,9 @@
 syntax = "proto3";
 
 package envoy.api.v2.core;
+
+option java_outer_classname = "ProtocolProto";
+option java_multiple_files = true;
 option java_package = "io.envoyproxy.envoy.api.v2.core";
 
 import "google/protobuf/duration.proto";

envoy/api/v2/discovery.proto

@@ -1,6 +1,9 @@
 syntax = "proto3";
 
 package envoy.api.v2;
+
+option java_outer_classname = "DiscoveryProto";
+option java_multiple_files = true;
 option java_package = "io.envoyproxy.envoy.api.v2";
 option go_package = "v2";
 

envoy/api/v2/eds.proto

@@ -1,6 +1,9 @@
 syntax = "proto3";
 
 package envoy.api.v2;
+
+option java_outer_classname = "EdsProto";
+option java_multiple_files = true;
 option java_package = "io.envoyproxy.envoy.api.v2";
 
 option java_generic_services = true;

envoy/api/v2/endpoint/endpoint.proto

@@ -1,6 +1,9 @@
 syntax = "proto3";
 
 package envoy.api.v2.endpoint;
+
+option java_outer_classname = "EndpointProto";
+option java_multiple_files = true;
 option java_package = "io.envoyproxy.envoy.api.v2.endpoint";
 option go_package = "endpoint";
 

envoy/api/v2/endpoint/load_report.proto

@@ -1,6 +1,9 @@
 syntax = "proto3";
 
 package envoy.api.v2.endpoint;
+
+option java_outer_classname = "LoadReportProto";
+option java_multiple_files = true;
 option java_package = "io.envoyproxy.envoy.api.v2.endpoint";
 
 import "envoy/api/v2/core/address.proto";

envoy/api/v2/lds.proto

@@ -1,6 +1,9 @@
 syntax = "proto3";
 
 package envoy.api.v2;
+
+option java_outer_classname = "LdsProto";
+option java_multiple_files = true;
 option java_package = "io.envoyproxy.envoy.api.v2";
 
 option java_generic_services = true;

envoy/api/v2/listener/listener.proto

@@ -1,6 +1,9 @@
 syntax = "proto3";
 
 package envoy.api.v2.listener;
+
+option java_outer_classname = "ListenerProto";
+option java_multiple_files = true;
 option java_package = "io.envoyproxy.envoy.api.v2.listener";
 option go_package = "listener";
 option csharp_namespace = "Envoy.Api.V2.ListenerNS";

envoy/api/v2/ratelimit/ratelimit.proto

@@ -1,6 +1,9 @@
 syntax = "proto3";
 
 package envoy.api.v2.ratelimit;
+
+option java_outer_classname = "RatelimitProto";
+option java_multiple_files = true;
 option java_package = "io.envoyproxy.envoy.api.v2.ratelimit";
 option go_package = "ratelimit";
 

envoy/api/v2/rds.proto

@@ -1,6 +1,9 @@
 syntax = "proto3";
 
 package envoy.api.v2;
+
+option java_outer_classname = "RdsProto";
+option java_multiple_files = true;
 option java_package = "io.envoyproxy.envoy.api.v2";
 
 option java_generic_services = true;

envoy/api/v2/route/route.proto

@@ -1,6 +1,9 @@
 syntax = "proto3";
 
 package envoy.api.v2.route;
+
+option java_outer_classname = "RouteProto";
+option java_multiple_files = true;
 option java_package = "io.envoyproxy.envoy.api.v2.route";
 option go_package = "route";
 option java_generic_services = true;

envoy/config/accesslog/v2/als.proto

@@ -1,6 +1,9 @@
 syntax = "proto3";
 
 package envoy.config.accesslog.v2;
+
+option java_outer_classname = "AlsProto";
+option java_multiple_files = true;
 option java_package = "io.envoyproxy.envoy.config.accesslog.v2";
 option go_package = "v2";
 

envoy/config/accesslog/v2/file.proto

@@ -1,6 +1,9 @@
 syntax = "proto3";
 
 package envoy.config.accesslog.v2;
+
+option java_outer_classname = "FileProto";
+option java_multiple_files = true;
 option java_package = "io.envoyproxy.envoy.config.accesslog.v2";
 option go_package = "v2";
 

envoy/config/bootstrap/v2/bootstrap.proto

@@ -6,6 +6,9 @@
 syntax = "proto3";
 
 package envoy.config.bootstrap.v2;
+
+option java_outer_classname = "BootstrapProto";
+option java_multiple_files = true;
 option java_package = "io.envoyproxy.envoy.config.bootstrap.v2";
 option go_package = "v2";
 

envoy/config/common/tap/v2alpha/common.proto

@@ -5,6 +5,9 @@ import "envoy/service/tap/v2alpha/common.proto";
 import "validate/validate.proto";
 
 package envoy.config.common.tap.v2alpha;
+
+option java_outer_classname = "CommonProto";
+option java_multiple_files = true;
 option java_package = "io.envoyproxy.envoy.service.tap.v2alpha";
 
 // [#protodoc-title: Common tap extension configuration]

envoy/config/filter/accesslog/v2/accesslog.proto

@@ -1,6 +1,9 @@
 syntax = "proto3";
 
 package envoy.config.filter.accesslog.v2;
+
+option java_outer_classname = "AccesslogProto";
+option java_multiple_files = true;
 option java_package = "io.envoyproxy.envoy.config.filter.accesslog.v2";
 option go_package = "v2";
 

envoy/config/filter/fault/v2/fault.proto

@@ -1,6 +1,9 @@
 syntax = "proto3";
 
 package envoy.config.filter.fault.v2;
+
+option java_outer_classname = "FaultProto";
+option java_multiple_files = true;
 option java_package = "io.envoyproxy.envoy.config.filter.fault.v2";
 option go_package = "v2";
 

envoy/config/filter/http/buffer/v2/buffer.proto

@@ -1,6 +1,9 @@
 syntax = "proto3";
 
 package envoy.config.filter.http.buffer.v2;
+
+option java_outer_classname = "BufferProto";
+option java_multiple_files = true;
 option java_package = "io.envoyproxy.envoy.config.filter.http.buffer.v2";
 option go_package = "v2";
 

envoy/config/filter/http/ext_authz/v2/ext_authz.proto

@@ -1,6 +1,8 @@
 syntax = "proto3";
 
 package envoy.config.filter.http.ext_authz.v2;
+
+option java_outer_classname = "ExtAuthzProto";
 option java_package = "io.envoyproxy.envoy.config.filter.http.ext_authz.v2";
 option java_multiple_files = true;
 option go_package = "v2";

envoy/config/filter/http/fault/v2/fault.proto

@@ -1,6 +1,9 @@
 syntax = "proto3";
 
 package envoy.config.filter.http.fault.v2;
+
+option java_outer_classname = "FaultProto";
+option java_multiple_files = true;
 option java_package = "io.envoyproxy.envoy.config.filter.http.fault.v2";
 option go_package = "v2";
 

envoy/config/filter/http/grpc_http1_reverse_bridge/v2alpha1/config.proto

@@ -1,6 +1,9 @@
 syntax = "proto3";
 
 package envoy.extensions.filter.http.grpc_http1_reverse_bridge.v2alpha1;
+
+option java_outer_classname = "ConfigProto";
+option java_multiple_files = true;
 option java_package = "io.envoyproxy.envoy.extensions.filter.http.grpc_http1_reverse_bridge.v2alpha1";
 option go_package = "v2";
 

envoy/config/filter/http/gzip/v2/gzip.proto

@@ -1,6 +1,9 @@
 syntax = "proto3";
 
 package envoy.config.filter.http.gzip.v2;
+
+option java_outer_classname = "GzipProto";
+option java_multiple_files = true;
 option java_package = "io.envoyproxy.envoy.config.filter.http.gzip.v2";
 option go_package = "v2";
 

envoy/config/filter/http/header_to_metadata/v2/header_to_metadata.proto

@@ -1,6 +1,9 @@
 syntax = "proto3";
 
 package envoy.config.filter.http.header_to_metadata.v2;
+
+option java_outer_classname = "HeaderToMetadataProto";
+option java_multiple_files = true;
 option java_package = "io.envoyproxy.envoy.config.filter.http.header_to_metadata.v2";
 option go_package = "v2";
 

envoy/config/filter/http/health_check/v2/health_check.proto

@@ -1,6 +1,9 @@
 syntax = "proto3";
 
 package envoy.config.filter.http.health_check.v2;
+
+option java_outer_classname = "HealthCheckProto";
+option java_multiple_files = true;
 option java_package = "io.envoyproxy.envoy.config.filter.http.health_check.v2";
 option go_package = "v2";
 

envoy/config/filter/http/ip_tagging/v2/ip_tagging.proto

@@ -1,6 +1,9 @@
 syntax = "proto3";
 
 package envoy.config.filter.http.ip_tagging.v2;
+
+option java_outer_classname = "IpTaggingProto";
+option java_multiple_files = true;
 option java_package = "io.envoyproxy.envoy.config.filter.http.ip_tagging.v2";
 option go_package = "v2";
 

envoy/config/filter/http/jwt_authn/v2alpha/config.proto

@@ -2,6 +2,9 @@
 syntax = "proto3";
 
 package envoy.config.filter.http.jwt_authn.v2alpha;
+
+option java_outer_classname = "ConfigProto";
+option java_multiple_files = true;
 option java_package = "io.envoyproxy.envoy.config.filter.http.jwt_authn.v2alpha";
 
 import "envoy/api/v2/core/base.proto";

envoy/config/filter/http/lua/v2/lua.proto

@@ -1,6 +1,9 @@
 syntax = "proto3";
 
 package envoy.config.filter.http.lua.v2;
+
+option java_outer_classname = "LuaProto";
+option java_multiple_files = true;
 option java_package = "io.envoyproxy.envoy.config.filter.http.lua.v2";
 option go_package = "v2";
 

envoy/config/filter/http/rate_limit/v2/rate_limit.proto

@@ -1,6 +1,9 @@
 syntax = "proto3";
 
 package envoy.config.filter.http.rate_limit.v2;
+
+option java_outer_classname = "RateLimitProto";
+option java_multiple_files = true;
 option java_package = "io.envoyproxy.envoy.config.filter.http.rate_limit.v2";
 option go_package = "v2";
 

envoy/config/filter/http/rbac/v2/rbac.proto

@@ -1,6 +1,9 @@
 syntax = "proto3";
 
 package envoy.config.filter.http.rbac.v2;
+
+option java_outer_classname = "RbacProto";
+option java_multiple_files = true;
 option java_package = "io.envoyproxy.envoy.config.filter.http.rbac.v2";
 option go_package = "v2";
 

envoy/config/filter/http/router/v2/router.proto

@@ -1,6 +1,9 @@
 syntax = "proto3";
 
 package envoy.config.filter.http.router.v2;
+
+option java_outer_classname = "RouterProto";
+option java_multiple_files = true;
 option java_package = "io.envoyproxy.envoy.config.filter.http.router.v2";
 option go_package = "v2";
 

envoy/config/filter/http/squash/v2/squash.proto

@@ -1,6 +1,9 @@
 syntax = "proto3";
 
 package envoy.config.filter.http.squash.v2;
+
+option java_outer_classname = "SquashProto";
+option java_multiple_files = true;
 option java_package = "io.envoyproxy.envoy.config.filter.http.squash.v2";
 option go_package = "v2";
 

envoy/config/filter/http/tap/v2alpha/tap.proto

@@ -5,6 +5,9 @@ import "envoy/config/common/tap/v2alpha/common.proto";
 import "validate/validate.proto";
 
 package envoy.config.filter.http.tap.v2alpha;
+
+option java_outer_classname = "TapProto";
+option java_multiple_files = true;
 option java_package = "io.envoyproxy.envoy.config.filter.http.tap.v2alpha";
 
 // [#protodoc-title: Tap]

envoy/config/filter/http/transcoder/v2/transcoder.proto

@@ -1,6 +1,9 @@
 syntax = "proto3";
 
 package envoy.config.filter.http.transcoder.v2;
+
+option java_outer_classname = "TranscoderProto";
+option java_multiple_files = true;
 option java_package = "io.envoyproxy.envoy.config.filter.http.transcoder.v2";
 option go_package = "v2";
 

envoy/config/filter/listener/original_src/v2alpha1/original_src.proto

@@ -1,6 +1,9 @@
 syntax = "proto3";
 
 package envoy.config.filter.listener.original_src.v2alpha1;
+
+option java_outer_classname = "OriginalSrcProto";
+option java_multiple_files = true;
 option java_package = "io.envoyproxy.envoy.config.filter.listener.original_src.v2alpha1";
 
 option go_package = "v2alpha1";

envoy/config/filter/network/client_ssl_auth/v2/client_ssl_auth.proto

@@ -1,6 +1,9 @@
 syntax = "proto3";
 
 package envoy.config.filter.network.client_ssl_auth.v2;
+
+option java_outer_classname = "ClientSslAuthProto";
+option java_multiple_files = true;
 option java_package = "io.envoyproxy.envoy.config.filter.network.client_ssl_auth.v2";
 option go_package = "v2";
 

envoy/config/filter/network/dubbo_proxy/v2alpha1/dubbo_proxy.proto

@@ -1,6 +1,9 @@
 syntax = "proto3";
 
 package envoy.config.filter.network.dubbo_proxy.v2alpha1;
+
+option java_outer_classname = "DubboProxyProto";
+option java_multiple_files = true;
 option java_package = "io.envoyproxy.envoy.config.filter.network.dubbo_proxy.v2alpha1";
 option go_package = "v2";
 

envoy/config/filter/network/dubbo_proxy/v2alpha1/route.proto

@@ -1,6 +1,9 @@
 syntax = "proto3";
 
 package envoy.config.filter.network.dubbo_proxy.v2alpha1;
+
+option java_outer_classname = "RouteProto";
+option java_multiple_files = true;
 option java_package = "io.envoyproxy.envoy.config.filter.network.dubbo_proxy.v2alpha1";
 option go_package = "v2";
 

envoy/config/filter/network/ext_authz/v2/ext_authz.proto

@@ -1,6 +1,9 @@
 syntax = "proto3";
 
 package envoy.config.filter.network.ext_authz.v2;
+
+option java_outer_classname = "ExtAuthzProto";
+option java_multiple_files = true;
 option java_package = "io.envoyproxy.envoy.config.filter.network.ext_authz.v2";
 option go_package = "v2";
 

envoy/config/filter/network/http_connection_manager/v2/http_connection_manager.proto

@@ -1,6 +1,9 @@
 syntax = "proto3";
 
 package envoy.config.filter.network.http_connection_manager.v2;
+
+option java_outer_classname = "HttpConnectionManagerProto";
+option java_multiple_files = true;
 option java_package = "io.envoyproxy.envoy.config.filter.network.http_connection_manager.v2";
 option go_package = "v2";
 

envoy/config/filter/network/mongo_proxy/v2/mongo_proxy.proto

@@ -1,6 +1,9 @@
 syntax = "proto3";
 
 package envoy.config.filter.network.mongo_proxy.v2;
+
+option java_outer_classname = "MongoProxyProto";
+option java_multiple_files = true;
 option java_package = "io.envoyproxy.envoy.config.filter.network.mongo_proxy.v2";
 option go_package = "v2";
 

envoy/config/filter/network/mysql_proxy/v1alpha1/mysql_proxy.proto

@@ -1,6 +1,9 @@
 syntax = "proto3";
 
 package envoy.config.filter.network.mysql_proxy.v1alpha1;
+
+option java_outer_classname = "MysqlProxyProto";
+option java_multiple_files = true;
 option java_package = "io.envoyproxy.envoy.config.filter.network.mysql_proxy.v1alpha1";
 option go_package = "v1alpha1";
 

envoy/config/filter/network/rate_limit/v2/rate_limit.proto

@@ -1,6 +1,9 @@
 syntax = "proto3";
 
 package envoy.config.filter.network.rate_limit.v2;
+
+option java_outer_classname = "RateLimitProto";
+option java_multiple_files = true;
 option java_package = "io.envoyproxy.envoy.config.filter.network.rate_limit.v2";
 option go_package = "v2";
 

envoy/config/filter/network/rbac/v2/rbac.proto

@@ -1,6 +1,9 @@
 syntax = "proto3";
 
 package envoy.config.filter.network.rbac.v2;
+
+option java_outer_classname = "RbacProto";
+option java_multiple_files = true;
 option java_package = "io.envoyproxy.envoy.config.filter.network.rbac.v2";
 option go_package = "v2";
 

envoy/config/filter/network/redis_proxy/v2/redis_proxy.proto

@@ -1,6 +1,9 @@
 syntax = "proto3";
 
 package envoy.config.filter.network.redis_proxy.v2;
+
+option java_outer_classname = "RedisProxyProto";
+option java_multiple_files = true;
 option java_package = "io.envoyproxy.envoy.config.filter.network.redis_proxy.v2";
 option go_package = "v2";
 

envoy/config/filter/network/tcp_proxy/v2/tcp_proxy.proto

@@ -1,6 +1,9 @@
 syntax = "proto3";
 
 package envoy.config.filter.network.tcp_proxy.v2;
+
+option java_outer_classname = "TcpProxyProto";
+option java_multiple_files = true;
 option java_package = "io.envoyproxy.envoy.config.filter.network.tcp_proxy.v2";
 option go_package = "v2";
 

envoy/config/filter/network/thrift_proxy/v2alpha1/route.proto

@@ -1,6 +1,9 @@
 syntax = "proto3";
 
 package envoy.config.filter.network.thrift_proxy.v2alpha1;
+
+option java_outer_classname = "RouteProto";
+option java_multiple_files = true;
 option java_package = "io.envoyproxy.envoy.config.filter.network.thrift_proxy.v2alpha1";
 option go_package = "v2";
 

envoy/config/filter/network/thrift_proxy/v2alpha1/thrift_proxy.proto

@@ -1,6 +1,9 @@
 syntax = "proto3";
 
 package envoy.config.filter.network.thrift_proxy.v2alpha1;
+
+option java_outer_classname = "ThriftProxyProto";
+option java_multiple_files = true;
 option java_package = "io.envoyproxy.envoy.config.filter.network.thrift_proxy.v2alpha1";
 option go_package = "v2";
 

envoy/config/filter/thrift/rate_limit/v2alpha1/rate_limit.proto

@@ -1,6 +1,9 @@
 syntax = "proto3";
 
 package envoy.config.filter.thrift.rate_limit.v2alpha1;
+
+option java_outer_classname = "RateLimitProto";
+option java_multiple_files = true;
 option java_package = "io.envoyproxy.envoy.config.filter.thrift.rate_limit.v2alpha1";
 option go_package = "v2alpha1";
 

envoy/config/filter/thrift/router/v2alpha1/router.proto

@@ -1,6 +1,9 @@
 syntax = "proto3";
 
 package envoy.config.filter.thrift.router.v2alpha1;
+
+option java_outer_classname = "RouterProto";
+option java_multiple_files = true;
 option java_package = "io.envoyproxy.envoy.config.filter.thrift.router.v2alpha1";
 option go_package = "v2alpha1";
 

envoy/config/grpc_credential/v2alpha/file_based_metadata.proto

@@ -4,6 +4,9 @@ syntax = "proto3";
 // Configuration for File Based Metadata Grpc Credentials Plugin
 
 package envoy.config.grpc_credential.v2alpha;
+
+option java_outer_classname = "FileBasedMetadataProto";
+option java_multiple_files = true;
 option java_package = "io.envoyproxy.envoy.config.grpc_credential.v2alpha";
 option go_package = "v2alpha";
 

envoy/config/health_checker/redis/v2/redis.proto

@@ -1,6 +1,9 @@
 syntax = "proto3";
 
 package envoy.config.health_checker.redis.v2;
+
+option java_outer_classname = "RedisProto";
+option java_multiple_files = true;
 option java_package = "io.envoyproxy.envoy.config.health_checker.redis.v2";
 option go_package = "v2";
 

envoy/config/metrics/v2/metrics_service.proto

@@ -3,6 +3,9 @@ syntax = "proto3";
 // [#protodoc-title: Metrics service]
 
 package envoy.config.metrics.v2;
+
+option java_outer_classname = "MetricsServiceProto";
+option java_multiple_files = true;
 option java_package = "io.envoyproxy.envoy.config.metrics.v2";
 
 import "envoy/api/v2/core/grpc_service.proto";

envoy/config/metrics/v2/stats.proto

@@ -4,6 +4,9 @@
 syntax = "proto3";
 
 package envoy.config.metrics.v2;
+
+option java_outer_classname = "StatsProto";
+option java_multiple_files = true;
 option java_package = "io.envoyproxy.envoy.config.metrics.v2";
 option go_package = "v2";
 

envoy/config/overload/v2alpha/overload.proto

@@ -1,6 +1,9 @@
 syntax = "proto3";
 
 package envoy.config.overload.v2alpha;
+
+option java_outer_classname = "OverloadProto";
+option java_multiple_files = true;
 option java_package = "io.envoyproxy.envoy.config.overload.v2alpha";
 option go_package = "v2alpha";
 

envoy/config/ratelimit/v2/rls.proto

@@ -1,6 +1,9 @@
 syntax = "proto3";
 
 package envoy.config.ratelimit.v2;
+
+option java_outer_classname = "RlsProto";
+option java_multiple_files = true;
 option java_package = "io.envoyproxy.envoy.config.ratelimit.v2";
 option go_package = "v2";
 

envoy/config/rbac/v2alpha/rbac.proto

@@ -7,6 +7,9 @@ import "envoy/type/matcher/metadata.proto";
 import "envoy/type/matcher/string.proto";
 
 package envoy.config.rbac.v2alpha;
+
+option java_outer_classname = "RbacProto";
+option java_multiple_files = true;
 option java_package = "io.envoyproxy.envoy.config.rbac.v2alpha";
 option go_package = "v2alpha";
 

envoy/config/resource_monitor/fixed_heap/v2alpha/fixed_heap.proto

@@ -1,6 +1,9 @@
 syntax = "proto3";
 
 package envoy.config.resource_monitor.fixed_heap.v2alpha;
+
+option java_outer_classname = "FixedHeapProto";
+option java_multiple_files = true;
 option java_package = "io.envoyproxy.envoy.config.resource_monitor.fixed_heap.v2alpha";
 option go_package = "v2alpha";
 

envoy/config/resource_monitor/injected_resource/v2alpha/injected_resource.proto

@@ -1,6 +1,9 @@
 syntax = "proto3";
 
 package envoy.config.resource_monitor.injected_resource.v2alpha;
+
+option java_outer_classname = "InjectedResourceProto";
+option java_multiple_files = true;
 option java_package = "io.envoyproxy.envoy.config.resource_monitor.injected_resource.v2alpha";
 option go_package = "v2alpha";
 

envoy/config/retry/previous_priorities/previous_priorities_config.proto

@@ -1,6 +1,9 @@
 syntax = "proto3";
 
 package envoy.config.retry.previous_priorities;
+
+option java_outer_classname = "PreviousPrioritiesConfigProto";
+option java_multiple_files = true;
 option java_package = "io.envoyproxy.envoy.config.retry.previous_priorities";
 
 // A retry host selector that attempts to spread retries between priorities, even if certain

envoy/config/trace/v2/trace.proto

@@ -4,6 +4,9 @@
 syntax = "proto3";
 
 package envoy.config.trace.v2;
+
+option java_outer_classname = "TraceProto";
+option java_multiple_files = true;
 option java_package = "io.envoyproxy.envoy.config.trace.v2";
 option go_package = "v2";
 

envoy/config/transport_socket/alts/v2alpha/alts.proto

@@ -1,6 +1,9 @@
 syntax = "proto3";
 
 package envoy.config.transport_socket.alts.v2alpha;
+
+option java_outer_classname = "AltsProto";
+option java_multiple_files = true;
 option java_package = "io.envoyproxy.envoy.config.transport_socket.alts.v2alpha";
 option go_package = "v2";
 

envoy/config/transport_socket/tap/v2alpha/tap.proto

@@ -1,6 +1,9 @@
 syntax = "proto3";
 
 package envoy.config.transport_socket.tap.v2alpha;
+
+option java_outer_classname = "TapProto";
+option java_multiple_files = true;
 option java_package = "io.envoyproxy.envoy.config.transport_socket.tap.v2alpha";
 option go_package = "v2";
 

envoy/data/accesslog/v2/accesslog.proto

@@ -1,6 +1,9 @@
 syntax = "proto3";
 
 package envoy.data.accesslog.v2;
+
+option java_outer_classname = "AccesslogProto";
+option java_multiple_files = true;
 option java_package = "io.envoyproxy.envoy.data.accesslog.v2";
 
 import "envoy/api/v2/core/address.proto";

envoy/data/cluster/v2alpha/outlier_detection_event.proto

@@ -1,6 +1,9 @@
 syntax = "proto3";
 
 package envoy.data.cluster.v2alpha;
+
+option java_outer_classname = "OutlierDetectionEventProto";
+option java_multiple_files = true;
 option java_package = "io.envoyproxy.envoy.data.cluster.v2alpha";
 
 import "google/protobuf/timestamp.proto";

envoy/data/core/v2alpha/health_check_event.proto

@@ -1,6 +1,9 @@
 syntax = "proto3";
 
 package envoy.data.core.v2alpha;
+
+option java_outer_classname = "HealthCheckEventProto";
+option java_multiple_files = true;
 option java_package = "io.envoyproxy.envoy.data.core.v2alpha";
 
 import "envoy/api/v2/core/address.proto";

envoy/data/tap/v2alpha/http.proto

@@ -1,6 +1,9 @@
 syntax = "proto3";
 
 package envoy.data.tap.v2alpha;
+
+option java_outer_classname = "HttpProto";
+option java_multiple_files = true;
 option java_package = "io.envoyproxy.envoy.data.tap.v2alpha";
 
 import "envoy/api/v2/core/base.proto";

envoy/data/tap/v2alpha/transport.proto

@@ -5,6 +5,9 @@ syntax = "proto3";
 // sequences on a socket.
 
 package envoy.data.tap.v2alpha;
+
+option java_outer_classname = "TransportProto";
+option java_multiple_files = true;
 option java_package = "io.envoyproxy.envoy.data.tap.v2alpha";
 option go_package = "v2";
 

envoy/data/tap/v2alpha/wrapper.proto

@@ -6,6 +6,9 @@ import "envoy/data/tap/v2alpha/transport.proto";
 import "validate/validate.proto";
 
 package envoy.data.tap.v2alpha;
+
+option java_outer_classname = "WrapperProto";
+option java_multiple_files = true;
 option java_package = "io.envoyproxy.envoy.data.tap.v2alpha";
 
 // [#protodoc-title: Tap data wrappers]

envoy/service/accesslog/v2/als.proto

@@ -1,6 +1,9 @@
 syntax = "proto3";
 
 package envoy.service.accesslog.v2;
+
+option java_outer_classname = "AlsProto";
+option java_multiple_files = true;
 option java_package = "io.envoyproxy.envoy.service.accesslog.v2";
 option go_package = "v2";
 option java_generic_services = true;

envoy/service/auth/v2/attribute_context.proto

@@ -1,6 +1,9 @@
 syntax = "proto3";
 
 package envoy.service.auth.v2;
+
+option java_outer_classname = "AttributeContextProto";
+option java_multiple_files = true;
 option java_package = "io.envoyproxy.envoy.service.auth.v2";
 
 import "envoy/api/v2/core/address.proto";

envoy/service/auth/v2/external_auth.proto

@@ -1,6 +1,9 @@
 syntax = "proto3";
 
 package envoy.service.auth.v2;
+
+option java_outer_classname = "ExternalAuthProto";
+option java_multiple_files = true;
 option java_package = "io.envoyproxy.envoy.service.auth.v2";
 option go_package = "v2";
 option java_generic_services = true;

envoy/service/discovery/v2/ads.proto

@@ -1,6 +1,9 @@
 syntax = "proto3";
 
 package envoy.service.discovery.v2;
+
+option java_outer_classname = "AdsProto";
+option java_multiple_files = true;
 option java_package = "io.envoyproxy.envoy.service.discovery.v2";
 option go_package = "v2";
 option java_generic_services = true;

envoy/service/discovery/v2/hds.proto

@@ -1,6 +1,9 @@
 syntax = "proto3";
 
 package envoy.service.discovery.v2;
+
+option java_outer_classname = "HdsProto";
+option java_multiple_files = true;
 option java_package = "io.envoyproxy.envoy.service.discovery.v2";
 
 option java_generic_services = true;

envoy/service/discovery/v2/sds.proto

@@ -1,6 +1,9 @@
 syntax = "proto3";
 
 package envoy.service.discovery.v2;
+
+option java_outer_classname = "SdsProto";
+option java_multiple_files = true;
 option java_package = "io.envoyproxy.envoy.service.discovery.v2";
 
 import "envoy/api/v2/discovery.proto";

envoy/service/load_stats/v2/lrs.proto

@@ -1,6 +1,9 @@
 syntax = "proto3";
 
 package envoy.service.load_stats.v2;
+
+option java_outer_classname = "LrsProto";
+option java_multiple_files = true;
 option java_package = "io.envoyproxy.envoy.service.load_stats.v2";
 option go_package = "v2";
 option java_generic_services = true;

envoy/service/metrics/v2/metrics_service.proto

@@ -1,6 +1,9 @@
 syntax = "proto3";
 
 package envoy.service.metrics.v2;
+
+option java_outer_classname = "MetricsServiceProto";
+option java_multiple_files = true;
 option java_package = "io.envoyproxy.envoy.service.metrics.v2";
 option go_package = "v2";
 option java_generic_services = true;

envoy/service/ratelimit/v2/rls.proto

@@ -1,6 +1,9 @@
 syntax = "proto3";
 
 package envoy.service.ratelimit.v2;
+
+option java_outer_classname = "RlsProto";
+option java_multiple_files = true;
 option java_package = "io.envoyproxy.envoy.service.ratelimit.v2";
 option go_package = "v2";
 

envoy/service/tap/v2alpha/common.proto

@@ -5,6 +5,9 @@ import "envoy/api/v2/route/route.proto";
 import "validate/validate.proto";
 
 package envoy.service.tap.v2alpha;
+
+option java_outer_classname = "CommonProto";
+option java_multiple_files = true;
 option java_package = "io.envoyproxy.envoy.service.tap.v2alpha";
 
 // [#protodoc-title: Common tap configuration]

envoy/service/trace/v2/trace_service.proto

@@ -3,6 +3,9 @@ syntax = "proto3";
 // [#proto-status: draft]
 
 package envoy.service.trace.v2;
+
+option java_outer_classname = "TraceServiceProto";
+option java_multiple_files = true;
 option java_package = "io.envoyproxy.envoy.service.trace.v2";
 option go_package = "v2";
 option java_generic_services = true;

envoy/type/http_status.proto

@@ -1,6 +1,9 @@
 syntax = "proto3";
 
 package envoy.type;
+
+option java_outer_classname = "HttpStatusProto";
+option java_multiple_files = true;
 option java_package = "io.envoyproxy.envoy.type";
 
 import "validate/validate.proto";

envoy/type/matcher/metadata.proto

@@ -1,6 +1,9 @@
 syntax = "proto3";
 
 package envoy.type.matcher;
+
+option java_outer_classname = "MetadataProto";
+option java_multiple_files = true;
 option java_package = "io.envoyproxy.envoy.type.matcher";
 option go_package = "matcher";
 

envoy/type/matcher/number.proto

@@ -1,6 +1,9 @@
 syntax = "proto3";
 
 package envoy.type.matcher;
+
+option java_outer_classname = "NumberProto";
+option java_multiple_files = true;
 option java_package = "io.envoyproxy.envoy.type.matcher";
 option go_package = "matcher";
 

envoy/type/matcher/string.proto

@@ -1,6 +1,9 @@
 syntax = "proto3";
 
 package envoy.type.matcher;
+
+option java_outer_classname = "StringProto";
+option java_multiple_files = true;
 option java_package = "io.envoyproxy.envoy.type.matcher";
 option go_package = "matcher";