diff --git a/build.gradle b/build.gradle index 556fa3f..559a5c6 100644 --- a/build.gradle +++ b/build.gradle @@ -4,7 +4,7 @@ plugins { } // 버전 변경은 여기서 -def commonVer = "beta.1.1.29" +def commonVer = "beta.1.1.30" group = 'com.kri.common' version = commonVer diff --git a/src/main/java/com/kri/common/autoconfigure/swagger/KriSwaggerAutoConfiguration.java b/src/main/java/com/kri/common/autoconfigure/swagger/KriSwaggerAutoConfiguration.java index b59f9ae..f58573e 100644 --- a/src/main/java/com/kri/common/autoconfigure/swagger/KriSwaggerAutoConfiguration.java +++ b/src/main/java/com/kri/common/autoconfigure/swagger/KriSwaggerAutoConfiguration.java @@ -14,6 +14,8 @@ import io.swagger.v3.oas.models.media.Schema; import io.swagger.v3.oas.models.parameters.Parameter; import io.swagger.v3.oas.models.security.SecurityRequirement; import io.swagger.v3.oas.models.security.SecurityScheme; +import java.util.LinkedHashSet; +import java.util.Set; import lombok.RequiredArgsConstructor; import org.springdoc.core.customizers.GlobalOpenApiCustomizer; import org.springdoc.core.customizers.ParameterCustomizer; @@ -35,6 +37,8 @@ import org.springframework.core.MethodParameter; @RequiredArgsConstructor public class KriSwaggerAutoConfiguration { + private static final String API_KEY_ADMIN_PACKAGE = "com.kri.common.endpoint.auth.apikey"; + private final KriSwaggerProperties properties; private final ApiKeyProperties apiKeyProperties; // apikey.header-name 읽기용 @@ -77,9 +81,13 @@ public class KriSwaggerAutoConfiguration { .group("kri-api") .pathsToMatch("/api/**", "/internal/**"); - String base = properties.getBasePackage(); - if (base != null && !base.isBlank()) { - builder.packagesToScan(base, "com.kri.common.feature.auth.apikey"); + Set packagesToScan = new LinkedHashSet<>(properties.getBasePackage()); + if (apiKeyProperties.isAdminApiEnabled()) { + packagesToScan.add(API_KEY_ADMIN_PACKAGE); + } + packagesToScan.removeIf(pack -> pack == null || pack.isBlank()); + if (!packagesToScan.isEmpty()) { + builder.packagesToScan(packagesToScan.toArray(String[]::new)); } return builder.build(); diff --git a/src/main/java/com/kri/common/autoconfigure/swagger/KriSwaggerProperties.java b/src/main/java/com/kri/common/autoconfigure/swagger/KriSwaggerProperties.java index e56a360..70bf414 100644 --- a/src/main/java/com/kri/common/autoconfigure/swagger/KriSwaggerProperties.java +++ b/src/main/java/com/kri/common/autoconfigure/swagger/KriSwaggerProperties.java @@ -21,7 +21,7 @@ public class KriSwaggerProperties { /** * 臾몄꽌?뷀븷 base package (null ?대㈃ ?꾩껜) */ - private String basePackage; + private List basePackage = new ArrayList<>(); /** * Swagger ?묎렐 ?덉슜 IP 紐⑸줉 (127.0.0.1, localhost, 0:0:0:0:0:0:0:1?€ 湲곕낯 ?덉슜) diff --git a/src/main/java/com/kri/common/runtime/swagger/CodeEnumOpenApiCustomizer.java b/src/main/java/com/kri/common/runtime/swagger/CodeEnumOpenApiCustomizer.java index 71bef99..2426f89 100644 --- a/src/main/java/com/kri/common/runtime/swagger/CodeEnumOpenApiCustomizer.java +++ b/src/main/java/com/kri/common/runtime/swagger/CodeEnumOpenApiCustomizer.java @@ -9,6 +9,7 @@ import io.swagger.v3.oas.models.media.Schema; import io.swagger.v3.oas.models.parameters.Parameter; import io.swagger.v3.oas.models.responses.ApiResponse; import java.lang.reflect.Field; +import java.util.List; import java.util.LinkedHashMap; import java.util.Map; import org.springdoc.core.customizers.GlobalOpenApiCustomizer; @@ -19,11 +20,11 @@ import org.springframework.context.annotation.ClassPathScanningCandidateComponen public class CodeEnumOpenApiCustomizer implements GlobalOpenApiCustomizer { - private final String basePackage; + private final List basePackages; private Map> componentClasses; - public CodeEnumOpenApiCustomizer(String basePackage) { - this.basePackage = basePackage; + public CodeEnumOpenApiCustomizer(List basePackages) { + this.basePackages = basePackages; } @Override @@ -169,7 +170,7 @@ public class CodeEnumOpenApiCustomizer implements GlobalOpenApiCustomizer { } private Map> collectComponentClasses(Map schemas) { - if (schemas == null || schemas.isEmpty() || basePackage == null || basePackage.isBlank()) { + if (schemas == null || schemas.isEmpty() || basePackages == null || basePackages.isEmpty()) { return Map.of(); } @@ -182,16 +183,22 @@ public class CodeEnumOpenApiCustomizer implements GlobalOpenApiCustomizer { new ClassPathScanningCandidateComponentProvider(false); scanner.addIncludeFilter(new AllClassesTypeFilter()); - for (var beanDefinition : scanner.findCandidateComponents(basePackage)) { - String className = beanDefinition.getBeanClassName(); - if (className == null || className.isBlank()) { + for (String basePackage : basePackages) { + if (basePackage == null || basePackage.isBlank()) { continue; } - try { - Class clazz = Class.forName(className); - classes.putIfAbsent(clazz.getSimpleName(), clazz); - } catch (ClassNotFoundException ignored) { + for (var beanDefinition : scanner.findCandidateComponents(basePackage)) { + String className = beanDefinition.getBeanClassName(); + if (className == null || className.isBlank()) { + continue; + } + + try { + Class clazz = Class.forName(className); + classes.putIfAbsent(clazz.getSimpleName(), clazz); + } catch (ClassNotFoundException ignored) { + } } }