generator-jhipster 7.6.0 → 7.8.1

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;
   }
@@ -167,6 +168,17 @@ module.exports = class extends BaseBlueprintGenerator {
         this.reactiveUniqueEntityTypes = new Set(this.reactiveEagerRelations.map(rel => rel.otherEntityNameCapitalized));
         this.reactiveUniqueEntityTypes.add(this.entityClass);
       },
+
+      relationshipsSqlDerivedProperties() {
+        if (!this.databaseTypeSql) return;
+        for (const relationship of this.relationships) {
+          if (!relationship.otherEntity.embedded) {
+            relationship.joinColumnNames = relationship.otherEntity.primaryKey.fields.map(
+              otherField => `${relationship.columnNamePrefix}${otherField.columnName}`
+            );
+          }
+        }
+      },
     };
   }
 
@@ -178,6 +190,15 @@ 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`);
+        }
+        if (this.isJhipsterVersionLessThan('7.7.1')) {
+          this.removeFile(`${this.entityAbsoluteFolder}/repository/search/SortToSortBuilderListConverter.java`);
+        }
+      },
       ...writeFiles(),
       ...super._missingPostWriting(),
     };
@@ -202,7 +223,11 @@ module.exports = class extends BaseBlueprintGenerator {
     return this._postWriting();
   }
 
-  /* Private methods used in templates */
+  /**
+   * @deprecated
+   * TODO remove for v8
+   * Private methods used in templates
+   */
   _getJoinColumnName(relationship) {
     if (relationship.id === true) {
       return 'id';

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.<%= persistClass %>.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,12 +20,12 @@ 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 static <%= packageName %>.repository.JHipsterCouchbaseRepository.pageableStatement;
 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;
@@ -38,26 +38,17 @@ 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.<%= persistClass %>.TYPE_NAME;
+
 /**
  * Spring Data Couchbase repository for the <%= persistClass %> entity.
  */
-<%_ if (!relationshipsContainEagerLoad) { _%>
+<%_ if (!implementsEagerLoadApis) { _%>
 @SuppressWarnings("unused")
 <%_ } _%>
 <%_
@@ -66,73 +57,69 @@ 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 %>`"  + <%
+            %> ", ARRAY OBJECT_ADD(item, 'id', meta(item).id) FOR item IN `<%= relationship.relationshipFieldNamePlural %>` END AS `<%= relationship.relationshipFieldNamePlural %>`"  + <%
           } else {
-            %> ", (SELECT `<%= relationship.relationshipFieldName %>`.*, meta(`<%= relationship.relationshipFieldName %>`).id)[0] as `<%= relationship.relationshipFieldName %>`" + <%
+            %> ", OBJECT_ADD(`<%= relationship.relationshipFieldName %>`, 'id', meta(`<%= relationship.relationshipFieldName %>`).id) AS `<%= relationship.relationshipFieldName %>`" + <%
           }
       } %>
         " 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) {
+    String WHERE = " WHERE b.type = '" + TYPE_NAME + "'";
+
+    default <%= pageOrFlux %><<%= persistClass %>> findAll(Pageable pageable) {
         return
         <% if (!reactive) { %>new PageImpl<>(<% } %>
-            findAllBy(pageableStatement(pageable, "b"))
+            findAll(pageableStatement(pageable, "b"))
         <% if (!reactive) { %>,
             pageable,
             count()
         )<% } %>;
     }
 
-    @Query(SELECT + JOIN + " WHERE b.#{#n1ql.filter} #{[0]}")
+    @Query(SELECT + JOIN + WHERE + " #{[0]}")
     @ScanConsistency(query = QueryScanConsistency.REQUEST_PLUS)
-    <%= listOrFlux %><<%= persistClass %>> findAllBy(String pageableStatement);
+    <%= listOrFlux %><<%= persistClass %>> findAll(String pageableStatement);
 
-    @Query(SELECT + JOIN + " WHERE b.#{#n1ql.filter}")
-    @ScanConsistency(query = QueryScanConsistency.REQUEST_PLUS)
+    @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(), "");
-    }
+<%_ if (searchEngine && notEmbeddedRelationships.length !== 0) { _%>
+    @Query(SELECT + JOIN + WHERE + " AND " + SEARCH_CONDITION)
+    <%= listOrFlux %><<%= persistClass %>> search(String queryString);
 
     default <%= pageOrFlux %><<%= persistClass %>> search(String queryString, Pageable pageable) {
         return
             <% if (!reactive) { %>new PageImpl<>(<% } %>
-                search(searchQuery(queryString).toString(), pageableStatement(pageable<% if (relationships.length !== 0) { %>, "b"<% } %>))
+                search(queryString, pageableStatement(pageable, "b"))
             <% if (!reactive) { %>)<% } %>;
     }
+
+    @ScanConsistency(query = QueryScanConsistency.NOT_BOUNDED)
+    @Query(SELECT + JOIN + WHERE + " AND " + SEARCH_CONDITION + " #{[1]}")
+    <%= listOrFlux %><<%= persistClass %>> search(String queryString, String pageableStatement);
 <%_ } _%>
 
 }

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/partials/update_template.ejs

