Merge pull request #96 from CodeKaio/91-package-by-feature

♻️ : package by feature
gaia-app · Aug 13, 2019 · a7c5860 · a7c5860
2 parents d22b4f4 + 7bfbd9a
commit a7c5860
Show file tree

Hide file tree

Showing 64 changed files with 184 additions and 309 deletions.
diff --git a/pom.xml b/pom.xml
@@ -12,7 +12,7 @@
 
 	<groupId>io.codeka</groupId>
 	<artifactId>gaia</artifactId>
-	<version>1.1.0</version>
+	<version>1.2.0-SNAPSHOT</version>
 	<name>gaia</name>
 	<description>gaia runs yours terraform modules</description>
 

diff --git 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/bo/TerraformBackend.java b/src/main/java/io/codeka/gaia/bo/TerraformBackend.java
diff --git a/src/main/java/io/codeka/gaia/bo/backend/Backend.java b/src/main/java/io/codeka/gaia/bo/backend/Backend.java
diff --git a/src/main/java/io/codeka/gaia/bo/backend/Http.java b/src/main/java/io/codeka/gaia/bo/backend/Http.java
diff --git a/src/main/java/io/codeka/gaia/bo/backend/Terraform.java b/src/main/java/io/codeka/gaia/bo/backend/Terraform.java
diff --git a/...deka/gaia/controller/IndexController.java → ...dashboard/controller/IndexController.java b/...deka/gaia/controller/IndexController.java → ...dashboard/controller/IndexController.java
@@ -1,8 +1,8 @@
-package io.codeka.gaia.controller;
+package io.codeka.gaia.dashboard.controller;
 
-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.stacks.bo.StackState;
+import io.codeka.gaia.stacks.repository.StackRepository;
 import io.codeka.gaia.teams.bo.Team;
 import io.codeka.gaia.teams.bo.User;
 import org.springframework.stereotype.Controller;

diff --git a/...va/io/codeka/gaia/bo/TerraformModule.java → ...deka/gaia/modules/bo/TerraformModule.java b/...va/io/codeka/gaia/bo/TerraformModule.java → ...deka/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/.../io/codeka/gaia/bo/TerraformVariable.java → ...ka/gaia/modules/bo/TerraformVariable.java b/.../io/codeka/gaia/bo/TerraformVariable.java → ...ka/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/...gaia/controller/ModuleRestController.java → ...ules/controller/ModuleRestController.java b/...gaia/controller/ModuleRestController.java → ...ules/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/...gaia/controller/ModulesMVCController.java → ...ules/controller/ModulesMVCController.java b/...gaia/controller/ModulesMVCController.java → ...ules/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/...ia/controller/TerraformCLIController.java → ...es/controller/TerraformCLIController.java b/...ia/controller/TerraformCLIController.java → ...es/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/...ia/repository/TerraformCLIRepository.java → ...es/repository/TerraformCLIRepository.java b/...ia/repository/TerraformCLIRepository.java → ...es/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/...ository/TerraformModuleGitRepository.java → ...ository/TerraformModuleGitRepository.java b/...ository/TerraformModuleGitRepository.java → ...ository/TerraformModuleGitRepository.java
@@ -1,9 +1,9 @@
-package io.codeka.gaia.repository;
+package io.codeka.gaia.modules.repository;
 
-import io.codeka.gaia.bo.TerraformModule;
-import io.codeka.gaia.repository.strategy.GitHubStrategy;
-import io.codeka.gaia.repository.strategy.GitLabStrategy;
-import io.codeka.gaia.repository.strategy.GitPlatformStrategy;
+import io.codeka.gaia.modules.bo.TerraformModule;
+import io.codeka.gaia.modules.repository.strategy.GitHubStrategy;
+import io.codeka.gaia.modules.repository.strategy.GitLabStrategy;
+import io.codeka.gaia.modules.repository.strategy.GitPlatformStrategy;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Repository;
 

diff --git a/...repository/TerraformModuleRepository.java → ...repository/TerraformModuleRepository.java b/...repository/TerraformModuleRepository.java → ...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/...a/repository/strategy/GitHubStrategy.java → ...s/repository/strategy/GitHubStrategy.java b/...a/repository/strategy/GitHubStrategy.java → ...s/repository/strategy/GitHubStrategy.java
@@ -1,4 +1,4 @@
-package io.codeka.gaia.repository.strategy;
+package io.codeka.gaia.modules.repository.strategy;
 
 import java.util.regex.Pattern;
 

