generator-jhipster 8.3.0 → 8.5.0

package/dist/generators/spring-boot/generator.js

@@ -30,6 +30,7 @@ import { createNeedleCallback, mutateData } from '../base/support/index.js';
 import { APPLICATION_TYPE_MICROSERVICE, applicationTypes, cacheTypes, databaseTypes, fieldTypes, messageBrokerTypes, searchEngineTypes, testFrameworkTypes, websocketTypes, } from '../../jdl/index.js';
 import { writeFiles as writeEntityFiles } from './entity-files.js';
 import { getPomVersionProperties, parseMavenPom } from '../maven/support/index.js';
+import { askForOptionalItems, askForServerSideOpts, askForServerTestOpts } from './prompts.js';
 const { CAFFEINE, EHCACHE, HAZELCAST, INFINISPAN, MEMCACHED, REDIS, NO: NO_CACHE } = cacheTypes;
 const { NO: NO_WEBSOCKET, SPRING_WEBSOCKET } = websocketTypes;
 const { CASSANDRA, COUCHBASE, MONGODB, NEO4J, SQL } = databaseTypes;
@@ -67,6 +68,9 @@ export default class SpringBootGenerator extends BaseApplicationGenerator {
                     return;
                 await this.promptCurrentJHipsterCommand();
             },
