From 5427d778fe5f3d1fe723bc098204474603dc09a7 Mon Sep 17 00:00:00 2001 From: Johnny Lim Date: Tue, 4 Sep 2018 06:27:26 +0900 Subject: [PATCH] Polish Closes gh-14293 --- .../data/mongo/MongoDataAutoConfiguration.java | 5 +++-- .../orm/jpa/HibernateJpaConfiguration.java | 2 +- .../mongo/MongoAutoConfigurationTests.java | 17 ++++++----------- .../boot/json/JacksonJsonParser.java | 2 +- 4 files changed, 11 insertions(+), 15 deletions(-) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/mongo/MongoDataAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/mongo/MongoDataAutoConfiguration.java index cfbe4b1b7a..265209c15a 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/mongo/MongoDataAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/mongo/MongoDataAutoConfiguration.java @@ -185,8 +185,9 @@ public class MongoDataAutoConfiguration { } /** - * Check if either a {@link com.mongodb.MongoClient} or - * {@link com.mongodb.client.MongoClient} bean is available. + * Check if either a {@link MongoClient com.mongodb.MongoClient} or + * {@link com.mongodb.client.MongoClient com.mongodb.client.MongoClient} bean is + * available. */ static class AnyMongoClientAvailable extends AnyNestedCondition { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/HibernateJpaConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/HibernateJpaConfiguration.java index d9a6433ab4..64b1891960 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/HibernateJpaConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/HibernateJpaConfiguration.java @@ -220,7 +220,7 @@ class HibernateJpaConfiguration extends JpaBaseConfiguration { // Continue searching } } - throw new IllegalStateException("No available JtaPlatform candidates amongst" + throw new IllegalStateException("No available JtaPlatform candidates amongst " + Arrays.toString(NO_JTA_PLATFORM_CLASSES)); } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mongo/MongoAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mongo/MongoAutoConfigurationTests.java index b86757f853..7823151052 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mongo/MongoAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mongo/MongoAutoConfigurationTests.java @@ -50,26 +50,22 @@ public class MongoAutoConfigurationTests { @Test public void optionsAdded() { - this.contextRunner.withPropertyValues("spring.data.mongodb.host:localhost") - .withUserConfiguration(OptionsConfig.class) + this.contextRunner.withUserConfiguration(OptionsConfig.class) .run((context) -> assertThat(context.getBean(MongoClient.class) .getMongoClientOptions().getSocketTimeout()).isEqualTo(300)); } @Test public void optionsAddedButNoHost() { - this.contextRunner - .withPropertyValues("spring.data.mongodb.uri:mongodb://localhost/test") - .withUserConfiguration(OptionsConfig.class) + this.contextRunner.withUserConfiguration(OptionsConfig.class) .run((context) -> assertThat(context.getBean(MongoClient.class) .getMongoClientOptions().getSocketTimeout()).isEqualTo(300)); } @Test public void optionsSslConfig() { - this.contextRunner - .withPropertyValues("spring.data.mongodb.uri:mongodb://localhost/test") - .withUserConfiguration(SslOptionsConfig.class).run((context) -> { + this.contextRunner.withUserConfiguration(SslOptionsConfig.class) + .run((context) -> { assertThat(context).hasSingleBean(MongoClient.class); MongoClient mongo = context.getBean(MongoClient.class); MongoClientOptions options = mongo.getMongoClientOptions(); @@ -81,9 +77,8 @@ public class MongoAutoConfigurationTests { @Test public void doesNotCreateMongoClientWhenAlreadyDefined() { - this.contextRunner - .withPropertyValues("spring.data.mongodb.uri:mongodb://localhost/test") - .withUserConfiguration(FallbackMongoClientConfig.class).run((context) -> { + this.contextRunner.withUserConfiguration(FallbackMongoClientConfig.class) + .run((context) -> { assertThat(context).doesNotHaveBean(MongoClient.class); assertThat(context) .hasSingleBean(com.mongodb.client.MongoClient.class); diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/json/JacksonJsonParser.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/json/JacksonJsonParser.java index 11f13e757b..4da38e6353 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/json/JacksonJsonParser.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/json/JacksonJsonParser.java @@ -37,7 +37,7 @@ public class JacksonJsonParser extends AbstractJsonParser { private ObjectMapper objectMapper; // Late binding /** - * Creates a instance with the specified {@link ObjectMapper}. + * Creates an instance with the specified {@link ObjectMapper}. * @param objectMapper the object mapper to use */ public JacksonJsonParser(ObjectMapper objectMapper) {