diff --git a/src/main/java/tech/jhipster/lite/generator/client/vue/core/application/VueApplicationService.java b/src/main/java/tech/jhipster/lite/generator/client/vue/core/application/VueApplicationService.java index f83e4ae9290..26bd495b4b9 100644 --- a/src/main/java/tech/jhipster/lite/generator/client/vue/core/application/VueApplicationService.java +++ b/src/main/java/tech/jhipster/lite/generator/client/vue/core/application/VueApplicationService.java @@ -2,8 +2,8 @@ import org.springframework.stereotype.Service; import tech.jhipster.lite.generator.client.vue.core.domain.VueModulesFactory; -import tech.jhipster.lite.generator.module.domain.JHipsterModule; -import tech.jhipster.lite.generator.module.domain.properties.JHipsterModuleProperties; +import tech.jhipster.lite.module.domain.JHipsterModule; +import tech.jhipster.lite.module.domain.properties.JHipsterModuleProperties; @Service public class VueApplicationService { diff --git a/src/main/java/tech/jhipster/lite/generator/client/vue/core/domain/VueModulesFactory.java b/src/main/java/tech/jhipster/lite/generator/client/vue/core/domain/VueModulesFactory.java index 9801a469a20..b8fe4e1ca02 100644 --- a/src/main/java/tech/jhipster/lite/generator/client/vue/core/domain/VueModulesFactory.java +++ b/src/main/java/tech/jhipster/lite/generator/client/vue/core/domain/VueModulesFactory.java @@ -1,14 +1,14 @@ package tech.jhipster.lite.generator.client.vue.core.domain; -import static tech.jhipster.lite.generator.module.domain.JHipsterModule.*; -import static tech.jhipster.lite.generator.module.domain.packagejson.VersionSource.*; +import static tech.jhipster.lite.module.domain.JHipsterModule.*; +import static tech.jhipster.lite.module.domain.packagejson.VersionSource.*; import tech.jhipster.lite.error.domain.Assert; -import tech.jhipster.lite.generator.module.domain.Indentation; -import tech.jhipster.lite.generator.module.domain.JHipsterDestination; -import tech.jhipster.lite.generator.module.domain.JHipsterModule; -import tech.jhipster.lite.generator.module.domain.JHipsterSource; -import tech.jhipster.lite.generator.module.domain.properties.JHipsterModuleProperties; +import tech.jhipster.lite.module.domain.Indentation; +import tech.jhipster.lite.module.domain.JHipsterDestination; +import tech.jhipster.lite.module.domain.JHipsterModule; +import tech.jhipster.lite.module.domain.JHipsterSource; +import tech.jhipster.lite.module.domain.properties.JHipsterModuleProperties; public class VueModulesFactory { diff --git a/src/main/java/tech/jhipster/lite/generator/client/vue/core/infrastructure/primary/VueModuleConfiguration.java b/src/main/java/tech/jhipster/lite/generator/client/vue/core/infrastructure/primary/VueModuleConfiguration.java index 876b42b2fc4..41755a45468 100644 --- a/src/main/java/tech/jhipster/lite/generator/client/vue/core/infrastructure/primary/VueModuleConfiguration.java +++ b/src/main/java/tech/jhipster/lite/generator/client/vue/core/infrastructure/primary/VueModuleConfiguration.java @@ -3,9 +3,9 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import tech.jhipster.lite.generator.client.vue.core.application.VueApplicationService; -import tech.jhipster.lite.generator.module.domain.properties.JHipsterModulePropertiesDefinition; -import tech.jhipster.lite.generator.module.infrastructure.primary.JHipsterModuleApiDoc; -import tech.jhipster.lite.generator.module.infrastructure.primary.JHipsterModuleResource; +import tech.jhipster.lite.module.domain.properties.JHipsterModulePropertiesDefinition; +import tech.jhipster.lite.module.infrastructure.primary.JHipsterModuleApiDoc; +import tech.jhipster.lite.module.infrastructure.primary.JHipsterModuleResource; @Configuration class VueModuleConfiguration { diff --git a/src/main/java/tech/jhipster/lite/generator/history/application/GeneratorHistoryApplicationService.java b/src/main/java/tech/jhipster/lite/generator/history/application/GeneratorHistoryApplicationService.java index bc10aa74693..f6850ed29aa 100644 --- a/src/main/java/tech/jhipster/lite/generator/history/application/GeneratorHistoryApplicationService.java +++ b/src/main/java/tech/jhipster/lite/generator/history/application/GeneratorHistoryApplicationService.java @@ -6,7 +6,7 @@ import tech.jhipster.lite.generator.history.domain.GeneratorHistoryRepository; import tech.jhipster.lite.generator.history.domain.GeneratorHistoryValue; import tech.jhipster.lite.generator.history.domain.HistoryProject; -import tech.jhipster.lite.generator.module.domain.properties.JHipsterProjectFolder; +import tech.jhipster.lite.module.domain.properties.JHipsterProjectFolder; @Service public class GeneratorHistoryApplicationService { diff --git a/src/main/java/tech/jhipster/lite/generator/history/domain/GeneratorHistoryRepository.java b/src/main/java/tech/jhipster/lite/generator/history/domain/GeneratorHistoryRepository.java index 3933b16e358..b8a16598e23 100644 --- a/src/main/java/tech/jhipster/lite/generator/history/domain/GeneratorHistoryRepository.java +++ b/src/main/java/tech/jhipster/lite/generator/history/domain/GeneratorHistoryRepository.java @@ -1,6 +1,6 @@ package tech.jhipster.lite.generator.history.domain; -import tech.jhipster.lite.generator.module.domain.properties.JHipsterProjectFolder; +import tech.jhipster.lite.module.domain.properties.JHipsterProjectFolder; public interface GeneratorHistoryRepository { GeneratorHistoryData getHistoryData(JHipsterProjectFolder folder); diff --git a/src/main/java/tech/jhipster/lite/generator/history/domain/HistoryProject.java b/src/main/java/tech/jhipster/lite/generator/history/domain/HistoryProject.java index 2b16815da10..baeecae7118 100644 --- a/src/main/java/tech/jhipster/lite/generator/history/domain/HistoryProject.java +++ b/src/main/java/tech/jhipster/lite/generator/history/domain/HistoryProject.java @@ -1,9 +1,9 @@ package tech.jhipster.lite.generator.history.domain; import tech.jhipster.lite.error.domain.Assert; -import tech.jhipster.lite.generator.module.domain.properties.JHipsterModuleProperties; -import tech.jhipster.lite.generator.module.domain.properties.JHipsterProjectFolder; import tech.jhipster.lite.generator.project.domain.Project; +import tech.jhipster.lite.module.domain.properties.JHipsterModuleProperties; +import tech.jhipster.lite.module.domain.properties.JHipsterProjectFolder; public record HistoryProject(JHipsterProjectFolder folder, String lineEnd) { private static final String BREAK = "\n"; diff --git a/src/main/java/tech/jhipster/lite/generator/history/infrastructure/primary/HistoryResource.java b/src/main/java/tech/jhipster/lite/generator/history/infrastructure/primary/HistoryResource.java index b2e9039257a..a2c2ec0fc8a 100644 --- a/src/main/java/tech/jhipster/lite/generator/history/infrastructure/primary/HistoryResource.java +++ b/src/main/java/tech/jhipster/lite/generator/history/infrastructure/primary/HistoryResource.java @@ -13,7 +13,7 @@ import tech.jhipster.lite.generator.history.application.GeneratorHistoryApplicationService; import tech.jhipster.lite.generator.history.domain.GeneratorHistoryValue; import tech.jhipster.lite.generator.history.infrastructure.primary.dto.HistoryDTO; -import tech.jhipster.lite.generator.module.domain.properties.JHipsterProjectFolder; +import tech.jhipster.lite.module.domain.properties.JHipsterProjectFolder; @RestController @RequestMapping("/api/project-histories") diff --git a/src/main/java/tech/jhipster/lite/generator/history/infrastructure/primary/SpringJHipsterModuleAppliedListener.java b/src/main/java/tech/jhipster/lite/generator/history/infrastructure/primary/SpringJHipsterModuleAppliedListener.java index d08f4756127..9360777e508 100644 --- a/src/main/java/tech/jhipster/lite/generator/history/infrastructure/primary/SpringJHipsterModuleAppliedListener.java +++ b/src/main/java/tech/jhipster/lite/generator/history/infrastructure/primary/SpringJHipsterModuleAppliedListener.java @@ -6,7 +6,7 @@ import tech.jhipster.lite.generator.history.application.GeneratorHistoryApplicationService; import tech.jhipster.lite.generator.history.domain.GeneratorHistoryValue; import tech.jhipster.lite.generator.history.domain.HistoryProject; -import tech.jhipster.lite.generator.module.domain.JHipsterModuleApplied; +import tech.jhipster.lite.module.domain.JHipsterModuleApplied; @Component class SpringJHipsterModuleAppliedListener implements ApplicationListener> { diff --git a/src/main/java/tech/jhipster/lite/generator/history/infrastructure/secondary/GeneratorHistoryLocalRepository.java b/src/main/java/tech/jhipster/lite/generator/history/infrastructure/secondary/GeneratorHistoryLocalRepository.java index a21932399ad..a69a325aa25 100644 --- a/src/main/java/tech/jhipster/lite/generator/history/infrastructure/secondary/GeneratorHistoryLocalRepository.java +++ b/src/main/java/tech/jhipster/lite/generator/history/infrastructure/secondary/GeneratorHistoryLocalRepository.java @@ -14,9 +14,9 @@ import tech.jhipster.lite.generator.history.domain.HistoryProject; import tech.jhipster.lite.generator.history.infrastructure.secondary.dto.GeneratorHistoryDataDTO; import tech.jhipster.lite.generator.history.infrastructure.secondary.dto.GeneratorHistoryValueDTO; -import tech.jhipster.lite.generator.module.domain.properties.JHipsterProjectFolder; import tech.jhipster.lite.generator.project.domain.ProjectFile; import tech.jhipster.lite.generator.project.domain.ProjectRepository; +import tech.jhipster.lite.module.domain.properties.JHipsterProjectFolder; @Repository public class GeneratorHistoryLocalRepository implements GeneratorHistoryRepository { diff --git a/src/main/java/tech/jhipster/lite/generator/infinitest/application/InfinitestApplicationService.java b/src/main/java/tech/jhipster/lite/generator/infinitest/application/InfinitestApplicationService.java index bece82f0bcc..5b261e2372a 100644 --- a/src/main/java/tech/jhipster/lite/generator/infinitest/application/InfinitestApplicationService.java +++ b/src/main/java/tech/jhipster/lite/generator/infinitest/application/InfinitestApplicationService.java @@ -2,8 +2,8 @@ import org.springframework.stereotype.Service; import tech.jhipster.lite.generator.infinitest.domain.InfinitestModuleFactory; -import tech.jhipster.lite.generator.module.domain.JHipsterModule; -import tech.jhipster.lite.generator.module.domain.properties.JHipsterModuleProperties; +import tech.jhipster.lite.module.domain.JHipsterModule; +import tech.jhipster.lite.module.domain.properties.JHipsterModuleProperties; @Service public class InfinitestApplicationService { diff --git a/src/main/java/tech/jhipster/lite/generator/infinitest/domain/InfinitestModuleFactory.java b/src/main/java/tech/jhipster/lite/generator/infinitest/domain/InfinitestModuleFactory.java index 538dad241db..66c6f760f74 100644 --- a/src/main/java/tech/jhipster/lite/generator/infinitest/domain/InfinitestModuleFactory.java +++ b/src/main/java/tech/jhipster/lite/generator/infinitest/domain/InfinitestModuleFactory.java @@ -1,9 +1,9 @@ package tech.jhipster.lite.generator.infinitest.domain; -import static tech.jhipster.lite.generator.module.domain.JHipsterModule.*; +import static tech.jhipster.lite.module.domain.JHipsterModule.*; -import tech.jhipster.lite.generator.module.domain.JHipsterModule; -import tech.jhipster.lite.generator.module.domain.properties.JHipsterModuleProperties; +import tech.jhipster.lite.module.domain.JHipsterModule; +import tech.jhipster.lite.module.domain.properties.JHipsterModuleProperties; public class InfinitestModuleFactory { diff --git a/src/main/java/tech/jhipster/lite/generator/infinitest/infrastructure/primary/InfinitestConfiguration.java b/src/main/java/tech/jhipster/lite/generator/infinitest/infrastructure/primary/InfinitestConfiguration.java index cf03370aadd..e856a43ef15 100644 --- a/src/main/java/tech/jhipster/lite/generator/infinitest/infrastructure/primary/InfinitestConfiguration.java +++ b/src/main/java/tech/jhipster/lite/generator/infinitest/infrastructure/primary/InfinitestConfiguration.java @@ -3,8 +3,8 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import tech.jhipster.lite.generator.infinitest.application.InfinitestApplicationService; -import tech.jhipster.lite.generator.module.infrastructure.primary.JHipsterModuleApiDoc; -import tech.jhipster.lite.generator.module.infrastructure.primary.JHipsterModuleResource; +import tech.jhipster.lite.module.infrastructure.primary.JHipsterModuleApiDoc; +import tech.jhipster.lite.module.infrastructure.primary.JHipsterModuleResource; @Configuration class InfinitestConfiguration { diff --git a/src/main/java/tech/jhipster/lite/generator/init/application/InitApplicationService.java b/src/main/java/tech/jhipster/lite/generator/init/application/InitApplicationService.java index d9899482c86..82979b961c8 100644 --- a/src/main/java/tech/jhipster/lite/generator/init/application/InitApplicationService.java +++ b/src/main/java/tech/jhipster/lite/generator/init/application/InitApplicationService.java @@ -3,8 +3,8 @@ import org.springframework.stereotype.Service; import tech.jhipster.lite.generator.init.domain.GitRepository; import tech.jhipster.lite.generator.init.domain.InitModuleFactory; -import tech.jhipster.lite.generator.module.domain.JHipsterModule; -import tech.jhipster.lite.generator.module.domain.properties.JHipsterModuleProperties; +import tech.jhipster.lite.module.domain.JHipsterModule; +import tech.jhipster.lite.module.domain.properties.JHipsterModuleProperties; @Service public class InitApplicationService { diff --git a/src/main/java/tech/jhipster/lite/generator/init/domain/GitRepository.java b/src/main/java/tech/jhipster/lite/generator/init/domain/GitRepository.java index 7840dccc283..8c4b7ab2d5c 100644 --- a/src/main/java/tech/jhipster/lite/generator/init/domain/GitRepository.java +++ b/src/main/java/tech/jhipster/lite/generator/init/domain/GitRepository.java @@ -1,6 +1,6 @@ package tech.jhipster.lite.generator.init.domain; -import tech.jhipster.lite.generator.module.domain.properties.JHipsterProjectFolder; +import tech.jhipster.lite.module.domain.properties.JHipsterProjectFolder; public interface GitRepository { void init(JHipsterProjectFolder folder); diff --git a/src/main/java/tech/jhipster/lite/generator/init/domain/InitModuleFactory.java b/src/main/java/tech/jhipster/lite/generator/init/domain/InitModuleFactory.java index 5677bfd3298..4258f09065a 100644 --- a/src/main/java/tech/jhipster/lite/generator/init/domain/InitModuleFactory.java +++ b/src/main/java/tech/jhipster/lite/generator/init/domain/InitModuleFactory.java @@ -1,14 +1,14 @@ package tech.jhipster.lite.generator.init.domain; -import static tech.jhipster.lite.generator.module.domain.JHipsterModule.*; -import static tech.jhipster.lite.generator.module.domain.packagejson.VersionSource.*; +import static tech.jhipster.lite.module.domain.JHipsterModule.*; +import static tech.jhipster.lite.module.domain.packagejson.VersionSource.*; import tech.jhipster.lite.common.domain.WordUtils; import tech.jhipster.lite.error.domain.Assert; -import tech.jhipster.lite.generator.module.domain.JHipsterDestination; -import tech.jhipster.lite.generator.module.domain.JHipsterModule; -import tech.jhipster.lite.generator.module.domain.JHipsterSource; -import tech.jhipster.lite.generator.module.domain.properties.JHipsterModuleProperties; +import tech.jhipster.lite.module.domain.JHipsterDestination; +import tech.jhipster.lite.module.domain.JHipsterModule; +import tech.jhipster.lite.module.domain.JHipsterSource; +import tech.jhipster.lite.module.domain.properties.JHipsterModuleProperties; public class InitModuleFactory { diff --git a/src/main/java/tech/jhipster/lite/generator/init/infrastructure/primary/InitModuleConfiguration.java b/src/main/java/tech/jhipster/lite/generator/init/infrastructure/primary/InitModuleConfiguration.java index cfd012f9883..3dcbbc4a82f 100644 --- a/src/main/java/tech/jhipster/lite/generator/init/infrastructure/primary/InitModuleConfiguration.java +++ b/src/main/java/tech/jhipster/lite/generator/init/infrastructure/primary/InitModuleConfiguration.java @@ -3,10 +3,10 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import tech.jhipster.lite.generator.init.application.InitApplicationService; -import tech.jhipster.lite.generator.module.domain.properties.JHipsterModulePropertiesDefinition; -import tech.jhipster.lite.generator.module.domain.properties.JHipsterModulePropertyDefinition; -import tech.jhipster.lite.generator.module.infrastructure.primary.JHipsterModuleApiDoc; -import tech.jhipster.lite.generator.module.infrastructure.primary.JHipsterModuleResource; +import tech.jhipster.lite.module.domain.properties.JHipsterModulePropertiesDefinition; +import tech.jhipster.lite.module.domain.properties.JHipsterModulePropertyDefinition; +import tech.jhipster.lite.module.infrastructure.primary.JHipsterModuleApiDoc; +import tech.jhipster.lite.module.infrastructure.primary.JHipsterModuleResource; @Configuration class InitModuleConfiguration { diff --git a/src/main/java/tech/jhipster/lite/generator/init/infrastructure/secondary/FileSystemGitRepository.java b/src/main/java/tech/jhipster/lite/generator/init/infrastructure/secondary/FileSystemGitRepository.java index 778ffe958d5..695c77c5e2b 100644 --- a/src/main/java/tech/jhipster/lite/generator/init/infrastructure/secondary/FileSystemGitRepository.java +++ b/src/main/java/tech/jhipster/lite/generator/init/infrastructure/secondary/FileSystemGitRepository.java @@ -6,7 +6,7 @@ import org.eclipse.jgit.api.errors.JGitInternalException; import org.springframework.stereotype.Repository; import tech.jhipster.lite.generator.init.domain.GitRepository; -import tech.jhipster.lite.generator.module.domain.properties.JHipsterProjectFolder; +import tech.jhipster.lite.module.domain.properties.JHipsterProjectFolder; @Repository class FileSystemGitRepository implements GitRepository { diff --git a/src/main/java/tech/jhipster/lite/generator/module/domain/JHipsterModuleFactory.java b/src/main/java/tech/jhipster/lite/generator/module/domain/JHipsterModuleFactory.java deleted file mode 100644 index ebf3fabfe92..00000000000 --- a/src/main/java/tech/jhipster/lite/generator/module/domain/JHipsterModuleFactory.java +++ /dev/null @@ -1,8 +0,0 @@ -package tech.jhipster.lite.generator.module.domain; - -import tech.jhipster.lite.generator.module.domain.properties.JHipsterModuleProperties; - -@FunctionalInterface -public interface JHipsterModuleFactory { - JHipsterModule create(JHipsterModuleProperties properties); -} diff --git a/src/main/java/tech/jhipster/lite/generator/module/domain/javadependency/ProjectJavaDependenciesRepository.java b/src/main/java/tech/jhipster/lite/generator/module/domain/javadependency/ProjectJavaDependenciesRepository.java deleted file mode 100644 index c817b42f37b..00000000000 --- a/src/main/java/tech/jhipster/lite/generator/module/domain/javadependency/ProjectJavaDependenciesRepository.java +++ /dev/null @@ -1,7 +0,0 @@ -package tech.jhipster.lite.generator.module.domain.javadependency; - -import tech.jhipster.lite.generator.module.domain.properties.JHipsterProjectFolder; - -public interface ProjectJavaDependenciesRepository { - ProjectJavaDependencies get(JHipsterProjectFolder folder); -} diff --git a/src/main/java/tech/jhipster/lite/generator/module/domain/javaproperties/SpringPropertyType.java b/src/main/java/tech/jhipster/lite/generator/module/domain/javaproperties/SpringPropertyType.java deleted file mode 100644 index 17cc4b7e796..00000000000 --- a/src/main/java/tech/jhipster/lite/generator/module/domain/javaproperties/SpringPropertyType.java +++ /dev/null @@ -1,6 +0,0 @@ -package tech.jhipster.lite.generator.module.domain.javaproperties; - -public enum SpringPropertyType { - MAIN, - TEST, -} diff --git a/src/main/java/tech/jhipster/lite/generator/module/domain/replacement/FileReplacer.java b/src/main/java/tech/jhipster/lite/generator/module/domain/replacement/FileReplacer.java deleted file mode 100644 index b0c6b41f332..00000000000 --- a/src/main/java/tech/jhipster/lite/generator/module/domain/replacement/FileReplacer.java +++ /dev/null @@ -1,7 +0,0 @@ -package tech.jhipster.lite.generator.module.domain.replacement; - -import tech.jhipster.lite.generator.module.domain.properties.JHipsterProjectFolder; - -interface FileReplacer { - void apply(JHipsterProjectFolder folder); -} diff --git a/src/main/java/tech/jhipster/lite/generator/module/package-info.java b/src/main/java/tech/jhipster/lite/generator/module/package-info.java deleted file mode 100644 index d7d1794a4bc..00000000000 --- a/src/main/java/tech/jhipster/lite/generator/module/package-info.java +++ /dev/null @@ -1,2 +0,0 @@ -@tech.jhipster.lite.SharedKernel -package tech.jhipster.lite.generator.module; diff --git a/src/main/java/tech/jhipster/lite/generator/project/infrastructure/primary/dto/ProjectDTO.java b/src/main/java/tech/jhipster/lite/generator/project/infrastructure/primary/dto/ProjectDTO.java index 1113ef8026d..cd1fa50d548 100644 --- a/src/main/java/tech/jhipster/lite/generator/project/infrastructure/primary/dto/ProjectDTO.java +++ b/src/main/java/tech/jhipster/lite/generator/project/infrastructure/primary/dto/ProjectDTO.java @@ -4,8 +4,8 @@ import io.swagger.v3.oas.annotations.media.Schema; import java.util.Map; import tech.jhipster.lite.error.domain.Assert; -import tech.jhipster.lite.generator.module.domain.properties.JHipsterModuleProperties; import tech.jhipster.lite.generator.project.domain.Project; +import tech.jhipster.lite.module.domain.properties.JHipsterModuleProperties; @Schema(description = "Project DTO") public class ProjectDTO { diff --git a/src/main/java/tech/jhipster/lite/generator/server/hexagonaldocumentation/application/HexagonalArchitectureDocumentationApplicationService.java b/src/main/java/tech/jhipster/lite/generator/server/hexagonaldocumentation/application/HexagonalArchitectureDocumentationApplicationService.java index db7db6dcd1b..4f13766d6f3 100644 --- a/src/main/java/tech/jhipster/lite/generator/server/hexagonaldocumentation/application/HexagonalArchitectureDocumentationApplicationService.java +++ b/src/main/java/tech/jhipster/lite/generator/server/hexagonaldocumentation/application/HexagonalArchitectureDocumentationApplicationService.java @@ -1,9 +1,9 @@ package tech.jhipster.lite.generator.server.hexagonaldocumentation.application; import org.springframework.stereotype.Service; -import tech.jhipster.lite.generator.module.domain.JHipsterModule; -import tech.jhipster.lite.generator.module.domain.properties.JHipsterModuleProperties; import tech.jhipster.lite.generator.server.hexagonaldocumentation.domain.HexagonalDocumentationModuleFactory; +import tech.jhipster.lite.module.domain.JHipsterModule; +import tech.jhipster.lite.module.domain.properties.JHipsterModuleProperties; @Service public class HexagonalArchitectureDocumentationApplicationService { diff --git a/src/main/java/tech/jhipster/lite/generator/server/hexagonaldocumentation/domain/HexagonalDocumentationModuleFactory.java b/src/main/java/tech/jhipster/lite/generator/server/hexagonaldocumentation/domain/HexagonalDocumentationModuleFactory.java index 30c37f38124..15e8713f7d7 100644 --- a/src/main/java/tech/jhipster/lite/generator/server/hexagonaldocumentation/domain/HexagonalDocumentationModuleFactory.java +++ b/src/main/java/tech/jhipster/lite/generator/server/hexagonaldocumentation/domain/HexagonalDocumentationModuleFactory.java @@ -1,10 +1,10 @@ package tech.jhipster.lite.generator.server.hexagonaldocumentation.domain; -import static tech.jhipster.lite.generator.module.domain.JHipsterModule.*; +import static tech.jhipster.lite.module.domain.JHipsterModule.*; -import tech.jhipster.lite.generator.module.domain.JHipsterModule; -import tech.jhipster.lite.generator.module.domain.JHipsterSource; -import tech.jhipster.lite.generator.module.domain.properties.JHipsterModuleProperties; +import tech.jhipster.lite.module.domain.JHipsterModule; +import tech.jhipster.lite.module.domain.JHipsterSource; +import tech.jhipster.lite.module.domain.properties.JHipsterModuleProperties; public class HexagonalDocumentationModuleFactory { diff --git a/src/main/java/tech/jhipster/lite/generator/server/hexagonaldocumentation/infrastructure/primary/HexagonalArchitectureDocumentationModuleConfiguration.java b/src/main/java/tech/jhipster/lite/generator/server/hexagonaldocumentation/infrastructure/primary/HexagonalArchitectureDocumentationModuleConfiguration.java index 8a6b5543940..12798dfbc2f 100644 --- a/src/main/java/tech/jhipster/lite/generator/server/hexagonaldocumentation/infrastructure/primary/HexagonalArchitectureDocumentationModuleConfiguration.java +++ b/src/main/java/tech/jhipster/lite/generator/server/hexagonaldocumentation/infrastructure/primary/HexagonalArchitectureDocumentationModuleConfiguration.java @@ -2,9 +2,9 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import tech.jhipster.lite.generator.module.infrastructure.primary.JHipsterModuleApiDoc; -import tech.jhipster.lite.generator.module.infrastructure.primary.JHipsterModuleResource; import tech.jhipster.lite.generator.server.hexagonaldocumentation.application.HexagonalArchitectureDocumentationApplicationService; +import tech.jhipster.lite.module.infrastructure.primary.JHipsterModuleApiDoc; +import tech.jhipster.lite.module.infrastructure.primary.JHipsterModuleResource; @Configuration class HexagonalArchitectureDocumentationModuleConfiguration { diff --git a/src/main/java/tech/jhipster/lite/generator/server/javatool/base/application/JavaBaseApplicationService.java b/src/main/java/tech/jhipster/lite/generator/server/javatool/base/application/JavaBaseApplicationService.java index e9b8632993f..fa73bf6a9df 100644 --- a/src/main/java/tech/jhipster/lite/generator/server/javatool/base/application/JavaBaseApplicationService.java +++ b/src/main/java/tech/jhipster/lite/generator/server/javatool/base/application/JavaBaseApplicationService.java @@ -1,9 +1,9 @@ package tech.jhipster.lite.generator.server.javatool.base.application; import org.springframework.stereotype.Service; -import tech.jhipster.lite.generator.module.domain.JHipsterModule; -import tech.jhipster.lite.generator.module.domain.properties.JHipsterModuleProperties; import tech.jhipster.lite.generator.server.javatool.base.domain.JavaBaseModuleFactory; +import tech.jhipster.lite.module.domain.JHipsterModule; +import tech.jhipster.lite.module.domain.properties.JHipsterModuleProperties; @Service public class JavaBaseApplicationService { diff --git a/src/main/java/tech/jhipster/lite/generator/server/javatool/base/domain/JavaBaseModuleFactory.java b/src/main/java/tech/jhipster/lite/generator/server/javatool/base/domain/JavaBaseModuleFactory.java index 980526abef0..cd8394d6d3b 100644 --- a/src/main/java/tech/jhipster/lite/generator/server/javatool/base/domain/JavaBaseModuleFactory.java +++ b/src/main/java/tech/jhipster/lite/generator/server/javatool/base/domain/JavaBaseModuleFactory.java @@ -1,12 +1,12 @@ package tech.jhipster.lite.generator.server.javatool.base.domain; -import static tech.jhipster.lite.generator.module.domain.JHipsterModule.*; +import static tech.jhipster.lite.module.domain.JHipsterModule.*; import tech.jhipster.lite.error.domain.Assert; -import tech.jhipster.lite.generator.module.domain.JHipsterDestination; -import tech.jhipster.lite.generator.module.domain.JHipsterModule; -import tech.jhipster.lite.generator.module.domain.JHipsterSource; -import tech.jhipster.lite.generator.module.domain.properties.JHipsterModuleProperties; +import tech.jhipster.lite.module.domain.JHipsterDestination; +import tech.jhipster.lite.module.domain.JHipsterModule; +import tech.jhipster.lite.module.domain.JHipsterSource; +import tech.jhipster.lite.module.domain.properties.JHipsterModuleProperties; public class JavaBaseModuleFactory { diff --git a/src/main/java/tech/jhipster/lite/generator/server/javatool/base/infrastructure/primary/JavaBaseModuleConfiguration.java b/src/main/java/tech/jhipster/lite/generator/server/javatool/base/infrastructure/primary/JavaBaseModuleConfiguration.java index 80e9d8096fa..9ff1b4bf37b 100644 --- a/src/main/java/tech/jhipster/lite/generator/server/javatool/base/infrastructure/primary/JavaBaseModuleConfiguration.java +++ b/src/main/java/tech/jhipster/lite/generator/server/javatool/base/infrastructure/primary/JavaBaseModuleConfiguration.java @@ -2,10 +2,10 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import tech.jhipster.lite.generator.module.domain.properties.JHipsterModulePropertiesDefinition; -import tech.jhipster.lite.generator.module.infrastructure.primary.JHipsterModuleApiDoc; -import tech.jhipster.lite.generator.module.infrastructure.primary.JHipsterModuleResource; import tech.jhipster.lite.generator.server.javatool.base.application.JavaBaseApplicationService; +import tech.jhipster.lite.module.domain.properties.JHipsterModulePropertiesDefinition; +import tech.jhipster.lite.module.infrastructure.primary.JHipsterModuleApiDoc; +import tech.jhipster.lite.module.infrastructure.primary.JHipsterModuleResource; @Configuration class JavaBaseModuleConfiguration { diff --git a/src/main/java/tech/jhipster/lite/generator/server/springboot/apidocumentation/springdoc/domain/Springdoc.java b/src/main/java/tech/jhipster/lite/generator/server/springboot/apidocumentation/springdoc/domain/Springdoc.java index d46923aebd5..e75c34cab01 100644 --- a/src/main/java/tech/jhipster/lite/generator/server/springboot/apidocumentation/springdoc/domain/Springdoc.java +++ b/src/main/java/tech/jhipster/lite/generator/server/springboot/apidocumentation/springdoc/domain/Springdoc.java @@ -1,9 +1,9 @@ package tech.jhipster.lite.generator.server.springboot.apidocumentation.springdoc.domain; import tech.jhipster.lite.generator.buildtool.generic.domain.Dependency; -import tech.jhipster.lite.generator.module.domain.javadependency.ArtifactId; -import tech.jhipster.lite.generator.module.domain.javadependency.DependencyId; -import tech.jhipster.lite.generator.module.domain.javadependency.GroupId; +import tech.jhipster.lite.module.domain.javadependency.ArtifactId; +import tech.jhipster.lite.module.domain.javadependency.DependencyId; +import tech.jhipster.lite.module.domain.javadependency.GroupId; public class Springdoc { diff --git a/src/main/java/tech/jhipster/lite/generator/server/springboot/apidocumentation/springdoc/domain/SpringdocDomainService.java b/src/main/java/tech/jhipster/lite/generator/server/springboot/apidocumentation/springdoc/domain/SpringdocDomainService.java index 5f3797bcfb4..f0b7be3d985 100644 --- a/src/main/java/tech/jhipster/lite/generator/server/springboot/apidocumentation/springdoc/domain/SpringdocDomainService.java +++ b/src/main/java/tech/jhipster/lite/generator/server/springboot/apidocumentation/springdoc/domain/SpringdocDomainService.java @@ -29,12 +29,12 @@ 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.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; import tech.jhipster.lite.generator.server.springboot.common.domain.SpringBootCommonService; +import tech.jhipster.lite.module.domain.javadependency.ProjectJavaDependenciesRepository; +import tech.jhipster.lite.module.domain.properties.JHipsterProjectFolder; public class SpringdocDomainService implements SpringdocService { diff --git a/src/main/java/tech/jhipster/lite/generator/server/springboot/apidocumentation/springdoc/infrastructure/config/SpringdocBeanConfiguration.java b/src/main/java/tech/jhipster/lite/generator/server/springboot/apidocumentation/springdoc/infrastructure/config/SpringdocBeanConfiguration.java index 24f824b56dd..93bdc06012c 100644 --- a/src/main/java/tech/jhipster/lite/generator/server/springboot/apidocumentation/springdoc/infrastructure/config/SpringdocBeanConfiguration.java +++ b/src/main/java/tech/jhipster/lite/generator/server/springboot/apidocumentation/springdoc/infrastructure/config/SpringdocBeanConfiguration.java @@ -3,11 +3,11 @@ 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.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; import tech.jhipster.lite.generator.server.springboot.common.domain.SpringBootCommonService; +import tech.jhipster.lite.module.domain.javadependency.ProjectJavaDependenciesRepository; @Configuration public class SpringdocBeanConfiguration { diff --git a/src/main/java/tech/jhipster/lite/generator/server/springboot/async/application/SpringBootAsyncApplicationService.java b/src/main/java/tech/jhipster/lite/generator/server/springboot/async/application/SpringBootAsyncApplicationService.java index 32012d7242d..93fc8162131 100644 --- a/src/main/java/tech/jhipster/lite/generator/server/springboot/async/application/SpringBootAsyncApplicationService.java +++ b/src/main/java/tech/jhipster/lite/generator/server/springboot/async/application/SpringBootAsyncApplicationService.java @@ -1,9 +1,9 @@ package tech.jhipster.lite.generator.server.springboot.async.application; import org.springframework.stereotype.Service; -import tech.jhipster.lite.generator.module.domain.JHipsterModule; -import tech.jhipster.lite.generator.module.domain.properties.JHipsterModuleProperties; import tech.jhipster.lite.generator.server.springboot.async.domain.SpringBootAsyncModuleFactory; +import tech.jhipster.lite.module.domain.JHipsterModule; +import tech.jhipster.lite.module.domain.properties.JHipsterModuleProperties; @Service public class SpringBootAsyncApplicationService { diff --git a/src/main/java/tech/jhipster/lite/generator/server/springboot/async/domain/SpringBootAsyncModuleFactory.java b/src/main/java/tech/jhipster/lite/generator/server/springboot/async/domain/SpringBootAsyncModuleFactory.java index 94b7d2f1ca1..b73a75959c7 100644 --- a/src/main/java/tech/jhipster/lite/generator/server/springboot/async/domain/SpringBootAsyncModuleFactory.java +++ b/src/main/java/tech/jhipster/lite/generator/server/springboot/async/domain/SpringBootAsyncModuleFactory.java @@ -1,12 +1,12 @@ package tech.jhipster.lite.generator.server.springboot.async.domain; -import static tech.jhipster.lite.generator.module.domain.JHipsterModule.*; +import static tech.jhipster.lite.module.domain.JHipsterModule.*; import tech.jhipster.lite.error.domain.Assert; -import tech.jhipster.lite.generator.module.domain.JHipsterDestination; -import tech.jhipster.lite.generator.module.domain.JHipsterModule; -import tech.jhipster.lite.generator.module.domain.JHipsterSource; -import tech.jhipster.lite.generator.module.domain.properties.JHipsterModuleProperties; +import tech.jhipster.lite.module.domain.JHipsterDestination; +import tech.jhipster.lite.module.domain.JHipsterModule; +import tech.jhipster.lite.module.domain.JHipsterSource; +import tech.jhipster.lite.module.domain.properties.JHipsterModuleProperties; public class SpringBootAsyncModuleFactory { diff --git a/src/main/java/tech/jhipster/lite/generator/server/springboot/async/infrastructure/primary/SpringBootAsyncConfiguration.java b/src/main/java/tech/jhipster/lite/generator/server/springboot/async/infrastructure/primary/SpringBootAsyncConfiguration.java index 4142671af88..8abe60c3ee4 100644 --- a/src/main/java/tech/jhipster/lite/generator/server/springboot/async/infrastructure/primary/SpringBootAsyncConfiguration.java +++ b/src/main/java/tech/jhipster/lite/generator/server/springboot/async/infrastructure/primary/SpringBootAsyncConfiguration.java @@ -2,10 +2,10 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import tech.jhipster.lite.generator.module.domain.properties.JHipsterModulePropertiesDefinition; -import tech.jhipster.lite.generator.module.infrastructure.primary.JHipsterModuleApiDoc; -import tech.jhipster.lite.generator.module.infrastructure.primary.JHipsterModuleResource; import tech.jhipster.lite.generator.server.springboot.async.application.SpringBootAsyncApplicationService; +import tech.jhipster.lite.module.domain.properties.JHipsterModulePropertiesDefinition; +import tech.jhipster.lite.module.infrastructure.primary.JHipsterModuleApiDoc; +import tech.jhipster.lite.module.infrastructure.primary.JHipsterModuleResource; @Configuration class SpringBootAsyncConfiguration { diff --git a/src/main/java/tech/jhipster/lite/generator/server/springboot/banner/application/BannerApplicationService.java b/src/main/java/tech/jhipster/lite/generator/server/springboot/banner/application/BannerApplicationService.java index c987bddf8a1..1ef4b447eef 100644 --- a/src/main/java/tech/jhipster/lite/generator/server/springboot/banner/application/BannerApplicationService.java +++ b/src/main/java/tech/jhipster/lite/generator/server/springboot/banner/application/BannerApplicationService.java @@ -1,9 +1,9 @@ package tech.jhipster.lite.generator.server.springboot.banner.application; import org.springframework.stereotype.Service; -import tech.jhipster.lite.generator.module.domain.JHipsterModule; -import tech.jhipster.lite.generator.module.domain.properties.JHipsterModuleProperties; import tech.jhipster.lite.generator.server.springboot.banner.domain.BannerModuleFactory; +import tech.jhipster.lite.module.domain.JHipsterModule; +import tech.jhipster.lite.module.domain.properties.JHipsterModuleProperties; @Service public class BannerApplicationService { diff --git a/src/main/java/tech/jhipster/lite/generator/server/springboot/banner/domain/BannerModuleFactory.java b/src/main/java/tech/jhipster/lite/generator/server/springboot/banner/domain/BannerModuleFactory.java index e9b38f58214..ad2b04d3613 100644 --- a/src/main/java/tech/jhipster/lite/generator/server/springboot/banner/domain/BannerModuleFactory.java +++ b/src/main/java/tech/jhipster/lite/generator/server/springboot/banner/domain/BannerModuleFactory.java @@ -1,13 +1,13 @@ package tech.jhipster.lite.generator.server.springboot.banner.domain; -import static tech.jhipster.lite.generator.module.domain.JHipsterModule.from; import static tech.jhipster.lite.generator.project.domain.Constants.MAIN_RESOURCES; +import static tech.jhipster.lite.module.domain.JHipsterModule.*; import tech.jhipster.lite.error.domain.Assert; -import tech.jhipster.lite.generator.module.domain.JHipsterDestination; -import tech.jhipster.lite.generator.module.domain.JHipsterModule; -import tech.jhipster.lite.generator.module.domain.JHipsterSource; -import tech.jhipster.lite.generator.module.domain.properties.JHipsterModuleProperties; +import tech.jhipster.lite.module.domain.JHipsterDestination; +import tech.jhipster.lite.module.domain.JHipsterModule; +import tech.jhipster.lite.module.domain.JHipsterSource; +import tech.jhipster.lite.module.domain.properties.JHipsterModuleProperties; public class BannerModuleFactory { diff --git a/src/main/java/tech/jhipster/lite/generator/server/springboot/banner/infrastructure/primary/rest/BannerResourceConfiguration.java b/src/main/java/tech/jhipster/lite/generator/server/springboot/banner/infrastructure/primary/rest/BannerResourceConfiguration.java index fbcc2ce5355..eea4db471e1 100644 --- a/src/main/java/tech/jhipster/lite/generator/server/springboot/banner/infrastructure/primary/rest/BannerResourceConfiguration.java +++ b/src/main/java/tech/jhipster/lite/generator/server/springboot/banner/infrastructure/primary/rest/BannerResourceConfiguration.java @@ -2,9 +2,9 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import tech.jhipster.lite.generator.module.infrastructure.primary.JHipsterModuleApiDoc; -import tech.jhipster.lite.generator.module.infrastructure.primary.JHipsterModuleResource; import tech.jhipster.lite.generator.server.springboot.banner.application.BannerApplicationService; +import tech.jhipster.lite.module.infrastructure.primary.JHipsterModuleApiDoc; +import tech.jhipster.lite.module.infrastructure.primary.JHipsterModuleResource; @Configuration class BannerResourceConfiguration { diff --git a/src/main/java/tech/jhipster/lite/generator/server/springboot/cucumber/application/CucumberApplicationService.java b/src/main/java/tech/jhipster/lite/generator/server/springboot/cucumber/application/CucumberApplicationService.java index af795296836..0a6f228a29b 100644 --- a/src/main/java/tech/jhipster/lite/generator/server/springboot/cucumber/application/CucumberApplicationService.java +++ b/src/main/java/tech/jhipster/lite/generator/server/springboot/cucumber/application/CucumberApplicationService.java @@ -1,9 +1,9 @@ package tech.jhipster.lite.generator.server.springboot.cucumber.application; import org.springframework.stereotype.Service; -import tech.jhipster.lite.generator.module.domain.JHipsterModule; -import tech.jhipster.lite.generator.module.domain.properties.JHipsterModuleProperties; import tech.jhipster.lite.generator.server.springboot.cucumber.domain.CucumberModuleFactory; +import tech.jhipster.lite.module.domain.JHipsterModule; +import tech.jhipster.lite.module.domain.properties.JHipsterModuleProperties; @Service public class CucumberApplicationService { diff --git a/src/main/java/tech/jhipster/lite/generator/server/springboot/cucumber/domain/CucumberModuleFactory.java b/src/main/java/tech/jhipster/lite/generator/server/springboot/cucumber/domain/CucumberModuleFactory.java index 1e885fa4ec7..35682b9d5b3 100644 --- a/src/main/java/tech/jhipster/lite/generator/server/springboot/cucumber/domain/CucumberModuleFactory.java +++ b/src/main/java/tech/jhipster/lite/generator/server/springboot/cucumber/domain/CucumberModuleFactory.java @@ -1,15 +1,15 @@ package tech.jhipster.lite.generator.server.springboot.cucumber.domain; -import static tech.jhipster.lite.generator.module.domain.JHipsterModule.*; +import static tech.jhipster.lite.module.domain.JHipsterModule.*; import tech.jhipster.lite.error.domain.Assert; -import tech.jhipster.lite.generator.module.domain.JHipsterDestination; -import tech.jhipster.lite.generator.module.domain.JHipsterModule; -import tech.jhipster.lite.generator.module.domain.JHipsterModule.JHipsterModuleBuilder; -import tech.jhipster.lite.generator.module.domain.JHipsterSource; -import tech.jhipster.lite.generator.module.domain.javadependency.JavaDependency; -import tech.jhipster.lite.generator.module.domain.javadependency.JavaDependencyScope; -import tech.jhipster.lite.generator.module.domain.properties.JHipsterModuleProperties; +import tech.jhipster.lite.module.domain.JHipsterDestination; +import tech.jhipster.lite.module.domain.JHipsterModule; +import tech.jhipster.lite.module.domain.JHipsterModule.JHipsterModuleBuilder; +import tech.jhipster.lite.module.domain.JHipsterSource; +import tech.jhipster.lite.module.domain.javadependency.JavaDependency; +import tech.jhipster.lite.module.domain.javadependency.JavaDependencyScope; +import tech.jhipster.lite.module.domain.properties.JHipsterModuleProperties; public class CucumberModuleFactory { diff --git a/src/main/java/tech/jhipster/lite/generator/server/springboot/cucumber/infrastructure/primary/CucumberModuleConfiguration.java b/src/main/java/tech/jhipster/lite/generator/server/springboot/cucumber/infrastructure/primary/CucumberModuleConfiguration.java index cb2b58e839d..79ba244ecca 100644 --- a/src/main/java/tech/jhipster/lite/generator/server/springboot/cucumber/infrastructure/primary/CucumberModuleConfiguration.java +++ b/src/main/java/tech/jhipster/lite/generator/server/springboot/cucumber/infrastructure/primary/CucumberModuleConfiguration.java @@ -2,11 +2,11 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import tech.jhipster.lite.generator.module.domain.properties.JHipsterModulePropertiesDefinition; -import tech.jhipster.lite.generator.module.domain.properties.JHipsterModulePropertyDefinition; -import tech.jhipster.lite.generator.module.infrastructure.primary.JHipsterModuleApiDoc; -import tech.jhipster.lite.generator.module.infrastructure.primary.JHipsterModuleResource; import tech.jhipster.lite.generator.server.springboot.cucumber.application.CucumberApplicationService; +import tech.jhipster.lite.module.domain.properties.JHipsterModulePropertiesDefinition; +import tech.jhipster.lite.module.domain.properties.JHipsterModulePropertyDefinition; +import tech.jhipster.lite.module.infrastructure.primary.JHipsterModuleApiDoc; +import tech.jhipster.lite.module.infrastructure.primary.JHipsterModuleResource; @Configuration class CucumberModuleConfiguration { diff --git a/src/main/java/tech/jhipster/lite/generator/server/springboot/database/mariadb/application/MariaDBApplicationService.java b/src/main/java/tech/jhipster/lite/generator/server/springboot/database/mariadb/application/MariaDBApplicationService.java index 57f8e9eb549..6f6fbecbb87 100644 --- a/src/main/java/tech/jhipster/lite/generator/server/springboot/database/mariadb/application/MariaDBApplicationService.java +++ b/src/main/java/tech/jhipster/lite/generator/server/springboot/database/mariadb/application/MariaDBApplicationService.java @@ -2,9 +2,9 @@ import org.springframework.stereotype.Service; import tech.jhipster.lite.generator.docker.domain.DockerImages; -import tech.jhipster.lite.generator.module.domain.JHipsterModule; -import tech.jhipster.lite.generator.module.domain.properties.JHipsterModuleProperties; import tech.jhipster.lite.generator.server.springboot.database.mariadb.domain.MariaDBModuleFactory; +import tech.jhipster.lite.module.domain.JHipsterModule; +import tech.jhipster.lite.module.domain.properties.JHipsterModuleProperties; @Service public class MariaDBApplicationService { diff --git a/src/main/java/tech/jhipster/lite/generator/server/springboot/database/mariadb/domain/MariaDBModuleFactory.java b/src/main/java/tech/jhipster/lite/generator/server/springboot/database/mariadb/domain/MariaDBModuleFactory.java index 601f5292e00..2d8f37028b7 100644 --- a/src/main/java/tech/jhipster/lite/generator/server/springboot/database/mariadb/domain/MariaDBModuleFactory.java +++ b/src/main/java/tech/jhipster/lite/generator/server/springboot/database/mariadb/domain/MariaDBModuleFactory.java @@ -1,19 +1,19 @@ package tech.jhipster.lite.generator.server.springboot.database.mariadb.domain; import static tech.jhipster.lite.common.domain.WordUtils.LF; -import static tech.jhipster.lite.generator.module.domain.JHipsterModule.*; import static tech.jhipster.lite.generator.server.springboot.core.domain.SpringBoot.NEEDLE_LOGBACK_LOGGER; +import static tech.jhipster.lite.module.domain.JHipsterModule.*; import tech.jhipster.lite.error.domain.Assert; import tech.jhipster.lite.generator.docker.domain.DockerImage; import tech.jhipster.lite.generator.docker.domain.DockerImages; -import tech.jhipster.lite.generator.module.domain.JHipsterDestination; -import tech.jhipster.lite.generator.module.domain.JHipsterModule; -import tech.jhipster.lite.generator.module.domain.javadependency.JavaDependency; -import tech.jhipster.lite.generator.module.domain.javadependency.JavaDependencyScope; -import tech.jhipster.lite.generator.module.domain.properties.JHipsterModuleProperties; import tech.jhipster.lite.generator.project.domain.DatabaseType; import tech.jhipster.lite.generator.server.springboot.common.domain.Level; +import tech.jhipster.lite.module.domain.JHipsterDestination; +import tech.jhipster.lite.module.domain.JHipsterModule; +import tech.jhipster.lite.module.domain.javadependency.JavaDependency; +import tech.jhipster.lite.module.domain.javadependency.JavaDependencyScope; +import tech.jhipster.lite.module.domain.properties.JHipsterModuleProperties; public class MariaDBModuleFactory { diff --git a/src/main/java/tech/jhipster/lite/generator/server/springboot/database/mariadb/infrastructure/primary/MariaDBModuleConfiguration.java b/src/main/java/tech/jhipster/lite/generator/server/springboot/database/mariadb/infrastructure/primary/MariaDBModuleConfiguration.java index 80cc4317bf8..57f57aee451 100644 --- a/src/main/java/tech/jhipster/lite/generator/server/springboot/database/mariadb/infrastructure/primary/MariaDBModuleConfiguration.java +++ b/src/main/java/tech/jhipster/lite/generator/server/springboot/database/mariadb/infrastructure/primary/MariaDBModuleConfiguration.java @@ -2,10 +2,10 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import tech.jhipster.lite.generator.module.domain.properties.JHipsterModulePropertiesDefinition; -import tech.jhipster.lite.generator.module.infrastructure.primary.JHipsterModuleApiDoc; -import tech.jhipster.lite.generator.module.infrastructure.primary.JHipsterModuleResource; import tech.jhipster.lite.generator.server.springboot.database.mariadb.application.MariaDBApplicationService; +import tech.jhipster.lite.module.domain.properties.JHipsterModulePropertiesDefinition; +import tech.jhipster.lite.module.infrastructure.primary.JHipsterModuleApiDoc; +import tech.jhipster.lite.module.infrastructure.primary.JHipsterModuleResource; @Configuration class MariaDBModuleConfiguration { diff --git a/src/main/java/tech/jhipster/lite/generator/server/springboot/database/postgresql/application/PostgresqlApplicationService.java b/src/main/java/tech/jhipster/lite/generator/server/springboot/database/postgresql/application/PostgresqlApplicationService.java index ea59bbf3200..219204745c4 100644 --- a/src/main/java/tech/jhipster/lite/generator/server/springboot/database/postgresql/application/PostgresqlApplicationService.java +++ b/src/main/java/tech/jhipster/lite/generator/server/springboot/database/postgresql/application/PostgresqlApplicationService.java @@ -2,9 +2,9 @@ import org.springframework.stereotype.Service; import tech.jhipster.lite.generator.docker.domain.DockerImages; -import tech.jhipster.lite.generator.module.domain.JHipsterModule; -import tech.jhipster.lite.generator.module.domain.properties.JHipsterModuleProperties; import tech.jhipster.lite.generator.server.springboot.database.postgresql.domain.PostgresqlModuleFactory; +import tech.jhipster.lite.module.domain.JHipsterModule; +import tech.jhipster.lite.module.domain.properties.JHipsterModuleProperties; @Service public class PostgresqlApplicationService { diff --git a/src/main/java/tech/jhipster/lite/generator/server/springboot/database/postgresql/domain/PostgresqlModuleFactory.java b/src/main/java/tech/jhipster/lite/generator/server/springboot/database/postgresql/domain/PostgresqlModuleFactory.java index 1e887c174cf..7cc3af7125b 100644 --- a/src/main/java/tech/jhipster/lite/generator/server/springboot/database/postgresql/domain/PostgresqlModuleFactory.java +++ b/src/main/java/tech/jhipster/lite/generator/server/springboot/database/postgresql/domain/PostgresqlModuleFactory.java @@ -1,21 +1,21 @@ package tech.jhipster.lite.generator.server.springboot.database.postgresql.domain; import static tech.jhipster.lite.common.domain.WordUtils.LF; -import static tech.jhipster.lite.generator.module.domain.JHipsterModule.*; import static tech.jhipster.lite.generator.server.springboot.core.domain.SpringBoot.NEEDLE_LOGBACK_LOGGER; +import static tech.jhipster.lite.module.domain.JHipsterModule.*; import tech.jhipster.lite.error.domain.Assert; import tech.jhipster.lite.generator.docker.domain.DockerImage; import tech.jhipster.lite.generator.docker.domain.DockerImages; -import tech.jhipster.lite.generator.module.domain.JHipsterDestination; -import tech.jhipster.lite.generator.module.domain.JHipsterModule; -import tech.jhipster.lite.generator.module.domain.JHipsterSource; -import tech.jhipster.lite.generator.module.domain.javadependency.JavaDependency; -import tech.jhipster.lite.generator.module.domain.javadependency.JavaDependencyScope; -import tech.jhipster.lite.generator.module.domain.javaproperties.PropertyKey; -import tech.jhipster.lite.generator.module.domain.properties.JHipsterModuleProperties; import tech.jhipster.lite.generator.project.domain.DatabaseType; import tech.jhipster.lite.generator.server.springboot.common.domain.Level; +import tech.jhipster.lite.module.domain.JHipsterDestination; +import tech.jhipster.lite.module.domain.JHipsterModule; +import tech.jhipster.lite.module.domain.JHipsterSource; +import tech.jhipster.lite.module.domain.javadependency.JavaDependency; +import tech.jhipster.lite.module.domain.javadependency.JavaDependencyScope; +import tech.jhipster.lite.module.domain.javaproperties.PropertyKey; +import tech.jhipster.lite.module.domain.properties.JHipsterModuleProperties; public class PostgresqlModuleFactory { diff --git a/src/main/java/tech/jhipster/lite/generator/server/springboot/database/postgresql/infrastructure/primary/PostgresqlModuleConfiguration.java b/src/main/java/tech/jhipster/lite/generator/server/springboot/database/postgresql/infrastructure/primary/PostgresqlModuleConfiguration.java index ff00d0b3fdb..17164053b61 100644 --- a/src/main/java/tech/jhipster/lite/generator/server/springboot/database/postgresql/infrastructure/primary/PostgresqlModuleConfiguration.java +++ b/src/main/java/tech/jhipster/lite/generator/server/springboot/database/postgresql/infrastructure/primary/PostgresqlModuleConfiguration.java @@ -2,10 +2,10 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import tech.jhipster.lite.generator.module.domain.properties.JHipsterModulePropertiesDefinition; -import tech.jhipster.lite.generator.module.infrastructure.primary.JHipsterModuleApiDoc; -import tech.jhipster.lite.generator.module.infrastructure.primary.JHipsterModuleResource; import tech.jhipster.lite.generator.server.springboot.database.postgresql.application.PostgresqlApplicationService; +import tech.jhipster.lite.module.domain.properties.JHipsterModulePropertiesDefinition; +import tech.jhipster.lite.module.infrastructure.primary.JHipsterModuleApiDoc; +import tech.jhipster.lite.module.infrastructure.primary.JHipsterModuleResource; @Configuration class PostgresqlModuleConfiguration { diff --git a/src/main/java/tech/jhipster/lite/generator/server/springboot/devtools/application/DevToolsApplicationService.java b/src/main/java/tech/jhipster/lite/generator/server/springboot/devtools/application/DevToolsApplicationService.java index 031406cf590..9be8024cb48 100644 --- a/src/main/java/tech/jhipster/lite/generator/server/springboot/devtools/application/DevToolsApplicationService.java +++ b/src/main/java/tech/jhipster/lite/generator/server/springboot/devtools/application/DevToolsApplicationService.java @@ -1,9 +1,9 @@ package tech.jhipster.lite.generator.server.springboot.devtools.application; import org.springframework.stereotype.Service; -import tech.jhipster.lite.generator.module.domain.JHipsterModule; -import tech.jhipster.lite.generator.module.domain.properties.JHipsterModuleProperties; import tech.jhipster.lite.generator.server.springboot.devtools.domain.DevToolsModuleFactory; +import tech.jhipster.lite.module.domain.JHipsterModule; +import tech.jhipster.lite.module.domain.properties.JHipsterModuleProperties; @Service public class DevToolsApplicationService { diff --git a/src/main/java/tech/jhipster/lite/generator/server/springboot/devtools/domain/DevToolsModuleFactory.java b/src/main/java/tech/jhipster/lite/generator/server/springboot/devtools/domain/DevToolsModuleFactory.java index d6e3f47d9dd..84350c6bae6 100644 --- a/src/main/java/tech/jhipster/lite/generator/server/springboot/devtools/domain/DevToolsModuleFactory.java +++ b/src/main/java/tech/jhipster/lite/generator/server/springboot/devtools/domain/DevToolsModuleFactory.java @@ -1,13 +1,13 @@ package tech.jhipster.lite.generator.server.springboot.devtools.domain; -import static tech.jhipster.lite.generator.module.domain.JHipsterModule.*; +import static tech.jhipster.lite.module.domain.JHipsterModule.*; import tech.jhipster.lite.error.domain.Assert; -import tech.jhipster.lite.generator.module.domain.JHipsterModule; -import tech.jhipster.lite.generator.module.domain.JHipsterSource; -import tech.jhipster.lite.generator.module.domain.javadependency.GroupId; -import tech.jhipster.lite.generator.module.domain.javaproperties.SpringProfile; -import tech.jhipster.lite.generator.module.domain.properties.JHipsterModuleProperties; +import tech.jhipster.lite.module.domain.JHipsterModule; +import tech.jhipster.lite.module.domain.JHipsterSource; +import tech.jhipster.lite.module.domain.javadependency.GroupId; +import tech.jhipster.lite.module.domain.javaproperties.SpringProfile; +import tech.jhipster.lite.module.domain.properties.JHipsterModuleProperties; public class DevToolsModuleFactory { diff --git a/src/main/java/tech/jhipster/lite/generator/server/springboot/devtools/infrastructure/primary/DevToolsModuleConfiguration.java b/src/main/java/tech/jhipster/lite/generator/server/springboot/devtools/infrastructure/primary/DevToolsModuleConfiguration.java index 214daaba71d..97b8e81def6 100644 --- a/src/main/java/tech/jhipster/lite/generator/server/springboot/devtools/infrastructure/primary/DevToolsModuleConfiguration.java +++ b/src/main/java/tech/jhipster/lite/generator/server/springboot/devtools/infrastructure/primary/DevToolsModuleConfiguration.java @@ -2,10 +2,10 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import tech.jhipster.lite.generator.module.domain.properties.JHipsterModulePropertiesDefinition; -import tech.jhipster.lite.generator.module.infrastructure.primary.JHipsterModuleApiDoc; -import tech.jhipster.lite.generator.module.infrastructure.primary.JHipsterModuleResource; import tech.jhipster.lite.generator.server.springboot.devtools.application.DevToolsApplicationService; +import tech.jhipster.lite.module.domain.properties.JHipsterModulePropertiesDefinition; +import tech.jhipster.lite.module.infrastructure.primary.JHipsterModuleApiDoc; +import tech.jhipster.lite.module.infrastructure.primary.JHipsterModuleResource; @Configuration class DevToolsModuleConfiguration { diff --git a/src/main/java/tech/jhipster/lite/generator/server/springboot/logsspy/application/LogsSpyApplicationService.java b/src/main/java/tech/jhipster/lite/generator/server/springboot/logsspy/application/LogsSpyApplicationService.java index a1b6a38a2c2..04fdf6d1f18 100644 --- a/src/main/java/tech/jhipster/lite/generator/server/springboot/logsspy/application/LogsSpyApplicationService.java +++ b/src/main/java/tech/jhipster/lite/generator/server/springboot/logsspy/application/LogsSpyApplicationService.java @@ -1,9 +1,9 @@ package tech.jhipster.lite.generator.server.springboot.logsspy.application; import org.springframework.stereotype.Service; -import tech.jhipster.lite.generator.module.domain.JHipsterModule; -import tech.jhipster.lite.generator.module.domain.properties.JHipsterModuleProperties; import tech.jhipster.lite.generator.server.springboot.logsspy.domain.LogsSpyModuleFactory; +import tech.jhipster.lite.module.domain.JHipsterModule; +import tech.jhipster.lite.module.domain.properties.JHipsterModuleProperties; @Service public class LogsSpyApplicationService { diff --git a/src/main/java/tech/jhipster/lite/generator/server/springboot/logsspy/domain/LogsSpyModuleFactory.java b/src/main/java/tech/jhipster/lite/generator/server/springboot/logsspy/domain/LogsSpyModuleFactory.java index a9b4eec17c0..0f8eac16f08 100644 --- a/src/main/java/tech/jhipster/lite/generator/server/springboot/logsspy/domain/LogsSpyModuleFactory.java +++ b/src/main/java/tech/jhipster/lite/generator/server/springboot/logsspy/domain/LogsSpyModuleFactory.java @@ -1,10 +1,10 @@ package tech.jhipster.lite.generator.server.springboot.logsspy.domain; -import static tech.jhipster.lite.generator.module.domain.JHipsterModule.*; +import static tech.jhipster.lite.module.domain.JHipsterModule.*; -import tech.jhipster.lite.generator.module.domain.JHipsterModule; -import tech.jhipster.lite.generator.module.domain.JHipsterSource; -import tech.jhipster.lite.generator.module.domain.properties.JHipsterModuleProperties; +import tech.jhipster.lite.module.domain.JHipsterModule; +import tech.jhipster.lite.module.domain.JHipsterSource; +import tech.jhipster.lite.module.domain.properties.JHipsterModuleProperties; public class LogsSpyModuleFactory { diff --git a/src/main/java/tech/jhipster/lite/generator/server/springboot/logsspy/infrastructure/primary/LogsSpyModuleConfiguration.java b/src/main/java/tech/jhipster/lite/generator/server/springboot/logsspy/infrastructure/primary/LogsSpyModuleConfiguration.java index d893cd2c7df..080b49f9d16 100644 --- a/src/main/java/tech/jhipster/lite/generator/server/springboot/logsspy/infrastructure/primary/LogsSpyModuleConfiguration.java +++ b/src/main/java/tech/jhipster/lite/generator/server/springboot/logsspy/infrastructure/primary/LogsSpyModuleConfiguration.java @@ -2,10 +2,10 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import tech.jhipster.lite.generator.module.domain.properties.JHipsterModulePropertiesDefinition; -import tech.jhipster.lite.generator.module.infrastructure.primary.JHipsterModuleApiDoc; -import tech.jhipster.lite.generator.module.infrastructure.primary.JHipsterModuleResource; import tech.jhipster.lite.generator.server.springboot.logsspy.application.LogsSpyApplicationService; +import tech.jhipster.lite.module.domain.properties.JHipsterModulePropertiesDefinition; +import tech.jhipster.lite.module.infrastructure.primary.JHipsterModuleApiDoc; +import tech.jhipster.lite.module.infrastructure.primary.JHipsterModuleResource; @Configuration class LogsSpyModuleConfiguration { diff --git a/src/main/java/tech/jhipster/lite/generator/server/springboot/mvc/security/oauth2/application/OAuth2SecurityApplicationService.java b/src/main/java/tech/jhipster/lite/generator/server/springboot/mvc/security/oauth2/application/OAuth2SecurityApplicationService.java index a4efd7a74e1..980e7c27576 100644 --- a/src/main/java/tech/jhipster/lite/generator/server/springboot/mvc/security/oauth2/application/OAuth2SecurityApplicationService.java +++ b/src/main/java/tech/jhipster/lite/generator/server/springboot/mvc/security/oauth2/application/OAuth2SecurityApplicationService.java @@ -2,10 +2,10 @@ import org.springframework.stereotype.Service; import tech.jhipster.lite.generator.docker.domain.DockerImages; -import tech.jhipster.lite.generator.module.domain.JHipsterModule; -import tech.jhipster.lite.generator.module.domain.properties.JHipsterModuleProperties; import tech.jhipster.lite.generator.server.springboot.mvc.security.oauth2.domain.OAuth2AccountModuleFactory; import tech.jhipster.lite.generator.server.springboot.mvc.security.oauth2.domain.OAuth2ModuleFactory; +import tech.jhipster.lite.module.domain.JHipsterModule; +import tech.jhipster.lite.module.domain.properties.JHipsterModuleProperties; @Service public class OAuth2SecurityApplicationService { diff --git a/src/main/java/tech/jhipster/lite/generator/server/springboot/mvc/security/oauth2/domain/OAuth2AccountModuleFactory.java b/src/main/java/tech/jhipster/lite/generator/server/springboot/mvc/security/oauth2/domain/OAuth2AccountModuleFactory.java index dde9f0f8df8..bc9d232ec84 100644 --- a/src/main/java/tech/jhipster/lite/generator/server/springboot/mvc/security/oauth2/domain/OAuth2AccountModuleFactory.java +++ b/src/main/java/tech/jhipster/lite/generator/server/springboot/mvc/security/oauth2/domain/OAuth2AccountModuleFactory.java @@ -1,11 +1,11 @@ package tech.jhipster.lite.generator.server.springboot.mvc.security.oauth2.domain; -import static tech.jhipster.lite.generator.module.domain.JHipsterModule.*; +import static tech.jhipster.lite.module.domain.JHipsterModule.*; -import tech.jhipster.lite.generator.module.domain.JHipsterDestination; -import tech.jhipster.lite.generator.module.domain.JHipsterModule; -import tech.jhipster.lite.generator.module.domain.JHipsterSource; -import tech.jhipster.lite.generator.module.domain.properties.JHipsterModuleProperties; +import tech.jhipster.lite.module.domain.JHipsterDestination; +import tech.jhipster.lite.module.domain.JHipsterModule; +import tech.jhipster.lite.module.domain.JHipsterSource; +import tech.jhipster.lite.module.domain.properties.JHipsterModuleProperties; public class OAuth2AccountModuleFactory { diff --git a/src/main/java/tech/jhipster/lite/generator/server/springboot/mvc/security/oauth2/domain/OAuth2ModuleFactory.java b/src/main/java/tech/jhipster/lite/generator/server/springboot/mvc/security/oauth2/domain/OAuth2ModuleFactory.java index 7d31652d376..3ea00fe618a 100644 --- a/src/main/java/tech/jhipster/lite/generator/server/springboot/mvc/security/oauth2/domain/OAuth2ModuleFactory.java +++ b/src/main/java/tech/jhipster/lite/generator/server/springboot/mvc/security/oauth2/domain/OAuth2ModuleFactory.java @@ -1,18 +1,18 @@ package tech.jhipster.lite.generator.server.springboot.mvc.security.oauth2.domain; -import static tech.jhipster.lite.generator.module.domain.JHipsterModule.*; +import static tech.jhipster.lite.module.domain.JHipsterModule.*; import tech.jhipster.lite.error.domain.Assert; import tech.jhipster.lite.generator.docker.domain.DockerImage; import tech.jhipster.lite.generator.docker.domain.DockerImages; -import tech.jhipster.lite.generator.module.domain.JHipsterDestination; -import tech.jhipster.lite.generator.module.domain.JHipsterModule; -import tech.jhipster.lite.generator.module.domain.JHipsterSource; -import tech.jhipster.lite.generator.module.domain.javadependency.GroupId; -import tech.jhipster.lite.generator.module.domain.javadependency.JavaDependency; -import tech.jhipster.lite.generator.module.domain.javadependency.JavaDependencyScope; -import tech.jhipster.lite.generator.module.domain.properties.JHipsterModuleProperties; -import tech.jhipster.lite.generator.module.domain.replacement.TextMatcher; +import tech.jhipster.lite.module.domain.JHipsterDestination; +import tech.jhipster.lite.module.domain.JHipsterModule; +import tech.jhipster.lite.module.domain.JHipsterSource; +import tech.jhipster.lite.module.domain.javadependency.GroupId; +import tech.jhipster.lite.module.domain.javadependency.JavaDependency; +import tech.jhipster.lite.module.domain.javadependency.JavaDependencyScope; +import tech.jhipster.lite.module.domain.properties.JHipsterModuleProperties; +import tech.jhipster.lite.module.domain.replacement.TextMatcher; public class OAuth2ModuleFactory { diff --git a/src/main/java/tech/jhipster/lite/generator/server/springboot/mvc/security/oauth2/infrastructure/primary/OAuth2ModuleConfiguration.java b/src/main/java/tech/jhipster/lite/generator/server/springboot/mvc/security/oauth2/infrastructure/primary/OAuth2ModuleConfiguration.java index 95535f25c4e..ca902d25347 100644 --- a/src/main/java/tech/jhipster/lite/generator/server/springboot/mvc/security/oauth2/infrastructure/primary/OAuth2ModuleConfiguration.java +++ b/src/main/java/tech/jhipster/lite/generator/server/springboot/mvc/security/oauth2/infrastructure/primary/OAuth2ModuleConfiguration.java @@ -2,10 +2,10 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import tech.jhipster.lite.generator.module.domain.properties.JHipsterModulePropertiesDefinition; -import tech.jhipster.lite.generator.module.infrastructure.primary.JHipsterModuleApiDoc; -import tech.jhipster.lite.generator.module.infrastructure.primary.JHipsterModuleResource; import tech.jhipster.lite.generator.server.springboot.mvc.security.oauth2.application.OAuth2SecurityApplicationService; +import tech.jhipster.lite.module.domain.properties.JHipsterModulePropertiesDefinition; +import tech.jhipster.lite.module.infrastructure.primary.JHipsterModuleApiDoc; +import tech.jhipster.lite.module.infrastructure.primary.JHipsterModuleResource; @Configuration class OAuth2ModuleConfiguration { diff --git a/src/main/java/tech/jhipster/lite/generator/module/application/JHipsterModulesApplicationService.java b/src/main/java/tech/jhipster/lite/module/application/JHipsterModulesApplicationService.java similarity index 56% rename from src/main/java/tech/jhipster/lite/generator/module/application/JHipsterModulesApplicationService.java rename to src/main/java/tech/jhipster/lite/module/application/JHipsterModulesApplicationService.java index 7687fc2906f..b1243efef7f 100644 --- a/src/main/java/tech/jhipster/lite/generator/module/application/JHipsterModulesApplicationService.java +++ b/src/main/java/tech/jhipster/lite/module/application/JHipsterModulesApplicationService.java @@ -1,14 +1,14 @@ -package tech.jhipster.lite.generator.module.application; +package tech.jhipster.lite.module.application; import java.time.Instant; 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.JavaDependenciesCurrentVersionsRepository; -import tech.jhipster.lite.generator.module.domain.javadependency.ProjectJavaDependenciesRepository; +import tech.jhipster.lite.module.domain.JHipsterModuleApplied; +import tech.jhipster.lite.module.domain.JHipsterModuleEvents; +import tech.jhipster.lite.module.domain.JHipsterModuleToApply; +import tech.jhipster.lite.module.domain.JHipsterModulesDomainService; +import tech.jhipster.lite.module.domain.JHipsterModulesRepository; +import tech.jhipster.lite.module.domain.javadependency.JavaDependenciesCurrentVersionsRepository; +import tech.jhipster.lite.module.domain.javadependency.ProjectJavaDependenciesRepository; @Service public class JHipsterModulesApplicationService { diff --git a/src/main/java/tech/jhipster/lite/generator/module/domain/ArgumentsReplacer.java b/src/main/java/tech/jhipster/lite/module/domain/ArgumentsReplacer.java similarity index 95% rename from src/main/java/tech/jhipster/lite/generator/module/domain/ArgumentsReplacer.java rename to src/main/java/tech/jhipster/lite/module/domain/ArgumentsReplacer.java index 730e3d32c9e..624b9501003 100644 --- a/src/main/java/tech/jhipster/lite/generator/module/domain/ArgumentsReplacer.java +++ b/src/main/java/tech/jhipster/lite/module/domain/ArgumentsReplacer.java @@ -1,4 +1,4 @@ -package tech.jhipster.lite.generator.module.domain; +package tech.jhipster.lite.module.domain; import java.util.Map; diff --git a/src/main/java/tech/jhipster/lite/generator/module/domain/DocumentationTitle.java b/src/main/java/tech/jhipster/lite/module/domain/DocumentationTitle.java similarity index 90% rename from src/main/java/tech/jhipster/lite/generator/module/domain/DocumentationTitle.java rename to src/main/java/tech/jhipster/lite/module/domain/DocumentationTitle.java index 1346fa52ba0..19e21b62c36 100644 --- a/src/main/java/tech/jhipster/lite/generator/module/domain/DocumentationTitle.java +++ b/src/main/java/tech/jhipster/lite/module/domain/DocumentationTitle.java @@ -1,4 +1,4 @@ -package tech.jhipster.lite.generator.module.domain; +package tech.jhipster.lite.module.domain; import org.apache.commons.lang3.StringUtils; import tech.jhipster.lite.error.domain.Assert; diff --git a/src/main/java/tech/jhipster/lite/generator/module/domain/Indentation.java b/src/main/java/tech/jhipster/lite/module/domain/Indentation.java similarity index 93% rename from src/main/java/tech/jhipster/lite/generator/module/domain/Indentation.java rename to src/main/java/tech/jhipster/lite/module/domain/Indentation.java index 8120cc3a4dc..b3293862975 100644 --- a/src/main/java/tech/jhipster/lite/generator/module/domain/Indentation.java +++ b/src/main/java/tech/jhipster/lite/module/domain/Indentation.java @@ -1,4 +1,4 @@ -package tech.jhipster.lite.generator.module.domain; +package tech.jhipster.lite.module.domain; import tech.jhipster.lite.error.domain.Assert; diff --git a/src/main/java/tech/jhipster/lite/generator/module/domain/InvalidJHipsterModuleSlugException.java b/src/main/java/tech/jhipster/lite/module/domain/InvalidJHipsterModuleSlugException.java similarity index 87% rename from src/main/java/tech/jhipster/lite/generator/module/domain/InvalidJHipsterModuleSlugException.java rename to src/main/java/tech/jhipster/lite/module/domain/InvalidJHipsterModuleSlugException.java index 9c7f980f672..f3449cb2d1c 100644 --- a/src/main/java/tech/jhipster/lite/generator/module/domain/InvalidJHipsterModuleSlugException.java +++ b/src/main/java/tech/jhipster/lite/module/domain/InvalidJHipsterModuleSlugException.java @@ -1,4 +1,4 @@ -package tech.jhipster.lite.generator.module.domain; +package tech.jhipster.lite.module.domain; import tech.jhipster.lite.error.domain.GeneratorException; diff --git a/src/main/java/tech/jhipster/lite/generator/module/domain/JHipsterDestination.java b/src/main/java/tech/jhipster/lite/module/domain/JHipsterDestination.java similarity index 90% rename from src/main/java/tech/jhipster/lite/generator/module/domain/JHipsterDestination.java rename to src/main/java/tech/jhipster/lite/module/domain/JHipsterDestination.java index 48587212f6f..d0e158575bf 100644 --- a/src/main/java/tech/jhipster/lite/generator/module/domain/JHipsterDestination.java +++ b/src/main/java/tech/jhipster/lite/module/domain/JHipsterDestination.java @@ -1,8 +1,8 @@ -package tech.jhipster.lite.generator.module.domain; +package tech.jhipster.lite.module.domain; import java.nio.file.Path; import tech.jhipster.lite.error.domain.Assert; -import tech.jhipster.lite.generator.module.domain.properties.JHipsterProjectFolder; +import tech.jhipster.lite.module.domain.properties.JHipsterProjectFolder; public class JHipsterDestination { diff --git a/src/main/java/tech/jhipster/lite/generator/module/domain/JHipsterFileContent.java b/src/main/java/tech/jhipster/lite/module/domain/JHipsterFileContent.java similarity index 93% rename from src/main/java/tech/jhipster/lite/generator/module/domain/JHipsterFileContent.java rename to src/main/java/tech/jhipster/lite/module/domain/JHipsterFileContent.java index 03900e9b3be..a4dcb8c1806 100644 --- a/src/main/java/tech/jhipster/lite/generator/module/domain/JHipsterFileContent.java +++ b/src/main/java/tech/jhipster/lite/module/domain/JHipsterFileContent.java @@ -1,4 +1,4 @@ -package tech.jhipster.lite.generator.module.domain; +package tech.jhipster.lite.module.domain; import java.nio.charset.StandardCharsets; import tech.jhipster.lite.common.domain.ProjectFilesReader; diff --git a/src/main/java/tech/jhipster/lite/generator/module/domain/JHipsterModule.java b/src/main/java/tech/jhipster/lite/module/domain/JHipsterModule.java similarity index 77% rename from src/main/java/tech/jhipster/lite/generator/module/domain/JHipsterModule.java rename to src/main/java/tech/jhipster/lite/module/domain/JHipsterModule.java index 03f7d63826c..b6ea5618ad2 100644 --- a/src/main/java/tech/jhipster/lite/generator/module/domain/JHipsterModule.java +++ b/src/main/java/tech/jhipster/lite/module/domain/JHipsterModule.java @@ -1,4 +1,4 @@ -package tech.jhipster.lite.generator.module.domain; +package tech.jhipster.lite.module.domain; import java.nio.file.Paths; import java.util.Collection; @@ -10,36 +10,36 @@ import java.util.function.Supplier; import java.util.stream.Stream; import tech.jhipster.lite.error.domain.Assert; -import tech.jhipster.lite.generator.module.domain.JHipsterModuleContext.JHipsterModuleContextBuilder; -import tech.jhipster.lite.generator.module.domain.JHipsterModuleFiles.JHipsterModuleFilesBuilder; -import tech.jhipster.lite.generator.module.domain.JHipsterModulePreActions.JHipsterModulePreActionsBuilder; -import tech.jhipster.lite.generator.module.domain.javadependency.ArtifactId; -import tech.jhipster.lite.generator.module.domain.javadependency.GroupId; -import tech.jhipster.lite.generator.module.domain.javadependency.JHipsterModuleJavaDependencies; -import tech.jhipster.lite.generator.module.domain.javadependency.JHipsterModuleJavaDependencies.JHipsterModuleJavaDependenciesBuilder; -import tech.jhipster.lite.generator.module.domain.javadependency.JavaDependency; -import tech.jhipster.lite.generator.module.domain.javadependency.JavaDependency.JavaDependencyGroupIdBuilder; -import tech.jhipster.lite.generator.module.domain.javadependency.VersionSlug; -import tech.jhipster.lite.generator.module.domain.javaproperties.JHipsterModuleSpringProperties; -import tech.jhipster.lite.generator.module.domain.javaproperties.JHipsterModuleSpringProperties.JHipsterModuleSpringPropertiesBuilder; -import tech.jhipster.lite.generator.module.domain.javaproperties.PropertyKey; -import tech.jhipster.lite.generator.module.domain.javaproperties.PropertyValue; -import tech.jhipster.lite.generator.module.domain.javaproperties.SpringProfile; -import tech.jhipster.lite.generator.module.domain.javaproperties.SpringProperties; -import tech.jhipster.lite.generator.module.domain.javaproperties.SpringProperty; -import tech.jhipster.lite.generator.module.domain.javaproperties.SpringProperty.SpringPropertyKeyBuilder; -import tech.jhipster.lite.generator.module.domain.packagejson.JHipsterModulePackageJson; -import tech.jhipster.lite.generator.module.domain.packagejson.JHipsterModulePackageJson.JHipsterModulePackageJsonBuilder; -import tech.jhipster.lite.generator.module.domain.packagejson.PackageName; -import tech.jhipster.lite.generator.module.domain.packagejson.ScriptCommand; -import tech.jhipster.lite.generator.module.domain.packagejson.ScriptKey; -import tech.jhipster.lite.generator.module.domain.postaction.JHipsterModulePostActions; -import tech.jhipster.lite.generator.module.domain.postaction.JHipsterModulePostActions.JHipsterModulePostActionsBuilder; -import tech.jhipster.lite.generator.module.domain.properties.JHipsterModuleProperties; -import tech.jhipster.lite.generator.module.domain.properties.JHipsterProjectFolder; -import tech.jhipster.lite.generator.module.domain.replacement.*; -import tech.jhipster.lite.generator.module.domain.replacement.JHipsterModuleMandatoryReplacements.JHipsterModuleMandatoryReplacementsBuilder; -import tech.jhipster.lite.generator.module.domain.replacement.JHipsterModuleOptionalReplacements.JHipsterModuleOptionalReplacementsBuilder; +import tech.jhipster.lite.module.domain.JHipsterModuleContext.JHipsterModuleContextBuilder; +import tech.jhipster.lite.module.domain.JHipsterModuleFiles.JHipsterModuleFilesBuilder; +import tech.jhipster.lite.module.domain.JHipsterModulePreActions.JHipsterModulePreActionsBuilder; +import tech.jhipster.lite.module.domain.javadependency.ArtifactId; +import tech.jhipster.lite.module.domain.javadependency.GroupId; +import tech.jhipster.lite.module.domain.javadependency.JHipsterModuleJavaDependencies; +import tech.jhipster.lite.module.domain.javadependency.JHipsterModuleJavaDependencies.JHipsterModuleJavaDependenciesBuilder; +import tech.jhipster.lite.module.domain.javadependency.JavaDependency; +import tech.jhipster.lite.module.domain.javadependency.JavaDependency.JavaDependencyGroupIdBuilder; +import tech.jhipster.lite.module.domain.javadependency.VersionSlug; +import tech.jhipster.lite.module.domain.javaproperties.JHipsterModuleSpringProperties; +import tech.jhipster.lite.module.domain.javaproperties.JHipsterModuleSpringProperties.JHipsterModuleSpringPropertiesBuilder; +import tech.jhipster.lite.module.domain.javaproperties.PropertyKey; +import tech.jhipster.lite.module.domain.javaproperties.PropertyValue; +import tech.jhipster.lite.module.domain.javaproperties.SpringProfile; +import tech.jhipster.lite.module.domain.javaproperties.SpringProperties; +import tech.jhipster.lite.module.domain.javaproperties.SpringProperty; +import tech.jhipster.lite.module.domain.javaproperties.SpringProperty.SpringPropertyKeyBuilder; +import tech.jhipster.lite.module.domain.packagejson.JHipsterModulePackageJson; +import tech.jhipster.lite.module.domain.packagejson.JHipsterModulePackageJson.JHipsterModulePackageJsonBuilder; +import tech.jhipster.lite.module.domain.packagejson.PackageName; +import tech.jhipster.lite.module.domain.packagejson.ScriptCommand; +import tech.jhipster.lite.module.domain.packagejson.ScriptKey; +import tech.jhipster.lite.module.domain.postaction.JHipsterModulePostActions; +import tech.jhipster.lite.module.domain.postaction.JHipsterModulePostActions.JHipsterModulePostActionsBuilder; +import tech.jhipster.lite.module.domain.properties.JHipsterModuleProperties; +import tech.jhipster.lite.module.domain.properties.JHipsterProjectFolder; +import tech.jhipster.lite.module.domain.replacement.*; +import tech.jhipster.lite.module.domain.replacement.JHipsterModuleMandatoryReplacements.JHipsterModuleMandatoryReplacementsBuilder; +import tech.jhipster.lite.module.domain.replacement.JHipsterModuleOptionalReplacements.JHipsterModuleOptionalReplacementsBuilder; public class JHipsterModule { diff --git a/src/main/java/tech/jhipster/lite/generator/module/domain/JHipsterModuleApplied.java b/src/main/java/tech/jhipster/lite/module/domain/JHipsterModuleApplied.java similarity index 71% rename from src/main/java/tech/jhipster/lite/generator/module/domain/JHipsterModuleApplied.java rename to src/main/java/tech/jhipster/lite/module/domain/JHipsterModuleApplied.java index cbd18ca6ae4..0537f8382bf 100644 --- a/src/main/java/tech/jhipster/lite/generator/module/domain/JHipsterModuleApplied.java +++ b/src/main/java/tech/jhipster/lite/module/domain/JHipsterModuleApplied.java @@ -1,8 +1,8 @@ -package tech.jhipster.lite.generator.module.domain; +package tech.jhipster.lite.module.domain; import java.time.Instant; import tech.jhipster.lite.error.domain.Assert; -import tech.jhipster.lite.generator.module.domain.properties.JHipsterModuleProperties; +import tech.jhipster.lite.module.domain.properties.JHipsterModuleProperties; public record JHipsterModuleApplied(JHipsterModuleProperties properties, JHipsterModuleSlug slug, Instant time) { public JHipsterModuleApplied { diff --git a/src/main/java/tech/jhipster/lite/generator/module/domain/JHipsterModuleChanges.java b/src/main/java/tech/jhipster/lite/module/domain/JHipsterModuleChanges.java similarity index 91% rename from src/main/java/tech/jhipster/lite/generator/module/domain/JHipsterModuleChanges.java rename to src/main/java/tech/jhipster/lite/module/domain/JHipsterModuleChanges.java index e690b874642..5bb82491033 100644 --- a/src/main/java/tech/jhipster/lite/generator/module/domain/JHipsterModuleChanges.java +++ b/src/main/java/tech/jhipster/lite/module/domain/JHipsterModuleChanges.java @@ -1,13 +1,13 @@ -package tech.jhipster.lite.generator.module.domain; +package tech.jhipster.lite.module.domain; import tech.jhipster.lite.error.domain.Assert; -import tech.jhipster.lite.generator.module.domain.javadependency.command.JavaDependenciesCommands; -import tech.jhipster.lite.generator.module.domain.javaproperties.SpringProperties; -import tech.jhipster.lite.generator.module.domain.packagejson.JHipsterModulePackageJson; -import tech.jhipster.lite.generator.module.domain.postaction.JHipsterModulePostActions; -import tech.jhipster.lite.generator.module.domain.properties.JHipsterProjectFolder; -import tech.jhipster.lite.generator.module.domain.replacement.JHipsterModuleMandatoryReplacements; -import tech.jhipster.lite.generator.module.domain.replacement.JHipsterModuleOptionalReplacements; +import tech.jhipster.lite.module.domain.javadependency.command.JavaDependenciesCommands; +import tech.jhipster.lite.module.domain.javaproperties.SpringProperties; +import tech.jhipster.lite.module.domain.packagejson.JHipsterModulePackageJson; +import tech.jhipster.lite.module.domain.postaction.JHipsterModulePostActions; +import tech.jhipster.lite.module.domain.properties.JHipsterProjectFolder; +import tech.jhipster.lite.module.domain.replacement.JHipsterModuleMandatoryReplacements; +import tech.jhipster.lite.module.domain.replacement.JHipsterModuleOptionalReplacements; public class JHipsterModuleChanges { diff --git a/src/main/java/tech/jhipster/lite/generator/module/domain/JHipsterModuleContext.java b/src/main/java/tech/jhipster/lite/module/domain/JHipsterModuleContext.java similarity index 91% rename from src/main/java/tech/jhipster/lite/generator/module/domain/JHipsterModuleContext.java rename to src/main/java/tech/jhipster/lite/module/domain/JHipsterModuleContext.java index bfcbacb7b66..3569e6334ca 100644 --- a/src/main/java/tech/jhipster/lite/generator/module/domain/JHipsterModuleContext.java +++ b/src/main/java/tech/jhipster/lite/module/domain/JHipsterModuleContext.java @@ -1,4 +1,4 @@ -package tech.jhipster.lite.generator.module.domain; +package tech.jhipster.lite.module.domain; import java.util.HashMap; import java.util.Map; @@ -6,8 +6,8 @@ import org.slf4j.LoggerFactory; import tech.jhipster.lite.common.domain.JHipsterCollections; import tech.jhipster.lite.error.domain.Assert; -import tech.jhipster.lite.generator.module.domain.JHipsterModule.JHipsterModuleBuilder; -import tech.jhipster.lite.generator.module.domain.properties.JHipsterModuleProperties; +import tech.jhipster.lite.module.domain.JHipsterModule.JHipsterModuleBuilder; +import tech.jhipster.lite.module.domain.properties.JHipsterModuleProperties; public class JHipsterModuleContext { diff --git a/src/main/java/tech/jhipster/lite/generator/module/domain/JHipsterModuleEvents.java b/src/main/java/tech/jhipster/lite/module/domain/JHipsterModuleEvents.java similarity index 65% rename from src/main/java/tech/jhipster/lite/generator/module/domain/JHipsterModuleEvents.java rename to src/main/java/tech/jhipster/lite/module/domain/JHipsterModuleEvents.java index 512bba634fa..4b47e762589 100644 --- a/src/main/java/tech/jhipster/lite/generator/module/domain/JHipsterModuleEvents.java +++ b/src/main/java/tech/jhipster/lite/module/domain/JHipsterModuleEvents.java @@ -1,4 +1,4 @@ -package tech.jhipster.lite.generator.module.domain; +package tech.jhipster.lite.module.domain; public interface JHipsterModuleEvents { void dispatch(JHipsterModuleApplied moduleApplied); diff --git a/src/main/java/tech/jhipster/lite/module/domain/JHipsterModuleFactory.java b/src/main/java/tech/jhipster/lite/module/domain/JHipsterModuleFactory.java new file mode 100644 index 00000000000..2bb56653a04 --- /dev/null +++ b/src/main/java/tech/jhipster/lite/module/domain/JHipsterModuleFactory.java @@ -0,0 +1,8 @@ +package tech.jhipster.lite.module.domain; + +import tech.jhipster.lite.module.domain.properties.JHipsterModuleProperties; + +@FunctionalInterface +public interface JHipsterModuleFactory { + JHipsterModule create(JHipsterModuleProperties properties); +} diff --git a/src/main/java/tech/jhipster/lite/generator/module/domain/JHipsterModuleFile.java b/src/main/java/tech/jhipster/lite/module/domain/JHipsterModuleFile.java similarity index 84% rename from src/main/java/tech/jhipster/lite/generator/module/domain/JHipsterModuleFile.java rename to src/main/java/tech/jhipster/lite/module/domain/JHipsterModuleFile.java index 5f2ec6afa4c..4d7ec23d97e 100644 --- a/src/main/java/tech/jhipster/lite/generator/module/domain/JHipsterModuleFile.java +++ b/src/main/java/tech/jhipster/lite/module/domain/JHipsterModuleFile.java @@ -1,4 +1,4 @@ -package tech.jhipster.lite.generator.module.domain; +package tech.jhipster.lite.module.domain; import tech.jhipster.lite.error.domain.Assert; diff --git a/src/main/java/tech/jhipster/lite/generator/module/domain/JHipsterModuleFiles.java b/src/main/java/tech/jhipster/lite/module/domain/JHipsterModuleFiles.java similarity index 94% rename from src/main/java/tech/jhipster/lite/generator/module/domain/JHipsterModuleFiles.java rename to src/main/java/tech/jhipster/lite/module/domain/JHipsterModuleFiles.java index 710e2e30068..3262d93f23d 100644 --- a/src/main/java/tech/jhipster/lite/generator/module/domain/JHipsterModuleFiles.java +++ b/src/main/java/tech/jhipster/lite/module/domain/JHipsterModuleFiles.java @@ -1,9 +1,9 @@ -package tech.jhipster.lite.generator.module.domain; +package tech.jhipster.lite.module.domain; import java.util.ArrayList; import java.util.Collection; import tech.jhipster.lite.error.domain.Assert; -import tech.jhipster.lite.generator.module.domain.JHipsterModule.JHipsterModuleBuilder; +import tech.jhipster.lite.module.domain.JHipsterModule.JHipsterModuleBuilder; public class JHipsterModuleFiles { diff --git a/src/main/java/tech/jhipster/lite/generator/module/domain/JHipsterModulePreActions.java b/src/main/java/tech/jhipster/lite/module/domain/JHipsterModulePreActions.java similarity index 89% rename from src/main/java/tech/jhipster/lite/generator/module/domain/JHipsterModulePreActions.java rename to src/main/java/tech/jhipster/lite/module/domain/JHipsterModulePreActions.java index 73eed67f481..5345da33ae0 100644 --- a/src/main/java/tech/jhipster/lite/generator/module/domain/JHipsterModulePreActions.java +++ b/src/main/java/tech/jhipster/lite/module/domain/JHipsterModulePreActions.java @@ -1,9 +1,9 @@ -package tech.jhipster.lite.generator.module.domain; +package tech.jhipster.lite.module.domain; import java.util.ArrayList; import java.util.Collection; import tech.jhipster.lite.error.domain.Assert; -import tech.jhipster.lite.generator.module.domain.JHipsterModule.JHipsterModuleBuilder; +import tech.jhipster.lite.module.domain.JHipsterModule.JHipsterModuleBuilder; public class JHipsterModulePreActions { diff --git a/src/main/java/tech/jhipster/lite/generator/module/domain/JHipsterModuleSlug.java b/src/main/java/tech/jhipster/lite/module/domain/JHipsterModuleSlug.java similarity index 92% rename from src/main/java/tech/jhipster/lite/generator/module/domain/JHipsterModuleSlug.java rename to src/main/java/tech/jhipster/lite/module/domain/JHipsterModuleSlug.java index c50da409114..f06293105e9 100644 --- a/src/main/java/tech/jhipster/lite/generator/module/domain/JHipsterModuleSlug.java +++ b/src/main/java/tech/jhipster/lite/module/domain/JHipsterModuleSlug.java @@ -1,4 +1,4 @@ -package tech.jhipster.lite.generator.module.domain; +package tech.jhipster.lite.module.domain; import java.util.regex.Pattern; import tech.jhipster.lite.error.domain.Assert; diff --git a/src/main/java/tech/jhipster/lite/generator/module/domain/JHipsterModuleToApply.java b/src/main/java/tech/jhipster/lite/module/domain/JHipsterModuleToApply.java similarity index 70% rename from src/main/java/tech/jhipster/lite/generator/module/domain/JHipsterModuleToApply.java rename to src/main/java/tech/jhipster/lite/module/domain/JHipsterModuleToApply.java index 33cef3750b2..2201ca276ff 100644 --- a/src/main/java/tech/jhipster/lite/generator/module/domain/JHipsterModuleToApply.java +++ b/src/main/java/tech/jhipster/lite/module/domain/JHipsterModuleToApply.java @@ -1,7 +1,7 @@ -package tech.jhipster.lite.generator.module.domain; +package tech.jhipster.lite.module.domain; import tech.jhipster.lite.error.domain.Assert; -import tech.jhipster.lite.generator.module.domain.properties.JHipsterModuleProperties; +import tech.jhipster.lite.module.domain.properties.JHipsterModuleProperties; public record JHipsterModuleToApply(JHipsterModuleProperties properties, JHipsterModuleSlug slug, JHipsterModule module) { public JHipsterModuleToApply { diff --git a/src/main/java/tech/jhipster/lite/generator/module/domain/JHipsterModulesDomainService.java b/src/main/java/tech/jhipster/lite/module/domain/JHipsterModulesDomainService.java similarity index 80% rename from src/main/java/tech/jhipster/lite/generator/module/domain/JHipsterModulesDomainService.java rename to src/main/java/tech/jhipster/lite/module/domain/JHipsterModulesDomainService.java index d296cd2acfe..39af145bcbd 100644 --- a/src/main/java/tech/jhipster/lite/generator/module/domain/JHipsterModulesDomainService.java +++ b/src/main/java/tech/jhipster/lite/module/domain/JHipsterModulesDomainService.java @@ -1,9 +1,9 @@ -package tech.jhipster.lite.generator.module.domain; +package tech.jhipster.lite.module.domain; import tech.jhipster.lite.error.domain.Assert; -import tech.jhipster.lite.generator.module.domain.javadependency.JavaDependenciesCurrentVersionsRepository; -import tech.jhipster.lite.generator.module.domain.javadependency.ProjectJavaDependenciesRepository; -import tech.jhipster.lite.generator.module.domain.javadependency.command.JavaDependenciesCommands; +import tech.jhipster.lite.module.domain.javadependency.JavaDependenciesCurrentVersionsRepository; +import tech.jhipster.lite.module.domain.javadependency.ProjectJavaDependenciesRepository; +import tech.jhipster.lite.module.domain.javadependency.command.JavaDependenciesCommands; public class JHipsterModulesDomainService { diff --git a/src/main/java/tech/jhipster/lite/generator/module/domain/JHipsterModulesRepository.java b/src/main/java/tech/jhipster/lite/module/domain/JHipsterModulesRepository.java similarity index 64% rename from src/main/java/tech/jhipster/lite/generator/module/domain/JHipsterModulesRepository.java rename to src/main/java/tech/jhipster/lite/module/domain/JHipsterModulesRepository.java index 826a446b0d1..0ec0a5a6fc2 100644 --- a/src/main/java/tech/jhipster/lite/generator/module/domain/JHipsterModulesRepository.java +++ b/src/main/java/tech/jhipster/lite/module/domain/JHipsterModulesRepository.java @@ -1,4 +1,4 @@ -package tech.jhipster.lite.generator.module.domain; +package tech.jhipster.lite.module.domain; public interface JHipsterModulesRepository { void apply(JHipsterModuleChanges changes); diff --git a/src/main/java/tech/jhipster/lite/generator/module/domain/JHipsterSource.java b/src/main/java/tech/jhipster/lite/module/domain/JHipsterSource.java similarity index 96% rename from src/main/java/tech/jhipster/lite/generator/module/domain/JHipsterSource.java rename to src/main/java/tech/jhipster/lite/module/domain/JHipsterSource.java index 8b03312e0aa..b6631ee89b7 100644 --- a/src/main/java/tech/jhipster/lite/generator/module/domain/JHipsterSource.java +++ b/src/main/java/tech/jhipster/lite/module/domain/JHipsterSource.java @@ -1,4 +1,4 @@ -package tech.jhipster.lite.generator.module.domain; +package tech.jhipster.lite.module.domain; import java.nio.file.Path; import org.apache.commons.io.FilenameUtils; diff --git a/src/main/java/tech/jhipster/lite/generator/module/domain/TemplatedFile.java b/src/main/java/tech/jhipster/lite/module/domain/TemplatedFile.java similarity index 91% rename from src/main/java/tech/jhipster/lite/generator/module/domain/TemplatedFile.java rename to src/main/java/tech/jhipster/lite/module/domain/TemplatedFile.java index 68e39e66fba..22159272b8b 100644 --- a/src/main/java/tech/jhipster/lite/generator/module/domain/TemplatedFile.java +++ b/src/main/java/tech/jhipster/lite/module/domain/TemplatedFile.java @@ -1,9 +1,9 @@ -package tech.jhipster.lite.generator.module.domain; +package tech.jhipster.lite.module.domain; import java.nio.file.Path; import tech.jhipster.lite.common.domain.ProjectFilesReader; import tech.jhipster.lite.error.domain.Assert; -import tech.jhipster.lite.generator.module.domain.properties.JHipsterProjectFolder; +import tech.jhipster.lite.module.domain.properties.JHipsterProjectFolder; public class TemplatedFile { diff --git a/src/main/java/tech/jhipster/lite/generator/module/domain/TemplatedFiles.java b/src/main/java/tech/jhipster/lite/module/domain/TemplatedFiles.java similarity index 86% rename from src/main/java/tech/jhipster/lite/generator/module/domain/TemplatedFiles.java rename to src/main/java/tech/jhipster/lite/module/domain/TemplatedFiles.java index ff185bc1c5d..de6b84e7fd3 100644 --- a/src/main/java/tech/jhipster/lite/generator/module/domain/TemplatedFiles.java +++ b/src/main/java/tech/jhipster/lite/module/domain/TemplatedFiles.java @@ -1,4 +1,4 @@ -package tech.jhipster.lite.generator.module.domain; +package tech.jhipster.lite.module.domain; import java.util.Collection; import tech.jhipster.lite.common.domain.JHipsterCollections; diff --git a/src/main/java/tech/jhipster/lite/generator/module/domain/javadependency/ArtifactId.java b/src/main/java/tech/jhipster/lite/module/domain/javadependency/ArtifactId.java similarity index 76% rename from src/main/java/tech/jhipster/lite/generator/module/domain/javadependency/ArtifactId.java rename to src/main/java/tech/jhipster/lite/module/domain/javadependency/ArtifactId.java index d4422a787ca..cf23b68b96a 100644 --- a/src/main/java/tech/jhipster/lite/generator/module/domain/javadependency/ArtifactId.java +++ b/src/main/java/tech/jhipster/lite/module/domain/javadependency/ArtifactId.java @@ -1,4 +1,4 @@ -package tech.jhipster.lite.generator.module.domain.javadependency; +package tech.jhipster.lite.module.domain.javadependency; import tech.jhipster.lite.error.domain.Assert; diff --git a/src/main/java/tech/jhipster/lite/generator/module/domain/javadependency/CurrentJavaDependenciesVersions.java b/src/main/java/tech/jhipster/lite/module/domain/javadependency/CurrentJavaDependenciesVersions.java similarity index 92% rename from src/main/java/tech/jhipster/lite/generator/module/domain/javadependency/CurrentJavaDependenciesVersions.java rename to src/main/java/tech/jhipster/lite/module/domain/javadependency/CurrentJavaDependenciesVersions.java index de627a15869..79909374c69 100644 --- a/src/main/java/tech/jhipster/lite/generator/module/domain/javadependency/CurrentJavaDependenciesVersions.java +++ b/src/main/java/tech/jhipster/lite/module/domain/javadependency/CurrentJavaDependenciesVersions.java @@ -1,4 +1,4 @@ -package tech.jhipster.lite.generator.module.domain.javadependency; +package tech.jhipster.lite.module.domain.javadependency; import java.util.Collection; import java.util.Map; diff --git a/src/main/java/tech/jhipster/lite/generator/module/domain/javadependency/DependencyId.java b/src/main/java/tech/jhipster/lite/module/domain/javadependency/DependencyId.java similarity index 77% rename from src/main/java/tech/jhipster/lite/generator/module/domain/javadependency/DependencyId.java rename to src/main/java/tech/jhipster/lite/module/domain/javadependency/DependencyId.java index d78db2f717b..c90bbe6fdff 100644 --- a/src/main/java/tech/jhipster/lite/generator/module/domain/javadependency/DependencyId.java +++ b/src/main/java/tech/jhipster/lite/module/domain/javadependency/DependencyId.java @@ -1,4 +1,4 @@ -package tech.jhipster.lite.generator.module.domain.javadependency; +package tech.jhipster.lite.module.domain.javadependency; import tech.jhipster.lite.error.domain.Assert; diff --git a/src/main/java/tech/jhipster/lite/generator/module/domain/javadependency/GroupId.java b/src/main/java/tech/jhipster/lite/module/domain/javadependency/GroupId.java similarity index 75% rename from src/main/java/tech/jhipster/lite/generator/module/domain/javadependency/GroupId.java rename to src/main/java/tech/jhipster/lite/module/domain/javadependency/GroupId.java index feb35bf2609..90b863c2076 100644 --- a/src/main/java/tech/jhipster/lite/generator/module/domain/javadependency/GroupId.java +++ b/src/main/java/tech/jhipster/lite/module/domain/javadependency/GroupId.java @@ -1,4 +1,4 @@ -package tech.jhipster.lite.generator.module.domain.javadependency; +package tech.jhipster.lite.module.domain.javadependency; import tech.jhipster.lite.error.domain.Assert; diff --git a/src/main/java/tech/jhipster/lite/generator/module/domain/javadependency/JHipsterModuleJavaDependencies.java b/src/main/java/tech/jhipster/lite/module/domain/javadependency/JHipsterModuleJavaDependencies.java similarity index 89% rename from src/main/java/tech/jhipster/lite/generator/module/domain/javadependency/JHipsterModuleJavaDependencies.java rename to src/main/java/tech/jhipster/lite/module/domain/javadependency/JHipsterModuleJavaDependencies.java index e2841907ffc..f110cf712ee 100644 --- a/src/main/java/tech/jhipster/lite/generator/module/domain/javadependency/JHipsterModuleJavaDependencies.java +++ b/src/main/java/tech/jhipster/lite/module/domain/javadependency/JHipsterModuleJavaDependencies.java @@ -1,10 +1,10 @@ -package tech.jhipster.lite.generator.module.domain.javadependency; +package tech.jhipster.lite.module.domain.javadependency; import java.util.ArrayList; import java.util.Collection; import tech.jhipster.lite.error.domain.Assert; -import tech.jhipster.lite.generator.module.domain.JHipsterModule.JHipsterModuleBuilder; -import tech.jhipster.lite.generator.module.domain.javadependency.command.JavaDependenciesCommands; +import tech.jhipster.lite.module.domain.JHipsterModule.JHipsterModuleBuilder; +import tech.jhipster.lite.module.domain.javadependency.command.JavaDependenciesCommands; public class JHipsterModuleJavaDependencies { diff --git a/src/main/java/tech/jhipster/lite/generator/module/domain/javadependency/JavaDependencies.java b/src/main/java/tech/jhipster/lite/module/domain/javadependency/JavaDependencies.java similarity index 93% rename from src/main/java/tech/jhipster/lite/generator/module/domain/javadependency/JavaDependencies.java rename to src/main/java/tech/jhipster/lite/module/domain/javadependency/JavaDependencies.java index b6aa1098d9a..25ade8530f2 100644 --- a/src/main/java/tech/jhipster/lite/generator/module/domain/javadependency/JavaDependencies.java +++ b/src/main/java/tech/jhipster/lite/module/domain/javadependency/JavaDependencies.java @@ -1,4 +1,4 @@ -package tech.jhipster.lite.generator.module.domain.javadependency; +package tech.jhipster.lite.module.domain.javadependency; import java.util.Collection; import java.util.Map; diff --git a/src/main/java/tech/jhipster/lite/generator/module/domain/javadependency/JavaDependenciesCurrentVersionsRepository.java b/src/main/java/tech/jhipster/lite/module/domain/javadependency/JavaDependenciesCurrentVersionsRepository.java similarity index 61% rename from src/main/java/tech/jhipster/lite/generator/module/domain/javadependency/JavaDependenciesCurrentVersionsRepository.java rename to src/main/java/tech/jhipster/lite/module/domain/javadependency/JavaDependenciesCurrentVersionsRepository.java index 331778a567b..89efee7393f 100644 --- a/src/main/java/tech/jhipster/lite/generator/module/domain/javadependency/JavaDependenciesCurrentVersionsRepository.java +++ b/src/main/java/tech/jhipster/lite/module/domain/javadependency/JavaDependenciesCurrentVersionsRepository.java @@ -1,4 +1,4 @@ -package tech.jhipster.lite.generator.module.domain.javadependency; +package tech.jhipster.lite.module.domain.javadependency; public interface JavaDependenciesCurrentVersionsRepository { CurrentJavaDependenciesVersions get(); diff --git a/src/main/java/tech/jhipster/lite/generator/module/domain/javadependency/JavaDependenciesVersions.java b/src/main/java/tech/jhipster/lite/module/domain/javadependency/JavaDependenciesVersions.java similarity index 93% rename from src/main/java/tech/jhipster/lite/generator/module/domain/javadependency/JavaDependenciesVersions.java rename to src/main/java/tech/jhipster/lite/module/domain/javadependency/JavaDependenciesVersions.java index 49a41f3178b..a82cdc0c0d0 100644 --- a/src/main/java/tech/jhipster/lite/generator/module/domain/javadependency/JavaDependenciesVersions.java +++ b/src/main/java/tech/jhipster/lite/module/domain/javadependency/JavaDependenciesVersions.java @@ -1,4 +1,4 @@ -package tech.jhipster.lite.generator.module.domain.javadependency; +package tech.jhipster.lite.module.domain.javadependency; import java.util.Collection; import java.util.Map; diff --git a/src/main/java/tech/jhipster/lite/generator/module/domain/javadependency/JavaDependency.java b/src/main/java/tech/jhipster/lite/module/domain/javadependency/JavaDependency.java similarity index 93% rename from src/main/java/tech/jhipster/lite/generator/module/domain/javadependency/JavaDependency.java rename to src/main/java/tech/jhipster/lite/module/domain/javadependency/JavaDependency.java index aa855a15a23..0ed551abb5b 100644 --- a/src/main/java/tech/jhipster/lite/generator/module/domain/javadependency/JavaDependency.java +++ b/src/main/java/tech/jhipster/lite/module/domain/javadependency/JavaDependency.java @@ -1,4 +1,4 @@ -package tech.jhipster.lite.generator.module.domain.javadependency; +package tech.jhipster.lite.module.domain.javadependency; import java.util.Collection; import java.util.List; @@ -9,11 +9,11 @@ import org.apache.commons.lang3.builder.HashCodeBuilder; import tech.jhipster.lite.common.domain.Generated; import tech.jhipster.lite.error.domain.Assert; -import tech.jhipster.lite.generator.module.domain.javadependency.command.AddJavaDependency; -import tech.jhipster.lite.generator.module.domain.javadependency.command.JavaDependenciesCommands; -import tech.jhipster.lite.generator.module.domain.javadependency.command.JavaDependencyCommand; -import tech.jhipster.lite.generator.module.domain.javadependency.command.RemoveJavaDependency; -import tech.jhipster.lite.generator.module.domain.javadependency.command.SetJavaDependencyVersion; +import tech.jhipster.lite.module.domain.javadependency.command.AddJavaDependency; +import tech.jhipster.lite.module.domain.javadependency.command.JavaDependenciesCommands; +import tech.jhipster.lite.module.domain.javadependency.command.JavaDependencyCommand; +import tech.jhipster.lite.module.domain.javadependency.command.RemoveJavaDependency; +import tech.jhipster.lite.module.domain.javadependency.command.SetJavaDependencyVersion; public class JavaDependency { diff --git a/src/main/java/tech/jhipster/lite/generator/module/domain/javadependency/JavaDependencyScope.java b/src/main/java/tech/jhipster/lite/module/domain/javadependency/JavaDependencyScope.java similarity index 89% rename from src/main/java/tech/jhipster/lite/generator/module/domain/javadependency/JavaDependencyScope.java rename to src/main/java/tech/jhipster/lite/module/domain/javadependency/JavaDependencyScope.java index e6b830ead57..b6c3c227ded 100644 --- a/src/main/java/tech/jhipster/lite/generator/module/domain/javadependency/JavaDependencyScope.java +++ b/src/main/java/tech/jhipster/lite/module/domain/javadependency/JavaDependencyScope.java @@ -1,4 +1,4 @@ -package tech.jhipster.lite.generator.module.domain.javadependency; +package tech.jhipster.lite.module.domain.javadependency; import tech.jhipster.lite.error.domain.Assert; diff --git a/src/main/java/tech/jhipster/lite/generator/module/domain/javadependency/JavaDependencyVersion.java b/src/main/java/tech/jhipster/lite/module/domain/javadependency/JavaDependencyVersion.java similarity index 84% rename from src/main/java/tech/jhipster/lite/generator/module/domain/javadependency/JavaDependencyVersion.java rename to src/main/java/tech/jhipster/lite/module/domain/javadependency/JavaDependencyVersion.java index 2cd70d2738a..d2e98a0b431 100644 --- a/src/main/java/tech/jhipster/lite/generator/module/domain/javadependency/JavaDependencyVersion.java +++ b/src/main/java/tech/jhipster/lite/module/domain/javadependency/JavaDependencyVersion.java @@ -1,4 +1,4 @@ -package tech.jhipster.lite.generator.module.domain.javadependency; +package tech.jhipster.lite.module.domain.javadependency; import tech.jhipster.lite.error.domain.Assert; diff --git a/src/main/java/tech/jhipster/lite/generator/module/domain/javadependency/ProjectJavaDependencies.java b/src/main/java/tech/jhipster/lite/module/domain/javadependency/ProjectJavaDependencies.java similarity index 93% rename from src/main/java/tech/jhipster/lite/generator/module/domain/javadependency/ProjectJavaDependencies.java rename to src/main/java/tech/jhipster/lite/module/domain/javadependency/ProjectJavaDependencies.java index ac075c50150..2ba3d279f7d 100644 --- a/src/main/java/tech/jhipster/lite/generator/module/domain/javadependency/ProjectJavaDependencies.java +++ b/src/main/java/tech/jhipster/lite/module/domain/javadependency/ProjectJavaDependencies.java @@ -1,4 +1,4 @@ -package tech.jhipster.lite.generator.module.domain.javadependency; +package tech.jhipster.lite.module.domain.javadependency; import java.util.Optional; diff --git a/src/main/java/tech/jhipster/lite/module/domain/javadependency/ProjectJavaDependenciesRepository.java b/src/main/java/tech/jhipster/lite/module/domain/javadependency/ProjectJavaDependenciesRepository.java new file mode 100644 index 00000000000..cdfa32e5c07 --- /dev/null +++ b/src/main/java/tech/jhipster/lite/module/domain/javadependency/ProjectJavaDependenciesRepository.java @@ -0,0 +1,7 @@ +package tech.jhipster.lite.module.domain.javadependency; + +import tech.jhipster.lite.module.domain.properties.JHipsterProjectFolder; + +public interface ProjectJavaDependenciesRepository { + ProjectJavaDependencies get(JHipsterProjectFolder folder); +} diff --git a/src/main/java/tech/jhipster/lite/generator/module/domain/javadependency/UnknownJavaVersionSlugException.java b/src/main/java/tech/jhipster/lite/module/domain/javadependency/UnknownJavaVersionSlugException.java similarity index 83% rename from src/main/java/tech/jhipster/lite/generator/module/domain/javadependency/UnknownJavaVersionSlugException.java rename to src/main/java/tech/jhipster/lite/module/domain/javadependency/UnknownJavaVersionSlugException.java index d38f217f97c..8a4b5daa59e 100644 --- a/src/main/java/tech/jhipster/lite/generator/module/domain/javadependency/UnknownJavaVersionSlugException.java +++ b/src/main/java/tech/jhipster/lite/module/domain/javadependency/UnknownJavaVersionSlugException.java @@ -1,4 +1,4 @@ -package tech.jhipster.lite.generator.module.domain.javadependency; +package tech.jhipster.lite.module.domain.javadependency; import tech.jhipster.lite.error.domain.GeneratorException; diff --git a/src/main/java/tech/jhipster/lite/generator/module/domain/javadependency/Version.java b/src/main/java/tech/jhipster/lite/module/domain/javadependency/Version.java similarity index 75% rename from src/main/java/tech/jhipster/lite/generator/module/domain/javadependency/Version.java rename to src/main/java/tech/jhipster/lite/module/domain/javadependency/Version.java index 17c30466196..363f075493f 100644 --- a/src/main/java/tech/jhipster/lite/generator/module/domain/javadependency/Version.java +++ b/src/main/java/tech/jhipster/lite/module/domain/javadependency/Version.java @@ -1,4 +1,4 @@ -package tech.jhipster.lite.generator.module.domain.javadependency; +package tech.jhipster.lite.module.domain.javadependency; import tech.jhipster.lite.error.domain.Assert; diff --git a/src/main/java/tech/jhipster/lite/generator/module/domain/javadependency/VersionSlug.java b/src/main/java/tech/jhipster/lite/module/domain/javadependency/VersionSlug.java similarity index 95% rename from src/main/java/tech/jhipster/lite/generator/module/domain/javadependency/VersionSlug.java rename to src/main/java/tech/jhipster/lite/module/domain/javadependency/VersionSlug.java index d462004dde3..3863263eca5 100644 --- a/src/main/java/tech/jhipster/lite/generator/module/domain/javadependency/VersionSlug.java +++ b/src/main/java/tech/jhipster/lite/module/domain/javadependency/VersionSlug.java @@ -1,4 +1,4 @@ -package tech.jhipster.lite.generator.module.domain.javadependency; +package tech.jhipster.lite.module.domain.javadependency; import java.util.Optional; import org.apache.commons.lang3.StringUtils; diff --git a/src/main/java/tech/jhipster/lite/generator/module/domain/javadependency/command/AddJavaDependency.java b/src/main/java/tech/jhipster/lite/module/domain/javadependency/command/AddJavaDependency.java similarity index 59% rename from src/main/java/tech/jhipster/lite/generator/module/domain/javadependency/command/AddJavaDependency.java rename to src/main/java/tech/jhipster/lite/module/domain/javadependency/command/AddJavaDependency.java index 658357f1513..adc49a4bbe2 100644 --- a/src/main/java/tech/jhipster/lite/generator/module/domain/javadependency/command/AddJavaDependency.java +++ b/src/main/java/tech/jhipster/lite/module/domain/javadependency/command/AddJavaDependency.java @@ -1,13 +1,13 @@ -package tech.jhipster.lite.generator.module.domain.javadependency.command; +package tech.jhipster.lite.module.domain.javadependency.command; import java.util.Optional; import tech.jhipster.lite.error.domain.Assert; -import tech.jhipster.lite.generator.module.domain.javadependency.ArtifactId; -import tech.jhipster.lite.generator.module.domain.javadependency.DependencyId; -import tech.jhipster.lite.generator.module.domain.javadependency.GroupId; -import tech.jhipster.lite.generator.module.domain.javadependency.JavaDependency; -import tech.jhipster.lite.generator.module.domain.javadependency.JavaDependencyScope; -import tech.jhipster.lite.generator.module.domain.javadependency.VersionSlug; +import tech.jhipster.lite.module.domain.javadependency.ArtifactId; +import tech.jhipster.lite.module.domain.javadependency.DependencyId; +import tech.jhipster.lite.module.domain.javadependency.GroupId; +import tech.jhipster.lite.module.domain.javadependency.JavaDependency; +import tech.jhipster.lite.module.domain.javadependency.JavaDependencyScope; +import tech.jhipster.lite.module.domain.javadependency.VersionSlug; public record AddJavaDependency(JavaDependency dependency) implements JavaDependencyCommand { public AddJavaDependency { diff --git a/src/main/java/tech/jhipster/lite/generator/module/domain/javadependency/command/JavaDependenciesCommands.java b/src/main/java/tech/jhipster/lite/module/domain/javadependency/command/JavaDependenciesCommands.java similarity index 92% rename from src/main/java/tech/jhipster/lite/generator/module/domain/javadependency/command/JavaDependenciesCommands.java rename to src/main/java/tech/jhipster/lite/module/domain/javadependency/command/JavaDependenciesCommands.java index db78f0d99f9..3d61d30bedf 100644 --- a/src/main/java/tech/jhipster/lite/generator/module/domain/javadependency/command/JavaDependenciesCommands.java +++ b/src/main/java/tech/jhipster/lite/module/domain/javadependency/command/JavaDependenciesCommands.java @@ -1,4 +1,4 @@ -package tech.jhipster.lite.generator.module.domain.javadependency.command; +package tech.jhipster.lite.module.domain.javadependency.command; import java.util.ArrayList; import java.util.Collection; diff --git a/src/main/java/tech/jhipster/lite/generator/module/domain/javadependency/command/JavaDependencyCommand.java b/src/main/java/tech/jhipster/lite/module/domain/javadependency/command/JavaDependencyCommand.java similarity index 68% rename from src/main/java/tech/jhipster/lite/generator/module/domain/javadependency/command/JavaDependencyCommand.java rename to src/main/java/tech/jhipster/lite/module/domain/javadependency/command/JavaDependencyCommand.java index ebd6e8bd672..f30f0499669 100644 --- a/src/main/java/tech/jhipster/lite/generator/module/domain/javadependency/command/JavaDependencyCommand.java +++ b/src/main/java/tech/jhipster/lite/module/domain/javadependency/command/JavaDependencyCommand.java @@ -1,4 +1,4 @@ -package tech.jhipster.lite.generator.module.domain.javadependency.command; +package tech.jhipster.lite.module.domain.javadependency.command; public sealed interface JavaDependencyCommand permits AddJavaDependency, RemoveJavaDependency, SetJavaDependencyVersion { JavaDependencyCommandType type(); diff --git a/src/main/java/tech/jhipster/lite/generator/module/domain/javadependency/command/JavaDependencyCommandType.java b/src/main/java/tech/jhipster/lite/module/domain/javadependency/command/JavaDependencyCommandType.java similarity index 50% rename from src/main/java/tech/jhipster/lite/generator/module/domain/javadependency/command/JavaDependencyCommandType.java rename to src/main/java/tech/jhipster/lite/module/domain/javadependency/command/JavaDependencyCommandType.java index abd851a47d1..d4366b8d230 100644 --- a/src/main/java/tech/jhipster/lite/generator/module/domain/javadependency/command/JavaDependencyCommandType.java +++ b/src/main/java/tech/jhipster/lite/module/domain/javadependency/command/JavaDependencyCommandType.java @@ -1,4 +1,4 @@ -package tech.jhipster.lite.generator.module.domain.javadependency.command; +package tech.jhipster.lite.module.domain.javadependency.command; public enum JavaDependencyCommandType { SET_VERSION, diff --git a/src/main/java/tech/jhipster/lite/generator/module/domain/javadependency/command/RemoveJavaDependency.java b/src/main/java/tech/jhipster/lite/module/domain/javadependency/command/RemoveJavaDependency.java similarity index 68% rename from src/main/java/tech/jhipster/lite/generator/module/domain/javadependency/command/RemoveJavaDependency.java rename to src/main/java/tech/jhipster/lite/module/domain/javadependency/command/RemoveJavaDependency.java index 427f0a63c81..d026ed88d3d 100644 --- a/src/main/java/tech/jhipster/lite/generator/module/domain/javadependency/command/RemoveJavaDependency.java +++ b/src/main/java/tech/jhipster/lite/module/domain/javadependency/command/RemoveJavaDependency.java @@ -1,7 +1,7 @@ -package tech.jhipster.lite.generator.module.domain.javadependency.command; +package tech.jhipster.lite.module.domain.javadependency.command; import tech.jhipster.lite.error.domain.Assert; -import tech.jhipster.lite.generator.module.domain.javadependency.DependencyId; +import tech.jhipster.lite.module.domain.javadependency.DependencyId; public record RemoveJavaDependency(DependencyId dependency) implements JavaDependencyCommand { public RemoveJavaDependency { diff --git a/src/main/java/tech/jhipster/lite/generator/module/domain/javadependency/command/SetJavaDependencyVersion.java b/src/main/java/tech/jhipster/lite/module/domain/javadependency/command/SetJavaDependencyVersion.java similarity index 75% rename from src/main/java/tech/jhipster/lite/generator/module/domain/javadependency/command/SetJavaDependencyVersion.java rename to src/main/java/tech/jhipster/lite/module/domain/javadependency/command/SetJavaDependencyVersion.java index 2a88ddacc0e..56e6041bccc 100644 --- a/src/main/java/tech/jhipster/lite/generator/module/domain/javadependency/command/SetJavaDependencyVersion.java +++ b/src/main/java/tech/jhipster/lite/module/domain/javadependency/command/SetJavaDependencyVersion.java @@ -1,7 +1,7 @@ -package tech.jhipster.lite.generator.module.domain.javadependency.command; +package tech.jhipster.lite.module.domain.javadependency.command; import tech.jhipster.lite.error.domain.Assert; -import tech.jhipster.lite.generator.module.domain.javadependency.JavaDependencyVersion; +import tech.jhipster.lite.module.domain.javadependency.JavaDependencyVersion; public record SetJavaDependencyVersion(JavaDependencyVersion version) implements JavaDependencyCommand { public SetJavaDependencyVersion { diff --git a/src/main/java/tech/jhipster/lite/generator/module/domain/javaproperties/JHipsterModuleSpringProperties.java b/src/main/java/tech/jhipster/lite/module/domain/javaproperties/JHipsterModuleSpringProperties.java similarity index 90% rename from src/main/java/tech/jhipster/lite/generator/module/domain/javaproperties/JHipsterModuleSpringProperties.java rename to src/main/java/tech/jhipster/lite/module/domain/javaproperties/JHipsterModuleSpringProperties.java index a375977b6e5..90e4957a62d 100644 --- a/src/main/java/tech/jhipster/lite/generator/module/domain/javaproperties/JHipsterModuleSpringProperties.java +++ b/src/main/java/tech/jhipster/lite/module/domain/javaproperties/JHipsterModuleSpringProperties.java @@ -1,10 +1,10 @@ -package tech.jhipster.lite.generator.module.domain.javaproperties; +package tech.jhipster.lite.module.domain.javaproperties; import java.util.HashMap; import java.util.Map; import tech.jhipster.lite.common.domain.JHipsterCollections; import tech.jhipster.lite.error.domain.Assert; -import tech.jhipster.lite.generator.module.domain.JHipsterModule.JHipsterModuleBuilder; +import tech.jhipster.lite.module.domain.JHipsterModule.JHipsterModuleBuilder; public class JHipsterModuleSpringProperties { diff --git a/src/main/java/tech/jhipster/lite/generator/module/domain/javaproperties/PropertyKey.java b/src/main/java/tech/jhipster/lite/module/domain/javaproperties/PropertyKey.java similarity index 74% rename from src/main/java/tech/jhipster/lite/generator/module/domain/javaproperties/PropertyKey.java rename to src/main/java/tech/jhipster/lite/module/domain/javaproperties/PropertyKey.java index a0cd340bf4b..0734086322d 100644 --- a/src/main/java/tech/jhipster/lite/generator/module/domain/javaproperties/PropertyKey.java +++ b/src/main/java/tech/jhipster/lite/module/domain/javaproperties/PropertyKey.java @@ -1,4 +1,4 @@ -package tech.jhipster.lite.generator.module.domain.javaproperties; +package tech.jhipster.lite.module.domain.javaproperties; import tech.jhipster.lite.error.domain.Assert; diff --git a/src/main/java/tech/jhipster/lite/generator/module/domain/javaproperties/PropertyValue.java b/src/main/java/tech/jhipster/lite/module/domain/javaproperties/PropertyValue.java similarity index 88% rename from src/main/java/tech/jhipster/lite/generator/module/domain/javaproperties/PropertyValue.java rename to src/main/java/tech/jhipster/lite/module/domain/javaproperties/PropertyValue.java index 1e1e305a716..309824e4d8b 100644 --- a/src/main/java/tech/jhipster/lite/generator/module/domain/javaproperties/PropertyValue.java +++ b/src/main/java/tech/jhipster/lite/module/domain/javaproperties/PropertyValue.java @@ -1,4 +1,4 @@ -package tech.jhipster.lite.generator.module.domain.javaproperties; +package tech.jhipster.lite.module.domain.javaproperties; import java.util.Collection; import java.util.List; diff --git a/src/main/java/tech/jhipster/lite/generator/module/domain/javaproperties/SpringProfile.java b/src/main/java/tech/jhipster/lite/module/domain/javaproperties/SpringProfile.java similarity index 81% rename from src/main/java/tech/jhipster/lite/generator/module/domain/javaproperties/SpringProfile.java rename to src/main/java/tech/jhipster/lite/module/domain/javaproperties/SpringProfile.java index 8e2910ad9e7..73f1978833c 100644 --- a/src/main/java/tech/jhipster/lite/generator/module/domain/javaproperties/SpringProfile.java +++ b/src/main/java/tech/jhipster/lite/module/domain/javaproperties/SpringProfile.java @@ -1,4 +1,4 @@ -package tech.jhipster.lite.generator.module.domain.javaproperties; +package tech.jhipster.lite.module.domain.javaproperties; import org.apache.commons.lang3.StringUtils; diff --git a/src/main/java/tech/jhipster/lite/generator/module/domain/javaproperties/SpringProperties.java b/src/main/java/tech/jhipster/lite/module/domain/javaproperties/SpringProperties.java similarity index 83% rename from src/main/java/tech/jhipster/lite/generator/module/domain/javaproperties/SpringProperties.java rename to src/main/java/tech/jhipster/lite/module/domain/javaproperties/SpringProperties.java index fc6886a10f6..c6026c8f0d5 100644 --- a/src/main/java/tech/jhipster/lite/generator/module/domain/javaproperties/SpringProperties.java +++ b/src/main/java/tech/jhipster/lite/module/domain/javaproperties/SpringProperties.java @@ -1,4 +1,4 @@ -package tech.jhipster.lite.generator.module.domain.javaproperties; +package tech.jhipster.lite.module.domain.javaproperties; import java.util.Collection; import tech.jhipster.lite.error.domain.Assert; diff --git a/src/main/java/tech/jhipster/lite/generator/module/domain/javaproperties/SpringProperty.java b/src/main/java/tech/jhipster/lite/module/domain/javaproperties/SpringProperty.java similarity index 97% rename from src/main/java/tech/jhipster/lite/generator/module/domain/javaproperties/SpringProperty.java rename to src/main/java/tech/jhipster/lite/module/domain/javaproperties/SpringProperty.java index faadc40d6a2..3a040d1cfd0 100644 --- a/src/main/java/tech/jhipster/lite/generator/module/domain/javaproperties/SpringProperty.java +++ b/src/main/java/tech/jhipster/lite/module/domain/javaproperties/SpringProperty.java @@ -1,4 +1,4 @@ -package tech.jhipster.lite.generator.module.domain.javaproperties; +package tech.jhipster.lite.module.domain.javaproperties; import tech.jhipster.lite.error.domain.Assert; diff --git a/src/main/java/tech/jhipster/lite/module/domain/javaproperties/SpringPropertyType.java b/src/main/java/tech/jhipster/lite/module/domain/javaproperties/SpringPropertyType.java new file mode 100644 index 00000000000..86c7b2eaecf --- /dev/null +++ b/src/main/java/tech/jhipster/lite/module/domain/javaproperties/SpringPropertyType.java @@ -0,0 +1,6 @@ +package tech.jhipster.lite.module.domain.javaproperties; + +public enum SpringPropertyType { + MAIN, + TEST, +} diff --git a/src/main/java/tech/jhipster/lite/generator/module/domain/packagejson/JHipsterModulePackageJson.java b/src/main/java/tech/jhipster/lite/module/domain/packagejson/JHipsterModulePackageJson.java similarity index 93% rename from src/main/java/tech/jhipster/lite/generator/module/domain/packagejson/JHipsterModulePackageJson.java rename to src/main/java/tech/jhipster/lite/module/domain/packagejson/JHipsterModulePackageJson.java index 7a1e4c35d12..9cea7765d7a 100644 --- a/src/main/java/tech/jhipster/lite/generator/module/domain/packagejson/JHipsterModulePackageJson.java +++ b/src/main/java/tech/jhipster/lite/module/domain/packagejson/JHipsterModulePackageJson.java @@ -1,9 +1,9 @@ -package tech.jhipster.lite.generator.module.domain.packagejson; +package tech.jhipster.lite.module.domain.packagejson; import java.util.ArrayList; import java.util.Collection; import tech.jhipster.lite.error.domain.Assert; -import tech.jhipster.lite.generator.module.domain.JHipsterModule.JHipsterModuleBuilder; +import tech.jhipster.lite.module.domain.JHipsterModule.JHipsterModuleBuilder; public class JHipsterModulePackageJson { diff --git a/src/main/java/tech/jhipster/lite/generator/module/domain/packagejson/PackageJsonDependencies.java b/src/main/java/tech/jhipster/lite/module/domain/packagejson/PackageJsonDependencies.java similarity index 89% rename from src/main/java/tech/jhipster/lite/generator/module/domain/packagejson/PackageJsonDependencies.java rename to src/main/java/tech/jhipster/lite/module/domain/packagejson/PackageJsonDependencies.java index 20b1e57299c..17615bd76b7 100644 --- a/src/main/java/tech/jhipster/lite/generator/module/domain/packagejson/PackageJsonDependencies.java +++ b/src/main/java/tech/jhipster/lite/module/domain/packagejson/PackageJsonDependencies.java @@ -1,4 +1,4 @@ -package tech.jhipster.lite.generator.module.domain.packagejson; +package tech.jhipster.lite.module.domain.packagejson; import java.util.Collection; import java.util.stream.Stream; diff --git a/src/main/java/tech/jhipster/lite/generator/module/domain/packagejson/PackageJsonDependency.java b/src/main/java/tech/jhipster/lite/module/domain/packagejson/PackageJsonDependency.java similarity index 81% rename from src/main/java/tech/jhipster/lite/generator/module/domain/packagejson/PackageJsonDependency.java rename to src/main/java/tech/jhipster/lite/module/domain/packagejson/PackageJsonDependency.java index 80b44c54788..598347ce542 100644 --- a/src/main/java/tech/jhipster/lite/generator/module/domain/packagejson/PackageJsonDependency.java +++ b/src/main/java/tech/jhipster/lite/module/domain/packagejson/PackageJsonDependency.java @@ -1,4 +1,4 @@ -package tech.jhipster.lite.generator.module.domain.packagejson; +package tech.jhipster.lite.module.domain.packagejson; import tech.jhipster.lite.error.domain.Assert; diff --git a/src/main/java/tech/jhipster/lite/generator/module/domain/packagejson/PackageName.java b/src/main/java/tech/jhipster/lite/module/domain/packagejson/PackageName.java similarity index 78% rename from src/main/java/tech/jhipster/lite/generator/module/domain/packagejson/PackageName.java rename to src/main/java/tech/jhipster/lite/module/domain/packagejson/PackageName.java index 309e0fc5d9a..3aa4c06db0b 100644 --- a/src/main/java/tech/jhipster/lite/generator/module/domain/packagejson/PackageName.java +++ b/src/main/java/tech/jhipster/lite/module/domain/packagejson/PackageName.java @@ -1,4 +1,4 @@ -package tech.jhipster.lite.generator.module.domain.packagejson; +package tech.jhipster.lite.module.domain.packagejson; import tech.jhipster.lite.error.domain.Assert; diff --git a/src/main/java/tech/jhipster/lite/generator/module/domain/packagejson/Script.java b/src/main/java/tech/jhipster/lite/module/domain/packagejson/Script.java similarity index 76% rename from src/main/java/tech/jhipster/lite/generator/module/domain/packagejson/Script.java rename to src/main/java/tech/jhipster/lite/module/domain/packagejson/Script.java index c0f275ed351..86d442dbf79 100644 --- a/src/main/java/tech/jhipster/lite/generator/module/domain/packagejson/Script.java +++ b/src/main/java/tech/jhipster/lite/module/domain/packagejson/Script.java @@ -1,4 +1,4 @@ -package tech.jhipster.lite.generator.module.domain.packagejson; +package tech.jhipster.lite.module.domain.packagejson; import tech.jhipster.lite.error.domain.Assert; diff --git a/src/main/java/tech/jhipster/lite/generator/module/domain/packagejson/ScriptCommand.java b/src/main/java/tech/jhipster/lite/module/domain/packagejson/ScriptCommand.java similarity index 77% rename from src/main/java/tech/jhipster/lite/generator/module/domain/packagejson/ScriptCommand.java rename to src/main/java/tech/jhipster/lite/module/domain/packagejson/ScriptCommand.java index caefc05a8f7..f935843ffe0 100644 --- a/src/main/java/tech/jhipster/lite/generator/module/domain/packagejson/ScriptCommand.java +++ b/src/main/java/tech/jhipster/lite/module/domain/packagejson/ScriptCommand.java @@ -1,4 +1,4 @@ -package tech.jhipster.lite.generator.module.domain.packagejson; +package tech.jhipster.lite.module.domain.packagejson; import tech.jhipster.lite.error.domain.Assert; diff --git a/src/main/java/tech/jhipster/lite/generator/module/domain/packagejson/ScriptKey.java b/src/main/java/tech/jhipster/lite/module/domain/packagejson/ScriptKey.java similarity index 75% rename from src/main/java/tech/jhipster/lite/generator/module/domain/packagejson/ScriptKey.java rename to src/main/java/tech/jhipster/lite/module/domain/packagejson/ScriptKey.java index 94b1bfde22d..5bc746ce23d 100644 --- a/src/main/java/tech/jhipster/lite/generator/module/domain/packagejson/ScriptKey.java +++ b/src/main/java/tech/jhipster/lite/module/domain/packagejson/ScriptKey.java @@ -1,4 +1,4 @@ -package tech.jhipster.lite.generator.module.domain.packagejson; +package tech.jhipster.lite.module.domain.packagejson; import tech.jhipster.lite.error.domain.Assert; diff --git a/src/main/java/tech/jhipster/lite/generator/module/domain/packagejson/Scripts.java b/src/main/java/tech/jhipster/lite/module/domain/packagejson/Scripts.java similarity index 86% rename from src/main/java/tech/jhipster/lite/generator/module/domain/packagejson/Scripts.java rename to src/main/java/tech/jhipster/lite/module/domain/packagejson/Scripts.java index 04affa1eb24..7b06fbb0bcc 100644 --- a/src/main/java/tech/jhipster/lite/generator/module/domain/packagejson/Scripts.java +++ b/src/main/java/tech/jhipster/lite/module/domain/packagejson/Scripts.java @@ -1,4 +1,4 @@ -package tech.jhipster.lite.generator.module.domain.packagejson; +package tech.jhipster.lite.module.domain.packagejson; import java.util.Collection; import java.util.stream.Stream; diff --git a/src/main/java/tech/jhipster/lite/generator/module/domain/packagejson/VersionSource.java b/src/main/java/tech/jhipster/lite/module/domain/packagejson/VersionSource.java similarity index 54% rename from src/main/java/tech/jhipster/lite/generator/module/domain/packagejson/VersionSource.java rename to src/main/java/tech/jhipster/lite/module/domain/packagejson/VersionSource.java index d36a386512e..00a9e9becb2 100644 --- a/src/main/java/tech/jhipster/lite/generator/module/domain/packagejson/VersionSource.java +++ b/src/main/java/tech/jhipster/lite/module/domain/packagejson/VersionSource.java @@ -1,4 +1,4 @@ -package tech.jhipster.lite.generator.module.domain.packagejson; +package tech.jhipster.lite.module.domain.packagejson; public enum VersionSource { COMMON, diff --git a/src/main/java/tech/jhipster/lite/generator/module/domain/postaction/JHipsterModuleExecutionContext.java b/src/main/java/tech/jhipster/lite/module/domain/postaction/JHipsterModuleExecutionContext.java similarity index 61% rename from src/main/java/tech/jhipster/lite/generator/module/domain/postaction/JHipsterModuleExecutionContext.java rename to src/main/java/tech/jhipster/lite/module/domain/postaction/JHipsterModuleExecutionContext.java index 275d20edc8d..6f575205459 100644 --- a/src/main/java/tech/jhipster/lite/generator/module/domain/postaction/JHipsterModuleExecutionContext.java +++ b/src/main/java/tech/jhipster/lite/module/domain/postaction/JHipsterModuleExecutionContext.java @@ -1,7 +1,7 @@ -package tech.jhipster.lite.generator.module.domain.postaction; +package tech.jhipster.lite.module.domain.postaction; import tech.jhipster.lite.error.domain.Assert; -import tech.jhipster.lite.generator.module.domain.properties.JHipsterProjectFolder; +import tech.jhipster.lite.module.domain.properties.JHipsterProjectFolder; public record JHipsterModuleExecutionContext(JHipsterProjectFolder projectFolder) { public JHipsterModuleExecutionContext { diff --git a/src/main/java/tech/jhipster/lite/generator/module/domain/postaction/JHipsterModulePostActions.java b/src/main/java/tech/jhipster/lite/module/domain/postaction/JHipsterModulePostActions.java similarity index 90% rename from src/main/java/tech/jhipster/lite/generator/module/domain/postaction/JHipsterModulePostActions.java rename to src/main/java/tech/jhipster/lite/module/domain/postaction/JHipsterModulePostActions.java index c78fd8fac49..7b8a3ebbba9 100644 --- a/src/main/java/tech/jhipster/lite/generator/module/domain/postaction/JHipsterModulePostActions.java +++ b/src/main/java/tech/jhipster/lite/module/domain/postaction/JHipsterModulePostActions.java @@ -1,9 +1,9 @@ -package tech.jhipster.lite.generator.module.domain.postaction; +package tech.jhipster.lite.module.domain.postaction; import java.util.ArrayList; import java.util.Collection; import tech.jhipster.lite.error.domain.Assert; -import tech.jhipster.lite.generator.module.domain.JHipsterModule.JHipsterModuleBuilder; +import tech.jhipster.lite.module.domain.JHipsterModule.JHipsterModuleBuilder; public class JHipsterModulePostActions { diff --git a/src/main/java/tech/jhipster/lite/generator/module/domain/postaction/RunnableInContext.java b/src/main/java/tech/jhipster/lite/module/domain/postaction/RunnableInContext.java similarity index 64% rename from src/main/java/tech/jhipster/lite/generator/module/domain/postaction/RunnableInContext.java rename to src/main/java/tech/jhipster/lite/module/domain/postaction/RunnableInContext.java index 4c76d566b09..30ac997db73 100644 --- a/src/main/java/tech/jhipster/lite/generator/module/domain/postaction/RunnableInContext.java +++ b/src/main/java/tech/jhipster/lite/module/domain/postaction/RunnableInContext.java @@ -1,4 +1,4 @@ -package tech.jhipster.lite.generator.module.domain.postaction; +package tech.jhipster.lite.module.domain.postaction; @FunctionalInterface public interface RunnableInContext { diff --git a/src/main/java/tech/jhipster/lite/generator/module/domain/properties/InvalidProjectBaseNameException.java b/src/main/java/tech/jhipster/lite/module/domain/properties/InvalidProjectBaseNameException.java similarity index 81% rename from src/main/java/tech/jhipster/lite/generator/module/domain/properties/InvalidProjectBaseNameException.java rename to src/main/java/tech/jhipster/lite/module/domain/properties/InvalidProjectBaseNameException.java index aec46f21d03..36f56eca424 100644 --- a/src/main/java/tech/jhipster/lite/generator/module/domain/properties/InvalidProjectBaseNameException.java +++ b/src/main/java/tech/jhipster/lite/module/domain/properties/InvalidProjectBaseNameException.java @@ -1,4 +1,4 @@ -package tech.jhipster.lite.generator.module.domain.properties; +package tech.jhipster.lite.module.domain.properties; import tech.jhipster.lite.error.domain.GeneratorException; diff --git a/src/main/java/tech/jhipster/lite/generator/module/domain/properties/InvalidPropertyTypeException.java b/src/main/java/tech/jhipster/lite/module/domain/properties/InvalidPropertyTypeException.java similarity index 96% rename from src/main/java/tech/jhipster/lite/generator/module/domain/properties/InvalidPropertyTypeException.java rename to src/main/java/tech/jhipster/lite/module/domain/properties/InvalidPropertyTypeException.java index a7d2c5b7ecf..68f31c2718a 100644 --- a/src/main/java/tech/jhipster/lite/generator/module/domain/properties/InvalidPropertyTypeException.java +++ b/src/main/java/tech/jhipster/lite/module/domain/properties/InvalidPropertyTypeException.java @@ -1,4 +1,4 @@ -package tech.jhipster.lite.generator.module.domain.properties; +package tech.jhipster.lite.module.domain.properties; import tech.jhipster.lite.error.domain.GeneratorException; diff --git a/src/main/java/tech/jhipster/lite/generator/module/domain/properties/JHipsterBasePackage.java b/src/main/java/tech/jhipster/lite/module/domain/properties/JHipsterBasePackage.java similarity index 91% rename from src/main/java/tech/jhipster/lite/generator/module/domain/properties/JHipsterBasePackage.java rename to src/main/java/tech/jhipster/lite/module/domain/properties/JHipsterBasePackage.java index a5c0d79c194..3611662876a 100644 --- a/src/main/java/tech/jhipster/lite/generator/module/domain/properties/JHipsterBasePackage.java +++ b/src/main/java/tech/jhipster/lite/module/domain/properties/JHipsterBasePackage.java @@ -1,4 +1,4 @@ -package tech.jhipster.lite.generator.module.domain.properties; +package tech.jhipster.lite.module.domain.properties; import org.apache.commons.lang3.StringUtils; diff --git a/src/main/java/tech/jhipster/lite/generator/module/domain/properties/JHipsterModuleProperties.java b/src/main/java/tech/jhipster/lite/module/domain/properties/JHipsterModuleProperties.java similarity index 96% rename from src/main/java/tech/jhipster/lite/generator/module/domain/properties/JHipsterModuleProperties.java rename to src/main/java/tech/jhipster/lite/module/domain/properties/JHipsterModuleProperties.java index 9b856af6e02..db5df336646 100644 --- a/src/main/java/tech/jhipster/lite/generator/module/domain/properties/JHipsterModuleProperties.java +++ b/src/main/java/tech/jhipster/lite/module/domain/properties/JHipsterModuleProperties.java @@ -1,9 +1,9 @@ -package tech.jhipster.lite.generator.module.domain.properties; +package tech.jhipster.lite.module.domain.properties; import java.util.Map; import tech.jhipster.lite.common.domain.JHipsterCollections; import tech.jhipster.lite.error.domain.Assert; -import tech.jhipster.lite.generator.module.domain.Indentation; +import tech.jhipster.lite.module.domain.Indentation; public record JHipsterModuleProperties(JHipsterProjectFolder projectFolder, Map properties) { public static final String BASE_PACKAGE_PROPERTY = "packageName"; diff --git a/src/main/java/tech/jhipster/lite/generator/module/domain/properties/JHipsterModulePropertiesDefinition.java b/src/main/java/tech/jhipster/lite/module/domain/properties/JHipsterModulePropertiesDefinition.java similarity index 93% rename from src/main/java/tech/jhipster/lite/generator/module/domain/properties/JHipsterModulePropertiesDefinition.java rename to src/main/java/tech/jhipster/lite/module/domain/properties/JHipsterModulePropertiesDefinition.java index fb6127a2e1c..bbfcb01dcb4 100644 --- a/src/main/java/tech/jhipster/lite/generator/module/domain/properties/JHipsterModulePropertiesDefinition.java +++ b/src/main/java/tech/jhipster/lite/module/domain/properties/JHipsterModulePropertiesDefinition.java @@ -1,6 +1,6 @@ -package tech.jhipster.lite.generator.module.domain.properties; +package tech.jhipster.lite.module.domain.properties; -import static tech.jhipster.lite.generator.module.domain.properties.JHipsterModulePropertyDefinition.*; +import static tech.jhipster.lite.module.domain.properties.JHipsterModulePropertyDefinition.*; import java.util.ArrayList; import java.util.Collection; diff --git a/src/main/java/tech/jhipster/lite/generator/module/domain/properties/JHipsterModulePropertyDefinition.java b/src/main/java/tech/jhipster/lite/module/domain/properties/JHipsterModulePropertyDefinition.java similarity index 98% rename from src/main/java/tech/jhipster/lite/generator/module/domain/properties/JHipsterModulePropertyDefinition.java rename to src/main/java/tech/jhipster/lite/module/domain/properties/JHipsterModulePropertyDefinition.java index bbd048f71fa..d84f5f399d1 100644 --- a/src/main/java/tech/jhipster/lite/generator/module/domain/properties/JHipsterModulePropertyDefinition.java +++ b/src/main/java/tech/jhipster/lite/module/domain/properties/JHipsterModulePropertyDefinition.java @@ -1,4 +1,4 @@ -package tech.jhipster.lite.generator.module.domain.properties; +package tech.jhipster.lite.module.domain.properties; import java.util.Optional; import tech.jhipster.lite.error.domain.Assert; diff --git a/src/main/java/tech/jhipster/lite/generator/module/domain/properties/JHipsterProjectBaseName.java b/src/main/java/tech/jhipster/lite/module/domain/properties/JHipsterProjectBaseName.java similarity index 93% rename from src/main/java/tech/jhipster/lite/generator/module/domain/properties/JHipsterProjectBaseName.java rename to src/main/java/tech/jhipster/lite/module/domain/properties/JHipsterProjectBaseName.java index f408c7f4879..3337aadaa30 100644 --- a/src/main/java/tech/jhipster/lite/generator/module/domain/properties/JHipsterProjectBaseName.java +++ b/src/main/java/tech/jhipster/lite/module/domain/properties/JHipsterProjectBaseName.java @@ -1,4 +1,4 @@ -package tech.jhipster.lite.generator.module.domain.properties; +package tech.jhipster.lite.module.domain.properties; import java.util.regex.Pattern; import org.apache.commons.lang3.StringUtils; diff --git a/src/main/java/tech/jhipster/lite/generator/module/domain/properties/JHipsterProjectFolder.java b/src/main/java/tech/jhipster/lite/module/domain/properties/JHipsterProjectFolder.java similarity index 86% rename from src/main/java/tech/jhipster/lite/generator/module/domain/properties/JHipsterProjectFolder.java rename to src/main/java/tech/jhipster/lite/module/domain/properties/JHipsterProjectFolder.java index df2df32b420..d61534dfcfe 100644 --- a/src/main/java/tech/jhipster/lite/generator/module/domain/properties/JHipsterProjectFolder.java +++ b/src/main/java/tech/jhipster/lite/module/domain/properties/JHipsterProjectFolder.java @@ -1,4 +1,4 @@ -package tech.jhipster.lite.generator.module.domain.properties; +package tech.jhipster.lite.module.domain.properties; import java.nio.file.Path; import java.nio.file.Paths; diff --git a/src/main/java/tech/jhipster/lite/generator/module/domain/properties/JHipsterProjectName.java b/src/main/java/tech/jhipster/lite/module/domain/properties/JHipsterProjectName.java similarity index 90% rename from src/main/java/tech/jhipster/lite/generator/module/domain/properties/JHipsterProjectName.java rename to src/main/java/tech/jhipster/lite/module/domain/properties/JHipsterProjectName.java index 9d74103f20f..5c5ed6262fd 100644 --- a/src/main/java/tech/jhipster/lite/generator/module/domain/properties/JHipsterProjectName.java +++ b/src/main/java/tech/jhipster/lite/module/domain/properties/JHipsterProjectName.java @@ -1,4 +1,4 @@ -package tech.jhipster.lite.generator.module.domain.properties; +package tech.jhipster.lite.module.domain.properties; import org.apache.commons.lang3.StringUtils; diff --git a/src/main/java/tech/jhipster/lite/generator/module/domain/properties/JHipsterPropertyDescription.java b/src/main/java/tech/jhipster/lite/module/domain/properties/JHipsterPropertyDescription.java similarity index 89% rename from src/main/java/tech/jhipster/lite/generator/module/domain/properties/JHipsterPropertyDescription.java rename to src/main/java/tech/jhipster/lite/module/domain/properties/JHipsterPropertyDescription.java index 69488f6ca93..9017d43b33b 100644 --- a/src/main/java/tech/jhipster/lite/generator/module/domain/properties/JHipsterPropertyDescription.java +++ b/src/main/java/tech/jhipster/lite/module/domain/properties/JHipsterPropertyDescription.java @@ -1,4 +1,4 @@ -package tech.jhipster.lite.generator.module.domain.properties; +package tech.jhipster.lite.module.domain.properties; import java.util.Optional; import org.apache.commons.lang3.StringUtils; diff --git a/src/main/java/tech/jhipster/lite/generator/module/domain/properties/JHipsterPropertyExample.java b/src/main/java/tech/jhipster/lite/module/domain/properties/JHipsterPropertyExample.java similarity index 88% rename from src/main/java/tech/jhipster/lite/generator/module/domain/properties/JHipsterPropertyExample.java rename to src/main/java/tech/jhipster/lite/module/domain/properties/JHipsterPropertyExample.java index 63dccb4af50..52675f8c540 100644 --- a/src/main/java/tech/jhipster/lite/generator/module/domain/properties/JHipsterPropertyExample.java +++ b/src/main/java/tech/jhipster/lite/module/domain/properties/JHipsterPropertyExample.java @@ -1,4 +1,4 @@ -package tech.jhipster.lite.generator.module.domain.properties; +package tech.jhipster.lite.module.domain.properties; import java.util.Optional; import org.apache.commons.lang3.StringUtils; diff --git a/src/main/java/tech/jhipster/lite/generator/module/domain/properties/JHipsterPropertyKey.java b/src/main/java/tech/jhipster/lite/module/domain/properties/JHipsterPropertyKey.java similarity index 77% rename from src/main/java/tech/jhipster/lite/generator/module/domain/properties/JHipsterPropertyKey.java rename to src/main/java/tech/jhipster/lite/module/domain/properties/JHipsterPropertyKey.java index 1df2b8d1b37..fdd361adf4c 100644 --- a/src/main/java/tech/jhipster/lite/generator/module/domain/properties/JHipsterPropertyKey.java +++ b/src/main/java/tech/jhipster/lite/module/domain/properties/JHipsterPropertyKey.java @@ -1,4 +1,4 @@ -package tech.jhipster.lite.generator.module.domain.properties; +package tech.jhipster.lite.module.domain.properties; import tech.jhipster.lite.error.domain.Assert; diff --git a/src/main/java/tech/jhipster/lite/generator/module/domain/properties/JHipsterPropertyType.java b/src/main/java/tech/jhipster/lite/module/domain/properties/JHipsterPropertyType.java similarity index 52% rename from src/main/java/tech/jhipster/lite/generator/module/domain/properties/JHipsterPropertyType.java rename to src/main/java/tech/jhipster/lite/module/domain/properties/JHipsterPropertyType.java index 2990cff1a4b..303131b51a6 100644 --- a/src/main/java/tech/jhipster/lite/generator/module/domain/properties/JHipsterPropertyType.java +++ b/src/main/java/tech/jhipster/lite/module/domain/properties/JHipsterPropertyType.java @@ -1,4 +1,4 @@ -package tech.jhipster.lite.generator.module.domain.properties; +package tech.jhipster.lite.module.domain.properties; public enum JHipsterPropertyType { STRING, diff --git a/src/main/java/tech/jhipster/lite/generator/module/domain/properties/UnknownPropertyException.java b/src/main/java/tech/jhipster/lite/module/domain/properties/UnknownPropertyException.java similarity index 77% rename from src/main/java/tech/jhipster/lite/generator/module/domain/properties/UnknownPropertyException.java rename to src/main/java/tech/jhipster/lite/module/domain/properties/UnknownPropertyException.java index 976acb38a67..a8d8d3466a3 100644 --- a/src/main/java/tech/jhipster/lite/generator/module/domain/properties/UnknownPropertyException.java +++ b/src/main/java/tech/jhipster/lite/module/domain/properties/UnknownPropertyException.java @@ -1,4 +1,4 @@ -package tech.jhipster.lite.generator.module.domain.properties; +package tech.jhipster.lite.module.domain.properties; import tech.jhipster.lite.error.domain.GeneratorException; diff --git a/src/main/java/tech/jhipster/lite/generator/module/domain/replacement/ElementMatcher.java b/src/main/java/tech/jhipster/lite/module/domain/replacement/ElementMatcher.java similarity index 74% rename from src/main/java/tech/jhipster/lite/generator/module/domain/replacement/ElementMatcher.java rename to src/main/java/tech/jhipster/lite/module/domain/replacement/ElementMatcher.java index 9912c988471..215184e7b56 100644 --- a/src/main/java/tech/jhipster/lite/generator/module/domain/replacement/ElementMatcher.java +++ b/src/main/java/tech/jhipster/lite/module/domain/replacement/ElementMatcher.java @@ -1,4 +1,4 @@ -package tech.jhipster.lite.generator.module.domain.replacement; +package tech.jhipster.lite.module.domain.replacement; import java.util.function.BiFunction; diff --git a/src/main/java/tech/jhipster/lite/module/domain/replacement/FileReplacer.java b/src/main/java/tech/jhipster/lite/module/domain/replacement/FileReplacer.java new file mode 100644 index 00000000000..95575393d22 --- /dev/null +++ b/src/main/java/tech/jhipster/lite/module/domain/replacement/FileReplacer.java @@ -0,0 +1,7 @@ +package tech.jhipster.lite.module.domain.replacement; + +import tech.jhipster.lite.module.domain.properties.JHipsterProjectFolder; + +interface FileReplacer { + void apply(JHipsterProjectFolder folder); +} diff --git a/src/main/java/tech/jhipster/lite/generator/module/domain/replacement/JHipsterModuleMandatoryReplacements.java b/src/main/java/tech/jhipster/lite/module/domain/replacement/JHipsterModuleMandatoryReplacements.java similarity index 92% rename from src/main/java/tech/jhipster/lite/generator/module/domain/replacement/JHipsterModuleMandatoryReplacements.java rename to src/main/java/tech/jhipster/lite/module/domain/replacement/JHipsterModuleMandatoryReplacements.java index 542629c0611..3075501ac4b 100644 --- a/src/main/java/tech/jhipster/lite/generator/module/domain/replacement/JHipsterModuleMandatoryReplacements.java +++ b/src/main/java/tech/jhipster/lite/module/domain/replacement/JHipsterModuleMandatoryReplacements.java @@ -1,12 +1,12 @@ -package tech.jhipster.lite.generator.module.domain.replacement; +package tech.jhipster.lite.module.domain.replacement; import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.StandardOpenOption; import tech.jhipster.lite.error.domain.Assert; -import tech.jhipster.lite.generator.module.domain.JHipsterModule.JHipsterModuleBuilder; -import tech.jhipster.lite.generator.module.domain.properties.JHipsterProjectFolder; +import tech.jhipster.lite.module.domain.JHipsterModule.JHipsterModuleBuilder; +import tech.jhipster.lite.module.domain.properties.JHipsterProjectFolder; public class JHipsterModuleMandatoryReplacements extends JHipsterModuleReplacements { diff --git a/src/main/java/tech/jhipster/lite/generator/module/domain/replacement/JHipsterModuleOptionalReplacements.java b/src/main/java/tech/jhipster/lite/module/domain/replacement/JHipsterModuleOptionalReplacements.java similarity index 92% rename from src/main/java/tech/jhipster/lite/generator/module/domain/replacement/JHipsterModuleOptionalReplacements.java rename to src/main/java/tech/jhipster/lite/module/domain/replacement/JHipsterModuleOptionalReplacements.java index 66348b29c34..4a05b963d0f 100644 --- a/src/main/java/tech/jhipster/lite/generator/module/domain/replacement/JHipsterModuleOptionalReplacements.java +++ b/src/main/java/tech/jhipster/lite/module/domain/replacement/JHipsterModuleOptionalReplacements.java @@ -1,4 +1,4 @@ -package tech.jhipster.lite.generator.module.domain.replacement; +package tech.jhipster.lite.module.domain.replacement; import java.io.IOException; import java.nio.file.Files; @@ -7,8 +7,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import tech.jhipster.lite.error.domain.Assert; -import tech.jhipster.lite.generator.module.domain.JHipsterModule.JHipsterModuleBuilder; -import tech.jhipster.lite.generator.module.domain.properties.JHipsterProjectFolder; +import tech.jhipster.lite.module.domain.JHipsterModule.JHipsterModuleBuilder; +import tech.jhipster.lite.module.domain.properties.JHipsterProjectFolder; public class JHipsterModuleOptionalReplacements extends JHipsterModuleReplacements { diff --git a/src/main/java/tech/jhipster/lite/generator/module/domain/replacement/JHipsterModuleReplacements.java b/src/main/java/tech/jhipster/lite/module/domain/replacement/JHipsterModuleReplacements.java similarity index 92% rename from src/main/java/tech/jhipster/lite/generator/module/domain/replacement/JHipsterModuleReplacements.java rename to src/main/java/tech/jhipster/lite/module/domain/replacement/JHipsterModuleReplacements.java index 8594fee5947..110aac960e2 100644 --- a/src/main/java/tech/jhipster/lite/generator/module/domain/replacement/JHipsterModuleReplacements.java +++ b/src/main/java/tech/jhipster/lite/module/domain/replacement/JHipsterModuleReplacements.java @@ -1,10 +1,10 @@ -package tech.jhipster.lite.generator.module.domain.replacement; +package tech.jhipster.lite.module.domain.replacement; import java.util.ArrayList; import java.util.Collection; import tech.jhipster.lite.error.domain.Assert; -import tech.jhipster.lite.generator.module.domain.JHipsterModule.JHipsterModuleBuilder; -import tech.jhipster.lite.generator.module.domain.properties.JHipsterProjectFolder; +import tech.jhipster.lite.module.domain.JHipsterModule.JHipsterModuleBuilder; +import tech.jhipster.lite.module.domain.properties.JHipsterProjectFolder; abstract class JHipsterModuleReplacements { diff --git a/src/main/java/tech/jhipster/lite/generator/module/domain/replacement/JustAfter.java b/src/main/java/tech/jhipster/lite/module/domain/replacement/JustAfter.java similarity index 84% rename from src/main/java/tech/jhipster/lite/generator/module/domain/replacement/JustAfter.java rename to src/main/java/tech/jhipster/lite/module/domain/replacement/JustAfter.java index 166fd61640a..f285a7b7d48 100644 --- a/src/main/java/tech/jhipster/lite/generator/module/domain/replacement/JustAfter.java +++ b/src/main/java/tech/jhipster/lite/module/domain/replacement/JustAfter.java @@ -1,4 +1,4 @@ -package tech.jhipster.lite.generator.module.domain.replacement; +package tech.jhipster.lite.module.domain.replacement; import tech.jhipster.lite.error.domain.Assert; diff --git a/src/main/java/tech/jhipster/lite/generator/module/domain/replacement/JustBefore.java b/src/main/java/tech/jhipster/lite/module/domain/replacement/JustBefore.java similarity index 84% rename from src/main/java/tech/jhipster/lite/generator/module/domain/replacement/JustBefore.java rename to src/main/java/tech/jhipster/lite/module/domain/replacement/JustBefore.java index 1b88b129928..2c1b18c2272 100644 --- a/src/main/java/tech/jhipster/lite/generator/module/domain/replacement/JustBefore.java +++ b/src/main/java/tech/jhipster/lite/module/domain/replacement/JustBefore.java @@ -1,4 +1,4 @@ -package tech.jhipster.lite.generator.module.domain.replacement; +package tech.jhipster.lite.module.domain.replacement; import tech.jhipster.lite.error.domain.Assert; diff --git a/src/main/java/tech/jhipster/lite/generator/module/domain/replacement/JustLineAfter.java b/src/main/java/tech/jhipster/lite/module/domain/replacement/JustLineAfter.java similarity index 69% rename from src/main/java/tech/jhipster/lite/generator/module/domain/replacement/JustLineAfter.java rename to src/main/java/tech/jhipster/lite/module/domain/replacement/JustLineAfter.java index 60134fc9b7c..c1ff0d9381b 100644 --- a/src/main/java/tech/jhipster/lite/generator/module/domain/replacement/JustLineAfter.java +++ b/src/main/java/tech/jhipster/lite/module/domain/replacement/JustLineAfter.java @@ -1,6 +1,6 @@ -package tech.jhipster.lite.generator.module.domain.replacement; +package tech.jhipster.lite.module.domain.replacement; -import static tech.jhipster.lite.generator.module.domain.replacement.JHipsterModuleReplacements.LF; +import static tech.jhipster.lite.module.domain.replacement.JHipsterModuleReplacements.*; import tech.jhipster.lite.error.domain.Assert; diff --git a/src/main/java/tech/jhipster/lite/generator/module/domain/replacement/JustLineBefore.java b/src/main/java/tech/jhipster/lite/module/domain/replacement/JustLineBefore.java similarity index 69% rename from src/main/java/tech/jhipster/lite/generator/module/domain/replacement/JustLineBefore.java rename to src/main/java/tech/jhipster/lite/module/domain/replacement/JustLineBefore.java index 5d40bedc550..aca188eeb4e 100644 --- a/src/main/java/tech/jhipster/lite/generator/module/domain/replacement/JustLineBefore.java +++ b/src/main/java/tech/jhipster/lite/module/domain/replacement/JustLineBefore.java @@ -1,6 +1,6 @@ -package tech.jhipster.lite.generator.module.domain.replacement; +package tech.jhipster.lite.module.domain.replacement; -import static tech.jhipster.lite.generator.module.domain.replacement.JHipsterModuleReplacements.LF; +import static tech.jhipster.lite.module.domain.replacement.JHipsterModuleReplacements.*; import tech.jhipster.lite.error.domain.Assert; diff --git a/src/main/java/tech/jhipster/lite/generator/module/domain/replacement/PositionalMatcher.java b/src/main/java/tech/jhipster/lite/module/domain/replacement/PositionalMatcher.java similarity index 61% rename from src/main/java/tech/jhipster/lite/generator/module/domain/replacement/PositionalMatcher.java rename to src/main/java/tech/jhipster/lite/module/domain/replacement/PositionalMatcher.java index 9b35c919b4d..8d152aa5cb1 100644 --- a/src/main/java/tech/jhipster/lite/generator/module/domain/replacement/PositionalMatcher.java +++ b/src/main/java/tech/jhipster/lite/module/domain/replacement/PositionalMatcher.java @@ -1,4 +1,4 @@ -package tech.jhipster.lite.generator.module.domain.replacement; +package tech.jhipster.lite.module.domain.replacement; interface PositionalMatcher { ElementMatcher element(); diff --git a/src/main/java/tech/jhipster/lite/generator/module/domain/replacement/RegexMatcher.java b/src/main/java/tech/jhipster/lite/module/domain/replacement/RegexMatcher.java similarity index 94% rename from src/main/java/tech/jhipster/lite/generator/module/domain/replacement/RegexMatcher.java rename to src/main/java/tech/jhipster/lite/module/domain/replacement/RegexMatcher.java index 05ac3366726..78cb501cb16 100644 --- a/src/main/java/tech/jhipster/lite/generator/module/domain/replacement/RegexMatcher.java +++ b/src/main/java/tech/jhipster/lite/module/domain/replacement/RegexMatcher.java @@ -1,4 +1,4 @@ -package tech.jhipster.lite.generator.module.domain.replacement; +package tech.jhipster.lite.module.domain.replacement; import java.util.function.BiFunction; import java.util.regex.Pattern; diff --git a/src/main/java/tech/jhipster/lite/generator/module/domain/replacement/ReplacementErrorException.java b/src/main/java/tech/jhipster/lite/module/domain/replacement/ReplacementErrorException.java similarity index 82% rename from src/main/java/tech/jhipster/lite/generator/module/domain/replacement/ReplacementErrorException.java rename to src/main/java/tech/jhipster/lite/module/domain/replacement/ReplacementErrorException.java index af55fe7dd45..bd8ed68a30a 100644 --- a/src/main/java/tech/jhipster/lite/generator/module/domain/replacement/ReplacementErrorException.java +++ b/src/main/java/tech/jhipster/lite/module/domain/replacement/ReplacementErrorException.java @@ -1,4 +1,4 @@ -package tech.jhipster.lite.generator.module.domain.replacement; +package tech.jhipster.lite.module.domain.replacement; import java.nio.file.Path; import tech.jhipster.lite.error.domain.GeneratorException; diff --git a/src/main/java/tech/jhipster/lite/generator/module/domain/replacement/TextMatcher.java b/src/main/java/tech/jhipster/lite/module/domain/replacement/TextMatcher.java similarity index 89% rename from src/main/java/tech/jhipster/lite/generator/module/domain/replacement/TextMatcher.java rename to src/main/java/tech/jhipster/lite/module/domain/replacement/TextMatcher.java index 4555b335e72..868471a0409 100644 --- a/src/main/java/tech/jhipster/lite/generator/module/domain/replacement/TextMatcher.java +++ b/src/main/java/tech/jhipster/lite/module/domain/replacement/TextMatcher.java @@ -1,4 +1,4 @@ -package tech.jhipster.lite.generator.module.domain.replacement; +package tech.jhipster.lite.module.domain.replacement; import java.util.function.BiFunction; import tech.jhipster.lite.error.domain.Assert; diff --git a/src/main/java/tech/jhipster/lite/generator/module/domain/replacement/UnknownCurrentValueException.java b/src/main/java/tech/jhipster/lite/module/domain/replacement/UnknownCurrentValueException.java similarity index 82% rename from src/main/java/tech/jhipster/lite/generator/module/domain/replacement/UnknownCurrentValueException.java rename to src/main/java/tech/jhipster/lite/module/domain/replacement/UnknownCurrentValueException.java index 51080282072..f09545b56a6 100644 --- a/src/main/java/tech/jhipster/lite/generator/module/domain/replacement/UnknownCurrentValueException.java +++ b/src/main/java/tech/jhipster/lite/module/domain/replacement/UnknownCurrentValueException.java @@ -1,4 +1,4 @@ -package tech.jhipster.lite.generator.module.domain.replacement; +package tech.jhipster.lite.module.domain.replacement; import java.nio.file.Path; import tech.jhipster.lite.error.domain.GeneratorException; diff --git a/src/main/java/tech/jhipster/lite/generator/module/infrastructure/primary/DuplicatedSlugException.java b/src/main/java/tech/jhipster/lite/module/infrastructure/primary/DuplicatedSlugException.java similarity index 77% rename from src/main/java/tech/jhipster/lite/generator/module/infrastructure/primary/DuplicatedSlugException.java rename to src/main/java/tech/jhipster/lite/module/infrastructure/primary/DuplicatedSlugException.java index 15e675f3c01..5c6d5b18fc5 100644 --- a/src/main/java/tech/jhipster/lite/generator/module/infrastructure/primary/DuplicatedSlugException.java +++ b/src/main/java/tech/jhipster/lite/module/infrastructure/primary/DuplicatedSlugException.java @@ -1,4 +1,4 @@ -package tech.jhipster.lite.generator.module.infrastructure.primary; +package tech.jhipster.lite.module.infrastructure.primary; import tech.jhipster.lite.error.domain.GeneratorException; diff --git a/src/main/java/tech/jhipster/lite/generator/module/infrastructure/primary/InvalidModuleQueryException.java b/src/main/java/tech/jhipster/lite/module/infrastructure/primary/InvalidModuleQueryException.java similarity index 91% rename from src/main/java/tech/jhipster/lite/generator/module/infrastructure/primary/InvalidModuleQueryException.java rename to src/main/java/tech/jhipster/lite/module/infrastructure/primary/InvalidModuleQueryException.java index 92168685fae..9fc893b3f22 100644 --- a/src/main/java/tech/jhipster/lite/generator/module/infrastructure/primary/InvalidModuleQueryException.java +++ b/src/main/java/tech/jhipster/lite/module/infrastructure/primary/InvalidModuleQueryException.java @@ -1,4 +1,4 @@ -package tech.jhipster.lite.generator.module.infrastructure.primary; +package tech.jhipster.lite.module.infrastructure.primary; import java.io.IOException; import tech.jhipster.lite.error.domain.GeneratorException; diff --git a/src/main/java/tech/jhipster/lite/generator/module/infrastructure/primary/InvalidProperitesDefinitionQueryException.java b/src/main/java/tech/jhipster/lite/module/infrastructure/primary/InvalidProperitesDefinitionQueryException.java similarity index 79% rename from src/main/java/tech/jhipster/lite/generator/module/infrastructure/primary/InvalidProperitesDefinitionQueryException.java rename to src/main/java/tech/jhipster/lite/module/infrastructure/primary/InvalidProperitesDefinitionQueryException.java index 33c138241f1..75fd9ba3a6e 100644 --- a/src/main/java/tech/jhipster/lite/generator/module/infrastructure/primary/InvalidProperitesDefinitionQueryException.java +++ b/src/main/java/tech/jhipster/lite/module/infrastructure/primary/InvalidProperitesDefinitionQueryException.java @@ -1,4 +1,4 @@ -package tech.jhipster.lite.generator.module.infrastructure.primary; +package tech.jhipster.lite.module.infrastructure.primary; import tech.jhipster.lite.error.domain.GeneratorException; diff --git a/src/main/java/tech/jhipster/lite/generator/module/infrastructure/primary/JHipsterModuleApiDoc.java b/src/main/java/tech/jhipster/lite/module/infrastructure/primary/JHipsterModuleApiDoc.java similarity index 78% rename from src/main/java/tech/jhipster/lite/generator/module/infrastructure/primary/JHipsterModuleApiDoc.java rename to src/main/java/tech/jhipster/lite/module/infrastructure/primary/JHipsterModuleApiDoc.java index 4ef224696cf..b939e9c64b0 100644 --- a/src/main/java/tech/jhipster/lite/generator/module/infrastructure/primary/JHipsterModuleApiDoc.java +++ b/src/main/java/tech/jhipster/lite/module/infrastructure/primary/JHipsterModuleApiDoc.java @@ -1,4 +1,4 @@ -package tech.jhipster.lite.generator.module.infrastructure.primary; +package tech.jhipster.lite.module.infrastructure.primary; import tech.jhipster.lite.error.domain.Assert; diff --git a/src/main/java/tech/jhipster/lite/generator/module/infrastructure/primary/JHipsterModuleApplicationController.java b/src/main/java/tech/jhipster/lite/module/infrastructure/primary/JHipsterModuleApplicationController.java similarity index 76% rename from src/main/java/tech/jhipster/lite/generator/module/infrastructure/primary/JHipsterModuleApplicationController.java rename to src/main/java/tech/jhipster/lite/module/infrastructure/primary/JHipsterModuleApplicationController.java index a60b37a2d48..f9b1b17d6c4 100644 --- a/src/main/java/tech/jhipster/lite/generator/module/infrastructure/primary/JHipsterModuleApplicationController.java +++ b/src/main/java/tech/jhipster/lite/module/infrastructure/primary/JHipsterModuleApplicationController.java @@ -1,12 +1,12 @@ -package tech.jhipster.lite.generator.module.infrastructure.primary; +package tech.jhipster.lite.module.infrastructure.primary; import com.fasterxml.jackson.databind.ObjectMapper; import java.io.IOException; import javax.servlet.http.HttpServletRequest; import org.springframework.util.StreamUtils; import tech.jhipster.lite.error.domain.Assert; -import tech.jhipster.lite.generator.module.application.JHipsterModulesApplicationService; -import tech.jhipster.lite.generator.module.domain.properties.JHipsterModuleProperties; +import tech.jhipster.lite.module.application.JHipsterModulesApplicationService; +import tech.jhipster.lite.module.domain.properties.JHipsterModuleProperties; class JHipsterModuleApplicationController extends JHipsterModuleController { diff --git a/src/main/java/tech/jhipster/lite/generator/module/infrastructure/primary/JHipsterModuleController.java b/src/main/java/tech/jhipster/lite/module/infrastructure/primary/JHipsterModuleController.java similarity index 75% rename from src/main/java/tech/jhipster/lite/generator/module/infrastructure/primary/JHipsterModuleController.java rename to src/main/java/tech/jhipster/lite/module/infrastructure/primary/JHipsterModuleController.java index e3bf2027de5..de4fc524a48 100644 --- a/src/main/java/tech/jhipster/lite/generator/module/infrastructure/primary/JHipsterModuleController.java +++ b/src/main/java/tech/jhipster/lite/module/infrastructure/primary/JHipsterModuleController.java @@ -1,4 +1,4 @@ -package tech.jhipster.lite.generator.module.infrastructure.primary; +package tech.jhipster.lite.module.infrastructure.primary; import java.io.IOException; import javax.servlet.http.HttpServletRequest; @@ -7,11 +7,11 @@ import org.springframework.web.servlet.ModelAndView; import org.springframework.web.servlet.mvc.Controller; import tech.jhipster.lite.error.domain.Assert; -import tech.jhipster.lite.generator.module.application.JHipsterModulesApplicationService; -import tech.jhipster.lite.generator.module.domain.JHipsterModuleFactory; -import tech.jhipster.lite.generator.module.domain.JHipsterModuleSlug; -import tech.jhipster.lite.generator.module.domain.JHipsterModuleToApply; -import tech.jhipster.lite.generator.module.domain.properties.JHipsterModuleProperties; +import tech.jhipster.lite.module.application.JHipsterModulesApplicationService; +import tech.jhipster.lite.module.domain.JHipsterModuleFactory; +import tech.jhipster.lite.module.domain.JHipsterModuleSlug; +import tech.jhipster.lite.module.domain.JHipsterModuleToApply; +import tech.jhipster.lite.module.domain.properties.JHipsterModuleProperties; abstract class JHipsterModuleController implements Controller { diff --git a/src/main/java/tech/jhipster/lite/generator/module/infrastructure/primary/JHipsterModulePropertiesDefinitionController.java b/src/main/java/tech/jhipster/lite/module/infrastructure/primary/JHipsterModulePropertiesDefinitionController.java similarity index 95% rename from src/main/java/tech/jhipster/lite/generator/module/infrastructure/primary/JHipsterModulePropertiesDefinitionController.java rename to src/main/java/tech/jhipster/lite/module/infrastructure/primary/JHipsterModulePropertiesDefinitionController.java index cdb0fae5240..b3a435e123a 100644 --- a/src/main/java/tech/jhipster/lite/generator/module/infrastructure/primary/JHipsterModulePropertiesDefinitionController.java +++ b/src/main/java/tech/jhipster/lite/module/infrastructure/primary/JHipsterModulePropertiesDefinitionController.java @@ -1,4 +1,4 @@ -package tech.jhipster.lite.generator.module.infrastructure.primary; +package tech.jhipster.lite.module.infrastructure.primary; import com.fasterxml.jackson.databind.ObjectMapper; import java.util.Map; diff --git a/src/main/java/tech/jhipster/lite/generator/module/infrastructure/primary/JHipsterModuleResource.java b/src/main/java/tech/jhipster/lite/module/infrastructure/primary/JHipsterModuleResource.java similarity index 92% rename from src/main/java/tech/jhipster/lite/generator/module/infrastructure/primary/JHipsterModuleResource.java rename to src/main/java/tech/jhipster/lite/module/infrastructure/primary/JHipsterModuleResource.java index 9357a953260..d112290e54d 100644 --- a/src/main/java/tech/jhipster/lite/generator/module/infrastructure/primary/JHipsterModuleResource.java +++ b/src/main/java/tech/jhipster/lite/module/infrastructure/primary/JHipsterModuleResource.java @@ -1,9 +1,9 @@ -package tech.jhipster.lite.generator.module.infrastructure.primary; +package tech.jhipster.lite.module.infrastructure.primary; import tech.jhipster.lite.error.domain.Assert; -import tech.jhipster.lite.generator.module.domain.JHipsterModuleFactory; -import tech.jhipster.lite.generator.module.domain.JHipsterModuleSlug; -import tech.jhipster.lite.generator.module.domain.properties.JHipsterModulePropertiesDefinition; +import tech.jhipster.lite.module.domain.JHipsterModuleFactory; +import tech.jhipster.lite.module.domain.JHipsterModuleSlug; +import tech.jhipster.lite.module.domain.properties.JHipsterModulePropertiesDefinition; public class JHipsterModuleResource { diff --git a/src/main/java/tech/jhipster/lite/generator/module/infrastructure/primary/JHipsterModulesLegacyHandlerMapping.java b/src/main/java/tech/jhipster/lite/module/infrastructure/primary/JHipsterModulesLegacyHandlerMapping.java similarity index 89% rename from src/main/java/tech/jhipster/lite/generator/module/infrastructure/primary/JHipsterModulesLegacyHandlerMapping.java rename to src/main/java/tech/jhipster/lite/module/infrastructure/primary/JHipsterModulesLegacyHandlerMapping.java index eb9bf81b096..d5dcc591e15 100644 --- a/src/main/java/tech/jhipster/lite/generator/module/infrastructure/primary/JHipsterModulesLegacyHandlerMapping.java +++ b/src/main/java/tech/jhipster/lite/module/infrastructure/primary/JHipsterModulesLegacyHandlerMapping.java @@ -1,4 +1,4 @@ -package tech.jhipster.lite.generator.module.infrastructure.primary; +package tech.jhipster.lite.module.infrastructure.primary; import com.fasterxml.jackson.databind.ObjectMapper; import java.util.Map; @@ -6,7 +6,7 @@ import org.springframework.beans.BeansException; import org.springframework.stereotype.Component; import org.springframework.web.servlet.handler.AbstractUrlHandlerMapping; -import tech.jhipster.lite.generator.module.application.JHipsterModulesApplicationService; +import tech.jhipster.lite.module.application.JHipsterModulesApplicationService; @Component class JHipsterModulesLegacyHandlerMapping extends AbstractUrlHandlerMapping { diff --git a/src/main/java/tech/jhipster/lite/generator/module/infrastructure/primary/JHipsterModulesPatchApplicationHandlerMapping.java b/src/main/java/tech/jhipster/lite/module/infrastructure/primary/JHipsterModulesPatchApplicationHandlerMapping.java similarity index 91% rename from src/main/java/tech/jhipster/lite/generator/module/infrastructure/primary/JHipsterModulesPatchApplicationHandlerMapping.java rename to src/main/java/tech/jhipster/lite/module/infrastructure/primary/JHipsterModulesPatchApplicationHandlerMapping.java index b566a3f295b..ede74d47663 100644 --- a/src/main/java/tech/jhipster/lite/generator/module/infrastructure/primary/JHipsterModulesPatchApplicationHandlerMapping.java +++ b/src/main/java/tech/jhipster/lite/module/infrastructure/primary/JHipsterModulesPatchApplicationHandlerMapping.java @@ -1,4 +1,4 @@ -package tech.jhipster.lite.generator.module.infrastructure.primary; +package tech.jhipster.lite.module.infrastructure.primary; import com.fasterxml.jackson.databind.ObjectMapper; import java.util.Map; @@ -7,7 +7,7 @@ import org.springframework.beans.BeansException; import org.springframework.stereotype.Component; import org.springframework.web.servlet.handler.AbstractUrlHandlerMapping; -import tech.jhipster.lite.generator.module.application.JHipsterModulesApplicationService; +import tech.jhipster.lite.module.application.JHipsterModulesApplicationService; @Component class JHipsterModulesPatchApplicationHandlerMapping extends AbstractUrlHandlerMapping { diff --git a/src/main/java/tech/jhipster/lite/generator/module/infrastructure/primary/JHipsterModulesPropertiesDefinitionHandlerMapping.java b/src/main/java/tech/jhipster/lite/module/infrastructure/primary/JHipsterModulesPropertiesDefinitionHandlerMapping.java similarity index 95% rename from src/main/java/tech/jhipster/lite/generator/module/infrastructure/primary/JHipsterModulesPropertiesDefinitionHandlerMapping.java rename to src/main/java/tech/jhipster/lite/module/infrastructure/primary/JHipsterModulesPropertiesDefinitionHandlerMapping.java index 71a0d4506f2..87c1b3a00d9 100644 --- a/src/main/java/tech/jhipster/lite/generator/module/infrastructure/primary/JHipsterModulesPropertiesDefinitionHandlerMapping.java +++ b/src/main/java/tech/jhipster/lite/module/infrastructure/primary/JHipsterModulesPropertiesDefinitionHandlerMapping.java @@ -1,4 +1,4 @@ -package tech.jhipster.lite.generator.module.infrastructure.primary; +package tech.jhipster.lite.module.infrastructure.primary; import com.fasterxml.jackson.databind.ObjectMapper; import java.util.Map; diff --git a/src/main/java/tech/jhipster/lite/generator/module/infrastructure/primary/JHipsterModulesResources.java b/src/main/java/tech/jhipster/lite/module/infrastructure/primary/JHipsterModulesResources.java similarity index 92% rename from src/main/java/tech/jhipster/lite/generator/module/infrastructure/primary/JHipsterModulesResources.java rename to src/main/java/tech/jhipster/lite/module/infrastructure/primary/JHipsterModulesResources.java index 81a0684dc7e..7ce5faa9511 100644 --- a/src/main/java/tech/jhipster/lite/generator/module/infrastructure/primary/JHipsterModulesResources.java +++ b/src/main/java/tech/jhipster/lite/module/infrastructure/primary/JHipsterModulesResources.java @@ -1,4 +1,4 @@ -package tech.jhipster.lite.generator.module.infrastructure.primary; +package tech.jhipster.lite.module.infrastructure.primary; import java.util.Collection; import java.util.stream.Collectors; diff --git a/src/main/java/tech/jhipster/lite/generator/module/infrastructure/primary/JHipsterModulesResourcesConfiguration.java b/src/main/java/tech/jhipster/lite/module/infrastructure/primary/JHipsterModulesResourcesConfiguration.java similarity index 85% rename from src/main/java/tech/jhipster/lite/generator/module/infrastructure/primary/JHipsterModulesResourcesConfiguration.java rename to src/main/java/tech/jhipster/lite/module/infrastructure/primary/JHipsterModulesResourcesConfiguration.java index 325884446e3..d069745da55 100644 --- a/src/main/java/tech/jhipster/lite/generator/module/infrastructure/primary/JHipsterModulesResourcesConfiguration.java +++ b/src/main/java/tech/jhipster/lite/module/infrastructure/primary/JHipsterModulesResourcesConfiguration.java @@ -1,4 +1,4 @@ -package tech.jhipster.lite.generator.module.infrastructure.primary; +package tech.jhipster.lite.module.infrastructure.primary; import java.util.Collection; import org.springframework.context.annotation.Bean; diff --git a/src/main/java/tech/jhipster/lite/generator/module/infrastructure/primary/JHipsterProjectQueryController.java b/src/main/java/tech/jhipster/lite/module/infrastructure/primary/JHipsterProjectQueryController.java similarity index 78% rename from src/main/java/tech/jhipster/lite/generator/module/infrastructure/primary/JHipsterProjectQueryController.java rename to src/main/java/tech/jhipster/lite/module/infrastructure/primary/JHipsterProjectQueryController.java index 7104ee23c32..355a199eb25 100644 --- a/src/main/java/tech/jhipster/lite/generator/module/infrastructure/primary/JHipsterProjectQueryController.java +++ b/src/main/java/tech/jhipster/lite/module/infrastructure/primary/JHipsterProjectQueryController.java @@ -1,13 +1,13 @@ -package tech.jhipster.lite.generator.module.infrastructure.primary; +package tech.jhipster.lite.module.infrastructure.primary; import com.fasterxml.jackson.databind.ObjectMapper; import java.io.IOException; import javax.servlet.http.HttpServletRequest; import org.springframework.util.StreamUtils; import tech.jhipster.lite.error.domain.Assert; -import tech.jhipster.lite.generator.module.application.JHipsterModulesApplicationService; -import tech.jhipster.lite.generator.module.domain.properties.JHipsterModuleProperties; import tech.jhipster.lite.generator.project.infrastructure.primary.dto.ProjectDTO; +import tech.jhipster.lite.module.application.JHipsterModulesApplicationService; +import tech.jhipster.lite.module.domain.properties.JHipsterModuleProperties; class JHipsterProjectQueryController extends JHipsterModuleController { diff --git a/src/main/java/tech/jhipster/lite/generator/module/infrastructure/primary/ModulesResource.java b/src/main/java/tech/jhipster/lite/module/infrastructure/primary/ModulesResource.java similarity index 92% rename from src/main/java/tech/jhipster/lite/generator/module/infrastructure/primary/ModulesResource.java rename to src/main/java/tech/jhipster/lite/module/infrastructure/primary/ModulesResource.java index 587783cac91..3d0a26a3f2c 100644 --- a/src/main/java/tech/jhipster/lite/generator/module/infrastructure/primary/ModulesResource.java +++ b/src/main/java/tech/jhipster/lite/module/infrastructure/primary/ModulesResource.java @@ -1,4 +1,4 @@ -package tech.jhipster.lite.generator.module.infrastructure.primary; +package tech.jhipster.lite.module.infrastructure.primary; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; diff --git a/src/main/java/tech/jhipster/lite/generator/module/infrastructure/primary/OpenApiFieldType.java b/src/main/java/tech/jhipster/lite/module/infrastructure/primary/OpenApiFieldType.java similarity index 76% rename from src/main/java/tech/jhipster/lite/generator/module/infrastructure/primary/OpenApiFieldType.java rename to src/main/java/tech/jhipster/lite/module/infrastructure/primary/OpenApiFieldType.java index 0678d73573e..e6d8615e0d0 100644 --- a/src/main/java/tech/jhipster/lite/generator/module/infrastructure/primary/OpenApiFieldType.java +++ b/src/main/java/tech/jhipster/lite/module/infrastructure/primary/OpenApiFieldType.java @@ -1,4 +1,4 @@ -package tech.jhipster.lite.generator.module.infrastructure.primary; +package tech.jhipster.lite.module.infrastructure.primary; enum OpenApiFieldType { STRING("string"), diff --git a/src/main/java/tech/jhipster/lite/generator/module/infrastructure/primary/OpenApiModulesConfiguration.java b/src/main/java/tech/jhipster/lite/module/infrastructure/primary/OpenApiModulesConfiguration.java similarity index 93% rename from src/main/java/tech/jhipster/lite/generator/module/infrastructure/primary/OpenApiModulesConfiguration.java rename to src/main/java/tech/jhipster/lite/module/infrastructure/primary/OpenApiModulesConfiguration.java index dad777144bb..4ad1c35036b 100644 --- a/src/main/java/tech/jhipster/lite/generator/module/infrastructure/primary/OpenApiModulesConfiguration.java +++ b/src/main/java/tech/jhipster/lite/module/infrastructure/primary/OpenApiModulesConfiguration.java @@ -1,4 +1,4 @@ -package tech.jhipster.lite.generator.module.infrastructure.primary; +package tech.jhipster.lite.module.infrastructure.primary; import io.swagger.v3.oas.models.Operation; import io.swagger.v3.oas.models.PathItem; @@ -18,12 +18,12 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import tech.jhipster.lite.common.domain.Enums; -import tech.jhipster.lite.generator.module.domain.JHipsterModuleSlug; -import tech.jhipster.lite.generator.module.domain.properties.JHipsterModulePropertyDefinition; -import tech.jhipster.lite.generator.module.domain.properties.JHipsterPropertyDescription; -import tech.jhipster.lite.generator.module.domain.properties.JHipsterPropertyExample; -import tech.jhipster.lite.generator.module.domain.properties.JHipsterPropertyKey; -import tech.jhipster.lite.generator.module.domain.properties.JHipsterPropertyType; +import tech.jhipster.lite.module.domain.JHipsterModuleSlug; +import tech.jhipster.lite.module.domain.properties.JHipsterModulePropertyDefinition; +import tech.jhipster.lite.module.domain.properties.JHipsterPropertyDescription; +import tech.jhipster.lite.module.domain.properties.JHipsterPropertyExample; +import tech.jhipster.lite.module.domain.properties.JHipsterPropertyKey; +import tech.jhipster.lite.module.domain.properties.JHipsterPropertyType; @Configuration class OpenApiModulesConfiguration { diff --git a/src/main/java/tech/jhipster/lite/generator/module/infrastructure/primary/RestJHipsterModule.java b/src/main/java/tech/jhipster/lite/module/infrastructure/primary/RestJHipsterModule.java similarity index 96% rename from src/main/java/tech/jhipster/lite/generator/module/infrastructure/primary/RestJHipsterModule.java rename to src/main/java/tech/jhipster/lite/module/infrastructure/primary/RestJHipsterModule.java index 0e71fa8c161..a8c91a1e894 100644 --- a/src/main/java/tech/jhipster/lite/generator/module/infrastructure/primary/RestJHipsterModule.java +++ b/src/main/java/tech/jhipster/lite/module/infrastructure/primary/RestJHipsterModule.java @@ -1,4 +1,4 @@ -package tech.jhipster.lite.generator.module.infrastructure.primary; +package tech.jhipster.lite.module.infrastructure.primary; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/src/main/java/tech/jhipster/lite/generator/module/infrastructure/primary/RestJHipsterModuleCategory.java b/src/main/java/tech/jhipster/lite/module/infrastructure/primary/RestJHipsterModuleCategory.java similarity index 94% rename from src/main/java/tech/jhipster/lite/generator/module/infrastructure/primary/RestJHipsterModuleCategory.java rename to src/main/java/tech/jhipster/lite/module/infrastructure/primary/RestJHipsterModuleCategory.java index 250754fe7f6..e770776db42 100644 --- a/src/main/java/tech/jhipster/lite/generator/module/infrastructure/primary/RestJHipsterModuleCategory.java +++ b/src/main/java/tech/jhipster/lite/module/infrastructure/primary/RestJHipsterModuleCategory.java @@ -1,4 +1,4 @@ -package tech.jhipster.lite.generator.module.infrastructure.primary; +package tech.jhipster.lite.module.infrastructure.primary; import io.swagger.v3.oas.annotations.media.Schema; import java.util.Collection; diff --git a/src/main/java/tech/jhipster/lite/generator/module/infrastructure/primary/RestJHipsterModuleProperties.java b/src/main/java/tech/jhipster/lite/module/infrastructure/primary/RestJHipsterModuleProperties.java similarity index 78% rename from src/main/java/tech/jhipster/lite/generator/module/infrastructure/primary/RestJHipsterModuleProperties.java rename to src/main/java/tech/jhipster/lite/module/infrastructure/primary/RestJHipsterModuleProperties.java index f7da6f80398..fa2c274ba90 100644 --- a/src/main/java/tech/jhipster/lite/generator/module/infrastructure/primary/RestJHipsterModuleProperties.java +++ b/src/main/java/tech/jhipster/lite/module/infrastructure/primary/RestJHipsterModuleProperties.java @@ -1,8 +1,8 @@ -package tech.jhipster.lite.generator.module.infrastructure.primary; +package tech.jhipster.lite.module.infrastructure.primary; import com.fasterxml.jackson.annotation.JsonProperty; import java.util.Map; -import tech.jhipster.lite.generator.module.domain.properties.JHipsterModuleProperties; +import tech.jhipster.lite.module.domain.properties.JHipsterModuleProperties; class RestJHipsterModuleProperties { diff --git a/src/main/java/tech/jhipster/lite/generator/module/infrastructure/primary/RestJHipsterModulePropertiesDefinition.java b/src/main/java/tech/jhipster/lite/module/infrastructure/primary/RestJHipsterModulePropertiesDefinition.java similarity index 80% rename from src/main/java/tech/jhipster/lite/generator/module/infrastructure/primary/RestJHipsterModulePropertiesDefinition.java rename to src/main/java/tech/jhipster/lite/module/infrastructure/primary/RestJHipsterModulePropertiesDefinition.java index 3ad77c1d0e0..171c77ccb40 100644 --- a/src/main/java/tech/jhipster/lite/generator/module/infrastructure/primary/RestJHipsterModulePropertiesDefinition.java +++ b/src/main/java/tech/jhipster/lite/module/infrastructure/primary/RestJHipsterModulePropertiesDefinition.java @@ -1,7 +1,7 @@ -package tech.jhipster.lite.generator.module.infrastructure.primary; +package tech.jhipster.lite.module.infrastructure.primary; import java.util.Collection; -import tech.jhipster.lite.generator.module.domain.properties.JHipsterModulePropertiesDefinition; +import tech.jhipster.lite.module.domain.properties.JHipsterModulePropertiesDefinition; class RestJHipsterModulePropertiesDefinition { diff --git a/src/main/java/tech/jhipster/lite/generator/module/infrastructure/primary/RestJHipsterModulePropertyDefinition.java b/src/main/java/tech/jhipster/lite/module/infrastructure/primary/RestJHipsterModulePropertyDefinition.java similarity index 84% rename from src/main/java/tech/jhipster/lite/generator/module/infrastructure/primary/RestJHipsterModulePropertyDefinition.java rename to src/main/java/tech/jhipster/lite/module/infrastructure/primary/RestJHipsterModulePropertyDefinition.java index 2075b21f73b..f37fdccec01 100644 --- a/src/main/java/tech/jhipster/lite/generator/module/infrastructure/primary/RestJHipsterModulePropertyDefinition.java +++ b/src/main/java/tech/jhipster/lite/module/infrastructure/primary/RestJHipsterModulePropertyDefinition.java @@ -1,9 +1,9 @@ -package tech.jhipster.lite.generator.module.infrastructure.primary; +package tech.jhipster.lite.module.infrastructure.primary; -import tech.jhipster.lite.generator.module.domain.properties.JHipsterModulePropertyDefinition; -import tech.jhipster.lite.generator.module.domain.properties.JHipsterPropertyDescription; -import tech.jhipster.lite.generator.module.domain.properties.JHipsterPropertyExample; -import tech.jhipster.lite.generator.module.domain.properties.JHipsterPropertyType; +import tech.jhipster.lite.module.domain.properties.JHipsterModulePropertyDefinition; +import tech.jhipster.lite.module.domain.properties.JHipsterPropertyDescription; +import tech.jhipster.lite.module.domain.properties.JHipsterPropertyExample; +import tech.jhipster.lite.module.domain.properties.JHipsterPropertyType; class RestJHipsterModulePropertyDefinition { diff --git a/src/main/java/tech/jhipster/lite/generator/module/infrastructure/primary/RestJHipsterModules.java b/src/main/java/tech/jhipster/lite/module/infrastructure/primary/RestJHipsterModules.java similarity index 95% rename from src/main/java/tech/jhipster/lite/generator/module/infrastructure/primary/RestJHipsterModules.java rename to src/main/java/tech/jhipster/lite/module/infrastructure/primary/RestJHipsterModules.java index d6b69f594c8..e50c79f5f1b 100644 --- a/src/main/java/tech/jhipster/lite/generator/module/infrastructure/primary/RestJHipsterModules.java +++ b/src/main/java/tech/jhipster/lite/module/infrastructure/primary/RestJHipsterModules.java @@ -1,4 +1,4 @@ -package tech.jhipster.lite.generator.module.infrastructure.primary; +package tech.jhipster.lite.module.infrastructure.primary; import io.swagger.v3.oas.annotations.media.Schema; import java.util.Collection; diff --git a/src/main/java/tech/jhipster/lite/generator/module/infrastructure/secondary/FileSystemCurrentJavaDependenciesVersionsRepository.java b/src/main/java/tech/jhipster/lite/module/infrastructure/secondary/FileSystemCurrentJavaDependenciesVersionsRepository.java similarity index 77% rename from src/main/java/tech/jhipster/lite/generator/module/infrastructure/secondary/FileSystemCurrentJavaDependenciesVersionsRepository.java rename to src/main/java/tech/jhipster/lite/module/infrastructure/secondary/FileSystemCurrentJavaDependenciesVersionsRepository.java index 6ef479f2bc1..a02853a9b32 100644 --- a/src/main/java/tech/jhipster/lite/generator/module/infrastructure/secondary/FileSystemCurrentJavaDependenciesVersionsRepository.java +++ b/src/main/java/tech/jhipster/lite/module/infrastructure/secondary/FileSystemCurrentJavaDependenciesVersionsRepository.java @@ -1,12 +1,12 @@ -package tech.jhipster.lite.generator.module.infrastructure.secondary; +package tech.jhipster.lite.module.infrastructure.secondary; import java.util.List; import java.util.regex.Pattern; import org.springframework.stereotype.Repository; import tech.jhipster.lite.common.domain.ProjectFilesReader; -import tech.jhipster.lite.generator.module.domain.javadependency.CurrentJavaDependenciesVersions; -import tech.jhipster.lite.generator.module.domain.javadependency.JavaDependenciesCurrentVersionsRepository; -import tech.jhipster.lite.generator.module.domain.javadependency.JavaDependencyVersion; +import tech.jhipster.lite.module.domain.javadependency.CurrentJavaDependenciesVersions; +import tech.jhipster.lite.module.domain.javadependency.JavaDependenciesCurrentVersionsRepository; +import tech.jhipster.lite.module.domain.javadependency.JavaDependencyVersion; @Repository class FileSystemCurrentJavaDependenciesVersionsRepository implements JavaDependenciesCurrentVersionsRepository { diff --git a/src/main/java/tech/jhipster/lite/generator/module/infrastructure/secondary/FileSystemJHipsterModuleFiles.java b/src/main/java/tech/jhipster/lite/module/infrastructure/secondary/FileSystemJHipsterModuleFiles.java similarity index 88% rename from src/main/java/tech/jhipster/lite/generator/module/infrastructure/secondary/FileSystemJHipsterModuleFiles.java rename to src/main/java/tech/jhipster/lite/module/infrastructure/secondary/FileSystemJHipsterModuleFiles.java index f16ca24ba4f..52ea7fe6ada 100644 --- a/src/main/java/tech/jhipster/lite/generator/module/infrastructure/secondary/FileSystemJHipsterModuleFiles.java +++ b/src/main/java/tech/jhipster/lite/module/infrastructure/secondary/FileSystemJHipsterModuleFiles.java @@ -1,4 +1,4 @@ -package tech.jhipster.lite.generator.module.infrastructure.secondary; +package tech.jhipster.lite.module.infrastructure.secondary; import static java.nio.file.attribute.PosixFilePermission.*; @@ -15,9 +15,9 @@ import tech.jhipster.lite.common.domain.Generated; import tech.jhipster.lite.common.domain.ProjectFilesReader; import tech.jhipster.lite.error.domain.GeneratorException; -import tech.jhipster.lite.generator.module.domain.TemplatedFile; -import tech.jhipster.lite.generator.module.domain.TemplatedFiles; -import tech.jhipster.lite.generator.module.domain.properties.JHipsterProjectFolder; +import tech.jhipster.lite.module.domain.TemplatedFile; +import tech.jhipster.lite.module.domain.TemplatedFiles; +import tech.jhipster.lite.module.domain.properties.JHipsterProjectFolder; @Repository class FileSystemJHipsterModuleFiles { diff --git a/src/main/java/tech/jhipster/lite/generator/module/infrastructure/secondary/FileSystemJHipsterModulesRepository.java b/src/main/java/tech/jhipster/lite/module/infrastructure/secondary/FileSystemJHipsterModulesRepository.java similarity index 84% rename from src/main/java/tech/jhipster/lite/generator/module/infrastructure/secondary/FileSystemJHipsterModulesRepository.java rename to src/main/java/tech/jhipster/lite/module/infrastructure/secondary/FileSystemJHipsterModulesRepository.java index 4dd500de99d..171f4b52bca 100644 --- a/src/main/java/tech/jhipster/lite/generator/module/infrastructure/secondary/FileSystemJHipsterModulesRepository.java +++ b/src/main/java/tech/jhipster/lite/module/infrastructure/secondary/FileSystemJHipsterModulesRepository.java @@ -1,12 +1,12 @@ -package tech.jhipster.lite.generator.module.infrastructure.secondary; +package tech.jhipster.lite.module.infrastructure.secondary; import org.springframework.stereotype.Repository; import tech.jhipster.lite.common.domain.ProjectFilesReader; import tech.jhipster.lite.error.domain.Assert; -import tech.jhipster.lite.generator.module.domain.JHipsterModuleChanges; -import tech.jhipster.lite.generator.module.domain.JHipsterModulesRepository; -import tech.jhipster.lite.generator.module.domain.postaction.JHipsterModuleExecutionContext; import tech.jhipster.lite.generator.npm.domain.NpmVersions; +import tech.jhipster.lite.module.domain.JHipsterModuleChanges; +import tech.jhipster.lite.module.domain.JHipsterModulesRepository; +import tech.jhipster.lite.module.domain.postaction.JHipsterModuleExecutionContext; @Repository class FileSystemJHipsterModulesRepository implements JHipsterModulesRepository { diff --git a/src/main/java/tech/jhipster/lite/generator/module/infrastructure/secondary/FileSystemJavaDependenciesCommandsHandler.java b/src/main/java/tech/jhipster/lite/module/infrastructure/secondary/FileSystemJavaDependenciesCommandsHandler.java similarity index 64% rename from src/main/java/tech/jhipster/lite/generator/module/infrastructure/secondary/FileSystemJavaDependenciesCommandsHandler.java rename to src/main/java/tech/jhipster/lite/module/infrastructure/secondary/FileSystemJavaDependenciesCommandsHandler.java index 93f1b1ca3b1..d7c52ed1bef 100644 --- a/src/main/java/tech/jhipster/lite/generator/module/infrastructure/secondary/FileSystemJavaDependenciesCommandsHandler.java +++ b/src/main/java/tech/jhipster/lite/module/infrastructure/secondary/FileSystemJavaDependenciesCommandsHandler.java @@ -1,17 +1,17 @@ -package tech.jhipster.lite.generator.module.infrastructure.secondary; +package tech.jhipster.lite.module.infrastructure.secondary; import java.nio.file.Files; import java.nio.file.Path; import org.springframework.stereotype.Service; import tech.jhipster.lite.common.domain.Generated; import tech.jhipster.lite.error.domain.Assert; -import tech.jhipster.lite.generator.module.domain.Indentation; -import tech.jhipster.lite.generator.module.domain.javadependency.command.AddJavaDependency; -import tech.jhipster.lite.generator.module.domain.javadependency.command.JavaDependenciesCommands; -import tech.jhipster.lite.generator.module.domain.javadependency.command.JavaDependencyCommand; -import tech.jhipster.lite.generator.module.domain.javadependency.command.RemoveJavaDependency; -import tech.jhipster.lite.generator.module.domain.javadependency.command.SetJavaDependencyVersion; -import tech.jhipster.lite.generator.module.domain.properties.JHipsterProjectFolder; +import tech.jhipster.lite.module.domain.Indentation; +import tech.jhipster.lite.module.domain.javadependency.command.AddJavaDependency; +import tech.jhipster.lite.module.domain.javadependency.command.JavaDependenciesCommands; +import tech.jhipster.lite.module.domain.javadependency.command.JavaDependencyCommand; +import tech.jhipster.lite.module.domain.javadependency.command.RemoveJavaDependency; +import tech.jhipster.lite.module.domain.javadependency.command.SetJavaDependencyVersion; +import tech.jhipster.lite.module.domain.properties.JHipsterProjectFolder; @Service class FileSystemJavaDependenciesCommandsHandler { diff --git a/src/main/java/tech/jhipster/lite/generator/module/infrastructure/secondary/FileSystemPackageJsonHandler.java b/src/main/java/tech/jhipster/lite/module/infrastructure/secondary/FileSystemPackageJsonHandler.java similarity index 94% rename from src/main/java/tech/jhipster/lite/generator/module/infrastructure/secondary/FileSystemPackageJsonHandler.java rename to src/main/java/tech/jhipster/lite/module/infrastructure/secondary/FileSystemPackageJsonHandler.java index 4645d49f02c..2263df09d8e 100644 --- a/src/main/java/tech/jhipster/lite/generator/module/infrastructure/secondary/FileSystemPackageJsonHandler.java +++ b/src/main/java/tech/jhipster/lite/module/infrastructure/secondary/FileSystemPackageJsonHandler.java @@ -1,4 +1,4 @@ -package tech.jhipster.lite.generator.module.infrastructure.secondary; +package tech.jhipster.lite.module.infrastructure.secondary; import java.io.IOException; import java.nio.charset.StandardCharsets; @@ -15,14 +15,14 @@ import tech.jhipster.lite.common.domain.Generated; import tech.jhipster.lite.error.domain.Assert; import tech.jhipster.lite.error.domain.GeneratorException; -import tech.jhipster.lite.generator.module.domain.Indentation; -import tech.jhipster.lite.generator.module.domain.packagejson.JHipsterModulePackageJson; -import tech.jhipster.lite.generator.module.domain.packagejson.PackageJsonDependencies; -import tech.jhipster.lite.generator.module.domain.packagejson.PackageJsonDependency; -import tech.jhipster.lite.generator.module.domain.packagejson.Scripts; -import tech.jhipster.lite.generator.module.domain.properties.JHipsterProjectFolder; import tech.jhipster.lite.generator.npm.domain.NpmVersionSource; import tech.jhipster.lite.generator.npm.domain.NpmVersions; +import tech.jhipster.lite.module.domain.Indentation; +import tech.jhipster.lite.module.domain.packagejson.JHipsterModulePackageJson; +import tech.jhipster.lite.module.domain.packagejson.PackageJsonDependencies; +import tech.jhipster.lite.module.domain.packagejson.PackageJsonDependency; +import tech.jhipster.lite.module.domain.packagejson.Scripts; +import tech.jhipster.lite.module.domain.properties.JHipsterProjectFolder; class FileSystemPackageJsonHandler { diff --git a/src/main/java/tech/jhipster/lite/generator/module/infrastructure/secondary/FileSystemProjectJavaDependenciesRepository.java b/src/main/java/tech/jhipster/lite/module/infrastructure/secondary/FileSystemProjectJavaDependenciesRepository.java similarity index 76% rename from src/main/java/tech/jhipster/lite/generator/module/infrastructure/secondary/FileSystemProjectJavaDependenciesRepository.java rename to src/main/java/tech/jhipster/lite/module/infrastructure/secondary/FileSystemProjectJavaDependenciesRepository.java index d0b748f6c8b..c403eb98763 100644 --- a/src/main/java/tech/jhipster/lite/generator/module/infrastructure/secondary/FileSystemProjectJavaDependenciesRepository.java +++ b/src/main/java/tech/jhipster/lite/module/infrastructure/secondary/FileSystemProjectJavaDependenciesRepository.java @@ -1,4 +1,4 @@ -package tech.jhipster.lite.generator.module.infrastructure.secondary; +package tech.jhipster.lite.module.infrastructure.secondary; import java.io.IOException; import java.io.InputStream; @@ -15,15 +15,15 @@ import org.springframework.stereotype.Repository; import tech.jhipster.lite.common.domain.Enums; import tech.jhipster.lite.error.domain.GeneratorException; -import tech.jhipster.lite.generator.module.domain.javadependency.JavaDependencies; -import tech.jhipster.lite.generator.module.domain.javadependency.JavaDependenciesVersions; -import tech.jhipster.lite.generator.module.domain.javadependency.JavaDependency; -import tech.jhipster.lite.generator.module.domain.javadependency.JavaDependencyScope; -import tech.jhipster.lite.generator.module.domain.javadependency.JavaDependencyVersion; -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.javadependency.VersionSlug; -import tech.jhipster.lite.generator.module.domain.properties.JHipsterProjectFolder; +import tech.jhipster.lite.module.domain.javadependency.JavaDependencies; +import tech.jhipster.lite.module.domain.javadependency.JavaDependenciesVersions; +import tech.jhipster.lite.module.domain.javadependency.JavaDependency; +import tech.jhipster.lite.module.domain.javadependency.JavaDependencyScope; +import tech.jhipster.lite.module.domain.javadependency.JavaDependencyVersion; +import tech.jhipster.lite.module.domain.javadependency.ProjectJavaDependencies; +import tech.jhipster.lite.module.domain.javadependency.ProjectJavaDependenciesRepository; +import tech.jhipster.lite.module.domain.javadependency.VersionSlug; +import tech.jhipster.lite.module.domain.properties.JHipsterProjectFolder; @Repository class FileSystemProjectJavaDependenciesRepository implements ProjectJavaDependenciesRepository { diff --git a/src/main/java/tech/jhipster/lite/generator/module/infrastructure/secondary/FileSystemSpringPropertiesCommandsHandler.java b/src/main/java/tech/jhipster/lite/module/infrastructure/secondary/FileSystemSpringPropertiesCommandsHandler.java similarity index 85% rename from src/main/java/tech/jhipster/lite/generator/module/infrastructure/secondary/FileSystemSpringPropertiesCommandsHandler.java rename to src/main/java/tech/jhipster/lite/module/infrastructure/secondary/FileSystemSpringPropertiesCommandsHandler.java index 26fc6a65a38..4adbbfe0499 100644 --- a/src/main/java/tech/jhipster/lite/generator/module/infrastructure/secondary/FileSystemSpringPropertiesCommandsHandler.java +++ b/src/main/java/tech/jhipster/lite/module/infrastructure/secondary/FileSystemSpringPropertiesCommandsHandler.java @@ -1,4 +1,4 @@ -package tech.jhipster.lite.generator.module.infrastructure.secondary; +package tech.jhipster.lite.module.infrastructure.secondary; import java.nio.file.Files; import java.nio.file.Path; @@ -10,10 +10,10 @@ import org.springframework.stereotype.Service; import tech.jhipster.lite.common.domain.Generated; import tech.jhipster.lite.error.domain.Assert; -import tech.jhipster.lite.generator.module.domain.javaproperties.SpringProperties; -import tech.jhipster.lite.generator.module.domain.javaproperties.SpringProperty; -import tech.jhipster.lite.generator.module.domain.javaproperties.SpringPropertyType; -import tech.jhipster.lite.generator.module.domain.properties.JHipsterProjectFolder; +import tech.jhipster.lite.module.domain.javaproperties.SpringProperties; +import tech.jhipster.lite.module.domain.javaproperties.SpringProperty; +import tech.jhipster.lite.module.domain.javaproperties.SpringPropertyType; +import tech.jhipster.lite.module.domain.properties.JHipsterProjectFolder; @Service class FileSystemSpringPropertiesCommandsHandler { diff --git a/src/main/java/tech/jhipster/lite/generator/module/infrastructure/secondary/InvalidPomException.java b/src/main/java/tech/jhipster/lite/module/infrastructure/secondary/InvalidPomException.java similarity index 78% rename from src/main/java/tech/jhipster/lite/generator/module/infrastructure/secondary/InvalidPomException.java rename to src/main/java/tech/jhipster/lite/module/infrastructure/secondary/InvalidPomException.java index f288770121d..ac44e66fc1e 100644 --- a/src/main/java/tech/jhipster/lite/generator/module/infrastructure/secondary/InvalidPomException.java +++ b/src/main/java/tech/jhipster/lite/module/infrastructure/secondary/InvalidPomException.java @@ -1,4 +1,4 @@ -package tech.jhipster.lite.generator.module.infrastructure.secondary; +package tech.jhipster.lite.module.infrastructure.secondary; import tech.jhipster.lite.error.domain.GeneratorException; diff --git a/src/main/java/tech/jhipster/lite/generator/module/infrastructure/secondary/MavenCommandHandler.java b/src/main/java/tech/jhipster/lite/module/infrastructure/secondary/MavenCommandHandler.java similarity index 93% rename from src/main/java/tech/jhipster/lite/generator/module/infrastructure/secondary/MavenCommandHandler.java rename to src/main/java/tech/jhipster/lite/module/infrastructure/secondary/MavenCommandHandler.java index c13b0212741..bb2fb1676b5 100644 --- a/src/main/java/tech/jhipster/lite/generator/module/infrastructure/secondary/MavenCommandHandler.java +++ b/src/main/java/tech/jhipster/lite/module/infrastructure/secondary/MavenCommandHandler.java @@ -1,4 +1,4 @@ -package tech.jhipster.lite.generator.module.infrastructure.secondary; +package tech.jhipster.lite.module.infrastructure.secondary; import static org.joox.JOOX.*; @@ -20,12 +20,12 @@ import tech.jhipster.lite.common.domain.Generated; import tech.jhipster.lite.error.domain.Assert; import tech.jhipster.lite.error.domain.GeneratorException; -import tech.jhipster.lite.generator.module.domain.Indentation; -import tech.jhipster.lite.generator.module.domain.javadependency.DependencyId; -import tech.jhipster.lite.generator.module.domain.javadependency.JavaDependencyScope; -import tech.jhipster.lite.generator.module.domain.javadependency.command.AddJavaDependency; -import tech.jhipster.lite.generator.module.domain.javadependency.command.RemoveJavaDependency; -import tech.jhipster.lite.generator.module.domain.javadependency.command.SetJavaDependencyVersion; +import tech.jhipster.lite.module.domain.Indentation; +import tech.jhipster.lite.module.domain.javadependency.DependencyId; +import tech.jhipster.lite.module.domain.javadependency.JavaDependencyScope; +import tech.jhipster.lite.module.domain.javadependency.command.AddJavaDependency; +import tech.jhipster.lite.module.domain.javadependency.command.RemoveJavaDependency; +import tech.jhipster.lite.module.domain.javadependency.command.SetJavaDependencyVersion; class MavenCommandHandler { diff --git a/src/main/java/tech/jhipster/lite/generator/module/infrastructure/secondary/MavenScope.java b/src/main/java/tech/jhipster/lite/module/infrastructure/secondary/MavenScope.java similarity index 90% rename from src/main/java/tech/jhipster/lite/generator/module/infrastructure/secondary/MavenScope.java rename to src/main/java/tech/jhipster/lite/module/infrastructure/secondary/MavenScope.java index 063f7008af8..a82c3ae0fff 100644 --- a/src/main/java/tech/jhipster/lite/generator/module/infrastructure/secondary/MavenScope.java +++ b/src/main/java/tech/jhipster/lite/module/infrastructure/secondary/MavenScope.java @@ -1,4 +1,4 @@ -package tech.jhipster.lite.generator.module.infrastructure.secondary; +package tech.jhipster.lite.module.infrastructure.secondary; import java.util.Map; import java.util.function.Function; diff --git a/src/main/java/tech/jhipster/lite/generator/module/infrastructure/secondary/MissingPackageJsonException.java b/src/main/java/tech/jhipster/lite/module/infrastructure/secondary/MissingPackageJsonException.java similarity index 64% rename from src/main/java/tech/jhipster/lite/generator/module/infrastructure/secondary/MissingPackageJsonException.java rename to src/main/java/tech/jhipster/lite/module/infrastructure/secondary/MissingPackageJsonException.java index e917fd804c3..e14046caec6 100644 --- a/src/main/java/tech/jhipster/lite/generator/module/infrastructure/secondary/MissingPackageJsonException.java +++ b/src/main/java/tech/jhipster/lite/module/infrastructure/secondary/MissingPackageJsonException.java @@ -1,7 +1,7 @@ -package tech.jhipster.lite.generator.module.infrastructure.secondary; +package tech.jhipster.lite.module.infrastructure.secondary; import tech.jhipster.lite.error.domain.GeneratorException; -import tech.jhipster.lite.generator.module.domain.properties.JHipsterProjectFolder; +import tech.jhipster.lite.module.domain.properties.JHipsterProjectFolder; class MissingPackageJsonException extends GeneratorException { diff --git a/src/main/java/tech/jhipster/lite/generator/module/infrastructure/secondary/MissingPomException.java b/src/main/java/tech/jhipster/lite/module/infrastructure/secondary/MissingPomException.java similarity index 60% rename from src/main/java/tech/jhipster/lite/generator/module/infrastructure/secondary/MissingPomException.java rename to src/main/java/tech/jhipster/lite/module/infrastructure/secondary/MissingPomException.java index da0eeb9f60a..916568ff159 100644 --- a/src/main/java/tech/jhipster/lite/generator/module/infrastructure/secondary/MissingPomException.java +++ b/src/main/java/tech/jhipster/lite/module/infrastructure/secondary/MissingPomException.java @@ -1,7 +1,7 @@ -package tech.jhipster.lite.generator.module.infrastructure.secondary; +package tech.jhipster.lite.module.infrastructure.secondary; import tech.jhipster.lite.error.domain.GeneratorException; -import tech.jhipster.lite.generator.module.domain.properties.JHipsterProjectFolder; +import tech.jhipster.lite.module.domain.properties.JHipsterProjectFolder; class MissingPomException extends GeneratorException { diff --git a/src/main/java/tech/jhipster/lite/generator/module/infrastructure/secondary/PropertiesFileSpringPropertiesHandler.java b/src/main/java/tech/jhipster/lite/module/infrastructure/secondary/PropertiesFileSpringPropertiesHandler.java similarity index 90% rename from src/main/java/tech/jhipster/lite/generator/module/infrastructure/secondary/PropertiesFileSpringPropertiesHandler.java rename to src/main/java/tech/jhipster/lite/module/infrastructure/secondary/PropertiesFileSpringPropertiesHandler.java index dd21850573f..85ef79ca314 100644 --- a/src/main/java/tech/jhipster/lite/generator/module/infrastructure/secondary/PropertiesFileSpringPropertiesHandler.java +++ b/src/main/java/tech/jhipster/lite/module/infrastructure/secondary/PropertiesFileSpringPropertiesHandler.java @@ -1,4 +1,4 @@ -package tech.jhipster.lite.generator.module.infrastructure.secondary; +package tech.jhipster.lite.module.infrastructure.secondary; import java.io.IOException; import java.nio.charset.StandardCharsets; @@ -8,8 +8,8 @@ import tech.jhipster.lite.common.domain.Generated; import tech.jhipster.lite.error.domain.Assert; import tech.jhipster.lite.error.domain.GeneratorException; -import tech.jhipster.lite.generator.module.domain.javaproperties.PropertyKey; -import tech.jhipster.lite.generator.module.domain.javaproperties.PropertyValue; +import tech.jhipster.lite.module.domain.javaproperties.PropertyKey; +import tech.jhipster.lite.module.domain.javaproperties.PropertyValue; class PropertiesFileSpringPropertiesHandler { diff --git a/src/main/java/tech/jhipster/lite/generator/module/infrastructure/secondary/SpringJHipsterModuleAppliedEvents.java b/src/main/java/tech/jhipster/lite/module/infrastructure/secondary/SpringJHipsterModuleAppliedEvents.java similarity index 69% rename from src/main/java/tech/jhipster/lite/generator/module/infrastructure/secondary/SpringJHipsterModuleAppliedEvents.java rename to src/main/java/tech/jhipster/lite/module/infrastructure/secondary/SpringJHipsterModuleAppliedEvents.java index f6902047d22..34817d1555f 100644 --- a/src/main/java/tech/jhipster/lite/generator/module/infrastructure/secondary/SpringJHipsterModuleAppliedEvents.java +++ b/src/main/java/tech/jhipster/lite/module/infrastructure/secondary/SpringJHipsterModuleAppliedEvents.java @@ -1,9 +1,9 @@ -package tech.jhipster.lite.generator.module.infrastructure.secondary; +package tech.jhipster.lite.module.infrastructure.secondary; import org.springframework.context.ApplicationEventPublisher; import org.springframework.stereotype.Component; -import tech.jhipster.lite.generator.module.domain.JHipsterModuleApplied; -import tech.jhipster.lite.generator.module.domain.JHipsterModuleEvents; +import tech.jhipster.lite.module.domain.JHipsterModuleApplied; +import tech.jhipster.lite.module.domain.JHipsterModuleEvents; @Component class SpringJHipsterModuleAppliedEvents implements JHipsterModuleEvents { diff --git a/src/main/java/tech/jhipster/lite/module/package-info.java b/src/main/java/tech/jhipster/lite/module/package-info.java new file mode 100644 index 00000000000..cca4f8ff309 --- /dev/null +++ b/src/main/java/tech/jhipster/lite/module/package-info.java @@ -0,0 +1,2 @@ +@tech.jhipster.lite.SharedKernel +package tech.jhipster.lite.module; diff --git a/src/test/java/tech/jhipster/lite/generator/client/angular/admin/health/infrastructure/primary/rest/AngularHealthResourceIT.java b/src/test/java/tech/jhipster/lite/generator/client/angular/admin/health/infrastructure/primary/rest/AngularHealthResourceIT.java index 054d87fec03..4d136fcdc03 100644 --- a/src/test/java/tech/jhipster/lite/generator/client/angular/admin/health/infrastructure/primary/rest/AngularHealthResourceIT.java +++ b/src/test/java/tech/jhipster/lite/generator/client/angular/admin/health/infrastructure/primary/rest/AngularHealthResourceIT.java @@ -13,9 +13,9 @@ import tech.jhipster.lite.IntegrationTest; import tech.jhipster.lite.TestUtils; import tech.jhipster.lite.generator.client.angular.admin.health.application.AngularHealthAssert; -import tech.jhipster.lite.generator.module.infrastructure.secondary.TestJHipsterModules; import tech.jhipster.lite.generator.project.domain.Project; import tech.jhipster.lite.generator.project.infrastructure.primary.dto.ProjectDTO; +import tech.jhipster.lite.module.infrastructure.secondary.TestJHipsterModules; @IntegrationTest @AutoConfigureMockMvc diff --git a/src/test/java/tech/jhipster/lite/generator/client/angular/common/application/AngularCommonApplicationServiceIT.java b/src/test/java/tech/jhipster/lite/generator/client/angular/common/application/AngularCommonApplicationServiceIT.java index 4a0390e9fa1..2b062dedfb2 100644 --- a/src/test/java/tech/jhipster/lite/generator/client/angular/common/application/AngularCommonApplicationServiceIT.java +++ b/src/test/java/tech/jhipster/lite/generator/client/angular/common/application/AngularCommonApplicationServiceIT.java @@ -14,8 +14,8 @@ import org.springframework.beans.factory.annotation.Autowired; import tech.jhipster.lite.IntegrationTest; import tech.jhipster.lite.generator.client.angular.core.application.AngularApplicationService; -import tech.jhipster.lite.generator.module.infrastructure.secondary.TestJHipsterModules; import tech.jhipster.lite.generator.project.domain.Project; +import tech.jhipster.lite.module.infrastructure.secondary.TestJHipsterModules; @IntegrationTest class AngularCommonApplicationServiceIT { diff --git a/src/test/java/tech/jhipster/lite/generator/client/angular/core/infrastructure/primary/rest/AngularResourceIT.java b/src/test/java/tech/jhipster/lite/generator/client/angular/core/infrastructure/primary/rest/AngularResourceIT.java index f715f1371d7..92ef42ec9ac 100644 --- a/src/test/java/tech/jhipster/lite/generator/client/angular/core/infrastructure/primary/rest/AngularResourceIT.java +++ b/src/test/java/tech/jhipster/lite/generator/client/angular/core/infrastructure/primary/rest/AngularResourceIT.java @@ -13,9 +13,9 @@ import tech.jhipster.lite.IntegrationTest; import tech.jhipster.lite.TestUtils; import tech.jhipster.lite.generator.client.angular.core.application.AngularAssert; -import tech.jhipster.lite.generator.module.infrastructure.secondary.TestJHipsterModules; import tech.jhipster.lite.generator.project.domain.Project; import tech.jhipster.lite.generator.project.infrastructure.primary.dto.ProjectDTO; +import tech.jhipster.lite.module.infrastructure.secondary.TestJHipsterModules; @IntegrationTest @AutoConfigureMockMvc diff --git a/src/test/java/tech/jhipster/lite/generator/client/angular/security/jwt/infrastructure/primary/rest/AngularJwtResourceIT.java b/src/test/java/tech/jhipster/lite/generator/client/angular/security/jwt/infrastructure/primary/rest/AngularJwtResourceIT.java index ce3a6e9fc6a..f6dc7dd8e35 100644 --- a/src/test/java/tech/jhipster/lite/generator/client/angular/security/jwt/infrastructure/primary/rest/AngularJwtResourceIT.java +++ b/src/test/java/tech/jhipster/lite/generator/client/angular/security/jwt/infrastructure/primary/rest/AngularJwtResourceIT.java @@ -13,9 +13,9 @@ import tech.jhipster.lite.IntegrationTest; import tech.jhipster.lite.TestUtils; import tech.jhipster.lite.generator.client.angular.security.jwt.application.AngularJwtAssert; -import tech.jhipster.lite.generator.module.infrastructure.secondary.TestJHipsterModules; import tech.jhipster.lite.generator.project.domain.Project; import tech.jhipster.lite.generator.project.infrastructure.primary.dto.ProjectDTO; +import tech.jhipster.lite.module.infrastructure.secondary.TestJHipsterModules; @IntegrationTest @AutoConfigureMockMvc diff --git a/src/test/java/tech/jhipster/lite/generator/client/angular/security/oauth2/infrastructure/primary/AngularOauth2ResourceIT.java b/src/test/java/tech/jhipster/lite/generator/client/angular/security/oauth2/infrastructure/primary/AngularOauth2ResourceIT.java index 72b4d27792b..7865ad48926 100644 --- a/src/test/java/tech/jhipster/lite/generator/client/angular/security/oauth2/infrastructure/primary/AngularOauth2ResourceIT.java +++ b/src/test/java/tech/jhipster/lite/generator/client/angular/security/oauth2/infrastructure/primary/AngularOauth2ResourceIT.java @@ -13,9 +13,9 @@ import tech.jhipster.lite.IntegrationTest; import tech.jhipster.lite.TestUtils; import tech.jhipster.lite.generator.client.angular.security.oauth2.application.AngularOauth2Assert; -import tech.jhipster.lite.generator.module.infrastructure.secondary.TestJHipsterModules; import tech.jhipster.lite.generator.project.domain.Project; import tech.jhipster.lite.generator.project.infrastructure.primary.dto.ProjectDTO; +import tech.jhipster.lite.module.infrastructure.secondary.TestJHipsterModules; @IntegrationTest @AutoConfigureMockMvc diff --git a/src/test/java/tech/jhipster/lite/generator/client/common/application/ClientCommonApplicationServiceIT.java b/src/test/java/tech/jhipster/lite/generator/client/common/application/ClientCommonApplicationServiceIT.java index 0818c34f29e..f7bcd7b05dd 100644 --- a/src/test/java/tech/jhipster/lite/generator/client/common/application/ClientCommonApplicationServiceIT.java +++ b/src/test/java/tech/jhipster/lite/generator/client/common/application/ClientCommonApplicationServiceIT.java @@ -12,8 +12,8 @@ import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import tech.jhipster.lite.IntegrationTest; -import tech.jhipster.lite.generator.module.infrastructure.secondary.TestJHipsterModules; import tech.jhipster.lite.generator.project.domain.Project; +import tech.jhipster.lite.module.infrastructure.secondary.TestJHipsterModules; @IntegrationTest class ClientCommonApplicationServiceIT { diff --git a/src/test/java/tech/jhipster/lite/generator/client/react/core/infrastructure/primary/rest/ReactResourceIT.java b/src/test/java/tech/jhipster/lite/generator/client/react/core/infrastructure/primary/rest/ReactResourceIT.java index 7f5d7034f14..7386e93ce75 100644 --- a/src/test/java/tech/jhipster/lite/generator/client/react/core/infrastructure/primary/rest/ReactResourceIT.java +++ b/src/test/java/tech/jhipster/lite/generator/client/react/core/infrastructure/primary/rest/ReactResourceIT.java @@ -14,9 +14,9 @@ import tech.jhipster.lite.IntegrationTest; import tech.jhipster.lite.TestUtils; import tech.jhipster.lite.generator.client.react.core.application.ReactAssert; -import tech.jhipster.lite.generator.module.infrastructure.secondary.TestJHipsterModules; import tech.jhipster.lite.generator.project.domain.Project; import tech.jhipster.lite.generator.project.infrastructure.primary.dto.ProjectDTO; +import tech.jhipster.lite.module.infrastructure.secondary.TestJHipsterModules; @IntegrationTest @AutoConfigureMockMvc diff --git a/src/test/java/tech/jhipster/lite/generator/client/svelte/core/infrastructure/primary/rest/SvelteResourceIT.java b/src/test/java/tech/jhipster/lite/generator/client/svelte/core/infrastructure/primary/rest/SvelteResourceIT.java index 03a100394c7..f93127a2ddf 100644 --- a/src/test/java/tech/jhipster/lite/generator/client/svelte/core/infrastructure/primary/rest/SvelteResourceIT.java +++ b/src/test/java/tech/jhipster/lite/generator/client/svelte/core/infrastructure/primary/rest/SvelteResourceIT.java @@ -13,9 +13,9 @@ import org.springframework.test.web.servlet.MockMvc; import tech.jhipster.lite.IntegrationTest; import tech.jhipster.lite.TestUtils; -import tech.jhipster.lite.generator.module.infrastructure.secondary.TestJHipsterModules; import tech.jhipster.lite.generator.project.domain.Project; import tech.jhipster.lite.generator.project.infrastructure.primary.dto.ProjectDTO; +import tech.jhipster.lite.module.infrastructure.secondary.TestJHipsterModules; @IntegrationTest @AutoConfigureMockMvc diff --git a/src/test/java/tech/jhipster/lite/generator/client/tools/cypress/infrastructure/primary/CypressResourceIT.java b/src/test/java/tech/jhipster/lite/generator/client/tools/cypress/infrastructure/primary/CypressResourceIT.java index a2ff6b88725..e2ef20282e0 100644 --- a/src/test/java/tech/jhipster/lite/generator/client/tools/cypress/infrastructure/primary/CypressResourceIT.java +++ b/src/test/java/tech/jhipster/lite/generator/client/tools/cypress/infrastructure/primary/CypressResourceIT.java @@ -14,10 +14,10 @@ import tech.jhipster.lite.TestUtils; import tech.jhipster.lite.generator.client.tools.cypress.application.CypressAssert; import tech.jhipster.lite.generator.client.vue.core.application.VueApplicationService; -import tech.jhipster.lite.generator.module.domain.properties.JHipsterModuleProperties; -import tech.jhipster.lite.generator.module.infrastructure.secondary.TestJHipsterModules; import tech.jhipster.lite.generator.project.domain.Project; import tech.jhipster.lite.generator.project.infrastructure.primary.dto.ProjectDTO; +import tech.jhipster.lite.module.domain.properties.JHipsterModuleProperties; +import tech.jhipster.lite.module.infrastructure.secondary.TestJHipsterModules; @IntegrationTest @AutoConfigureMockMvc diff --git a/src/test/java/tech/jhipster/lite/generator/client/tools/playwright/infrastructure/primary/PlaywrightResourceIT.java b/src/test/java/tech/jhipster/lite/generator/client/tools/playwright/infrastructure/primary/PlaywrightResourceIT.java index 464298ff1fe..f3b3851b6ce 100644 --- a/src/test/java/tech/jhipster/lite/generator/client/tools/playwright/infrastructure/primary/PlaywrightResourceIT.java +++ b/src/test/java/tech/jhipster/lite/generator/client/tools/playwright/infrastructure/primary/PlaywrightResourceIT.java @@ -14,10 +14,10 @@ import tech.jhipster.lite.TestUtils; import tech.jhipster.lite.generator.client.tools.playwright.application.PlaywrightAssert; import tech.jhipster.lite.generator.client.vue.core.application.VueApplicationService; -import tech.jhipster.lite.generator.module.domain.properties.JHipsterModuleProperties; -import tech.jhipster.lite.generator.module.infrastructure.secondary.TestJHipsterModules; import tech.jhipster.lite.generator.project.domain.Project; import tech.jhipster.lite.generator.project.infrastructure.primary.dto.ProjectDTO; +import tech.jhipster.lite.module.domain.properties.JHipsterModuleProperties; +import tech.jhipster.lite.module.infrastructure.secondary.TestJHipsterModules; @IntegrationTest @AutoConfigureMockMvc diff --git a/src/test/java/tech/jhipster/lite/generator/client/vue/core/domain/VueModulesFactoryTest.java b/src/test/java/tech/jhipster/lite/generator/client/vue/core/domain/VueModulesFactoryTest.java index fbc67ff210d..6dd8542fff2 100644 --- a/src/test/java/tech/jhipster/lite/generator/client/vue/core/domain/VueModulesFactoryTest.java +++ b/src/test/java/tech/jhipster/lite/generator/client/vue/core/domain/VueModulesFactoryTest.java @@ -1,13 +1,13 @@ package tech.jhipster.lite.generator.client.vue.core.domain; -import static tech.jhipster.lite.generator.module.infrastructure.secondary.JHipsterModulesAssertions.*; +import static tech.jhipster.lite.module.infrastructure.secondary.JHipsterModulesAssertions.*; import org.junit.jupiter.api.Test; import tech.jhipster.lite.UnitTest; import tech.jhipster.lite.common.domain.FileUtils; -import tech.jhipster.lite.generator.module.domain.JHipsterModule; -import tech.jhipster.lite.generator.module.domain.JHipsterModulesFixture; -import tech.jhipster.lite.generator.module.domain.properties.JHipsterModuleProperties; +import tech.jhipster.lite.module.domain.JHipsterModule; +import tech.jhipster.lite.module.domain.JHipsterModulesFixture; +import tech.jhipster.lite.module.domain.properties.JHipsterModuleProperties; @UnitTest class VueModulesFactoryTest { diff --git a/src/test/java/tech/jhipster/lite/generator/history/infrastructure/primary/HistoryResourceTest.java b/src/test/java/tech/jhipster/lite/generator/history/infrastructure/primary/HistoryResourceTest.java index 40ee4351eca..b90b1e7d7d1 100644 --- a/src/test/java/tech/jhipster/lite/generator/history/infrastructure/primary/HistoryResourceTest.java +++ b/src/test/java/tech/jhipster/lite/generator/history/infrastructure/primary/HistoryResourceTest.java @@ -17,7 +17,7 @@ import tech.jhipster.lite.generator.history.application.GeneratorHistoryApplicationService; import tech.jhipster.lite.generator.history.domain.GeneratorHistoryValue; import tech.jhipster.lite.generator.history.infrastructure.primary.dto.HistoryDTO; -import tech.jhipster.lite.generator.module.domain.properties.JHipsterProjectFolder; +import tech.jhipster.lite.module.domain.properties.JHipsterProjectFolder; @UnitTest @ExtendWith(SpringExtension.class) diff --git a/src/test/java/tech/jhipster/lite/generator/init/domain/InitModuleFactoryTest.java b/src/test/java/tech/jhipster/lite/generator/init/domain/InitModuleFactoryTest.java index d4bea7ad360..fb4a802f743 100644 --- a/src/test/java/tech/jhipster/lite/generator/init/domain/InitModuleFactoryTest.java +++ b/src/test/java/tech/jhipster/lite/generator/init/domain/InitModuleFactoryTest.java @@ -1,7 +1,7 @@ package tech.jhipster.lite.generator.init.domain; import static org.mockito.Mockito.*; -import static tech.jhipster.lite.generator.module.infrastructure.secondary.JHipsterModulesAssertions.*; +import static tech.jhipster.lite.module.infrastructure.secondary.JHipsterModulesAssertions.*; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -10,11 +10,11 @@ import org.mockito.junit.jupiter.MockitoExtension; import tech.jhipster.lite.UnitTest; import tech.jhipster.lite.common.domain.FileUtils; -import tech.jhipster.lite.generator.module.domain.JHipsterModule; -import tech.jhipster.lite.generator.module.domain.JHipsterModulesFixture; -import tech.jhipster.lite.generator.module.domain.properties.JHipsterModuleProperties; -import tech.jhipster.lite.generator.module.domain.properties.JHipsterProjectFolder; -import tech.jhipster.lite.generator.module.infrastructure.secondary.JHipsterModulesAssertions.ModuleAsserter; +import tech.jhipster.lite.module.domain.JHipsterModule; +import tech.jhipster.lite.module.domain.JHipsterModulesFixture; +import tech.jhipster.lite.module.domain.properties.JHipsterModuleProperties; +import tech.jhipster.lite.module.domain.properties.JHipsterProjectFolder; +import tech.jhipster.lite.module.infrastructure.secondary.JHipsterModulesAssertions.ModuleAsserter; @UnitTest @ExtendWith(MockitoExtension.class) diff --git a/src/test/java/tech/jhipster/lite/generator/init/infrastructure/secondary/FileSystemGitRepositoryTest.java b/src/test/java/tech/jhipster/lite/generator/init/infrastructure/secondary/FileSystemGitRepositoryTest.java index 9ccceceab5c..8d0b6611f41 100644 --- a/src/test/java/tech/jhipster/lite/generator/init/infrastructure/secondary/FileSystemGitRepositoryTest.java +++ b/src/test/java/tech/jhipster/lite/generator/init/infrastructure/secondary/FileSystemGitRepositoryTest.java @@ -13,7 +13,7 @@ import org.junit.jupiter.api.condition.OS; import tech.jhipster.lite.UnitTest; import tech.jhipster.lite.common.domain.FileUtils; -import tech.jhipster.lite.generator.module.domain.properties.JHipsterProjectFolder; +import tech.jhipster.lite.module.domain.properties.JHipsterProjectFolder; @UnitTest class FileSystemGitRepositoryTest { diff --git a/src/test/java/tech/jhipster/lite/generator/packagemanager/npm/infrastructure/primary/rest/NpmResourceIT.java b/src/test/java/tech/jhipster/lite/generator/packagemanager/npm/infrastructure/primary/rest/NpmResourceIT.java index f35d37394a1..c2258490e24 100644 --- a/src/test/java/tech/jhipster/lite/generator/packagemanager/npm/infrastructure/primary/rest/NpmResourceIT.java +++ b/src/test/java/tech/jhipster/lite/generator/packagemanager/npm/infrastructure/primary/rest/NpmResourceIT.java @@ -14,10 +14,10 @@ import org.springframework.test.web.servlet.MockMvc; import tech.jhipster.lite.IntegrationTest; import tech.jhipster.lite.common.domain.FileUtils; -import tech.jhipster.lite.generator.module.infrastructure.secondary.TestJHipsterModules; import tech.jhipster.lite.generator.packagemanager.npm.domain.NpmRepository; import tech.jhipster.lite.generator.project.domain.Project; import tech.jhipster.lite.generator.project.infrastructure.primary.dto.ProjectDTO; +import tech.jhipster.lite.module.infrastructure.secondary.TestJHipsterModules; @IntegrationTest @AutoConfigureMockMvc diff --git a/src/test/java/tech/jhipster/lite/generator/project/infrastructure/primary/dto/ProjectDTOTest.java b/src/test/java/tech/jhipster/lite/generator/project/infrastructure/primary/dto/ProjectDTOTest.java index e680e9398df..a752d9d81db 100644 --- a/src/test/java/tech/jhipster/lite/generator/project/infrastructure/primary/dto/ProjectDTOTest.java +++ b/src/test/java/tech/jhipster/lite/generator/project/infrastructure/primary/dto/ProjectDTOTest.java @@ -7,13 +7,13 @@ import org.junit.jupiter.api.Test; import tech.jhipster.lite.UnitTest; import tech.jhipster.lite.error.domain.MissingMandatoryValueException; -import tech.jhipster.lite.generator.module.domain.Indentation; -import tech.jhipster.lite.generator.module.domain.properties.JHipsterBasePackage; -import tech.jhipster.lite.generator.module.domain.properties.JHipsterModuleProperties; -import tech.jhipster.lite.generator.module.domain.properties.JHipsterProjectBaseName; -import tech.jhipster.lite.generator.module.domain.properties.JHipsterProjectFolder; import tech.jhipster.lite.generator.project.domain.DefaultConfig; import tech.jhipster.lite.generator.project.domain.Project; +import tech.jhipster.lite.module.domain.Indentation; +import tech.jhipster.lite.module.domain.properties.JHipsterBasePackage; +import tech.jhipster.lite.module.domain.properties.JHipsterModuleProperties; +import tech.jhipster.lite.module.domain.properties.JHipsterProjectBaseName; +import tech.jhipster.lite.module.domain.properties.JHipsterProjectFolder; @UnitTest class ProjectDTOTest { diff --git a/src/test/java/tech/jhipster/lite/generator/project/infrastructure/primary/rest/ProjectResourceIT.java b/src/test/java/tech/jhipster/lite/generator/project/infrastructure/primary/rest/ProjectResourceIT.java index 6ba5878fdbe..49c207cdd17 100644 --- a/src/test/java/tech/jhipster/lite/generator/project/infrastructure/primary/rest/ProjectResourceIT.java +++ b/src/test/java/tech/jhipster/lite/generator/project/infrastructure/primary/rest/ProjectResourceIT.java @@ -15,10 +15,10 @@ import tech.jhipster.lite.IntegrationTest; import tech.jhipster.lite.common.domain.FileUtils; import tech.jhipster.lite.generator.buildtool.maven.application.MavenApplicationService; -import tech.jhipster.lite.generator.module.infrastructure.secondary.TestJHipsterModules; import tech.jhipster.lite.generator.project.domain.Project; import tech.jhipster.lite.generator.project.infrastructure.primary.dto.ProjectDTO; import tech.jhipster.lite.generator.server.springboot.core.application.SpringBootApplicationService; +import tech.jhipster.lite.module.infrastructure.secondary.TestJHipsterModules; @IntegrationTest @AutoConfigureMockMvc diff --git a/src/test/java/tech/jhipster/lite/generator/readme/application/ReadMeApplicationServiceIT.java b/src/test/java/tech/jhipster/lite/generator/readme/application/ReadMeApplicationServiceIT.java index 041e5f41fa3..d5b8f1e910b 100644 --- a/src/test/java/tech/jhipster/lite/generator/readme/application/ReadMeApplicationServiceIT.java +++ b/src/test/java/tech/jhipster/lite/generator/readme/application/ReadMeApplicationServiceIT.java @@ -6,8 +6,8 @@ import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import tech.jhipster.lite.IntegrationTest; -import tech.jhipster.lite.generator.module.infrastructure.secondary.TestJHipsterModules; import tech.jhipster.lite.generator.project.domain.Project; +import tech.jhipster.lite.module.infrastructure.secondary.TestJHipsterModules; @IntegrationTest class ReadMeApplicationServiceIT { diff --git a/src/test/java/tech/jhipster/lite/generator/server/hexagonaldocumentation/domain/HexagonalDocumentationModuleFactoryTest.java b/src/test/java/tech/jhipster/lite/generator/server/hexagonaldocumentation/domain/HexagonalDocumentationModuleFactoryTest.java index bef2f183139..2b9e752c965 100644 --- a/src/test/java/tech/jhipster/lite/generator/server/hexagonaldocumentation/domain/HexagonalDocumentationModuleFactoryTest.java +++ b/src/test/java/tech/jhipster/lite/generator/server/hexagonaldocumentation/domain/HexagonalDocumentationModuleFactoryTest.java @@ -1,13 +1,13 @@ package tech.jhipster.lite.generator.server.hexagonaldocumentation.domain; -import static tech.jhipster.lite.generator.module.infrastructure.secondary.JHipsterModulesAssertions.*; +import static tech.jhipster.lite.module.infrastructure.secondary.JHipsterModulesAssertions.*; import org.junit.jupiter.api.Test; import tech.jhipster.lite.UnitTest; import tech.jhipster.lite.common.domain.FileUtils; -import tech.jhipster.lite.generator.module.domain.JHipsterModule; -import tech.jhipster.lite.generator.module.domain.JHipsterModulesFixture; -import tech.jhipster.lite.generator.module.domain.properties.JHipsterModuleProperties; +import tech.jhipster.lite.module.domain.JHipsterModule; +import tech.jhipster.lite.module.domain.JHipsterModulesFixture; +import tech.jhipster.lite.module.domain.properties.JHipsterModuleProperties; @UnitTest class HexagonalDocumentationModuleFactoryTest { diff --git a/src/test/java/tech/jhipster/lite/generator/server/javatool/base/domain/JavaBaseModuleFactoryTest.java b/src/test/java/tech/jhipster/lite/generator/server/javatool/base/domain/JavaBaseModuleFactoryTest.java index 52a5c77ba53..a25ef5d7e81 100644 --- a/src/test/java/tech/jhipster/lite/generator/server/javatool/base/domain/JavaBaseModuleFactoryTest.java +++ b/src/test/java/tech/jhipster/lite/generator/server/javatool/base/domain/JavaBaseModuleFactoryTest.java @@ -1,13 +1,13 @@ package tech.jhipster.lite.generator.server.javatool.base.domain; -import static tech.jhipster.lite.generator.module.infrastructure.secondary.JHipsterModulesAssertions.*; +import static tech.jhipster.lite.module.infrastructure.secondary.JHipsterModulesAssertions.*; import org.junit.jupiter.api.Test; import tech.jhipster.lite.UnitTest; import tech.jhipster.lite.common.domain.FileUtils; -import tech.jhipster.lite.generator.module.domain.JHipsterModule; -import tech.jhipster.lite.generator.module.domain.JHipsterModulesFixture; -import tech.jhipster.lite.generator.module.domain.properties.JHipsterModuleProperties; +import tech.jhipster.lite.module.domain.JHipsterModule; +import tech.jhipster.lite.module.domain.JHipsterModulesFixture; +import tech.jhipster.lite.module.domain.properties.JHipsterModuleProperties; @UnitTest class JavaBaseModuleFactoryTest { diff --git a/src/test/java/tech/jhipster/lite/generator/server/javatool/frontendmaven/infrastructure/primary/rest/FrontendMavenResourceIT.java b/src/test/java/tech/jhipster/lite/generator/server/javatool/frontendmaven/infrastructure/primary/rest/FrontendMavenResourceIT.java index 4b418db57d5..bf35478e1a3 100644 --- a/src/test/java/tech/jhipster/lite/generator/server/javatool/frontendmaven/infrastructure/primary/rest/FrontendMavenResourceIT.java +++ b/src/test/java/tech/jhipster/lite/generator/server/javatool/frontendmaven/infrastructure/primary/rest/FrontendMavenResourceIT.java @@ -13,9 +13,9 @@ import tech.jhipster.lite.IntegrationTest; import tech.jhipster.lite.TestUtils; import tech.jhipster.lite.generator.buildtool.maven.application.MavenApplicationService; -import tech.jhipster.lite.generator.module.infrastructure.secondary.TestJHipsterModules; import tech.jhipster.lite.generator.project.domain.Project; import tech.jhipster.lite.generator.project.infrastructure.primary.dto.ProjectDTO; +import tech.jhipster.lite.module.infrastructure.secondary.TestJHipsterModules; @IntegrationTest @AutoConfigureMockMvc diff --git a/src/test/java/tech/jhipster/lite/generator/server/javatool/jacoco/infrastructure/primary/rest/JacocoResourceIT.java b/src/test/java/tech/jhipster/lite/generator/server/javatool/jacoco/infrastructure/primary/rest/JacocoResourceIT.java index 8a058f12384..e9e6a10cbb7 100644 --- a/src/test/java/tech/jhipster/lite/generator/server/javatool/jacoco/infrastructure/primary/rest/JacocoResourceIT.java +++ b/src/test/java/tech/jhipster/lite/generator/server/javatool/jacoco/infrastructure/primary/rest/JacocoResourceIT.java @@ -15,9 +15,9 @@ import tech.jhipster.lite.IntegrationTest; import tech.jhipster.lite.TestUtils; import tech.jhipster.lite.generator.buildtool.maven.application.MavenApplicationService; -import tech.jhipster.lite.generator.module.infrastructure.secondary.TestJHipsterModules; import tech.jhipster.lite.generator.project.domain.Project; import tech.jhipster.lite.generator.project.infrastructure.primary.dto.ProjectDTO; +import tech.jhipster.lite.module.infrastructure.secondary.TestJHipsterModules; @IntegrationTest @AutoConfigureMockMvc diff --git a/src/test/java/tech/jhipster/lite/generator/server/sonar/application/SonarApplicationServiceIT.java b/src/test/java/tech/jhipster/lite/generator/server/sonar/application/SonarApplicationServiceIT.java index 0a386eea56b..9f99f62cb43 100644 --- a/src/test/java/tech/jhipster/lite/generator/server/sonar/application/SonarApplicationServiceIT.java +++ b/src/test/java/tech/jhipster/lite/generator/server/sonar/application/SonarApplicationServiceIT.java @@ -6,8 +6,8 @@ import org.springframework.beans.factory.annotation.Autowired; import tech.jhipster.lite.IntegrationTest; import tech.jhipster.lite.generator.buildtool.maven.application.MavenApplicationService; -import tech.jhipster.lite.generator.module.infrastructure.secondary.TestJHipsterModules; import tech.jhipster.lite.generator.project.domain.Project; +import tech.jhipster.lite.module.infrastructure.secondary.TestJHipsterModules; @IntegrationTest class SonarApplicationServiceIT { diff --git a/src/test/java/tech/jhipster/lite/generator/server/sonar/infrastructure/primary/rest/SonarResourceIT.java b/src/test/java/tech/jhipster/lite/generator/server/sonar/infrastructure/primary/rest/SonarResourceIT.java index f1505944034..72c4713dcf9 100644 --- a/src/test/java/tech/jhipster/lite/generator/server/sonar/infrastructure/primary/rest/SonarResourceIT.java +++ b/src/test/java/tech/jhipster/lite/generator/server/sonar/infrastructure/primary/rest/SonarResourceIT.java @@ -12,10 +12,10 @@ import tech.jhipster.lite.TestUtils; import tech.jhipster.lite.common.domain.FileUtils; import tech.jhipster.lite.generator.buildtool.maven.application.MavenApplicationService; -import tech.jhipster.lite.generator.module.infrastructure.secondary.TestJHipsterModules; import tech.jhipster.lite.generator.project.domain.Project; import tech.jhipster.lite.generator.project.infrastructure.primary.dto.ProjectDTO; import tech.jhipster.lite.generator.server.sonar.application.SonarAssert; +import tech.jhipster.lite.module.infrastructure.secondary.TestJHipsterModules; @IntegrationTest @AutoConfigureMockMvc diff --git a/src/test/java/tech/jhipster/lite/generator/server/springboot/apidocumentation/springdoc/application/SpringdocApplicationServiceIT.java b/src/test/java/tech/jhipster/lite/generator/server/springboot/apidocumentation/springdoc/application/SpringdocApplicationServiceIT.java index 09ebff3b008..a22c5773036 100644 --- a/src/test/java/tech/jhipster/lite/generator/server/springboot/apidocumentation/springdoc/application/SpringdocApplicationServiceIT.java +++ b/src/test/java/tech/jhipster/lite/generator/server/springboot/apidocumentation/springdoc/application/SpringdocApplicationServiceIT.java @@ -13,9 +13,9 @@ import org.springframework.beans.factory.annotation.Autowired; import tech.jhipster.lite.IntegrationTest; import tech.jhipster.lite.generator.buildtool.maven.application.MavenApplicationService; -import tech.jhipster.lite.generator.module.infrastructure.secondary.TestJHipsterModules; import tech.jhipster.lite.generator.project.domain.Project; import tech.jhipster.lite.generator.server.springboot.core.application.SpringBootApplicationService; +import tech.jhipster.lite.module.infrastructure.secondary.TestJHipsterModules; @IntegrationTest class SpringdocApplicationServiceIT { diff --git a/src/test/java/tech/jhipster/lite/generator/server/springboot/apidocumentation/springdoc/domain/SpringdocDomainServiceTest.java b/src/test/java/tech/jhipster/lite/generator/server/springboot/apidocumentation/springdoc/domain/SpringdocDomainServiceTest.java index 5b21a0f63d4..ff1fa33522c 100644 --- a/src/test/java/tech/jhipster/lite/generator/server/springboot/apidocumentation/springdoc/domain/SpringdocDomainServiceTest.java +++ b/src/test/java/tech/jhipster/lite/generator/server/springboot/apidocumentation/springdoc/domain/SpringdocDomainServiceTest.java @@ -39,15 +39,15 @@ 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.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; import tech.jhipster.lite.generator.server.springboot.common.domain.SpringBootCommonService; +import tech.jhipster.lite.module.domain.javadependency.JavaDependencies; +import tech.jhipster.lite.module.domain.javadependency.JavaDependency; +import tech.jhipster.lite.module.domain.javadependency.ProjectJavaDependencies; +import tech.jhipster.lite.module.domain.javadependency.ProjectJavaDependenciesRepository; +import tech.jhipster.lite.module.domain.properties.JHipsterProjectFolder; @UnitTest @ExtendWith(MockitoExtension.class) diff --git a/src/test/java/tech/jhipster/lite/generator/server/springboot/apidocumentation/springdoc/infrastructure/primary/rest/SpringdocResourceIT.java b/src/test/java/tech/jhipster/lite/generator/server/springboot/apidocumentation/springdoc/infrastructure/primary/rest/SpringdocResourceIT.java index 1c04c3aae79..361587b8752 100644 --- a/src/test/java/tech/jhipster/lite/generator/server/springboot/apidocumentation/springdoc/infrastructure/primary/rest/SpringdocResourceIT.java +++ b/src/test/java/tech/jhipster/lite/generator/server/springboot/apidocumentation/springdoc/infrastructure/primary/rest/SpringdocResourceIT.java @@ -15,10 +15,10 @@ import tech.jhipster.lite.TestUtils; import tech.jhipster.lite.common.domain.FileUtils; import tech.jhipster.lite.generator.buildtool.maven.application.MavenApplicationService; -import tech.jhipster.lite.generator.module.infrastructure.secondary.TestJHipsterModules; import tech.jhipster.lite.generator.project.domain.Project; import tech.jhipster.lite.generator.project.infrastructure.primary.dto.ProjectDTO; import tech.jhipster.lite.generator.server.springboot.core.application.SpringBootApplicationService; +import tech.jhipster.lite.module.infrastructure.secondary.TestJHipsterModules; @IntegrationTest @AutoConfigureMockMvc diff --git a/src/test/java/tech/jhipster/lite/generator/server/springboot/async/domain/SpringBootAsyncModuleFactoryTest.java b/src/test/java/tech/jhipster/lite/generator/server/springboot/async/domain/SpringBootAsyncModuleFactoryTest.java index 5cc9a4dc1f3..eca23beab0b 100644 --- a/src/test/java/tech/jhipster/lite/generator/server/springboot/async/domain/SpringBootAsyncModuleFactoryTest.java +++ b/src/test/java/tech/jhipster/lite/generator/server/springboot/async/domain/SpringBootAsyncModuleFactoryTest.java @@ -1,13 +1,13 @@ package tech.jhipster.lite.generator.server.springboot.async.domain; -import static tech.jhipster.lite.generator.module.infrastructure.secondary.JHipsterModulesAssertions.*; +import static tech.jhipster.lite.module.infrastructure.secondary.JHipsterModulesAssertions.*; import org.junit.jupiter.api.Test; import tech.jhipster.lite.UnitTest; import tech.jhipster.lite.common.domain.FileUtils; -import tech.jhipster.lite.generator.module.domain.JHipsterModule; -import tech.jhipster.lite.generator.module.domain.JHipsterModulesFixture; -import tech.jhipster.lite.generator.module.domain.properties.JHipsterModuleProperties; +import tech.jhipster.lite.module.domain.JHipsterModule; +import tech.jhipster.lite.module.domain.JHipsterModulesFixture; +import tech.jhipster.lite.module.domain.properties.JHipsterModuleProperties; @UnitTest class SpringBootAsyncModuleFactoryTest { diff --git a/src/test/java/tech/jhipster/lite/generator/server/springboot/banner/domain/BannerModuleFactoryTest.java b/src/test/java/tech/jhipster/lite/generator/server/springboot/banner/domain/BannerModuleFactoryTest.java index 58d89a9851f..ec2087b9699 100644 --- a/src/test/java/tech/jhipster/lite/generator/server/springboot/banner/domain/BannerModuleFactoryTest.java +++ b/src/test/java/tech/jhipster/lite/generator/server/springboot/banner/domain/BannerModuleFactoryTest.java @@ -1,12 +1,12 @@ package tech.jhipster.lite.generator.server.springboot.banner.domain; -import static tech.jhipster.lite.generator.module.domain.JHipsterModulesFixture.*; -import static tech.jhipster.lite.generator.module.infrastructure.secondary.JHipsterModulesAssertions.*; +import static tech.jhipster.lite.module.domain.JHipsterModulesFixture.*; +import static tech.jhipster.lite.module.infrastructure.secondary.JHipsterModulesAssertions.*; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import tech.jhipster.lite.UnitTest; -import tech.jhipster.lite.generator.module.domain.JHipsterModule; +import tech.jhipster.lite.module.domain.JHipsterModule; @UnitTest class BannerModuleFactoryTest { diff --git a/src/test/java/tech/jhipster/lite/generator/server/springboot/broker/kafka/application/KafkaApplicationServiceIT.java b/src/test/java/tech/jhipster/lite/generator/server/springboot/broker/kafka/application/KafkaApplicationServiceIT.java index f5e6788eb04..86215f7dd74 100644 --- a/src/test/java/tech/jhipster/lite/generator/server/springboot/broker/kafka/application/KafkaApplicationServiceIT.java +++ b/src/test/java/tech/jhipster/lite/generator/server/springboot/broker/kafka/application/KafkaApplicationServiceIT.java @@ -12,9 +12,9 @@ import org.springframework.beans.factory.annotation.Autowired; import tech.jhipster.lite.IntegrationTest; import tech.jhipster.lite.generator.buildtool.maven.application.MavenApplicationService; -import tech.jhipster.lite.generator.module.infrastructure.secondary.TestJHipsterModules; import tech.jhipster.lite.generator.project.domain.Project; import tech.jhipster.lite.generator.server.springboot.core.application.SpringBootApplicationService; +import tech.jhipster.lite.module.infrastructure.secondary.TestJHipsterModules; @IntegrationTest class KafkaApplicationServiceIT { diff --git a/src/test/java/tech/jhipster/lite/generator/server/springboot/broker/kafka/infrastructure/primary/rest/KafkaResourceIT.java b/src/test/java/tech/jhipster/lite/generator/server/springboot/broker/kafka/infrastructure/primary/rest/KafkaResourceIT.java index aedea195570..730e8c78858 100644 --- a/src/test/java/tech/jhipster/lite/generator/server/springboot/broker/kafka/infrastructure/primary/rest/KafkaResourceIT.java +++ b/src/test/java/tech/jhipster/lite/generator/server/springboot/broker/kafka/infrastructure/primary/rest/KafkaResourceIT.java @@ -17,11 +17,11 @@ import tech.jhipster.lite.TestUtils; import tech.jhipster.lite.error.domain.GeneratorException; import tech.jhipster.lite.generator.buildtool.maven.application.MavenApplicationService; -import tech.jhipster.lite.generator.module.infrastructure.secondary.TestJHipsterModules; import tech.jhipster.lite.generator.project.domain.Project; import tech.jhipster.lite.generator.project.infrastructure.primary.dto.ProjectDTO; import tech.jhipster.lite.generator.server.springboot.broker.kafka.application.KafkaApplicationService; import tech.jhipster.lite.generator.server.springboot.core.application.SpringBootApplicationService; +import tech.jhipster.lite.module.infrastructure.secondary.TestJHipsterModules; @IntegrationTest @AutoConfigureMockMvc diff --git a/src/test/java/tech/jhipster/lite/generator/server/springboot/broker/pulsar/application/PulsarApplicationServiceIT.java b/src/test/java/tech/jhipster/lite/generator/server/springboot/broker/pulsar/application/PulsarApplicationServiceIT.java index 2fc53d0380e..7aed8042ce5 100644 --- a/src/test/java/tech/jhipster/lite/generator/server/springboot/broker/pulsar/application/PulsarApplicationServiceIT.java +++ b/src/test/java/tech/jhipster/lite/generator/server/springboot/broker/pulsar/application/PulsarApplicationServiceIT.java @@ -11,9 +11,9 @@ import org.springframework.beans.factory.annotation.Autowired; import tech.jhipster.lite.IntegrationTest; import tech.jhipster.lite.generator.buildtool.maven.application.MavenApplicationService; -import tech.jhipster.lite.generator.module.infrastructure.secondary.TestJHipsterModules; import tech.jhipster.lite.generator.project.domain.Project; import tech.jhipster.lite.generator.server.springboot.core.application.SpringBootApplicationService; +import tech.jhipster.lite.module.infrastructure.secondary.TestJHipsterModules; @IntegrationTest class PulsarApplicationServiceIT { diff --git a/src/test/java/tech/jhipster/lite/generator/server/springboot/broker/pulsar/infrastructure/primary/rest/PulsarResourceIT.java b/src/test/java/tech/jhipster/lite/generator/server/springboot/broker/pulsar/infrastructure/primary/rest/PulsarResourceIT.java index cdb4efefb82..b6fe6af31a5 100644 --- a/src/test/java/tech/jhipster/lite/generator/server/springboot/broker/pulsar/infrastructure/primary/rest/PulsarResourceIT.java +++ b/src/test/java/tech/jhipster/lite/generator/server/springboot/broker/pulsar/infrastructure/primary/rest/PulsarResourceIT.java @@ -16,10 +16,10 @@ import tech.jhipster.lite.TestUtils; import tech.jhipster.lite.error.domain.GeneratorException; import tech.jhipster.lite.generator.buildtool.maven.application.MavenApplicationService; -import tech.jhipster.lite.generator.module.infrastructure.secondary.TestJHipsterModules; import tech.jhipster.lite.generator.project.domain.Project; import tech.jhipster.lite.generator.project.infrastructure.primary.dto.ProjectDTO; import tech.jhipster.lite.generator.server.springboot.core.application.SpringBootApplicationService; +import tech.jhipster.lite.module.infrastructure.secondary.TestJHipsterModules; @IntegrationTest @AutoConfigureMockMvc diff --git a/src/test/java/tech/jhipster/lite/generator/server/springboot/cache/common/application/SpringBootCacheApplicationServiceIT.java b/src/test/java/tech/jhipster/lite/generator/server/springboot/cache/common/application/SpringBootCacheApplicationServiceIT.java index fa1079072b2..f063551e013 100644 --- a/src/test/java/tech/jhipster/lite/generator/server/springboot/cache/common/application/SpringBootCacheApplicationServiceIT.java +++ b/src/test/java/tech/jhipster/lite/generator/server/springboot/cache/common/application/SpringBootCacheApplicationServiceIT.java @@ -8,9 +8,9 @@ import org.springframework.beans.factory.annotation.Autowired; import tech.jhipster.lite.IntegrationTest; import tech.jhipster.lite.generator.buildtool.maven.application.MavenApplicationService; -import tech.jhipster.lite.generator.module.infrastructure.secondary.TestJHipsterModules; import tech.jhipster.lite.generator.project.domain.Project; import tech.jhipster.lite.generator.server.springboot.core.application.SpringBootApplicationService; +import tech.jhipster.lite.module.infrastructure.secondary.TestJHipsterModules; @IntegrationTest class SpringBootCacheApplicationServiceIT { diff --git a/src/test/java/tech/jhipster/lite/generator/server/springboot/cache/ehcache/application/EhcacheApplicationServiceIT.java b/src/test/java/tech/jhipster/lite/generator/server/springboot/cache/ehcache/application/EhcacheApplicationServiceIT.java index 42582d6afa0..a5bb158eb27 100644 --- a/src/test/java/tech/jhipster/lite/generator/server/springboot/cache/ehcache/application/EhcacheApplicationServiceIT.java +++ b/src/test/java/tech/jhipster/lite/generator/server/springboot/cache/ehcache/application/EhcacheApplicationServiceIT.java @@ -8,9 +8,9 @@ import org.springframework.beans.factory.annotation.Autowired; import tech.jhipster.lite.IntegrationTest; import tech.jhipster.lite.generator.buildtool.maven.application.MavenApplicationService; -import tech.jhipster.lite.generator.module.infrastructure.secondary.TestJHipsterModules; import tech.jhipster.lite.generator.project.domain.Project; import tech.jhipster.lite.generator.server.springboot.core.application.SpringBootApplicationService; +import tech.jhipster.lite.module.infrastructure.secondary.TestJHipsterModules; @IntegrationTest class EhcacheApplicationServiceIT { diff --git a/src/test/java/tech/jhipster/lite/generator/server/springboot/cache/ehcache/infrastructure/primary/rest/EhcacheResourceIT.java b/src/test/java/tech/jhipster/lite/generator/server/springboot/cache/ehcache/infrastructure/primary/rest/EhcacheResourceIT.java index 3e0c4537bfe..17753c6f31b 100644 --- a/src/test/java/tech/jhipster/lite/generator/server/springboot/cache/ehcache/infrastructure/primary/rest/EhcacheResourceIT.java +++ b/src/test/java/tech/jhipster/lite/generator/server/springboot/cache/ehcache/infrastructure/primary/rest/EhcacheResourceIT.java @@ -14,10 +14,10 @@ import tech.jhipster.lite.common.domain.FileUtils; import tech.jhipster.lite.error.domain.GeneratorException; import tech.jhipster.lite.generator.buildtool.maven.application.MavenApplicationService; -import tech.jhipster.lite.generator.module.infrastructure.secondary.TestJHipsterModules; import tech.jhipster.lite.generator.project.domain.Project; import tech.jhipster.lite.generator.project.infrastructure.primary.dto.ProjectDTO; import tech.jhipster.lite.generator.server.springboot.core.application.SpringBootApplicationService; +import tech.jhipster.lite.module.infrastructure.secondary.TestJHipsterModules; @IntegrationTest @AutoConfigureMockMvc diff --git a/src/test/java/tech/jhipster/lite/generator/server/springboot/cache/simple/application/SpringBootCacheSimpleApplicationServiceIT.java b/src/test/java/tech/jhipster/lite/generator/server/springboot/cache/simple/application/SpringBootCacheSimpleApplicationServiceIT.java index 10d892ea885..b6a4f3f654c 100644 --- a/src/test/java/tech/jhipster/lite/generator/server/springboot/cache/simple/application/SpringBootCacheSimpleApplicationServiceIT.java +++ b/src/test/java/tech/jhipster/lite/generator/server/springboot/cache/simple/application/SpringBootCacheSimpleApplicationServiceIT.java @@ -8,9 +8,9 @@ import org.springframework.beans.factory.annotation.Autowired; import tech.jhipster.lite.IntegrationTest; import tech.jhipster.lite.generator.buildtool.maven.application.MavenApplicationService; -import tech.jhipster.lite.generator.module.infrastructure.secondary.TestJHipsterModules; import tech.jhipster.lite.generator.project.domain.Project; import tech.jhipster.lite.generator.server.springboot.core.application.SpringBootApplicationService; +import tech.jhipster.lite.module.infrastructure.secondary.TestJHipsterModules; @IntegrationTest class SpringBootCacheSimpleApplicationServiceIT { diff --git a/src/test/java/tech/jhipster/lite/generator/server/springboot/cache/simple/infrastructure/primary/rest/SpringBootCacheSimpleResourceIT.java b/src/test/java/tech/jhipster/lite/generator/server/springboot/cache/simple/infrastructure/primary/rest/SpringBootCacheSimpleResourceIT.java index 006f495112e..482cbb06c53 100644 --- a/src/test/java/tech/jhipster/lite/generator/server/springboot/cache/simple/infrastructure/primary/rest/SpringBootCacheSimpleResourceIT.java +++ b/src/test/java/tech/jhipster/lite/generator/server/springboot/cache/simple/infrastructure/primary/rest/SpringBootCacheSimpleResourceIT.java @@ -14,10 +14,10 @@ import tech.jhipster.lite.common.domain.FileUtils; import tech.jhipster.lite.error.domain.GeneratorException; import tech.jhipster.lite.generator.buildtool.maven.application.MavenApplicationService; -import tech.jhipster.lite.generator.module.infrastructure.secondary.TestJHipsterModules; import tech.jhipster.lite.generator.project.domain.Project; import tech.jhipster.lite.generator.project.infrastructure.primary.dto.ProjectDTO; import tech.jhipster.lite.generator.server.springboot.core.application.SpringBootApplicationService; +import tech.jhipster.lite.module.infrastructure.secondary.TestJHipsterModules; @IntegrationTest @AutoConfigureMockMvc diff --git a/src/test/java/tech/jhipster/lite/generator/server/springboot/common/application/SpringBootCommonApplicationServiceIT.java b/src/test/java/tech/jhipster/lite/generator/server/springboot/common/application/SpringBootCommonApplicationServiceIT.java index 13dccc49f81..09a1ba40470 100644 --- a/src/test/java/tech/jhipster/lite/generator/server/springboot/common/application/SpringBootCommonApplicationServiceIT.java +++ b/src/test/java/tech/jhipster/lite/generator/server/springboot/common/application/SpringBootCommonApplicationServiceIT.java @@ -14,11 +14,11 @@ import tech.jhipster.lite.IntegrationTest; import tech.jhipster.lite.error.domain.GeneratorException; import tech.jhipster.lite.generator.buildtool.maven.application.MavenApplicationService; -import tech.jhipster.lite.generator.module.infrastructure.secondary.TestJHipsterModules; import tech.jhipster.lite.generator.project.domain.DefaultConfig; import tech.jhipster.lite.generator.project.domain.Project; import tech.jhipster.lite.generator.server.springboot.common.domain.Level; import tech.jhipster.lite.generator.server.springboot.core.application.SpringBootApplicationService; +import tech.jhipster.lite.module.infrastructure.secondary.TestJHipsterModules; @IntegrationTest class SpringBootCommonApplicationServiceIT { diff --git a/src/test/java/tech/jhipster/lite/generator/server/springboot/core/application/SpringBootApplicationServiceIT.java b/src/test/java/tech/jhipster/lite/generator/server/springboot/core/application/SpringBootApplicationServiceIT.java index f2bc17fa9b1..ed387889e6a 100644 --- a/src/test/java/tech/jhipster/lite/generator/server/springboot/core/application/SpringBootApplicationServiceIT.java +++ b/src/test/java/tech/jhipster/lite/generator/server/springboot/core/application/SpringBootApplicationServiceIT.java @@ -11,8 +11,8 @@ import tech.jhipster.lite.IntegrationTest; import tech.jhipster.lite.error.domain.GeneratorException; import tech.jhipster.lite.generator.buildtool.maven.application.MavenApplicationService; -import tech.jhipster.lite.generator.module.infrastructure.secondary.TestJHipsterModules; import tech.jhipster.lite.generator.project.domain.Project; +import tech.jhipster.lite.module.infrastructure.secondary.TestJHipsterModules; @IntegrationTest class SpringBootApplicationServiceIT { diff --git a/src/test/java/tech/jhipster/lite/generator/server/springboot/core/infrastructure/primary/rest/SpringBootResourceIT.java b/src/test/java/tech/jhipster/lite/generator/server/springboot/core/infrastructure/primary/rest/SpringBootResourceIT.java index aba155ed6b0..e4bc1a3fd15 100644 --- a/src/test/java/tech/jhipster/lite/generator/server/springboot/core/infrastructure/primary/rest/SpringBootResourceIT.java +++ b/src/test/java/tech/jhipster/lite/generator/server/springboot/core/infrastructure/primary/rest/SpringBootResourceIT.java @@ -15,9 +15,9 @@ import tech.jhipster.lite.IntegrationTest; import tech.jhipster.lite.TestUtils; import tech.jhipster.lite.generator.buildtool.maven.application.MavenApplicationService; -import tech.jhipster.lite.generator.module.infrastructure.secondary.TestJHipsterModules; import tech.jhipster.lite.generator.project.domain.Project; import tech.jhipster.lite.generator.project.infrastructure.primary.dto.ProjectDTO; +import tech.jhipster.lite.module.infrastructure.secondary.TestJHipsterModules; @IntegrationTest @AutoConfigureMockMvc diff --git a/src/test/java/tech/jhipster/lite/generator/server/springboot/cucumber/domain/CucumberModuleFactoryTest.java b/src/test/java/tech/jhipster/lite/generator/server/springboot/cucumber/domain/CucumberModuleFactoryTest.java index 49ec5649d94..fca712329bf 100644 --- a/src/test/java/tech/jhipster/lite/generator/server/springboot/cucumber/domain/CucumberModuleFactoryTest.java +++ b/src/test/java/tech/jhipster/lite/generator/server/springboot/cucumber/domain/CucumberModuleFactoryTest.java @@ -1,13 +1,13 @@ package tech.jhipster.lite.generator.server.springboot.cucumber.domain; -import static tech.jhipster.lite.generator.module.infrastructure.secondary.JHipsterModulesAssertions.*; +import static tech.jhipster.lite.module.infrastructure.secondary.JHipsterModulesAssertions.*; import org.junit.jupiter.api.Test; import tech.jhipster.lite.UnitTest; import tech.jhipster.lite.common.domain.FileUtils; -import tech.jhipster.lite.generator.module.domain.JHipsterModule; -import tech.jhipster.lite.generator.module.domain.JHipsterModulesFixture; -import tech.jhipster.lite.generator.module.domain.properties.JHipsterModuleProperties; +import tech.jhipster.lite.module.domain.JHipsterModule; +import tech.jhipster.lite.module.domain.JHipsterModulesFixture; +import tech.jhipster.lite.module.domain.properties.JHipsterModuleProperties; @UnitTest class CucumberModuleFactoryTest { diff --git a/src/test/java/tech/jhipster/lite/generator/server/springboot/database/mariadb/domain/MariaDBModuleFactoryTest.java b/src/test/java/tech/jhipster/lite/generator/server/springboot/database/mariadb/domain/MariaDBModuleFactoryTest.java index aa1182d5dfa..b68fbbc5f7f 100644 --- a/src/test/java/tech/jhipster/lite/generator/server/springboot/database/mariadb/domain/MariaDBModuleFactoryTest.java +++ b/src/test/java/tech/jhipster/lite/generator/server/springboot/database/mariadb/domain/MariaDBModuleFactoryTest.java @@ -1,7 +1,7 @@ package tech.jhipster.lite.generator.server.springboot.database.mariadb.domain; import static org.mockito.Mockito.when; -import static tech.jhipster.lite.generator.module.infrastructure.secondary.JHipsterModulesAssertions.assertThatModuleOnProjectWithDefaultPom; +import static tech.jhipster.lite.module.infrastructure.secondary.JHipsterModulesAssertions.*; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -12,9 +12,9 @@ import tech.jhipster.lite.common.domain.FileUtils; import tech.jhipster.lite.generator.docker.domain.DockerImage; import tech.jhipster.lite.generator.docker.domain.DockerImages; -import tech.jhipster.lite.generator.module.domain.JHipsterModule; -import tech.jhipster.lite.generator.module.domain.JHipsterModulesFixture; -import tech.jhipster.lite.generator.module.domain.properties.JHipsterModuleProperties; +import tech.jhipster.lite.module.domain.JHipsterModule; +import tech.jhipster.lite.module.domain.JHipsterModulesFixture; +import tech.jhipster.lite.module.domain.properties.JHipsterModuleProperties; @UnitTest @ExtendWith(MockitoExtension.class) diff --git a/src/test/java/tech/jhipster/lite/generator/server/springboot/database/mongodb/application/MongodbApplicationServiceIT.java b/src/test/java/tech/jhipster/lite/generator/server/springboot/database/mongodb/application/MongodbApplicationServiceIT.java index 8e95166247f..f73139d31b4 100644 --- a/src/test/java/tech/jhipster/lite/generator/server/springboot/database/mongodb/application/MongodbApplicationServiceIT.java +++ b/src/test/java/tech/jhipster/lite/generator/server/springboot/database/mongodb/application/MongodbApplicationServiceIT.java @@ -8,9 +8,9 @@ import org.springframework.beans.factory.annotation.Autowired; import tech.jhipster.lite.IntegrationTest; import tech.jhipster.lite.generator.buildtool.maven.application.MavenApplicationService; -import tech.jhipster.lite.generator.module.infrastructure.secondary.TestJHipsterModules; import tech.jhipster.lite.generator.project.domain.Project; import tech.jhipster.lite.generator.server.springboot.core.application.SpringBootApplicationService; +import tech.jhipster.lite.module.infrastructure.secondary.TestJHipsterModules; @IntegrationTest class MongodbApplicationServiceIT { diff --git a/src/test/java/tech/jhipster/lite/generator/server/springboot/database/mongodb/infrastructure/primary/rest/MongodbResourceIT.java b/src/test/java/tech/jhipster/lite/generator/server/springboot/database/mongodb/infrastructure/primary/rest/MongodbResourceIT.java index 6b1cff11cfe..ab95e8a947a 100644 --- a/src/test/java/tech/jhipster/lite/generator/server/springboot/database/mongodb/infrastructure/primary/rest/MongodbResourceIT.java +++ b/src/test/java/tech/jhipster/lite/generator/server/springboot/database/mongodb/infrastructure/primary/rest/MongodbResourceIT.java @@ -14,10 +14,10 @@ import tech.jhipster.lite.common.domain.FileUtils; import tech.jhipster.lite.error.domain.GeneratorException; import tech.jhipster.lite.generator.buildtool.maven.application.MavenApplicationService; -import tech.jhipster.lite.generator.module.infrastructure.secondary.TestJHipsterModules; import tech.jhipster.lite.generator.project.domain.Project; import tech.jhipster.lite.generator.project.infrastructure.primary.dto.ProjectDTO; import tech.jhipster.lite.generator.server.springboot.core.application.SpringBootApplicationService; +import tech.jhipster.lite.module.infrastructure.secondary.TestJHipsterModules; @IntegrationTest @AutoConfigureMockMvc diff --git a/src/test/java/tech/jhipster/lite/generator/server/springboot/database/mssql/application/MssqlApplicationServiceIT.java b/src/test/java/tech/jhipster/lite/generator/server/springboot/database/mssql/application/MssqlApplicationServiceIT.java index 0fa93476e83..91cdcca5641 100644 --- a/src/test/java/tech/jhipster/lite/generator/server/springboot/database/mssql/application/MssqlApplicationServiceIT.java +++ b/src/test/java/tech/jhipster/lite/generator/server/springboot/database/mssql/application/MssqlApplicationServiceIT.java @@ -10,9 +10,9 @@ import org.springframework.beans.factory.annotation.Autowired; import tech.jhipster.lite.IntegrationTest; import tech.jhipster.lite.generator.buildtool.maven.application.MavenApplicationService; -import tech.jhipster.lite.generator.module.infrastructure.secondary.TestJHipsterModules; import tech.jhipster.lite.generator.project.domain.Project; import tech.jhipster.lite.generator.server.springboot.core.application.SpringBootApplicationService; +import tech.jhipster.lite.module.infrastructure.secondary.TestJHipsterModules; @IntegrationTest class MssqlApplicationServiceIT { diff --git a/src/test/java/tech/jhipster/lite/generator/server/springboot/database/mssql/infrastructure/primary/rest/MssqlResourceIT.java b/src/test/java/tech/jhipster/lite/generator/server/springboot/database/mssql/infrastructure/primary/rest/MssqlResourceIT.java index 31391c5410f..c10cdd03476 100644 --- a/src/test/java/tech/jhipster/lite/generator/server/springboot/database/mssql/infrastructure/primary/rest/MssqlResourceIT.java +++ b/src/test/java/tech/jhipster/lite/generator/server/springboot/database/mssql/infrastructure/primary/rest/MssqlResourceIT.java @@ -13,10 +13,10 @@ import tech.jhipster.lite.IntegrationTest; import tech.jhipster.lite.TestUtils; import tech.jhipster.lite.generator.buildtool.maven.application.MavenApplicationService; -import tech.jhipster.lite.generator.module.infrastructure.secondary.TestJHipsterModules; import tech.jhipster.lite.generator.project.domain.Project; import tech.jhipster.lite.generator.project.infrastructure.primary.dto.ProjectDTO; import tech.jhipster.lite.generator.server.springboot.core.application.SpringBootApplicationService; +import tech.jhipster.lite.module.infrastructure.secondary.TestJHipsterModules; @IntegrationTest @AutoConfigureMockMvc diff --git a/src/test/java/tech/jhipster/lite/generator/server/springboot/database/mysql/application/MySQLApplicationServiceIT.java b/src/test/java/tech/jhipster/lite/generator/server/springboot/database/mysql/application/MySQLApplicationServiceIT.java index 3073c51499c..e3129553476 100644 --- a/src/test/java/tech/jhipster/lite/generator/server/springboot/database/mysql/application/MySQLApplicationServiceIT.java +++ b/src/test/java/tech/jhipster/lite/generator/server/springboot/database/mysql/application/MySQLApplicationServiceIT.java @@ -12,9 +12,9 @@ import org.springframework.beans.factory.annotation.Autowired; import tech.jhipster.lite.IntegrationTest; import tech.jhipster.lite.generator.buildtool.maven.application.MavenApplicationService; -import tech.jhipster.lite.generator.module.infrastructure.secondary.TestJHipsterModules; import tech.jhipster.lite.generator.project.domain.Project; import tech.jhipster.lite.generator.server.springboot.core.application.SpringBootApplicationService; +import tech.jhipster.lite.module.infrastructure.secondary.TestJHipsterModules; @IntegrationTest class MySQLApplicationServiceIT { diff --git a/src/test/java/tech/jhipster/lite/generator/server/springboot/database/mysql/infrastructure/primary/rest/MySQLResourceIT.java b/src/test/java/tech/jhipster/lite/generator/server/springboot/database/mysql/infrastructure/primary/rest/MySQLResourceIT.java index d4e8ee6b532..3213d1f3555 100644 --- a/src/test/java/tech/jhipster/lite/generator/server/springboot/database/mysql/infrastructure/primary/rest/MySQLResourceIT.java +++ b/src/test/java/tech/jhipster/lite/generator/server/springboot/database/mysql/infrastructure/primary/rest/MySQLResourceIT.java @@ -14,10 +14,10 @@ import tech.jhipster.lite.common.domain.FileUtils; import tech.jhipster.lite.error.domain.GeneratorException; import tech.jhipster.lite.generator.buildtool.maven.application.MavenApplicationService; -import tech.jhipster.lite.generator.module.infrastructure.secondary.TestJHipsterModules; import tech.jhipster.lite.generator.project.domain.Project; import tech.jhipster.lite.generator.project.infrastructure.primary.dto.ProjectDTO; import tech.jhipster.lite.generator.server.springboot.core.application.SpringBootApplicationService; +import tech.jhipster.lite.module.infrastructure.secondary.TestJHipsterModules; @IntegrationTest @AutoConfigureMockMvc diff --git a/src/test/java/tech/jhipster/lite/generator/server/springboot/database/postgresql/domain/PostgresqlModuleFactoryTest.java b/src/test/java/tech/jhipster/lite/generator/server/springboot/database/postgresql/domain/PostgresqlModuleFactoryTest.java index 7b4d575838d..c48e5b7684f 100644 --- a/src/test/java/tech/jhipster/lite/generator/server/springboot/database/postgresql/domain/PostgresqlModuleFactoryTest.java +++ b/src/test/java/tech/jhipster/lite/generator/server/springboot/database/postgresql/domain/PostgresqlModuleFactoryTest.java @@ -1,7 +1,7 @@ package tech.jhipster.lite.generator.server.springboot.database.postgresql.domain; import static org.mockito.Mockito.when; -import static tech.jhipster.lite.generator.module.infrastructure.secondary.JHipsterModulesAssertions.assertThatModuleOnProjectWithDefaultPom; +import static tech.jhipster.lite.module.infrastructure.secondary.JHipsterModulesAssertions.*; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -12,9 +12,9 @@ import tech.jhipster.lite.common.domain.FileUtils; import tech.jhipster.lite.generator.docker.domain.DockerImage; import tech.jhipster.lite.generator.docker.domain.DockerImages; -import tech.jhipster.lite.generator.module.domain.JHipsterModule; -import tech.jhipster.lite.generator.module.domain.JHipsterModulesFixture; -import tech.jhipster.lite.generator.module.domain.properties.JHipsterModuleProperties; +import tech.jhipster.lite.module.domain.JHipsterModule; +import tech.jhipster.lite.module.domain.JHipsterModulesFixture; +import tech.jhipster.lite.module.domain.properties.JHipsterModuleProperties; @UnitTest @ExtendWith(MockitoExtension.class) diff --git a/src/test/java/tech/jhipster/lite/generator/server/springboot/dbmigration/flyway/application/FlywayApplicationServiceIT.java b/src/test/java/tech/jhipster/lite/generator/server/springboot/dbmigration/flyway/application/FlywayApplicationServiceIT.java index fbd75b3481d..b4d26473e8f 100644 --- a/src/test/java/tech/jhipster/lite/generator/server/springboot/dbmigration/flyway/application/FlywayApplicationServiceIT.java +++ b/src/test/java/tech/jhipster/lite/generator/server/springboot/dbmigration/flyway/application/FlywayApplicationServiceIT.java @@ -11,9 +11,9 @@ import org.springframework.boot.test.mock.mockito.SpyBean; import tech.jhipster.lite.IntegrationTest; import tech.jhipster.lite.generator.buildtool.maven.application.MavenApplicationService; -import tech.jhipster.lite.generator.module.infrastructure.secondary.TestJHipsterModules; import tech.jhipster.lite.generator.project.domain.Project; import tech.jhipster.lite.generator.server.springboot.core.application.SpringBootApplicationService; +import tech.jhipster.lite.module.infrastructure.secondary.TestJHipsterModules; @IntegrationTest class FlywayApplicationServiceIT { diff --git a/src/test/java/tech/jhipster/lite/generator/server/springboot/dbmigration/flyway/infrastructure/primary/rest/FlywayResourceIT.java b/src/test/java/tech/jhipster/lite/generator/server/springboot/dbmigration/flyway/infrastructure/primary/rest/FlywayResourceIT.java index 7fe4431ceb8..4c6b49441a2 100644 --- a/src/test/java/tech/jhipster/lite/generator/server/springboot/dbmigration/flyway/infrastructure/primary/rest/FlywayResourceIT.java +++ b/src/test/java/tech/jhipster/lite/generator/server/springboot/dbmigration/flyway/infrastructure/primary/rest/FlywayResourceIT.java @@ -17,10 +17,10 @@ import tech.jhipster.lite.common.domain.FileUtils; import tech.jhipster.lite.error.domain.GeneratorException; import tech.jhipster.lite.generator.buildtool.maven.application.MavenApplicationService; -import tech.jhipster.lite.generator.module.infrastructure.secondary.TestJHipsterModules; import tech.jhipster.lite.generator.project.domain.Project; import tech.jhipster.lite.generator.project.infrastructure.primary.dto.ProjectDTO; import tech.jhipster.lite.generator.server.springboot.core.application.SpringBootApplicationService; +import tech.jhipster.lite.module.infrastructure.secondary.TestJHipsterModules; @IntegrationTest @AutoConfigureMockMvc diff --git a/src/test/java/tech/jhipster/lite/generator/server/springboot/dbmigration/liquibase/application/LiquibaseApplicationServiceIT.java b/src/test/java/tech/jhipster/lite/generator/server/springboot/dbmigration/liquibase/application/LiquibaseApplicationServiceIT.java index 4d70e424a9c..0cf8d60c5d8 100644 --- a/src/test/java/tech/jhipster/lite/generator/server/springboot/dbmigration/liquibase/application/LiquibaseApplicationServiceIT.java +++ b/src/test/java/tech/jhipster/lite/generator/server/springboot/dbmigration/liquibase/application/LiquibaseApplicationServiceIT.java @@ -20,9 +20,6 @@ import tech.jhipster.lite.IntegrationTest; import tech.jhipster.lite.error.domain.GeneratorException; import tech.jhipster.lite.generator.buildtool.generic.domain.BuildToolService; -import tech.jhipster.lite.generator.module.domain.JHipsterModulesFixture; -import tech.jhipster.lite.generator.module.domain.properties.JHipsterModuleProperties; -import tech.jhipster.lite.generator.module.infrastructure.secondary.TestJHipsterModules; import tech.jhipster.lite.generator.project.domain.BuildToolType; import tech.jhipster.lite.generator.project.domain.DatabaseType; import tech.jhipster.lite.generator.project.domain.Project; @@ -30,6 +27,9 @@ import tech.jhipster.lite.generator.server.springboot.database.mariadb.application.MariaDBApplicationService; import tech.jhipster.lite.generator.server.springboot.database.mysql.domain.MySQLService; import tech.jhipster.lite.generator.server.springboot.database.postgresql.application.PostgresqlApplicationService; +import tech.jhipster.lite.module.domain.JHipsterModulesFixture; +import tech.jhipster.lite.module.domain.properties.JHipsterModuleProperties; +import tech.jhipster.lite.module.infrastructure.secondary.TestJHipsterModules; @IntegrationTest class LiquibaseApplicationServiceIT { diff --git a/src/test/java/tech/jhipster/lite/generator/server/springboot/dbmigration/liquibase/infrastructure/primary/rest/LiquibaseResourceIT.java b/src/test/java/tech/jhipster/lite/generator/server/springboot/dbmigration/liquibase/infrastructure/primary/rest/LiquibaseResourceIT.java index 6262cefec3b..417204e028d 100644 --- a/src/test/java/tech/jhipster/lite/generator/server/springboot/dbmigration/liquibase/infrastructure/primary/rest/LiquibaseResourceIT.java +++ b/src/test/java/tech/jhipster/lite/generator/server/springboot/dbmigration/liquibase/infrastructure/primary/rest/LiquibaseResourceIT.java @@ -17,14 +17,14 @@ import tech.jhipster.lite.common.domain.FileUtils; import tech.jhipster.lite.error.domain.GeneratorException; import tech.jhipster.lite.generator.buildtool.maven.application.MavenApplicationService; -import tech.jhipster.lite.generator.module.domain.JHipsterModulesFixture; -import tech.jhipster.lite.generator.module.domain.properties.JHipsterModuleProperties; -import tech.jhipster.lite.generator.module.infrastructure.secondary.TestJHipsterModules; import tech.jhipster.lite.generator.project.domain.Project; import tech.jhipster.lite.generator.project.infrastructure.primary.dto.ProjectDTO; import tech.jhipster.lite.generator.server.springboot.core.application.SpringBootApplicationService; import tech.jhipster.lite.generator.server.springboot.database.postgresql.application.PostgresqlApplicationService; import tech.jhipster.lite.generator.server.springboot.dbmigration.liquibase.application.LiquibaseApplicationService; +import tech.jhipster.lite.module.domain.JHipsterModulesFixture; +import tech.jhipster.lite.module.domain.properties.JHipsterModuleProperties; +import tech.jhipster.lite.module.infrastructure.secondary.TestJHipsterModules; @IntegrationTest @AutoConfigureMockMvc diff --git a/src/test/java/tech/jhipster/lite/generator/server/springboot/dbmigration/mongock/application/MongockApplicationServiceIT.java b/src/test/java/tech/jhipster/lite/generator/server/springboot/dbmigration/mongock/application/MongockApplicationServiceIT.java index 8e6997c1dcc..4a25996d93c 100644 --- a/src/test/java/tech/jhipster/lite/generator/server/springboot/dbmigration/mongock/application/MongockApplicationServiceIT.java +++ b/src/test/java/tech/jhipster/lite/generator/server/springboot/dbmigration/mongock/application/MongockApplicationServiceIT.java @@ -9,10 +9,10 @@ import tech.jhipster.lite.IntegrationTest; import tech.jhipster.lite.TestUtils; import tech.jhipster.lite.generator.buildtool.maven.application.MavenApplicationService; -import tech.jhipster.lite.generator.module.infrastructure.secondary.TestJHipsterModules; import tech.jhipster.lite.generator.project.domain.Project; import tech.jhipster.lite.generator.project.infrastructure.primary.dto.ProjectDTO; import tech.jhipster.lite.generator.server.springboot.core.application.SpringBootApplicationService; +import tech.jhipster.lite.module.infrastructure.secondary.TestJHipsterModules; @IntegrationTest class MongockApplicationServiceIT { diff --git a/src/test/java/tech/jhipster/lite/generator/server/springboot/dbmigration/mongock/infrastructure/primary/rest/MongockResourceIT.java b/src/test/java/tech/jhipster/lite/generator/server/springboot/dbmigration/mongock/infrastructure/primary/rest/MongockResourceIT.java index ae5230cc796..71140930166 100644 --- a/src/test/java/tech/jhipster/lite/generator/server/springboot/dbmigration/mongock/infrastructure/primary/rest/MongockResourceIT.java +++ b/src/test/java/tech/jhipster/lite/generator/server/springboot/dbmigration/mongock/infrastructure/primary/rest/MongockResourceIT.java @@ -14,10 +14,10 @@ import tech.jhipster.lite.common.domain.FileUtils; import tech.jhipster.lite.error.domain.GeneratorException; import tech.jhipster.lite.generator.buildtool.maven.application.MavenApplicationService; -import tech.jhipster.lite.generator.module.infrastructure.secondary.TestJHipsterModules; import tech.jhipster.lite.generator.project.domain.Project; import tech.jhipster.lite.generator.project.infrastructure.primary.dto.ProjectDTO; import tech.jhipster.lite.generator.server.springboot.core.application.SpringBootApplicationService; +import tech.jhipster.lite.module.infrastructure.secondary.TestJHipsterModules; @IntegrationTest @AutoConfigureMockMvc diff --git a/src/test/java/tech/jhipster/lite/generator/server/springboot/devtools/domain/DevToolsModuleFactoryTest.java b/src/test/java/tech/jhipster/lite/generator/server/springboot/devtools/domain/DevToolsModuleFactoryTest.java index a1cc2b3e510..fa21bbc37ae 100644 --- a/src/test/java/tech/jhipster/lite/generator/server/springboot/devtools/domain/DevToolsModuleFactoryTest.java +++ b/src/test/java/tech/jhipster/lite/generator/server/springboot/devtools/domain/DevToolsModuleFactoryTest.java @@ -1,6 +1,6 @@ package tech.jhipster.lite.generator.server.springboot.devtools.domain; -import static tech.jhipster.lite.generator.module.infrastructure.secondary.JHipsterModulesAssertions.*; +import static tech.jhipster.lite.module.infrastructure.secondary.JHipsterModulesAssertions.*; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -8,9 +8,9 @@ import org.mockito.junit.jupiter.MockitoExtension; import tech.jhipster.lite.UnitTest; import tech.jhipster.lite.common.domain.FileUtils; -import tech.jhipster.lite.generator.module.domain.JHipsterModule; -import tech.jhipster.lite.generator.module.domain.JHipsterModulesFixture; -import tech.jhipster.lite.generator.module.domain.properties.JHipsterModuleProperties; +import tech.jhipster.lite.module.domain.JHipsterModule; +import tech.jhipster.lite.module.domain.JHipsterModulesFixture; +import tech.jhipster.lite.module.domain.properties.JHipsterModuleProperties; @UnitTest @ExtendWith(MockitoExtension.class) diff --git a/src/test/java/tech/jhipster/lite/generator/server/springboot/docker/application/SpringBootDockerApplicationServiceIT.java b/src/test/java/tech/jhipster/lite/generator/server/springboot/docker/application/SpringBootDockerApplicationServiceIT.java index ceef6d5e7a8..5a25ec8080d 100644 --- a/src/test/java/tech/jhipster/lite/generator/server/springboot/docker/application/SpringBootDockerApplicationServiceIT.java +++ b/src/test/java/tech/jhipster/lite/generator/server/springboot/docker/application/SpringBootDockerApplicationServiceIT.java @@ -9,8 +9,8 @@ import tech.jhipster.lite.IntegrationTest; import tech.jhipster.lite.common.domain.WordUtils; import tech.jhipster.lite.generator.buildtool.maven.application.MavenApplicationService; -import tech.jhipster.lite.generator.module.infrastructure.secondary.TestJHipsterModules; import tech.jhipster.lite.generator.project.domain.Project; +import tech.jhipster.lite.module.infrastructure.secondary.TestJHipsterModules; @IntegrationTest class SpringBootDockerApplicationServiceIT { diff --git a/src/test/java/tech/jhipster/lite/generator/server/springboot/docker/infrastructure/primary/rest/SpringBootDockerResourceIT.java b/src/test/java/tech/jhipster/lite/generator/server/springboot/docker/infrastructure/primary/rest/SpringBootDockerResourceIT.java index 45c1e48d1fd..b0f6348619b 100644 --- a/src/test/java/tech/jhipster/lite/generator/server/springboot/docker/infrastructure/primary/rest/SpringBootDockerResourceIT.java +++ b/src/test/java/tech/jhipster/lite/generator/server/springboot/docker/infrastructure/primary/rest/SpringBootDockerResourceIT.java @@ -13,10 +13,10 @@ import tech.jhipster.lite.TestUtils; import tech.jhipster.lite.common.domain.FileUtils; import tech.jhipster.lite.generator.buildtool.maven.application.MavenApplicationService; -import tech.jhipster.lite.generator.module.infrastructure.secondary.TestJHipsterModules; import tech.jhipster.lite.generator.project.domain.Project; import tech.jhipster.lite.generator.project.infrastructure.primary.dto.ProjectDTO; import tech.jhipster.lite.generator.server.springboot.docker.application.SpringBootDockerApplicationService; +import tech.jhipster.lite.module.infrastructure.secondary.TestJHipsterModules; @IntegrationTest @AutoConfigureMockMvc diff --git a/src/test/java/tech/jhipster/lite/generator/server/springboot/logging/aop/application/AopLoggingApplicationServiceIT.java b/src/test/java/tech/jhipster/lite/generator/server/springboot/logging/aop/application/AopLoggingApplicationServiceIT.java index dc7a43da653..3f69919e25b 100644 --- a/src/test/java/tech/jhipster/lite/generator/server/springboot/logging/aop/application/AopLoggingApplicationServiceIT.java +++ b/src/test/java/tech/jhipster/lite/generator/server/springboot/logging/aop/application/AopLoggingApplicationServiceIT.java @@ -11,9 +11,9 @@ import tech.jhipster.lite.IntegrationTest; import tech.jhipster.lite.error.domain.GeneratorException; import tech.jhipster.lite.generator.buildtool.maven.application.MavenApplicationService; -import tech.jhipster.lite.generator.module.infrastructure.secondary.TestJHipsterModules; import tech.jhipster.lite.generator.project.domain.Project; import tech.jhipster.lite.generator.server.springboot.core.application.SpringBootApplicationService; +import tech.jhipster.lite.module.infrastructure.secondary.TestJHipsterModules; @IntegrationTest class AopLoggingApplicationServiceIT { diff --git a/src/test/java/tech/jhipster/lite/generator/server/springboot/logging/aop/infrastructure/primary/rest/AopLoggingResourceIT.java b/src/test/java/tech/jhipster/lite/generator/server/springboot/logging/aop/infrastructure/primary/rest/AopLoggingResourceIT.java index efb2bd3c287..5b8ccd4937d 100644 --- a/src/test/java/tech/jhipster/lite/generator/server/springboot/logging/aop/infrastructure/primary/rest/AopLoggingResourceIT.java +++ b/src/test/java/tech/jhipster/lite/generator/server/springboot/logging/aop/infrastructure/primary/rest/AopLoggingResourceIT.java @@ -15,10 +15,10 @@ import tech.jhipster.lite.IntegrationTest; import tech.jhipster.lite.TestUtils; import tech.jhipster.lite.generator.buildtool.maven.application.MavenApplicationService; -import tech.jhipster.lite.generator.module.infrastructure.secondary.TestJHipsterModules; import tech.jhipster.lite.generator.project.domain.Project; import tech.jhipster.lite.generator.project.infrastructure.primary.dto.ProjectDTO; import tech.jhipster.lite.generator.server.springboot.core.application.SpringBootApplicationService; +import tech.jhipster.lite.module.infrastructure.secondary.TestJHipsterModules; @IntegrationTest @AutoConfigureMockMvc diff --git a/src/test/java/tech/jhipster/lite/generator/server/springboot/logging/logstash/application/LogstashApplicationServiceIT.java b/src/test/java/tech/jhipster/lite/generator/server/springboot/logging/logstash/application/LogstashApplicationServiceIT.java index ba3e8932d85..5cbe2073d7a 100644 --- a/src/test/java/tech/jhipster/lite/generator/server/springboot/logging/logstash/application/LogstashApplicationServiceIT.java +++ b/src/test/java/tech/jhipster/lite/generator/server/springboot/logging/logstash/application/LogstashApplicationServiceIT.java @@ -8,9 +8,9 @@ import org.springframework.beans.factory.annotation.Autowired; import tech.jhipster.lite.IntegrationTest; import tech.jhipster.lite.generator.buildtool.maven.application.MavenApplicationService; -import tech.jhipster.lite.generator.module.infrastructure.secondary.TestJHipsterModules; import tech.jhipster.lite.generator.project.domain.Project; import tech.jhipster.lite.generator.server.springboot.core.application.SpringBootApplicationService; +import tech.jhipster.lite.module.infrastructure.secondary.TestJHipsterModules; @IntegrationTest class LogstashApplicationServiceIT { diff --git a/src/test/java/tech/jhipster/lite/generator/server/springboot/logging/logstash/infrastructure/primary/rest/LogstashResourceIT.java b/src/test/java/tech/jhipster/lite/generator/server/springboot/logging/logstash/infrastructure/primary/rest/LogstashResourceIT.java index 4a1cb6725b4..dc78467031b 100644 --- a/src/test/java/tech/jhipster/lite/generator/server/springboot/logging/logstash/infrastructure/primary/rest/LogstashResourceIT.java +++ b/src/test/java/tech/jhipster/lite/generator/server/springboot/logging/logstash/infrastructure/primary/rest/LogstashResourceIT.java @@ -14,10 +14,10 @@ import tech.jhipster.lite.common.domain.FileUtils; import tech.jhipster.lite.error.domain.GeneratorException; import tech.jhipster.lite.generator.buildtool.maven.application.MavenApplicationService; -import tech.jhipster.lite.generator.module.infrastructure.secondary.TestJHipsterModules; import tech.jhipster.lite.generator.project.domain.Project; import tech.jhipster.lite.generator.project.infrastructure.primary.dto.ProjectDTO; import tech.jhipster.lite.generator.server.springboot.core.application.SpringBootApplicationService; +import tech.jhipster.lite.module.infrastructure.secondary.TestJHipsterModules; @IntegrationTest @AutoConfigureMockMvc diff --git a/src/test/java/tech/jhipster/lite/generator/server/springboot/logsspy/domain/LogsSpyModuleFactoryTest.java b/src/test/java/tech/jhipster/lite/generator/server/springboot/logsspy/domain/LogsSpyModuleFactoryTest.java index ca1506baca5..4eca63a6be3 100644 --- a/src/test/java/tech/jhipster/lite/generator/server/springboot/logsspy/domain/LogsSpyModuleFactoryTest.java +++ b/src/test/java/tech/jhipster/lite/generator/server/springboot/logsspy/domain/LogsSpyModuleFactoryTest.java @@ -1,13 +1,13 @@ package tech.jhipster.lite.generator.server.springboot.logsspy.domain; -import static tech.jhipster.lite.generator.module.infrastructure.secondary.JHipsterModulesAssertions.*; +import static tech.jhipster.lite.module.infrastructure.secondary.JHipsterModulesAssertions.*; import org.junit.jupiter.api.Test; import tech.jhipster.lite.UnitTest; import tech.jhipster.lite.common.domain.FileUtils; -import tech.jhipster.lite.generator.module.domain.JHipsterModule; -import tech.jhipster.lite.generator.module.domain.JHipsterModulesFixture; -import tech.jhipster.lite.generator.module.domain.properties.JHipsterModuleProperties; +import tech.jhipster.lite.module.domain.JHipsterModule; +import tech.jhipster.lite.module.domain.JHipsterModulesFixture; +import tech.jhipster.lite.module.domain.properties.JHipsterModuleProperties; @UnitTest class LogsSpyModuleFactoryTest { diff --git a/src/test/java/tech/jhipster/lite/generator/server/springboot/mvc/security/jwt/application/JwtSecurityApplicationServiceIT.java b/src/test/java/tech/jhipster/lite/generator/server/springboot/mvc/security/jwt/application/JwtSecurityApplicationServiceIT.java index 3319f8da8cf..507c47df0a6 100644 --- a/src/test/java/tech/jhipster/lite/generator/server/springboot/mvc/security/jwt/application/JwtSecurityApplicationServiceIT.java +++ b/src/test/java/tech/jhipster/lite/generator/server/springboot/mvc/security/jwt/application/JwtSecurityApplicationServiceIT.java @@ -17,12 +17,12 @@ import org.springframework.beans.factory.annotation.Autowired; import tech.jhipster.lite.IntegrationTest; import tech.jhipster.lite.generator.buildtool.maven.domain.MavenService; -import tech.jhipster.lite.generator.module.domain.properties.JHipsterModuleProperties; import tech.jhipster.lite.generator.project.domain.Project; import tech.jhipster.lite.generator.project.infrastructure.secondary.GitUtils; import tech.jhipster.lite.generator.server.javatool.base.application.JavaBaseApplicationService; import tech.jhipster.lite.generator.server.springboot.core.domain.SpringBootService; import tech.jhipster.lite.generator.server.springboot.mvc.web.domain.SpringBootMvcService; +import tech.jhipster.lite.module.domain.properties.JHipsterModuleProperties; @IntegrationTest class JwtSecurityApplicationServiceIT { diff --git a/src/test/java/tech/jhipster/lite/generator/server/springboot/mvc/security/jwt/infrastructure/primary/rest/JwtSecurityResourceIT.java b/src/test/java/tech/jhipster/lite/generator/server/springboot/mvc/security/jwt/infrastructure/primary/rest/JwtSecurityResourceIT.java index 3900bda2e32..c85a3a86514 100644 --- a/src/test/java/tech/jhipster/lite/generator/server/springboot/mvc/security/jwt/infrastructure/primary/rest/JwtSecurityResourceIT.java +++ b/src/test/java/tech/jhipster/lite/generator/server/springboot/mvc/security/jwt/infrastructure/primary/rest/JwtSecurityResourceIT.java @@ -13,7 +13,6 @@ import tech.jhipster.lite.TestUtils; import tech.jhipster.lite.common.domain.FileUtils; import tech.jhipster.lite.generator.buildtool.maven.application.MavenApplicationService; -import tech.jhipster.lite.generator.module.infrastructure.secondary.TestJHipsterModules; import tech.jhipster.lite.generator.project.domain.Project; import tech.jhipster.lite.generator.project.infrastructure.primary.dto.ProjectDTO; import tech.jhipster.lite.generator.project.infrastructure.secondary.GitUtils; @@ -21,6 +20,7 @@ import tech.jhipster.lite.generator.server.springboot.core.application.SpringBootApplicationService; import tech.jhipster.lite.generator.server.springboot.mvc.security.jwt.application.JwtSecurityApplicationService; import tech.jhipster.lite.generator.server.springboot.mvc.web.application.SpringBootMvcApplicationService; +import tech.jhipster.lite.module.infrastructure.secondary.TestJHipsterModules; @IntegrationTest @AutoConfigureMockMvc diff --git a/src/test/java/tech/jhipster/lite/generator/server/springboot/mvc/security/oauth2/domain/OAuth2ModuleFactoryTest.java b/src/test/java/tech/jhipster/lite/generator/server/springboot/mvc/security/oauth2/domain/OAuth2ModuleFactoryTest.java index 72fd805cc4c..86dd3397802 100644 --- a/src/test/java/tech/jhipster/lite/generator/server/springboot/mvc/security/oauth2/domain/OAuth2ModuleFactoryTest.java +++ b/src/test/java/tech/jhipster/lite/generator/server/springboot/mvc/security/oauth2/domain/OAuth2ModuleFactoryTest.java @@ -1,7 +1,7 @@ package tech.jhipster.lite.generator.server.springboot.mvc.security.oauth2.domain; import static org.mockito.Mockito.*; -import static tech.jhipster.lite.generator.module.infrastructure.secondary.JHipsterModulesAssertions.*; +import static tech.jhipster.lite.module.infrastructure.secondary.JHipsterModulesAssertions.*; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -12,9 +12,9 @@ import tech.jhipster.lite.common.domain.FileUtils; import tech.jhipster.lite.generator.docker.domain.DockerImage; import tech.jhipster.lite.generator.docker.domain.DockerImages; -import tech.jhipster.lite.generator.module.domain.JHipsterModule; -import tech.jhipster.lite.generator.module.domain.JHipsterModulesFixture; -import tech.jhipster.lite.generator.module.domain.properties.JHipsterModuleProperties; +import tech.jhipster.lite.module.domain.JHipsterModule; +import tech.jhipster.lite.module.domain.JHipsterModulesFixture; +import tech.jhipster.lite.module.domain.properties.JHipsterModuleProperties; @UnitTest @ExtendWith(MockitoExtension.class) diff --git a/src/test/java/tech/jhipster/lite/generator/server/springboot/mvc/security/oauth2/domain/Oauth2AccountModuleFactoryTest.java b/src/test/java/tech/jhipster/lite/generator/server/springboot/mvc/security/oauth2/domain/Oauth2AccountModuleFactoryTest.java index b146c36f397..c92e2eee98b 100644 --- a/src/test/java/tech/jhipster/lite/generator/server/springboot/mvc/security/oauth2/domain/Oauth2AccountModuleFactoryTest.java +++ b/src/test/java/tech/jhipster/lite/generator/server/springboot/mvc/security/oauth2/domain/Oauth2AccountModuleFactoryTest.java @@ -1,13 +1,13 @@ package tech.jhipster.lite.generator.server.springboot.mvc.security.oauth2.domain; -import static tech.jhipster.lite.generator.module.infrastructure.secondary.JHipsterModulesAssertions.*; +import static tech.jhipster.lite.module.infrastructure.secondary.JHipsterModulesAssertions.*; import org.junit.jupiter.api.Test; import tech.jhipster.lite.UnitTest; import tech.jhipster.lite.common.domain.FileUtils; -import tech.jhipster.lite.generator.module.domain.JHipsterModule; -import tech.jhipster.lite.generator.module.domain.JHipsterModulesFixture; -import tech.jhipster.lite.generator.module.domain.properties.JHipsterModuleProperties; +import tech.jhipster.lite.module.domain.JHipsterModule; +import tech.jhipster.lite.module.domain.JHipsterModulesFixture; +import tech.jhipster.lite.module.domain.properties.JHipsterModuleProperties; @UnitTest class Oauth2AccountModuleFactoryTest { diff --git a/src/test/java/tech/jhipster/lite/generator/server/springboot/mvc/web/application/SpringBootMvcApplicationServiceIT.java b/src/test/java/tech/jhipster/lite/generator/server/springboot/mvc/web/application/SpringBootMvcApplicationServiceIT.java index 833c4811835..aed670793e2 100644 --- a/src/test/java/tech/jhipster/lite/generator/server/springboot/mvc/web/application/SpringBootMvcApplicationServiceIT.java +++ b/src/test/java/tech/jhipster/lite/generator/server/springboot/mvc/web/application/SpringBootMvcApplicationServiceIT.java @@ -11,10 +11,10 @@ import org.springframework.beans.factory.annotation.Autowired; import tech.jhipster.lite.IntegrationTest; import tech.jhipster.lite.generator.buildtool.maven.application.MavenApplicationService; -import tech.jhipster.lite.generator.module.infrastructure.secondary.TestJHipsterModules; import tech.jhipster.lite.generator.project.domain.DefaultConfig; import tech.jhipster.lite.generator.project.domain.Project; import tech.jhipster.lite.generator.server.springboot.core.application.SpringBootApplicationService; +import tech.jhipster.lite.module.infrastructure.secondary.TestJHipsterModules; @IntegrationTest class SpringBootMvcApplicationServiceIT { diff --git a/src/test/java/tech/jhipster/lite/generator/server/springboot/mvc/web/infrastructure/primary/rest/SpringBootMvcResourceIT.java b/src/test/java/tech/jhipster/lite/generator/server/springboot/mvc/web/infrastructure/primary/rest/SpringBootMvcResourceIT.java index dd9868e5f8d..5e94748cf00 100644 --- a/src/test/java/tech/jhipster/lite/generator/server/springboot/mvc/web/infrastructure/primary/rest/SpringBootMvcResourceIT.java +++ b/src/test/java/tech/jhipster/lite/generator/server/springboot/mvc/web/infrastructure/primary/rest/SpringBootMvcResourceIT.java @@ -16,10 +16,10 @@ import tech.jhipster.lite.IntegrationTest; import tech.jhipster.lite.TestUtils; import tech.jhipster.lite.generator.buildtool.maven.application.MavenApplicationService; -import tech.jhipster.lite.generator.module.infrastructure.secondary.TestJHipsterModules; import tech.jhipster.lite.generator.project.domain.Project; import tech.jhipster.lite.generator.project.infrastructure.primary.dto.ProjectDTO; import tech.jhipster.lite.generator.server.springboot.core.application.SpringBootApplicationService; +import tech.jhipster.lite.module.infrastructure.secondary.TestJHipsterModules; @IntegrationTest @AutoConfigureMockMvc diff --git a/src/test/java/tech/jhipster/lite/generator/server/springboot/springcloud/common/application/SpringCloudCommonApplicationServiceIT.java b/src/test/java/tech/jhipster/lite/generator/server/springboot/springcloud/common/application/SpringCloudCommonApplicationServiceIT.java index a91795e975a..f1e25e1ef5e 100644 --- a/src/test/java/tech/jhipster/lite/generator/server/springboot/springcloud/common/application/SpringCloudCommonApplicationServiceIT.java +++ b/src/test/java/tech/jhipster/lite/generator/server/springboot/springcloud/common/application/SpringCloudCommonApplicationServiceIT.java @@ -13,9 +13,9 @@ import org.springframework.beans.factory.annotation.Autowired; import tech.jhipster.lite.IntegrationTest; import tech.jhipster.lite.generator.buildtool.maven.application.MavenApplicationService; -import tech.jhipster.lite.generator.module.infrastructure.secondary.TestJHipsterModules; import tech.jhipster.lite.generator.project.domain.Project; import tech.jhipster.lite.generator.server.springboot.core.application.SpringBootApplicationService; +import tech.jhipster.lite.module.infrastructure.secondary.TestJHipsterModules; @IntegrationTest class SpringCloudCommonApplicationServiceIT { diff --git a/src/test/java/tech/jhipster/lite/generator/server/springboot/springcloud/configclient/application/SpringCloudConfigApplicationServiceIT.java b/src/test/java/tech/jhipster/lite/generator/server/springboot/springcloud/configclient/application/SpringCloudConfigApplicationServiceIT.java index 5850a77f61c..36ceeb09d2b 100644 --- a/src/test/java/tech/jhipster/lite/generator/server/springboot/springcloud/configclient/application/SpringCloudConfigApplicationServiceIT.java +++ b/src/test/java/tech/jhipster/lite/generator/server/springboot/springcloud/configclient/application/SpringCloudConfigApplicationServiceIT.java @@ -10,9 +10,9 @@ import org.springframework.beans.factory.annotation.Autowired; import tech.jhipster.lite.IntegrationTest; import tech.jhipster.lite.generator.buildtool.maven.application.MavenApplicationService; -import tech.jhipster.lite.generator.module.infrastructure.secondary.TestJHipsterModules; import tech.jhipster.lite.generator.project.domain.Project; import tech.jhipster.lite.generator.server.springboot.core.application.SpringBootApplicationService; +import tech.jhipster.lite.module.infrastructure.secondary.TestJHipsterModules; @IntegrationTest class SpringCloudConfigApplicationServiceIT { diff --git a/src/test/java/tech/jhipster/lite/generator/server/springboot/springcloud/configclient/infrastructure/primary/rest/SpringCloudConfigClientResourceIT.java b/src/test/java/tech/jhipster/lite/generator/server/springboot/springcloud/configclient/infrastructure/primary/rest/SpringCloudConfigClientResourceIT.java index 076c2c5f07a..515a79d73a0 100644 --- a/src/test/java/tech/jhipster/lite/generator/server/springboot/springcloud/configclient/infrastructure/primary/rest/SpringCloudConfigClientResourceIT.java +++ b/src/test/java/tech/jhipster/lite/generator/server/springboot/springcloud/configclient/infrastructure/primary/rest/SpringCloudConfigClientResourceIT.java @@ -14,10 +14,10 @@ import tech.jhipster.lite.common.domain.FileUtils; import tech.jhipster.lite.error.domain.GeneratorException; import tech.jhipster.lite.generator.buildtool.maven.application.MavenApplicationService; -import tech.jhipster.lite.generator.module.infrastructure.secondary.TestJHipsterModules; import tech.jhipster.lite.generator.project.domain.Project; import tech.jhipster.lite.generator.project.infrastructure.primary.dto.ProjectDTO; import tech.jhipster.lite.generator.server.springboot.core.application.SpringBootApplicationService; +import tech.jhipster.lite.module.infrastructure.secondary.TestJHipsterModules; @IntegrationTest @AutoConfigureMockMvc diff --git a/src/test/java/tech/jhipster/lite/generator/server/springboot/springcloud/consul/application/ConsulApplicationServiceIT.java b/src/test/java/tech/jhipster/lite/generator/server/springboot/springcloud/consul/application/ConsulApplicationServiceIT.java index 00a216b2aeb..d4bc47e0dd3 100644 --- a/src/test/java/tech/jhipster/lite/generator/server/springboot/springcloud/consul/application/ConsulApplicationServiceIT.java +++ b/src/test/java/tech/jhipster/lite/generator/server/springboot/springcloud/consul/application/ConsulApplicationServiceIT.java @@ -8,9 +8,9 @@ import org.springframework.beans.factory.annotation.Autowired; import tech.jhipster.lite.IntegrationTest; import tech.jhipster.lite.generator.buildtool.maven.application.MavenApplicationService; -import tech.jhipster.lite.generator.module.infrastructure.secondary.TestJHipsterModules; import tech.jhipster.lite.generator.project.domain.Project; import tech.jhipster.lite.generator.server.springboot.core.application.SpringBootApplicationService; +import tech.jhipster.lite.module.infrastructure.secondary.TestJHipsterModules; @IntegrationTest class ConsulApplicationServiceIT { diff --git a/src/test/java/tech/jhipster/lite/generator/server/springboot/springcloud/consul/infrastructure/primary/rest/ConsulResourceIT.java b/src/test/java/tech/jhipster/lite/generator/server/springboot/springcloud/consul/infrastructure/primary/rest/ConsulResourceIT.java index 278e719ebb7..79996a2d749 100644 --- a/src/test/java/tech/jhipster/lite/generator/server/springboot/springcloud/consul/infrastructure/primary/rest/ConsulResourceIT.java +++ b/src/test/java/tech/jhipster/lite/generator/server/springboot/springcloud/consul/infrastructure/primary/rest/ConsulResourceIT.java @@ -14,10 +14,10 @@ import tech.jhipster.lite.common.domain.FileUtils; import tech.jhipster.lite.error.domain.GeneratorException; import tech.jhipster.lite.generator.buildtool.maven.application.MavenApplicationService; -import tech.jhipster.lite.generator.module.infrastructure.secondary.TestJHipsterModules; import tech.jhipster.lite.generator.project.domain.Project; import tech.jhipster.lite.generator.project.infrastructure.primary.dto.ProjectDTO; import tech.jhipster.lite.generator.server.springboot.core.application.SpringBootApplicationService; +import tech.jhipster.lite.module.infrastructure.secondary.TestJHipsterModules; @IntegrationTest @AutoConfigureMockMvc diff --git a/src/test/java/tech/jhipster/lite/generator/server/springboot/springcloud/eureka/application/EurekaApplicationServiceIT.java b/src/test/java/tech/jhipster/lite/generator/server/springboot/springcloud/eureka/application/EurekaApplicationServiceIT.java index d4f491bcff7..8e399df6876 100644 --- a/src/test/java/tech/jhipster/lite/generator/server/springboot/springcloud/eureka/application/EurekaApplicationServiceIT.java +++ b/src/test/java/tech/jhipster/lite/generator/server/springboot/springcloud/eureka/application/EurekaApplicationServiceIT.java @@ -8,9 +8,9 @@ import org.springframework.beans.factory.annotation.Autowired; import tech.jhipster.lite.IntegrationTest; import tech.jhipster.lite.generator.buildtool.maven.application.MavenApplicationService; -import tech.jhipster.lite.generator.module.infrastructure.secondary.TestJHipsterModules; import tech.jhipster.lite.generator.project.domain.Project; import tech.jhipster.lite.generator.server.springboot.core.application.SpringBootApplicationService; +import tech.jhipster.lite.module.infrastructure.secondary.TestJHipsterModules; @IntegrationTest class EurekaApplicationServiceIT { diff --git a/src/test/java/tech/jhipster/lite/generator/server/springboot/springcloud/eureka/infrastructure/primary/rest/EurekaResourceIT.java b/src/test/java/tech/jhipster/lite/generator/server/springboot/springcloud/eureka/infrastructure/primary/rest/EurekaResourceIT.java index 11ec0fe74bb..f680433623b 100644 --- a/src/test/java/tech/jhipster/lite/generator/server/springboot/springcloud/eureka/infrastructure/primary/rest/EurekaResourceIT.java +++ b/src/test/java/tech/jhipster/lite/generator/server/springboot/springcloud/eureka/infrastructure/primary/rest/EurekaResourceIT.java @@ -13,10 +13,10 @@ import tech.jhipster.lite.TestUtils; import tech.jhipster.lite.common.domain.FileUtils; import tech.jhipster.lite.generator.buildtool.maven.application.MavenApplicationService; -import tech.jhipster.lite.generator.module.infrastructure.secondary.TestJHipsterModules; import tech.jhipster.lite.generator.project.domain.Project; import tech.jhipster.lite.generator.project.infrastructure.primary.dto.ProjectDTO; import tech.jhipster.lite.generator.server.springboot.core.application.SpringBootApplicationService; +import tech.jhipster.lite.module.infrastructure.secondary.TestJHipsterModules; @IntegrationTest @AutoConfigureMockMvc diff --git a/src/test/java/tech/jhipster/lite/generator/server/springboot/springcloud/gateway/application/GatewayApplicationServiceIT.java b/src/test/java/tech/jhipster/lite/generator/server/springboot/springcloud/gateway/application/GatewayApplicationServiceIT.java index 664e631b6a3..4cac7f6b7bf 100644 --- a/src/test/java/tech/jhipster/lite/generator/server/springboot/springcloud/gateway/application/GatewayApplicationServiceIT.java +++ b/src/test/java/tech/jhipster/lite/generator/server/springboot/springcloud/gateway/application/GatewayApplicationServiceIT.java @@ -8,9 +8,9 @@ import org.springframework.beans.factory.annotation.Autowired; import tech.jhipster.lite.IntegrationTest; import tech.jhipster.lite.generator.buildtool.maven.application.MavenApplicationService; -import tech.jhipster.lite.generator.module.infrastructure.secondary.TestJHipsterModules; import tech.jhipster.lite.generator.project.domain.Project; import tech.jhipster.lite.generator.server.springboot.core.application.SpringBootApplicationService; +import tech.jhipster.lite.module.infrastructure.secondary.TestJHipsterModules; @IntegrationTest class GatewayApplicationServiceIT { diff --git a/src/test/java/tech/jhipster/lite/generator/server/springboot/springcloud/gateway/infrastructure/primary/rest/GatewayResourceIT.java b/src/test/java/tech/jhipster/lite/generator/server/springboot/springcloud/gateway/infrastructure/primary/rest/GatewayResourceIT.java index ecbffd1693a..17ba0e30e10 100644 --- a/src/test/java/tech/jhipster/lite/generator/server/springboot/springcloud/gateway/infrastructure/primary/rest/GatewayResourceIT.java +++ b/src/test/java/tech/jhipster/lite/generator/server/springboot/springcloud/gateway/infrastructure/primary/rest/GatewayResourceIT.java @@ -13,10 +13,10 @@ import tech.jhipster.lite.TestUtils; import tech.jhipster.lite.common.domain.FileUtils; import tech.jhipster.lite.generator.buildtool.maven.application.MavenApplicationService; -import tech.jhipster.lite.generator.module.infrastructure.secondary.TestJHipsterModules; import tech.jhipster.lite.generator.project.domain.Project; import tech.jhipster.lite.generator.project.infrastructure.primary.dto.ProjectDTO; import tech.jhipster.lite.generator.server.springboot.core.application.SpringBootApplicationService; +import tech.jhipster.lite.module.infrastructure.secondary.TestJHipsterModules; @IntegrationTest @AutoConfigureMockMvc diff --git a/src/test/java/tech/jhipster/lite/generator/server/springboot/technicaltools/actuator/application/SpringBootActuatorApplicationServiceIT.java b/src/test/java/tech/jhipster/lite/generator/server/springboot/technicaltools/actuator/application/SpringBootActuatorApplicationServiceIT.java index ca977e9fe9d..d33df08d9a5 100644 --- a/src/test/java/tech/jhipster/lite/generator/server/springboot/technicaltools/actuator/application/SpringBootActuatorApplicationServiceIT.java +++ b/src/test/java/tech/jhipster/lite/generator/server/springboot/technicaltools/actuator/application/SpringBootActuatorApplicationServiceIT.java @@ -6,9 +6,9 @@ import org.springframework.beans.factory.annotation.Autowired; import tech.jhipster.lite.IntegrationTest; import tech.jhipster.lite.generator.buildtool.maven.application.MavenApplicationService; -import tech.jhipster.lite.generator.module.infrastructure.secondary.TestJHipsterModules; import tech.jhipster.lite.generator.project.domain.Project; import tech.jhipster.lite.generator.server.springboot.core.application.SpringBootApplicationService; +import tech.jhipster.lite.module.infrastructure.secondary.TestJHipsterModules; @IntegrationTest class SpringBootActuatorApplicationServiceIT { diff --git a/src/test/java/tech/jhipster/lite/generator/server/springboot/technicaltools/actuator/infrastructure/primary/rest/SpringBootActuatorResourceIT.java b/src/test/java/tech/jhipster/lite/generator/server/springboot/technicaltools/actuator/infrastructure/primary/rest/SpringBootActuatorResourceIT.java index 1a53ef03bd4..463d40dd452 100644 --- a/src/test/java/tech/jhipster/lite/generator/server/springboot/technicaltools/actuator/infrastructure/primary/rest/SpringBootActuatorResourceIT.java +++ b/src/test/java/tech/jhipster/lite/generator/server/springboot/technicaltools/actuator/infrastructure/primary/rest/SpringBootActuatorResourceIT.java @@ -12,11 +12,11 @@ import tech.jhipster.lite.IntegrationTest; import tech.jhipster.lite.TestUtils; import tech.jhipster.lite.generator.buildtool.maven.application.MavenApplicationService; -import tech.jhipster.lite.generator.module.infrastructure.secondary.TestJHipsterModules; import tech.jhipster.lite.generator.project.domain.Project; import tech.jhipster.lite.generator.project.infrastructure.primary.dto.ProjectDTO; import tech.jhipster.lite.generator.server.springboot.core.application.SpringBootApplicationService; import tech.jhipster.lite.generator.server.springboot.technicaltools.actuator.application.SpringbootActuatorAssert; +import tech.jhipster.lite.module.infrastructure.secondary.TestJHipsterModules; @IntegrationTest @AutoConfigureMockMvc diff --git a/src/test/java/tech/jhipster/lite/generator/server/springboot/user/application/SpringBootUserApplicationServiceIT.java b/src/test/java/tech/jhipster/lite/generator/server/springboot/user/application/SpringBootUserApplicationServiceIT.java index 4f1d7bbd0fd..561edf071f1 100644 --- a/src/test/java/tech/jhipster/lite/generator/server/springboot/user/application/SpringBootUserApplicationServiceIT.java +++ b/src/test/java/tech/jhipster/lite/generator/server/springboot/user/application/SpringBootUserApplicationServiceIT.java @@ -15,14 +15,14 @@ import org.springframework.beans.factory.annotation.Autowired; import tech.jhipster.lite.IntegrationTest; import tech.jhipster.lite.generator.buildtool.maven.application.MavenApplicationService; -import tech.jhipster.lite.generator.module.domain.JHipsterModulesFixture; -import tech.jhipster.lite.generator.module.domain.properties.JHipsterModuleProperties; -import tech.jhipster.lite.generator.module.infrastructure.secondary.TestJHipsterModules; import tech.jhipster.lite.generator.project.domain.DatabaseType; import tech.jhipster.lite.generator.project.domain.Project; import tech.jhipster.lite.generator.server.springboot.core.application.SpringBootApplicationService; import tech.jhipster.lite.generator.server.springboot.database.mariadb.application.MariaDBApplicationService; import tech.jhipster.lite.generator.server.springboot.database.mysql.application.MySQLApplicationService; +import tech.jhipster.lite.module.domain.JHipsterModulesFixture; +import tech.jhipster.lite.module.domain.properties.JHipsterModuleProperties; +import tech.jhipster.lite.module.infrastructure.secondary.TestJHipsterModules; @IntegrationTest class SpringBootUserApplicationServiceIT { diff --git a/src/test/java/tech/jhipster/lite/generator/server/springboot/user/infrastructure/primary/rest/SpringBootUserResourceIT.java b/src/test/java/tech/jhipster/lite/generator/server/springboot/user/infrastructure/primary/rest/SpringBootUserResourceIT.java index 9b908efb8e1..ce56a8dfe81 100644 --- a/src/test/java/tech/jhipster/lite/generator/server/springboot/user/infrastructure/primary/rest/SpringBootUserResourceIT.java +++ b/src/test/java/tech/jhipster/lite/generator/server/springboot/user/infrastructure/primary/rest/SpringBootUserResourceIT.java @@ -20,14 +20,14 @@ import tech.jhipster.lite.TestUtils; import tech.jhipster.lite.common.domain.FileUtils; import tech.jhipster.lite.generator.buildtool.maven.application.MavenApplicationService; -import tech.jhipster.lite.generator.module.domain.JHipsterModulesFixture; -import tech.jhipster.lite.generator.module.domain.properties.JHipsterModuleProperties; -import tech.jhipster.lite.generator.module.infrastructure.secondary.TestJHipsterModules; import tech.jhipster.lite.generator.project.domain.Project; import tech.jhipster.lite.generator.project.infrastructure.primary.dto.ProjectDTO; import tech.jhipster.lite.generator.server.springboot.core.application.SpringBootApplicationService; import tech.jhipster.lite.generator.server.springboot.database.mariadb.application.MariaDBApplicationService; import tech.jhipster.lite.generator.server.springboot.database.mysql.application.MySQLApplicationService; +import tech.jhipster.lite.module.domain.JHipsterModulesFixture; +import tech.jhipster.lite.module.domain.properties.JHipsterModuleProperties; +import tech.jhipster.lite.module.infrastructure.secondary.TestJHipsterModules; @IntegrationTest @AutoConfigureMockMvc diff --git a/src/test/java/tech/jhipster/lite/generator/server/springboot/webflux/web/application/SpringBootWebfluxApplicationServiceIT.java b/src/test/java/tech/jhipster/lite/generator/server/springboot/webflux/web/application/SpringBootWebfluxApplicationServiceIT.java index c91d7539314..3d8944d3b59 100644 --- a/src/test/java/tech/jhipster/lite/generator/server/springboot/webflux/web/application/SpringBootWebfluxApplicationServiceIT.java +++ b/src/test/java/tech/jhipster/lite/generator/server/springboot/webflux/web/application/SpringBootWebfluxApplicationServiceIT.java @@ -8,9 +8,9 @@ import org.springframework.beans.factory.annotation.Autowired; import tech.jhipster.lite.IntegrationTest; import tech.jhipster.lite.generator.buildtool.maven.application.MavenApplicationService; -import tech.jhipster.lite.generator.module.infrastructure.secondary.TestJHipsterModules; import tech.jhipster.lite.generator.project.domain.Project; import tech.jhipster.lite.generator.server.springboot.core.application.SpringBootApplicationService; +import tech.jhipster.lite.module.infrastructure.secondary.TestJHipsterModules; @IntegrationTest class SpringBootWebfluxApplicationServiceIT { diff --git a/src/test/java/tech/jhipster/lite/generator/server/springboot/webflux/web/infrastructure/primary/rest/SpringBootWebfluxResourceIT.java b/src/test/java/tech/jhipster/lite/generator/server/springboot/webflux/web/infrastructure/primary/rest/SpringBootWebfluxResourceIT.java index 31d5d51703d..6088b6cfe6c 100644 --- a/src/test/java/tech/jhipster/lite/generator/server/springboot/webflux/web/infrastructure/primary/rest/SpringBootWebfluxResourceIT.java +++ b/src/test/java/tech/jhipster/lite/generator/server/springboot/webflux/web/infrastructure/primary/rest/SpringBootWebfluxResourceIT.java @@ -13,10 +13,10 @@ import tech.jhipster.lite.IntegrationTest; import tech.jhipster.lite.TestUtils; import tech.jhipster.lite.generator.buildtool.maven.application.MavenApplicationService; -import tech.jhipster.lite.generator.module.infrastructure.secondary.TestJHipsterModules; import tech.jhipster.lite.generator.project.domain.Project; import tech.jhipster.lite.generator.project.infrastructure.primary.dto.ProjectDTO; import tech.jhipster.lite.generator.server.springboot.core.application.SpringBootApplicationService; +import tech.jhipster.lite.module.infrastructure.secondary.TestJHipsterModules; @IntegrationTest @AutoConfigureMockMvc diff --git a/src/test/java/tech/jhipster/lite/generator/typescript/infrastructure/primary/rest/TypescriptResourceIT.java b/src/test/java/tech/jhipster/lite/generator/typescript/infrastructure/primary/rest/TypescriptResourceIT.java index 9d7a67659a9..51c0453f154 100644 --- a/src/test/java/tech/jhipster/lite/generator/typescript/infrastructure/primary/rest/TypescriptResourceIT.java +++ b/src/test/java/tech/jhipster/lite/generator/typescript/infrastructure/primary/rest/TypescriptResourceIT.java @@ -12,10 +12,10 @@ import org.springframework.test.web.servlet.MockMvc; import tech.jhipster.lite.IntegrationTest; import tech.jhipster.lite.TestUtils; -import tech.jhipster.lite.generator.module.infrastructure.secondary.TestJHipsterModules; import tech.jhipster.lite.generator.project.domain.Project; import tech.jhipster.lite.generator.project.infrastructure.primary.dto.ProjectDTO; import tech.jhipster.lite.generator.typescript.application.TypescriptAssert; +import tech.jhipster.lite.module.infrastructure.secondary.TestJHipsterModules; @IntegrationTest @AutoConfigureMockMvc diff --git a/src/test/java/tech/jhipster/lite/generator/module/domain/ArgumentsReplacerTest.java b/src/test/java/tech/jhipster/lite/module/domain/ArgumentsReplacerTest.java similarity index 95% rename from src/test/java/tech/jhipster/lite/generator/module/domain/ArgumentsReplacerTest.java rename to src/test/java/tech/jhipster/lite/module/domain/ArgumentsReplacerTest.java index 7336209e653..cf6d0058049 100644 --- a/src/test/java/tech/jhipster/lite/generator/module/domain/ArgumentsReplacerTest.java +++ b/src/test/java/tech/jhipster/lite/module/domain/ArgumentsReplacerTest.java @@ -1,4 +1,4 @@ -package tech.jhipster.lite.generator.module.domain; +package tech.jhipster.lite.module.domain; import static org.assertj.core.api.Assertions.*; diff --git a/src/test/java/tech/jhipster/lite/generator/module/domain/DocumentationTitleTest.java b/src/test/java/tech/jhipster/lite/module/domain/DocumentationTitleTest.java similarity index 85% rename from src/test/java/tech/jhipster/lite/generator/module/domain/DocumentationTitleTest.java rename to src/test/java/tech/jhipster/lite/module/domain/DocumentationTitleTest.java index 18b2e58d5da..365b570d47f 100644 --- a/src/test/java/tech/jhipster/lite/generator/module/domain/DocumentationTitleTest.java +++ b/src/test/java/tech/jhipster/lite/module/domain/DocumentationTitleTest.java @@ -1,4 +1,4 @@ -package tech.jhipster.lite.generator.module.domain; +package tech.jhipster.lite.module.domain; import static org.assertj.core.api.Assertions.*; diff --git a/src/test/java/tech/jhipster/lite/generator/module/domain/JHipsterDestinationTest.java b/src/test/java/tech/jhipster/lite/module/domain/JHipsterDestinationTest.java similarity index 88% rename from src/test/java/tech/jhipster/lite/generator/module/domain/JHipsterDestinationTest.java rename to src/test/java/tech/jhipster/lite/module/domain/JHipsterDestinationTest.java index 0febc22d469..35d36777af8 100644 --- a/src/test/java/tech/jhipster/lite/generator/module/domain/JHipsterDestinationTest.java +++ b/src/test/java/tech/jhipster/lite/module/domain/JHipsterDestinationTest.java @@ -1,4 +1,4 @@ -package tech.jhipster.lite.generator.module.domain; +package tech.jhipster.lite.module.domain; import static org.assertj.core.api.Assertions.*; @@ -8,7 +8,7 @@ import org.junit.jupiter.api.Test; import tech.jhipster.lite.UnitTest; import tech.jhipster.lite.common.domain.FileUtils; -import tech.jhipster.lite.generator.module.domain.properties.JHipsterProjectFolder; +import tech.jhipster.lite.module.domain.properties.JHipsterProjectFolder; @UnitTest class JHipsterDestinationTest { diff --git a/src/test/java/tech/jhipster/lite/generator/module/domain/JHipsterFileContentTest.java b/src/test/java/tech/jhipster/lite/module/domain/JHipsterFileContentTest.java similarity index 93% rename from src/test/java/tech/jhipster/lite/generator/module/domain/JHipsterFileContentTest.java rename to src/test/java/tech/jhipster/lite/module/domain/JHipsterFileContentTest.java index 6988eea4b5f..a29fdb59a5e 100644 --- a/src/test/java/tech/jhipster/lite/generator/module/domain/JHipsterFileContentTest.java +++ b/src/test/java/tech/jhipster/lite/module/domain/JHipsterFileContentTest.java @@ -1,7 +1,7 @@ -package tech.jhipster.lite.generator.module.domain; +package tech.jhipster.lite.module.domain; import static org.assertj.core.api.Assertions.*; -import static tech.jhipster.lite.generator.module.domain.JHipsterModulesFixture.*; +import static tech.jhipster.lite.module.domain.JHipsterModulesFixture.*; import java.io.IOException; import java.nio.charset.StandardCharsets; diff --git a/src/test/java/tech/jhipster/lite/generator/module/domain/JHipsterModuleContextTest.java b/src/test/java/tech/jhipster/lite/module/domain/JHipsterModuleContextTest.java similarity index 90% rename from src/test/java/tech/jhipster/lite/generator/module/domain/JHipsterModuleContextTest.java rename to src/test/java/tech/jhipster/lite/module/domain/JHipsterModuleContextTest.java index 82357872a82..a8246d4a611 100644 --- a/src/test/java/tech/jhipster/lite/generator/module/domain/JHipsterModuleContextTest.java +++ b/src/test/java/tech/jhipster/lite/module/domain/JHipsterModuleContextTest.java @@ -1,7 +1,7 @@ -package tech.jhipster.lite.generator.module.domain; +package tech.jhipster.lite.module.domain; import static org.assertj.core.api.Assertions.*; -import static tech.jhipster.lite.generator.module.domain.JHipsterModulesFixture.*; +import static tech.jhipster.lite.module.domain.JHipsterModulesFixture.*; import ch.qos.logback.classic.Level; import java.util.Map; diff --git a/src/test/java/tech/jhipster/lite/generator/module/domain/JHipsterModuleSlugTest.java b/src/test/java/tech/jhipster/lite/module/domain/JHipsterModuleSlugTest.java similarity index 90% rename from src/test/java/tech/jhipster/lite/generator/module/domain/JHipsterModuleSlugTest.java rename to src/test/java/tech/jhipster/lite/module/domain/JHipsterModuleSlugTest.java index 079d52a558f..4138d0a399c 100644 --- a/src/test/java/tech/jhipster/lite/generator/module/domain/JHipsterModuleSlugTest.java +++ b/src/test/java/tech/jhipster/lite/module/domain/JHipsterModuleSlugTest.java @@ -1,4 +1,4 @@ -package tech.jhipster.lite.generator.module.domain; +package tech.jhipster.lite.module.domain; import static org.assertj.core.api.Assertions.*; diff --git a/src/test/java/tech/jhipster/lite/generator/module/domain/JHipsterModulesFixture.java b/src/test/java/tech/jhipster/lite/module/domain/JHipsterModulesFixture.java similarity index 82% rename from src/test/java/tech/jhipster/lite/generator/module/domain/JHipsterModulesFixture.java rename to src/test/java/tech/jhipster/lite/module/domain/JHipsterModulesFixture.java index 7ec7d5035b2..9b5008e9f61 100644 --- a/src/test/java/tech/jhipster/lite/generator/module/domain/JHipsterModulesFixture.java +++ b/src/test/java/tech/jhipster/lite/module/domain/JHipsterModulesFixture.java @@ -1,7 +1,7 @@ -package tech.jhipster.lite.generator.module.domain; +package tech.jhipster.lite.module.domain; -import static tech.jhipster.lite.generator.module.domain.JHipsterModule.*; -import static tech.jhipster.lite.generator.module.domain.properties.JHipsterModulePropertyDefinition.*; +import static tech.jhipster.lite.module.domain.JHipsterModule.*; +import static tech.jhipster.lite.module.domain.properties.JHipsterModulePropertyDefinition.*; import java.util.HashMap; import java.util.List; @@ -9,24 +9,24 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import tech.jhipster.lite.common.domain.FileUtils; -import tech.jhipster.lite.generator.module.domain.JHipsterModule.JHipsterModuleBuilder; -import tech.jhipster.lite.generator.module.domain.javadependency.ArtifactId; -import tech.jhipster.lite.generator.module.domain.javadependency.CurrentJavaDependenciesVersions; -import tech.jhipster.lite.generator.module.domain.javadependency.DependencyId; -import tech.jhipster.lite.generator.module.domain.javadependency.GroupId; -import tech.jhipster.lite.generator.module.domain.javadependency.JavaDependency; -import tech.jhipster.lite.generator.module.domain.javadependency.JavaDependency.JavaDependencyOptionalValueBuilder; -import tech.jhipster.lite.generator.module.domain.javadependency.JavaDependencyScope; -import tech.jhipster.lite.generator.module.domain.javadependency.JavaDependencyVersion; -import tech.jhipster.lite.generator.module.domain.javadependency.command.AddJavaDependency; -import tech.jhipster.lite.generator.module.domain.javadependency.command.JavaDependenciesCommands; -import tech.jhipster.lite.generator.module.domain.javadependency.command.RemoveJavaDependency; -import tech.jhipster.lite.generator.module.domain.javadependency.command.SetJavaDependencyVersion; -import tech.jhipster.lite.generator.module.domain.javaproperties.SpringProperty; -import tech.jhipster.lite.generator.module.domain.packagejson.VersionSource; -import tech.jhipster.lite.generator.module.domain.properties.JHipsterModuleProperties; -import tech.jhipster.lite.generator.module.domain.properties.JHipsterModulePropertiesDefinition; -import tech.jhipster.lite.generator.module.domain.properties.JHipsterProjectFolder; +import tech.jhipster.lite.module.domain.JHipsterModule.JHipsterModuleBuilder; +import tech.jhipster.lite.module.domain.javadependency.ArtifactId; +import tech.jhipster.lite.module.domain.javadependency.CurrentJavaDependenciesVersions; +import tech.jhipster.lite.module.domain.javadependency.DependencyId; +import tech.jhipster.lite.module.domain.javadependency.GroupId; +import tech.jhipster.lite.module.domain.javadependency.JavaDependency; +import tech.jhipster.lite.module.domain.javadependency.JavaDependency.JavaDependencyOptionalValueBuilder; +import tech.jhipster.lite.module.domain.javadependency.JavaDependencyScope; +import tech.jhipster.lite.module.domain.javadependency.JavaDependencyVersion; +import tech.jhipster.lite.module.domain.javadependency.command.AddJavaDependency; +import tech.jhipster.lite.module.domain.javadependency.command.JavaDependenciesCommands; +import tech.jhipster.lite.module.domain.javadependency.command.RemoveJavaDependency; +import tech.jhipster.lite.module.domain.javadependency.command.SetJavaDependencyVersion; +import tech.jhipster.lite.module.domain.javaproperties.SpringProperty; +import tech.jhipster.lite.module.domain.packagejson.VersionSource; +import tech.jhipster.lite.module.domain.properties.JHipsterModuleProperties; +import tech.jhipster.lite.module.domain.properties.JHipsterModulePropertiesDefinition; +import tech.jhipster.lite.module.domain.properties.JHipsterProjectFolder; public final class JHipsterModulesFixture { diff --git a/src/test/java/tech/jhipster/lite/generator/module/domain/JHipsterSourceTest.java b/src/test/java/tech/jhipster/lite/module/domain/JHipsterSourceTest.java similarity index 95% rename from src/test/java/tech/jhipster/lite/generator/module/domain/JHipsterSourceTest.java rename to src/test/java/tech/jhipster/lite/module/domain/JHipsterSourceTest.java index afb30322471..1c8a7503e4c 100644 --- a/src/test/java/tech/jhipster/lite/generator/module/domain/JHipsterSourceTest.java +++ b/src/test/java/tech/jhipster/lite/module/domain/JHipsterSourceTest.java @@ -1,4 +1,4 @@ -package tech.jhipster.lite.generator.module.domain; +package tech.jhipster.lite.module.domain; import static org.assertj.core.api.Assertions.*; diff --git a/src/test/java/tech/jhipster/lite/generator/module/domain/javadependency/CurrentJavaDependenciesVersionsTest.java b/src/test/java/tech/jhipster/lite/module/domain/javadependency/CurrentJavaDependenciesVersionsTest.java similarity index 72% rename from src/test/java/tech/jhipster/lite/generator/module/domain/javadependency/CurrentJavaDependenciesVersionsTest.java rename to src/test/java/tech/jhipster/lite/module/domain/javadependency/CurrentJavaDependenciesVersionsTest.java index 1ca7f11497b..22db72e0f4a 100644 --- a/src/test/java/tech/jhipster/lite/generator/module/domain/javadependency/CurrentJavaDependenciesVersionsTest.java +++ b/src/test/java/tech/jhipster/lite/module/domain/javadependency/CurrentJavaDependenciesVersionsTest.java @@ -1,7 +1,7 @@ -package tech.jhipster.lite.generator.module.domain.javadependency; +package tech.jhipster.lite.module.domain.javadependency; import static org.assertj.core.api.Assertions.*; -import static tech.jhipster.lite.generator.module.domain.JHipsterModulesFixture.*; +import static tech.jhipster.lite.module.domain.JHipsterModulesFixture.*; import org.junit.jupiter.api.Test; import tech.jhipster.lite.UnitTest; diff --git a/src/test/java/tech/jhipster/lite/generator/module/domain/javadependency/JavaDependencyScopeTest.java b/src/test/java/tech/jhipster/lite/module/domain/javadependency/JavaDependencyScopeTest.java similarity index 93% rename from src/test/java/tech/jhipster/lite/generator/module/domain/javadependency/JavaDependencyScopeTest.java rename to src/test/java/tech/jhipster/lite/module/domain/javadependency/JavaDependencyScopeTest.java index fe750641ddd..22b05e4a0f3 100644 --- a/src/test/java/tech/jhipster/lite/generator/module/domain/javadependency/JavaDependencyScopeTest.java +++ b/src/test/java/tech/jhipster/lite/module/domain/javadependency/JavaDependencyScopeTest.java @@ -1,4 +1,4 @@ -package tech.jhipster.lite.generator.module.domain.javadependency; +package tech.jhipster.lite.module.domain.javadependency; import static org.assertj.core.api.Assertions.*; diff --git a/src/test/java/tech/jhipster/lite/generator/module/domain/javadependency/JavaDependencyTest.java b/src/test/java/tech/jhipster/lite/module/domain/javadependency/JavaDependencyTest.java similarity index 90% rename from src/test/java/tech/jhipster/lite/generator/module/domain/javadependency/JavaDependencyTest.java rename to src/test/java/tech/jhipster/lite/module/domain/javadependency/JavaDependencyTest.java index cd49fd5907c..f23cb03d3c4 100644 --- a/src/test/java/tech/jhipster/lite/generator/module/domain/javadependency/JavaDependencyTest.java +++ b/src/test/java/tech/jhipster/lite/module/domain/javadependency/JavaDependencyTest.java @@ -1,16 +1,16 @@ -package tech.jhipster.lite.generator.module.domain.javadependency; +package tech.jhipster.lite.module.domain.javadependency; import static org.assertj.core.api.Assertions.*; -import static tech.jhipster.lite.generator.module.domain.JHipsterModule.*; -import static tech.jhipster.lite.generator.module.domain.JHipsterModulesFixture.*; +import static tech.jhipster.lite.module.domain.JHipsterModule.*; +import static tech.jhipster.lite.module.domain.JHipsterModulesFixture.*; import java.util.List; import org.junit.jupiter.api.Test; import tech.jhipster.lite.UnitTest; -import tech.jhipster.lite.generator.module.domain.javadependency.command.AddJavaDependency; -import tech.jhipster.lite.generator.module.domain.javadependency.command.JavaDependenciesCommands; -import tech.jhipster.lite.generator.module.domain.javadependency.command.RemoveJavaDependency; -import tech.jhipster.lite.generator.module.domain.javadependency.command.SetJavaDependencyVersion; +import tech.jhipster.lite.module.domain.javadependency.command.AddJavaDependency; +import tech.jhipster.lite.module.domain.javadependency.command.JavaDependenciesCommands; +import tech.jhipster.lite.module.domain.javadependency.command.RemoveJavaDependency; +import tech.jhipster.lite.module.domain.javadependency.command.SetJavaDependencyVersion; @UnitTest class JavaDependencyTest { diff --git a/src/test/java/tech/jhipster/lite/generator/module/domain/javadependency/VersionSlugTest.java b/src/test/java/tech/jhipster/lite/module/domain/javadependency/VersionSlugTest.java similarity index 95% rename from src/test/java/tech/jhipster/lite/generator/module/domain/javadependency/VersionSlugTest.java rename to src/test/java/tech/jhipster/lite/module/domain/javadependency/VersionSlugTest.java index 36b1d79fc9b..90f79c5e386 100644 --- a/src/test/java/tech/jhipster/lite/generator/module/domain/javadependency/VersionSlugTest.java +++ b/src/test/java/tech/jhipster/lite/module/domain/javadependency/VersionSlugTest.java @@ -1,4 +1,4 @@ -package tech.jhipster.lite.generator.module.domain.javadependency; +package tech.jhipster.lite.module.domain.javadependency; import static org.assertj.core.api.Assertions.*; diff --git a/src/test/java/tech/jhipster/lite/generator/module/domain/properties/IndentationTest.java b/src/test/java/tech/jhipster/lite/module/domain/properties/IndentationTest.java similarity index 85% rename from src/test/java/tech/jhipster/lite/generator/module/domain/properties/IndentationTest.java rename to src/test/java/tech/jhipster/lite/module/domain/properties/IndentationTest.java index 597dcb67fb4..b6c663a2e49 100644 --- a/src/test/java/tech/jhipster/lite/generator/module/domain/properties/IndentationTest.java +++ b/src/test/java/tech/jhipster/lite/module/domain/properties/IndentationTest.java @@ -1,10 +1,10 @@ -package tech.jhipster.lite.generator.module.domain.properties; +package tech.jhipster.lite.module.domain.properties; import static org.assertj.core.api.Assertions.*; import org.junit.jupiter.api.Test; import tech.jhipster.lite.UnitTest; -import tech.jhipster.lite.generator.module.domain.Indentation; +import tech.jhipster.lite.module.domain.Indentation; @UnitTest class IndentationTest { diff --git a/src/test/java/tech/jhipster/lite/generator/module/domain/properties/JHipsterBasePackageTest.java b/src/test/java/tech/jhipster/lite/module/domain/properties/JHipsterBasePackageTest.java similarity index 93% rename from src/test/java/tech/jhipster/lite/generator/module/domain/properties/JHipsterBasePackageTest.java rename to src/test/java/tech/jhipster/lite/module/domain/properties/JHipsterBasePackageTest.java index 49e14014194..34f1e6e80fd 100644 --- a/src/test/java/tech/jhipster/lite/generator/module/domain/properties/JHipsterBasePackageTest.java +++ b/src/test/java/tech/jhipster/lite/module/domain/properties/JHipsterBasePackageTest.java @@ -1,4 +1,4 @@ -package tech.jhipster.lite.generator.module.domain.properties; +package tech.jhipster.lite.module.domain.properties; import static org.assertj.core.api.Assertions.*; diff --git a/src/test/java/tech/jhipster/lite/generator/module/domain/properties/JHipsterModulePropertiesDefinitionTest.java b/src/test/java/tech/jhipster/lite/module/domain/properties/JHipsterModulePropertiesDefinitionTest.java similarity index 78% rename from src/test/java/tech/jhipster/lite/generator/module/domain/properties/JHipsterModulePropertiesDefinitionTest.java rename to src/test/java/tech/jhipster/lite/module/domain/properties/JHipsterModulePropertiesDefinitionTest.java index df2550d000d..df239b2fb3d 100644 --- a/src/test/java/tech/jhipster/lite/generator/module/domain/properties/JHipsterModulePropertiesDefinitionTest.java +++ b/src/test/java/tech/jhipster/lite/module/domain/properties/JHipsterModulePropertiesDefinitionTest.java @@ -1,7 +1,7 @@ -package tech.jhipster.lite.generator.module.domain.properties; +package tech.jhipster.lite.module.domain.properties; import static org.assertj.core.api.Assertions.*; -import static tech.jhipster.lite.generator.module.domain.properties.JHipsterModulePropertyDefinition.*; +import static tech.jhipster.lite.module.domain.properties.JHipsterModulePropertyDefinition.*; import java.util.Collection; import org.junit.jupiter.api.Test; diff --git a/src/test/java/tech/jhipster/lite/generator/module/domain/properties/JHipsterModulePropertiesTest.java b/src/test/java/tech/jhipster/lite/module/domain/properties/JHipsterModulePropertiesTest.java similarity index 97% rename from src/test/java/tech/jhipster/lite/generator/module/domain/properties/JHipsterModulePropertiesTest.java rename to src/test/java/tech/jhipster/lite/module/domain/properties/JHipsterModulePropertiesTest.java index 421e2806df4..1c12d53e630 100644 --- a/src/test/java/tech/jhipster/lite/generator/module/domain/properties/JHipsterModulePropertiesTest.java +++ b/src/test/java/tech/jhipster/lite/module/domain/properties/JHipsterModulePropertiesTest.java @@ -1,4 +1,4 @@ -package tech.jhipster.lite.generator.module.domain.properties; +package tech.jhipster.lite.module.domain.properties; import static org.assertj.core.api.Assertions.*; @@ -9,7 +9,7 @@ import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.ValueSource; import tech.jhipster.lite.UnitTest; -import tech.jhipster.lite.generator.module.domain.Indentation; +import tech.jhipster.lite.module.domain.Indentation; @UnitTest class JHipsterModulePropertiesTest { diff --git a/src/test/java/tech/jhipster/lite/generator/module/domain/properties/JHipsterProjectBaseNameTest.java b/src/test/java/tech/jhipster/lite/module/domain/properties/JHipsterProjectBaseNameTest.java similarity index 93% rename from src/test/java/tech/jhipster/lite/generator/module/domain/properties/JHipsterProjectBaseNameTest.java rename to src/test/java/tech/jhipster/lite/module/domain/properties/JHipsterProjectBaseNameTest.java index bf25c0008dc..948b051b43b 100644 --- a/src/test/java/tech/jhipster/lite/generator/module/domain/properties/JHipsterProjectBaseNameTest.java +++ b/src/test/java/tech/jhipster/lite/module/domain/properties/JHipsterProjectBaseNameTest.java @@ -1,4 +1,4 @@ -package tech.jhipster.lite.generator.module.domain.properties; +package tech.jhipster.lite.module.domain.properties; import static org.assertj.core.api.Assertions.*; diff --git a/src/test/java/tech/jhipster/lite/generator/module/domain/properties/JHipsterProjectNameTest.java b/src/test/java/tech/jhipster/lite/module/domain/properties/JHipsterProjectNameTest.java similarity index 90% rename from src/test/java/tech/jhipster/lite/generator/module/domain/properties/JHipsterProjectNameTest.java rename to src/test/java/tech/jhipster/lite/module/domain/properties/JHipsterProjectNameTest.java index 1f1412f09a6..0dc06a43e2a 100644 --- a/src/test/java/tech/jhipster/lite/generator/module/domain/properties/JHipsterProjectNameTest.java +++ b/src/test/java/tech/jhipster/lite/module/domain/properties/JHipsterProjectNameTest.java @@ -1,4 +1,4 @@ -package tech.jhipster.lite.generator.module.domain.properties; +package tech.jhipster.lite.module.domain.properties; import static org.assertj.core.api.Assertions.*; diff --git a/src/test/java/tech/jhipster/lite/generator/module/domain/properties/JHipsterPropertyDescriptionTest.java b/src/test/java/tech/jhipster/lite/module/domain/properties/JHipsterPropertyDescriptionTest.java similarity index 90% rename from src/test/java/tech/jhipster/lite/generator/module/domain/properties/JHipsterPropertyDescriptionTest.java rename to src/test/java/tech/jhipster/lite/module/domain/properties/JHipsterPropertyDescriptionTest.java index 8fdb5cf105d..ad7f0c2a2c0 100644 --- a/src/test/java/tech/jhipster/lite/generator/module/domain/properties/JHipsterPropertyDescriptionTest.java +++ b/src/test/java/tech/jhipster/lite/module/domain/properties/JHipsterPropertyDescriptionTest.java @@ -1,4 +1,4 @@ -package tech.jhipster.lite.generator.module.domain.properties; +package tech.jhipster.lite.module.domain.properties; import static org.assertj.core.api.Assertions.*; diff --git a/src/test/java/tech/jhipster/lite/generator/module/domain/properties/JHipsterPropertyExampleTest.java b/src/test/java/tech/jhipster/lite/module/domain/properties/JHipsterPropertyExampleTest.java similarity index 90% rename from src/test/java/tech/jhipster/lite/generator/module/domain/properties/JHipsterPropertyExampleTest.java rename to src/test/java/tech/jhipster/lite/module/domain/properties/JHipsterPropertyExampleTest.java index 07f3dbc43d6..e8d15ba48ce 100644 --- a/src/test/java/tech/jhipster/lite/generator/module/domain/properties/JHipsterPropertyExampleTest.java +++ b/src/test/java/tech/jhipster/lite/module/domain/properties/JHipsterPropertyExampleTest.java @@ -1,4 +1,4 @@ -package tech.jhipster.lite.generator.module.domain.properties; +package tech.jhipster.lite.module.domain.properties; import static org.assertj.core.api.Assertions.*; diff --git a/src/test/java/tech/jhipster/lite/generator/module/domain/replacement/JHipsterModuleMandatoryReplacementsTest.java b/src/test/java/tech/jhipster/lite/module/domain/replacement/JHipsterModuleMandatoryReplacementsTest.java similarity index 86% rename from src/test/java/tech/jhipster/lite/generator/module/domain/replacement/JHipsterModuleMandatoryReplacementsTest.java rename to src/test/java/tech/jhipster/lite/module/domain/replacement/JHipsterModuleMandatoryReplacementsTest.java index 2b2194c27d9..07c4d25f152 100644 --- a/src/test/java/tech/jhipster/lite/generator/module/domain/replacement/JHipsterModuleMandatoryReplacementsTest.java +++ b/src/test/java/tech/jhipster/lite/module/domain/replacement/JHipsterModuleMandatoryReplacementsTest.java @@ -1,17 +1,17 @@ -package tech.jhipster.lite.generator.module.domain.replacement; +package tech.jhipster.lite.module.domain.replacement; import static org.assertj.core.api.Assertions.*; import static tech.jhipster.lite.TestUtils.*; -import static tech.jhipster.lite.generator.module.domain.JHipsterModule.*; -import static tech.jhipster.lite.generator.module.infrastructure.secondary.JHipsterModulesAssertions.*; +import static tech.jhipster.lite.module.domain.JHipsterModule.*; +import static tech.jhipster.lite.module.infrastructure.secondary.JHipsterModulesAssertions.*; import org.junit.jupiter.api.Test; import tech.jhipster.lite.TestUtils; import tech.jhipster.lite.UnitTest; -import tech.jhipster.lite.generator.module.domain.JHipsterModule.JHipsterModuleBuilder; -import tech.jhipster.lite.generator.module.domain.properties.JHipsterModuleProperties; -import tech.jhipster.lite.generator.module.domain.properties.JHipsterProjectFolder; import tech.jhipster.lite.generator.project.domain.Project; +import tech.jhipster.lite.module.domain.JHipsterModule.JHipsterModuleBuilder; +import tech.jhipster.lite.module.domain.properties.JHipsterModuleProperties; +import tech.jhipster.lite.module.domain.properties.JHipsterProjectFolder; @UnitTest class JHipsterModuleMandatoryReplacementsTest { diff --git a/src/test/java/tech/jhipster/lite/generator/module/domain/replacement/JHipsterModuleOptionalReplacementsTest.java b/src/test/java/tech/jhipster/lite/module/domain/replacement/JHipsterModuleOptionalReplacementsTest.java similarity index 75% rename from src/test/java/tech/jhipster/lite/generator/module/domain/replacement/JHipsterModuleOptionalReplacementsTest.java rename to src/test/java/tech/jhipster/lite/module/domain/replacement/JHipsterModuleOptionalReplacementsTest.java index 62a42643272..88e7eb0e09e 100644 --- a/src/test/java/tech/jhipster/lite/generator/module/domain/replacement/JHipsterModuleOptionalReplacementsTest.java +++ b/src/test/java/tech/jhipster/lite/module/domain/replacement/JHipsterModuleOptionalReplacementsTest.java @@ -1,16 +1,16 @@ -package tech.jhipster.lite.generator.module.domain.replacement; +package tech.jhipster.lite.module.domain.replacement; import static org.assertj.core.api.Assertions.*; -import static tech.jhipster.lite.generator.module.domain.JHipsterModule.*; +import static tech.jhipster.lite.module.domain.JHipsterModule.*; import ch.qos.logback.classic.Level; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import tech.jhipster.lite.LogsSpy; import tech.jhipster.lite.UnitTest; -import tech.jhipster.lite.generator.module.domain.JHipsterModule.JHipsterModuleBuilder; -import tech.jhipster.lite.generator.module.domain.properties.JHipsterModuleProperties; -import tech.jhipster.lite.generator.module.domain.properties.JHipsterProjectFolder; +import tech.jhipster.lite.module.domain.JHipsterModule.JHipsterModuleBuilder; +import tech.jhipster.lite.module.domain.properties.JHipsterModuleProperties; +import tech.jhipster.lite.module.domain.properties.JHipsterProjectFolder; @UnitTest @ExtendWith(LogsSpy.class) diff --git a/src/test/java/tech/jhipster/lite/generator/module/domain/replacement/RegexMatcherTest.java b/src/test/java/tech/jhipster/lite/module/domain/replacement/RegexMatcherTest.java similarity index 90% rename from src/test/java/tech/jhipster/lite/generator/module/domain/replacement/RegexMatcherTest.java rename to src/test/java/tech/jhipster/lite/module/domain/replacement/RegexMatcherTest.java index 2df6adf3040..b8a0ccc37ab 100644 --- a/src/test/java/tech/jhipster/lite/generator/module/domain/replacement/RegexMatcherTest.java +++ b/src/test/java/tech/jhipster/lite/module/domain/replacement/RegexMatcherTest.java @@ -1,4 +1,4 @@ -package tech.jhipster.lite.generator.module.domain.replacement; +package tech.jhipster.lite.module.domain.replacement; import static org.assertj.core.api.Assertions.*; diff --git a/src/test/java/tech/jhipster/lite/generator/module/infrastructure/primary/JHipsterModuleApplicationControllerTest.java b/src/test/java/tech/jhipster/lite/module/infrastructure/primary/JHipsterModuleApplicationControllerTest.java similarity index 84% rename from src/test/java/tech/jhipster/lite/generator/module/infrastructure/primary/JHipsterModuleApplicationControllerTest.java rename to src/test/java/tech/jhipster/lite/module/infrastructure/primary/JHipsterModuleApplicationControllerTest.java index 2dfd2f8ad27..530fdf7d9c3 100644 --- a/src/test/java/tech/jhipster/lite/generator/module/infrastructure/primary/JHipsterModuleApplicationControllerTest.java +++ b/src/test/java/tech/jhipster/lite/module/infrastructure/primary/JHipsterModuleApplicationControllerTest.java @@ -1,8 +1,8 @@ -package tech.jhipster.lite.generator.module.infrastructure.primary; +package tech.jhipster.lite.module.infrastructure.primary; import static org.assertj.core.api.Assertions.*; import static org.mockito.Mockito.*; -import static tech.jhipster.lite.generator.module.infrastructure.primary.JHipsterModulesResourceFixture.*; +import static tech.jhipster.lite.module.infrastructure.primary.JHipsterModulesResourceFixture.*; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; @@ -11,7 +11,7 @@ import org.springframework.mock.web.MockHttpServletResponse; import tech.jhipster.lite.JsonHelper; import tech.jhipster.lite.UnitTest; -import tech.jhipster.lite.generator.module.application.JHipsterModulesApplicationService; +import tech.jhipster.lite.module.application.JHipsterModulesApplicationService; @UnitTest class JHipsterModuleApplicationControllerTest { diff --git a/src/test/java/tech/jhipster/lite/generator/module/infrastructure/primary/JHipsterModulePropertiesDefinitionControllerTest.java b/src/test/java/tech/jhipster/lite/module/infrastructure/primary/JHipsterModulePropertiesDefinitionControllerTest.java similarity index 85% rename from src/test/java/tech/jhipster/lite/generator/module/infrastructure/primary/JHipsterModulePropertiesDefinitionControllerTest.java rename to src/test/java/tech/jhipster/lite/module/infrastructure/primary/JHipsterModulePropertiesDefinitionControllerTest.java index 0934ceb0705..434ad22e92c 100644 --- a/src/test/java/tech/jhipster/lite/generator/module/infrastructure/primary/JHipsterModulePropertiesDefinitionControllerTest.java +++ b/src/test/java/tech/jhipster/lite/module/infrastructure/primary/JHipsterModulePropertiesDefinitionControllerTest.java @@ -1,7 +1,7 @@ -package tech.jhipster.lite.generator.module.infrastructure.primary; +package tech.jhipster.lite.module.infrastructure.primary; import static org.assertj.core.api.Assertions.*; -import static tech.jhipster.lite.generator.module.infrastructure.primary.JHipsterModulesResourceFixture.*; +import static tech.jhipster.lite.module.infrastructure.primary.JHipsterModulesResourceFixture.*; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.ValueSource; diff --git a/src/test/java/tech/jhipster/lite/generator/module/infrastructure/primary/JHipsterModulesResourceFixture.java b/src/test/java/tech/jhipster/lite/module/infrastructure/primary/JHipsterModulesResourceFixture.java similarity index 90% rename from src/test/java/tech/jhipster/lite/generator/module/infrastructure/primary/JHipsterModulesResourceFixture.java rename to src/test/java/tech/jhipster/lite/module/infrastructure/primary/JHipsterModulesResourceFixture.java index 2c5da932b0c..10d11816c75 100644 --- a/src/test/java/tech/jhipster/lite/generator/module/infrastructure/primary/JHipsterModulesResourceFixture.java +++ b/src/test/java/tech/jhipster/lite/module/infrastructure/primary/JHipsterModulesResourceFixture.java @@ -1,8 +1,8 @@ -package tech.jhipster.lite.generator.module.infrastructure.primary; +package tech.jhipster.lite.module.infrastructure.primary; import java.util.List; -import tech.jhipster.lite.generator.module.domain.JHipsterModuleFactory; -import tech.jhipster.lite.generator.module.domain.JHipsterModulesFixture; +import tech.jhipster.lite.module.domain.JHipsterModuleFactory; +import tech.jhipster.lite.module.domain.JHipsterModulesFixture; final class JHipsterModulesResourceFixture { diff --git a/src/test/java/tech/jhipster/lite/generator/module/infrastructure/primary/JHipsterModulesResourcesTest.java b/src/test/java/tech/jhipster/lite/module/infrastructure/primary/JHipsterModulesResourcesTest.java similarity index 73% rename from src/test/java/tech/jhipster/lite/generator/module/infrastructure/primary/JHipsterModulesResourcesTest.java rename to src/test/java/tech/jhipster/lite/module/infrastructure/primary/JHipsterModulesResourcesTest.java index 43bc48c7ffb..c8d6864f746 100644 --- a/src/test/java/tech/jhipster/lite/generator/module/infrastructure/primary/JHipsterModulesResourcesTest.java +++ b/src/test/java/tech/jhipster/lite/module/infrastructure/primary/JHipsterModulesResourcesTest.java @@ -1,7 +1,7 @@ -package tech.jhipster.lite.generator.module.infrastructure.primary; +package tech.jhipster.lite.module.infrastructure.primary; import static org.assertj.core.api.Assertions.*; -import static tech.jhipster.lite.generator.module.infrastructure.primary.JHipsterModulesResourceFixture.*; +import static tech.jhipster.lite.module.infrastructure.primary.JHipsterModulesResourceFixture.*; import java.util.List; import org.junit.jupiter.api.Test; diff --git a/src/test/java/tech/jhipster/lite/generator/module/infrastructure/primary/JHipsterProjectQueryControllerTest.java b/src/test/java/tech/jhipster/lite/module/infrastructure/primary/JHipsterProjectQueryControllerTest.java similarity index 84% rename from src/test/java/tech/jhipster/lite/generator/module/infrastructure/primary/JHipsterProjectQueryControllerTest.java rename to src/test/java/tech/jhipster/lite/module/infrastructure/primary/JHipsterProjectQueryControllerTest.java index 5d2d3b35a08..ee84598bb8e 100644 --- a/src/test/java/tech/jhipster/lite/generator/module/infrastructure/primary/JHipsterProjectQueryControllerTest.java +++ b/src/test/java/tech/jhipster/lite/module/infrastructure/primary/JHipsterProjectQueryControllerTest.java @@ -1,8 +1,8 @@ -package tech.jhipster.lite.generator.module.infrastructure.primary; +package tech.jhipster.lite.module.infrastructure.primary; import static org.assertj.core.api.Assertions.*; import static org.mockito.Mockito.*; -import static tech.jhipster.lite.generator.module.infrastructure.primary.JHipsterModulesResourceFixture.*; +import static tech.jhipster.lite.module.infrastructure.primary.JHipsterModulesResourceFixture.*; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; @@ -11,7 +11,7 @@ import org.springframework.mock.web.MockHttpServletResponse; import tech.jhipster.lite.JsonHelper; import tech.jhipster.lite.UnitTest; -import tech.jhipster.lite.generator.module.application.JHipsterModulesApplicationService; +import tech.jhipster.lite.module.application.JHipsterModulesApplicationService; @UnitTest class JHipsterProjectQueryControllerTest { diff --git a/src/test/java/tech/jhipster/lite/generator/module/infrastructure/primary/RestJHipsterModulePropertiesDefinitionTest.java b/src/test/java/tech/jhipster/lite/module/infrastructure/primary/RestJHipsterModulePropertiesDefinitionTest.java similarity index 91% rename from src/test/java/tech/jhipster/lite/generator/module/infrastructure/primary/RestJHipsterModulePropertiesDefinitionTest.java rename to src/test/java/tech/jhipster/lite/module/infrastructure/primary/RestJHipsterModulePropertiesDefinitionTest.java index eba6f539649..e96c4ded203 100644 --- a/src/test/java/tech/jhipster/lite/generator/module/infrastructure/primary/RestJHipsterModulePropertiesDefinitionTest.java +++ b/src/test/java/tech/jhipster/lite/module/infrastructure/primary/RestJHipsterModulePropertiesDefinitionTest.java @@ -1,11 +1,11 @@ -package tech.jhipster.lite.generator.module.infrastructure.primary; +package tech.jhipster.lite.module.infrastructure.primary; import static org.assertj.core.api.Assertions.*; import org.junit.jupiter.api.Test; import tech.jhipster.lite.JsonHelper; import tech.jhipster.lite.UnitTest; -import tech.jhipster.lite.generator.module.domain.JHipsterModulesFixture; +import tech.jhipster.lite.module.domain.JHipsterModulesFixture; @UnitTest class RestJHipsterModulePropertiesDefinitionTest { diff --git a/src/test/java/tech/jhipster/lite/generator/module/infrastructure/primary/RestJHipsterModulePropertiesTest.java b/src/test/java/tech/jhipster/lite/module/infrastructure/primary/RestJHipsterModulePropertiesTest.java similarity index 85% rename from src/test/java/tech/jhipster/lite/generator/module/infrastructure/primary/RestJHipsterModulePropertiesTest.java rename to src/test/java/tech/jhipster/lite/module/infrastructure/primary/RestJHipsterModulePropertiesTest.java index 3ff75f787ea..6d37faaae74 100644 --- a/src/test/java/tech/jhipster/lite/generator/module/infrastructure/primary/RestJHipsterModulePropertiesTest.java +++ b/src/test/java/tech/jhipster/lite/module/infrastructure/primary/RestJHipsterModulePropertiesTest.java @@ -1,7 +1,7 @@ -package tech.jhipster.lite.generator.module.infrastructure.primary; +package tech.jhipster.lite.module.infrastructure.primary; import static org.assertj.core.api.Assertions.*; -import static tech.jhipster.lite.generator.module.domain.JHipsterModulesFixture.*; +import static tech.jhipster.lite.module.domain.JHipsterModulesFixture.*; import org.junit.jupiter.api.Test; import tech.jhipster.lite.JsonHelper; diff --git a/src/test/java/tech/jhipster/lite/generator/module/infrastructure/primary/RestJHipsterModulesTest.java b/src/test/java/tech/jhipster/lite/module/infrastructure/primary/RestJHipsterModulesTest.java similarity index 91% rename from src/test/java/tech/jhipster/lite/generator/module/infrastructure/primary/RestJHipsterModulesTest.java rename to src/test/java/tech/jhipster/lite/module/infrastructure/primary/RestJHipsterModulesTest.java index c3f2ecac08b..a5a0fb98abd 100644 --- a/src/test/java/tech/jhipster/lite/generator/module/infrastructure/primary/RestJHipsterModulesTest.java +++ b/src/test/java/tech/jhipster/lite/module/infrastructure/primary/RestJHipsterModulesTest.java @@ -1,7 +1,7 @@ -package tech.jhipster.lite.generator.module.infrastructure.primary; +package tech.jhipster.lite.module.infrastructure.primary; import static org.assertj.core.api.Assertions.*; -import static tech.jhipster.lite.generator.module.infrastructure.primary.JHipsterModulesResourceFixture.*; +import static tech.jhipster.lite.module.infrastructure.primary.JHipsterModulesResourceFixture.*; import org.junit.jupiter.api.Test; import tech.jhipster.lite.JsonHelper; diff --git a/src/test/java/tech/jhipster/lite/generator/module/infrastructure/secondary/FileSystemCurrentJavaDependenciesVersionsRepositoryTest.java b/src/test/java/tech/jhipster/lite/module/infrastructure/secondary/FileSystemCurrentJavaDependenciesVersionsRepositoryTest.java similarity index 89% rename from src/test/java/tech/jhipster/lite/generator/module/infrastructure/secondary/FileSystemCurrentJavaDependenciesVersionsRepositoryTest.java rename to src/test/java/tech/jhipster/lite/module/infrastructure/secondary/FileSystemCurrentJavaDependenciesVersionsRepositoryTest.java index 46712017fba..87343212340 100644 --- a/src/test/java/tech/jhipster/lite/generator/module/infrastructure/secondary/FileSystemCurrentJavaDependenciesVersionsRepositoryTest.java +++ b/src/test/java/tech/jhipster/lite/module/infrastructure/secondary/FileSystemCurrentJavaDependenciesVersionsRepositoryTest.java @@ -1,4 +1,4 @@ -package tech.jhipster.lite.generator.module.infrastructure.secondary; +package tech.jhipster.lite.module.infrastructure.secondary; import static org.assertj.core.api.Assertions.*; diff --git a/src/test/java/tech/jhipster/lite/generator/module/infrastructure/secondary/FileSystemJHipsterModuleFilesTest.java b/src/test/java/tech/jhipster/lite/module/infrastructure/secondary/FileSystemJHipsterModuleFilesTest.java similarity index 79% rename from src/test/java/tech/jhipster/lite/generator/module/infrastructure/secondary/FileSystemJHipsterModuleFilesTest.java rename to src/test/java/tech/jhipster/lite/module/infrastructure/secondary/FileSystemJHipsterModuleFilesTest.java index 031eb5b0b88..21757d69f12 100644 --- a/src/test/java/tech/jhipster/lite/generator/module/infrastructure/secondary/FileSystemJHipsterModuleFilesTest.java +++ b/src/test/java/tech/jhipster/lite/module/infrastructure/secondary/FileSystemJHipsterModuleFilesTest.java @@ -1,8 +1,8 @@ -package tech.jhipster.lite.generator.module.infrastructure.secondary; +package tech.jhipster.lite.module.infrastructure.secondary; import static org.assertj.core.api.Assertions.*; -import static tech.jhipster.lite.generator.module.domain.JHipsterModule.*; -import static tech.jhipster.lite.generator.module.domain.JHipsterModule.from; +import static tech.jhipster.lite.module.domain.JHipsterModule.*; +import static tech.jhipster.lite.module.domain.JHipsterModule.from; import ch.qos.logback.classic.Level; import java.nio.file.Paths; @@ -13,9 +13,9 @@ import tech.jhipster.lite.common.domain.FileUtils; import tech.jhipster.lite.common.infrastructure.secondary.FileSystemProjectFilesReader; import tech.jhipster.lite.error.domain.GeneratorException; -import tech.jhipster.lite.generator.module.domain.JHipsterModule; -import tech.jhipster.lite.generator.module.domain.properties.JHipsterModuleProperties; -import tech.jhipster.lite.generator.module.domain.properties.JHipsterProjectFolder; +import tech.jhipster.lite.module.domain.JHipsterModule; +import tech.jhipster.lite.module.domain.properties.JHipsterModuleProperties; +import tech.jhipster.lite.module.domain.properties.JHipsterProjectFolder; @UnitTest @ExtendWith(LogsSpy.class) diff --git a/src/test/java/tech/jhipster/lite/generator/module/infrastructure/secondary/FileSystemJHipsterModulesRepositoryTest.java b/src/test/java/tech/jhipster/lite/module/infrastructure/secondary/FileSystemJHipsterModulesRepositoryTest.java similarity index 92% rename from src/test/java/tech/jhipster/lite/generator/module/infrastructure/secondary/FileSystemJHipsterModulesRepositoryTest.java rename to src/test/java/tech/jhipster/lite/module/infrastructure/secondary/FileSystemJHipsterModulesRepositoryTest.java index 3708a9bdf69..85b2f8aadbf 100644 --- a/src/test/java/tech/jhipster/lite/generator/module/infrastructure/secondary/FileSystemJHipsterModulesRepositoryTest.java +++ b/src/test/java/tech/jhipster/lite/module/infrastructure/secondary/FileSystemJHipsterModulesRepositoryTest.java @@ -1,14 +1,14 @@ -package tech.jhipster.lite.generator.module.infrastructure.secondary; +package tech.jhipster.lite.module.infrastructure.secondary; -import static tech.jhipster.lite.generator.module.domain.JHipsterModulesFixture.*; -import static tech.jhipster.lite.generator.module.infrastructure.secondary.JHipsterModulesAssertions.*; +import static tech.jhipster.lite.module.domain.JHipsterModulesFixture.*; +import static tech.jhipster.lite.module.infrastructure.secondary.JHipsterModulesAssertions.*; import ch.qos.logback.classic.Level; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import tech.jhipster.lite.LogsSpy; import tech.jhipster.lite.UnitTest; -import tech.jhipster.lite.generator.module.domain.JHipsterModule; +import tech.jhipster.lite.module.domain.JHipsterModule; @UnitTest @ExtendWith(LogsSpy.class) diff --git a/src/test/java/tech/jhipster/lite/generator/module/infrastructure/secondary/FileSystemJavaDependenciesCommandsHandlerTest.java b/src/test/java/tech/jhipster/lite/module/infrastructure/secondary/FileSystemJavaDependenciesCommandsHandlerTest.java similarity index 69% rename from src/test/java/tech/jhipster/lite/generator/module/infrastructure/secondary/FileSystemJavaDependenciesCommandsHandlerTest.java rename to src/test/java/tech/jhipster/lite/module/infrastructure/secondary/FileSystemJavaDependenciesCommandsHandlerTest.java index 02108c17167..361c92528cf 100644 --- a/src/test/java/tech/jhipster/lite/generator/module/infrastructure/secondary/FileSystemJavaDependenciesCommandsHandlerTest.java +++ b/src/test/java/tech/jhipster/lite/module/infrastructure/secondary/FileSystemJavaDependenciesCommandsHandlerTest.java @@ -1,13 +1,13 @@ -package tech.jhipster.lite.generator.module.infrastructure.secondary; +package tech.jhipster.lite.module.infrastructure.secondary; import static org.assertj.core.api.Assertions.*; -import static tech.jhipster.lite.generator.module.domain.JHipsterModulesFixture.*; +import static tech.jhipster.lite.module.domain.JHipsterModulesFixture.*; import org.junit.jupiter.api.Test; import tech.jhipster.lite.UnitTest; -import tech.jhipster.lite.generator.module.domain.Indentation; -import tech.jhipster.lite.generator.module.domain.javadependency.command.JavaDependenciesCommands; -import tech.jhipster.lite.generator.module.domain.properties.JHipsterProjectFolder; +import tech.jhipster.lite.module.domain.Indentation; +import tech.jhipster.lite.module.domain.javadependency.command.JavaDependenciesCommands; +import tech.jhipster.lite.module.domain.properties.JHipsterProjectFolder; @UnitTest class FileSystemJavaDependenciesCommandsHandlerTest { diff --git a/src/test/java/tech/jhipster/lite/generator/module/infrastructure/secondary/FileSystemPackageJsonHandlerTest.java b/src/test/java/tech/jhipster/lite/module/infrastructure/secondary/FileSystemPackageJsonHandlerTest.java similarity index 94% rename from src/test/java/tech/jhipster/lite/generator/module/infrastructure/secondary/FileSystemPackageJsonHandlerTest.java rename to src/test/java/tech/jhipster/lite/module/infrastructure/secondary/FileSystemPackageJsonHandlerTest.java index 60a429f0da8..3fc4f1514cb 100644 --- a/src/test/java/tech/jhipster/lite/generator/module/infrastructure/secondary/FileSystemPackageJsonHandlerTest.java +++ b/src/test/java/tech/jhipster/lite/module/infrastructure/secondary/FileSystemPackageJsonHandlerTest.java @@ -1,10 +1,10 @@ -package tech.jhipster.lite.generator.module.infrastructure.secondary; +package tech.jhipster.lite.module.infrastructure.secondary; import static org.assertj.core.api.Assertions.*; import static org.mockito.ArgumentMatchers.*; import static org.mockito.Mockito.*; -import static tech.jhipster.lite.generator.module.domain.JHipsterModule.*; -import static tech.jhipster.lite.generator.module.domain.JHipsterModulesFixture.*; +import static tech.jhipster.lite.module.domain.JHipsterModule.*; +import static tech.jhipster.lite.module.domain.JHipsterModulesFixture.*; import java.io.IOException; import java.nio.file.Files; @@ -18,14 +18,14 @@ import org.mockito.junit.jupiter.MockitoExtension; import tech.jhipster.lite.UnitTest; import tech.jhipster.lite.common.domain.FileUtils; -import tech.jhipster.lite.generator.module.domain.Indentation; -import tech.jhipster.lite.generator.module.domain.packagejson.JHipsterModulePackageJson; -import tech.jhipster.lite.generator.module.domain.packagejson.JHipsterModulePackageJson.JHipsterModulePackageJsonBuilder; -import tech.jhipster.lite.generator.module.domain.packagejson.VersionSource; -import tech.jhipster.lite.generator.module.domain.properties.JHipsterProjectFolder; import tech.jhipster.lite.generator.npm.domain.NpmVersion; import tech.jhipster.lite.generator.npm.domain.NpmVersionSource; import tech.jhipster.lite.generator.npm.domain.NpmVersions; +import tech.jhipster.lite.module.domain.Indentation; +import tech.jhipster.lite.module.domain.packagejson.JHipsterModulePackageJson; +import tech.jhipster.lite.module.domain.packagejson.JHipsterModulePackageJson.JHipsterModulePackageJsonBuilder; +import tech.jhipster.lite.module.domain.packagejson.VersionSource; +import tech.jhipster.lite.module.domain.properties.JHipsterProjectFolder; @UnitTest @SuppressWarnings("java:S5976") diff --git a/src/test/java/tech/jhipster/lite/generator/module/infrastructure/secondary/FileSystemProjectJavaDependenciesRepositoryTest.java b/src/test/java/tech/jhipster/lite/module/infrastructure/secondary/FileSystemProjectJavaDependenciesRepositoryTest.java similarity index 74% rename from src/test/java/tech/jhipster/lite/generator/module/infrastructure/secondary/FileSystemProjectJavaDependenciesRepositoryTest.java rename to src/test/java/tech/jhipster/lite/module/infrastructure/secondary/FileSystemProjectJavaDependenciesRepositoryTest.java index 05ce1f9d923..4e9edbba7fe 100644 --- a/src/test/java/tech/jhipster/lite/generator/module/infrastructure/secondary/FileSystemProjectJavaDependenciesRepositoryTest.java +++ b/src/test/java/tech/jhipster/lite/module/infrastructure/secondary/FileSystemProjectJavaDependenciesRepositoryTest.java @@ -1,21 +1,21 @@ -package tech.jhipster.lite.generator.module.infrastructure.secondary; +package tech.jhipster.lite.module.infrastructure.secondary; import static org.assertj.core.api.Assertions.*; import org.junit.jupiter.api.Test; import tech.jhipster.lite.UnitTest; import tech.jhipster.lite.error.domain.GeneratorException; -import tech.jhipster.lite.generator.module.domain.javadependency.ArtifactId; -import tech.jhipster.lite.generator.module.domain.javadependency.DependencyId; -import tech.jhipster.lite.generator.module.domain.javadependency.GroupId; -import tech.jhipster.lite.generator.module.domain.javadependency.JavaDependencies; -import tech.jhipster.lite.generator.module.domain.javadependency.JavaDependenciesVersions; -import tech.jhipster.lite.generator.module.domain.javadependency.JavaDependency; -import tech.jhipster.lite.generator.module.domain.javadependency.JavaDependencyScope; -import tech.jhipster.lite.generator.module.domain.javadependency.JavaDependencyVersion; -import tech.jhipster.lite.generator.module.domain.javadependency.ProjectJavaDependencies; -import tech.jhipster.lite.generator.module.domain.javadependency.VersionSlug; -import tech.jhipster.lite.generator.module.domain.properties.JHipsterProjectFolder; +import tech.jhipster.lite.module.domain.javadependency.ArtifactId; +import tech.jhipster.lite.module.domain.javadependency.DependencyId; +import tech.jhipster.lite.module.domain.javadependency.GroupId; +import tech.jhipster.lite.module.domain.javadependency.JavaDependencies; +import tech.jhipster.lite.module.domain.javadependency.JavaDependenciesVersions; +import tech.jhipster.lite.module.domain.javadependency.JavaDependency; +import tech.jhipster.lite.module.domain.javadependency.JavaDependencyScope; +import tech.jhipster.lite.module.domain.javadependency.JavaDependencyVersion; +import tech.jhipster.lite.module.domain.javadependency.ProjectJavaDependencies; +import tech.jhipster.lite.module.domain.javadependency.VersionSlug; +import tech.jhipster.lite.module.domain.properties.JHipsterProjectFolder; @UnitTest class FileSystemProjectJavaDependenciesRepositoryTest { diff --git a/src/test/java/tech/jhipster/lite/generator/module/infrastructure/secondary/FileSystemSpringPropertiesCommandsHandlerTest.java b/src/test/java/tech/jhipster/lite/module/infrastructure/secondary/FileSystemSpringPropertiesCommandsHandlerTest.java similarity index 89% rename from src/test/java/tech/jhipster/lite/generator/module/infrastructure/secondary/FileSystemSpringPropertiesCommandsHandlerTest.java rename to src/test/java/tech/jhipster/lite/module/infrastructure/secondary/FileSystemSpringPropertiesCommandsHandlerTest.java index 73f2bbc4417..08d00ad0824 100644 --- a/src/test/java/tech/jhipster/lite/generator/module/infrastructure/secondary/FileSystemSpringPropertiesCommandsHandlerTest.java +++ b/src/test/java/tech/jhipster/lite/module/infrastructure/secondary/FileSystemSpringPropertiesCommandsHandlerTest.java @@ -1,7 +1,7 @@ -package tech.jhipster.lite.generator.module.infrastructure.secondary; +package tech.jhipster.lite.module.infrastructure.secondary; import static org.assertj.core.api.Assertions.*; -import static tech.jhipster.lite.generator.module.domain.JHipsterModulesFixture.*; +import static tech.jhipster.lite.module.domain.JHipsterModulesFixture.*; import java.io.IOException; import java.nio.file.Files; @@ -13,9 +13,9 @@ import org.junit.jupiter.params.provider.ValueSource; import tech.jhipster.lite.UnitTest; import tech.jhipster.lite.common.domain.FileUtils; -import tech.jhipster.lite.generator.module.domain.javaproperties.SpringProperties; -import tech.jhipster.lite.generator.module.domain.javaproperties.SpringProperty; -import tech.jhipster.lite.generator.module.domain.properties.JHipsterProjectFolder; +import tech.jhipster.lite.module.domain.javaproperties.SpringProperties; +import tech.jhipster.lite.module.domain.javaproperties.SpringProperty; +import tech.jhipster.lite.module.domain.properties.JHipsterProjectFolder; @UnitTest class FileSystemSpringPropertiesCommandsHandlerTest { diff --git a/src/test/java/tech/jhipster/lite/generator/module/infrastructure/secondary/JHipsterModulesAssertions.java b/src/test/java/tech/jhipster/lite/module/infrastructure/secondary/JHipsterModulesAssertions.java similarity index 97% rename from src/test/java/tech/jhipster/lite/generator/module/infrastructure/secondary/JHipsterModulesAssertions.java rename to src/test/java/tech/jhipster/lite/module/infrastructure/secondary/JHipsterModulesAssertions.java index 4aa8e810d7a..c4625b82c3a 100644 --- a/src/test/java/tech/jhipster/lite/generator/module/infrastructure/secondary/JHipsterModulesAssertions.java +++ b/src/test/java/tech/jhipster/lite/module/infrastructure/secondary/JHipsterModulesAssertions.java @@ -1,4 +1,4 @@ -package tech.jhipster.lite.generator.module.infrastructure.secondary; +package tech.jhipster.lite.module.infrastructure.secondary; import static org.assertj.core.api.Assertions.*; @@ -12,8 +12,8 @@ import java.util.stream.Stream; import org.assertj.core.api.SoftAssertions; import tech.jhipster.lite.error.domain.Assert; -import tech.jhipster.lite.generator.module.domain.JHipsterModule; -import tech.jhipster.lite.generator.module.domain.properties.JHipsterProjectFolder; +import tech.jhipster.lite.module.domain.JHipsterModule; +import tech.jhipster.lite.module.domain.properties.JHipsterProjectFolder; public final class JHipsterModulesAssertions { diff --git a/src/test/java/tech/jhipster/lite/generator/module/infrastructure/secondary/MavenCommandHandlerTest.java b/src/test/java/tech/jhipster/lite/module/infrastructure/secondary/MavenCommandHandlerTest.java similarity index 93% rename from src/test/java/tech/jhipster/lite/generator/module/infrastructure/secondary/MavenCommandHandlerTest.java rename to src/test/java/tech/jhipster/lite/module/infrastructure/secondary/MavenCommandHandlerTest.java index 2d3d1161ea4..1f0c10b4a46 100644 --- a/src/test/java/tech/jhipster/lite/generator/module/infrastructure/secondary/MavenCommandHandlerTest.java +++ b/src/test/java/tech/jhipster/lite/module/infrastructure/secondary/MavenCommandHandlerTest.java @@ -1,7 +1,7 @@ -package tech.jhipster.lite.generator.module.infrastructure.secondary; +package tech.jhipster.lite.module.infrastructure.secondary; import static org.assertj.core.api.Assertions.*; -import static tech.jhipster.lite.generator.module.domain.JHipsterModulesFixture.*; +import static tech.jhipster.lite.module.domain.JHipsterModulesFixture.*; import java.io.IOException; import java.nio.file.Files; @@ -14,11 +14,11 @@ import tech.jhipster.lite.UnitTest; import tech.jhipster.lite.common.domain.FileUtils; import tech.jhipster.lite.error.domain.GeneratorException; -import tech.jhipster.lite.generator.module.domain.Indentation; -import tech.jhipster.lite.generator.module.domain.javadependency.JavaDependencyVersion; -import tech.jhipster.lite.generator.module.domain.javadependency.command.AddJavaDependency; -import tech.jhipster.lite.generator.module.domain.javadependency.command.RemoveJavaDependency; -import tech.jhipster.lite.generator.module.domain.javadependency.command.SetJavaDependencyVersion; +import tech.jhipster.lite.module.domain.Indentation; +import tech.jhipster.lite.module.domain.javadependency.JavaDependencyVersion; +import tech.jhipster.lite.module.domain.javadependency.command.AddJavaDependency; +import tech.jhipster.lite.module.domain.javadependency.command.RemoveJavaDependency; +import tech.jhipster.lite.module.domain.javadependency.command.SetJavaDependencyVersion; @UnitTest class MavenCommandHandlerTest { diff --git a/src/test/java/tech/jhipster/lite/generator/module/infrastructure/secondary/MavenScopeTest.java b/src/test/java/tech/jhipster/lite/module/infrastructure/secondary/MavenScopeTest.java similarity index 87% rename from src/test/java/tech/jhipster/lite/generator/module/infrastructure/secondary/MavenScopeTest.java rename to src/test/java/tech/jhipster/lite/module/infrastructure/secondary/MavenScopeTest.java index 9a40ccd9a29..49e232604af 100644 --- a/src/test/java/tech/jhipster/lite/generator/module/infrastructure/secondary/MavenScopeTest.java +++ b/src/test/java/tech/jhipster/lite/module/infrastructure/secondary/MavenScopeTest.java @@ -1,4 +1,4 @@ -package tech.jhipster.lite.generator.module.infrastructure.secondary; +package tech.jhipster.lite.module.infrastructure.secondary; import static org.assertj.core.api.Assertions.*; diff --git a/src/test/java/tech/jhipster/lite/generator/module/infrastructure/secondary/PropertiesFileSpringPropertiesHandlerTest.java b/src/test/java/tech/jhipster/lite/module/infrastructure/secondary/PropertiesFileSpringPropertiesHandlerTest.java similarity index 94% rename from src/test/java/tech/jhipster/lite/generator/module/infrastructure/secondary/PropertiesFileSpringPropertiesHandlerTest.java rename to src/test/java/tech/jhipster/lite/module/infrastructure/secondary/PropertiesFileSpringPropertiesHandlerTest.java index 0436e28621c..18a946116ab 100644 --- a/src/test/java/tech/jhipster/lite/generator/module/infrastructure/secondary/PropertiesFileSpringPropertiesHandlerTest.java +++ b/src/test/java/tech/jhipster/lite/module/infrastructure/secondary/PropertiesFileSpringPropertiesHandlerTest.java @@ -1,7 +1,7 @@ -package tech.jhipster.lite.generator.module.infrastructure.secondary; +package tech.jhipster.lite.module.infrastructure.secondary; import static org.assertj.core.api.Assertions.*; -import static tech.jhipster.lite.generator.module.domain.JHipsterModule.*; +import static tech.jhipster.lite.module.domain.JHipsterModule.*; import java.io.IOException; import java.nio.file.Files; diff --git a/src/test/java/tech/jhipster/lite/generator/module/infrastructure/secondary/TestJHipsterModules.java b/src/test/java/tech/jhipster/lite/module/infrastructure/secondary/TestJHipsterModules.java similarity index 87% rename from src/test/java/tech/jhipster/lite/generator/module/infrastructure/secondary/TestJHipsterModules.java rename to src/test/java/tech/jhipster/lite/module/infrastructure/secondary/TestJHipsterModules.java index f2de6e46744..e9a0b1518cd 100644 --- a/src/test/java/tech/jhipster/lite/generator/module/infrastructure/secondary/TestJHipsterModules.java +++ b/src/test/java/tech/jhipster/lite/module/infrastructure/secondary/TestJHipsterModules.java @@ -1,4 +1,4 @@ -package tech.jhipster.lite.generator.module.infrastructure.secondary; +package tech.jhipster.lite.module.infrastructure.secondary; import static org.mockito.Mockito.*; @@ -6,14 +6,14 @@ import tech.jhipster.lite.error.domain.Assert; import tech.jhipster.lite.generator.init.domain.GitRepository; import tech.jhipster.lite.generator.init.domain.InitModuleFactory; -import tech.jhipster.lite.generator.module.application.JHipsterModulesApplicationService; -import tech.jhipster.lite.generator.module.domain.JHipsterModule; -import tech.jhipster.lite.generator.module.domain.JHipsterModuleEvents; -import tech.jhipster.lite.generator.module.domain.JHipsterModuleSlug; -import tech.jhipster.lite.generator.module.domain.JHipsterModuleToApply; -import tech.jhipster.lite.generator.module.domain.properties.JHipsterModuleProperties; import tech.jhipster.lite.generator.npm.infrastructure.secondary.FileSystemNpmVersions; import tech.jhipster.lite.generator.project.domain.Project; +import tech.jhipster.lite.module.application.JHipsterModulesApplicationService; +import tech.jhipster.lite.module.domain.JHipsterModule; +import tech.jhipster.lite.module.domain.JHipsterModuleEvents; +import tech.jhipster.lite.module.domain.JHipsterModuleSlug; +import tech.jhipster.lite.module.domain.JHipsterModuleToApply; +import tech.jhipster.lite.module.domain.properties.JHipsterModuleProperties; public final class TestJHipsterModules {