demus/openhab-core
1
0
Fork 0
mirror of https://github.com/danieldemus/openhab-core.git synced 2026-07-29 12:34:22 +02:00
Code Issues 1 Packages Projects Releases Wiki Activity

Use flatMap to simplify map operations (#4190)

Browse Source 
Signed-off-by: Holger Friedrich <mail@holger-friedrich.de>
This commit is contained in:
Holger Friedrich
2024-04-20 19:15:06 +02:00
committed by GitHub
parent dc17296e07
commit 0db45fa168
3 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bundles/org.openhab.core.automation.module.script.rulesupport/src/main/java/org/openhab/core/automation/module/script/rulesupport/loader/AbstractScriptFileWatcher.java
+2 -2
View File
@@ -239,8 +239,8 @@ public abstract class AbstractScriptFileWatcher implements WatchService.WatchEve
} }
private CompletableFuture<Void> addFiles(Collection<Path> files) { private CompletableFuture<Void> addFiles(Collection<Path> files) {
return CompletableFuture.allOf(files.stream().map(this::getScriptFileReference).filter(Optional::isPresent) return CompletableFuture.allOf(files.stream().map(this::getScriptFileReference).flatMap(Optional::stream)
.map(Optional::get).sorted().map(this::addScriptFileReference).toArray(CompletableFuture<?>[]::new)); .sorted().map(this::addScriptFileReference).toArray(CompletableFuture<?>[]::new));
} }
private CompletableFuture<Void> addScriptFileReference(ScriptFileReference newRef) { private CompletableFuture<Void> addScriptFileReference(ScriptFileReference newRef) {
bundles/org.openhab.core.config.discovery.usbserial.ser2net/src/main/java/org/openhab/core/config/discovery/usbserial/ser2net/internal/Ser2NetUsbSerialDiscovery.java
+1 -2
View File
@@ -115,8 +115,7 @@ public class Ser2NetUsbSerialDiscovery implements ServiceListener, UsbSerialDisc
Set<UsbSerialDeviceInformation> scanResult = Stream.of(mdnsClient.list(SERVICE_TYPE, SINGLE_SCAN_DURATION)) Set<UsbSerialDeviceInformation> scanResult = Stream.of(mdnsClient.list(SERVICE_TYPE, SINGLE_SCAN_DURATION))
.map(this::createUsbSerialDeviceInformation) // .map(this::createUsbSerialDeviceInformation) //
.filter(Optional::isPresent) // .flatMap(Optional::stream) //
.map(Optional::get) //
.collect(Collectors.toSet()); .collect(Collectors.toSet());
Set<UsbSerialDeviceInformation> added = setDifference(scanResult, lastScanResult); Set<UsbSerialDeviceInformation> added = setDifference(scanResult, lastScanResult);
bundles/org.openhab.core.model.yaml/src/main/java/org/openhab/core/model/yaml/internal/YamlModelRepositoryImpl.java
+1 -1
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) { 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(); .filter(YamlElement::isValid).toList();
} }