Merge pull request #4438 from PasinduYeshan/fix/selective-claim3

Remove claim retrieval skip logic from recursive methods.

Author: PasinduYeshan

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

@@ -3267,19 +3267,6 @@ private List<String> doGetUserList(String claim, String claimValue, String profi
             // For all the user stores append the domain name to the claim and pass it recursively (Including PRIMARY).
             String domainName = ((AbstractUserStoreManager) userStoreManager).getMyDomainName();
 
-            try {
-                if (isIdentityStoreManagedClaim(claimManager.getClaim(claim), domainName, userStoreManager)) {
-                    if (log.isDebugEnabled()) {
-                        log.debug("The claim: " + claim + " is an identity store managed claim for the domain: "
-                                + domainName + ". Hence skipping the user store.");
-                    }
-                    continue;
-                }
-            } catch (org.wso2.carbon.user.api.UserStoreException e) {
-                log.error(String.format("Error occurred while retrieving claim for claim URI: %s for domain: %s.",
-                        claim, domainName), e);
-            }
-
             String claimValueWithDomain;
             if (StringUtils.equalsIgnoreCase(domainName, UserCoreConstants.PRIMARY_DEFAULT_DOMAIN_NAME)) {
                 claimValueWithDomain = domainName + CarbonConstants.DOMAIN_SEPARATOR + claimValue;
@@ -3543,19 +3530,6 @@ private List<User> doGetUserListWithID(String claim, String claimValue, String p
             // For all the user stores append the domain name to the claim and pass it recursively (Including PRIMARY).
             String domainName = ((AbstractUserStoreManager) userStoreManager).getMyDomainName();
 
-            try {
-                if (isIdentityStoreManagedClaim(claimManager.getClaim(claim), domainName, userStoreManager)) {
-                    if (log.isDebugEnabled()) {
-                        log.debug("The claim: " + claim + " is an identity store managed claim for the domain: "
-                                + domainName + ". Hence skipping the user store.");
-                    }
-                    continue;
-                }
-            } catch (org.wso2.carbon.user.api.UserStoreException e) {
-                log.error(String.format("Error occurred while retrieving claim for claim URI: %s for domain: %s.",
-                        claim, domainName), e);
-            }
-
             String claimValueWithDomain;
             if (StringUtils.equalsIgnoreCase(domainName, UserCoreConstants.PRIMARY_DEFAULT_DOMAIN_NAME)) {
                 claimValueWithDomain = domainName + CarbonConstants.DOMAIN_SEPARATOR + claimValue;