generator-jhipster 7.4.1 → 7.5.0

package/generators/entity-client/templates/angular/src/main/webapp/app/entities/list/pagination-template.ejs

@@ -54,16 +54,16 @@
                 page: pageToLoad - 1,
                 query: this.currentSearch,
                 size: this.itemsPerPage,
-                sort: this.sort()}).subscribe(
-                    (res: HttpResponse<I<%= entityAngularName %>[]>) => {
+                sort: this.sort()}).subscribe({
+                    next: (res: HttpResponse<I<%= entityAngularName %>[]>) => {
                         this.isLoading = false;
                         this.onSuccess(res.body, res.headers, pageToLoad, !dontNavigate);
                     },
-                    () => {
+                    error: () => {
                         this.isLoading = false;
                         this.onError();
                     }
-                );
+                });
             return;
         }
 <%_ } _%>
@@ -71,16 +71,16 @@
         this.<%= entityInstance %>Service.query({
             page: pageToLoad - 1,
             size: this.itemsPerPage,
-            sort: this.sort()}).subscribe(
-                (res: HttpResponse<I<%= entityAngularName %>[]>) => {
+            sort: this.sort()}).subscribe({
+                next: (res: HttpResponse<I<%= entityAngularName %>[]>) => {
                     this.isLoading = false;
                     this.onSuccess(res.body, res.headers, pageToLoad, !dontNavigate);
                 },
-                () => {
+                error: () => {
                     this.isLoading = false;
                     this.onError();
                 }
-            );
+            });
     }
 
 <%_ if (searchEngine) { _%>

package/generators/entity-client/templates/angular/src/main/webapp/app/entities/route/entity-management-routing-resolve.service.spec.ts.ejs

@@ -19,12 +19,11 @@
 <%_
 const tsKeyId = generateTestEntityId(primaryKey.type);
 _%>
-jest.mock('@angular/router');
-
 import { TestBed } from '@angular/core/testing';
 import { HttpResponse } from '@angular/common/http';
 import { HttpClientTestingModule } from '@angular/common/http/testing';
-import { ActivatedRouteSnapshot, Router } from '@angular/router';
+import { ActivatedRouteSnapshot, ActivatedRoute, Router, convertToParamMap } from '@angular/router';
+import { RouterTestingModule } from '@angular/router/testing';
 import { of } from 'rxjs';
 
 import { I<%= entityAngularName %>, <%= entityAngularName %> } from '../<%= entityFileName %>.model';
@@ -41,11 +40,21 @@ describe('<%= entityAngularName %> routing resolve service', () => {
 
   beforeEach(() => {
     TestBed.configureTestingModule({
-      imports: [HttpClientTestingModule],
-      providers: [Router, ActivatedRouteSnapshot],
+      imports: [HttpClientTestingModule, RouterTestingModule.withRoutes([])],
+      providers: [
+        {
+          provide: ActivatedRoute,
+          useValue: {
+            snapshot: {
+              paramMap: convertToParamMap({})
+            },
+          },
+        },
+      ],
     });
     mockRouter = TestBed.inject(Router);
-    mockActivatedRouteSnapshot = TestBed.inject(ActivatedRouteSnapshot);
+    jest.spyOn(mockRouter, 'navigate').mockImplementation(() => Promise.resolve(true));
+    mockActivatedRouteSnapshot = TestBed.inject(ActivatedRoute).snapshot;
     routingResolveService = TestBed.inject(<%= entityAngularName %>RoutingResolveService);
     service = TestBed.inject(<%= entityAngularName %>Service);
     result<%= entityAngularName %> = undefined;

package/generators/entity-client/templates/angular/src/main/webapp/app/entities/service/entity.service.spec.ts.ejs

@@ -25,7 +25,7 @@ _%>
 import { TestBed } from '@angular/core/testing';
 import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing';
 <%_ if (fieldsContainDate) { _%>
-import * as dayjs from 'dayjs';
+import dayjs from 'dayjs/esm';
 <%_ } _%>
 
 <%_ if (fieldsContainDate) { _%>

package/generators/entity-client/templates/angular/src/main/webapp/app/entities/service/entity.service.ts.ejs

@@ -27,7 +27,7 @@ import { HttpClient, HttpResponse } from '@angular/common/http';
 import { Observable } from 'rxjs';
 <%_ if (fieldsContainDate) { _%>
 import { map } from 'rxjs/operators';
-import * as dayjs from 'dayjs';
+import dayjs from 'dayjs/esm';
 <%_ } _%>
 
 import { isPresent } from 'app/core/util/operators';

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

@@ -25,14 +25,13 @@ const allRelationshipsByEntityNeedingOptions = Object
 const testEntityPrimaryKey0 = generateTestEntityPrimaryKey(primaryKey, 0);
 const testEntityPrimaryKey1 = generateTestEntityPrimaryKey(primaryKey, 1);
 _%>
-jest.mock('@angular/router');
-
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { HttpResponse } from '@angular/common/http';
 import { HttpClientTestingModule } from '@angular/common/http/testing';
 import { FormBuilder } from '@angular/forms';
 import { ActivatedRoute } from '@angular/router';
-import { of, Subject } from 'rxjs';
+import { RouterTestingModule } from '@angular/router/testing';
+import { of, Subject, from } from 'rxjs';
 
 import { <%= entityAngularName %>Service } from '../service/<%= entityFileName %>.service';
 import { I<%= entityAngularName %>, <%= entityAngularName %> } from '../<%= entityFileName %>.model';
@@ -62,9 +61,17 @@ describe('<%= entityAngularName %> Management Update Component', () => {
 
     beforeEach(() => {
         TestBed.configureTestingModule({
-            imports: [HttpClientTestingModule],
+            imports: [HttpClientTestingModule, RouterTestingModule.withRoutes([])],
             declarations: [<%= entityAngularName %>UpdateComponent],
-            providers: [FormBuilder, ActivatedRoute],
+            providers: [
+              FormBuilder,
+              {
+                provide: ActivatedRoute,
+                useValue: {
+                  params: from([{}]),
+                },
+              },
+            ]
         })
         .overrideTemplate(<%= entityAngularName %>UpdateComponent, '')
         .compileComponents();

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

@@ -43,7 +43,7 @@ import { Observable } from 'rxjs';
 import { finalize<% if (relationships.some(rel => rel.ownerSide === true)) { %>, map<% } %> } from 'rxjs/operators';
 
 <%_ if (fieldsContainInstant || fieldsContainZonedDateTime) { _%>
-import * as dayjs from 'dayjs';
+import dayjs from 'dayjs/esm';
 import { DATE_TIME_FORMAT } from 'app/config/input.constants';
 <%_ } _%>
 
@@ -239,10 +239,10 @@ _%>
     <%_ } _%>
 
     protected subscribeToSaveResponse(result: Observable<HttpResponse<I<%= entityAngularName %>>>): void {
-        result.pipe(finalize(() => this.onSaveFinalize())).subscribe(
-            () => this.onSaveSuccess(),
-            () => this.onSaveError()
-        );
+        result.pipe(finalize(() => this.onSaveFinalize())).subscribe({
+            next: () => this.onSaveSuccess(),
+            error: () => this.onSaveError()
+        });
     }
 
     protected onSaveSuccess(): void {

package/generators/entity-client/templates/angular/src/test/javascript/e2e/entities/entity.spec.ts.ejs

@@ -42,7 +42,7 @@ import {
     <%_ } _%>
 } from './<%= entityFileName %>.page-object';
 <%_ if (fieldsContainBlobOrImage) { _%>
-import * as path from 'path';
+import path from 'path';
 <%_ } _%>
 
 const expect = chai.expect;

package/generators/entity-client/templates/common/src/test/javascript/cypress/integration/entity/entity.spec.ts.ejs

@@ -48,8 +48,8 @@ describe('<%= entityClass %> e2e test', () => {
 
   const <%= entityInstance %>PageUrl = '/<%= entityPage %>';
   const <%= entityInstance %>PageUrlPattern = new RegExp('/<%= entityPage %>(\\?.*)?$');
-  const username = Cypress.env('E2E_USERNAME') ?? 'admin';
-  const password = Cypress.env('E2E_PASSWORD') ?? 'admin';
+  const username = Cypress.env('E2E_USERNAME') ?? 'user';
+  const password = Cypress.env('E2E_PASSWORD') ?? 'user';
   const <%= entityInstance %>Sample = <%- JSON.stringify(generateTestEntity(sampleFields.map(field => field.reference))) %>;
 
   let <%= entityInstance %>: any;
@@ -57,30 +57,9 @@ describe('<%= entityClass %> e2e test', () => {
   <%_ if (skipCreateTest) { _%>// <%_ } _%>let <%= otherEntity.entityInstance %>: any;
 <%_ } _%>
 
-<%_ if (authenticationTypeOauth2) { _%>
   beforeEach(() => {
-    cy.getOauth2Data();
-    cy.get('@oauth2Data').then(oauth2Data => {
-      cy.oauthLogin(oauth2Data, username, password);
-    });
-    cy.intercept('GET', '/<%= baseApi + entityApiUrl %>').as('entitiesRequest');
-    cy.visit('');
-    cy.get(entityItemSelector).should('exist');
-  });
-
-  beforeEach(() => {
-    Cypress.Cookies.preserveOnce('XSRF-TOKEN', 'JSESSIONID');
-  })
-<%_ } else { _%>
-  before(() => {
-    cy.window().then((win) => {
-      win.sessionStorage.clear()
-    });
-    cy.visit('');
     cy.login(username, password);
-    cy.get(entityItemSelector).should('exist');
   });
-<%_ } _%>
 
 <%_ if (requiredOtherEntities.length > 0) { _%>
   <%_ if (skipCreateTest) { _%>
@@ -159,13 +138,6 @@ describe('<%= entityClass %> e2e test', () => {
    */
   <%_ } _%>
 
-<%_ } _%>
-<%_ if (authenticationTypeOauth2) { _%>
-
-  afterEach(() => {
-    cy.oauthLogout();
-    cy.clearCache();
-  });
 <%_ } _%>
 
   it('<%= entityClassPlural %> menu should load <%= entityClassPlural %> page', () => {
@@ -191,11 +163,11 @@ describe('<%= entityClass %> e2e test', () => {
       });
 
       it('should load create <%= entityClass %> page', () => {
-        cy.get(entityCreateButtonSelector).click({force: true});
+        cy.get(entityCreateButtonSelector).click();
         cy.url().should('match', new RegExp('/<%= entityPage %>/new$'));
         cy.getEntityCreateUpdateHeading('<%= entityClass %>');
         cy.get(entityCreateSaveButtonSelector).should('exist');
-        cy.get(entityCreateCancelButtonSelector).click({force: true});
+        cy.get(entityCreateCancelButtonSelector).click();
         cy.wait('@entitiesRequest').then(({ response }) => {
           expect(response!.statusCode).to.equal(200);
         });
@@ -213,7 +185,7 @@ describe('<%= entityClass %> e2e test', () => {
         cy.authenticatedRequest({
           method: 'POST',
           url: '/<%= baseApi + entityApiUrl %>',
-  <% if (requiredRelationships.length > 0) { %>
+  <%_ if (requiredRelationships.length > 0) { _%>
           body: {
             ...<%= entityInstance %>Sample,
     <%_ for (relationship of requiredRelationships) { _%>
@@ -234,6 +206,11 @@ describe('<%= entityClass %> e2e test', () => {
             },
             {
               statusCode: 200,
+  <%_ if (!paginationNo) { _%>
+              headers: {
+                link: '<http://localhost/<%= baseApi + entityApiUrl %>?page=0&size=20>; rel="last",<http://localhost/<%= baseApi + entityApiUrl %>?page=0&size=20>; rel="first"',
+              },
+  <%_ } _%>
               body: [<%= entityInstance %>],
             }
           ).as('entitiesRequestInternal');
@@ -263,7 +240,7 @@ describe('<%= entityClass %> e2e test', () => {
       it('detail button click should load details <%= entityClass %> page', () => {
         cy.get(entityDetailsButtonSelector).first().click();
         cy.getEntityDetailsHeading('<%= entityInstance %>');
-        cy.get(entityDetailsBackButtonSelector).click({force: true});
+        cy.get(entityDetailsBackButtonSelector).click();
         cy.wait('@entitiesRequest').then(({ response }) => {
           expect(response!.statusCode).to.equal(200);
         });
@@ -275,7 +252,7 @@ describe('<%= entityClass %> e2e test', () => {
         cy.get(entityEditButtonSelector).first().click();
         cy.getEntityCreateUpdateHeading('<%= entityClass %>');
         cy.get(entityCreateSaveButtonSelector).should('exist');
-        cy.get(entityCreateCancelButtonSelector).click({force: true});
+        cy.get(entityCreateCancelButtonSelector).click();
         cy.wait('@entitiesRequest').then(({ response }) => {
           expect(response!.statusCode).to.equal(200);
         });
@@ -291,7 +268,7 @@ describe('<%= entityClass %> e2e test', () => {
         cy.wait('@dialogDeleteRequest');
   <%_ } _%>
         cy.getEntityDeleteDialogHeading('<%= entityInstance %>').should('exist');
-        cy.get(entityConfirmDeleteButtonSelector).click({force: true});
+        cy.get(entityConfirmDeleteButtonSelector).click();
         cy.wait('@deleteEntityRequest').then(({ response }) => {
           expect(response!.statusCode).to.equal(204);
         });
@@ -311,7 +288,7 @@ describe('<%= entityClass %> e2e test', () => {
   describe('new <%= entityClass %> page', () => {
     beforeEach(() => {
       cy.visit(`${<%= entityInstance %>PageUrl}`);
-      cy.get(entityCreateButtonSelector).click({force: true});
+      cy.get(entityCreateButtonSelector).click();
       cy.getEntityCreateUpdateHeading('<%= entityClass %>');
     });
 

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

@@ -167,8 +167,9 @@ export const <%= entityReactName %>Slice = createEntitySlice({
         searchEntities,
         <%_ } _%>
         ), (state, action) => {
+          const { data<% if (!paginationNo) { %>, headers<% } %> } = action.payload;
         <%_ if (paginationInfiniteScroll) { _%>
-          const links = parseHeaderForLinks(action.payload.headers.link);
+          const links = parseHeaderForLinks(headers.link);
         <%_ } _%>
 
           return {
@@ -177,14 +178,14 @@ export const <%= entityReactName %>Slice = createEntitySlice({
         <%_ if (paginationInfiniteScroll) { _%>
           <%_ if (!databaseTypeCassandra) { _%>
             links,
-            entities: loadMoreDataWhenScrolled(state.entities, action.payload.data, links),
+            entities: loadMoreDataWhenScrolled(state.entities, data, links),
           <%_ } _%>
         <%_ } else { _%>
-            entities: action.payload.data,
+            entities: data,
         <%_ } _%>
         <%_ if (!paginationNo) { _%>
           <%_ if (!databaseTypeCassandra) { _%>
-            totalItems: parseInt(action.payload.headers['x-total-count'], 10)
+            totalItems: parseInt(headers['x-total-count'], 10)
           <%_ } _%>
         <%_ } _%>
           };

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

@@ -66,16 +66,16 @@ import AlertService from '@/shared/alert/alert.service';
       hasManyToMany = true;
     } _%>
     <%_ if (!importEntitiesSeen.includes(otherEntityAngularName)) { _%>
-      <% if (relationship.otherEntityUser && !authenticationTypeOauth2) { %>
-import UserService from '@/admin/user-management/user-management.service';
-  <% } else if (relationship.otherEntityUser && authenticationTypeOauth2) { %>
-import UserOAuth2Service from '@/entities/user/user.oauth2.service';
-  <% } else if (!relationship.otherEntityUser) { %>
+      <% if (relationship.otherEntityUser && (!skipUserManagement || authenticationTypeOauth2)) { %>
+import UserService from '@/entities/user/user.service';
+      <% } else { %>
 import <%= otherEntityAngularName %>Service from '@/entities/<%= otherEntityClientRootFolder %><%= otherEntityFolderName %>/<%= otherEntityFileName %>.service';
 import { I<%= otherEntityAngularName %> } from '@/shared/model/<%= otherEntityModelName %>.model';
-  <% } %>
+      <% } %>
+    <%_ } _%>
+    <%_ importEntitiesSeen.push(otherEntityAngularName); _%>
+  <%_ } _%>
 <%_ } _%>
-<%_ importEntitiesSeen.push(otherEntityAngularName); } } _%>
 import { I<%= entityAngularName %>, <%= entityAngularName %> } from '@/shared/model/<%= entityModelFileName %>.model';
 import <%= entityAngularName %>Service from './<%= entityFileName %>.service';
 <%_ const enumImports = generateEntityClientEnumImports(fields); _%>
@@ -142,16 +142,18 @@ export default class <%= entityAngularName %>Update extends <% if (fieldsContain
         const otherEntityAngularName = relationship.otherEntityAngularName;
   _%>
   <%_ if (!entitiesSeen.includes(otherEntityAngularName)) { %>
-  <%_ if (otherEntityAngularName === 'User' && authenticationType === 'oauth2') { _%>
-  @Inject('userOAuth2Service') private userOAuth2Service: () => UserOAuth2Service;
-  <%_ } else {_%>
+      <% if (relationship.otherEntityUser && (!skipUserManagement || authenticationTypeOauth2)) { %>
+  @Inject('userService') private userService: () => UserService;
+      <% } else { %>
   @Inject('<%= otherEntityName %>Service') private <%= otherEntityName %>Service: () => <%= otherEntityAngularName %>Service;
-  <%_ } _%>
-  <%_ } _%>
-  <%_ if (!entitiesSeen.includes(otherEntityNamePlural)) { %>
+      <%_ } _%>
+    <%_ } _%>
+    <%_ if (!entitiesSeen.includes(otherEntityNamePlural)) { %>
   public <%= otherEntityNamePlural %> : <% if (otherEntityAngularName === 'User') { %>Array<any><%_ } else { _%>I<%= otherEntityAngularName %>[]<%_ } _%> = [];
+    <%_ } _%>
+    <%_ entitiesSeen.push(otherEntityAngularName);entitiesSeen.push(otherEntityNamePlural); _%>
   <%_ } _%>
-  <%_ entitiesSeen.push(otherEntityAngularName);entitiesSeen.push(otherEntityNamePlural); } } _%>
+<%_ } _%>
   <%_ enumImports.forEach( (importedPath, importedType) => { _%>
   public <%- _.lowerFirst(importedType) %>Values : string[] = Object.keys(<%- importedType %>);
   <%_ }); _%>
@@ -317,14 +319,16 @@ _%>
           if (!entitiesSet.has(otherEntityName)) {
             entitiesSet.add(otherEntityName);
     _%>
-    <%_ if (otherEntityAngularName === 'User' && authenticationType === 'oauth2') { _%>
-    this.userOAuth2Service().retrieve().then((res) => {
-    <%_ } else {_%>
+      <% if (relationship.otherEntityUser && (!skipUserManagement || authenticationTypeOauth2)) { %>
+    this.userService().retrieve().then((res) => {
+      <%_ } else { _%>
     this.<%= otherEntityName %>Service().retrieve().then((res) => {
-    <%_ } _%>
+      <%_ } _%>
       this.<%= otherEntityNamePlural %> = res.data;
     });
-    <%_ } } } _%>
+      <%_ } _%>
+    <%_ } _%>
+  <%_ } _%>
   }
 
   <%_ if (hasManyToMany) { _%>

package/generators/entity-client/templates/vue/src/test/javascript/spec/app/entities/entity-update.component.spec.ts.ejs

@@ -45,10 +45,8 @@ import <%= entityAngularName %>Service from '@/entities/<%= entityFolderName %>/
     const otherEntityFolderName = relationship.otherEntityFileName;
     const otherEntityClientRootFolder = relationship.otherEntityClientRootFolder; _%>
     <%_ if (!importEntitiesSeen.includes(otherEntityAngularName)) { _%>
-      <% if (relationship.otherEntityUser && !authenticationTypeOauth2) { %>
-import UserService from '@/admin/user-management/user-management.service';
-      <%_ } else if (relationship.otherEntityUser && authenticationTypeOauth2) { _%>
-import UserOAuth2Service from '@/entities/user/user.oauth2.service';
+      <% if (relationship.otherEntityUser && (!skipUserManagement || authenticationTypeOauth2)) { %>
+import UserService from '@/entities/user/user.service';
       <% } else if (!relationship.otherEntityUser) { %>
 import <%= otherEntityAngularName %>Service from '@/entities/<%= otherEntityClientRootFolder %><%= otherEntityFolderName %>/<%= otherEntityFileName %>.service';
       <%_ } _%>
@@ -101,8 +99,8 @@ describe('Component Tests', () => {
       const otherEntityName = relationship.otherEntityName;
       const otherEntityAngularName = relationship.otherEntityAngularName; _%>
     <%_ if (!entitiesSeen.includes(otherEntityAngularName)) { %>
-      <%_ if (relationship.otherEntityUser && authenticationTypeOauth2) { _%>
-          userOAuth2Service: () => new UserOAuth2Service(),
+      <% if (relationship.otherEntityUser && (!skipUserManagement || authenticationTypeOauth2)) { %>
+          userService: () => new UserService(),
       <%_ } else { _%>
           <%= otherEntityName %>Service: () =>
             sinon.createStubInstance<<%= otherEntityAngularName %>Service>(<%= otherEntityAngularName %>Service, {

package/generators/entity-server/files.js

@@ -172,6 +172,16 @@ const serverFiles = {
         },
       ],
     },
+    {
+      condition: generator => generator.searchEngine === ELASTICSEARCH && !generator.embedded && !generator.paginationNo,
+      path: SERVER_MAIN_SRC_DIR,
+      templates: [
+        {
+          file: 'package/repository/search/SortToFieldSortBuilderConverter.java',
+          renameTo: generator => `${generator.entityAbsoluteFolder}/repository/search/SortToFieldSortBuilderConverter.java`,
+        },
+      ],
+    },
     {
       condition: generator => !generator.reactive && !generator.embedded && generator.databaseType !== COUCHBASE,
       path: SERVER_MAIN_SRC_DIR,

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

@@ -25,7 +25,7 @@
     const reactiveEntityToDto = (dtoMapstruct && !viaService) ? `.map(${entityToDtoReference})` : '';
 _%>
 <%_ if (jpaMetamodelFiltering) { _%>
-    public ResponseEntity<List<<%= instanceType %>>> getAll<%= entityClassPlural %>(<%= entityClass %>Criteria criteria<% if (!paginationNo) { %>, Pageable pageable<% if (reactive) { %>, ServerHttpRequest request<% } %><% } %>) {
+    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);
   <%_ if (paginationNo) { _%>
         List<<%= instanceType %>> entityList = <%= entityInstance %>QueryService.findByCriteria(criteria);
@@ -65,7 +65,7 @@ _%>
         return <%= entityInstance %>Repository.<% if (relationshipsContainEagerLoad) { %>findAllWithEagerRelationships<% } else { %>findAll<% } %>()<% if (reactive) { %>.collectList()<% } %>;
     <%_ } _%>
   <%_ } else { _%>
-    public <% if (reactive) { %>Mono<ResponseEntity<List<<%= instanceType %>>>><% } else { %>ResponseEntity<List<<%= instanceType %>>><% } %> getAll<%= entityClassPlural %>(Pageable pageable<% if (reactive) { %>, ServerHttpRequest request<% } %><% if (fieldsContainNoOwnerOneToOne) { %>, @RequestParam(required = false) String filter<% } %><% if (relationshipsContainEagerLoad) { %>, @RequestParam(required = false, defaultValue = "false") 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 (relationshipsContainEagerLoad) { %>, @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) { _%>
       <%_ if (relationshipsContainEagerLoad) { _%>

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

@@ -27,7 +27,7 @@ if (paginationNo) { %>
     public <% if (reactive) { %>Mono<<% } %>List<<%= instanceType %>><% if (reactive) { %>><% } %> search<%= entityClassPlural %>(@RequestParam String query) {
         log.debug("REST request to search <%= entityClassPlural %> for query {}", query);<%- include('search_stream_template', {viaService: viaService, fromResource: true}); -%>
 <% } if (!paginationNo) { %>
-    public <% if (reactive) { %>Mono<<% } %>ResponseEntity<<%= listOrFlux %><<%= instanceType %>>><% if (reactive) { %>><% } %> search<%= entityClassPlural %>(@RequestParam String query, Pageable pageable<% if (reactive) { %>, ServerHttpRequest request<% } %>) {
+    public <% if (reactive) { %>Mono<<% } %>ResponseEntity<<%= listOrFlux %><<%= instanceType %>>><% if (reactive) { %>><% } %> search<%= entityClassPlural %>(@RequestParam String query, @org.springdoc.api.annotations.ParameterObject Pageable pageable<% if (reactive) { %>, ServerHttpRequest request<% } %>) {
         log.debug("REST request to search for a page of <%= entityClassPlural %> for query {}", query);
   <%_ if (!reactive) { _%>
     <%_ if (viaService) { _%>

package/generators/entity-server/templates/src/main/java/package/domain/Entity.java.jhi.ejs

@@ -50,11 +50,8 @@ package <%= entityAbsolutePackage %>.domain;
 <%_ if (relationshipsContainOtherSideIgnore) { _%>
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 <%_ } _%>
-<%_ if (!dtoMapstruct && typeof javadoc !== 'undefined') { _%>
-import io.swagger.annotations.ApiModel;
-<%_ } _%>
-<%_ if (!dtoMapstruct && importApiModelProperty) { _%>
-import io.swagger.annotations.ApiModelProperty;
+<%_ if (!dtoMapstruct && (typeof javadoc !== 'undefined' || importApiModelProperty)) { _%>
+import io.swagger.v3.oas.annotations.media.Schema;
 <%_ } _%>
 
 import java.io.Serializable;
@@ -91,7 +88,7 @@ import <%= otherEntity.entityAbsoluteClass %>;
 <%_ } else { _%>
 <%- formatAsClassJavadoc(javadoc) %>
   <%_ if (!dtoMapstruct) { _%>
-@ApiModel(description = "<%- formatAsApiDescription(javadoc) %>")
+@Schema(description = "<%- formatAsApiDescription(javadoc) %>")
   <%_ } _%>
 <%_ } _%>
 <&- fragments.annotationSection() -&>
@@ -111,7 +108,7 @@ public class <%= persistClass %> implements Serializable {
 <%- formatAsFieldJavadoc(field.javadoc) %>
   <%_ } _%>
   <%_ if (!dtoMapstruct && typeof field.javadoc !== 'undefined') { _%>
-    @ApiModelProperty(value = "<%- formatAsApiDescription(field.javadoc) %>"<% if (field.fieldValidationRequired) { %>, required = true<% } %>)
+    @Schema(description = "<%- formatAsApiDescription(field.javadoc) %>"<% if (field.fieldValidationRequired) { %>, required = true<% } %>)
   <%_ } _%>
 <&- fragments.field<%- field.fieldNameCapitalized %>AnnotationSection() -&>
     private <%= field.javaFieldType %> <%= field.fieldName %>;
@@ -130,7 +127,7 @@ for (relationship of relationships.filter(relationship => !relationship.embedded
   if (typeof relationship.javadoc !== 'undefined') { _%>
 <%- formatAsFieldJavadoc(relationship.javadoc) %>
     <%_ if (!dtoMapstruct) { _%>
-    @ApiModelProperty(value = "<%- formatAsApiDescription(relationship.javadoc) %>")
+    @Schema(description = "<%- formatAsApiDescription(relationship.javadoc) %>")
     <%_ } _%>
   <%_ } _%>
 <&- fragments.relationship<%- relationship.relationshipNameCapitalized %>AnnotationSection() -&>

package/generators/entity-server/templates/src/main/java/package/repository/search/EntitySearchRepository.java.ejs

@@ -29,6 +29,12 @@ import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageImpl;
   <%_ } _%>
 import org.springframework.data.domain.Pageable;
+import org.springframework.data.elasticsearch.core.query.NativeSearchQueryBuilder;
+import org.elasticsearch.search.sort.FieldSortBuilder;
+import java.util.List;
+import org.springframework.data.domain.PageRequest;
+
+
 <%_ } _%>
 <%_ if (reactive) { _%>
 import org.springframework.data.elasticsearch.core.ReactiveElasticsearchTemplate;
@@ -72,9 +78,19 @@ class <%= entityClass %>SearchRepositoryInternalImpl implements <%= entityClass
 
     @Override
     public Flux<<%= entityClass %>> search(String query<% if (!paginationNo) { %>, Pageable pageable<% } %>) {
-        NativeSearchQuery nativeSearchQuery = new NativeSearchQuery(queryStringQuery(query));
   <%_ if (!paginationNo) { _%>
-        nativeSearchQuery.setPageable(pageable);
+        List<FieldSortBuilder> builders = new SortToFieldSortBuilderConverter().convert(pageable.getSort());
+
+        NativeSearchQueryBuilder queryBuilder = new NativeSearchQueryBuilder().withQuery(queryStringQuery(query))
+            .withPageable(PageRequest.of(pageable.getPageNumber(), pageable.getPageSize()));
+
+        builders.stream().forEach(builder -> {
+            queryBuilder.withSort(builder);
+        });
+
+        NativeSearchQuery nativeSearchQuery = queryBuilder.build();
+  <%_ } else { _%>
+        NativeSearchQuery nativeSearchQuery = new NativeSearchQuery(queryStringQuery(query));
   <%_ } _%>
         return reactiveElasticsearchTemplate
             .search(nativeSearchQuery, <%= entityClass %>.class)

package/generators/entity-server/templates/src/main/java/package/repository/search/SortToFieldSortBuilderConverter.java.ejs

@@ -0,0 +1,24 @@
+package <%= entityAbsolutePackage %>.repository.search;
+
+import org.elasticsearch.search.sort.FieldSortBuilder;
+import org.elasticsearch.search.sort.SortOrder;
+import org.springframework.core.convert.converter.Converter;
+import org.springframework.data.domain.Sort;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class SortToFieldSortBuilderConverter implements Converter<Sort, List<FieldSortBuilder>> {
+
+    @Override
+    public List<FieldSortBuilder> convert(Sort sort) {
+        List<FieldSortBuilder> builders = new ArrayList<>();
+        sort.stream().forEach(order -> {
+            String property = order.getProperty() + ".keyword";
+            SortOrder sortOrder = SortOrder.fromString(order.getDirection().name());
+            builders.add(new FieldSortBuilder(property).order(sortOrder));
+
+        });
+        return builders;
+    }
+}

package/generators/entity-server/templates/src/main/java/package/service/dto/EntityDTO.java.ejs

@@ -19,10 +19,8 @@
 package <%= entityAbsolutePackage %>.service.dto;
 
 import java.util.Objects;
-<%_ if (typeof javadoc !== 'undefined') { _%>
-import io.swagger.annotations.ApiModel;
-<%_ } if (importApiModelProperty) { _%>
-import io.swagger.annotations.ApiModelProperty;
+<%_ if (typeof javadoc !== 'undefined' || importApiModelProperty) { _%>
+import io.swagger.v3.oas.annotations.media.Schema;
 <%_ } _%>
 <%_ if (fieldsContainInstant) { _%>
 import java.time.Instant;
@@ -68,7 +66,7 @@ import <%= `${otherEntity.entityAbsolutePackage}.service.dto.${otherEntity.dtoCl
  * A DTO for the {@link <%= entityAbsolutePackage %>.domain.<%= persistClass %>} entity.
  */
 <%_ if (typeof javadoc !== 'undefined') { _%>
-@ApiModel(description = "<%- formatAsApiDescription(javadoc) %>")
+@Schema(description = "<%- formatAsApiDescription(javadoc) %>")
 <%_ } _%>
 public class <%= dtoClass %> implements Serializable {
 
@@ -85,7 +83,7 @@ _%>
     <%_ }
   } _%>
   <%_ if (reference.doc) { _%>
-    @ApiModelProperty(value = "<%- formatAsApiDescription(reference.doc) %>"<% if (required) { %>, required = true<% } %>)
+    @Schema(description = "<%- formatAsApiDescription(reference.doc) %>"<% if (required) { %>, required = true<% } %>)
   <%_ } _%>
   <%_ if (field && field.fieldTypeBytes && databaseTypeSql) { _%>
     @Lob

package/generators/entity-server/templates/src/main/java/package/web/rest/EntityResource.java.ejs

@@ -65,7 +65,6 @@ import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.PageImpl;
   <%_ } _%>
 import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
   <%_ if (reactive) { _%>
 import org.springframework.http.server.reactive.ServerHttpRequest;
   <%_ } _%>
@@ -74,7 +73,8 @@ import org.springframework.web.servlet.support.ServletUriComponentsBuilder;
   <%_ } else { _%>
 import org.springframework.web.util.UriComponentsBuilder;
   <%_ } _%>
-<%_ } else if (reactive) { _%>
+<%_ } _%>
+<%_ if (reactive || (!jpaMetamodelFiltering && !paginationNo)) { _%>
 import org.springframework.http.HttpStatus;
 <%_ } _%>
 <%_ if (reactive) { _%>