generator-jhipster 8.4.0 → 8.6.0

package/dist/generators/spring-boot/templates/src/main/java/_package_/_entityPackage_/service/UserService.java.ejs

@@ -114,7 +114,7 @@ import java.util.stream.Collectors;
 public class UserService {
 <%_ if (!databaseTypeNo) { _%>
 
-    private final Logger log = LoggerFactory.getLogger(UserService.class);
+    private static final Logger log = LoggerFactory.getLogger(UserService.class);
 
     private final UserRepository userRepository;
   <%_ if (!authenticationTypeOauth2) { _%>

package/dist/generators/spring-boot/templates/src/main/java/_package_/_entityPackage_/service/_entityClass_QueryService.java.ejs

@@ -68,7 +68,7 @@ import <%= entityAbsolutePackage %>.service.mapper.<%= entityClass %>Mapper;
 <%_ } _%>
 public class <%= serviceClassName %> extends QueryService<<%= persistClass %>> {
 
-    private final Logger log = LoggerFactory.getLogger(<%= serviceClassName %>.class);
+    private static final Logger log = LoggerFactory.getLogger(<%= serviceClassName %>.class);
 <%- include('../_partials_entity_/inject_template', {viaService: false, constructorName: serviceClassName, queryService: false, isUsingMapsId: false, mapsIdAssoc: null, isController: false}); -%>
 <%_ if (paginationNo) { _%>
 

package/dist/generators/spring-boot/templates/src/main/java/_package_/_entityPackage_/service/impl/_entityClass_ServiceImpl.java.ejs

@@ -95,7 +95,7 @@ import java.util.stream.StreamSupport;
 @Transactional<% } %>
 public class <%= serviceClassName %><% if (serviceImpl) { %> implements <%= entityClass %>Service<% } %> {
 
-    private final Logger log = LoggerFactory.getLogger(<%= serviceClassName %>.class);
+    private static final Logger log = LoggerFactory.getLogger(<%= serviceClassName %>.class);
 <%- include('../../_partials_entity_/inject_template', {viaService: false, constructorName: serviceClassName, queryService: false, isUsingMapsId: isUsingMapsId, mapsIdAssoc: mapsIdAssoc, isController: false}); -%>
 
 <%_ if (!serviceImpl) { _%>

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

@@ -84,7 +84,7 @@ public class PublicUserResource {
     private static final List<String> ALLOWED_ORDERED_PROPERTIES = Collections.unmodifiableList(Arrays.asList("id", "login", "firstName", "lastName", "email", "activated", "langKey"));
 <%_ } _%>
 
-    private final Logger log = LoggerFactory.getLogger(PublicUserResource.class);
+    private static final Logger log = LoggerFactory.getLogger(PublicUserResource.class);
 
     private final UserService userService;
 <%_ if (searchEngineElasticsearch) { _%>

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

@@ -115,7 +115,7 @@ public class UserResource {
     private static final List<String> ALLOWED_ORDERED_PROPERTIES = Collections.unmodifiableList(Arrays.asList(
     "id", "login", "firstName", "lastName", "email", "activated", "langKey", "createdBy", "createdDate", "lastModifiedBy", "lastModifiedDate"));
 
-    private final Logger log = LoggerFactory.getLogger(UserResource.class);
+    private static final Logger log = LoggerFactory.getLogger(UserResource.class);
 
     @Value("${jhipster.clientApp.name}")
     private String applicationName;

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

@@ -139,7 +139,7 @@ import java.util.stream.StreamSupport;
 <%_ } _%>
 public class <%= entityClass %>Resource {
 
-    private final Logger log = LoggerFactory.getLogger(<%= entityClass %>Resource.class);
+    private static final Logger log = LoggerFactory.getLogger(<%= entityClass %>Resource.class);
 <%_ if (!readOnly) { _%>
 
   <%_ let entityName = entityInstance;

package/dist/generators/spring-boot/templates/src/test/java/_package_/_entityPackage_/service/UserServiceIT.java.ejs

@@ -47,6 +47,7 @@ import tech.jhipster.security.RandomUtil;
 <%_ if (!authenticationTypeOauth2) { _%>
 import org.apache.commons.lang3.RandomStringUtils;
 <%_ } _%>
+import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -127,6 +128,11 @@ import static org.mockito.Mockito.any;
 <%_ if (databaseTypeSql && !reactive && !authenticationTypeOauth2) { _%>
 import static org.mockito.Mockito.when;
 <%_ } _%>
+<%_ if (cacheProviderAny) { _%>
+import org.springframework.cache.CacheManager;
+import org.springframework.cache.Cache;
+import java.util.Objects;
+<%_ } _%>
 
 /**
  * Integration tests for {@link UserService}.
@@ -137,14 +143,19 @@ import static org.mockito.Mockito.when;
 <%_ } _%>
 class UserServiceIT {
 
-    private static final String DEFAULT_LOGIN = "johndoe";
+    private static final String DEFAULT_LOGIN = "johndoe_service";
 
-    private static final String DEFAULT_EMAIL = "johndoe@localhost";
+    private static final String DEFAULT_EMAIL = "johndoe_service@localhost";
 
     private static final String DEFAULT_FIRSTNAME = "john";
 
     private static final String DEFAULT_LASTNAME = "doe";
 
+<%_ if (cacheProviderAny) { _%>
+    @Autowired
+    private CacheManager cacheManager;
+
+<%_ } _%>
 <%_ if (!databaseTypeCassandra) { _%>
     private static final String DEFAULT_IMAGEURL = "http://placehold.it/50x50";
 
@@ -189,21 +200,21 @@ class UserServiceIT {
 <%_ if (authenticationTypeOauth2) { _%>
     private Map<String, Object> userDetails;
 
+<%_ } _%>
+<%_ if (!databaseTypeCassandra && !requiresDeleteAllUsers) { _%>
+    private Long numberOfUsers;
+
+    @BeforeEach
+    public void countUsers() {
+        numberOfUsers = userRepository.count()<%- reactorBlock %>;
+    }
+
 <%_ } _%>
     @BeforeEach
     public void init() {
 <%_ if (databaseTypeCouchbase) { _%>
         mockAuthentication();
 <%_ } _%>
-<%_ if ((databaseTypeSql || databaseTypeMongodb || databaseTypeNeo4j || databaseTypeCouchbase) && authenticationTypeSession && !reactive) { _%>
-        persistentTokenRepository.deleteAll();
-<%_ } _%>
-<%_ if (databaseTypeSql && reactive) { _%>
-        userRepository.deleteAllUserAuthorities().block();
-<%_ } _%>
-<%_ if ((reactive && !databaseTypeNo) || databaseTypeMongodb || databaseTypeNeo4j || databaseTypeCassandra || databaseTypeCouchbase) { _%>
-        userRepository.deleteAll()<% if (reactive) { %>.block()<% } %>;
-<%_ } _%>
 <%_ if (!databaseTypeNo) { _%>
         user = new <%= user.persistClass %>();
   <%_ if (databaseTypeCassandra) { _%>
@@ -240,6 +251,31 @@ class UserServiceIT {
 
         when(dateTimeProvider.getNow()).thenReturn(Optional.of(LocalDateTime.now()));
         auditingHandler.setDateTimeProvider(dateTimeProvider);
+<%_ } _%>
+    }
+
+    @AfterEach
+    public void cleanupAndCheck() {
+<%_ if (cacheProviderAny) { _%>
+        cacheManager.getCacheNames().stream()
+            .map(cacheName -> this.cacheManager.getCache(cacheName))
+            .filter(Objects::nonNull)
+            .forEach(Cache::clear);
+<%_ } _%>
+<%_ if ((databaseTypeSql || databaseTypeMongodb || databaseTypeNeo4j || databaseTypeCouchbase) && authenticationTypeSession && !reactive) { _%>
+        persistentTokenRepository.deleteAll();
+<%_ } _%>
+<%_ if (requiresDeleteAllUsers) { _%>
+    <%_ if (databaseTypeSql && reactive) { _%>
+        userRepository.deleteAllUserAuthorities()<%- reactorBlock %>;
+    <%_ } _%>
+        userRepository.deleteAll()<%- reactorBlock %>;
+<%_ } else { _%>
+        userService.deleteUser(DEFAULT_LOGIN)<%- reactorBlock %>;
+<%_ } _%>
+<%_ if (!databaseTypeCassandra && !requiresDeleteAllUsers) { _%>
+        assertThat(userRepository.count()<%- reactorBlock %>).isEqualTo(numberOfUsers);
+        numberOfUsers = null;
 <%_ } _%>
     }
 <%_ if ((databaseTypeSql || databaseTypeMongodb || databaseTypeNeo4j || databaseTypeCouchbase) && authenticationTypeSession && !reactive) { _%>

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

@@ -18,6 +18,8 @@
 -%>
 package <%= packageName %>.web.rest;
 
+import static org.assertj.core.api.Assertions.assertThat;
+
 import <%= packageName %>.IntegrationTest;
 <%_ if (databaseTypeSql && reactive) { _%>
 import <%= packageName %>.config.Constants;
@@ -27,6 +29,9 @@ import <%= packageName %>.config.TestSecurityConfiguration;
 <%_ } _%>
 import <%= user.entityAbsoluteClass %>;
 import <%= packageName %>.repository.UserRepository;
+<%_ if (!requiresDeleteAllUsers) { _%>
+import <%= packageName %>.service.UserService;
+<%_ } _%>
 <%_ if (searchEngineElasticsearch) { _%>
 import <%= packageName %>.repository.search.UserSearchRepository;
 <%_ } _%>
@@ -34,6 +39,7 @@ import <%= packageName %>.security.AuthoritiesConstants;
 <%_ if (databaseTypeSql && reactive) { _%>
 import <%= packageName %>.repository.EntityManager;
 <%_ } _%>
+import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -44,6 +50,8 @@ import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMock
 <%_ } _%>
 <%_ if (cacheProviderAny) { _%>
 import org.springframework.cache.CacheManager;
+import org.springframework.cache.Cache;
+import java.util.Objects;
 <%_ } _%>
 <%_ if (cacheProviderMemcached) { _%>
 import org.springframework.cache.support.NoOpCacheManager;
@@ -76,20 +84,14 @@ import java.util.stream.Stream;
 <%_ if (databaseTypeCassandra) { _%>
 import java.util.UUID;
 <%_ } _%>
+import java.util.Set;
 
-<%_ if (reactive) { _%>
-import static org.assertj.core.api.Assertions.assertThat;
-<%_ } _%>
 <%_ if (reactive && searchEngineElasticsearch) { _%>
 import static org.mockito.Mockito.*;
 <%_ } _%>
 <%_ if (reactive && authenticationUsesCsrf) { _%>
 import static org.springframework.security.test.web.reactive.server.SecurityMockServerConfigurers.csrf;
 <%_ } else if (!reactive) { _%>
-  <%_ if (databaseTypeSql || databaseTypeMongodb || databaseTypeNeo4j || databaseTypeCouchbase) { _%>
-import static org.hamcrest.Matchers.hasItems;
-  <%_ } _%>
-import static org.hamcrest.Matchers.hasItem;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*;
 <%_ } _%>
@@ -115,6 +117,11 @@ class PublicUserResourceIT {
 
     @Autowired
     private UserRepository userRepository;
+<%_ if (!requiresDeleteAllUsers) { _%>
+
+    @Autowired
+    private UserService userService;
+<%_ } _%>
 <%_ if (searchEngineElasticsearch) { _%>
 
     /**
@@ -139,17 +146,18 @@ class PublicUserResourceIT {
     @Autowired
 <%_ if (reactive) { _%>
     private WebTestClient webTestClient;
+
 <%_ } else { _%>
     private MockMvc restUserMockMvc;
-<%_ } _%>
 
+<%_ } _%>
     private <%= user.persistClass %> user;
+<%_ if (!databaseTypeCassandra && !requiresDeleteAllUsers) { _%>
+    private Long numberOfUsers;
 
-<%_ if (cacheProviderAny) { _%>
     @BeforeEach
-    public void setup() {
-        cacheManager.getCache(UserRepository.USERS_BY_LOGIN_CACHE).clear();
-        cacheManager.getCache(UserRepository.USERS_BY_EMAIL_CACHE).clear();
+    public void countUsers() {
+        numberOfUsers = userRepository.count()<%- reactorBlock %>;
     }
 
 <%_ } _%>
@@ -162,7 +170,29 @@ class PublicUserResourceIT {
 <%_ } _%>
     @BeforeEach
     public void initTest() {
-        user = UserResourceIT.initTestUser(userRepository<% if (databaseTypeSql) { %>, em<% } %>);
+        user = UserResourceIT.initTestUser(<% if (databaseTypeSql) { %>em<% } %>);
+    }
+
+    @AfterEach
+    public void cleanupAndCheck() {
+<%_ if (cacheProviderAny) { _%>
+        cacheManager.getCacheNames().stream()
+            .map(cacheName -> this.cacheManager.getCache(cacheName))
+            .filter(Objects::nonNull)
+            .forEach(Cache::clear);
+<%_ } _%>
+<%_ if (requiresDeleteAllUsers) { _%>
+  <%_ if (databaseTypeSql && reactive) { _%>
+        userRepository.deleteAllUserAuthorities()<%- reactorBlock %>;
+  <%_ } _%>
+        userRepository.deleteAll()<%- reactorBlock %>;
+<%_ } else { _%>
+        userService.deleteUser(user.getLogin())<%- reactorBlock %>;
+<%_ } _%>
+<%_ if (!databaseTypeCassandra && !requiresDeleteAllUsers) { _%>
+        assertThat(userRepository.count()<%- reactorBlock %>).isEqualTo(numberOfUsers);
+        numberOfUsers = null;
+<%_ } _%>
     }
 
     @Test
@@ -175,32 +205,38 @@ class PublicUserResourceIT {
 
         // Get all the users
 <%_ if (reactive) { _%>
-        <%= user.dtoClass %> foundUser = webTestClient.get().uri("/api/users?sort=id,desc")
+        webTestClient.get().uri("/api/users?sort=id,desc")
             .accept(MediaType.APPLICATION_JSON)
             .exchange()
             .expectStatus().isOk()
             .expectHeader().contentType(MediaType.APPLICATION_JSON)
-            .returnResult(<%= user.dtoClass %>.class).getResponseBody().blockFirst();
-
-        assertThat(foundUser.getLogin()).isEqualTo(DEFAULT_LOGIN);
+            .expectBody()
+            .jsonPath("$.[?(@.id == <%- primaryKey.typeNumeric ? '%d' : "'%s'" %>)].login", user.getId()).isEqualTo(user.getLogin())
+            .jsonPath("$.[?(@.id == <%- primaryKey.typeNumeric ? '%d' : "'%s'" %>)].keys()", user.getId()).isEqualTo(Set.of("id", "login"))
   <%_ for (field of user.fields.filter(field => !field.builtIn && field.relatedByOtherEntity)) { _%>
-        assertThat(foundUser.get<%= field.propertyJavaBeanName %>()).isEqualTo(DEFAULT_<%= field.fieldName.toUpperCase() %>);
+            .jsonPath("$.[?(@.id == <%- primaryKey.typeNumeric ? '%d' : "'%s'" %>)].<%= field.fieldName %>", user.getId()).isEqualTo(user.get<%= field.propertyJavaBeanName %>())
   <%_ } _%>
+            .jsonPath("$.[*].email").doesNotHaveJsonPath()
+  <%_ if (!databaseTypeCassandra) { _%>
+            .jsonPath("$.[*].imageUrl").doesNotHaveJsonPath()
+  <%_ } _%>
+            .jsonPath("$.[*].langKey").doesNotHaveJsonPath();
 <%_ } else { _%>
         restUserMockMvc.perform(get("/api/users<% if (databaseTypeSql) { %>?sort=id,desc<% } %>")
             .accept(MediaType.APPLICATION_JSON))
             .andExpect(status().isOk())
             .andExpect(content().contentType(MediaType.APPLICATION_JSON_VALUE))
-            .andExpect(jsonPath("$.[*].login").value(hasItem(DEFAULT_LOGIN)))
+            .andExpect(jsonPath("$.[?(@.id == <%- primaryKey.typeNumeric ? '%d' : "'%s'" %>)].login", user.getId()).value(user.getLogin()))
+            .andExpect(jsonPath("$.[?(@.id == <%- primaryKey.typeNumeric ? '%d' : "'%s'" %>)].keys()", user.getId()).value(Set.of("id", "login")))
   <%_ for (field of user.fields.filter(field => !field.builtIn && field.relatedByOtherEntity)) { _%>
-            .andExpect(jsonPath("$.[*].<%= field.fieldName %>").value(hasItem(DEFAULT_<%= field.fieldName.toUpperCase() %>)))
+            .andExpect(jsonPath("$.[?(@.id == <%- primaryKey.typeNumeric ? '%d' : "'%s'" %>)].<%= field.fieldName %>", user.getId()).value(user.get<%= field.propertyJavaBeanName %>()))
   <%_ } _%>
-            .andExpect(jsonPath("$.[*].email").doesNotExist())
+            .andExpect(jsonPath("$.[*].email").doesNotHaveJsonPath())
   <%_ if (!databaseTypeCassandra) { _%>
-            .andExpect(jsonPath("$.[*].imageUrl").doesNotExist())
+            .andExpect(jsonPath("$.[*].imageUrl").doesNotHaveJsonPath())
   <%_ } _%>
-            .andExpect(jsonPath("$.[*].langKey").doesNotExist());
-<% } _%>
+            .andExpect(jsonPath("$.[*].langKey").doesNotHaveJsonPath());
+<%_ } _%>
     }
 
 <%_ if (databaseTypeSql && !authenticationTypeOauth2) { _%>