diff --git a/...a/repository/strategy/GitLabStrategy.java → ...s/repository/strategy/GitLabStrategy.java b/...a/repository/strategy/GitLabStrategy.java → ...s/repository/strategy/GitLabStrategy.java
@@ -1,4 +1,4 @@
-package io.codeka.gaia.repository.strategy;
+package io.codeka.gaia.modules.repository.strategy;
 
 import java.util.regex.Pattern;
 

diff --git a/...ository/strategy/GitPlatformStrategy.java → ...ository/strategy/GitPlatformStrategy.java b/...ository/strategy/GitPlatformStrategy.java → ...ository/strategy/GitPlatformStrategy.java
@@ -1,4 +1,4 @@
-package io.codeka.gaia.repository.strategy;
+package io.codeka.gaia.modules.repository.strategy;
 
 import org.apache.commons.lang.StringUtils;
 

diff --git a/src/main/java/io/codeka/gaia/runner/StackCommandBuilder.java b/src/main/java/io/codeka/gaia/runner/StackCommandBuilder.java
@@ -1,10 +1,10 @@
 package io.codeka.gaia.runner;
 
 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.bo.mustache.TerraformScript;
+import io.codeka.gaia.settings.bo.Settings;
+import io.codeka.gaia.stacks.bo.Stack;
+import io.codeka.gaia.modules.bo.TerraformModule;
+import io.codeka.gaia.stacks.bo.mustache.TerraformScript;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;

diff --git a/src/main/java/io/codeka/gaia/runner/StackRunner.java b/src/main/java/io/codeka/gaia/runner/StackRunner.java
@@ -3,9 +3,14 @@
 import com.spotify.docker.client.DockerClient;
 import com.spotify.docker.client.exceptions.DockerException;
 import com.spotify.docker.client.messages.ContainerConfig;
-import io.codeka.gaia.bo.*;
-import io.codeka.gaia.repository.JobRepository;
-import io.codeka.gaia.repository.StackRepository;
+import io.codeka.gaia.modules.bo.TerraformModule;
+import io.codeka.gaia.settings.bo.Settings;
+import io.codeka.gaia.stacks.repository.JobRepository;
+import io.codeka.gaia.stacks.repository.StackRepository;
+import io.codeka.gaia.stacks.bo.Job;
+import io.codeka.gaia.stacks.bo.JobType;
+import io.codeka.gaia.stacks.bo.Stack;
+import io.codeka.gaia.stacks.bo.StackState;
 import org.apache.commons.io.output.WriterOutputStream;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Async;

diff --git a/src/main/java/io/codeka/gaia/runner/config/DockerConfig.java b/src/main/java/io/codeka/gaia/runner/config/DockerConfig.java
@@ -4,7 +4,7 @@
 import com.spotify.docker.client.DockerClient;
 import com.spotify.docker.client.messages.ContainerConfig;
 import com.spotify.docker.client.messages.HostConfig;
-import io.codeka.gaia.bo.Settings;
+import io.codeka.gaia.settings.bo.Settings;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 

diff --git a/...main/java/io/codeka/gaia/bo/Settings.java → .../io/codeka/gaia/settings/bo/Settings.java b/...main/java/io/codeka/gaia/bo/Settings.java → .../io/codeka/gaia/settings/bo/Settings.java
@@ -1,4 +1,4 @@
-package io.codeka.gaia.bo;
+package io.codeka.gaia.settings.bo;
 
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.stereotype.Component;

diff --git a/...a/gaia/controller/SettingsController.java → ...ttings/controller/SettingsController.java b/...a/gaia/controller/SettingsController.java → ...ttings/controller/SettingsController.java
@@ -1,7 +1,7 @@
-package io.codeka.gaia.controller;
+package io.codeka.gaia.settings.controller;
 
-import io.codeka.gaia.bo.Settings;
-import io.codeka.gaia.repository.SettingsRepository;
+import io.codeka.gaia.settings.bo.Settings;
+import io.codeka.gaia.settings.repository.SettingsRepository;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.annotation.Secured;
 import org.springframework.stereotype.Controller;

