From ffc56f5c233fdae8aaae55162b8f4a1f4ec266a4 Mon Sep 17 00:00:00 2001 From: Igor Kulikov Date: Thu, 14 Feb 2019 17:23:08 +0200 Subject: [PATCH] Add prefix to device credentials cache keys. --- .../dao/cache/PreviousDeviceCredentialsIdKeyGenerator.java | 6 ++++-- .../server/dao/device/DeviceCredentialsServiceImpl.java | 4 ++-- ...Test.java => DeviceCredentialCacheServiceNoSqlTest.java} | 2 +- ...lTest.java => DeviceCredentialsCacheServiceSqlTest.java} | 2 +- 4 files changed, 8 insertions(+), 6 deletions(-) rename dao/src/test/java/org/thingsboard/server/dao/service/nosql/{DeviceCredentialCacheNoSqlTest.java => DeviceCredentialCacheServiceNoSqlTest.java} (89%) rename dao/src/test/java/org/thingsboard/server/dao/service/sql/{DeviceCredentialsCacheSqlTest.java => DeviceCredentialsCacheServiceSqlTest.java} (89%) diff --git a/dao/src/main/java/org/thingsboard/server/dao/cache/PreviousDeviceCredentialsIdKeyGenerator.java b/dao/src/main/java/org/thingsboard/server/dao/cache/PreviousDeviceCredentialsIdKeyGenerator.java index 60f7b80e8b..e3ac355c8c 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/cache/PreviousDeviceCredentialsIdKeyGenerator.java +++ b/dao/src/main/java/org/thingsboard/server/dao/cache/PreviousDeviceCredentialsIdKeyGenerator.java @@ -22,9 +22,11 @@ import org.thingsboard.server.dao.device.DeviceCredentialsService; import java.lang.reflect.Method; +import static org.thingsboard.server.common.data.CacheConstants.DEVICE_CREDENTIALS_CACHE; + public class PreviousDeviceCredentialsIdKeyGenerator implements KeyGenerator { - private static final String NOT_VALID_DEVICE = "notValidDeviceCredentialsId"; + private static final String NOT_VALID_DEVICE = DEVICE_CREDENTIALS_CACHE + "_notValidDeviceCredentialsId"; @Override public Object generate(Object o, Method method, Object... objects) { @@ -34,7 +36,7 @@ public class PreviousDeviceCredentialsIdKeyGenerator implements KeyGenerator { if (deviceCredentials.getDeviceId() != null) { DeviceCredentials oldDeviceCredentials = deviceCredentialsService.findDeviceCredentialsByDeviceId(tenantId, deviceCredentials.getDeviceId()); if (oldDeviceCredentials != null) { - return oldDeviceCredentials.getCredentialsId(); + return DEVICE_CREDENTIALS_CACHE + "_" + oldDeviceCredentials.getCredentialsId(); } } return NOT_VALID_DEVICE; diff --git a/dao/src/main/java/org/thingsboard/server/dao/device/DeviceCredentialsServiceImpl.java b/dao/src/main/java/org/thingsboard/server/dao/device/DeviceCredentialsServiceImpl.java index 50a9faa148..7c7910ba8f 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/device/DeviceCredentialsServiceImpl.java +++ b/dao/src/main/java/org/thingsboard/server/dao/device/DeviceCredentialsServiceImpl.java @@ -54,7 +54,7 @@ public class DeviceCredentialsServiceImpl implements DeviceCredentialsService { } @Override - @Cacheable(cacheNames = DEVICE_CREDENTIALS_CACHE, unless = "#result == null") + @Cacheable(cacheNames = DEVICE_CREDENTIALS_CACHE, key = "'deviceCredentials_' + #credentialsId", unless = "#result == null") public DeviceCredentials findDeviceCredentialsByCredentialsId(String credentialsId) { log.trace("Executing findDeviceCredentialsByCredentialsId [{}]", credentialsId); validateString(credentialsId, "Incorrect credentialsId " + credentialsId); @@ -89,7 +89,7 @@ public class DeviceCredentialsServiceImpl implements DeviceCredentialsService { } @Override - @CacheEvict(cacheNames = DEVICE_CREDENTIALS_CACHE, key = "#deviceCredentials.credentialsId") + @CacheEvict(cacheNames = DEVICE_CREDENTIALS_CACHE, key = "'deviceCredentials_' + #deviceCredentials.credentialsId") public void deleteDeviceCredentials(TenantId tenantId, DeviceCredentials deviceCredentials) { log.trace("Executing deleteDeviceCredentials [{}]", deviceCredentials); deviceCredentialsDao.removeById(tenantId, deviceCredentials.getUuidId()); diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/nosql/DeviceCredentialCacheNoSqlTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/nosql/DeviceCredentialCacheServiceNoSqlTest.java similarity index 89% rename from dao/src/test/java/org/thingsboard/server/dao/service/nosql/DeviceCredentialCacheNoSqlTest.java rename to dao/src/test/java/org/thingsboard/server/dao/service/nosql/DeviceCredentialCacheServiceNoSqlTest.java index b66ace42f1..8e12bb2c93 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/service/nosql/DeviceCredentialCacheNoSqlTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/service/nosql/DeviceCredentialCacheServiceNoSqlTest.java @@ -19,5 +19,5 @@ import org.thingsboard.server.dao.service.BaseDeviceCredentialsCacheTest; import org.thingsboard.server.dao.service.DaoNoSqlTest; @DaoNoSqlTest -public class DeviceCredentialCacheNoSqlTest extends BaseDeviceCredentialsCacheTest { +public class DeviceCredentialCacheServiceNoSqlTest extends BaseDeviceCredentialsCacheTest { } diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/sql/DeviceCredentialsCacheSqlTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/sql/DeviceCredentialsCacheServiceSqlTest.java similarity index 89% rename from dao/src/test/java/org/thingsboard/server/dao/service/sql/DeviceCredentialsCacheSqlTest.java rename to dao/src/test/java/org/thingsboard/server/dao/service/sql/DeviceCredentialsCacheServiceSqlTest.java index 75a7b49a40..0a5e50c16f 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/service/sql/DeviceCredentialsCacheSqlTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/service/sql/DeviceCredentialsCacheServiceSqlTest.java @@ -19,5 +19,5 @@ import org.thingsboard.server.dao.service.BaseDeviceCredentialsCacheTest; import org.thingsboard.server.dao.service.DaoSqlTest; @DaoSqlTest -public class DeviceCredentialsCacheSqlTest extends BaseDeviceCredentialsCacheTest { +public class DeviceCredentialsCacheServiceSqlTest extends BaseDeviceCredentialsCacheTest { }