Merge branch '2.1.x'

2019-06-28 14:15:17 -07:00
parent c62b6b4ccd 9aa4887376
commit a417e136a3
1 changed files with 1 additions and 1 deletions
--- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/AbstractFilterRegistrationBean.java
+++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/AbstractFilterRegistrationBean.java
@@ -41,7 +41,7 @@ import org.springframework.util.StringUtils;
 * @author Brian Clozel
 * @since 1.5.22
 */
-public abstract class AbstractFilterRegistrationBean extends RegistrationBean {
+public abstract class AbstractFilterRegistrationBean<T extends Filter> extends DynamicRegistrationBean<Dynamic> {

 	private static final String[] DEFAULT_URL_MAPPINGS = { "/*" };