Refactoring: rename error to base

README.md

@@ -9,6 +9,7 @@ JHipster Light will help you to start your project:
 
 - init the project
 - add Maven as Build Tool
+- add Base classes and Domain Error
 - add Spring Boot as Server Framework
 - add Tomcat or Undertow as Server
 - add PostgreSQL as Database

src/main/java/tech/jhipster/light/generator/server/javatool/base/application/JavaBaseApplicationService.java

@@ -0,0 +1,19 @@
+package tech.jhipster.light.generator.server.javatool.base.application;
+
+import org.springframework.stereotype.Service;
+import tech.jhipster.light.generator.project.domain.Project;
+import tech.jhipster.light.generator.server.javatool.base.domain.JavaBaseService;
+
+@Service
+public class JavaBaseApplicationService {
+
+  private final JavaBaseService javaBaseService;
+
+  public JavaBaseApplicationService(JavaBaseService javaBaseService) {
+    this.javaBaseService = javaBaseService;
+  }
+
+  public void init(Project project) {
+    javaBaseService.init(project);
+  }
+}

src/main/java/tech/jhipster/light/generator/server/javatool/error/domain/ErrorDomainService.java → src/main/java/tech/jhipster/light/generator/server/javatool/base/domain/JavaBaseDomainService.java

@@ -1,4 +1,4 @@
-package tech.jhipster.light.generator.server.javatool.error.domain;
+package tech.jhipster.light.generator.server.javatool.base.domain;
 
 import static tech.jhipster.light.common.domain.FileUtils.getPath;
 import static tech.jhipster.light.generator.project.domain.Constants.MAIN_JAVA;
@@ -8,13 +8,13 @@
 import tech.jhipster.light.generator.project.domain.Project;
 import tech.jhipster.light.generator.project.domain.ProjectRepository;
 
