generator-jhipster 7.1.0 → 7.4.0

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

@@ -18,28 +18,57 @@
 -%>
 
 pluginManagement {
-    <%_ if (!SPRING_BOOT_VERSION.endsWith('RELEASE')) { _%>
+<%_ if (!SPRING_BOOT_VERSION.endsWith('RELEASE')) { _%>
     repositories {
         maven { url 'https://repo.spring.io/milestone' }
         gradlePluginPortal()
     }
-    <%_ } _%>
+<%_ } _%>
     plugins {
         id 'org.springframework.boot' version "${springBootVersion}"
         id 'com.google.cloud.tools.jib' version "${jibPluginVersion}"
         id 'com.gorylenko.gradle-git-properties' version "${gitPropertiesPluginVersion}"
-        <%_ if (enableSwaggerCodegen) { _%>
+<%_ if (enableSwaggerCodegen) { _%>
         id "org.openapi.generator" version "${openapiPluginVersion}"
-        <%_ } _%>
-        <%_ if (!skipClient) { _%>
+<%_ } _%>
+<%_ if (!skipClient) { _%>
         id 'com.github.node-gradle.node' version "${gradleNodePluginVersion}"
-        <%_ } _%>
-        <%_ if (databaseType === 'sql' && !reactive) { _%>
+<%_ } _%>
+<%_ if (databaseTypeSql && !reactive) { _%>
         id 'org.liquibase.gradle' version "${liquibasePluginVersion}"
-        <%_ } _%>
+<%_ } _%>
         id 'org.sonarqube' version "${sonarqubePluginVersion}"
-        id "io.spring.nohttp" version "${noHttpPluginVersion}"
+        id "io.spring.nohttp" version "${noHttpCheckstyleVersion}"
+        id 'com.github.andygoossens.gradle-modernizer-plugin' version "${modernizerPluginVersion}"
+<%_ if (enableGradleEnterprise) { _%>
+        id "com.gradle.enterprise" version "${gradleEnterprisePluginVersion}"
+        id "com.gradle.common-custom-user-data-gradle-plugin" version "${gradleCommonCustomUserDataPluginVersion}"
+<%_ } _%>
     }
 }
 
+<%_ if (enableGradleEnterprise) { _%>
+plugins {
+    id 'com.gradle.enterprise'
+    id 'com.gradle.common-custom-user-data-gradle-plugin'
+}
+    
+gradleEnterprise {
+    server = "<%= gradleEnterpriseHost %>"
+    buildScan {
+        captureTaskInputFiles = true
+        uploadInBackground = System.getenv("CI") == null // adjust to your CI provider
+        publishAlways()
+    }
+}
+
+buildCache {
+    local { enabled = true }
+    remote(HttpBuildCache) {
+        push = true
+        enabled = false // Disabled as this might not always desired
+        url = '<%= gradleEnterpriseHost %>/cache/' // note the trailing slash!
+    }
+}
+<%_ } _%>  
 rootProject.name = "<%= dasherizedBaseName %>"

package/generators/server/templates/sql/reactive/src/main/java/package/repository/UserSqlHelper.java.ejs

@@ -0,0 +1,48 @@
+<%#
+ Copyright 2013-2021 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.
+-%>
+package <%= packageName %>.repository;
+
+import java.util.ArrayList;
+import java.util.List;
+import org.springframework.data.relational.core.sql.Column;
+import org.springframework.data.relational.core.sql.Expression;
+import org.springframework.data.relational.core.sql.Table;
+
+public class UserSqlHelper {
+    public static List<Expression> getColumns(Table table, String columnPrefix) {
+        List<Expression> columns = new ArrayList<>();
+        columns.add(Column.aliased("id", table, columnPrefix + "_id"));
+        columns.add(Column.aliased("login", table, columnPrefix + "_login"));
+  <%_ if (!authenticationTypeOauth2) { _%>
+        columns.add(Column.aliased("password_hash", table, columnPrefix + "_password"));
+  <%_ } _%>
+        columns.add(Column.aliased("first_name", table, columnPrefix + "_first_name"));
+        columns.add(Column.aliased("last_name", table, columnPrefix + "_last_name"));
+        columns.add(Column.aliased("email", table, columnPrefix + "_email"));
+        columns.add(Column.aliased("activated", table, columnPrefix + "_activated"));
+        columns.add(Column.aliased("lang_key", table, columnPrefix + "_lang_key"));
+        columns.add(Column.aliased("image_url", table, columnPrefix + "_image_url"));
+  <%_ if (!authenticationTypeOauth2) { _%>
+        columns.add(Column.aliased("activation_key", table, columnPrefix + "_activation_key"));
+        columns.add(Column.aliased("reset_key", table, columnPrefix + "_reset_key"));
+        columns.add(Column.aliased("reset_date", table, columnPrefix + "_reset_date"));
+  <%_ } _%>
+        return columns;
+    }
+}

