Browse Source

Merge pull request #14149 from izeye:polish-20180821

* pr/14149:
  Polish
pull/14149/merge
Stephane Nicoll 8 years ago
parent
commit
f8cffaf240
  1. 2
      spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/jpa/JpaRepositoriesAutoConfiguration.java
  2. 6
      spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/jpa/JpaRepositoriesAutoConfigurationTests.java
  3. 6
      spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/task/TaskSchedulingAutoConfigurationTests.java
  4. 2
      spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/ldap/DataLdapTestPropertiesIntegrationTests.java
  5. 2
      spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/mongo/DataMongoTestPropertiesIntegrationTests.java
  6. 2
      spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/neo4j/DataNeo4jTestPropertiesIntegrationTests.java
  7. 2
      spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/redis/DataRedisTestPropertiesIntegrationTests.java
  8. 2
      spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/jdbc/JdbcTestPropertiesIntegrationTests.java
  9. 2
      spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/jooq/JooqTestPropertiesIntegrationTests.java
  10. 2
      spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/json/JsonTestPropertiesIntegrationTests.java
  11. 2
      spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/orm/jpa/DataJpaTestPropertiesIntegrationTests.java
  12. 2
      spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/web/client/RestClientTestPropertiesIntegrationTests.java
  13. 2
      spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/web/reactive/WebFluxTestPropertiesIntegrationTests.java
  14. 2
      spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/web/servlet/WebMvcTestPropertiesIntegrationTests.java
  15. 2
      spring-boot-samples/spring-boot-sample-oauth2-client/src/test/java/sample/oauth2/client/SampleOAuth2ClientApplicationTests.java

2
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/jpa/JpaRepositoriesAutoConfiguration.java

