Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Clarify that registration bean URL patterns use Servlet spec format

Browse Source 
Closes gh-13080
This commit is contained in:
Andy Wilkinson
2018-05-10 15:45:16 +01:00
parent d2cef484cb
commit c8b3cea200
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
spring-boot/src/main/java/org/springframework/boot/web/servlet/AbstractFilterRegistrationBean.java
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright 2012-2016 the original author or authors. * Copyright 2012-2018 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -157,8 +157,8 @@ abstract class AbstractFilterRegistrationBean extends RegistrationBean {
} }
/** /**
* Return a mutable collection of URL patterns that the filter will be registered * Return a mutable collection of URL patterns, as defined in the Servlet
* against. * specification, that the filter will be registered against.
* @return the URL patterns * @return the URL patterns
*/ */
public Collection<String> getUrlPatterns() { public Collection<String> getUrlPatterns() {
@@ -166,7 +166,8 @@ abstract class AbstractFilterRegistrationBean extends RegistrationBean {
} }
/** /**
* Add URL patterns that the filter will be registered against. * Add URL patterns, as defined in the Servlet specification, that the filter will be
* registered against.
* @param urlPatterns the URL patterns * @param urlPatterns the URL patterns
*/ */
public void addUrlPatterns(String... urlPatterns) { public void addUrlPatterns(String... urlPatterns) {

7
spring-boot/src/main/java/org/springframework/boot/web/servlet/ServletRegistrationBean.java
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright 2012-2016 the original author or authors. * Copyright 2012-2018 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -128,7 +128,8 @@ public class ServletRegistrationBean extends RegistrationBean {
} }
/** /**
* Return a mutable collection of the URL mappings for the servlet. * Return a mutable collection of the URL mappings, as defined in the Servlet
* specification, for the servlet.
* @return the urlMappings * @return the urlMappings
*/ */
public Collection<String> getUrlMappings() { public Collection<String> getUrlMappings() {
@@ -136,7 +137,7 @@ public class ServletRegistrationBean extends RegistrationBean {
} }
/** /**
* Add URL mappings for the servlet. * Add URL mappings, as defined in the Servlet specification, for the servlet.
* @param urlMappings the mappings to add * @param urlMappings the mappings to add
* @see #setUrlMappings(Collection) * @see #setUrlMappings(Collection)
*/ */