Merge pull request #2636 from DamnClin/add-template-migration

Switch to add template in files batch
jhipster · Jul 17, 2022 · fe1c95a · fe1c95a
2 parents a458b8e + 0bfc9fb
commit fe1c95a
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 28 deletions.
diff --git a/...enerator/server/springboot/beanvalidationtest/domain/BeanValidationTestModuleFactory.java b/...enerator/server/springboot/beanvalidationtest/domain/BeanValidationTestModuleFactory.java
@@ -23,8 +23,8 @@ public JHipsterModule buildModule(JHipsterModuleProperties properties) {
         .and()
       .files()
         .batch(SOURCE, toSrcTestJava().append(properties.basePackage().path()))
-          .template("BeanValidationAssertions.java")
-          .template("BeanValidationTest.java")
+          .addTemplate("BeanValidationAssertions.java")
+          .addTemplate("BeanValidationTest.java")
           .and()
         .and()
       .build();

diff --git a/...h/jhipster/lite/generator/server/springboot/broker/pulsar/domain/PulsarModuleFactory.java b/...h/jhipster/lite/generator/server/springboot/broker/pulsar/domain/PulsarModuleFactory.java
@@ -42,8 +42,8 @@ public JHipsterModule buildModule(JHipsterModuleProperties properties) {
         .add(SOURCE.template("pulsar.yml"), toSrcMainDocker().append("pulsar.yml"))
         .add(SOURCE.template("PulsarTestContainerExtension.java"), testDestination.append("PulsarTestContainerExtension.java"))
         .batch(SOURCE, toSrcMainJava().append(packagePath).append(PULSAR_CONFIG))
-          .template("PulsarProperties.java")
-          .template("PulsarConfiguration.java")
+          .addTemplate("PulsarProperties.java")
+          .addTemplate("PulsarConfiguration.java")
           .and()
         .add(SOURCE.template("PulsarConfigurationIT.java"), testDestination.append(PULSAR_CONFIG).append("PulsarConfigurationIT.java"))
         .and()

diff --git a/...ipster/lite/generator/server/springboot/database/mongodb/domain/MongoDbModuleFactory.java b/...ipster/lite/generator/server/springboot/database/mongodb/domain/MongoDbModuleFactory.java
@@ -43,16 +43,16 @@ public JHipsterModule buildModule(JHipsterModuleProperties properties) {
       .files()
         .add(SOURCE.template("mongodb.yml"), toSrcMainDocker().append("mongodb.yml"))
         .batch(SOURCE, toSrcMainJava().append(packagePath).append(MONGO_SECONDARY))
-          .template("MongodbDatabaseConfiguration.java")
-          .template("JSR310DateConverters.java")
+          .addTemplate("MongodbDatabaseConfiguration.java")
+          .addTemplate("JSR310DateConverters.java")
           .and()
         .add(
               SOURCE.template("JSR310DateConvertersTest.java"), 
               toSrcTestJava().append(packagePath).append(MONGO_SECONDARY).append("JSR310DateConvertersTest.java")
             )
         .batch(SOURCE, toSrcTestJava().append(packagePath))
-          .template("MongodbTestContainerExtension.java")
-          .template("TestContainersSpringContextCustomizerFactory.java")
+          .addTemplate("MongodbTestContainerExtension.java")
+          .addTemplate("TestContainersSpringContextCustomizerFactory.java")
           .and()
         .add(SOURCE.template("spring.factories"), to("src/test/resources/META-INF/spring.factories"))
         .and()

diff --git a/...pster/lite/generator/server/springboot/logging/logstash/domain/LogstashModuleFactory.java b/...pster/lite/generator/server/springboot/logging/logstash/domain/LogstashModuleFactory.java
@@ -26,15 +26,15 @@ public JHipsterModule buildModule(JHipsterModuleProperties properties) {
         .and()
       .files()
         .batch(SOURCE.append("main"), toSrcMainJava().append(packagePath).append(LOGSTASH_SECONDARY))
-        .template("LogstashTcpConfiguration.java")
-        .template("LogstashTcpLifeCycle.java")
-        .template("LogstashTcpProperties.java")
+          .addTemplate("LogstashTcpConfiguration.java")
+          .addTemplate("LogstashTcpLifeCycle.java")
+          .addTemplate("LogstashTcpProperties.java")
         .and()
         .batch(SOURCE.append("test"), toSrcTestJava().append(packagePath).append(LOGSTASH_SECONDARY))
-          .template("LogstashTcpConfigurationIT.java")
-          .template("LogstashTcpConfigurationTest.java")
-          .template("LogstashTcpLifeCycleTest.java")
-          .template("LogstashTcpPropertiesTest.java")
+          .addTemplate("LogstashTcpConfigurationIT.java")
+          .addTemplate("LogstashTcpConfigurationTest.java")
+          .addTemplate("LogstashTcpLifeCycleTest.java")
+          .addTemplate("LogstashTcpPropertiesTest.java")
           .and()
         .and()
       .springMainProperties()

diff --git a/...hipster/lite/generator/server/springboot/mvc/web/domain/SpringBootMvcsModulesFactory.java b/...hipster/lite/generator/server/springboot/mvc/web/domain/SpringBootMvcsModulesFactory.java
@@ -74,8 +74,8 @@ private JHipsterModuleBuilder springMvcBuilder(JHipsterModuleProperties properti
         .and()
       .files()
         .batch(SOURCE.append("src/cors"), toSrcMainJava().append(packagePath).append(CORS_PRIMARY))
-          .template("CorsFilterConfiguration.java")
-          .template("CorsProperties.java")
+          .addTemplate("CorsFilterConfiguration.java")
+          .addTemplate("CorsProperties.java")
           .and()
         .add(
           SOURCE.append("test/cors").template("CorsFilterConfigurationIT.java"),

diff --git a/...e/generator/server/springboot/mvc/zalandoproblem/domain/ZalandoProblemsModuleFactory.java b/...e/generator/server/springboot/mvc/zalandoproblem/domain/ZalandoProblemsModuleFactory.java
@@ -35,19 +35,19 @@ public JHipsterModule buildModule(JHipsterModuleProperties properties) {
         .and()
       .files()
         .batch(SOURCE.append("main"), toSrcMainJava().append(packagePath).append(EXCEPTION_PATH))
-          .template("BadRequestAlertException.java")
-          .template("ErrorConstants.java")
-          .template("ExceptionTranslator.java")
-          .template("FieldErrorDTO.java")
-          .template("HeaderUtil.java")
-          .template("ProblemConfiguration.java")
+          .addTemplate("BadRequestAlertException.java")
+          .addTemplate("ErrorConstants.java")
+          .addTemplate("ExceptionTranslator.java")
+          .addTemplate("FieldErrorDTO.java")
+          .addTemplate("HeaderUtil.java")
+          .addTemplate("ProblemConfiguration.java")
           .and()
         .batch(TEST_SOURCE, toSrcTestJava().append(packagePath).append(EXCEPTION_PATH))
-          .template("BadRequestAlertExceptionTest.java")
-          .template("ExceptionTranslatorIT.java")
-          .template("ExceptionTranslatorTestController.java")
-          .template("FieldErrorDTOTest.java")
-          .template("HeaderUtilTest.java")
+          .addTemplate("BadRequestAlertExceptionTest.java")
+          .addTemplate("ExceptionTranslatorIT.java")
+          .addTemplate("ExceptionTranslatorTestController.java")
+          .addTemplate("FieldErrorDTOTest.java")
+          .addTemplate("HeaderUtilTest.java")
           .and()
         .add(TEST_SOURCE.template("TestUtil.java"), toSrcTestJava().append(packagePath).append("TestUtil.java"))
         .and()