- implement dyamic display based on tags

- ref #3820

Author: jknack

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

@@ -33,7 +33,6 @@
 import io.pebbletemplates.pebble.extension.AbstractExtension;
 import io.pebbletemplates.pebble.extension.Filter;
 import io.pebbletemplates.pebble.extension.Function;
-import io.pebbletemplates.pebble.lexer.Syntax;
 import io.pebbletemplates.pebble.loader.ClasspathLoader;
 import io.pebbletemplates.pebble.loader.DelegatingLoader;
 import io.pebbletemplates.pebble.loader.FileLoader;
@@ -44,7 +43,6 @@
 
 public class AsciiDocContext {
   public static final BiConsumer<String, Schema<?>> NOOP = (name, schema) -> {};
-  public static final Schema EMPTY_SCHEMA = new Schema<>();
 
   private ObjectMapper json;
 
@@ -133,7 +131,7 @@ public Map<String, Object> getGlobalVariables() {
                         "..."));
                 // Routes
                 var operations =
-                    context.openapi.getOperations().stream()
+                    Optional.of(context.openapi.getOperations()).orElse(List.of()).stream()
                         .map(op -> new HttpRequest(context, op, Map.of()))
                         .toList();
                 // so we can print routes without calling function: routes() vs routes
@@ -142,7 +140,7 @@ public Map<String, Object> getGlobalVariables() {
 
                 // Tags
                 var tags =
-                    context.openapi.getTags().stream()
+                    Optional.ofNullable(context.openapi.getTags()).orElse(List.of()).stream()
                         .map(
                             tag ->
                                 new TagExt(
@@ -236,7 +234,6 @@ public Map<String, Filter> getFilters() {
                     .collect(Collectors.toMap(Enum::name, it -> wrapFilter(it.name(), it)));
               }
             })
-        .syntax(new Syntax.Builder().setEnableNewLineTrimming(false).build())
         .build();
   }
 
@@ -384,7 +381,7 @@ private Map<String, Object> traverse(
       SneakyThrows.Function2<Schema<?>, Schema<?>, String> valueMapper,
       BiConsumer<String, Schema<?>> consumer,
       BiConsumer<String, Schema<?>> inner) {
-    if (schema == EMPTY_SCHEMA) {
+    if (schema == null) {
       return Map.of();
     }
     var resolved = resolveSchema(schema);

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

@@ -21,7 +21,7 @@ public interface HttpMessage {
   AsciiDocContext context();
 
   default Schema<?> selectBody(Schema<?> body, String modifier) {
-    if (body != AsciiDocContext.EMPTY_SCHEMA) {
+    if (body != null) {
       return switch (modifier) {
         case "full" -> body;
         case "simple" -> context().reduceSchema(body);

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

@@ -151,13 +151,12 @@ public String getQueryString(Map<String, Object> filter) {
     return "";
   }
 
-  @SuppressWarnings("unchecked")
   private Schema<?> getBody(List<String> contentType) {
     var body =
         Optional.ofNullable(operation.getRequestBody())
             .map(it -> toSchema(it.getContent(), contentType))
             .map(context::resolveSchema)
-            .orElse(AsciiDocContext.EMPTY_SCHEMA);
+            .orElse(null);
 
     return selectBody(body, options.getOrDefault("body", "full").toString());
   }
@@ -170,7 +169,7 @@ public Schema<?> getForm() {
       BiFunction<Schema<?>, Map.Entry<String, String>, Map.Entry<String, String>> formatter) {
     var output = ArrayListMultimap.<String, String>create();
     var form = getForm();
-    if (form != AsciiDocContext.EMPTY_SCHEMA) {
+    if (form != null) {
       traverseSchema(null, form, formatter, output::put);
     }
     return output;
@@ -232,23 +231,21 @@ public ParameterList getAllParameters() {
     var parameters = allParameters();
     var body = getForm();
     var bodyType = "form";
-    if (body == AsciiDocContext.EMPTY_SCHEMA) {
+    if (body == null) {
       body = getBody();
       bodyType = "body";
     }
     var paramType = bodyType;
-    if (body != AsciiDocContext.EMPTY_SCHEMA) {
-      context.traverseSchema(
-          body,
-          (propertyName, schema) -> {
-            var p = new Parameter();
-            p.setName(propertyName);
-            p.setSchema(schema);
-            p.setIn(paramType);
-            p.setDescription(schema.getDescription());
-            parameters.add(p);
-          });
-    }
+    context.traverseSchema(
+        body,
+        (propertyName, schema) -> {
+          var p = new Parameter();
+          p.setName(propertyName);
+          p.setSchema(schema);
+          p.setIn(paramType);
+          p.setDescription(schema.getDescription());
+          parameters.add(p);
+        });
     return new ParameterList(parameters, ParameterList.PARAM);
   }
 

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

@@ -104,12 +104,11 @@ public StatusCode getStatusCode() {
     return StatusCode.valueOf(statusCode);
   }
 
-  @SuppressWarnings("unchecked")
   private Schema<?> getBody(ResponseExt response) {
     return Optional.ofNullable(response)
         .map(it -> toSchema(it.getContent(), List.of()))
         .map(context()::resolveSchema)
-        .orElse(AsciiDocContext.EMPTY_SCHEMA);
+        .orElse(null);
   }
 
   @NonNull @Override

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

@@ -60,7 +60,7 @@ public String render(Map<String, Object> args) {
             });
     if (formUrlEncoded.isEmpty()) {
       var body = request.getBody();
-      if (body != AsciiDocContext.EMPTY_SCHEMA) {
+      if (body != null) {
         options.put("-d", "'" + context.toJson(context.schemaProperties(body), false) + "'");
       }
     } else {

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

@@ -39,7 +39,7 @@ public String render(Map<String, Object> options) {
             .append('\n');
       }
       var schema = request.getBody();
-      if (schema != AsciiDocContext.EMPTY_SCHEMA) {
+      if (schema != null) {
         sb.append(context.toJson(context.schemaProperties(schema), false)).append('\n');
       }
       return sb.append("----").toString();

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

@@ -28,7 +28,7 @@ public String render(Map<String, Object> options) {
         sb.append(header.getName()).append(": ").append(value).append('\n');
       }
       var schema = response.getBody();
-      if (schema != AsciiDocContext.EMPTY_SCHEMA) {
+      if (schema != null) {
         sb.append(context.getJson().writeValueAsString(context.schemaProperties(schema)))
             .append('\n');
       }