Simplify code of retrieval of dependencies versions for maven plugin

jhipster · Jan 20, 2024 · 3a7d814 · 3a7d814
1 parent aca60eb
commit 3a7d814
Showing 1 changed file with 9 additions and 4 deletions.
diff --git a/src/main/java/tech/jhipster/lite/module/domain/mavenplugin/JHipsterModuleMavenPlugins.java b/src/main/java/tech/jhipster/lite/module/domain/mavenplugin/JHipsterModuleMavenPlugins.java
@@ -16,6 +16,7 @@
 import tech.jhipster.lite.module.domain.javabuildprofile.BuildProfileId;
 import tech.jhipster.lite.module.domain.javadependency.JavaDependenciesVersions;
 import tech.jhipster.lite.module.domain.javadependency.JavaDependency;
+import tech.jhipster.lite.module.domain.javadependency.JavaDependencyVersion;
 import tech.jhipster.lite.module.domain.javadependency.ProjectJavaDependencies;
 import tech.jhipster.lite.shared.error.domain.Assert;
 
@@ -76,10 +77,7 @@ private static <C extends AddMavenPlugin> Function<MavenPlugin, C> toAddMavenPlu
       plugin
         .dependencies()
         .stream()
-        .map(JavaDependency::version)
-        .flatMap(Optional::stream)
-        .map(JavaDependency.toVersion(versions, projectDependencies))
-        .flatMap(Optional::stream)
+        .flatMap(toDependencyVersion(versions, projectDependencies))
         .forEach(commandBuilder::addDependencyVersion);
       return plugin
         .versionSlug()
@@ -90,6 +88,13 @@ private static <C extends AddMavenPlugin> Function<MavenPlugin, C> toAddMavenPlu
     };
   }
 
+  private static Function<JavaDependency, Stream<JavaDependencyVersion>> toDependencyVersion(
+    JavaDependenciesVersions versions,
+    ProjectJavaDependencies projectDependencies
+  ) {
+    return dependency -> dependency.version().flatMap(JavaDependency.toVersion(versions, projectDependencies)).stream();
+  }
+
   public static class JHipsterModuleMavenPluginsBuilder<T> {
 
     private final T parentModuleBuilder;