generator-jhipster 7.4.1 → 7.7.0

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

@@ -1,5 +1,5 @@
 <%#
- Copyright 2013-2021 the original author or authors from the JHipster project.
+ 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.
@@ -26,7 +26,7 @@ import org.springframework.data.annotation.Id;
 import org.springframework.data.mongodb.core.mapping.Document;
   <%_ } _%>
 import org.springframework.data.mongodb.core.mapping.Field;
-  <%_ if (relationships.length > 0) { _%>
+  <%_ if (!reactive && relationships.length > 0) { _%>
 import org.springframework.data.mongodb.core.mapping.DBRef;
   <%_ } _%>
 <&_ } -&>
@@ -55,26 +55,23 @@ import org.springframework.data.mongodb.core.mapping.DBRef;
 
 <%_ for (const relationship of relationships) { _%>
 <&_ if (fragment.relationship<%- relationship.relationshipNameCapitalized %>AnnotationSection) { -&>
-  <%_ if (relationship.relationshipOneToMany) { _%>
-    <%_ if (!relationship.otherEntity.embedded) { _%>
+  <%_ if (!reactive && (relationship.relationshipManyToMany || !relationship.otherEntity.embedded)) { _%>
     @DBRef
-    <%_ } _%>
+  <%_ } _%>
+  <%_ if (relationship.relationshipOneToMany) { _%>
     @Field("<%= relationship.relationshipFieldName %>")
   <%_ } else if (relationship.relationshipManyToOne) { _%>
     <%_ if (!relationship.otherEntity.embedded) { _%>
-    @DBRef
     @Field("<%= relationship.relationshipFieldName %>")
     <%_ } _%>
 
   <%_ } else if (relationship.relationshipManyToMany) { _%>
-    @DBRef
     @Field("<%= relationship.relationshipFieldNamePlural %>")
   <%_ } else { _%>
     <%_ if (!relationship.otherEntity.embedded) { _%>
-    @DBRef
-        <%_ if (relationship.ownerSide) { _%>
+      <%_ if (relationship.ownerSide) { _%>
     @Field("<%= relationship.relationshipFieldName %>")
-        <%_ } _%>
+      <%_ } _%>
     <%_ } _%>
   <%_ } _%>
 

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

@@ -1,5 +1,5 @@
 <%#
- Copyright 2013-2021 the original author or authors from the JHipster project.
+ 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.

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

@@ -1,5 +1,5 @@
 <%#
- Copyright 2013-2021 the original author or authors from the JHipster project.
+ 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.

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

@@ -1,5 +1,5 @@
 <%#
- Copyright 2013-2021 the original author or authors from the JHipster project.
+ 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.

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

@@ -1,5 +1,5 @@
 <%#
- Copyright 2013-2021 the original author or authors from the JHipster project.
+ 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.

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

@@ -1,5 +1,5 @@
 <%#
- Copyright 2013-2021 the original author or authors from the JHipster project.
+ 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.
@@ -41,16 +41,8 @@ import org.springframework.data.neo4j.repository.Neo4jRepository;
 import org.springframework.data.cassandra.repository.CassandraRepository;
 <%_ } _%>
 import org.springframework.stereotype.Repository;
-<%_
-if (databaseTypeSql || databaseTypeMongodb) {
-  let importList = fieldsContainOwnerManyToMany;
-  for (r of relationships) {
-    if (r.relationshipManyToOne && r.otherEntityUser) {
-      importList = true;
-    }
-  }
-_%>
-  <%_ if (importList) { _%>
+<%_ if (databaseTypeSql || databaseTypeMongodb) { _%>
+  <%_ if (relationshipsContainEagerLoad || relationships.some(r => r.relationshipManyToOne && r.otherEntityUser)) { _%>
 import java.util.List;
   <%_ } _%>
   <%_ if (relationshipsContainEagerLoad) { _%>
@@ -69,39 +61,57 @@ import java.util.UUID;
 @SuppressWarnings("unused")
 <%_ } _%>
 @Repository
-public interface <%= entityClass %>Repository extends <% if (databaseTypeSql) { %>JpaRepository<% } %><% if (databaseTypeMongodb) { %>MongoRepository<% } %><% if (databaseTypeNeo4j) { %>Neo4jRepository<% } %><% if (databaseTypeCassandra) { %>CassandraRepository<% } %><<%= persistClass %>, <%= primaryKey.type %>><% if (jpaMetamodelFiltering) { %>, JpaSpecificationExecutor<<%= persistClass %>><% } %> {
-  <%_
-  for (const relationship of relationships) {
-    if (relationship.relationshipManyToOne && relationship.otherEntityUser && databaseTypeSql) { _%>
+public interface <%= entityClass %>Repository extends <% if (containsBagRelationships && databaseTypeSql) { %><%= entityClass %>RepositoryWithBagRelationships, <% } %><% if (databaseTypeSql) { %>JpaRepository<% } %><% if (databaseTypeMongodb) { %>MongoRepository<% } %><% if (databaseTypeNeo4j) { %>Neo4jRepository<% } %><% if (databaseTypeCassandra) { %>CassandraRepository<% } %><<%= persistClass %>, <%= primaryKey.type %>><% if (jpaMetamodelFiltering) { %>, JpaSpecificationExecutor<<%= persistClass %>><% } %> {
+<%_ for (const relationship of relationships) { _%>
+  <%_ if (relationship.relationshipManyToOne && relationship.otherEntityUser && databaseTypeSql) { _%>
 
     @Query("select <%= entityInstanceDbSafe %> from <%= persistClass %> <%= entityInstanceDbSafe %> where <%= entityInstanceDbSafe %>.<%= relationship.relationshipFieldName %>.login = ?#{principal.<% if (authenticationTypeOauth2) { %>preferredUsername<% } else { %>username<% } %>}")
     List<<%= persistClass %>> findBy<%= relationship.relationshipNameCapitalized %>IsCurrentUser();
-    <%_ } _%>
   <%_ } _%>
-  <%_
-  if (relationshipsContainEagerLoad) {
-    if (databaseTypeSql) { _%>
+<%_ } _%>
+<%_ if (relationshipsContainEagerLoad) { _%>
+  <%_ if (databaseTypeSql) { _%>
+
+    <%_ const containsToOneEagerRelationship = relationships.some(relationship => relationship.relationshipEagerLoad && !relationship.bagRelationship); _%>
+    default Optional<<%= persistClass %>> findOneWithEagerRelationships(<%= primaryKey.type %> <%= primaryKey.name %>) {
+        return <% if (containsBagRelationships) { %>this.fetchBagRelationships(<% } %>
+            this.<% if (containsToOneEagerRelationship) { %>findOneWithToOneRelationships<% } else { %>findById<% } %>(<%= primaryKey.name %>)
+    <%  if (containsBagRelationships) { %>)<% } %>;
+    }
+
+    default List<<%= persistClass %>> findAllWithEagerRelationships() {
+        return <% if (containsBagRelationships) { %>this.fetchBagRelationships(<% } %>
+            this.<% if (containsToOneEagerRelationship) { %>findAllWithToOneRelationships<% } else { %>findAll<% } %>()
+    <%  if (containsBagRelationships) { %>)<% } %>;
+    }
+
+    default Page<<%= persistClass %>> findAllWithEagerRelationships(Pageable pageable) {
+        return <% if (containsBagRelationships) { %>this.fetchBagRelationships(<% } %>
+            this.<% if (containsToOneEagerRelationship) { %>findAllWithToOneRelationships<% } else { %>findAll<% } %>(pageable)
+    <%  if (containsBagRelationships) { %>)<% } %>;
+    }
+    <%_ if (containsToOneEagerRelationship) { _%>
 
     @Query(value = "select distinct <%= entityInstanceDbSafe %> from <%= persistClass %> <%= entityInstanceDbSafe %><%
       for (const relationship of relationships) {
-        if (relationship.relationshipEagerLoad) { %> left join fetch <%= entityInstanceDbSafe %>.<%= relationship.reference.name %><% }
+        if (relationship.relationshipEagerLoad && !relationship.bagRelationship) { %> left join fetch <%= entityInstanceDbSafe %>.<%= relationship.reference.name %><% }
       } %>",
         countQuery = "select count(distinct <%= entityInstanceDbSafe %>) from <%= persistClass %> <%= entityInstanceDbSafe %>")
-    Page<<%= persistClass %>> findAllWithEagerRelationships(Pageable pageable);
+    Page<<%= persistClass %>> findAllWithToOneRelationships(Pageable pageable);
 
     @Query("select distinct <%= entityInstanceDbSafe %> from <%= persistClass %> <%= entityInstanceDbSafe %><%
       for (const relationship of relationships) {
-        if (relationship.relationshipEagerLoad) { %> left join fetch <%= entityInstanceDbSafe %>.<%= relationship.reference.name %><% }
+        if (relationship.relationshipEagerLoad && !relationship.bagRelationship) { %> left join fetch <%= entityInstanceDbSafe %>.<%= relationship.reference.name %><% }
       } %>")
-    List<<%= persistClass %>> findAllWithEagerRelationships();
+    List<<%= persistClass %>> findAllWithToOneRelationships();
 
     @Query("select <%= entityInstanceDbSafe %> from <%= persistClass %> <%= entityInstanceDbSafe %><%
       for (const relationship of relationships) {
-        if (relationship.relationshipEagerLoad) { %> left join fetch <%= entityInstanceDbSafe %>.<%= relationship.reference.name %><% }
+        if (relationship.relationshipEagerLoad && !relationship.bagRelationship) { %> left join fetch <%= entityInstanceDbSafe %>.<%= relationship.reference.name %><% }
       } %> where <%= entityInstanceDbSafe %>.id =:id")
-    Optional<<%= persistClass %>> findOneWithEagerRelationships(@Param("id") <%= primaryKey.type %> id);
-    <%_
-    } else if (databaseTypeMongodb)  { _%>
+    Optional<<%= persistClass %>> findOneWithToOneRelationships(@Param("id") <%= primaryKey.type %> id);
+    <%_ } _%>
+  <%_ } else if (databaseTypeMongodb) { _%>
 
     @Query("{}")
     Page<<%= persistClass %>> findAllWithEagerRelationships(Pageable pageable);
@@ -111,8 +121,6 @@ public interface <%= entityClass %>Repository extends <% if (databaseTypeSql) {
 
     @Query("{'id': ?0}")
     Optional<<%= persistClass %>> findOneWithEagerRelationships(<%= primaryKey.type %> id);
-    <%_
-    }
-  }
-  _%>
+  <%_ } _%>
+<%_ } _%>
 }

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

@@ -1,5 +1,5 @@
 <%#
- Copyright 2013-2021 the original author or authors from the JHipster project.
+ 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.
@@ -41,17 +41,21 @@ 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) { _%>
 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.Expression;
 import org.springframework.data.relational.core.sql.Select;
 import org.springframework.data.relational.core.sql.SelectBuilder.SelectFromAndJoin<% if (reactiveEagerRelations.length > 0) { %>Condition<% } %>;
 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;
 <%_ } _%>
@@ -73,9 +77,8 @@ import <%= otherEntity.entityAbsolutePackage %>.repository.rowmapper.<%= otherEn
 import <%= otherEntity.entityAbsolutePackage %>.repository.<%= otherEntity.entityClass %>SqlHelper;
   <%_ } _%>
 <%_ }); _%>
-import <%= packageName %>.service.EntityManager;
-<%_ if (fieldsContainOwnerManyToMany) { _%>
-import <%= packageName %>.service.EntityManager.LinkTable;
+<%_ if (packageName !== entityAbsolutePackage) { _%>
+import <%= packageName %>.repository.EntityManager;
 <%_ } _%>
 
 import reactor.core.publisher.Flux;
@@ -85,7 +88,7 @@ import reactor.core.publisher.Mono;
  * Spring Data <%= officialDatabaseType %> reactive custom repository implementation for the <%= persistClass %> entity.
  */
 @SuppressWarnings("unused")
-class <%= entityClass %>RepositoryInternalImpl implements <%= entityClass %>RepositoryInternal {
+class <%= entityClass %>RepositoryInternalImpl extends SimpleR2dbcRepository<<%= persistClass %>, <%= primaryKey.type %>> implements <%= entityClass %>RepositoryInternal {
     private final DatabaseClient db;
     private final R2dbcEntityTemplate r2dbcEntityTemplate;
     private final EntityManager entityManager;
@@ -102,12 +105,14 @@ class <%= entityClass %>RepositoryInternalImpl implements <%= entityClass %>Repo
 <%_ relationships.forEach(function(rel) {
   if (rel.shouldWriteJoinTable) {
 _%>
-    private final static EntityManager.LinkTable <%= rel.relationshipName %>Link = new 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 %>", "<%= getColumnName(name) %>_id", "<%= getColumnName(rel.relationshipName) %>_id");
 <%_ }
 }); _%>
 
     public <%= entityClass %>RepositoryInternalImpl(R2dbcEntityTemplate template, EntityManager entityManager<%_
-            reactiveUniqueEntityTypes.forEach(function(element) { _%>, <%= element %>RowMapper <%= element.toLowerCase() %>Mapper<%_ }); _%>) {
+            reactiveUniqueEntityTypes.forEach(function(element) { _%>, <%= element %>RowMapper <%= element.toLowerCase() %>Mapper<%_ }); _%>, R2dbcEntityOperations entityOperations,
+        R2dbcConverter converter) {
+        super(new MappingRelationalEntityInformation(converter.getMappingContext().getRequiredPersistentEntity(<%= persistClass %>.class)), entityOperations, converter);
         this.db = template.getDatabaseClient();
         this.r2dbcEntityTemplate = template;
         this.entityManager = entityManager;
@@ -127,22 +132,18 @@ _%>
     }
 
     RowsFetchSpec<<%= persistClass %>> createQuery(Pageable pageable, Criteria criteria) {
-        List<Expression> columns = <%= persistClass %>SqlHelper.getColumns(entityTable, EntityManager.ENTITY_ALIAS);
+        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 ))<%_ }); _%>;
+        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 ))
+<%_ }); _%>;
 
         String select = entityManager.createSelect(selectFrom, <%= persistClass %>.class, pageable, criteria);
-<%_ if (databaseTypeSql) { _%>
-        String alias = entityTable.getReferenceName().getReference();
-        String selectWhere =
-            Optional.ofNullable(criteria).map(crit ->
-                new StringBuilder(select).append(" ").append("WHERE").append(" ").append(alias).append(".").append(crit.toString()).toString()).orElse(select); // TODO remove once https://github.com/spring-projects/spring-data-jdbc/issues/907 will be fixed
-<%_ } _%>
-        return db.sql(select<% if (databaseTypeSql) { %>Where<% } %>).map(this::process);
+        return db.sql(select).map(this::process);
     }
 
     @Override
@@ -152,10 +153,10 @@ _%>
 
     @Override
     public Mono<<%= persistClass %>> findById(<%= primaryKey.type %> id) {
-        return createQuery(null, where("<%= primaryKey.name %>").is(id)).one();
+        return createQuery(null, where(EntityManager.ENTITY_ALIAS + ".<%= primaryKey.name %>").is(id)).one();
     }
 
-<%_ if (fieldsContainOwnerManyToMany) { _%>
+<%_ if (relationshipsContainEagerLoad) { _%>
 
     @Override
     public Mono<<%= persistClass %>> findOneWithEagerRelationships(<%= primaryKey.type %> id) {
@@ -181,76 +182,47 @@ _%>
         return entity;
     }
 
-    @Override
-    public <S extends <%= persistClass %>> Mono<S> insert(S entity) {
-        return entityManager.insert(entity);
-    }
-
     @Override
     public <S extends <%= persistClass %>> Mono<S> save(S entity) {
-        if (entity.get<%= primaryKey.nameCapitalized %>() == null) {
 <%_ if (isUsingMapsId) { _%>
-            entity.set<%= primaryKey.nameCapitalized %>(entity.get<%= mapsIdAssoc.relationshipNameCapitalized %>().get<%= primaryKey.nameCapitalized %>());
-<%_ } _%>
-            return insert(entity)<% if (fieldsContainOwnerManyToMany) { %>.flatMap(savedEntity -> updateRelations(savedEntity))<% } %>;
-        } else {
-            return update(entity).map(numberOfUpdates -> {
-                if (numberOfUpdates.intValue() <= 0) {
-                    throw new IllegalStateException("Unable to update <%= entityClass %> with id = " + entity.get<%= primaryKey.nameCapitalized %>());
-                }
-                return entity;
-            })<% if (fieldsContainOwnerManyToMany) { %>.then(updateRelations(entity))<% } %>;
+        if (entity.get<%= primaryKey.nameCapitalized %>() == null && entity.get<%= mapsIdAssoc.relationshipNameCapitalized %>() != null) {
+            entity.set<%= primaryKey.nameCapitalized %>(entity.get<%= mapsIdAssoc.relationshipNameCapitalized %>().get<%= mapsIdAssoc.otherEntity.primaryKey.nameCapitalized %>());
+            return entityManager.insert(entity);
         }
-    }
-
-    @Override
-    public Mono<Integer> update(<%= persistClass %> entity) {
-<%_ if (fields.some(field => !field.id) || relationships.some(relationship => !relationship.id && relationship.ownerSide)) { _%>
-        //fixme is this the proper way?
-        return r2dbcEntityTemplate.update(entity).thenReturn(1);
-<%_ } else { _%>
-        /*
-         * Entity doesn't contain any updatable data, ignore update for compatibility.
-         * Otherwise it fails with `IllegalArgumentException: UPDATE contains no assignments`
-         * https://github.com/spring-projects/spring-data-r2dbc/issues/250#issuecomment-563122844
-         */
-        return Mono.just(1);
 <%_ } _%>
+        return super.save(entity)<% if (fieldsContainOwnerManyToMany) { %>.flatMap((S e) -> updateRelations(e))<% } %>;
     }
 
 <%_ if (fieldsContainOwnerManyToMany) { _%>
-
-    @Override
-    public Mono<Void> deleteById(Long entityId) {
-        return deleteRelations(entityId).then(
-             r2dbcEntityTemplate.delete(<%= persistClass %>.class).matching(query(where("id").is(entityId))).all().then()
-        );
-    }
-
     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) { _%>
+    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();
-   <%_ } else { _%>
+    <%_ } else { _%>
         result = result.and(entityManager.updateLinkTable(<%= rel.relationshipName %>Link, entity.get<%= primaryKey.nameCapitalized %>(), entity.get<%= rel.relationshipNameCapitalizedPlural %>().stream().map(<%= asEntity(rel.otherEntityNameCapitalized) %>::getId)));
-   <%_
-       }
-  }); _%>
+    <%_ } _%>
+  <%_ }); _%>
         return result.thenReturn(entity);
     }
 
