Refactor : Improve Code Maintainability, Readability, and Encapsulation

apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/grayReleaseRule/GrayReleaseRulesHolder.java

@@ -170,15 +170,20 @@ public boolean hasGrayReleaseRule(String clientAppId, String clientIp, String cl
       return true;
     }
     // check label gray rule
-    if (!Strings.isNullOrEmpty(clientLabel) &&
-        (reversedGrayReleaseRuleLabelCache.containsKey(
-            assembleReversedGrayReleaseRuleKey(clientAppId, namespaceName, clientLabel)) ||
-            reversedGrayReleaseRuleLabelCache.containsKey(
-                assembleReversedGrayReleaseRuleKey(clientAppId, namespaceName,
-                    GrayReleaseRuleItemDTO.ALL_Label)))) {
+
+    if (isClientLabelValid(clientLabel) && isGrayReleaseRulePresent(clientAppId, namespaceName, clientLabel)) {
       return true;
     }
     return false;
+    }
+
+  private boolean isClientLabelValid(String clientLabel) {
+    return !Strings.isNullOrEmpty(clientLabel);
+  }
+
+  private boolean isGrayReleaseRulePresent(String clientAppId, String namespaceName, String clientLabel) {
+    return reversedGrayReleaseRuleLabelCache.containsKey(assembleReversedGrayReleaseRuleKey(clientAppId, namespaceName, clientLabel)) ||
+            reversedGrayReleaseRuleLabelCache.containsKey(assembleReversedGrayReleaseRuleKey(clientAppId, namespaceName, GrayReleaseRuleItemDTO.ALL_Label));
   }
 
   private void scanGrayReleaseRules() {

apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/service/ItemSetService.java

@@ -63,46 +63,77 @@ public ItemChangeSets updateSet(Namespace namespace, ItemChangeSets changeSets)
   @Transactional
   public ItemChangeSets updateSet(String appId, String clusterName,
                                   String namespaceName, ItemChangeSets changeSet) {
-    Namespace namespace = namespaceService.findOne(appId, clusterName, namespaceName);
+    Namespace namespace = validateNamespace(appId, clusterName, namespaceName);
+    validateItemLimit(namespace, changeSet);
+
+    String operator = changeSet.getDataChangeLastModifiedBy();
+    ConfigChangeContentBuilder configChangeContentBuilder = new ConfigChangeContentBuilder();
+
+    processItemChanges(changeSet, namespace, operator, configChangeContentBuilder);
+    auditChanges(changeSet, operator);
+    commitChanges(appId, clusterName, namespaceName, configChangeContentBuilder, operator);
+
+    return changeSet;
+  }
 
+  private Namespace validateNamespace(String appId, String clusterName, String namespaceName) {
+    Namespace namespace = namespaceService.findOne(appId, clusterName, namespaceName);
     if (namespace == null) {
       throw NotFoundException.namespaceNotFound(appId, clusterName, namespaceName);
     }
+    return namespace;
+  }
 
-    if (bizConfig.isItemNumLimitEnabled()) {
-      int itemCount = itemService.findNonEmptyItemCount(namespace.getId());
-      int createItemCount = (int) changeSet.getCreateItems().stream().filter(item -> !StringUtils.isEmpty(item.getKey())).count();
-      int deleteItemCount = (int) changeSet.getDeleteItems().stream().filter(item -> !StringUtils.isEmpty(item.getKey())).count();
-      itemCount = itemCount + createItemCount - deleteItemCount;
-      if (itemCount > bizConfig.itemNumLimit()) {
-        throw new BadRequestException("The maximum number of items (" + bizConfig.itemNumLimit() + ") for this namespace has been reached. Current item count is " + itemCount + ".");
-      }
+  private void validateItemLimit(Namespace namespace, ItemChangeSets changeSet) {
+    if (!bizConfig.isItemNumLimitEnabled()) {
+      return;
     }
 
-    String operator = changeSet.getDataChangeLastModifiedBy();
-    ConfigChangeContentBuilder configChangeContentBuilder = new ConfigChangeContentBuilder();
+    int itemCount = itemService.findNonEmptyItemCount(namespace.getId());
+    int createItemCount = (int) changeSet.getCreateItems().stream()
+            .filter(item -> !StringUtils.isEmpty(item.getKey())).count();
+    int deleteItemCount = (int) changeSet.getDeleteItems().stream()
+            .filter(item -> !StringUtils.isEmpty(item.getKey())).count();
+
+    itemCount = itemCount + createItemCount - deleteItemCount;
+
+    if (itemCount > bizConfig.itemNumLimit()) {
+      throw new BadRequestException("The maximum number of items (" + bizConfig.itemNumLimit() +
+              ") for this namespace has been reached. Current item count is " + itemCount + ".");
+    }
+  }
 
+  private void processItemChanges(ItemChangeSets changeSet, Namespace namespace,
+                                  String operator, ConfigChangeContentBuilder configChangeContentBuilder) {
     if (!CollectionUtils.isEmpty(changeSet.getCreateItems())) {
-      this.doCreateItems(changeSet.getCreateItems(), namespace, operator, configChangeContentBuilder);
-      auditService.audit("ItemSet", null, Audit.OP.INSERT, operator);
+      doCreateItems(changeSet.getCreateItems(), namespace, operator, configChangeContentBuilder);
+    }
+    if (!CollectionUtils.isEmpty(changeSet.getUpdateItems())) {
+      doUpdateItems(changeSet.getUpdateItems(), namespace, operator, configChangeContentBuilder);
+    }
+    if (!CollectionUtils.isEmpty(changeSet.getDeleteItems())) {
+      doDeleteItems(changeSet.getDeleteItems(), namespace, operator, configChangeContentBuilder);
     }
+  }
 
+  private void auditChanges(ItemChangeSets changeSet, String operator) {
+    if (!CollectionUtils.isEmpty(changeSet.getCreateItems())) {
+      auditService.audit("ItemSet", null, Audit.OP.INSERT, operator);
+    }
     if (!CollectionUtils.isEmpty(changeSet.getUpdateItems())) {
-      this.doUpdateItems(changeSet.getUpdateItems(), namespace, operator, configChangeContentBuilder);
       auditService.audit("ItemSet", null, Audit.OP.UPDATE, operator);
     }
-
     if (!CollectionUtils.isEmpty(changeSet.getDeleteItems())) {
-      this.doDeleteItems(changeSet.getDeleteItems(), namespace, operator, configChangeContentBuilder);
       auditService.audit("ItemSet", null, Audit.OP.DELETE, operator);
     }
+  }
 
+  private void commitChanges(String appId, String clusterName, String namespaceName,
+                             ConfigChangeContentBuilder configChangeContentBuilder, String operator) {
     if (configChangeContentBuilder.hasContent()) {
-      commitService.createCommit(appId, clusterName, namespaceName, configChangeContentBuilder.build(),
-                                 changeSet.getDataChangeLastModifiedBy());
+      commitService.createCommit(appId, clusterName, namespaceName,
+              configChangeContentBuilder.build(), operator);
     }
-
-    return changeSet;
   }
 
   private void doDeleteItems(List<ItemDTO> toDeleteItems, Namespace namespace, String operator,

apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/service/ReleaseHistoryService.java

@@ -65,6 +65,8 @@ public class ReleaseHistoryService {
       ApolloThreadFactory.create("ReleaseHistoryService", true));
   private final AtomicBoolean cleanStopped = new AtomicBoolean(false);
 
+  private static final int BATCH_SIZE = 100; // Number of records processed per batch
+
   private final ReleaseHistoryRepository releaseHistoryRepository;
   private final ReleaseRepository releaseRepository;
   private final AuditService auditService;
@@ -189,7 +191,7 @@ private void cleanReleaseHistory(ReleaseHistory cleanRelease) {
     String branchName = cleanRelease.getBranchName();
 
     int retentionLimit = this.getReleaseHistoryRetentionLimit(cleanRelease);
-    //Second check, if retentionLimit is default value, do not clean
+    // Second check, if retentionLimit is default value, do not clean
     if (retentionLimit == DEFAULT_RELEASE_HISTORY_RETENTION_SIZE) {
       return;
     }
@@ -202,10 +204,11 @@ private void cleanReleaseHistory(ReleaseHistory cleanRelease) {
     boolean hasMore = true;
     while (hasMore && !Thread.currentThread().isInterrupted()) {
       List<ReleaseHistory> cleanReleaseHistoryList = releaseHistoryRepository.findFirst100ByAppIdAndClusterNameAndNamespaceNameAndBranchNameAndIdLessThanEqualOrderByIdAsc(
-          appId, clusterName, namespaceName, branchName, maxId.get());
+              appId, clusterName, namespaceName, branchName, maxId.get());
+
       Set<Long> releaseIds = cleanReleaseHistoryList.stream()
-          .map(ReleaseHistory::getReleaseId)
-          .collect(Collectors.toSet());
+              .map(ReleaseHistory::getReleaseId)
+              .collect(Collectors.toSet());
 
       transactionManager.execute(new TransactionCallbackWithoutResult() {
         @Override
@@ -214,7 +217,8 @@ protected void doInTransactionWithoutResult(TransactionStatus status) {
           releaseRepository.deleteAllById(releaseIds);
         }
       });
-      hasMore = cleanReleaseHistoryList.size() == 100;
+
+      hasMore = cleanReleaseHistoryList.size() == BATCH_SIZE;
     }
   }
 

apollo-common/src/main/java/com/ctrip/framework/apollo/common/constants/ApolloServer.java

@@ -16,10 +16,11 @@
  */
 package com.ctrip.framework.apollo.common.constants;
 
+import com.ctrip.framework.apollo.common.constants.VersionUtil;
+
 /**
  * @author Jason Song([email protected])
  */
 public class ApolloServer {
-  public final static String VERSION =
-      "java-" + ApolloServer.class.getPackage().getImplementationVersion();
+  public static final String VERSION = VersionUtil.getVersion(ApolloServer.class);
 }

apollo-common/src/main/java/com/ctrip/framework/apollo/common/constants/VersionUtil.java

@@ -0,0 +1,32 @@
+/*
+ * Copyright 2024 Apollo Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package com.ctrip.framework.apollo.common.constants;
+
+/**
+ * Utility class for retrieving version information.
+ */
+public class VersionUtil {
+    private VersionUtil() {
+        // Prevent instantiation
+    }
+
+    public static String getVersion(Class<?> clazz) {
+        String implementationVersion = clazz.getPackage().getImplementationVersion();
+        return "java-" + (implementationVersion != null ? implementationVersion : "unknown");
+    }
+}

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);