From 8b805f9f4eb9728e085030faebf9cce34630d5ca Mon Sep 17 00:00:00 2001 From: MiniDigger | Martin Date: Tue, 16 Jul 2024 18:47:41 +0200 Subject: [PATCH] fix: properly add filters and sorters to openapi again --- .../papermc/hangar/config/SwaggerConfig.java | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/backend/src/main/java/io/papermc/hangar/config/SwaggerConfig.java b/backend/src/main/java/io/papermc/hangar/config/SwaggerConfig.java index fc7722ba6..b23d367fd 100644 --- a/backend/src/main/java/io/papermc/hangar/config/SwaggerConfig.java +++ b/backend/src/main/java/io/papermc/hangar/config/SwaggerConfig.java @@ -59,7 +59,7 @@ public class SwaggerConfig { } @Bean - public GroupedOpenApi publicOpenApi() { + public GroupedOpenApi publicOpenApi(CustomScanner customScanner) { return GroupedOpenApi.builder().group("public").pathsToMatch("/api/v1/**").addOpenApiCustomizer((openApi -> { openApi.info(new Info().title("Hangar API").version("1.0").description(""" This page describes the format for the current Hangar REST API as well as general usage guidelines.
@@ -94,17 +94,23 @@ public GroupedOpenApi publicOpenApi() { If applicable, always cache responses. The Hangar API itself is cached by CloudFlare and internally.""")); openApi.getComponents().addSecuritySchemes("HangarAuth", new SecurityScheme().type(SecurityScheme.Type.HTTP).scheme("bearer").bearerFormat("JWT")); - })).build(); + })) + .addOperationCustomizer(customScanner) + .build(); } @Bean - public GroupedOpenApi internalOpenApi() { - return GroupedOpenApi.builder().group("internal").pathsToMatch("/api/internal/**").build(); + public GroupedOpenApi internalOpenApi(CustomScanner customScanner) { + return GroupedOpenApi.builder().group("internal").pathsToMatch("/api/internal/**").addOperationCustomizer(customScanner).build(); } @Bean - public GroupedOpenApi combinedOpenApi() { - return GroupedOpenApi.builder().group("combined").pathsToMatch("/api/**").addOpenApiCustomizer(this.requiredByDefaultCustomizer()).addOpenApiCustomizer(this.exceptionCustomizer()).build(); + public GroupedOpenApi combinedOpenApi(CustomScanner customScanner) { + return GroupedOpenApi.builder().group("combined").pathsToMatch("/api/**") + .addOpenApiCustomizer(this.requiredByDefaultCustomizer()) + .addOpenApiCustomizer(this.exceptionCustomizer()) + .addOperationCustomizer(customScanner) + .build(); } public OpenApiCustomizer requiredByDefaultCustomizer() {