-    protected Mono<Void> deleteRelations(Long entityId) {
-  <%_ relationships.filter(function(rel) {
-          return (rel.relationshipManyToMany && rel.ownerSide);
-  }).forEach(function(rel, idx) {
-    if (idx === 0) { _%>
-        return entityManager.deleteFromLinkTable(<%= rel.relationshipName %>Link, entityId)<%
-    } else { %>
-                .and(entityManager.deleteFromLinkTable(<%= rel.relationshipName %>Link, entityId))<% }
-  }); %>;
+    @Override
+    public Mono<Void> deleteById(Long entityId) {
+        return deleteRelations(entityId)
+            .then(super.deleteById(entityId));
     }
 
+    protected Mono<Void> deleteRelations(Long entityId) {
+  <%_ relationships.filter(function(rel) {
+      return (rel.relationshipManyToMany && rel.ownerSide);
+    }).forEach(function(rel, idx) { _%>
+    <%_ if (idx === 0) { _%>
+        return entityManager.deleteFromLinkTable(<%= rel.relationshipName %>Link, entityId)
+    <%_} else { _%>
+            .and(entityManager.deleteFromLinkTable(<%= rel.relationshipName %>Link, entityId))
+    <%_ } _%>
+  <%_ }); %>;
+        }
 <%_ } _%>
 }

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

