OpenHAB
/
openhab-core
mirror of https://github.com/openhab/openhab-core.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Use flatMap to simplify map operations (#4190) 

Signed-off-by: Holger Friedrich <mail@holger-friedrich.de>
pull/4192/head
Holger Friedrich 2024-04-20 19:15:06 +02:00 committed by GitHub
parent dc17296e07
commit 0db45fa168
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bundles/org.openhab.core.automation.module.script.rulesupport/src/main/java/org/openhab/core/automation/module/script/rulesupport/loader/AbstractScriptFileWatcher.java
View File

@ -239,8 +239,8 @@ public abstract class AbstractScriptFileWatcher implements WatchService.WatchEve
}
private CompletableFuture<Void> addFiles(Collection<Path> files) {
return CompletableFuture.allOf(files.stream().map(this::getScriptFileReference).filter(Optional::isPresent)
.map(Optional::get).sorted().map(this::addScriptFileReference).toArray(CompletableFuture<?>[]::new));
return CompletableFuture.allOf(files.stream().map(this::getScriptFileReference).flatMap(Optional::stream)
.sorted().map(this::addScriptFileReference).toArray(CompletableFuture<?>[]::new));
}
private CompletableFuture<Void> addScriptFileReference(ScriptFileReference newRef) {

3
bundles/org.openhab.core.config.discovery.usbserial.ser2net/src/main/java/org/openhab/core/config/discovery/usbserial/ser2net/internal/Ser2NetUsbSerialDiscovery.java
View File

@ -115,8 +115,7 @@ public class Ser2NetUsbSerialDiscovery implements ServiceListener, UsbSerialDisc
Set<UsbSerialDeviceInformation> scanResult = Stream.of(mdnsClient.list(SERVICE_TYPE, SINGLE_SCAN_DURATION))
.map(this::createUsbSerialDeviceInformation) //
.filter(Optional::isPresent) //
.map(Optional::get) //
.flatMap(Optional::stream) //
.collect(Collectors.toSet());
Set<UsbSerialDeviceInformation> added = setDifference(scanResult, lastScanResult);

2
bundles/org.openhab.core.model.yaml/src/main/java/org/openhab/core/model/yaml/internal/YamlModelRepositoryImpl.java
View File

@ -413,7 +413,7 @@ public class YamlModelRepositoryImpl implements WatchService.WatchEventListener,
}
private <T extends YamlElement> List<T> parseJsonNodes(List<JsonNode> nodes, Class<T> elementClass) {
return nodes.stream().map(nE -> parseJsonNode(nE, elementClass)).filter(Optional::isPresent).map(Optional::get)
return nodes.stream().map(nE -> parseJsonNode(nE, elementClass)).flatMap(Optional::stream)
.filter(YamlElement::isValid).toList();
}