Merge pull request #2374 from DamnClin/move-history

Move history out of generator
jhipster · Jul 4, 2022 · 96d0edd · 96d0edd
2 parents df58a3e + af6a575
commit 96d0edd
Show file tree

Hide file tree

Showing 26 changed files with 70 additions and 70 deletions.
diff --git a/src/main/java/tech/jhipster/lite/generator/history/package-info.java b/src/main/java/tech/jhipster/lite/generator/history/package-info.java
diff --git a/...n/GeneratorHistoryApplicationService.java → ...n/GeneratorHistoryApplicationService.java b/...n/GeneratorHistoryApplicationService.java → ...n/GeneratorHistoryApplicationService.java
@@ -1,11 +1,11 @@
-package tech.jhipster.lite.generator.history.application;
+package tech.jhipster.lite.history.application;
 
 import java.util.List;
 import org.springframework.stereotype.Service;
 import tech.jhipster.lite.error.domain.Assert;
-import tech.jhipster.lite.generator.history.domain.GeneratorHistoryRepository;
-import tech.jhipster.lite.generator.history.domain.GeneratorHistoryValue;
-import tech.jhipster.lite.generator.history.domain.HistoryProject;
+import tech.jhipster.lite.history.domain.GeneratorHistoryRepository;
+import tech.jhipster.lite.history.domain.GeneratorHistoryValue;
+import tech.jhipster.lite.history.domain.HistoryProject;
 import tech.jhipster.lite.module.domain.properties.JHipsterProjectFolder;
 
 @Service

diff --git a/.../history/domain/GeneratorHistoryData.java → .../history/domain/GeneratorHistoryData.java b/.../history/domain/GeneratorHistoryData.java → .../history/domain/GeneratorHistoryData.java
@@ -1,4 +1,4 @@
-package tech.jhipster.lite.generator.history.domain;
+package tech.jhipster.lite.history.domain;
 
 import java.util.List;
 

diff --git a/...ry/domain/GeneratorHistoryRepository.java → ...ry/domain/GeneratorHistoryRepository.java b/...ry/domain/GeneratorHistoryRepository.java → ...ry/domain/GeneratorHistoryRepository.java
@@ -1,4 +1,4 @@
-package tech.jhipster.lite.generator.history.domain;
+package tech.jhipster.lite.history.domain;
 
 import tech.jhipster.lite.module.domain.properties.JHipsterProjectFolder;
 

diff --git a/...history/domain/GeneratorHistoryValue.java → ...history/domain/GeneratorHistoryValue.java b/...history/domain/GeneratorHistoryValue.java → ...history/domain/GeneratorHistoryValue.java
@@ -1,4 +1,4 @@
-package tech.jhipster.lite.generator.history.domain;
+package tech.jhipster.lite.history.domain;
 
 import java.time.Instant;
 

diff --git a/...erator/history/domain/HistoryProject.java → ...r/lite/history/domain/HistoryProject.java b/...erator/history/domain/HistoryProject.java → ...r/lite/history/domain/HistoryProject.java
@@ -1,4 +1,4 @@
-package tech.jhipster.lite.generator.history.domain;
+package tech.jhipster.lite.history.domain;
 
 import tech.jhipster.lite.error.domain.Assert;
 import tech.jhipster.lite.generator.project.domain.Project;

diff --git a/.../primary/GeneratorHistoryInterceptor.java → .../primary/GeneratorHistoryInterceptor.java b/.../primary/GeneratorHistoryInterceptor.java → .../primary/GeneratorHistoryInterceptor.java
@@ -1,15 +1,15 @@
-package tech.jhipster.lite.generator.history.infrastructure.primary;
+package tech.jhipster.lite.history.infrastructure.primary;
 
 import java.time.Clock;
 import org.aspectj.lang.JoinPoint;
 import org.aspectj.lang.annotation.AfterReturning;
 import org.aspectj.lang.annotation.Aspect;
 import org.springframework.context.annotation.Configuration;
-import tech.jhipster.lite.generator.history.application.GeneratorHistoryApplicationService;
-import tech.jhipster.lite.generator.history.domain.GeneratorHistoryValue;
-import tech.jhipster.lite.generator.history.domain.HistoryProject;
 import tech.jhipster.lite.generator.project.domain.Project;
 import tech.jhipster.lite.generator.project.infrastructure.primary.dto.ProjectDTO;
+import tech.jhipster.lite.history.application.GeneratorHistoryApplicationService;
+import tech.jhipster.lite.history.domain.GeneratorHistoryValue;
+import tech.jhipster.lite.history.domain.HistoryProject;
 import tech.jhipster.lite.technical.infrastructure.primary.annotation.GeneratorStep;
 
 @Aspect