@@ -0,0 +1,37 @@
+<%#
+ Copyright 2013-2021 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 <%= packageName %>.repository;
+
+import java.util.List;
+import java.util.Optional;
+<%_ if (fieldsContainUUID) { _%>
+import java.util.UUID;
+<%_ } _%>
+
+import org.springframework.data.domain.Page;
+
+import <%= packageName %>.domain.<%= persistClass %>;
+
+public interface <%= entityClass %>RepositoryWithBagRelationships {
+    Optional<<%= persistClass %>> fetchBagRelationships(Optional<<%= persistClass %>> <%= entityInstance %>);
+
+    List<<%= persistClass %>> fetchBagRelationships(List<<%= persistClass %>> <%= entityInstancePlural %>);
+
+    Page<<%= persistClass %>> fetchBagRelationships(Page<<%= persistClass %>> <%= entityInstancePlural %>);
+}

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

@@ -0,0 +1,90 @@
+<%#
+ Copyright 2013-2021 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 <%= packageName %>.repository;
+
+import java.util.List;
+import java.util.Optional;
+<%_ if (fieldsContainUUID) { _%>
+import java.util.UUID;
+<%_ } _%>
+
+import javax.persistence.EntityManager;
+
+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 %>;
+
+/**
+ * Utility repository to load bag relationships based on https://vladmihalcea.com/hibernate-multiplebagfetchexception/
+ */
+public class <%= entityClass %>RepositoryWithBagRelationshipsImpl implements <%= entityClass %>RepositoryWithBagRelationships {
+    @Autowired
+    private EntityManager entityManager;
+ 
+    @Override
+    public Optional<<%= persistClass %>> fetchBagRelationships(Optional<<%= persistClass %>> <%= entityInstance %>) {
+        return <%= entityInstance %>
+<%_ for (const relationship of relationships.filter(relationship => relationship.bagRelationship)) { _%>
+            .map(this::fetch<%= relationship.relationshipNameCapitalizedPlural %>)
+<%_ } _%>
+        ;
+    }
+ 
+    @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
+            .of(<%= entityInstancePlural %>)
+<%_ for (const relationship of relationships.filter(relationship => relationship.bagRelationship)) { _%>
+            .map(this::fetch<%= relationship.relationshipNameCapitalizedPlural %>)
+<%_ } _%>
+            .get();
+    }
+<%_ for (const relationship of relationships.filter(relationship => relationship.bagRelationship)) { _%>
+
+    <%= persistClass %> fetch<%= relationship.relationshipNameCapitalizedPlural %>(<%= persistClass %> result) {
+        return entityManager
+            .createQuery(
+                "select <%= entityInstance %> from <%= persistClass %> <%= entityInstance %> left join fetch <%= entityInstance %>.<%= relationship.relationshipFieldNamePlural %> where <%= entityInstance %> is :<%= entityInstance %>",
+                <%= persistClass %>.class
+            )
+            .setParameter("<%= entityInstance %>", result)
+            .setHint(QueryHints.PASS_DISTINCT_THROUGH, false)
+            .getSingleResult();
+    }
+
+    List<<%= persistClass %>> fetch<%= relationship.relationshipNameCapitalizedPlural %>(List<<%= persistClass %>> <%= entityInstancePlural %>) {
+        return entityManager
+            .createQuery(
+                "select distinct <%= entityInstance %> from <%= persistClass %> <%= entityInstance %> left join fetch <%= entityInstance %>.<%= relationship.relationshipFieldNamePlural %> where <%= entityInstance %> in :<%= entityInstancePlural %>",
+                <%= persistClass %>.class
+            )
+            .setParameter("<%= entityInstancePlural %>", <%= entityInstancePlural %>)
+            .setHint(QueryHints.PASS_DISTINCT_THROUGH, false)
+            .getResultList();
+    }
+<%_ } _%>
+}

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

