From 136e26e3079687ad112ce494e155a03166e4b1ba Mon Sep 17 00:00:00 2001 From: Johnny Lim Date: Fri, 12 Jan 2018 03:05:14 +0900 Subject: [PATCH] Fix typo in DynamicRegistrationBean class name Closes gh-11606 --- .../boot/autoconfigure/jersey/JerseyAutoConfiguration.java | 4 ++-- .../boot/web/servlet/AbstractFilterRegistrationBean.java | 2 +- ...aimcRegistrationBean.java => DynamicRegistrationBean.java} | 2 +- .../boot/web/servlet/ServletContextInitializerBeans.java | 2 +- .../boot/web/servlet/ServletRegistrationBean.java | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) rename spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/{DynaimcRegistrationBean.java => DynamicRegistrationBean.java} (98%) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfiguration.java index 78ede63c7a8..4ad093d2026 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfiguration.java @@ -56,7 +56,7 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplicat import org.springframework.boot.autoconfigure.jackson.JacksonAutoConfiguration; import org.springframework.boot.autoconfigure.web.servlet.DispatcherServletAutoConfiguration; import org.springframework.boot.context.properties.EnableConfigurationProperties; -import org.springframework.boot.web.servlet.DynaimcRegistrationBean; +import org.springframework.boot.web.servlet.DynamicRegistrationBean; import org.springframework.boot.web.servlet.FilterRegistrationBean; import org.springframework.boot.web.servlet.ServletRegistrationBean; import org.springframework.context.annotation.Bean; @@ -181,7 +181,7 @@ public class JerseyAutoConfiguration implements ServletContextAware { return ClassUtils.getUserClass(this.config.getClass()).getName(); } - private void addInitParameters(DynaimcRegistrationBean registration) { + private void addInitParameters(DynamicRegistrationBean registration) { for (Entry entry : this.jersey.getInit().entrySet()) { registration.addInitParameter(entry.getKey(), entry.getValue()); } diff --git 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 index 03edfd7f430..9d5b130a7e9 100644 --- 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 @@ -42,7 +42,7 @@ import org.springframework.util.Assert; * @author Phillip Webb */ abstract class AbstractFilterRegistrationBean - extends DynaimcRegistrationBean { + extends DynamicRegistrationBean { /** * Filters that wrap the servlet request should be ordered less than or equal to this. diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/DynaimcRegistrationBean.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/DynamicRegistrationBean.java similarity index 98% rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/DynaimcRegistrationBean.java rename to spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/DynamicRegistrationBean.java index e979ca2690b..b6c685eead5 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/DynaimcRegistrationBean.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/DynamicRegistrationBean.java @@ -37,7 +37,7 @@ import org.springframework.util.StringUtils; * @author Phillip Webb * @since 2.0.0 */ -public abstract class DynaimcRegistrationBean +public abstract class DynamicRegistrationBean extends RegistrationBean { private static final Log logger = LogFactory.getLog(RegistrationBean.class); diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/ServletContextInitializerBeans.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/ServletContextInitializerBeans.java index d50ef51b7e5..b30e10c02ca 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/ServletContextInitializerBeans.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/ServletContextInitializerBeans.java @@ -246,7 +246,7 @@ public class ServletContextInitializerBeans } /** - * Adapter to convert a given Bean type into a {@link DynaimcRegistrationBean} (and + * Adapter to convert a given Bean type into a {@link DynamicRegistrationBean} (and * hence a {@link ServletContextInitializer}. */ private interface RegistrationBeanAdapter { diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/ServletRegistrationBean.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/ServletRegistrationBean.java index f710e9242dc..0a51f66422b 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/ServletRegistrationBean.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/ServletRegistrationBean.java @@ -51,7 +51,7 @@ import org.springframework.util.ObjectUtils; * @see ServletContext#addServlet(String, Servlet) */ public class ServletRegistrationBean - extends DynaimcRegistrationBean { + extends DynamicRegistrationBean { private static final Log logger = LogFactory.getLog(ServletRegistrationBean.class);