resolve nested $ref in schema (#1337)

aklivity · Nov 27, 2024 · 34c39ae · 34c39ae
1 parent bc34b23
commit 34c39ae
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/...livity/zilla/runtime/binding/asyncapi/internal/model/resolver/AsyncapiSchemaResolver.java b/...livity/zilla/runtime/binding/asyncapi/internal/model/resolver/AsyncapiSchemaResolver.java
@@ -14,6 +14,8 @@
  */
 package io.aklivity.zilla.runtime.binding.asyncapi.internal.model.resolver;
 
+import static java.util.stream.Collectors.toMap;
+
 import java.util.Map;
 import java.util.Optional;
 import java.util.regex.Pattern;
@@ -54,6 +56,12 @@ public AsyncapiSchema resolve(
             resolved.items = resolve(resolved.items);
         }
 
+        if (resolved.properties != null)
+        {
+            resolved.properties = resolved.properties.entrySet().stream()
+                .collect(toMap(Map.Entry::getKey, entry -> resolve(entry.getValue())));
+        }
+
         return resolved;
     }
 

diff --git a/...pi.spec/src/main/scripts/io/aklivity/zilla/specs/binding/asyncapi/config/server.http.yaml b/...pi.spec/src/main/scripts/io/aklivity/zilla/specs/binding/asyncapi/config/server.http.yaml
@@ -83,6 +83,9 @@ catalogs:
             petsCorrelationId:
               location: '$message.header#/CorrelId'
           schemas:
+            name:
+              type: string
+              description: Pet name.
             petPayload:
               type: object
               properties:
@@ -91,8 +94,7 @@ catalogs:
                   minimum: 0
                   description: Pet id.
                 name:
-                  type: string
-                  description: Pet name.
+                  $ref: '#/components/schemas/name'
                 tag:
                   type: string
                   description: Tag.