generator-jhipster 8.5.0 → 8.7.0

package/dist/generators/spring-boot/templates/src/test/java/_package_/_entityPackage_/web/rest/PublicUserResourceIT.java.ejs

@@ -75,9 +75,6 @@ import org.springframework.transaction.annotation.Transactional;
 import reactor.core.publisher.Mono;
 <%_ } _%>
 
-<%_ if (databaseTypeSql && !reactive) { _%>
-import jakarta.persistence.EntityManager;
-<%_ } _%>
 <%_ if (databaseTypeCassandra || databaseTypeCouchbase) { _%>
 import java.util.stream.Stream;
 <%_ } _%>
@@ -108,8 +105,6 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
 @IntegrationTest
 class PublicUserResourceIT {
 
-    private static final String DEFAULT_LOGIN = "johndoe";
-
 <%_ const DEFAULT_USER = {firstName: 'john', lastName: 'doe'}; _%>
 <%_ for (field of user.fields.filter(field => !field.builtIn && field.relatedByOtherEntity)) { _%>
     private static final String DEFAULT_<%= field.fieldName.toUpperCase() %> = "<%= DEFAULT_USER [field.fieldName] %>";
@@ -132,11 +127,6 @@ class PublicUserResourceIT {
     @Autowired
     private UserSearchRepository mockUserSearchRepository;
 <%_ } _%>
-<%_ if (databaseTypeSql) { _%>
-
-    @Autowired
-    private EntityManager em;
-<%_ } _%>
 <%_ if (cacheProviderAny) { _%>
 
     @Autowired
@@ -170,7 +160,7 @@ class PublicUserResourceIT {
 <%_ } _%>
     @BeforeEach
     public void initTest() {
-        user = UserResourceIT.initTestUser(<% if (databaseTypeSql) { %>em<% } %>);
+        user = UserResourceIT.initTestUser();
     }
 
     @AfterEach

package/dist/generators/spring-boot/templates/src/test/java/_package_/_entityPackage_/web/rest/UserResourceIT.java.ejs

@@ -133,11 +133,6 @@ class UserResourceIT {
 <%_ } else { _%>
     private static final <%= user.primaryKey.type %> DEFAULT_ID = <%- this.getPrimaryKeyValue(user.primaryKey.type) %>;
 <%_ } _%>
-<%_ if (!authenticationTypeOauth2) { _%>
-
-    private static final String DEFAULT_PASSWORD = "passjohndoe";
-    private static final String UPDATED_PASSWORD = "passjhipster";
-<%_ } _%>
 
     private static final String DEFAULT_EMAIL = "johndoe@localhost";
 <%_ if (!authenticationTypeOauth2) { _%>
@@ -231,7 +226,7 @@ class UserResourceIT {
      * This is a static method, as tests for other entities might also need it,
      * if they test an entity which has a required relationship to the User entity.
      */
-    public static <%= user.persistClass %> createEntity(<% if (databaseTypeSql) { %>EntityManager em<% } %>) {
+    public static <%= user.persistClass %> createEntity() {
         <%= user.persistClass %> persistUser = new <%= user.persistClass %>();
 <%_ if (databaseTypeCassandra || (authenticationTypeOauth2 && !databaseTypeCouchbase)) { _%>
         persistUser.setId(UUID.randomUUID().toString());
@@ -265,8 +260,8 @@ class UserResourceIT {
     /**
      * Setups the database with one user.
      */
-    public static <%= user.persistClass %> initTestUser(<% if (databaseTypeSql) { %>EntityManager em<% } _%>) {
-        <%= user.persistClass %> persistUser = createEntity(<% if (databaseTypeSql ) { %>em<% } _%>);
+    public static <%= user.persistClass %> initTestUser() {
+        <%= user.persistClass %> persistUser = createEntity();
 <%_ if (databaseTypeSql) { _%>
         persistUser.setLogin(DEFAULT_LOGIN);
         persistUser.setEmail(DEFAULT_EMAIL);
@@ -276,7 +271,7 @@ class UserResourceIT {
 
     @BeforeEach
     public void initTest() {
-        user = initTestUser(<% if (databaseTypeSql) { %>em<% } _%>);
+        user = initTestUser();
     }
 
     @AfterEach
@@ -465,7 +460,7 @@ class UserResourceIT {
         userDTO.setLogin("anotherlogin");
         userDTO.setFirstName(DEFAULT_FIRSTNAME);
         userDTO.setLastName(DEFAULT_LASTNAME);
-        userDTO.setEmail(DEFAULT_EMAIL);// this email should already be used
+        userDTO.setEmail(DEFAULT_EMAIL); // this email should already be used
         userDTO.setActivated(true);
   <%_ if (!databaseTypeCassandra) { _%>
         userDTO.setImageUrl(DEFAULT_IMAGEURL);
@@ -764,7 +759,7 @@ class UserResourceIT {
         userDTO.setLogin(updatedUser.getLogin());
         userDTO.setFirstName(updatedUser.getFirstName());
         userDTO.setLastName(updatedUser.getLastName());
-        userDTO.setEmail("jhipster@localhost");// this email should already be used by anotherUser
+        userDTO.setEmail("jhipster@localhost"); // this email should already be used by anotherUser
         userDTO.setActivated(updatedUser.isActivated());
   <%_ if (!databaseTypeCassandra) { _%>
         userDTO.setImageUrl(updatedUser.getImageUrl());
@@ -831,7 +826,7 @@ class UserResourceIT {
 
         <%= user.adminUserDto %> userDTO = new <%= user.adminUserDto %>();
         userDTO.setId(updatedUser.getId());
-        userDTO.setLogin("jhipster");// this login should already be used by anotherUser
+        userDTO.setLogin("jhipster"); // this login should already be used by anotherUser
         userDTO.setFirstName(updatedUser.getFirstName());
         userDTO.setLastName(updatedUser.getLastName());
         userDTO.setEmail(updatedUser.getEmail());

package/dist/generators/spring-boot/templates/src/test/java/_package_/_entityPackage_/web/rest/_entityClass_ResourceIT.java.ejs

@@ -210,7 +210,7 @@ import java.util.UUID;
 <%_ } _%>
 <%_ if (!embedded && (primaryKey.hasLong || primaryKey.hasInteger)) { _%>
 import java.util.Random;
-  <%_ if (primaryKey.hasLong) { _%>
+  <%_ if (primaryKey.hasLong && !readOnly && updatableEntity) { _%>
 import java.util.concurrent.atomic.AtomicLong;
   <%_ } else if (primaryKey.hasInteger) { _%>
 import java.util.concurrent.atomic.AtomicInteger;
@@ -448,8 +448,10 @@ if (field.fieldTypeString || field.blobContentTypeText) {
 <%_ } _%>
 <%_ if (!embedded && (primaryKey.hasLong || primaryKey.hasInteger)) { _%>
 
+  <%_ if (primaryKey.hasLong && !readOnly && updatableEntity || primaryKey.hasInteger) { _%>
     private static Random random = new Random();
-  <%_ if (primaryKey.hasLong) { _%>
+  <%_ } _%>
+  <%_ if (primaryKey.hasLong && !readOnly && updatableEntity) { _%>
     private static AtomicLong longCount = new AtomicLong(random.nextInt() + ( 2 * Integer.MAX_VALUE ));
   <%_ } else if (primaryKey.hasInteger) { _%>
     private static AtomicInteger intCount = new AtomicInteger(random.nextInt() + ( 2 * Short.MAX_VALUE ));
@@ -514,42 +516,51 @@ filterTestableRelationships.filter(rel => !rel.otherEntity.builtInUser).forEach(
 <%_ });
 }_%>
 <%_ ['DEFAULT_', 'UPDATED_'].forEach((fieldStatus) => { _%>
+<%_   const createInstance = fieldStatus === 'UPDATED_' ? `updated${persistClass}` : persistInstance;  _%>
     /**
      * Create an <% if (fieldStatus === 'UPDATED_') { %>updated <% } %>entity for this test.
      *
      * This is a static method, as tests for other entities might also need it,
      * if they test an entity which requires the current entity.
      */
-    public static <%= persistClass %> create<% if (fieldStatus === 'UPDATED_') { _%>Updated<%_ } %>Entity(<% if (databaseTypeSql) { %>EntityManager em<% } %>) {
+    public static <%= persistClass %> create<% if (fieldStatus === 'UPDATED_') { _%>Updated<%_ } %>Entity(<% if (databaseTypeSql && anyRelationshipIsRequired) { %>EntityManager em<% } %>) {
   <%_ if (fluentMethods) { _%>
-        <%= persistClass %> <%= persistInstance %> = new <%= persistClass %>()
+        <% if (!anyRelationshipIsRequired) { %>return <% } else { %><%= persistClass %> <%= createInstance %> = <% } %>new <%= persistClass %>()
     <%_ if (reactive && databaseTypeSql && primaryKey.typeUUID && !isUsingMapsId) { _%>
             .<%= primaryKey.name %>(UUID.randomUUID())
     <%_ } _%>
     <%_ if (primaryKey.typeString && !isUsingMapsId && !primaryKey.autoGenerate) { _%>
             .<%= primaryKey.name %>(UUID.randomUUID().toString())
     <%_ } _%>
-    <% for (field of fieldsToTest) { %>
-            .<%= field.fieldName %>(<%= fieldStatus + field.fieldNameUnderscored.toUpperCase() %>)<% if (field.fieldTypeBinary && !field.blobContentTypeText) { %>
-            .<%= field.fieldName %>ContentType(<%= fieldStatus + field.fieldNameUnderscored.toUpperCase() %>_CONTENT_TYPE)<% } %><% } %>;
+    <%_ for (field of fieldsToTest) { _%>
+            .<%= field.fieldName %>(<%= fieldStatus + field.fieldNameUnderscored.toUpperCase() %>)
+      <%_ if (field.fieldTypeBinary && !field.blobContentTypeText) { _%>
+            .<%= field.fieldName %>ContentType(<%= fieldStatus + field.fieldNameUnderscored.toUpperCase() %>_CONTENT_TYPE)
+      <%_ } _%>
+    <%_ } _%>;
+    <%_ if (!anyRelationshipIsRequired) { _%>
+    }
+    <%_   return; _%>
+    <%_ } _%>
   <%_ } else { _%>
-        <%= persistClass %> <%= persistInstance %> = new <%= persistClass %>();
+        <%= persistClass %> <%= createInstance %> = new <%= persistClass %>();
     <%_ if (reactive && databaseTypeSql && primaryKey.typeUUID && !isUsingMapsId) { _%>
-        <%= persistInstance %>.set<%= primaryKey.fields[0].fieldInJavaBeanMethod %>(UUID.randomUUID());
+        <%= createInstance %>.set<%= primaryKey.fields[0].fieldInJavaBeanMethod %>(UUID.randomUUID());
     <%_ } _%>
     <%_ if (primaryKey.typeString && !isUsingMapsId && !primaryKey.autoGenerate) { _%>
-        <%= persistInstance %>.set<%= primaryKey.fields[0].fieldInJavaBeanMethod %>(UUID.randomUUID().toString());
+        <%= createInstance %>.set<%= primaryKey.fields[0].fieldInJavaBeanMethod %>(UUID.randomUUID().toString());
     <%_ } _%>
     <%_ for (field of fieldsToTest) { _%>
-        <%= persistInstance %>.set<%= field.fieldInJavaBeanMethod %>(<%= fieldStatus + field.fieldNameUnderscored.toUpperCase() %>);
+        <%= createInstance %>.set<%= field.fieldInJavaBeanMethod %>(<%= fieldStatus + field.fieldNameUnderscored.toUpperCase() %>);
       <%_ if (field.fieldTypeBinary && !field.blobContentTypeText) { _%>
-        <%= persistInstance %>.set<%= field.fieldInJavaBeanMethod %>ContentType(<%= fieldStatus + field.fieldNameUnderscored.toUpperCase() %>_CONTENT_TYPE);
+        <%= createInstance %>.set<%= field.fieldInJavaBeanMethod %>ContentType(<%= fieldStatus + field.fieldNameUnderscored.toUpperCase() %>_CONTENT_TYPE);
       <%_ } _%>
     <%_ } _%>
   <%_ } _%>
   <%_
   const alreadyGeneratedEntities = [];
   for (relationship of persistableRelationships) {
+    const otherEntity = relationship.otherEntity;
     const relationshipValidate = relationship.relationshipValidate;
     const otherEntityName = relationship.otherEntityName;
     const otherEntityNameCapitalized = relationship.otherEntityNameCapitalized;
@@ -560,7 +571,7 @@ filterTestableRelationships.filter(rel => !rel.otherEntity.builtInUser).forEach(
         // Add required entity
       <%_ if (alreadyGeneratedEntities.indexOf(otherEntityName) == -1) { _%>
         <%_ if (relationship.otherEntityUser) { /* TODO or other entity has no unique fields */ _%>
-        <%= relationship.otherEntity.persistClass %> <%= otherEntityName %> = <%= createEntityPrefix %><%= otherEntityNameCapitalized %>ResourceIT.createEntity(<% if (databaseTypeSql) { %>em<% } %>)<%= createEntityPostfix %>;
+        <%= relationship.otherEntity.persistClass %> <%= otherEntityName %> = <%= createEntityPrefix %><%= otherEntityNameCapitalized %>ResourceIT.createEntity(<% if (databaseTypeSql && otherEntity.anyRelationshipIsRequired) { %>em<% } %>)<%= createEntityPostfix %>;
           <%_ if (databaseTypeSql && !reactive) { _%>
         em.persist(<%= otherEntityName %>);
         em.flush();
@@ -574,7 +585,7 @@ filterTestableRelationships.filter(rel => !rel.otherEntity.builtInUser).forEach(
             <%_ if (!isUsingMapsId || fieldStatus !== "UPDATED_") { _%>
         if (TestUtil.findAll(em, <%= relationship.otherEntity.persistClass %>.class).isEmpty()) {
             <%_ } _%>
-            <%= otherEntityName %> = <%= createEntityPrefix %><%= otherEntityNameCapitalized %>ResourceIT.create<% if (fieldStatus === 'UPDATED_') { %>Updated<% } %>Entity(em)<%= createEntityPostfix %>;
+            <%= otherEntityName %> = <%= createEntityPrefix %><%= otherEntityNameCapitalized %>ResourceIT.create<% if (fieldStatus === 'UPDATED_') { %>Updated<% } %>Entity(<% if (relationship.otherEntity.anyRelationshipIsRequired) { %>em<% } %>)<%= createEntityPostfix %>;
             em.persist(<%= otherEntityName %>);
             em.flush();
             <%_ if (!isUsingMapsId || fieldStatus !== "UPDATED_") { _%>
@@ -583,7 +594,7 @@ filterTestableRelationships.filter(rel => !rel.otherEntity.builtInUser).forEach(
         }
             <%_ } _%>
           <%_ } else { _%>
-        <%= otherEntityName %> = <%= createEntityPrefix %><%= otherEntityNameCapitalized %>ResourceIT.create<% if (fieldStatus === 'UPDATED_') { %>Updated<% } %>Entity(<% if (databaseType === 'sql') { %>em<% } %>)<%= createEntityPostfix %>;
+        <%= otherEntityName %> = <%= createEntityPrefix %><%= otherEntityNameCapitalized %>ResourceIT.create<% if (fieldStatus === 'UPDATED_') { %>Updated<% } %>Entity(<% if (databaseType === 'sql' && otherEntity.anyRelationshipIsRequired) { %>em<% } %>)<%= createEntityPostfix %>;
           <%_ } _%>
           <%_ if (databaseTypeMongodb) { _%>
         <%= otherEntityName %>.set<%= primaryKey.nameCapitalized %>("fixed-id-for-tests");
@@ -591,14 +602,14 @@ filterTestableRelationships.filter(rel => !rel.otherEntity.builtInUser).forEach(
         <%_ } _%>
       <%_ } _%>
       <%_ if (relationship.relationshipManyToMany || relationship.relationshipOneToMany) { _%>
-        <%= persistInstance %>.get<%= relationshipNameCapitalizedPlural %>().add(<%= otherEntityName %>);
+        <%= createInstance %>.get<%= relationshipNameCapitalizedPlural %>().add(<%= otherEntityName %>);
       <%_ } else { _%>
-        <%= persistInstance %>.set<%= relationshipNameCapitalized %>(<%= otherEntityName %>);
+        <%= createInstance %>.set<%= relationshipNameCapitalized %>(<%= otherEntityName %>);
       <%_ } _%>
         <%_ alreadyGeneratedEntities.push(otherEntityName) _%>
     <%_ } _%>
   <%_ } _%>
-        return <%= persistInstance %>;
+        return <%= createInstance %>;
     }
 <%_ }); _%>
 
@@ -634,7 +645,7 @@ _%>
 <%_ } _%>
     @BeforeEach
     public void initTest() {
-        <%= persistInstance %> = createEntity(<% if (databaseTypeSql) { %>em<% } %>);
+        <%= persistInstance %> = createEntity(<% if (databaseTypeSql && anyRelationshipIsRequired) { %>em<% } %>);
     }
 
     @AfterEach
@@ -787,13 +798,14 @@ _%>
         int searchDatabaseSizeBefore = IterableUtil.sizeOf(<%= entityInstance %>SearchRepository.findAll()<%= callListBlock %>);
     <%_ } _%>
     <%_ for (relationship of relationships) {
+      const otherEntity = relationship.otherEntity;
       const otherEntityName = relationship.otherEntityName;
       const otherEntityNameCapitalized = relationship.otherEntityNameCapitalized;
       const mapsIdUse = relationship.id;
       if (mapsIdUse) { _%>
         // Add a new parent entity
         <%_ if (alreadyGeneratedEntities.indexOf(otherEntityName) == -1) { _%>
-        <%= relationship.otherEntity.persistClass %> <%= otherEntityName %> = <%= otherEntityNameCapitalized %>ResourceIT.create<% if (!relationship.otherEntityUser) { _%>Updated<%_ } %>Entity(<% if (databaseTypeSql) { %>em<% } %>);
+        <%= relationship.otherEntity.persistClass %> <%= otherEntityName %> = <%= otherEntityNameCapitalized %>ResourceIT.create<% if (!relationship.otherEntityUser) { _%>Updated<%_ } %>Entity(<% if (databaseTypeSql && otherEntity.anyRelationshipIsRequired) { %>em<% } %>);
           <%_ if (databaseTypeSql && !reactive) { _%>
         em.persist(<%= otherEntityName %>);
         em.flush();
@@ -1230,12 +1242,12 @@ _%>
         <%= relationship.otherEntity.persistClass %> <%= relationship.relationshipFieldName %>;
         if (TestUtil.findAll(em, <%= relationship.otherEntity.persistClass %>.class).isEmpty()) {
             <%= entityInstance %>Repository.saveAndFlush(<%= persistInstance %>);
-            <%= relationship.relationshipFieldName %> = <%= createEntityPrefix %><%= relationship.otherEntityNameCapitalized %>ResourceIT.createEntity(em);
+            <%= relationship.relationshipFieldName %> = <%= createEntityPrefix %><%= relationship.otherEntityNameCapitalized %>ResourceIT.createEntity(<% if (relationship.otherEntity.anyRelationshipIsRequired) { %>em<% } %>);
         } else {
             <%= relationship.relationshipFieldName %> = TestUtil.findAll(em, <%= relationship.otherEntity.persistClass %>.class).get(0);
         }
       <%_ } else { _%>
-        <%= relationship.otherEntity.persistClass %> <%= relationship.relationshipFieldName %> = <%= relationship.otherEntityNameCapitalized %>ResourceIT.createEntity(em);
+        <%= relationship.otherEntity.persistClass %> <%= relationship.relationshipFieldName %> = <%= relationship.otherEntityNameCapitalized %>ResourceIT.createEntity(<% if (relationship.otherEntity.anyRelationshipIsRequired) { %>em<% } %>);
       <%_ } _%>
       <%_ if(reactive) { _%>
         <%= relationship.otherEntity.persistInstance %>Repository.<%= saveMethod %>(<%= relationship.relationshipFieldName %>)<%= callBlock %>;
@@ -1887,7 +1899,7 @@ _%>
     }
 
     protected void assertSameRepositoryCount(long countBefore) {
-      assertThat(countBefore).isEqualTo(getRepositoryCount());
+        assertThat(countBefore).isEqualTo(getRepositoryCount());
     }
 
     protected <%- persistClass %> getPersisted<%- persistClass %>(<%- persistClass %> <%- entityInstance %>) {

package/dist/generators/{server → spring-boot}/templates/src/test/java/_package_/config/StaticResourcesWebConfigurerTest.java.ejs

@@ -53,13 +53,10 @@ class StaticResourcesWebConfigurerTest {
 
     @Test
     void shouldAppendResourceHandlerAndInitializeIt() {
-
         staticResourcesWebConfiguration.addResourceHandlers(resourceHandlerRegistry);
 
-        verify(resourceHandlerRegistry, times(1))
-            .addResourceHandler(RESOURCE_PATHS);
-        verify(staticResourcesWebConfiguration, times(1))
-            .initializeResourceHandler(any(ResourceHandlerRegistration.class));
+        verify(resourceHandlerRegistry, times(1)).addResourceHandler(RESOURCE_PATHS);
+        verify(staticResourcesWebConfiguration, times(1)).initializeResourceHandler(any(ResourceHandlerRegistration.class));
         for (String testingPath : RESOURCE_PATHS) {
             assertThat(resourceHandlerRegistry.hasMappingForPattern(testingPath)).isTrue();
         }
@@ -78,7 +75,6 @@ class StaticResourcesWebConfigurerTest {
         verify(resourceHandlerRegistration, times(1)).addResourceLocations(RESOURCE_LOCATIONS);
     }
 
-
     @Test
     void shouldCreateCacheControlBasedOnJhipsterDefaultProperties() {
         CacheControl cacheExpected = CacheControl.maxAge(JHipsterDefaults.Http.Cache.timeToLiveInDays, TimeUnit.DAYS).cachePublic();

package/dist/generators/{server → spring-boot}/templates/src/test/java/_package_/config/WebConfigurerTest.java.ejs

@@ -65,10 +65,8 @@ class WebConfigurerTest {
     @BeforeEach
     public void setup() {
         servletContext = spy(new MockServletContext());
-        doReturn(mock(FilterRegistration.Dynamic.class))
-            .when(servletContext).addFilter(anyString(), any(Filter.class));
-        doReturn(mock(ServletRegistration.Dynamic.class))
-            .when(servletContext).addServlet(anyString(), any(Servlet.class));
+        doReturn(mock(FilterRegistration.Dynamic.class)).when(servletContext).addFilter(anyString(), any(Filter.class));
+        doReturn(mock(ServletRegistration.Dynamic.class)).when(servletContext).addServlet(anyString(), any(Servlet.class));
 
         env = new MockEnvironment();
         props = new JHipsterProperties();
@@ -99,14 +97,14 @@ class WebConfigurerTest {
         props.getCors().setMaxAge(1800L);
         props.getCors().setAllowCredentials(true);
 
-        MockMvc mockMvc = MockMvcBuilders.standaloneSetup(new WebConfigurerTestController())
-            .addFilters(webConfigurer.corsFilter())
-            .build();
+        MockMvc mockMvc = MockMvcBuilders.standaloneSetup(new WebConfigurerTestController()).addFilters(webConfigurer.corsFilter()).build();
 
-        mockMvc.perform(
-            options("/api/test-cors")
-                .header(HttpHeaders.ORIGIN, "other.domain.com")
-                .header(HttpHeaders.ACCESS_CONTROL_REQUEST_METHOD, "POST"))
+        mockMvc
+            .perform(
+                options("/api/test-cors")
+                    .header(HttpHeaders.ORIGIN, "other.domain.com")
+                    .header(HttpHeaders.ACCESS_CONTROL_REQUEST_METHOD, "POST")
+            )
             .andExpect(status().isOk())
             .andExpect(header().string(HttpHeaders.ACCESS_CONTROL_ALLOW_ORIGIN, "other.domain.com"))
             .andExpect(header().string(HttpHeaders.VARY, "Origin"))
@@ -140,9 +138,7 @@ class WebConfigurerTest {
     void shouldCorsFilterDeactivatedForNullAllowedOrigins() throws Exception {
         props.getCors().setAllowedOrigins(null);
 
-        MockMvc mockMvc = MockMvcBuilders.standaloneSetup(new WebConfigurerTestController())
-            .addFilters(webConfigurer.corsFilter())
-            .build();
+        MockMvc mockMvc = MockMvcBuilders.standaloneSetup(new WebConfigurerTestController()).addFilters(webConfigurer.corsFilter()).build();
 
         mockMvc
             .perform(get("/api/test-cors").header(HttpHeaders.ORIGIN, "other.domain.com"))
@@ -154,9 +150,7 @@ class WebConfigurerTest {
     void shouldCorsFilterDeactivatedForEmptyAllowedOrigins() throws Exception {
         props.getCors().setAllowedOrigins(new ArrayList<>());
 
-        MockMvc mockMvc = MockMvcBuilders.standaloneSetup(new WebConfigurerTestController())
-            .addFilters(webConfigurer.corsFilter())
-            .build();
+        MockMvc mockMvc = MockMvcBuilders.standaloneSetup(new WebConfigurerTestController()).addFilters(webConfigurer.corsFilter()).build();
 
         mockMvc
             .perform(get("/api/test-cors").header(HttpHeaders.ORIGIN, "other.domain.com"))

package/dist/generators/{server → spring-boot}/templates/src/test/java/_package_/config/WebConfigurerTestController.java.ejs

@@ -26,9 +26,11 @@ public class WebConfigurerTestController {
 
     @GetMapping("/api/test-cors")
     public void testCorsOnApiPath() {
+        // empty method
     }
 
     @GetMapping("/test/test-cors")
     public void testCorsOnOtherPath() {
+        // empty method
     }
 }

package/dist/generators/{server → spring-boot}/templates/src/test/java/_package_/management/SecurityMetersServiceTests.java.ejs

@@ -18,16 +18,14 @@
 -%>
 package <%= packageName %>.management;
 
+import static org.assertj.core.api.Assertions.assertThat;
 import io.micrometer.core.instrument.Counter;
 import io.micrometer.core.instrument.MeterRegistry;
 import io.micrometer.core.instrument.simple.SimpleMeterRegistry;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-
 import java.util.Collection;
 
-import static org.assertj.core.api.Assertions.assertThat;
-
 class SecurityMetersServiceTests {
     private static final String INVALID_TOKENS_METER_EXPECTED_NAME = "security.authentication.invalid-tokens";
 
@@ -46,21 +44,13 @@ class SecurityMetersServiceTests {
     void testInvalidTokensCountersByCauseAreCreated() {
         meterRegistry.get(INVALID_TOKENS_METER_EXPECTED_NAME).counter();
 
-        meterRegistry.get(INVALID_TOKENS_METER_EXPECTED_NAME)
-            .tag("cause", "expired")
-            .counter();
+        meterRegistry.get(INVALID_TOKENS_METER_EXPECTED_NAME).tag("cause", "expired").counter();
 
-        meterRegistry.get(INVALID_TOKENS_METER_EXPECTED_NAME)
-            .tag("cause", "unsupported")
-            .counter();
+        meterRegistry.get(INVALID_TOKENS_METER_EXPECTED_NAME).tag("cause", "unsupported").counter();
 
-        meterRegistry.get(INVALID_TOKENS_METER_EXPECTED_NAME)
-            .tag("cause", "invalid-signature")
-            .counter();
+        meterRegistry.get(INVALID_TOKENS_METER_EXPECTED_NAME).tag("cause", "invalid-signature").counter();
 
-        meterRegistry.get(INVALID_TOKENS_METER_EXPECTED_NAME)
-            .tag("cause", "malformed")
-            .counter();
+        meterRegistry.get(INVALID_TOKENS_METER_EXPECTED_NAME).tag("cause", "malformed").counter();
 
         Collection<Counter> counters = meterRegistry.find(INVALID_TOKENS_METER_EXPECTED_NAME).counters();
 
@@ -69,45 +59,28 @@ class SecurityMetersServiceTests {
 
     @Test
     void testCountMethodsShouldBeBoundToCorrectCounters() {
-        assertThat(meterRegistry.get(INVALID_TOKENS_METER_EXPECTED_NAME)
-            .tag("cause", "expired")
-            .counter().count()).isZero();
+        assertThat(meterRegistry.get(INVALID_TOKENS_METER_EXPECTED_NAME).tag("cause", "expired").counter().count()).isZero();
 
         securityMetersService.trackTokenExpired();
 
-        assertThat(meterRegistry.get(INVALID_TOKENS_METER_EXPECTED_NAME)
-            .tag("cause", "expired")
-            .counter().count()).isEqualTo(1);
+        assertThat(meterRegistry.get(INVALID_TOKENS_METER_EXPECTED_NAME).tag("cause", "expired").counter().count()).isEqualTo(1);
 
-        assertThat(meterRegistry.get(INVALID_TOKENS_METER_EXPECTED_NAME)
-            .tag("cause", "unsupported")
-            .counter().count()).isZero();
+        assertThat(meterRegistry.get(INVALID_TOKENS_METER_EXPECTED_NAME).tag("cause", "unsupported").counter().count()).isZero();
 
         securityMetersService.trackTokenUnsupported();
 
-        assertThat(meterRegistry.get(INVALID_TOKENS_METER_EXPECTED_NAME)
-            .tag("cause", "unsupported")
-            .counter().count()).isEqualTo(1);
+        assertThat(meterRegistry.get(INVALID_TOKENS_METER_EXPECTED_NAME).tag("cause", "unsupported").counter().count()).isEqualTo(1);
 
-        assertThat(meterRegistry.get(INVALID_TOKENS_METER_EXPECTED_NAME)
-            .tag("cause", "invalid-signature")
-            .counter().count()).isZero();
+        assertThat(meterRegistry.get(INVALID_TOKENS_METER_EXPECTED_NAME).tag("cause", "invalid-signature").counter().count()).isZero();
 
         securityMetersService.trackTokenInvalidSignature();
 
-        assertThat(meterRegistry.get(INVALID_TOKENS_METER_EXPECTED_NAME)
-            .tag("cause", "invalid-signature")
-            .counter().count()).isEqualTo(1);
+        assertThat(meterRegistry.get(INVALID_TOKENS_METER_EXPECTED_NAME).tag("cause", "invalid-signature").counter().count()).isEqualTo(1);
 
-        assertThat(meterRegistry.get(INVALID_TOKENS_METER_EXPECTED_NAME)
-            .tag("cause", "malformed")
-            .counter().count()).isZero();
+        assertThat(meterRegistry.get(INVALID_TOKENS_METER_EXPECTED_NAME).tag("cause", "malformed").counter().count()).isZero();
 
         securityMetersService.trackTokenMalformed();
 
-        assertThat(meterRegistry.get(INVALID_TOKENS_METER_EXPECTED_NAME)
-            .tag("cause", "malformed")
-            .counter().count()).isEqualTo(1);
+        assertThat(meterRegistry.get(INVALID_TOKENS_METER_EXPECTED_NAME).tag("cause", "malformed").counter().count()).isEqualTo(1);
     }
-
 }

package/dist/generators/{server → spring-boot}/templates/src/test/java/_package_/security/SecurityUtilsUnitTest_imperative.java.ejs

@@ -73,8 +73,7 @@ class SecurityUtilsUnitTest {
         claims.put("groups", AuthoritiesConstants.USER);
         claims.put("sub", 123);
         claims.put("preferred_username", "admin");
-        OidcIdToken idToken = new OidcIdToken(ID_TOKEN, Instant.now(),
-            Instant.now().plusSeconds(60), claims);
+        OidcIdToken idToken = new OidcIdToken(ID_TOKEN, Instant.now(), Instant.now().plusSeconds(60), claims);
         Collection<GrantedAuthority> authorities = new ArrayList<>();
         authorities.add(new SimpleGrantedAuthority(AuthoritiesConstants.USER));
         OidcUser user = new DefaultOidcUser(authorities, idToken);
@@ -92,12 +91,14 @@ class SecurityUtilsUnitTest {
         Map<String, Object> claims = new HashMap<>();
         claims.put("groups", Arrays.asList(AuthoritiesConstants.ADMIN, AuthoritiesConstants.USER));
 
-        List<GrantedAuthority> expectedAuthorities = Arrays.asList(new SimpleGrantedAuthority(AuthoritiesConstants.ADMIN), new SimpleGrantedAuthority(AuthoritiesConstants.USER));
+        List<GrantedAuthority> expectedAuthorities = Arrays.asList(
+            new SimpleGrantedAuthority(AuthoritiesConstants.ADMIN),
+            new SimpleGrantedAuthority(AuthoritiesConstants.USER)
+        );
 
         List<GrantedAuthority> authorities = SecurityUtils.extractAuthorityFromClaims(claims);
 
-        assertThat(authorities).isNotNull().isNotEmpty().hasSize(2)
-            .containsAll(expectedAuthorities);
+        assertThat(authorities).isNotNull().isNotEmpty().hasSize(2).containsAll(expectedAuthorities);
     }
 
     @Test
@@ -105,7 +106,10 @@ class SecurityUtilsUnitTest {
         Map<String, Object> claims = new HashMap<>();
         claims.put(SecurityUtils.CLAIMS_NAMESPACE + "roles", Arrays.asList(AuthoritiesConstants.ADMIN, AuthoritiesConstants.USER));
 
-        List<GrantedAuthority> expectedAuthorities = Arrays.asList(new SimpleGrantedAuthority(AuthoritiesConstants.ADMIN), new SimpleGrantedAuthority(AuthoritiesConstants.USER));
+        List<GrantedAuthority> expectedAuthorities = Arrays.asList(
+            new SimpleGrantedAuthority(AuthoritiesConstants.ADMIN),
+            new SimpleGrantedAuthority(AuthoritiesConstants.USER)
+        );
 
         List<GrantedAuthority> authorities = SecurityUtils.extractAuthorityFromClaims(claims);
 

package/dist/generators/{server → spring-boot}/templates/src/test/java/_package_/security/SecurityUtilsUnitTest_reactive.java.ejs

@@ -48,11 +48,7 @@ class SecurityUtilsUnitTest {
     @Test
     void testgetCurrentUserLogin() {
         String login = SecurityUtils.getCurrentUserLogin()
-            .contextWrite(
-                ReactiveSecurityContextHolder.withAuthentication(
-                    new UsernamePasswordAuthenticationToken("admin", "admin")
-                )
-            )
+            .contextWrite(ReactiveSecurityContextHolder.withAuthentication(new UsernamePasswordAuthenticationToken("admin", "admin")))
             .block();
         assertThat(login).isEqualTo("admin");
     }
@@ -61,11 +57,7 @@ class SecurityUtilsUnitTest {
     @Test
     void testgetCurrentUserJWT() {
         String jwt = SecurityUtils.getCurrentUserJWT()
-            .contextWrite(
-                ReactiveSecurityContextHolder.withAuthentication(
-                    new UsernamePasswordAuthenticationToken("admin", "token")
-                )
-            )
+            .contextWrite(ReactiveSecurityContextHolder.withAuthentication(new UsernamePasswordAuthenticationToken("admin", "token")))
             .block();
         assertThat(jwt).isEqualTo("token");
     }
@@ -74,11 +66,7 @@ class SecurityUtilsUnitTest {
     @Test
     void testIsAuthenticated() {
         Boolean isAuthenticated = SecurityUtils.isAuthenticated()
-            .contextWrite(
-                ReactiveSecurityContextHolder.withAuthentication(
-                    new UsernamePasswordAuthenticationToken("admin", "admin")
-                )
-            )
+            .contextWrite(ReactiveSecurityContextHolder.withAuthentication(new UsernamePasswordAuthenticationToken("admin", "admin")))
             .block();
         assertThat(isAuthenticated).isTrue();
     }
@@ -89,9 +77,7 @@ class SecurityUtilsUnitTest {
         authorities.add(new SimpleGrantedAuthority(AuthoritiesConstants.ANONYMOUS));
         Boolean isAuthenticated = SecurityUtils.isAuthenticated()
             .contextWrite(
-                ReactiveSecurityContextHolder.withAuthentication(
-                    new UsernamePasswordAuthenticationToken("admin", "admin", authorities)
-                )
+                ReactiveSecurityContextHolder.withAuthentication(new UsernamePasswordAuthenticationToken("admin", "admin", authorities))
             )
             .block();
         assertThat(isAuthenticated).isFalse();
@@ -104,12 +90,18 @@ class SecurityUtilsUnitTest {
         Context context = ReactiveSecurityContextHolder.withAuthentication(
             new UsernamePasswordAuthenticationToken("admin", "admin", authorities)
         );
-        Boolean hasCurrentUserThisAuthority = SecurityUtils.hasCurrentUserAnyOfAuthorities(AuthoritiesConstants.USER, AuthoritiesConstants.ADMIN)
+        Boolean hasCurrentUserThisAuthority = SecurityUtils.hasCurrentUserAnyOfAuthorities(
+            AuthoritiesConstants.USER,
+            AuthoritiesConstants.ADMIN
+        )
             .contextWrite(context)
             .block();
         assertThat(hasCurrentUserThisAuthority).isTrue();
 
-        hasCurrentUserThisAuthority = SecurityUtils.hasCurrentUserAnyOfAuthorities(AuthoritiesConstants.ANONYMOUS, AuthoritiesConstants.ADMIN)
+        hasCurrentUserThisAuthority = SecurityUtils.hasCurrentUserAnyOfAuthorities(
+            AuthoritiesConstants.ANONYMOUS,
+            AuthoritiesConstants.ADMIN
+        )
             .contextWrite(context)
             .block();
         assertThat(hasCurrentUserThisAuthority).isFalse();
@@ -122,12 +114,18 @@ class SecurityUtilsUnitTest {
         Context context = ReactiveSecurityContextHolder.withAuthentication(
             new UsernamePasswordAuthenticationToken("admin", "admin", authorities)
         );
-        Boolean hasCurrentUserThisAuthority = SecurityUtils.hasCurrentUserNoneOfAuthorities(AuthoritiesConstants.USER, AuthoritiesConstants.ADMIN)
+        Boolean hasCurrentUserThisAuthority = SecurityUtils.hasCurrentUserNoneOfAuthorities(
+            AuthoritiesConstants.USER,
+            AuthoritiesConstants.ADMIN
+        )
             .contextWrite(context)
             .block();
         assertThat(hasCurrentUserThisAuthority).isFalse();
 
-        hasCurrentUserThisAuthority = SecurityUtils.hasCurrentUserNoneOfAuthorities(AuthoritiesConstants.ANONYMOUS, AuthoritiesConstants.ADMIN)
+        hasCurrentUserThisAuthority = SecurityUtils.hasCurrentUserNoneOfAuthorities(
+            AuthoritiesConstants.ANONYMOUS,
+            AuthoritiesConstants.ADMIN
+        )
             .contextWrite(context)
             .block();
         assertThat(hasCurrentUserThisAuthority).isTrue();
@@ -145,9 +143,7 @@ class SecurityUtilsUnitTest {
             .block();
         assertThat(hasCurrentUserThisAuthority).isTrue();
 
-        hasCurrentUserThisAuthority = SecurityUtils.hasCurrentUserThisAuthority(AuthoritiesConstants.ADMIN)
-            .contextWrite(context)
-            .block();
+        hasCurrentUserThisAuthority = SecurityUtils.hasCurrentUserThisAuthority(AuthoritiesConstants.ADMIN).contextWrite(context).block();
         assertThat(hasCurrentUserThisAuthority).isFalse();
     }
 }

package/dist/generators/{server → spring-boot}/templates/src/test/java/_package_/security/jwt/JwtAuthenticationTestUtils.java.ejs

@@ -72,8 +72,7 @@ public class JwtAuthenticationTestUtils {
 
         var now = Instant.now();
 
-        JwtClaimsSet claims = JwtClaimsSet
-            .builder()
+        JwtClaimsSet claims = JwtClaimsSet.builder()
             .issuedAt(now)
             .expiresAt(now.plusSeconds(60))
             .subject(user)

package/dist/generators/{server → spring-boot}/templates/src/test/java/_package_/security/jwt/TestAuthenticationResource.java.ejs

@@ -1,5 +1,6 @@
 package <%= packageName %>.security.jwt;
 
+import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.*;
 
 /**
@@ -8,12 +9,13 @@ import org.springframework.web.bind.annotation.*;
 @RestController
 @RequestMapping("/api")
 public class TestAuthenticationResource {
+
     /**
      * {@code GET  /authenticate} : check if the authentication token correctly validates
      *
      * @return ok.
      */
-    @GetMapping("/authenticate")
+    @GetMapping(value = "/authenticate", produces = MediaType.TEXT_PLAIN_VALUE)
     public String isAuthenticated() {
         return "ok";
     }