Merge branch '7.1.x' into 7.2.x

confluentinc · Mar 15, 2023 · 3306852 · 3306852
2 parents 95313fe + e045089
commit 3306852
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/...buf-provider/src/main/java/io/confluent/kafka/schemaregistry/protobuf/ProtobufSchema.java b/...buf-provider/src/main/java/io/confluent/kafka/schemaregistry/protobuf/ProtobufSchema.java
@@ -1151,7 +1151,7 @@ private static Map<String, OptionElement> mergeOptions(List<OptionElement> optio
     // which may not be using the alternative aggregate syntax.
     return options.stream()
         .collect(Collectors.toMap(
-            OptionElement::getName,
+            o -> o.getName().startsWith(".") ? o.getName().substring(1) : o.getName(),
             o -> o,
             ProtobufSchema::merge));
   }

diff --git a/...provider/src/test/java/io/confluent/kafka/schemaregistry/protobuf/ProtobufSchemaTest.java b/...provider/src/test/java/io/confluent/kafka/schemaregistry/protobuf/ProtobufSchemaTest.java
@@ -434,7 +434,7 @@ public void testComplexCustomOptions() {
         + "option java_multiple_files = true;\n"
         + "option (com.custom.map).subject = 'user-value';\n"
         + "option (com.custom.map).compatibility_mode = FULL;\n"
-        + "option (confluent.file_meta).doc = \"file meta\";\n"
+        + "option (.confluent.file_meta).doc = \"file meta\";\n"
         + "option (confluent.file_meta).params = [\n"
         + "      {\n"
         + "        value: \"my_value\",\n"
@@ -455,7 +455,7 @@ public void testComplexCustomOptions() {
         + "option java_multiple_files = true;\n"
         + "option (com.custom.map).subject = \"user-value\";\n"
         + "option (com.custom.map).compatibility_mode = FULL;\n"
-        + "option (confluent.file_meta).doc = \"file meta\";\n"
+        + "option (.confluent.file_meta).doc = \"file meta\";\n"
         + "option (confluent.file_meta).params = [{\n"
         + "  value: \"my_value\",\n"
         + "  key: \"my_key\"\n"