From f80188ebc4b592754449c740f831123b4de41ab3 Mon Sep 17 00:00:00 2001 From: Bryce Anderson Date: Wed, 28 Aug 2019 09:40:38 -0600 Subject: [PATCH] api: Fix duplicate java_outer_classname declarations (#8059) The java_outer_classname is unintentionally duplicated in the new udp_listener_config and regex proto files. This changes them to unique names that match the predominant naming scheme. Signed-off-by: Bryce Anderson --- api/envoy/api/v2/listener/udp_listener_config.proto | 2 +- api/envoy/type/matcher/regex.proto | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/api/envoy/api/v2/listener/udp_listener_config.proto b/api/envoy/api/v2/listener/udp_listener_config.proto index 88a2a35d3cfc..f75383bab232 100644 --- a/api/envoy/api/v2/listener/udp_listener_config.proto +++ b/api/envoy/api/v2/listener/udp_listener_config.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package envoy.api.v2.listener; -option java_outer_classname = "ListenerProto"; +option java_outer_classname = "UdpListenerConfigProto"; option java_multiple_files = true; option java_package = "io.envoyproxy.envoy.api.v2.listener"; option go_package = "listener"; diff --git a/api/envoy/type/matcher/regex.proto b/api/envoy/type/matcher/regex.proto index b3b7194441eb..048a576cc8a6 100644 --- a/api/envoy/type/matcher/regex.proto +++ b/api/envoy/type/matcher/regex.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package envoy.type.matcher; -option java_outer_classname = "StringProto"; +option java_outer_classname = "RegexProto"; option java_multiple_files = true; option java_package = "io.envoyproxy.envoy.type.matcher"; option go_package = "matcher";