Skip to content

Commit

Permalink
templates/java: add OuterClass suffix when conflict with all enums an…
Browse files Browse the repository at this point in the history
…d messages

According to
https://developers.google.com/protocol-buffers/docs/reference/java-generated\#invocation,
OuterClass suffix should be appended not only top-level but also nested enums and
messages.

Signed-off-by: leafs99 <leafs99@qq.com>
  • Loading branch information
jingjingye authored and leafs99 committed Aug 2, 2022
1 parent 0e25aab commit a921306
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions templates/java/register.go
Original file line number Diff line number Diff line change
Expand Up @@ -269,13 +269,13 @@ func underscoreBetweenConsecutiveUppercase(name string) string {
func appendOuterClassName(outerClassName string, file pgs.File) string {
conflict := false

for _, enum := range file.Enums() {
for _, enum := range file.AllEnums() {
if enum.Name().String() == outerClassName {
conflict = true
}
}

for _, message := range file.Messages() {
for _, message := range file.AllMessages() {
if message.Name().String() == outerClassName {
conflict = true
}
Expand Down

0 comments on commit a921306

Please sign in to comment.