Merge branch '2.0.x' into 2.1.x

7 years ago · 9aa4887376
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;
				@@ -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> {

 	/**
 	 * Filters that wrap the servlet request should be ordered less than or equal to this.