WIP

springwolf · May 24, 2024 · 2fd4db5 · 2fd4db5
1 parent 2136f10
commit 2fd4db5
Show file tree

Hide file tree

Showing 7 changed files with 149 additions and 81 deletions.
diff --git a/...a/io/github/springwolf/core/asyncapi/components/examples/walkers/DefaultSchemaWalker.java b/...a/io/github/springwolf/core/asyncapi/components/examples/walkers/DefaultSchemaWalker.java
@@ -52,7 +52,7 @@ public boolean canHandle(String contentType) {
     public R fromSchema(Schema schema, Map<String, Schema> definitions) {
         exampleValueGenerator.initialize();
 
-        String schemaName = exampleValueGenerator.lookupSchemaName(schema);
+        String schemaName = exampleValueGenerator.lookupSchemaName(schema).get();
         try {
             T generatedExample = buildExample(schemaName, schema, definitions, new HashSet<>())
                     .orElseThrow(() -> new ExampleGeneratingException("Something went wrong"));
@@ -154,13 +154,14 @@ private Optional<T> getExampleValueFromSchemaAnnotation(Schema schema) {
     private Optional<T> buildArrayExample(Schema schema, Map<String, Schema> definitions, Set<Schema> visited) {
         Schema arrayItemSchema =
                 resolveSchemaFromRef(schema.getItems(), definitions).orElse(schema.getItems());
-        String arrayItemName = exampleValueGenerator.lookupSchemaName(arrayItemSchema);
 
-        Optional<T> arrayItem = buildExample(arrayItemName, arrayItemSchema, definitions, visited);
+        Optional<String> arrayName = exampleValueGenerator.lookupSchemaName(schema);
 
-        String arrayName = exampleValueGenerator.lookupSchemaName(schema);
-
-        return arrayItem.map(array -> exampleValueGenerator.createArrayExample(arrayName, array));
+        return exampleValueGenerator
+                .lookupSchemaName(arrayItemSchema)
+                .or(() -> arrayName)
+                .flatMap(arrayItemName -> buildExample(arrayItemName, arrayItemSchema, definitions, visited))
+                .map(arrayItem -> exampleValueGenerator.createArrayExample(arrayName.get(), arrayItem));
     }
 
     private Optional<T> buildFromStringSchema(Schema schema) {
@@ -248,7 +249,12 @@ private List<PropertyExample<T>> buildPropertyExampleListFromSchema(
             Map<String, Schema> properties, Map<String, Schema> definitions, Set<Schema> visited) {
         return properties.entrySet().stream()
                 .map(propertySchema -> {
-                    String propertyKey = exampleValueGenerator.lookupSchemaName(propertySchema.getValue());
+                    // There can be instances where the schema has no name and only the property is named
+                    // in this case we se the key as schema name
+                    String propertyKey = exampleValueGenerator
+                            .lookupSchemaName(propertySchema.getValue())
+                            .orElse(propertySchema.getKey());
+
                     Optional<T> propertyValue =
                             buildExample(propertyKey, propertySchema.getValue(), definitions, visited);
 

diff --git a/...io/github/springwolf/core/asyncapi/components/examples/walkers/ExampleValueGenerator.java b/...io/github/springwolf/core/asyncapi/components/examples/walkers/ExampleValueGenerator.java
@@ -21,7 +21,7 @@ public interface ExampleValueGenerator<T, R> {
      */
     default void initialize() {}
 
-    String lookupSchemaName(Schema schema);
+    Optional<String> lookupSchemaName(Schema schema);
 
     /**
      * @return The serializable representation of the example (object for json and yaml, string for others)

diff --git a/.../springwolf/core/asyncapi/components/examples/walkers/json/ExampleJsonValueGenerator.java b/.../springwolf/core/asyncapi/components/examples/walkers/json/ExampleJsonValueGenerator.java
@@ -34,8 +34,8 @@ public boolean canHandle(String contentType) {
     }
 
     @Override
-    public String lookupSchemaName(Schema schema) {
-        return schema.getName();
+    public Optional<String> lookupSchemaName(Schema schema) {
+        return Optional.ofNullable(schema.getName());
     }
 
     @NotNull

diff --git a/...ub/springwolf/core/asyncapi/components/examples/walkers/xml/ExampleXmlValueGenerator.java b/...ub/springwolf/core/asyncapi/components/examples/walkers/xml/ExampleXmlValueGenerator.java
@@ -61,11 +61,11 @@ public void initialize() {
     }
 
     @Override
-    public String lookupSchemaName(Schema schema) {
+    public Optional<String> lookupSchemaName(Schema schema) {
         if (schema.getXml() != null && schema.getXml().getName() != null) {
-            return schema.getXml().getName();
+            return Optional.of(schema.getXml().getName());
         }
-        return schema.getName();
+        return Optional.ofNullable(schema.getName());
     }
 
     @Override
@@ -158,15 +158,15 @@ public Node createArrayExample(String name, Node arrayItem) {
 
     @Override
     public String prepareForSerialization(Schema schema, Node exampleObject) {
-        final Node objectToWrite;
+        final Optional<Node> objectToWrite;
         if (exampleObject instanceof Element) {
-            objectToWrite = exampleObject;
+            objectToWrite = Optional.of(exampleObject);
         } else {
-            final String name = lookupSchemaName(schema);
-            objectToWrite = wrapNode(name, exampleObject);
+            objectToWrite = lookupSchemaName(schema).map(name -> wrapNode(name, exampleObject));
         }
+
         try {
-            document.appendChild(objectToWrite);
+            document.appendChild(objectToWrite.get());
 
             String xml = exampleXmlValueSerializer.writeDocumentAsXmlString(document);
             exampleCache.putIfAbsent(getCacheKey(schema), exampleObject);
@@ -229,7 +229,7 @@ private Node readXmlString(String xmlString) {
     private Optional<Node> createNodeOrAddAttribute(String value, Schema schema) {
         if (!nodeStack.isEmpty() && isAttribute(schema)) {
             Element currentParent = nodeStack.peek();
-            currentParent.setAttribute(lookupSchemaName(schema), value);
+            lookupSchemaName(schema).ifPresent(name -> currentParent.setAttribute(name, value));
             return Optional.empty();
         } else {
             return Optional.of(document.createTextNode(value));

diff --git a/.../springwolf/core/asyncapi/components/examples/walkers/yaml/ExampleYamlValueGenerator.java b/.../springwolf/core/asyncapi/components/examples/walkers/yaml/ExampleYamlValueGenerator.java
@@ -31,7 +31,7 @@ public boolean canHandle(String contentType) {
     }
 
     @Override
-    public String lookupSchemaName(Schema schema) {
+    public Optional<String> lookupSchemaName(Schema schema) {
         return exampleJsonValueGenerator.lookupSchemaName(schema);
     }