-public class ErrorDomainService implements ErrorService {
+public class JavaBaseDomainService implements JavaBaseService {
 
-  public static final String SOURCE = "server/javatool/error";
+  public static final String SOURCE = "server/javatool/base";
 
   private final ProjectRepository projectRepository;
 
-  public ErrorDomainService(ProjectRepository projectRepository) {
+  public JavaBaseDomainService(ProjectRepository projectRepository) {
     this.projectRepository = projectRepository;
   }
 

src/main/java/tech/jhipster/light/generator/server/javatool/base/domain/JavaBaseService.java

@@ -0,0 +1,7 @@
+package tech.jhipster.light.generator.server.javatool.base.domain;
+
+import tech.jhipster.light.generator.project.domain.Project;
+
+public interface JavaBaseService {
+  void init(Project project);
+}

src/main/java/tech/jhipster/light/generator/server/javatool/base/infrastructure/beans/JavaBaseBeanConfiguration.java

@@ -0,0 +1,22 @@
+package tech.jhipster.light.generator.server.javatool.base.infrastructure.beans;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import tech.jhipster.light.generator.project.domain.ProjectRepository;
+import tech.jhipster.light.generator.server.javatool.base.domain.JavaBaseDomainService;
+import tech.jhipster.light.generator.server.javatool.base.domain.JavaBaseService;
+
+@Configuration
+public class JavaBaseBeanConfiguration {
+
+  private final ProjectRepository projectRepository;
+
+  public JavaBaseBeanConfiguration(ProjectRepository projectRepository) {
+    this.projectRepository = projectRepository;
+  }
+
+  @Bean
+  public JavaBaseService javaBaseService() {
+    return new JavaBaseDomainService(projectRepository);
+  }
+}

src/main/java/tech/jhipster/light/generator/server/javatool/error/infrastructure/primary/rest/ErrorResource.java → src/main/java/tech/jhipster/light/generator/server/javatool/base/infrastructure/primary/rest/JavaBaseResource.java

@@ -1,4 +1,4 @@
-package tech.jhipster.light.generator.server.javatool.error.infrastructure.primary.rest;
+package tech.jhipster.light.generator.server.javatool.base.infrastructure.primary.rest;
 
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.responses.ApiResponse;
@@ -10,24 +10,24 @@
 import org.springframework.web.bind.annotation.RestController;
 import tech.jhipster.light.generator.project.domain.Project;
 import tech.jhipster.light.generator.project.infrastructure.primary.dto.ProjectDTO;
-import tech.jhipster.light.generator.server.javatool.error.application.ErrorApplicationService;
+import tech.jhipster.light.generator.server.javatool.base.application.JavaBaseApplicationService;
 
 @RestController
-@RequestMapping("/api/servers/java/error")
+@RequestMapping("/api/servers/java/base")
 @Tag(name = "Java")
-class ErrorResource {
+class JavaBaseResource {
 
-  private final ErrorApplicationService errorApplicationService;
+  private final JavaBaseApplicationService javaBaseApplicationService;
 
-  public ErrorResource(ErrorApplicationService errorApplicationService) {
-    this.errorApplicationService = errorApplicationService;
+  public JavaBaseResource(JavaBaseApplicationService javaBaseApplicationService) {
+    this.javaBaseApplicationService = javaBaseApplicationService;
   }
 
-  @Operation(summary = "Add Error domain to project")
+  @Operation(summary = "Add Base classes and Error domain to project")
   @ApiResponses({ @ApiResponse(responseCode = "500", description = "An error occurred while initializing project") })
   @PostMapping
   public void init(@RequestBody ProjectDTO projectDTO) {
     Project project = ProjectDTO.toProject(projectDTO);
-    errorApplicationService.init(project);
+    javaBaseApplicationService.init(project);
   }
 }

src/main/java/tech/jhipster/light/generator/server/javatool/base/package-info.java

@@ -0,0 +1,2 @@
+@tech.jhipster.light.BusinessContext
+package tech.jhipster.light.generator.server.javatool.base;

src/test/java/tech/jhipster/light/generator/server/javatool/error/application/ErrorApplicationServiceIT.java → src/test/java/tech/jhipster/light/generator/server/javatool/base/application/JavaBaseApplicationServiceIT.java

@@ -1,4 +1,4 @@
-package tech.jhipster.light.generator.server.javatool.error.application;
+package tech.jhipster.light.generator.server.javatool.base.application;
 
 import static tech.jhipster.light.TestUtils.*;
 import static tech.jhipster.light.common.domain.FileUtils.getPath;
@@ -10,16 +10,16 @@
 import tech.jhipster.light.generator.project.domain.Project;
 
 @IntegrationTest
-class ErrorApplicationServiceIT {
+class JavaBaseApplicationServiceIT {
 
   @Autowired
-  ErrorApplicationService errorApplicationService;
+  JavaBaseApplicationService javaBaseApplicationService;
 
   @Test
   void shouldInit() {
     Project project = tmpProject();
 
-    errorApplicationService.init(project);
+    javaBaseApplicationService.init(project);
 
     String pathMain = "src/main/java/com/mycompany/myapp/error/domain";
     assertFileExist(project, getPath(pathMain, "Assert.java"));
@@ -40,7 +40,7 @@ void shouldInitWithSpecificPackage() {
     Project project = tmpProject();
     project.addConfig(PACKAGE_NAME, "tech.jhipster.chips");
 
-    errorApplicationService.init(project);
+    javaBaseApplicationService.init(project);
 
     String packageResult = "package tech.jhipster.chips.error.domain;";
 

src/test/java/tech/jhipster/light/generator/server/javatool/error/domain/ErrorDomainServiceTest.java → src/test/java/tech/jhipster/light/generator/server/javatool/base/domain/JavaBaseDomainServiceTest.java

@@ -1,4 +1,4 @@
-package tech.jhipster.light.generator.server.javatool.error.domain;
+package tech.jhipster.light.generator.server.javatool.base.domain;
 
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyString;
@@ -17,19 +17,19 @@
 
 @UnitTest
 @ExtendWith(MockitoExtension.class)
-class ErrorDomainServiceTest {
+class JavaBaseDomainServiceTest {
 
   @Mock
   ProjectRepository projectRepository;
 
   @InjectMocks
-  ErrorDomainService errorDomainService;
+  JavaBaseDomainService javaBaseDomainService;
 
   @Test
   void shouldInit() {
     Project project = tmpProject();
 
-    errorDomainService.init(project);
+    javaBaseDomainService.init(project);
 
     verify(projectRepository, times(8)).template(any(Project.class), anyString(), anyString(), anyString());
   }

src/test/java/tech/jhipster/light/generator/server/javatool/error/infrastructure/beans/ErrorServiceBeanConfigurationIT.java → src/test/java/tech/jhipster/light/generator/server/javatool/base/infrastructure/beans/JavaBaseBeanConfigurationIT.java

@@ -1,21 +1,21 @@
-package tech.jhipster.light.generator.server.javatool.error.infrastructure.beans;
+package tech.jhipster.light.generator.server.javatool.base.infrastructure.beans;
 
 import static org.assertj.core.api.Assertions.*;
 
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;
 import tech.jhipster.light.IntegrationTest;
-import tech.jhipster.light.generator.server.javatool.error.domain.ErrorDomainService;
+import tech.jhipster.light.generator.server.javatool.base.domain.JavaBaseDomainService;
 
 @IntegrationTest
-class ErrorServiceBeanConfigurationIT {
+class JavaBaseBeanConfigurationIT {
 
   @Autowired
   ApplicationContext applicationContext;
 
   @Test
   void shouldGetBean() {
-    assertThat(applicationContext.getBean("errorService")).isNotNull().isInstanceOf(ErrorDomainService.class);
+    assertThat(applicationContext.getBean("javaBaseService")).isNotNull().isInstanceOf(JavaBaseDomainService.class);
   }
 }

src/test/java/tech/jhipster/light/generator/server/javatool/error/infrastructure/primary/rest/ErrorResourceIT.java → src/test/java/tech/jhipster/light/generator/server/javatool/base/infrastructure/primary/rest/JavaBaseResourceIT.java

@@ -1,4 +1,4 @@
-package tech.jhipster.light.generator.server.javatool.error.infrastructure.primary.rest;
+package tech.jhipster.light.generator.server.javatool.base.infrastructure.primary.rest;
 
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
@@ -20,7 +20,7 @@
 
 @IntegrationTest
 @AutoConfigureMockMvc
-class ErrorResourceIT {
+class JavaBaseResourceIT {
 
   @Autowired
   MockMvc mockMvc;
@@ -35,7 +35,7 @@ void shouldInit() throws Exception {
 
     mockMvc
       .perform(
-        post("/api/servers/java/error").contentType(MediaType.APPLICATION_JSON).content(TestUtils.convertObjectToJsonBytes(projectDTO))
+        post("/api/servers/java/base").contentType(MediaType.APPLICATION_JSON).content(TestUtils.convertObjectToJsonBytes(projectDTO))
       )
       .andExpect(status().isOk());
 

tests/generate.sh

@@ -11,7 +11,7 @@ callApi() {
 
 callApi beer.json "/api/projects/init"
 callApi beer.json "/api/build-tools/maven"
-callApi beer.json "/api/servers/java/error"
+callApi beer.json "/api/servers/java/base"
 callApi beer.json "/api/servers/spring-boot"
 callApi beer.json "/api/servers/spring-boot/banner/jhipster-v7"
 callApi beer.json "/api/servers/spring-boot/web/tomcat"