diff --git a/src/main/java/tech/jhipster/lite/generator/ci/github/actions/infrastructure/primary/rest/GitHubActionsResource.java b/src/main/java/tech/jhipster/lite/generator/ci/github/actions/infrastructure/primary/rest/GitHubActionsResource.java index 5e1af72b0e8..7150970cee6 100644 --- a/src/main/java/tech/jhipster/lite/generator/ci/github/actions/infrastructure/primary/rest/GitHubActionsResource.java +++ b/src/main/java/tech/jhipster/lite/generator/ci/github/actions/infrastructure/primary/rest/GitHubActionsResource.java @@ -14,7 +14,7 @@ import tech.jhipster.lite.technical.infrastructure.primary.annotation.GeneratorStep; @RestController -@RequestMapping("/api/github-actions/") +@RequestMapping("/api/developer-tools/github-actions/") @Tag(name = "Continuous Integration") class GitHubActionsResource { diff --git a/src/main/java/tech/jhipster/lite/generator/client/angular/core/infrastructure/primary/rest/AngularResource.java b/src/main/java/tech/jhipster/lite/generator/client/angular/core/infrastructure/primary/rest/AngularResource.java index 4b9e22c6178..f0800086aca 100644 --- a/src/main/java/tech/jhipster/lite/generator/client/angular/core/infrastructure/primary/rest/AngularResource.java +++ b/src/main/java/tech/jhipster/lite/generator/client/angular/core/infrastructure/primary/rest/AngularResource.java @@ -35,7 +35,7 @@ public void addAngular(@RequestBody ProjectDTO projectDTO) { @Operation(summary = "Add Angular with minimal CSS") @ApiResponse(responseCode = "500", description = "An error occurred while adding Angular with minimal CSS") - @PostMapping("/styled") + @PostMapping("/styles") @GeneratorStep(id = GeneratorAction.ANGULAR_STYLED) public void addStyledAngular(@RequestBody ProjectDTO projectDTO) { Project project = ProjectDTO.toProject(projectDTO); diff --git a/src/main/java/tech/jhipster/lite/generator/client/react/core/infrastructure/primary/rest/ReactResource.java b/src/main/java/tech/jhipster/lite/generator/client/react/core/infrastructure/primary/rest/ReactResource.java index cb685da8638..d5915992645 100644 --- a/src/main/java/tech/jhipster/lite/generator/client/react/core/infrastructure/primary/rest/ReactResource.java +++ b/src/main/java/tech/jhipster/lite/generator/client/react/core/infrastructure/primary/rest/ReactResource.java @@ -35,7 +35,7 @@ public void addReact(@RequestBody ProjectDTO projectDTO) { @Operation(summary = "Add React+Vite with minimal CSS", description = "Add React+Vite with minimal CSS") @ApiResponse(responseCode = "500", description = "An error occurred while adding React+Vite with minimal CSS") - @PostMapping("/styled") + @PostMapping("/styles") @GeneratorStep(id = GeneratorAction.REACT_STYLED) public void addStyledReact(@RequestBody ProjectDTO projectDTO) { Project project = ProjectDTO.toProject(projectDTO); diff --git a/src/main/java/tech/jhipster/lite/generator/client/svelte/core/infrastructure/primary/rest/SvelteResource.java b/src/main/java/tech/jhipster/lite/generator/client/svelte/core/infrastructure/primary/rest/SvelteResource.java index 271d86956b3..956db0649c1 100644 --- a/src/main/java/tech/jhipster/lite/generator/client/svelte/core/infrastructure/primary/rest/SvelteResource.java +++ b/src/main/java/tech/jhipster/lite/generator/client/svelte/core/infrastructure/primary/rest/SvelteResource.java @@ -35,7 +35,7 @@ public void addSvelte(@RequestBody ProjectDTO projectDTO) { @Operation(summary = "Add SvelteKit with minimal CSS") @ApiResponse(responseCode = "500", description = "An error occurred while adding SvelteKit with minimal CSS") - @PostMapping("/styled") + @PostMapping("/styles") @GeneratorStep(id = GeneratorAction.SVEKTEKIT_STYLE) public void addStyledSvelteKit(@RequestBody ProjectDTO projectDTO) { Project project = ProjectDTO.toProject(projectDTO); diff --git a/src/main/java/tech/jhipster/lite/generator/client/vue/core/infrastructure/primary/rest/VueResource.java b/src/main/java/tech/jhipster/lite/generator/client/vue/core/infrastructure/primary/rest/VueResource.java index f4b32e63470..1feb842f826 100644 --- a/src/main/java/tech/jhipster/lite/generator/client/vue/core/infrastructure/primary/rest/VueResource.java +++ b/src/main/java/tech/jhipster/lite/generator/client/vue/core/infrastructure/primary/rest/VueResource.java @@ -35,7 +35,7 @@ public void addVue(@RequestBody ProjectDTO projectDTO) { @Operation(summary = "Add Vue+Vite with minimal CSS", description = "Add Vue+Vite with Minimal CSS") @ApiResponse(responseCode = "500", description = "An error occurred while adding Vue+Vite with minimal CSS") - @PostMapping("/styled") + @PostMapping("/styles") @GeneratorStep(id = GeneratorAction.VUE_STYLED) public void addStyledVue(@RequestBody ProjectDTO projectDTO) { Project project = ProjectDTO.toProject(projectDTO); @@ -44,7 +44,7 @@ public void addStyledVue(@RequestBody ProjectDTO projectDTO) { @Operation(summary = "Add Pinia", description = "Add pinia for state management") @ApiResponse(responseCode = "500", description = "An error occurred while adding Pinia") - @PostMapping("/pinia") + @PostMapping("/stores/pinia") @GeneratorStep(id = GeneratorAction.VUE_PINIA) public void addPinia(@RequestBody ProjectDTO projectDTO) { Project project = ProjectDTO.toProject(projectDTO); 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 be454705fab..0f40ad644af 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 @@ -14,7 +14,7 @@ import tech.jhipster.lite.generator.project.domain.Project; @RestController -@RequestMapping("/api/projects") +@RequestMapping("/api/project-histories") @Tag(name = "History") class HistoryResource { @@ -26,7 +26,7 @@ public HistoryResource(GeneratorHistoryApplicationService generatorHistoryApplic @Operation(summary = "Get project history") @ApiResponse(responseCode = "500", description = "An error occurred while getting history project") - @GetMapping("/history") + @GetMapping public ResponseEntity get( @Parameter(description = "Project path to get history") @RequestParam(value = "folder") String folder ) { diff --git a/src/main/java/tech/jhipster/lite/generator/init/infrastructure/primary/rest/InitResource.java b/src/main/java/tech/jhipster/lite/generator/init/infrastructure/primary/rest/InitResource.java index ec012067d68..5266f5d9a3a 100644 --- a/src/main/java/tech/jhipster/lite/generator/init/infrastructure/primary/rest/InitResource.java +++ b/src/main/java/tech/jhipster/lite/generator/init/infrastructure/primary/rest/InitResource.java @@ -19,7 +19,7 @@ import tech.jhipster.lite.technical.infrastructure.primary.annotation.GeneratorStep; @RestController -@RequestMapping("/api/projects") +@RequestMapping("/api") @Tag(name = "Init") class InitResource { @@ -31,7 +31,7 @@ public InitResource(InitApplicationService initApplicationService) { @Operation(summary = "Init project") @ApiResponse(responseCode = "500", description = "An error occurred while initializing project") - @PostMapping("/init") + @PostMapping("/projects") @GeneratorStep(id = GeneratorAction.INIT) public void init(@RequestBody ProjectDTO projectDTO) { Project project = ProjectDTO.toProject(projectDTO); @@ -40,7 +40,7 @@ public void init(@RequestBody ProjectDTO projectDTO) { @Operation(summary = "Download project") @ApiResponse(responseCode = "500", description = "An error occurred while downloading project") - @PostMapping("/download") + @PostMapping("/project-downloads") @GeneratorStep(id = GeneratorAction.DOWNLOAD) public ResponseEntity download(@RequestBody ProjectDTO projectDTO) { Project project = ProjectDTO.toProject(projectDTO); diff --git a/src/main/java/tech/jhipster/lite/generator/packagemanager/npm/infrastructure/primary/rest/NpmResource.java b/src/main/java/tech/jhipster/lite/generator/packagemanager/npm/infrastructure/primary/rest/NpmResource.java index 9078f02cff6..d584d5cc07a 100644 --- a/src/main/java/tech/jhipster/lite/generator/packagemanager/npm/infrastructure/primary/rest/NpmResource.java +++ b/src/main/java/tech/jhipster/lite/generator/packagemanager/npm/infrastructure/primary/rest/NpmResource.java @@ -14,7 +14,7 @@ import tech.jhipster.lite.technical.infrastructure.primary.annotation.GeneratorStep; @RestController -@RequestMapping("/api/npm") +@RequestMapping("/api/package-managers/npm") @Tag(name = "NPM") class NpmResource { diff --git a/src/main/java/tech/jhipster/lite/generator/packagemanager/npm/infrastructure/secondary/NpmLocalRepository.java b/src/main/java/tech/jhipster/lite/generator/packagemanager/npm/infrastructure/secondary/NpmLocalRepository.java index 02d6f2282b1..40fb3c3eb71 100644 --- a/src/main/java/tech/jhipster/lite/generator/packagemanager/npm/infrastructure/secondary/NpmLocalRepository.java +++ b/src/main/java/tech/jhipster/lite/generator/packagemanager/npm/infrastructure/secondary/NpmLocalRepository.java @@ -34,7 +34,7 @@ public void npmInstall(Project project) { try { this.runProcess(project, Npm.getExecutableCommand(), "install"); } catch (IOException e) { - throw new GeneratorException("Error when running \"npm install\""); + throw new GeneratorException("Error when running \"npm install\"", e); } } diff --git a/src/main/java/tech/jhipster/lite/generator/server/javatool/frontendmaven/infrastructure/primary/rest/FrontendMavenResource.java b/src/main/java/tech/jhipster/lite/generator/server/javatool/frontendmaven/infrastructure/primary/rest/FrontendMavenResource.java index 70e1d55501c..cb83b117ff8 100644 --- a/src/main/java/tech/jhipster/lite/generator/server/javatool/frontendmaven/infrastructure/primary/rest/FrontendMavenResource.java +++ b/src/main/java/tech/jhipster/lite/generator/server/javatool/frontendmaven/infrastructure/primary/rest/FrontendMavenResource.java @@ -14,7 +14,7 @@ import tech.jhipster.lite.technical.infrastructure.primary.annotation.GeneratorStep; @RestController -@RequestMapping("/api/frontend-maven-plugin") +@RequestMapping("/api/developer-tools/frontend-maven-plugin") @Tag(name = "Frontend Maven Plugin") class FrontendMavenResource { diff --git a/src/main/java/tech/jhipster/lite/generator/server/sonar/infrastructure/primary/rest/SonarResource.java b/src/main/java/tech/jhipster/lite/generator/server/sonar/infrastructure/primary/rest/SonarResource.java index 8e26a597f2c..215d76fecb1 100644 --- a/src/main/java/tech/jhipster/lite/generator/server/sonar/infrastructure/primary/rest/SonarResource.java +++ b/src/main/java/tech/jhipster/lite/generator/server/sonar/infrastructure/primary/rest/SonarResource.java @@ -14,7 +14,7 @@ import tech.jhipster.lite.technical.infrastructure.primary.annotation.GeneratorStep; @RestController -@RequestMapping("/api/servers/sonar") +@RequestMapping("/api/developer-tools/sonar") @Tag(name = "Sonar") class SonarResource { diff --git a/src/main/java/tech/jhipster/lite/generator/server/springboot/banner/infrastructure/primary/rest/BannerResource.java b/src/main/java/tech/jhipster/lite/generator/server/springboot/banner/infrastructure/primary/rest/BannerResource.java index 44ca1891a58..374f59e7a04 100644 --- a/src/main/java/tech/jhipster/lite/generator/server/springboot/banner/infrastructure/primary/rest/BannerResource.java +++ b/src/main/java/tech/jhipster/lite/generator/server/springboot/banner/infrastructure/primary/rest/BannerResource.java @@ -14,7 +14,7 @@ import tech.jhipster.lite.technical.infrastructure.primary.annotation.GeneratorStep; @RestController -@RequestMapping("/api/servers/spring-boot/banner") +@RequestMapping("/api/servers/spring-boot/banners") @Tag(name = "Spring Boot") class BannerResource { diff --git a/src/main/java/tech/jhipster/lite/generator/server/springboot/cache/ehcache/infrastructure/primary/rest/EhcacheResource.java b/src/main/java/tech/jhipster/lite/generator/server/springboot/cache/ehcache/infrastructure/primary/rest/EhcacheResource.java index df0042e0632..b44d8c39b0c 100644 --- a/src/main/java/tech/jhipster/lite/generator/server/springboot/cache/ehcache/infrastructure/primary/rest/EhcacheResource.java +++ b/src/main/java/tech/jhipster/lite/generator/server/springboot/cache/ehcache/infrastructure/primary/rest/EhcacheResource.java @@ -14,7 +14,7 @@ import tech.jhipster.lite.technical.infrastructure.primary.annotation.GeneratorStep; @RestController -@RequestMapping("/api/servers/spring-boot/cache/ehcache") +@RequestMapping("/api/servers/spring-boot/caches/ehcache") @Tag(name = "Spring Boot - Cache") class EhcacheResource { diff --git a/src/main/java/tech/jhipster/lite/generator/server/springboot/cache/simple/infrastructure/primary/rest/SpringBootCacheSimpleResource.java b/src/main/java/tech/jhipster/lite/generator/server/springboot/cache/simple/infrastructure/primary/rest/SpringBootCacheSimpleResource.java index 9cfab6d005b..3d4e907830c 100644 --- a/src/main/java/tech/jhipster/lite/generator/server/springboot/cache/simple/infrastructure/primary/rest/SpringBootCacheSimpleResource.java +++ b/src/main/java/tech/jhipster/lite/generator/server/springboot/cache/simple/infrastructure/primary/rest/SpringBootCacheSimpleResource.java @@ -14,7 +14,7 @@ import tech.jhipster.lite.technical.infrastructure.primary.annotation.GeneratorStep; @RestController -@RequestMapping("/api/servers/spring-boot/cache/simple") +@RequestMapping("/api/servers/spring-boot/caches/simple") @Tag(name = "Spring Boot - Cache") class SpringBootCacheSimpleResource { diff --git a/src/main/java/tech/jhipster/lite/generator/server/springboot/dbmigration/flyway/infrastructure/primary/rest/FlywayResource.java b/src/main/java/tech/jhipster/lite/generator/server/springboot/dbmigration/flyway/infrastructure/primary/rest/FlywayResource.java index fe485be1810..f77084e5dc2 100644 --- a/src/main/java/tech/jhipster/lite/generator/server/springboot/dbmigration/flyway/infrastructure/primary/rest/FlywayResource.java +++ b/src/main/java/tech/jhipster/lite/generator/server/springboot/dbmigration/flyway/infrastructure/primary/rest/FlywayResource.java @@ -14,7 +14,7 @@ import tech.jhipster.lite.technical.infrastructure.primary.annotation.GeneratorStep; @RestController -@RequestMapping("/api/servers/spring-boot/databases/migration/flyway") +@RequestMapping("/api/servers/spring-boot/database-migration-tools/flyway") @Tag(name = "Spring Boot - Database Migration") class FlywayResource { @@ -26,7 +26,7 @@ public FlywayResource(FlywayApplicationService flywayApplicationService) { @Operation(summary = "Add Flyway") @ApiResponse(responseCode = "500", description = "An error occurred while adding Flyway") - @PostMapping("/init") + @PostMapping @GeneratorStep(id = GeneratorAction.FLYWAY) public void init(@RequestBody ProjectDTO projectDTO) { Project project = ProjectDTO.toProject(projectDTO); diff --git a/src/main/java/tech/jhipster/lite/generator/server/springboot/dbmigration/liquibase/infrastructure/primary/rest/LiquibaseResource.java b/src/main/java/tech/jhipster/lite/generator/server/springboot/dbmigration/liquibase/infrastructure/primary/rest/LiquibaseResource.java index c9eb9f2e082..bc30756fbbf 100644 --- a/src/main/java/tech/jhipster/lite/generator/server/springboot/dbmigration/liquibase/infrastructure/primary/rest/LiquibaseResource.java +++ b/src/main/java/tech/jhipster/lite/generator/server/springboot/dbmigration/liquibase/infrastructure/primary/rest/LiquibaseResource.java @@ -14,7 +14,7 @@ import tech.jhipster.lite.technical.infrastructure.primary.annotation.GeneratorStep; @RestController -@RequestMapping("/api/servers/spring-boot/databases/migration/liquibase") +@RequestMapping("/api/servers/spring-boot/database-migration-tools/liquibase") @Tag(name = "Spring Boot - Database Migration") class LiquibaseResource { @@ -26,7 +26,7 @@ public LiquibaseResource(LiquibaseApplicationService liquibaseApplicationService @Operation(summary = "Add Liquibase") @ApiResponse(responseCode = "500", description = "An error occurred while adding Liquibase") - @PostMapping("init") + @PostMapping @GeneratorStep(id = GeneratorAction.LIQUIBASE) public void init(@RequestBody ProjectDTO projectDTO) { Project project = ProjectDTO.toProject(projectDTO); diff --git a/src/main/java/tech/jhipster/lite/generator/server/springboot/devtools/infrastructure/primary/rest/DevToolsResource.java b/src/main/java/tech/jhipster/lite/generator/server/springboot/devtools/infrastructure/primary/rest/DevToolsResource.java index 9d02890a7f0..718e8bdf07e 100644 --- a/src/main/java/tech/jhipster/lite/generator/server/springboot/devtools/infrastructure/primary/rest/DevToolsResource.java +++ b/src/main/java/tech/jhipster/lite/generator/server/springboot/devtools/infrastructure/primary/rest/DevToolsResource.java @@ -14,7 +14,7 @@ import tech.jhipster.lite.technical.infrastructure.primary.annotation.GeneratorStep; @RestController -@RequestMapping("/api/servers/spring-boot/devtools") +@RequestMapping("/api/servers/spring-boot/technical-tools/devtools") @Tag(name = "Spring Boot - Tools") class DevToolsResource { diff --git a/src/main/java/tech/jhipster/lite/generator/server/springboot/docker/infrastructure/primary/rest/SpringBootDockerResource.java b/src/main/java/tech/jhipster/lite/generator/server/springboot/docker/infrastructure/primary/rest/SpringBootDockerResource.java index 9248d89f797..74ef6cd4d90 100644 --- a/src/main/java/tech/jhipster/lite/generator/server/springboot/docker/infrastructure/primary/rest/SpringBootDockerResource.java +++ b/src/main/java/tech/jhipster/lite/generator/server/springboot/docker/infrastructure/primary/rest/SpringBootDockerResource.java @@ -14,7 +14,7 @@ import tech.jhipster.lite.technical.infrastructure.primary.annotation.GeneratorStep; @RestController -@RequestMapping("/api/servers/spring-boot/docker") +@RequestMapping("/api/servers/spring-boot/containers/docker") @Tag(name = "Spring Boot - Tools") class SpringBootDockerResource { diff --git a/src/main/java/tech/jhipster/lite/generator/server/springboot/logging/aop/infrastructure/primary/rest/AopLoggingResource.java b/src/main/java/tech/jhipster/lite/generator/server/springboot/logging/aop/infrastructure/primary/rest/AopLoggingResource.java index 0b71f6bc3c7..19079626ccd 100644 --- a/src/main/java/tech/jhipster/lite/generator/server/springboot/logging/aop/infrastructure/primary/rest/AopLoggingResource.java +++ b/src/main/java/tech/jhipster/lite/generator/server/springboot/logging/aop/infrastructure/primary/rest/AopLoggingResource.java @@ -14,7 +14,7 @@ import tech.jhipster.lite.technical.infrastructure.primary.annotation.GeneratorStep; @RestController -@RequestMapping("/api/servers/spring-boot/logging/aop") +@RequestMapping("/api/servers/spring-boot/log-tools/aop") @Tag(name = "Spring Boot - Logging") class AopLoggingResource { diff --git a/src/main/java/tech/jhipster/lite/generator/server/springboot/logging/logstash/infrastructure/primary/rest/LogstashResource.java b/src/main/java/tech/jhipster/lite/generator/server/springboot/logging/logstash/infrastructure/primary/rest/LogstashResource.java index 9b25f4211c4..bdd5fd0ea31 100644 --- a/src/main/java/tech/jhipster/lite/generator/server/springboot/logging/logstash/infrastructure/primary/rest/LogstashResource.java +++ b/src/main/java/tech/jhipster/lite/generator/server/springboot/logging/logstash/infrastructure/primary/rest/LogstashResource.java @@ -14,7 +14,7 @@ import tech.jhipster.lite.technical.infrastructure.primary.annotation.GeneratorStep; @RestController -@RequestMapping("/api/servers/spring-boot/logging/logstash") +@RequestMapping("/api/servers/spring-boot/log-tools/logstash") @Tag(name = "Spring Boot - Logging") class LogstashResource { diff --git a/src/main/java/tech/jhipster/lite/generator/server/springboot/mvc/dummy/infrastructure/primary/rest/DummyResource.java b/src/main/java/tech/jhipster/lite/generator/server/springboot/mvc/dummy/infrastructure/primary/rest/DummyResource.java index 4a8f957b75f..d457470007e 100644 --- a/src/main/java/tech/jhipster/lite/generator/server/springboot/mvc/dummy/infrastructure/primary/rest/DummyResource.java +++ b/src/main/java/tech/jhipster/lite/generator/server/springboot/mvc/dummy/infrastructure/primary/rest/DummyResource.java @@ -14,7 +14,7 @@ import tech.jhipster.lite.technical.infrastructure.primary.annotation.GeneratorStep; @RestController -@RequestMapping("/api/servers/spring-boot/mvc/dummy") +@RequestMapping("/api/servers/spring-boot/features/dummy") @Tag(name = "Spring Boot - MVC") class DummyResource { diff --git a/src/main/java/tech/jhipster/lite/generator/server/springboot/mvc/security/jwt/infrastructure/primary/rest/JwtSecurityResource.java b/src/main/java/tech/jhipster/lite/generator/server/springboot/mvc/security/jwt/infrastructure/primary/rest/JwtSecurityResource.java index db00e0704c8..cef31d533fe 100644 --- a/src/main/java/tech/jhipster/lite/generator/server/springboot/mvc/security/jwt/infrastructure/primary/rest/JwtSecurityResource.java +++ b/src/main/java/tech/jhipster/lite/generator/server/springboot/mvc/security/jwt/infrastructure/primary/rest/JwtSecurityResource.java @@ -14,7 +14,7 @@ import tech.jhipster.lite.technical.infrastructure.primary.annotation.GeneratorStep; @RestController -@RequestMapping("/api/servers/spring-boot/mvc/security") +@RequestMapping("/api/servers/spring-boot/security-systems") @Tag(name = "Spring Boot - MVC - Security") class JwtSecurityResource { diff --git a/src/main/java/tech/jhipster/lite/generator/server/springboot/mvc/security/oauth2/infrastructure/primary/rest/OAuth2SecurityResource.java b/src/main/java/tech/jhipster/lite/generator/server/springboot/mvc/security/oauth2/infrastructure/primary/rest/OAuth2SecurityResource.java index 8922c5899ff..0518b468c87 100644 --- a/src/main/java/tech/jhipster/lite/generator/server/springboot/mvc/security/oauth2/infrastructure/primary/rest/OAuth2SecurityResource.java +++ b/src/main/java/tech/jhipster/lite/generator/server/springboot/mvc/security/oauth2/infrastructure/primary/rest/OAuth2SecurityResource.java @@ -14,7 +14,7 @@ import tech.jhipster.lite.technical.infrastructure.primary.annotation.GeneratorStep; @RestController -@RequestMapping("/api/servers/spring-boot/mvc/security") +@RequestMapping("/api/servers/spring-boot/security-systems") @Tag(name = "Spring Boot - MVC - Security") class OAuth2SecurityResource { diff --git a/src/main/java/tech/jhipster/lite/generator/server/springboot/mvc/springdoc/infrastructure/primary/rest/SpringdocResource.java b/src/main/java/tech/jhipster/lite/generator/server/springboot/mvc/springdoc/infrastructure/primary/rest/SpringdocResource.java index b3dc040fcb6..30a08d0c383 100644 --- a/src/main/java/tech/jhipster/lite/generator/server/springboot/mvc/springdoc/infrastructure/primary/rest/SpringdocResource.java +++ b/src/main/java/tech/jhipster/lite/generator/server/springboot/mvc/springdoc/infrastructure/primary/rest/SpringdocResource.java @@ -14,7 +14,7 @@ import tech.jhipster.lite.technical.infrastructure.primary.annotation.GeneratorStep; @RestController -@RequestMapping("/api/servers/spring-boot/mvc/springdoc") +@RequestMapping("/api/servers/spring-boot/api-documentations/springdoc") class SpringdocResource { private final SpringdocApplicationService springdocApplicationService; diff --git a/src/main/java/tech/jhipster/lite/generator/server/springboot/mvc/web/infrastructure/primary/rest/SpringBootMvcResource.java b/src/main/java/tech/jhipster/lite/generator/server/springboot/mvc/web/infrastructure/primary/rest/SpringBootMvcResource.java index ccf01189481..426ec9fe971 100644 --- a/src/main/java/tech/jhipster/lite/generator/server/springboot/mvc/web/infrastructure/primary/rest/SpringBootMvcResource.java +++ b/src/main/java/tech/jhipster/lite/generator/server/springboot/mvc/web/infrastructure/primary/rest/SpringBootMvcResource.java @@ -14,7 +14,7 @@ import tech.jhipster.lite.technical.infrastructure.primary.annotation.GeneratorStep; @RestController -@RequestMapping("/api/servers/spring-boot/mvc/web") +@RequestMapping("/api/servers/spring-boot") @Tag(name = "Spring Boot - MVC") class SpringBootMvcResource { @@ -26,7 +26,7 @@ public SpringBootMvcResource(SpringBootMvcApplicationService springBootMvcApplic @Operation(summary = "Add Spring Boot MVC with Tomcat") @ApiResponse(responseCode = "500", description = "An error occurred while adding Spring Boot MVC with Tomcat") - @PostMapping("/tomcat") + @PostMapping("/web-servers/tomcat") @GeneratorStep(id = GeneratorAction.SPRINGBOOT_TOMCAT) public void addSpringBootMvc(@RequestBody ProjectDTO projectDTO) { Project project = ProjectDTO.toProject(projectDTO); @@ -35,7 +35,7 @@ public void addSpringBootMvc(@RequestBody ProjectDTO projectDTO) { @Operation(summary = "Add Spring Boot MVC with Undertow") @ApiResponse(responseCode = "500", description = "An error occurred while adding Spring Boot MVC with Undertow") - @PostMapping("/undertow") + @PostMapping("/web-servers/undertow") @GeneratorStep(id = GeneratorAction.SPRINGBOOT_UNDERTOW) public void addSpringBootUndertow(@RequestBody ProjectDTO projectDTO) { Project project = ProjectDTO.toProject(projectDTO); @@ -44,7 +44,7 @@ public void addSpringBootUndertow(@RequestBody ProjectDTO projectDTO) { @Operation(summary = "Add Spring Boot Actuator") @ApiResponse(responseCode = "500", description = "An error occurred while adding Spring Boot Actuator") - @PostMapping("/actuator") + @PostMapping("/technical-tools/actuator") @GeneratorStep(id = GeneratorAction.SPRINGBOOT_ACTUATOR) public void addSpringBootActuator(@RequestBody ProjectDTO projectDTO) { Project project = ProjectDTO.toProject(projectDTO); diff --git a/src/main/java/tech/jhipster/lite/generator/server/springboot/springcloud/configclient/infrastructure/primary/rest/SpringCloudConfigResource.java b/src/main/java/tech/jhipster/lite/generator/server/springboot/springcloud/configclient/infrastructure/primary/rest/SpringCloudConfigResource.java index cc7d83e2b3f..2448a05bb47 100644 --- a/src/main/java/tech/jhipster/lite/generator/server/springboot/springcloud/configclient/infrastructure/primary/rest/SpringCloudConfigResource.java +++ b/src/main/java/tech/jhipster/lite/generator/server/springboot/springcloud/configclient/infrastructure/primary/rest/SpringCloudConfigResource.java @@ -14,7 +14,7 @@ import tech.jhipster.lite.technical.infrastructure.primary.annotation.GeneratorStep; @RestController -@RequestMapping("/api/servers/spring-boot/spring-cloud/config-client") +@RequestMapping("/api/servers/spring-boot/distributed-systems/spring-cloud/config-client") @Tag(name = "Spring Boot - Spring Cloud") class SpringCloudConfigResource { diff --git a/src/main/java/tech/jhipster/lite/generator/server/springboot/springcloud/consul/infrastructure/primary/rest/ConsulResource.java b/src/main/java/tech/jhipster/lite/generator/server/springboot/springcloud/consul/infrastructure/primary/rest/ConsulResource.java index 1f445dca4e5..be08e97eeb2 100644 --- a/src/main/java/tech/jhipster/lite/generator/server/springboot/springcloud/consul/infrastructure/primary/rest/ConsulResource.java +++ b/src/main/java/tech/jhipster/lite/generator/server/springboot/springcloud/consul/infrastructure/primary/rest/ConsulResource.java @@ -14,7 +14,7 @@ import tech.jhipster.lite.technical.infrastructure.primary.annotation.GeneratorStep; @RestController -@RequestMapping("/api/servers/spring-boot/spring-cloud/consul") +@RequestMapping("/api/servers/spring-boot/distributed-systems/spring-cloud/consul") @Tag(name = "Spring Boot - Spring Cloud") class ConsulResource { diff --git a/src/main/java/tech/jhipster/lite/generator/server/springboot/springcloud/eureka/infrastructure/primary/rest/EurekaResource.java b/src/main/java/tech/jhipster/lite/generator/server/springboot/springcloud/eureka/infrastructure/primary/rest/EurekaResource.java index e3ade220788..f3c147f999e 100644 --- a/src/main/java/tech/jhipster/lite/generator/server/springboot/springcloud/eureka/infrastructure/primary/rest/EurekaResource.java +++ b/src/main/java/tech/jhipster/lite/generator/server/springboot/springcloud/eureka/infrastructure/primary/rest/EurekaResource.java @@ -13,7 +13,7 @@ import tech.jhipster.lite.technical.infrastructure.primary.annotation.GeneratorStep; @RestController -@RequestMapping("/api/servers/spring-boot/spring-cloud/eureka-client") +@RequestMapping("/api/servers/spring-boot/distributed-systems/spring-cloud/eureka-client") @Tag(name = "Spring Boot - Spring Cloud") class EurekaResource { diff --git a/src/main/java/tech/jhipster/lite/generator/server/springboot/user/infrastructure/primary/rest/SpringBootUserResource.java b/src/main/java/tech/jhipster/lite/generator/server/springboot/user/infrastructure/primary/rest/SpringBootUserResource.java index f1c1f1fbcba..3847f3ba172 100644 --- a/src/main/java/tech/jhipster/lite/generator/server/springboot/user/infrastructure/primary/rest/SpringBootUserResource.java +++ b/src/main/java/tech/jhipster/lite/generator/server/springboot/user/infrastructure/primary/rest/SpringBootUserResource.java @@ -19,7 +19,7 @@ import tech.jhipster.lite.technical.infrastructure.primary.annotation.GeneratorStep; @RestController -@RequestMapping("/api/servers/spring-boot/user") +@RequestMapping("/api/servers/spring-boot/features/user") @Tag(name = "Spring Boot - User") class SpringBootUserResource { diff --git a/src/main/java/tech/jhipster/lite/generator/setup/codespaces/infrastructure/primary/rest/CodespacesResource.java b/src/main/java/tech/jhipster/lite/generator/setup/codespaces/infrastructure/primary/rest/CodespacesResource.java index 2cf533e07f1..585c3ca25a0 100644 --- a/src/main/java/tech/jhipster/lite/generator/setup/codespaces/infrastructure/primary/rest/CodespacesResource.java +++ b/src/main/java/tech/jhipster/lite/generator/setup/codespaces/infrastructure/primary/rest/CodespacesResource.java @@ -14,8 +14,8 @@ import tech.jhipster.lite.technical.infrastructure.primary.annotation.GeneratorStep; @RestController -@RequestMapping("/api/setup") -@Tag(name = "Setup") +@RequestMapping("/api/developer-tools/codespaces") +@Tag(name = "Codespaces") class CodespacesResource { private final CodespacesApplicationService codespacesApplicationService; @@ -26,7 +26,7 @@ public CodespacesResource(CodespacesApplicationService codespacesApplicationServ @Operation(summary = "GitHub Codespaces", description = "Init GitHub Codespaces configuration files") @ApiResponse(responseCode = "500", description = "An error occurred while initializing GitHub Codespaces files.") - @PostMapping("/codespaces") + @PostMapping @GeneratorStep(id = GeneratorAction.GITHUB_CODESPACES) public void init(@RequestBody ProjectDTO projectDTO) { Project project = ProjectDTO.toProject(projectDTO); diff --git a/src/main/java/tech/jhipster/lite/generator/typescript/infrastructure/primary/rest/TypescriptResource.java b/src/main/java/tech/jhipster/lite/generator/typescript/infrastructure/primary/rest/TypescriptResource.java index fdad94ef7a7..e7dd9686818 100644 --- a/src/main/java/tech/jhipster/lite/generator/typescript/infrastructure/primary/rest/TypescriptResource.java +++ b/src/main/java/tech/jhipster/lite/generator/typescript/infrastructure/primary/rest/TypescriptResource.java @@ -14,7 +14,7 @@ import tech.jhipster.lite.technical.infrastructure.primary.annotation.GeneratorStep; @RestController -@RequestMapping("/api/typescript") +@RequestMapping("/api/javascript-languages/typescript") @Tag(name = "Typescript") class TypescriptResource { diff --git a/src/main/webapp/app/common/secondary/ProjectHistoryRepository.ts b/src/main/webapp/app/common/secondary/ProjectHistoryRepository.ts index 7bf8d51cc8f..fe1013ae06b 100644 --- a/src/main/webapp/app/common/secondary/ProjectHistoryRepository.ts +++ b/src/main/webapp/app/common/secondary/ProjectHistoryRepository.ts @@ -8,6 +8,6 @@ export default class ProjectHistoryRepository implements ProjectHistoryService { constructor(private axiosHttp: AxiosHttp) {} async get(folder: Folder): Promise { - return this.axiosHttp.get('api/projects/history', { params: { folder } }).then(response => toHistory(response.data)); + return this.axiosHttp.get('api/project-histories', { params: { folder } }).then(response => toHistory(response.data)); } } diff --git a/src/main/webapp/app/springboot/secondary/ProjectRepository.ts b/src/main/webapp/app/springboot/secondary/ProjectRepository.ts index 5c727896c65..372844b02a9 100644 --- a/src/main/webapp/app/springboot/secondary/ProjectRepository.ts +++ b/src/main/webapp/app/springboot/secondary/ProjectRepository.ts @@ -8,7 +8,7 @@ export default class ProjectRepository implements ProjectService { async init(project: Project): Promise { const restProject: RestProject = toRestProject(project); - await this.axiosHttp.post('api/projects/init', restProject); + await this.axiosHttp.post('api/projects', restProject); } async addMaven(project: Project): Promise { @@ -18,7 +18,7 @@ export default class ProjectRepository implements ProjectService { async addFrontendMavenPlugin(project: Project): Promise { const restProject: RestProject = toRestProject(project); - await this.axiosHttp.post('api/frontend-maven-plugin', restProject); + await this.axiosHttp.post('api/developer-tools/frontend-maven-plugin', restProject); } async addJavaBase(project: Project): Promise { diff --git a/src/main/webapp/app/springboot/secondary/SpringBootRepository.ts b/src/main/webapp/app/springboot/secondary/SpringBootRepository.ts index 2b46e9b1813..165e3015f5e 100644 --- a/src/main/webapp/app/springboot/secondary/SpringBootRepository.ts +++ b/src/main/webapp/app/springboot/secondary/SpringBootRepository.ts @@ -13,37 +13,37 @@ export default class SpringBootRepository implements SpringBootService { async addSpringBootMvcTomcat(project: Project): Promise { const restProject: RestProject = toRestProject(project); - await this.axiosHttp.post('api/servers/spring-boot/mvc/web/tomcat', restProject); + await this.axiosHttp.post('api/servers/spring-boot/web-servers/tomcat', restProject); } async addSpringBootBannerIppon(project: Project): Promise { const restProject: RestProject = toRestProject(project); - await this.axiosHttp.post('api/servers/spring-boot/banner/ippon', restProject); + await this.axiosHttp.post('api/servers/spring-boot/banners/ippon', restProject); } async addSpringBootBannerJHipsterV2(project: Project): Promise { const restProject: RestProject = toRestProject(project); - await this.axiosHttp.post('api/servers/spring-boot/banner/jhipster-v2', restProject); + await this.axiosHttp.post('api/servers/spring-boot/banners/jhipster-v2', restProject); } async addSpringBootBannerJHipsterV3(project: Project): Promise { const restProject: RestProject = toRestProject(project); - await this.axiosHttp.post('api/servers/spring-boot/banner/jhipster-v3', restProject); + await this.axiosHttp.post('api/servers/spring-boot/banners/jhipster-v3', restProject); } async addSpringBootBannerJHipsterV7(project: Project): Promise { const restProject: RestProject = toRestProject(project); - await this.axiosHttp.post('api/servers/spring-boot/banner/jhipster-v7', restProject); + await this.axiosHttp.post('api/servers/spring-boot/banners/jhipster-v7', restProject); } async addSpringBootBannerJHipsterV7React(project: Project): Promise { const restProject: RestProject = toRestProject(project); - await this.axiosHttp.post('api/servers/spring-boot/banner/jhipster-v7-react', restProject); + await this.axiosHttp.post('api/servers/spring-boot/banners/jhipster-v7-react', restProject); } async addSpringBootBannerJHipsterV7Vue(project: Project): Promise { const restProject: RestProject = toRestProject(project); - await this.axiosHttp.post('api/servers/spring-boot/banner/jhipster-v7-vue', restProject); + await this.axiosHttp.post('api/servers/spring-boot/banners/jhipster-v7-vue', restProject); } async addPostgres(project: Project): Promise { @@ -67,42 +67,42 @@ export default class SpringBootRepository implements SpringBootService { } async addSpringBootFlywayInit(project: Project): Promise { const restProject: RestProject = toRestProject(project); - await this.axiosHttp.post('/api/servers/spring-boot/databases/migration/flyway/init', restProject); + await this.axiosHttp.post('/api/servers/spring-boot/database-migration-tools/flyway', restProject); } async addSpringBootFlywayUser(project: Project): Promise { const restProject: RestProject = toRestProject(project); - await this.axiosHttp.post('/api/servers/spring-boot/databases/migration/flyway/user', restProject); + await this.axiosHttp.post('/api/servers/spring-boot/database-migration-tools/flyway/user', restProject); } async addSpringBootLiquibaseInit(project: Project): Promise { const restProject: RestProject = toRestProject(project); - await this.axiosHttp.post('/api/servers/spring-boot/databases/migration/liquibase/init', restProject); + await this.axiosHttp.post('/api/servers/spring-boot/database-migration-tools/liquibase', restProject); } async addSpringBootLiquibaseUser(project: Project): Promise { const restProject: RestProject = toRestProject(project); - await this.axiosHttp.post('/api/servers/spring-boot/databases/migration/liquibase/user', restProject); + await this.axiosHttp.post('/api/servers/spring-boot/database-migration-tools/liquibase/user', restProject); } async addJWT(project: Project): Promise { const restProject: RestProject = toRestProject(project); - await this.axiosHttp.post('/api/servers/spring-boot/mvc/security/jwt', restProject); + await this.axiosHttp.post('/api/servers/spring-boot/security-systems/jwt', restProject); } async addBasicAuthJWT(project: Project): Promise { const restProject: RestProject = toRestProject(project); - await this.axiosHttp.post('/api/servers/spring-boot/mvc/security/jwt/basic-auth', restProject); + await this.axiosHttp.post('/api/servers/spring-boot/security-systems/jwt/basic-auth', restProject); } async addOauth2(project: Project): Promise { const restProject: RestProject = toRestProject(project); - await this.axiosHttp.post('/api/servers/spring-boot/mvc/security/oauth2', restProject); + await this.axiosHttp.post('/api/servers/spring-boot/security-systems/oauth2', restProject); } async addSpringdocJWT(project: Project): Promise { const restProject: RestProject = toRestProject(project); - await this.axiosHttp.post('/api/servers/spring-boot/mvc/springdoc/init-with-security-jwt', restProject); + await this.axiosHttp.post('/api/servers/spring-boot/api-documentations/springdoc/init-with-security-jwt', restProject); } async addSpringBootAsync(project: Project): Promise { @@ -112,46 +112,46 @@ export default class SpringBootRepository implements SpringBootService { async addSpringBootDevtoolsDependencies(project: Project): Promise { const restProject: RestProject = toRestProject(project); - await this.axiosHttp.post('/api/servers/spring-boot/devtools', restProject); + await this.axiosHttp.post('/api/servers/spring-boot/technical-tools/devtools', restProject); } async addSpringBootDockerfile(project: Project): Promise { const restProject: RestProject = toRestProject(project); - await this.axiosHttp.post('/api/servers/spring-boot/docker/dockerfile', restProject); + await this.axiosHttp.post('/api/servers/spring-boot/containers/docker/dockerfile', restProject); } async addSpringBootDockerJib(project: Project): Promise { const restProject: RestProject = toRestProject(project); - await this.axiosHttp.post('/api/servers/spring-boot/docker/jib', restProject); + await this.axiosHttp.post('/api/servers/spring-boot/containers/docker/jib', restProject); } async addSpringCloudConfigClient(project: Project): Promise { const restProject: RestProject = toRestProject(project); - await this.axiosHttp.post('/api/servers/spring-boot/spring-cloud/config-client', restProject); + await this.axiosHttp.post('/api/servers/spring-boot/distributed-systems/spring-cloud/config-client', restProject); } async addSpringCloudConsul(project: Project): Promise { const restProject: RestProject = toRestProject(project); - await this.axiosHttp.post('/api/servers/spring-boot/spring-cloud/consul', restProject); + await this.axiosHttp.post('/api/servers/spring-boot/distributed-systems/spring-cloud/consul', restProject); } async addSpringCloudEureka(project: Project): Promise { const restProject: RestProject = toRestProject(project); - await this.axiosHttp.post('/api/servers/spring-boot/spring-cloud/eureka-client', restProject); + await this.axiosHttp.post('/api/servers/spring-boot/distributed-systems/spring-cloud/eureka-client', restProject); } async addEhcacheWithJavaConf(project: Project): Promise { const restProject: RestProject = toRestProject(project); - await this.axiosHttp.post('/api/servers/spring-boot/cache/ehcache/java-configuration', restProject); + await this.axiosHttp.post('/api/servers/spring-boot/caches/ehcache/java-configuration', restProject); } async addEhcacheWithXML(project: Project): Promise { const restProject: RestProject = toRestProject(project); - await this.axiosHttp.post('/api/servers/spring-boot/cache/ehcache/xml-configuration', restProject); + await this.axiosHttp.post('/api/servers/spring-boot/caches/ehcache/xml-configuration', restProject); } async addSimpleCache(project: Project): Promise { const restProject: RestProject = toRestProject(project); - await this.axiosHttp.post('/api/servers/spring-boot/cache/simple', restProject); + await this.axiosHttp.post('/api/servers/spring-boot/caches/simple', restProject); } } diff --git a/src/main/webapp/app/springboot/secondary/client/AngularRepository.ts b/src/main/webapp/app/springboot/secondary/client/AngularRepository.ts index 316ee280e65..ea0b698610e 100644 --- a/src/main/webapp/app/springboot/secondary/client/AngularRepository.ts +++ b/src/main/webapp/app/springboot/secondary/client/AngularRepository.ts @@ -13,6 +13,6 @@ export default class AngularRepository implements AngularService { async addWithStyle(project: Project): Promise { const restProject: RestProject = toRestProject(project); - await this.axiosHttp.post('/api/clients/angular/styled', restProject); + await this.axiosHttp.post('/api/clients/angular/styles', restProject); } } diff --git a/src/main/webapp/app/springboot/secondary/client/ReactRepository.ts b/src/main/webapp/app/springboot/secondary/client/ReactRepository.ts index 139168d9a2e..f785a2d9a4b 100644 --- a/src/main/webapp/app/springboot/secondary/client/ReactRepository.ts +++ b/src/main/webapp/app/springboot/secondary/client/ReactRepository.ts @@ -13,6 +13,6 @@ export default class ReactRepository implements ReactService { async addWithStyle(project: Project): Promise { const restProject: RestProject = toRestProject(project); - await this.axiosHttp.post('/api/clients/react/styled', restProject); + await this.axiosHttp.post('/api/clients/react/styles', restProject); } } diff --git a/src/main/webapp/app/springboot/secondary/client/VueRepository.ts b/src/main/webapp/app/springboot/secondary/client/VueRepository.ts index c64519df54b..87fac64abed 100644 --- a/src/main/webapp/app/springboot/secondary/client/VueRepository.ts +++ b/src/main/webapp/app/springboot/secondary/client/VueRepository.ts @@ -13,6 +13,6 @@ export default class VueRepository implements VueService { async addWithStyle(project: Project): Promise { const restProject: RestProject = toRestProject(project); - await this.axiosHttp.post('/api/clients/vue/styled', restProject); + await this.axiosHttp.post('/api/clients/vue/styles', restProject); } } diff --git a/src/test/java/tech/jhipster/lite/generator/ci/github/actions/infrastructure/primary/rest/GitHubActionsResourceIT.java b/src/test/java/tech/jhipster/lite/generator/ci/github/actions/infrastructure/primary/rest/GitHubActionsResourceIT.java index a3747874e49..e031a3ffb03 100644 --- a/src/test/java/tech/jhipster/lite/generator/ci/github/actions/infrastructure/primary/rest/GitHubActionsResourceIT.java +++ b/src/test/java/tech/jhipster/lite/generator/ci/github/actions/infrastructure/primary/rest/GitHubActionsResourceIT.java @@ -32,7 +32,11 @@ void shouldAddGitHubActionsForMaven() throws Exception { ProjectDTO projectDTO = readFileToObject("json/chips.json", ProjectDTO.class).folder(FileUtils.tmpDirForTest()); mockMvc - .perform(post("/api/github-actions/maven").contentType(MediaType.APPLICATION_JSON).content(convertObjectToJsonBytes(projectDTO))) + .perform( + post("/api/developer-tools/github-actions/maven") + .contentType(MediaType.APPLICATION_JSON) + .content(convertObjectToJsonBytes(projectDTO)) + ) .andExpect(status().isOk()); Project project = ProjectDTO.toProject(projectDTO); 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 7668240a6ea..0e8da31863a 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 @@ -53,7 +53,7 @@ void shouldAddStyledAngular() throws Exception { mockMvc .perform( - post("/api/clients/angular/styled").contentType(MediaType.APPLICATION_JSON).content(TestUtils.convertObjectToJsonBytes(projectDTO)) + post("/api/clients/angular/styles").contentType(MediaType.APPLICATION_JSON).content(TestUtils.convertObjectToJsonBytes(projectDTO)) ) .andExpect(status().isOk()); 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 1e547365ff3..1043057b9f2 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 @@ -54,7 +54,7 @@ void shouldAddStyledReact() throws Exception { mockMvc .perform( - post("/api/clients/react/styled").contentType(MediaType.APPLICATION_JSON).content(TestUtils.convertObjectToJsonBytes(projectDTO)) + post("/api/clients/react/styles").contentType(MediaType.APPLICATION_JSON).content(TestUtils.convertObjectToJsonBytes(projectDTO)) ) .andExpect(status().isOk()); 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 a0ffa89106b..fc808954b45 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 @@ -58,7 +58,7 @@ void shouldAddStyledSvelte() throws Exception { mockMvc .perform( - post("/api/clients/svelte/styled").contentType(MediaType.APPLICATION_JSON).content(TestUtils.convertObjectToJsonBytes(projectDTO)) + post("/api/clients/svelte/styles").contentType(MediaType.APPLICATION_JSON).content(TestUtils.convertObjectToJsonBytes(projectDTO)) ) .andExpect(status().isOk()); diff --git a/src/test/java/tech/jhipster/lite/generator/client/vue/core/infrastructure/primary/rest/VueResourceIT.java b/src/test/java/tech/jhipster/lite/generator/client/vue/core/infrastructure/primary/rest/VueResourceIT.java index caf663ef8c1..d2afa122bce 100644 --- a/src/test/java/tech/jhipster/lite/generator/client/vue/core/infrastructure/primary/rest/VueResourceIT.java +++ b/src/test/java/tech/jhipster/lite/generator/client/vue/core/infrastructure/primary/rest/VueResourceIT.java @@ -60,7 +60,9 @@ void shouldAddPinia() throws Exception { mockMvc .perform( - post("/api/clients/vue/pinia").contentType(MediaType.APPLICATION_JSON).content(TestUtils.convertObjectToJsonBytes(projectDTO)) + post("/api/clients/vue/stores/pinia") + .contentType(MediaType.APPLICATION_JSON) + .content(TestUtils.convertObjectToJsonBytes(projectDTO)) ) .andExpect(status().isOk()); VueAssert.assertPiniaDependency(project); @@ -74,7 +76,7 @@ void shouldAddStyledVue() throws Exception { mockMvc .perform( - post("/api/clients/vue/styled").contentType(MediaType.APPLICATION_JSON).content(TestUtils.convertObjectToJsonBytes(projectDTO)) + post("/api/clients/vue/styles").contentType(MediaType.APPLICATION_JSON).content(TestUtils.convertObjectToJsonBytes(projectDTO)) ) .andExpect(status().isOk()); diff --git a/src/test/java/tech/jhipster/lite/generator/history/infrastructure/primary/GeneratorHistoryInterceptorIT.java b/src/test/java/tech/jhipster/lite/generator/history/infrastructure/primary/GeneratorHistoryInterceptorIT.java index 73406d7913b..a9411fdaf60 100644 --- a/src/test/java/tech/jhipster/lite/generator/history/infrastructure/primary/GeneratorHistoryInterceptorIT.java +++ b/src/test/java/tech/jhipster/lite/generator/history/infrastructure/primary/GeneratorHistoryInterceptorIT.java @@ -28,7 +28,7 @@ void shouldAddInHistory() throws Exception { ProjectDTO projectDTO = readFileToObject("json/chips.json", ProjectDTO.class).folder(FileUtils.tmpDirForTest()); mockMvc - .perform(post("/api/projects/init").contentType(MediaType.APPLICATION_JSON).content(convertObjectToJsonBytes(projectDTO))) + .perform(post("/api/projects").contentType(MediaType.APPLICATION_JSON).content(convertObjectToJsonBytes(projectDTO))) .andExpect(status().isOk()); // Then String content = FileUtils.read(getPath(projectDTO.getFolder(), ".jhipster", "history.json")); diff --git a/src/test/java/tech/jhipster/lite/generator/history/infrastructure/primary/HistoryResourceIT.java b/src/test/java/tech/jhipster/lite/generator/history/infrastructure/primary/HistoryResourceIT.java index c12fe54b299..cc5795337ba 100644 --- a/src/test/java/tech/jhipster/lite/generator/history/infrastructure/primary/HistoryResourceIT.java +++ b/src/test/java/tech/jhipster/lite/generator/history/infrastructure/primary/HistoryResourceIT.java @@ -27,7 +27,7 @@ class HistoryResourceIT { @Test void shouldNotGetHistoryWithoutFolder() throws Exception { - mockMvc.perform(get("/api/projects/history")).andExpect(status().isBadRequest()); + mockMvc.perform(get("/api/project-histories")).andExpect(status().isBadRequest()); } @Test @@ -39,7 +39,7 @@ void shouldGetHistory() throws Exception { projectDTO.folder(FileUtils.tmpDirForTest()); mockMvc - .perform(post("/api/projects/init").contentType(MediaType.APPLICATION_JSON).content(TestUtils.convertObjectToJsonBytes(projectDTO))) + .perform(post("/api/projects").contentType(MediaType.APPLICATION_JSON).content(TestUtils.convertObjectToJsonBytes(projectDTO))) .andExpect(status().isOk()); mockMvc .perform( @@ -48,12 +48,14 @@ void shouldGetHistory() throws Exception { .andExpect(status().isOk()); mockMvc .perform( - post("/api/github-actions/maven").contentType(MediaType.APPLICATION_JSON).content(TestUtils.convertObjectToJsonBytes(projectDTO)) + post("/api/developer-tools/github-actions/maven") + .contentType(MediaType.APPLICATION_JSON) + .content(TestUtils.convertObjectToJsonBytes(projectDTO)) ) .andExpect(status().isOk()); mockMvc - .perform(get("/api/projects/history").param("folder", projectDTO.getFolder())) + .perform(get("/api/project-histories").param("folder", projectDTO.getFolder())) .andExpect(status().isOk()) .andExpect(jsonPath("$.serviceIds", Matchers.hasSize(3))) .andExpect(jsonPath("$.serviceIds[0]").value(GeneratorAction.INIT)) diff --git a/src/test/java/tech/jhipster/lite/generator/init/infrastructure/primary/rest/InitResourceIT.java b/src/test/java/tech/jhipster/lite/generator/init/infrastructure/primary/rest/InitResourceIT.java index d5528c7a3a6..45e7da3ea69 100644 --- a/src/test/java/tech/jhipster/lite/generator/init/infrastructure/primary/rest/InitResourceIT.java +++ b/src/test/java/tech/jhipster/lite/generator/init/infrastructure/primary/rest/InitResourceIT.java @@ -41,7 +41,7 @@ void shouldInit() throws Exception { ProjectDTO projectDTO = readFileToObject("json/chips.json", ProjectDTO.class).folder(FileUtils.tmpDirForTest()); mockMvc - .perform(post("/api/projects/init").contentType(MediaType.APPLICATION_JSON).content(convertObjectToJsonBytes(projectDTO))) + .perform(post("/api/projects").contentType(MediaType.APPLICATION_JSON).content(convertObjectToJsonBytes(projectDTO))) .andExpect(status().isOk()); Project project = ProjectDTO.toProject(projectDTO); @@ -59,7 +59,7 @@ void shouldDownload() throws Exception { initApplicationService.init(project); mockMvc - .perform(post("/api/projects/download").contentType(MediaType.APPLICATION_JSON).content(convertObjectToJsonBytes(projectDTO))) + .perform(post("/api/project-downloads").contentType(MediaType.APPLICATION_JSON).content(convertObjectToJsonBytes(projectDTO))) .andExpect(status().isOk()) .andExpect(header().string("Content-Disposition", "attachment; filename=" + project.getBaseName().orElse("application") + ".zip")) .andExpect(header().string("X-Suggested-Filename", project.getBaseName().orElse("application") + ".zip")) 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 d6bde424b32..89613ffe826 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 @@ -41,7 +41,9 @@ void shouldInstall() throws Exception { initApplicationService.init(project); mockMvc - .perform(post("/api/npm/install").contentType(MediaType.APPLICATION_JSON).content(convertObjectToJsonBytes(projectDTO))) + .perform( + post("/api/package-managers/npm/install").contentType(MediaType.APPLICATION_JSON).content(convertObjectToJsonBytes(projectDTO)) + ) .andExpect(status().isOk()); assertFileExist(project, "node_modules"); @@ -54,7 +56,11 @@ void shouldPrettify() throws Exception { initApplicationService.init(project); mockMvc - .perform(post("/api/npm/prettier-format").contentType(MediaType.APPLICATION_JSON).content(convertObjectToJsonBytes(projectDTO))) + .perform( + post("/api/package-managers/npm/prettier-format") + .contentType(MediaType.APPLICATION_JSON) + .content(convertObjectToJsonBytes(projectDTO)) + ) .andExpect(status().isOk()); verify(npmRepository).npmPrettierFormat(any(Project.class)); 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 c75960a67fd..fc5d9880a9a 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 @@ -41,7 +41,9 @@ void shouldAddFrontendMavenPlugin() throws Exception { mockMvc .perform( - post("/api/frontend-maven-plugin").contentType(MediaType.APPLICATION_JSON).content(TestUtils.convertObjectToJsonBytes(projectDTO)) + post("/api/developer-tools/frontend-maven-plugin") + .contentType(MediaType.APPLICATION_JSON) + .content(TestUtils.convertObjectToJsonBytes(projectDTO)) ) .andExpect(status().isOk()); 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 ba7f870572d..c2b32d14dd4 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 @@ -39,7 +39,7 @@ void shouldAddSonarJavaBackend() throws Exception { mockMvc .perform( - post("/api/servers/sonar/java-backend") + post("/api/developer-tools/sonar/java-backend") .contentType(MediaType.APPLICATION_JSON) .content(TestUtils.convertObjectToJsonBytes(projectDTO)) ) @@ -58,7 +58,7 @@ void shouldAddSonarJavaBackendAndFrontend() throws Exception { mockMvc .perform( - post("/api/servers/sonar/java-backend-and-frontend") + post("/api/developer-tools/sonar/java-backend-and-frontend") .contentType(MediaType.APPLICATION_JSON) .content(TestUtils.convertObjectToJsonBytes(projectDTO)) ) diff --git a/src/test/java/tech/jhipster/lite/generator/server/springboot/banner/infrastructure/primary/rest/BannerResourceIT.java b/src/test/java/tech/jhipster/lite/generator/server/springboot/banner/infrastructure/primary/rest/BannerResourceIT.java index a7eeb141667..f00a121fa86 100644 --- a/src/test/java/tech/jhipster/lite/generator/server/springboot/banner/infrastructure/primary/rest/BannerResourceIT.java +++ b/src/test/java/tech/jhipster/lite/generator/server/springboot/banner/infrastructure/primary/rest/BannerResourceIT.java @@ -29,12 +29,12 @@ class BannerResourceIT { @ParameterizedTest @ValueSource( strings = { - "/api/servers/spring-boot/banner/jhipster-v7", - "/api/servers/spring-boot/banner/ippon", - "/api/servers/spring-boot/banner/jhipster-v7-react", - "/api/servers/spring-boot/banner/jhipster-v7-vue", - "/api/servers/spring-boot/banner/jhipster-v2", - "/api/servers/spring-boot/banner/jhipster-v3", + "/api/servers/spring-boot/banners/jhipster-v7", + "/api/servers/spring-boot/banners/ippon", + "/api/servers/spring-boot/banners/jhipster-v7-react", + "/api/servers/spring-boot/banners/jhipster-v7-vue", + "/api/servers/spring-boot/banners/jhipster-v2", + "/api/servers/spring-boot/banners/jhipster-v3", } ) void shouldAddBanner(String url) throws Exception { 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 59ec8c2dadf..69179330ed6 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 @@ -50,7 +50,7 @@ void shouldAddEhcacheJava() throws Exception { mockMvc .perform( - post("/api/servers/spring-boot/cache/ehcache/java-configuration") + post("/api/servers/spring-boot/caches/ehcache/java-configuration") .contentType(MediaType.APPLICATION_JSON) .content(TestUtils.convertObjectToJsonBytes(projectDTO)) ) @@ -73,7 +73,7 @@ void shouldAddEhcacheXml() throws Exception { mockMvc .perform( - post("/api/servers/spring-boot/cache/ehcache/xml-configuration") + post("/api/servers/spring-boot/caches/ehcache/xml-configuration") .contentType(MediaType.APPLICATION_JSON) .content(TestUtils.convertObjectToJsonBytes(projectDTO)) ) 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 5159e4162ff..5f18c1a9286 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 @@ -49,7 +49,7 @@ void shouldInit() throws Exception { mockMvc .perform( - post("/api/servers/spring-boot/cache/simple") + post("/api/servers/spring-boot/caches/simple") .contentType(MediaType.APPLICATION_JSON) .content(TestUtils.convertObjectToJsonBytes(projectDTO)) ) 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 bc22c6af31f..855241abd9f 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 @@ -65,7 +65,7 @@ void shouldInit() throws Exception { mockMvc .perform( - post("/api/servers/spring-boot/databases/migration/flyway/init") + post("/api/servers/spring-boot/database-migration-tools/flyway") .contentType(MediaType.APPLICATION_JSON) .content(TestUtils.convertObjectToJsonBytes(projectDTO)) ) @@ -91,7 +91,7 @@ void shouldAddUserAndAuthority() throws Exception { mockMvc .perform( - post("/api/servers/spring-boot/databases/migration/flyway/user") + post("/api/servers/spring-boot/database-migration-tools/flyway/user") .contentType(MediaType.APPLICATION_JSON) .content(TestUtils.convertObjectToJsonBytes(projectDTO)) ) 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 2479620cf7a..d57b44d239f 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 @@ -76,7 +76,7 @@ void shouldInit() throws Exception { mockMvc .perform( - post("/api/servers/spring-boot/databases/migration/liquibase/init") + post("/api/servers/spring-boot/database-migration-tools/liquibase") .contentType(MediaType.APPLICATION_JSON) .content(TestUtils.convertObjectToJsonBytes(projectDTO)) ) @@ -112,7 +112,7 @@ void shouldAddUserPostgresql() throws Exception { mockMvc .perform( - post("/api/servers/spring-boot/databases/migration/liquibase/user") + post("/api/servers/spring-boot/database-migration-tools/liquibase/user") .contentType(MediaType.APPLICATION_JSON) .content(TestUtils.convertObjectToJsonBytes(projectDTO)) ) diff --git a/src/test/java/tech/jhipster/lite/generator/server/springboot/devtools/infrastructure/rest/DevToolsResourceIT.java b/src/test/java/tech/jhipster/lite/generator/server/springboot/devtools/infrastructure/rest/DevToolsResourceIT.java index 4ee4b2c0c92..e888c5b5ca7 100644 --- a/src/test/java/tech/jhipster/lite/generator/server/springboot/devtools/infrastructure/rest/DevToolsResourceIT.java +++ b/src/test/java/tech/jhipster/lite/generator/server/springboot/devtools/infrastructure/rest/DevToolsResourceIT.java @@ -51,7 +51,7 @@ void shouldInit() throws Exception { mockMvc .perform( - post("/api/servers/spring-boot/devtools") + post("/api/servers/spring-boot/technical-tools/devtools") .contentType(MediaType.APPLICATION_JSON) .content(TestUtils.convertObjectToJsonBytes(projectDTO)) ) 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 9579054e7b0..61e98408708 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 @@ -44,7 +44,7 @@ void shouldAddJib() throws Exception { mockMvc .perform( - post("/api/servers/spring-boot/docker/jib") + post("/api/servers/spring-boot/containers/docker/jib") .contentType(MediaType.APPLICATION_JSON) .content(TestUtils.convertObjectToJsonBytes(projectDTO)) ) @@ -63,7 +63,7 @@ void shouldAddDockerfile() throws Exception { mockMvc .perform( - post("/api/servers/spring-boot/docker/dockerfile") + post("/api/servers/spring-boot/containers/docker/dockerfile") .contentType(MediaType.APPLICATION_JSON) .content(TestUtils.convertObjectToJsonBytes(projectDTO)) ) 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 ef219110475..99aca6a1323 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 @@ -53,7 +53,7 @@ void shouldInit() throws Exception { mockMvc .perform( - post("/api/servers/spring-boot/logging/aop") + post("/api/servers/spring-boot/log-tools/aop") .contentType(MediaType.APPLICATION_JSON) .content(TestUtils.convertObjectToJsonBytes(projectDTO)) ) 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 dec1c7d5ecf..29a75c9c59f 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 @@ -52,7 +52,7 @@ void shouldInit() throws Exception { mockMvc .perform( - post("/api/servers/spring-boot/logging/logstash") + post("/api/servers/spring-boot/log-tools/logstash") .contentType(MediaType.APPLICATION_JSON) .content(TestUtils.convertObjectToJsonBytes(projectDTO)) ) diff --git a/src/test/java/tech/jhipster/lite/generator/server/springboot/mvc/dummy/infrastructure/primary/rest/DummyResourceIT.java b/src/test/java/tech/jhipster/lite/generator/server/springboot/mvc/dummy/infrastructure/primary/rest/DummyResourceIT.java index 8e01dd8eb8f..572bb03289d 100644 --- a/src/test/java/tech/jhipster/lite/generator/server/springboot/mvc/dummy/infrastructure/primary/rest/DummyResourceIT.java +++ b/src/test/java/tech/jhipster/lite/generator/server/springboot/mvc/dummy/infrastructure/primary/rest/DummyResourceIT.java @@ -30,7 +30,7 @@ void shouldAddDummyContext() throws Exception { mockMvc .perform( - post("/api/servers/spring-boot/mvc/dummy") + post("/api/servers/spring-boot/features/dummy") .contentType(MediaType.APPLICATION_JSON) .content(TestUtils.convertObjectToJsonBytes(projectDTO)) ) 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 7049406ce82..ce7048536ff 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 @@ -66,7 +66,7 @@ void shouldInit() throws Exception { mockMvc .perform( - post("/api/servers/spring-boot/mvc/security/jwt") + post("/api/servers/spring-boot/security-systems/jwt") .contentType(MediaType.APPLICATION_JSON) .content(TestUtils.convertObjectToJsonBytes(projectDTO)) ) @@ -93,7 +93,7 @@ void shouldAddBasicAuth() throws Exception { mockMvc .perform( - post("/api/servers/spring-boot/mvc/security/jwt/basic-auth") + post("/api/servers/spring-boot/security-systems/jwt/basic-auth") .contentType(MediaType.APPLICATION_JSON) .content(TestUtils.convertObjectToJsonBytes(projectDTO)) ) diff --git a/src/test/java/tech/jhipster/lite/generator/server/springboot/mvc/security/oauth2/infrastructure/primary/rest/OAuth2SecurityResourceIT.java b/src/test/java/tech/jhipster/lite/generator/server/springboot/mvc/security/oauth2/infrastructure/primary/rest/OAuth2SecurityResourceIT.java index f53e69ee51c..d507f99a237 100644 --- a/src/test/java/tech/jhipster/lite/generator/server/springboot/mvc/security/oauth2/infrastructure/primary/rest/OAuth2SecurityResourceIT.java +++ b/src/test/java/tech/jhipster/lite/generator/server/springboot/mvc/security/oauth2/infrastructure/primary/rest/OAuth2SecurityResourceIT.java @@ -67,7 +67,7 @@ void shouldAddOAuth2() throws Exception { mockMvc .perform( - post("/api/servers/spring-boot/mvc/security/oauth2") + post("/api/servers/spring-boot/security-systems/oauth2") .contentType(MediaType.APPLICATION_JSON) .content(TestUtils.convertObjectToJsonBytes(projectDTO)) ) @@ -89,7 +89,7 @@ void shouldAddAccountContext() throws Exception { mockMvc .perform( - post("/api/servers/spring-boot/mvc/security/oauth2/account") + post("/api/servers/spring-boot/security-systems/oauth2/account") .contentType(MediaType.APPLICATION_JSON) .content(TestUtils.convertObjectToJsonBytes(projectDTO)) ) diff --git a/src/test/java/tech/jhipster/lite/generator/server/springboot/mvc/springdoc/infrastructure/primary/rest/SpringdocResourceIT.java b/src/test/java/tech/jhipster/lite/generator/server/springboot/mvc/springdoc/infrastructure/primary/rest/SpringdocResourceIT.java index f4a4cee8df2..1b6bd05fea8 100644 --- a/src/test/java/tech/jhipster/lite/generator/server/springboot/mvc/springdoc/infrastructure/primary/rest/SpringdocResourceIT.java +++ b/src/test/java/tech/jhipster/lite/generator/server/springboot/mvc/springdoc/infrastructure/primary/rest/SpringdocResourceIT.java @@ -59,7 +59,7 @@ void shouldInit() throws Exception { mockMvc .perform( - post("/api/servers/spring-boot/mvc/springdoc/init") + post("/api/servers/spring-boot/api-documentations/springdoc/init") .contentType(MediaType.APPLICATION_JSON) .content(TestUtils.convertObjectToJsonBytes(projectDTO)) ) @@ -90,7 +90,7 @@ void shouldInitWithSecurityJWT() throws Exception { mockMvc .perform( - post("/api/servers/spring-boot/mvc/springdoc/init-with-security-jwt") + post("/api/servers/spring-boot/api-documentations/springdoc/init-with-security-jwt") .contentType(MediaType.APPLICATION_JSON) .content(TestUtils.convertObjectToJsonBytes(projectDTO)) ) 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 1d7451237e2..0e7ac8a42a7 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 @@ -51,7 +51,7 @@ void shouldAddSpringBootMvc() throws Exception { mockMvc .perform( - post("/api/servers/spring-boot/mvc/web/tomcat") + post("/api/servers/spring-boot/web-servers/tomcat") .contentType(MediaType.APPLICATION_JSON) .content(TestUtils.convertObjectToJsonBytes(projectDTO)) ) @@ -79,7 +79,7 @@ void shouldAddSpringBootUndertow() throws Exception { mockMvc .perform( - post("/api/servers/spring-boot/mvc/web/undertow") + post("/api/servers/spring-boot/web-servers/undertow") .contentType(MediaType.APPLICATION_JSON) .content(TestUtils.convertObjectToJsonBytes(projectDTO)) ) @@ -103,7 +103,7 @@ void shouldAddSpringBootActuator() throws Exception { mockMvc .perform( - post("/api/servers/spring-boot/mvc/web/actuator") + post("/api/servers/spring-boot/technical-tools/actuator") .contentType(MediaType.APPLICATION_JSON) .content(TestUtils.convertObjectToJsonBytes(projectDTO)) ) 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 858cfd4e8de..2218b64b9bd 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 @@ -49,7 +49,7 @@ void shouldInit() throws Exception { mockMvc .perform( - post("/api/servers/spring-boot/spring-cloud/config-client") + post("/api/servers/spring-boot/distributed-systems/spring-cloud/config-client") .contentType(MediaType.APPLICATION_JSON) .content(TestUtils.convertObjectToJsonBytes(projectDTO)) ) 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 c862352dbab..8b4a6b8f174 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 @@ -51,7 +51,7 @@ void shouldInit() throws Exception { mockMvc .perform( - post("/api/servers/spring-boot/spring-cloud/consul") + post("/api/servers/spring-boot/distributed-systems/spring-cloud/consul") .contentType(MediaType.APPLICATION_JSON) .content(TestUtils.convertObjectToJsonBytes(projectDTO)) ) 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 e0ceb0b6602..a92e96c792f 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 @@ -49,7 +49,7 @@ void shouldInit() throws Exception { // When mockMvc .perform( - post("/api/servers/spring-boot/spring-cloud/eureka-client") + post("/api/servers/spring-boot/distributed-systems/spring-cloud/eureka-client") .contentType(MediaType.APPLICATION_JSON) .content(TestUtils.convertObjectToJsonBytes(projectDTO)) ) 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 2a5b3a27cd6..f8156c694ad 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 @@ -53,7 +53,7 @@ void shouldAddUserAndAuthorityEntitiesForPostgreSQL() throws Exception { mockMvc .perform( - post("/api/servers/spring-boot/user/postgresql") + post("/api/servers/spring-boot/features/user/postgresql") .contentType(MediaType.APPLICATION_JSON) .content(TestUtils.convertObjectToJsonBytes(projectDTO)) ) @@ -78,7 +78,7 @@ void shouldAddUserAndAuthorityEntitiesForMySQL() throws Exception { mockMvc .perform( - post("/api/servers/spring-boot/user/mysql") + post("/api/servers/spring-boot/features/user/mysql") .contentType(MediaType.APPLICATION_JSON) .content(TestUtils.convertObjectToJsonBytes(projectDTO)) ) @@ -103,7 +103,7 @@ void shouldAddUserAndAuthorityEntitiesForMariaDB() throws Exception { mockMvc .perform( - post("/api/servers/spring-boot/user/mariadb") + post("/api/servers/spring-boot/features/user/mariadb") .contentType(MediaType.APPLICATION_JSON) .content(TestUtils.convertObjectToJsonBytes(projectDTO)) ) diff --git a/src/test/java/tech/jhipster/lite/generator/setup/codespaces/infrastructure/primary/rest/CodespacesResourceIT.java b/src/test/java/tech/jhipster/lite/generator/setup/codespaces/infrastructure/primary/rest/CodespacesResourceIT.java index d46ac1ab188..739024cfbfc 100644 --- a/src/test/java/tech/jhipster/lite/generator/setup/codespaces/infrastructure/primary/rest/CodespacesResourceIT.java +++ b/src/test/java/tech/jhipster/lite/generator/setup/codespaces/infrastructure/primary/rest/CodespacesResourceIT.java @@ -31,7 +31,9 @@ void shouldInit() throws Exception { Project project = ProjectDTO.toProject(projectDTO); mockMvc - .perform(post("/api/setup/codespaces").contentType(MediaType.APPLICATION_JSON).content(convertObjectToJsonBytes(projectDTO))) + .perform( + post("/api/developer-tools/codespaces").contentType(MediaType.APPLICATION_JSON).content(convertObjectToJsonBytes(projectDTO)) + ) .andExpect(status().isOk()); assertFilesDockerfile(project); 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 00f7e051837..3087d245f57 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 @@ -34,7 +34,11 @@ void shouldInit() throws Exception { initApplicationService.init(project); mockMvc - .perform(post("/api/typescript").contentType(MediaType.APPLICATION_JSON).content(TestUtils.convertObjectToJsonBytes(projectDTO))) + .perform( + post("/api/javascript-languages/typescript") + .contentType(MediaType.APPLICATION_JSON) + .content(TestUtils.convertObjectToJsonBytes(projectDTO)) + ) .andExpect(status().isOk()); TypescriptAssert.assertDevDependencies(project); diff --git a/src/test/javascript/spec/common/secondary/ProjectHistoryRepository.spec.ts b/src/test/javascript/spec/common/secondary/ProjectHistoryRepository.spec.ts index 7cbf647aa44..8c1d529ac7b 100644 --- a/src/test/javascript/spec/common/secondary/ProjectHistoryRepository.spec.ts +++ b/src/test/javascript/spec/common/secondary/ProjectHistoryRepository.spec.ts @@ -13,7 +13,7 @@ describe('ProjectRepository', () => { const history: History = await projectHistoryRepository.get('folder/path'); const [uri, config] = axiosHttpStub.get.getCall(0).args; - expect(uri).toBe('api/projects/history'); + expect(uri).toBe('api/project-histories'); expect(config).toEqual({ params: { folder: 'folder/path' } }); expect(history).toEqual({ services: [Service.INITIALIZATION, Service.JAVA_BASE, Service.MAVEN], diff --git a/src/test/javascript/spec/springboot/secondary/ProjectRepository.spec.ts b/src/test/javascript/spec/springboot/secondary/ProjectRepository.spec.ts index 994e76c2a49..b2276491a33 100644 --- a/src/test/javascript/spec/springboot/secondary/ProjectRepository.spec.ts +++ b/src/test/javascript/spec/springboot/secondary/ProjectRepository.spec.ts @@ -15,7 +15,7 @@ describe('ProjectRepository', () => { const expectedRestProject: RestProject = toRestProject(project); const [uri, payload] = axiosHttpStub.post.getCall(0).args; - expect(uri).toBe('api/projects/init'); + expect(uri).toBe('api/projects'); expect(payload).toEqual(expectedRestProject); }); @@ -57,7 +57,7 @@ describe('ProjectRepository', () => { const expectedRestProject: RestProject = toRestProject(project); const [uri, payload] = axiosHttpStub.post.getCall(0).args; - expect(uri).toBe('api/frontend-maven-plugin'); + expect(uri).toBe('api/developer-tools/frontend-maven-plugin'); expect(payload).toEqual(expectedRestProject); }); }); diff --git a/src/test/javascript/spec/springboot/secondary/SpringBootRepository.spec.ts b/src/test/javascript/spec/springboot/secondary/SpringBootRepository.spec.ts index d53568f24ac..8a1301fab64 100644 --- a/src/test/javascript/spec/springboot/secondary/SpringBootRepository.spec.ts +++ b/src/test/javascript/spec/springboot/secondary/SpringBootRepository.spec.ts @@ -29,7 +29,7 @@ describe('SpringBootRepository', () => { const expectedRestProject: RestProject = toRestProject(project); const [uri, payload] = axiosHttpStub.post.getCall(0).args; - expect(uri).toBe('api/servers/spring-boot/mvc/web/tomcat'); + expect(uri).toBe('api/servers/spring-boot/web-servers/tomcat'); expect(payload).toEqual(expectedRestProject); }); @@ -43,7 +43,7 @@ describe('SpringBootRepository', () => { const expectedRestProject: RestProject = toRestProject(project); const [uri, payload] = axiosHttpStub.post.getCall(0).args; - expect(uri).toBe('api/servers/spring-boot/banner/ippon'); + expect(uri).toBe('api/servers/spring-boot/banners/ippon'); expect(payload).toEqual(expectedRestProject); }); @@ -57,7 +57,7 @@ describe('SpringBootRepository', () => { const expectedRestProject: RestProject = toRestProject(project); const [uri, payload] = axiosHttpStub.post.getCall(0).args; - expect(uri).toBe('api/servers/spring-boot/banner/jhipster-v2'); + expect(uri).toBe('api/servers/spring-boot/banners/jhipster-v2'); expect(payload).toEqual(expectedRestProject); }); @@ -71,7 +71,7 @@ describe('SpringBootRepository', () => { const expectedRestProject: RestProject = toRestProject(project); const [uri, payload] = axiosHttpStub.post.getCall(0).args; - expect(uri).toBe('api/servers/spring-boot/banner/jhipster-v3'); + expect(uri).toBe('api/servers/spring-boot/banners/jhipster-v3'); expect(payload).toEqual(expectedRestProject); }); @@ -85,7 +85,7 @@ describe('SpringBootRepository', () => { const expectedRestProject: RestProject = toRestProject(project); const [uri, payload] = axiosHttpStub.post.getCall(0).args; - expect(uri).toBe('api/servers/spring-boot/banner/jhipster-v7'); + expect(uri).toBe('api/servers/spring-boot/banners/jhipster-v7'); expect(payload).toEqual(expectedRestProject); }); @@ -99,7 +99,7 @@ describe('SpringBootRepository', () => { const expectedRestProject: RestProject = toRestProject(project); const [uri, payload] = axiosHttpStub.post.getCall(0).args; - expect(uri).toBe('api/servers/spring-boot/banner/jhipster-v7-react'); + expect(uri).toBe('api/servers/spring-boot/banners/jhipster-v7-react'); expect(payload).toEqual(expectedRestProject); }); @@ -113,7 +113,7 @@ describe('SpringBootRepository', () => { const expectedRestProject: RestProject = toRestProject(project); const [uri, payload] = axiosHttpStub.post.getCall(0).args; - expect(uri).toBe('api/servers/spring-boot/banner/jhipster-v7-vue'); + expect(uri).toBe('api/servers/spring-boot/banners/jhipster-v7-vue'); expect(payload).toEqual(expectedRestProject); }); @@ -183,7 +183,7 @@ describe('SpringBootRepository', () => { const expectedRestProject: RestProject = toRestProject(project); const [uri, payload] = axiosHttpStub.post.getCall(0).args; - expect(uri).toBe('/api/servers/spring-boot/databases/migration/flyway/init'); + expect(uri).toBe('/api/servers/spring-boot/database-migration-tools/flyway'); expect(payload).toEqual(expectedRestProject); }); @@ -197,7 +197,7 @@ describe('SpringBootRepository', () => { const expectedRestProject: RestProject = toRestProject(project); const [uri, payload] = axiosHttpStub.post.getCall(0).args; - expect(uri).toBe('/api/servers/spring-boot/databases/migration/flyway/user'); + expect(uri).toBe('/api/servers/spring-boot/database-migration-tools/flyway/user'); expect(payload).toEqual(expectedRestProject); }); @@ -211,7 +211,7 @@ describe('SpringBootRepository', () => { const expectedRestProject: RestProject = toRestProject(project); const [uri, payload] = axiosHttpStub.post.getCall(0).args; - expect(uri).toBe('/api/servers/spring-boot/databases/migration/liquibase/init'); + expect(uri).toBe('/api/servers/spring-boot/database-migration-tools/liquibase'); expect(payload).toEqual(expectedRestProject); }); @@ -225,7 +225,7 @@ describe('SpringBootRepository', () => { const expectedRestProject: RestProject = toRestProject(project); const [uri, payload] = axiosHttpStub.post.getCall(0).args; - expect(uri).toBe('/api/servers/spring-boot/databases/migration/liquibase/user'); + expect(uri).toBe('/api/servers/spring-boot/database-migration-tools/liquibase/user'); expect(payload).toEqual(expectedRestProject); }); @@ -239,7 +239,7 @@ describe('SpringBootRepository', () => { const expectedRestProject: RestProject = toRestProject(project); const [uri, payload] = axiosHttpStub.post.getCall(0).args; - expect(uri).toBe('/api/servers/spring-boot/mvc/security/jwt'); + expect(uri).toBe('/api/servers/spring-boot/security-systems/jwt'); expect(payload).toEqual(expectedRestProject); }); @@ -253,7 +253,7 @@ describe('SpringBootRepository', () => { const expectedRestProject: RestProject = toRestProject(project); const [uri, payload] = axiosHttpStub.post.getCall(0).args; - expect(uri).toBe('/api/servers/spring-boot/mvc/security/jwt/basic-auth'); + expect(uri).toBe('/api/servers/spring-boot/security-systems/jwt/basic-auth'); expect(payload).toEqual(expectedRestProject); }); @@ -267,7 +267,7 @@ describe('SpringBootRepository', () => { const expectedRestProject: RestProject = toRestProject(project); const [uri, payload] = axiosHttpStub.post.getCall(0).args; - expect(uri).toBe('/api/servers/spring-boot/mvc/security/oauth2'); + expect(uri).toBe('/api/servers/spring-boot/security-systems/oauth2'); expect(payload).toEqual(expectedRestProject); }); @@ -281,7 +281,7 @@ describe('SpringBootRepository', () => { const expectedRestProject: RestProject = toRestProject(project); const [uri, payload] = axiosHttpStub.post.getCall(0).args; - expect(uri).toBe('/api/servers/spring-boot/mvc/springdoc/init-with-security-jwt'); + expect(uri).toBe('/api/servers/spring-boot/api-documentations/springdoc/init-with-security-jwt'); expect(payload).toEqual(expectedRestProject); }); @@ -309,7 +309,7 @@ describe('SpringBootRepository', () => { const expectedRestProject: RestProject = toRestProject(project); const [uri, payload] = axiosHttpStub.post.getCall(0).args; - expect(uri).toBe('/api/servers/spring-boot/devtools'); + expect(uri).toBe('/api/servers/spring-boot/technical-tools/devtools'); expect(payload).toEqual(expectedRestProject); }); @@ -323,7 +323,7 @@ describe('SpringBootRepository', () => { const expectedRestProject: RestProject = toRestProject(project); const [uri, payload] = axiosHttpStub.post.getCall(0).args; - expect(uri).toBe('/api/servers/spring-boot/docker/dockerfile'); + expect(uri).toBe('/api/servers/spring-boot/containers/docker/dockerfile'); expect(payload).toEqual(expectedRestProject); }); @@ -337,7 +337,7 @@ describe('SpringBootRepository', () => { const expectedRestProject: RestProject = toRestProject(project); const [uri, payload] = axiosHttpStub.post.getCall(0).args; - expect(uri).toBe('/api/servers/spring-boot/docker/jib'); + expect(uri).toBe('/api/servers/spring-boot/containers/docker/jib'); expect(payload).toEqual(expectedRestProject); }); @@ -351,7 +351,7 @@ describe('SpringBootRepository', () => { const expectedRestProject: RestProject = toRestProject(project); const [uri, payload] = axiosHttpStub.post.getCall(0).args; - expect(uri).toBe('/api/servers/spring-boot/spring-cloud/config-client'); + expect(uri).toBe('/api/servers/spring-boot/distributed-systems/spring-cloud/config-client'); expect(payload).toEqual(expectedRestProject); }); @@ -365,7 +365,7 @@ describe('SpringBootRepository', () => { const expectedRestProject: RestProject = toRestProject(project); const [uri, payload] = axiosHttpStub.post.getCall(0).args; - expect(uri).toBe('/api/servers/spring-boot/spring-cloud/consul'); + expect(uri).toBe('/api/servers/spring-boot/distributed-systems/spring-cloud/consul'); expect(payload).toEqual(expectedRestProject); }); @@ -379,7 +379,7 @@ describe('SpringBootRepository', () => { const expectedRestProject: RestProject = toRestProject(project); const [uri, payload] = axiosHttpStub.post.getCall(0).args; - expect(uri).toBe('/api/servers/spring-boot/spring-cloud/eureka-client'); + expect(uri).toBe('/api/servers/spring-boot/distributed-systems/spring-cloud/eureka-client'); expect(payload).toEqual(expectedRestProject); }); @@ -393,7 +393,7 @@ describe('SpringBootRepository', () => { const expectedRestProject: RestProject = toRestProject(project); const [uri, payload] = axiosHttpStub.post.getCall(0).args; - expect(uri).toBe('/api/servers/spring-boot/cache/ehcache/java-configuration'); + expect(uri).toBe('/api/servers/spring-boot/caches/ehcache/java-configuration'); expect(payload).toEqual(expectedRestProject); }); @@ -407,7 +407,7 @@ describe('SpringBootRepository', () => { const expectedRestProject: RestProject = toRestProject(project); const [uri, payload] = axiosHttpStub.post.getCall(0).args; - expect(uri).toBe('/api/servers/spring-boot/cache/ehcache/xml-configuration'); + expect(uri).toBe('/api/servers/spring-boot/caches/ehcache/xml-configuration'); expect(payload).toEqual(expectedRestProject); }); @@ -421,7 +421,7 @@ describe('SpringBootRepository', () => { const expectedRestProject: RestProject = toRestProject(project); const [uri, payload] = axiosHttpStub.post.getCall(0).args; - expect(uri).toBe('/api/servers/spring-boot/cache/simple'); + expect(uri).toBe('/api/servers/spring-boot/caches/simple'); expect(payload).toEqual(expectedRestProject); }); }); diff --git a/src/test/javascript/spec/springboot/secondary/client/AngularRepository.spec.ts b/src/test/javascript/spec/springboot/secondary/client/AngularRepository.spec.ts index 5c5a7bc639c..b59dcaf45d7 100644 --- a/src/test/javascript/spec/springboot/secondary/client/AngularRepository.spec.ts +++ b/src/test/javascript/spec/springboot/secondary/client/AngularRepository.spec.ts @@ -29,7 +29,7 @@ describe('AngularRepository', () => { const expectedRestProject: RestProject = toRestProject(project); const [uri, payload] = axiosHttpStub.post.getCall(0).args; - expect(uri).toBe('/api/clients/angular/styled'); + expect(uri).toBe('/api/clients/angular/styles'); expect(payload).toEqual(expectedRestProject); }); }); diff --git a/src/test/javascript/spec/springboot/secondary/client/ReactRepository.spec.ts b/src/test/javascript/spec/springboot/secondary/client/ReactRepository.spec.ts index ca927b54902..f94efd1fe35 100644 --- a/src/test/javascript/spec/springboot/secondary/client/ReactRepository.spec.ts +++ b/src/test/javascript/spec/springboot/secondary/client/ReactRepository.spec.ts @@ -29,7 +29,7 @@ describe('ReactRepository', () => { const expectedRestProject: RestProject = toRestProject(project); const [uri, payload] = axiosHttpStub.post.getCall(0).args; - expect(uri).toBe('/api/clients/react/styled'); + expect(uri).toBe('/api/clients/react/styles'); expect(payload).toEqual(expectedRestProject); }); }); diff --git a/src/test/javascript/spec/springboot/secondary/client/VueRepository.spec.ts b/src/test/javascript/spec/springboot/secondary/client/VueRepository.spec.ts index 29919de0346..318acdb1f4f 100644 --- a/src/test/javascript/spec/springboot/secondary/client/VueRepository.spec.ts +++ b/src/test/javascript/spec/springboot/secondary/client/VueRepository.spec.ts @@ -29,7 +29,7 @@ describe('VueRepository', () => { const expectedRestProject: RestProject = toRestProject(project); const [uri, payload] = axiosHttpStub.post.getCall(0).args; - expect(uri).toBe('/api/clients/vue/styled'); + expect(uri).toBe('/api/clients/vue/styles'); expect(payload).toEqual(expectedRestProject); }); }); diff --git a/tests-ci/generate.sh b/tests-ci/generate.sh index 0eec1260591..6f5753101ca 100755 --- a/tests-ci/generate.sh +++ b/tests-ci/generate.sh @@ -29,39 +29,39 @@ callApi() { "http://localhost:7471""$api") if [[ $status_code == '40'* || $status_code == '50'* ]]; then - echo "Error when calling API:" "$status_code" + echo "Error when calling API:" "$status_code" "$api" exit 1 fi; } springboot() { - callApi "/api/projects/init" + callApi "/api/projects" callApi "/api/build-tools/maven" - callApi "/api/github-actions/maven" + callApi "/api/developer-tools/github-actions/maven" callApi "/api/servers/java/base" callApi "/api/servers/java/jacoco-minimum-coverage" callApi "/api/servers/spring-boot" - callApi "/api/servers/spring-boot/mvc/web/tomcat" - callApi "/api/servers/spring-boot/mvc/web/actuator" + callApi "/api/servers/spring-boot/web-servers/tomcat" + callApi "/api/servers/spring-boot/technical-tools/actuator" } springboot_undertow() { - callApi "/api/projects/init" + callApi "/api/projects" callApi "/api/build-tools/maven" - callApi "/api/github-actions/maven" + callApi "/api/developer-tools/github-actions/maven" callApi "/api/servers/java/base" callApi "/api/servers/java/jacoco-minimum-coverage" callApi "/api/servers/spring-boot" - callApi "/api/servers/spring-boot/mvc/web/undertow" - callApi "/api/servers/spring-boot/mvc/web/actuator" + callApi "/api/servers/spring-boot/web-servers/undertow" + callApi "/api/servers/spring-boot/technical-tools/actuator" } sonar_back() { - callApi "/api/servers/sonar/java-backend" + callApi "/api/developer-tools/sonar/java-backend" } sonar_back_front() { - callApi "/api/servers/sonar/java-backend-and-frontend" + callApi "/api/developer-tools/sonar/java-backend-and-frontend" } if [[ $application == 'springboot' ]]; then @@ -77,97 +77,97 @@ elif [[ $application == 'fullapp' ]]; then sonar_back_front callApi "/api/servers/spring-boot/async" - callApi "/api/servers/spring-boot/devtools" - callApi "/api/servers/spring-boot/logging/aop" - callApi "/api/servers/spring-boot/logging/logstash" - callApi "/api/servers/spring-boot/banner/jhipster-v7" - callApi "/api/servers/spring-boot/docker/jib" - callApi "/api/servers/spring-boot/docker/dockerfile" + callApi "/api/servers/spring-boot/technical-tools/devtools" + callApi "/api/servers/spring-boot/log-tools/aop" + callApi "/api/servers/spring-boot/log-tools/logstash" + callApi "/api/servers/spring-boot/banners/jhipster-v7" + callApi "/api/servers/spring-boot/containers/docker/jib" + callApi "/api/servers/spring-boot/containers/docker/dockerfile" callApi "/api/servers/java/arch" - callApi "/api/setup/codespaces" + callApi "/api/developer-tools/codespaces" - callApi "/api/servers/spring-boot/mvc/security/jwt" - callApi "/api/servers/spring-boot/mvc/security/jwt/basic-auth" - callApi "/api/servers/spring-boot/mvc/springdoc/init-with-security-jwt" - callApi "/api/servers/spring-boot/mvc/dummy" + callApi "/api/servers/spring-boot/security-systems/jwt" + callApi "/api/servers/spring-boot/security-systems/jwt/basic-auth" + callApi "/api/servers/spring-boot/api-documentations/springdoc/init-with-security-jwt" + callApi "/api/servers/spring-boot/features" callApi "/api/servers/spring-boot/databases/postgresql" - callApi "/api/servers/spring-boot/user/postgresql" - callApi "/api/servers/spring-boot/databases/migration/liquibase/init" - callApi "/api/servers/spring-boot/databases/migration/liquibase/user" + callApi "/api/servers/spring-boot/features/user/postgresql" + callApi "/api/servers/spring-boot/database-migration-tools/liquibase" + callApi "/api/servers/spring-boot/database-migration-tools/liquibase/user" - callApi "/api/servers/spring-boot/cache/ehcache/java-configuration" + callApi "/api/servers/spring-boot/caches/ehcache/java-configuration" - callApi "/api/frontend-maven-plugin" + callApi "/api/developer-tools/frontend-maven-plugin" callApi "/api/clients/vue" elif [[ $application == 'oauth2app' ]]; then springboot sonar_back - callApi "/api/servers/spring-boot/mvc/security/oauth2" - callApi "/api/servers/spring-boot/mvc/security/oauth2/account" + callApi "/api/servers/spring-boot/security-systems/oauth2" + callApi "/api/servers/spring-boot/security-systems/oauth2/account" elif [[ $application == 'mysqlapp' ]]; then springboot sonar_back - callApi "/api/servers/spring-boot/mvc/springdoc/init" - callApi "/api/servers/spring-boot/mvc/dummy" + callApi "/api/servers/spring-boot/api-documentations/springdoc/init" + callApi "/api/servers/spring-boot/features" callApi "/api/servers/spring-boot/databases/mysql" - callApi "/api/servers/spring-boot/user/mysql" - callApi "/api/servers/spring-boot/databases/migration/liquibase/init" - callApi "/api/servers/spring-boot/databases/migration/liquibase/user" + callApi "/api/servers/spring-boot/features/user/mysql" + callApi "/api/servers/spring-boot/database-migration-tools/liquibase" + callApi "/api/servers/spring-boot/database-migration-tools/liquibase/user" - callApi "/api/servers/spring-boot/cache/ehcache/xml-configuration" + callApi "/api/servers/spring-boot/caches/ehcache/xml-configuration" elif [[ $application == 'mariadbapp' ]]; then springboot sonar_back - callApi "/api/servers/spring-boot/mvc/springdoc/init" - callApi "/api/servers/spring-boot/mvc/dummy" + callApi "/api/servers/spring-boot/api-documentations/springdoc/init" + callApi "/api/servers/spring-boot/features" callApi "/api/servers/spring-boot/databases/mariadb" - callApi "/api/servers/spring-boot/user/mariadb" - callApi "/api/servers/spring-boot/databases/migration/liquibase/init" - callApi "/api/servers/spring-boot/databases/migration/liquibase/user" + callApi "/api/servers/spring-boot/features/user/mariadb" + callApi "/api/servers/spring-boot/database-migration-tools/liquibase" + callApi "/api/servers/spring-boot/database-migration-tools/liquibase/user" - callApi "/api/servers/spring-boot/cache/ehcache/xml-configuration" + callApi "/api/servers/spring-boot/caches/ehcache/xml-configuration" elif [[ $application == 'flywayapp' ]]; then springboot sonar_back callApi "/api/servers/spring-boot/databases/postgresql" - callApi "/api/servers/spring-boot/user/postgresql" - callApi "/api/servers/spring-boot/databases/migration/flyway/init" - callApi "/api/servers/spring-boot/databases/migration/flyway/user" + callApi "/api/servers/spring-boot/features/user/postgresql" + callApi "/api/servers/spring-boot/database-migration-tools/flyway" + callApi "/api/servers/spring-boot/database-migration-tools/flyway/user" elif [[ $application == 'undertowapp' ]]; then springboot_undertow sonar_back callApi "/api/servers/spring-boot/databases/mysql" - callApi "/api/servers/spring-boot/user/mysql" - callApi "/api/servers/spring-boot/databases/migration/flyway/init" - callApi "/api/servers/spring-boot/databases/migration/flyway/user" + callApi "/api/servers/spring-boot/features/user/mysql" + callApi "/api/servers/spring-boot/database-migration-tools/flyway" + callApi "/api/servers/spring-boot/database-migration-tools/flyway/user" - callApi "/api/servers/spring-boot/cache/simple" + callApi "/api/servers/spring-boot/caches/simple" elif [[ $application == 'eurekaapp' ]]; then springboot sonar_back - callApi "/api/servers/spring-boot/spring-cloud/eureka-client" - callApi "/api/servers/spring-boot/spring-cloud/config-client" + callApi "/api/servers/spring-boot/distributed-systems/spring-cloud/eureka-client" + callApi "/api/servers/spring-boot/distributed-systems/spring-cloud/config-client" elif [[ $application == 'consulapp' ]]; then springboot_undertow sonar_back - callApi "/api/servers/spring-boot/spring-cloud/consul" + callApi "/api/servers/spring-boot/distributed-systems/spring-cloud/consul" elif [[ $application == 'mongodbapp' ]]; then springboot @@ -179,36 +179,36 @@ elif [[ $application == 'angularapp' ]]; then springboot sonar_back_front - callApi "/api/frontend-maven-plugin" + callApi "/api/developer-tools/frontend-maven-plugin" callApi "/api/clients/angular" - callApi "/api/servers/spring-boot/mvc/security/jwt" - callApi "/api/servers/spring-boot/mvc/security/jwt/basic-auth" + callApi "/api/servers/spring-boot/security-systems/jwt" + callApi "/api/servers/spring-boot/security-systems/jwt/basic-auth" callApi "/api/clients/angular/jwt" elif [[ $application == 'reactapp' ]]; then springboot sonar_back_front - callApi "/api/frontend-maven-plugin" - callApi "/api/clients/react/styled" + callApi "/api/developer-tools/frontend-maven-plugin" + callApi "/api/clients/react/styles" callApi "/api/clients/cypress" elif [[ $application == 'vueapp' ]]; then springboot sonar_back_front - callApi "/api/frontend-maven-plugin" - callApi "/api/clients/vue/styled" - callApi "/api/clients/vue/pinia" + callApi "/api/developer-tools/frontend-maven-plugin" + callApi "/api/clients/vue/styles" + callApi "/api/clients/vue/stores/pinia" callApi "/api/clients/cypress" elif [[ $application == 'svelteapp' ]]; then springboot sonar_back_front - callApi "/api/frontend-maven-plugin" - callApi "/api/clients/svelte/styled" + callApi "/api/developer-tools/frontend-maven-plugin" + callApi "/api/clients/svelte/styles" elif [[ $application == 'kafkaapp' ]]; then springboot