Springdoc / fix review comments

src/main/java/tech/jhipster/lite/generator/module/application/JHipsterModulesApplicationService.java

@@ -1,16 +1,13 @@
 package tech.jhipster.lite.generator.module.application;
 
 import java.time.Instant;
-import java.util.Optional;
 import org.springframework.stereotype.Service;
 import tech.jhipster.lite.generator.module.domain.JHipsterModuleApplied;
 import tech.jhipster.lite.generator.module.domain.JHipsterModuleEvents;
 import tech.jhipster.lite.generator.module.domain.JHipsterModuleToApply;
 import tech.jhipster.lite.generator.module.domain.JHipsterModulesDomainService;
 import tech.jhipster.lite.generator.module.domain.JHipsterModulesRepository;
-import tech.jhipster.lite.generator.module.domain.javadependency.DependencyId;
 import tech.jhipster.lite.generator.module.domain.javadependency.JavaDependenciesCurrentVersionsRepository;
-import tech.jhipster.lite.generator.module.domain.javadependency.JavaDependency;
 import tech.jhipster.lite.generator.module.domain.javadependency.ProjectJavaDependenciesRepository;
 
 @Service
@@ -34,8 +31,4 @@ public void apply(JHipsterModuleToApply toApply) {
 
     events.dispatch(new JHipsterModuleApplied(toApply.project(), toApply.slug(), Instant.now()));
   }
-
-  public Optional<JavaDependency> getDependency(String projectFolder, DependencyId dependencyId) {
-    return modules.getDependency(projectFolder, dependencyId);
-  }
 }

src/main/java/tech/jhipster/lite/generator/module/domain/JHipsterModulesDomainService.java

@@ -1,10 +1,7 @@
 package tech.jhipster.lite.generator.module.domain;
 
-import java.util.Optional;
 import tech.jhipster.lite.error.domain.Assert;
-import tech.jhipster.lite.generator.module.domain.javadependency.DependencyId;
 import tech.jhipster.lite.generator.module.domain.javadependency.JavaDependenciesCurrentVersionsRepository;
-import tech.jhipster.lite.generator.module.domain.javadependency.JavaDependency;
 import tech.jhipster.lite.generator.module.domain.javadependency.ProjectJavaDependenciesRepository;
 import tech.jhipster.lite.generator.module.domain.javadependency.command.JavaDependenciesCommands;
 
@@ -42,10 +39,6 @@ public void apply(JHipsterModule module) {
     modules.apply(changes);
   }
 
-  public Optional<JavaDependency> getDependency(String projectFolder, DependencyId dependencyId) {
-    return projectDependencies.get(new JHipsterProjectFolder(projectFolder)).dependency(dependencyId);
-  }
-
   private JavaDependenciesCommands buildDependenciesChanges(JHipsterModule module) {
     return module.javaDependencies().buildChanges(currentVersions.get(), projectDependencies.get(module.projectFolder()));
   }

src/main/java/tech/jhipster/lite/generator/server/springboot/apidocumentation/springdoc/domain/SpringdocDomainService.java

@@ -29,7 +29,8 @@
 import tech.jhipster.lite.error.domain.GeneratorException;
 import tech.jhipster.lite.generator.buildtool.generic.domain.BuildToolService;
 import tech.jhipster.lite.generator.buildtool.generic.domain.Dependency;
-import tech.jhipster.lite.generator.module.JHipsterModules;
+import tech.jhipster.lite.generator.module.domain.javadependency.ProjectJavaDependenciesRepository;
+import tech.jhipster.lite.generator.module.domain.properties.JHipsterProjectFolder;
 import tech.jhipster.lite.generator.project.domain.Project;
 import tech.jhipster.lite.generator.project.domain.ProjectFile;
 import tech.jhipster.lite.generator.project.domain.ProjectRepository;
