Spring Boot v3 templates based on https://github.com/jhipster/jhipste…

generators/spring-boot-v2/generator.js

@@ -2,16 +2,10 @@ import { basename, dirname, join } from 'path';
 import { fileURLToPath } from 'url';
 import { existsSync } from 'fs';
 import BaseApplicationGenerator from 'generator-jhipster/generators/spring-boot';
-import { getEnumInfo } from 'generator-jhipster/generators/base-application/support';
 import { files as entityServerFiles } from 'jhipster-7-templates/esm/generators/entity-server';
 import { files as serverFiles } from 'jhipster-7-templates/esm/generators/server';
 import { convertToKotlinFile } from '../kotlin/support/files.js';
 import { migrateApplicationTask } from './preparing-migration.js';
-import migration from './migration.cjs';
-
-const { jhipsterConstants } = migration;
-const { MAIN_DIR } = jhipsterConstants;
-const SERVER_MAIN_SRC_KOTLIN_DIR = `${MAIN_DIR}kotlin/`;
 
 const jhipster7TemplatesPackage = dirname(fileURLToPath(import.meta.resolve('jhipster-7-templates/package.json')));
 
@@ -342,38 +336,6 @@ export default class extends BaseApplicationGenerator {
                     });
                 }
             },
-
-            // Can be dropped for jhipster 8.7.0
-            async writeEnumFiles({ application, entities }) {
-                for (const entity of entities.filter(entity => !entity.skipServer)) {
-                    for (const field of entity.fields.filter(field => field.fieldIsEnum)) {
-                        const enumInfo = {
-                            ...application,
-                            ...getEnumInfo(field, entity.clientRootFolder),
-                            frontendAppName: entity.frontendAppName,
-                            packageName: application.packageName,
-                            javaPackageSrcDir: application.javaPackageSrcDir,
-                            entityJavaPackageFolder: entity.entityJavaPackageFolder,
-                            entityAbsolutePackage: entity.entityAbsolutePackage || application.packageName,
-                        };
-                        await this.writeFiles({
-                            blocks: [
-                                {
-                                    templates: [
-                                        {
-                                            file: `${SERVER_MAIN_SRC_KOTLIN_DIR}_package_/_entityPackage_/domain/enumeration/_enumName_.kt`,
-                                            renameTo: () =>
-                                                `${SERVER_MAIN_SRC_KOTLIN_DIR}${entity.entityAbsoluteFolder}/domain/enumeration/${field.fieldType}.kt`,
-                                        },
-                                    ],
-                                },
-                            ],
-                            rootTemplatesPath: ['../../spring-boot/templates/domain/'],
-                            context: enumInfo,
-                        });
-                    }
-                }
-            },
         });
     }
 
