generator-jhipster 7.6.0 → 7.7.0

package/generators/entity-server/index.js

@@ -22,6 +22,7 @@ const { INITIALIZING_PRIORITY, PREPARING_PRIORITY, DEFAULT_PRIORITY, WRITING_PRI
   require('../../lib/constants/priorities.cjs').compat;
 
 const constants = require('../generator-constants');
+const { entityDefaultConfig } = require('../generator-defaults');
 const { writeFiles, customizeFiles } = require('./files');
 const utils = require('../utils');
 const { GENERATOR_ENTITY_SERVER } = require('../generator-list');
@@ -35,7 +36,7 @@ module.exports = class extends BaseBlueprintGenerator {
   constructor(args, options, features) {
     super(args, options, features);
 
-    this.entity = this.options.context;
+    this.entity = this.options.context || { ...entityDefaultConfig };
 
     this.jhipsterContext = this.options.jhipsterContext || this.options.context;
   }
@@ -178,6 +179,12 @@ module.exports = class extends BaseBlueprintGenerator {
   // Public API method used by the getter and also by Blueprints
   _writing() {
     return {
+      cleanupOldElasticSearchFiles() {
+        if (!this.searchEngineElasticsearch) return;
+        if (this.isJhipsterVersionLessThan('7.6.1')) {
+          this.removeFile(`${this.entityAbsoluteFolder}/repository/search/SortToFieldSortBuilderConverter.java`);
+        }
+      },
       ...writeFiles(),
       ...super._missingPostWriting(),
     };

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

@@ -23,6 +23,7 @@
 <&_ if (fragment.staticImportSection) { -&>
 <%_ if (!embedded) { _%>
 import static <%= packageName %>.config.Constants.ID_DELIMITER;
+import static <%= packageName %>.domain.<%= entityClass %>.TYPE_NAME;
 import static org.springframework.data.couchbase.core.mapping.id.GenerationStrategy.UNIQUE;
 <%_ } _%>
 <&_ } -&>
@@ -31,9 +32,10 @@ import static org.springframework.data.couchbase.core.mapping.id.GenerationStrat
   <%_ if (!embedded) { _%>
 import org.springframework.data.annotation.Id;
 import org.springframework.data.couchbase.core.mapping.id.GeneratedValue;
-import org.springframework.data.couchbase.core.mapping.id.IdPrefix;
-  <%_ } _%>
 import org.springframework.data.couchbase.core.mapping.Document;
+import org.springframework.data.couchbase.repository.Collection;
+import org.springframework.data.annotation.TypeAlias;
+  <%_ } _%>
 import org.springframework.data.couchbase.core.mapping.Field;
   <%_ if (relationships.length > 0) { _%>
 import com.fasterxml.jackson.annotation.JsonIgnore;
@@ -42,21 +44,17 @@ import java.util.stream.Collectors;
 <&_ } -&>
 
 <&_ if (fragment.annotationSection) { -&>
+  <%_ if (!embedded) { _%>
 @Document
+@TypeAlias(TYPE_NAME)
+@Collection(TYPE_NAME)
+  <%_ } _%>
 <&_ } -&>
 
 <&_ if (fragment.classStaticFieldsSection) { -&>
-<%_ if (!embedded) { _%>
-    public static final String PREFIX = "<%= entityInstance.toLowerCase() %>";
-<%_ } _%>
-<&_ } -&>
-
-<&_ if (fragment.classFieldsSection) { -&>
-<%_ if (!embedded) { _%>
-    @SuppressWarnings("unused")
-    @IdPrefix
-    private String prefix = PREFIX;
-<%_ } _%>
+  <%_ if (!embedded) { _%>
+    public static final String TYPE_NAME = "<%= entityInstance %>";
+  <%_ } _%>
 <&_ } -&>
 
 <%_ for (const field of fields) { _%>

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

@@ -20,40 +20,27 @@ package <%= entityAbsolutePackage %>.repository;
 
 import <%= entityAbsolutePackage %>.domain.<%= persistClass %>;
 
-<%_ if (relationships.length !== 0 || searchEngineCouchbase) { _%>
+<%_ if (relationships.length !== 0) { _%>
 import org.springframework.data.couchbase.repository.Query;
 import org.springframework.data.domain.Pageable;
-import com.couchbase.client.java.query.QueryScanConsistency;
-import org.springframework.data.couchbase.repository.ScanConsistency;
-import static <%= packageName %>.repository.JHipsterCouchbaseRepository.pageableStatement;
   <%_ if (reactive) { _%>
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
   <%_ } else { _%>
 import org.springframework.data.domain.Page;
-import org.springframework.data.domain.PageImpl;
 import java.util.List;
   <%_ } _%>
 <%_ } _%>
 <%_ if (relationships.length !== 0 && !reactive) { _%>
 import java.util.Optional;
 <%_ } _%>
-<%_ if (searchEngineCouchbase) { _%>
-import static <%= packageName %>.repository.JHipsterCouchbaseRepository.searchQuery;
-<%_ } _%>
 import org.springframework.stereotype.Repository;
-<%_
-let importList = fieldsContainOwnerManyToMany;
-for (r of relationships) {
-  if (r.relationshipManyToOne && r.otherEntityUser) {
-    importList = true;
-  }
-}
-_%>
 <%_ if (primaryKey.typeUUID) { _%>
 import java.util.UUID;
 <%_ } _%>
 
+import static <%= packageName %>.domain.<%= entityClass %>.TYPE_NAME;
+
 /**
  * Spring Data Couchbase repository for the <%= persistClass %> entity.
  */
@@ -66,12 +53,12 @@ import java.util.UUID;
     let pageOrFlux = reactive ? 'Flux' : 'Page';
 _%>
 @Repository
-public interface <%= entityClass %>Repository extends JHipsterCouchbaseRepository<<%= persistClass %>, <%= primaryKey.type %>><% if (jpaMetamodelFiltering) { %>, JpaSpecificationExecutor<<%= persistClass %>><% } %> {
+public interface <%= entityClass %>Repository extends JHipsterCouchbaseRepository<<%= persistClass %>, <%= primaryKey.type %>><% if (jpaMetamodelFiltering) { %>, JpaSpecificationExecutor<<%= persistClass %>><% } %><% if (searchEngine) { %>, CouchbaseSearchRepository<<%= persistClass %>, <%= primaryKey.type %>><% } %> {
   <%_
-  if (relationships.length !== 0) { %>
-
+  var notEmbeddedRelationships = relationships.filter(relationship => !relationship.otherEntityIsEmbedded)
+  if (notEmbeddedRelationships.length !== 0) { %>
     String SELECT = "SELECT meta(b).id as __id, meta(b).cas as __cas, b.*" + <%
-      for (const relationship of relationships) {
+      for (const relationship of notEmbeddedRelationships) {
           if (relationship.collection) {
             %> ", (SELECT `<%= relationship.relationshipFieldName %>`.*, meta(`<%= relationship.relationshipFieldName %>`).id FROM `<%= relationship.relationshipFieldNamePlural %>` `<%= relationship.relationshipFieldName %>`) as `<%= relationship.relationshipFieldNamePlural %>`"  + <%
           } else {
@@ -81,58 +68,35 @@ public interface <%= entityClass %>Repository extends JHipsterCouchbaseRepositor
         " FROM #{#n1ql.bucket} b";
 
     String JOIN = <%
-        relationships.forEach(function (relationship, index) {
+        notEmbeddedRelationships.forEach(function (relationship, index) {
           if (!relationship.collection) { %>
-            " LEFT JOIN #{#n1ql.bucket} `<%= relationship.relationshipFieldName %>` ON KEYS b.`<%= relationship.relationshipFieldName %>`"<%
+            " LEFT JOIN `<%= relationship.otherEntity.entityInstance %>` `<%= relationship.relationshipFieldName %>` ON KEYS b.`<%= relationship.relationshipFieldName %>`"<%
           } else { %>
-            " LEFT NEST #{#n1ql.bucket} `<%= relationship.relationshipFieldNamePlural %>` ON KEYS b.`<%= relationship.relationshipFieldNamePlural %>`"<%
+            " LEFT NEST `<%= relationship.otherEntity.entityInstance %>` `<%= relationship.relationshipFieldNamePlural %>` ON KEYS b.`<%= relationship.relationshipFieldNamePlural %>`"<%
           }
-          if (index < relationships.length - 1) { %>
+          if (index < notEmbeddedRelationships.length - 1) { %>
             + <%
           }
         }); %>;
 
-    default <%= pageOrFlux %><<%= persistClass %>> findAll<% if (reactive) {%>By<% } %>(Pageable pageable) {
-        return
-        <% if (!reactive) { %>new PageImpl<>(<% } %>
-            findAllBy(pageableStatement(pageable, "b"))
-        <% if (!reactive) { %>,
-            pageable,
-            count()
-        )<% } %>;
-    }
-
-    @Query(SELECT + JOIN + " WHERE b.#{#n1ql.filter} #{[0]}")
-    @ScanConsistency(query = QueryScanConsistency.REQUEST_PLUS)
-    <%= listOrFlux %><<%= persistClass %>> findAllBy(String pageableStatement);
-
-    @Query(SELECT + JOIN + " WHERE b.#{#n1ql.filter}")
-    @ScanConsistency(query = QueryScanConsistency.REQUEST_PLUS)
+    String WHERE = " WHERE b.type = '" + TYPE_NAME + "'";
+
+    @Query(SELECT + JOIN + WHERE)
+    <%= pageOrFlux %><<%= persistClass %>> findAll(Pageable pageable);
+
+    @Query(SELECT + JOIN + WHERE)
     <%= listOrFlux %><<%= persistClass %>> findAll();
 
     @Query(SELECT + " USE KEYS $1" + JOIN)
-    @ScanConsistency(query = QueryScanConsistency.REQUEST_PLUS)
     <%= optionalOrMono %><<%= persistClass %>> findById(String id);<%
     } _%>
 
-<%_ if (searchEngineCouchbase) { _%>
-  <%_ if (relationships.length === 0) { _%>
-    @Query("#{#n1ql.selectEntity} WHERE #{#n1ql.filter} AND SEARCH(#{#n1ql.bucket}, #{[0]}) #{[1]}")
-  <%_ } else { _%>
-    @Query(SELECT + JOIN + " WHERE b.#{#n1ql.filter} AND SEARCH(b, #{[0]}) #{[1]}")
-  <%_ } _%>
-    <%= listOrFlux %><<%= persistClass %>> search(String queryString, String pageableStatement);
-
-    default <%= listOrFlux %><<%= persistClass %>> search(String queryString) {
-        return search(searchQuery(queryString).toString(), "");
-    }
-
-    default <%= pageOrFlux %><<%= persistClass %>> search(String queryString, Pageable pageable) {
-        return
-            <% if (!reactive) { %>new PageImpl<>(<% } %>
-                search(searchQuery(queryString).toString(), pageableStatement(pageable<% if (relationships.length !== 0) { %>, "b"<% } %>))
-            <% if (!reactive) { %>)<% } %>;
-    }
+<%_ if (searchEngine && notEmbeddedRelationships.length !== 0) { _%>
+    @Query(SELECT + JOIN + WHERE + " AND " + SEARCH_CONDITION)
+    <%= listOrFlux %><<%= persistClass %>> search(String queryString);
+
+    @Query(SELECT + JOIN + WHERE + " AND " + SEARCH_CONDITION)
+    <%= pageOrFlux %><<%= persistClass %>> search(String queryString, Pageable pageable);
 <%_ } _%>
 
 }

package/generators/entity-server/templates/couchbase/src/main/resources/config/couchmove/changelog/entity.fts.ejs

@@ -4,8 +4,8 @@
         "doc_config": {
             "docid_prefix_delim": "",
             "docid_regexp": "",
-            "mode": "type_field",
-            "type_field": "_class"
+            "mode": "scope.collection.type_field",
+            "type_field": "type"
         },
         "mapping": {
             "analysis": {},
@@ -17,12 +17,11 @@
                 "enabled": false
             },
             "default_type": "_default",
-            "docvalues_dynamic": true,
+            "docvalues_dynamic": false,
             "index_dynamic": true,
             "store_dynamic": false,
-            "type_field": "_type",
             "types": {
-                "<%= entityAbsolutePackage %>.domain.<%= entityClass %>": {
+                "${scope}.<%= entityInstance %>.<%= entityInstance %>": {
                     "dynamic": true,
                     "enabled": true
                 }
@@ -36,5 +35,5 @@
     "sourceType": "couchbase",
     "sourceName": "${bucket}",
     "uuid": "",
-    "name": "<%= entityClass.toLowerCase() %>"
+    "name": "<%= entityInstance %>"
 }

package/generators/entity-server/templates/couchbase/src/main/resources/config/couchmove/changelog/entity.n1ql.ejs

@@ -0,0 +1,5 @@
+CREATE COLLECTION `${bucket}`.`${scope}`.`<%= entityInstance %>`;
+
+CREATE INDEX `<%= entityInstance %>_type` ON `${bucket}`.`${scope}`.`<%= entityInstance %>`(type)
+    WHERE `type` = "<%= entityInstance %>"
+    WITH { "defer_build" : true };

package/generators/entity-server/templates/partials/it_patch_update.partial.java.ejs

@@ -40,14 +40,14 @@ partialUpdated<%= persistClass %>.set<%= primaryKey.nameCapitalized %>(<%= persi
 <%_ if (reactive) { _%>
 webTestClient
 .patch()
-.uri(ENTITY_API_URL_ID, partialUpdated<%= asEntity(entityClass) %>.get<%= primaryKey.nameCapitalized %>())
+.uri(ENTITY_API_URL_ID, partialUpdated<%= persistClass %>.get<%= primaryKey.nameCapitalized %>())
 .contentType(MediaType.valueOf("application/merge-patch+json"))
 .bodyValue(TestUtil.convertObjectToJsonBytes(<%= 'partialUpdated' + persistClass %>))
 .exchange()
 .expectStatus()
 .isOk();
 <%_ } else { _%>
-rest<%= entityClass %>MockMvc.perform(patch(ENTITY_API_URL_ID, partialUpdated<%= asEntity(entityClass) %>.get<%= primaryKey.nameCapitalized %>())<% if (testsNeedCsrf) { %>.with(csrf())<% }%>
+rest<%= entityClass %>MockMvc.perform(patch(ENTITY_API_URL_ID, partialUpdated<%= persistClass %>.get<%= primaryKey.nameCapitalized %>())<% if (testsNeedCsrf) { %>.with(csrf())<% }%>
 .contentType("application/merge-patch+json")
 .content(TestUtil.convertObjectToJsonBytes(<%= 'partialUpdated' + persistClass %>)))
 .andExpect(status().isOk());

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

@@ -38,7 +38,7 @@ if (isUsingMapsId) {
         }
   <%_ } _%>
 <%_ } _%>
-<%_  if (!viaService) { _%>
+<%_ if (!viaService) { _%>
   <%_ if (dtoMapstruct) { _%>
     <%_ resultEntity = persistInstance; _%>
         <%= persistClass %> <%= persistInstance %> = <%= dtoToEntity %>(<%= instanceName %>);

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

@@ -65,7 +65,7 @@ _%>
         return <%= entityInstance %>Repository.<% if (relationshipsContainEagerLoad) { %>findAllWithEagerRelationships<% } else { %>findAll<% } %>()<% if (reactive) { %>.collectList()<% } %>;
     <%_ } _%>
   <%_ } else { _%>
-    public <% if (reactive) { %>Mono<ResponseEntity<List<<%= instanceType %>>>><% } else { %>ResponseEntity<List<<%= instanceType %>>><% } %> getAll<%= entityClassPlural %>(@org.springdoc.api.annotations.ParameterObject Pageable pageable<% if (reactive) { %>, ServerHttpRequest request<% } %><% if (fieldsContainNoOwnerOneToOne) { %>, @RequestParam(required = false) String filter<% } %><% if (relationshipsContainEagerLoad) { %>, @RequestParam(required = false, defaultValue = "false") boolean eagerload<% } %>) {<%- include('get_all_stream_template', {viaService: viaService}); -%>
+    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}); -%>
         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())

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

@@ -42,11 +42,11 @@
       const mapsIdEntityInstance = mapsIdEntity.charAt(0).toLowerCase() + mapsIdEntity.slice(1);
       const mapsIdRepoInstance = `${mapsIdEntityInstance}Repository`;
       beans.push({class: `${mapsIdEntity}Repository`, instance: mapsIdRepoInstance});
-      }
-    }
-    if (saveUserSnapshot && (viaService || constructorName.endsWith('Resource'))) {
-      beans.push({class: 'UserRepository', instance: 'userRepository'});
     }
+  }
+  if (saveUserSnapshot && (viaService || constructorName.endsWith('Resource'))) {
+    beans.push({class: 'UserRepository', instance: 'userRepository'});
+  }
 _%>
 
     <%= beans.map(bean => `private final ${bean.class} ${bean.instance};`).join('\n\n    ') %>

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

@@ -24,7 +24,7 @@ const mapOrFlatMap = reactive ? 'flatMap' : 'map'
 const returnPrefix = (isService) ? 'return' : returnType + '<' + instanceType + '> result =';
 const mapper = entityInstance  + 'Mapper';
 _%>
-<%_ if(viaService) { _%>
+<%_ if (viaService) { _%>
   <%_ if(reactive) { _%>
     Mono<<%= instanceType %>> result = <%= entityInstance %>Service.partialUpdate(<%= instanceName %>);
   <%_ } else { _%>
@@ -32,8 +32,8 @@ _%>
   <%_ } _%>
 <%_ } else { %>
 <%- returnPrefix %> <%= entityInstance %>Repository.findById(<%= instanceName %>.get<%= primaryKey.nameCapitalized %>())
-   .map(existing<%= entityClass %> -> {
-  <%_ if(dtoMapstruct) { _%>
+    .map(existing<%= entityClass %> -> {
+  <%_ if (dtoMapstruct) { _%>
        <%= mapper %>.partialUpdate(existing<%= entityClass %>, <%= instanceName %>);
   <%_ } else { _%>
     <%_ for (const field of fields.filter(field => !field.id && !field.transient)) { _%>

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

@@ -34,7 +34,7 @@ const entityToDtoReference = mapper + '::' + 'toDto'; %>
             .map(<%= entityToDtoReference %>)
     <%_ } _%>
     <%_ if (dtoMapstruct || searchEngineElasticsearch) { _%>
-        .collect(Collectors.toList());
+            .collect(Collectors.toList());
     <%_ } _%>
   <%_ } _%>
 <%_ } else { _%>

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

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

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

@@ -69,7 +69,7 @@ import java.time.Duration;
 import java.util.HashSet;
 import java.util.Set;
 <%_ } _%>
-<%_ if (fieldsContainUUID) { _%>
+<%_ if (fieldsContainUUID || otherEntityPrimaryKeyTypesIncludesUUID) { _%>
 import java.util.UUID;
 <%_ }
 Object.keys(uniqueEnums).forEach(function(element) { _%>
@@ -361,7 +361,7 @@ _%>
 <%_ for (const relationship of relationships) { _%>
   <%_ if (relationship.otherEntity.embedded) {
     if (relationship.relationshipManyToOne) { _%>
-            ", <%= relationship.relationshipFieldNamePlural %>='" + get<%= relationship.relationshipNameCapitalizedPlural %>() + "'" +
+            ", <%= relationship.relationshipFieldName %>='" + get<%= relationship.relationshipNameCapitalized %>() + "'" +
     <%_ } else if (relationship.relationshipOneToOne && relationship.ownerSide) { _%>
             ", <%= relationship.relationshipFieldName %>='" + get<%= relationship.relationshipNameCapitalized %>() + "'" +
     <%_ } _%>

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

@@ -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,7 +61,7 @@ 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 %>><% } %> {
+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) { _%>
 
@@ -80,25 +72,46 @@ public interface <%= entityClass %>Repository extends <% 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);

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

@@ -112,7 +112,7 @@ _%>
     public <%= entityClass %>RepositoryInternalImpl(R2dbcEntityTemplate template, EntityManager entityManager<%_
             reactiveUniqueEntityTypes.forEach(function(element) { _%>, <%= element %>RowMapper <%= element.toLowerCase() %>Mapper<%_ }); _%>, R2dbcEntityOperations entityOperations,
         R2dbcConverter converter) {
-        super(new MappingRelationalEntityInformation(converter.getMappingContext().getRequiredPersistentEntity(<%= entityClass %>.class)), entityOperations, converter);
+        super(new MappingRelationalEntityInformation(converter.getMappingContext().getRequiredPersistentEntity(<%= persistClass %>.class)), entityOperations, converter);
         this.db = template.getDatabaseClient();
         this.r2dbcEntityTemplate = template;
         this.entityManager = entityManager;
@@ -132,7 +132,7 @@ _%>
     }
 
     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 %>"));
 <%_ }); _%>
@@ -156,7 +156,7 @@ _%>
         return createQuery(null, where(EntityManager.ENTITY_ALIAS + ".<%= primaryKey.name %>").is(id)).one();
     }
 
-<%_ if (fieldsContainOwnerManyToMany) { _%>
+<%_ if (relationshipsContainEagerLoad) { _%>
 
     @Override
     public Mono<<%= persistClass %>> findOneWithEagerRelationships(<%= primaryKey.type %> id) {

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

@@ -90,7 +90,7 @@ public interface <%= entityClass %>Repository extends <% if (databaseTypeSql) {
   <%_ } _%>
 <%_ } _%>
 <%_ if (databaseTypeSql) { _%>
-  <%_ if (fieldsContainOwnerManyToMany) { _%>
+  <%_ if (relationshipsContainEagerLoad) { _%>
 
     @Override
     Mono<<%= persistClass %>> findOneWithEagerRelationships(<%= primaryKey.type %> id);
@@ -153,7 +153,7 @@ interface <%= entityClass %>RepositoryInternal {
 
     Flux<<%= persistClass %>> findAllBy(Pageable pageable, Criteria criteria);
 
-  <%_ if (fieldsContainOwnerManyToMany) { _%>
+  <%_ if (relationshipsContainEagerLoad) { _%>
 
     Mono<<%= persistClass %>> findOneWithEagerRelationships(<%= primaryKey.type %> id);