From 923dcff8e5d3b7c142c882a1b2ef97c60ea29ab5 Mon Sep 17 00:00:00 2001
From: Andrii Shvaika <ashvayka@thingsboard.io>
Date: Wed, 22 Jun 2022 10:31:32 +0300
Subject: [PATCH] No more transaction cache

---
 .../server/cache/CacheSpecsMapTest.java          | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/common/cache/src/test/java/org/thingsboard/server/cache/CacheSpecsMapTest.java b/common/cache/src/test/java/org/thingsboard/server/cache/CacheSpecsMapTest.java
index 7e65d6a230..f561119f7f 100644
--- a/common/cache/src/test/java/org/thingsboard/server/cache/CacheSpecsMapTest.java
+++ b/common/cache/src/test/java/org/thingsboard/server/cache/CacheSpecsMapTest.java
@@ -21,8 +21,8 @@ import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.cache.CacheManager;
-import org.springframework.cache.transaction.TransactionAwareCacheDecorator;
-import org.springframework.cache.transaction.TransactionAwareCacheManagerProxy;
+import org.springframework.cache.caffeine.CaffeineCache;
+import org.springframework.cache.support.SimpleCacheManager;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.TestPropertySource;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
@@ -45,14 +45,16 @@ public class CacheSpecsMapTest {
     CacheManager cacheManager;
 
     @Test
-    public void verifyTransactionAwareCacheManagerProxy() {
-        assertThat(cacheManager).isInstanceOf(TransactionAwareCacheManagerProxy.class);
+    public void verifyNotTransactionAwareCacheManagerProxy() {
+        // We no longer use built-in transaction support for the caches, because we have our own cache cleanup and transaction logic that implements CAS.
+        assertThat(cacheManager).isInstanceOf(SimpleCacheManager.class);
     }
 
     @Test
-    public void givenCacheConfig_whenCacheManagerReady_thenVerifyExistedCachesWithTransactionAwareCacheDecorator() {
-        assertThat(cacheManager.getCache("relations")).isInstanceOf(TransactionAwareCacheDecorator.class);
-        assertThat(cacheManager.getCache("devices")).isInstanceOf(TransactionAwareCacheDecorator.class);
+    public void givenCacheConfig_whenCacheManagerReady_thenVerifyExistedCachesWithNoTransactionAwareCacheDecorator() {
+        // We no longer use built-in transaction support for the caches, because we have our own cache cleanup and transaction logic that implements CAS.
+        assertThat(cacheManager.getCache("relations")).isInstanceOf(CaffeineCache.class);
+        assertThat(cacheManager.getCache("devices")).isInstanceOf(CaffeineCache.class);
     }
 
     @Test