From fc01ae705ca41d142b68a1f0d3def61540592744 Mon Sep 17 00:00:00 2001 From: "data-plane-api(CircleCI)" Date: Mon, 1 Jul 2019 18:43:09 +0000 Subject: [PATCH] api: use unique outer class names for tap proto files (#7434) When building protos using the Java protoc, multiple input files mapping to the same output file causes an erorr. This updates the name of the generated files for the tap proto files to be unique. Signed-off-by: Snow Pettersen Mirrored from https://github.com/envoyproxy/envoy @ 3c8a1ef9d128bf11ccc179b2e171e180a0861332 --- envoy/service/tap/v2alpha/tap.proto | 2 +- envoy/service/tap/v2alpha/tapds.proto | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/envoy/service/tap/v2alpha/tap.proto b/envoy/service/tap/v2alpha/tap.proto index c4cc919c..9dccbb31 100644 --- a/envoy/service/tap/v2alpha/tap.proto +++ b/envoy/service/tap/v2alpha/tap.proto @@ -7,7 +7,7 @@ package envoy.service.tap.v2alpha; import "validate/validate.proto"; -option java_outer_classname = "CommonProto"; +option java_outer_classname = "TapProto"; option java_multiple_files = true; option java_package = "io.envoyproxy.envoy.service.tap.v2alpha"; diff --git a/envoy/service/tap/v2alpha/tapds.proto b/envoy/service/tap/v2alpha/tapds.proto index a7aea7de..2f61074c 100644 --- a/envoy/service/tap/v2alpha/tapds.proto +++ b/envoy/service/tap/v2alpha/tapds.proto @@ -8,7 +8,7 @@ package envoy.service.tap.v2alpha; import "google/api/annotations.proto"; -option java_outer_classname = "CommonProto"; +option java_outer_classname = "TapDsProto"; option java_multiple_files = true; option java_package = "io.envoyproxy.envoy.service.tap.v2alpha";