diff --git a/qqq-middleware-javalin/src/main/java/com/kingsrook/qqq/middleware/javalin/QMiddlewareApiSpecHandler.java b/qqq-middleware-javalin/src/main/java/com/kingsrook/qqq/middleware/javalin/QMiddlewareApiSpecHandler.java index cee9441a..7988435c 100644 --- a/qqq-middleware-javalin/src/main/java/com/kingsrook/qqq/middleware/javalin/QMiddlewareApiSpecHandler.java +++ b/qqq-middleware-javalin/src/main/java/com/kingsrook/qqq/middleware/javalin/QMiddlewareApiSpecHandler.java @@ -159,7 +159,7 @@ public class QMiddlewareApiSpecHandler { try { - OpenAPI openAPI = new MiddlewareVersionV1().generate(basePath); + OpenAPI openAPI = new MiddlewareVersionV1().generateOpenAPIModel(basePath); context.contentType(ContentType.APPLICATION_YAML); context.result(YamlUtils.toYaml(openAPI)); } @@ -178,7 +178,7 @@ public class QMiddlewareApiSpecHandler { try { - OpenAPI openAPI = new MiddlewareVersionV1().generate(basePath); + OpenAPI openAPI = new MiddlewareVersionV1().generateOpenAPIModel(basePath); context.contentType(ContentType.APPLICATION_JSON); context.result(JsonUtils.toJson(openAPI)); } @@ -246,7 +246,7 @@ public class QMiddlewareApiSpecHandler throw (new QUserFacingException("Unrecognized version: " + version)); } - OpenAPI openAPI = middlewareSpec.get().generate(basePath); + OpenAPI openAPI = middlewareSpec.get().generateOpenAPIModel(basePath); html = html.replace("{title}", openAPI.getInfo().getTitle() + " - " + version); StringBuilder otherVersionOptions = new StringBuilder(); diff --git a/qqq-middleware-javalin/src/main/java/com/kingsrook/qqq/middleware/javalin/tools/PublishAPI.java b/qqq-middleware-javalin/src/main/java/com/kingsrook/qqq/middleware/javalin/tools/PublishAPI.java index 5e5bc7dd..a411c403 100644 --- a/qqq-middleware-javalin/src/main/java/com/kingsrook/qqq/middleware/javalin/tools/PublishAPI.java +++ b/qqq-middleware-javalin/src/main/java/com/kingsrook/qqq/middleware/javalin/tools/PublishAPI.java @@ -103,7 +103,7 @@ public class PublishAPI implements Callable // build the openapi spec - then run it through a "grouping" function, which will make several // // subsets of it (e.g., grouped by table mostly) - then we'll write out each such file // ///////////////////////////////////////////////////////////////////////////////////////////////// - OpenAPI openAPI = middlewareVersion.generate("qqq"); + OpenAPI openAPI = middlewareVersion.generateOpenAPIModel("qqq"); String yaml = YamlUtils.toYaml(openAPI, mapper -> { if(sortFileContentsForHuman) diff --git a/qqq-middleware-javalin/src/main/java/com/kingsrook/qqq/middleware/javalin/tools/ValidateAPIVersions.java b/qqq-middleware-javalin/src/main/java/com/kingsrook/qqq/middleware/javalin/tools/ValidateAPIVersions.java index d7986fe1..fdc918ae 100644 --- a/qqq-middleware-javalin/src/main/java/com/kingsrook/qqq/middleware/javalin/tools/ValidateAPIVersions.java +++ b/qqq-middleware-javalin/src/main/java/com/kingsrook/qqq/middleware/javalin/tools/ValidateAPIVersions.java @@ -111,7 +111,7 @@ public class ValidateAPIVersions implements Callable /////////////////////////////////////////////////////////// // generate a new spec based on current code in codebase // /////////////////////////////////////////////////////////// - OpenAPI openAPI = middlewareVersion.generate("qqq"); + OpenAPI openAPI = middlewareVersion.generateOpenAPIModel("qqq"); String yaml = YamlUtils.toYaml(openAPI, mapper -> { mapper.configure(MapperFeature.SORT_PROPERTIES_ALPHABETICALLY, true);