diff --git a/...frastructure/primary/HistoryResource.java → ...frastructure/primary/HistoryResource.java b/...frastructure/primary/HistoryResource.java → ...frastructure/primary/HistoryResource.java
@@ -1,4 +1,4 @@
-package tech.jhipster.lite.generator.history.infrastructure.primary;
+package tech.jhipster.lite.history.infrastructure.primary;
 
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
@@ -10,9 +10,9 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
-import tech.jhipster.lite.generator.history.application.GeneratorHistoryApplicationService;
-import tech.jhipster.lite.generator.history.domain.GeneratorHistoryValue;
-import tech.jhipster.lite.generator.history.infrastructure.primary.dto.HistoryDTO;
+import tech.jhipster.lite.history.application.GeneratorHistoryApplicationService;
+import tech.jhipster.lite.history.domain.GeneratorHistoryValue;
+import tech.jhipster.lite.history.infrastructure.primary.dto.HistoryDTO;
 import tech.jhipster.lite.module.domain.properties.JHipsterProjectFolder;
 
 @RestController

diff --git a/.../SpringJHipsterModuleAppliedListener.java → .../SpringJHipsterModuleAppliedListener.java b/.../SpringJHipsterModuleAppliedListener.java → .../SpringJHipsterModuleAppliedListener.java
@@ -1,11 +1,11 @@
-package tech.jhipster.lite.generator.history.infrastructure.primary;
+package tech.jhipster.lite.history.infrastructure.primary;
 
 import org.springframework.context.ApplicationListener;
 import org.springframework.context.PayloadApplicationEvent;
 import org.springframework.stereotype.Component;
-import tech.jhipster.lite.generator.history.application.GeneratorHistoryApplicationService;
-import tech.jhipster.lite.generator.history.domain.GeneratorHistoryValue;
-import tech.jhipster.lite.generator.history.domain.HistoryProject;
+import tech.jhipster.lite.history.application.GeneratorHistoryApplicationService;
+import tech.jhipster.lite.history.domain.GeneratorHistoryValue;
+import tech.jhipster.lite.history.domain.HistoryProject;
 import tech.jhipster.lite.module.domain.JHipsterModuleApplied;
 
 @Component

