Merge pull request #14621 from izeye

* pr/14621:
  Polish

Author: snicoll

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/jdbc/JdbcRepositoriesAutoConfiguration.java

@@ -34,9 +34,8 @@
  * {@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

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"

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();
 	}
 
 }