fixes

generators/spring-boot-v2/generator.js

@@ -68,6 +68,8 @@ export default class extends BaseApplicationGenerator {
                                 ['/SecurityConfiguration.', '/SecurityConfiguration_imperative.'],
                                 ['/ExceptionTranslatorIT.', '/ExceptionTranslatorIT_imperative.'],
                                 ['/SpaWebFilter.', '/SpaWebFilter_reactive.'],
+                                ['EntityDTO', '_dtoClass_'],
+                                [/\/Entity(.*)\./, '/_entityClass_$1.'],
                                 // ['LogoutResource.', 'LogoutResource_imperative.'],
                                 // ['UserSqlHelper.', 'UserSqlHelper_reactive.'],
                                 // ['ColumnConverter.', 'ColumnConverter_reactive.'],
@@ -80,8 +82,10 @@ export default class extends BaseApplicationGenerator {
                             if (!existsSync(`${resolvedSourceFile}.ejs`)) {
                                 const sourceBasename = basename(resolvedSourceFile);
                                 if (
-                                    /User(.*)\.kt/.test(sourceBasename) &&
-                                    !['UserJWTController.kt', 'UserJWTControllerIT.kt'].includes(sourceBasename)
+                                    (/User(.*)\.kt/.test(sourceBasename) &&
+                                        !['UserJWTController.kt', 'UserJWTControllerIT.kt'].includes(sourceBasename)) ||
+                                    resolvedSourceFile.includes('_entityClass_') ||
+                                    resolvedSourceFile.includes('_dtoClass_')
                                 ) {
                                     resolvedSourceFile = resolvedSourceFile.replace('_package_', '_package_/_entityPackage_');
                                 } else {

generators/spring-boot/generator.js

@@ -83,6 +83,7 @@ export default class extends BaseApplicationGenerator {
                             '_enumName_.java',
                             '_persistClass_.java.jhi.jackson_identity_info',
                             '_entityClass_GatlingTest.java',
+                            '_entityClass_CriteriaTest.java',
 
                             'SpaWebFilter_imperative.java',
                             'SpaWebFilterIT_imperative.java',
@@ -107,7 +108,9 @@ export default class extends BaseApplicationGenerator {
                         if (file.namespace === 'jhipster-kotlin:spring-boot-v2' || !file.sourceFile.includes('.java')) return file;
                         const resolvedKotlinFile = this.templatePath(`${convertToKotlinFile(file.sourceFile)}.ejs`);
                         if (existsSync(resolvedKotlinFile)) return file;
-                        const ktFile = convertToKotlinFile(file.sourceFile);
+                        const ktFile = convertToKotlinFile(file.sourceFile)
+                            .replace('_dtoClass_', 'EntityDTO')
+                            .replace('_entityClass_', 'Entity');
                         for (const resolvedSourceFile of [
                             this.templatePath('../../spring-boot-v2/templates', `${ktFile}.ejs`),
                             this.templatePath('../../spring-boot-v2/templates', `${ktFile.replace('/_entityPackage_', '')}.ejs`),
@@ -121,7 +124,7 @@ export default class extends BaseApplicationGenerator {
                         }
                         if (file.namespace === 'jhipster:spring-boot') {
                             // Print files that should be implemented for spring-boot v3
-                            // console.log(`'${basename(file.sourceFile)}',`);
+                            console.log(`'${basename(file.sourceFile)}',`);
                             return undefined;
                         }
                         return file;