generator-jhipster 8.0.0 → 8.2.0

package/dist/generators/server/templates/src/test/java/_package_/web/rest/AccountResourceIT.java.ejs

@@ -1,5 +1,5 @@
 <%#
- Copyright 2013-2023 the original author or authors from the JHipster project.
+ Copyright 2013-2024 the original author or authors from the JHipster project.
 
  This file is part of the JHipster project, see https://www.jhipster.tech/
  for more information.
@@ -41,11 +41,15 @@ import <%= packageName %>.service.dto.<%= user.adminUserDto %>;
 import <%= packageName %>.service.dto.<%= user.dtoClass %>;
 import <%= packageName %>.web.rest.vm.KeyAndPasswordVM;
 import <%= packageName %>.web.rest.vm.ManagedUserVM;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
 import org.apache.commons.lang3.RandomStringUtils;
 <%_ if (reactive && authenticationUsesCsrf || databaseTypeMongodb || databaseTypeNeo4j) { _%>
 import org.junit.jupiter.api.BeforeEach;
 <%_ } _%>
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.springframework.beans.factory.annotation.Autowired;
 <%_ if (reactive) { _%>
 import org.springframework.boot.test.autoconfigure.web.reactive.AutoConfigureWebTestClient;
@@ -74,6 +78,7 @@ import java.time.Instant;
 import java.time.LocalDate;
 <%_ } _%>
 import java.util.*;
