Merge pull request #9971 from murdos/chore/optional-stream-idiom

chore: simplify code by using Optional::stream
jhipster · Jun 2, 2024 · dbb0529 · dbb0529
2 parents fb5ca32 + 10708a2
commit dbb0529
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/src/main/java/tech/jhipster/lite/module/domain/landscape/JHipsterLandscapeFeature.java b/src/main/java/tech/jhipster/lite/module/domain/landscape/JHipsterLandscapeFeature.java
@@ -27,8 +27,7 @@ private Optional<JHipsterLandscapeDependencies> buildDependencies() {
       modules()
         .stream()
         .map(JHipsterLandscapeModule::dependencies)
-        .filter(Optional::isPresent)
-        .map(Optional::get)
+        .flatMap(Optional::stream)
         .flatMap(JHipsterLandscapeDependencies::stream)
         .toList()
     );

diff --git a/...ch/jhipster/lite/module/infrastructure/secondary/docker/FileSystemDockerImagesReader.java b/...ch/jhipster/lite/module/infrastructure/secondary/docker/FileSystemDockerImagesReader.java
@@ -28,8 +28,7 @@ public DockerImageVersions get() {
       .map(String::trim)
       .map(String::toLowerCase)
       .map(toDockerImage())
-      .filter(Optional::isPresent)
-      .map(Optional::get)
+      .flatMap(Optional::stream)
       .toList();
 
     return new DockerImageVersions(versionsRead);