generator-jhipster 7.7.0 → 7.9.0

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,27 +45,33 @@ _%>
      */
     @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 { _%>
   <%_ if (paginationNo) { _%>
-    public <% if (reactive) { %>Mono<<% } %>List<<%= instanceType %>><% if (reactive) { %>><% } %> getAll<%= entityClassPlural %>(<% if (fieldsContainNoOwnerOneToOne) { %>@RequestParam(required = false) String filter<% } %><% if (relationshipsContainEagerLoad && fieldsContainNoOwnerOneToOne) { %>,<% } %><% if (relationshipsContainEagerLoad) { %>@RequestParam(required = false, defaultValue = "false") boolean eagerload<% } %>) {<%- include('get_all_stream_template', {viaService: viaService}); -%>
+    public <% if (reactive) { %>Mono<<% } %>List<<%= instanceType %>><% if (reactive) { %>><% } %> getAll<%= entityClassPlural %>(<% if (fieldsContainNoOwnerOneToOne) { %>@RequestParam(required = false) String filter<% } %><% if (implementsEagerLoadApis && fieldsContainNoOwnerOneToOne) { %>,<% } %><% if (implementsEagerLoadApis) { %>@RequestParam(required = false, defaultValue = "false") boolean eagerload<% } %>) {<%- include('get_all_stream_template', {viaService: viaService}); -%>
         log.debug("REST request to get all <%= entityClassPlural %>");
     <%_ if (viaService) { _%>
         return <%= entityInstance %>Service.findAll()<% if (reactive) { %>.collectList()<% } %>;
     <%_ } else if (dtoMapstruct) { _%>
-        <%= reactive ? 'Flux' : 'List' %><<%= persistClass %>> <%= entityInstancePlural %> = <%= entityInstance %>Repository.<% if (relationshipsContainEagerLoad) { %>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 (relationshipsContainEagerLoad) { %>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 (relationshipsContainEagerLoad) { %>, @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())
@@ -79,7 +85,7 @@ _%>
                         ).body(countWithEntities.getT2())
                 );
     <%_ } else { _%>
-      <%_ if (relationshipsContainEagerLoad) { _%>
+      <%_ if (implementsEagerLoadApis) { _%>
         Page<<%= instanceType %>> page;
         if (eagerload) {
             page = <%= entityInstance %><%= viaService ? 'Service' : 'Repository' %>.findAllWithEagerRelationships(pageable)<%= reactiveEntityToDto %>;

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

@@ -24,7 +24,7 @@
     const returnPrefix = returnDirectly ? 'return' : `${instanceType} ${instanceName} =`;
 %>
 <%_ if (!viaService) { _%>
-        <%- returnPrefix %> <%= entityInstance %>Repository.<% if (relationshipsContainEagerLoad) { %>findOneWithEagerRelationships(id)<% } else { %>findById(id)<% } %><% if (!dtoMapstruct) { %>;<% } else { %>
+        <%- returnPrefix %> <%= entityInstance %>Repository.<% if (implementsEagerLoadApis) { %>findOneWithEagerRelationships(id)<% } else { %>findById(id)<% } %><% if (!dtoMapstruct) { %>;<% } else { %>
             .map(<%= entityToDtoReference %>);<% } %>
 <%_ } else { _%>
         <%- returnPrefix %> <%= entityInstance %>Service.findOne(id);

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

@@ -16,7 +16,8 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -%>
-<%_ const beans = [];
+<%_
+  const beans = [];
   if (viaService) {
     beans.push({class: `${entityClass}Service`, instance: `${entityInstance}Service`});
     beans.push({class: `${entityClass}Repository`, instance: `${entityInstance}Repository`});
@@ -49,8 +50,16 @@
   }
 _%>
 
-    <%= beans.map(bean => `private final ${bean.class} ${bean.instance};`).join('\n\n    ') %>
+<%_ for (const bean of beans) { _%>
+    private final <%= bean.class %> <%= bean.instance %>;
 
-    public <%= constructorName %>(<%= beans.map(bean => `${bean.class} ${bean.instance}`).join(', ') %>) {
-        <%= beans.map(bean => `this.${bean.instance} = ${bean.instance};`).join('\n        ') %>
+<%_ } _%>
+    public <%= constructorName %>(
+<%_ for (const bean of beans) { _%>
+        <%= bean.class %> <%= bean.instance %><% if (bean !== beans[beans.length -1]) { %>,<% } %>
+<%_ } _%>
+    ) {
+<%_ for (const bean of beans) { _%>
+        this.<%= bean.instance %> = <%= bean.instance %>;
+<%_ } _%>
     }

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

@@ -25,7 +25,7 @@ const returnPrefix = (isService) ? 'return' : returnType + '<' + instanceType +
 const mapper = entityInstance  + 'Mapper';
 _%>
 <%_ if (viaService) { _%>
-  <%_ if(reactive) { _%>
+  <%_ if (reactive) { _%>
     Mono<<%= instanceType %>> result = <%= entityInstance %>Service.partialUpdate(<%= instanceName %>);
   <%_ } else { _%>
     Optional<<%= instanceType %>> result = <%= entityInstance %>Service.partialUpdate(<%= instanceName %>);
@@ -49,7 +49,7 @@ _%>
   <% } %>
     return existing<%= entityClass %>;
     })
-    .<%= mapOrFlatMap %>(<%= entityInstance %>Repository::save)
+  <% if (!updatableEntity) { %>// <%} %>.<%= mapOrFlatMap %>(<%= entityInstance %>Repository::save)
   <%_ if (searchEngineElasticsearch) { _%>
     .<%= mapOrFlatMap %>(saved<%= entityClass %> -> {
         <%= entityInstance %>SearchRepository.save(saved<%= entityClass %>);

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

@@ -22,6 +22,7 @@
     importSection: 0,
     staticImportSection: 0,
     annotationSection: 0,
+    additionalInterfacesSection: 0,
     classStaticFieldsSection: 0,
     classFieldsSection: 0,
     classAdditionalFieldsSection: 0,
@@ -92,7 +93,7 @@ import <%= otherEntity.entityAbsoluteClass %>;
   <%_ } _%>
 <%_ } _%>
 <&- fragments.annotationSection() -&>
-public class <%= persistClass %> implements Serializable {
+public class <%= persistClass %> implements Serializable<&- fragments.additionalInterfacesSection() -&> {
 
     private static final long serialVersionUID = 1L;
 

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

@@ -23,3 +23,20 @@
 <&_ if (fragment.annotationSection) { -&>
 @org.springframework.data.elasticsearch.annotations.Document(indexName = "<%= entityInstance.toLowerCase() %>")
 <&_ } -&>
+
+<%_ for (const field of fields) { -%>
+  <&_ if (fragment.field<%- field.fieldNameCapitalized %>AnnotationSection) { -&>
+    <%_ if (field.id && field.fieldName != 'id') { _%>
+    @org.springframework.data.annotation.Id
+    <%_ } _%>
+  <&_ } -&>
+<%_ } -%>
+
+<%_ for (const relationship of relationships) { -%>
+  <&_ if (fragment.relationship<%- relationship.relationshipNameCapitalized %>AnnotationSection) { -&>
+    <% // just break the cycle // in the reactive area, we already have the annotation in place
+      if (!relationship.ownerSide && !reactive) { %>
+        @org.springframework.data.annotation.Transient
+    <% } %>
+  <&_ } -&>
+<%_ } -%>

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

@@ -0,0 +1,31 @@
+<%#
+ 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.
+-%>
+<%#
+ This is a fragment file, it will be merged into to root template if available.
+ EJS fragments will process % delimiter tags in template and & delimiter tags in the merge process.
+-%>
+<&_ if (fragment.classAdditionalFieldsMethodsSection) { -&>
+
+    @PostLoad
+    @PostPersist
+    public void updateEntityState() {
+        this.setIsPersisted();
+    }
+
+ <&_ } -&>

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

@@ -30,7 +30,9 @@ import org.springframework.data.cassandra.core.mapping.Table;
 <&_ } -&>
 
 <&_ if (fragment.annotationSection) { -&>
-@Table("<%= entityInstance %>")
+// Since spring-data-cassandra 3.4.2, table names needs to be in lowercase
+// See https://github.com/spring-projects/spring-data-cassandra/issues/1293#issuecomment-1192555467
+@Table("<%= entityInstance.toLowerCase() %>")
 <&_ } -&>
 
 <%_ for (const field of fields) { _%>

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

@@ -0,0 +1,54 @@
+<%#
+ 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.
+-%>
+<%#
+ This is a fragment file, it will be merged into to root template if available.
+ EJS fragments will process % delimiter tags in template and & delimiter tags in the merge process.
+-%>
+<&_ if (fragment.importSection) { -&>
+import org.springframework.data.domain.Persistable;
+<&_ } -&>
+
+<&_ if (fragment.additionalInterfacesSection) { -&>
+, Persistable<<%= primaryKey.type %>>
+<&_ } -&>
+
+<&_ if (fragment.classAdditionalFieldsSection) { -&>
+    @Transient
+    private boolean isPersisted;
+<&_ } -&>
+
+<&_ if (fragment.classAdditionalFieldsMethodsSection) { -&>
+<%_ if (primaryKey.name !== 'id') { -%>
+    @Override
+    public <%= primaryKey.type %> getId() {
+        return this.<%= primaryKey.name %>;
+    }
+ <%_ } -%>
+
+    @Transient
+    @Override
+    public boolean isNew() {
+        return !this.isPersisted;
+    }
+
+    public <%= persistClass %> setIsPersisted() {
+        this.isPersisted = true;
+        return this;
+    }
+ <&_ } -&>

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

@@ -92,7 +92,7 @@ import org.springframework.data.relational.core.mapping.Table;
 <&_ if (fragment.classAdditionalRelationshipsSection) { -&>
     <%_ for (const relationship of relationships) { _%>
       <%_ if (relationship.ownerSide && !relationship.collection && !relationship.id) { _%>
-    @Column("<%= relationship.columnName %>_id")
+    @Column("<%= relationship.joinColumnNames[0] %>")
     private <%= relationship.otherEntity.primaryKey.type %> <%= relationship.relationshipFieldName %>Id;
       <%_ } _%>
     <%_ } _%>

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

@@ -0,0 +1,43 @@
+<%#
+ 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.
+-%>
+package <%= entityAbsolutePackage %>.domain;
+
+import org.reactivestreams.Publisher;
+import org.springframework.data.r2dbc.mapping.OutboundRow;
+import org.springframework.data.r2dbc.mapping.event.AfterConvertCallback;
+import org.springframework.data.r2dbc.mapping.event.AfterSaveCallback;
+import org.springframework.data.relational.core.sql.SqlIdentifier;
+import org.springframework.stereotype.Component;
+
+import reactor.core.publisher.Mono;
+
+@Component
+public class <%= persistClass %>Callback implements AfterSaveCallback<<%= persistClass %>>, AfterConvertCallback<<%= persistClass %>> {
+
+    @Override
+    public Publisher<<%= persistClass %>> onAfterConvert(<%= persistClass %> entity, SqlIdentifier table) {
+        return Mono.just(entity.setIsPersisted());
+    }
+
+    @Override
+    public Publisher<<%= persistClass %>> onAfterSave(<%= persistClass %> entity, OutboundRow outboundRow,
+            SqlIdentifier table) {
+        return Mono.just(entity.setIsPersisted());
+    }
+}

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

@@ -20,13 +20,13 @@ package <%= entityAbsolutePackage %>.repository;
 
 import <%= entityAbsolutePackage %>.domain.<%= persistClass %>;
 
-<%_ if (relationshipsContainEagerLoad) { _%>
+<%_ if (implementsEagerLoadApis) { _%>
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 <%_ } _%>
 <%_ if (databaseTypeSql) { _%>
 import org.springframework.data.jpa.repository.*;
-  <%_ if (relationshipsContainEagerLoad) { _%>
+  <%_ if (implementsEagerLoadApis) { _%>
 import org.springframework.data.repository.query.Param;
   <%_ } _%>
 <%_ } _%>
@@ -42,10 +42,10 @@ import org.springframework.data.cassandra.repository.CassandraRepository;
 <%_ } _%>
 import org.springframework.stereotype.Repository;
 <%_ if (databaseTypeSql || databaseTypeMongodb) { _%>
-  <%_ if (relationshipsContainEagerLoad || relationships.some(r => r.relationshipManyToOne && r.otherEntityUser)) { _%>
+  <%_ if (implementsEagerLoadApis || relationships.some(r => r.relationshipManyToOne && r.otherEntityUser)) { _%>
 import java.util.List;
   <%_ } _%>
-  <%_ if (relationshipsContainEagerLoad) { _%>
+  <%_ if (implementsEagerLoadApis) { _%>
 import java.util.Optional;
   <%_ } _%>
 <%_ } _%>
@@ -55,9 +55,14 @@ import java.util.UUID;
 <%_ } _%>
 
 /**
- * Spring Data <%= officialDatabaseType %> repository for the <%= persistClass %> entity.
+ * <%= springDataDescription %> repository for the <%= persistClass %> entity.
+<%_ if (containsBagRelationships && databaseTypeSql) { _%>
+ *
+ * When extending this class, extend <%= entityClass %>RepositoryWithBagRelationships too.
+ * For more information refer to https://github.com/jhipster/generator-jhipster/issues/17990.
+<%_ } _%>
  */
-<%_ if (!relationshipsContainEagerLoad) { _%>
+<%_ if (!implementsEagerLoadApis) { _%>
 @SuppressWarnings("unused")
 <%_ } _%>
 @Repository
@@ -69,7 +74,7 @@ public interface <%= entityClass %>Repository extends <% if (containsBagRelation
     List<<%= persistClass %>> findBy<%= relationship.relationshipNameCapitalized %>IsCurrentUser();
   <%_ } _%>
 <%_ } _%>
-<%_ if (relationshipsContainEagerLoad) { _%>
+<%_ if (implementsEagerLoadApis) { _%>
   <%_ if (databaseTypeSql) { _%>
 
     <%_ const containsToOneEagerRelationship = relationships.some(relationship => relationship.relationshipEagerLoad && !relationship.bagRelationship); _%>

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

@@ -38,19 +38,21 @@ import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Optional;
 import org.springframework.data.domain.Pageable;
-<%_ if (databaseTypeSql) { _%>
 import io.r2dbc.spi.Row;
 import io.r2dbc.spi.RowMetadata;
 import static org.springframework.data.relational.core.query.Criteria.where;
-  <%_ if (fieldsContainOwnerManyToMany) { _%>
+<%_ if (containsBagRelationships) { _%>
 import static org.springframework.data.relational.core.query.Query.query;
-  <%_ } _%>
+<%_ } _%>
 import org.springframework.data.r2dbc.convert.R2dbcConverter;
 import org.springframework.data.r2dbc.core.R2dbcEntityOperations;
 import org.springframework.data.r2dbc.core.R2dbcEntityTemplate;
 import org.springframework.data.r2dbc.repository.support.SimpleR2dbcRepository;
 import org.springframework.data.relational.core.query.Criteria;
 import org.springframework.data.relational.core.sql.Column;
+import org.springframework.data.relational.core.sql.Comparison;
+import org.springframework.data.relational.core.sql.Condition;
+import org.springframework.data.relational.core.sql.Conditions;
 import org.springframework.data.relational.core.sql.Expression;
 import org.springframework.data.relational.core.sql.Select;
 import org.springframework.data.relational.core.sql.SelectBuilder.SelectFromAndJoin<% if (reactiveEagerRelations.length > 0) { %>Condition<% } %>;
@@ -58,7 +60,6 @@ import org.springframework.data.relational.core.sql.Table;
 import org.springframework.data.relational.repository.support.MappingRelationalEntityInformation;
 import org.springframework.r2dbc.core.DatabaseClient;
 import org.springframework.r2dbc.core.RowsFetchSpec;
-<%_ } _%>
 
 import <%= entityAbsolutePackage %>.domain.<%= persistClass %>;
 <% relationships.forEach(function(rel) {
@@ -85,7 +86,7 @@ import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
 /**
- * Spring Data <%= officialDatabaseType %> reactive custom repository implementation for the <%= persistClass %> entity.
+ * <%= springDataDescription %> custom repository implementation for the <%= persistClass %> entity.
  */
 @SuppressWarnings("unused")
 class <%= entityClass %>RepositoryInternalImpl extends SimpleR2dbcRepository<<%= persistClass %>, <%= primaryKey.type %>> implements <%= entityClass %>RepositoryInternal {
@@ -105,7 +106,7 @@ class <%= entityClass %>RepositoryInternalImpl extends SimpleR2dbcRepository<<%=
 <%_ relationships.forEach(function(rel) {
   if (rel.shouldWriteJoinTable) {
 _%>
-    private final static EntityManager.LinkTable <%= rel.relationshipName %>Link = new EntityManager.LinkTable("<%= rel.joinTable.name %>", "<%= getColumnName(name) %>_id", "<%= getColumnName(rel.relationshipName) %>_id");
+    private final static EntityManager.LinkTable <%= rel.relationshipName %>Link = new EntityManager.LinkTable("<%= rel.joinTable.name %>", "<%= entity.entityTableName %>_<%= getColumnName(entity.primaryKey.name) %>", "<%= rel.joinColumnNames[0] %>");
 <%_ }
 }); _%>
 
@@ -123,40 +124,35 @@ _%>
 
     @Override
     public Flux<<%= persistClass %>> findAllBy(Pageable pageable) {
-        return findAllBy(pageable, null);
-    }
-
-    @Override
-    public Flux<<%= persistClass %>> findAllBy(Pageable pageable, Criteria criteria) {
-        return createQuery(pageable, criteria).all();
+        return createQuery(pageable, null).all();
     }
 
-    RowsFetchSpec<<%= persistClass %>> createQuery(Pageable pageable, Criteria criteria) {
+    RowsFetchSpec<<%= persistClass %>> createQuery(Pageable pageable, Condition whereClause) {
         List<Expression> columns = <%= entityClass %>SqlHelper.getColumns(entityTable, EntityManager.ENTITY_ALIAS);
 <%_ reactiveEagerRelations.forEach(function(rel) { _%>
         columns.addAll(<%= rel.otherEntityNameCapitalized %>SqlHelper.getColumns(<%= rel.relationshipName %>Table, "<%= rel.relationshipName %>"));
 <%_ }); _%>
         SelectFromAndJoin<% if (reactiveEagerRelations.length > 0) { %>Condition<% } %> selectFrom = Select.builder().select(columns).from(entityTable)
-<%_ reactiveEagerRelations.forEach(function(rel) {
-            const colName = _getJoinColumnName(rel); _%>
-            .leftOuterJoin(<%= rel.relationshipName %>Table).on(Column.create("<%= colName %>", entityTable)).equals(Column.create("id", <%= rel.relationshipName %>Table ))
+<%_ reactiveEagerRelations.forEach(function(rel) { _%>
+            .leftOuterJoin(<%= rel.relationshipName %>Table).on(Column.create("<%= rel.joinColumnNames[0] %>", entityTable)).equals(Column.create("<%= rel.otherEntity.primaryKey.fields[0].columnName %>", <%= rel.relationshipName %>Table ))
 <%_ }); _%>;
-
-        String select = entityManager.createSelect(selectFrom, <%= persistClass %>.class, pageable, criteria);
+        // we do not support Criteria here for now as of https://github.com/jhipster/generator-jhipster/issues/18269
+        String select = entityManager.createSelect(selectFrom, <%= persistClass %>.class, pageable, whereClause);
         return db.sql(select).map(this::process);
     }
 
     @Override
     public Flux<<%= persistClass %>> findAll() {
-        return findAllBy(null, null);
+        return findAllBy(null);
     }
 
     @Override
     public Mono<<%= persistClass %>> findById(<%= primaryKey.type %> id) {
-        return createQuery(null, where(EntityManager.ENTITY_ALIAS + ".<%= primaryKey.name %>").is(id)).one();
+        Comparison whereClause = Conditions.isEqual(entityTable.column("<%= primaryKey.fields[0].columnName %>"), Conditions.just(id.toString()));
+        return createQuery(null, whereClause).one();
     }
 
-<%_ if (relationshipsContainEagerLoad) { _%>
+<%_ if (implementsEagerLoadApis) { _%>
 
     @Override
     public Mono<<%= persistClass %>> findOneWithEagerRelationships(<%= primaryKey.type %> id) {
@@ -190,30 +186,30 @@ _%>
             return entityManager.insert(entity);
         }
 <%_ } _%>
-        return super.save(entity)<% if (fieldsContainOwnerManyToMany) { %>.flatMap((S e) -> updateRelations(e))<% } %>;
+        return super.save(entity)<% if (containsBagRelationships) { %>.flatMap((S e) -> updateRelations(e))<% } %>;
     }
 
-<%_ if (fieldsContainOwnerManyToMany) { _%>
+<%_ if (containsBagRelationships) { _%>
     protected <S extends <%= persistClass %>> Mono<S> updateRelations(S entity) {
   <%_ relationships.filter(function(rel) {
     return (rel.relationshipManyToMany && rel.ownerSide);
    }).forEach(function(rel, idx) { _%>
     <%_ if (idx === 0) { _%>
-        Mono<Void> result = entityManager.updateLinkTable(<%= rel.relationshipName %>Link, entity.get<%= primaryKey.nameCapitalized %>(), entity.get<%= rel.relationshipNameCapitalizedPlural %>().stream().map(<%= asEntity(rel.otherEntityNameCapitalized) %>::getId)).then();
+        Mono<Void> result = entityManager.updateLinkTable(<%= rel.relationshipName %>Link, entity.get<%= primaryKey.nameCapitalized %>(), entity.get<%= rel.relationshipNameCapitalizedPlural %>().stream().map(<%= asEntity(rel.otherEntityNameCapitalized) %>::get<%= rel.otherEntity.primaryKey.nameCapitalized %>)).then();
     <%_ } else { _%>
-        result = result.and(entityManager.updateLinkTable(<%= rel.relationshipName %>Link, entity.get<%= primaryKey.nameCapitalized %>(), entity.get<%= rel.relationshipNameCapitalizedPlural %>().stream().map(<%= asEntity(rel.otherEntityNameCapitalized) %>::getId)));
+        result = result.and(entityManager.updateLinkTable(<%= rel.relationshipName %>Link, entity.get<%= primaryKey.nameCapitalized %>(), entity.get<%= rel.relationshipNameCapitalizedPlural %>().stream().map(<%= asEntity(rel.otherEntityNameCapitalized) %>::get<%= rel.otherEntity.primaryKey.nameCapitalized %>)));
     <%_ } _%>
   <%_ }); _%>
         return result.thenReturn(entity);
     }
 
     @Override
-    public Mono<Void> deleteById(Long entityId) {
+    public Mono<Void> deleteById(<%= primaryKey.type %> entityId) {
         return deleteRelations(entityId)
             .then(super.deleteById(entityId));
     }
 
-    protected Mono<Void> deleteRelations(Long entityId) {
+    protected Mono<Void> deleteRelations(<%= primaryKey.type %> entityId) {
   <%_ relationships.filter(function(rel) {
       return (rel.relationshipManyToMany && rel.ownerSide);
     }).forEach(function(rel, idx) { _%>

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

@@ -16,7 +16,7 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -%>
-package <%= packageName %>.repository;
+package <%= entityAbsolutePackage %>.repository;
 
 import java.util.List;
 import java.util.Optional;
@@ -26,7 +26,7 @@ import java.util.UUID;
 
 import org.springframework.data.domain.Page;
 
-import <%= packageName %>.domain.<%= persistClass %>;
+import <%= entityAbsolutePackage %>.domain.<%= persistClass %>;
 
 public interface <%= entityClass %>RepositoryWithBagRelationships {
     Optional<<%= persistClass %>> fetchBagRelationships(Optional<<%= persistClass %>> <%= entityInstance %>);

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

@@ -16,30 +16,33 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -%>
-package <%= packageName %>.repository;
+package <%= entityAbsolutePackage %>.repository;
 
+import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
+import java.util.HashMap;
 <%_ if (fieldsContainUUID) { _%>
 import java.util.UUID;
 <%_ } _%>
+import java.util.stream.IntStream;
 
 import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
 
 import org.hibernate.annotations.QueryHints;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageImpl;
 
-import <%= packageName %>.domain.<%= persistClass %>;
+import <%= entityAbsolutePackage %>.domain.<%= persistClass %>;
 
 /**
  * Utility repository to load bag relationships based on https://vladmihalcea.com/hibernate-multiplebagfetchexception/
  */
 public class <%= entityClass %>RepositoryWithBagRelationshipsImpl implements <%= entityClass %>RepositoryWithBagRelationships {
-    @Autowired
+    @PersistenceContext
     private EntityManager entityManager;
- 
+
     @Override
     public Optional<<%= persistClass %>> fetchBagRelationships(Optional<<%= persistClass %>> <%= entityInstance %>) {
         return <%= entityInstance %>
@@ -48,12 +51,12 @@ public class <%= entityClass %>RepositoryWithBagRelationshipsImpl implements <%=
 <%_ } _%>
         ;
     }
- 
+
     @Override
     public Page<<%= persistClass %>> fetchBagRelationships(Page<<%= persistClass %>> <%= entityInstancePlural %>) {
         return new PageImpl<>(fetchBagRelationships(<%= entityInstancePlural %>.getContent()), <%= entityInstancePlural %>.getPageable(), <%= entityInstancePlural %>.getTotalElements());
     }
- 
+
     @Override
     public List<<%= persistClass %>> fetchBagRelationships(List<<%= persistClass %>> <%= entityInstancePlural %>) {
         return Optional
@@ -61,7 +64,7 @@ public class <%= entityClass %>RepositoryWithBagRelationshipsImpl implements <%=
 <%_ for (const relationship of relationships.filter(relationship => relationship.bagRelationship)) { _%>
             .map(this::fetch<%= relationship.relationshipNameCapitalizedPlural %>)
 <%_ } _%>
-            .get();
+            .orElse(Collections.emptyList());
     }
 <%_ for (const relationship of relationships.filter(relationship => relationship.bagRelationship)) { _%>
 
@@ -77,7 +80,10 @@ public class <%= entityClass %>RepositoryWithBagRelationshipsImpl implements <%=
     }
 
     List<<%= persistClass %>> fetch<%= relationship.relationshipNameCapitalizedPlural %>(List<<%= persistClass %>> <%= entityInstancePlural %>) {
-        return entityManager
+        HashMap<Object, Integer> order = new HashMap<>();
+        IntStream.range(0, <%= entityInstancePlural %>.size())
+            .forEach(index -> order.put(<%= entityInstancePlural %>.get(index).get<%= primaryKey.nameCapitalized %>(), index));
+        List<<%= persistClass %>> result = entityManager
             .createQuery(
                 "select distinct <%= entityInstance %> from <%= persistClass %> <%= entityInstance %> left join fetch <%= entityInstance %>.<%= relationship.relationshipFieldNamePlural %> where <%= entityInstance %> in :<%= entityInstancePlural %>",
                 <%= persistClass %>.class
@@ -85,6 +91,8 @@ public class <%= entityClass %>RepositoryWithBagRelationshipsImpl implements <%=
             .setParameter("<%= entityInstancePlural %>", <%= entityInstancePlural %>)
             .setHint(QueryHints.PASS_DISTINCT_THROUGH, false)
             .getResultList();
+        Collections.sort(result, (o1, o2) -> Integer.compare(order.get(o1.get<%= primaryKey.nameCapitalized %>()), order.get(o2.get<%= primaryKey.nameCapitalized %>())));
+        return result;
     }
 <%_ } _%>
 }