+import java.util.stream.Stream;
 
 import static org.assertj.core.api.Assertions.assertThat;
 <%_ if (reactive && searchEngineElasticsearch) { _%>
@@ -110,6 +115,9 @@ import static org.springframework.security.test.web.servlet.response.SecurityMoc
 class AccountResourceIT {
     static final String TEST_USER_LOGIN = "test";
 
+    @Autowired
+    private ObjectMapper om;
+
     @Autowired
     private UserRepository userRepository;
 <%_ if (databaseTypeSql || databaseTypeMongodb || databaseTypeNeo4j) { _%>
@@ -199,7 +207,7 @@ class AccountResourceIT {
         user.setFirstName("john");
         user.setLastName("doe");
         user.setEmail("john.doe@jhipster.com");
-<%_ if (databaseTypeSql || databaseTypeMongodb || databaseTypeCouchbase || databaseTypeNeo4j) { _%>
+<%_ if (user.hasImageField) { _%>
         user.setImageUrl("http://placehold.it/50x50");
 <%_ } _%>
         user.setLangKey("en");
@@ -217,7 +225,7 @@ class AccountResourceIT {
             .jsonPath("$.firstName").isEqualTo("john")
             .jsonPath("$.lastName").isEqualTo("doe")
             .jsonPath("$.email").isEqualTo("john.doe@jhipster.com")
-  <%_ if (databaseTypeSql || databaseTypeMongodb || databaseTypeCouchbase || databaseTypeNeo4j) { _%>
+  <%_ if (user.hasImageField) { _%>
             .jsonPath("$.imageUrl").isEqualTo("http://placehold.it/50x50")
   <%_ } _%>
             .jsonPath("$.langKey").isEqualTo("en")
@@ -231,7 +239,7 @@ class AccountResourceIT {
             .andExpect(jsonPath("$.firstName").value("john"))
             .andExpect(jsonPath("$.lastName").value("doe"))
             .andExpect(jsonPath("$.email").value("john.doe@jhipster.com"))
-  <%_ if (databaseTypeSql || databaseTypeMongodb || databaseTypeCouchbase || databaseTypeNeo4j) { _%>
+  <%_ if (user.hasImageField) { _%>
             .andExpect(jsonPath("$.imageUrl").value("http://placehold.it/50x50"))
   <%_ } _%>
             .andExpect(jsonPath("$.langKey").value("en"))
@@ -270,7 +278,7 @@ class AccountResourceIT {
         validUser.setFirstName("Alice");
         validUser.setLastName("Test");
         validUser.setEmail("test-register-valid@example.com");
-<%_ if (databaseTypeSql || databaseTypeMongodb || databaseTypeCouchbase || databaseTypeNeo4j) { _%>
+<%_ if (user.hasImageField) { _%>
         validUser.setImageUrl("http://placehold.it/50x50");
 <%_ } _%>
         validUser.setLangKey(Constants.DEFAULT_LANGUAGE);
@@ -280,14 +288,14 @@ class AccountResourceIT {
 <%_ if (reactive) { _%>
         accountWebTestClient.post().uri("/api/register")
             .contentType(MediaType.APPLICATION_JSON)
-            .bodyValue(TestUtil.convertObjectToJsonBytes(validUser))
+            .bodyValue(om.writeValueAsBytes(validUser))
             .exchange()
             .expectStatus().isCreated();
 <%_ } else { _%>
         restAccountMockMvc.perform(
             post("/api/register")
                 .contentType(MediaType.APPLICATION_JSON)
-                .content(TestUtil.convertObjectToJsonBytes(validUser))<% if (authenticationUsesCsrf) { %>
+                .content(om.writeValueAsBytes(validUser))<% if (authenticationUsesCsrf) { %>
                 .with(csrf())<% } %>)
             .andExpect(status().isCreated());
 <%_ } _%>
@@ -307,7 +315,7 @@ class AccountResourceIT {
         invalidUser.setLastName("One");
         invalidUser.setEmail("funky@example.com");
         invalidUser.setActivated(true);
-<%_ if (databaseTypeSql || databaseTypeMongodb || databaseTypeCouchbase || databaseTypeNeo4j) { _%>
+<%_ if (user.hasImageField) { _%>
         invalidUser.setImageUrl("http://placehold.it/50x50");
 <%_ } _%>
         invalidUser.setLangKey(Constants.DEFAULT_LANGUAGE);
@@ -317,7 +325,7 @@ class AccountResourceIT {
         restAccountMockMvc.perform(
             post("/api/register")
                 .contentType(MediaType.APPLICATION_JSON)
-                .content(TestUtil.convertObjectToJsonBytes(invalidUser))<% if (authenticationUsesCsrf) { %>
+                .content(om.writeValueAsBytes(invalidUser))<% if (authenticationUsesCsrf) { %>
                 .with(csrf())<% } %>)
         <%_ if (databaseTypeCouchbase) { _%>
             .andDo(exportTestSecurityContext())
@@ -326,7 +334,7 @@ class AccountResourceIT {
 <%_ } else { _%>
         accountWebTestClient.post().uri("/api/register")
             .contentType(MediaType.APPLICATION_JSON)
-            .bodyValue(TestUtil.convertObjectToJsonBytes(invalidUser))
+            .bodyValue(om.writeValueAsBytes(invalidUser))
             .exchange()
             .expectStatus().isBadRequest();
 <%_ } _%>
@@ -335,72 +343,31 @@ class AccountResourceIT {
         assertThat(user).isEmpty();
     }
 
-    @Test
-<%_ if (databaseTypeSql && !reactive) { _%>
-    @Transactional
-<%_ } _%>
-    void testRegisterInvalidEmail() throws Exception {
-        ManagedUserVM invalidUser = new ManagedUserVM();
-        invalidUser.setLogin("bob");
-        invalidUser.setPassword("password");
-        invalidUser.setFirstName("Bob");
-        invalidUser.setLastName("Green");
-        invalidUser.setEmail("invalid");// <-- invalid
-        invalidUser.setActivated(true);
-<%_ if (databaseTypeSql || databaseTypeMongodb || databaseTypeCouchbase || databaseTypeNeo4j) { _%>
-        invalidUser.setImageUrl("http://placehold.it/50x50");
-<%_ } _%>
-        invalidUser.setLangKey(Constants.DEFAULT_LANGUAGE);
-        invalidUser.setAuthorities(Collections.singleton(AuthoritiesConstants.USER));
-
-<%_ if (reactive) { _%>
-        accountWebTestClient.post().uri("/api/register")
-            .contentType(MediaType.APPLICATION_JSON)
-            .bodyValue(TestUtil.convertObjectToJsonBytes(invalidUser))
-            .exchange()
-            .expectStatus().isBadRequest();
-<%_ } else { _%>
-        restAccountMockMvc.perform(
-            post("/api/register")
-                .contentType(MediaType.APPLICATION_JSON)
-                .content(TestUtil.convertObjectToJsonBytes(invalidUser))<% if (authenticationUsesCsrf) { %>
-                .with(csrf())<% } %>)
-            .andExpect(status().isBadRequest());
-<%_ } _%>
-
-        Optional<<%= user.persistClass %>> user = userRepository.findOneByLogin("bob")<% if (reactive) { %>.blockOptional()<% } %>;
-        assertThat(user).isEmpty();
+    static Stream<ManagedUserVM> invalidUsers() {
+        return Stream.of(
+            createInvalidUser("bob", "password", "Bob", "Green", "invalid", true),// <-- invalid
+            createInvalidUser("bob", "123", "Bob", "Green", "bob@example.com", true),// password with only 3 digits
+            createInvalidUser("bob", null, "Bob", "Green", "bob@example.com", true)// invalid null password
+        );
     }
 
-    @Test
+    @ParameterizedTest
+    @MethodSource("invalidUsers")
 <%_ if (databaseTypeSql && !reactive) { _%>
     @Transactional
 <%_ } _%>
-    void testRegisterInvalidPassword() throws Exception {
-        ManagedUserVM invalidUser = new ManagedUserVM();
-        invalidUser.setLogin("bob");
-        invalidUser.setPassword("123");// password with only 3 digits
-        invalidUser.setFirstName("Bob");
-        invalidUser.setLastName("Green");
-        invalidUser.setEmail("bob@example.com");
-        invalidUser.setActivated(true);
-<%_ if (databaseTypeSql || databaseTypeMongodb || databaseTypeCouchbase || databaseTypeNeo4j) { _%>
-        invalidUser.setImageUrl("http://placehold.it/50x50");
-<%_ } _%>
-        invalidUser.setLangKey(Constants.DEFAULT_LANGUAGE);
-        invalidUser.setAuthorities(Collections.singleton(AuthoritiesConstants.USER));
-
+    void testRegisterInvalidUsers(ManagedUserVM invalidUser) throws Exception {
 <%_ if (reactive) { _%>
         accountWebTestClient.post().uri("/api/register")
             .contentType(MediaType.APPLICATION_JSON)
-            .bodyValue(TestUtil.convertObjectToJsonBytes(invalidUser))
+            .bodyValue(om.writeValueAsBytes(invalidUser))
             .exchange()
             .expectStatus().isBadRequest();
 <%_ } else { _%>
         restAccountMockMvc.perform(
             post("/api/register")
                 .contentType(MediaType.APPLICATION_JSON)
-                .content(TestUtil.convertObjectToJsonBytes(invalidUser))<% if (authenticationUsesCsrf) { %>
+                .content(om.writeValueAsBytes(invalidUser))<% if (authenticationUsesCsrf) { %>
                 .with(csrf())<% } %>)
             .andExpect(status().isBadRequest());
 <%_ } _%>
@@ -409,41 +376,20 @@ class AccountResourceIT {
         assertThat(user).isEmpty();
     }
 
-    @Test
-<%_ if (databaseTypeSql && !reactive) { _%>
-    @Transactional
-<%_ } _%>
-    void testRegisterNullPassword() throws Exception {
+    private static ManagedUserVM createInvalidUser(String login, String password, String firstName, String lastName, String email, boolean activated) {
         ManagedUserVM invalidUser = new ManagedUserVM();
-        invalidUser.setLogin("bob");
-        invalidUser.setPassword(null);// invalid null password
-        invalidUser.setFirstName("Bob");
-        invalidUser.setLastName("Green");
-        invalidUser.setEmail("bob@example.com");
-        invalidUser.setActivated(true);
-<%_ if (databaseTypeSql || databaseTypeMongodb || databaseTypeCouchbase || databaseTypeNeo4j) { _%>
+        invalidUser.setLogin(login);
+        invalidUser.setPassword(password);
+        invalidUser.setFirstName(firstName);
+        invalidUser.setLastName(lastName);
+        invalidUser.setEmail(email);
+        invalidUser.setActivated(activated);
+<%_ if (user.hasImageField) { _%>
         invalidUser.setImageUrl("http://placehold.it/50x50");
 <%_ } _%>
         invalidUser.setLangKey(Constants.DEFAULT_LANGUAGE);
         invalidUser.setAuthorities(Collections.singleton(AuthoritiesConstants.USER));
-
-<%_ if (reactive) { _%>
-        accountWebTestClient.post().uri("/api/register")
-            .contentType(MediaType.APPLICATION_JSON)
-            .bodyValue(TestUtil.convertObjectToJsonBytes(invalidUser))
-            .exchange()
-            .expectStatus().isBadRequest();
-<%_ } else { _%>
-        restAccountMockMvc.perform(
-            post("/api/register")
-                .contentType(MediaType.APPLICATION_JSON)
-                .content(TestUtil.convertObjectToJsonBytes(invalidUser))<% if (authenticationUsesCsrf) { %>
-                .with(csrf())<% } %>)
-            .andExpect(status().isBadRequest());
-<%_ } _%>
-
-        Optional<<%= user.persistClass %>> user = userRepository.findOneByLogin("bob")<% if (reactive) { %>.blockOptional()<% } %>;
-        assertThat(user).isEmpty();
+        return invalidUser;
     }
 
     @Test
@@ -458,7 +404,7 @@ class AccountResourceIT {
         firstUser.setFirstName("Alice");
         firstUser.setLastName("Something");
         firstUser.setEmail("alice@example.com");
-<%_ if (databaseTypeSql || databaseTypeMongodb || databaseTypeCouchbase || databaseTypeNeo4j) { _%>
+<%_ if (user.hasImageField) { _%>
         firstUser.setImageUrl("http://placehold.it/50x50");
 <%_ } _%>
         firstUser.setLangKey(Constants.DEFAULT_LANGUAGE);
@@ -471,11 +417,11 @@ class AccountResourceIT {
         secondUser.setFirstName(firstUser.getFirstName());
         secondUser.setLastName(firstUser.getLastName());
         secondUser.setEmail("alice2@example.com");
-<%_ if (databaseTypeSql || databaseTypeMongodb || databaseTypeCouchbase || databaseTypeNeo4j) { _%>
+<%_ if (user.hasImageField) { _%>
         secondUser.setImageUrl(firstUser.getImageUrl());
 <%_ } _%>
         secondUser.setLangKey(firstUser.getLangKey());
-<%_ if (databaseTypeSql || databaseTypeMongodb || databaseTypeCouchbase || databaseTypeNeo4j) { _%>
+<%_ if (generateSpringAuditor) { _%>
         secondUser.setCreatedBy(firstUser.getCreatedBy());
         secondUser.setCreatedDate(firstUser.getCreatedDate());
         secondUser.setLastModifiedBy(firstUser.getLastModifiedBy());
@@ -487,14 +433,14 @@ class AccountResourceIT {
 <%_ if (reactive) { _%>
         accountWebTestClient.post().uri("/api/register")
             .contentType(MediaType.APPLICATION_JSON)
-            .bodyValue(TestUtil.convertObjectToJsonBytes(firstUser))
+            .bodyValue(om.writeValueAsBytes(firstUser))
             .exchange()
             .expectStatus().isCreated();
 <%_ } else { _%>
         restAccountMockMvc.perform(
             post("/api/register")
                 .contentType(MediaType.APPLICATION_JSON)
-                .content(TestUtil.convertObjectToJsonBytes(firstUser))<% if (authenticationUsesCsrf) { %>
+                .content(om.writeValueAsBytes(firstUser))<% if (authenticationUsesCsrf) { %>
                 .with(csrf())<% } %>)
             .andExpect(status().isCreated());
 <%_ } _%>
@@ -503,14 +449,14 @@ class AccountResourceIT {
 <%_ if (reactive) { _%>
         accountWebTestClient.post().uri("/api/register")
             .contentType(MediaType.APPLICATION_JSON)
-            .bodyValue(TestUtil.convertObjectToJsonBytes(secondUser))
+            .bodyValue(om.writeValueAsBytes(secondUser))
             .exchange()
             .expectStatus().isCreated();
 <%_ } else { _%>
         restAccountMockMvc.perform(
             post("/api/register")
                 .contentType(MediaType.APPLICATION_JSON)
-                .content(TestUtil.convertObjectToJsonBytes(secondUser))<% if (authenticationUsesCsrf) { %>
+                .content(om.writeValueAsBytes(secondUser))<% if (authenticationUsesCsrf) { %>
                 .with(csrf())<% } %>)
         <%_ if (databaseTypeCouchbase) { _%>
             .andDo(exportTestSecurityContext())
@@ -527,14 +473,14 @@ class AccountResourceIT {
 <%_ if (reactive) { _%>
         accountWebTestClient.post().uri("/api/register")
             .contentType(MediaType.APPLICATION_JSON)
-            .bodyValue(TestUtil.convertObjectToJsonBytes(secondUser))
+            .bodyValue(om.writeValueAsBytes(secondUser))
             .exchange()
             .expectStatus().isBadRequest();
 <%_ } else { _%>
         restAccountMockMvc.perform(
             post("/api/register")
                 .contentType(MediaType.APPLICATION_JSON)
-                .content(TestUtil.convertObjectToJsonBytes(secondUser))<% if (authenticationUsesCsrf) { %>
+                .content(om.writeValueAsBytes(secondUser))<% if (authenticationUsesCsrf) { %>
                 .with(csrf())<% } %>)
             .andExpect(status().is4xxClientError());
 <%_ } _%>
@@ -552,7 +498,7 @@ class AccountResourceIT {
         firstUser.setFirstName("Alice");
         firstUser.setLastName("Test");
         firstUser.setEmail("test-register-duplicate-email@example.com");
-<%_ if (databaseTypeSql || databaseTypeMongodb || databaseTypeCouchbase || databaseTypeNeo4j) { _%>
+<%_ if (user.hasImageField) { _%>
         firstUser.setImageUrl("http://placehold.it/50x50");
 <%_ } _%>
         firstUser.setLangKey(Constants.DEFAULT_LANGUAGE);
@@ -562,14 +508,14 @@ class AccountResourceIT {
 <%_ if (reactive) { _%>
         accountWebTestClient.post().uri("/api/register")
             .contentType(MediaType.APPLICATION_JSON)
-            .bodyValue(TestUtil.convertObjectToJsonBytes(firstUser))
+            .bodyValue(om.writeValueAsBytes(firstUser))
             .exchange()
             .expectStatus().isCreated();
 <%_ } else { _%>
         restAccountMockMvc.perform(
             post("/api/register")
                 .contentType(MediaType.APPLICATION_JSON)
-                .content(TestUtil.convertObjectToJsonBytes(firstUser))<% if (authenticationUsesCsrf) { %>
+                .content(om.writeValueAsBytes(firstUser))<% if (authenticationUsesCsrf) { %>
                 .with(csrf())<% } %>)
             .andExpect(status().isCreated());
 <%_ } _%>
@@ -584,7 +530,7 @@ class AccountResourceIT {
         secondUser.setFirstName(firstUser.getFirstName());
         secondUser.setLastName(firstUser.getLastName());
         secondUser.setEmail(firstUser.getEmail());
-<%_ if (databaseTypeSql || databaseTypeMongodb || databaseTypeCouchbase || databaseTypeNeo4j) { _%>
+<%_ if (user.hasImageField) { _%>
         secondUser.setImageUrl(firstUser.getImageUrl());
 <%_ } _%>
         secondUser.setLangKey(firstUser.getLangKey());
@@ -594,14 +540,14 @@ class AccountResourceIT {
 <%_ if (reactive) { _%>
         accountWebTestClient.post().uri("/api/register")
             .contentType(MediaType.APPLICATION_JSON)
-            .bodyValue(TestUtil.convertObjectToJsonBytes(secondUser))
+            .bodyValue(om.writeValueAsBytes(secondUser))
             .exchange()
             .expectStatus().isCreated();
 <%_ } else { _%>
         restAccountMockMvc.perform(
             post("/api/register")
                 .contentType(MediaType.APPLICATION_JSON)
-                .content(TestUtil.convertObjectToJsonBytes(secondUser))<% if (authenticationUsesCsrf) { %>
+                .content(om.writeValueAsBytes(secondUser))<% if (authenticationUsesCsrf) { %>
                 .with(csrf())<% } %>)
             .andExpect(status().isCreated());
 <%_ } _%>
@@ -620,7 +566,7 @@ class AccountResourceIT {
         userWithUpperCaseEmail.setFirstName(firstUser.getFirstName());
         userWithUpperCaseEmail.setLastName(firstUser.getLastName());
         userWithUpperCaseEmail.setEmail("TEST-register-duplicate-email@example.com");
-<%_ if (databaseTypeSql || databaseTypeMongodb || databaseTypeCouchbase || databaseTypeNeo4j) { _%>
+<%_ if (user.hasImageField) { _%>
         userWithUpperCaseEmail.setImageUrl(firstUser.getImageUrl());
 <%_ } _%>
         userWithUpperCaseEmail.setLangKey(firstUser.getLangKey());
@@ -630,14 +576,14 @@ class AccountResourceIT {
 <%_ if (reactive) { _%>
         accountWebTestClient.post().uri("/api/register")
             .contentType(MediaType.APPLICATION_JSON)
-            .bodyValue(TestUtil.convertObjectToJsonBytes(userWithUpperCaseEmail))
+            .bodyValue(om.writeValueAsBytes(userWithUpperCaseEmail))
             .exchange()
             .expectStatus().isCreated();
 <%_ } else { _%>
         restAccountMockMvc.perform(
             post("/api/register")
                 .contentType(MediaType.APPLICATION_JSON)
-                .content(TestUtil.convertObjectToJsonBytes(userWithUpperCaseEmail))<% if (authenticationUsesCsrf) { %>
+                .content(om.writeValueAsBytes(userWithUpperCaseEmail))<% if (authenticationUsesCsrf) { %>
                 .with(csrf())<% } %>)
             .andExpect(status().isCreated());
 <%_ } _%>
@@ -653,14 +599,14 @@ class AccountResourceIT {
 <%_ if (reactive) { _%>
         accountWebTestClient.post().uri("/api/register")
             .contentType(MediaType.APPLICATION_JSON)
-            .bodyValue(TestUtil.convertObjectToJsonBytes(secondUser))
+            .bodyValue(om.writeValueAsBytes(secondUser))
             .exchange()
             .expectStatus().is4xxClientError();
 <%_ } else { _%>
         restAccountMockMvc.perform(
             post("/api/register")
                 .contentType(MediaType.APPLICATION_JSON)
-                .content(TestUtil.convertObjectToJsonBytes(secondUser))<% if (authenticationUsesCsrf) { %>
+                .content(om.writeValueAsBytes(secondUser))<% if (authenticationUsesCsrf) { %>
                 .with(csrf())<% } %>)
             .andExpect(status().is4xxClientError());
 <%_ } _%>
@@ -678,7 +624,7 @@ class AccountResourceIT {
         validUser.setLastName("Guy");
         validUser.setEmail("badguy@example.com");
         validUser.setActivated(true);
-<%_ if (databaseTypeSql || databaseTypeMongodb || databaseTypeCouchbase || databaseTypeNeo4j) { _%>
+<%_ if (user.hasImageField) { _%>
         validUser.setImageUrl("http://placehold.it/50x50");
 <%_ } _%>
         validUser.setLangKey(Constants.DEFAULT_LANGUAGE);
@@ -687,14 +633,14 @@ class AccountResourceIT {
 <%_ if (reactive) { _%>
         accountWebTestClient.post().uri("/api/register")
             .contentType(MediaType.APPLICATION_JSON)
-            .bodyValue(TestUtil.convertObjectToJsonBytes(validUser))
+            .bodyValue(om.writeValueAsBytes(validUser))
             .exchange()
             .expectStatus().isCreated();
 <%_ } else { _%>
         restAccountMockMvc.perform(
             post("/api/register")
                 .contentType(MediaType.APPLICATION_JSON)
-                .content(TestUtil.convertObjectToJsonBytes(validUser))<% if (authenticationUsesCsrf) { %>
+                .content(om.writeValueAsBytes(validUser))<% if (authenticationUsesCsrf) { %>
                 .with(csrf())<% } %>)
             .andExpect(status().isCreated());
 <%_ } _%>
@@ -779,7 +725,7 @@ class AccountResourceIT {
         userDTO.setLastName("lastname");
         userDTO.setEmail("save-account@example.com");
         userDTO.setActivated(false);
-<%_ if (databaseTypeSql || databaseTypeMongodb || databaseTypeCouchbase || databaseTypeNeo4j) { _%>
+<%_ if (user.hasImageField) { _%>
         userDTO.setImageUrl("http://placehold.it/50x50");
 <%_ } _%>
         userDTO.setLangKey(Constants.DEFAULT_LANGUAGE);
@@ -788,14 +734,14 @@ class AccountResourceIT {
 <%_ if (reactive) { _%>
         accountWebTestClient.post().uri("/api/account")
             .contentType(MediaType.APPLICATION_JSON)
-            .bodyValue(TestUtil.convertObjectToJsonBytes(userDTO))
+            .bodyValue(om.writeValueAsBytes(userDTO))
             .exchange()
             .expectStatus().isOk();
 <%_ } else { _%>
         restAccountMockMvc.perform(
             post("/api/account")
                 .contentType(MediaType.APPLICATION_JSON)
-                .content(TestUtil.convertObjectToJsonBytes(userDTO))<% if (authenticationUsesCsrf) { %>
+                .content(om.writeValueAsBytes(userDTO))<% if (authenticationUsesCsrf) { %>
                 .with(csrf())<% } %>)
             .andExpect(status().isOk());
 <%_ } _%>
@@ -806,7 +752,7 @@ class AccountResourceIT {
         assertThat(updatedUser.getEmail()).isEqualTo(userDTO.getEmail());
         assertThat(updatedUser.getLangKey()).isEqualTo(userDTO.getLangKey());
         assertThat(updatedUser.getPassword()).isEqualTo(user.getPassword());
-<%_ if (databaseTypeSql || databaseTypeMongodb || databaseTypeCouchbase || databaseTypeNeo4j) { _%>
+<%_ if (user.hasImageField) { _%>
         assertThat(updatedUser.getImageUrl()).isEqualTo(userDTO.getImageUrl());
 <%_ } _%>
         assertThat(updatedUser.isActivated()).isTrue();
@@ -839,7 +785,7 @@ class AccountResourceIT {
         userDTO.setLastName("lastname");
         userDTO.setEmail("invalid email");
         userDTO.setActivated(false);
-<%_ if (databaseTypeSql || databaseTypeMongodb || databaseTypeCouchbase || databaseTypeNeo4j) { _%>
+<%_ if (user.hasImageField) { _%>
         userDTO.setImageUrl("http://placehold.it/50x50");
 <%_ } _%>
         userDTO.setLangKey(Constants.DEFAULT_LANGUAGE);
@@ -848,14 +794,14 @@ class AccountResourceIT {
 <%_ if (reactive) { _%>
         accountWebTestClient.post().uri("/api/account")
             .contentType(MediaType.APPLICATION_JSON)
-            .bodyValue(TestUtil.convertObjectToJsonBytes(userDTO))
+            .bodyValue(om.writeValueAsBytes(userDTO))
             .exchange()
             .expectStatus().isBadRequest();
 <%_ } else { _%>
         restAccountMockMvc.perform(
             post("/api/account")
                 .contentType(MediaType.APPLICATION_JSON)
-                .content(TestUtil.convertObjectToJsonBytes(userDTO))<% if (authenticationUsesCsrf) { %>
+                .content(om.writeValueAsBytes(userDTO))<% if (authenticationUsesCsrf) { %>
                 .with(csrf())<% } %>)
         <%_ if (databaseTypeCouchbase) { _%>
             .andDo(exportTestSecurityContext())
@@ -905,7 +851,7 @@ class AccountResourceIT {
         userDTO.setLastName("lastname");
         userDTO.setEmail("save-existing-email2@example.com");
         userDTO.setActivated(false);
-<%_ if (databaseTypeSql || databaseTypeMongodb || databaseTypeCouchbase || databaseTypeNeo4j) { _%>
+<%_ if (user.hasImageField) { _%>
         userDTO.setImageUrl("http://placehold.it/50x50");
 <%_ } _%>
         userDTO.setLangKey(Constants.DEFAULT_LANGUAGE);
@@ -914,14 +860,14 @@ class AccountResourceIT {
 <%_ if (reactive) { _%>
         accountWebTestClient.post().uri("/api/account")
             .contentType(MediaType.APPLICATION_JSON)
-            .bodyValue(TestUtil.convertObjectToJsonBytes(userDTO))
+            .bodyValue(om.writeValueAsBytes(userDTO))
             .exchange()
             .expectStatus().isBadRequest();
 <%_ } else { _%>
         restAccountMockMvc.perform(
             post("/api/account")
                 .contentType(MediaType.APPLICATION_JSON)
-                .content(TestUtil.convertObjectToJsonBytes(userDTO))<% if (authenticationUsesCsrf) { %>
+                .content(om.writeValueAsBytes(userDTO))<% if (authenticationUsesCsrf) { %>
                 .with(csrf())<% } %>)
             .andExpect(status().isBadRequest());
 <%_ } _%>
@@ -955,7 +901,7 @@ class AccountResourceIT {
         userDTO.setLastName("lastname");
         userDTO.setEmail("save-existing-email-and-login@example.com");
         userDTO.setActivated(false);
-<%_ if (databaseTypeSql || databaseTypeMongodb || databaseTypeCouchbase || databaseTypeNeo4j) { _%>
+<%_ if (user.hasImageField) { _%>
         userDTO.setImageUrl("http://placehold.it/50x50");
 <%_ } _%>
         userDTO.setLangKey(Constants.DEFAULT_LANGUAGE);
@@ -964,14 +910,14 @@ class AccountResourceIT {
 <%_ if (reactive) { _%>
         accountWebTestClient.post().uri("/api/account")
             .contentType(MediaType.APPLICATION_JSON)
-            .bodyValue(TestUtil.convertObjectToJsonBytes(userDTO))
+            .bodyValue(om.writeValueAsBytes(userDTO))
             .exchange()
             .expectStatus().isOk();
 <%_ } else { _%>
         restAccountMockMvc.perform(
             post("/api/account")
                 .contentType(MediaType.APPLICATION_JSON)
-                .content(TestUtil.convertObjectToJsonBytes(userDTO))<% if (authenticationUsesCsrf) { %>
+                .content(om.writeValueAsBytes(userDTO))<% if (authenticationUsesCsrf) { %>
                 .with(csrf())<% } %>)
             .andExpect(status().isOk());
 <%_ } _%>
@@ -1002,13 +948,13 @@ class AccountResourceIT {
 <%_ if (reactive) { _%>
         accountWebTestClient.post().uri("/api/account/change-password")
             .contentType(MediaType.APPLICATION_JSON)
-            .bodyValue(TestUtil.convertObjectToJsonBytes(new PasswordChangeDTO("1"+currentPassword, "new password")))
+            .bodyValue(om.writeValueAsBytes(new PasswordChangeDTO("1"+currentPassword, "new password")))
             .exchange()
             .expectStatus().isBadRequest();
 <%_ } else { _%>
         restAccountMockMvc.perform(post("/api/account/change-password")
             .contentType(MediaType.APPLICATION_JSON)
-            .content(TestUtil.convertObjectToJsonBytes(new PasswordChangeDTO("1"+currentPassword, "new password")))
+            .content(om.writeValueAsBytes(new PasswordChangeDTO("1"+currentPassword, "new password")))
             <%_ if (authenticationUsesCsrf) { _%>
             .with(csrf())<%_ } _%>)
             .andExpect(status().isBadRequest());
@@ -1041,13 +987,13 @@ class AccountResourceIT {
 <%_ if (reactive) { _%>
         accountWebTestClient.post().uri("/api/account/change-password")
             .contentType(MediaType.APPLICATION_JSON)
-            .bodyValue(TestUtil.convertObjectToJsonBytes(new PasswordChangeDTO(currentPassword, "new password")))
+            .bodyValue(om.writeValueAsBytes(new PasswordChangeDTO(currentPassword, "new password")))
             .exchange()
             .expectStatus().isOk();
 <%_ } else { _%>
         restAccountMockMvc.perform(post("/api/account/change-password")
             .contentType(MediaType.APPLICATION_JSON)
-            .content(TestUtil.convertObjectToJsonBytes(new PasswordChangeDTO(currentPassword, "new password")))
+            .content(om.writeValueAsBytes(new PasswordChangeDTO(currentPassword, "new password")))
             <%_ if (authenticationUsesCsrf) { _%>
             .with(csrf())<%_ } _%>)
             .andExpect(status().isOk());
@@ -1081,13 +1027,13 @@ class AccountResourceIT {
 <%_ if (reactive) { _%>
         accountWebTestClient.post().uri("/api/account/change-password")
             .contentType(MediaType.APPLICATION_JSON)
-            .bodyValue(TestUtil.convertObjectToJsonBytes(new PasswordChangeDTO(currentPassword, newPassword)))
+            .bodyValue(om.writeValueAsBytes(new PasswordChangeDTO(currentPassword, newPassword)))
             .exchange()
             .expectStatus().isBadRequest();
 <%_ } else { _%>
         restAccountMockMvc.perform(post("/api/account/change-password")
             .contentType(MediaType.APPLICATION_JSON)
-            .content(TestUtil.convertObjectToJsonBytes(new PasswordChangeDTO(currentPassword, newPassword)))
+            .content(om.writeValueAsBytes(new PasswordChangeDTO(currentPassword, newPassword)))
             <%_ if (authenticationUsesCsrf) { _%>
             .with(csrf())<%_ } _%>)
             .andExpect(status().isBadRequest());
@@ -1121,13 +1067,13 @@ class AccountResourceIT {
 <%_ if (reactive) { _%>
         accountWebTestClient.post().uri("/api/account/change-password")
             .contentType(MediaType.APPLICATION_JSON)
-            .bodyValue(TestUtil.convertObjectToJsonBytes(new PasswordChangeDTO(currentPassword, newPassword)))
+            .bodyValue(om.writeValueAsBytes(new PasswordChangeDTO(currentPassword, newPassword)))
             .exchange()
             .expectStatus().isBadRequest();
 <%_ } else { _%>
         restAccountMockMvc.perform(post("/api/account/change-password")
             .contentType(MediaType.APPLICATION_JSON)
-            .content(TestUtil.convertObjectToJsonBytes(new PasswordChangeDTO(currentPassword, newPassword)))
+            .content(om.writeValueAsBytes(new PasswordChangeDTO(currentPassword, newPassword)))
             <%_ if (authenticationUsesCsrf) { _%>
             .with(csrf())<%_ } _%>)
             .andExpect(status().isBadRequest());
@@ -1159,13 +1105,13 @@ class AccountResourceIT {
 <%_ if (reactive) { _%>
         accountWebTestClient.post().uri("/api/account/change-password")
             .contentType(MediaType.APPLICATION_JSON)
-            .bodyValue(TestUtil.convertObjectToJsonBytes(new PasswordChangeDTO(currentPassword, "")))
+            .bodyValue(om.writeValueAsBytes(new PasswordChangeDTO(currentPassword, "")))
             .exchange()
             .expectStatus().isBadRequest();
 <%_ } else { _%>
         restAccountMockMvc.perform(post("/api/account/change-password")
             .contentType(MediaType.APPLICATION_JSON)
-            .content(TestUtil.convertObjectToJsonBytes(new PasswordChangeDTO(currentPassword, "")))
+            .content(om.writeValueAsBytes(new PasswordChangeDTO(currentPassword, "")))
             <%_ if (authenticationUsesCsrf) { _%>
             .with(csrf())<%_ } _%>)
             .andExpect(status().isBadRequest());
@@ -1376,14 +1322,14 @@ class AccountResourceIT {
 <%_ if (reactive) { _%>
         accountWebTestClient.post().uri("/api/account/reset-password/finish")
             .contentType(MediaType.APPLICATION_JSON)
-            .bodyValue(TestUtil.convertObjectToJsonBytes(keyAndPassword))
+            .bodyValue(om.writeValueAsBytes(keyAndPassword))
             .exchange()
             .expectStatus().isOk();
 <%_ } else { _%>
         restAccountMockMvc.perform(
             post("/api/account/reset-password/finish")
                 .contentType(MediaType.APPLICATION_JSON)
-                .content(TestUtil.convertObjectToJsonBytes(keyAndPassword))<% if (authenticationUsesCsrf) { %>
+                .content(om.writeValueAsBytes(keyAndPassword))<% if (authenticationUsesCsrf) { %>
                 .with(csrf())<% } %>)
             .andExpect(status().isOk());
 <%_ } _%>
@@ -1418,14 +1364,14 @@ class AccountResourceIT {
 <%_ if (reactive) { _%>
         accountWebTestClient.post().uri("/api/account/reset-password/finish")
             .contentType(MediaType.APPLICATION_JSON)
-            .bodyValue(TestUtil.convertObjectToJsonBytes(keyAndPassword))
+            .bodyValue(om.writeValueAsBytes(keyAndPassword))
             .exchange()
             .expectStatus().isBadRequest();
 <%_ } else { _%>
         restAccountMockMvc.perform(
             post("/api/account/reset-password/finish")
                 .contentType(MediaType.APPLICATION_JSON)
-                .content(TestUtil.convertObjectToJsonBytes(keyAndPassword))<% if (authenticationUsesCsrf) { %>
+                .content(om.writeValueAsBytes(keyAndPassword))<% if (authenticationUsesCsrf) { %>
                 .with(csrf())<% } %>)
             .andExpect(status().isBadRequest());
 <%_ } _%>
@@ -1446,14 +1392,14 @@ class AccountResourceIT {
 <%_ if (reactive) { _%>
         accountWebTestClient.post().uri("/api/account/reset-password/finish")
             .contentType(MediaType.APPLICATION_JSON)
-            .bodyValue(TestUtil.convertObjectToJsonBytes(keyAndPassword))
+            .bodyValue(om.writeValueAsBytes(keyAndPassword))
             .exchange()
             .expectStatus().isEqualTo(HttpStatus.INTERNAL_SERVER_ERROR);
 <%_ } else { _%>
         restAccountMockMvc.perform(
             post("/api/account/reset-password/finish")
                 .contentType(MediaType.APPLICATION_JSON)
-                .content(TestUtil.convertObjectToJsonBytes(keyAndPassword))<% if (authenticationUsesCsrf) { %>
+                .content(om.writeValueAsBytes(keyAndPassword))<% if (authenticationUsesCsrf) { %>
                 .with(csrf())<% } %>)
             .andExpect(status().isInternalServerError());
 <%_ } _%>