generator-jhipster 7.7.0 → 7.9.0

package/generators/server/index.js

@@ -29,18 +29,8 @@ const constants = require('../generator-constants');
 const statistics = require('../statistics');
 const { defaultConfig } = require('../generator-defaults');
 const { JWT, OAUTH2, SESSION } = require('../../jdl/jhipster/authentication-types');
-const {
-  CASSANDRA,
-  COUCHBASE,
-  MARIADB,
-  MSSQL,
-  MYSQL,
-  ORACLE,
-  POSTGRESQL,
-  SQL,
-  MONGODB,
-  NEO4J,
-} = require('../../jdl/jhipster/database-types');
+
+const { CASSANDRA, COUCHBASE, ORACLE, MONGODB, NEO4J } = require('../../jdl/jhipster/database-types');
 const { CAFFEINE, EHCACHE, HAZELCAST, INFINISPAN, MEMCACHED, REDIS } = require('../../jdl/jhipster/cache-types');
 const { GRADLE, MAVEN } = require('../../jdl/jhipster/build-tool-types');
 const { ELASTICSEARCH } = require('../../jdl/jhipster/search-engine-types');
@@ -179,8 +169,12 @@ module.exports = class JHipsterServerGenerator extends BaseBlueprintGenerator {
         this.DOCKER_REDIS = constants.DOCKER_REDIS;
         this.DOCKER_CASSANDRA = constants.DOCKER_CASSANDRA;
         this.DOCKER_ELASTICSEARCH = constants.DOCKER_ELASTICSEARCH;
+        this.DOCKER_ELASTICSEARCH_CONTAINER = constants.DOCKER_ELASTICSEARCH_CONTAINER;
+        this.ELASTICSEARCH_VERSION = constants.ELASTICSEARCH_VERSION;
         this.DOCKER_KEYCLOAK = constants.DOCKER_KEYCLOAK;
+        this.DOCKER_KEYCLOAK_VERSION = constants.DOCKER_KEYCLOAK_VERSION;
         this.DOCKER_KAFKA = constants.DOCKER_KAFKA;
+        this.KAFKA_VERSION = constants.KAFKA_VERSION;
         this.DOCKER_ZOOKEEPER = constants.DOCKER_ZOOKEEPER;
         this.DOCKER_SONAR = constants.DOCKER_SONAR;
         this.DOCKER_CONSUL = constants.DOCKER_CONSUL;
@@ -193,22 +187,22 @@ module.exports = class JHipsterServerGenerator extends BaseBlueprintGenerator {
 
         this.JAVA_VERSION = constants.JAVA_VERSION;
         this.JAVA_COMPATIBLE_VERSIONS = constants.JAVA_COMPATIBLE_VERSIONS;
+        this.GRADLE_VERSION = constants.GRADLE_VERSION;
 
         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 = this.jhiBomVersion || constants.JHIPSTER_DEPENDENCIES_VERSION;
         this.SPRING_BOOT_VERSION = constants.SPRING_BOOT_VERSION;
         this.LIQUIBASE_VERSION = constants.LIQUIBASE_VERSION;
+        // TODO v8: Remove this constant
         this.LIQUIBASE_DTD_VERSION = constants.LIQUIBASE_DTD_VERSION;
         this.HIBERNATE_VERSION = constants.HIBERNATE_VERSION;
-        this.JACOCO_VERSION = constants.JACOCO_VERSION;
-
-        this.KAFKA_VERSION = constants.KAFKA_VERSION;
-
         this.JACKSON_DATABIND_NULLABLE_VERSION = constants.JACKSON_DATABIND_NULLABLE_VERSION;
+        this.JACOCO_VERSION = constants.JACOCO_VERSION;
+        this.JIB_VERSION = constants.JIB_VERSION;
+        this.H2_VERSION = constants.H2_VERSION;
+        this.H2_R2DBC_VERSION = constants.H2_R2DBC_VERSION;
 
         this.ANGULAR = constants.SUPPORTED_CLIENT_FRAMEWORKS.ANGULAR;
         this.VUE = constants.SUPPORTED_CLIENT_FRAMEWORKS.VUE;
@@ -358,33 +352,6 @@ module.exports = class JHipsterServerGenerator extends BaseBlueprintGenerator {
         this.testResourceDir = SERVER_TEST_RES_DIR;
         this.srcMainDir = MAIN_DIR;
         this.srcTestDir = TEST_DIR;
-
-        if (this.jhipsterConfig.databaseType === SQL) {
-          // sql
-          let dbContainer;
-          switch (this.jhipsterConfig.prodDatabaseType) {
-            case MYSQL:
-              dbContainer = this.DOCKER_MYSQL;
-              break;
-            case MARIADB:
-              dbContainer = this.DOCKER_MARIADB;
-              break;
-            case POSTGRESQL:
-              dbContainer = this.DOCKER_POSTGRESQL;
-              break;
-            case MSSQL:
-              dbContainer = this.DOCKER_MSSQL;
-              break;
-            case ORACLE:
-            default:
-              dbContainer = null;
-          }
-          if (dbContainer != null && dbContainer.includes(':')) {
-            this.containerVersion = dbContainer.split(':')[1];
-          } else {
-            this.containerVersion = 'latest';
-          }
-        }
       },
     };
   }