@ -71,7 +71,7 @@ public class JpaRepositoriesAutoConfiguration { @@ -71,7 +71,7 @@ public class JpaRepositoriesAutoConfiguration {
@Bean
@Conditional(BootstrapExecutorCondition.class)
public EntityManagerFactoryBuilderCustomizer entityManagerFactoryBoostrapExecutorCustomizer(
public EntityManagerFactoryBuilderCustomizer entityManagerFactoryBootstrapExecutorCustomizer(
ObjectProvider<AsyncTaskExecutor> taskExecutor) {
return (builder) -> builder.setBootstrapExecutor(taskExecutor.getIfAvailable());
}

6
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/jpa/JpaRepositoriesAutoConfigurationTests.java

@ -87,7 +87,7 @@ public class JpaRepositoriesAutoConfigurationTests { @@ -87,7 +87,7 @@ public class JpaRepositoriesAutoConfigurationTests {
}
@Test
public void whenBootstrappingModeIsLazyBoostrapExecutorIsConfigured() {
public void whenBootstrappingModeIsLazyBootstrapExecutorIsConfigured() {
this.contextRunner.withUserConfiguration(TestConfiguration.class)
.withPropertyValues("spring.data.jpa.repositories.bootstrap-mode=lazy")
.run((context) -> assertThat(
@ -96,7 +96,7 @@ public class JpaRepositoriesAutoConfigurationTests { @@ -96,7 +96,7 @@ public class JpaRepositoriesAutoConfigurationTests {
}
@Test
public void whenBootstrappingModeIsDeferredBoostrapExecutorIsConfigured() {
public void whenBootstrappingModeIsDeferredBootstrapExecutorIsConfigured() {
this.contextRunner.withUserConfiguration(TestConfiguration.class)
.withPropertyValues(
"spring.data.jpa.repositories.bootstrap-mode=deferred")
@ -106,7 +106,7 @@ public class JpaRepositoriesAutoConfigurationTests { @@ -106,7 +106,7 @@ public class JpaRepositoriesAutoConfigurationTests {
}
@Test
public void whenBootstrappingModeIsDefaultBoostrapExecutorIsNotConfigured() {
public void whenBootstrappingModeIsDefaultBootstrapExecutorIsNotConfigured() {
this.contextRunner.withUserConfiguration(TestConfiguration.class)
.withPropertyValues("spring.data.jpa.repositories.bootstrap-mode=default")
.run((context) -> assertThat(

6
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/task/TaskSchedulingAutoConfigurationTests.java

@ -54,7 +54,7 @@ public class TaskSchedulingAutoConfigurationTests { @@ -54,7 +54,7 @@ public class TaskSchedulingAutoConfigurationTests {
}
@Test
public void enableSchedulingWithNoTakExecutorAutoConfiguresOne() {
public void enableSchedulingWithNoTaskExecutorAutoConfiguresOne() {
this.contextRunner
.withPropertyValues(
"spring.task.scheduling.thread-name-prefix=scheduling-test-")
@ -68,7 +68,7 @@ public class TaskSchedulingAutoConfigurationTests { @@ -68,7 +68,7 @@ public class TaskSchedulingAutoConfigurationTests {
}
@Test
public void enableSchedulingWithNoTakExecutorAppliesCustomizers() {
public void enableSchedulingWithNoTaskExecutorAppliesCustomizers() {
this.contextRunner
.withPropertyValues(
"spring.task.scheduling.thread-name-prefix=scheduling-test-")
@ -84,7 +84,7 @@ public class TaskSchedulingAutoConfigurationTests { @@ -84,7 +84,7 @@ public class TaskSchedulingAutoConfigurationTests {
}
@Test
public void enableSchedulingWithExistingTakSchedulerBacksOff() {
public void enableSchedulingWithExistingTaskSchedulerBacksOff() {
this.contextRunner.withUserConfiguration(SchedulingConfiguration.class,
TaskSchedulerConfiguration.class).run((context) -> {
assertThat(context).hasSingleBean(TaskScheduler.class);

2
spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/ldap/DataLdapTestPropertiesIntegrationTests.java

@ -39,7 +39,7 @@ public class DataLdapTestPropertiesIntegrationTests { @@ -39,7 +39,7 @@ public class DataLdapTestPropertiesIntegrationTests {
private Environment environment;
@Test
public void environmentWitNewProfile() {
public void environmentWithNewProfile() {
String profile = this.environment.getActiveProfiles()[0];
assertThat(profile).isEqualTo("test");
}

2
spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/mongo/DataMongoTestPropertiesIntegrationTests.java

@ -39,7 +39,7 @@ public class DataMongoTestPropertiesIntegrationTests { @@ -39,7 +39,7 @@ public class DataMongoTestPropertiesIntegrationTests {
private Environment environment;
@Test
public void environmentWitNewProfile() {
public void environmentWithNewProfile() {
String profile = this.environment.getActiveProfiles()[0];
assertThat(profile).isEqualTo("test");
}

2
spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/neo4j/DataNeo4jTestPropertiesIntegrationTests.java

@ -49,7 +49,7 @@ public class DataNeo4jTestPropertiesIntegrationTests { @@ -49,7 +49,7 @@ public class DataNeo4jTestPropertiesIntegrationTests {
private Environment environment;
@Test
public void environmentWitNewProfile() {
public void environmentWithNewProfile() {
String profile = this.environment.getActiveProfiles()[0];
assertThat(profile).isEqualTo("test");
}

2
spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/redis/DataRedisTestPropertiesIntegrationTests.java

@ -49,7 +49,7 @@ public class DataRedisTestPropertiesIntegrationTests { @@ -49,7 +49,7 @@ public class DataRedisTestPropertiesIntegrationTests {
private Environment environment;
@Test
public void environmentWitNewProfile() {
public void environmentWithNewProfile() {
String profile = this.environment.getActiveProfiles()[0];
assertThat(profile).isEqualTo("test");
}

2
spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/jdbc/JdbcTestPropertiesIntegrationTests.java

@ -39,7 +39,7 @@ public class JdbcTestPropertiesIntegrationTests { @@ -39,7 +39,7 @@ public class JdbcTestPropertiesIntegrationTests {
private Environment environment;
@Test
public void environmentWitNewProfile() {
public void environmentWithNewProfile() {
String profile = this.environment.getActiveProfiles()[0];
assertThat(profile).isEqualTo("test");
}

2
spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/jooq/JooqTestPropertiesIntegrationTests.java

@ -39,7 +39,7 @@ public class JooqTestPropertiesIntegrationTests { @@ -39,7 +39,7 @@ public class JooqTestPropertiesIntegrationTests {
private Environment environment;
@Test
public void environmentWitNewProfile() {
public void environmentWithNewProfile() {
String profile = this.environment.getActiveProfiles()[0];
assertThat(profile).isEqualTo("test");
}

2
spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/json/JsonTestPropertiesIntegrationTests.java

@ -39,7 +39,7 @@ public class JsonTestPropertiesIntegrationTests { @@ -39,7 +39,7 @@ public class JsonTestPropertiesIntegrationTests {
private Environment environment;
@Test
public void environmentWitNewProfile() {
public void environmentWithNewProfile() {
String profile = this.environment.getActiveProfiles()[0];
assertThat(profile).isEqualTo("test");
}

2
spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/orm/jpa/DataJpaTestPropertiesIntegrationTests.java

@ -39,7 +39,7 @@ public class DataJpaTestPropertiesIntegrationTests { @@ -39,7 +39,7 @@ public class DataJpaTestPropertiesIntegrationTests {
private Environment environment;
@Test
public void environmentWitNewProfile() {
public void environmentWithNewProfile() {
String profile = this.environment.getActiveProfiles()[0];
assertThat(profile).isEqualTo("test");
}

2
spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/web/client/RestClientTestPropertiesIntegrationTests.java

@ -39,7 +39,7 @@ public class RestClientTestPropertiesIntegrationTests { @@ -39,7 +39,7 @@ public class RestClientTestPropertiesIntegrationTests {
private Environment environment;
@Test
public void environmentWitNewProfile() {
public void environmentWithNewProfile() {
String profile = this.environment.getActiveProfiles()[0];
assertThat(profile).isEqualTo("test");
}

2
spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/web/reactive/WebFluxTestPropertiesIntegrationTests.java

@ -39,7 +39,7 @@ public class WebFluxTestPropertiesIntegrationTests { @@ -39,7 +39,7 @@ public class WebFluxTestPropertiesIntegrationTests {
private Environment environment;
@Test
public void environmentWitNewProfile() {
public void environmentWithNewProfile() {
String profile = this.environment.getActiveProfiles()[0];
assertThat(profile).isEqualTo("test");
}

2
spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/web/servlet/WebMvcTestPropertiesIntegrationTests.java

@ -39,7 +39,7 @@ public class WebMvcTestPropertiesIntegrationTests { @@ -39,7 +39,7 @@ public class WebMvcTestPropertiesIntegrationTests {
private Environment environment;
@Test
public void environmentWitNewProfile() {
public void environmentWithNewProfile() {
String profile = this.environment.getActiveProfiles()[0];
assertThat(profile).isEqualTo("test");
}

2
spring-boot-samples/spring-boot-sample-oauth2-client/src/test/java/sample/oauth2/client/SampleOAuth2ClientApplicationTests.java

@ -35,7 +35,7 @@ import static org.assertj.core.api.Assertions.assertThat; @@ -35,7 +35,7 @@ import static org.assertj.core.api.Assertions.assertThat;
@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, properties = {
"APP-CLIENT-ID=my-client-id", "APP-CLIENT-SECRET=my-client-secret",
"YAHOO-CLIENT-ID=my-yahoo-client-id",
"YAHOO-CLIENT-SECRET=my-yahooo-client-secret" })
"YAHOO-CLIENT-SECRET=my-yahoo-client-secret" })
public class SampleOAuth2ClientApplicationTests {
@LocalServerPort

Loading…
Cancel
Save