generator-jhipster 7.7.0 → 7.9.0

package/generators/entity-server/files.js

@@ -19,6 +19,7 @@
 const _ = require('lodash');
 const chalk = require('chalk');
 const fs = require('fs');
+const entityServerCleanup = require('./cleanup');
 const utils = require('../utils');
 const constants = require('../generator-constants');
 const { CASSANDRA, COUCHBASE, MONGODB, NEO4J, SQL } = require('../../jdl/jhipster/database-types');
@@ -37,11 +38,7 @@ const SERVER_MAIN_RES_DIR = constants.SERVER_MAIN_RES_DIR;
 const TEST_DIR = constants.TEST_DIR;
 const SERVER_TEST_SRC_DIR = constants.SERVER_TEST_SRC_DIR;
 
-/**
- * The default is to use a file path string. It implies use of the template method.
- * For any other config an object { file:.., method:.., template:.. } can be used
- */
-const serverFiles = {
+const cassandraChangelogFiles = {
   dbChangelog: [
     {
       condition: generator => generator.databaseType === CASSANDRA && !generator.skipDbChangelog,
@@ -54,7 +51,10 @@ const serverFiles = {
       ],
     },
   ],
-  server: [
+};
+
+const modelFiles = {
+  model: [
     {
       path: SERVER_MAIN_SRC_DIR,
       templates: [
@@ -62,6 +62,31 @@ const serverFiles = {
           file: 'package/domain/Entity.java.jhi',
           renameTo: generator => `${generator.entityAbsoluteFolder}/domain/${generator.persistClass}.java.jhi`,
         },
+      ],
+    },
+  ],
+  modelTestFiles: [
+    {
+      path: SERVER_TEST_SRC_DIR,
+      templates: [
+        {
+          file: 'package/domain/EntityTest.java',
+          renameTo: generator => `${generator.entityAbsoluteFolder}/domain/${generator.persistClass}Test.java`,
+        },
+      ],
+    },
+  ],
+};
+
+/**
+ * The default is to use a file path string. It implies use of the template method.
+ * For any other config an object { file:.., method:.., template:.. } can be used
+ */
+const entityFiles = {
+  server: [
+    {
+      path: SERVER_MAIN_SRC_DIR,
+      templates: [
         {
           file: 'package/domain/Entity.java.jhi.javax_validation',
           renameTo: generator => `${generator.entityAbsoluteFolder}/domain/${generator.persistClass}.java.jhi.javax_validation`,
@@ -78,6 +103,36 @@ const serverFiles = {
         },
       ],
     },
+    {
+      condition: generator => generator.databaseTypeSql && generator.requiresPersistableImplementation,
+      path: SERVER_MAIN_SRC_DIR,
+      templates: [
+        {
+          file: 'package/domain/Entity.java.jhi.spring_data_persistable',
+          renameTo: generator => `${generator.entityAbsoluteFolder}/domain/${generator.persistClass}.java.jhi.spring_data_persistable`,
+        },
+      ],
+    },
+    {
+      condition: generator => generator.databaseTypeSql && generator.reactive && generator.requiresPersistableImplementation,
+      path: SERVER_MAIN_SRC_DIR,
+      templates: [
+        {
+          file: 'package/domain/EntityCallback.java',
+          renameTo: generator => `${generator.entityAbsoluteFolder}/domain/${generator.persistClass}Callback.java`,
+        },
+      ],
+    },
+    {
+      condition: generator => generator.databaseTypeSql && !generator.reactive && generator.requiresPersistableImplementation,
+      path: SERVER_MAIN_SRC_DIR,
+      templates: [
+        {
+          file: 'package/domain/Entity.java.jhi.javax_lifecycle_events',
+          renameTo: generator => `${generator.entityAbsoluteFolder}/domain/${generator.persistClass}.java.jhi.javax_lifecycle_events`,
+        },
+      ],
+    },
     {
       condition: generator => generator.databaseTypeCassandra,
       path: SERVER_MAIN_SRC_DIR,
@@ -138,6 +193,11 @@ const serverFiles = {
         },
       ],
     },
+  ],
+};
+
+const restFiles = {
+  restFiles: [
     {
       condition: generator => !generator.embedded,
       path: SERVER_MAIN_SRC_DIR,
@@ -148,6 +208,31 @@ const serverFiles = {
         },
       ],
     },
+  ],
+  restTestFiles: [
+    {
+      condition: generator => !generator.embedded,
+      path: SERVER_TEST_SRC_DIR,
+      templates: [
+        {
+          file: 'package/web/rest/EntityResourceIT.java',
+          options: {
+            context: {
+              _,
+              chalkRed: chalk.red,
+              fs,
+              SERVER_TEST_SRC_DIR,
+            },
+          },
+          renameTo: generator => `${generator.entityAbsoluteFolder}/web/rest/${generator.entityClass}ResourceIT.java`,
+        },
+      ],
+    },
+  ],
+};
+
+const filteringFiles = {
+  filteringFiles: [
     {
       condition: generator => generator.jpaMetamodelFiltering,
       path: SERVER_MAIN_SRC_DIR,
@@ -162,6 +247,11 @@ const serverFiles = {
         },
       ],
     },
+  ],
+};
+
+const elasticSearchFiles = {
+  elasticSearchFiles: [
     {
       condition: generator => generator.searchEngine === ELASTICSEARCH && !generator.embedded,
       path: SERVER_MAIN_SRC_DIR,
@@ -172,16 +262,11 @@ const serverFiles = {
         },
       ],
     },
-    {
-      condition: generator => generator.searchEngine === ELASTICSEARCH && !generator.embedded && !generator.paginationNo,
-      path: SERVER_MAIN_SRC_DIR,
-      templates: [
-        {
-          file: 'package/repository/search/SortToSortBuilderListConverter.java',
-          renameTo: generator => `${generator.entityAbsoluteFolder}/repository/search/SortToSortBuilderListConverter.java`,
-        },
-      ],
-    },
+  ],
+};
+
+const respositoryFiles = {
+  respositoryFiles: [
     {
       condition: generator => !generator.reactive && !generator.embedded && generator.databaseType !== COUCHBASE,
       path: SERVER_MAIN_SRC_DIR,
@@ -198,11 +283,12 @@ const serverFiles = {
       templates: [
         {
           file: 'package/repository/EntityRepositoryWithBagRelationships.java',
-          renameTo: generator => `${generator.packageFolder}/repository/${generator.entityClass}RepositoryWithBagRelationships.java`,
+          renameTo: generator => `${generator.entityAbsoluteFolder}/repository/${generator.entityClass}RepositoryWithBagRelationships.java`,
         },
         {
           file: 'package/repository/EntityRepositoryWithBagRelationshipsImpl.java',
-          renameTo: generator => `${generator.packageFolder}/repository/${generator.entityClass}RepositoryWithBagRelationshipsImpl.java`,
+          renameTo: generator =>
+            `${generator.entityAbsoluteFolder}/repository/${generator.entityClass}RepositoryWithBagRelationshipsImpl.java`,
         },
       ],
     },
@@ -234,6 +320,11 @@ const serverFiles = {
         },
       ],
     },
+  ],
+};
+
+const serviceFiles = {
+  serviceFiles: [
     {
       condition: generator => generator.service === SERVICE_IMPL && !generator.embedded,
       path: SERVER_MAIN_SRC_DIR,
@@ -258,6 +349,11 @@ const serverFiles = {
         },
       ],
     },
+  ],
+};
+
+const dtoFiles = {
+  dtoFiles: [
     {
       condition: generator => generator.dto === MAPSTRUCT,
       path: SERVER_MAIN_SRC_DIR,
@@ -277,36 +373,32 @@ const serverFiles = {
       ],
     },
   ],
-  test: [
+  dtoTestFiles: [
     {
-      condition: generator => !generator.embedded,
+      condition: generator => generator.dto === MAPSTRUCT,
       path: SERVER_TEST_SRC_DIR,
       templates: [
         {
-          file: 'package/web/rest/EntityResourceIT.java',
-          options: {
-            context: {
-              _,
-              chalkRed: chalk.red,
-              fs,
-              SERVER_TEST_SRC_DIR,
-            },
-          },
-          renameTo: generator => `${generator.entityAbsoluteFolder}/web/rest/${generator.entityClass}ResourceIT.java`,
+          file: 'package/service/dto/EntityDTOTest.java',
+          renameTo: generator => `${generator.entityAbsoluteFolder}/service/dto/${generator.asDto(generator.entityClass)}Test.java`,
         },
       ],
     },
     {
-      condition: generator => generator.searchEngine === ELASTICSEARCH && !generator.embedded,
+      condition: generator => generator.dto === MAPSTRUCT && [SQL, MONGODB, COUCHBASE, NEO4J].includes(generator.databaseType),
       path: SERVER_TEST_SRC_DIR,
       templates: [
         {
-          file: 'package/repository/search/EntitySearchRepositoryMockConfiguration.java',
-          renameTo: generator =>
-            `${generator.entityAbsoluteFolder}/repository/search/${generator.entityClass}SearchRepositoryMockConfiguration.java`,
+          file: 'package/service/mapper/EntityMapperTest.java',
+          renameTo: generator => `${generator.entityAbsoluteFolder}/service/mapper/${generator.entityClass}MapperTest.java`,
         },
       ],
     },
+  ],
+};
+
+const gatlingFiles = {
+  gatlingFiles: [
     {
       condition: generator => generator.gatlingTests,
       path: TEST_DIR,
@@ -318,38 +410,22 @@ const serverFiles = {
         },
       ],
     },
-    {
-      path: SERVER_TEST_SRC_DIR,
-      templates: [
-        {
-          file: 'package/domain/EntityTest.java',
-          renameTo: generator => `${generator.entityAbsoluteFolder}/domain/${generator.persistClass}Test.java`,
-        },
-      ],
-    },
-    {
-      condition: generator => generator.dto === MAPSTRUCT,
-      path: SERVER_TEST_SRC_DIR,
-      templates: [
-        {
-          file: 'package/service/dto/EntityDTOTest.java',
-          renameTo: generator => `${generator.entityAbsoluteFolder}/service/dto/${generator.asDto(generator.entityClass)}Test.java`,
-        },
-      ],
-    },
-    {
-      condition: generator => generator.dto === MAPSTRUCT && [SQL, MONGODB, COUCHBASE, NEO4J].includes(generator.databaseType),
-      path: SERVER_TEST_SRC_DIR,
-      templates: [
-        {
-          file: 'package/service/mapper/EntityMapperTest.java',
-          renameTo: generator => `${generator.entityAbsoluteFolder}/service/mapper/${generator.entityClass}MapperTest.java`,
-        },
-      ],
-    },
   ],
 };
 
