Skip ci coverage

generators/base-application/support/prepare-entity.ts

@@ -69,6 +69,7 @@ const { BYTES, BYTE_BUFFER } = fieldTypes.RelationalOnlyDBTypes;
 const { IMAGE, TEXT } = fieldTypes.BlobTypes;
 
 const BASE_TEMPLATE_DATA = {
+  builtIn: false,
   primaryKey: undefined,
   entityPackage: undefined,
   skipUiGrouping: false,

generators/bootstrap-application/generator.spec.ts

@@ -706,6 +706,7 @@ describe(`generator - ${generator}`, () => {
   "applicationType": "monolith",
   "authenticationType": "jwt",
   "baseName": "jhipster",
+  "builtIn": false,
   "changelogDate": "20220129025419",
   "changelogDateForRecent": 2022-01-29T02:54:19.000Z,
   "clientFramework": "angular",
@@ -1038,6 +1039,7 @@ describe(`generator - ${generator}`, () => {
   "applicationType": "monolith",
   "authenticationType": "jwt",
   "baseName": "jhipster",
+  "builtIn": false,
   "changelogDate": "20220129025419",
   "changelogDateForRecent": 2022-01-29T02:54:19.000Z,
   "clientFramework": "angular",

generators/java/generator.ts

@@ -22,7 +22,13 @@ import BaseApplicationGenerator from '../base-application/index.js';
 import { GENERATOR_JAVA, GENERATOR_BOOTSTRAP_APPLICATION } from '../generator-list.js';
 import writeTask from './files.js';
 import cleanupTask from './cleanup.js';
-import { packageInfoTransform, generatedAnnotationTransform, checkJava } from './support/index.js';
+import {
+  packageInfoTransform,
+  generatedAnnotationTransform,
+  checkJava,
+  javaMainPackageTemplatesBlock,
+  javaTestPackageTemplatesBlock,
+} from './support/index.js';
 import { JavaApplication } from './types.js';
 import { BaseApplicationGeneratorDefinition, GenericApplicationDefinition } from '../base-application/tasks.js';
 import { GenericSourceTypeDefinition } from '../base/tasks.js';
@@ -41,6 +47,8 @@ export default class JavaGenerator extends BaseApplicationGenerator<GeneratorDef
   useJakartaValidation!: boolean;
   useJacksonIdentityInfo!: boolean;
   generateEnums!: boolean;
+  generateBuiltInUser!: boolean;
+  generateBuiltInUserTests!: boolean;
 
   async beforeQueue() {
     if (!this.fromBlueprint) {
@@ -133,11 +141,33 @@ export default class JavaGenerator extends BaseApplicationGenerator<GeneratorDef
         if (!this.generateEntities) return;
 
         const { useJakartaValidation, useJacksonIdentityInfo } = this;
-        for (const entity of entities.filter(entity => !entity.skipServer && !entity.builtIn)) {
-          await this.writeFiles({
-            sections: entityServerFiles,
-            context: { ...application, ...entity, useJakartaValidation, useJacksonIdentityInfo },
-          });
+        for (const entity of entities.filter(entity => !entity.skipServer)) {
+          if (entity.builtIn) {
+            if ((entity as any).builtInUser) {
+              await this.writeFiles({
+                blocks: [
+                  javaMainPackageTemplatesBlock({
+                    condition: () => this.generateBuiltInUser,
+                    templates: ['_entityPackage_/domain/_persistClass_.java.jhi'],
+                  }),
+                  javaMainPackageTemplatesBlock({
+                    condition: ctx => ctx.useJakartaValidation && this.generateBuiltInUser,
+                    templates: ['_entityPackage_/domain/_persistClass_.java.jhi.jakarta_validation'],
+                  }),
+                  javaTestPackageTemplatesBlock({
+                    condition: () => this.generateBuiltInUser || this.generateBuiltInUserTests,
+                    templates: ['_entityPackage_/domain/_persistClass_Test.java', '_entityPackage_/domain/_persistClass_TestSamples.java'],
+                  }),
+                ],
+                context: { ...application, ...entity, useJakartaValidation, useJacksonIdentityInfo },
+              });
+            }
+          } else {
+            await this.writeFiles({
+              sections: entityServerFiles,
+              context: { ...application, ...entity, useJakartaValidation, useJacksonIdentityInfo },
+            });
+          }
         }
       },
 

generators/java/templates/src/test/java/_package_/_entityPackage_/domain/_persistClass_Test.java.ejs

@@ -19,7 +19,7 @@
 package <%= entityAbsolutePackage %>.domain;
 
 import static <%= entityAbsolutePackage %>.domain.<%= persistClass %>TestSamples.*;
-<%_ for (const otherEntity of otherEntities.filter(otherEntity => !otherEntity.builtIn)) { _%>
+<%_ for (const otherEntity of otherEntities) { _%>
 import static <%= otherEntity.entityAbsolutePackage %>.domain.<%= otherEntity.persistClass %>TestSamples.*;
 <%_ } _%>
 <%_ for (const otherEntity of otherEntities.filter(otherEntity => entityPackage !== otherEntity.entityPackage)) { _%>
@@ -50,7 +50,7 @@ class <%= persistClass %>Test {
         assertThat(<%= persistInstance %>1).isNotEqualTo(<%= persistInstance %>2);
 <%_} _%>
     }
-<%_ for (const relationship of relationships.filter(relationship => !relationship.otherEntity.builtIn)) { _%>
+<%_ for (const relationship of relationships) { _%>
 
     @Test
     void <%- relationship.relationshipName %>Test() throws Exception {
@@ -78,7 +78,7 @@ class <%= persistClass %>Test {
         assertThat(<%= persistInstance %>.get<%- relationship.propertyNameCapitalized %>()).doesNotContain(<%= relationship.otherEntity.persistInstance %>Back);
   <%_ } else { _%>
 
-    <%_ if (fluentMethods) { _%>
+    <%_ if (fluentMethods && !builtIn) { _%>
         <%= persistInstance %>.<%- relationship.propertyName %>(null);
     <%_ } else { _%>
         <%= persistInstance %>.set<%- relationship.propertyNameCapitalized %>(null);
@@ -94,7 +94,7 @@ class <%= persistClass %>Test {
   <%_ } _%>
   <%_ if (relationship.collection) { _%>
 
-    <%_ if (fluentMethods) { _%>
+    <%_ if (fluentMethods && !builtIn) { _%>
         <%= persistInstance %>.<%- relationship.propertyName %>(new HashSet<>(Set.of(<%= relationship.otherEntity.persistInstance %>Back)));
     <%_ } else { _%>
         <%= persistInstance %>.set<%- relationship.propertyNameCapitalized %>(new HashSet<>(Set.of(<%= relationship.otherEntity.persistInstance %>Back)));

generators/java/templates/src/test/java/_package_/_entityPackage_/domain/_persistClass_TestSamples.java.ejs

@@ -48,7 +48,7 @@ public class <%= persistClass %>TestSamples {
 <%_ } _%>
 
     public static <%= persistClass %> get<%= persistClass %>Sample1() {
-<%_ if (fluentMethods) { _%>
+<%_ if (fluentMethods && !builtIn) { _%>
         return new <%= persistClass %>()<% sampleFields.forEach(field => { %>.<%- field.fieldName %>(<%- field.javaValueSample1 %>)<% }) %>;
 <%_ } else { _%>
         <%= persistClass %> <%= persistInstance %> = new <%= persistClass %>();
@@ -60,7 +60,7 @@ public class <%= persistClass %>TestSamples {
     }
 
     public static <%= persistClass %> get<%= persistClass %>Sample2() {
-<%_ if (fluentMethods) { _%>
+<%_ if (fluentMethods && !builtIn) { _%>
         return new <%= persistClass %>()<% sampleFields.forEach(field => { %>.<%- field.fieldName %>(<%- field.javaValueSample2 %>)<% }) %>;
 <%_ } else { _%>
         <%= persistClass %> <%= persistInstance %> = new <%= persistClass %>();
@@ -72,7 +72,7 @@ public class <%= persistClass %>TestSamples {
     }
 
     public static <%= persistClass %> get<%= persistClass %>RandomSampleGenerator() {
-<%_ if (fluentMethods) { _%>
+<%_ if (fluentMethods && !builtIn) { _%>
         return new <%= persistClass %>()<% sampleFields.forEach(field => { %>.<%- field.fieldName %>(<%- field.javaValueGenerator %>)<% }) %>;
 <%_ } else { _%>
         <%= persistClass %> <%= persistInstance %> = new <%= persistClass %>();

generators/server/__snapshots__/generator.spec.js.snap

@@ -1130,6 +1130,12 @@ exports[`generator - server with entities should match files snapshot 1`] = `
   "src/test/java/com/mycompany/myapp/domain/FooTestSamples.java": {
     "stateCleared": "modified",
   },
+  "src/test/java/com/mycompany/myapp/domain/UserTest.java": {
+    "stateCleared": "modified",
+  },
+  "src/test/java/com/mycompany/myapp/domain/UserTestSamples.java": {
+    "stateCleared": "modified",
+  },
   "src/test/java/com/mycompany/myapp/management/SecurityMetersServiceTests.java": {
     "stateCleared": "modified",
   },

generators/server/generator.js

@@ -161,7 +161,8 @@ export default class JHipsterServerGenerator extends BaseApplicationGenerator {
     if (!this.delegateToBlueprint) {
       await this.dependsOnJHipster(GENERATOR_BOOTSTRAP_APPLICATION);
       await this.dependsOnJHipster(GENERATOR_COMMON);
-      await this.dependsOnJHipster(GENERATOR_JAVA);
+      const javaGenerator = await this.dependsOnJHipster(GENERATOR_JAVA);
+      javaGenerator.generateBuiltInUserTests = true;
     }
   }
 

generators/server/support/__snapshots__/needles.spec.ts.snap

@@ -371,6 +371,12 @@ exports[`generator - server - support - needles generated project should match s
   "src/test/java/com/mycompany/myapp/config/timezone/HibernateTimeZoneIT.java": {
     "stateCleared": "modified",
   },
+  "src/test/java/com/mycompany/myapp/domain/UserTest.java": {
+    "stateCleared": "modified",
+  },
+  "src/test/java/com/mycompany/myapp/domain/UserTestSamples.java": {
+    "stateCleared": "modified",
+  },
   "src/test/java/com/mycompany/myapp/management/SecurityMetersServiceTests.java": {
     "stateCleared": "modified",
   },

generators/spring-data-cassandra/__snapshots__/generator.spec.ts.snap

@@ -386,6 +386,12 @@ exports[`generator - cassandra gateway-jwt-gradle-enableTranslation(true)-com.pa
   "src/test/java/com/package/domain/SimpleTestSamples.java": {
     "stateCleared": "modified",
   },
+  "src/test/java/com/package/domain/UserTest.java": {
+    "stateCleared": "modified",
+  },
+  "src/test/java/com/package/domain/UserTestSamples.java": {
+    "stateCleared": "modified",
+  },
   "src/test/java/com/package/management/SecurityMetersServiceTests.java": {
     "stateCleared": "modified",
   },
@@ -1873,6 +1879,12 @@ exports[`generator - cassandra monolith-jwt-reactive(false)-maven-enableTranslat
   "src/test/java/tech/jhipster/domain/SimpleEntityTestSamples.java": {
     "stateCleared": "modified",
   },
+  "src/test/java/tech/jhipster/domain/UserEntityTest.java": {
+    "stateCleared": "modified",
+  },
+  "src/test/java/tech/jhipster/domain/UserEntityTestSamples.java": {
+    "stateCleared": "modified",
+  },
   "src/test/java/tech/jhipster/management/SecurityMetersServiceTests.java": {
     "stateCleared": "modified",
   },
@@ -3447,6 +3459,12 @@ exports[`generator - cassandra monolith-session-reactive(false)-maven-enableTran
   "src/test/java/tech/jhipster/domain/SimpleEntityTestSamples.java": {
     "stateCleared": "modified",
   },
+  "src/test/java/tech/jhipster/domain/UserEntityTest.java": {
+    "stateCleared": "modified",
+  },
+  "src/test/java/tech/jhipster/domain/UserEntityTestSamples.java": {
+    "stateCleared": "modified",
+  },
   "src/test/java/tech/jhipster/security/DomainUserDetailsServiceIT.java": {
     "stateCleared": "modified",
   },

generators/spring-data-couchbase/__snapshots__/generator.spec.ts.snap

@@ -404,6 +404,12 @@ exports[`generator - couchbase gateway-jwt-gradle-enableTranslation(true)-com.pa
   "src/test/java/com/package/domain/SimpleTestSamples.java": {
     "stateCleared": "modified",
   },
+  "src/test/java/com/package/domain/UserTest.java": {
+    "stateCleared": "modified",
+  },
+  "src/test/java/com/package/domain/UserTestSamples.java": {
+    "stateCleared": "modified",
+  },
   "src/test/java/com/package/management/SecurityMetersServiceTests.java": {
     "stateCleared": "modified",
   },
@@ -1912,6 +1918,12 @@ exports[`generator - couchbase monolith-jwt-reactive(false)-maven-enableTranslat
   "src/test/java/tech/jhipster/domain/SimpleEntityTestSamples.java": {
     "stateCleared": "modified",
   },
+  "src/test/java/tech/jhipster/domain/UserEntityTest.java": {
+    "stateCleared": "modified",
+  },
+  "src/test/java/tech/jhipster/domain/UserEntityTestSamples.java": {
+    "stateCleared": "modified",
+  },
   "src/test/java/tech/jhipster/management/SecurityMetersServiceTests.java": {
     "stateCleared": "modified",
   },
@@ -3513,6 +3525,12 @@ exports[`generator - couchbase monolith-session-reactive(false)-maven-enableTran
   "src/test/java/tech/jhipster/domain/SimpleEntityTestSamples.java": {
     "stateCleared": "modified",
   },
+  "src/test/java/tech/jhipster/domain/UserEntityTest.java": {
+    "stateCleared": "modified",
+  },
+  "src/test/java/tech/jhipster/domain/UserEntityTestSamples.java": {
+    "stateCleared": "modified",
+  },
   "src/test/java/tech/jhipster/security/DomainUserDetailsServiceIT.java": {
     "stateCleared": "modified",
   },

generators/spring-data-elasticsearch/__snapshots__/generator.spec.ts.snap

@@ -416,6 +416,12 @@ exports[`generator - elasticsearch gateway-jwt-gradle-enableTranslation(true)-co
   "src/test/java/com/package/domain/SimpleTestSamples.java": {
     "stateCleared": "modified",
   },
+  "src/test/java/com/package/domain/UserTest.java": {
+    "stateCleared": "modified",
+  },
+  "src/test/java/com/package/domain/UserTestSamples.java": {
+    "stateCleared": "modified",
+  },
   "src/test/java/com/package/management/SecurityMetersServiceTests.java": {
     "stateCleared": "modified",
   },
@@ -2077,6 +2083,12 @@ exports[`generator - elasticsearch monolith-jwt-reactive(false)-maven-enableTran
   "src/test/java/tech/jhipster/domain/SimpleEntityTestSamples.java": {
     "stateCleared": "modified",
   },
+  "src/test/java/tech/jhipster/domain/UserEntityTest.java": {
+    "stateCleared": "modified",
+  },
+  "src/test/java/tech/jhipster/domain/UserEntityTestSamples.java": {
+    "stateCleared": "modified",
+  },
   "src/test/java/tech/jhipster/management/SecurityMetersServiceTests.java": {
     "stateCleared": "modified",
   },
@@ -3891,6 +3903,12 @@ exports[`generator - elasticsearch monolith-session-reactive(false)-maven-enable
   "src/test/java/tech/jhipster/domain/SimpleEntityTestSamples.java": {
     "stateCleared": "modified",
   },
+  "src/test/java/tech/jhipster/domain/UserEntityTest.java": {
+    "stateCleared": "modified",
+  },
+  "src/test/java/tech/jhipster/domain/UserEntityTestSamples.java": {
+    "stateCleared": "modified",
+  },
   "src/test/java/tech/jhipster/security/DomainUserDetailsServiceIT.java": {
     "stateCleared": "modified",
   },

generators/spring-data-mongodb/__snapshots__/generator.spec.ts.snap

@@ -374,6 +374,12 @@ exports[`generator - mongodb gateway-jwt-gradle-enableTranslation(true)-com.pack
   "src/test/java/com/package/domain/SimpleTestSamples.java": {
     "stateCleared": "modified",
   },
+  "src/test/java/com/package/domain/UserTest.java": {
+    "stateCleared": "modified",
+  },
+  "src/test/java/com/package/domain/UserTestSamples.java": {
+    "stateCleared": "modified",
+  },
   "src/test/java/com/package/management/SecurityMetersServiceTests.java": {
     "stateCleared": "modified",
   },
@@ -1819,6 +1825,12 @@ exports[`generator - mongodb monolith-jwt-reactive(false)-maven-enableTranslatio
   "src/test/java/tech/jhipster/domain/SimpleEntityTestSamples.java": {
     "stateCleared": "modified",
   },
+  "src/test/java/tech/jhipster/domain/UserEntityTest.java": {
+    "stateCleared": "modified",
+  },
+  "src/test/java/tech/jhipster/domain/UserEntityTestSamples.java": {
+    "stateCleared": "modified",
+  },
   "src/test/java/tech/jhipster/management/SecurityMetersServiceTests.java": {
     "stateCleared": "modified",
   },
@@ -3348,6 +3360,12 @@ exports[`generator - mongodb monolith-session-reactive(false)-maven-enableTransl
   "src/test/java/tech/jhipster/domain/SimpleEntityTestSamples.java": {
     "stateCleared": "modified",
   },
+  "src/test/java/tech/jhipster/domain/UserEntityTest.java": {
+    "stateCleared": "modified",
+  },
+  "src/test/java/tech/jhipster/domain/UserEntityTestSamples.java": {
+    "stateCleared": "modified",
+  },
   "src/test/java/tech/jhipster/security/DomainUserDetailsServiceIT.java": {
     "stateCleared": "modified",
   },

generators/spring-data-neo4j/__snapshots__/generator.spec.ts.snap

@@ -380,6 +380,12 @@ exports[`generator - neo4j gateway-jwt-gradle-enableTranslation(true)-com.packag
   "src/test/java/com/package/domain/SimpleTestSamples.java": {
     "stateCleared": "modified",
   },
+  "src/test/java/com/package/domain/UserTest.java": {
+    "stateCleared": "modified",
+  },
+  "src/test/java/com/package/domain/UserTestSamples.java": {
+    "stateCleared": "modified",
+  },
   "src/test/java/com/package/management/SecurityMetersServiceTests.java": {
     "stateCleared": "modified",
   },
@@ -1819,6 +1825,12 @@ exports[`generator - neo4j monolith-jwt-reactive(false)-maven-enableTranslation(
   "src/test/java/tech/jhipster/domain/SimpleEntityTestSamples.java": {
     "stateCleared": "modified",
   },
+  "src/test/java/tech/jhipster/domain/UserEntityTest.java": {
+    "stateCleared": "modified",
+  },
+  "src/test/java/tech/jhipster/domain/UserEntityTestSamples.java": {
+    "stateCleared": "modified",
+  },
   "src/test/java/tech/jhipster/management/SecurityMetersServiceTests.java": {
     "stateCleared": "modified",
   },
@@ -3345,6 +3357,12 @@ exports[`generator - neo4j monolith-session-reactive(false)-maven-enableTranslat
   "src/test/java/tech/jhipster/domain/SimpleEntityTestSamples.java": {
     "stateCleared": "modified",
   },
+  "src/test/java/tech/jhipster/domain/UserEntityTest.java": {
+    "stateCleared": "modified",
+  },
+  "src/test/java/tech/jhipster/domain/UserEntityTestSamples.java": {
+    "stateCleared": "modified",
+  },
   "src/test/java/tech/jhipster/security/DomainUserDetailsServiceIT.java": {
     "stateCleared": "modified",
   },