@@ -1,5 +1,5 @@
 <%#
- Copyright 2013-2021 the original author or authors from the JHipster project.
+ 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.
@@ -35,7 +35,7 @@ import org.springframework.data.domain.Pageable;
 <%_ } _%>
 <%_ if (databaseTypeSql) { _%>
 import org.springframework.data.r2dbc.repository.Query;
-import org.springframework.data.r2dbc.repository.R2dbcRepository;
+import org.springframework.data.repository.reactive.ReactiveCrudRepository;
 import org.springframework.data.relational.core.query.Criteria;
 <%_ } _%>
 <%_ if (databaseTypeMongodb) { _%>
@@ -61,10 +61,9 @@ import java.util.UUID;
  */
 @SuppressWarnings("unused")
 @Repository
-public interface <%= entityClass %>Repository extends <% if (databaseTypeSql) { %>R2dbc<% } if (databaseTypeMongodb) { %>ReactiveMongo<% } if (databaseTypeCouchbase) { %>ReactiveN1qlCouchbase<% } if (databaseTypeNeo4j) { %>ReactiveNeo4j<% } if (databaseTypeCassandra) { %>ReactiveCassandra<% } %>Repository<<%= persistClass %>, <%= primaryKey.type %>><% if (databaseTypeSql) { %>, <%= entityClass %>RepositoryInternal<% } %> {
+public interface <%= entityClass %>Repository extends <% if (databaseTypeSql) { %>ReactiveCrud<% } if (databaseTypeMongodb) { %>ReactiveMongo<% } if (databaseTypeCouchbase) { %>ReactiveN1qlCouchbase<% } if (databaseTypeNeo4j) { %>ReactiveNeo4j<% } if (databaseTypeCassandra) { %>ReactiveCassandra<% } %>Repository<<%= persistClass %>, <%= primaryKey.type %>><% if (databaseTypeSql) { %>, <%= entityClass %>RepositoryInternal<% } %> {
 
 <%_ if (!paginationNo) { _%>
-
     Flux<<%= persistClass %>> findAllBy(Pageable pageable);
 <%_ } _%>
 <%_ if (relationshipsContainEagerLoad) { _%>
@@ -90,9 +89,8 @@ public interface <%= entityClass %>Repository extends <% if (databaseTypeSql) {
     Mono<<%= persistClass %>> findOneWithEagerRelationships(<%= primaryKey.type %> id);
   <%_ } _%>
 <%_ } _%>
-<%_
-if (databaseTypeSql) {
-  if (fieldsContainOwnerManyToMany) { _%>
+<%_ if (databaseTypeSql) { _%>
+  <%_ if (relationshipsContainEagerLoad) { _%>
 
     @Override
     Mono<<%= persistClass %>> findOneWithEagerRelationships(<%= primaryKey.type %> id);
@@ -103,16 +101,12 @@ if (databaseTypeSql) {
     @Override
     Flux<<%= persistClass %>> findAllWithEagerRelationships(Pageable page);
 
-    @Override
-    Mono<Void> deleteById(<%= primaryKey.type %> id);
-
   <%_ } _%>
 
-  <%_
-  for (const relationship of relationships) {
+  <%_ for (const relationship of relationships) {
     let relationshipName = relationship.relationshipName;
-    let ownerSide = relationship.ownerSide;
-    if (relationship.relationshipManyToOne || (relationship.relationshipOneToOne && ownerSide)) { _%>
+    let ownerSide = relationship.ownerSide; _%>
+    <%_ if (relationship.relationshipManyToOne || (relationship.relationshipOneToOne && ownerSide)) { _%>
 
     @Query("SELECT * FROM <%= entityTableName %> entity WHERE entity.<%= getColumnName(relationshipName) %>_id = :id")
     Flux<<%= persistClass %>> findBy<%= relationship.relationshipNameCapitalized %>(<%= primaryKey.type %> id);
@@ -133,7 +127,9 @@ if (databaseTypeSql) {
     <%_ } _%>
   <%_ } _%>
 
-    // just to avoid having unambigous methods
+    @Override
+    <S extends <%= persistClass %>> Mono<S> save(S entity);
+
     @Override
     Flux<<%= persistClass %>> findAll();
 
@@ -141,23 +137,23 @@ if (databaseTypeSql) {
     Mono<<%= persistClass %>> findById(<%= primaryKey.type %> id);
 
     @Override
-    <S extends <%= persistClass %>> Mono<S> save(S entity);
-
+    Mono<Void> deleteById(<%= primaryKey.type %> id);
 <%_ } _%>
 
 }
 <%_ if (databaseTypeSql) { _%>
 interface <%= entityClass %>RepositoryInternal {
-    <S extends <%= persistClass %>> Mono<S> insert(S entity);
     <S extends <%= persistClass %>> Mono<S> save(S entity);
-    Mono<Integer> update(<%= persistClass %> entity);
+
+    Flux<<%= persistClass %>> findAllBy(Pageable pageable);
 
     Flux<<%= persistClass %>> findAll();
+
     Mono<<%= persistClass %>> findById(<%= primaryKey.type %> id);
-    Flux<<%= persistClass %>> findAllBy(Pageable pageable);
+
     Flux<<%= persistClass %>> findAllBy(Pageable pageable, Criteria criteria);
 
-  <%_ if (fieldsContainOwnerManyToMany) { _%>
+  <%_ if (relationshipsContainEagerLoad) { _%>
 
     Mono<<%= persistClass %>> findOneWithEagerRelationships(<%= primaryKey.type %> id);
 
@@ -166,6 +162,7 @@ interface <%= entityClass %>RepositoryInternal {
     Flux<<%= persistClass %>> findAllWithEagerRelationships(Pageable page);
 
     Mono<Void> deleteById(<%= primaryKey.type %> id);
+
   <%_ } _%>
 
 }

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

@@ -1,5 +1,5 @@
 <%#
- Copyright 2013-2021 the original author or authors from the JHipster project.
+ 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.