@@ -0,0 +1,77 @@
+<%#
+ 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.
+-%>
+<%_ const instanceType = restClass;
+const instanceName = restInstance;
+const mapper = entityInstance  + 'Mapper';
+const dtoToEntity = mapper + '.' + 'toEntity';
+const entityToDto = mapper + '.' + 'toDto';
+const entityToDtoReference = mapper + '::' + 'toDto';
+const returnPrefix = (returnDirectly && !searchEngineElasticsearch) ? 'return' : instanceType + ' result =';
+let resultEntity;
+let mapsIdEntityInstance;
+let mapsIdRepoInstance;
+let otherEntityName;
+
+if (isUsingMapsId) {
+    mapsIdEntityInstance = mapsIdAssoc.otherEntityNameCapitalized.charAt(0).toLowerCase() + mapsIdAssoc.otherEntityNameCapitalized.slice(1);
+    mapsIdRepoInstance = `${mapsIdEntityInstance}Repository`;
+    otherEntityName = mapsIdAssoc.otherEntityName;
+} _%>
+<%_ if (!viaService) { _%>
+  <%_ if (dtoMapstruct) { _%>
+    <%_ resultEntity = persistInstance; _%>
+        <%= persistClass %> <%= persistInstance %> = <%= dtoToEntity %>(<%= instanceName %>);
+    <%_ if (isPersisted) { _%>
+        <%= persistInstance %>.setIsPersisted();
+    <%_ } _%>
+    <%_ if (isUsingMapsId) { _%>
+        <%= mapsIdAssoc.otherEntity.primaryKey.type %> <%= otherEntityName %>Id = <%= instanceName %>.get<%= mapsIdAssoc.relationshipNameCapitalized %>().get<%= primaryKey.nameCapitalized %>();
+        <%= mapsIdRepoInstance %>.findById(<%= otherEntityName %>Id).ifPresent(<%= persistInstance %>::<%_ if (!fluentMethods) { _%>set<%= mapsIdAssoc.relationshipNameCapitalized %> <%_ } else { _%><%= mapsIdAssoc.relationshipName %><%_ } _%>);
+    <%_ } _%>
+    <%_ if (updatableEntity) { _%>
+        <%= persistInstance %> = <%= entityInstance %>Repository.save(<%= persistInstance %>);
+    <%_ } else { _%>
+        // no save call needed as we have no fields that can be updated
+    <%_ } _%>
+        <%= returnPrefix %> <%= entityToDto %>(<%= persistInstance %>);
+  <%_ } else {
+      resultEntity = 'result'; _%>
+    <%_ if (isUsingMapsId) { _%>
+        <%= mapsIdAssoc.otherEntity.primaryKey.type %> <%= otherEntityName %>Id = <%= instanceName %>.get<%= mapsIdAssoc.relationshipNameCapitalized %>().get<%= primaryKey.nameCapitalized %>();
+        <%= mapsIdRepoInstance %>.findById(<%= otherEntityName %>Id).ifPresent(<%= instanceName %>::<%_ if (!fluentMethods) { _%>set<%= mapsIdAssoc.relationshipNameCapitalized %> <%_ } else { _%><%= otherEntityName %><%_ } _%>);
+    <%_ } _%>
+    <%_ if (isPersisted) { _%>
+        <%= persistInstance %>.setIsPersisted();
+    <%_ } _%>
+    <%_ if (updatableEntity) { _%>
+        <%= returnPrefix %> <%= entityInstance %>Repository.save(<%= persistInstance %>);
+    <%_ } else { _%>
+        // no save call needed as we have no fields that can be updated
+        <%= returnPrefix %> <%= persistInstance %>;
+    <%_ } _%>
+  <%_ } _%>
+  <%_ if (searchEngineElasticsearch) { _%>
+        <%= entityInstance %>SearchRepository.save(<%= resultEntity %>);
+    <%_ if (returnDirectly) { _%>
+        return result;
+    <%_ } _%>
+  <%_ } _%>
+<%_ } else { _%>
+        <%= returnPrefix %> <%= entityInstance %>Service.update(<%= instanceName %>);
+<%_ } _%>

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

