generator-jhipster 7.4.1 → 7.7.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.
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-const cleanup = require('../cleanup');
+const serverCleanup = require('./cleanup');
 const constants = require('../generator-constants');
 const { GATEWAY, MICROSERVICE, MONOLITH } = require('../../jdl/jhipster/application-types');
 const { JWT, OAUTH2, SESSION } = require('../../jdl/jhipster/authentication-types');
@@ -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`,
+        },
+      ],
+    },
   ],
 };
 
@@ -306,6 +332,11 @@ 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: [
     {
@@ -345,7 +376,7 @@ const baseServerFiles = {
       ],
     },
     {
-      condition: generator => generator.buildTool === MAVEN,
+      condition: generator => !generator.skipClient,
       templates: [
         { file: 'npmw', method: 'copy', noEjs: true },
         { file: 'npmw.cmd', method: 'copy', noEjs: true },
@@ -432,6 +463,7 @@ const baseServerFiles = {
       ],
     },
     {
+      condition: generator => !generator.reactive,
       path: SERVER_TEST_SRC_DIR,
       templates: [
         {
@@ -440,6 +472,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,
@@ -651,6 +693,15 @@ 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`,
@@ -658,13 +709,22 @@ const baseServerFiles = {
       ],
     },
     {
-      condition: generator => generator.applicationType === GATEWAY && generator.serviceDiscoveryType && generator.reactive,
+      condition: generator =>
+        generator.authenticationType === OAUTH2 &&
+        generator.reactive &&
+        (generator.applicationType === MONOLITH || generator.applicationType === GATEWAY),
       path: SERVER_MAIN_SRC_DIR,
       templates: [
         {
-          file: 'package/config/apidocs/GatewaySwaggerResourcesProvider.java',
-          renameTo: generator => `${generator.javaDir}config/apidocs/GatewaySwaggerResourcesProvider.java`,
+          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,
+      templates: [
         {
           file: 'package/web/filter/ModifyServersOpenApiFilter.java',
           renameTo: generator => `${generator.javaDir}web/filter/ModifyServersOpenApiFilter.java`,
@@ -679,10 +739,6 @@ const baseServerFiles = {
           file: 'package/web/filter/ModifyServersOpenApiFilterTest.java',
           renameTo: generator => `${generator.testDir}web/filter/ModifyServersOpenApiFilterTest.java`,
         },
-        {
-          file: 'package/config/apidocs/GatewaySwaggerResourcesProviderTest.java',
-          renameTo: generator => `${generator.testDir}config/apidocs/GatewaySwaggerResourcesProviderTest.java`,
-        },
       ],
     },
   ],
@@ -770,8 +826,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`,
         },
       ],
     },
@@ -823,10 +879,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`,
@@ -849,6 +901,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,
@@ -857,6 +919,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`,
+        },
       ],
     },
     {
@@ -916,12 +982,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`,
         },
       ],
     },
@@ -1196,13 +1262,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`,
         },
       ],
     },
@@ -1236,7 +1318,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,
@@ -1323,13 +1405,12 @@ const baseServerFiles = {
           file: 'package/cucumber/CucumberTestContextConfiguration.java',
           renameTo: generator => `${generator.testDir}cucumber/CucumberTestContextConfiguration.java`,
         },
-        { file: '../features/gitkeep', noEjs: true },
       ],
     },
     {
       condition: generator => generator.cucumberTests,
       path: SERVER_TEST_RES_DIR,
-      templates: ['cucumber.properties'],
+      templates: [{ file: 'package/features/gitkeep', renameTo: generator => `${generator.testDir}cucumber/gitkeep`, noEjs: true }],
     },
     {
       condition: generator => !shouldSkipUserManagement(generator) && generator.authenticationType !== OAUTH2,
@@ -1425,7 +1506,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`,
@@ -1638,7 +1718,16 @@ const baseServerFiles = {
           file: 'package/cucumber/stepdefs/UserStepDefs.java',
           renameTo: generator => `${generator.testDir}cucumber/stepdefs/UserStepDefs.java`,
         },