diff --git a/...nfrastructure/primary/dto/HistoryDTO.java → ...nfrastructure/primary/dto/HistoryDTO.java b/...nfrastructure/primary/dto/HistoryDTO.java → ...nfrastructure/primary/dto/HistoryDTO.java
@@ -1,10 +1,10 @@
-package tech.jhipster.lite.generator.history.infrastructure.primary.dto;
+package tech.jhipster.lite.history.infrastructure.primary.dto;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
-import tech.jhipster.lite.generator.history.domain.GeneratorHistoryValue;
+import tech.jhipster.lite.history.domain.GeneratorHistoryValue;
 
 public record HistoryDTO(@Schema(name = "Service Ids applied to project", required = true) Collection<String> serviceIds) {
   public static HistoryDTO from(List<GeneratorHistoryValue> serviceIds) {

diff --git a/...dary/GeneratorHistoryLocalRepository.java → ...dary/GeneratorHistoryLocalRepository.java b/...dary/GeneratorHistoryLocalRepository.java → ...dary/GeneratorHistoryLocalRepository.java
@@ -1,4 +1,4 @@
-package tech.jhipster.lite.generator.history.infrastructure.secondary;
+package tech.jhipster.lite.history.infrastructure.secondary;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import java.io.IOException;
@@ -8,14 +8,14 @@
 import tech.jhipster.lite.common.domain.FileUtils;
 import tech.jhipster.lite.common.domain.JsonUtils;
 import tech.jhipster.lite.error.domain.GeneratorException;
-import tech.jhipster.lite.generator.history.domain.GeneratorHistoryData;
-import tech.jhipster.lite.generator.history.domain.GeneratorHistoryRepository;
-import tech.jhipster.lite.generator.history.domain.GeneratorHistoryValue;
-import tech.jhipster.lite.generator.history.domain.HistoryProject;
-import tech.jhipster.lite.generator.history.infrastructure.secondary.dto.GeneratorHistoryDataDTO;
-import tech.jhipster.lite.generator.history.infrastructure.secondary.dto.GeneratorHistoryValueDTO;
 import tech.jhipster.lite.generator.project.domain.ProjectFile;
 import tech.jhipster.lite.generator.project.domain.ProjectRepository;
+import tech.jhipster.lite.history.domain.GeneratorHistoryData;
+import tech.jhipster.lite.history.domain.GeneratorHistoryRepository;
+import tech.jhipster.lite.history.domain.GeneratorHistoryValue;
+import tech.jhipster.lite.history.domain.HistoryProject;
+import tech.jhipster.lite.history.infrastructure.secondary.dto.GeneratorHistoryDataDTO;
+import tech.jhipster.lite.history.infrastructure.secondary.dto.GeneratorHistoryValueDTO;
 import tech.jhipster.lite.module.domain.properties.JHipsterProjectFolder;
 
 @Repository

diff --git a/...ndary/dto/DefaultInstantDeserializer.java → ...ndary/dto/DefaultInstantDeserializer.java b/...ndary/dto/DefaultInstantDeserializer.java → ...ndary/dto/DefaultInstantDeserializer.java
@@ -1,4 +1,4 @@
-package tech.jhipster.lite.generator.history.infrastructure.secondary.dto;
+package tech.jhipster.lite.history.infrastructure.secondary.dto;
 
 import com.fasterxml.jackson.datatype.jsr310.deser.InstantDeserializer;
 import java.time.Instant;

diff --git a/...econdary/dto/GeneratorHistoryDataDTO.java → ...econdary/dto/GeneratorHistoryDataDTO.java b/...econdary/dto/GeneratorHistoryDataDTO.java → ...econdary/dto/GeneratorHistoryDataDTO.java
@@ -1,9 +1,9 @@
-package tech.jhipster.lite.generator.history.infrastructure.secondary.dto;
+package tech.jhipster.lite.history.infrastructure.secondary.dto;
 
 import java.util.Collections;
 import java.util.List;
-import tech.jhipster.lite.generator.history.domain.GeneratorHistoryData;
-import tech.jhipster.lite.generator.history.domain.GeneratorHistoryValue;
+import tech.jhipster.lite.history.domain.GeneratorHistoryData;
+import tech.jhipster.lite.history.domain.GeneratorHistoryValue;
 
 public record GeneratorHistoryDataDTO(List<GeneratorHistoryValueDTO> values) {
   public static GeneratorHistoryDataDTO from(List<GeneratorHistoryValue> values) {

diff --git a/...condary/dto/GeneratorHistoryValueDTO.java → ...condary/dto/GeneratorHistoryValueDTO.java b/...condary/dto/GeneratorHistoryValueDTO.java → ...condary/dto/GeneratorHistoryValueDTO.java
@@ -1,10 +1,10 @@
-package tech.jhipster.lite.generator.history.infrastructure.secondary.dto;
+package tech.jhipster.lite.history.infrastructure.secondary.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.datatype.jsr310.ser.InstantSerializer;
 import java.time.Instant;
-import tech.jhipster.lite.generator.history.domain.GeneratorHistoryValue;
+import tech.jhipster.lite.history.domain.GeneratorHistoryValue;
 
 public record GeneratorHistoryValueDTO(
   String serviceId,

diff --git a/src/main/java/tech/jhipster/lite/history/package-info.java b/src/main/java/tech/jhipster/lite/history/package-info.java
@@ -0,0 +1,2 @@
+@tech.jhipster.lite.BusinessContext
+package tech.jhipster.lite.history;
diff --git a/...GeneratorHistoryApplicationServiceIT.java → ...GeneratorHistoryApplicationServiceIT.java b/...GeneratorHistoryApplicationServiceIT.java → ...GeneratorHistoryApplicationServiceIT.java
@@ -1,7 +1,7 @@
-package tech.jhipster.lite.generator.history.application;
+package tech.jhipster.lite.history.application;
 
 import static org.assertj.core.api.Assertions.*;
-import static tech.jhipster.lite.generator.history.domain.HistoryProjectsFixture.*;
+import static tech.jhipster.lite.history.domain.HistoryProjectsFixture.*;
 
 import java.io.IOException;
 import java.nio.file.Files;
@@ -10,8 +10,8 @@
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import tech.jhipster.lite.IntegrationTest;
-import tech.jhipster.lite.generator.history.domain.GeneratorHistoryValue;
-import tech.jhipster.lite.generator.history.domain.HistoryProject;
+import tech.jhipster.lite.history.domain.GeneratorHistoryValue;
+import tech.jhipster.lite.history.domain.HistoryProject;
 
 @IntegrationTest
 class GeneratorHistoryApplicationServiceIT {

diff --git a/...neratorHistoryApplicationServiceTest.java → ...neratorHistoryApplicationServiceTest.java b/...neratorHistoryApplicationServiceTest.java → ...neratorHistoryApplicationServiceTest.java
@@ -1,4 +1,4 @@
-package tech.jhipster.lite.generator.history.application;
+package tech.jhipster.lite.history.application;
 
 import static org.assertj.core.api.Assertions.*;
 import static org.mockito.Mockito.*;
@@ -11,10 +11,10 @@
 import org.mockito.junit.jupiter.MockitoExtension;
 import tech.jhipster.lite.UnitTest;
 import tech.jhipster.lite.error.domain.MissingMandatoryValueException;
-import tech.jhipster.lite.generator.history.domain.GeneratorHistoryData;
-import tech.jhipster.lite.generator.history.domain.GeneratorHistoryRepository;
-import tech.jhipster.lite.generator.history.domain.HistoryProject;
-import tech.jhipster.lite.generator.history.domain.HistoryProjectsFixture;
+import tech.jhipster.lite.history.domain.GeneratorHistoryData;
+import tech.jhipster.lite.history.domain.GeneratorHistoryRepository;
+import tech.jhipster.lite.history.domain.HistoryProject;
+import tech.jhipster.lite.history.domain.HistoryProjectsFixture;
 
 @UnitTest
 @ExtendWith(MockitoExtension.class)

diff --git a/...istory/domain/HistoryProjectsFixture.java → ...istory/domain/HistoryProjectsFixture.java b/...istory/domain/HistoryProjectsFixture.java → ...istory/domain/HistoryProjectsFixture.java
@@ -1,4 +1,4 @@
-package tech.jhipster.lite.generator.history.domain;
+package tech.jhipster.lite.history.domain;
 
 import tech.jhipster.lite.common.domain.FileUtils;
 

diff --git a/...rimary/GeneratorHistoryInterceptorIT.java → ...rimary/GeneratorHistoryInterceptorIT.java b/...rimary/GeneratorHistoryInterceptorIT.java → ...rimary/GeneratorHistoryInterceptorIT.java
@@ -1,4 +1,4 @@
-package tech.jhipster.lite.generator.history.infrastructure.primary;
+package tech.jhipster.lite.history.infrastructure.primary;
 
 import static org.assertj.core.api.Assertions.*;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*;

diff --git a/...astructure/primary/HistoryResourceIT.java → ...astructure/primary/HistoryResourceIT.java b/...astructure/primary/HistoryResourceIT.java → ...astructure/primary/HistoryResourceIT.java
@@ -1,4 +1,4 @@
-package tech.jhipster.lite.generator.history.infrastructure.primary;
+package tech.jhipster.lite.history.infrastructure.primary;
 
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*;

diff --git a/...tructure/primary/HistoryResourceTest.java → ...tructure/primary/HistoryResourceTest.java b/...tructure/primary/HistoryResourceTest.java → ...tructure/primary/HistoryResourceTest.java
@@ -1,9 +1,9 @@
-package tech.jhipster.lite.generator.history.infrastructure.primary;
+package tech.jhipster.lite.history.infrastructure.primary;
 
 import static org.assertj.core.api.Assertions.*;
 import static org.mockito.ArgumentMatchers.*;
 import static org.mockito.Mockito.*;
-import static tech.jhipster.lite.generator.history.infrastructure.primary.dto.HistoryDTOTest.*;
+import static tech.jhipster.lite.history.infrastructure.primary.dto.HistoryDTOTest.*;
 
 import java.util.List;
 import org.junit.jupiter.api.Test;
@@ -14,9 +14,9 @@
 import org.springframework.http.ResponseEntity;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 import tech.jhipster.lite.UnitTest;
-import tech.jhipster.lite.generator.history.application.GeneratorHistoryApplicationService;
-import tech.jhipster.lite.generator.history.domain.GeneratorHistoryValue;
-import tech.jhipster.lite.generator.history.infrastructure.primary.dto.HistoryDTO;
+import tech.jhipster.lite.history.application.GeneratorHistoryApplicationService;
+import tech.jhipster.lite.history.domain.GeneratorHistoryValue;
+import tech.jhipster.lite.history.infrastructure.primary.dto.HistoryDTO;
 import tech.jhipster.lite.module.domain.properties.JHipsterProjectFolder;
 
 @UnitTest

diff --git a/...structure/primary/dto/HistoryDTOTest.java → ...structure/primary/dto/HistoryDTOTest.java b/...structure/primary/dto/HistoryDTOTest.java → ...structure/primary/dto/HistoryDTOTest.java
@@ -1,14 +1,14 @@
-package tech.jhipster.lite.generator.history.infrastructure.primary.dto;
+package tech.jhipster.lite.history.infrastructure.primary.dto;
 
-import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.*;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.json.JsonMapper;
 import java.time.Instant;
 import java.util.List;
 import org.junit.jupiter.api.Test;
 import tech.jhipster.lite.UnitTest;
-import tech.jhipster.lite.generator.history.domain.GeneratorHistoryValue;
+import tech.jhipster.lite.history.domain.GeneratorHistoryValue;
 
 @UnitTest
 public class HistoryDTOTest {

diff --git a/.../GeneratorHistoryLocalRepositoryTest.java → .../GeneratorHistoryLocalRepositoryTest.java b/.../GeneratorHistoryLocalRepositoryTest.java → .../GeneratorHistoryLocalRepositoryTest.java
@@ -1,9 +1,9 @@
-package tech.jhipster.lite.generator.history.infrastructure.secondary;
+package tech.jhipster.lite.history.infrastructure.secondary;
 
 import static org.assertj.core.api.Assertions.*;
 import static org.mockito.ArgumentMatchers.*;
 import static org.mockito.Mockito.*;
-import static tech.jhipster.lite.generator.history.domain.HistoryProjectsFixture.*;
+import static tech.jhipster.lite.history.domain.HistoryProjectsFixture.*;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -25,10 +25,10 @@
 import tech.jhipster.lite.common.domain.FileUtils;
 import tech.jhipster.lite.common.domain.JsonUtils;
 import tech.jhipster.lite.error.domain.GeneratorException;
-import tech.jhipster.lite.generator.history.domain.GeneratorHistoryData;
-import tech.jhipster.lite.generator.history.domain.GeneratorHistoryValue;
-import tech.jhipster.lite.generator.history.domain.HistoryProject;
 import tech.jhipster.lite.generator.project.domain.ProjectRepository;
+import tech.jhipster.lite.history.domain.GeneratorHistoryData;
+import tech.jhipster.lite.history.domain.GeneratorHistoryValue;
+import tech.jhipster.lite.history.domain.HistoryProject;
 
 @UnitTest
 @ExtendWith(MockitoExtension.class)

diff --git a/.../dto/DefaultInstanceDeserializerTest.java → .../dto/DefaultInstanceDeserializerTest.java b/.../dto/DefaultInstanceDeserializerTest.java → .../dto/DefaultInstanceDeserializerTest.java
@@ -1,6 +1,6 @@
-package tech.jhipster.lite.generator.history.infrastructure.secondary.dto;
+package tech.jhipster.lite.history.infrastructure.secondary.dto;
 
-import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.*;
 
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;

diff --git a/...dary/dto/GeneratorHistoryDataDTOTest.java → ...dary/dto/GeneratorHistoryDataDTOTest.java b/...dary/dto/GeneratorHistoryDataDTOTest.java → ...dary/dto/GeneratorHistoryDataDTOTest.java
@@ -1,12 +1,12 @@
-package tech.jhipster.lite.generator.history.infrastructure.secondary.dto;
+package tech.jhipster.lite.history.infrastructure.secondary.dto;
 
-import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.*;
 
 import java.time.Instant;
 import java.util.List;
 import org.junit.jupiter.api.Test;
 import tech.jhipster.lite.UnitTest;
-import tech.jhipster.lite.generator.history.domain.GeneratorHistoryValue;
+import tech.jhipster.lite.history.domain.GeneratorHistoryValue;
 
 @UnitTest
 class GeneratorHistoryDataDTOTest {

diff --git a/...ary/dto/GeneratorHistoryValueDTOTest.java → ...ary/dto/GeneratorHistoryValueDTOTest.java b/...ary/dto/GeneratorHistoryValueDTOTest.java → ...ary/dto/GeneratorHistoryValueDTOTest.java
@@ -1,11 +1,11 @@
-package tech.jhipster.lite.generator.history.infrastructure.secondary.dto;
+package tech.jhipster.lite.history.infrastructure.secondary.dto;
 
-import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.*;
 
 import java.time.Instant;
 import org.junit.jupiter.api.Test;
 import tech.jhipster.lite.UnitTest;
-import tech.jhipster.lite.generator.history.domain.GeneratorHistoryValue;
+import tech.jhipster.lite.history.domain.GeneratorHistoryValue;
 
 @UnitTest
 class GeneratorHistoryValueDTOTest {
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		@tech.jhipster.lite.BusinessContext
		package tech.jhipster.lite.history;