(avro) branch branch-1.12 updated: Fix missing bits from cherry-picking AVRO-4027

[opwvhk]

This is an automated email from the ASF dual-hosted git repository.

opwvhk pushed a commit to branch branch-1.12
in repository https://gitbox.apache.org/repos/asf/avro.git


The following commit(s) were added to refs/heads/branch-1.12 by this push:
     new 4c7a01d5d6 Fix missing bits from cherry-picking AVRO-4027
4c7a01d5d6 is described below

commit 4c7a01d5d6a4ef85a8c322b4be86a27d02425ba5
Author: Oscar Westra van Holthe - Kind <opw...@apache.org>
AuthorDate: Sat Jun 14 16:38:25 2025 +0200

    Fix missing bits from cherry-picking AVRO-4027
---
 share/idl_grammar/org/apache/avro/idl/Idl.g4 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/share/idl_grammar/org/apache/avro/idl/Idl.g4 
b/share/idl_grammar/org/apache/avro/idl/Idl.g4
index 6144abadc0..927962c5b7 100644
--- a/share/idl_grammar/org/apache/avro/idl/Idl.g4
+++ b/share/idl_grammar/org/apache/avro/idl/Idl.g4
@@ -138,7 +138,7 @@ unionType: Union LBrace types+=fullType (Comma 
types+=fullType)* RBrace;
 
 jsonValue: jsonObject | jsonArray | jsonLiteral;
 jsonLiteral: literal=(StringLiteral | IntegerLiteral | FloatingPointLiteral | 
BTrue | BFalse | Null);
-jsonObject: LBrace jsonPairs+=jsonPair (Comma jsonPairs+=jsonPair)* RBrace;
+jsonObject: LBrace (jsonPairs+=jsonPair (Comma jsonPairs+=jsonPair)*)? RBrace;
 jsonPair: name=StringLiteral Colon value=jsonValue;
 jsonArray: LBracket (jsonValues+=jsonValue (Comma jsonValues+=jsonValue)*)? 
RBracket;