- fix sample data/schema properties for array of basic types/as well as basic types it self

- fix links for array, arraylike models

Author: jknack

modules/jooby-openapi/src/main/java/io/jooby/internal/openapi/asciidoc/AsciiDocContext.java

@@ -41,6 +41,8 @@
 import io.pebbletemplates.pebble.loader.Loader;
 import io.pebbletemplates.pebble.template.EvaluationContext;
 import io.pebbletemplates.pebble.template.PebbleTemplate;
+import io.swagger.v3.oas.models.media.BooleanSchema;
+import io.swagger.v3.oas.models.media.NumberSchema;
 import io.swagger.v3.oas.models.media.Schema;
 
 public class AsciiDocContext {
@@ -313,11 +315,26 @@ public Schema<?> resolveSchema(Schema<?> schema) {
   public Object schemaProperties(Schema<?> schema) {
     var resolved = resolveSchema(schema);
     if ("array".equals(resolved.getType())) {
+      var items = resolveSchema(resolved.getItems());
+      if (items.getName() == null) {
+        return List.of(basicTypeSample(items));
+      }
       return List.of(traverse(resolved.getItems(), NOOP));
     }
+    if (resolved.getName() == null) {
+      return basicTypeSample(resolved);
+    }
     return traverse(schema, NOOP);
   }
 
+  private Object basicTypeSample(Schema<?> items) {
+    return switch (items) {
+      case NumberSchema s -> 0;
+      case BooleanSchema s -> true;
+      default -> schemaType(items);
+    };
+  }
+
   @SuppressWarnings("rawtypes")
   public Schema<?> reduceSchema(Schema<?> schema) {
     var truncated = emptySchema(schema);
@@ -348,6 +365,7 @@ public Schema<?> emptySchema(Schema<?> schema) {
     var empty = new Schema<>();
     empty.setType(resolved.getType());
     empty.setName(resolved.getName());
+    empty.setTypes(resolved.getTypes());
     return empty;
   }
 

modules/jooby-openapi/src/main/java/io/jooby/internal/openapi/asciidoc/Display.java

@@ -105,19 +105,23 @@ public Object apply(
           };
       var asciidoc = AsciiDocContext.from(context);
       var resolved = asciidoc.resolveSchema(schema);
-      var target = resolved;
-      var prefix = "";
-      var suffix = "";
-      if (resolved.getItems() != null) {
-        target = asciidoc.resolveSchema(resolved.getItems());
-        prefix = Optional.ofNullable(resolved.getName()).orElse("") + "[";
-        suffix = "]";
+      if (resolved.getItems() == null) {
+        if (resolved.getName() == null) {
+          return resolved.getType();
+        }
+        return new SafeString("<<" + resolved.getName() + ">>");
+      } else {
+        var item = asciidoc.resolveSchema(resolved.getItems());
+        if (item.getName() == null) {
+          // primitives
+          return new SafeString(item.getType() + "[]");
+        } else {
+          if ("array".equals(resolved.getType())) {
+            return new SafeString("<<" + item.getName() + ">>[]");
+          }
+          return new SafeString(resolved.getName() + "[<<" + item.getName() + ">>]");
+        }
       }
-      if ("object".equals(target.getType())) {
-        return new SafeString(prefix + "<<" + target.getName() + ">>" + suffix);
-      }
-      // no link for basic types
-      return prefix + target.getName() + suffix;
     }
   },
   curl {

modules/jooby-openapi/src/test/java/issues/i3820/App3820b.java

@@ -18,5 +18,12 @@ public class App3820b extends Jooby {
           List<String> strings = new ArrayList<>();
           return strings;
         });
+
+    get(
+        "/string",
+        ctx -> {
+          String value = "";
+          return value;
+        });
   }
 }

modules/jooby-openapi/src/test/java/issues/i3820/PebbleSupportTest.java

@@ -959,14 +959,34 @@ public void link(OpenAPIExt openapi) throws IOException {
 
     templates
         .evaluateThat("{{GET(\"/library/search\") | response | link }}")
-        .isEqualTo("[<<Book>>]");
+        .isEqualTo("<<Book>>[]");
   }
 
   @OpenAPITest(value = App3820b.class)
-  public void linkPrimitives(OpenAPIExt openapi) throws IOException {
+  public void checkPrimitives(OpenAPIExt openapi) throws IOException {
     var templates = new PebbleTemplateSupport(CurrentDir.testClass(getClass(), "adoc"), openapi);
 
-    templates.evaluateThat("{{GET(\"/strings\") | response | link }}").isEqualTo("Page[<<Book>>]");
+    templates.evaluateThat("{{GET(\"/strings\") | response | link }}").isEqualTo("string[]");
+
+    templates
+        .evaluateThat("{{GET(\"/strings\") | response | json }}")
+        .isEqualToIgnoringNewLines(
+            """
+            [source, json]
+            ----
+            [ "string" ]
+            ----\
+            """);
+
+    templates
+        .evaluateThat("{{GET(\"/string\") | response | json }}")
+        .isEqualToIgnoringNewLines(
+            """
+            [source, json]
+            ----
+            "string"
+            ----\
+            """);
   }
 
   @OpenAPITest(value = AppLib.class)