+            askForServerTestOpts,
+            askForServerSideOpts,
+            askForOptionalItems,
         });
     }
     get [BaseApplicationGenerator.PROMPTING]() {
@@ -74,6 +78,9 @@ export default class SpringBootGenerator extends BaseApplicationGenerator {
     }
     get configuring() {
         return this.asConfiguringTaskGroup({
+            async configureCommand() {
+                await this.configureCurrentJHipsterCommandConfig();
+            },
             checks() {
                 const config = this.jhipsterConfigWithDefaults;
                 if (config.enableHibernateCache && [NO_CACHE, MEMCACHED].includes(config.cacheProvider)) {
@@ -106,7 +113,7 @@ export default class SpringBootGenerator extends BaseApplicationGenerator {
     get composing() {
         return this.asComposingTaskGroup({
             async composing() {
-                const { applicationType, databaseType, messageBroker, searchEngine, websocket, cacheProvider, skipClient, clientFramework, enableTranslation, testFrameworks, feignClient, } = this.jhipsterConfigWithDefaults;
+                const { applicationType, databaseType, messageBroker, searchEngine, websocket, cacheProvider, skipClient, clientFramework, testFrameworks, feignClient, } = this.jhipsterConfigWithDefaults;
                 await this.composeWithJHipster(GENERATOR_DOCKER);
                 await this.composeWithJHipster('jhipster:java:jib');
                 await this.composeWithJHipster('jhipster:java:code-quality');
@@ -116,9 +123,6 @@ export default class SpringBootGenerator extends BaseApplicationGenerator {
                 if (applicationType === GATEWAY) {
                     await this.composeWithJHipster('jhipster:spring-cloud:gateway');
                 }
-                if (enableTranslation) {
-                    await this.composeWithJHipster(GENERATOR_LANGUAGES);
-                }
                 if (testFrameworks?.includes(CUCUMBER)) {
                     await this.composeWithJHipster(GENERATOR_CUCUMBER);
                 }
@@ -161,6 +165,28 @@ export default class SpringBootGenerator extends BaseApplicationGenerator {
     get [BaseApplicationGenerator.COMPOSING]() {
         return this.delegateTasksToBlueprint(() => this.composing);
     }
+    get composingComponent() {
+        return this.asComposingComponentTaskGroup({
+            async composeLanguages() {
+                if (this.jhipsterConfigWithDefaults.enableTranslation) {
+                    await this.composeWithJHipster(GENERATOR_LANGUAGES);
+                }
+            },
+        });
+    }
+    get [BaseApplicationGenerator.COMPOSING_COMPONENT]() {
+        return this.delegateTasksToBlueprint(() => this.composingComponent);
+    }
+    get loading() {
+        return this.asLoadingTaskGroup({
+            async loadCommand({ application }) {
+                await this.loadCurrentJHipsterCommandConfig(application);
+            },
+        });
+    }
+    get [BaseApplicationGenerator.LOADING]() {
+        return this.delegateTasksToBlueprint(() => this.loading);
+    }
     get preparing() {
         return this.asPreparingTaskGroup({
             checksWebsocket({ application }) {
@@ -194,6 +220,20 @@ export default class SpringBootGenerator extends BaseApplicationGenerator {
                     (application.backendType ?? 'Java') === 'Java' &&
                         (ADD_SPRING_MILESTONE_REPOSITORY || SPRING_BOOT_VERSION.includes('M') || SPRING_BOOT_VERSION.includes('RC'));
             },
+            prepare({ application, applicationDefaults }) {
+                const { reactive } = application;
+                applicationDefaults({
+                    __override__: false,
+                    requiresDeleteAllUsers: data => (data.anyEntityHasRelationshipWithUser && data.authenticationTypeOauth2) ||
+                        data.authenticationTypeOauth2 ||
+                        data.databaseTypeNeo4j ||
+                        (reactive && data.databaseTypeSql) ||
+                        (!reactive && data.databaseTypeMongodb) ||
+                        (!reactive && data.databaseTypeCassandra),
+                    reactorBlock: reactive ? '.block()' : '',
+                    reactorBlockOptional: reactive ? '.blockOptional()' : '',
+                });
+            },
             registerSpringFactory({ source, application }) {
                 source.addTestSpringFactory = ({ key, value }) => {
                     const springFactoriesFile = `${application.srcTestResources}META-INF/spring.factories`;
@@ -284,6 +324,16 @@ public void set${javaBeanCase(propertyName)}(${propertyType} ${propertyName}) {
     }
     get preparingEachEntityRelationship() {
         return this.asPreparingEachEntityRelationshipTaskGroup({
+            checkUserRelationships({ entity, entityName, relationship }) {
+                if (!entity.dtoMapstruct && relationship.otherEntity.builtInUser) {
+                    this.log.warn(`Entity ${entityName} doesn't use DTO. You should check for User data leakage through ${relationship.relationshipName} relationship.`);
+                }
+            },
+            checkDtoRelationships({ entity, entityName, relationship }) {
+                if (entity.dto !== relationship.otherEntity.dto && !relationship.otherEntity.builtIn) {
+                    this.log.warn(`Relationship between entities with different DTO configurations can cause unexpected results. Check ${relationship.relationshipName} in the ${entityName} entity.`);
+                }
+            },
             prepareEntity({ relationship }) {
                 if (relationship.otherEntity.embedded)
                     return;

package/dist/generators/{server → spring-boot}/prompts.js

@@ -18,17 +18,15 @@
  */
 import chalk from 'chalk';
 import { includes, intersection } from 'lodash-es';
-import { applicationOptions, applicationTypes, authenticationTypes, databaseTypes, cacheTypes, serviceDiscoveryTypes, testFrameworkTypes, } from '../../jdl/jhipster/index.js';
-import { MESSAGE_BROKER } from './options/index.js';
-import { R2DBC_DB_OPTIONS, SQL_DB_OPTIONS } from './support/database.js';
+import { applicationOptions, applicationTypes, authenticationTypes, databaseTypes, cacheTypes, testFrameworkTypes, } from '../../jdl/jhipster/index.js';
+import { MESSAGE_BROKER } from '../server/options/index.js';
+import { R2DBC_DB_OPTIONS, SQL_DB_OPTIONS } from '../server/support/database.js';
 const { OptionNames } = applicationOptions;
-const { GATEWAY, MICROSERVICE, MONOLITH } = applicationTypes;
+const { GATEWAY, MONOLITH } = applicationTypes;
 const { CAFFEINE, EHCACHE, HAZELCAST, INFINISPAN, MEMCACHED, REDIS } = cacheTypes;
-const { JWT, OAUTH2, SESSION } = authenticationTypes;
+const { OAUTH2 } = authenticationTypes;
 const { CASSANDRA, H2_DISK, H2_MEMORY, MONGODB, NEO4J, SQL, COUCHBASE } = databaseTypes;
-const { CONSUL, EUREKA } = serviceDiscoveryTypes;
-const { AUTHENTICATION_TYPE, CACHE_PROVIDER, DATABASE_TYPE, DEV_DATABASE_TYPE, PROD_DATABASE_TYPE, REACTIVE, SERVER_PORT, SERVICE_DISCOVERY_TYPE, WEBSOCKET, SEARCH_ENGINE, ENABLE_SWAGGER_CODEGEN, } = OptionNames;
-const NO_SERVICE_DISCOVERY = serviceDiscoveryTypes.NO;
+const { CACHE_PROVIDER, DATABASE_TYPE, DEV_DATABASE_TYPE, PROD_DATABASE_TYPE, SERVICE_DISCOVERY_TYPE, WEBSOCKET, SEARCH_ENGINE, ENABLE_SWAGGER_CODEGEN, } = OptionNames;
 const NO_DATABASE = databaseTypes.NO;
 const NO_CACHE_PROVIDER = cacheTypes.NO;
 const { GATLING, CUCUMBER } = testFrameworkTypes;
@@ -52,70 +50,8 @@ const getOptionFromArray = (array, option) => {
 export async function askForServerSideOpts({ control }) {
     if (control.existingProject && !this.options.askAnswered)
         return;
-    const { applicationType, serverPort: defaultServerPort, reactive } = this.jhipsterConfigWithDefaults;
+    const { applicationType } = this.jhipsterConfigWithDefaults;
     const prompts = [
-        {
-            when: () => [MONOLITH, MICROSERVICE].includes(applicationType),
-            type: 'confirm',
-            name: REACTIVE,
-            message: 'Do you want to make it reactive with Spring WebFlux?',
-            default: reactive,
-        },
-        {
-            when: () => applicationType === GATEWAY || applicationType === MICROSERVICE,
-            type: 'input',
-            name: SERVER_PORT,
-            validate: input => (/^([0-9]*)$/.test(input) ? true : 'This is not a valid port number.'),
-            message: 'As you are running in a microservice architecture, on which port would like your server to run? It should be unique to avoid port conflicts.',
-            default: defaultServerPort,
-        },
-        {
-            when: () => applicationType === 'gateway' || applicationType === 'microservice',
-            type: 'list',
-            name: SERVICE_DISCOVERY_TYPE,
-            message: 'Which service discovery server do you want to use?',
-            choices: [
-                {
-                    value: CONSUL,
-                    name: 'Consul (recommended)',
-                },
-                {
-                    value: EUREKA,
-                    name: 'JHipster Registry (legacy, uses Eureka, provides Spring Cloud Config support)',
-                },
-                {
-                    value: NO_SERVICE_DISCOVERY,
-                    name: 'No service discovery',
-                },
-            ],
-            default: CONSUL,
-        },
-        {
-            when: answers => (applicationType === MONOLITH && answers.serviceDiscoveryType !== EUREKA) || [GATEWAY, MICROSERVICE].includes(applicationType),
-            type: 'list',
-            name: AUTHENTICATION_TYPE,
-            message: `Which ${chalk.yellow('*type*')} of authentication would you like to use?`,
-            choices: answers => {
-                const opts = [
-                    {
-                        value: JWT,
-                        name: 'JWT authentication (stateless, with a token)',
-                    },
-                ];
-                opts.push({
-                    value: OAUTH2,
-                    name: 'OAuth 2.0 / OIDC Authentication (stateful, works with Keycloak and Okta)',
-                });
-                if (applicationType === MONOLITH && answers.serviceDiscoveryType !== EUREKA) {
-                    opts.push({
-                        value: SESSION,
-                        name: 'HTTP Session Authentication (stateful, default Spring Security mechanism)',
-                    });
-                }
-                return opts;
-            },
-            default: this.jhipsterConfigWithDefaults.authenticationType,
-        },
         {
             type: 'list',
             name: DATABASE_TYPE,
@@ -300,7 +236,7 @@ export async function askForServerTestOpts({ control }) {
         {
             type: 'checkbox',
             name: 'serverTestFrameworks',
-            message: 'Besides Junit, which testing frameworks would you like to use?',
+            message: 'Besides JUnit, which testing frameworks would you like to use?',
             choices: [
                 { name: 'Gatling', value: GATLING },
                 { name: 'Cucumber', value: CUCUMBER },