Skip to content

Commit 9aef45e

Browse files
Zeta201Zeta201
committed
Address reviewer suggestions
1 parent c59e20f commit 9aef45e

File tree

8 files changed

+70
-32
lines changed

8 files changed

+70
-32
lines changed

‎core/org.wso2.carbon.registry.core/src/main/java/org/wso2/carbon/registry/core/jdbc/dao/JDBCResourceDAO.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2211,6 +2211,7 @@ public String getPathFromId(int pathId) throws RegistryException {
22112211
*
22122212
*/
22132213
public String getPathFromIdOnRead(int pathId) throws RegistryException {
2214+
22142215
try {
22152216
return JDBCPathCache.getPathCache()
22162217
.getPathOnRead(JDBCDatabaseTransaction.getConnection(), pathId);

‎core/org.wso2.carbon.user.core/src/main/java/org/wso2/carbon/user/core/common/AbstractUserStoreManager.java‎

Lines changed: 46 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11263,8 +11263,8 @@ public String[] getUserList(Condition condition, String domain, String profileNa
1126311263
if (((AbstractUserStoreManager) secManager).isUniqueUserIdEnabled()) {
1126411264
UniqueIDPaginatedSearchResult users = ((AbstractUserStoreManager) secManager).doGetUserListWithID(condition,
1126511265
profileName, limit, offset, sortBy, sortOrder);
11266-
addUsersToUserIdCache(users.getUsers());
11267-
addUsersToUserNameCache(users.getUsers());
11266+
addUsersToUserIdCacheOnRead(users.getUsers());
11267+
addUsersToUserNameCacheOnRead(users.getUsers());
1126811268
filteredUsers = users.getUsers().stream().map(User::getUsername).toArray(String[]::new);
1126911269
} else {
1127011270
PaginatedSearchResult users = ((AbstractUserStoreManager) secManager).doGetUserList(condition,
@@ -13910,8 +13910,8 @@ public String getUserIDFromUserName(String userName) throws UserStoreException {
1391013910
log.debug("User is not available in cache or database.");
1391113911
return null;
1391213912
}
13913-
addToUserIDCache(userID, userName, userStore);
13914-
addToUserNameCache(userID, userName, userStore);
13913+
addToUserIDCacheOnRead(userID, userName, userStore);
13914+
addToUserNameCacheOnRead(userID, userName, userStore);
1391513915
return userID;
1391613916
}
1391713917

@@ -13920,8 +13920,8 @@ public String getUserIDFromUserName(String userName) throws UserStoreException {
1392013920
userStore.getDomainName(), null);
1392113921
if (claims != null && claims.size() == 1) {
1392213922
userID = claims.get(USER_ID_CLAIM_URI);
13923-
addToUserIDCache(userID, userName, userStore);
13924-
addToUserNameCache(userID, userName, userStore);
13923+
addToUserIDCacheOnRead(userID, userName, userStore);
13924+
addToUserNameCacheOnRead(userID, userName, userStore);
1392513925
return userID;
1392613926
}
1392713927
}
@@ -14014,8 +14014,8 @@ private String getUserNameFromCurrentUserStore(String userID, UserStore userStor
1401414014
}
1401514015
return null;
1401614016
}
14017-
addToUserNameCache(userID, userName, userStore);
14018-
addToUserIDCache(userID, userName, userStore);
14017+
addToUserNameCacheOnRead(userID, userName, userStore);
14018+
addToUserIDCacheOnRead(userID, userName, userStore);
1401914019
}
1402014020
return UserCoreUtil.addDomainToName(userName, userStore.getDomainName());
1402114021
}
@@ -14055,13 +14055,27 @@ private String getFromUserIDCache(String userName, UserStore userStore) {
1405514055

1405614056
private void addToUserIDCache(String userID, String userName, UserStore userStore) {
1405714057

14058+
UserIdResolverCache.getInstance()
14059+
.addToCache(UserCoreUtil.addDomainToName(userName, userStore.getDomainName()), userID,
14060+
RESOLVE_USER_ID_FROM_USER_NAME_CACHE_NAME, tenantId);
14061+
}
14062+
14063+
private void addToUserIDCacheOnRead(String userID, String userName, UserStore userStore) {
14064+
1405814065
UserIdResolverCache.getInstance()
1405914066
.addToCacheOnRead(UserCoreUtil.addDomainToName(userName, userStore.getDomainName()), userID,
1406014067
RESOLVE_USER_ID_FROM_USER_NAME_CACHE_NAME, tenantId);
1406114068
}
1406214069

1406314070
private void addToUserNameCache(String userID, String userName, UserStore userStore) {
1406414071

14072+
UserIdResolverCache.getInstance()
14073+
.addToCache(userID, UserCoreUtil.addDomainToName(userName, userStore.getDomainName()),
14074+
RESOLVE_USER_NAME_FROM_USER_ID_CACHE_NAME, tenantId);
14075+
}
14076+
14077+
private void addToUserNameCacheOnRead(String userID, String userName, UserStore userStore) {
14078+
1406514079
UserIdResolverCache.getInstance()
1406614080
.addToCacheOnRead(userID, UserCoreUtil.addDomainToName(userName, userStore.getDomainName()),
1406714081
RESOLVE_USER_NAME_FROM_USER_ID_CACHE_NAME, tenantId);
@@ -14082,6 +14096,16 @@ private void clearUserIDResolverCache(String userID, String userName, UserStore
1408214096

1408314097
private void addUsersToUserIdCache(List<User> userList) {
1408414098

14099+
UserIdResolverCache userIdResolverCacheInstance = UserIdResolverCache.getInstance();
14100+
for (User user : userList) {
14101+
userIdResolverCacheInstance.addToCache(
14102+
UserCoreUtil.addDomainToName(user.getUsername(), user.getUserStoreDomain()), user.getUserID(),
14103+
RESOLVE_USER_ID_FROM_USER_NAME_CACHE_NAME, tenantId);
14104+
}
14105+
}
14106+
14107+
private void addUsersToUserIdCacheOnRead(List<User> userList) {
14108+
1408514109
UserIdResolverCache userIdResolverCacheInstance = UserIdResolverCache.getInstance();
1408614110
for (User user : userList) {
1408714111
userIdResolverCacheInstance.addToCacheOnRead(
@@ -14092,6 +14116,16 @@ private void addUsersToUserIdCache(List<User> userList) {
1409214116

1409314117
private void addUsersToUserNameCache(List<User> userList) {
1409414118

14119+
UserIdResolverCache userIdResolverCacheInstance = UserIdResolverCache.getInstance();
14120+
for (User user : userList) {
14121+
userIdResolverCacheInstance.addToCache(
14122+
user.getUserID(), UserCoreUtil.addDomainToName(user.getUsername(), user.getUserStoreDomain()),
14123+
RESOLVE_USER_NAME_FROM_USER_ID_CACHE_NAME, tenantId);
14124+
}
14125+
}
14126+
14127+
private void addUsersToUserNameCacheOnRead(List<User> userList) {
14128+
1409514129
UserIdResolverCache userIdResolverCacheInstance = UserIdResolverCache.getInstance();
1409614130
for (User user : userList) {
1409714131
userIdResolverCacheInstance.addToCacheOnRead(
@@ -17210,8 +17244,8 @@ private List<User> getFilteredUsers(Condition condition, String profileName, int
1721017244
if (isUniqueUserIdEnabled(secManager)) {
1721117245
UniqueIDPaginatedSearchResult users = ((AbstractUserStoreManager) secManager)
1721217246
.doGetUserListWithID(condition, profileName, limit, offset, sortBy, sortOrder);
17213-
addUsersToUserIdCache(users.getUsers());
17214-
addUsersToUserNameCache(users.getUsers());
17247+
addUsersToUserIdCacheOnRead(users.getUsers());
17248+
addUsersToUserNameCacheOnRead(users.getUsers());
1721517249
filteredUsers = users.getUsers();
1721617250
} else {
1721717251
PaginatedSearchResult users = ((AbstractUserStoreManager) secManager)
@@ -18468,8 +18502,8 @@ public List<User> getUserListOfGroup(String groupID, int limit, int offset, Stri
1846818502
UniqueIDPaginatedSearchResult users = this.doGetUserListWithID(condition,
1846918503
UserCoreConstants.PRIMARY_DEFAULT_DOMAIN_NAME, resolveUserListLimit(limit), offset,
1847018504
sortBy, sortOrder);
18471-
addUsersToUserIdCache(users.getUsers());
18472-
addUsersToUserNameCache(users.getUsers());
18505+
addUsersToUserIdCacheOnRead(users.getUsers());
18506+
addUsersToUserNameCacheOnRead(users.getUsers());
1847318507
filteredUsers = users.getUsers();
1847418508
} else {
1847518509
PaginatedSearchResult users = this.doGetUserList(condition, UserCoreConstants.PRIMARY_DEFAULT_DOMAIN_NAME,

‎core/org.wso2.carbon.user.core/src/main/java/org/wso2/carbon/user/core/common/UserRolesCache.java‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,13 @@
1818
*/
1919
package org.wso2.carbon.user.core.common;
2020

21-
import org.apache.commons.lang.StringUtils;
21+
import java.util.concurrent.TimeUnit;
22+
23+
import javax.cache.Cache;
24+
import javax.cache.CacheConfiguration;
25+
import javax.cache.CacheManager;
26+
import javax.cache.Caching;
27+
2228
import org.apache.commons.logging.Log;
2329
import org.apache.commons.logging.LogFactory;
2430
import org.wso2.carbon.caching.impl.CachingConstants;
@@ -29,12 +35,6 @@
2935
import org.wso2.carbon.user.core.internal.UserStoreMgtDSComponent;
3036
import org.wso2.carbon.user.core.util.UserCoreUtil;
3137

32-
import javax.cache.Cache;
33-
import javax.cache.CacheConfiguration;
34-
import javax.cache.CacheManager;
35-
import javax.cache.Caching;
36-
import java.util.concurrent.TimeUnit;
37-
3838
public class UserRolesCache {
3939

4040
private static final String USER_ROLES_CACHE_MANAGER = "USER_ROLES_CACHE_MANAGER";
@@ -135,6 +135,7 @@ public void addToCache(String serverId, int tenantId, String userName, String[]
135135
*
136136
*/
137137
public void addToCacheOnRead(String serverId, int tenantId, String userName, String[] userRoleList) {
138+
138139
try {
139140
PrivilegedCarbonContext.startTenantFlow();
140141
PrivilegedCarbonContext carbonContext = PrivilegedCarbonContext.getThreadLocalCarbonContext();

‎core/org.wso2.carbon.user.core/src/main/java/org/wso2/carbon/user/core/common/UserUniqueIDManger.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,8 +106,8 @@ public User getUser(String uniqueId, AbstractUserStoreManager userStoreManager,
106106
return null;
107107
}
108108
userName = usernames[0];
109-
addToUserNameCache(uniqueId, userName);
110-
addToUserIDCache(uniqueId, userName);
109+
addToUserNameCacheOnRead(uniqueId, userName);
110+
addToUserIDCacheOnRead(uniqueId, userName);
111111
}
112112

113113
User user = new User();

‎core/org.wso2.carbon.user.core/src/main/java/org/wso2/carbon/user/core/ldap/ReadOnlyLDAPUserStoreManager.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4675,6 +4675,7 @@ protected void putToUserCache(String name, LdapName value) {
46754675
* @param value the LDAP name (DN)
46764676
*/
46774677
protected void putToUserCacheOnRead(String name, LdapName value) {
4678+
46784679
try {
46794680
startTenantFlow();
46804681
Cache<String, LdapName> userDnCache = createOrGetUserDnCache();

‎core/org.wso2.carbon.user.core/src/main/java/org/wso2/carbon/user/core/ldap/UniqueIDReadOnlyLDAPUserStoreManager.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1529,8 +1529,8 @@ public List<String> doGetUserListFromPropertiesWithID(String property, String va
15291529
if (StringUtils.equals(property,
15301530
realmConfig.getUserStoreProperty(LDAPConstants.USER_NAME_ATTRIBUTE))) {
15311531
putToUserCache(value, new LdapName(sr.getNameInNamespace()));
1532-
addToUserNameCache(propertyValue, value, getMyDomainName());
1533-
addToUserIDCache(propertyValue, value, getMyDomainName());
1532+
addToUserNameCacheOnRead(propertyValue, value, getMyDomainName());
1533+
addToUserIDCacheOnRead(propertyValue, value, getMyDomainName());
15341534
}
15351535
}
15361536
}

‎core/org.wso2.carbon.user.core/src/main/java/org/wso2/carbon/user/core/tenant/JDBCTenantManager.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -649,7 +649,7 @@ public String getDomain(int tenantId) throws UserStoreException {
649649
}
650650
tenantDomainNameValidation(tenantDomain);
651651
tenantDomainCache.addToCacheOnRead(tenantIdKey, new TenantDomainEntry(tenantDomain));
652-
tenantIdCache.addToCache(new TenantDomainKey(tenantDomain), new TenantIdEntry(tenantId));
652+
tenantIdCache.addToCacheOnRead(new TenantDomainKey(tenantDomain), new TenantIdEntry(tenantId));
653653
}
654654

655655
if (tenantDomain != null) {
@@ -751,7 +751,7 @@ public int getTenantId(String tenantDomain) throws UserStoreException {
751751
}
752752
tenantDomainNameValidation(tenantDomain);
753753
tenantIdCache.addToCacheOnRead(tenantDomainKey, new TenantIdEntry(tenantId));
754-
tenantDomainCache.addToCache(new TenantIdKey(tenantId), new TenantDomainEntry(tenantDomain));
754+
tenantDomainCache.addToCacheOnRead(new TenantIdKey(tenantId), new TenantDomainEntry(tenantDomain));
755755
}
756756
} catch (SQLException e) {
757757
DatabaseUtil.rollBack(dbConnection);

‎core/org.wso2.carbon.user.core/src/main/java/org/wso2/carbon/user/core/tenant/TenantDomainCache.java‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,15 @@
2222
* Date: Oct 1, 2010 Time: 2:36:37 PM
2323
*/
2424

25+
import javax.cache.Cache;
26+
import javax.cache.CacheManager;
27+
import javax.cache.Caching;
28+
2529
import org.apache.commons.logging.Log;
2630
import org.apache.commons.logging.LogFactory;
2731
import org.wso2.carbon.context.PrivilegedCarbonContext;
2832
import org.wso2.carbon.utils.multitenancy.MultitenantConstants;
2933

30-
import javax.cache.Cache;
31-
import javax.cache.CacheManager;
32-
import javax.cache.Caching;
33-
3434
/**
3535
* This is the tenant cache.
3636
*/
@@ -103,11 +103,12 @@ public void addToCacheOnRead(TenantIdKey key, TenantDomainEntry entry) {
103103
Cache<TenantIdKey, TenantDomainEntry> cache = getTenantDomainCache();
104104
if (cache != null) {
105105
cache.putOnRead(key, entry);
106-
log.debug(TENANT_DOMAIN_CACHE + " which is under " + TENANT_DOMAIN_CACHE_MANAGER + ", added the entry : " + entry
107-
+ " for the key : " + key + " successfully");
106+
log.debug(TENANT_DOMAIN_CACHE + " which is under " + TENANT_DOMAIN_CACHE_MANAGER +
107+
", added the entry : " + entry + " for the key : " + key + " successfully");
108108
} else {
109109
if (log.isDebugEnabled()) {
110-
log.debug("Error while getting the cache : " + TENANT_DOMAIN_CACHE + " which is under " + TENANT_DOMAIN_CACHE_MANAGER);
110+
log.debug("Error while getting the cache : " + TENANT_DOMAIN_CACHE +
111+
" which is under " + TENANT_DOMAIN_CACHE_MANAGER);
111112
}
112113
}
113114
} finally {

0 commit comments

Comments
 (0)