@@ -437,8 +399,14 @@ export default class extends BaseApplicationGenerator {
                     source.addGradleProperty({ property: 'mapstructVersion', value: application.javaDependencies.mapstruct });
                     source.addGradleProperty({ property: 'springBootVersion', value: application.javaDependencies['spring-boot'] });
                     if (application.databaseTypeSql) {
-                        source.addGradleProperty({ property: 'liquibase.version', value: application.javaDependencies.liquibase });
-                        source.addGradleProperty({ property: 'hibernateVersion', value: application.javaDependencies.hibernate });
+                        source.addGradleProperty({
+                            property: 'liquibase.version',
+                            value: application.javaManagedProperties['liquibase.version'],
+                        });
+                        source.addGradleProperty({
+                            property: 'hibernateVersion',
+                            value: application.javaManagedProperties['hibernate.version'],
+                        });
                         source.addGradleProperty({ property: 'jaxbRuntimeVersion', value: '4.0.0' });
                     }
                     if (application.databaseTypeCassandra) {

generators/spring-boot-v2/templates/src/main/kotlin/_package_/config/LocaleConfiguration.kt.ejs

@@ -30,7 +30,7 @@ import org.springframework.web.servlet.i18n.LocaleChangeInterceptor
 class LocaleConfiguration : WebMvcConfigurer {
 
     @Bean
-    fun localeResolver() = AngularCookieLocaleResolver().apply { cookieName = "NG_TRANSLATE_LANG_KEY" }
+    fun localeResolver() = AngularCookieLocaleResolver("NG_TRANSLATE_LANG_KEY")
 
     override fun addInterceptors(registry: InterceptorRegistry?) {
         registry!!.addInterceptor(LocaleChangeInterceptor().apply { paramName = "language" })

generators/spring-boot-v2/templates/src/main/kotlin/_package_/domain/Authority.kt.ejs

@@ -42,14 +42,14 @@ import org.springframework.data.annotation.Transient
 import org.springframework.data.domain.Persistable
 import org.springframework.data.relational.core.mapping.Table
     <%_ } else { _%>
-import javax.persistence.Entity
-import javax.persistence.Id
-import javax.persistence.Table
-import javax.persistence.Column
+import jakarta.persistence.Entity
+import jakarta.persistence.Id
+import jakarta.persistence.Table
+import jakarta.persistence.Column
     <%_ } _%>
 <%_ } _%>
-import javax.validation.constraints.NotNull
-import javax.validation.constraints.Size
+import jakarta.validation.constraints.NotNull
+import jakarta.validation.constraints.Size
 import java.io.Serializable
 
 /**

generators/spring-boot-v2/templates/src/main/kotlin/_package_/security/jwt/JWTFilter.kt.ejs

@@ -34,11 +34,11 @@ import reactor.core.publisher.Mono
 <%_ } else { _%>
 import org.springframework.web.filter.GenericFilterBean
 
-import javax.servlet.FilterChain
-import javax.servlet.ServletException
-import javax.servlet.ServletRequest
-import javax.servlet.ServletResponse
-import javax.servlet.http.HttpServletRequest
+import jakarta.servlet.FilterChain
+import jakarta.servlet.ServletException
+import jakarta.servlet.ServletRequest
+import jakarta.servlet.ServletResponse
+import jakarta.servlet.http.HttpServletRequest
 import java.io.IOException
 <%_ } _%>
 

generators/spring-boot/__snapshots__/generator.spec.js.snap

@@ -95,24 +95,9 @@ exports[`SubGenerator kotlin of kotlin JHipster blueprint > run > should succeed
   "src/main/docker/app.yml": {
     "stateCleared": "modified",
   },
-  "src/main/docker/grafana/provisioning/dashboards/JVM.json": {
-    "stateCleared": "modified",
-  },
-  "src/main/docker/grafana/provisioning/dashboards/dashboard.yml": {
-    "stateCleared": "modified",
-  },
-  "src/main/docker/grafana/provisioning/datasources/datasource.yml": {
-    "stateCleared": "modified",
-  },
-  "src/main/docker/jhipster-control-center.yml": {
-    "stateCleared": "modified",
-  },
   "src/main/docker/jib/entrypoint.sh": {
     "stateCleared": "modified",
   },
-  "src/main/docker/monitoring.yml": {
-    "stateCleared": "modified",
-  },
   "src/main/docker/postgresql.yml": {
     "stateCleared": "modified",
   },
@@ -164,9 +149,6 @@ exports[`SubGenerator kotlin of kotlin JHipster blueprint > run > should succeed
   "src/main/kotlin/com/mycompany/myapp/config/LiquibaseConfiguration.kt": {
     "stateCleared": "modified",
   },
-  "src/main/kotlin/com/mycompany/myapp/config/LocaleConfiguration.kt": {
-    "stateCleared": "modified",
-  },
   "src/main/kotlin/com/mycompany/myapp/config/LoggingAspectConfiguration.kt": {
     "stateCleared": "modified",
   },
@@ -176,6 +158,9 @@ exports[`SubGenerator kotlin of kotlin JHipster blueprint > run > should succeed
   "src/main/kotlin/com/mycompany/myapp/config/SecurityConfiguration.kt": {
     "stateCleared": "modified",
   },
+  "src/main/kotlin/com/mycompany/myapp/config/SecurityJwtConfiguration.kt": {
+    "stateCleared": "modified",
+  },
   "src/main/kotlin/com/mycompany/myapp/config/StaticResourcesWebConfiguration.kt": {
     "stateCleared": "modified",
   },
@@ -269,15 +254,6 @@ exports[`SubGenerator kotlin of kotlin JHipster blueprint > run > should succeed
   "src/main/kotlin/com/mycompany/myapp/security/UserNotActivatedException.kt": {
     "stateCleared": "modified",
   },
-  "src/main/kotlin/com/mycompany/myapp/security/jwt/JWTConfigurer.kt": {
-    "stateCleared": "modified",
-  },
-  "src/main/kotlin/com/mycompany/myapp/security/jwt/JWTFilter.kt": {
-    "stateCleared": "modified",
-  },
-  "src/main/kotlin/com/mycompany/myapp/security/jwt/TokenProvider.kt": {
-    "stateCleared": "modified",
-  },
   "src/main/kotlin/com/mycompany/myapp/service/AnotherSimpleService.kt": {
     "stateCleared": "modified",
   },
@@ -347,13 +323,19 @@ exports[`SubGenerator kotlin of kotlin JHipster blueprint > run > should succeed
   "src/main/kotlin/com/mycompany/myapp/service/mapper/UserMapper.kt": {
     "stateCleared": "modified",
   },
+  "src/main/kotlin/com/mycompany/myapp/web/filter/SpaWebFilter.kt": {
+    "stateCleared": "modified",
+  },
   "src/main/kotlin/com/mycompany/myapp/web/rest/AccountResource.kt": {
     "stateCleared": "modified",
   },
   "src/main/kotlin/com/mycompany/myapp/web/rest/AnotherSimpleResource.kt": {
     "stateCleared": "modified",
   },
-  "src/main/kotlin/com/mycompany/myapp/web/rest/ClientForwardController.kt": {
+  "src/main/kotlin/com/mycompany/myapp/web/rest/AuthenticateController.kt": {
+    "stateCleared": "modified",
+  },
+  "src/main/kotlin/com/mycompany/myapp/web/rest/AuthorityResource.kt": {
     "stateCleared": "modified",
   },
   "src/main/kotlin/com/mycompany/myapp/web/rest/CriteriaAndDtoResource.kt": {
@@ -374,9 +356,6 @@ exports[`SubGenerator kotlin of kotlin JHipster blueprint > run > should succeed
   "src/main/kotlin/com/mycompany/myapp/web/rest/SimpleResource.kt": {
     "stateCleared": "modified",
   },
-  "src/main/kotlin/com/mycompany/myapp/web/rest/UserJWTController.kt": {
-    "stateCleared": "modified",
-  },
   "src/main/kotlin/com/mycompany/myapp/web/rest/UserResource.kt": {
     "stateCleared": "modified",
   },
@@ -653,13 +632,16 @@ exports[`SubGenerator kotlin of kotlin JHipster blueprint > run > should succeed
   "src/test/kotlin/com/mycompany/myapp/security/SecurityUtilsUnitTest.kt": {
     "stateCleared": "modified",
   },
-  "src/test/kotlin/com/mycompany/myapp/security/jwt/JWTFilterTest.kt": {
+  "src/test/kotlin/com/mycompany/myapp/security/jwt/AuthenticationIntegrationTest.kt": {
     "stateCleared": "modified",
   },
-  "src/test/kotlin/com/mycompany/myapp/security/jwt/TokenProviderSecurityMetersTests.kt": {
+  "src/test/kotlin/com/mycompany/myapp/security/jwt/JwtAuthenticationTestUtils.kt": {
     "stateCleared": "modified",
   },
-  "src/test/kotlin/com/mycompany/myapp/security/jwt/TokenProviderTest.kt": {
+  "src/test/kotlin/com/mycompany/myapp/security/jwt/TokenAuthenticationIT.kt": {
+    "stateCleared": "modified",
+  },
+  "src/test/kotlin/com/mycompany/myapp/security/jwt/TokenAuthenticationSecurityMetersIT.kt": {
     "stateCleared": "modified",
   },
   "src/test/kotlin/com/mycompany/myapp/service/MailServiceIT.kt": {
@@ -689,7 +671,10 @@ exports[`SubGenerator kotlin of kotlin JHipster blueprint > run > should succeed
   "src/test/kotlin/com/mycompany/myapp/web/rest/AnotherSimpleResourceIT.kt": {
     "stateCleared": "modified",
   },
-  "src/test/kotlin/com/mycompany/myapp/web/rest/ClientForwardControllerTest.kt": {
+  "src/test/kotlin/com/mycompany/myapp/web/rest/AuthenticateControllerIT.kt": {
+    "stateCleared": "modified",
+  },
+  "src/test/kotlin/com/mycompany/myapp/web/rest/AuthorityResourceIT.kt": {
     "stateCleared": "modified",
   },
   "src/test/kotlin/com/mycompany/myapp/web/rest/CriteriaAndDtoResourceIT.kt": {
@@ -713,9 +698,6 @@ exports[`SubGenerator kotlin of kotlin JHipster blueprint > run > should succeed
   "src/test/kotlin/com/mycompany/myapp/web/rest/TestUtil.kt": {
     "stateCleared": "modified",
   },
-  "src/test/kotlin/com/mycompany/myapp/web/rest/UserJWTControllerIT.kt": {
-    "stateCleared": "modified",
-  },
   "src/test/kotlin/com/mycompany/myapp/web/rest/UserResourceIT.kt": {
     "stateCleared": "modified",
   },
@@ -761,8 +743,5 @@ exports[`SubGenerator kotlin of kotlin JHipster blueprint > run > should succeed
   "src/test/resources/templates/mail/testEmail.html": {
     "stateCleared": "modified",
   },
-  "src/test/resources/testcontainers.properties": {
-    "stateCleared": "modified",
-  },
 }
 `;