fix：Optimize CHANGES.md、unit tests、usage documentation

CHANGES.md

@@ -9,7 +9,8 @@ Apollo 2.4.0
 * [Feature support portal restTemplate Client connection pool config](https://github.com/apolloconfig/apollo/pull/5200)
 * [Feature added the ability for administrators to globally search for Value](https://github.com/apolloconfig/apollo/pull/5182)
 * [Fix link namespace published items show missing some items](https://github.com/apolloconfig/apollo/pull/5240)
-* [Feature added determine appid+cluster namespace num limit logic](https://github.com/apolloconfig/apollo/pull/5227)
+* [Feature: Add limit and whitelist for namespace count per appid+cluster](https://github.com/apolloconfig/apollo/pull/5228)
+
 * 
 ------------------
 All issues and pull requests are [here](https://github.com/apolloconfig/apollo/milestone/15?closed=1)

apollo-biz/src/test/java/com/ctrip/framework/apollo/biz/service/NamespaceServiceIntegrationTest.java

@@ -37,8 +37,8 @@
 import java.util.HashSet;
 import org.junit.Assert;
 import org.junit.Test;
-import org.mockito.Mock;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.test.context.jdbc.Sql;
@@ -74,7 +74,7 @@ public class NamespaceServiceIntegrationTest extends AbstractIntegrationTest {
   @Autowired
   private NamespaceRepository namespaceRepository;
 
-  @Mock
+  @MockBean
   private BizConfig bizConfig;
 
   private String testApp = "testApp";
@@ -153,11 +153,9 @@ public void testGetCommitsByModifiedTime() throws ParseException {
   @Sql(scripts = "/sql/clean.sql", executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD)
   public void testNamespaceNumLimit() {
 
-    ReflectionTestUtils.setField(namespaceService, "bizConfig", bizConfig);
     when(bizConfig.isNamespaceNumLimitEnabled()).thenReturn(true);
     when(bizConfig.namespaceNumLimit()).thenReturn(2);
 
-
     Namespace namespace = new Namespace();
     namespace.setAppId(testApp);
     namespace.setClusterName(testCluster);
@@ -195,15 +193,11 @@ public void testNamespaceNumLimitFalse() {
     namespace.setNamespaceName("demo-namespace");
     namespaceService.save(namespace);
 
-    try {
-      Namespace namespace2 = new Namespace();
-      namespace2.setAppId(testApp);
-      namespace2.setClusterName(testCluster);
-      namespace2.setNamespaceName("demo-namespace2");
-      namespaceService.save(namespace2);
-    } catch (Exception e) {
-      Assert.assertTrue(e instanceof ServiceException);
-    }
+    Namespace namespace2 = new Namespace();
+    namespace2.setAppId(testApp);
+    namespace2.setClusterName(testCluster);
+    namespace2.setNamespaceName("demo-namespace2");
+    namespaceService.save(namespace2);
 
     int nowCount = namespaceRepository.countByAppIdAndClusterName(testApp, testCluster);
     Assert.assertEquals(3, nowCount);
@@ -226,15 +220,11 @@ public void testNamespaceNumLimitWhite() {
     namespace.setNamespaceName("demo-namespace");
     namespaceService.save(namespace);
 
-    try {
-      Namespace namespace2 = new Namespace();
-      namespace2.setAppId(testApp);
-      namespace2.setClusterName(testCluster);
-      namespace2.setNamespaceName("demo-namespace2");
-      namespaceService.save(namespace2);
-    } catch (Exception e) {
-      Assert.assertTrue(e instanceof ServiceException);
-    }
+    Namespace namespace2 = new Namespace();
+    namespace2.setAppId(testApp);
+    namespace2.setClusterName(testCluster);
+    namespace2.setNamespaceName("demo-namespace2");
+    namespaceService.save(namespace2);
 
     int nowCount = namespaceRepository.countByAppIdAndClusterName(testApp, testCluster);
     Assert.assertEquals(3, nowCount);

docs/en/portal/apollo-user-guide.md

@@ -511,7 +511,7 @@ Please note that modifications to system parameters may affect the performance o
 
 
 
-## 6.4 单个命名空间下的配置项数量限制
+## 6.4 Parameter settings for limiting the number of namespaces in the appld+cluster dimension
 
 Starting from version 2.4.0, apollo-portal provides the function of checking the upper limit of the number of namespaces that can be created under the appld+cluster dimension. This function is disabled by default and needs to be enabled by configuring the system `namespace.num.limit.enabled`. At the same time, the system parameter `namespace.num.limit` is provided to dynamically configure the upper limit of the number of Namespaces under the appld+cluster dimension. The default value is 200. Considering that some basic components such as gateways, message queues, Redis, and databases require special processing, a new system parameter `namespace.num.limit.white` is added to configure the verification whitelist, which is not affected by the upper limit of the number of Namespaces.
 
@@ -520,19 +520,15 @@ Starting from version 2.4.0, apollo-portal provides the function of checking the
 1. Log in to the Apollo Configuration Center interface with a super administrator account.
 2. Go to the `Administrator Tools - System Parameters - ConfigDB Configuration Management` page and add or modify the `namespace.num.limit.enabled` configuration item to true/false to enable/disable this function. It is disabled by default.
 
-[//]: # (   ![item-num-limit-enabled](https://cdn.jsdelivr.net/gh/apolloconfig/apollo@master/doc/images/namespace-num-limit-enabled.png))
-![item-num-limit-enabled](../../../doc/images/namespace-num-limit-enabled.png)
+   ![item-num-limit-enabled](https://cdn.jsdelivr.net/gh/apolloconfig/apollo@master/doc/images/namespace-num-limit-enabled.png)
 
 3. Go to the `Administrator Tools - System Parameters - ConfigDB Configuration Management` page to add or modify the `namespace.num.limit` configuration item to configure the upper limit of the number of namespaces under a single appld+cluster. The default value is 200
 
-[//]: # (   ![item-num-limit](https://cdn.jsdelivr.net/gh/apolloconfig/apollo@master/doc/images/namespace-num-limit.png))
-![item-num-limit](../../../doc/images/namespace-num-limit.png)
+   ![item-num-limit](https://cdn.jsdelivr.net/gh/apolloconfig/apollo@master/doc/images/namespace-num-limit.png)
 
 4. Go to `Administrator Tools - System Parameters - ConfigDB Configuration Management` page to add or modify the `namespace.num.limit.white` configuration item to configure the whitelist for namespace quantity limit verification. Multiple AppIds are separated by English commas.
 
-[//]: # (   ![item-num-limit](https://cdn.jsdelivr.net/gh/apolloconfig/apollo@master/doc/images/namespace-num-limit-white.png))
-![item-num-limit](../../../doc/images/namespace-num-limit-white.png)
-
+   ![item-num-limit](https://cdn.jsdelivr.net/gh/apolloconfig/apollo@master/doc/images/namespace-num-limit-white.png)
 
 
 

docs/zh/portal/apollo-user-guide.md

@@ -483,24 +483,22 @@ Apollo从1.6.0版本开始增加访问密钥机制，从而只有经过身份验
 ![System-parameterization-of-global-search-configuration-items](../images/System-parameterization-of-global-search-configuration-items.png)
 
 
-## 6.4 单个命名空间下的配置项数量限制
+## 6.4 appld+cluster维度下命名空间数量限制功能参数设置
 从2.4.0版本开始，apollo-portal提供了appld+cluster维度下可以创建的命名空间数量上限校验的功能，此功能默认关闭，需要配置系统 `namespace.num.limit.enabled` 开启，同时提供了系统参数`namespace.num.limit`来动态配置appld+cluster维度下的Namespace数量上限值，默认为200个，考虑到一些基础组件如网关、消息队列、Redis、数据库等需要特殊处理，新增了系统参数`namespace.num.limit.white` 来配置校验白名单，不受Namespace数量上限的影响
 
 **设置方法：**
 1. 用超级管理员账号登录到Apollo配置中心的界面
 2. 进入 `管理员工具 - 系统参数 - ConfigDB 配置管理` 页面新增或修改 `namespace.num.limit.enabled` 配置项为true/false 即可开启/关闭此功能，默认关闭
 
-[//]: # (   ![item-num-limit-enabled](https://cdn.jsdelivr.net/gh/apolloconfig/apollo@master/doc/images/namespace-num-limit-enabled.png))
-![item-num-limit-enabled](../../../doc/images/namespace-num-limit-enabled.png)
+   ![item-num-limit-enabled](https://cdn.jsdelivr.net/gh/apolloconfig/apollo@master/doc/images/namespace-num-limit-enabled.png)
+
 3. 进入 `管理员工具 - 系统参数 - ConfigDB 配置管理` 页面新增或修改 `namespace.num.limit` 配置项来配置单个appld+cluster下的namespace数量上限值，默认为200
 
-[//]: # (   ![item-num-limit](https://cdn.jsdelivr.net/gh/apolloconfig/apollo@master/doc/images/namespace-num-limit.png))
-![item-num-limit](../../../doc/images/namespace-num-limit.png)
+   ![item-num-limit](https://cdn.jsdelivr.net/gh/apolloconfig/apollo@master/doc/images/namespace-num-limit.png)
 
 4. 进入 `管理员工具 - 系统参数 - ConfigDB 配置管理` 页面新增或修改 `namespace.num.limit.white` 配置项来配置namespace数量上限校验的白名单，多个AppId使用英文逗号分隔
 
-[//]: # (   ![item-num-limit](https://cdn.jsdelivr.net/gh/apolloconfig/apollo@master/doc/images/namespace-num-limit-white.png))
-![item-num-limit](../../../doc/images/namespace-num-limit-white.png)
+   ![item-num-limit](https://cdn.jsdelivr.net/gh/apolloconfig/apollo@master/doc/images/namespace-num-limit-white.png)