generator-jhipster 8.3.0 → 8.5.0

package/dist/generators/react/templates/src/main/webapp/app/config/notification-middleware.ts.ejs

@@ -16,23 +16,47 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -%>
-
 <%_ if (enableTranslation) { _%>
 import { translate } from 'react-jhipster';
 <%_ } _%>
 import { toast } from 'react-toastify';
 import { isFulfilledAction, isRejectedAction } from 'app/shared/reducers/reducer.utils';
-import { AxiosError, AxiosHeaderValue } from 'axios';
+import { isAxiosError } from 'axios';
+import { FieldErrorVM, isProblemWithMessage } from 'app/shared/jhipster/problem-details';
+import { getMessageFromHeaders } from 'app/shared/jhipster/headers';
+
+type TostMessage = {
+  message?: string;
+<%_ if (enableTranslation) { _%>
+  key?: string;
+  data?: any;
+<%_ } _%>
+};
 
-const addErrorAlert = (message, key?, data?) => {
+const addErrorAlert = (message: TostMessage) => {
 <%_ if (enableTranslation) { _%>
-  key = key ? key : message;
-  toast.error(translate(key, data));
+  toast.error(message.key ? translate(message.key, message.data) ?? message.message : message.message);
 <%_ } else { _%>
-  toast.error(message);
+  toast.error(message.message);
 <%_ } _%>
 };
 
+const getFieldErrorsTosts = (fieldErrors: FieldErrorVM[]): TostMessage[] =>
+  fieldErrors.map(fieldError => {
+    if (['Min', 'Max', 'DecimalMin', 'DecimalMax'].includes(fieldError.message)) {
+      fieldError.message = 'Size';
+    }
+    // convert 'something[14].other[4].id' to 'something[].other[].id' so translations can be written to it
+    const convertedField = fieldError.field.replace(/\[\d*\]/g, '[]');
+<%_ if (enableTranslation) { _%>
+    const fieldName = translate(`<%= frontendAppName %>.${fieldError.objectName}.${convertedField}`);
+    return { message: `Error on field "${fieldName}"`, key: `error.${fieldError.message}`, data: { fieldName } };
+<%_ } else { _%>
+    const fieldName = convertedField.charAt(0).toUpperCase() + convertedField.slice(1);
+    return { message: `Error on field "${fieldName}"` };
+<%_ } _%>
+  });
+
 export default () => next => action => {
   const { error, payload } = action;
 
@@ -40,103 +64,72 @@ export default () => next => action => {
    *
    * The notification middleware serves to add success and error notifications
    */
-  if (isFulfilledAction(action) && payload && payload.headers) {
-    const headers = payload?.headers;
-    let alert: string | null = null;
-<%_ if (enableTranslation) { _%>
-    let alertParams: string | null = null;
-<%_ } _%>
-    headers && Object.entries<string>(headers).forEach(([k, v]) => {
-      if (k.toLowerCase().endsWith('app-alert')) {
-        alert = v;
-      }<% if (enableTranslation) { %> else if (k.toLowerCase().endsWith('app-params')) {
-        alertParams = decodeURIComponent(v.replace(/\+/g, ' '));
-      }<% } %>
-    });
+  if (isFulfilledAction(action) && payload?.headers) {
+    const { alert<% if (enableTranslation) { %>, param<% } %> } = getMessageFromHeaders(payload.headers);
     if (alert) {
 <%_ if (enableTranslation) { _%>
-      const alertParam = alertParams;
-      toast.success(translate(alert, { param: alertParam }));
+      toast.success(translate(alert, { param }));
 <%_ } else { _%>
       toast.success(alert);
 <%_ } _%>
     }
   }
 
-
-  if (isRejectedAction(action) && error && error.isAxiosError) {
-    const axiosError = error as AxiosError;
-    if (axiosError.response) {
-      const response = axiosError.response;
-      const data = response.data as any;
-      if (
-        !(
-          response.status === 401 &&
-          (axiosError.message === '' || response.config.url === 'api/account' || response.config.url === 'api/authenticate')
-        )
-      ) {
-        switch (response.status) {
-          // connection refused, server not reachable
-          case 0:
-            addErrorAlert('Server not reachable', 'error.server.not.reachable');
-            break;
-
-          case 400: {
-            let errorHeader: string | null = null;
-            let entityKey: string | null = null;
-            response?.headers &&
-              Object.entries<AxiosHeaderValue>(response.headers).forEach(([k, v]) => {
-              if (k.toLowerCase().endsWith('app-error')) {
-                errorHeader = v as string;
-              } else if (k.toLowerCase().endsWith('app-params')) {
-                entityKey = v as string;
-              }
-            });
-            if (errorHeader) {
-              const entityName = <% if (enableTranslation) { %>translate(
-                'global.menu.entities.' + entityKey
-              )<% } else { %>entityKey<% } %>;
-              addErrorAlert(errorHeader, errorHeader, { entityName });
-            } else if (data?.fieldErrors) {
-              const fieldErrors = data.fieldErrors;
-              for (const fieldError of fieldErrors) {
-                if (['Min', 'Max', 'DecimalMin', 'DecimalMax'].includes(fieldError.message)) {
-                    fieldError.message = 'Size';
-                }
-                // convert 'something[14].other[4].id' to 'something[].other[].id' so translations can be written to it
-                const convertedField = fieldError.field.replace(/\[\d*\]/g, '[]');
-                const fieldName = <% if (enableTranslation) { %>translate(
-                  `<%= frontendAppName %>.${fieldError.objectName}.${convertedField}`
-                )<% } else { %>convertedField.charAt(0).toUpperCase() + convertedField.slice(1)<% } %>;
-                addErrorAlert(`Error on field "${fieldName}"`, `error.${fieldError.message}`, { fieldName });
-              }
-            } else if (typeof data === 'string' && data !== '') {
-              addErrorAlert(data);
-            } else {
-              toast.error(data?.message || data?.error || data?.title || 'Unknown error!');
-            }
-            break;
+  if (isRejectedAction(action) && isAxiosError(error)) {
+    if (error.response) {
+      const response = error.response;
+      if (response.status === 401) {
+        // Ignore, page will be redirected to login.
+      } else if (error.config?.url?.endsWith('api/account') || error.config?.url?.endsWith('api/authenticate')) {
+        // Ignore, authentication status check and authentication are treated differently.
+      } else if (response.status === 0) {
+        // connection refused, server not reachable
+          addErrorAlert({
+            message: 'Server not reachable',
+<%_ if (enableTranslation) { _%>
+            key: 'error.server.not.reachable',
+<%_ } _%>
+          });
+      } else if (response.status === 404) {
+          addErrorAlert({
+            message: 'Not found',
+<%_ if (enableTranslation) { _%>
+            key: 'error.url.not.found',
+<%_ } _%>
+          });
+      } else {
+        const data = response.data;
+        const problem = isProblemWithMessage(data) ? data : null;
+        if (problem?.fieldErrors) {
+          getFieldErrorsTosts(problem.fieldErrors).forEach(message => addErrorAlert(message));
+        } else {
+          const { error: toastError<% if (enableTranslation) { %>, param<% } %> } = getMessageFromHeaders((response.headers as any) ?? {});
+          if (toastError) {
+<%_ if (enableTranslation) { _%>
+            const entityName = translate('global.menu.entities.' + param);
+            addErrorAlert({ key: toastError, data: { entityName } });
+<%_ } else { _%>
+            addErrorAlert({ message: toastError });
+<%_ } _%>
+<%_ if (enableTranslation) { _%>
+          } else if (problem?.message) {
+            addErrorAlert({ message: problem.detail, key: problem.message });
+<%_ } _%>
+          } else if (typeof data === 'string' && data !== '') {
+            addErrorAlert({ message: data });
+          } else {
+            toast.error(data?.detail ?? data?.message ?? data?.error ?? data?.title ?? 'Unknown error!');
           }
-          case 404:
-            addErrorAlert('Not found', 'error.url.not.found');
-            break;
-
-          default:
-            if (typeof data === 'string' && data !== '') {
-              addErrorAlert(data);
-            } else {
-              toast.error(data?.message || data?.error || data?.title || 'Unknown error!');
-            }
         }
       }
-    } else if (axiosError.config && axiosError.config.url === 'api/account' && axiosError.config.method === 'get') {
+    } else if (error.config?.url?.endsWith('api/account') && error.config?.method === 'get') {
       /* eslint-disable no-console */
       console.log('Authentication Error: Trying to access url api/account with GET.');
     } else {
-      toast.error(error.message || 'Unknown error!');
+      addErrorAlert({ message: error.message ?? 'Unknown error!' });
     }
   } else if (error) {
-    toast.error(error.message || 'Unknown error!');
+    addErrorAlert({ message: error.message ?? 'Unknown error!' });
   }
 
   return next(action);

package/dist/generators/react/templates/src/main/webapp/app/config/store.ts.ejs

@@ -45,7 +45,7 @@ const store = configureStore({
     getDefaultMiddleware({
       serializableCheck: {
         // Ignore these field paths in all actions
-        ignoredActionPaths: ['payload.config', 'payload.request', 'payload.headers', 'error', 'meta.arg'],
+        ignoredActionPaths: ['meta.arg', 'meta.baseQueryMeta', 'payload.config', 'payload.request', 'payload.headers', 'error'],
       },
     }).concat(
       errorMiddleware,

package/dist/generators/react/templates/src/main/webapp/app/entities/_entityFolder_/_entityFile_-update.tsx.ejs

@@ -143,7 +143,7 @@ _%>
     const entity = {
       ...<%= entityInstance %>Entity,
       ...values,
-<%_ for (const rel of persistableRelationships) { _%>
+<%_ for (const rel of persistableRelationships.filter(rel => !rel.otherEntity.embedded)) { _%>
   <%_ if (rel.collection) { _%>
       <%= rel.propertyName %>: mapIdList(values.<%= rel.propertyName %>),
   <%_ } else { _%>
@@ -186,7 +186,7 @@ _%>
           <%= fieldName %>: convertDateTimeFromServer(<%= entityInstance %>Entity.<%= fieldName %>),
   <%_ } _%>
 <%_ } _%>
-<%_ for (const rel of persistableRelationships) {
+<%_ for (const rel of persistableRelationships.filter(rel => !rel.otherEntity.embedded)) {
     const otherEntityPkName = rel.otherEntity.primaryKey && rel.otherEntity.primaryKey.name || 'id';
     const relationshipFieldName = rel.relationshipFieldName;
     const relationshipFieldNamePlural = rel.relationshipFieldNamePlural;
@@ -297,7 +297,7 @@ _%>
           </UncontrolledTooltip>
   <%_ } _%>
 <%_ } _%>
-<%_ for (const rel of persistableRelationships) {
+<%_ for (const rel of persistableRelationships.filter(rel => !rel.otherEntity.embedded)) {
     const otherEntityPkName = rel.otherEntity.primaryKey && rel.otherEntity.primaryKey.name || 'id';
     const otherEntityNamePlural = rel.otherEntityNamePlural;
     const relationshipName = rel.relationshipName;

package/dist/generators/react/templates/src/main/webapp/app/entities/_entityFolder_/_entityFile_.reducer.ts.ejs

@@ -63,18 +63,23 @@ export const searchEntities = createAsyncThunk(
     const requestUrl = `${apiSearchUrl}?query=${query}`;
   <%_ } _%>
     return axios.get<I<%= entityReactName %>[]>(requestUrl);
-  }
+  },
+  { serializeError: serializeAxiosError },
 );
 
 <%_ } _%>
-export const getEntities = createAsyncThunk('<%= entityInstance %>/fetch_entity_list', async ({ <%_ if(!paginationNo) { _%>page, size, <%_ } _%>sort }: IQueryParams) => {
+export const getEntities = createAsyncThunk(
+  '<%= entityInstance %>/fetch_entity_list',
+  async ({ <%_ if(!paginationNo) { _%>page, size, <%_ } _%>sort }: IQueryParams) => {
 <%_ if (!paginationNo) { _%>
-  const requestUrl = `${apiUrl}?${sort ? `page=${page}&size=${size}&sort=${sort}&` : ''}cacheBuster=${new Date().getTime()}`;
+    const requestUrl = `${apiUrl}?${sort ? `page=${page}&size=${size}&sort=${sort}&` : ''}cacheBuster=${new Date().getTime()}`;
 <%_ } else { _%>
-  const requestUrl = `${apiUrl}?${sort ? `sort=${sort}&` : ''}cacheBuster=${new Date().getTime()}`;
+    const requestUrl = `${apiUrl}?${sort ? `sort=${sort}&` : ''}cacheBuster=${new Date().getTime()}`;
 <%_ } _%>
-  return axios.get<I<%= entityReactName %>[]>(requestUrl);
-});
+    return axios.get<I<%= entityReactName %>[]>(requestUrl);
+  },
+  { serializeError: serializeAxiosError },
+);
 
 export const getEntity = createAsyncThunk(
   '<%= entityInstance %>/fetch_entity',
@@ -82,7 +87,7 @@ export const getEntity = createAsyncThunk(
     const requestUrl = `${apiUrl}/${id}`;
     return axios.get<I<%= entityReactName %>>(requestUrl);
   },
-  { serializeError: serializeAxiosError }
+  { serializeError: serializeAxiosError },
 );
 
 <%_ if (!readOnly) { _%>

package/dist/generators/react/templates/src/main/webapp/app/modules/home/home.tsx.ejs

@@ -50,7 +50,7 @@ export const Home = () => {
         <span className="hipster rounded" />
       </Col>
       <Col md="9">
-        <h1 className="display-4"><Translate contentKey="home.title">Welcome, <%= backendType %> Hipster!</Translate></h1>
+        <h1 className="display-4"><Translate contentKey="home.title">Welcome, <%- hipsterName %>!</Translate></h1>
         <p className="lead"><Translate contentKey="home.subtitle">This is your homepage</Translate></p>
         {
           (account?.login) ? (
@@ -92,27 +92,27 @@ export const Home = () => {
 
         <ul>
           <li>
-            <a href="https://www.jhipster.tech/" target="_blank" rel="noopener noreferrer">
+            <a href="<%- hipsterDocumentationLink %>" target="_blank" rel="noopener noreferrer">
               <Translate contentKey="home.link.homepage">JHipster homepage</Translate>
             </a>
           </li>
           <li>
-            <a href="https://stackoverflow.com/tags/jhipster/info" target="_blank" rel="noopener noreferrer">
+            <a href="<%- hipsterStackoverflowLink %>" target="_blank" rel="noopener noreferrer">
               <Translate contentKey="home.link.stackoverflow">JHipster on Stack Overflow</Translate>
             </a>
           </li>
           <li>
-            <a href="https://github.com/jhipster/generator-jhipster/issues?state=open" target="_blank" rel="noopener noreferrer">
+            <a href="<%- hipsterBugTrackerLink %>" target="_blank" rel="noopener noreferrer">
               <Translate contentKey="home.link.bugtracker">JHipster bug tracker</Translate>
             </a>
           </li>
           <li>
-            <a href="https://gitter.im/jhipster/generator-jhipster" target="_blank" rel="noopener noreferrer">
+            <a href="<%- hipsterChatLink %>" target="_blank" rel="noopener noreferrer">
               <Translate contentKey="home.link.chat">JHipster public chat room</Translate>
             </a>
           </li>
           <li>
-            <a href="https://twitter.com/jhipster" target="_blank" rel="noopener noreferrer">
+            <a href="<%- hipsterTwitterLink %>" target="_blank" rel="noopener noreferrer">
               <Translate contentKey="home.link.follow">follow @jhipster on Twitter</Translate>
             </a>
           </li>
@@ -121,7 +121,7 @@ export const Home = () => {
         <p>
           <Translate contentKey="home.like">If you like JHipster, do not forget to give us a star on</Translate>
           {' '}
-          <a href="https://github.com/jhipster/generator-jhipster" target="_blank" rel="noopener noreferrer">GitHub</a>!
+          <a href="<%- hipsterProjectLink %>" target="_blank" rel="noopener noreferrer">GitHub</a>!
         </p>
       </Col>
     </Row>

package/dist/generators/react/templates/src/main/webapp/app/shared/reducers/reducer.utils.ts.ejs

@@ -25,7 +25,7 @@ import {
   SliceCaseReducers,
   ValidateSliceCaseReducers,
 } from '@reduxjs/toolkit';
-import { AxiosError } from 'axios';
+import { AxiosError, isAxiosError } from 'axios';
 
 /**
  * Model for redux actions with pagination
@@ -69,7 +69,7 @@ const commonErrorProperties: Array<keyof SerializedError> = ['name', 'message',
  */
 export const serializeAxiosError = (value: any): AxiosError | SerializedError => {
   if (typeof value === 'object' && value !== null) {
-    if (value.isAxiosError) {
+    if (isAxiosError(value)) {
       return value;
     } else {
       const simpleError: SerializedError = {};
@@ -143,4 +143,3 @@ export const createEntitySlice = <T, Reducers extends SliceCaseReducers<EntitySt
     },
   });
 };
-

package/dist/generators/react/templates/webpack/webpack.microfrontend.js.jhi.react.ejs

@@ -44,11 +44,3 @@ const { DefinePlugin } = require('webpack');
           ),
         },
 <&_ } -&>
-<&_ if (fragment.pluginsSection) { -&>
-<%_ if (applicationTypeMicroservice) { _%>
-      new DefinePlugin({
-        <%= this._.upperCase(baseName) %>_I18N_RESOURCES_PREFIX: JSON.stringify(''),
-      }),
-<%_ } _%>
-<&_ } -&>
-

package/dist/generators/server/command.js

@@ -21,12 +21,6 @@ import { GENERATOR_COMMON, GENERATOR_SPRING_BOOT } from '../generator-list.js';
 import { APPLICATION_TYPE_GATEWAY, APPLICATION_TYPE_MICROSERVICE, APPLICATION_TYPE_MONOLITH } from '../../jdl/index.js';
 const command = {
     options: {
-        authenticationType: {
-            name: 'auth',
-            description: 'Provide authentication type for the application when skipping server side generation',
-            type: String,
-            scope: 'storage',
-        },
         db: {
             description: 'Provide DB name for the application when skipping server side generation',
             type: String,
@@ -65,11 +59,6 @@ const command = {
             type: String,
             scope: 'storage',
         },
-        reactive: {
-            description: 'Generate a reactive backend',
-            type: Boolean,
-            scope: 'storage',
-        },
         searchEngine: {
             description: 'Provide search engine for the application when skipping server side generation',
             type: String,

package/dist/generators/server/generator.js

@@ -20,27 +20,25 @@
 /* eslint-disable consistent-return */
 import { existsSync } from 'fs';
 import chalk from 'chalk';
-import { getDBTypeFromDBValue, buildJavaGet as javaGetCall, javaBeanCase as javaBeanClassNameFormat, buildJavaGetter as javaGetter, buildJavaSetter as javaSetter, getJavaValueGeneratorForType as getJavaValueForType, getPrimaryKeyValue as getPKValue, hibernateSnakeCase, } from './support/index.js';
-import { askForOptionalItems, askForServerSideOpts, askForServerTestOpts } from './prompts.js';
-import { GENERATOR_COMMON, GENERATOR_SERVER, GENERATOR_SPRING_BOOT } from '../generator-list.js';
+import { buildJavaGet as javaGetCall, javaBeanCase as javaBeanClassNameFormat, buildJavaGetter as javaGetter, buildJavaSetter as javaSetter, getJavaValueGeneratorForType as getJavaValueForType, getPrimaryKeyValue as getPKValue, hibernateSnakeCase, } from './support/index.js';
+import { GENERATOR_COMMON, GENERATOR_SPRING_BOOT } from '../generator-list.js';
 import BaseApplicationGenerator from '../base-application/index.js';
 import { packageJson } from '../../lib/index.js';
 import { SERVER_MAIN_SRC_DIR, SERVER_MAIN_RES_DIR, SERVER_TEST_SRC_DIR, SERVER_TEST_RES_DIR, CLIENT_WEBPACK_DIR, MAIN_DIR, LOGIN_REGEX, TEST_DIR, JAVA_VERSION, JAVA_COMPATIBLE_VERSIONS, JHIPSTER_DEPENDENCIES_VERSION, } from '../generator-constants.js';
-import statistics from '../statistics.js';
-import { applicationTypes, authenticationTypes, buildToolTypes, databaseTypes, fieldTypes, entityOptions, validations, reservedKeywords, searchEngineTypes, clientFrameworkTypes, } from '../../jdl/jhipster/index.js';
+import { applicationTypes, buildToolTypes, databaseTypes, fieldTypes, entityOptions, validations, reservedKeywords, searchEngineTypes, clientFrameworkTypes, } from '../../jdl/jhipster/index.js';
 import { stringifyApplicationData } from '../base-application/support/index.js';
-import { createBase64Secret, createSecret, createNeedleCallback, mutateData } from '../base/support/index.js';
+import { createNeedleCallback, mutateData } from '../base/support/index.js';
 import { isReservedPaginationWords } from '../../jdl/jhipster/reserved-keywords.js';
 import { loadStoredAppOptions } from '../app/support/index.js';
+import { isReservedH2Keyword } from '../spring-data-relational/support/h2-reserved-keywords.js';
 const dbTypes = fieldTypes;
 const { STRING: TYPE_STRING, INTEGER: TYPE_INTEGER, LONG: TYPE_LONG, BIG_DECIMAL: TYPE_BIG_DECIMAL, FLOAT: TYPE_FLOAT, DOUBLE: TYPE_DOUBLE, LOCAL_DATE: TYPE_LOCAL_DATE, ZONED_DATE_TIME: TYPE_ZONED_DATE_TIME, INSTANT: TYPE_INSTANT, DURATION: TYPE_DURATION, } = dbTypes.CommonDBTypes;
 const { SUPPORTED_VALIDATION_RULES } = validations;
 const { isReservedTableName } = reservedKeywords;
 const { ANGULAR, REACT, VUE } = clientFrameworkTypes;
-const { JWT, OAUTH2, SESSION } = authenticationTypes;
 const { GRADLE, MAVEN } = buildToolTypes;
-const { CASSANDRA, COUCHBASE, MONGODB, NEO4J, SQL, NO: NO_DATABASE } = databaseTypes;
-const { MICROSERVICE, GATEWAY } = applicationTypes;
+const { CASSANDRA, SQL, NO: NO_DATABASE } = databaseTypes;
+const { GATEWAY } = applicationTypes;
 const { NO: NO_SEARCH_ENGINE } = searchEngineTypes;
 const { CommonDBTypes, RelationalOnlyDBTypes } = fieldTypes;
 const { INSTANT } = CommonDBTypes;
@@ -82,50 +80,11 @@ export default class JHipsterServerGenerator extends BaseApplicationGenerator {
                     return;
                 await this.promptCurrentJHipsterCommand();
             },
-            askForServerTestOpts,
-            askForServerSideOpts,
-            askForOptionalItems,
         });
     }
     get [BaseApplicationGenerator.PROMPTING]() {
         return this.delegateTasksToBlueprint(() => this.prompting);
     }
-    get configuring() {
-        return this.asConfiguringTaskGroup({
-            configServerPort() {
-                if (!this.jhipsterConfig.serverPort && this.jhipsterConfig.applicationIndex) {
-                    this.jhipsterConfig.serverPort = 8080 + this.jhipsterConfig.applicationIndex;
-                }
-            },
-            configure() {
-                this._configureServer();
-            },
-            syncUserWithIdp() {
-                if (this.jhipsterConfig.syncUserWithIdp === undefined && this.jhipsterConfig.authenticationType === OAUTH2) {
-                    if (this.jhipsterConfig.databaseType === NO_DATABASE) {
-                        this.jhipsterConfig.syncUserWithIdp = false;
-                    }
-                    else if (this.isJhipsterVersionLessThan('8.1.1')) {
-                        this.jhipsterConfig.syncUserWithIdp = true;
-                    }
-                    else if (this.jhipsterConfig.applicationType === GATEWAY) {
-                        // For compatibility with v8 microservices allow syncUserWithIdp by default.
-                        // Switch to false at v9.
-                        this.jhipsterConfig.syncUserWithIdp = true;
-                    }
-                    else {
-                        this.jhipsterConfig.syncUserWithIdp = this.getExistingEntities().some(entity => (entity.definition.relationships ?? []).some(relationship => relationship.otherEntityName.toLowerCase() === 'user'));
-                    }
-                }
-                else if (this.jhipsterConfig.syncUserWithIdp && this.jhipsterConfig.authenticationType !== OAUTH2) {
-                    throw new Error(`syncUserWithIdp is only supported with authenticationType ${OAUTH2}`);
-                }
-            },
-        });
-    }
-    get [BaseApplicationGenerator.CONFIGURING]() {
-        return this.delegateTasksToBlueprint(() => this.configuring);
-    }
     get composing() {
         return this.asComposingTaskGroup({
             async composeCommand() {
@@ -143,17 +102,14 @@ export default class JHipsterServerGenerator extends BaseApplicationGenerator {
     }
     get loading() {
         return this.asLoadingTaskGroup({
+            async loadCommand({ application }) {
+                await this.loadCurrentJHipsterCommandConfig(application);
+            },
             loadEnvironmentVariables({ application }) {
                 application.packageInfoJavadocs?.push({ packageName: `${application.packageName}.aop.logging`, documentation: 'Logging aspect.' }, { packageName: `${application.packageName}.management`, documentation: 'Application management.' }, { packageName: `${application.packageName}.repository.rowmapper`, documentation: 'Webflux database column mapper.' }, { packageName: `${application.packageName}.security`, documentation: 'Application security utilities.' }, { packageName: `${application.packageName}.service.dto`, documentation: 'Data transfer objects for rest mapping.' }, { packageName: `${application.packageName}.service.mapper`, documentation: 'Data transfer objects mappers.' }, { packageName: `${application.packageName}.web.filter`, documentation: 'Request chain filters.' }, { packageName: `${application.packageName}.web.rest.errors`, documentation: 'Rest layer error handling.' }, { packageName: `${application.packageName}.web.rest.vm`, documentation: 'Rest layer visual models.' });
-                application.defaultPackaging = process.env.JHI_WAR === '1' ? 'war' : 'jar';
                 if (application.defaultPackaging === 'war') {
                     this.log.info(`Using ${application.defaultPackaging} as default packaging`);
                 }
-                const JHI_PROFILE = process.env.JHI_PROFILE;
-                application.defaultEnvironment = (JHI_PROFILE || '').includes('dev') ? 'dev' : 'prod';
-                if (JHI_PROFILE) {
-                    this.log.info(`Using ${application.defaultEnvironment} as default profile`);
-                }
             },
             setupServerconsts({ application }) {
                 // Make constants available in templates
@@ -264,10 +220,12 @@ export default class JHipsterServerGenerator extends BaseApplicationGenerator {
                 // Don't touch the configuration for microservice entities published at gateways
                 !(applicationTypeGateway && entityConfig.microserviceName) &&
                     !application.searchEngineAny &&
-                    !entityConfig.searchEngine) {
+                    entityConfig.searchEngine !== NO_SEARCH_ENGINE) {
+                    if (entityConfig.searchEngine) {
+                        this.log.warn('Search engine is enabled at entity level, but disabled at application level. Search engine will be disabled');
+                    }
                     // Search engine can only be enabled at entity level and disabled at application level for gateways publishing a microservice entity
                     entityConfig.searchEngine = NO_SEARCH_ENGINE;
-                    this.log.warn('Search engine is enabled at entity level, but disabled at application level. Search engine will be disabled');
                 }
             },
             configureModelFiltering({ application, entityConfig }) {
@@ -296,9 +254,13 @@ export default class JHipsterServerGenerator extends BaseApplicationGenerator {
             configureEntityTable({ application, entityName, entityConfig }) {
                 if ((application.applicationTypeGateway && entityConfig.microserviceName) || entityConfig.skipServer)
                     return;
+                const { jhiTablePrefix, devDatabaseTypeH2Any } = application;
                 const databaseType = entityConfig.prodDatabaseType ?? application.prodDatabaseType ?? entityConfig.databaseType ?? application.databaseType;
                 const entityTableName = entityConfig.entityTableName ?? hibernateSnakeCase(entityName);
-                const fixedEntityTableName = this._fixEntityTableName(entityTableName, databaseType, application.jhiTablePrefix);
+                const fixedEntityTableName = (isReservedTableName(entityTableName, databaseType) || (devDatabaseTypeH2Any && isReservedH2Keyword(entityTableName))) &&
+                    jhiTablePrefix
+                    ? `${jhiTablePrefix}_${entityTableName}`
+                    : entityTableName;
                 if (fixedEntityTableName !== entityTableName) {
                     entityConfig.entityTableName = fixedEntityTableName;
                 }
@@ -397,25 +359,6 @@ export default class JHipsterServerGenerator extends BaseApplicationGenerator {
                     throw new Error(`Composite id is not supported. Defined in ${entitiesWithCompositeIds.map(entity => `${entity.name} (${entity.primaryKey.fields.map(field => field.fieldName)})`)}`);
                 }
             },
-            insight({ application }) {
-                statistics.sendSubGenEvent('generator', GENERATOR_SERVER, {
-                    app: {
-                        authenticationType: application.authenticationType,
-                        cacheProvider: application.cacheProvider,
-                        enableHibernateCache: application.enableHibernateCache,
-                        websocket: application.websocket,
-                        databaseType: application.databaseType,
-                        devDatabaseType: application.devDatabaseType,
-                        prodDatabaseType: application.prodDatabaseType,
-                        searchEngine: application.searchEngine,
-                        messageBroker: application.messageBroker,
-                        serviceDiscoveryType: application.serviceDiscoveryType,
-                        buildTool: application.buildTool,
-                        enableSwaggerCodegen: application.enableSwaggerCodegen,
-                        enableGradleEnterprise: application.enableGradleEnterprise,
-                    },
-                });
-            },
         });
     }
     get [BaseApplicationGenerator.DEFAULT]() {
@@ -427,7 +370,6 @@ export default class JHipsterServerGenerator extends BaseApplicationGenerator {
                 const packageJsonConfigStorage = this.packageJson.createStorage('config').createProxy();
                 packageJsonConfigStorage.backend_port = application.gatewayServerPort || application.serverPort;
                 packageJsonConfigStorage.packaging = application.defaultPackaging;
-                packageJsonConfigStorage.default_environment = application.defaultEnvironment;
             },
             packageJsonBackendScripts({ application }) {
                 const scriptsStorage = this.packageJson.createStorage('scripts');
@@ -506,38 +448,6 @@ export default class JHipsterServerGenerator extends BaseApplicationGenerator {
     get [BaseApplicationGenerator.POST_WRITING]() {
         return this.delegateTasksToBlueprint(() => this.postWriting);
     }
-    _configureServer(config = this.jhipsterConfigWithDefaults, dest = this.jhipsterConfig) {
-        // Generate JWT secret key if key does not already exist in config
-        if ((config.authenticationType === JWT || config.applicationType === MICROSERVICE || config.applicationType === GATEWAY) &&
-            config.jwtSecretKey === undefined) {
-            dest.jwtSecretKey = createBase64Secret(64, this.options.reproducibleTests);
-        }
-        // Generate remember me key if key does not already exist in config
-        if (config.authenticationType === SESSION && !dest.rememberMeKey) {
-            dest.rememberMeKey = createSecret();
-        }
-        if (config.authenticationType === OAUTH2) {
-            dest.skipUserManagement = true;
-        }
-        if (!config.databaseType && config.prodDatabaseType) {
-            dest.databaseType = getDBTypeFromDBValue(config.prodDatabaseType);
-        }
-        if (!config.devDatabaseType && config.prodDatabaseType) {
-            dest.devDatabaseType = config.prodDatabaseType;
-        }
-        const databaseType = config.databaseType;
-        if (databaseType === NO_DATABASE) {
-            dest.devDatabaseType = NO_DATABASE;
-            dest.prodDatabaseType = NO_DATABASE;
-            dest.enableHibernateCache = false;
-            dest.skipUserManagement = true;
-        }
-        else if ([MONGODB, NEO4J, COUCHBASE, CASSANDRA].includes(databaseType)) {
-            dest.devDatabaseType = databaseType;
-            dest.prodDatabaseType = databaseType;
-            dest.enableHibernateCache = false;
-        }
-    }
     /**
      * Validate the entityTableName
      * @return {true|string} true for a valid value or error message.
@@ -631,12 +541,6 @@ export default class JHipsterServerGenerator extends BaseApplicationGenerator {
             throw new Error(`relationshipSide is missing in .jhipster/${entityName}.json for relationship ${stringifyApplicationData(relationship)}`);
         }
     }
-    _fixEntityTableName(entityTableName, prodDatabaseType, jhiTablePrefix) {
-        if (isReservedTableName(entityTableName, prodDatabaseType) && jhiTablePrefix) {
-            entityTableName = `${jhiTablePrefix}_${entityTableName}`;
-        }
-        return entityTableName;
-    }
     /**
      * @private
      * Return the method name which converts the filter to specification

package/dist/generators/server/jdl/application-definition.js

@@ -20,11 +20,13 @@ import { upperCase, snakeCase } from 'lodash-es';
 import databaseMigrationOption from '../options/database-migration.js';
 import messageBrokerOption from '../options/message-broker.js';
 import { feignClientDefinition, syncUserWithIdpDefinition } from '../options/index.js';
+import { jdlRoutesOptions } from '../../spring-cloud/generators/gateway/jdl/jdl-routes-option.js';
 const jdlOptions = [
     databaseMigrationOption,
     messageBrokerOption,
     feignClientDefinition,
     syncUserWithIdpDefinition,
+    jdlRoutesOptions,
 ];
 const applicationConfig = {
     tokenConfigs: jdlOptions.map(option => ({
@@ -45,7 +47,7 @@ const applicationConfig = {
     optionsTypes: Object.fromEntries(jdlOptions.map(option => [
         option.name,
         {
-            type: messageBrokerOption.type,
+            type: option.type,
         },
     ])),
 };