generator-jhipster 7.5.0 → 7.6.0

package/generators/server/__snapshots__/generator.spec.mjs.snap

@@ -304,7 +304,7 @@ Object {
       "path": "src/test/java/",
       "templates": Array [
         Object {
-          "file": "package/ArchTest.java",
+          "file": "package/TechnicalStructureTest.java",
           "renameTo": [Function],
         },
       ],
@@ -357,6 +357,7 @@ Object {
       ],
     },
     Object {
+      "condition": [Function],
       "path": "src/test/java/",
       "templates": Array [
         Object {
@@ -365,6 +366,16 @@ Object {
         },
       ],
     },
+    Object {
+      "condition": [Function],
+      "path": "src/test/java/",
+      "templates": Array [
+        Object {
+          "file": "package/security/SecurityUtilsUnitTest_reactive.java",
+          "renameTo": [Function],
+        },
+      ],
+    },
     Object {
       "condition": [Function],
       "path": "src/main/java/",
@@ -580,10 +591,6 @@ Object {
           "file": "package/config/JacksonConfiguration.java",
           "renameTo": [Function],
         },
-        Object {
-          "file": "package/config/LocaleConfiguration.java",
-          "renameTo": [Function],
-        },
         Object {
           "file": "package/config/LoggingAspectConfiguration.java",
           "renameTo": [Function],
@@ -614,6 +621,16 @@ Object {
         },
       ],
     },
+    Object {
+      "condition": [Function],
+      "path": "src/main/java/",
+      "templates": Array [
+        Object {
+          "file": "package/config/LocaleConfiguration.java",
+          "renameTo": [Function],
+        },
+      ],
+    },
     Object {
       "condition": [Function],
       "path": "src/main/java/",
@@ -622,6 +639,10 @@ Object {
           "file": "package/config/ReactorConfiguration.java",
           "renameTo": [Function],
         },
+        Object {
+          "file": "package/config/LocaleConfiguration_reactive.java",
+          "renameTo": [Function],
+        },
       ],
     },
     Object {
@@ -679,11 +700,11 @@ Object {
       "path": "src/main/java/",
       "templates": Array [
         Object {
-          "file": "package/service/ColumnConverter.java",
+          "file": "package/repository/rowmapper/ColumnConverter.java",
           "renameTo": [Function],
         },
         Object {
-          "file": "package/service/EntityManager.java",
+          "file": "package/repository/EntityManager.java",
           "renameTo": [Function],
         },
       ],
@@ -767,12 +788,28 @@ Object {
           "file": "package/web/rest/AuthInfoResource.java",
           "renameTo": [Function],
         },
+      ],
+    },
+    Object {
+      "condition": [Function],
+      "path": "src/main/java/",
+      "templates": Array [
         Object {
           "file": "package/web/rest/LogoutResource.java",
           "renameTo": [Function],
         },
       ],
     },
+    Object {
+      "condition": [Function],
+      "path": "src/main/java/",
+      "templates": Array [
+        Object {
+          "file": "package/web/rest/LogoutResource_reactive.java",
+          "renameTo": [Function],
+        },
+      ],
+    },
     Object {
       "condition": [Function],
       "path": "src/main/java/",
@@ -1539,6 +1576,35 @@ Object {
         },
       ],
     },
