From a0a8bbbc79e1ce72c100b2525344556381647d80 Mon Sep 17 00:00:00 2001 From: Jonathan Cobb Date: Thu, 3 Dec 2020 09:53:40 -0500 Subject: [PATCH] allow subclasses to supply openapi tags --- .../cobbzilla/wizard/server/config/OpenApiConfiguration.java | 1 + .../wizard/server/config/RestServerConfiguration.java | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/wizard-server/src/main/java/org/cobbzilla/wizard/server/config/OpenApiConfiguration.java b/wizard-server/src/main/java/org/cobbzilla/wizard/server/config/OpenApiConfiguration.java index b327060..7ce818e 100644 --- a/wizard-server/src/main/java/org/cobbzilla/wizard/server/config/OpenApiConfiguration.java +++ b/wizard-server/src/main/java/org/cobbzilla/wizard/server/config/OpenApiConfiguration.java @@ -93,6 +93,7 @@ public class OpenApiConfiguration { final OpenAPI oas = new OpenAPI() .components(new Components().securitySchemes(MapBuilder.build(SEC_API_KEY, securityScheme))) .info(info) + .tags(configuration.getOpenApiTags()) .servers(servers); final Set packages = getPackages(configuration); diff --git a/wizard-server/src/main/java/org/cobbzilla/wizard/server/config/RestServerConfiguration.java b/wizard-server/src/main/java/org/cobbzilla/wizard/server/config/RestServerConfiguration.java index 4a2eb73..efa352e 100644 --- a/wizard-server/src/main/java/org/cobbzilla/wizard/server/config/RestServerConfiguration.java +++ b/wizard-server/src/main/java/org/cobbzilla/wizard/server/config/RestServerConfiguration.java @@ -2,6 +2,7 @@ package org.cobbzilla.wizard.server.config; import com.fasterxml.jackson.annotation.JsonIgnore; import com.github.jknack.handlebars.Handlebars; +import io.swagger.v3.oas.models.tags.Tag; import lombok.Getter; import lombok.Setter; import lombok.extern.slf4j.Slf4j; @@ -26,6 +27,7 @@ import org.springframework.context.ApplicationContext; import java.io.File; import java.util.Collection; import java.util.HashMap; +import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.TimeUnit; @@ -66,6 +68,9 @@ public class RestServerConfiguration { @Getter @Setter private OpenApiConfiguration openApi; public boolean hasOpenApi () { return openApi != null && openApi.valid(); } + @Getter(lazy=true) private final List openApiTags = initOpenApiTags(); + protected List initOpenApiTags () { return null; } + @Getter @Setter private String springContextPath = "classpath:/spring.xml"; @Getter @Setter private String springShardContextPath = "classpath:/spring-shard.xml"; @Getter @Setter private int bcryptRounds = 12;