spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2026-10-01 06:49:42 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch '2.1.x'

Browse Source 
Closes gh-17079
This commit is contained in:
Andy Wilkinson
2019-06-07 11:00:44 +01:00
parent 5b2de5c81d 24925c3dae
commit aef92b9295
2799 changed files with 28402 additions and 47836 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spring-boot-samples/spring-boot-sample-data-mongodb/src/main/java/sample/data/mongo/Customer.java
+1 -2
View File
@@ -37,8 +37,7 @@ public class Customer {
@Override
public String toString() {
return String.format("Customer[id=%s, firstName='%s', lastName='%s']", this.id,
this.firstName, this.lastName);
return String.format("Customer[id=%s, firstName='%s', lastName='%s']", this.id, this.firstName, this.lastName);
}
}
spring-boot-samples/spring-boot-sample-data-mongodb/src/main/java/sample/data/mongo/SampleMongoApplication.java
+2 -3
View File
@@ -61,9 +61,8 @@ public class SampleMongoApplication implements CommandLineRunner {
@Bean
public MongoClientSettingsBuilderCustomizer customizer() {
return (builder) -> builder
.applyToConnectionPoolSettings((connectionPool) -> connectionPool
.maxConnectionIdleTime(5, TimeUnit.MINUTES));
return (builder) -> builder.applyToConnectionPoolSettings(
(connectionPool) -> connectionPool.maxConnectionIdleTime(5, TimeUnit.MINUTES));
}
public static void main(String[] args) {