generator-jhipster 7.9.2 → 7.9.3

package/generators/entity/index.js

@@ -855,7 +855,7 @@ class EntityGenerator extends BaseBlueprintGenerator {
        */
       processEagerLoadRelationships() {
         this.context.relationships.forEach(relationship => {
-          if (relationship.otherEntity.embedded) {
+          if (!relationship.otherEntity.primaryKey) {
             relationship.bagRelationship = false;
             relationship.relationshipEagerLoad = false;
             return;
@@ -872,7 +872,7 @@ class EntityGenerator extends BaseBlueprintGenerator {
         this.context.relationshipsContainEagerLoad = this.context.relationships.some(relationship => relationship.relationshipEagerLoad);
         this.context.containsBagRelationships = this.context.relationships.some(relationship => relationship.bagRelationship);
         this.context.implementsEagerLoadApis = // Cassandra doesn't provides *WithEagerReationships apis
-          ![CASSANDRA, COUCHBASE].includes(this.context.databaseType) &&
+          ![CASSANDRA, COUCHBASE, NEO4J].includes(this.context.databaseType) &&
           // Only sql and mongodb provides *WithEagerReationships apis for imperative implementation
           (this.context.reactive || [SQL, MONGODB].includes(this.context.databaseType)) &&
           this.context.relationshipsContainEagerLoad;
@@ -1145,7 +1145,8 @@ class EntityGenerator extends BaseBlueprintGenerator {
   }
 
   _checkPersistableInterfaceRequirement() {
-    this.context.requiresPersistableImplementation = this.context.fields.some(field => field.requiresPersistableImplementation);
+    this.context.requiresPersistableImplementation =
+      this.context.requiresPersistableImplementation || this.context.fields.some(field => field.requiresPersistableImplementation);
   }
 }
 

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

@@ -88,7 +88,7 @@ _%>
                     </span>
         <%_ } else { _%>
                     <div *ngIf="<%= entityInstance + '.' + relationshipFieldName %>">
-                        <a [routerLink]="['/<%= otherEntityStateName %>', <%= entityInstance + '.' + relationshipFieldName + '.' + relationship.otherEntity.primaryKey.name %>, 'view']">{{ <%= entityInstance %>.<%= relationshipFieldName %>?.<%= otherEntityField %> }}</a>
+                        <a [routerLink]="['/<%= otherEntityStateName %>', <%= entityInstance + '.' + relationshipFieldName + '.' + relationship.otherEntity.primaryKey.name %>, 'view']">{{ <%= entityInstance %>.<%= relationshipFieldName %>.<%= otherEntityField %> }}</a>
                     </div>
         <%_ } _%>
     <%_ } _%>

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

@@ -61,19 +61,26 @@
 <%_ } _%>
 
 <%_ if (jpaMetamodelFiltering && paginationPagination) { _%>
-    <<%= jhiPrefixDashed %>-filter [filters]="filters" (filterChange)="navigateToWithComponentValues()"></<%= jhiPrefixDashed %>-filter>
+    <<%= jhiPrefixDashed %>-filter [filters]="filters"></<%= jhiPrefixDashed %>-filter>
 <%_ } _%>
 
     <div class="alert alert-warning" id="no-result" *ngIf="<%= entityInstancePlural %>?.length === 0">
         <span <%= jhiPrefix %>Translate="<%= i18nKeyPrefix %>.home.notFound"><%- this._getEntityClientTranslation(i18nKeyPrefix + '.home.notFound') %></span>
     </div>
 
-    <div class="table-responsive" id="entities" *ngIf="<%= entityInstancePlural %> && <%= entityInstancePlural %>.length > 0">
+    <div class="table-responsive table-entities" id="entities" *ngIf="<%= entityInstancePlural %> && <%= entityInstancePlural %>.length > 0">
         <table class="table table-striped" aria-describedby="page-heading">
             <thead>
                 <tr <%= jhiPrefix %>Sort [(predicate)]="predicate" [(ascending)]="ascending" (sortChange)="navigateToWithComponentValues()">
 <%_ for (const field of fields.filter(field => !field.hidden)) { _%>
-                    <th scope="col" <%= jhiPrefix %>SortBy="<%= field.fieldName %>"><span <%= jhiPrefix %>Translate="<%= field.fieldTranslationKey %>"><%- this._getEntityClientTranslation(field.fieldTranslationKey) %></span> <fa-icon <% if (searchEngine && !field.fieldTypeBoolean && !field.fieldTypeNumeric && !field.fieldTypeTemporal) { %>*ngIf="!currentSearch" <% } %>icon="sort"></fa-icon></th>
+                    <th scope="col" <%= jhiPrefix %>SortBy="<%= field.fieldName %>">
+                        <div class="d-flex">
+                            <span <%= jhiPrefix %>Translate="<%= field.fieldTranslationKey %>"><%- this._getEntityClientTranslation(field.fieldTranslationKey) %></span>
+  <%_ if (!field.transient) { _%>
+                            <fa-icon class="p-1" <% if (searchEngine && !field.fieldTypeBoolean && !field.fieldTypeNumeric && !field.fieldTypeTemporal) { %>*ngIf="!currentSearch" <% } %>icon="sort"></fa-icon>
+  <%_ } _%>
+                        </div>
+                    </th>
 <%_ } _%>
 <%_ for (const relationship of relationships.filter(rel => !rel.otherEntityIsEmbedded)) { _%>
   <%_ if (relationship.relationshipManyToOne
@@ -81,13 +88,18 @@
     || (relationship.relationshipManyToMany && relationship.ownerSide && paginationNo)) {
     const fieldName = "." + relationship.otherEntityField;
   _%>
-                    <th scope="col" <%= jhiPrefix %>SortBy="<%= relationship.relationshipName + (fieldName) %>"><span <%= jhiPrefix %>Translate="<%= `${i18nKeyPrefix}.${relationship.relationshipName}` %>"><%- this._getEntityClientTranslation(i18nKeyPrefix + '.' + relationship.relationshipName) %></span> <fa-icon icon="sort"></fa-icon></th>
+                    <th scope="col" <%= jhiPrefix %>SortBy="<%= relationship.relationshipName + (fieldName) %>">
+                        <div class="d-flex">
+                            <span <%= jhiPrefix %>Translate="<%= `${i18nKeyPrefix}.${relationship.relationshipName}` %>"><%- this._getEntityClientTranslation(i18nKeyPrefix + '.' + relationship.relationshipName) %></span>
+                            <fa-icon class="p-1" icon="sort"></fa-icon>
+                        </div>
+                    </th>
   <%_ } _%>
 <%_ } _%>
                     <th scope="col"></th>
                 </tr>
             </thead>
-            <tbody<% if (paginationInfiniteScroll) { %> infinite-scroll (scrolled)="loadPage(page + 1)" [infiniteScrollDisabled]="page >= links['last']" [infiniteScrollDistance]="0"<% } %>>
+            <tbody<% if (paginationInfiniteScroll) { %> infinite-scroll (scrolled)="loadPage(page + 1)" [infiniteScrollDisabled]="page - 1 >= links['last']" [infiniteScrollDistance]="0"<% } %>>
                 <tr *ngFor="let <%= entityInstance %> of <%= entityInstancePlural %>; trackBy: track<%= primaryKey.nameCapitalized %>" data-cy="entityTable">
 <%_
 const routerLink = ` [routerLink]="['/${ entityPage }', ${entityInstance}.${primaryKey.name}, 'view']"`;
@@ -146,7 +158,7 @@ _%>
                         </span>
             <%_ } else { _%>
                         <div *ngIf="<%= entityInstance + "." + relationshipFieldName %>">
-                            <a [routerLink]="['/<%= relationship.otherEntity.entityPage %>', <%= entityInstance %>.<%= relationshipFieldName %>.<%= relationship.otherEntity.primaryKey.name %>, 'view']">{{ <%= entityInstance %>.<%= relationshipFieldName %>?.<%= otherEntityField %> }}</a>
+                            <a [routerLink]="['/<%= relationship.otherEntity.entityPage %>', <%= entityInstance %>.<%= relationshipFieldName %>.<%= relationship.otherEntity.primaryKey.name %>, 'view']">{{ <%= entityInstance %>.<%= relationshipFieldName %>.<%= otherEntityField %> }}</a>
                         </div>
             <%_ } _%>
         <%_ } _%>

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

@@ -166,7 +166,7 @@ describe('<%= entityAngularName %> Management Component', () => {
         comp.ngOnInit();
 
         // THEN
-        expect(service.query).toHaveBeenLastCalledWith(expect.objectContaining({ 'someId.in': 'dc4279ea-cfb9-11ec-9d64-0242ac120002' }));
+        expect(service.query).toHaveBeenLastCalledWith(expect.objectContaining({ 'someId.in': ['dc4279ea-cfb9-11ec-9d64-0242ac120002'] }));
     });
   <%_ } _%>
 <%_ } _%>

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

