#13 Rearrange packages

dvoraka · Mar 21, 2019 · d578216 · d578216
1 parent 975bd7a
commit d578216
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 8 deletions.
diff --git a/...integration-test/groovy/dvoraka/archbuilder/template/ConfigurableMicroserviceISpec.groovy b/...integration-test/groovy/dvoraka/archbuilder/template/ConfigurableMicroserviceISpec.groovy
@@ -8,8 +8,8 @@ import dvoraka.archbuilder.data.Directory
 import dvoraka.archbuilder.generate.Generator
 import dvoraka.archbuilder.generate.JavaHelper
 import dvoraka.archbuilder.generate.JavaTestingHelper
-import dvoraka.archbuilder.module.ConfigurableMicroservice
 import dvoraka.archbuilder.module.Module
+import dvoraka.archbuilder.module.microservice.ConfigurableMicroservice
 import dvoraka.archbuilder.sample.microservice.data.BaseException
 import dvoraka.archbuilder.sample.microservice.data.ResultData
 import dvoraka.archbuilder.sample.microservice.data.message.RequestMessage

diff --git a/...der/src/integration-test/groovy/dvoraka/archbuilder/template/RestMicroserviceISpec.groovy b/...der/src/integration-test/groovy/dvoraka/archbuilder/template/RestMicroserviceISpec.groovy
@@ -9,7 +9,7 @@ import dvoraka.archbuilder.generate.Generator
 import dvoraka.archbuilder.generate.JavaHelper
 import dvoraka.archbuilder.generate.JavaTestingHelper
 import dvoraka.archbuilder.module.Module
-import dvoraka.archbuilder.module.RestMicroservice
+import dvoraka.archbuilder.module.microservice.RestMicroservice
 import dvoraka.archbuilder.sample.microservice.service.BaseService
 import dvoraka.archbuilder.service.DirService
 import dvoraka.archbuilder.springconfig.SpringConfigGenerator

diff --git a/builder/src/main/java/dvoraka/archbuilder/App.java b/builder/src/main/java/dvoraka/archbuilder/App.java
@@ -7,8 +7,8 @@
 import dvoraka.archbuilder.generate.Generator;
 import dvoraka.archbuilder.generate.LangGenerator;
 import dvoraka.archbuilder.generate.MainGenerator;
-import dvoraka.archbuilder.module.DefaultMicroservice;
 import dvoraka.archbuilder.module.Module;
+import dvoraka.archbuilder.module.microservice.DefaultMicroservice;
 import dvoraka.archbuilder.service.DirService;
 import dvoraka.archbuilder.springconfig.SpringConfigGenerator;
 import org.springframework.beans.factory.annotation.Autowired;

diff --git a/...lder/module/ConfigurableMicroservice.java → ...icroservice/ConfigurableMicroservice.java b/...lder/module/ConfigurableMicroservice.java → ...icroservice/ConfigurableMicroservice.java
@@ -1,6 +1,7 @@
-package dvoraka.archbuilder.module;
+package dvoraka.archbuilder.module.microservice;
 
 import dvoraka.archbuilder.data.Directory;
+import dvoraka.archbuilder.module.Module;
 import dvoraka.archbuilder.springconfig.SpringConfigGenerator;
 import dvoraka.archbuilder.submodule.build.BuildSubmodule;
 import dvoraka.archbuilder.submodule.build.ConfigurableGradleSubmodule;

diff --git a/...chbuilder/module/DefaultMicroservice.java → ...ule/microservice/DefaultMicroservice.java b/...chbuilder/module/DefaultMicroservice.java → ...ule/microservice/DefaultMicroservice.java
@@ -1,11 +1,11 @@
-package dvoraka.archbuilder.module;
+package dvoraka.archbuilder.module.microservice;
 
 import dvoraka.archbuilder.data.Directory;
+import dvoraka.archbuilder.module.Module;
 import dvoraka.archbuilder.springconfig.SpringConfigGenerator;
 import dvoraka.archbuilder.submodule.build.BuildSubmodule;
 import dvoraka.archbuilder.submodule.build.DefaultGradleSubmodule;
 import dvoraka.archbuilder.submodule.net.DefaultNetSubmodule;
-import dvoraka.archbuilder.submodule.net.NetConfig;
 import dvoraka.archbuilder.submodule.net.NetSubmodule;
 import dvoraka.archbuilder.submodule.service.DefaultServiceSubmodule;
 import dvoraka.archbuilder.submodule.service.ServiceSubmodule;

diff --git a/.../archbuilder/module/RestMicroservice.java → ...module/microservice/RestMicroservice.java b/.../archbuilder/module/RestMicroservice.java → ...module/microservice/RestMicroservice.java
@@ -1,7 +1,8 @@
-package dvoraka.archbuilder.module;
+package dvoraka.archbuilder.module.microservice;
 
 import dvoraka.archbuilder.data.DirType;
 import dvoraka.archbuilder.data.Directory;
+import dvoraka.archbuilder.module.Module;
 import dvoraka.archbuilder.springconfig.BeanMapping;
 import dvoraka.archbuilder.springconfig.SpringConfigGenerator;
 import dvoraka.archbuilder.template.TemplateHelper;

diff --git a/builder/src/main/java/dvoraka/archbuilder/submodule/net/ConfigurableNetSubmodule.java b/builder/src/main/java/dvoraka/archbuilder/submodule/net/ConfigurableNetSubmodule.java
@@ -12,7 +12,7 @@
 import java.util.Collection;
 import java.util.List;
 
-import static dvoraka.archbuilder.module.ConfigurableMicroservice.MESSAGE_DIR;
+import static dvoraka.archbuilder.module.microservice.ConfigurableMicroservice.MESSAGE_DIR;
 import static dvoraka.archbuilder.util.Utils.uncapitalize;
 
 public class ConfigurableNetSubmodule implements NetSubmodule, TemplateHelper {