From b079eeff1ac29fa1874163d8131cb453d81ef2e6 Mon Sep 17 00:00:00 2001
From: Johnny Lim <izeye@naver.com>
Date: Thu, 27 Sep 2018 15:46:13 +0900
Subject: [PATCH] Polish

Closes gh-14621
---
 .../data/jdbc/JdbcRepositoriesAutoConfiguration.java     | 5 ++---
 .../additional-spring-configuration-metadata.json        | 9 ++++-----
 .../data/jdbc/ExampleDataJdbcApplication.java            | 5 ++---
 3 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/jdbc/JdbcRepositoriesAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/jdbc/JdbcRepositoriesAutoConfiguration.java
index a8cc1d6467..afd2974f98 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/jdbc/JdbcRepositoriesAutoConfiguration.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/jdbc/JdbcRepositoriesAutoConfiguration.java
@@ -34,9 +34,8 @@ import org.springframework.jdbc.core.namedparam.NamedParameterJdbcOperations;
  * {@link EnableAutoConfiguration Auto-configuration} for Spring Data's JDBC Repositories.
  * <p>
  * Once in effect, the auto-configuration is the equivalent of enabling JDBC repositories
- * using the
- * {@link org.springframework.data.jdbc.repository.config.EnableJdbcRepositories}
- * annotation and providing a {@link JdbcConfiguration} subclass.
+ * using the {@link EnableJdbcRepositories} annotation and providing a
+ * {@link JdbcConfiguration} subclass.
  *
  * @author Andy Wilkinson
  * @since 2.1.0
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/spring-boot-project/spring-boot-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json
index 27770b77b5..01cc796a07 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json
+++ b/spring-boot-project/spring-boot-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json
@@ -516,11 +516,6 @@
         "level" : "error"
       }
     },
-    {
-      "name": "spring.quartz.scheduler-name",
-      "type": "java.lang.String",
-      "defaultValue": "quartzScheduler"
-    },
     {
       "name": "spring.quartz.jdbc.initialize-schema",
       "defaultValue": "embedded"
@@ -529,6 +524,10 @@
       "name": "spring.quartz.job-store-type",
       "defaultValue": "memory"
     },
+    {
+      "name": "spring.quartz.scheduler-name",
+      "defaultValue": "quartzScheduler"
+    },
     {
       "name": "spring.rabbitmq.cache.connection.mode",
       "defaultValue": "channel"
diff --git a/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/jdbc/ExampleDataJdbcApplication.java b/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/jdbc/ExampleDataJdbcApplication.java
index cb3b0524eb..bb0534deb3 100644
--- a/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/jdbc/ExampleDataJdbcApplication.java
+++ b/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/jdbc/ExampleDataJdbcApplication.java
@@ -33,9 +33,8 @@ public class ExampleDataJdbcApplication {
 
 	@Bean
 	public DataSource dataSource() {
-		EmbeddedDatabaseBuilder builder = new EmbeddedDatabaseBuilder()
-				.generateUniqueName(true).setType(EmbeddedDatabaseType.HSQL);
-		return builder.build();
+		return new EmbeddedDatabaseBuilder().generateUniqueName(true)
+				.setType(EmbeddedDatabaseType.HSQL).build();
 	}
 
 }