Merge pull request #492 from pascalgrimaud/refactoring-spring-cloud-c…

…onsul Refactoring: move Consul to Spring Cloud
jhipster · Jan 6, 2022 · bdf7d17 · bdf7d17
2 parents 88703ad + d3c4bfc
commit bdf7d17
Show file tree

Hide file tree

Showing 16 changed files with 24 additions and 24 deletions.
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
diff --git a/...application/ConsulApplicationService.java → ...application/ConsulApplicationService.java b/...application/ConsulApplicationService.java → ...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/...rver/springboot/consul/domain/Consul.java → ...oot/springcloud/consul/domain/Consul.java b/...rver/springboot/consul/domain/Consul.java → ...oot/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/...ot/consul/domain/ConsulDomainService.java → ...ud/consul/domain/ConsulDomainService.java b/...ot/consul/domain/ConsulDomainService.java → ...ud/consul/domain/ConsulDomainService.java
@@ -1,17 +1,17 @@
-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;
 import tech.jhipster.lite.generator.project.domain.ProjectRepository;
 
 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/...ringboot/consul/domain/ConsulService.java → ...ingcloud/consul/domain/ConsulService.java b/...ringboot/consul/domain/ConsulService.java → ...ingcloud/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/...cture/config/ConsulBeanConfiguration.java → ...cture/config/ConsulBeanConfiguration.java b/...cture/config/ConsulBeanConfiguration.java → ...cture/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/...tructure/primary/rest/ConsulResource.java → ...tructure/primary/rest/ConsulResource.java b/...tructure/primary/rest/ConsulResource.java → ...tructure/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/.../java/tech/jhipster/lite/generator/server/springboot/springcloud/consul/package-info.java b/.../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/...ul/src/bootstrap-fast.properties.mustache → ...ul/src/bootstrap-fast.properties.mustache b/...ul/src/bootstrap-fast.properties.mustache → ...ul/src/bootstrap-fast.properties.mustache
diff --git a/.../consul/src/bootstrap.properties.mustache → .../consul/src/bootstrap.properties.mustache b/.../consul/src/bootstrap.properties.mustache → .../consul/src/bootstrap.properties.mustache
diff --git a/...springboot/consul/src/consul.yml.mustache → ...pringcloud/consul/src/consul.yml.mustache b/...springboot/consul/src/consul.yml.mustache → ...pringcloud/consul/src/consul.yml.mustache
diff --git a/...consul/test/bootstrap.properties.mustache → ...consul/test/bootstrap.properties.mustache b/...consul/test/bootstrap.properties.mustache → ...consul/test/bootstrap.properties.mustache
diff --git a/...plication/ConsulApplicationServiceIT.java → ...plication/ConsulApplicationServiceIT.java b/...plication/ConsulApplicationServiceIT.java → ...plication/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/...boot/consul/application/ConsulAssert.java → ...loud/consul/application/ConsulAssert.java b/...boot/consul/application/ConsulAssert.java → ...loud/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/...ure/config/ConsulBeanConfigurationIT.java → ...ure/config/ConsulBeanConfigurationIT.java b/...ure/config/ConsulBeanConfigurationIT.java → ...ure/config/ConsulBeanConfigurationIT.java
@@ -1,12 +1,12 @@
-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;
 
 import org.junit.jupiter.api.Test;
 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/...ucture/primary/rest/ConsulResourceIT.java → ...ucture/primary/rest/ConsulResourceIT.java b/...ucture/primary/rest/ConsulResourceIT.java → ...ucture/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;
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		@tech.jhipster.lite.BusinessContext
		package tech.jhipster.lite.generator.server.springboot.springcloud.consul;