Merge branch '1.4.x' into 1.5.x

spring-boot-docs/src/main/java/org/springframework/boot/jdbc/BasicDataSourceExample.java

@@ -45,4 +45,5 @@ public class BasicDataSourceExample {
 		// end::configuration[]
 
 	}
+
 }

spring-boot-docs/src/main/java/org/springframework/boot/jdbc/CompleteTwoDataSourcesExample.java

@@ -25,8 +25,8 @@ import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Primary;
 
 /**
- * Example configuration for configuring two data sources with what Spring Boot does
- * in auto-configuration.
+ * Example configuration for configuring two data sources with what Spring Boot does in
+ * auto-configuration.
  *
  * @author Stephane Nicoll
  */
@@ -50,9 +50,7 @@ public class CompleteTwoDataSourcesExample {
 		@Primary
 		@ConfigurationProperties("app.datasource.foo")
 		public DataSource fooDataSource() {
-			return fooDataSourceProperties()
-					.initializeDataSourceBuilder()
-					.build();
+			return fooDataSourceProperties().initializeDataSourceBuilder().build();
 		}
 
 		@Bean
@@ -61,13 +59,10 @@ public class CompleteTwoDataSourcesExample {
 			return new DataSourceProperties();
 		}
 
-
 		@Bean
 		@ConfigurationProperties("app.datasource.bar")
 		public DataSource barDataSource() {
-			return barDataSourceProperties()
-					.initializeDataSourceBuilder()
-					.build();
+			return barDataSourceProperties().initializeDataSourceBuilder().build();
 		}
 		// end::configuration[]
 

spring-boot-docs/src/main/java/org/springframework/boot/jdbc/ConfigurableDataSourceExample.java

@@ -52,10 +52,10 @@ public class ConfigurableDataSourceExample {
 		@ConfigurationProperties("app.datasource")
 		public HikariDataSource dataSource(DataSourceProperties properties) {
 			return (HikariDataSource) properties.initializeDataSourceBuilder()
-					.type(HikariDataSource.class)
-					.build();
+					.type(HikariDataSource.class).build();
 		}
 		// end::configuration[]
 
 	}
+
 }

spring-boot-docs/src/main/java/org/springframework/boot/jdbc/SimpleDataSourceExample.java

@@ -43,8 +43,7 @@ public class SimpleDataSourceExample {
 		@ConfigurationProperties("app.datasource")
 		public HikariDataSource dataSource() {
 			return (HikariDataSource) DataSourceBuilder.create()
-					.type(HikariDataSource.class)
-					.build();
+					.type(HikariDataSource.class).build();
 		}
 		// end::configuration[]
 

spring-boot-docs/src/main/java/org/springframework/boot/jdbc/SimpleTwoDataSourcesExample.java

@@ -53,18 +53,14 @@ public class SimpleTwoDataSourcesExample {
 		@Primary
 		@ConfigurationProperties("app.datasource.foo")
 		public DataSource fooDataSource() {
-			return fooDataSourceProperties()
-					.initializeDataSourceBuilder()
-					.build();
+			return fooDataSourceProperties().initializeDataSourceBuilder().build();
 		}
 
-
 		@Bean
 		@ConfigurationProperties("app.datasource.bar")
 		public BasicDataSource barDataSource() {
 			return (BasicDataSource) DataSourceBuilder.create()
-					.type(BasicDataSource.class)
-					.build();
+					.type(BasicDataSource.class).build();
 		}
 		// end::configuration[]