generator-jhipster 7.5.0 → 7.8.0

package/generators/server/files.js

@@ -1,5 +1,5 @@
 /**
- * Copyright 2013-2021 the original author or authors from the JHipster project.
+ * Copyright 2013-2022 the original author or authors from the JHipster project.
  *
  * This file is part of the JHipster project, see https://www.jhipster.tech/
  * for more information.
@@ -104,6 +104,34 @@ const mongoDbFiles = {
         },
       ],
     },
+    {
+      path: SERVER_TEST_SRC_DIR,
+      templates: [
+        {
+          file: 'package/config/MongoDbTestContainer.java',
+          renameTo: generator => `${generator.testDir}config/MongoDbTestContainer.java`,
+        },
+        {
+          file: 'package/config/EmbeddedMongo.java',
+          renameTo: generator => `${generator.testDir}config/EmbeddedMongo.java`,
+        },
+        {
+          file: 'package/config/TestContainersSpringContextCustomizerFactory.java',
+          renameTo: generator => `${generator.testDir}config/TestContainersSpringContextCustomizerFactory.java`,
+        },
+      ],
+    },
+    {
+      path: SERVER_TEST_RES_DIR,
+      templates: [
+        {
+          file: 'META-INF/spring.factories',
+        },
+        {
+          file: 'testcontainers.properties',
+        },
+      ],
+    },
   ],
 };
 
@@ -196,7 +224,29 @@ const cassandraFiles = {
           file: 'package/CassandraKeyspaceIT.java',
           renameTo: generator => `${generator.testDir}CassandraKeyspaceIT.java`,
         },
-        { file: 'package/AbstractCassandraTest.java', renameTo: generator => `${generator.testDir}AbstractCassandraTest.java` },
+        {
+          file: 'package/config/CassandraTestContainer.java',
+          renameTo: generator => `${generator.testDir}config/CassandraTestContainer.java`,
+        },
+        {
+          file: 'package/config/EmbeddedCassandra.java',
+          renameTo: generator => `${generator.testDir}config/EmbeddedCassandra.java`,
+        },
+        {
+          file: 'package/config/TestContainersSpringContextCustomizerFactory.java',
+          renameTo: generator => `${generator.testDir}config/TestContainersSpringContextCustomizerFactory.java`,
+        },
+      ],
+    },
+    {
+      path: SERVER_TEST_RES_DIR,
+      templates: [
+        {
+          file: 'META-INF/spring.factories',
+        },
+        {
+          file: 'testcontainers.properties',
+        },
       ],
     },
   ],
@@ -306,10 +356,19 @@ const baseServerFiles = {
         { file: 'config/realm-config/jhipster-users-0.json', method: 'copy', renameTo: () => 'realm-config/jhipster-users-0.json' },
       ],
     },
+    {
+      condition: generator => generator.serviceDiscoveryType || generator.applicationTypeGateway || generator.applicationTypeMicroservice,
+      path: DOCKER_DIR,
+      templates: ['zipkin.yml'],
+    },
   ],
   serverBuild: [
     {
-      templates: [{ file: 'checkstyle.xml', options: { interpolate: INTERPOLATE_REGEX } }],
+      templates: [
+        { file: 'checkstyle.xml', options: { interpolate: INTERPOLATE_REGEX } },
+        { file: 'devcontainer/devcontainer.json', renameTo: () => '.devcontainer/devcontainer.json' },
+        { file: 'devcontainer/Dockerfile', renameTo: () => '.devcontainer/Dockerfile' },
+      ],
     },
     {
       condition: generator => generator.buildTool === GRADLE,
@@ -338,13 +397,14 @@ const baseServerFiles = {
       templates: [
         { file: 'mvnw', method: 'copy', noEjs: true },
         { file: 'mvnw.cmd', method: 'copy', noEjs: true },
+        { file: '.mvn/jvm.config', method: 'copy', noEjs: true },
         { file: '.mvn/wrapper/maven-wrapper.jar', method: 'copy', noEjs: true },
         { file: '.mvn/wrapper/maven-wrapper.properties', method: 'copy', noEjs: true },
-        { file: '.mvn/wrapper/MavenWrapperDownloader.java', method: 'copy', noEjs: true },
         { file: 'pom.xml', options: { interpolate: INTERPOLATE_REGEX } },
       ],
     },
     {
+      condition: generator => !generator.skipClient,
       templates: [
         { file: 'npmw', method: 'copy', noEjs: true },
         { file: 'npmw.cmd', method: 'copy', noEjs: true },
@@ -431,6 +491,7 @@ const baseServerFiles = {
       ],
     },
     {
+      condition: generator => !generator.reactive,
       path: SERVER_TEST_SRC_DIR,
       templates: [
         {
@@ -439,6 +500,16 @@ const baseServerFiles = {
         },
       ],
     },
+    {
+      condition: generator => generator.reactive,
+      path: SERVER_TEST_SRC_DIR,
+      templates: [
+        {
+          file: 'package/security/SecurityUtilsUnitTest_reactive.java',
+          renameTo: generator => `${generator.testDir}security/SecurityUtilsUnitTest.java`,
+        },
+      ],
+    },
     {
       condition: generator => generator.authenticationType === JWT,
       path: SERVER_MAIN_SRC_DIR,
@@ -650,12 +721,34 @@ const baseServerFiles = {
           file: 'package/web/rest/AuthInfoResource.java',
           renameTo: generator => `${generator.javaDir}web/rest/AuthInfoResource.java`,
         },
+      ],
+    },
+    {
+      condition: generator =>
+        generator.authenticationType === OAUTH2 &&
+        !generator.reactive &&
+        (generator.applicationType === MONOLITH || generator.applicationType === GATEWAY),
+      path: SERVER_MAIN_SRC_DIR,
+      templates: [
         {
           file: 'package/web/rest/LogoutResource.java',
           renameTo: generator => `${generator.javaDir}web/rest/LogoutResource.java`,
         },
       ],
     },
+    {
+      condition: generator =>
+        generator.authenticationType === OAUTH2 &&
+        generator.reactive &&
+        (generator.applicationType === MONOLITH || generator.applicationType === GATEWAY),
+      path: SERVER_MAIN_SRC_DIR,
+      templates: [
+        {
+          file: 'package/web/rest/LogoutResource_reactive.java',
+          renameTo: generator => `${generator.javaDir}web/rest/LogoutResource.java`,
+        },
+      ],
+    },
     {
       condition: generator => generator.applicationType === GATEWAY && generator.serviceDiscoveryType && generator.reactive,
       path: SERVER_MAIN_SRC_DIR,
@@ -761,8 +854,8 @@ const baseServerFiles = {
       path: SERVER_TEST_SRC_DIR,
       templates: [
         {
-          file: 'package/ArchTest.java',
-          renameTo: generator => `${generator.testDir}ArchTest.java`,
+          file: 'package/TechnicalStructureTest.java',
+          renameTo: generator => `${generator.testDir}TechnicalStructureTest.java`,
         },
       ],
     },
@@ -814,10 +907,6 @@ const baseServerFiles = {
           file: 'package/config/JacksonConfiguration.java',
           renameTo: generator => `${generator.javaDir}config/JacksonConfiguration.java`,
         },
-        {
-          file: 'package/config/LocaleConfiguration.java',
-          renameTo: generator => `${generator.javaDir}config/LocaleConfiguration.java`,
-        },
         {
           file: 'package/config/LoggingAspectConfiguration.java',
           renameTo: generator => `${generator.javaDir}config/LoggingAspectConfiguration.java`,
@@ -840,6 +929,16 @@ const baseServerFiles = {
       path: SERVER_MAIN_SRC_DIR,
       templates: [{ file: 'package/config/Constants.java', renameTo: generator => `${generator.javaDir}config/Constants.java` }],
     },
+    {
+      condition: generator => !generator.reactive,
+      path: SERVER_MAIN_SRC_DIR,
+      templates: [
+        {
+          file: 'package/config/LocaleConfiguration.java',
+          renameTo: generator => `${generator.javaDir}config/LocaleConfiguration.java`,
+        },
+      ],
+    },
     {
       condition: generator => generator.reactive,
       path: SERVER_MAIN_SRC_DIR,
@@ -848,6 +947,10 @@ const baseServerFiles = {
           file: 'package/config/ReactorConfiguration.java',
           renameTo: generator => `${generator.javaDir}config/ReactorConfiguration.java`,
         },
+        {
+          file: 'package/config/LocaleConfiguration_reactive.java',
+          renameTo: generator => `${generator.javaDir}config/LocaleConfiguration.java`,
+        },
       ],
     },
     {
@@ -907,12 +1010,12 @@ const baseServerFiles = {
       path: SERVER_MAIN_SRC_DIR,
       templates: [
         {
-          file: 'package/service/ColumnConverter.java',
-          renameTo: generator => `${generator.javaDir}service/ColumnConverter.java`,
+          file: 'package/repository/rowmapper/ColumnConverter.java',
+          renameTo: generator => `${generator.javaDir}repository/rowmapper/ColumnConverter.java`,
         },
         {
-          file: 'package/service/EntityManager.java',
-          renameTo: generator => `${generator.javaDir}service/EntityManager.java`,
+          file: 'package/repository/EntityManager.java',
+          renameTo: generator => `${generator.javaDir}repository/EntityManager.java`,
         },
       ],
     },
@@ -1016,8 +1119,12 @@ const baseServerFiles = {
       path: SERVER_MAIN_SRC_DIR,
       templates: [
         {
-          file: 'package/config/KafkaProperties.java',
-          renameTo: generator => `${generator.javaDir}config/KafkaProperties.java`,
+          file: 'package/config/KafkaSseConsumer.java',
+          renameTo: generator => `${generator.javaDir}config/KafkaSseConsumer.java`,
+        },
+        {
+          file: 'package/config/KafkaSseProducer.java',
+          renameTo: generator => `${generator.javaDir}config/KafkaSseProducer.java`,
         },
       ],
     },
@@ -1102,7 +1209,17 @@ const baseServerFiles = {
       ],
     },
     {
-      condition: generator => generator.messageBroker === KAFKA,
+      condition: generator => generator.messageBroker === KAFKA && generator.reactive,
+      path: SERVER_MAIN_SRC_DIR,
+      templates: [
+        {
+          file: 'package/web/rest/KafkaResource_reactive.java',
+          renameTo: generator => `${generator.javaDir}web/rest/${generator.upperFirstCamelCase(generator.baseName)}KafkaResource.java`,
+        },
+      ],
+    },
+    {
+      condition: generator => generator.messageBroker === KAFKA && !generator.reactive,
       path: SERVER_MAIN_SRC_DIR,
       templates: [
         {
@@ -1187,13 +1304,29 @@ const baseServerFiles = {
       path: SERVER_TEST_SRC_DIR,
       templates: [
         { file: 'package/web/rest/TestUtil.java', renameTo: generator => `${generator.testDir}web/rest/TestUtil.java` },
+        {
+          file: 'package/web/rest/errors/ExceptionTranslatorTestController.java',
+          renameTo: generator => `${generator.testDir}web/rest/errors/ExceptionTranslatorTestController.java`,
+        },
+      ],
+    },
+    {
+      condition: generator => !generator.reactive,
+      path: SERVER_TEST_SRC_DIR,
+      templates: [
         {
           file: 'package/web/rest/errors/ExceptionTranslatorIT.java',
           renameTo: generator => `${generator.testDir}web/rest/errors/ExceptionTranslatorIT.java`,
         },
+      ],
+    },
+    {
+      condition: generator => generator.reactive,
+      path: SERVER_TEST_SRC_DIR,
+      templates: [
         {
-          file: 'package/web/rest/errors/ExceptionTranslatorTestController.java',
-          renameTo: generator => `${generator.testDir}web/rest/errors/ExceptionTranslatorTestController.java`,
+          file: 'package/web/rest/errors/ExceptionTranslatorIT_reactive.java',
+          renameTo: generator => `${generator.testDir}web/rest/errors/ExceptionTranslatorIT.java`,
         },
       ],
     },
@@ -1227,7 +1360,7 @@ const baseServerFiles = {
     },
     {
       path: SERVER_TEST_RES_DIR,
-      templates: ['config/application.yml', 'logback.xml'],
+      templates: ['config/application.yml', 'logback.xml', 'junit-platform.properties'],
     },
     {
       condition: generator => generator.databaseType === SQL && !generator.reactive,
@@ -1319,10 +1452,7 @@ const baseServerFiles = {
     {
       condition: generator => generator.cucumberTests,
       path: SERVER_TEST_RES_DIR,
-      templates: [
-        'junit-platform.properties',
-        { file: 'package/features/gitkeep', renameTo: generator => `${generator.testDir}cucumber/gitkeep`, noEjs: true },
-      ],
+      templates: [{ file: 'package/features/gitkeep', renameTo: generator => `${generator.testDir}cucumber/gitkeep`, noEjs: true }],
     },
     {
       condition: generator => !shouldSkipUserManagement(generator) && generator.authenticationType !== OAUTH2,
@@ -1338,6 +1468,24 @@ const baseServerFiles = {
     {
       condition: generator => generator.messageBroker === KAFKA,
       path: SERVER_TEST_SRC_DIR,
+      templates: [
+        {
+          file: 'package/config/KafkaTestContainer.java',
+          renameTo: generator => `${generator.testDir}config/KafkaTestContainer.java`,
+        },
+        {
+          file: 'package/config/EmbeddedKafka.java',
+          renameTo: generator => `${generator.testDir}config/EmbeddedKafka.java`,
+        },
+        {
+          file: 'package/config/TestContainersSpringContextCustomizerFactory.java',
+          renameTo: generator => `${generator.testDir}config/TestContainersSpringContextCustomizerFactory.java`,
+        },
+      ],
+    },
+    {
+      condition: generator => generator.messageBroker === KAFKA && !generator.reactive,
+      path: SERVER_TEST_SRC_DIR,
       templates: [
         {
           file: 'package/web/rest/KafkaResourceIT.java',
@@ -1345,6 +1493,28 @@ const baseServerFiles = {
         },
       ],
     },
+    {
+      condition: generator => generator.messageBroker === KAFKA && generator.reactive,
+      path: SERVER_TEST_SRC_DIR,
+      templates: [
+        {
+          file: 'package/web/rest/KafkaResourceIT_reactive.java',
+          renameTo: generator => `${generator.testDir}web/rest/${generator.upperFirstCamelCase(generator.baseName)}KafkaResourceIT.java`,
+        },
+      ],
+    },
+    {
+      condition: generator => generator.messageBroker === KAFKA,
+      path: SERVER_TEST_RES_DIR,
+      templates: [
+        {
+          file: 'META-INF/spring.factories',
+        },
+        {
+          file: 'testcontainers.properties',
+        },
+      ],
+    },
   ],
   serverJavaUserManagement: [
     {
@@ -1418,7 +1588,6 @@ const baseServerFiles = {
           file: 'package/repository/UserRepository.java',
           renameTo: generator => `${generator.javaDir}repository/UserRepository.java`,
         },
-        { file: 'package/web/rest/UserResource.java', renameTo: generator => `${generator.javaDir}web/rest/UserResource.java` },
         {
           file: 'package/web/rest/PublicUserResource.java',
           renameTo: generator => `${generator.javaDir}web/rest/PublicUserResource.java`,
@@ -1624,7 +1793,8 @@ const baseServerFiles = {
       ],
     },
     {
-      condition: generator => !generator.skipUserManagement && generator.cucumberTests,
+      condition: generator =>
+        !generator.skipUserManagement && generator.cucumberTests && !generator.databaseTypeMongodb && !generator.databaseTypeCassandra,
       path: SERVER_TEST_SRC_DIR,
       templates: [
         {
@@ -1634,7 +1804,8 @@ const baseServerFiles = {
       ],
     },
     {
-      condition: generator => !generator.skipUserManagement && generator.cucumberTests,
+      condition: generator =>
+        !generator.skipUserManagement && generator.cucumberTests && !generator.databaseTypeMongodb && !generator.databaseTypeCassandra,
       path: SERVER_TEST_RES_DIR,
       templates: [
         {
@@ -1736,6 +1907,14 @@ function writeFiles() {
       this.generateKeyStore();
     },
 
+    cleanupFiles() {
+      if (this.isJhipsterVersionLessThan('7.6.1')) {
+        if (this.authenticationTypeOauth2 && !this.databaseTypeNo) {
+          this.removeFile(`${this.mainJavaPackageDir}web/rest/UserResource.java`);
+        }
+      }
+    },
+
     cleanupOldServerFiles() {
       serverCleanup.cleanupOldServerFiles(
         this,