@@ -25,7 +25,7 @@ _%>
 <%_ if (viaService) { _%>
         return <%= entityInstance %>Service.save(<%= instanceName %>)
 <%_ } else { _%>
-        return <%= entityInstance %>Repository.save(<%if (dtoMapstruct) { %><%= dtoToEntity %>(<% } %><%= instanceName %>)<%if (dtoMapstruct) { %>)<% } -%>
+        return <%= entityInstance %>Repository.save(<%if (dtoMapstruct) { %><%= dtoToEntity %>(<% } %><%= instanceName %><%if (dtoMapstruct) { %>)<% } -%>)
     <%_ if (searchEngineElasticsearch) { %>
             .flatMap(<%= entityInstance %>SearchRepository::save)
     <%_ } -%>

package/generators/entity-server/templates/reactive/partials/update_template.ejs

@@ -0,0 +1,41 @@
+<%#
+ 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.
+-%>
+<%_ const instanceType = restClass;
+const instanceName = restInstance;
+const mapper = entityInstance  + 'Mapper';
+const dtoToEntity = mapper + '.' + 'toEntity';
+const entityToDtoReference = mapper + '::' + 'toDto';
+_%>
+<%_ if (viaService) { _%>
+        return <%= entityInstance %>Service.update(<%= instanceName %>)
+<%_ } else { _%>
+    <%_ if (updatableEntity) { _%>
+        return <%= entityInstance %>Repository.save(<%if (dtoMapstruct) { %><%= dtoToEntity %>(<% } %><%= instanceName %><%if (dtoMapstruct) { %>)<% } -%><% if (isPersisted) { %>.setIsPersisted()<% } %>)
+    <%_ } else { _%>
+        // no save call needed as we have no fields that can be updated
+        return <%= entityInstance %>Repository.findById(<%= instanceName %>.get<%= primaryKey.nameCapitalized %>())
+    <%_ } _%>
+    <%_ if (searchEngineElasticsearch) { %>
+            .flatMap(<%= entityInstance %>SearchRepository::save)
+    <%_ } -%>
+    <%_ if (dtoMapstruct) { %>
+            .map(<%= entityToDtoReference  %>)
+    <%_ } -%>
+    <%_ if (returnDirectly) { _%>;<%_ } _%>
+<%_ } _%>

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

@@ -50,22 +50,22 @@ _%>
     }
 <%_ } 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.<% if (implementsEagerLoadApis) { %>findAllWithEagerRelationships<% } else { %>findAll<% } %>();
       <%_ if (reactive) { _%>
         return <%= entityInstancePlural %>.map(<%= entityToDtoReference %>).collectList();
       <%_ } else { _%>
         return <%= entityListToDtoListReference %>(<%= entityInstancePlural %>);
       <%_ } _%>
     <%_ } else { _%>
-        return <%= entityInstance %>Repository.<% if (relationshipsContainEagerLoad) { %>findAllWithEagerRelationships<% } else { %>findAll<% } %>()<% if (reactive) { %>.collectList()<% } %>;
+        return <%= entityInstance %>Repository.<% if (implementsEagerLoadApis) { %>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 (implementsEagerLoadApis) { %>, @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())
@@ -79,7 +79,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`});
@@ -42,15 +43,23 @@
       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    ') %>
+<%_ 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

@@ -24,16 +24,16 @@ const mapOrFlatMap = reactive ? 'flatMap' : 'map'
 const returnPrefix = (isService) ? 'return' : returnType + '<' + instanceType + '> result =';
 const mapper = entityInstance  + 'Mapper';
 _%>
-<%_ if(viaService) { _%>
-  <%_ if(reactive) { _%>
+<%_ if (viaService) { _%>
+  <%_ if (reactive) { _%>
     Mono<<%= instanceType %>> result = <%= entityInstance %>Service.partialUpdate(<%= instanceName %>);
   <%_ } else { _%>
     Optional<<%= instanceType %>> result = <%= entityInstance %>Service.partialUpdate(<%= instanceName %>);
   <%_ } _%>
 <%_ } 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)) { _%>
@@ -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/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

@@ -22,6 +22,7 @@
     importSection: 0,
     staticImportSection: 0,
     annotationSection: 0,
+    additionalInterfacesSection: 0,
     classStaticFieldsSection: 0,
     classFieldsSection: 0,
     classAdditionalFieldsSection: 0,
@@ -69,7 +70,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) { _%>
@@ -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;
 
@@ -361,7 +362,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 %>() + "'" +
     <%_ } _%>