use js method to generate UUID

jhipster · Apr 13, 2021 · 2ec5ff7 · 2ec5ff7
1 parent cceec9b
commit 2ec5ff7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/generators/entity-server/templates/partials/it_patch_update.partial.java.ejs b/generators/entity-server/templates/partials/it_patch_update.partial.java.ejs
@@ -17,8 +17,8 @@
  limitations under the License.
 -%>
 // Initialize the database
-<%_ if (primaryKey.isUuid && !databaseTypeSql) { _%>
-    <%= persistInstance %>.set<%= primaryKey.nameCapitalized %>(UUID.randomUUID());
+<%_ if (!primaryKey.autoGenerate && !databaseTypeSql) { _%>
+    <%= persistInstance %>.set<%= primaryKey.nameCapitalized %>(<%- getPrimaryKeyValue(primaryKey.type, databaseType, '1') %>);
 <%_ } _%>
 <%= entityInstance %>Repository.<%= saveMethod %>(<%= persistInstance %>)<%= callBlock %>;
 

diff --git a/utils/entity.js b/utils/entity.js
@@ -30,7 +30,7 @@ const { MapperTypes } = require('../jdl/jhipster/entity-options');
 const { OAUTH2 } = require('../jdl/jhipster/authentication-types');
 const { CommonDBTypes } = require('../jdl/jhipster/field-types');
 
-const { BOOLEAN, UUID } = CommonDBTypes;
+const { BOOLEAN } = CommonDBTypes;
 const { MAPSTRUCT } = MapperTypes;
 const { PAGINATION, INFINITE_SCROLL } = PaginationTypes;
 const NO_PAGINATION = PaginationTypes.NO;
@@ -360,7 +360,6 @@ function prepareEntityPrimaryKeyForTemplates(entityWithConfig, generator, enable
       type: primaryKeyType,
       tsType: generator.getTypescriptKeyType(primaryKeyType),
       composite,
-      isUuid: primaryKeyType === UUID,
       relationships: idRelationships,
       // Fields declared in this entity
       ownFields: idFields,