@@ -43,18 +44,18 @@ public class SpringdocDomainService implements SpringdocService {
   private final BuildToolService buildToolService;
   private final ProjectRepository projectRepository;
   private final SpringBootCommonService springBootCommonService;
-  private final JHipsterModules jHipsterModules;
+  private final ProjectJavaDependenciesRepository projectJavaDependenciesRepository;
 
   public SpringdocDomainService(
     BuildToolService buildToolService,
     ProjectRepository projectRepository,
     SpringBootCommonService springBootCommonService,
-    JHipsterModules jHipsterModules
+    ProjectJavaDependenciesRepository projectJavaDependenciesRepository
   ) {
     this.buildToolService = buildToolService;
     this.projectRepository = projectRepository;
     this.springBootCommonService = springBootCommonService;
-    this.jHipsterModules = jHipsterModules;
+    this.projectJavaDependenciesRepository = projectJavaDependenciesRepository;
   }
 
   @Override
@@ -79,8 +80,10 @@ public void addSpringdocDependency(Project project) {
           buildToolService.addProperty(project, "springdoc-openapi-ui.version", version);
           Dependency dependency;
           dependency =
-            jHipsterModules
-              .getDependency(project.getFolder(), WEBFLUX_DEPENDENCY_ID)
+            projectJavaDependenciesRepository
+              .get(new JHipsterProjectFolder(project.getFolder()))
+              .dependencies()
+              .get(WEBFLUX_DEPENDENCY_ID)
               .map(d -> springdocDependencyForWebflux())
               .orElse(springdocDependencyForMvc());
           buildToolService.addDependency(project, dependency);

src/main/java/tech/jhipster/lite/generator/server/springboot/apidocumentation/springdoc/infrastructure/config/SpringdocBeanConfiguration.java

@@ -3,7 +3,7 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import tech.jhipster.lite.generator.buildtool.generic.domain.BuildToolService;
-import tech.jhipster.lite.generator.module.JHipsterModules;
+import tech.jhipster.lite.generator.module.domain.javadependency.ProjectJavaDependenciesRepository;
 import tech.jhipster.lite.generator.project.domain.ProjectRepository;
 import tech.jhipster.lite.generator.server.springboot.apidocumentation.springdoc.domain.SpringdocDomainService;
 import tech.jhipster.lite.generator.server.springboot.apidocumentation.springdoc.domain.SpringdocService;
@@ -15,22 +15,22 @@ public class SpringdocBeanConfiguration {
   private final BuildToolService buildToolService;
   private final ProjectRepository projectRepository;
   private final SpringBootCommonService springBootCommonService;
-  private final JHipsterModules jHipsterModules;
+  private final ProjectJavaDependenciesRepository projectJavaDependenciesRepository;
 
   public SpringdocBeanConfiguration(
     BuildToolService buildToolService,
     ProjectRepository projectRepository,
     SpringBootCommonService springBootCommonService,
-    JHipsterModules jHipsterModules
+    ProjectJavaDependenciesRepository projectJavaDependenciesRepository
   ) {
     this.buildToolService = buildToolService;
     this.projectRepository = projectRepository;
     this.springBootCommonService = springBootCommonService;
-    this.jHipsterModules = jHipsterModules;
+    this.projectJavaDependenciesRepository = projectJavaDependenciesRepository;
   }
 
   @Bean
   public SpringdocService springdocService() {
-    return new SpringdocDomainService(buildToolService, projectRepository, springBootCommonService, jHipsterModules);
+    return new SpringdocDomainService(buildToolService, projectRepository, springBootCommonService, projectJavaDependenciesRepository);
   }
 }

src/test/java/tech/jhipster/lite/generator/server/springboot/apidocumentation/springdoc/domain/SpringdocDomainServiceTest.java

@@ -25,6 +25,7 @@
 import static tech.jhipster.lite.generator.server.springboot.apidocumentation.springdoc.domain.SpringdocConstants.DEFAULT_TRY_OUT_ENABLED;
 
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 import org.junit.jupiter.api.Test;
@@ -36,8 +37,11 @@
 import tech.jhipster.lite.UnitTest;
 import tech.jhipster.lite.generator.buildtool.generic.domain.BuildToolService;
 import tech.jhipster.lite.generator.buildtool.generic.domain.Dependency;
-import tech.jhipster.lite.generator.module.JHipsterModules;
+import tech.jhipster.lite.generator.module.domain.javadependency.JavaDependencies;
 import tech.jhipster.lite.generator.module.domain.javadependency.JavaDependency;
+import tech.jhipster.lite.generator.module.domain.javadependency.ProjectJavaDependencies;
+import tech.jhipster.lite.generator.module.domain.javadependency.ProjectJavaDependenciesRepository;
+import tech.jhipster.lite.generator.module.domain.properties.JHipsterProjectFolder;
 import tech.jhipster.lite.generator.project.domain.Project;
 import tech.jhipster.lite.generator.project.domain.ProjectFile;
 import tech.jhipster.lite.generator.project.domain.ProjectRepository;
@@ -57,7 +61,7 @@ class SpringdocDomainServiceTest {
   SpringBootCommonService springBootCommonService;
 
   @Mock
-  JHipsterModules jHipsterModules;
+  ProjectJavaDependenciesRepository projectJavaDependenciesRepository;
 
   @InjectMocks
   SpringdocDomainService springdocDomainService;
@@ -69,6 +73,8 @@ void shouldInitWithDefaultValues() {
     config.put(BASE_NAME, "foo");
     Project project = Project.builder().folder("/path/to/folder").config(config).build();
 
+    when(projectJavaDependenciesRepository.get(any(JHipsterProjectFolder.class))).thenReturn(new ProjectJavaDependencies(null, null));
+
     // When
     when(buildToolService.getVersion(project, "springdoc-openapi")).thenReturn(Optional.of("0.0.0"));
     springdocDomainService.init(project);
@@ -110,6 +116,8 @@ void shouldInitWithAdditionalConfigFromProject() {
 
     Project project = Project.builder().folder("/path/to/folder").config(projectConfig).build();
 
+    when(projectJavaDependenciesRepository.get(any(JHipsterProjectFolder.class))).thenReturn(new ProjectJavaDependencies(null, null));
+
     // When
     when(buildToolService.getVersion(project, "springdoc-openapi")).thenReturn(Optional.of("0.0.0"));
     springdocDomainService.init(project);
@@ -138,12 +146,11 @@ void shouldInitForWebflux() {
     config.put(BASE_NAME, "foo");
     Project project = Project.builder().folder("/path/to/folder").config(config).build();
 
-    when(jHipsterModules.getDependency(project.getFolder(), WEBFLUX_DEPENDENCY_ID))
-      .thenReturn(
-        Optional.of(
-          JavaDependency.builder().groupId(WEBFLUX_DEPENDENCY_ID.groupId()).artifactId(WEBFLUX_DEPENDENCY_ID.artifactId()).build()
-        )
-      );
+    List<JavaDependency> dependencies = List.of(
+      JavaDependency.builder().groupId(WEBFLUX_DEPENDENCY_ID.groupId()).artifactId(WEBFLUX_DEPENDENCY_ID.artifactId()).build()
+    );
+    when(projectJavaDependenciesRepository.get(any(JHipsterProjectFolder.class)))
+      .thenReturn(new ProjectJavaDependencies(null, new JavaDependencies(dependencies)));
 
     // When
     when(buildToolService.getVersion(project, "springdoc-openapi")).thenReturn(Optional.of("0.0.0"));
@@ -159,6 +166,10 @@ void shouldInitForWebflux() {
 
     verify(springBootCommonService, times(3)).addProperties(any(), anyString(), any());
     verify(springBootCommonService).addProperties(project, "springdoc.swagger-ui.operationsSorter", DEFAULT_SWAGGER_UI_SORT_VALUE);
+
+    ArgumentCaptor<JHipsterProjectFolder> jHipsterProjectFolderArgCaptor = ArgumentCaptor.forClass(JHipsterProjectFolder.class);
+    verify(projectJavaDependenciesRepository).get(jHipsterProjectFolderArgCaptor.capture());
+    assertThat(jHipsterProjectFolderArgCaptor.getValue().folder()).isEqualTo("/path/to/folder");
   }
 
   private static Dependency getExpectedDependency() {