generator-jhipster 8.0.0 → 8.1.0

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

@@ -114,14 +114,13 @@ _%>
             </dd>
 <%_ } _%>
 <%_ for (relationship of relationships) {
-    const ownerSide = relationship.ownerSide;
     const relationshipName = relationship.relationshipName;
     const relationshipFieldName = relationship.relationshipFieldName;
     const relationshipFieldNamePlural = relationship.relationshipFieldNamePlural;
     const relationshipNameHumanized = relationship.relationshipNameHumanized;
     const otherEntityPkName = relationship.otherEntity.primaryKey && relationship.otherEntity.primaryKey.name || 'id';
     const otherEntityField = relationship.otherEntityField; _%>
-  <%_ if (ownerSide) { _%>
+  <%_ if (relationship.persistableRelationship) { _%>
             <dt>
               <Translate contentKey="<%= i18nKeyPrefix %>.<%= relationshipName %>">
                 <%= relationshipNameHumanized %>

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

@@ -50,16 +50,16 @@ let uniqueRelationFields = new Set();
 
 Object.keys(differentRelationships).forEach(key => {
 
-  const hasAnyRelationshipQuery = differentRelationships[key].some(rel =>
-    (rel.relationshipOneToOne && rel.ownerSide && !rel.otherEntityUser)
-      || !rel.relationshipOneToMany);
+  const hasAnyRelationshipQuery = differentRelationships[key].some(rel => rel.persistableRelationship);
   if (hasAnyRelationshipQuery) {
     hasRelationshipQuery = true;
     differentRelationships[key].forEach(rel => {
-      if (rel.relationshipManyToMany && rel.ownerSide) {
-        manyToManyOwners.add(rel);
-      } else {
-        relFieldNames.add(rel);
+      if (rel.persistableRelationship) {
+        if (rel.relationshipManyToMany) {
+          manyToManyOwners.add(rel);
+        } else {
+          relFieldNames.add(rel);
+        }
       }
     });
   }
@@ -169,7 +169,7 @@ _%>
       <%= rel.relationshipFieldNamePlural %>: mapIdList(values.<%= rel.relationshipFieldNamePlural %>),
 <%_ }) _%>
 <%_ relFieldNames.forEach(rel => { _%>
-<%_ if (rel.relationshipManyToOne || (rel.ownerSide && rel.relationshipOneToOne))  { _%>
+<%_ if (rel.persistableRelationship && !rel.collection)  { _%>
         <%= rel.relationshipFieldName %>: <%= rel.otherEntityNamePlural %>.find(it => it.<%= rel.otherEntity.primaryKey.name %>.toString() === values.<%= rel.relationshipFieldName %>.toString()),
 <%_ } _%>
 <%_ }) _%>
@@ -213,9 +213,9 @@ _%>
     const otherEntityPkName = rel.otherEntity.primaryKey && rel.otherEntity.primaryKey.name || 'id';
     const relationshipFieldName = rel.relationshipFieldName;
     const relationshipFieldNamePlural = rel.relationshipFieldNamePlural;
-  if (rel.relationshipManyToOne || (rel.relationshipOneToOne && rel.ownerSide)) { _%>
+  if (rel.persistableRelationship && !rel.collection) { _%>
           <%= relationshipFieldName %>: <%= entityInstance %>Entity?.<%= relationshipFieldName %>?.<%= otherEntityPkName %>,
-  <%_ } else if (rel.relationshipManyToMany && rel.ownerSide) { _%>
+  <%_ } else if (rel.persistableRelationship) { _%>
           <%= relationshipFieldNamePlural %>: <%= entityInstance %>Entity?.<%= relationshipFieldNamePlural %>?.map(e => e.<%= otherEntityPkName %>.toString()),
   <%_ } _%>
 <%_ }) _%>
@@ -321,7 +321,6 @@ _%>
   <%_ } _%>
 <%_ } _%>
 <%_ relationships.forEach(rel => {
-    const ownerSide = rel.ownerSide;
     const otherEntityPkName = rel.otherEntity.primaryKey && rel.otherEntity.primaryKey.name || 'id';
     const otherEntityNamePlural = rel.otherEntityNamePlural;
     const relationshipName = rel.relationshipName;
@@ -331,7 +330,7 @@ _%>
     const otherEntityField = rel.otherEntityField;
     const relationshipRequired = rel.relationshipRequired;
     const translationKey = `${i18nKeyPrefix}.${relationshipName}`; _%>
-  <%_ if (rel.relationshipManyToOne || (rel.relationshipOneToOne && ownerSide)) { _%>
+  <%_ if (rel.persistableRelationship && !rel.collection) { _%>
           <ValidatedField
             id="<%= entityFileName %>-<%= relationshipName %>"
             name="<%= relationshipFieldName %>"
@@ -360,7 +359,7 @@ _%>
     <%_ if (relationshipRequired) { _%>
             <FormText><Translate contentKey="entity.validation.required">This field is required.</Translate></FormText>
     <%_ } _%>
-  <%_ } else if (rel.relationshipManyToMany && rel.ownerSide) { _%>
+  <%_ } else if (rel.persistableRelationship) { _%>
           <ValidatedField
         <%_ if (enableTranslation) { _%>
             label={translate('<%= i18nKeyPrefix %>.<%= relationshipName %>')}

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

@@ -376,9 +376,7 @@ export const <%= entityReactName %> = () => {
                   <th className="hand" onClick={sort('<%= field.fieldName %>')} ><Translate contentKey="<%= `${i18nKeyPrefix}.${field.fieldName}` %>"><%= field.fieldNameHumanized %></Translate> <FontAwesomeIcon icon={getSortIconByFieldName('<%= field.fieldName %>')} /></th>
 <%_ } _%>
 <%_ for (relationship of relationships) { _%>
-    <%_ if (relationship.relationshipManyToOne
-    || (relationship.relationshipOneToOne && relationship.ownerSide)
-    || (relationship.relationshipManyToMany && relationship.ownerSide && paginationNo)) { _%>
+    <%_ if (relationship.persistableRelationship && (paginationNo || !relationship.collection)) { _%>
                   <th><Translate contentKey="<%= `${i18nKeyPrefix}.${relationship.relationshipName}` %>"><%= relationship.relationshipNameHumanized %></Translate> <FontAwesomeIcon icon="sort" /></th>
     <%_ } _%>
 <%_ } _%>
@@ -442,14 +440,11 @@ _%>
 <%_ } _%>
 <%_ for (relationship of relationships) {
   const otherEntity = relationship.otherEntity;
-  const ownerSide = relationship.ownerSide;
   const relationshipFieldName = relationship.relationshipFieldName;
   const relationshipFieldNamePlural = relationship.relationshipFieldNamePlural;
   const otherEntityPkName = relationship.otherEntity.primaryKey && relationship.otherEntity.primaryKey.name || 'id';
   const otherEntityField = relationship.otherEntityField; _%>
-  <%_ if (relationship.relationshipManyToOne
-  || (relationship.relationshipOneToOne && ownerSide)
-  || (relationship.relationshipManyToMany && ownerSide && paginationNo)) { _%>
+  <%_ if (relationship.persistableRelationship && (paginationNo || !relationship.collection)) { _%>
                     <td>
     <%_ if (relationship.otherEntityUser) { _%>
       <%_ if (relationship.relationshipManyToMany) { _%>
@@ -491,7 +486,7 @@ _%>
                           <Button tag={Link} to={`/<%= entityPage %>/${<%= entityInstance %>.<%= primaryKey.name %>}/edit<%_ if (paginationPagination) { _%>?page=${paginationState.activePage}&sort=${paginationState.sort},${paginationState.order}<%_ } _%>`} color="primary" size="sm" data-cy="entityEditButton">
                             <FontAwesomeIcon icon="pencil-alt" /> <span className="d-none d-md-inline"><Translate contentKey="entity.action.edit">Edit</Translate></span>
                           </Button>
-                          <Button onClick={() => location.href=`/<%= entityPage %>/${<%= entityInstance %>.<%= primaryKey.name %>}/delete<%_ if (paginationPagination) { _%>?page=${paginationState.activePage}&sort=${paginationState.sort},${paginationState.order}<%_ } _%>`} color="danger" size="sm" data-cy="entityDeleteButton">
+                          <Button onClick={() => <% if (entityInstance !== 'window' ) { %>window.<% } %>location.href=`/<%= entityPage %>/${<%= entityInstance %>.<%= primaryKey.name %>}/delete<%_ if (paginationPagination) { _%>?page=${paginationState.activePage}&sort=${paginationState.sort},${paginationState.order}<%_ } _%>`} color="danger" size="sm" data-cy="entityDeleteButton">
                             <FontAwesomeIcon icon="trash" /> <span className="d-none d-md-inline"><Translate contentKey="entity.action.delete">Delete</Translate></span>
                           </Button>
 <%_ } _%>

package/dist/generators/react/templates/src/main/webapp/app/entities/_entityFolder_/_entityModel_.model.ts.ejs

@@ -17,7 +17,7 @@
  limitations under the License.
 -%>
 <%
-const variablesWithTypes = this.generateEntityClientFields(primaryKey, fields, relationships, dto, 'string', embedded);
+const variablesWithTypes = this.generateEntityClientFields(primaryKey, fields, relationships, dto, customDateType = 'dayjs.Dayjs', embedded);
 const typeImports = this.generateEntityClientImports(relationships, dto);
 const defaultVariablesValues = this.generateEntityClientFieldDefaultValues(fields.filter(field => !field.id));
 const enumImports = this.generateEntityClientEnumImports(fields.filter(field => !field.id));

package/dist/generators/react/templates/src/main/webapp/app/shared/layout/header/header.scss.ejs

@@ -21,7 +21,7 @@ $header-color-secondary: #bbb;
 $header-color-hover: darken($header-color, 20%);
 
 /* ==========================================================================
-Developement Ribbon
+Development Ribbon
 ========================================================================== */
 .ribbon {
   background-color: rgba(170, 0, 0, 0.5);

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

@@ -129,7 +129,7 @@ export const createEntitySlice = <T, Reducers extends SliceCaseReducers<EntitySt
       extraReducers(builder);
       /*
        * Common rejection logic is handled here.
-       * If you want to add your own rejcetion logic, pass `skipRejectionHandling: true`
+       * If you want to add your own rejection logic, pass `skipRejectionHandling: true`
        * while calling `createEntitySlice`
        * */
       if (!skipRejectionHandling) {

package/dist/generators/react/templates/src/main/webapp/app/shared/util/date-utils.ts.ejs

@@ -23,6 +23,6 @@ import { APP_LOCAL_DATETIME_FORMAT } from 'app/config/constants';
 export const convertDateTimeFromServer = date =>
   date ? dayjs(date).format(APP_LOCAL_DATETIME_FORMAT) : null;
 
-export const convertDateTimeToServer = date => date ? dayjs(date).toDate() : null;
+export const convertDateTimeToServer = (date?: string) : dayjs.Dayjs | null => (date ? dayjs(date) : null);
 
 export const displayDefaultDateTime = () => dayjs().startOf('day').format(APP_LOCAL_DATETIME_FORMAT);

package/dist/generators/server/cleanup.mjs

@@ -186,4 +186,9 @@ export default function cleanupOldServerFilesTask(taskParam) {
             this.removeFile(`${application.javaPackageTestDir}config/TestContainersSpringContextCustomizerFactory.java`);
         }
     }
+    if (this.isJhipsterVersionLessThan('8.0.1')) {
+        if (application.authenticationTypeOauth2) {
+            this.removeFile(`${application.javaPackageSrcDir}security/oauth2/OAuthIdpTokenResponseDTO.java`);
+        }
+    }
 }

package/dist/generators/server/command.mjs

@@ -17,7 +17,7 @@
  * limitations under the License.
  */
 import chalk from 'chalk';
-import { GENERATOR_JAVA, GENERATOR_LIQUIBASE, GENERATOR_SPRING_DATA_RELATIONAL } from '../generator-list.mjs';
+import { GENERATOR_COMMON, GENERATOR_JAVA, GENERATOR_LIQUIBASE, GENERATOR_SPRING_DATA_RELATIONAL } from '../generator-list.mjs';
 import { APPLICATION_TYPE_GATEWAY, APPLICATION_TYPE_MICROSERVICE, APPLICATION_TYPE_MONOLITH } from '../../jdl/index.js';
 const command = {
     options: {
@@ -145,7 +145,18 @@ const command = {
                 },
             ],
         },
+        feignClient: {
+            description: 'Generate a feign client',
+            cli: {
+                type: Boolean,
+            },
+            prompt: {
+                type: 'confirm',
+                message: 'Do you want to generate a feign client?',
+            },
+            default: false,
+        },
     },
-    import: [GENERATOR_JAVA, GENERATOR_LIQUIBASE, GENERATOR_SPRING_DATA_RELATIONAL],
+    import: [GENERATOR_COMMON, GENERATOR_JAVA, GENERATOR_LIQUIBASE, GENERATOR_SPRING_DATA_RELATIONAL],
 };
 export default command;

package/dist/generators/server/entity-files.mjs

@@ -75,8 +75,8 @@ const filteringReactiveFiles = {
         },
     ],
 };
-export const respositoryFiles = {
-    respositoryFiles: [
+export const repositoryFiles = {
+    repositoryFiles: [
         {
             condition: generator => !generator.reactive && !generator.embedded && generator.databaseType !== COUCHBASE,
             ...javaMainPackageTemplatesBlock('_entityPackage_/'),
@@ -175,7 +175,7 @@ export const serverFiles = {
     ...restFiles,
     ...filteringFiles,
     ...filteringReactiveFiles,
-    ...respositoryFiles,
+    ...repositoryFiles,
     ...serviceFiles,
     ...dtoFiles,
 };

package/dist/generators/server/files.mjs

@@ -52,48 +52,12 @@ const reactiveConfigFiles = {
         },
     ],
 };
-const feignFiles = {
-    microserviceFeignFiles: [
-        {
-            path: `${SERVER_MAIN_SRC_DIR}_package_/`,
-            renameTo: moveToJavaPackageSrcDir,
-            templates: ['config/FeignConfiguration.java'],
-        },
-        {
-            condition: generator => generator.authenticationTypeOauth2,
-            path: `${SERVER_MAIN_SRC_DIR}_package_/`,
-            renameTo: moveToJavaPackageSrcDir,
-            templates: [
-                'security/oauth2/AuthorizationHeaderUtil.java',
-                'client/AuthorizedFeignClient.java',
-                'client/OAuth2InterceptedFeignConfiguration.java',
-                'client/TokenRelayRequestInterceptor.java',
-            ],
-        },
-        {
-            condition: generator => generator.authenticationTypeJwt,
-            path: `${SERVER_MAIN_SRC_DIR}_package_/`,
-            renameTo: moveToJavaPackageSrcDir,
-            templates: ['client/UserFeignClientInterceptor_jwt.java'],
-        },
-        {
-            condition: generator => generator.authenticationTypeOauth2,
-            path: `${SERVER_TEST_SRC_DIR}_package_/`,
-            renameTo: moveToJavaPackageTestDir,
-            templates: ['security/oauth2/AuthorizationHeaderUtilTest.java'],
-        },
-    ],
-};
 const oauth2Files = {
     oauth2Files: [
         {
             path: `${SERVER_MAIN_SRC_DIR}_package_/`,
             renameTo: moveToJavaPackageSrcDir,
-            templates: [
-                'security/oauth2/AudienceValidator.java',
-                'security/oauth2/JwtGrantedAuthorityConverter.java',
-                'security/oauth2/OAuthIdpTokenResponseDTO.java',
-            ],
+            templates: ['security/oauth2/AudienceValidator.java', 'security/oauth2/JwtGrantedAuthorityConverter.java'],
         },
         {
             path: `${SERVER_TEST_SRC_DIR}_package_/`,
@@ -581,7 +545,7 @@ export const baseServerFiles = {
         },
     ],
 };
-export const serverFiles = mergeSections(baseServerFiles, addSectionsCondition(jwtFiles, context => context.authenticationTypeJwt), addSectionsCondition(oauth2Files, context => context.authenticationTypeOauth2), addSectionsCondition(gatewayFiles, context => context.applicationTypeGateway), addSectionsCondition(accountFiles, context => context.generateAuthenticationApi), addSectionsCondition(feignFiles, context => !context.reactive && context.applicationTypeMicroservice), addSectionsCondition(userManagementFiles, context => context.generateUserManagement), addSectionsCondition(imperativeConfigFiles, context => !context.reactive), addSectionsCondition(reactiveConfigFiles, context => context.reactive), addSectionsCondition(swaggerFiles, context => context.enableSwaggerCodegen));
+export const serverFiles = mergeSections(baseServerFiles, addSectionsCondition(jwtFiles, context => context.authenticationTypeJwt), addSectionsCondition(oauth2Files, context => context.authenticationTypeOauth2), addSectionsCondition(gatewayFiles, context => context.applicationTypeGateway), addSectionsCondition(accountFiles, context => context.generateAuthenticationApi), addSectionsCondition(userManagementFiles, context => context.generateUserManagement), addSectionsCondition(imperativeConfigFiles, context => !context.reactive), addSectionsCondition(reactiveConfigFiles, context => context.reactive), addSectionsCondition(swaggerFiles, context => context.enableSwaggerCodegen));
 /**
  * @this {import('./index.mjs')}
  */

package/dist/generators/server/generator.mjs

@@ -23,14 +23,14 @@ import os from 'os';
 import chalk from 'chalk';
 import { getDBTypeFromDBValue, buildJavaGet as javaGetCall, javaBeanCase as javaBeanClassNameFormat, buildJavaGetter as javaGetter, buildJavaSetter as javaSetter, getJavaValueGeneratorForType as getJavaValueForType, getPrimaryKeyValue as getPKValue, generateKeyStore, addSpringFactory, hibernateSnakeCase, } from './support/index.mjs';
 import { askForOptionalItems, askForServerSideOpts, askForServerTestOpts } from './prompts.mjs';
-import { GENERATOR_BOOTSTRAP_APPLICATION, GENERATOR_SPRING_DATA_CASSANDRA, GENERATOR_COMMON, GENERATOR_SPRING_DATA_COUCHBASE, GENERATOR_CUCUMBER, GENERATOR_DOCKER, GENERATOR_SPRING_DATA_ELASTICSEARCH, GENERATOR_GATLING, GENERATOR_GRADLE, GENERATOR_JAVA, GENERATOR_SPRING_CLOUD_STREAM, GENERATOR_LANGUAGES, GENERATOR_MAVEN, GENERATOR_SPRING_DATA_MONGODB, GENERATOR_SPRING_DATA_NEO4J, GENERATOR_SERVER, GENERATOR_SPRING_CACHE, GENERATOR_SPRING_WEBSOCKET, GENERATOR_SPRING_DATA_RELATIONAL, } from '../generator-list.mjs';
+import { GENERATOR_BOOTSTRAP_APPLICATION, GENERATOR_SPRING_DATA_CASSANDRA, GENERATOR_COMMON, GENERATOR_SPRING_DATA_COUCHBASE, GENERATOR_CUCUMBER, GENERATOR_DOCKER, GENERATOR_SPRING_DATA_ELASTICSEARCH, GENERATOR_GATLING, GENERATOR_GRADLE, GENERATOR_JAVA, GENERATOR_SPRING_CLOUD_STREAM, GENERATOR_LANGUAGES, GENERATOR_MAVEN, GENERATOR_SPRING_DATA_MONGODB, GENERATOR_SPRING_DATA_NEO4J, GENERATOR_SERVER, GENERATOR_SPRING_CACHE, GENERATOR_SPRING_WEBSOCKET, GENERATOR_SPRING_DATA_RELATIONAL, GENERATOR_FEIGN_CLIENT, } from '../generator-list.mjs';
 import BaseApplicationGenerator from '../base-application/index.mjs';
 import { writeFiles } from './files.mjs';
 import { writeFiles as writeEntityFiles } from './entity-files.mjs';
 import { packageJson } from '../../lib/index.mjs';
 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, ADD_SPRING_MILESTONE_REPOSITORY, JHIPSTER_DEPENDENCIES_VERSION, } from '../generator-constants.mjs';
 import statistics from '../statistics.mjs';
-import { applicationTypes, authenticationTypes, buildToolTypes, databaseTypes, cacheTypes, serviceDiscoveryTypes, websocketTypes, fieldTypes, entityOptions, validations, reservedKeywords, searchEngineTypes, messageBrokerTypes, clientFrameworkTypes, testFrameworkTypes, } from '../../jdl/jhipster/index.mjs';
+import { applicationTypes, authenticationTypes, buildToolTypes, databaseTypes, cacheTypes, serviceDiscoveryTypes, websocketTypes, fieldTypes, entityOptions, validations, reservedKeywords, searchEngineTypes, messageBrokerTypes, clientFrameworkTypes, testFrameworkTypes, APPLICATION_TYPE_MICROSERVICE, } from '../../jdl/jhipster/index.mjs';
 import { stringifyApplicationData } from '../base-application/support/index.mjs';
 import { createBase64Secret, createSecret, createNeedleCallback } from '../base/support/index.mjs';
 import command from './command.mjs';
@@ -121,6 +121,23 @@ export default class JHipsterServerGenerator extends BaseApplicationGenerator {
             configure() {
                 this._configureServer();
             },
+            feignMigration() {
+                const { reactive, applicationType, feignClient } = this.jhipsterConfigWithDefaults;
+                if (feignClient) {
+                    if (reactive) {
+                        this.handleCheckFailure('Feign client is not supported by reactive applications.');
+                    }
+                    if (applicationType !== APPLICATION_TYPE_MICROSERVICE) {
+                        this.handleCheckFailure('Feign client is only supported by microservice applications.');
+                    }
+                }
+                if (feignClient === undefined &&
+                    this.isJhipsterVersionLessThan('8.0.1') &&
+                    reactive &&
+                    applicationType === APPLICATION_TYPE_MICROSERVICE) {
+                    this.jhipsterConfig.feignClient = true;
+                }
+            },
         });
     }
     get [BaseApplicationGenerator.CONFIGURING]() {
@@ -129,7 +146,7 @@ export default class JHipsterServerGenerator extends BaseApplicationGenerator {
     get composing() {
         return this.asComposingTaskGroup({
             async composing() {
-                const { buildTool, enableTranslation, databaseType, messageBroker, searchEngine, testFrameworks, websocket, cacheProvider } = this.jhipsterConfigWithDefaults;
+                const { buildTool, enableTranslation, databaseType, messageBroker, searchEngine, testFrameworks, websocket, cacheProvider, feignClient, } = this.jhipsterConfigWithDefaults;
                 if (buildTool === GRADLE) {
                     await this.composeWithJHipster(GENERATOR_GRADLE);
                 }
@@ -176,6 +193,9 @@ export default class JHipsterServerGenerator extends BaseApplicationGenerator {
                 if ([EHCACHE, CAFFEINE, HAZELCAST, INFINISPAN, MEMCACHED, REDIS].includes(cacheProvider)) {
                     await this.composeWithJHipster(GENERATOR_SPRING_CACHE);
                 }
+                if (feignClient) {
+                    await this.composeWithJHipster(GENERATOR_FEIGN_CLIENT);
+                }
             },
         });
     }
@@ -310,7 +330,7 @@ export default class JHipsterServerGenerator extends BaseApplicationGenerator {
                 const { applicationTypeMicroservice, applicationTypeGateway, clientFrameworkAny } = application;
                 if (entityConfig.microserviceName && !(applicationTypeMicroservice && clientFrameworkAny)) {
                     if (!entityConfig.searchEngine) {
-                        // If a non-microfrontent microservice entity, should be disabled by default.
+                        // If a non-microfrontend microservice entity, should be disabled by default.
                         entityConfig.searchEngine = NO_SEARCH_ENGINE;
                     }
                 }
@@ -335,7 +355,7 @@ export default class JHipsterServerGenerator extends BaseApplicationGenerator {
                     entityConfig.jpaMetamodelFiltering = false;
                 }
             },
-            configureEntityTable({ application, entityName, entityConfig, entityStorage }) {
+            configureEntityTable({ application, entityName, entityConfig }) {
                 if ((application.applicationTypeGateway && entityConfig.microserviceName) || entityConfig.skipServer)
                     return;
                 entityConfig.entityTableName = entityConfig.entityTableName || hibernateSnakeCase(entityName);
@@ -353,19 +373,11 @@ export default class JHipsterServerGenerator extends BaseApplicationGenerator {
                     (application.applicationType !== GATEWAY || !entityConfig.microserviceName)) {
                     entityConfig.pagination = NO_PAGINATION;
                 }
-                // Validate root entity json content
-                if (entityConfig.changelogDate === undefined) {
-                    const currentDate = this.dateFormatForLiquibase();
-                    if (entityStorage.existed) {
-                        this.log.verboseInfo(`changelogDate is missing in .jhipster/${entityConfig.name}.json, using ${currentDate} as fallback`);
-                    }
-                    entityConfig.changelogDate = currentDate;
-                }
                 if (entityConfig.incrementalChangelog === undefined) {
                     // Keep entity's original incrementalChangelog option.
                     entityConfig.incrementalChangelog =
                         application.incrementalChangelog &&
-                            !existsSync(this.destinationPath(`src/main/resources/config/liquibase/changelog/${entityConfig.changelogDate}_added_entity_${entityConfig.name}.xml`));
+                            !existsSync(this.destinationPath(`src/main/resources/config/liquibase/changelog/${entityConfig.annotations?.changelogDate}_added_entity_${entityConfig.name}.xml`));
                 }
             },
             configureFields({ application, entityConfig, entityName }) {
@@ -544,7 +556,7 @@ export default class JHipsterServerGenerator extends BaseApplicationGenerator {
                         'java:docker': './mvnw -ntp verify -DskipTests -Pprod jib:dockerBuild',
                         'java:docker:arm64': 'npm run java:docker -- -Djib-maven-plugin.architecture=arm64',
                         'backend:unit:test': `./mvnw -ntp${excludeWebapp} verify --batch-mode ${javaCommonLog} ${javaTestLog}`,
-                        'backend:build-cache': './mvnw dependency:go-offline',
+                        'backend:build-cache': './mvnw dependency:go-offline -ntp',
                         'backend:debug': './mvnw -Dspring-boot.run.jvmArguments="-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:8000"',
                     });
                 }
@@ -563,7 +575,7 @@ export default class JHipsterServerGenerator extends BaseApplicationGenerator {
                         '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',
+                        'backend:build-cache': 'npm run backend:info && npm run backend:nohttp:test && npm run ci:e2e:package -- -x webapp -x webapp_test',
                     });
                 }
                 scriptsStorage.set({
@@ -675,9 +687,13 @@ export default class JHipsterServerGenerator extends BaseApplicationGenerator {
         if (!config.devDatabaseType && config.prodDatabaseType) {
             dest.devDatabaseType = config.prodDatabaseType;
         }
-        // force variables unused by microservice applications
-        if (config.applicationType === MICROSERVICE) {
-            dest.websocket = NO_WEBSOCKET;
+        if (config.websocket && config.websocket !== NO_WEBSOCKET) {
+            if (config.reactive) {
+                throw new Error('Spring Websocket is not supported with reactive applications.');
+            }
+            if (config.applicationType === MICROSERVICE) {
+                throw new Error('Spring Websocket is not supported with microservice applications.');
+            }
         }
         const databaseType = config.databaseType;
         if (databaseType === NO_DATABASE) {

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

@@ -19,8 +19,9 @@
 import * as _ from 'lodash-es';
 import databaseMigrationOption from '../options/database-migration.mjs';
 import messageBrokerOption from '../options/message-broker.mjs';
+import { feignClientDefinition } from '../options/index.mjs';
 const { upperCase, snakeCase } = _;
-const jdlOptions = [databaseMigrationOption, messageBrokerOption];
+const jdlOptions = [databaseMigrationOption, messageBrokerOption, feignClientDefinition];
 const applicationConfig = {
     tokenConfigs: jdlOptions.map(option => ({
         name: upperCase(snakeCase(option.name)),
@@ -34,7 +35,9 @@ const applicationConfig = {
             msg: `${option.name} property`,
         },
     ])),
-    optionsValues: Object.fromEntries(jdlOptions.map(option => [option.name, Object.fromEntries(option.knownChoices.map(choice => [choice, choice]))])),
+    optionsValues: Object.fromEntries(jdlOptions
+        .filter(option => option.knownChoices)
+        .map(option => [option.name, Object.fromEntries(option.knownChoices.map(choice => [choice, choice]))])),
     optionsTypes: Object.fromEntries(jdlOptions.map(option => [
         option.name,
         {

package/dist/generators/server/options/feign-client.mjs

@@ -0,0 +1,24 @@
+/**
+ * Copyright 2013-2023 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.
+ */
+export const FEIGN_CLIENT = 'feignClient';
+export const feignClientDefinition = {
+    name: FEIGN_CLIENT,
+    type: 'boolean',
+    tokenType: 'BOOLEAN',
+};

package/dist/generators/server/options/index.mjs

@@ -18,3 +18,4 @@
  */
 export * from './database-migration.mjs';
 export * from './message-broker.mjs';
+export * from './feign-client.mjs';

package/dist/generators/server/resources/Dockerfile

@@ -10,52 +10,52 @@ LABEL ALIAS=jhipster-control-center
 FROM jhipster/consul-config-loader:v0.4.1
 LABEL ALIAS=consul-config-loader
 
-FROM postgres:16.0
+FROM postgres:16.1
 LABEL ALIAS=postgresql
 
-FROM quay.io/keycloak/keycloak:22.0.5
+FROM quay.io/keycloak/keycloak:23.0.1
 LABEL ALIAS=keycloak
 
 FROM mysql:8.2.0
 
-FROM mariadb:11.1.2
+FROM mariadb:11.2.2
 
-FROM mongo:7.0.2
+FROM mongo:7.0.4
 LABEL ALIAS=mongodb
 
-FROM couchbase/server:7.2.2
+FROM couchbase/server:7.2.3
 LABEL ALIAS=couchbase
 
-FROM cassandra:3.11.14
+FROM cassandra:4.1.3
 
 FROM mcr.microsoft.com/mssql/server:2019-CU16-GDR1-ubuntu-20.04
 LABEL ALIAS=mssql
 
-FROM neo4j:5.13.0
+FROM neo4j:5.14.0
 
 FROM hazelcast/management-center:5.3.3
 LABEL ALIAS=hazelcast
 
 FROM memcached:1.6.22-alpine
 
-FROM redis:7.2.2
+FROM redis:7.2.3
 
-FROM confluentinc/cp-kafka:7.5.1
+FROM confluentinc/cp-kafka:7.5.2
 LABEL ALIAS=kafka
 
-FROM confluentinc/cp-zookeeper:7.5.1
+FROM confluentinc/cp-zookeeper:7.5.2
 LABEL ALIAS=zookeeper
 
-FROM apachepulsar/pulsar:3.0.1
+FROM apachepulsar/pulsar:3.1.1
 LABEL ALIAS=pulsar
 
-FROM sonarqube:10.2.1-community
+FROM sonarqube:10.3.0-community
 LABEL ALIAS=sonar
 
-FROM docker.io/bitnami/consul:1.16.2
+FROM docker.io/bitnami/consul:1.17.0
 LABEL ALIAS=consul
 
-FROM prom/prometheus:v2.47.2
+FROM prom/prometheus:v2.48.0
 LABEL ALIAS=prometheus
 
 FROM prom/alertmanager:v0.26.0
@@ -64,7 +64,7 @@ LABEL ALIAS=prometheus-alertmanager
 FROM quay.io/coreos/prometheus-operator:v0.42.1
 LABEL ALIAS=prometheus-operator
 
-FROM grafana/grafana:10.2.0
+FROM grafana/grafana:10.2.2
 LABEL ALIAS=grafana
 
 FROM quay.io/coreos/grafana-watcher:v0.0.8
@@ -79,5 +79,5 @@ LABEL ALIAS=java-jre
 FROM swaggerapi/swagger-editor:latest
 LABEL ALIAS=swagger-editor
 
-FROM openzipkin/zipkin:2.24
+FROM openzipkin/zipkin:3.0
 LABEL ALIAS=zipkin

package/dist/generators/server/resources/gradle/libs.versions.toml

@@ -3,16 +3,16 @@ gradle-git-properties = { id = 'com.gorylenko.gradle-git-properties', version =
 
 node-gradle = { id = 'com.github.node-gradle.node', version = '7.0.1' }
 
-gradle-liquibase = { id = 'org.liquibase.gradle', version = '2.2.0' }
+gradle-liquibase = { id = 'org.liquibase.gradle', version = '2.2.1' }
 
 gradle-sonarqube = { id = 'org.sonarqube', version = '4.4.1.3373' }
 
-spotless-gradle-plugin = { id = 'com.diffplug.spotless', version = '6.22.0' }
+spotless-gradle-plugin = { id = 'com.diffplug.spotless', version = '6.23.3' }
 
 gradle-modernizer-plugin = { id = 'com.github.andygoossens.gradle-modernizer-plugin', version = '1.9.0' }
 
-gradle-enterprise = { id = 'com.gradle.enterprise', version = '3.15.1' }
+gradle-enterprise = { id = 'com.gradle.enterprise', version = '3.16' }
 
-common-custom-user-data-gradle-plugin = { id = 'com.gradle.common-custom-user-data-gradle-plugin', version = '1.12' }
+common-custom-user-data-gradle-plugin = { id = 'com.gradle.common-custom-user-data-gradle-plugin', version = '1.12.1' }
 
 gatling-gradle = { id = 'io.gatling.gradle', version = '3.9.5.6' }