Skip to content

Commit 776a56d

Browse files
committed
Make WebProperties and WebMvcProperties optional in SwaggerConfig. Fixes #3292
1 parent 1fde754 commit 776a56d

1 file changed

Lines changed: 10 additions & 7 deletions

File tree

  • springdoc-openapi-starter-webmvc-ui/src/main/java/org/springdoc/webmvc/ui

springdoc-openapi-starter-webmvc-ui/src/main/java/org/springdoc/webmvc/ui/SwaggerConfig.java

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -149,21 +149,24 @@ SwaggerIndexTransformer indexPageTransformer(SwaggerUiConfigProperties swaggerUi
149149
/**
150150
* Swagger web mvc configurer swagger web mvc configurer.
151151
*
152-
* @param swaggerUiConfigProperties the swagger ui calculated config
153-
* @param springWebProperties the spring web config
154-
* @param springWebMvcProperties the spring mvc config
155-
* @param swaggerIndexTransformer the swagger index transformer
156-
* @param swaggerResourceResolver the swagger resource resolver
157-
* @param swaggerWelcomeCommon the swagger welcome common
152+
* @param swaggerUiConfigProperties the swagger ui calculated config
153+
* @param springWebPropertiesProvider the spring web config provider
154+
* @param springWebMvcPropertiesProvider the spring mvc config provider
155+
* @param swaggerIndexTransformer the swagger index transformer
156+
* @param swaggerResourceResolver the swagger resource resolver
157+
* @param swaggerWelcomeCommon the swagger welcome common
158158
* @return the swagger web mvc configurer
159159
*/
160160
@Bean
161161
@ConditionalOnMissingBean
162162
@Lazy(false)
163163
SwaggerWebMvcConfigurer swaggerWebMvcConfigurer(SwaggerUiConfigProperties swaggerUiConfigProperties,
164-
WebProperties springWebProperties, WebMvcProperties springWebMvcProperties,
164+
ObjectProvider<WebProperties> springWebPropertiesProvider,
165+
ObjectProvider<WebMvcProperties> springWebMvcPropertiesProvider,
165166
SwaggerIndexTransformer swaggerIndexTransformer, SwaggerResourceResolver swaggerResourceResolver,
166167
SwaggerWelcomeCommon swaggerWelcomeCommon) {
168+
WebProperties springWebProperties = springWebPropertiesProvider.getIfAvailable(WebProperties::new);
169+
WebMvcProperties springWebMvcProperties = springWebMvcPropertiesProvider.getIfAvailable(WebMvcProperties::new);
167170
return new SwaggerWebMvcConfigurer(swaggerUiConfigProperties, springWebProperties, springWebMvcProperties, swaggerIndexTransformer, swaggerResourceResolver, swaggerWelcomeCommon);
168171
}
169172

0 commit comments

Comments
 (0)