Skip to content

Commit 98f1973

Browse files
committed
Warning messages when docs are explicitly enabled. Fixes #3131
1 parent b088a05 commit 98f1973

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
@@ -729,6 +729,6 @@ MethodParameterPojoExtractor methodParameterPojoExtractor(SchemaUtils schemaUtil
729729
@ConditionalOnMissingBean(name = "springDocAppInitializer")
730730
@Lazy(false)
731731
SpringDocAppInitializer springDocAppInitializer(SpringDocConfigProperties springDocConfigProperties){
732-
return new SpringDocAppInitializer(springDocConfigProperties.getApiDocs().getPath(), SPRINGDOC_ENABLED);
732+
return new SpringDocAppInitializer(springDocConfigProperties.getApiDocs().getPath(), SPRINGDOC_ENABLED, springDocConfigProperties.getApiDocs().isEnabled());
733733
}
734734
}

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
@@ -54,22 +54,30 @@ public class SpringDocAppInitializer {
5454
*/
5555
private static final Logger LOGGER = LoggerFactory.getLogger(SpringDocAppInitializer.class);
5656

57+
/**
58+
* The Springdoc enabled.
59+
*/
60+
private final boolean springdocEnabled;
61+
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, W
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
@@ -195,7 +195,7 @@ SwaggerResourceResolver swaggerResourceResolver(SwaggerUiConfigProperties swagge
195195
@ConditionalOnProperty(name = SPRINGDOC_USE_MANAGEMENT_PORT, havingValue = "false", matchIfMissing = true)
196196
@Lazy(false)
197197
SpringDocAppInitializer springDocSwaggerInitializer(SwaggerUiConfigProperties swaggerUiConfigProperties) {
198-
return new SpringDocAppInitializer(swaggerUiConfigProperties.getPath(), SPRINGDOC_SWAGGER_UI_ENABLED);
198+
return new SpringDocAppInitializer(swaggerUiConfigProperties.getPath(), SPRINGDOC_SWAGGER_UI_ENABLED, swaggerUiConfigProperties.isEnabled());
199199
}
200200

201201
/**
@@ -232,8 +232,8 @@ SwaggerWelcomeActuator swaggerActuatorWelcome(SwaggerUiConfigProperties swaggerU
232232
@Bean
233233
@ConditionalOnMissingBean(name = "springDocSwaggerInitializer")
234234
@Lazy(false)
235-
SpringDocAppInitializer springDocSwaggerInitializer() {
236-
return new SpringDocAppInitializer(DEFAULT_SWAGGER_UI_ACTUATOR_PATH, SPRINGDOC_SWAGGER_UI_ENABLED);
235+
SpringDocAppInitializer springDocSwaggerInitializer(SwaggerUiConfigProperties swaggerUiConfigProperties) {
236+
return new SpringDocAppInitializer(DEFAULT_SWAGGER_UI_ACTUATOR_PATH, SPRINGDOC_SWAGGER_UI_ENABLED, swaggerUiConfigProperties.isEnabled());
237237
}
238238
}
239239
}

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
/**
@@ -136,8 +136,8 @@ ScalarActuatorController scalarActuatorController(ScalarProperties properties,
136136
@Bean
137137
@ConditionalOnMissingBean(name = "springDocScalarInitializer")
138138
@Lazy(false)
139-
SpringDocAppInitializer springDocScalarInitializer(){
140-
return new SpringDocAppInitializer(DEFAULT_SCALAR_ACTUATOR_PATH, SCALAR_ENABLED);
139+
SpringDocAppInitializer springDocScalarInitializer(ScalarProperties scalarProperties){
140+
return new SpringDocAppInitializer(DEFAULT_SCALAR_ACTUATOR_PATH, SCALAR_ENABLED, scalarProperties.isEnabled());
141141
}
142142
}
143143

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
@@ -183,7 +183,7 @@ SwaggerResourceResolver swaggerResourceResolver(SwaggerUiConfigProperties swagge
183183
@ConditionalOnProperty(name = SPRINGDOC_USE_MANAGEMENT_PORT, havingValue = "false", matchIfMissing = true)
184184
@Lazy(false)
185185
SpringDocAppInitializer springDocSwaggerInitializer(SwaggerUiConfigProperties swaggerUiConfigProperties) {
186-
return new SpringDocAppInitializer(swaggerUiConfigProperties.getPath(), SPRINGDOC_SWAGGER_UI_ENABLED);
186+
return new SpringDocAppInitializer(swaggerUiConfigProperties.getPath(), SPRINGDOC_SWAGGER_UI_ENABLED, swaggerUiConfigProperties.isEnabled());
187187
}
188188

189189
/**
@@ -217,8 +217,8 @@ SwaggerWelcomeActuator swaggerActuatorWelcome(SwaggerUiConfigProperties swaggerU
217217
@Bean
218218
@ConditionalOnMissingBean(name = "springDocSwaggerInitializer")
219219
@Lazy(false)
220-
SpringDocAppInitializer springDocSwaggerInitializer() {
221-
return new SpringDocAppInitializer(DEFAULT_SWAGGER_UI_ACTUATOR_PATH, SPRINGDOC_SWAGGER_UI_ENABLED);
220+
SpringDocAppInitializer springDocSwaggerInitializer(SwaggerUiConfigProperties swaggerUiConfigProperties) {
221+
return new SpringDocAppInitializer(DEFAULT_SWAGGER_UI_ACTUATOR_PATH, SPRINGDOC_SWAGGER_UI_ENABLED, swaggerUiConfigProperties.isEnabled());
222222
}
223223
}
224224
}

0 commit comments

Comments
 (0)