package/generators/server/templates/src/main/docker/app.yml.ejs

@@ -25,81 +25,85 @@ services:
       - _JAVA_OPTIONS=-Xmx512m -Xms256m
       - SPRING_PROFILES_ACTIVE=prod,api-docs
       - MANAGEMENT_METRICS_EXPORT_PROMETHEUS_ENABLED=true
-      <%_ if (serviceDiscoveryType === 'consul') { _%>
+<%_ if (serviceDiscoveryConsul) { _%>
       - SPRING_CLOUD_CONSUL_HOST=consul
       - SPRING_CLOUD_CONSUL_PORT=8500
-      <%_ } _%>
-      <%_ if (serviceDiscoveryType === 'eureka') { _%>
+<%_ } _%>
+<%_ if (serviceDiscoveryEureka) { _%>
       - EUREKA_CLIENT_SERVICE_URL_DEFAULTZONE=http://admin:$${jhipster.registry.password}@jhipster-registry:8761/eureka
       - SPRING_CLOUD_CONFIG_URI=http://admin:$${jhipster.registry.password}@jhipster-registry:8761/config
-      <%_ } _%>
-      <%_ if (databaseType === 'sql') {
-        const databaseName = ['mysql', 'mariadb'].includes(prodDatabaseType) ? baseName.toLowerCase() : baseName;
-      _%>
-        <%_ if (reactive) { _%>
+<%_ } _%>
+<%_ if (databaseTypeSql) {
+const databaseName = prodDatabaseTypeMysql || prodDatabaseTypeMariadb ? baseName.toLowerCase() : baseName;
+_%>
+  <%_ if (reactive) { _%>
       - SPRING_R2DBC_URL=<%- getR2DBCUrl(prodDatabaseType, { hostname: `${baseName.toLowerCase()}-${prodDatabaseType}`, databaseName: databaseName }) %>
-        <%_ } else { _%>
+  <%_ } else { _%>
       - SPRING_DATASOURCE_URL=<%- getJDBCUrl(prodDatabaseType, { hostname: `${baseName.toLowerCase()}-${prodDatabaseType}`, databaseName: databaseName }) %>
-        <%_ } _%>
+  <%_ } _%>
       - SPRING_LIQUIBASE_URL=<%- getJDBCUrl(prodDatabaseType, { hostname: `${baseName.toLowerCase()}-${prodDatabaseType}`, databaseName: databaseName }) %>
-      <%_ } _%>
-      <%_ if (prodDatabaseType === 'mongodb') { _%>
+<%_ } _%>
+<%_ if (databaseTypeMongodb) { _%>
       - SPRING_DATA_MONGODB_URI=mongodb://<%= baseName.toLowerCase() %>-mongodb:27017<% if (reactive) { %>/?waitQueueMultiple=1000<% } %>
       - SPRING_DATA_MONGODB_DATABASE=<%= baseName %>
-      <%_ } _%>
-      <%_ if (prodDatabaseType === 'neo4j') { _%>
+<%_ } _%>
+<%_ if (databaseTypeNeo4j) { _%>
       - SPRING_NEO4J_URI=bolt://<%= baseName.toLowerCase() %>-neo4j:7687
-      <%_ } _%>
-      <%_ if (prodDatabaseType === 'couchbase') { _%>
-      - SPRING_COUCHBASE_BOOTSTRAP_HOSTS=<%= baseName.toLowerCase() %>-couchbase
-      - SPRING_COUCHBASE_BUCKET_NAME=<%= baseName %>
-      <%_ } _%>
-      <%_ if (cacheProvider === 'memcached') { _%>
+<%_ } _%>
+<%_ if (databaseTypeCouchbase) { _%>
+      - SPRING_COUCHBASE_CONNECTION_STRING=<%= baseName.toLowerCase() %>-couchbase
+      - JHIPSTER_DATABASE_COUCHBASE_BUCKET_NAME=<%= baseName %>
+<%_ } _%>
+<%_ if (cacheProviderMemcached) { _%>
       - JHIPSTER_CACHE_MEMCACHED_SERVERS=<%= baseName.toLowerCase() %>-memcached:11211
-      <%_ } _%>
-      <%_ if (cacheProvider === 'redis') { _%>
+<%_ } _%>
+<%_ if (cacheProviderRedis) { _%>
       - JHIPSTER_CACHE_REDIS_SERVER=redis://<%= baseName.toLowerCase() %>-redis:6379
       - JHIPSTER_CACHE_REDIS_CLUSTER=false
       # - JHIPSTER_CACHE_REDIS_SERVER=redis://<%= baseName.toLowerCase() %>-redis:6379
       # - JHIPSTER_CACHE_REDIS_CLUSTER=true
-      <%_ } _%>
-      <%_ if (authenticationType === 'oauth2') { _%>
+<%_ } _%>
+<%_ if (authenticationTypeOauth2) { _%>
       - SPRING_SECURITY_OAUTH2_CLIENT_PROVIDER_OIDC_ISSUER_URI=http://keycloak:9080/auth/realms/jhipster
-      <%_ if (applicationType === 'gateway' || applicationType === 'monolith') { _%>
+  <%_ if (applicationTypeGateway || applicationTypeMonolith) { _%>
       - SPRING_SECURITY_OAUTH2_CLIENT_REGISTRATION_OIDC_CLIENT_ID=web_app
       - SPRING_SECURITY_OAUTH2_CLIENT_REGISTRATION_OIDC_CLIENT_SECRET=web_app
-      <%_ } _%>
-      <%_ if (applicationType === 'microservice') { _%>
+  <%_ } _%>
+  <%_ if (applicationTypeMicroservice) { _%>
       - SPRING_SECURITY_OAUTH2_CLIENT_REGISTRATION_OIDC_CLIENT_ID=internal
       - SPRING_SECURITY_OAUTH2_CLIENT_REGISTRATION_OIDC_CLIENT_SECRET=internal
-      <%_ } _%>
-      <%_ } _%>
-      <%_ if (prodDatabaseType === 'cassandra') { _%>
+  <%_ } _%>
+<%_ } _%>
+<%_ if (databaseTypeCassandra) { _%>
       - SPRING_DATA_CASSANDRA_CONTACTPOINTS=<%= baseName.toLowerCase() %>-cassandra
       - JHIPSTER_SLEEP=30 # gives time for other services to boot before the application
-      <%_ } else if (prodDatabaseType === 'mariadb') { _%>
+<%_ } else if (prodDatabaseTypeMariadb) { _%>
       - JHIPSTER_SLEEP=120 # gives time for mariadb server to start
-      <%_ } else if (prodDatabaseType === 'mssql') { _%>
+<%_ } else if (prodDatabaseTypeMssql) { _%>
       - JHIPSTER_SLEEP=60 # gives time for mssql server to start
-      <%_ } else { _%>
+<%_ } else { _%>
       - JHIPSTER_SLEEP=30 # gives time for other services to boot before the application
-      <%_ } _%>
-      <%_ if (searchEngine === 'elasticsearch') { _%>
+<%_ } _%>
+<%_ if (searchEngineElasticsearch) { _%>
+  <%_ if (!reactive) { _%>
       - SPRING_ELASTICSEARCH_REST_URIS=http://<%= baseName.toLowerCase() %>-elasticsearch:9200
-      <%_ } _%>
-      <%_ if (messageBroker === 'kafka') { _%>
+  <%_ } else { _%>
+      - SPRING_DATA_ELASTICSEARCH_CLIENT_REACTIVE_ENDPOINTS=<%= baseName.toLowerCase() %>-elasticsearch:9200
+  <%_ } _%>
+<%_ } _%>
+<%_ if (messageBrokerKafka) { _%>
       - KAFKA_BOOTSTRAPSERVERS=kafka:9092
-      <%_ } _%>
-      <%_ if (cacheProvider === 'infinispan') { _%>
+<%_ } _%>
+<%_ if (cacheProviderInfinispan) { _%>
       - JAVA_OPTS=-Djgroups.tcp.address=NON_LOOPBACK -Djava.net.preferIPv4Stack=true
-      <%_ } _%>
-    <%_ if (applicationType === 'monolith' || applicationType === 'gateway') { _%>
+<%_ } _%>
+<%_ if (applicationTypeMonolith || applicationTypeGateway) { _%>
     # If you want to expose these ports outside your dev PC,
     # remove the "127.0.0.1:" prefix
     ports:
       - 127.0.0.1:<%= serverPort %>:<%= serverPort %>
-    <%_ } _%>
-  <%_ if (prodDatabaseType === 'mysql') { _%>
+<%_ } _%>
+<%_ if (prodDatabaseTypeMysql) { _%>
   <%= baseName.toLowerCase() %>-mysql:
     image: <%= DOCKER_MYSQL %>
     # volumes:
@@ -112,8 +116,8 @@ services:
     ports:
       - 127.0.0.1:3306:3306
     command: mysqld --lower_case_table_names=1 --skip-ssl --character_set_server=utf8mb4 --explicit_defaults_for_timestamp
-  <%_ } _%>
-  <%_ if (prodDatabaseType === 'mariadb') { _%>
+<%_ } _%>
+<%_ if (prodDatabaseTypeMariadb) { _%>
   <%= baseName.toLowerCase() %>-mariadb:
     image: <%= DOCKER_MARIADB %>
     # volumes:
@@ -126,8 +130,8 @@ services:
     ports:
       - 127.0.0.1:3306:3306
     command: mysqld --lower_case_table_names=1 --skip-ssl --character_set_server=utf8mb4 --explicit_defaults_for_timestamp
-  <%_ } _%>
-  <%_ if (prodDatabaseType === 'postgresql') { _%>
+<%_ } _%>
+<%_ if (prodDatabaseTypePostgres) { _%>
   <%= baseName.toLowerCase() %>-postgresql:
     image: <%= DOCKER_POSTGRESQL %>
     # volumes:
@@ -140,8 +144,8 @@ services:
     # remove the "127.0.0.1:" prefix
     ports:
       - 127.0.0.1:5432:5432
-  <%_ } _%>
-  <%_ if (prodDatabaseType === 'mongodb') { _%>
+<%_ } _%>
+<%_ if (databaseTypeMongodb) { _%>
   <%= baseName.toLowerCase() %>-mongodb:
     image: <%= DOCKER_MONGODB %>
     # If you want to expose these ports outside your dev PC,
@@ -150,8 +154,8 @@ services:
       - 127.0.0.1:27017:27017
     # volumes:
     #   - ~/volumes/jhipster/<%= baseName %>/mongodb/:/data/db/
-  <%_ } _%>
-  <%_ if (prodDatabaseType === 'couchbase') { _%>
+<%_ } _%>
+<%_ if (databaseTypeCouchbase) { _%>
   <%= baseName.toLowerCase() %>-couchbase:
     build:
       context: .
@@ -168,8 +172,8 @@ services:
       - BUCKET=<%= baseName %>
     # volumes:
     #   - ~/volumes/jhipster/<%= baseName.toLowerCase() %>/couchbase/:/opt/couchbase/var
-  <%_ } _%>
-  <%_ if (prodDatabaseType === 'mssql') { _%>
+<%_ } _%>
+<%_ if (prodDatabaseTypeMssql) { _%>
   <%= baseName.toLowerCase() %>-mssql:
     image: <%= DOCKER_MSSQL %>
     # volumes are not supported on macOS
@@ -186,8 +190,8 @@ services:
     ports:
       - 127.0.0.1:1433:1433
     command: /bin/bash -c '/opt/mssql/bin/sqlservr & echo "wait $$MSSQL_SLEEP sec for DB to start "; sleep $$MSSQL_SLEEP; /opt/mssql-tools/bin/sqlcmd -U sa -P $$SA_PASSWORD -d tempdb -q "EXIT(CREATE DATABASE $$MSSQL_DATABASE)"; wait;'
-  <%_ } _%>
-  <%_ if (prodDatabaseType === 'neo4j') { _%>
+<%_ } _%>
+<%_ if (databaseTypeNeo4j) { _%>
   <%= baseName.toLowerCase() %>-neo4j:
     image: <%= DOCKER_NEO4J %>
     # volumes:
@@ -199,8 +203,8 @@ services:
     ports:
       - "127.0.0.1:7474:7474"
       - "127.0.0.1:7687:7687"
-  <%_ } _%>
-  <%_ if (prodDatabaseType === 'cassandra') { _%>
+<%_ } _%>
+<%_ if (databaseTypeCassandra) { _%>
   <%= baseName.toLowerCase() %>-cassandra:
     image: <%= DOCKER_CASSANDRA %>
     # volumes:
@@ -228,24 +232,24 @@ services:
       dockerfile: cassandra/Cassandra-Migration.Dockerfile
     volumes:
       - ../resources/config/cql:/cql:ro
-  <%_ } _%>
-  <%_ if (cacheProvider === 'memcached') { _%>
+<%_ } _%>
+<%_ if (cacheProviderMemcached) { _%>
   <%= baseName.toLowerCase() %>-memcached:
     image: <%= DOCKER_MEMCACHED %>
     # If you want to expose these ports outside your dev PC,
     # remove the "127.0.0.1:" prefix
     ports:
       - 127.0.0.1:11211:11211
-  <%_ } _%>
-  <%_ if (cacheProvider === 'redis') { _%>
+<%_ } _%>
+<%_ if (cacheProviderRedis) { _%>
   <%= baseName.toLowerCase() %>-redis:
     image: <%= DOCKER_REDIS %>
     # If you want to expose these ports outside your dev PC,
     # remove the "127.0.0.1:" prefix
     ports:
       - 127.0.0.1:6379:6379
-  <%_ } _%>
-  <%_ if (searchEngine === 'elasticsearch') { _%>
+<%_ } _%>
+<%_ if (searchEngineElasticsearch) { _%>
   <%= baseName.toLowerCase() %>-elasticsearch:
     image: <%= DOCKER_ELASTICSEARCH %>
     # volumes:
@@ -258,8 +262,8 @@ services:
     environment:
       - "ES_JAVA_OPTS=-Xms1024m -Xmx1024m"
       - "discovery.type=single-node"
-  <%_ } _%>
-  <%_ if (messageBroker === 'kafka') { _%>
+<%_ } _%>
+<%_ if (messageBrokerKafka) { _%>
   kafka:
     image: <%= DOCKER_KAFKA %>
     # If you want to expose these ports outside your dev PC,
@@ -279,8 +283,8 @@ services:
     environment:
       ZOOKEEPER_CLIENT_PORT: 2181
       ZOOKEEPER_TICK_TIME: 2000
-  <%_ } _%>
-  <%_ if (serviceDiscoveryType === 'eureka') { _%>
+<%_ } _%>
+<%_ if (serviceDiscoveryEureka) { _%>
   jhipster-registry:
     image: <%= DOCKER_JHIPSTER_REGISTRY %>
     volumes:
@@ -290,8 +294,9 @@ services:
     # When run with the "prod" Spring profile, it will read the configuration from a Git repository
     # See https://www.jhipster.tech/jhipster-registry/#spring-cloud-config
     environment:
+      - JHIPSTER_SLEEP=20
       - _JAVA_OPTIONS=-Xmx512m -Xms256m
-      - SPRING_PROFILES_ACTIVE=dev,api-docs<% if (authenticationType === 'oauth2') { %>,oauth2<% } %>
+      - SPRING_PROFILES_ACTIVE=dev,api-docs<% if (authenticationTypeOauth2) { %>,oauth2<% } %>
       - SPRING_SECURITY_USER_PASSWORD=admin
       - JHIPSTER_REGISTRY_PASSWORD=admin
       - SPRING_CLOUD_CONFIG_SERVER_COMPOSITE_0_TYPE=native
@@ -299,18 +304,18 @@ services:
       # - SPRING_CLOUD_CONFIG_SERVER_COMPOSITE_0_TYPE=git
       # - SPRING_CLOUD_CONFIG_SERVER_COMPOSITE_0_URI=https://github.com/jhipster/jhipster-registry/
       # - SPRING_CLOUD_CONFIG_SERVER_COMPOSITE_0_SEARCH_PATHS=central-config
-      <%_ if (authenticationType === 'oauth2') { _%>
+  <%_ if (authenticationTypeOauth2) { _%>
       # For keycloak to work, you need to add '127.0.0.1 keycloak' to your hosts file
       - SPRING_SECURITY_OAUTH2_CLIENT_PROVIDER_OIDC_ISSUER_URI=http://keycloak:9080/auth/realms/jhipster
       - SPRING_SECURITY_OAUTH2_CLIENT_REGISTRATION_OIDC_CLIENT_ID=jhipster-registry
       - SPRING_SECURITY_OAUTH2_CLIENT_REGISTRATION_OIDC_CLIENT_SECRET=jhipster-registry
-      <%_ } _%>
+  <%_ } _%>
     # If you want to expose these ports outside your dev PC,
     # remove the "127.0.0.1:" prefix
     ports:
       - 127.0.0.1:8761:8761
-  <%_ } _%>
-  <%_ if (serviceDiscoveryType === 'consul') { _%>
+<%_ } _%>
+<%_ if (serviceDiscoveryConsul) { _%>
   consul:
     image: <%= DOCKER_CONSUL %>
     # If you want to expose these ports outside your dev PC,
@@ -333,8 +338,8 @@ services:
       # as configured in central-server-config/git2consul.json
       # Also set SPRING_CLOUD_CONSUL_CONFIG_FORMAT=files on your apps
       # - CONFIG_MODE=git
-  <%_ } _%>
-  <%_ if (authenticationType === 'oauth2' && applicationType !== 'microservice') { _%>
+<%_ } _%>
+<%_ if (authenticationTypeOauth2 && !applicationTypeMicroservice) { _%>
   keycloak:
     image: <%= DOCKER_KEYCLOAK %>
     command: ["-b", "0.0.0.0", "-Dkeycloak.migration.action=import", "-Dkeycloak.migration.provider=dir", "-Dkeycloak.migration.dir=/opt/jboss/keycloak/realm-config", "-Dkeycloak.migration.strategy=OVERWRITE_EXISTING", "-Djboss.socket.binding.port-offset=1000", "-Dkeycloak.profile.feature.upload_scripts=enabled"]
@@ -350,4 +355,4 @@ services:
       - 127.0.0.1:9080:9080
       - 127.0.0.1:9443:9443
       - 127.0.0.1:10990:10990
-  <%_ } _%>
+<%_ } _%>

package/generators/server/templates/src/main/docker/config/README.md.ejs

@@ -18,14 +18,14 @@
 -%>
 # Central configuration sources details
 
-<%_ if (serviceDiscoveryType === 'eureka') { _%>
+<%_ if (serviceDiscoveryEureka) { _%>
 The JHipster-Registry will use the following directories as its configuration source :
 - localhost-config : when running the registry in docker with the jhipster-registry.yml docker-compose file
 - docker-config : when running the registry and the app both in docker with the app.yml docker-compose file
 
 For more info, refer to https://www.jhipster.tech/jhipster-registry/#spring-cloud-config
 <%_ } _%>
-<%_ if (serviceDiscoveryType === 'consul') { _%>
+<%_ if (serviceDiscoveryConsul) { _%>
 When running the consul.yml or app.yml docker-compose files, files located in `central-server-config/`
 will get automatically loaded in Consul's K/V store. Adding or editing files will trigger a reloading.