+const serverFiles = {
+  ...cassandraChangelogFiles,
+  ...modelFiles,
+  ...entityFiles,
+  ...restFiles,
+  ...filteringFiles,
+  ...elasticSearchFiles,
+  ...respositoryFiles,
+  ...serviceFiles,
+  ...dtoFiles,
+  ...gatlingFiles,
+};
+
 module.exports = {
   writeFiles,
   serverFiles,
@@ -358,6 +434,15 @@ module.exports = {
 
 function writeFiles() {
   return {
+    setUp() {
+      this.javaDir = `${this.packageFolder}/`;
+      this.testDir = `${this.packageFolder}/`;
+    },
+
+    cleanupOldServerFiles() {
+      entityServerCleanup.cleanupOldFiles(this, `${SERVER_MAIN_SRC_DIR}${this.javaDir}`, `${SERVER_TEST_SRC_DIR}${this.testDir}`);
+    },
+
     writeServerFiles() {
       if (this.skipServer) return undefined;
 

package/generators/entity-server/index.js

@@ -18,7 +18,7 @@
  */
 /* eslint-disable consistent-return */
 const BaseBlueprintGenerator = require('../generator-base-blueprint');
-const { INITIALIZING_PRIORITY, PREPARING_PRIORITY, DEFAULT_PRIORITY, WRITING_PRIORITY, PREPARING_FIELDS_PRIORITY, POST_WRITING_PRIORITY } =
+const { PREPARING_PRIORITY, DEFAULT_PRIORITY, WRITING_PRIORITY, PREPARING_FIELDS_PRIORITY, POST_WRITING_PRIORITY } =
   require('../../lib/constants/priorities.cjs').compat;
 
 const constants = require('../generator-constants');
@@ -47,21 +47,6 @@ module.exports = class extends BaseBlueprintGenerator {
     }
   }
 
-  // Public API method used by the getter and also by Blueprints
-  _initializing() {
-    return {
-      setupConstants() {
-        // Make constants available in templates
-        this.LIQUIBASE_DTD_VERSION = constants.LIQUIBASE_DTD_VERSION;
-      },
-    };
-  }
-
-  get [INITIALIZING_PRIORITY]() {
-    if (this.delegateToBlueprint) return {};
-    return this._initializing();
-  }
-
   _preparing() {
     return {
       validateDatabaseSafety() {
@@ -116,8 +101,19 @@ module.exports = class extends BaseBlueprintGenerator {
       loadConfigIntoGenerator() {
         utils.copyObjectProps(this, this.entity);
 
-        this.testsNeedCsrf = [OAUTH2, SESSION].includes(this.entity.authenticationType);
-        this.officialDatabaseType = constants.OFFICIAL_DATABASE_TYPE_NAMES[this.entity.databaseType];
+        const { databaseType, authenticationType, reactive } = this.entity;
+        this.testsNeedCsrf = [OAUTH2, SESSION].includes(authenticationType);
+        this.officialDatabaseType = constants.OFFICIAL_DATABASE_TYPE_NAMES[databaseType];
+        let springDataDatabase;
+        if (this.databaseType !== SQL) {
+          springDataDatabase = this.officialDatabaseType;
+          if (reactive) {
+            springDataDatabase += ' reactive';
+          }
+        } else {
+          springDataDatabase = reactive ? 'R2DBC' : 'JPA';
+        }
+        this.springDataDescription = `Spring Data ${springDataDatabase}`;
       },
 
       /**
@@ -168,6 +164,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}`
+            );
+          }
+        }
+      },
     };
   }
 
@@ -179,12 +186,6 @@ 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(),
     };
@@ -209,7 +210,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,7 +23,7 @@
 <&_ if (fragment.staticImportSection) { -&>
 <%_ if (!embedded) { _%>
 import static <%= packageName %>.config.Constants.ID_DELIMITER;
-import static <%= packageName %>.domain.<%= entityClass %>.TYPE_NAME;
+import static <%= packageName %>.domain.<%= persistClass %>.TYPE_NAME;
 import static org.springframework.data.couchbase.core.mapping.id.GenerationStrategy.UNIQUE;
 <%_ } _%>
 <&_ } -&>

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

@@ -23,11 +23,15 @@ import <%= entityAbsolutePackage %>.domain.<%= persistClass %>;
 <%_ 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;
   <%_ 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;
   <%_ } _%>
 <%_ } _%>
@@ -39,12 +43,12 @@ import org.springframework.stereotype.Repository;
 import java.util.UUID;
 <%_ } _%>
 
-import static <%= packageName %>.domain.<%= entityClass %>.TYPE_NAME;
+import static <%= packageName %>.domain.<%= persistClass %>.TYPE_NAME;
 
 /**
  * Spring Data Couchbase repository for the <%= persistClass %> entity.
  */
-<%_ if (!relationshipsContainEagerLoad) { _%>
+<%_ if (!implementsEagerLoadApis) { _%>
 @SuppressWarnings("unused")
 <%_ } _%>
 <%_
@@ -60,9 +64,9 @@ public interface <%= entityClass %>Repository extends JHipsterCouchbaseRepositor
     String SELECT = "SELECT meta(b).id as __id, meta(b).cas as __cas, b.*" + <%
       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";
@@ -81,8 +85,19 @@ public interface <%= entityClass %>Repository extends JHipsterCouchbaseRepositor
 
     String WHERE = " WHERE b.type = '" + TYPE_NAME + "'";
 
-    @Query(SELECT + JOIN + WHERE)
-    <%= pageOrFlux %><<%= persistClass %>> findAll(Pageable pageable);
+    default <%= pageOrFlux %><<%= persistClass %>> findAll(Pageable pageable) {
+        return
+        <% if (!reactive) { %>new PageImpl<>(<% } %>
+            findAll(pageableStatement(pageable, "b"))
+        <% if (!reactive) { %>,
+            pageable,
+            count()
+        )<% } %>;
+    }
+
+    @Query(SELECT + JOIN + WHERE + " #{[0]}")
+    @ScanConsistency(query = QueryScanConsistency.REQUEST_PLUS)
+    <%= listOrFlux %><<%= persistClass %>> findAll(String pageableStatement);
 
     @Query(SELECT + JOIN + WHERE)
     <%= listOrFlux %><<%= persistClass %>> findAll();
@@ -95,8 +110,16 @@ public interface <%= entityClass %>Repository extends JHipsterCouchbaseRepositor
     @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);
+    default <%= pageOrFlux %><<%= persistClass %>> search(String queryString, Pageable pageable) {
+        return
+            <% if (!reactive) { %>new PageImpl<>(<% } %>
+                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/partials/save_template.ejs

@@ -57,7 +57,7 @@ if (isUsingMapsId) {
         <%= returnPrefix %> <%= entityInstance %>Repository.save(<%= persistInstance %>);
   <%_ } _%>
   <%_ if (searchEngineElasticsearch) { _%>
-        <%= entityInstance %>SearchRepository.save(<%= resultEntity %>);
+        <%= entityInstance %>SearchRepository.index(<%= resultEntity %>);
     <%_ if (returnDirectly) { _%>
         return result;
     <%_ } _%>

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.index(<%= 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) { _%>;<%_ } _%>
+<%_ } _%>