fix(3.0.0): ExtendableObject update property name pattern

Pakisan · Feb 15, 2024 · 32dd46d · 32dd46d
1 parent e836aac
commit 32dd46d
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 15 deletions.
diff --git a/asyncapi-core/src/main/java/com/asyncapi/v3/ExtendableObject.java b/asyncapi-core/src/main/java/com/asyncapi/v3/ExtendableObject.java
@@ -31,7 +31,7 @@
 @JsonIgnoreProperties({"extensionFields"})
 public class ExtendableObject {
 
-    private static final Pattern extensionPropertyNamePattern = Pattern.compile("^x-[\\w\\d\\-\\_]+$");
+    private static final Pattern extensionPropertyNamePattern = Pattern.compile("^x-[\\w.\\x2d_]+$");
 
     /**
      * Extension fields in the form x-extension-field-name for the exposed API.

diff --git a/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/AdeoKafkaRequestReplyAsyncAPI.kt b/asyncapi-core/src/test/kotlin/com/asyncapi/examples/v3/_0_0/AdeoKafkaRequestReplyAsyncAPI.kt
@@ -93,11 +93,11 @@ class AdeoKafkaRequestReplyAsyncAPI: AbstractExampleValidationTest() {
     override fun expectedChannels(): Map<String, Any> {
         val costingResponseChannelKafkaBinding = KafkaChannelBinding()
         costingResponseChannelKafkaBinding.extensionFields = mapOf(
-                Pair("x-key-subject-name-strategy", mapOf(
+                Pair("x-key.subject.name.strategy", mapOf(
                         Pair("type", "string"),
                         Pair("description", "We use the RecordNameStrategy to infer the messages schema. Use `key.subject.name.strategy=io.confluent.kafka.serializers.subject.RecordNameStrategy` in your consumer configuration.\n"),
                 )),
-                Pair("x-value-subject-name-strategy", mapOf(
+                Pair("x-value.subject.name.strategy", mapOf(
                         Pair("type", "string"),
                         Pair("description", "We use the RecordNameStrategy to infer the messages schema. Use `value.subject.name.strategy=io.confluent.kafka.serializers.subject.RecordNameStrategy` in your consumer configuration.\n"),
                 ))
@@ -175,7 +175,7 @@ class AdeoKafkaRequestReplyAsyncAPI: AbstractExampleValidationTest() {
                 )
                 .build()
         receiveACostingRequestKafkaBinding.extensionFields = mapOf(
-                Pair("x-value-subject-name-strategy", mapOf(
+                Pair("x-value.subject.name.strategy", mapOf(
                         Pair("type", "string"),
                         Pair("description", "We use the RecordNameStrategy to infer the messages schema. Use `value.subject.name.strategy=io.confluent.kafka.serializers.subject.RecordNameStrategy` in your producer configuration.\n"
                         ),
@@ -213,11 +213,11 @@ class AdeoKafkaRequestReplyAsyncAPI: AbstractExampleValidationTest() {
                         "to connect to the ADEO Broker."
         )
         saslSslSecurityScheme.extensionFields = mapOf(
-                Pair("x-sasl-jaas-config", "org.apache.kafka.common.security.plain.PlainLoginModule required " +
+                Pair("x-sasl.jaas.config", "org.apache.kafka.common.security.plain.PlainLoginModule required " +
                         "username=\"<CLUSTER_API_KEY>\" password=\"<CLUSTER_API_SECRET>\";"),
-                Pair("x-security-protocol", "SASL_SSL"),
-                Pair("x-ssl-endpoint-identification-algorithm", "https"),
-                Pair("x-sasl-mechanism", "PLAIN")
+                Pair("x-security.protocol", "SASL_SSL"),
+                Pair("x-ssl.endpoint.identification.algorithm", "https"),
+                Pair("x-sasl.mechanism", "PLAIN")
         )
 
         return Components.builder()

diff --git a/asyncapi-core/src/test/resources/examples/v3.0.0/adeo-kafka-request-reply-asyncapi.yml b/asyncapi-core/src/test/resources/examples/v3.0.0/adeo-kafka-request-reply-asyncapi.yml
@@ -87,13 +87,13 @@ channels:
 
     bindings:
       kafka:
-        x-key-subject-name-strategy:
+        x-key.subject.name.strategy:
           type: string
           description: >
             We use the RecordNameStrategy to infer the messages schema. Use
             `key.subject.name.strategy=io.confluent.kafka.serializers.subject.RecordNameStrategy`
             in your consumer configuration.
-        x-value-subject-name-strategy:
+        x-value.subject.name.strategy:
           type: string
           description: >
             We use the RecordNameStrategy to infer the messages schema. Use
@@ -128,7 +128,7 @@ operations:
           description: >
             The groupId must be prefixed by your `svc` account, deliver by the
             Adeo Kafka team. This `svc` must have the write access to the topic.
-        x-value-subject-name-strategy:
+        x-value.subject.name.strategy:
           type: string
           description: >
             We use the RecordNameStrategy to infer the messages schema. Use
@@ -286,12 +286,12 @@ components:
   securitySchemes:
     sasl-ssl:
       type: plain
-      x-sasl-jaas-config: >-
+      x-sasl.jaas.config: >-
         org.apache.kafka.common.security.plain.PlainLoginModule required
         username="<CLUSTER_API_KEY>" password="<CLUSTER_API_SECRET>";
-      x-security-protocol: SASL_SSL
-      x-ssl-endpoint-identification-algorithm: https
-      x-sasl-mechanism: PLAIN
+      x-security.protocol: SASL_SSL
+      x-ssl.endpoint.identification.algorithm: https
+      x-sasl.mechanism: PLAIN
       description: >
         Use [SASL authentication with SSL
         encryption](https://docs.confluent.io/platform/current/security/security_tutorial.html#configure-clients)