generator-jhipster 7.2.0 → 7.4.1

package/generators/server/index.js

@@ -18,7 +18,6 @@
  */
 /* eslint-disable consistent-return */
 const chalk = require('chalk');
-const _ = require('lodash');
 const os = require('os');
 const prompts = require('./prompts');
 const { GENERATOR_COMMON, GENERATOR_LANGUAGES, GENERATOR_SERVER } = require('../generator-list');
@@ -46,7 +45,7 @@ const { CAFFEINE, EHCACHE, HAZELCAST, INFINISPAN, MEMCACHED, REDIS } = require('
 const { GRADLE, MAVEN } = require('../../jdl/jhipster/build-tool-types');
 const { ELASTICSEARCH } = require('../../jdl/jhipster/search-engine-types');
 const { EUREKA } = require('../../jdl/jhipster/service-discovery-types');
-const { MICROSERVICE } = require('../../jdl/jhipster/application-types');
+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');
@@ -55,8 +54,6 @@ const NO_CACHE = cacheTypes.NO;
 const NO_DATABASE = databaseTypes.NO;
 const NO_WEBSOCKET = websocketTypes.FALSE;
 
-let useBlueprints;
-
 module.exports = class JHipsterServerGenerator extends BaseBlueprintGenerator {
   constructor(args, options, features) {
     super(args, options, { unique: 'namespace', ...features });
@@ -76,11 +73,15 @@ module.exports = class JHipsterServerGenerator extends BaseBlueprintGenerator {
 
     // preserve old jhipsterVersion value for cleanup which occurs after new config is written into disk
     this.jhipsterOldVersion = this.jhipsterConfig.jhipsterVersion;
+  }
 
-    useBlueprints = !this.fromBlueprint && this.instantiateBlueprints(GENERATOR_SERVER);
+  async _postConstruct() {
+    if (!this.fromBlueprint) {
+      await this.composeWithBlueprints(GENERATOR_SERVER);
+    }
 
     // Not using normal blueprints or this is a normal blueprint.
-    if (!useBlueprints || (this.fromBlueprint && this.sbsBlueprint)) {
+    if ((!this.fromBlueprint && !this.delegateToBlueprint) || (this.fromBlueprint && this.sbsBlueprint)) {
       this.setFeatures({
         customInstallTask: async function customInstallTask(preferredPm, defaultInstallTask) {
           const buildTool = this.jhipsterConfig.buildTool;
@@ -120,6 +121,24 @@ module.exports = class JHipsterServerGenerator extends BaseBlueprintGenerator {
         }
       },
 
+      loadEnvironmentVariables() {
+        if (process.env.JHI_BOM_VERSION) {
+          this.jhiBomVersion = process.env.JHI_BOM_VERSION;
+          this.info(`Using JHipster BOM version ${process.env.JHI_BOM_VERSION}`);
+        }
+
+        this.defaultPackaging = process.env.JHI_WAR === '1' ? 'war' : 'jar';
+        if (this.defaultPackaging === 'war') {
+          this.info(`Using ${this.defaultPackaging} as default packaging`);
+        }
+
+        const JHI_PROFILE = process.env.JHI_PROFILE;
+        this.defaultEnvironment = (JHI_PROFILE || '').includes('dev') ? 'dev' : 'prod';
+        if (JHI_PROFILE) {
+          this.info(`Using ${this.defaultEnvironment} as default profile`);
+        }
+      },
+
       setupServerconsts() {
         // Make constants available in templates
         this.MAIN_DIR = constants.MAIN_DIR;
@@ -159,13 +178,14 @@ module.exports = class JHipsterServerGenerator extends BaseBlueprintGenerator {
         this.DOCKER_COMPOSE_FORMAT_VERSION = constants.DOCKER_COMPOSE_FORMAT_VERSION;
 
         this.JAVA_VERSION = constants.JAVA_VERSION;
+        this.JAVA_COMPATIBLE_VERSIONS = constants.JAVA_COMPATIBLE_VERSIONS;
 
         this.NODE_VERSION = constants.NODE_VERSION;
         this.NPM_VERSION = constants.NPM_VERSION;
         this.GRADLE_VERSION = constants.GRADLE_VERSION;
 
         this.JIB_VERSION = constants.JIB_VERSION;
-        this.JHIPSTER_DEPENDENCIES_VERSION = constants.JHIPSTER_DEPENDENCIES_VERSION;
+        this.JHIPSTER_DEPENDENCIES_VERSION = this.jhiBomVersion || constants.JHIPSTER_DEPENDENCIES_VERSION;
         this.SPRING_BOOT_VERSION = constants.SPRING_BOOT_VERSION;
         this.LIQUIBASE_VERSION = constants.LIQUIBASE_VERSION;
         this.LIQUIBASE_DTD_VERSION = constants.LIQUIBASE_DTD_VERSION;
@@ -213,7 +233,7 @@ module.exports = class JHipsterServerGenerator extends BaseBlueprintGenerator {
   }
 
   get initializing() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._initializing();
   }
 
@@ -233,7 +253,7 @@ module.exports = class JHipsterServerGenerator extends BaseBlueprintGenerator {
   }
 
   get prompting() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._prompting();
   }
 
@@ -245,6 +265,14 @@ module.exports = class JHipsterServerGenerator extends BaseBlueprintGenerator {
           this.jhipsterConfig.serverPort = 8080 + this.jhipsterConfig.applicationIndex;
         }
       },
+      forceReactiveGateway() {
+        if (this.jhipsterConfig.applicationType === GATEWAY) {
+          if (this.jhipsterConfig.reactive !== undefined && !this.jhipsterConfig.reactive) {
+            this.warning('Non reactive gateway is not supported. Switching to reactive.');
+          }
+          this.jhipsterConfig.reactive = true;
+        }
+      },
       configure() {
         this._configureServer();
       },
@@ -252,27 +280,27 @@ module.exports = class JHipsterServerGenerator extends BaseBlueprintGenerator {
   }
 
   get configuring() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._configuring();
   }
 
   // Public API method used by the getter and also by Blueprints
   _composing() {
     return {
-      composeCommon() {
-        this.composeWithJHipster(GENERATOR_COMMON, true);
+      async composeCommon() {
+        await this.composeWithJHipster(GENERATOR_COMMON, true);
       },
 
-      composeLanguages() {
+      async composeLanguages() {
         // We don't expose client/server to cli, composing with languages is used for test purposes.
         if (this.jhipsterConfig.enableTranslation === false) return;
-        this.composeWithJHipster(GENERATOR_LANGUAGES, true);
+        await this.composeWithJHipster(GENERATOR_LANGUAGES, true);
       },
     };
   }
 
   get composing() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._composing();
   }
 
@@ -292,7 +320,7 @@ module.exports = class JHipsterServerGenerator extends BaseBlueprintGenerator {
   }
 
   get loading() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._loading();
   }
 
@@ -302,10 +330,6 @@ module.exports = class JHipsterServerGenerator extends BaseBlueprintGenerator {
       prepareForTemplates() {
         // Application name modified, using each technology's conventions
         this.frontendAppName = this.getFrontendAppName();
-        this.camelizedBaseName = _.camelCase(this.baseName);
-        this.dasherizedBaseName = _.kebabCase(this.baseName);
-        this.lowercaseBaseName = this.baseName.toLowerCase();
-        this.humanizedBaseName = _.startCase(this.baseName);
         this.mainClass = this.getMainClassName();
         this.cacheManagerIsAvailable = [EHCACHE, CAFFEINE, HAZELCAST, INFINISPAN, MEMCACHED, REDIS].includes(this.cacheProvider);
         this.testsNeedCsrf = [OAUTH2, SESSION].includes(this.authenticationType);
@@ -343,7 +367,7 @@ module.exports = class JHipsterServerGenerator extends BaseBlueprintGenerator {
   }
 
   get preparing() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._preparing();
   }
 
@@ -353,9 +377,29 @@ module.exports = class JHipsterServerGenerator extends BaseBlueprintGenerator {
       ...super._missingPreDefault(),
 
       loadUserManagementEntities() {
+        // TODO v8 move to preparingEntities priority.
         if (!this.configOptions.sharedEntities) return;
         // Make user entity available to templates.
-        this.user = this.configOptions.sharedEntities.User;
+        const user = (this.user = this.configOptions.sharedEntities.User);
+        if (!user) return;
+
+        const { packageName, packageFolder } = this;
+        const { persistClass } = user;
+        user.entityAbsolutePackage = packageName;
+        user.entityAbsoluteFolder = packageFolder;
+        user.entityAbsoluteClass = `${packageName}.domain.${persistClass}`;
+      },
+
+      loadDomains() {
+        if (!this.configOptions.sharedEntities) return;
+        this.domains = [
+          ...new Set([
+            this.packageName,
+            ...Object.values(this.configOptions.sharedEntities)
+              .map(entity => entity.entityAbsolutePackage)
+              .filter(packageName => packageName),
+          ]),
+        ];
       },
 
       insight() {
@@ -381,7 +425,7 @@ module.exports = class JHipsterServerGenerator extends BaseBlueprintGenerator {
   }
 
   get default() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._default();
   }
 
@@ -394,7 +438,7 @@ module.exports = class JHipsterServerGenerator extends BaseBlueprintGenerator {
   }
 
   get writing() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._writing();
   }
 
@@ -402,11 +446,9 @@ module.exports = class JHipsterServerGenerator extends BaseBlueprintGenerator {
     return {
       packageJsonScripts() {
         const packageJsonConfigStorage = this.packageJson.createStorage('config').createProxy();
-        packageJsonConfigStorage.backend_port = this.serverPort;
-        packageJsonConfigStorage.packaging = process.env.JHI_WAR === '1' ? 'war' : 'jar';
-        if (process.env.JHI_PROFILE) {
-          packageJsonConfigStorage.default_environment = process.env.JHI_PROFILE.includes('dev') ? 'dev' : 'prod';
-        }
+        packageJsonConfigStorage.backend_port = this.gatewayServerPort || this.serverPort;
+        packageJsonConfigStorage.packaging = this.defaultPackaging;
+        packageJsonConfigStorage.default_environment = this.defaultEnvironment;
       },
       packageJsonDockerScripts() {
         const scriptsStorage = this.packageJson.createStorage('scripts');
@@ -482,7 +524,7 @@ module.exports = class JHipsterServerGenerator extends BaseBlueprintGenerator {
           }
         });
         scriptsStorage.set({
-          'docker:app:up': `docker-compose -f ${this.DOCKER_DIR}app.yml up -d ${this.dasherizedBaseName}-app`,
+          'docker:app:up': `docker-compose -f ${this.DOCKER_DIR}app.yml up -d`,
           'docker:others:await': dockerAwaitScripts.join(' && '),
           'predocker:others:up': dockerBuild.join(' && '),
           'docker:others:up': dockerOthersUp.join(' && '),
@@ -503,6 +545,7 @@ module.exports = class JHipsterServerGenerator extends BaseBlueprintGenerator {
         let e2ePackage = 'target/e2e';
         if (buildTool === MAVEN) {
           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',
@@ -519,6 +562,7 @@ module.exports = class JHipsterServerGenerator extends BaseBlueprintGenerator {
           const excludeWebapp = this.jhipsterConfig.skipClient ? '' : '-x webapp';
           e2ePackage = 'e2e';
           scriptsStorage.set({
+            'app:start': './gradlew',
             'backend:info': './gradlew -v',
             'backend:doc:test': `./gradlew javadoc ${excludeWebapp}`,
             'backend:nohttp:test': `./gradlew checkstyleNohttp ${excludeWebapp}`,
@@ -561,18 +605,38 @@ module.exports = class JHipsterServerGenerator extends BaseBlueprintGenerator {
               '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}`,
+          });
+        }
       },
     };
   }
 
   get postWriting() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._postWriting();
   }
 
   // Public API method used by the getter and also by Blueprints
   _end() {
     return {
+      checkLocaleValue() {
+        if (this.languages && this.languages.includes('in')) {
+          this.warning(
+            "For jdk 17 compatibility 'in' locale value should set 'java.locale.useOldISOCodes=true' environment variable. Refer to https://bugs.openjdk.java.net/browse/JDK-8267069"
+          );
+        }
+      },
+
       end() {
         this.log(chalk.green.bold('\nServer application generated successfully.\n'));
 
@@ -590,7 +654,7 @@ module.exports = class JHipsterServerGenerator extends BaseBlueprintGenerator {
   }
 
   get end() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._end();
   }
 
@@ -602,7 +666,10 @@ module.exports = class JHipsterServerGenerator extends BaseBlueprintGenerator {
     }
 
     // Generate JWT secret key if key does not already exist in config
-    if ((config.authenticationType === JWT || config.applicationType === MICROSERVICE) && config.jwtSecretKey === undefined) {
+    if (
+      (config.authenticationType === JWT || config.applicationType === MICROSERVICE || config.applicationType === GATEWAY) &&
+      config.jwtSecretKey === undefined
+    ) {
       config.jwtSecretKey = getBase64Secret.call(this, null, 64);
     }
     // Generate remember me key if key does not already exist in config

package/generators/server/needle-api/needle-server-cache.js

@@ -25,16 +25,14 @@ const SERVER_MAIN_SRC_DIR = constants.SERVER_MAIN_SRC_DIR;
 
 module.exports = class extends needleServer {
   addEntityToCache(entityClass, relationships, packageName, packageFolder, cacheProvider) {
-    this.addEntryToCache(`${packageName}.domain.${entityClass}.class.getName()`, packageFolder, cacheProvider);
+    const entityAbsoluteClass = entityClass.includes('.') ? entityClass : `${packageName}.domain.${entityClass}`;
+    const entityClassNameGetter = `${entityAbsoluteClass}.class.getName()`;
+    this.addEntryToCache(entityClassNameGetter, packageFolder, cacheProvider);
     // Add the collections linked to that entity to cache
     relationships.forEach(relationship => {
       const relationshipType = relationship.relationshipType;
       if (relationshipType === 'one-to-many' || relationshipType === 'many-to-many') {
-        this.addEntryToCache(
-          `${packageName}.domain.${entityClass}.class.getName() + ".${relationship.relationshipFieldNamePlural}"`,
-          packageFolder,
-          cacheProvider
-        );
+        this.addEntryToCache(`${entityClassNameGetter} + ".${relationship.relationshipFieldNamePlural}"`, packageFolder, cacheProvider);
       }
     });
   }

package/generators/server/templates/.mvn/wrapper/maven-wrapper.properties

@@ -1,2 +1,2 @@
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.2/apache-maven-3.8.2-bin.zip
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.3/apache-maven-3.8.3-bin.zip
 wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar

package/generators/server/templates/build.gradle.ejs

@@ -56,7 +56,7 @@ description = ""
 
 sourceCompatibility=<%= JAVA_VERSION %>
 targetCompatibility=<%= JAVA_VERSION %>
-assert System.properties["java.specification.version"] == "1.8" || "1.9" || "10" || "11" || "12" || "13" || "14" || "15" || "16"
+assert System.properties["java.specification.version"] == <%- JAVA_COMPATIBLE_VERSIONS.map(ver => `"${ver}"`).join(' || '); %>
 
 apply from: "gradle/docker.gradle"
 apply from: "gradle/sonar.gradle"
@@ -127,6 +127,14 @@ test {
     // see https://github.com/jhipster/generator-jhipster/pull/2771 and https://github.com/jhipster/generator-jhipster/pull/4484
     // ignoreFailures true
     reports.html.enabled = false
+<%_ if (reactive) { _%>
+
+    if (JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_13)) {
+        jvmArgs += [
+            "-XX:+AllowRedefinitionToAddDeleteMethods"
+        ]
+    }
+<%_ } _%>
 }
 
 modernizer {
@@ -164,6 +172,14 @@ task integrationTest(type: Test) {
     // see https://github.com/jhipster/generator-jhipster/pull/2771 and https://github.com/jhipster/generator-jhipster/pull/4484
     // ignoreFailures true
     reports.html.enabled = false
+<%_ if (reactive) { _%>
+
+    if (JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_13)) {
+        jvmArgs += [
+            "-XX:+AllowRedefinitionToAddDeleteMethods"
+        ]
+    }
+<%_ } _%>
 }
 <%_ if (cucumberTests) { _%>
 

package/generators/server/templates/gradle.properties.ejs

@@ -28,16 +28,16 @@ springBootVersion=<%= SPRING_BOOT_VERSION %>
 # https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-dependencies/<%= SPRING_BOOT_VERSION %> -->
 hibernateVersion=<%= HIBERNATE_VERSION %>
 mapstructVersion=1.4.2.Final
-archunitJunit5Version=0.21.0
+archunitJunit5Version=0.22.0
 <%_ if (enableSwaggerCodegen) { _%>
 jacksonDatabindNullableVersion=<%= JACKSON_DATABIND_NULLABLE_VERSION %>
 <%_ } _%>
 <%_ if (cacheProviderCaffeine) { _%>
-caffeineVersion=3.0.3
+caffeineVersion=3.0.4
 typesafeConfigVersion=1.4.1
 <%_ } _%>
 <%_ if (databaseTypeSql && !reactive) { _%>
-liquibaseHibernate5Version=4.4.3
+liquibaseHibernate5Version=<%= LIQUIBASE_VERSION %>
 liquibaseTaskPrefix=liquibase
 <%_ } _%>
 
@@ -47,7 +47,7 @@ commonsBeanutilsVersion=1.9.4
 
 <%_ if (reactive) { _%>
 blockhoundJunitPlatformVersion=1.0.6.RELEASE
-junitPlatformLauncherVersion=1.7.2
+junitPlatformLauncherVersion=1.8.1
 <%_ } _%>
 
 <%_ if (databaseTypeSql) { _%>
@@ -63,21 +63,21 @@ cassandraDriverVersion=4.11.3
 jibPluginVersion=<%= JIB_VERSION %>
 gitPropertiesPluginVersion=2.3.1
 <%_ if (!skipClient) { _%>
-gradleNodePluginVersion=3.1.0
+gradleNodePluginVersion=3.1.1
 <%_ } _%>
 <%_ if (databaseTypeSql && !reactive) { _%>
-liquibasePluginVersion=2.0.4
+liquibasePluginVersion=2.1.0
 <%_ } _%>
 sonarqubePluginVersion=3.3
 <%_ if (enableSwaggerCodegen) { _%>
 openapiPluginVersion=5.2.1
 <%_ } _%>
-noHttpCheckstyleVersion=0.0.9
-checkstyleVersion=9.0
-modernizerPluginVersion=1.6.0
+noHttpCheckstyleVersion=0.0.10
+checkstyleVersion=9.1
+modernizerPluginVersion=1.6.1
 <%_ if (enableGradleEnterprise) { _%>
-gradleEnterprisePluginVersion=3.6.4
-gradleCommonCustomUserDataPluginVersion=1.4.2
+gradleEnterprisePluginVersion=3.7.1
+gradleCommonCustomUserDataPluginVersion=1.5
 <%_ } _%>
 # jhipster-needle-gradle-property - JHipster will add additional properties here
 

package/generators/server/templates/npmw

@@ -4,7 +4,7 @@ basedir=`dirname "$0"`
 
 if [ -f "$basedir/mvnw" ]; then
   builddir="target/node"
-  installCommand="$basedir/mvnw frontend:install-node-and-npm@install-node-and-npm"
+  installCommand="$basedir/mvnw -Pwebapp frontend:install-node-and-npm@install-node-and-npm"
 else
   builddir=".gradle/npm"
   installCommand="$basedir/gradlew npmSetup"

package/generators/server/templates/npmw.cmd

@@ -6,7 +6,7 @@ set NPMW_DIR=%~dp0
 
 if exist "%NPMW_DIR%\mvnw.cmd" (
   set NPM_EXE=%NPMW_DIR%\target\node\npm.cmd
-  set INSTALL_NPM_COMMAND=%NPMW_DIR%\mvnw.cmd frontend:install-node-and-npm@install-node-and-npm
+  set INSTALL_NPM_COMMAND=%NPMW_DIR%\mvnw.cmd -Pwebapp frontend:install-node-and-npm@install-node-and-npm
 ) else (
   set NPM_EXE=%NPMW_DIR%\.gradle\npm\npm.cmd
   set INSTALL_NPM_COMMAND=%NPMW_DIR%\gradlew.bat npmSetup