Skip to content

Commit

Permalink
api: Fix duplicate java_outer_classname declarations (#8059)
Browse files Browse the repository at this point in the history
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 <banderson@twitter.com>
  • Loading branch information
Bryce Anderson authored and mattklein123 committed Aug 28, 2019
1 parent f8e42ae commit f80188e
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion api/envoy/api/v2/listener/udp_listener_config.proto
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
2 changes: 1 addition & 1 deletion api/envoy/type/matcher/regex.proto
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down

0 comments on commit f80188e

Please sign in to comment.