+    Object {
+      "condition": [Function],
+      "path": "src/test/java/",
+      "templates": Array [
+        Object {
+          "file": "package/MongoDbTestContainerExtension.java",
+          "renameTo": [Function],
+        },
+      ],
+    },
+    Object {
+      "condition": [Function],
+      "path": "src/test/resources/",
+      "templates": Array [
+        Object {
+          "file": "META-INF/spring.factories",
+        },
+      ],
+    },
+    Object {
+      "condition": [Function],
+      "path": "src/test/java/",
+      "templates": Array [
+        Object {
+          "file": "package/TestContainersSpringContextCustomizerFactory.java",
+          "renameTo": [Function],
+        },
+      ],
+    },
     Object {
       "condition": [Function],
       "path": "src/main/java/",
@@ -1597,12 +1663,28 @@ Object {
           "file": "package/web/rest/TestUtil.java",
           "renameTo": [Function],
         },
+        Object {
+          "file": "package/web/rest/errors/ExceptionTranslatorTestController.java",
+          "renameTo": [Function],
+        },
+      ],
+    },
+    Object {
+      "condition": [Function],
+      "path": "src/test/java/",
+      "templates": Array [
         Object {
           "file": "package/web/rest/errors/ExceptionTranslatorIT.java",
           "renameTo": [Function],
         },
+      ],
+    },
+    Object {
+      "condition": [Function],
+      "path": "src/test/java/",
+      "templates": Array [
         Object {
-          "file": "package/web/rest/errors/ExceptionTranslatorTestController.java",
+          "file": "package/web/rest/errors/ExceptionTranslatorIT_reactive.java",
           "renameTo": [Function],
         },
       ],
@@ -1640,6 +1722,7 @@ Object {
       "templates": Array [
         "config/application.yml",
         "logback.xml",
+        "junit-platform.properties",
       ],
     },
     Object {
@@ -1741,7 +1824,6 @@ Object {
       "condition": [Function],
       "path": "src/test/resources/",
       "templates": Array [
-        "junit-platform.properties",
         Object {
           "file": "package/features/gitkeep",
           "noEjs": true,

package/generators/server/esm.mjs

@@ -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.

package/generators/server/files-couchbase.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.

package/generators/server/files-sql.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.

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,32 @@ const mongoDbFiles = {
         },
       ],
     },
+    {
+      path: SERVER_TEST_SRC_DIR,
+      templates: [
+        {
+          file: 'package/MongoDbTestContainerExtension.java',
+          renameTo: generator => `${generator.testDir}MongoDbTestContainerExtension.java`,
+        },
+      ],
+    },
+    {
+      path: SERVER_TEST_RES_DIR,
+      templates: [
+        {
+          file: 'META-INF/spring.factories',
+        },
+      ],
+    },
+    {
+      path: SERVER_TEST_SRC_DIR,
+      templates: [
+        {
+          file: 'package/TestContainersSpringContextCustomizerFactory.java',
+          renameTo: generator => `${generator.testDir}TestContainersSpringContextCustomizerFactory.java`,
+        },
+      ],
+    },
   ],
 };
 
@@ -431,6 +457,7 @@ const baseServerFiles = {
       ],
     },
     {
+      condition: generator => !generator.reactive,
       path: SERVER_TEST_SRC_DIR,
       templates: [
         {
@@ -439,6 +466,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 +687,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 +820,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 +873,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 +895,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 +913,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 +976,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`,
         },
       ],
     },
@@ -1187,13 +1256,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 +1312,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 +1404,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,

package/generators/server/generator.spec.mjs

@@ -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.

package/generators/server/index.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.
@@ -49,6 +49,18 @@ const { MICROSERVICE, GATEWAY } = require('../../jdl/jhipster/application-types'
 const { getBase64Secret, getRandomHex } = require('../utils');
 const cacheTypes = require('../../jdl/jhipster/cache-types');
 const websocketTypes = require('../../jdl/jhipster/websocket-types');
+const {
+  INITIALIZING_PRIORITY,
+  PROMPTING_PRIORITY,
+  CONFIGURING_PRIORITY,
+  COMPOSING_PRIORITY,
+  LOADING_PRIORITY,
+  PREPARING_PRIORITY,
+  DEFAULT_PRIORITY,
+  WRITING_PRIORITY,
+  POST_WRITING_PRIORITY,
+  END_PRIORITY,
+} = require('../../lib/constants/priorities.cjs').compat;
 
 const NO_CACHE = cacheTypes.NO;
 const NO_DATABASE = databaseTypes.NO;
@@ -231,12 +243,12 @@ module.exports = class JHipsterServerGenerator extends BaseBlueprintGenerator {
     };
   }
 
-  get initializing() {
+  get [INITIALIZING_PRIORITY]() {
     if (this.delegateToBlueprint) return {};
     return this._initializing();
   }
 
-  // Public API method used by the getter and also by Blueprints
+  /** @inheritdoc */
   _prompting() {
     return {
       askForModuleName: prompts.askForModuleName,
@@ -251,12 +263,12 @@ module.exports = class JHipsterServerGenerator extends BaseBlueprintGenerator {
     };
   }
 
-  get prompting() {
+  get [PROMPTING_PRIORITY]() {
     if (this.delegateToBlueprint) return {};
     return this._prompting();
   }
 
-  // Public API method used by the getter and also by Blueprints
+  /** @inheritdoc */
   _configuring() {
     return {
       configServerPort() {
@@ -278,12 +290,12 @@ module.exports = class JHipsterServerGenerator extends BaseBlueprintGenerator {
     };
   }
 
-  get configuring() {
+  get [CONFIGURING_PRIORITY]() {
     if (this.delegateToBlueprint) return {};
     return this._configuring();
   }
 
-  // Public API method used by the getter and also by Blueprints
+  /** @inheritdoc */
   _composing() {
     return {
       async composeCommon() {
@@ -298,12 +310,12 @@ module.exports = class JHipsterServerGenerator extends BaseBlueprintGenerator {
     };
   }
 
-  get composing() {
+  get [COMPOSING_PRIORITY]() {
     if (this.delegateToBlueprint) return {};
     return this._composing();
   }
 
-  // Public API method used by the getter and also by Blueprints
+  /** @inheritdoc */
   _loading() {
     return {
       loadSharedConfig() {
@@ -318,12 +330,12 @@ module.exports = class JHipsterServerGenerator extends BaseBlueprintGenerator {
     };
   }
 
-  get loading() {
+  get [LOADING_PRIORITY]() {
     if (this.delegateToBlueprint) return {};
     return this._loading();
   }
 
-  // Public API method used by the getter and also by Blueprints
+  /** @inheritdoc */
   _preparing() {
     return {
       prepareForTemplates() {
@@ -374,12 +386,12 @@ module.exports = class JHipsterServerGenerator extends BaseBlueprintGenerator {
     };
   }
 
-  get preparing() {
+  get [PREPARING_PRIORITY]() {
     if (this.delegateToBlueprint) return {};
     return this._preparing();
   }
 
-  // Public API method used by the getter and also by Blueprints
+  /** @inheritdoc */
   _default() {
     return {
       ...super._missingPreDefault(),
@@ -432,12 +444,12 @@ module.exports = class JHipsterServerGenerator extends BaseBlueprintGenerator {
     };
   }
 
-  get default() {
+  get [DEFAULT_PRIORITY]() {
     if (this.delegateToBlueprint) return {};
     return this._default();
   }
 
-  // Public API method used by the getter and also by Blueprints
+  /** @inheritdoc */
   _writing() {
     return {
       cleanupCucumberTests() {
@@ -448,6 +460,14 @@ module.exports = class JHipsterServerGenerator extends BaseBlueprintGenerator {
           this.removeFile(`${this.srcTestDir}features/user/user.feature`);
         }
       },
+      cleanupSql() {
+        if (!this.databaseTypeSql) return undefined;
+        if (this.reactive && this.isJhipsterVersionLessThan('7.5.1')) {
+          this.removeFile(`${this.mainJavaPackageDir}service/ColumnConverter.java`);
+          this.removeFile(`${this.mainJavaPackageDir}service/EntityManager.java`);
+          this.removeFile(`${this.testJavaPackageDir}ArchTest.java`);
+        }
+      },
       cleanupServer() {
         if (this.isJhipsterVersionLessThan('7.4.2')) {
           this.removeFile(`${this.mainJavaPackageDir}config/apidocs/GatewaySwaggerResourcesProvider.java`);
@@ -459,11 +479,12 @@ module.exports = class JHipsterServerGenerator extends BaseBlueprintGenerator {
     };
   }
 
-  get writing() {
+  get [WRITING_PRIORITY]() {
     if (this.delegateToBlueprint) return {};
     return this._writing();
   }
 
+  /** @inheritdoc */
   _postWriting() {
     return {
       packageJsonScripts() {
@@ -582,7 +603,7 @@ module.exports = class JHipsterServerGenerator extends BaseBlueprintGenerator {
             'backend:debug': './mvnw -Dspring-boot.run.jvmArguments="-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:8000"',
           });
         } else if (buildTool === GRADLE) {
-          const excludeWebapp = this.jhipsterConfig.skipClient ? '' : '-x webapp';
+          const excludeWebapp = this.jhipsterConfig.skipClient ? '' : '-x webapp -x webapp_test';
           e2ePackage = 'e2e';
           scriptsStorage.set({
             'app:start': './gradlew',
@@ -632,12 +653,12 @@ module.exports = class JHipsterServerGenerator extends BaseBlueprintGenerator {
     };
   }
 
-  get postWriting() {
+  get [POST_WRITING_PRIORITY]() {
     if (this.delegateToBlueprint) return {};
     return this._postWriting();
   }
 
-  // Public API method used by the getter and also by Blueprints
+  /** @inheritdoc */
   _end() {
     return {
       checkLocaleValue() {
@@ -664,7 +685,7 @@ module.exports = class JHipsterServerGenerator extends BaseBlueprintGenerator {
     };
   }
 
-  get end() {
+  get [END_PRIORITY]() {
     if (this.delegateToBlueprint) return {};
     return this._end();
   }

package/generators/server/needle-api/needle-server-cache.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.

package/generators/server/needle-api/needle-server-gradle.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.

package/generators/server/needle-api/needle-server-liquibase.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.

package/generators/server/needle-api/needle-server-logback-spring.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.

package/generators/server/needle-api/needle-server-maven.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.

package/generators/server/needle-api/needle-server.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.