diff --git a/...a/gaia/repository/SettingsRepository.java → ...ttings/repository/SettingsRepository.java b/...a/gaia/repository/SettingsRepository.java → ...ttings/repository/SettingsRepository.java
@@ -1,6 +1,6 @@
-package io.codeka.gaia.repository;
+package io.codeka.gaia.settings.repository;
 
-import io.codeka.gaia.bo.Settings;
+import io.codeka.gaia.settings.bo.Settings;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.stereotype.Repository;

diff --git a/src/main/java/io/codeka/gaia/bo/Job.java → ...in/java/io/codeka/gaia/stacks/bo/Job.java b/src/main/java/io/codeka/gaia/bo/Job.java → ...in/java/io/codeka/gaia/stacks/bo/Job.java
@@ -1,4 +1,4 @@
-package io.codeka.gaia.bo;
+package io.codeka.gaia.stacks.bo;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import io.codeka.gaia.teams.bo.User;

diff --git a/...ain/java/io/codeka/gaia/bo/JobStatus.java → ...a/io/codeka/gaia/stacks/bo/JobStatus.java b/...ain/java/io/codeka/gaia/bo/JobStatus.java → ...a/io/codeka/gaia/stacks/bo/JobStatus.java
@@ -1,4 +1,4 @@
-package io.codeka.gaia.bo;
+package io.codeka.gaia.stacks.bo;
 
 public enum JobStatus {
     RUNNING, FINISHED, FAILED

diff --git a/src/main/java/io/codeka/gaia/bo/JobType.java → ...ava/io/codeka/gaia/stacks/bo/JobType.java b/src/main/java/io/codeka/gaia/bo/JobType.java → ...ava/io/codeka/gaia/stacks/bo/JobType.java
@@ -1,4 +1,4 @@
-package io.codeka.gaia.bo;
+package io.codeka.gaia.stacks.bo;
 
 public enum JobType {
     PREVIEW, RUN, STOP

diff --git a/src/main/java/io/codeka/gaia/bo/Stack.java → .../java/io/codeka/gaia/stacks/bo/Stack.java b/src/main/java/io/codeka/gaia/bo/Stack.java → .../java/io/codeka/gaia/stacks/bo/Stack.java
@@ -1,4 +1,4 @@
-package io.codeka.gaia.bo;
+package io.codeka.gaia.stacks.bo;
 
 import io.codeka.gaia.teams.bo.Team;
 import io.codeka.gaia.teams.bo.User;

diff --git a/...in/java/io/codeka/gaia/bo/StackState.java → .../io/codeka/gaia/stacks/bo/StackState.java b/...in/java/io/codeka/gaia/bo/StackState.java → .../io/codeka/gaia/stacks/bo/StackState.java
@@ -1,4 +1,4 @@
-package io.codeka.gaia.bo;
+package io.codeka.gaia.stacks.bo;
 
 /**
  * Represents the state of a Stack.

diff --git a/...ava/io/codeka/gaia/bo/TerraformState.java → ...codeka/gaia/stacks/bo/TerraformState.java b/...ava/io/codeka/gaia/bo/TerraformState.java → ...codeka/gaia/stacks/bo/TerraformState.java
@@ -1,4 +1,4 @@
-package io.codeka.gaia.bo;
+package io.codeka.gaia.stacks.bo;
 
 import java.util.Map;
 

diff --git a/...eka/gaia/bo/mustache/TerraformScript.java → ...a/stacks/bo/mustache/TerraformScript.java b/...eka/gaia/bo/mustache/TerraformScript.java → ...a/stacks/bo/mustache/TerraformScript.java
@@ -1,4 +1,4 @@
-package io.codeka.gaia.bo.mustache;
+package io.codeka.gaia.stacks.bo.mustache;
 
 /**
  * Object matching the terraform mustache template

diff --git a/...ka/gaia/controller/JobRestController.java → .../stacks/controller/JobRestController.java b/...ka/gaia/controller/JobRestController.java → .../stacks/controller/JobRestController.java
@@ -1,7 +1,7 @@
-package io.codeka.gaia.controller;
+package io.codeka.gaia.stacks.controller;
 
-import io.codeka.gaia.bo.Job;
-import io.codeka.gaia.repository.JobRepository;
+import io.codeka.gaia.stacks.bo.Job;
+import io.codeka.gaia.stacks.repository.JobRepository;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.*;