Skip to content

Commit d4f99ac

Browse files
committed
Support Schema added in OpenAPI Specification v3.1. fixes #2345
1 parent 620f153 commit d4f99ac

File tree

2 files changed

+9
-13
lines changed

2 files changed

+9
-13
lines changed

springdoc-openapi-starter-common/src/main/java/org/springdoc/core/configuration/SpringDocConfiguration.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -458,15 +458,14 @@ static class SpringDocActuatorConfiguration {
458458
* Springdoc bean factory post processor 3 bean factory post processor.
459459
*
460460
* @param groupedOpenApis the grouped open apis
461-
* @param springDocConfigProperties the spring doc config properties
462461
* @return the bean factory post processor
463462
*/
464463
@Bean
465464
@Lazy(false)
466465
@ConditionalOnManagementPort(ManagementPortType.DIFFERENT)
467466
@Conditional(MultipleOpenApiSupportCondition.class)
468-
static BeanFactoryPostProcessor springdocBeanFactoryPostProcessor3(List<GroupedOpenApi> groupedOpenApis, SpringDocConfigProperties springDocConfigProperties) {
469-
return new SpringdocActuatorBeanFactoryConfigurer(groupedOpenApis, springDocConfigProperties);
467+
static BeanFactoryPostProcessor springdocBeanFactoryPostProcessor3(List<GroupedOpenApi> groupedOpenApis) {
468+
return new SpringdocActuatorBeanFactoryConfigurer(groupedOpenApis);
470469
}
471470

472471
/**

springdoc-openapi-starter-common/src/main/java/org/springdoc/core/configurer/SpringdocActuatorBeanFactoryConfigurer.java

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@
4343
import static org.springdoc.core.utils.Constants.DEFAULT_GROUP_NAME;
4444
import static org.springdoc.core.utils.Constants.HEALTH_PATTERN;
4545
import static org.springdoc.core.utils.Constants.MANAGEMENT_ENDPOINTS_WEB;
46+
import static org.springdoc.core.utils.Constants.SPRINGDOC_PREFIX;
4647

4748
/**
4849
* The type Springdoc bean factory configurer.
@@ -55,29 +56,25 @@ public class SpringdocActuatorBeanFactoryConfigurer extends SpringdocBeanFactory
5556
*/
5657
private final List<GroupedOpenApi> groupedOpenApis;
5758

58-
/**
59-
* The Spring doc config properties.
60-
*/
61-
private final SpringDocConfigProperties springDocConfigProperties;
62-
6359
/**
6460
* Instantiates a new Springdoc actuator bean factory configurer.
6561
*
6662
* @param groupedOpenApis the grouped open apis
67-
* @param springDocConfigProperties the spring doc config properties
6863
*/
69-
public SpringdocActuatorBeanFactoryConfigurer(List<GroupedOpenApi> groupedOpenApis, SpringDocConfigProperties springDocConfigProperties) {
64+
public SpringdocActuatorBeanFactoryConfigurer(List<GroupedOpenApi> groupedOpenApis) {
7065
this.groupedOpenApis = groupedOpenApis;
71-
this.springDocConfigProperties=springDocConfigProperties;
7266
}
7367

7468
@Override
7569
public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory) {
7670
final BindResult<WebEndpointProperties> result = Binder.get(environment)
7771
.bind(MANAGEMENT_ENDPOINTS_WEB, WebEndpointProperties.class);
78-
if (result.isBound()) {
72+
final BindResult<SpringDocConfigProperties> springDocConfigPropertiesBindResult = Binder.get(environment)
73+
.bind(SPRINGDOC_PREFIX, SpringDocConfigProperties.class);
74+
75+
if (result.isBound() && springDocConfigPropertiesBindResult.isBound()) {
7976
WebEndpointProperties webEndpointProperties = result.get();
80-
77+
SpringDocConfigProperties springDocConfigProperties = springDocConfigPropertiesBindResult.get();
8178
List<GroupedOpenApi> newGroups = new ArrayList<>();
8279

8380
ActuatorOpenApiCustomizer actuatorOpenApiCustomizer = new ActuatorOpenApiCustomizer(webEndpointProperties);

0 commit comments

Comments
 (0)