@@ -26,7 +26,7 @@
   const notSortableFieldsAfterSearch = notSortableFieldsAfterSearchArray
       .map(field => `'${field.fieldName}'`)
       .join(', ');
-  
+
   const componentName = entityAngularName + 'Component';
 _%>
 import { Component, OnInit } from '@angular/core';
@@ -34,7 +34,7 @@ import { Component, OnInit } from '@angular/core';
 import { HttpHeaders } from '@angular/common/http';
 <%_ } _%>
 import { ActivatedRoute, Data, ParamMap, Router } from '@angular/router';
-import { combineLatest, filter, Observable, switchMap, tap } from 'rxjs';
+import { combineLatest<%_ if (!readOnly) { _%>, filter<%_ } _%>, Observable, switchMap, tap } from 'rxjs';
 <%_ if (!readOnly) { _%>
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
 <%_ } _%>
@@ -43,7 +43,9 @@ import { I<%= entityAngularName %> } from '../<%= entityFileName %>.model';
 <%_ if (!paginationNo) { %>
 import {
   ITEMS_PER_PAGE,
+<%_ if (paginationPagination) { _%>
   PAGE_HEADER,
+<%_ } _%>
 <%_ if (paginationPagination) { _%>
   TOTAL_COUNT_RESPONSE_HEADER,
 <%_ } _%>
@@ -53,7 +55,9 @@ import {
   ASC,
   DESC,
   SORT,
+<%_ if (!readOnly) { _%>
   ITEM_DELETED_EVENT,
+<%_ } _%>
   DEFAULT_SORT_DATA
 } from 'app/config/navigation.constants';
 import { EntityArrayResponseType, <%= entityAngularName %>Service } from '../service/<%= entityFileName %>.service';
@@ -67,7 +71,7 @@ import { DataUtils } from 'app/core/util/data-util.service';
 import { ParseLinks } from 'app/core/util/parse-links.service';
 <%_ } _%>
 <%_ if (jpaMetamodelFiltering && paginationPagination) { _%>
-import { FilterOptions, IFilterOptions } from 'app/shared/filter/filter.model';
+import { FilterOptions, IFilterOptions, IFilterOption } from 'app/shared/filter/filter.model';
 <%_ } _%>
 <%_ if (paginationNo) { _%>
 import { SortService } from 'app/shared/sort/sort.service';
@@ -157,6 +161,9 @@ export class <%= componentName %> implements OnInit {
 <%_ } _%>
     ngOnInit(): void {
       this.load();
+<% if (jpaMetamodelFiltering && paginationPagination) { %>
+      this.filters.filterChanges.subscribe(filterOptions => this.handleNavigation(1, this.predicate, this.ascending, filterOptions));
+<% } %>
     }
 
 <%_ if (fieldsContainBlob) { _%>
@@ -196,12 +203,12 @@ export class <%= componentName %> implements OnInit {
     }
 
     navigateToWithComponentValues(): void {
-      this.handleNavigation(<% if (!paginationNo) { %>this.page, <% } %>this.predicate, this.ascending<% if (jpaMetamodelFiltering && paginationPagination) { %>, this.filters<% } %><% if (searchEngine) { %>, this.currentSearch<% } %>);
+      this.handleNavigation(<% if (!paginationNo) { %>this.page, <% } %>this.predicate, this.ascending<% if (jpaMetamodelFiltering && paginationPagination) { %>, this.filters.filterOptions<% } %><% if (searchEngine) { %>, this.currentSearch<% } %>);
     }
 
 <%_ if (!paginationNo) { _%>
     navigateToPage(page = this.page): void {
-      this.handleNavigation(page, this.predicate, this.ascending<% if (jpaMetamodelFiltering && paginationPagination) { %>, this.filters<% } %><% if (searchEngine) { %>, this.currentSearch<% } %>);
+      this.handleNavigation(page, this.predicate, this.ascending<% if (jpaMetamodelFiltering && paginationPagination) { %>, this.filters.filterOptions<% } %><% if (searchEngine) { %>, this.currentSearch<% } %>);
     }
 
 <%_ } _%>
@@ -210,13 +217,13 @@ export class <%= componentName %> implements OnInit {
         .pipe(
           tap(([params, data]) => this.fillComponentAttributeFromRoute(params, data)),
           switchMap(() =>
-            this.queryBackend(<% if (!paginationNo) { %>this.page, <% } %>this.predicate, this.ascending<% if (jpaMetamodelFiltering && paginationPagination) { %>, this.filters<% } %><% if (searchEngine) { %>, this.currentSearch<% } %>)
+            this.queryBackend(<% if (!paginationNo) { %>this.page, <% } %>this.predicate, this.ascending<% if (jpaMetamodelFiltering && paginationPagination) { %>, this.filters.filterOptions<% } %><% if (searchEngine) { %>, this.currentSearch<% } %>)
           )
         );
     }
 
     protected fillComponentAttributeFromRoute(params: ParamMap, data: Data): void {
-<%_ if (!paginationNo) { _%>
+<%_ if (paginationPagination) { _%>
       const page = params.get(PAGE_HEADER);
       this.page = +(page ?? 1);
 <%_ } _%>
@@ -293,7 +300,7 @@ export class <%= componentName %> implements OnInit {
     }
 
 <%_ } _%>
-    protected queryBackend(<% if (!paginationNo) { %>page?: number, <% } %>predicate?: string, ascending?: boolean<% if (jpaMetamodelFiltering && paginationPagination) { %>, filters?: IFilterOptions<% } %><% if (searchEngine) { %>, currentSearch?: string<% } %>): Observable<EntityArrayResponseType> {
+    protected queryBackend(<% if (!paginationNo) { %>page?: number, <% } %>predicate?: string, ascending?: boolean<% if (jpaMetamodelFiltering && paginationPagination) { %>, filterOptions?: IFilterOption[]<% } %><% if (searchEngine) { %>, currentSearch?: string<% } %>): Observable<EntityArrayResponseType> {
       this.isLoading = true;
 <%_ if (!paginationNo) { _%>
       const pageToLoad: number = page ?? 1;
@@ -312,11 +319,9 @@ export class <%= componentName %> implements OnInit {
         sort: this.getSortQueryParam(predicate, ascending),
       };
 <%_ if (jpaMetamodelFiltering && paginationPagination) { _%>
-      if (filters?.hasAnyFilterSet()) {
-        filters.filterOptions.forEach(filterOption => {
-          queryObject[filterOption.name] = filterOption.value;
-        });
-      }
+      filterOptions?.forEach(filterOption => {
+        queryObject[filterOption.name] = filterOption.values;
+      });
 <%_ } _%>
 <%_ if (searchEngine) { _%>
       if (this.currentSearch && this.currentSearch !== '') {
@@ -335,7 +340,7 @@ export class <%= componentName %> implements OnInit {
 <%_ } _%>
     }
 
-    protected handleNavigation(<% if (!paginationNo) { %>page = this.page, <% } %>predicate?: string, ascending?: boolean<% if (jpaMetamodelFiltering && paginationPagination) { %>, filters?: IFilterOptions<% } %><% if (searchEngine) { %>, currentSearch?: string<% } %>): void {
+    protected handleNavigation(<% if (!paginationNo) { %>page = this.page, <% } %>predicate?: string, ascending?: boolean<% if (jpaMetamodelFiltering && paginationPagination) { %>, filterOptions?: IFilterOption[]<% } %><% if (searchEngine) { %>, currentSearch?: string<% } %>): void {
       const queryParamsObj<%_ if (jpaMetamodelFiltering && paginationPagination) { _%>: any<%_ } _%> = {
 <%_ if (searchEngine) { _%>
         search: currentSearch,
@@ -346,12 +351,11 @@ export class <%= componentName %> implements OnInit {
 <%_ } _%>
         sort: this.getSortQueryParam(predicate, ascending),
       };
+
 <%_ if (jpaMetamodelFiltering && paginationPagination) { _%>
-      if (filters?.hasAnyFilterSet()) {
-        filters.filterOptions.forEach(filterOption => {
-          queryParamsObj[filterOption.nameAsQueryParam()] = filterOption.value;
-        });
-      }
+      filterOptions?.forEach(filterOption => {
+        queryParamsObj[filterOption.nameAsQueryParam()] = filterOption.values;
+      });
 <%_ } _%>
 
       this.router.navigate([ './' ], {

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

@@ -124,11 +124,13 @@ describe('<%= entityAngularName %> Service', () => {
 
 <%_ if (!readOnly) { _%>
         it('should delete a <%= entityAngularName %>', () => {
+            const expected = true;
+
             service.delete(<%- tsKeyId %>).subscribe(resp => expectedResult = resp.ok);
 
             const req = httpMock.expectOne({ method: 'DELETE' });
             req.flush({ status: 200 });
-            expect(expectedResult);
+            expect(expectedResult).toBe(expected);
         });
 <%_ } _%>
 

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

@@ -67,7 +67,7 @@ export type EntityArrayResponseType = HttpResponse<I<%= entityAngularName %>[]>;
 export class <%= entityAngularName %>Service {
     protected resourceUrl = this.applicationConfigService.getEndpointFor('api/<%= entityApiUrl %>'<% if ((applicationTypeGateway || applicationTypeMicroservice) && locals.microserviceName) { %>, '<%= microserviceName.toLowerCase() %>'<% } %>);
 <%_ if (searchEngine) { _%>
-    protected resourceSearchUrl = this.applicationConfigService.getEndpointFor('api/_search/<%= entityApiUrl %>'<% if (applicationTypeGateway && locals.microserviceName) { %>, '<%= microserviceName.toLowerCase() %>'<% } %>);
+    protected resourceSearchUrl = this.applicationConfigService.getEndpointFor('api/_search/<%= entityApiUrl %>'<% if ((applicationTypeGateway || applicationTypeMicroservice) && locals.microserviceName) { %>, '<%= microserviceName.toLowerCase() %>'<% } %>);
 <%_ } _%>
 
     constructor(protected http: HttpClient, protected applicationConfigService: ApplicationConfigService) {}

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

@@ -192,7 +192,7 @@ _%>
     form.reset({
       ...<%= entityInstance %>RawValue,
 <%_ for (const field of fields.filter(field => field.id)) { _%>
-      <%= field.fieldName %>: { value: <%= entityInstance %>RawValue.<%= field.fieldName %>, disabled: <% if (field.autoGenerate) { %>true<% } else { %><%= entityInstance %>RawValue.<%= fieldName %> !== null<% } %> },
+      <%= field.fieldName %>: { value: <%= entityInstance %>RawValue.<%= field.fieldName %>, disabled: <% if (field.autoGenerate) { %>true<% } else { %><%= entityInstance %>RawValue.<%= field.fieldName %> !== null<% } %> },
 <%_ } _%>
     } as any /* cast to workaround https://github.com/angular/angular/issues/46458 */);
   }

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

@@ -111,7 +111,7 @@ export default class <%= entityAngularName %> extends <% if (fieldsContainBlob |
   <%_ if (paginationInfiniteScroll) { _%>
         if ((<any>this.$refs.infiniteLoading)) {
           (<any>this.$refs.infiniteLoading).stateChanger.loaded();
-          if (this.links !== {} && this.page > this.links['last']) {
+          if (JSON.stringify(this.links) !== JSON.stringify({}) && this.page > this.links['last']) {
             (<any>this.$refs.infiniteLoading).stateChanger.complete();
           }
         }
@@ -144,7 +144,7 @@ export default class <%= entityAngularName %> extends <% if (fieldsContainBlob |
 <%_ if (paginationInfiniteScroll) { _%>
       if ((<any>this.$refs.infiniteLoading)) {
         (<any>this.$refs.infiniteLoading).stateChanger.loaded();
-        if (this.links !== {} && this.page > this.links['last']) {
+        if (JSON.stringify(this.links) !== JSON.stringify({}) && this.page > this.links['last']) {
           (<any>this.$refs.infiniteLoading).stateChanger.complete();
         }
       }

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

@@ -17,9 +17,13 @@
  limitations under the License.
 -%>
 <%_ if (reactive) { _%>
-        return <%= entityInstance %><%= viaService ? 'Service.delete' : 'Repository.deleteById' %>(id)<%_ if (!viaService && searchEngineElasticsearch) { %>
-            .then(<%= entityInstance %>SearchRepository.deleteById(id))<%_ } _%><%_ if (!fromResource) { _%>;
-<%_ } _%>
+        return <%= entityInstance %><%= viaService ? 'Service.delete' : 'Repository.deleteById' %>(id)
+  <%_ if (!viaService && searchEngineElasticsearch) { %>
+            .then(<%= entityInstance %>SearchRepository.deleteById(id))
+  <%_ } -%>
+  <%_ if (!fromResource) { -%>
+        ;
+  <%_ } _%>
 <%_ } else { _%>
         <%= entityInstance %><%= viaService ? 'Service.delete' : 'Repository.deleteById' %>(id);
   <%_ if (!viaService && searchEngineElasticsearch) { _%>

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.toString().replaceAll("[\n\r\t]", "_"));
+        log.debug("REST request to get <%= entityClassPlural %> by criteria: {}", criteria);
   <%_ 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.toString().replaceAll("[\n\r\t]", "_"));
+        log.debug("REST request to count <%= entityClassPlural %> by criteria: {}", criteria);
         return ResponseEntity.ok().body(<%= entityInstance %>QueryService.countByCriteria(criteria));
     }
 <%_ } else { _%>

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

@@ -22,6 +22,7 @@
     importSection: 0,
     staticImportSection: 0,
     annotationSection: 0,
+    extendsSection: 1,
     additionalInterfacesSection: 0,
     classStaticFieldsSection: 0,
     classFieldsSection: 0,
@@ -30,6 +31,8 @@
     classAdditionalRelationshipsSection: 0,
     classAdditionalRelationshipsMethodsSection: 0,
 <%_ for (const field of fields) { _%>
+    field<%- field.fieldNameCapitalized %>CustomDeclarationSection: 1,
+    field<%- field.fieldNameCapitalized %>CustomMethodsSection: 1,
     field<%- field.fieldNameCapitalized %>AnnotationSection: 0,
   <%_ if (field.fieldWithContentType) { _%>
     field<%- field.fieldNameCapitalized %>ContentTypeAnnotationSection: 0,
@@ -93,7 +96,8 @@ import <%= otherEntity.entityAbsoluteClass %>;
   <%_ } _%>
 <%_ } _%>
 <&- fragments.annotationSection() -&>
-public class <%= persistClass %> implements Serializable<&- fragments.additionalInterfacesSection() -&> {
+@SuppressWarnings("common-java:DuplicatedBlocks")
+public class <%= persistClass %> <&- fragments.extendsSection() -&>implements Serializable<&- fragments.additionalInterfacesSection() -&> {
 
     private static final long serialVersionUID = 1L;
 
@@ -104,7 +108,9 @@ public class <%= persistClass %> implements Serializable<&- fragments.additional
 <%_ } _%>
 <&- fragments.classStaticFieldsSection() -&>
 <&- fragments.classFieldsSection() -&>
-<%_ for (const field of fields.filter(field => !field.transient && (embedded || !field.id || !primaryKey.composite))) { _%>
+<%_ for (const field of fields.filter(field => !field.javaInherited && !field.transient && (embedded || !field.id || !primaryKey.composite))) { _%>
+<&- fragments.field<%- field.fieldNameCapitalized %>CustomDeclarationSection() -&>
+<&_ if (!fragments.field<%- field.fieldNameCapitalized %>CustomDeclarationSection()) { -&>
   <%_ if (typeof field.javadoc !== 'undefined') { _%>
 <%- formatAsFieldJavadoc(field.javadoc) %>
   <%_ } _%>
@@ -119,6 +125,7 @@ public class <%= persistClass %> implements Serializable<&- fragments.additional
     private String <%= field.fieldName %>ContentType;
 
   <%_ } _%>
+<&_ } -&>
 <%_ } _%>
 <&- fragments.classAdditionalFieldsSection() -&>
 
@@ -170,6 +177,8 @@ for (relationship of relationships.filter(relationship => !relationship.embedded
 <&- fragments.classAdditionalRelationshipsSection() -&>
     // jhipster-needle-entity-add-field - JHipster will add fields here
 <%_ for (const field of fields.filter(field => !field.transient && (embedded || !field.id || !primaryKey.composite))) { _%>
+<&- fragments.field<%- field.fieldNameCapitalized %>CustomMethodsSection() -&>
+<&_ if (!fragments.field<%- field.fieldNameCapitalized %>CustomMethodsSection()) { -&>
 
     public <%= field.javaFieldType %> get<%= field.fieldInJavaBeanMethod %>() {
         return this.<%= field.fieldName %>;
@@ -182,12 +191,12 @@ for (relationship of relationships.filter(relationship => !relationship.embedded
     }
   <%_ } _%>
 
-<&- fragments.field<%- field.fieldNameCapitalized %>CustomSetSection() -&>
-<&_ if (!fragments.field<%- field.fieldNameCapitalized %>CustomSetSection()) { -&>
+  <&- fragments.field<%- field.fieldNameCapitalized %>CustomSetSection() -&>
+  <&_ if (!fragments.field<%- field.fieldNameCapitalized %>CustomSetSection()) { -&>
     public void set<%= field.fieldInJavaBeanMethod %>(<%= field.javaFieldType %> <%= field.fieldName %>) {
         this.<%= field.fieldName %> = <%= field.fieldName %>;
     }
-<&_ } -&>
+  <&_ } -&>
   <%_ if (field.fieldWithContentType) { _%>
 
     public String get<%= field.fieldInJavaBeanMethod %>ContentType() {
@@ -205,6 +214,7 @@ for (relationship of relationships.filter(relationship => !relationship.embedded
         this.<%= field.fieldName %>ContentType = <%= field.fieldName %>ContentType;
     }
   <%_ } _%>
+<&_ } -&>
 <%_ } _%>
 
 <&- fragments.classAdditionalFieldsMethodsSection('\n\n') -&>

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

@@ -22,6 +22,13 @@
 -%>
 <&_ if (fragment.importSection) { -&>
 import org.springframework.data.domain.Persistable;
+<%_ if (!relationshipsContainOtherSideIgnore) { _%>
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+<%_ } _%>
+<&_ } -&>
+
+<&_ if (fragment.annotationSection) { -&>
+@JsonIgnoreProperties(value = { "new" })
 <&_ } -&>
 
 <&_ if (fragment.additionalInterfacesSection) { -&>
@@ -51,4 +58,4 @@ import org.springframework.data.domain.Persistable;
         this.isPersisted = true;
         return this;
     }
- <&_ } -&>
+ <&_ } -&>

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

@@ -37,6 +37,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Optional;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.data.domain.Pageable;
 import io.r2dbc.spi.Row;
 import io.r2dbc.spi.RowMetadata;
@@ -148,7 +149,11 @@ _%>
 
     @Override
     public Mono<<%= persistClass %>> findById(<%= primaryKey.type %> id) {
+<%_ if (primaryKey.type != 'Long') {  _%>
+        Comparison whereClause = Conditions.isEqual(entityTable.column("<%= primaryKey.fields[0].columnName %>"), Conditions.just(StringUtils.wrap(id.toString(), "'")));
+<%_ } else { _%>
         Comparison whereClause = Conditions.isEqual(entityTable.column("<%= primaryKey.fields[0].columnName %>"), Conditions.just(id.toString()));
+<%_ }_%>
         return createQuery(null, whereClause).one();
     }
 

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

@@ -78,7 +78,7 @@ public class <%= serviceClassName %> extends QueryService<<%= persistClass %>> {
      */
     @Transactional(readOnly = true)
     public List<<%= instanceType %>> findByCriteria(<%= criteria %> criteria) {
-        log.debug("find by criteria : {}", criteria.toString().replaceAll("[\n\r\t]", "_"));
+        log.debug("find by criteria : {}", criteria);
         final Specification<<%= persistClass %>> specification = createSpecification(criteria);
 <%_ if (dtoMapstruct) { _%>
         return <%= entityListToDto %>(<%= repository %>.findAll(specification));
@@ -95,7 +95,7 @@ public class <%= serviceClassName %> extends QueryService<<%= persistClass %>> {
      */
     @Transactional(readOnly = true)
     public Page<<%= instanceType %>> findByCriteria(<%= criteria %> criteria, Pageable page) {
-        log.debug("find by criteria : {}, page: {}", criteria.toString().replaceAll("[\n\r\t]", "_"), page);
+        log.debug("find by criteria : {}, page: {}", criteria, page);
         final Specification<<%= persistClass %>> specification = createSpecification(criteria);
 <%_ if (dtoMapstruct) { _%>
         return <%= repository %>.findAll(specification, page)
@@ -112,7 +112,7 @@ public class <%= serviceClassName %> extends QueryService<<%= persistClass %>> {
      */
     @Transactional(readOnly = true)
     public long countByCriteria(<%= criteria %> criteria) {
-        log.debug("count by criteria : {}", criteria.toString().replaceAll("[\n\r\t]", "_"));
+        log.debug("count by criteria : {}", criteria);
         final Specification<<%= persistClass %>> specification = createSpecification(criteria);
         return <%= repository %>.count(specification);
     }
@@ -134,7 +134,7 @@ public class <%= serviceClassName %> extends QueryService<<%= persistClass %>> {
             }
 <%_
 fields.forEach((field) => {
-  if (field.id) return;
+  if (field.id || field.transient) return;
   if (isFilterableType(field.fieldType)) { _%>
             if (criteria.get<%= field.fieldInJavaBeanMethod %>() != null) {
                 specification = specification.and(<%= getSpecificationBuilder(field.fieldType) %>(criteria.get<%= field.fieldInJavaBeanMethod %>(), <%= persistClass %>_.<%= field.fieldName %>));

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

@@ -142,17 +142,19 @@ public interface <%= entityClass %>Service {
      * @return a Mono to signal the deletion
 <%_ } _%>
      */
-    <%- reactive ? 'Mono<Void>' : 'void' %> delete(<%= primaryKey.type %> id);<% if (searchEngine) { %>
+    <%- reactive ? 'Mono<Void>' : 'void' %> delete(<%= primaryKey.type %> id);
+<%_ if (searchEngine) { _%>
 
     /**
      * Search for the <%= entityInstance %> corresponding to the query.
      *
      * @param query the query of the search.
-<%_ if (!paginationNo) { _%>
+  <%_ if (!paginationNo) { _%>
      *
      * @param pageable the pagination information.
-<%_ } _%>
+  <%_ } _%>
      * @return the list of entities.
      */
-    <% if (!paginationNo) { %><%= pageOrFlux %><<%= instanceType %><% } else { %><%= listOrFlux %><<%= instanceType %><% } %>> search(String query<% if (!paginationNo) { %>, Pageable pageable<% } %>);<% } %>
+    <% if (!paginationNo) { %><%= pageOrFlux %><<%= instanceType %><% } else { %><%= listOrFlux %><<%= instanceType %><% } %>> search(String query<% if (!paginationNo) { %>, Pageable pageable<% } %>);
+<%_ } _%>
 }

package/generators/entity-server/templates/src/main/java/package/service/criteria/EntityCriteria.java.ejs

@@ -7,36 +7,12 @@ import tech.jhipster.service.Criteria;
 <%_ for (const field of fields) { if (field.fieldIsEnum === true) { _%>
 import <%= entityAbsolutePackage %>.domain.enumeration.<%= field.fieldType %>;
 <%_ } } _%>
-import tech.jhipster.service.filter.BooleanFilter;
-import tech.jhipster.service.filter.DoubleFilter;
-import tech.jhipster.service.filter.Filter;
-import tech.jhipster.service.filter.FloatFilter;
-import tech.jhipster.service.filter.IntegerFilter;
-import tech.jhipster.service.filter.LongFilter;
-import tech.jhipster.service.filter.StringFilter;
-<%_ if (fieldsContainBigDecimal) { _%>
-import tech.jhipster.service.filter.BigDecimalFilter;
-<%_ } _%>
-<%_ if (fieldsContainDuration) { _%>
-import tech.jhipster.service.filter.DurationFilter;
-<%_ } _%>
-<%_ if (fieldsContainInstant) { _%>
-import tech.jhipster.service.filter.InstantFilter;
-<%_ } _%>
-<%_ if (fieldsContainLocalDate) { _%>
-import tech.jhipster.service.filter.LocalDateFilter;
-<%_ } _%>
-<%_ if (fieldsContainUUID || otherEntityPrimaryKeyTypesIncludesUUID) { _%>
-import tech.jhipster.service.filter.UUIDFilter;
-<%_ } _%>
-<%_ if (fieldsContainZonedDateTime) { _%>
-import tech.jhipster.service.filter.ZonedDateTimeFilter;
-<%_ } _%>
+import tech.jhipster.service.filter.*;
 
 <%_
 var filterVariables = [];
 var extraFilters = {};
-fields.forEach((field) => {
+fields.filter(field => !field.transient).forEach((field) => {
   const fieldType = field.fieldType;
   if (isFilterableType(fieldType)) {
     var filterType;
@@ -78,6 +54,7 @@ _%>
  * fix type specific filters.
  */
 @ParameterObject
+@SuppressWarnings("common-java:DuplicatedBlocks")
 public class <%= entityClass %>Criteria implements Serializable, Criteria {
 <%_ Object.keys(extraFilters).forEach((key) => {
   extraFilter = extraFilters[key]; _%>

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

@@ -68,6 +68,7 @@ import <%= `${otherEntity.entityAbsolutePackage}.service.dto.${otherEntity.dtoCl
 <%_ if (typeof javadoc !== 'undefined') { _%>
 @Schema(description = "<%- formatAsApiDescription(javadoc) %>")
 <%_ } _%>
+@SuppressWarnings("common-java:DuplicatedBlocks")
 public class <%= dtoClass %> implements Serializable {
 
 <%_ for (reference of dtoReferences) {

package/generators/entity-server/templates/src/main/java/package/service/impl/EntityServiceImpl.java.ejs

@@ -127,7 +127,7 @@ public class <%= serviceClassName %><% if (serviceImpl) { %> implements <%= enti
     @Override
 <%_ } _%>
     public <% if (reactive) { %>Mono<<% } %><%= instanceType %><% if (reactive) { %>><% } %> update(<%= instanceType %> <%= instanceName %>) {
-        log.debug("Request to save <%= entityClass %> : {}", <%= instanceName %>);
+        log.debug("Request to update <%= entityClass %> : {}", <%= instanceName %>);
 <%- include('/partials/update_template', {updatableEntity, viaService: false, returnDirectly: true, isUsingMapsId: isUsingMapsId, mapsIdAssoc: mapsIdAssoc, isController: false, isPersisted: requiresPersistableImplementation}); -%>
     }