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

Merge pull request #11606 from izeye:fix-typo-dynamic 

* pr/11606:
  Fix typo in DynamicRegistrationBean class name
This commit is contained in:
Stephane Nicoll 2018-01-12 01:45:09 +01:00
parent bfa2c87b4e 136e26e307
commit 270acd4636
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfiguration.java
View File

@ -56,7 +56,7 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplicat
import org.springframework.boot.autoconfigure.jackson.JacksonAutoConfiguration; import org.springframework.boot.autoconfigure.jackson.JacksonAutoConfiguration;
import org.springframework.boot.autoconfigure.web.servlet.DispatcherServletAutoConfiguration; import org.springframework.boot.autoconfigure.web.servlet.DispatcherServletAutoConfiguration;
import org.springframework.boot.context.properties.EnableConfigurationProperties; 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.FilterRegistrationBean;
import org.springframework.boot.web.servlet.ServletRegistrationBean; import org.springframework.boot.web.servlet.ServletRegistrationBean;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
@ -181,7 +181,7 @@ public class JerseyAutoConfiguration implements ServletContextAware {
return ClassUtils.getUserClass(this.config.getClass()).getName(); return ClassUtils.getUserClass(this.config.getClass()).getName();
} }
private void addInitParameters(DynaimcRegistrationBean<?> registration) { private void addInitParameters(DynamicRegistrationBean<?> registration) {
for (Entry<String, String> entry : this.jersey.getInit().entrySet()) { for (Entry<String, String> entry : this.jersey.getInit().entrySet()) {
registration.addInitParameter(entry.getKey(), entry.getValue()); registration.addInitParameter(entry.getKey(), entry.getValue());
} }

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

@ -42,7 +42,7 @@ import org.springframework.util.Assert;
* @author Phillip Webb * @author Phillip Webb
*/ */
abstract class AbstractFilterRegistrationBean<T extends Filter> abstract class AbstractFilterRegistrationBean<T extends Filter>
extends DynaimcRegistrationBean<FilterRegistration.Dynamic> { extends DynamicRegistrationBean<Dynamic> {
/** /**
* Filters that wrap the servlet request should be ordered less than or equal to this. * Filters that wrap the servlet request should be ordered less than or equal to this.

2
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/DynaimcRegistrationBean.java → spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/DynamicRegistrationBean.java
View File

@ -37,7 +37,7 @@ import org.springframework.util.StringUtils;
* @author Phillip Webb * @author Phillip Webb
* @since 2.0.0 * @since 2.0.0
*/ */
public abstract class DynaimcRegistrationBean<D extends Registration.Dynamic> public abstract class DynamicRegistrationBean<D extends Registration.Dynamic>
extends RegistrationBean { extends RegistrationBean {
private static final Log logger = LogFactory.getLog(RegistrationBean.class); private static final Log logger = LogFactory.getLog(RegistrationBean.class);

2
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/ServletContextInitializerBeans.java
View File

@ -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}. * hence a {@link ServletContextInitializer}.
*/ */
private interface RegistrationBeanAdapter<T> { private interface RegistrationBeanAdapter<T> {

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

@ -51,7 +51,7 @@ import org.springframework.util.ObjectUtils;
* @see ServletContext#addServlet(String, Servlet) * @see ServletContext#addServlet(String, Servlet)
*/ */
public class ServletRegistrationBean<T extends Servlet> public class ServletRegistrationBean<T extends Servlet>
extends DynaimcRegistrationBean<ServletRegistration.Dynamic> { extends DynamicRegistrationBean<ServletRegistration.Dynamic> {
private static final Log logger = LogFactory.getLog(ServletRegistrationBean.class); private static final Log logger = LogFactory.getLog(ServletRegistrationBean.class);