diff --git a/README.md b/README.md index d9a292cf..92044f3c 100644 --- a/README.md +++ b/README.md @@ -28,7 +28,7 @@ To use the plugin you need Gradle version 5.6 or later, to start add the followi ```groovy plugins { - id "co.com.bancolombia.cleanArchitecture" version "1.9.1" + id "co.com.bancolombia.cleanArchitecture" version "1.9.2" } ``` diff --git a/build.gradle b/build.gradle index e2a13c60..eacea19b 100644 --- a/build.gradle +++ b/build.gradle @@ -137,6 +137,4 @@ tasks.register('installGitHooks', Copy) { } into file('.git/hooks') fileMode 0777 -} - - +} \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 32cacf07..dc7a24d1 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,2 +1,3 @@ package=co.com.bancolombia -systemProp.version=1.9.1 +systemProp.version=1.9.2 + diff --git a/src/functionalTest/java/co/com/bancolombia/PluginCleanFunctionalTest.java b/src/functionalTest/java/co/com/bancolombia/PluginCleanFunctionalTest.java index 7f060a2b..7d53842e 100644 --- a/src/functionalTest/java/co/com/bancolombia/PluginCleanFunctionalTest.java +++ b/src/functionalTest/java/co/com/bancolombia/PluginCleanFunctionalTest.java @@ -104,6 +104,10 @@ public void canRunTaskGenerateStructureWithOutLombok() { new File( "build/functionalTest/applications/app-service/src/main/java/co/com/bancolombia/MainApplication.java") .exists()); + assertTrue( + new File( + "build/functionalTest/applications/app-service/src/main/java/co/com/bancolombia/config/UseCasesConfig.java") + .exists()); assertTrue( new File( "build/functionalTest/applications/app-service/src/main/java/co/com/bancolombia/config") @@ -163,6 +167,10 @@ public void canRunTaskGenerateStructureWithOutParameters() { new File( "build/functionalTest/applications/app-service/src/main/java/co/com/bancolombia/MainApplication.java") .exists()); + assertTrue( + new File( + "build/functionalTest/applications/app-service/src/main/java/co/com/bancolombia/config/UseCasesConfig.java") + .exists()); assertTrue( new File( "build/functionalTest/applications/app-service/src/main/java/co/com/bancolombia/config") diff --git a/src/main/java/co/com/bancolombia/Constants.java b/src/main/java/co/com/bancolombia/Constants.java index 0c7d7549..2caa00f7 100644 --- a/src/main/java/co/com/bancolombia/Constants.java +++ b/src/main/java/co/com/bancolombia/Constants.java @@ -16,7 +16,7 @@ public class Constants { public static final String COBERTURA_VERSION = "3.0.0"; public static final String RCOMMONS_ASYNC_COMMONS_STARTER_VERSION = "1.0.0-beta5"; public static final String RCOMMONS_OBJECT_MAPPER_VERSION = "0.1.0"; - public static final String PLUGIN_VERSION = "1.9.1"; + public static final String PLUGIN_VERSION = "1.9.2"; public static final String TOMCAT_EXCLUSION = "compile.exclude group: \"org.springframework.boot\", module:\"spring-boot-starter-tomcat\""; diff --git a/src/main/resources/structure/applications/appservice/usecases.java.mustache b/src/main/resources/structure/applications/appservice/usecases.java.mustache new file mode 100644 index 00000000..2db6d64c --- /dev/null +++ b/src/main/resources/structure/applications/appservice/usecases.java.mustache @@ -0,0 +1,14 @@ +package {{package}}.config; + +import org.springframework.context.annotation.ComponentScan; +import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.FilterType; + +@Configuration +@ComponentScan(basePackages = "{{package}}.usecase", + includeFilters = { + @ComponentScan.Filter(type = FilterType.REGEX, pattern = "^.+UseCase$") + }, + useDefaultFilters = false) +public class UseCasesConfig { +} diff --git a/src/main/resources/structure/definition.json b/src/main/resources/structure/definition.json index e275f6d9..2ea569d7 100644 --- a/src/main/resources/structure/definition.json +++ b/src/main/resources/structure/definition.json @@ -13,6 +13,7 @@ "files": { "structure/applications/appservice/build.gradle.mustache": "applications/app-service/build.gradle", "structure/applications/appservice/main.java.mustache": "applications/app-service/src/main/java/{{packagePath}}/MainApplication.java", + "structure/applications/appservice/usecases.java.mustache": "applications/app-service/src/main/java/{{packagePath}}/config/UseCasesConfig.java", "structure/applications/appservice/log4j2.properties.mustache": "applications/app-service/src/main/resources/log4j2.properties", "structure/applications/appservice/application.yaml.mustache": "applications/app-service/src/main/resources/application.yaml", "structure/deployment/dockerfile.mustache": "deployment/Dockerfile", diff --git a/src/main/resources/structure/without-lombok/definition.json b/src/main/resources/structure/without-lombok/definition.json index 9eb94a7f..92a974e0 100644 --- a/src/main/resources/structure/without-lombok/definition.json +++ b/src/main/resources/structure/without-lombok/definition.json @@ -13,6 +13,7 @@ "files": { "structure/applications/appservice/build.gradle.mustache": "applications/app-service/build.gradle", "structure/applications/appservice/main.java.mustache": "applications/app-service/src/main/java/{{packagePath}}/MainApplication.java", + "structure/applications/appservice/usecases.java.mustache": "applications/app-service/src/main/java/{{packagePath}}/config/UseCasesConfig.java", "structure/applications/appservice/log4j2.properties.mustache": "applications/app-service/src/main/resources/log4j2.properties", "structure/applications/appservice/application.yaml.mustache": "applications/app-service/src/main/resources/application.yaml", "structure/deployment/dockerfile.mustache": "deployment/Dockerfile", diff --git a/src/test/java/co/com/bancolombia/task/GenerateStructureTaskTest.java b/src/test/java/co/com/bancolombia/task/GenerateStructureTaskTest.java index 1875c490..429b2c53 100644 --- a/src/test/java/co/com/bancolombia/task/GenerateStructureTaskTest.java +++ b/src/test/java/co/com/bancolombia/task/GenerateStructureTaskTest.java @@ -78,6 +78,10 @@ public void generateStructure() throws IOException, CleanException { new File( "build/unitTest/applications/app-service/src/main/java/co/com/bancolombia/MainApplication.java") .exists()); + assertTrue( + new File( + "build/unitTest/applications/app-service/src/main/java/co/com/bancolombia/config/UseCasesConfig.java") + .exists()); assertTrue( new File("build/unitTest/applications/app-service/src/main/java/co/com/bancolombia/config") .exists()); @@ -124,6 +128,10 @@ public void generateStructureReactiveWithCobertura() throws IOException, CleanEx assertTrue( new File("build/unitTest/applications/app-service/src/main/java/test/MainApplication.java") .exists()); + assertTrue( + new File( + "build/unitTest/applications/app-service/src/main/java/co/com/bancolombia/config/UseCasesConfig.java") + .exists()); assertTrue( new File("build/unitTest/applications/app-service/src/main/java/test/config").exists()); assertTrue(