From 8b9cb02845fb70fa76ef2db0ced7c677c2e3b721 Mon Sep 17 00:00:00 2001 From: Kamil Krzywanski Date: Sat, 30 Nov 2024 22:06:07 +0100 Subject: [PATCH 1/3] Isue #27972 last tests fix --- .../_package_/_entityPackage_/service/UserService.java.ejs | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/generators/spring-boot/templates/src/main/java/_package_/_entityPackage_/service/UserService.java.ejs b/generators/spring-boot/templates/src/main/java/_package_/_entityPackage_/service/UserService.java.ejs index 13ad90292eef..732df94b3510 100644 --- a/generators/spring-boot/templates/src/main/java/_package_/_entityPackage_/service/UserService.java.ejs +++ b/generators/spring-boot/templates/src/main/java/_package_/_entityPackage_/service/UserService.java.ejs @@ -54,6 +54,9 @@ import org.slf4j.LoggerFactory; <%_ } _%> <%_ if (cacheProviderAny) { _%> import org.springframework.cache.CacheManager; +<%_ if (databaseTypeCouchbase) { _%> +import org.springframework.cache.annotation.CacheEvict; +<%_ } _%> <%_ } _%> <%_ if (databaseTypeSql || databaseTypeMongodb || databaseTypeNeo4j || databaseTypeCouchbase) { _%> <%_ if (!reactive) { _%> @@ -573,6 +576,9 @@ public class UserService { .map(<%= user.adminUserDto %>::new); } + <%_ if (databaseTypeCouchbase) { _%> + @CacheEvict(cacheNames = UserRepository.USERS_BY_LOGIN_CACHE) + <%_ } _%> <%_ if (reactive) { _%> <%_ if (databaseTypeSql) { _%> @Transactional From 9b5547842d5993799eb495483653e9cacdef31d0 Mon Sep 17 00:00:00 2001 From: Kamil Krzywanski Date: Sat, 30 Nov 2024 22:19:18 +0100 Subject: [PATCH 2/3] Isue #27972 last tests fix --- .../java/_package_/_entityPackage_/service/UserService.java.ejs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/spring-boot/templates/src/main/java/_package_/_entityPackage_/service/UserService.java.ejs b/generators/spring-boot/templates/src/main/java/_package_/_entityPackage_/service/UserService.java.ejs index 732df94b3510..bf458b2c0a0e 100644 --- a/generators/spring-boot/templates/src/main/java/_package_/_entityPackage_/service/UserService.java.ejs +++ b/generators/spring-boot/templates/src/main/java/_package_/_entityPackage_/service/UserService.java.ejs @@ -576,7 +576,7 @@ public class UserService { .map(<%= user.adminUserDto %>::new); } - <%_ if (databaseTypeCouchbase) { _%> + <%_ if (databaseTypeCouchbase && cacheProviderAny) { _%> @CacheEvict(cacheNames = UserRepository.USERS_BY_LOGIN_CACHE) <%_ } _%> <%_ if (reactive) { _%> From 07b7850a6616fc0553982f698098270c6acba0ef Mon Sep 17 00:00:00 2001 From: Kamil Krzywanski Date: Sun, 1 Dec 2024 12:18:47 +0100 Subject: [PATCH 3/3] Isue #27972 last tests fix --- .../java/_package_/_entityPackage_/service/UserService.java.ejs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/spring-boot/templates/src/main/java/_package_/_entityPackage_/service/UserService.java.ejs b/generators/spring-boot/templates/src/main/java/_package_/_entityPackage_/service/UserService.java.ejs index bf458b2c0a0e..25e1d67733e2 100644 --- a/generators/spring-boot/templates/src/main/java/_package_/_entityPackage_/service/UserService.java.ejs +++ b/generators/spring-boot/templates/src/main/java/_package_/_entityPackage_/service/UserService.java.ejs @@ -577,7 +577,7 @@ public class UserService { } <%_ if (databaseTypeCouchbase && cacheProviderAny) { _%> - @CacheEvict(cacheNames = UserRepository.USERS_BY_LOGIN_CACHE) + @CacheEvict(cacheNames = UserRepository.USERS_BY_LOGIN_CACHE, key = "#login") <%_ } _%> <%_ if (reactive) { _%> <%_ if (databaseTypeSql) { _%>