generator-jhipster 7.8.0 → 7.9.1

package/generators/entity-client/templates/react/src/main/webapp/app/entities/entity.tsx.ejs

@@ -20,7 +20,7 @@ import React, { useState, useEffect } from 'react';
 <%_ if (paginationInfiniteScroll) { _%>
 import InfiniteScroll from 'react-infinite-scroll-component';
 <%_ } _%>
-import { Link, RouteComponentProps } from 'react-router-dom';
+import { Link, useLocation, useNavigate } from 'react-router-dom';
 import { Button, <% if (searchEngine) { %>Input, InputGroup, FormGroup, Form, Row, Col, <% } %>Table } from 'reactstrap';
 import {
   <%_ if (blobFields.length > 0) { _%>
@@ -61,14 +61,17 @@ import {
 <%_ } _%>
 } from './<%= entityFileName %>.reducer';
 
-export const <%= entityReactName %> = (props: RouteComponentProps<{url: string}>) => {
+export const <%= entityReactName %> = () => {
   const dispatch = useAppDispatch();
 
+  const location = useLocation();
+  const navigate = useNavigate();
+
 <%_ if (searchEngine) { _%>
   const [search, setSearch] = useState('');
 <%_ } _%>
 <%_ if (!paginationNo) { _%>
-  const [paginationState, setPaginationState] = useState(overridePaginationStateWithQueryParams(getSortState(props.location, ITEMS_PER_PAGE, '<%= primaryKey.name %>'), props.location.search));
+  const [paginationState, setPaginationState] = useState(overridePaginationStateWithQueryParams(getSortState(location, ITEMS_PER_PAGE, '<%= primaryKey.name %>'), location.search));
 <%_ } _%>
 <%_ if (paginationInfiniteScroll) { _%>
   const [sorting, setSorting] = useState(false);
@@ -208,8 +211,8 @@ export const <%= entityReactName %> = (props: RouteComponentProps<{url: string}>
   const sortEntities = () => {
     getAllEntities();
     const endURL = `?page=${paginationState.activePage}&sort=${paginationState.sort},${paginationState.order}`;
-    if (props.location.search !== endURL) {
-      props.history.push(`${props.location.pathname}${endURL}`);
+    if (location.search !== endURL) {
+      navigate(`${location.pathname}${endURL}`);
     }
   };
   <%_ } _%>
@@ -227,7 +230,7 @@ export const <%= entityReactName %> = (props: RouteComponentProps<{url: string}>
 
   <%_ if (paginationPagination) { _%>
   useEffect(() => {
-    const params = new URLSearchParams(props.location.search);
+    const params = new URLSearchParams(location.search);
     const page = params.get('page');
     const sort = params.get(SORT);
     if (page && sort) {
@@ -239,7 +242,7 @@ export const <%= entityReactName %> = (props: RouteComponentProps<{url: string}>
         order: sortSplit[1]
       });
     }
-  }, [props.location.search]);
+  }, [location.search]);
   <%_ } _%>
 
   const sort = p => () => {
@@ -282,8 +285,6 @@ export const <%= entityReactName %> = (props: RouteComponentProps<{url: string}>
 <%_ } _%>
   };
 
-  const { match } = props;
-
   return (
     <div>
       <h2 id="<%= entityFileName %>-heading" data-cy="<%= entityClass %>Heading">
@@ -324,7 +325,7 @@ export const <%= entityReactName %> = (props: RouteComponentProps<{url: string}>
 <%_ } _%>
       <div className="table-responsive">
 <%_ if (paginationInfiniteScroll) { _%>
-        <InfiniteScroll dataLength={<%= entityInstance %>List ? <%= entityInstance %>List.length : 0} 
+        <InfiniteScroll dataLength={<%= entityInstance %>List ? <%= entityInstance %>List.length : 0}
                         next={handleLoadMore}
                         hasMore={paginationState.activePage - 1 < links.next}
                         loader={<div className="loader">Loading ...</div>}>

package/generators/entity-client/templates/react/src/main/webapp/app/entities/index.tsx.ejs

@@ -17,9 +17,9 @@
  limitations under the License.
 -%>
 import React from 'react';
-import { Switch } from 'react-router-dom';
+import { Route } from 'react-router-dom';
 
-import ErrorBoundaryRoute from 'app/shared/error/error-boundary-route';
+import ErrorBoundaryRoutes from 'app/shared/error/error-boundary-routes';
 
 import <%= entityReactName %> from './<%= entityFileName %>';
 import <%= entityReactName %>Detail from './<%= entityFileName %>-detail';
@@ -28,20 +28,20 @@ import <%= entityReactName %>Update from './<%= entityFileName %>-update';
 import <%= entityReactName %>DeleteDialog from './<%= entityFileName %>-delete-dialog';
 <%_ } _%>
 
-const Routes = ({ match }) => (
-  <>
-    <Switch>
+const <%= entityReactName %>Routes = () => (
+  <ErrorBoundaryRoutes>
+    <Route index element={<<%= entityReactName %> />} />
 <%_ if (!readOnly) { _%>
-      <ErrorBoundaryRoute exact path={`${match.url}/new`} component={<%= entityReactName %>Update} />
-      <ErrorBoundaryRoute exact path={`${match.url}/:id/edit`} component={<%= entityReactName %>Update} />
+    <Route path="new" element={<<%= entityReactName %>Update />} />
 <%_ } _%>
-      <ErrorBoundaryRoute exact path={`${match.url}/:id`} component={<%= entityReactName %>Detail}  />
-      <ErrorBoundaryRoute path={match.url} component={<%= entityReactName %>} />
-    </Switch>
+    <Route path=":id">
+      <Route index element={<<%= entityReactName %>Detail />} />
 <%_ if (!readOnly) { _%>
-    <ErrorBoundaryRoute exact path={`${match.url}/:id/delete`} component={<%= entityReactName %>DeleteDialog} />
+      <Route path="edit" element={<<%= entityReactName %>Update />} />
+      <Route path="delete" element={<<%= entityReactName %>DeleteDialog />} />
 <%_ } _%>
-  </>
+    </Route>
+  </ErrorBoundaryRoutes>
 );
 
-export default Routes;
+export default <%= entityReactName %>Routes;

package/generators/entity-client/templates/react/src/main/webapp/app/entities/react_validators.ejs

@@ -17,35 +17,28 @@
  limitations under the License.
 -%>
 <%# Returns a string of all react validators required for the input field. -%>
-<%
-let result = '';
-
-if (field.fieldValidate === true) {
-    const validators = [];
-    if (field.fieldValidationRequired && !field.fieldTypeBoolean) {
-        validators.push('required: { value: true, message: translate(\'entity.validation.required\') }');
-    }
-    if (field.fieldValidationMinLength) {
-        validators.push('minLength: { value: ' + field.fieldValidateRulesMinlength + ', message: translate(\'entity.validation.minlength\', { min: ' + field.fieldValidateRulesMinlength + ' }) }');
-    }
-    if (field.fieldValidationMaxLength) {
-        validators.push('maxLength: { value: ' + field.fieldValidateRulesMaxlength + ', message: translate(\'entity.validation.maxlength\', { max: ' + field.fieldValidateRulesMaxlength + ' }) }');
-    }
-    if (field.fieldValidationMin) {
-        validators.push('min: { value: ' + field.fieldValidateRulesMin + ', message: translate(\'entity.validation.min\', { min: ' + field.fieldValidateRulesMin + ' }) }');
-    }
-    if (field.fieldValidationMax) {
-        validators.push('max: { value: ' + field.fieldValidateRulesMax + ', message: translate(\'entity.validation.max\', { max: ' + field.fieldValidateRulesMax + ' }) }');
-    }
-    if (field.fieldValidationPattern) {
-        validators.push('pattern: { value: /' + field.fieldValidateRulesPatternReact + '/, message: translate(\'entity.validation.pattern\', { pattern: \'' + field.fieldValidateRulesPatternReact.replace(/\\/g, '\\\\') + '\' }) }');
-    }
-    if (field.fieldTypeNumeric) {
-        validators.push('validate: v => isNumber(v) || translate(\'entity.validation.number\')');
-    }
-
-    result = validators.join(',\n                ');
-    result = `validate={{\n                ${result}\n                }}`;
-}
--%>
-<%- result -%>
+<%_ if (field.fieldValidate === true) { _%>
+        validate={{
+  <%_ if (field.fieldValidationRequired && !field.fieldTypeBoolean) { _%>
+          required: { value: true, message: translate('entity.validation.required') },
+  <%_ } _%>
+  <%_ if (field.fieldValidationMinLength) { _%>
+          minLength: { value: <%= field.fieldValidateRulesMinlength %>, message: translate('entity.validation.minlength', { min: <%= field.fieldValidateRulesMinlength %> }) },
+  <%_ } _%>
+  <%_ if (field.fieldValidationMaxLength) { _%>
+          maxLength: { value: <%= field.fieldValidateRulesMaxlength %>, message: translate('entity.validation.maxlength', { max: <%= field.fieldValidateRulesMaxlength %> }) },
+  <%_ } _%>
+  <%_ if (field.fieldValidationMin) { _%>
+          min: { value: <%= field.fieldValidateRulesMin %>, message: translate('entity.validation.min', { min: <%= field.fieldValidateRulesMin %> }) },
+  <%_ } _%>
+  <%_ if (field.fieldValidationMax) { _%>
+          max: { value: <%= field.fieldValidateRulesMax %>, message: translate('entity.validation.max', { max: <%= field.fieldValidateRulesMax %> }) },
+  <%_ } _%>
+  <%_ if (field.fieldValidationPattern) { _%>
+          pattern: { value: /<%= field.fieldValidateRulesPatternReact%>/, message: translate('entity.validation.pattern', { pattern: '<%= field.fieldValidateRulesPatternReact.replace(/\\/g, '\\\\')%>' }) },
+  <%_ } _%>
+  <%_ if (field.fieldTypeNumeric) { _%>
+          validate: v => isNumber(v) || translate('entity.validation.number'),
+  <%_ } _%>
+        }}
+<%_ } _%>

package/generators/entity-client/templates/vue/src/main/webapp/app/entities/entity-update.component.ts.ejs

@@ -206,7 +206,7 @@ export default class <%= entityAngularName %>Update extends <% if (fieldsContain
         <%_ } else {_%>
         const message = 'A <%= entityAngularName %> is updated with identifier ' + param.id;
         <%_ } _%>
-        return this.$root.$bvToast.toast(message.toString(), {
+        return (this.$root as any).$bvToast.toast(message.toString(), {
           toaster: 'b-toaster-top-center',
           title: 'Info',
           variant: 'info',
@@ -226,7 +226,7 @@ export default class <%= entityAngularName %>Update extends <% if (fieldsContain
         <%_ } else {_%>
         const message = 'A <%= entityAngularName %> is created with identifier ' + param.id;
         <%_ } _%>
-        this.$root.$bvToast.toast(message.toString(), {
+        (this.$root as any).$bvToast.toast(message.toString(), {
           toaster: 'b-toaster-top-center',
           title: 'Success',
           variant: 'success',

package/generators/entity-server/cleanup.js

@@ -0,0 +1,41 @@
+/**
+ * Copyright 2013-2022 the original author or authors from the JHipster project.
+ *
+ * This file is part of the JHipster project, see https://www.jhipster.tech/
+ * for more information.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/**
+ * Removes server files that where generated in previous JHipster versions and therefore
+ * need to be removed.
+ *
+ * @param {any} generator - reference to generator
+ * @param {string} javaDir - Java directory
+ * @param {string} testDir - Java tests directory
+ */
+function cleanupOldFiles(generator, javaDir, testDir) {
+  if (generator.isJhipsterVersionLessThan('7.6.1')) {
+    if (generator.searchEngineElasticsearch) {
+      generator.removeFile(`${javaDir}/repository/search/SortToFieldSortBuilderConverter.java`);
+    }
+  }
+  if (generator.isJhipsterVersionLessThan('7.7.1')) {
+    generator.removeFile(`${javaDir}/repository/search/SortToSortBuilderListConverter.java`);
+    generator.removeFile(`${testDir}/repository/search/${generator.entityClass}SearchRepositoryMockConfiguration.java`);
+  }
+}
+
+module.exports = {
+  cleanupOldFiles,
+};

package/generators/entity-server/files.js

@@ -19,6 +19,7 @@
 const _ = require('lodash');
 const chalk = require('chalk');
 const fs = require('fs');
+const entityServerCleanup = require('./cleanup');
 const utils = require('../utils');
 const constants = require('../generator-constants');
 const { CASSANDRA, COUCHBASE, MONGODB, NEO4J, SQL } = require('../../jdl/jhipster/database-types');
@@ -37,11 +38,7 @@ const SERVER_MAIN_RES_DIR = constants.SERVER_MAIN_RES_DIR;
 const TEST_DIR = constants.TEST_DIR;
 const SERVER_TEST_SRC_DIR = constants.SERVER_TEST_SRC_DIR;
 
-/**
- * The default is to use a file path string. It implies use of the template method.
- * For any other config an object { file:.., method:.., template:.. } can be used
- */
-const serverFiles = {
+const cassandraChangelogFiles = {
   dbChangelog: [
     {
       condition: generator => generator.databaseType === CASSANDRA && !generator.skipDbChangelog,
@@ -54,7 +51,10 @@ const serverFiles = {
       ],
     },
   ],
-  server: [
+};
+
+const modelFiles = {
+  model: [
     {
       path: SERVER_MAIN_SRC_DIR,
       templates: [
@@ -62,6 +62,31 @@ const serverFiles = {
           file: 'package/domain/Entity.java.jhi',
           renameTo: generator => `${generator.entityAbsoluteFolder}/domain/${generator.persistClass}.java.jhi`,
         },
+      ],
+    },
+  ],
+  modelTestFiles: [
+    {
+      path: SERVER_TEST_SRC_DIR,
+      templates: [
+        {
+          file: 'package/domain/EntityTest.java',
+          renameTo: generator => `${generator.entityAbsoluteFolder}/domain/${generator.persistClass}Test.java`,
+        },
+      ],
+    },
+  ],
+};
+
+/**
+ * The default is to use a file path string. It implies use of the template method.
+ * For any other config an object { file:.., method:.., template:.. } can be used
+ */
+const entityFiles = {
+  server: [
+    {
+      path: SERVER_MAIN_SRC_DIR,
+      templates: [
         {
           file: 'package/domain/Entity.java.jhi.javax_validation',
           renameTo: generator => `${generator.entityAbsoluteFolder}/domain/${generator.persistClass}.java.jhi.javax_validation`,
@@ -168,6 +193,11 @@ const serverFiles = {
         },
       ],
     },
+  ],
+};
+
+const restFiles = {
+  restFiles: [
     {
       condition: generator => !generator.embedded,
       path: SERVER_MAIN_SRC_DIR,
@@ -178,6 +208,31 @@ const serverFiles = {
         },
       ],
     },
+  ],
+  restTestFiles: [
+    {
+      condition: generator => !generator.embedded,
+      path: SERVER_TEST_SRC_DIR,
+      templates: [
+        {
+          file: 'package/web/rest/EntityResourceIT.java',
+          options: {
+            context: {
+              _,
+              chalkRed: chalk.red,
+              fs,
+              SERVER_TEST_SRC_DIR,
+            },
+          },
+          renameTo: generator => `${generator.entityAbsoluteFolder}/web/rest/${generator.entityClass}ResourceIT.java`,
+        },
+      ],
+    },
+  ],
+};
+
+const filteringFiles = {
+  filteringFiles: [
     {
       condition: generator => generator.jpaMetamodelFiltering,
       path: SERVER_MAIN_SRC_DIR,
@@ -192,6 +247,11 @@ const serverFiles = {
         },
       ],
     },
+  ],
+};
+
+const elasticSearchFiles = {
+  elasticSearchFiles: [
     {
       condition: generator => generator.searchEngine === ELASTICSEARCH && !generator.embedded,
       path: SERVER_MAIN_SRC_DIR,
@@ -202,6 +262,11 @@ const serverFiles = {
         },
       ],
     },
+  ],
+};
+
+const respositoryFiles = {
+  respositoryFiles: [
     {
       condition: generator => !generator.reactive && !generator.embedded && generator.databaseType !== COUCHBASE,
       path: SERVER_MAIN_SRC_DIR,
@@ -218,11 +283,12 @@ const serverFiles = {
       templates: [
         {
           file: 'package/repository/EntityRepositoryWithBagRelationships.java',
-          renameTo: generator => `${generator.packageFolder}/repository/${generator.entityClass}RepositoryWithBagRelationships.java`,
+          renameTo: generator => `${generator.entityAbsoluteFolder}/repository/${generator.entityClass}RepositoryWithBagRelationships.java`,
         },
         {
           file: 'package/repository/EntityRepositoryWithBagRelationshipsImpl.java',
-          renameTo: generator => `${generator.packageFolder}/repository/${generator.entityClass}RepositoryWithBagRelationshipsImpl.java`,
+          renameTo: generator =>
+            `${generator.entityAbsoluteFolder}/repository/${generator.entityClass}RepositoryWithBagRelationshipsImpl.java`,
         },
       ],
     },
@@ -254,6 +320,11 @@ const serverFiles = {
         },
       ],
     },
+  ],
+};
+
+const serviceFiles = {
+  serviceFiles: [
     {
       condition: generator => generator.service === SERVICE_IMPL && !generator.embedded,
       path: SERVER_MAIN_SRC_DIR,
@@ -278,6 +349,11 @@ const serverFiles = {
         },
       ],
     },
+  ],
+};
+
+const dtoFiles = {
+  dtoFiles: [
     {
       condition: generator => generator.dto === MAPSTRUCT,
       path: SERVER_MAIN_SRC_DIR,
@@ -297,36 +373,32 @@ const serverFiles = {
       ],
     },
   ],
-  test: [
+  dtoTestFiles: [
     {
-      condition: generator => !generator.embedded,
+      condition: generator => generator.dto === MAPSTRUCT,
       path: SERVER_TEST_SRC_DIR,
       templates: [
         {
-          file: 'package/web/rest/EntityResourceIT.java',
-          options: {
-            context: {
-              _,
-              chalkRed: chalk.red,
-              fs,
-              SERVER_TEST_SRC_DIR,
-            },
-          },
-          renameTo: generator => `${generator.entityAbsoluteFolder}/web/rest/${generator.entityClass}ResourceIT.java`,
+          file: 'package/service/dto/EntityDTOTest.java',
+          renameTo: generator => `${generator.entityAbsoluteFolder}/service/dto/${generator.asDto(generator.entityClass)}Test.java`,
         },
       ],
     },
     {
-      condition: generator => generator.searchEngine === ELASTICSEARCH && !generator.embedded,
+      condition: generator => generator.dto === MAPSTRUCT && [SQL, MONGODB, COUCHBASE, NEO4J].includes(generator.databaseType),
       path: SERVER_TEST_SRC_DIR,
       templates: [
         {
-          file: 'package/repository/search/EntitySearchRepositoryMockConfiguration.java',
-          renameTo: generator =>
-            `${generator.entityAbsoluteFolder}/repository/search/${generator.entityClass}SearchRepositoryMockConfiguration.java`,
+          file: 'package/service/mapper/EntityMapperTest.java',
+          renameTo: generator => `${generator.entityAbsoluteFolder}/service/mapper/${generator.entityClass}MapperTest.java`,
         },
       ],
     },
+  ],
+};
+
+const gatlingFiles = {
+  gatlingFiles: [
     {
       condition: generator => generator.gatlingTests,
       path: TEST_DIR,
@@ -338,38 +410,22 @@ const serverFiles = {
         },
       ],
     },
-    {
-      path: SERVER_TEST_SRC_DIR,
-      templates: [
-        {
-          file: 'package/domain/EntityTest.java',
-          renameTo: generator => `${generator.entityAbsoluteFolder}/domain/${generator.persistClass}Test.java`,
-        },
-      ],
-    },
-    {
-      condition: generator => generator.dto === MAPSTRUCT,
-      path: SERVER_TEST_SRC_DIR,
-      templates: [
-        {
-          file: 'package/service/dto/EntityDTOTest.java',
-          renameTo: generator => `${generator.entityAbsoluteFolder}/service/dto/${generator.asDto(generator.entityClass)}Test.java`,
-        },
-      ],
-    },
-    {
-      condition: generator => generator.dto === MAPSTRUCT && [SQL, MONGODB, COUCHBASE, NEO4J].includes(generator.databaseType),
-      path: SERVER_TEST_SRC_DIR,
-      templates: [
-        {
-          file: 'package/service/mapper/EntityMapperTest.java',
-          renameTo: generator => `${generator.entityAbsoluteFolder}/service/mapper/${generator.entityClass}MapperTest.java`,
-        },
-      ],
-    },
   ],
 };
 
+const serverFiles = {
+  ...cassandraChangelogFiles,
+  ...modelFiles,
+  ...entityFiles,
+  ...restFiles,
+  ...filteringFiles,
+  ...elasticSearchFiles,
+  ...respositoryFiles,
+  ...serviceFiles,
+  ...dtoFiles,
+  ...gatlingFiles,
+};
+
 module.exports = {
   writeFiles,
   serverFiles,
@@ -378,6 +434,15 @@ module.exports = {
 
 function writeFiles() {
   return {
+    setUp() {
+      this.javaDir = `${this.packageFolder}/`;
+      this.testDir = `${this.packageFolder}/`;
+    },
+
+    cleanupOldServerFiles() {
+      entityServerCleanup.cleanupOldFiles(this, `${SERVER_MAIN_SRC_DIR}${this.javaDir}`, `${SERVER_TEST_SRC_DIR}${this.testDir}`);
+    },
+
     writeServerFiles() {
       if (this.skipServer) return undefined;
 

package/generators/entity-server/index.js

@@ -18,7 +18,7 @@
  */
 /* eslint-disable consistent-return */
 const BaseBlueprintGenerator = require('../generator-base-blueprint');
-const { INITIALIZING_PRIORITY, PREPARING_PRIORITY, DEFAULT_PRIORITY, WRITING_PRIORITY, PREPARING_FIELDS_PRIORITY, POST_WRITING_PRIORITY } =
+const { PREPARING_PRIORITY, DEFAULT_PRIORITY, WRITING_PRIORITY, PREPARING_FIELDS_PRIORITY, POST_WRITING_PRIORITY } =
   require('../../lib/constants/priorities.cjs').compat;
 
 const constants = require('../generator-constants');
@@ -47,21 +47,6 @@ module.exports = class extends BaseBlueprintGenerator {
     }
   }
 
-  // Public API method used by the getter and also by Blueprints
-  _initializing() {
-    return {
-      setupConstants() {
-        // Make constants available in templates
-        this.LIQUIBASE_DTD_VERSION = constants.LIQUIBASE_DTD_VERSION;
-      },
-    };
-  }
-
-  get [INITIALIZING_PRIORITY]() {
-    if (this.delegateToBlueprint) return {};
-    return this._initializing();
-  }
-
   _preparing() {
     return {
       validateDatabaseSafety() {
@@ -116,8 +101,19 @@ module.exports = class extends BaseBlueprintGenerator {
       loadConfigIntoGenerator() {
         utils.copyObjectProps(this, this.entity);
 
-        this.testsNeedCsrf = [OAUTH2, SESSION].includes(this.entity.authenticationType);
-        this.officialDatabaseType = constants.OFFICIAL_DATABASE_TYPE_NAMES[this.entity.databaseType];
+        const { databaseType, authenticationType, reactive } = this.entity;
+        this.testsNeedCsrf = [OAUTH2, SESSION].includes(authenticationType);
+        this.officialDatabaseType = constants.OFFICIAL_DATABASE_TYPE_NAMES[databaseType];
+        let springDataDatabase;
+        if (this.databaseType !== SQL) {
+          springDataDatabase = this.officialDatabaseType;
+          if (reactive) {
+            springDataDatabase += ' reactive';
+          }
+        } else {
+          springDataDatabase = reactive ? 'R2DBC' : 'JPA';
+        }
+        this.springDataDescription = `Spring Data ${springDataDatabase}`;
       },
 
       /**
@@ -190,15 +186,6 @@ module.exports = class extends BaseBlueprintGenerator {
   // Public API method used by the getter and also by Blueprints
   _writing() {
     return {
-      cleanupOldElasticSearchFiles() {
-        if (!this.searchEngineElasticsearch) return;
-        if (this.isJhipsterVersionLessThan('7.6.1')) {
-          this.removeFile(`${this.entityAbsoluteFolder}/repository/search/SortToFieldSortBuilderConverter.java`);
-        }
-        if (this.isJhipsterVersionLessThan('7.7.1')) {
-          this.removeFile(`${this.entityAbsoluteFolder}/repository/search/SortToSortBuilderListConverter.java`);
-        }
-      },
       ...writeFiles(),
       ...super._missingPostWriting(),
     };

package/generators/entity-server/templates/partials/save_template.ejs

@@ -57,7 +57,7 @@ if (isUsingMapsId) {
         <%= returnPrefix %> <%= entityInstance %>Repository.save(<%= persistInstance %>);
   <%_ } _%>
   <%_ if (searchEngineElasticsearch) { _%>
-        <%= entityInstance %>SearchRepository.save(<%= resultEntity %>);
+        <%= entityInstance %>SearchRepository.index(<%= resultEntity %>);
     <%_ if (returnDirectly) { _%>
         return result;
     <%_ } _%>

package/generators/entity-server/templates/partials/update_template.ejs

@@ -67,7 +67,7 @@ if (isUsingMapsId) {
     <%_ } _%>
   <%_ } _%>
   <%_ if (searchEngineElasticsearch) { _%>
-        <%= entityInstance %>SearchRepository.save(<%= resultEntity %>);
+        <%= entityInstance %>SearchRepository.index(<%= resultEntity %>);
     <%_ if (returnDirectly) { _%>
         return result;
     <%_ } _%>

package/generators/entity-server/templates/src/main/java/package/common/get_all_template.ejs

@@ -26,7 +26,7 @@
 _%>
 <%_ if (jpaMetamodelFiltering) { _%>
     public ResponseEntity<List<<%= instanceType %>>> getAll<%= entityClassPlural %>(<%= entityClass %>Criteria criteria<% if (!paginationNo) { %>, @org.springdoc.api.annotations.ParameterObject Pageable pageable<% if (reactive) { %>, ServerHttpRequest request<% } %><% } %>) {
-        log.debug("REST request to get <%= entityClassPlural %> by criteria: {}", criteria);
+        log.debug("REST request to get <%= entityClassPlural %> by criteria: {}", criteria.toString().replaceAll("[\n\r\t]", "_"));
   <%_ if (paginationNo) { _%>
         List<<%= instanceType %>> entityList = <%= entityInstance %>QueryService.findByCriteria(criteria);
         return ResponseEntity.ok().body(entityList);
@@ -45,7 +45,7 @@ _%>
      */
     @GetMapping("/<%= entityApiUrl %>/count")
     public ResponseEntity<Long> count<%= entityClassPlural %>(<%= entityClass %>Criteria criteria) {
-        log.debug("REST request to count <%= entityClassPlural %> by criteria: {}", criteria);
+        log.debug("REST request to count <%= entityClassPlural %> by criteria: {}", criteria.toString().replaceAll("[\n\r\t]", "_"));
         return ResponseEntity.ok().body(<%= entityInstance %>QueryService.countByCriteria(criteria));
     }
 <%_ } else { _%>
@@ -55,17 +55,23 @@ _%>
     <%_ if (viaService) { _%>
         return <%= entityInstance %>Service.findAll()<% if (reactive) { %>.collectList()<% } %>;
     <%_ } else if (dtoMapstruct) { _%>
-        <%= reactive ? 'Flux' : 'List' %><<%= persistClass %>> <%= entityInstancePlural %> = <%= entityInstance %>Repository.<% if (implementsEagerLoadApis) { %>findAllWithEagerRelationships<% } else { %>findAll<% } %>();
+        <%= reactive ? 'Flux' : 'List' %><<%= persistClass %>> <%= entityInstancePlural %> = <%= entityInstance %>Repository.findAll();
       <%_ if (reactive) { _%>
         return <%= entityInstancePlural %>.map(<%= entityToDtoReference %>).collectList();
       <%_ } else { _%>
         return <%= entityListToDtoListReference %>(<%= entityInstancePlural %>);
       <%_ } _%>
+    <%_ } else if (implementsEagerLoadApis) { _%>
+        if (eagerload) {
+            return <%= entityInstance %>Repository.findAllWithEagerRelationships()<% if (reactive) { %>.collectList()<% } %>;
+        } else {
+            return <%= entityInstance %>Repository.findAll()<% if (reactive) { %>.collectList()<% } %>;
+        }
     <%_ } else { _%>
-        return <%= entityInstance %>Repository.<% if (implementsEagerLoadApis) { %>findAllWithEagerRelationships<% } else { %>findAll<% } %>()<% if (reactive) { %>.collectList()<% } %>;
+            return <%= entityInstance %>Repository.findAll()<% if (reactive) { %>.collectList()<% } %>;
     <%_ } _%>
   <%_ } else { _%>
-    public <% if (reactive) { %>Mono<ResponseEntity<List<<%= instanceType %>>>><% } else { %>ResponseEntity<List<<%= instanceType %>>><% } %> getAll<%= entityClassPlural %>(@org.springdoc.api.annotations.ParameterObject Pageable pageable<% if (reactive) { %>, ServerHttpRequest request<% } %><% if (fieldsContainNoOwnerOneToOne) { %>, @RequestParam(required = false) String filter<% } %><% if (implementsEagerLoadApis) { %>, @RequestParam(required = false, defaultValue = "true") boolean eagerload<% } %>) {<%- include('get_all_stream_template', {viaService: viaService}); -%>
+    public <% if (reactive) { %>Mono<ResponseEntity<List<<%= instanceType %>>>><% } else { %>ResponseEntity<List<<%= instanceType %>>><% } %> getAll<%= entityClassPlural %>(@org.springdoc.api.annotations.ParameterObject Pageable pageable<% if (reactive) { %>, ServerHttpRequest request<% } %><% if (fieldsContainNoOwnerOneToOne) { %>, @RequestParam(required = false) String filter<% } %><% if (implementsEagerLoadApis) { %>, @RequestParam(required = false, defaultValue = "false") boolean eagerload<% } %>) {<%- include('get_all_stream_template', {viaService: viaService}); -%>
         log.debug("REST request to get a page of <%= entityClassPlural %>");
     <%_ if (reactive) { _%>
         return <%= entityInstance %><%= viaService ? 'Service.countAll' : 'Repository.count' %>().zipWith(<%= entityInstance %><%= viaService ? 'Service.findAll' : 'Repository.findAllBy' %>(pageable)<%= reactiveEntityToDto %>.collectList())