From 090ab53eaadb9ad50579c077c44076511274f8fb Mon Sep 17 00:00:00 2001 From: Julien WITTOUCK Date: Mon, 12 Aug 2019 13:13:29 +0200 Subject: [PATCH] :recycle: : moves module feature to its own package --- src/main/java/io/codeka/gaia/Gaia.java | 11 ----------- .../io/codeka/gaia/controller/IndexController.java | 2 +- .../io/codeka/gaia/controller/StackController.java | 2 +- .../codeka/gaia/{ => modules}/bo/TerraformModule.java | 2 +- .../gaia/{ => modules}/bo/TerraformVariable.java | 2 +- .../controller/ModuleRestController.java | 6 +++--- .../controller/ModulesMVCController.java | 8 ++++---- .../controller/TerraformCLIController.java | 4 ++-- .../repository/TerraformCLIRepository.java | 2 +- .../repository/TerraformModuleGitRepository.java | 4 ++-- .../repository/TerraformModuleRepository.java | 4 ++-- .../repository/strategy/GitHubStrategy.java | 0 .../repository/strategy/GitLabStrategy.java | 0 .../repository/strategy/GitPlatformStrategy.java | 0 .../io/codeka/gaia/runner/StackCommandBuilder.java | 2 +- src/main/java/io/codeka/gaia/runner/StackRunner.java | 1 + .../io/codeka/gaia/service/StackCostCalculator.java | 2 +- .../io/codeka/gaia/config/ActuatorSecurityTest.java | 7 ------- .../codeka/gaia/controller/IndexControllerTest.java | 2 +- .../codeka/gaia/controller/StackControllerTest.java | 4 ++-- .../gaia/{ => modules}/bo/TerraformModuleTest.java | 5 +++-- .../controller/ModuleRestControllerTest.java | 8 +++----- .../controller/ModulesMVCControllerTest.java | 8 ++++---- .../controller/TerraformCLIControllerTest.java | 4 ++-- .../repository/TerraformCLIRepositoryTest.java | 2 +- .../repository/TerraformModuleGitRepositoryTest.java | 4 ++-- .../repository/TerraformModuleRepositoryIT.java | 4 ++-- .../repository/strategy/GitHubStrategyTest.java | 0 .../repository/strategy/GitLabStrategyTest.java | 0 .../codeka/gaia/runner/StackCommandBuilderTest.java | 5 ++--- .../java/io/codeka/gaia/runner/StackRunnerTest.java | 1 + .../codeka/gaia/service/StackCostCalculatorTest.java | 4 ++-- 32 files changed, 46 insertions(+), 64 deletions(-) rename src/main/java/io/codeka/gaia/{ => modules}/bo/TerraformModule.java (98%) rename src/main/java/io/codeka/gaia/{ => modules}/bo/TerraformVariable.java (95%) rename src/main/java/io/codeka/gaia/{ => modules}/controller/ModuleRestController.java (89%) rename src/main/java/io/codeka/gaia/{ => modules}/controller/ModulesMVCController.java (91%) rename src/main/java/io/codeka/gaia/{ => modules}/controller/TerraformCLIController.java (84%) rename src/main/java/io/codeka/gaia/{ => modules}/repository/TerraformCLIRepository.java (98%) rename src/main/java/io/codeka/gaia/{ => modules}/repository/TerraformModuleGitRepository.java (93%) rename src/main/java/io/codeka/gaia/{ => modules}/repository/TerraformModuleRepository.java (85%) rename src/main/java/io/codeka/gaia/{ => modules}/repository/strategy/GitHubStrategy.java (100%) rename src/main/java/io/codeka/gaia/{ => modules}/repository/strategy/GitLabStrategy.java (100%) rename src/main/java/io/codeka/gaia/{ => modules}/repository/strategy/GitPlatformStrategy.java (100%) rename src/test/java/io/codeka/gaia/{ => modules}/bo/TerraformModuleTest.java (89%) rename src/test/java/io/codeka/gaia/{ => modules}/controller/ModuleRestControllerTest.java (92%) rename src/test/java/io/codeka/gaia/{ => modules}/controller/ModulesMVCControllerTest.java (95%) rename src/test/java/io/codeka/gaia/{ => modules}/controller/TerraformCLIControllerTest.java (90%) rename src/test/java/io/codeka/gaia/{ => modules}/repository/TerraformCLIRepositoryTest.java (98%) rename src/test/java/io/codeka/gaia/{ => modules}/repository/TerraformModuleGitRepositoryTest.java (95%) rename src/test/java/io/codeka/gaia/{ => modules}/repository/TerraformModuleRepositoryIT.java (95%) rename src/test/java/io/codeka/gaia/{ => modules}/repository/strategy/GitHubStrategyTest.java (100%) rename src/test/java/io/codeka/gaia/{ => modules}/repository/strategy/GitLabStrategyTest.java (100%) diff --git a/src/main/java/io/codeka/gaia/Gaia.java b/src/main/java/io/codeka/gaia/Gaia.java index 43fa23bb1..6721bab4c 100644 --- a/src/main/java/io/codeka/gaia/Gaia.java +++ b/src/main/java/io/codeka/gaia/Gaia.java @@ -1,20 +1,9 @@ package io.codeka.gaia; -import io.codeka.gaia.bo.Stack; -import io.codeka.gaia.bo.TerraformModule; -import io.codeka.gaia.bo.TerraformVariable; -import io.codeka.gaia.repository.StackRepository; -import io.codeka.gaia.repository.TerraformModuleRepository; -import io.codeka.gaia.repository.TerraformStateRepository; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.CommandLineRunner; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.context.annotation.Bean; import org.springframework.data.mongodb.repository.config.EnableMongoRepositories; -import java.util.List; - @SpringBootApplication @EnableMongoRepositories public class Gaia { diff --git a/src/main/java/io/codeka/gaia/controller/IndexController.java b/src/main/java/io/codeka/gaia/controller/IndexController.java index 34f640b18..ffce36fcc 100644 --- a/src/main/java/io/codeka/gaia/controller/IndexController.java +++ b/src/main/java/io/codeka/gaia/controller/IndexController.java @@ -2,7 +2,7 @@ import io.codeka.gaia.bo.StackState; import io.codeka.gaia.repository.StackRepository; -import io.codeka.gaia.repository.TerraformModuleRepository; +import io.codeka.gaia.modules.repository.TerraformModuleRepository; import io.codeka.gaia.teams.bo.Team; import io.codeka.gaia.teams.bo.User; import org.springframework.stereotype.Controller; diff --git a/src/main/java/io/codeka/gaia/controller/StackController.java b/src/main/java/io/codeka/gaia/controller/StackController.java index 444184ff4..1f3759a5a 100644 --- a/src/main/java/io/codeka/gaia/controller/StackController.java +++ b/src/main/java/io/codeka/gaia/controller/StackController.java @@ -3,7 +3,7 @@ import io.codeka.gaia.bo.Job; import io.codeka.gaia.repository.JobRepository; import io.codeka.gaia.repository.StackRepository; -import io.codeka.gaia.repository.TerraformModuleRepository; +import io.codeka.gaia.modules.repository.TerraformModuleRepository; import io.codeka.gaia.runner.StackRunner; import io.codeka.gaia.teams.bo.User; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/io/codeka/gaia/bo/TerraformModule.java b/src/main/java/io/codeka/gaia/modules/bo/TerraformModule.java similarity index 98% rename from src/main/java/io/codeka/gaia/bo/TerraformModule.java rename to src/main/java/io/codeka/gaia/modules/bo/TerraformModule.java index 78fce7c41..72f73d692 100644 --- a/src/main/java/io/codeka/gaia/bo/TerraformModule.java +++ b/src/main/java/io/codeka/gaia/modules/bo/TerraformModule.java @@ -1,4 +1,4 @@ -package io.codeka.gaia.bo; +package io.codeka.gaia.modules.bo; import io.codeka.gaia.teams.bo.Team; import io.codeka.gaia.teams.bo.User; diff --git a/src/main/java/io/codeka/gaia/bo/TerraformVariable.java b/src/main/java/io/codeka/gaia/modules/bo/TerraformVariable.java similarity index 95% rename from src/main/java/io/codeka/gaia/bo/TerraformVariable.java rename to src/main/java/io/codeka/gaia/modules/bo/TerraformVariable.java index cc71b0f0c..e84c88a39 100644 --- a/src/main/java/io/codeka/gaia/bo/TerraformVariable.java +++ b/src/main/java/io/codeka/gaia/modules/bo/TerraformVariable.java @@ -1,4 +1,4 @@ -package io.codeka.gaia.bo; +package io.codeka.gaia.modules.bo; /** * Represents a module variable diff --git a/src/main/java/io/codeka/gaia/controller/ModuleRestController.java b/src/main/java/io/codeka/gaia/modules/controller/ModuleRestController.java similarity index 89% rename from src/main/java/io/codeka/gaia/controller/ModuleRestController.java rename to src/main/java/io/codeka/gaia/modules/controller/ModuleRestController.java index 5bb375ff3..9fbcc850b 100644 --- a/src/main/java/io/codeka/gaia/controller/ModuleRestController.java +++ b/src/main/java/io/codeka/gaia/modules/controller/ModuleRestController.java @@ -1,7 +1,7 @@ -package io.codeka.gaia.controller; +package io.codeka.gaia.modules.controller; -import io.codeka.gaia.bo.TerraformModule; -import io.codeka.gaia.repository.TerraformModuleRepository; +import io.codeka.gaia.modules.bo.TerraformModule; +import io.codeka.gaia.modules.repository.TerraformModuleRepository; import io.codeka.gaia.teams.bo.User; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.annotation.Secured; diff --git a/src/main/java/io/codeka/gaia/controller/ModulesMVCController.java b/src/main/java/io/codeka/gaia/modules/controller/ModulesMVCController.java similarity index 91% rename from src/main/java/io/codeka/gaia/controller/ModulesMVCController.java rename to src/main/java/io/codeka/gaia/modules/controller/ModulesMVCController.java index c39d69c39..658284ef3 100644 --- a/src/main/java/io/codeka/gaia/controller/ModulesMVCController.java +++ b/src/main/java/io/codeka/gaia/modules/controller/ModulesMVCController.java @@ -1,8 +1,8 @@ -package io.codeka.gaia.controller; +package io.codeka.gaia.modules.controller; -import io.codeka.gaia.bo.TerraformModule; -import io.codeka.gaia.repository.TerraformModuleGitRepository; -import io.codeka.gaia.repository.TerraformModuleRepository; +import io.codeka.gaia.modules.bo.TerraformModule; +import io.codeka.gaia.modules.repository.TerraformModuleGitRepository; +import io.codeka.gaia.modules.repository.TerraformModuleRepository; import io.codeka.gaia.teams.bo.User; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; diff --git a/src/main/java/io/codeka/gaia/controller/TerraformCLIController.java b/src/main/java/io/codeka/gaia/modules/controller/TerraformCLIController.java similarity index 84% rename from src/main/java/io/codeka/gaia/controller/TerraformCLIController.java rename to src/main/java/io/codeka/gaia/modules/controller/TerraformCLIController.java index 1d1384ca0..d3f0ebcef 100644 --- a/src/main/java/io/codeka/gaia/controller/TerraformCLIController.java +++ b/src/main/java/io/codeka/gaia/modules/controller/TerraformCLIController.java @@ -1,6 +1,6 @@ -package io.codeka.gaia.controller; +package io.codeka.gaia.modules.controller; -import io.codeka.gaia.repository.TerraformCLIRepository; +import io.codeka.gaia.modules.repository.TerraformCLIRepository; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RestController; diff --git a/src/main/java/io/codeka/gaia/repository/TerraformCLIRepository.java b/src/main/java/io/codeka/gaia/modules/repository/TerraformCLIRepository.java similarity index 98% rename from src/main/java/io/codeka/gaia/repository/TerraformCLIRepository.java rename to src/main/java/io/codeka/gaia/modules/repository/TerraformCLIRepository.java index 137c8dd19..66730e595 100644 --- a/src/main/java/io/codeka/gaia/repository/TerraformCLIRepository.java +++ b/src/main/java/io/codeka/gaia/modules/repository/TerraformCLIRepository.java @@ -1,4 +1,4 @@ -package io.codeka.gaia.repository; +package io.codeka.gaia.modules.repository; import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/io/codeka/gaia/repository/TerraformModuleGitRepository.java b/src/main/java/io/codeka/gaia/modules/repository/TerraformModuleGitRepository.java similarity index 93% rename from src/main/java/io/codeka/gaia/repository/TerraformModuleGitRepository.java rename to src/main/java/io/codeka/gaia/modules/repository/TerraformModuleGitRepository.java index 661509b1d..8dfaf81fa 100644 --- a/src/main/java/io/codeka/gaia/repository/TerraformModuleGitRepository.java +++ b/src/main/java/io/codeka/gaia/modules/repository/TerraformModuleGitRepository.java @@ -1,6 +1,6 @@ -package io.codeka.gaia.repository; +package io.codeka.gaia.modules.repository; -import io.codeka.gaia.bo.TerraformModule; +import io.codeka.gaia.modules.bo.TerraformModule; import io.codeka.gaia.repository.strategy.GitHubStrategy; import io.codeka.gaia.repository.strategy.GitLabStrategy; import io.codeka.gaia.repository.strategy.GitPlatformStrategy; diff --git a/src/main/java/io/codeka/gaia/repository/TerraformModuleRepository.java b/src/main/java/io/codeka/gaia/modules/repository/TerraformModuleRepository.java similarity index 85% rename from src/main/java/io/codeka/gaia/repository/TerraformModuleRepository.java rename to src/main/java/io/codeka/gaia/modules/repository/TerraformModuleRepository.java index 4bee00b37..45ba3d7d4 100644 --- a/src/main/java/io/codeka/gaia/repository/TerraformModuleRepository.java +++ b/src/main/java/io/codeka/gaia/modules/repository/TerraformModuleRepository.java @@ -1,6 +1,6 @@ -package io.codeka.gaia.repository; +package io.codeka.gaia.modules.repository; -import io.codeka.gaia.bo.TerraformModule; +import io.codeka.gaia.modules.bo.TerraformModule; import io.codeka.gaia.teams.bo.Team; import org.springframework.data.mongodb.repository.MongoRepository; import org.springframework.stereotype.Repository; diff --git a/src/main/java/io/codeka/gaia/repository/strategy/GitHubStrategy.java b/src/main/java/io/codeka/gaia/modules/repository/strategy/GitHubStrategy.java similarity index 100% rename from src/main/java/io/codeka/gaia/repository/strategy/GitHubStrategy.java rename to src/main/java/io/codeka/gaia/modules/repository/strategy/GitHubStrategy.java diff --git a/src/main/java/io/codeka/gaia/repository/strategy/GitLabStrategy.java b/src/main/java/io/codeka/gaia/modules/repository/strategy/GitLabStrategy.java similarity index 100% rename from src/main/java/io/codeka/gaia/repository/strategy/GitLabStrategy.java rename to src/main/java/io/codeka/gaia/modules/repository/strategy/GitLabStrategy.java diff --git a/src/main/java/io/codeka/gaia/repository/strategy/GitPlatformStrategy.java b/src/main/java/io/codeka/gaia/modules/repository/strategy/GitPlatformStrategy.java similarity index 100% rename from src/main/java/io/codeka/gaia/repository/strategy/GitPlatformStrategy.java rename to src/main/java/io/codeka/gaia/modules/repository/strategy/GitPlatformStrategy.java diff --git a/src/main/java/io/codeka/gaia/runner/StackCommandBuilder.java b/src/main/java/io/codeka/gaia/runner/StackCommandBuilder.java index 1250032b7..3a66b1dd9 100644 --- a/src/main/java/io/codeka/gaia/runner/StackCommandBuilder.java +++ b/src/main/java/io/codeka/gaia/runner/StackCommandBuilder.java @@ -3,7 +3,7 @@ import com.github.mustachejava.Mustache; import io.codeka.gaia.bo.Settings; import io.codeka.gaia.bo.Stack; -import io.codeka.gaia.bo.TerraformModule; +import io.codeka.gaia.modules.bo.TerraformModule; import io.codeka.gaia.bo.mustache.TerraformScript; import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/io/codeka/gaia/runner/StackRunner.java b/src/main/java/io/codeka/gaia/runner/StackRunner.java index a8b29997f..c51b66b25 100644 --- a/src/main/java/io/codeka/gaia/runner/StackRunner.java +++ b/src/main/java/io/codeka/gaia/runner/StackRunner.java @@ -4,6 +4,7 @@ import com.spotify.docker.client.exceptions.DockerException; import com.spotify.docker.client.messages.ContainerConfig; import io.codeka.gaia.bo.*; +import io.codeka.gaia.modules.bo.TerraformModule; import io.codeka.gaia.repository.JobRepository; import io.codeka.gaia.repository.StackRepository; import org.apache.commons.io.output.WriterOutputStream; diff --git a/src/main/java/io/codeka/gaia/service/StackCostCalculator.java b/src/main/java/io/codeka/gaia/service/StackCostCalculator.java index fbc2091db..b60e51b04 100644 --- a/src/main/java/io/codeka/gaia/service/StackCostCalculator.java +++ b/src/main/java/io/codeka/gaia/service/StackCostCalculator.java @@ -4,7 +4,7 @@ import io.codeka.gaia.bo.JobType; import io.codeka.gaia.bo.Stack; import io.codeka.gaia.repository.JobRepository; -import io.codeka.gaia.repository.TerraformModuleRepository; +import io.codeka.gaia.modules.repository.TerraformModuleRepository; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/src/test/java/io/codeka/gaia/config/ActuatorSecurityTest.java b/src/test/java/io/codeka/gaia/config/ActuatorSecurityTest.java index 371911c94..9942868ac 100644 --- a/src/test/java/io/codeka/gaia/config/ActuatorSecurityTest.java +++ b/src/test/java/io/codeka/gaia/config/ActuatorSecurityTest.java @@ -1,17 +1,10 @@ package io.codeka.gaia.config; -import io.codeka.gaia.repository.StackRepository; -import io.codeka.gaia.repository.TerraformModuleRepository; import io.codeka.gaia.test.MongoContainer; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; -import org.mockito.Mock; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; -import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.test.mock.mockito.MockBean; -import org.springframework.data.mongodb.core.MongoTemplate; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.web.servlet.MockMvc; import org.testcontainers.junit.jupiter.Container; diff --git a/src/test/java/io/codeka/gaia/controller/IndexControllerTest.java b/src/test/java/io/codeka/gaia/controller/IndexControllerTest.java index 15f403307..3b3b6a261 100644 --- a/src/test/java/io/codeka/gaia/controller/IndexControllerTest.java +++ b/src/test/java/io/codeka/gaia/controller/IndexControllerTest.java @@ -2,7 +2,7 @@ import io.codeka.gaia.bo.StackState; import io.codeka.gaia.repository.StackRepository; -import io.codeka.gaia.repository.TerraformModuleRepository; +import io.codeka.gaia.modules.repository.TerraformModuleRepository; import io.codeka.gaia.teams.bo.Team; import io.codeka.gaia.teams.bo.User; import org.junit.jupiter.api.Test; diff --git a/src/test/java/io/codeka/gaia/controller/StackControllerTest.java b/src/test/java/io/codeka/gaia/controller/StackControllerTest.java index e44773ad0..3ee648d9d 100644 --- a/src/test/java/io/codeka/gaia/controller/StackControllerTest.java +++ b/src/test/java/io/codeka/gaia/controller/StackControllerTest.java @@ -2,10 +2,10 @@ import io.codeka.gaia.bo.Job; import io.codeka.gaia.bo.Stack; -import io.codeka.gaia.bo.TerraformModule; +import io.codeka.gaia.modules.bo.TerraformModule; import io.codeka.gaia.repository.JobRepository; import io.codeka.gaia.repository.StackRepository; -import io.codeka.gaia.repository.TerraformModuleRepository; +import io.codeka.gaia.modules.repository.TerraformModuleRepository; import io.codeka.gaia.runner.StackRunner; import io.codeka.gaia.teams.bo.User; import org.junit.jupiter.api.BeforeEach; diff --git a/src/test/java/io/codeka/gaia/bo/TerraformModuleTest.java b/src/test/java/io/codeka/gaia/modules/bo/TerraformModuleTest.java similarity index 89% rename from src/test/java/io/codeka/gaia/bo/TerraformModuleTest.java rename to src/test/java/io/codeka/gaia/modules/bo/TerraformModuleTest.java index 56b1064e8..d2748879f 100644 --- a/src/test/java/io/codeka/gaia/bo/TerraformModuleTest.java +++ b/src/test/java/io/codeka/gaia/modules/bo/TerraformModuleTest.java @@ -1,4 +1,4 @@ -package io.codeka.gaia.bo; +package io.codeka.gaia.modules.bo; import io.codeka.gaia.teams.bo.Team; import io.codeka.gaia.teams.bo.User; @@ -6,7 +6,8 @@ import java.util.List; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; class TerraformModuleTest { diff --git a/src/test/java/io/codeka/gaia/controller/ModuleRestControllerTest.java b/src/test/java/io/codeka/gaia/modules/controller/ModuleRestControllerTest.java similarity index 92% rename from src/test/java/io/codeka/gaia/controller/ModuleRestControllerTest.java rename to src/test/java/io/codeka/gaia/modules/controller/ModuleRestControllerTest.java index 7bcf2a249..b0492acdf 100644 --- a/src/test/java/io/codeka/gaia/controller/ModuleRestControllerTest.java +++ b/src/test/java/io/codeka/gaia/modules/controller/ModuleRestControllerTest.java @@ -1,7 +1,7 @@ -package io.codeka.gaia.controller; +package io.codeka.gaia.modules.controller; -import io.codeka.gaia.bo.TerraformModule; -import io.codeka.gaia.repository.TerraformModuleRepository; +import io.codeka.gaia.modules.bo.TerraformModule; +import io.codeka.gaia.modules.repository.TerraformModuleRepository; import io.codeka.gaia.teams.bo.Team; import io.codeka.gaia.teams.bo.User; import org.junit.jupiter.api.BeforeEach; @@ -10,14 +10,12 @@ import org.mockito.InjectMocks; import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; -import org.springframework.security.core.authority.SimpleGrantedAuthority; import java.util.List; import java.util.Optional; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertThrows; -import static org.mockito.ArgumentMatchers.anyList; import static org.mockito.Mockito.*; @ExtendWith(MockitoExtension.class) diff --git a/src/test/java/io/codeka/gaia/controller/ModulesMVCControllerTest.java b/src/test/java/io/codeka/gaia/modules/controller/ModulesMVCControllerTest.java similarity index 95% rename from src/test/java/io/codeka/gaia/controller/ModulesMVCControllerTest.java rename to src/test/java/io/codeka/gaia/modules/controller/ModulesMVCControllerTest.java index 87448ddc5..5a892ba11 100644 --- a/src/test/java/io/codeka/gaia/controller/ModulesMVCControllerTest.java +++ b/src/test/java/io/codeka/gaia/modules/controller/ModulesMVCControllerTest.java @@ -1,8 +1,8 @@ -package io.codeka.gaia.controller; +package io.codeka.gaia.modules.controller; -import io.codeka.gaia.bo.TerraformModule; -import io.codeka.gaia.repository.TerraformModuleGitRepository; -import io.codeka.gaia.repository.TerraformModuleRepository; +import io.codeka.gaia.modules.bo.TerraformModule; +import io.codeka.gaia.modules.repository.TerraformModuleGitRepository; +import io.codeka.gaia.modules.repository.TerraformModuleRepository; import io.codeka.gaia.teams.bo.Team; import io.codeka.gaia.teams.bo.User; import org.junit.jupiter.api.BeforeEach; diff --git a/src/test/java/io/codeka/gaia/controller/TerraformCLIControllerTest.java b/src/test/java/io/codeka/gaia/modules/controller/TerraformCLIControllerTest.java similarity index 90% rename from src/test/java/io/codeka/gaia/controller/TerraformCLIControllerTest.java rename to src/test/java/io/codeka/gaia/modules/controller/TerraformCLIControllerTest.java index ebe0781cb..2b3a16ab2 100644 --- a/src/test/java/io/codeka/gaia/controller/TerraformCLIControllerTest.java +++ b/src/test/java/io/codeka/gaia/modules/controller/TerraformCLIControllerTest.java @@ -1,6 +1,6 @@ -package io.codeka.gaia.controller; +package io.codeka.gaia.modules.controller; -import io.codeka.gaia.repository.TerraformCLIRepository; +import io.codeka.gaia.modules.repository.TerraformCLIRepository; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/src/test/java/io/codeka/gaia/repository/TerraformCLIRepositoryTest.java b/src/test/java/io/codeka/gaia/modules/repository/TerraformCLIRepositoryTest.java similarity index 98% rename from src/test/java/io/codeka/gaia/repository/TerraformCLIRepositoryTest.java rename to src/test/java/io/codeka/gaia/modules/repository/TerraformCLIRepositoryTest.java index 883f71b3b..2b2245bca 100644 --- a/src/test/java/io/codeka/gaia/repository/TerraformCLIRepositoryTest.java +++ b/src/test/java/io/codeka/gaia/modules/repository/TerraformCLIRepositoryTest.java @@ -1,4 +1,4 @@ -package io.codeka.gaia.repository; +package io.codeka.gaia.modules.repository; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/src/test/java/io/codeka/gaia/repository/TerraformModuleGitRepositoryTest.java b/src/test/java/io/codeka/gaia/modules/repository/TerraformModuleGitRepositoryTest.java similarity index 95% rename from src/test/java/io/codeka/gaia/repository/TerraformModuleGitRepositoryTest.java rename to src/test/java/io/codeka/gaia/modules/repository/TerraformModuleGitRepositoryTest.java index db68860cf..5196a5ec9 100644 --- a/src/test/java/io/codeka/gaia/repository/TerraformModuleGitRepositoryTest.java +++ b/src/test/java/io/codeka/gaia/modules/repository/TerraformModuleGitRepositoryTest.java @@ -1,6 +1,6 @@ -package io.codeka.gaia.repository; +package io.codeka.gaia.modules.repository; -import io.codeka.gaia.bo.TerraformModule; +import io.codeka.gaia.modules.bo.TerraformModule; import io.codeka.gaia.repository.strategy.GitPlatformStrategy; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/src/test/java/io/codeka/gaia/repository/TerraformModuleRepositoryIT.java b/src/test/java/io/codeka/gaia/modules/repository/TerraformModuleRepositoryIT.java similarity index 95% rename from src/test/java/io/codeka/gaia/repository/TerraformModuleRepositoryIT.java rename to src/test/java/io/codeka/gaia/modules/repository/TerraformModuleRepositoryIT.java index acd38fdd3..3a8f45f9e 100644 --- a/src/test/java/io/codeka/gaia/repository/TerraformModuleRepositoryIT.java +++ b/src/test/java/io/codeka/gaia/modules/repository/TerraformModuleRepositoryIT.java @@ -1,6 +1,6 @@ -package io.codeka.gaia.repository; +package io.codeka.gaia.modules.repository; -import io.codeka.gaia.bo.TerraformModule; +import io.codeka.gaia.modules.bo.TerraformModule; import io.codeka.gaia.teams.bo.Team; import io.codeka.gaia.test.MongoContainer; import org.junit.jupiter.api.BeforeEach; diff --git a/src/test/java/io/codeka/gaia/repository/strategy/GitHubStrategyTest.java b/src/test/java/io/codeka/gaia/modules/repository/strategy/GitHubStrategyTest.java similarity index 100% rename from src/test/java/io/codeka/gaia/repository/strategy/GitHubStrategyTest.java rename to src/test/java/io/codeka/gaia/modules/repository/strategy/GitHubStrategyTest.java diff --git a/src/test/java/io/codeka/gaia/repository/strategy/GitLabStrategyTest.java b/src/test/java/io/codeka/gaia/modules/repository/strategy/GitLabStrategyTest.java similarity index 100% rename from src/test/java/io/codeka/gaia/repository/strategy/GitLabStrategyTest.java rename to src/test/java/io/codeka/gaia/modules/repository/strategy/GitLabStrategyTest.java diff --git a/src/test/java/io/codeka/gaia/runner/StackCommandBuilderTest.java b/src/test/java/io/codeka/gaia/runner/StackCommandBuilderTest.java index 241e6ba22..0740e4a88 100644 --- a/src/test/java/io/codeka/gaia/runner/StackCommandBuilderTest.java +++ b/src/test/java/io/codeka/gaia/runner/StackCommandBuilderTest.java @@ -2,11 +2,10 @@ import com.github.mustachejava.DefaultMustacheFactory; import com.github.mustachejava.Mustache; -import com.github.mustachejava.MustacheFactory; import io.codeka.gaia.bo.Settings; import io.codeka.gaia.bo.Stack; -import io.codeka.gaia.bo.TerraformModule; -import io.codeka.gaia.bo.TerraformVariable; +import io.codeka.gaia.modules.bo.TerraformModule; +import io.codeka.gaia.modules.bo.TerraformVariable; import org.jetbrains.annotations.NotNull; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/src/test/java/io/codeka/gaia/runner/StackRunnerTest.java b/src/test/java/io/codeka/gaia/runner/StackRunnerTest.java index 26b11e872..60eebf35d 100644 --- a/src/test/java/io/codeka/gaia/runner/StackRunnerTest.java +++ b/src/test/java/io/codeka/gaia/runner/StackRunnerTest.java @@ -6,6 +6,7 @@ import com.spotify.docker.client.messages.ContainerCreation; import com.spotify.docker.client.messages.ContainerExit; import io.codeka.gaia.bo.*; +import io.codeka.gaia.modules.bo.TerraformModule; import io.codeka.gaia.repository.JobRepository; import io.codeka.gaia.repository.StackRepository; import io.codeka.gaia.teams.bo.User; diff --git a/src/test/java/io/codeka/gaia/service/StackCostCalculatorTest.java b/src/test/java/io/codeka/gaia/service/StackCostCalculatorTest.java index b6fc1b217..0b374613d 100644 --- a/src/test/java/io/codeka/gaia/service/StackCostCalculatorTest.java +++ b/src/test/java/io/codeka/gaia/service/StackCostCalculatorTest.java @@ -3,9 +3,9 @@ import io.codeka.gaia.bo.Job; import io.codeka.gaia.bo.JobType; import io.codeka.gaia.bo.Stack; -import io.codeka.gaia.bo.TerraformModule; +import io.codeka.gaia.modules.bo.TerraformModule; import io.codeka.gaia.repository.JobRepository; -import io.codeka.gaia.repository.TerraformModuleRepository; +import io.codeka.gaia.modules.repository.TerraformModuleRepository; import io.codeka.gaia.teams.bo.User; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith;