Skip to content

Commit 95c3b87

Browse files
committed
Warning messages when docs are explicitly enabled. Fixes #3131
1 parent e444dee commit 95c3b87

File tree

8 files changed

+27
-19
lines changed

8 files changed

+27
-19
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -736,6 +736,6 @@ MethodParameterPojoExtractor methodParameterPojoExtractor(SchemaUtils schemaUtil
736736
@ConditionalOnMissingBean(name = "springDocAppInitializer")
737737
@Lazy(false)
738738
SpringDocAppInitializer springDocAppInitializer(SpringDocConfigProperties springDocConfigProperties){
739-
return new SpringDocAppInitializer(springDocConfigProperties.getApiDocs().getPath(), SPRINGDOC_ENABLED);
739+
return new SpringDocAppInitializer(springDocConfigProperties.getApiDocs().getPath(), SPRINGDOC_ENABLED, springDocConfigProperties.getApiDocs().isEnabled());
740740
}
741741
}

springdoc-openapi-starter-common/src/main/java/org/springdoc/core/events/SpringDocAppInitializer.java

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,11 @@ public class SpringDocAppInitializer {
4949
*/
5050
private final String property;
5151

52+
/**
53+
* The Springdoc enabled.
54+
*/
55+
private final boolean springdocEnabled;
56+
5257
/**
5358
* The constant LOGGER.
5459
*/
@@ -57,19 +62,22 @@ public class SpringDocAppInitializer {
5762
/**
5863
* Instantiates a new Spring doc app initializer.
5964
*
60-
* @param endpoint the endpoint
61-
* @param property the property
65+
* @param endpoint the endpoint
66+
* @param property the property
67+
* @param springdocEnabled the springdoc enabled
6268
*/
63-
public SpringDocAppInitializer(String endpoint, String property) {
69+
public SpringDocAppInitializer(String endpoint, String property, boolean springdocEnabled) {
6470
this.endpoint = endpoint;
6571
this.property = property;
72+
this.springdocEnabled = springdocEnabled;
6673
}
6774

6875
/**
6976
* Init.
7077
*/
7178
@EventListener(ApplicationReadyEvent.class)
7279
public void init() {
73-
LOGGER.warn("SpringDoc {} endpoint is enabled by default. To disable it in production, set the property '{}=false'", endpoint, property);
80+
if(!this.springdocEnabled)
81+
LOGGER.warn("SpringDoc {} endpoint is enabled by default. To disable it in production, set the property '{}=false'", endpoint, property);
7482
}
7583
}

springdoc-openapi-starter-common/src/main/java/org/springdoc/core/properties/SpringDocConfigProperties.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1434,7 +1434,7 @@ public static class ApiDocs {
14341434
/**
14351435
* Whether to generate and serve an OpenAPI document.
14361436
*/
1437-
private boolean enabled = true;
1437+
private boolean enabled;
14381438

14391439
/**
14401440
* The Resolve schema properties.

springdoc-openapi-starter-common/src/main/java/org/springdoc/core/properties/SwaggerUiConfigProperties.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ public class SwaggerUiConfigProperties extends AbstractSwaggerUiConfigProperties
9696
/**
9797
* Whether to generate and serve an OpenAPI document.
9898
*/
99-
private boolean enabled = true;
99+
private boolean enabled;
100100

101101
/**
102102
* The Use root path.

springdoc-openapi-starter-webflux-scalar/src/main/java/org/springdoc/webflux/scalar/ScalarConfiguration.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ ForwardedHeaderTransformer forwardedHeaderTransformer() {
102102
@ConditionalOnProperty(name = SPRINGDOC_USE_MANAGEMENT_PORT, havingValue = "false", matchIfMissing = true)
103103
@Lazy(false)
104104
SpringDocAppInitializer springDocScalarInitializer(ScalarProperties scalarProperties){
105-
return new SpringDocAppInitializer(scalarProperties.getPath(), SCALAR_ENABLED);
105+
return new SpringDocAppInitializer(scalarProperties.getPath(), SCALAR_ENABLED, scalarProperties.isEnabled());
106106
}
107107

108108
/**
@@ -135,8 +135,8 @@ ScalarActuatorController scalarActuatorController(ScalarProperties properties,
135135
@Bean
136136
@ConditionalOnMissingBean(name = "springDocScalarInitializer")
137137
@Lazy(false)
138-
SpringDocAppInitializer springDocScalarInitializer(){
139-
return new SpringDocAppInitializer(DEFAULT_SCALAR_ACTUATOR_PATH, SCALAR_ENABLED);
138+
SpringDocAppInitializer springDocScalarInitializer(ScalarProperties scalarProperties){
139+
return new SpringDocAppInitializer(DEFAULT_SCALAR_ACTUATOR_PATH, SCALAR_ENABLED, scalarProperties.isEnabled());
140140
}
141141
}
142142

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ SwaggerResourceResolver swaggerResourceResolver(SwaggerUiConfigProperties swagge
196196
@ConditionalOnProperty(name = SPRINGDOC_USE_MANAGEMENT_PORT, havingValue = "false", matchIfMissing = true)
197197
@Lazy(false)
198198
SpringDocAppInitializer springDocSwaggerInitializer(SwaggerUiConfigProperties swaggerUiConfigProperties) {
199-
return new SpringDocAppInitializer(swaggerUiConfigProperties.getPath(), SPRINGDOC_SWAGGER_UI_ENABLED);
199+
return new SpringDocAppInitializer(swaggerUiConfigProperties.getPath(), SPRINGDOC_SWAGGER_UI_ENABLED, swaggerUiConfigProperties.isEnabled());
200200
}
201201

202202
/**
@@ -233,8 +233,8 @@ SwaggerWelcomeActuator swaggerActuatorWelcome(SwaggerUiConfigProperties swaggerU
233233
@Bean
234234
@ConditionalOnMissingBean(name = "springDocSwaggerInitializer")
235235
@Lazy(false)
236-
SpringDocAppInitializer springDocSwaggerInitializer() {
237-
return new SpringDocAppInitializer(DEFAULT_SWAGGER_UI_ACTUATOR_PATH, SPRINGDOC_SWAGGER_UI_ENABLED);
236+
SpringDocAppInitializer springDocSwaggerInitializer(SwaggerUiConfigProperties swaggerUiConfigProperties) {
237+
return new SpringDocAppInitializer(DEFAULT_SWAGGER_UI_ACTUATOR_PATH, SPRINGDOC_SWAGGER_UI_ENABLED, swaggerUiConfigProperties.isEnabled());
238238
}
239239
}
240240
}

springdoc-openapi-starter-webmvc-scalar/src/main/java/org/springdoc/webmvc/scalar/ScalarConfiguration.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ public FilterRegistrationBean<ForwardedHeaderFilter> forwardedHeaderFilter() {
103103
@ConditionalOnProperty(name = SPRINGDOC_USE_MANAGEMENT_PORT, havingValue = "false", matchIfMissing = true)
104104
@Lazy(false)
105105
SpringDocAppInitializer springDocScalarInitializer(ScalarProperties scalarProperties) {
106-
return new SpringDocAppInitializer(scalarProperties.getPath(), SCALAR_ENABLED);
106+
return new SpringDocAppInitializer(scalarProperties.getPath(), SCALAR_ENABLED, scalarProperties.isEnabled());
107107
}
108108

109109
/**
@@ -137,8 +137,8 @@ ScalarActuatorController scalarActuatorController(ScalarProperties properties, W
137137
@Bean
138138
@ConditionalOnMissingBean(name = "springDocScalarInitializer")
139139
@Lazy(false)
140-
SpringDocAppInitializer springDocScalarInitializer() {
141-
return new SpringDocAppInitializer(DEFAULT_SCALAR_ACTUATOR_PATH, SCALAR_ENABLED);
140+
SpringDocAppInitializer springDocScalarInitializer(ScalarProperties properties) {
141+
return new SpringDocAppInitializer(DEFAULT_SCALAR_ACTUATOR_PATH, SCALAR_ENABLED, properties.isEnabled());
142142
}
143143
}
144144

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ SwaggerResourceResolver swaggerResourceResolver(SwaggerUiConfigProperties swagge
185185
@ConditionalOnProperty(name = SPRINGDOC_USE_MANAGEMENT_PORT, havingValue = "false", matchIfMissing = true)
186186
@Lazy(false)
187187
SpringDocAppInitializer springDocSwaggerInitializer(SwaggerUiConfigProperties swaggerUiConfigProperties) {
188-
return new SpringDocAppInitializer(swaggerUiConfigProperties.getPath(), SPRINGDOC_SWAGGER_UI_ENABLED);
188+
return new SpringDocAppInitializer(swaggerUiConfigProperties.getPath(), SPRINGDOC_SWAGGER_UI_ENABLED, swaggerUiConfigProperties.isEnabled());
189189
}
190190

191191
/**
@@ -219,8 +219,8 @@ SwaggerWelcomeActuator swaggerActuatorWelcome(SwaggerUiConfigProperties swaggerU
219219
@Bean
220220
@ConditionalOnMissingBean(name = "springDocSwaggerInitializer")
221221
@Lazy(false)
222-
SpringDocAppInitializer springDocSwaggerInitializer() {
223-
return new SpringDocAppInitializer(DEFAULT_SWAGGER_UI_ACTUATOR_PATH, SPRINGDOC_SWAGGER_UI_ENABLED);
222+
SpringDocAppInitializer springDocSwaggerInitializer(SwaggerUiConfigProperties swaggerUiConfigProperties) {
223+
return new SpringDocAppInitializer(DEFAULT_SWAGGER_UI_ACTUATOR_PATH, SPRINGDOC_SWAGGER_UI_ENABLED, swaggerUiConfigProperties.isEnabled());
224224
}
225225
}
226226
}

0 commit comments

Comments
 (0)