Merge branch '2.1.x'

Closes gh-17079
This commit is contained in:
Andy Wilkinson
2019-06-07 11:00:44 +01:00
2799 changed files with 28402 additions and 47836 deletions

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

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) {