@@ -403,14 +370,7 @@ module.exports = class JHipsterServerGenerator extends BaseBlueprintGenerator {
         // TODO v8 move to preparingEntities priority.
         if (!this.configOptions.sharedEntities) return;
         // Make user entity available to templates.
-        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}`;
+        this.user = this.configOptions.sharedEntities.User;
       },
 
       loadDomains() {
@@ -455,28 +415,6 @@ module.exports = class JHipsterServerGenerator extends BaseBlueprintGenerator {
   /** @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(),
     };
@@ -498,16 +436,21 @@ module.exports = class JHipsterServerGenerator extends BaseBlueprintGenerator {
       },
       packageJsonDockerScripts() {
         const scriptsStorage = this.packageJson.createStorage('scripts');
-        const databaseType = this.jhipsterConfig.databaseType;
+        const { databaseType, prodDatabaseType } = this.jhipsterConfig;
+        const { databaseTypeSql, prodDatabaseTypeMysql, authenticationTypeOauth2, applicationTypeMicroservice } = this;
         const dockerAwaitScripts = [];
-        if (databaseType === SQL) {
-          const prodDatabaseType = this.jhipsterConfig.prodDatabaseType;
+        if (databaseTypeSql) {
+          if (prodDatabaseTypeMysql) {
+            scriptsStorage.set({
+              'docker:db:await': `echo "Waiting for MySQL to start" && wait-on -t ${WAIT_TIMEOUT} tcp:3306 && sleep 20 && echo "MySQL started"`,
+            });
+          }
           if (prodDatabaseType === NO_DATABASE || prodDatabaseType === ORACLE) {
             scriptsStorage.set('docker:db:up', `echo "Docker for db ${prodDatabaseType} not configured for application ${this.baseName}"`);
           } else {
             scriptsStorage.set({
               'docker:db:up': `docker-compose -f src/main/docker/${prodDatabaseType}.yml up -d`,
-              'docker:db:down': `docker-compose -f src/main/docker/${prodDatabaseType}.yml down -v --remove-orphans`,
+              'docker:db:down': `docker-compose -f src/main/docker/${prodDatabaseType}.yml down -v`,
             });
           }
         } else {
@@ -526,12 +469,12 @@ module.exports = class JHipsterServerGenerator extends BaseBlueprintGenerator {
             scriptsStorage.set({
               'docker:db:build': `docker-compose -f ${dockerFile} build`,
               'docker:db:up': `docker-compose -f ${dockerFile} up -d`,
-              'docker:db:down': `docker-compose -f ${dockerFile} down -v --remove-orphans`,
+              'docker:db:down': `docker-compose -f ${dockerFile} down -v`,
             });
           } else if (this.fs.exists(this.destinationPath(dockerFile))) {
             scriptsStorage.set({
               'docker:db:up': `docker-compose -f ${dockerFile} up -d`,
-              'docker:db:down': `docker-compose -f ${dockerFile} down -v --remove-orphans`,
+              'docker:db:down': `docker-compose -f ${dockerFile} down -v`,
             });
           } else {
             scriptsStorage.set('docker:db:up', `echo "Docker for db ${databaseType} not configured for application ${this.baseName}"`);
@@ -553,18 +496,25 @@ module.exports = class JHipsterServerGenerator extends BaseBlueprintGenerator {
               scriptsStorage.set(`docker:${dockerConfig}:build`, `docker-compose -f ${dockerFile} build`);
               dockerBuild.push(`npm run docker:${dockerConfig}:build`);
             } else if (dockerConfig === 'jhipster-registry') {
-              dockerAwaitScripts.push(
+              if (authenticationTypeOauth2 && !applicationTypeMicroservice) {
+                dockerOthersUp.push('npm run docker:keycloak:await');
+              }
+              scriptsStorage.set(
+                'docker:jhipster-registry:await',
                 `echo "Waiting for jhipster-registry to start" && wait-on -t ${WAIT_TIMEOUT} http-get://localhost:8761/management/health && echo "jhipster-registry started"`
               );
