Skip to content

Commit

Permalink
♻️ : moves module feature to its own package
Browse files Browse the repository at this point in the history
  • Loading branch information
@juwit
juwit committed Aug 12, 2019
1 parent 8a2539c commit 090ab53
Show file tree
Hide file tree
Showing 32 changed files with 46 additions and 64 deletions.
11 changes: 0 additions & 11 deletions src/main/java/io/codeka/gaia/Gaia.java
View file
@@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/io/codeka/gaia/controller/IndexController.java
View file
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/io/codeka/gaia/controller/StackController.java
View file
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...va/io/codeka/gaia/bo/TerraformModule.java → ...deka/gaia/modules/bo/TerraformModule.java
View file
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion .../io/codeka/gaia/bo/TerraformVariable.java → ...ka/gaia/modules/bo/TerraformVariable.java
View file
@@ -1,4 +1,4 @@
package io.codeka.gaia.bo;
package io.codeka.gaia.modules.bo;

/**
* Represents a module variable
Expand Down
6 changes: 3 additions & 3 deletions ...gaia/controller/ModuleRestController.java → ...ules/controller/ModuleRestController.java
View file
@@ -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;
Expand Down
8 changes: 4 additions & 4 deletions ...gaia/controller/ModulesMVCController.java → ...ules/controller/ModulesMVCController.java
View file
@@ -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;
Expand Down
4 changes: 2 additions & 2 deletions ...ia/controller/TerraformCLIController.java → ...es/controller/TerraformCLIController.java
View file
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...ia/repository/TerraformCLIRepository.java → ...es/repository/TerraformCLIRepository.java
View file
@@ -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;
Expand Down
4 changes: 2 additions & 2 deletions ...ository/TerraformModuleGitRepository.java → ...ository/TerraformModuleGitRepository.java
View file
@@ -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;
Expand Down
4 changes: 2 additions & 2 deletions ...repository/TerraformModuleRepository.java → ...repository/TerraformModuleRepository.java
View file
@@ -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;
Expand Down
0 ...a/repository/strategy/GitHubStrategy.java → ...s/repository/strategy/GitHubStrategy.java
View file
File renamed without changes.
0 ...a/repository/strategy/GitLabStrategy.java → ...s/repository/strategy/GitLabStrategy.java
View file
File renamed without changes.
0 ...ository/strategy/GitPlatformStrategy.java → ...ository/strategy/GitPlatformStrategy.java
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion src/main/java/io/codeka/gaia/runner/StackCommandBuilder.java
View file
Expand Up @@ -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;
Expand Down
1 change: 1 addition & 0 deletions src/main/java/io/codeka/gaia/runner/StackRunner.java
View file
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/io/codeka/gaia/service/StackCostCalculator.java
View file
Expand Up @@ -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;

Expand Down
7 changes: 0 additions & 7 deletions src/test/java/io/codeka/gaia/config/ActuatorSecurityTest.java
View file
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/io/codeka/gaia/controller/IndexControllerTest.java
View file
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions src/test/java/io/codeka/gaia/controller/StackControllerTest.java
View file
Expand Up @@ -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;
Expand Down
5 changes: 3 additions & 2 deletions ...o/codeka/gaia/bo/TerraformModuleTest.java → .../gaia/modules/bo/TerraformModuleTest.java
View file
@@ -1,12 +1,13 @@
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;
import org.junit.jupiter.api.Test;

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 {

Expand Down
8 changes: 3 additions & 5 deletions .../controller/ModuleRestControllerTest.java → .../controller/ModuleRestControllerTest.java
View file
@@ -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;
Expand All @@ -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)
Expand Down
8 changes: 4 additions & 4 deletions .../controller/ModulesMVCControllerTest.java → .../controller/ModulesMVCControllerTest.java
View file
@@ -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;
Expand Down
4 changes: 2 additions & 2 deletions ...ontroller/TerraformCLIControllerTest.java → ...ontroller/TerraformCLIControllerTest.java
View file
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...epository/TerraformCLIRepositoryTest.java → ...epository/TerraformCLIRepositoryTest.java
View file
@@ -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;
Expand Down
4 changes: 2 additions & 2 deletions ...ory/TerraformModuleGitRepositoryTest.java → ...ory/TerraformModuleGitRepositoryTest.java
View file
@@ -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;
Expand Down
4 changes: 2 additions & 2 deletions ...pository/TerraformModuleRepositoryIT.java → ...pository/TerraformModuleRepositoryIT.java
View file
@@ -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;
Expand Down
0 ...pository/strategy/GitHubStrategyTest.java → ...pository/strategy/GitHubStrategyTest.java
View file
File renamed without changes.
0 ...pository/strategy/GitLabStrategyTest.java → ...pository/strategy/GitLabStrategyTest.java
View file
File renamed without changes.
5 changes: 2 additions & 3 deletions src/test/java/io/codeka/gaia/runner/StackCommandBuilderTest.java
View file
Expand Up @@ -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;
Expand Down
1 change: 1 addition & 0 deletions src/test/java/io/codeka/gaia/runner/StackRunnerTest.java
View file
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions src/test/java/io/codeka/gaia/service/StackCostCalculatorTest.java
View file
Expand Up @@ -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;
Expand Down

0 comments on commit 090ab53

Please sign in to comment.