root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 15 Packages Projects Releases Wiki Activity

Merge branch '2.0.x'

This commit is contained in:
Andy Wilkinson 2018-05-10 15:46:47 +01:00
parent 36c7602f2a fbf974478a
commit 0b76fc8f8e
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -154,8 +154,8 @@ public abstract class AbstractFilterRegistrationBean<T extends Filter>
}
/**
* Return a mutable collection of URL patterns that the filter will be registered
* against.
* Return a mutable collection of URL patterns, as defined in the Servlet
* specification, that the filter will be registered against.
* @return the URL patterns
*/
public Collection<String> getUrlPatterns() {
@ -163,7 +163,8 @@ public abstract class AbstractFilterRegistrationBean<T extends Filter>
}
/**
* 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
*/
public void addUrlPatterns(String... urlPatterns) {

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

@ -129,7 +129,8 @@ public class ServletRegistrationBean<T extends Servlet>
}
/**
* 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
*/
public Collection<String> getUrlMappings() {
@ -137,7 +138,7 @@ public class ServletRegistrationBean<T extends Servlet>
}
/**
* Add URL mappings for the servlet.
* Add URL mappings, as defined in the Servlet specification, for the servlet.
* @param urlMappings the mappings to add
* @see #setUrlMappings(Collection)
*/