Refactor: Extracted common user search logic into a separate service class

               - Moved  findUsers method to UserSearchService to remove duplication
               - Updated OidcLocalUserServiceImpl and SpringSecurityUserService to use the new service
               - Improved code maintainability and reusability

Author: Arsh255

apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/spi/oidc/OidcLocalUserServiceImpl.java

@@ -27,6 +27,8 @@
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
+
+import com.ctrip.framework.apollo.portal.util.UserSearchService;
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.authority.SimpleGrantedAuthority;
 import org.springframework.security.core.userdetails.User;
@@ -53,11 +55,14 @@ public class OidcLocalUserServiceImpl implements OidcLocalUserService {
 
   private final UserRepository userRepository;
 
+  private final UserSearchService userSearchService;
+
   public OidcLocalUserServiceImpl(
       JdbcUserDetailsManager userDetailsManager,
       UserRepository userRepository) {
     this.userDetailsManager = userDetailsManager;
     this.userRepository = userRepository;
+    this.userSearchService = new UserSearchService(userRepository);
   }
 
   @Transactional(rollbackFor = Exception.class)
@@ -89,46 +94,14 @@ public void updateUserInfo(UserInfo newUserInfo) {
   @Override
   public List<UserInfo> searchUsers(String keyword, int offset, int limit,
       boolean includeInactiveUsers) {
-    List<UserPO> users = this.findUsers(keyword, includeInactiveUsers);
+    List<UserPO> users = this.userSearchService.findUsers(keyword, includeInactiveUsers);
     if (CollectionUtils.isEmpty(users)) {
       return Collections.emptyList();
     }
     return users.stream().map(UserPO::toUserInfo)
         .collect(Collectors.toList());
   }
 
-  private List<UserPO> findUsers(String keyword, boolean includeInactiveUsers) {
-    Map<Long, UserPO> users = new HashMap<>();
-    List<UserPO> byUsername;
-    List<UserPO> byUserDisplayName;
-    if (includeInactiveUsers) {
-      if (StringUtils.isEmpty(keyword)) {
-        return (List<UserPO>) userRepository.findAll();
-      }
-      byUsername = userRepository.findByUsernameLike("%" + keyword + "%");
-      byUserDisplayName = userRepository.findByUserDisplayNameLike("%" + keyword + "%");
-    } else {
-      if (StringUtils.isEmpty(keyword)) {
-        return userRepository.findFirst20ByEnabled(1);
-      }
-      byUsername = userRepository
-          .findByUsernameLikeAndEnabled("%" + keyword + "%", 1);
-      byUserDisplayName = userRepository
-          .findByUserDisplayNameLikeAndEnabled("%" + keyword + "%", 1);
-    }
-    if (!CollectionUtils.isEmpty(byUsername)) {
-      for (UserPO user : byUsername) {
-        users.put(user.getId(), user);
-      }
-    }
-    if (!CollectionUtils.isEmpty(byUserDisplayName)) {
-      for (UserPO user : byUserDisplayName) {
-        users.put(user.getId(), user);
-      }
-    }
-    return new ArrayList<>(users.values());
-  }
-
   @Override
   public UserInfo findByUserId(String userId) {
     UserPO userPO = userRepository.findByUsername(userId);

apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/spi/springsecurity/SpringSecurityUserService.java

@@ -27,6 +27,8 @@
 
 import java.util.HashMap;
 import java.util.Map;
+
+import com.ctrip.framework.apollo.portal.util.UserSearchService;
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
@@ -47,13 +49,16 @@ public class SpringSecurityUserService implements UserService {
 
   private final AuthorityRepository authorityRepository;
 
+  private final UserSearchService userSearchService;
+
   public SpringSecurityUserService(
       PasswordEncoder passwordEncoder,
       UserRepository userRepository,
       AuthorityRepository authorityRepository) {
     this.passwordEncoder = passwordEncoder;
     this.userRepository = userRepository;
     this.authorityRepository = authorityRepository;
+    this.userSearchService = new UserSearchService(userRepository);
   }
 
   @Transactional
@@ -102,45 +107,14 @@ public void changeEnabled(UserPO user) {
   @Override
   public List<UserInfo> searchUsers(String keyword, int offset, int limit,
       boolean includeInactiveUsers) {
-    List<UserPO> users = this.findUsers(keyword, includeInactiveUsers);
+    List<UserPO> users = this.userSearchService.findUsers(keyword, includeInactiveUsers);
     if (CollectionUtils.isEmpty(users)) {
       return Collections.emptyList();
     }
     return users.stream().map(UserPO::toUserInfo)
         .collect(Collectors.toList());
   }
 
-  private List<UserPO> findUsers(String keyword, boolean includeInactiveUsers) {
-    Map<Long, UserPO> users = new HashMap<>();
-    List<UserPO> byUsername;
-    List<UserPO> byUserDisplayName;
-    if (includeInactiveUsers) {
-      if (StringUtils.isEmpty(keyword)) {
-        return (List<UserPO>) userRepository.findAll();
-      }
-      byUsername = userRepository.findByUsernameLike("%" + keyword + "%");
-      byUserDisplayName = userRepository.findByUserDisplayNameLike("%" + keyword + "%");
-    } else {
-      if (StringUtils.isEmpty(keyword)) {
-        return userRepository.findFirst20ByEnabled(1);
-      }
-      byUsername = userRepository.findByUsernameLikeAndEnabled("%" + keyword + "%", 1);
-      byUserDisplayName = userRepository
-          .findByUserDisplayNameLikeAndEnabled("%" + keyword + "%", 1);
-    }
-    if (!CollectionUtils.isEmpty(byUsername)) {
-      for (UserPO user : byUsername) {
-        users.put(user.getId(), user);
-      }
-    }
-    if (!CollectionUtils.isEmpty(byUserDisplayName)) {
-      for (UserPO user : byUserDisplayName) {
-        users.put(user.getId(), user);
-      }
-    }
-    return new ArrayList<>(users.values());
-  }
-
   @Override
   public UserInfo findByUserId(String userId) {
     UserPO userPO = userRepository.findByUsername(userId);

apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/util/UserSearchService.java

@@ -0,0 +1,53 @@
+package com.ctrip.framework.apollo.portal.util;
+
+import com.ctrip.framework.apollo.portal.entity.po.UserPO;
+import com.ctrip.framework.apollo.portal.repository.UserRepository;
+import org.springframework.util.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public class UserSearchService {
+
+    private final UserRepository userRepository;
+
+    public UserSearchService(UserRepository userRepository) {
+        this.userRepository = userRepository;
+    }
+
+    public List<UserPO> findUsers(String keyword, boolean includeInactiveUsers) {
+        Map<Long, UserPO> users = new HashMap<>();
+        List<UserPO> byUsername;
+        List<UserPO> byUserDisplayName;
+
+        if (includeInactiveUsers) {
+            if (StringUtils.isEmpty(keyword)) {
+                return (List<UserPO>) userRepository.findAll();
+            }
+            byUsername = userRepository.findByUsernameLike("%" + keyword + "%");
+            byUserDisplayName = userRepository.findByUserDisplayNameLike("%" + keyword + "%");
+        } else {
+            if (StringUtils.isEmpty(keyword)) {
+                return userRepository.findFirst20ByEnabled(1);
+            }
+            byUsername = userRepository.findByUsernameLikeAndEnabled("%" + keyword + "%", 1);
+            byUserDisplayName = userRepository.findByUserDisplayNameLikeAndEnabled("%" + keyword + "%", 1);
+        }
+
+        if (!CollectionUtils.isEmpty(byUsername)) {
+            for (UserPO user : byUsername) {
+                users.put(user.getId(), user);
+            }
+        }
+        if (!CollectionUtils.isEmpty(byUserDisplayName)) {
+            for (UserPO user : byUserDisplayName) {
+                users.put(user.getId(), user);
+            }
+        }
+
+        return new ArrayList<>(users.values());
+    }
+}