feat: allow integer id

yelhouti · Mar 24, 2024 · ff5c329 · ff5c329
1 parent ffda950
commit ff5c329
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 2 deletions.
diff --git a/generators/entity-server/templates/src/test/java/package/web/rest/EntityResourceIT.java.ejs b/generators/entity-server/templates/src/test/java/package/web/rest/EntityResourceIT.java.ejs
@@ -208,6 +208,10 @@ import java.util.UUID;
 import java.util.Random;
 import java.util.concurrent.atomic.AtomicLong;
 <%_ } _%>
+<%_ if (!embedded && primaryKey.hasInteger) { _%>
+import java.util.Random;
+import java.util.concurrent.atomic.AtomicInteger;
+<%_ } _%>
 
 <%_ if (fieldsContainBigDecimal) { _%>
 import static <%= packageName %>.web.rest.TestUtil.sameNumber;
@@ -439,6 +443,11 @@ if (field.fieldTypeString || field.blobContentTypeText) {
 
     private static Random random = new Random();
     private static AtomicLong count = new AtomicLong(random.nextInt() + ( 2 * Integer.MAX_VALUE ));
+<%_ } _%>
+<%_ if (!embedded && primaryKey.hasInteger) { _%>
+
+private static Random random = new Random();
+private static AtomicInteger count = new AtomicInteger(random.nextInt() + ( 2 * Integer.MAX_VALUE ));
 <%_ } _%>
 
     @Autowired
@@ -1373,7 +1382,7 @@ _%>
         // Disconnect from session so that the updates on updated<%= persistClass %> are not directly saved in db
         em.detach(updated<%= persistClass %>);
   <%_ } _%>
-  <%_ if (fluentMethods && fieldsToTest.length > 0) { _%>
+  <%_ if (fluentMethods && fieldsToTest.filter(f => !f.id).length > 0) { _%>
         updated<%= persistClass %><% for (field of fieldsToTest.filter(f => !f.id)) { %>
             .<%= field.fieldName %>(<%= 'UPDATED_' + field.fieldNameUnderscored.toUpperCase() %>)<% if (field.fieldTypeBinary && !field.blobContentTypeText) { %>
             .<%= field.fieldName %>ContentType(<%= 'UPDATED_' + field.fieldNameUnderscored.toUpperCase() %>_CONTENT_TYPE)<% } %><% } %>;

diff --git a/generators/generator-base-private.js b/generators/generator-base-private.js
@@ -1349,6 +1349,9 @@ module.exports = class JHipsterBasePrivateGenerator extends Generator {
     if (primaryKeyType === TYPE_UUID) {
       return this.getJavaValueGeneratorForType(primaryKeyType);
     }
+    if (primaryKeyType === TYPE_INTEGER) {
+      return `${defaultValue}`;
+    }
     return `${defaultValue}L`;
   }
 
@@ -1362,6 +1365,9 @@ module.exports = class JHipsterBasePrivateGenerator extends Generator {
     if (type === 'Long') {
       return 'count.incrementAndGet()';
     }
+    if (type === 'Integer') {
+      return 'count.incrementAndGet()';
+    }
     throw new Error(`Java type ${type} does not have a random generator implemented`);
   }
 

diff --git a/utils/entity.js b/utils/entity.js
@@ -35,7 +35,7 @@ const { CommonDBTypes } = require('../jdl/jhipster/field-types');
 const { isReservedTableName } = require('../jdl/jhipster/reserved-keywords');
 const constants = require('../generators/generator-constants');
 
-const { BOOLEAN, LONG, STRING, UUID } = CommonDBTypes;
+const { BOOLEAN, LONG, STRING, UUID, INTEGER } = CommonDBTypes;
 const { NO: NO_DTO, MAPSTRUCT } = MapperTypes;
 const { PAGINATION, INFINITE_SCROLL } = PaginationTypes;
 const { SERVICE_IMPL } = ServiceTypes;
@@ -293,6 +293,7 @@ function derivedPrimaryKeyProperties(primaryKey) {
   _.defaults(primaryKey, {
     hasUUID: primaryKey.fields && primaryKey.fields.some(field => field.fieldType === UUID),
     hasLong: primaryKey.fields && primaryKey.fields.some(field => field.fieldType === LONG),
+    hasInteger: primaryKey.fields && primaryKey.fields.some(field => field.fieldType === INTEGER),
     typeUUID: primaryKey.type === UUID,
     typeString: primaryKey.type === STRING,
     typeLong: primaryKey.type === LONG,
@@ -361,6 +362,9 @@ function prepareEntityPrimaryKeyForTemplates(entityWithConfig, generator, enable
             get columnName() {
               return idCount === 1 ? field.columnName : `${generator.getColumnName(relationship.relationshipName)}_${field.columnName}`;
             },
+            get columnType() {
+              return field.columnType;
+            },
             get reference() {
               return fieldToReference(entityWithConfig, this);
             },