Skip to content

Commit 70e0a27

Browse files
committed
Drop the use of the term "white list"
Closes gh-21737
1 parent d4c8fa9 commit 70e0a27

File tree

3 files changed

+5
-6
lines changed

3 files changed

+5
-6
lines changed

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/template/AbstractViewResolverProperties.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ public abstract class AbstractViewResolverProperties {
6060
private Charset charset = DEFAULT_CHARSET;
6161

6262
/**
63-
* White list of view names that can be resolved.
63+
* The view names that can be resolved.
6464
*/
6565
private String[] viewNames;
6666

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/embedded/TomcatWebServerFactoryCustomizer.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -158,8 +158,7 @@ private void customizeRemoteIpValve(ConfigurableTomcatWebServerFactory factory)
158158
if (StringUtils.hasLength(remoteIpHeader)) {
159159
valve.setRemoteIpHeader(remoteIpHeader);
160160
}
161-
// The internal proxies default to a white list of "safe" internal IP
162-
// addresses
161+
// The internal proxies default to a list of "safe" internal IP addresses
163162
valve.setInternalProxies(tomcatProperties.getInternalProxies());
164163
valve.setPortHeader(tomcatProperties.getPortHeader());
165164
valve.setProtocolHeaderHttpsValue(tomcatProperties.getProtocolHeaderHttpsValue());

spring-boot-project/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -316,7 +316,7 @@ Rather, pick only the properties that you need.
316316
spring.freemarker.settings.*= # Well-known FreeMarker keys which are passed to FreeMarker's Configuration.
317317
spring.freemarker.suffix=.ftl # Suffix that gets appended to view names when building a URL.
318318
spring.freemarker.template-loader-path=classpath:/templates/ # Comma-separated list of template paths.
319-
spring.freemarker.view-names= # White list of view names that can be resolved.
319+
spring.freemarker.view-names= # The view names that can be resolved.
320320
321321
# GROOVY TEMPLATES ({spring-boot-autoconfigure-module-code}/groovy/template/GroovyTemplateProperties.java[GroovyTemplateProperties])
322322
spring.groovy.template.allow-request-override=false # Whether HttpServletRequest attributes are allowed to override (hide) controller generated model attributes of the same name.
@@ -334,7 +334,7 @@ Rather, pick only the properties that you need.
334334
spring.groovy.template.request-context-attribute= # Name of the RequestContext attribute for all views.
335335
spring.groovy.template.resource-loader-path=classpath:/templates/ # Template path.
336336
spring.groovy.template.suffix=.tpl # Suffix that gets appended to view names when building a URL.
337-
spring.groovy.template.view-names= # White list of view names that can be resolved.
337+
spring.groovy.template.view-names= # The view names that can be resolved.
338338
339339
# SPRING HATEOAS ({spring-boot-autoconfigure-module-code}/hateoas/HateoasProperties.java[HateoasProperties])
340340
spring.hateoas.use-hal-as-default-json-media-type=true # Whether application/hal+json responses should be sent to requests that accept application/json.
@@ -422,7 +422,7 @@ Rather, pick only the properties that you need.
422422
spring.mustache.prefix=classpath:/templates/ # Prefix to apply to template names.
423423
spring.mustache.request-context-attribute= # Name of the RequestContext attribute for all views.
424424
spring.mustache.suffix=.mustache # Suffix to apply to template names.
425-
spring.mustache.view-names= # White list of view names that can be resolved.
425+
spring.mustache.view-names= # The view names that can be resolved.
426426
427427
# SPRING MVC ({spring-boot-autoconfigure-module-code}/web/servlet/WebMvcProperties.java[WebMvcProperties])
428428
spring.mvc.async.request-timeout= # Amount of time before asynchronous request handling times out.

0 commit comments

Comments
 (0)