-        '../features/user/user.feature',
+      ],
+    },
+    {
+      condition: generator => !generator.skipUserManagement && generator.cucumberTests,
+      path: SERVER_TEST_RES_DIR,
+      templates: [
+        {
+          file: 'package/features/user/user.feature',
+          renameTo: generator => `${generator.testDir}cucumber/user.feature`,
+        },
       ],
     },
     {
@@ -1734,8 +1823,16 @@ 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() {
-      cleanup.cleanupOldServerFiles(
+      serverCleanup.cleanupOldServerFiles(
         this,
         `${SERVER_MAIN_SRC_DIR}/${this.javaDir}`,
         `${SERVER_TEST_SRC_DIR}/${this.testDir}`,

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,11 +49,27 @@ 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;
 const NO_WEBSOCKET = websocketTypes.FALSE;
 
+const { SERVER_MAIN_SRC_DIR, SERVER_MAIN_RES_DIR, SERVER_TEST_SRC_DIR, SERVER_TEST_RES_DIR, MAIN_DIR, TEST_DIR } = constants;
+
+const WAIT_TIMEOUT = 3 * 60000;
+
 module.exports = class JHipsterServerGenerator extends BaseBlueprintGenerator {
   constructor(args, options, features) {
     super(args, options, { unique: 'namespace', ...features });
@@ -93,14 +109,11 @@ module.exports = class JHipsterServerGenerator extends BaseBlueprintGenerator {
           ) {
             return defaultInstallTask();
           }
-          const gradle = buildTool === GRADLE;
-          const command = gradle ? './gradlew' : './npmw';
-          const args = gradle ? ['npmInstall'] : ['install'];
 
           try {
-            await this.spawnCommand(command, args, { preferLocal: true });
+            await this.spawnCommand('./npmw', ['install'], { preferLocal: true });
           } catch (error) {
-            this.log(chalk.red(`Error executing '${command} ${args.join(' ')}', execute it yourself. (${error.shortMessage})`));
+            this.log(chalk.red(`Error executing './npmw install', execute it yourself. (${error.shortMessage})`));
           }
           return true;
         }.bind(this),
@@ -176,6 +189,7 @@ module.exports = class JHipsterServerGenerator extends BaseBlueprintGenerator {
         this.DOCKER_PROMETHEUS = constants.DOCKER_PROMETHEUS;
         this.DOCKER_GRAFANA = constants.DOCKER_GRAFANA;
         this.DOCKER_COMPOSE_FORMAT_VERSION = constants.DOCKER_COMPOSE_FORMAT_VERSION;
+        this.DOCKER_ZIPKIN = constants.DOCKER_ZIPKIN;
 
         this.JAVA_VERSION = constants.JAVA_VERSION;
         this.JAVA_COMPATIBLE_VERSIONS = constants.JAVA_COMPATIBLE_VERSIONS;
@@ -232,12 +246,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,
@@ -252,12 +266,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() {
@@ -279,12 +293,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() {
@@ -299,12 +313,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() {
@@ -319,12 +333,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() {
@@ -336,6 +350,15 @@ module.exports = class JHipsterServerGenerator extends BaseBlueprintGenerator {
 
         this.jhiTablePrefix = this.getTableName(this.jhiPrefix);
 
+        this.mainJavaDir = SERVER_MAIN_SRC_DIR;
+        this.mainJavaPackageDir = `${SERVER_MAIN_SRC_DIR}${this.packageFolder}/`;
+        this.mainJavaResourceDir = SERVER_MAIN_RES_DIR;
+        this.testJavaDir = SERVER_TEST_SRC_DIR;
+        this.testJavaPackageDir = `${SERVER_TEST_SRC_DIR}${this.packageFolder}/`;
+        this.testResourceDir = SERVER_TEST_RES_DIR;
+        this.srcMainDir = MAIN_DIR;
+        this.srcTestDir = TEST_DIR;
+
         if (this.jhipsterConfig.databaseType === SQL) {
           // sql
           let dbContainer;
@@ -366,12 +389,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(),
@@ -424,24 +447,47 @@ 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() {
+        if (!this.cucumberTests) return undefined;
+        if (this.isJhipsterVersionLessThan('7.4.2')) {
+          this.removeFile(`${this.testResourceDir}cucumber.properties`);
+          this.removeFile(`${this.srcTestDir}features/gitkeep`);
+          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`);
+          this.removeFile(`${this.testJavaDir}config/apidocs/GatewaySwaggerResourcesProviderTest.java`);
+        }
+      },
       ...writeFiles(),
       ...super._missingPostWriting(),
     };
   }
 
-  get writing() {
+  get [WRITING_PRIORITY]() {
     if (this.delegateToBlueprint) return {};
     return this._writing();
   }
 
+  /** @inheritdoc */
   _postWriting() {
     return {
       packageJsonScripts() {
@@ -468,13 +514,12 @@ module.exports = class JHipsterServerGenerator extends BaseBlueprintGenerator {
           const dockerFile = `src/main/docker/${databaseType}.yml`;
           if (databaseType === CASSANDRA) {
             scriptsStorage.set({
-              'docker:db:await': 'wait-on tcp:9042 && sleep 20',
+              'docker:db:await': `wait-on -t ${WAIT_TIMEOUT} tcp:9042 && sleep 20`,
             });
           }
           if (databaseType === COUCHBASE) {
             scriptsStorage.set({
-              'docker:db:await':
-                'echo "Waiting for Couchbase to start" && wait-on http-get://localhost:8091/ui/index.html && sleep 30 && echo "Couchbase started"',
+              'docker:db:await': `echo "Waiting for Couchbase to start" && wait-on -t ${WAIT_TIMEOUT} http-get://localhost:8091/ui/index.html && sleep 30 && echo "Couchbase started"`,
             });
           }
           if (databaseType === COUCHBASE || databaseType === CASSANDRA) {
@@ -494,7 +539,7 @@ module.exports = class JHipsterServerGenerator extends BaseBlueprintGenerator {
         }
         if (this.jhipsterConfig.searchEngine === ELASTICSEARCH) {
           dockerAwaitScripts.push(
-            'echo "Waiting for Elasticsearch to start" && wait-on "http-get://localhost:9200/_cluster/health?wait_for_status=green&timeout=60s" && echo "Elasticsearch started"'
+            `echo "Waiting for Elasticsearch to start" && wait-on -t ${WAIT_TIMEOUT} "http-get://localhost:9200/_cluster/health?wait_for_status=green&timeout=60s" && echo "Elasticsearch started"`
           );
         }
 
@@ -509,11 +554,11 @@ module.exports = class JHipsterServerGenerator extends BaseBlueprintGenerator {
               dockerBuild.push(`npm run docker:${dockerConfig}:build`);
             } else if (dockerConfig === 'jhipster-registry') {
               dockerAwaitScripts.push(
-                'echo "Waiting for jhipster-registry to start" && wait-on http-get://localhost:8761/management/health && echo "jhipster-registry started"'
+                `echo "Waiting for jhipster-registry to start" && wait-on -t ${WAIT_TIMEOUT} http-get://localhost:8761/management/health && echo "jhipster-registry started"`
               );
             } else if (dockerConfig === 'keycloak') {
               dockerAwaitScripts.push(
-                'echo "Waiting for keycloak to start" && wait-on http-get://localhost:9080/auth/realms/jhipster -t 30000 && echo "keycloak started" || echo "keycloak not running, make sure oauth2 server is running"'
+                `echo "Waiting for keycloak to start" && wait-on -t ${WAIT_TIMEOUT} http-get://localhost:9080/auth/realms/jhipster && echo "keycloak started" || echo "keycloak not running, make sure oauth2 server is running"`
               );
             }
 
@@ -544,22 +589,23 @@ module.exports = class JHipsterServerGenerator extends BaseBlueprintGenerator {
         const buildTool = this.jhipsterConfig.buildTool;
         let e2ePackage = 'target/e2e';
         if (buildTool === MAVEN) {
+          const excludeWebapp = this.jhipsterConfig.skipClient ? '' : ' -Dskip.installnodenpm -Dskip.npm';
           scriptsStorage.set({
             'app:start': './mvnw',
             'backend:info': './mvnw -ntp enforcer:display-info --batch-mode',
             'backend:doc:test': './mvnw -ntp javadoc:javadoc --batch-mode',
             'backend:nohttp:test': './mvnw -ntp checkstyle:check --batch-mode',
-            'backend:start': './mvnw -P-webapp',
+            'backend:start': `./mvnw${excludeWebapp}`,
             'java:jar': './mvnw -ntp verify -DskipTests --batch-mode',
             'java:war': './mvnw -ntp verify -DskipTests --batch-mode -Pwar',
-            'java:docker': './mvnw -ntp verify -DskipTests jib:dockerBuild',
+            'java:docker': './mvnw -ntp verify -DskipTests -Pprod jib:dockerBuild',
             'java:docker:arm64': 'npm run java:docker -- -Djib-maven-plugin.architecture=arm64',
-            'backend:unit:test': `./mvnw -ntp -P-webapp verify --batch-mode ${javaCommonLog} ${javaTestLog}`,
+            'backend:unit:test': `./mvnw -ntp${excludeWebapp} verify --batch-mode ${javaCommonLog} ${javaTestLog}`,
             'backend:build-cache': './mvnw dependency:go-offline',
             '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',
@@ -569,7 +615,7 @@ module.exports = class JHipsterServerGenerator extends BaseBlueprintGenerator {
             'backend:start': `./gradlew ${excludeWebapp}`,
             'java:jar': './gradlew bootJar -x test -x integrationTest',
             'java:war': './gradlew bootWar -Pwar -x test -x integrationTest',
-            'java:docker': './gradlew bootJar jibDockerBuild',
+            'java:docker': './gradlew bootJar -Pprod jibDockerBuild',
             'backend:unit:test': `./gradlew test integrationTest ${excludeWebapp} ${javaCommonLog} ${javaTestLog}`,
             'postci:e2e:package': 'cp build/libs/*.$npm_package_config_packaging e2e.$npm_package_config_packaging',
             'backend:build-cache': 'npm run backend:info && npm run backend:nohttp:test && npm run ci:e2e:package',
@@ -583,12 +629,12 @@ module.exports = class JHipsterServerGenerator extends BaseBlueprintGenerator {
           'java:war:prod': 'npm run java:war -- -Pprod',
           'java:docker:dev': 'npm run java:docker -- -Pdev,webapp',
           'java:docker:prod': 'npm run java:docker -- -Pprod',
-          'ci:backend:test': 'npm run backend:info && npm run backend:doc:test && npm run backend:nohttp:test && npm run backend:unit:test',
-          'ci:server:package': 'npm run java:$npm_package_config_packaging:$npm_package_config_default_environment',
+          'ci:backend:test':
+            'npm run backend:info && npm run backend:doc:test && npm run backend:nohttp:test && npm run backend:unit:test -- -P$npm_package_config_default_environment',
           'ci:e2e:package':
             'npm run java:$npm_package_config_packaging:$npm_package_config_default_environment -- -Pe2e -Denforcer.skip=true',
           'preci:e2e:server:start': 'npm run docker:db:await --if-present && npm run docker:others:await --if-present',
-          'ci:e2e:server:start': `java -jar ${e2ePackage}.$npm_package_config_packaging --spring.profiles.active=$npm_package_config_default_environment ${javaCommonLog} ${javaTestLog} --logging.level.org.springframework.web=ERROR`,
+          'ci:e2e:server:start': `java -jar ${e2ePackage}.$npm_package_config_packaging --spring.profiles.active=e2e,$npm_package_config_default_environment ${javaCommonLog} ${javaTestLog} --logging.level.org.springframework.web=ERROR`,
         });
       },
       packageJsonE2eScripts() {
@@ -596,37 +642,23 @@ module.exports = class JHipsterServerGenerator extends BaseBlueprintGenerator {
         const buildCmd = this.jhipsterConfig.buildTool === GRADLE ? 'gradlew' : 'mvnw';
         if (scriptsStorage.get('e2e')) {
           scriptsStorage.set({
-            'ci:server:await':
-              'echo "Waiting for server at port $npm_package_config_backend_port to start" && wait-on http-get://localhost:$npm_package_config_backend_port/management/health && echo "Server at port $npm_package_config_backend_port started"',
+            'ci:server:await': `echo "Waiting for server at port $npm_package_config_backend_port to start" && wait-on -t ${WAIT_TIMEOUT} http-get://localhost:$npm_package_config_backend_port/management/health && echo "Server at port $npm_package_config_backend_port started"`,
             'pree2e:headless': 'npm run ci:server:await',
             'ci:e2e:run': 'concurrently -k -s first "npm run ci:e2e:server:start" "npm run e2e:headless"',
             'e2e:dev': `concurrently -k -s first "./${buildCmd}" "npm run e2e"`,
-            'e2e:devserver':
-              'concurrently -k -s first "npm run backend:start" "npm start" "wait-on http-get://localhost:9000 && npm run e2e:headless -- -c baseUrl=http://localhost:9000"',
-          });
-        }
-        // Vue eagerly loads remotes, wait for it.
-        if (this.microfrontend && this.applicationTypeGateway && this.clientFrameworkVue) {
-          const remotesScript = this.remotes
-            .map(
-              app =>
-                `echo "Waiting for microfrontend ${app.baseName} to start" && wait-on http-get://localhost:$npm_package_config_backend_port/${app.endpointPrefix}/remoteEntry.js && echo "Microfrontend ${app.baseName} started"`
-            )
-            .join(' && ');
-          scriptsStorage.set({
-            'ci:server:await': `${scriptsStorage.get('ci:server:await')} && ${remotesScript}`,
+            'e2e:devserver': `concurrently -k -s first "npm run backend:start" "npm start" "wait-on -t ${WAIT_TIMEOUT} http-get://localhost:9000 && npm run e2e:headless -- -c baseUrl=http://localhost:9000"`,
           });
         }
       },
     };
   }
 
-  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() {
@@ -653,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.