+              dockerAwaitScripts.push('npm run docker:jhipster-registry:await');
             } else if (dockerConfig === 'keycloak') {
-              dockerAwaitScripts.push(
-                `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"`
+              scriptsStorage.set(
+                'docker:keycloak:await',
+                `echo "Waiting for keycloak to start" && wait-on -t ${WAIT_TIMEOUT} http-get://localhost:9080/realms/jhipster && echo "keycloak started" || echo "keycloak not running, make sure oauth2 server is running"`
               );
+              dockerAwaitScripts.push('npm run docker:keycloak:await');
             }
 
             scriptsStorage.set(`docker:${dockerConfig}:up`, `docker-compose -f ${dockerFile} up -d`);
             dockerOthersUp.push(`npm run docker:${dockerConfig}:up`);
-            scriptsStorage.set(`docker:${dockerConfig}:down`, `docker-compose -f ${dockerFile} down -v --remove-orphans`);
+            scriptsStorage.set(`docker:${dockerConfig}:down`, `docker-compose -f ${dockerFile} down -v`);
             dockerOthersDown.push(`npm run docker:${dockerConfig}:down`);
           }
         });
@@ -616,6 +566,7 @@ module.exports = class JHipsterServerGenerator extends BaseBlueprintGenerator {
             'java:jar': './gradlew bootJar -x test -x integrationTest',
             'java:war': './gradlew bootWar -Pwar -x test -x integrationTest',
             'java:docker': './gradlew bootJar -Pprod jibDockerBuild',
+            'java:docker:arm64': 'npm run java:docker -- -PjibArchitecture=arm64',
             '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',
@@ -641,8 +592,9 @@ module.exports = class JHipsterServerGenerator extends BaseBlueprintGenerator {
         const scriptsStorage = this.packageJson.createStorage('scripts');
         const buildCmd = this.jhipsterConfig.buildTool === GRADLE ? 'gradlew' : 'mvnw';
         if (scriptsStorage.get('e2e')) {
+          const applicationWaitTimeout = WAIT_TIMEOUT * (this.applicationTypeGateway ? 2 : 1);
           scriptsStorage.set({
-            '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"`,
+            'ci:server:await': `echo "Waiting for server at port $npm_package_config_backend_port to start" && wait-on -t ${applicationWaitTimeout} 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"`,

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

@@ -20,6 +20,7 @@ const chalk = require('chalk');
 const needleServer = require('./needle-server');
 
 const buildGradlePath = 'build.gradle';
+const gradleSettingsPath = 'settings.gradle';
 
 module.exports = class extends needleServer {
   addProperty(name, value) {
@@ -92,4 +93,41 @@ module.exports = class extends needleServer {
 
     this.addBlockContentToFile(rewriteFileModel, errorMessage);
   }
+
+  addPluginToPluginManagement(id, version) {
+    const errorMessage = `${chalk.yellow('Reference to ')}id ${id} version ${version}${chalk.yellow(' not added.')}`;
+    const rewriteFileModel = this.generateFileModel(
+      gradleSettingsPath,
+      'jhipster-needle-gradle-plugin-management-plugins',
+      `id '${id}' version '${version}'`
+    );
+
+    this.addBlockContentToFile(rewriteFileModel, errorMessage);
+  }
+
+  addPluginManagementRepository(url, username, password) {
+    const errorMessage = chalk.yellow('Reference to ') + url + chalk.yellow(' not added.');
+    let repository = 'maven {\n';
+    if (url) {
+      repository += `        url "${url}"\n`;
+    }
+    if (username || password) {
+      repository += '        credentials {\n';
+      if (username) {
+        repository += `            username = "${username}"\n`;
+      }
+      if (password) {
+        repository += `            password = "${password}"\n`;
+      }
+      repository += '        }\n';
+    }
+    repository += '    }';
+
+    const rewriteFileModel = this.generateFileModel(
+      gradleSettingsPath,
+      'jhipster-needle-gradle-plugin-management-repositories',
+      repository
+    );
+    this.addBlockContentToFile(rewriteFileModel, errorMessage);
+  }
 };

package/generators/server/needles.cjs

@@ -0,0 +1,79 @@
+/**
+ * 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.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+const { createBaseNeedle } = require('../../lib/support/needles.cjs');
+
+/**
+ * @typedef {Object} ApplicationPropertiesNeedles - creates a new type named 'SpecialType'
+ * @property {string} [property] - property declaration
+ * @property {string} [propertyGetter] - property getter
+ * @property {string} [propertyClass] - property class
+ */
+
+/**
+ * Insert content into ApplicationProperties class
+ * @example
+ * insertContentIntoApplicationProperties(generator, {
+ *   property: 'private final bar = new Bar();',
+ *   proppertyGetter: `
+ * public getBar() {
+ *     return bar;
+ * }`,
+ *   propertyClass: `
+ * public static class Async {
+ *     private String foo = "default";
+ * }`,
+ * })
+ * @example
+ * generator.editFile(
+ *   'ApplicationProperties.java',
+ *   insertContentIntoApplicationProperties({
+ *     property: 'private final bar = new Bar();',
+ *     proppertyGetter: `
+ * public getBar() {
+ *     return bar;
+ * }`,
+ *     propertyClass: `
+ * public static class Async {
+ *     private String foo = "default";
+ * }`,
+ *   });
+ * );
+ * @param {import('../generator-base.js')} [generator]
+ * @param {ApplicationPropertiesNeedles} needles
+ * @returns {import('../../generators/generator-base.js').CascatedEditFileCallback | import('../../generators/generator-base.js').EditFileCallback}
+ */
+const insertContentIntoApplicationProperties = (generator, needles) => {
+  if (!needles) {
+    needles = generator;
+    generator = null;
+  }
+
+  return createBaseNeedle(
+    {
+      generator,
+      filePath: generator ? `${generator.SERVER_MAIN_SRC_DIR}${generator.javaDir}config/ApplicationProperties.java` : undefined,
+      needlesPrefix: 'application-properties',
+    },
+    needles
+  );
+};
+
+module.exports = {
+  insertContentIntoApplicationProperties,
+};

package/generators/server/templates/.mvn/jvm.config

@@ -0,0 +1 @@
+

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

@@ -1,2 +1,18 @@
-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
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.6/apache-maven-3.8.6-bin.zip
+wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.1/maven-wrapper-3.1.1.jar

package/generators/server/templates/.npmrc.ejs

@@ -0,0 +1 @@
+script-shell=bash