Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #17893 from kioyong

Browse Source 
* pr/17893:
  Simplify some code

Closes gh-17893
This commit is contained in:
Stephane Nicoll
2019-08-19 07:33:09 +02:00
parent 7712f9c0e5 a5746d0a03
commit 78ea423148
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/reactive/ReactiveWebServerFactoryConfiguration.java
View File

@@ -69,7 +69,7 @@ abstract class ReactiveWebServerFactoryConfiguration {
ObjectProvider<NettyRouteProvider> routes, ObjectProvider<NettyServerCustomizer> serverCustomizers) {
NettyReactiveWebServerFactory serverFactory = new NettyReactiveWebServerFactory();
serverFactory.setResourceFactory(resourceFactory);
routes.orderedStream().forEach((route) -> serverFactory.addRouteProviders(route));
routes.orderedStream().forEach(serverFactory::addRouteProviders);
serverFactory.getServerCustomizers().addAll(serverCustomizers.orderedStream().collect(Collectors.toList()));
return serverFactory;
}

4
spring-boot-project/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/filewatch/FileSystemWatcher.java
View File

@@ -165,9 +165,7 @@ public class FileSystemWatcher {
}
private void saveInitialSnapshots() {
for (File folder : this.folders.keySet()) {
this.folders.put(folder, new FolderSnapshot(folder));
}
this.folders.replaceAll((f, v) -> new FolderSnapshot(f));
}
/**