thingsboard-memoizeit

replaced multicache for caffeine

7/21/2020 5:54:33 AM

Rômulo Manciola Meloca

Commit: 684fabb

Tree: 471f411

Parents: cdf0514

Changes

dao/src/main/java/org/thingsboard/server/dao/dashboard/DashboardServiceImpl.java 5(+2 -3)

dao/src/main/java/org/thingsboard/server/dao/sql/relation/JpaRelationDao.java 5(+2 -3)

Details

dao/src/main/java/org/thingsboard/server/dao/dashboard/DashboardServiceImpl.java 5(+2 -3)

diff --git a/dao/src/main/java/org/thingsboard/server/dao/dashboard/DashboardServiceImpl.java b/dao/src/main/java/org/thingsboard/server/dao/dashboard/DashboardServiceImpl.java
index 9c9857c..f737e93 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/dashboard/DashboardServiceImpl.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/dashboard/DashboardServiceImpl.java
@@ -15,8 +15,7 @@
  */
 package org.thingsboard.server.dao.dashboard;
 
-import br.ufrgs.inf.prosoft.cache.Parameters;
-import br.ufrgs.inf.prosoft.cache.SingleCache;
+import br.ufrgs.inf.prosoft.cache.*;
 
 import com.google.common.base.Function;
 import com.google.common.util.concurrent.Futures;
@@ -288,7 +287,7 @@ public class DashboardServiceImpl extends AbstractEntityService implements Dashb
         
     }
 
-public static SingleCache<Parameters, List<DashboardInfo>> findEntitiesCache = new SingleCache<>("01#static-single:CustomerDashboardsUpdater.findEntities");
+public static CaffeineSingleCache<Parameters, List<DashboardInfo>> findEntitiesCache = new CaffeineSingleCache<>("01#static-single:CustomerDashboardsUpdater.findEntities", 300000);
 
     private class CustomerDashboardsUpdater extends TimePaginatedRemover<Customer, DashboardInfo> {

dao/src/main/java/org/thingsboard/server/dao/sql/relation/JpaRelationDao.java 5(+2 -3)

diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/relation/JpaRelationDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/relation/JpaRelationDao.java
index 5b83034..0bba379 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/sql/relation/JpaRelationDao.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/sql/relation/JpaRelationDao.java
@@ -15,8 +15,7 @@
  */
 package org.thingsboard.server.dao.sql.relation;
 
-import br.ufrgs.inf.prosoft.cache.Parameters;
-import br.ufrgs.inf.prosoft.cache.SingleCache;
+import br.ufrgs.inf.prosoft.cache.*;
 
 import com.google.common.util.concurrent.ListenableFuture;
 import lombok.extern.slf4j.Slf4j;
@@ -187,7 +186,7 @@ public class JpaRelationDao extends JpaAbstractDaoListeningExecutorService imple
                 });
     }
 
-public static SingleCache<Parameters, ListenableFuture<List<EntityRelation>>> findRelationsCache = new SingleCache<>("03#static-single:JpaRelationDao.findRelations");
+public static CaffeineSingleCache<Parameters, ListenableFuture<List<EntityRelation>>> findRelationsCache = new CaffeineSingleCache<>("03#static-single:JpaRelationDao.findRelations", 300000);
 
     @Override
     public ListenableFuture<List<EntityRelation>> findRelations(TenantId tenantId, EntityId from, String relationType, RelationTypeGroup typeGroup, EntityType childType, TimePageLink pageLink) {