dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Renamed lock in OAuth2Service

Browse Source
This commit is contained in:
vzikratyi 2020-06-30 15:10:55 +03:00
parent 7d5ceaf311
commit 201ffebc5a
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
dao/src/main/java/org/thingsboard/server/dao/oauth2/OAuth2ServiceImpl.java
View File

@ -47,7 +47,6 @@ import java.util.concurrent.ExecutionException;
import java.util.concurrent.locks.ReentrantLock; import java.util.concurrent.locks.ReentrantLock;
import java.util.function.Consumer; import java.util.function.Consumer;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import java.util.stream.Stream;
import static org.thingsboard.server.dao.oauth2.OAuth2Utils.*; import static org.thingsboard.server.dao.oauth2.OAuth2Utils.*;
@ -57,7 +56,7 @@ public class OAuth2ServiceImpl implements OAuth2Service {
private static final ObjectMapper mapper = new ObjectMapper(); private static final ObjectMapper mapper = new ObjectMapper();
private final ReentrantLock cacheWriteLock = new ReentrantLock(); private final ReentrantLock clientRegistrationSaveLock = new ReentrantLock();
private final Map<TenantId, OAuth2ClientsParams> clientsParams = new ConcurrentHashMap<>(); private final Map<TenantId, OAuth2ClientsParams> clientsParams = new ConcurrentHashMap<>();
@Autowired @Autowired
@ -126,7 +125,7 @@ public class OAuth2ServiceImpl implements OAuth2Service {
validateRegistrationIdUniqueness(oAuth2ClientsParams, TenantId.SYS_TENANT_ID); validateRegistrationIdUniqueness(oAuth2ClientsParams, TenantId.SYS_TENANT_ID);
cacheWriteLock.lock(); clientRegistrationSaveLock.lock();
try { try {
validateRegistrationIdUniqueness(oAuth2ClientsParams, TenantId.SYS_TENANT_ID); validateRegistrationIdUniqueness(oAuth2ClientsParams, TenantId.SYS_TENANT_ID);
AdminSettings oauth2SystemAdminSettings = adminSettingsService.findAdminSettingsByKey(TenantId.SYS_TENANT_ID, OAUTH2_CLIENT_REGISTRATIONS_PARAMS); AdminSettings oauth2SystemAdminSettings = adminSettingsService.findAdminSettingsByKey(TenantId.SYS_TENANT_ID, OAUTH2_CLIENT_REGISTRATIONS_PARAMS);
@ -138,7 +137,7 @@ public class OAuth2ServiceImpl implements OAuth2Service {
adminSettingsService.saveAdminSettings(TenantId.SYS_TENANT_ID, oauth2SystemAdminSettings); adminSettingsService.saveAdminSettings(TenantId.SYS_TENANT_ID, oauth2SystemAdminSettings);
clientsParams.put(TenantId.SYS_TENANT_ID, oAuth2ClientsParams); clientsParams.put(TenantId.SYS_TENANT_ID, oAuth2ClientsParams);
} finally { } finally {
cacheWriteLock.unlock(); clientRegistrationSaveLock.unlock();
} }
return getSystemOAuth2ClientsParams(); return getSystemOAuth2ClientsParams();
@ -152,7 +151,7 @@ public class OAuth2ServiceImpl implements OAuth2Service {
validate(oAuth2ClientsParams); validate(oAuth2ClientsParams);
validateRegistrationIdUniqueness(oAuth2ClientsParams, tenantId); validateRegistrationIdUniqueness(oAuth2ClientsParams, tenantId);
cacheWriteLock.lock(); clientRegistrationSaveLock.lock();
try { try {
validateRegistrationIdUniqueness(oAuth2ClientsParams, tenantId); validateRegistrationIdUniqueness(oAuth2ClientsParams, tenantId);
@ -170,7 +169,7 @@ public class OAuth2ServiceImpl implements OAuth2Service {
clientsParams.put(tenantId, oAuth2ClientsParams); clientsParams.put(tenantId, oAuth2ClientsParams);
} finally { } finally {
cacheWriteLock.unlock(); clientRegistrationSaveLock.unlock();
} }
return getTenantOAuth2ClientsParams(tenantId); return getTenantOAuth2ClientsParams(tenantId);