root
/
spring-boot
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Merge pull request #14954 from Hanope

Browse Source 
* pr/14954:
  Fix typos
pull/14971/head
Stephane Nicoll 6 years ago
parent a43728d9d8 65e3b9ff5b
commit 3652f15cb7
4 changed files with 50 additions and 50 deletions
Show Stats Download Patch File Download Diff File

46
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnBeanTests.java
Unescape Escape View File

@ -155,8 +155,8 @@ public class ConditionalOnBeanTests {
@Test @Test
public void parameterizedContainerWhenValueIsOfMissingBeanDoesNotMatch() { public void parameterizedContainerWhenValueIsOfMissingBeanDoesNotMatch() {
this.contextRunner this.contextRunner
.withUserConfiguration(ParmeterizedWithoutCustomConfig.class, .withUserConfiguration(ParameterizedWithoutCustomConfig.class,
ParmeterizedConditionWithValueConfig.class) ParameterizedConditionWithValueConfig.class)
.run((context) -> assertThat(context) .run((context) -> assertThat(context)
.satisfies(exampleBeanRequirement("otherExampleBean"))); .satisfies(exampleBeanRequirement("otherExampleBean")));
} }
@ -164,8 +164,8 @@ public class ConditionalOnBeanTests {
@Test @Test
public void parameterizedContainerWhenValueIsOfExistingBeanMatches() { public void parameterizedContainerWhenValueIsOfExistingBeanMatches() {
this.contextRunner this.contextRunner
.withUserConfiguration(ParmeterizedWithCustomConfig.class, .withUserConfiguration(ParameterizedWithCustomConfig.class,
ParmeterizedConditionWithValueConfig.class) ParameterizedConditionWithValueConfig.class)
.run((context) -> assertThat(context).satisfies(exampleBeanRequirement( .run((context) -> assertThat(context).satisfies(exampleBeanRequirement(
"customExampleBean", "conditionalCustomExampleBean"))); "customExampleBean", "conditionalCustomExampleBean")));
} }
@ -173,8 +173,8 @@ public class ConditionalOnBeanTests {
@Test @Test
public void parameterizedContainerWhenValueIsOfMissingBeanRegistrationDoesNotMatch() { public void parameterizedContainerWhenValueIsOfMissingBeanRegistrationDoesNotMatch() {
this.contextRunner this.contextRunner
.withUserConfiguration(ParmeterizedWithoutCustomContainerConfig.class, .withUserConfiguration(ParameterizedWithoutCustomContainerConfig.class,
ParmeterizedConditionWithValueConfig.class) ParameterizedConditionWithValueConfig.class)
.run((context) -> assertThat(context) .run((context) -> assertThat(context)
.satisfies(exampleBeanRequirement("otherExampleBean"))); .satisfies(exampleBeanRequirement("otherExampleBean")));
} }
@ -182,8 +182,8 @@ public class ConditionalOnBeanTests {
@Test @Test
public void parameterizedContainerWhenValueIsOfExistingBeanRegistrationMatches() { public void parameterizedContainerWhenValueIsOfExistingBeanRegistrationMatches() {
this.contextRunner this.contextRunner
.withUserConfiguration(ParmeterizedWithCustomContainerConfig.class, .withUserConfiguration(ParameterizedWithCustomContainerConfig.class,
ParmeterizedConditionWithValueConfig.class) ParameterizedConditionWithValueConfig.class)
.run((context) -> assertThat(context).satisfies(exampleBeanRequirement( .run((context) -> assertThat(context).satisfies(exampleBeanRequirement(
"customExampleBean", "conditionalCustomExampleBean"))); "customExampleBean", "conditionalCustomExampleBean")));
} }
@ -191,8 +191,8 @@ public class ConditionalOnBeanTests {
@Test @Test
public void parameterizedContainerWhenReturnTypeIsOfExistingBeanMatches() { public void parameterizedContainerWhenReturnTypeIsOfExistingBeanMatches() {
this.contextRunner this.contextRunner
.withUserConfiguration(ParmeterizedWithCustomConfig.class, .withUserConfiguration(ParameterizedWithCustomConfig.class,
ParmeterizedConditionWithReturnTypeConfig.class) ParameterizedConditionWithReturnTypeConfig.class)
.run((context) -> assertThat(context).satisfies(exampleBeanRequirement( .run((context) -> assertThat(context).satisfies(exampleBeanRequirement(
"customExampleBean", "conditionalCustomExampleBean"))); "customExampleBean", "conditionalCustomExampleBean")));
} }
@ -200,8 +200,8 @@ public class ConditionalOnBeanTests {
@Test @Test
public void parameterizedContainerWhenReturnTypeIsOfExistingBeanRegistrationMatches() { public void parameterizedContainerWhenReturnTypeIsOfExistingBeanRegistrationMatches() {
this.contextRunner this.contextRunner
.withUserConfiguration(ParmeterizedWithCustomContainerConfig.class, .withUserConfiguration(ParameterizedWithCustomContainerConfig.class,
ParmeterizedConditionWithReturnTypeConfig.class) ParameterizedConditionWithReturnTypeConfig.class)
.run((context) -> assertThat(context).satisfies(exampleBeanRequirement( .run((context) -> assertThat(context).satisfies(exampleBeanRequirement(
"customExampleBean", "conditionalCustomExampleBean"))); "customExampleBean", "conditionalCustomExampleBean")));
} }
@ -209,8 +209,8 @@ public class ConditionalOnBeanTests {
@Test @Test
public void parameterizedContainerWhenReturnRegistrationTypeIsOfExistingBeanMatches() { public void parameterizedContainerWhenReturnRegistrationTypeIsOfExistingBeanMatches() {
this.contextRunner this.contextRunner
.withUserConfiguration(ParmeterizedWithCustomConfig.class, .withUserConfiguration(ParameterizedWithCustomConfig.class,
ParmeterizedConditionWithReturnRegistrationTypeConfig.class) ParameterizedConditionWithReturnRegistrationTypeConfig.class)
.run((context) -> assertThat(context).satisfies(exampleBeanRequirement( .run((context) -> assertThat(context).satisfies(exampleBeanRequirement(
"customExampleBean", "conditionalCustomExampleBean"))); "customExampleBean", "conditionalCustomExampleBean")));
} }
@ -218,8 +218,8 @@ public class ConditionalOnBeanTests {
@Test @Test
public void parameterizedContainerWhenReturnRegistrationTypeIsOfExistingBeanRegistrationMatches() { public void parameterizedContainerWhenReturnRegistrationTypeIsOfExistingBeanRegistrationMatches() {
this.contextRunner this.contextRunner
.withUserConfiguration(ParmeterizedWithCustomContainerConfig.class, .withUserConfiguration(ParameterizedWithCustomContainerConfig.class,
ParmeterizedConditionWithReturnRegistrationTypeConfig.class) ParameterizedConditionWithReturnRegistrationTypeConfig.class)
.run((context) -> assertThat(context).satisfies(exampleBeanRequirement( .run((context) -> assertThat(context).satisfies(exampleBeanRequirement(
"customExampleBean", "conditionalCustomExampleBean"))); "customExampleBean", "conditionalCustomExampleBean")));
} }
@ -415,7 +415,7 @@ public class ConditionalOnBeanTests {
} }
@Configuration @Configuration
static class ParmeterizedWithCustomConfig { static class ParameterizedWithCustomConfig {
@Bean @Bean
public CustomExampleBean customExampleBean() { public CustomExampleBean customExampleBean() {
@ -425,7 +425,7 @@ public class ConditionalOnBeanTests {
} }
@Configuration @Configuration
static class ParmeterizedWithoutCustomConfig { static class ParameterizedWithoutCustomConfig {
@Bean @Bean
public OtherExampleBean otherExampleBean() { public OtherExampleBean otherExampleBean() {
@ -435,7 +435,7 @@ public class ConditionalOnBeanTests {
} }
@Configuration @Configuration
static class ParmeterizedWithoutCustomContainerConfig { static class ParameterizedWithoutCustomContainerConfig {
@Bean @Bean
public TestParameterizedContainer<OtherExampleBean> otherExampleBean() { public TestParameterizedContainer<OtherExampleBean> otherExampleBean() {
@ -445,7 +445,7 @@ public class ConditionalOnBeanTests {
} }
@Configuration @Configuration
static class ParmeterizedWithCustomContainerConfig { static class ParameterizedWithCustomContainerConfig {
@Bean @Bean
public TestParameterizedContainer<CustomExampleBean> customExampleBean() { public TestParameterizedContainer<CustomExampleBean> customExampleBean() {
@ -455,7 +455,7 @@ public class ConditionalOnBeanTests {
} }
@Configuration @Configuration
static class ParmeterizedConditionWithValueConfig { static class ParameterizedConditionWithValueConfig {
@Bean @Bean
@ConditionalOnBean(value = CustomExampleBean.class, parameterizedContainer = TestParameterizedContainer.class) @ConditionalOnBean(value = CustomExampleBean.class, parameterizedContainer = TestParameterizedContainer.class)
@ -466,7 +466,7 @@ public class ConditionalOnBeanTests {
} }
@Configuration @Configuration
static class ParmeterizedConditionWithReturnTypeConfig { static class ParameterizedConditionWithReturnTypeConfig {
@Bean @Bean
@ConditionalOnBean(parameterizedContainer = TestParameterizedContainer.class) @ConditionalOnBean(parameterizedContainer = TestParameterizedContainer.class)
@ -477,7 +477,7 @@ public class ConditionalOnBeanTests {
} }
@Configuration @Configuration
static class ParmeterizedConditionWithReturnRegistrationTypeConfig { static class ParameterizedConditionWithReturnRegistrationTypeConfig {
@Bean @Bean
@ConditionalOnBean(parameterizedContainer = TestParameterizedContainer.class) @ConditionalOnBean(parameterizedContainer = TestParameterizedContainer.class)

46
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnMissingBeanTests.java
Unescape Escape View File

@ -310,8 +310,8 @@ public class ConditionalOnMissingBeanTests {
@Test @Test
public void parameterizedContainerWhenValueIsOfMissingBeanMatches() { public void parameterizedContainerWhenValueIsOfMissingBeanMatches() {
this.contextRunner this.contextRunner
.withUserConfiguration(ParmeterizedWithoutCustomConfig.class, .withUserConfiguration(ParameterizedWithoutCustomConfig.class,
ParmeterizedConditionWithValueConfig.class) ParameterizedConditionWithValueConfig.class)
.run((context) -> assertThat(context).satisfies(exampleBeanRequirement( .run((context) -> assertThat(context).satisfies(exampleBeanRequirement(
"otherExampleBean", "conditionalCustomExampleBean"))); "otherExampleBean", "conditionalCustomExampleBean")));
} }
@ -319,8 +319,8 @@ public class ConditionalOnMissingBeanTests {
@Test @Test
public void parameterizedContainerWhenValueIsOfExistingBeanDoesNotMatch() { public void parameterizedContainerWhenValueIsOfExistingBeanDoesNotMatch() {
this.contextRunner this.contextRunner
.withUserConfiguration(ParmeterizedWithCustomConfig.class, .withUserConfiguration(ParameterizedWithCustomConfig.class,
ParmeterizedConditionWithValueConfig.class) ParameterizedConditionWithValueConfig.class)
.run((context) -> assertThat(context) .run((context) -> assertThat(context)
.satisfies(exampleBeanRequirement("customExampleBean"))); .satisfies(exampleBeanRequirement("customExampleBean")));
} }
@ -328,8 +328,8 @@ public class ConditionalOnMissingBeanTests {
@Test @Test
public void parameterizedContainerWhenValueIsOfMissingBeanRegistrationMatches() { public void parameterizedContainerWhenValueIsOfMissingBeanRegistrationMatches() {
this.contextRunner this.contextRunner
.withUserConfiguration(ParmeterizedWithoutCustomContainerConfig.class, .withUserConfiguration(ParameterizedWithoutCustomContainerConfig.class,
ParmeterizedConditionWithValueConfig.class) ParameterizedConditionWithValueConfig.class)
.run((context) -> assertThat(context).satisfies(exampleBeanRequirement( .run((context) -> assertThat(context).satisfies(exampleBeanRequirement(
"otherExampleBean", "conditionalCustomExampleBean"))); "otherExampleBean", "conditionalCustomExampleBean")));
} }
@ -337,8 +337,8 @@ public class ConditionalOnMissingBeanTests {
@Test @Test
public void parameterizedContainerWhenValueIsOfExistingBeanRegistrationDoesNotMatch() { public void parameterizedContainerWhenValueIsOfExistingBeanRegistrationDoesNotMatch() {
this.contextRunner this.contextRunner
.withUserConfiguration(ParmeterizedWithCustomContainerConfig.class, .withUserConfiguration(ParameterizedWithCustomContainerConfig.class,
ParmeterizedConditionWithValueConfig.class) ParameterizedConditionWithValueConfig.class)
.run((context) -> assertThat(context) .run((context) -> assertThat(context)
.satisfies(exampleBeanRequirement("customExampleBean"))); .satisfies(exampleBeanRequirement("customExampleBean")));
} }
@ -346,8 +346,8 @@ public class ConditionalOnMissingBeanTests {
@Test @Test
public void parameterizedContainerWhenReturnTypeIsOfExistingBeanDoesNotMatch() { public void parameterizedContainerWhenReturnTypeIsOfExistingBeanDoesNotMatch() {
this.contextRunner this.contextRunner
.withUserConfiguration(ParmeterizedWithCustomConfig.class, .withUserConfiguration(ParameterizedWithCustomConfig.class,
ParmeterizedConditionWithReturnTypeConfig.class) ParameterizedConditionWithReturnTypeConfig.class)
.run((context) -> assertThat(context) .run((context) -> assertThat(context)
.satisfies(exampleBeanRequirement("customExampleBean"))); .satisfies(exampleBeanRequirement("customExampleBean")));
} }
@ -355,8 +355,8 @@ public class ConditionalOnMissingBeanTests {
@Test @Test
public void parameterizedContainerWhenReturnTypeIsOfExistingBeanRegistrationDoesNotMatch() { public void parameterizedContainerWhenReturnTypeIsOfExistingBeanRegistrationDoesNotMatch() {
this.contextRunner this.contextRunner
.withUserConfiguration(ParmeterizedWithCustomContainerConfig.class, .withUserConfiguration(ParameterizedWithCustomContainerConfig.class,
ParmeterizedConditionWithReturnTypeConfig.class) ParameterizedConditionWithReturnTypeConfig.class)
.run((context) -> assertThat(context) .run((context) -> assertThat(context)
.satisfies(exampleBeanRequirement("customExampleBean"))); .satisfies(exampleBeanRequirement("customExampleBean")));
} }
@ -364,8 +364,8 @@ public class ConditionalOnMissingBeanTests {
@Test @Test
public void parameterizedContainerWhenReturnRegistrationTypeIsOfExistingBeanDoesNotMatch() { public void parameterizedContainerWhenReturnRegistrationTypeIsOfExistingBeanDoesNotMatch() {
this.contextRunner this.contextRunner
.withUserConfiguration(ParmeterizedWithCustomConfig.class, .withUserConfiguration(ParameterizedWithCustomConfig.class,
ParmeterizedConditionWithReturnRegistrationTypeConfig.class) ParameterizedConditionWithReturnRegistrationTypeConfig.class)
.run((context) -> assertThat(context) .run((context) -> assertThat(context)
.satisfies(exampleBeanRequirement("customExampleBean"))); .satisfies(exampleBeanRequirement("customExampleBean")));
} }
@ -373,8 +373,8 @@ public class ConditionalOnMissingBeanTests {
@Test @Test
public void parameterizedContainerWhenReturnRegistrationTypeIsOfExistingBeanRegistrationDoesNotMatch() { public void parameterizedContainerWhenReturnRegistrationTypeIsOfExistingBeanRegistrationDoesNotMatch() {
this.contextRunner this.contextRunner
.withUserConfiguration(ParmeterizedWithCustomContainerConfig.class, .withUserConfiguration(ParameterizedWithCustomContainerConfig.class,
ParmeterizedConditionWithReturnRegistrationTypeConfig.class) ParameterizedConditionWithReturnRegistrationTypeConfig.class)
.run((context) -> assertThat(context) .run((context) -> assertThat(context)
.satisfies(exampleBeanRequirement("customExampleBean"))); .satisfies(exampleBeanRequirement("customExampleBean")));
} }
@ -717,7 +717,7 @@ public class ConditionalOnMissingBeanTests {
} }
@Configuration @Configuration
static class ParmeterizedWithCustomConfig { static class ParameterizedWithCustomConfig {
@Bean @Bean
public CustomExampleBean customExampleBean() { public CustomExampleBean customExampleBean() {
@ -727,7 +727,7 @@ public class ConditionalOnMissingBeanTests {
} }
@Configuration @Configuration
static class ParmeterizedWithoutCustomConfig { static class ParameterizedWithoutCustomConfig {
@Bean @Bean
public OtherExampleBean otherExampleBean() { public OtherExampleBean otherExampleBean() {
@ -737,7 +737,7 @@ public class ConditionalOnMissingBeanTests {
} }
@Configuration @Configuration
static class ParmeterizedWithoutCustomContainerConfig { static class ParameterizedWithoutCustomContainerConfig {
@Bean @Bean
public TestParameterizedContainer<OtherExampleBean> otherExampleBean() { public TestParameterizedContainer<OtherExampleBean> otherExampleBean() {
@ -747,7 +747,7 @@ public class ConditionalOnMissingBeanTests {
} }
@Configuration @Configuration
static class ParmeterizedWithCustomContainerConfig { static class ParameterizedWithCustomContainerConfig {
@Bean @Bean
public TestParameterizedContainer<CustomExampleBean> customExampleBean() { public TestParameterizedContainer<CustomExampleBean> customExampleBean() {
@ -757,7 +757,7 @@ public class ConditionalOnMissingBeanTests {
} }
@Configuration @Configuration
static class ParmeterizedConditionWithValueConfig { static class ParameterizedConditionWithValueConfig {
@Bean @Bean
@ConditionalOnMissingBean(value = CustomExampleBean.class, parameterizedContainer = TestParameterizedContainer.class) @ConditionalOnMissingBean(value = CustomExampleBean.class, parameterizedContainer = TestParameterizedContainer.class)
@ -768,7 +768,7 @@ public class ConditionalOnMissingBeanTests {
} }
@Configuration @Configuration
static class ParmeterizedConditionWithReturnTypeConfig { static class ParameterizedConditionWithReturnTypeConfig {
@Bean @Bean
@ConditionalOnMissingBean(parameterizedContainer = TestParameterizedContainer.class) @ConditionalOnMissingBean(parameterizedContainer = TestParameterizedContainer.class)
@ -779,7 +779,7 @@ public class ConditionalOnMissingBeanTests {
} }
@Configuration @Configuration
static class ParmeterizedConditionWithReturnRegistrationTypeConfig { static class ParameterizedConditionWithReturnRegistrationTypeConfig {
@Bean @Bean
@ConditionalOnMissingBean(parameterizedContainer = TestParameterizedContainer.class) @ConditionalOnMissingBean(parameterizedContainer = TestParameterizedContainer.class)

4
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/freemarker/FreeMarkerAutoConfigurationServletIntegrationTests.java
Unescape Escape View File

@ -242,7 +242,7 @@ public class FreeMarkerAutoConfigurationServletIntegrationTests {
static class FilterRegistrationResourceConfiguration { static class FilterRegistrationResourceConfiguration {
@Bean @Bean
public FilterRegistrationBean<ResourceUrlEncodingFilter> filterRegisration() { public FilterRegistrationBean<ResourceUrlEncodingFilter> filterRegistration() {
FilterRegistrationBean<ResourceUrlEncodingFilter> bean = new FilterRegistrationBean<ResourceUrlEncodingFilter>( FilterRegistrationBean<ResourceUrlEncodingFilter> bean = new FilterRegistrationBean<ResourceUrlEncodingFilter>(
new ResourceUrlEncodingFilter()); new ResourceUrlEncodingFilter());
bean.setDispatcherTypes(EnumSet.of(DispatcherType.INCLUDE)); bean.setDispatcherTypes(EnumSet.of(DispatcherType.INCLUDE));
@ -256,7 +256,7 @@ public class FreeMarkerAutoConfigurationServletIntegrationTests {
static class FilterRegistrationOtherConfiguration { static class FilterRegistrationOtherConfiguration {
@Bean @Bean
public FilterRegistrationBean<OrderedCharacterEncodingFilter> filterRegisration() { public FilterRegistrationBean<OrderedCharacterEncodingFilter> filterRegistration() {
return new FilterRegistrationBean<OrderedCharacterEncodingFilter>( return new FilterRegistrationBean<OrderedCharacterEncodingFilter>(
new OrderedCharacterEncodingFilter()); new OrderedCharacterEncodingFilter());
} }

4
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/thymeleaf/ThymeleafServletAutoConfigurationTests.java
Unescape Escape View File

@ -356,7 +356,7 @@ public class ThymeleafServletAutoConfigurationTests {
static class FilterRegistrationResourceConfiguration { static class FilterRegistrationResourceConfiguration {
@Bean @Bean
public FilterRegistrationBean<ResourceUrlEncodingFilter> filterRegisration() { public FilterRegistrationBean<ResourceUrlEncodingFilter> filterRegistration() {
FilterRegistrationBean<ResourceUrlEncodingFilter> bean = new FilterRegistrationBean<ResourceUrlEncodingFilter>( FilterRegistrationBean<ResourceUrlEncodingFilter> bean = new FilterRegistrationBean<ResourceUrlEncodingFilter>(
new ResourceUrlEncodingFilter()); new ResourceUrlEncodingFilter());
bean.setDispatcherTypes(EnumSet.of(DispatcherType.INCLUDE)); bean.setDispatcherTypes(EnumSet.of(DispatcherType.INCLUDE));
@ -370,7 +370,7 @@ public class ThymeleafServletAutoConfigurationTests {
static class FilterRegistrationOtherConfiguration { static class FilterRegistrationOtherConfiguration {
@Bean @Bean
public FilterRegistrationBean<OrderedCharacterEncodingFilter> filterRegisration() { public FilterRegistrationBean<OrderedCharacterEncodingFilter> filterRegistration() {
return new FilterRegistrationBean<OrderedCharacterEncodingFilter>( return new FilterRegistrationBean<OrderedCharacterEncodingFilter>(
new OrderedCharacterEncodingFilter()); new OrderedCharacterEncodingFilter());
} }

Write Preview
Loading…
Cancel
Save