diff --git a/src/main/java/tech/jhipster/lite/generator/server/springboot/consul/package-info.java b/src/main/java/tech/jhipster/lite/generator/server/springboot/consul/package-info.java deleted file mode 100644 index 8168d4cc152..00000000000 --- a/src/main/java/tech/jhipster/lite/generator/server/springboot/consul/package-info.java +++ /dev/null @@ -1,2 +0,0 @@ -@tech.jhipster.lite.BusinessContext -package tech.jhipster.lite.generator.server.springboot.consul; diff --git a/src/main/java/tech/jhipster/lite/generator/server/springboot/consul/application/ConsulApplicationService.java b/src/main/java/tech/jhipster/lite/generator/server/springboot/springcloud/consul/application/ConsulApplicationService.java similarity index 78% rename from src/main/java/tech/jhipster/lite/generator/server/springboot/consul/application/ConsulApplicationService.java rename to src/main/java/tech/jhipster/lite/generator/server/springboot/springcloud/consul/application/ConsulApplicationService.java index 5eaee1355e2..30867a6602e 100644 --- a/src/main/java/tech/jhipster/lite/generator/server/springboot/consul/application/ConsulApplicationService.java +++ b/src/main/java/tech/jhipster/lite/generator/server/springboot/springcloud/consul/application/ConsulApplicationService.java @@ -1,8 +1,8 @@ -package tech.jhipster.lite.generator.server.springboot.consul.application; +package tech.jhipster.lite.generator.server.springboot.springcloud.consul.application; import org.springframework.stereotype.Service; import tech.jhipster.lite.generator.project.domain.Project; -import tech.jhipster.lite.generator.server.springboot.consul.domain.ConsulService; +import tech.jhipster.lite.generator.server.springboot.springcloud.consul.domain.ConsulService; @Service public class ConsulApplicationService { diff --git a/src/main/java/tech/jhipster/lite/generator/server/springboot/consul/domain/Consul.java b/src/main/java/tech/jhipster/lite/generator/server/springboot/springcloud/consul/domain/Consul.java similarity index 94% rename from src/main/java/tech/jhipster/lite/generator/server/springboot/consul/domain/Consul.java rename to src/main/java/tech/jhipster/lite/generator/server/springboot/springcloud/consul/domain/Consul.java index 41b2d307b44..6901ca2d00a 100644 --- a/src/main/java/tech/jhipster/lite/generator/server/springboot/consul/domain/Consul.java +++ b/src/main/java/tech/jhipster/lite/generator/server/springboot/springcloud/consul/domain/Consul.java @@ -1,4 +1,4 @@ -package tech.jhipster.lite.generator.server.springboot.consul.domain; +package tech.jhipster.lite.generator.server.springboot.springcloud.consul.domain; import tech.jhipster.lite.generator.buildtool.generic.domain.Dependency; diff --git a/src/main/java/tech/jhipster/lite/generator/server/springboot/consul/domain/ConsulDomainService.java b/src/main/java/tech/jhipster/lite/generator/server/springboot/springcloud/consul/domain/ConsulDomainService.java similarity index 89% rename from src/main/java/tech/jhipster/lite/generator/server/springboot/consul/domain/ConsulDomainService.java rename to src/main/java/tech/jhipster/lite/generator/server/springboot/springcloud/consul/domain/ConsulDomainService.java index 3611525cb6e..8384e91d7b7 100644 --- a/src/main/java/tech/jhipster/lite/generator/server/springboot/consul/domain/ConsulDomainService.java +++ b/src/main/java/tech/jhipster/lite/generator/server/springboot/springcloud/consul/domain/ConsulDomainService.java @@ -1,9 +1,9 @@ -package tech.jhipster.lite.generator.server.springboot.consul.domain; +package tech.jhipster.lite.generator.server.springboot.springcloud.consul.domain; import static tech.jhipster.lite.common.domain.FileUtils.getPath; import static tech.jhipster.lite.generator.project.domain.Constants.*; import static tech.jhipster.lite.generator.project.domain.DefaultConfig.BASE_NAME; -import static tech.jhipster.lite.generator.server.springboot.consul.domain.Consul.*; +import static tech.jhipster.lite.generator.server.springboot.springcloud.consul.domain.Consul.*; import tech.jhipster.lite.generator.buildtool.generic.domain.BuildToolService; import tech.jhipster.lite.generator.project.domain.Project; @@ -11,7 +11,7 @@ public class ConsulDomainService implements ConsulService { - public static final String SOURCE = "server/springboot/consul"; + public static final String SOURCE = "server/springboot/springcloud/consul"; private final BuildToolService buildToolService; private final ProjectRepository projectRepository; diff --git a/src/main/java/tech/jhipster/lite/generator/server/springboot/consul/domain/ConsulService.java b/src/main/java/tech/jhipster/lite/generator/server/springboot/springcloud/consul/domain/ConsulService.java similarity index 75% rename from src/main/java/tech/jhipster/lite/generator/server/springboot/consul/domain/ConsulService.java rename to src/main/java/tech/jhipster/lite/generator/server/springboot/springcloud/consul/domain/ConsulService.java index a772782061d..1b003b01d4e 100644 --- a/src/main/java/tech/jhipster/lite/generator/server/springboot/consul/domain/ConsulService.java +++ b/src/main/java/tech/jhipster/lite/generator/server/springboot/springcloud/consul/domain/ConsulService.java @@ -1,4 +1,4 @@ -package tech.jhipster.lite.generator.server.springboot.consul.domain; +package tech.jhipster.lite.generator.server.springboot.springcloud.consul.domain; import tech.jhipster.lite.generator.project.domain.Project; diff --git a/src/main/java/tech/jhipster/lite/generator/server/springboot/consul/infrastructure/config/ConsulBeanConfiguration.java b/src/main/java/tech/jhipster/lite/generator/server/springboot/springcloud/consul/infrastructure/config/ConsulBeanConfiguration.java similarity index 72% rename from src/main/java/tech/jhipster/lite/generator/server/springboot/consul/infrastructure/config/ConsulBeanConfiguration.java rename to src/main/java/tech/jhipster/lite/generator/server/springboot/springcloud/consul/infrastructure/config/ConsulBeanConfiguration.java index 217c0864009..5733469d9a5 100644 --- a/src/main/java/tech/jhipster/lite/generator/server/springboot/consul/infrastructure/config/ConsulBeanConfiguration.java +++ b/src/main/java/tech/jhipster/lite/generator/server/springboot/springcloud/consul/infrastructure/config/ConsulBeanConfiguration.java @@ -1,11 +1,11 @@ -package tech.jhipster.lite.generator.server.springboot.consul.infrastructure.config; +package tech.jhipster.lite.generator.server.springboot.springcloud.consul.infrastructure.config; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import tech.jhipster.lite.generator.buildtool.generic.domain.BuildToolService; import tech.jhipster.lite.generator.project.domain.ProjectRepository; -import tech.jhipster.lite.generator.server.springboot.consul.domain.ConsulDomainService; -import tech.jhipster.lite.generator.server.springboot.consul.domain.ConsulService; +import tech.jhipster.lite.generator.server.springboot.springcloud.consul.domain.ConsulDomainService; +import tech.jhipster.lite.generator.server.springboot.springcloud.consul.domain.ConsulService; @Configuration public class ConsulBeanConfiguration { diff --git a/src/main/java/tech/jhipster/lite/generator/server/springboot/consul/infrastructure/primary/rest/ConsulResource.java b/src/main/java/tech/jhipster/lite/generator/server/springboot/springcloud/consul/infrastructure/primary/rest/ConsulResource.java similarity index 82% rename from src/main/java/tech/jhipster/lite/generator/server/springboot/consul/infrastructure/primary/rest/ConsulResource.java rename to src/main/java/tech/jhipster/lite/generator/server/springboot/springcloud/consul/infrastructure/primary/rest/ConsulResource.java index 3822d29b673..4bae29f9c44 100644 --- a/src/main/java/tech/jhipster/lite/generator/server/springboot/consul/infrastructure/primary/rest/ConsulResource.java +++ b/src/main/java/tech/jhipster/lite/generator/server/springboot/springcloud/consul/infrastructure/primary/rest/ConsulResource.java @@ -1,4 +1,4 @@ -package tech.jhipster.lite.generator.server.springboot.consul.infrastructure.primary.rest; +package tech.jhipster.lite.generator.server.springboot.springcloud.consul.infrastructure.primary.rest; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.responses.ApiResponse; @@ -9,11 +9,11 @@ import org.springframework.web.bind.annotation.RestController; import tech.jhipster.lite.generator.project.domain.Project; import tech.jhipster.lite.generator.project.infrastructure.primary.dto.ProjectDTO; -import tech.jhipster.lite.generator.server.springboot.consul.application.ConsulApplicationService; +import tech.jhipster.lite.generator.server.springboot.springcloud.consul.application.ConsulApplicationService; @RestController @RequestMapping("/api/servers/spring-boot/spring-cloud/consul") -@Tag(name = "Spring Boot - Cloud") +@Tag(name = "Spring Boot - Spring Cloud") class ConsulResource { private final ConsulApplicationService consulApplicationService; diff --git a/src/main/java/tech/jhipster/lite/generator/server/springboot/springcloud/consul/package-info.java b/src/main/java/tech/jhipster/lite/generator/server/springboot/springcloud/consul/package-info.java new file mode 100644 index 00000000000..3bf01889d00 --- /dev/null +++ b/src/main/java/tech/jhipster/lite/generator/server/springboot/springcloud/consul/package-info.java @@ -0,0 +1,2 @@ +@tech.jhipster.lite.BusinessContext +package tech.jhipster.lite.generator.server.springboot.springcloud.consul; diff --git a/src/main/resources/generator/server/springboot/consul/src/bootstrap-fast.properties.mustache b/src/main/resources/generator/server/springboot/springcloud/consul/src/bootstrap-fast.properties.mustache similarity index 100% rename from src/main/resources/generator/server/springboot/consul/src/bootstrap-fast.properties.mustache rename to src/main/resources/generator/server/springboot/springcloud/consul/src/bootstrap-fast.properties.mustache diff --git a/src/main/resources/generator/server/springboot/consul/src/bootstrap.properties.mustache b/src/main/resources/generator/server/springboot/springcloud/consul/src/bootstrap.properties.mustache similarity index 100% rename from src/main/resources/generator/server/springboot/consul/src/bootstrap.properties.mustache rename to src/main/resources/generator/server/springboot/springcloud/consul/src/bootstrap.properties.mustache diff --git a/src/main/resources/generator/server/springboot/consul/src/consul.yml.mustache b/src/main/resources/generator/server/springboot/springcloud/consul/src/consul.yml.mustache similarity index 100% rename from src/main/resources/generator/server/springboot/consul/src/consul.yml.mustache rename to src/main/resources/generator/server/springboot/springcloud/consul/src/consul.yml.mustache diff --git a/src/main/resources/generator/server/springboot/consul/test/bootstrap.properties.mustache b/src/main/resources/generator/server/springboot/springcloud/consul/test/bootstrap.properties.mustache similarity index 100% rename from src/main/resources/generator/server/springboot/consul/test/bootstrap.properties.mustache rename to src/main/resources/generator/server/springboot/springcloud/consul/test/bootstrap.properties.mustache diff --git a/src/test/java/tech/jhipster/lite/generator/server/springboot/consul/application/ConsulApplicationServiceIT.java b/src/test/java/tech/jhipster/lite/generator/server/springboot/springcloud/consul/application/ConsulApplicationServiceIT.java similarity index 92% rename from src/test/java/tech/jhipster/lite/generator/server/springboot/consul/application/ConsulApplicationServiceIT.java rename to src/test/java/tech/jhipster/lite/generator/server/springboot/springcloud/consul/application/ConsulApplicationServiceIT.java index 25cf5e4e4b8..b7ee8986055 100644 --- a/src/test/java/tech/jhipster/lite/generator/server/springboot/consul/application/ConsulApplicationServiceIT.java +++ b/src/test/java/tech/jhipster/lite/generator/server/springboot/springcloud/consul/application/ConsulApplicationServiceIT.java @@ -1,8 +1,8 @@ -package tech.jhipster.lite.generator.server.springboot.consul.application; +package tech.jhipster.lite.generator.server.springboot.springcloud.consul.application; import static tech.jhipster.lite.TestUtils.tmpProject; import static tech.jhipster.lite.generator.project.domain.DefaultConfig.BASE_NAME; -import static tech.jhipster.lite.generator.server.springboot.consul.application.ConsulAssert.*; +import static tech.jhipster.lite.generator.server.springboot.springcloud.consul.application.ConsulAssert.*; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/test/java/tech/jhipster/lite/generator/server/springboot/consul/application/ConsulAssert.java b/src/test/java/tech/jhipster/lite/generator/server/springboot/springcloud/consul/application/ConsulAssert.java similarity index 90% rename from src/test/java/tech/jhipster/lite/generator/server/springboot/consul/application/ConsulAssert.java rename to src/test/java/tech/jhipster/lite/generator/server/springboot/springcloud/consul/application/ConsulAssert.java index 4bcd984a774..ebce4055fa6 100644 --- a/src/test/java/tech/jhipster/lite/generator/server/springboot/consul/application/ConsulAssert.java +++ b/src/test/java/tech/jhipster/lite/generator/server/springboot/springcloud/consul/application/ConsulAssert.java @@ -1,12 +1,12 @@ -package tech.jhipster.lite.generator.server.springboot.consul.application; +package tech.jhipster.lite.generator.server.springboot.springcloud.consul.application; import static tech.jhipster.lite.TestUtils.assertFileContent; import static tech.jhipster.lite.TestUtils.assertFileExist; import static tech.jhipster.lite.common.domain.FileUtils.getPath; import static tech.jhipster.lite.generator.project.domain.Constants.MAIN_RESOURCES; import static tech.jhipster.lite.generator.project.domain.Constants.TEST_RESOURCES; -import static tech.jhipster.lite.generator.server.springboot.consul.domain.Consul.getDockerConsulImage; -import static tech.jhipster.lite.generator.server.springboot.consul.domain.Consul.getSpringCloudVersion; +import static tech.jhipster.lite.generator.server.springboot.springcloud.consul.domain.Consul.getDockerConsulImage; +import static tech.jhipster.lite.generator.server.springboot.springcloud.consul.domain.Consul.getSpringCloudVersion; import java.util.List; import tech.jhipster.lite.generator.project.domain.Project; diff --git a/src/test/java/tech/jhipster/lite/generator/server/springboot/consul/infrastructure/config/ConsulBeanConfigurationIT.java b/src/test/java/tech/jhipster/lite/generator/server/springboot/springcloud/consul/infrastructure/config/ConsulBeanConfigurationIT.java similarity index 72% rename from src/test/java/tech/jhipster/lite/generator/server/springboot/consul/infrastructure/config/ConsulBeanConfigurationIT.java rename to src/test/java/tech/jhipster/lite/generator/server/springboot/springcloud/consul/infrastructure/config/ConsulBeanConfigurationIT.java index 68b5ee543c5..d80efa08104 100644 --- a/src/test/java/tech/jhipster/lite/generator/server/springboot/consul/infrastructure/config/ConsulBeanConfigurationIT.java +++ b/src/test/java/tech/jhipster/lite/generator/server/springboot/springcloud/consul/infrastructure/config/ConsulBeanConfigurationIT.java @@ -1,4 +1,4 @@ -package tech.jhipster.lite.generator.server.springboot.consul.infrastructure.config; +package tech.jhipster.lite.generator.server.springboot.springcloud.consul.infrastructure.config; import static org.assertj.core.api.Assertions.assertThat; @@ -6,7 +6,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationContext; import tech.jhipster.lite.IntegrationTest; -import tech.jhipster.lite.generator.server.springboot.consul.domain.ConsulDomainService; +import tech.jhipster.lite.generator.server.springboot.springcloud.consul.domain.ConsulDomainService; @IntegrationTest class ConsulBeanConfigurationIT { diff --git a/src/test/java/tech/jhipster/lite/generator/server/springboot/consul/infrastructure/primary/rest/ConsulResourceIT.java b/src/test/java/tech/jhipster/lite/generator/server/springboot/springcloud/consul/infrastructure/primary/rest/ConsulResourceIT.java similarity index 91% rename from src/test/java/tech/jhipster/lite/generator/server/springboot/consul/infrastructure/primary/rest/ConsulResourceIT.java rename to src/test/java/tech/jhipster/lite/generator/server/springboot/springcloud/consul/infrastructure/primary/rest/ConsulResourceIT.java index 59459d6023a..2b1a3a5375d 100644 --- a/src/test/java/tech/jhipster/lite/generator/server/springboot/consul/infrastructure/primary/rest/ConsulResourceIT.java +++ b/src/test/java/tech/jhipster/lite/generator/server/springboot/springcloud/consul/infrastructure/primary/rest/ConsulResourceIT.java @@ -1,8 +1,8 @@ -package tech.jhipster.lite.generator.server.springboot.consul.infrastructure.primary.rest; +package tech.jhipster.lite.generator.server.springboot.springcloud.consul.infrastructure.primary.rest; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; -import static tech.jhipster.lite.generator.server.springboot.consul.application.ConsulAssert.*; +import static tech.jhipster.lite.generator.server.springboot.springcloud.consul.application.ConsulAssert.*; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired;