optimize: Add some checks to RegistryFactory

changes/en-us/2.x.md

@@ -35,8 +35,9 @@ Add changes here for all PR submitted to the 2.x branch.
 - [[#7282](https://github.com/apache/incubator-seata/pull/7282)] optimize unexpected NullPointerException in lookup method in FileRegistryServiceImpl class
 - [[#7310](https://github.com/seata/seata/pull/7310)] Optimize minor issues in the naming-server
 - [[#7329](https://github.com/apache/incubator-seata/pull/7329)] upgrade tomcat to 9.0.100
-- [[#7344](https://github.com/apache/incubator-seata/pull/7344)] raft mode performs transaction size check in advance
 - [[#7337](https://github.com/apache/incubator-seata/pull/7337)] Add ChannelEventListener support to prevent memory leaks
+- [[#7344](https://github.com/apache/incubator-seata/pull/7344)] raft mode performs transaction size check in advance
+- [[#7345](https://github.com/apache/incubator-seata/pull/7345)] add empty check and duplicate type check to RegistryFactory
 
 
 ### security:
@@ -64,6 +65,7 @@ Add changes here for all PR submitted to the 2.x branch.
 - [[#7294](https://github.com/apache/incubator-seata/pull/7294)] improved test testGetInsertParamsValue in SqlServerInsertRecognizerTest by splitting and parameterizing
 - [[#7295](https://github.com/apache/incubator-seata/pull/7295)] updated 3 tests in StringUtilsTest to use parameterized unit testing
 - [[#7205](https://github.com/apache/incubator-seata/issues/7205)] add UT for namingserver module
+- 
 ### refactor:
 
 - [[#7315](https://github.com/apache/incubator-seata/pull/7315)] Refactor log testing to use ListAppender for more accurate and efficient log capture

changes/zh-cn/2.x.md

@@ -33,8 +33,9 @@
 - [[#7282](https://github.com/apache/incubator-seata/pull/7282)] 优化FileRegistryServiceImpl类lookup的NullPointerException问题
 - [[#7310](https://github.com/seata/seata/pull/7310)] 优化naming-server中的一些小问题
 - [[#7329](https://github.com/apache/incubator-seata/pull/7329)] 将 tomcat 升级到 9.0.100
-- [[#7344](https://github.com/apache/incubator-seata/pull/7344)] raft模式提前检查事务大小
 - [[#7337](https://github.com/apache/incubator-seata/pull/7337)] 添加 ChannelEventListener 支持以防止内存泄漏
+- [[#7344](https://github.com/apache/incubator-seata/pull/7344)] raft模式提前检查事务大小
+- [[#7345](https://github.com/apache/incubator-seata/pull/7345)] 为 RegistryFactory 增加空校验与重复类型检查
 
 
 ### security:

discovery/seata-discovery-core/src/main/java/org/apache/seata/discovery/registry/MultiRegistryFactory.java

@@ -17,8 +17,10 @@
 package org.apache.seata.discovery.registry;
 
 import java.util.ArrayList;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Objects;
+import java.util.Set;
 
 import org.apache.seata.common.ConfigurationKeys;
 import org.apache.seata.common.Constants;
@@ -31,7 +33,6 @@
 
 /**
  * The type multiple Registry factory.
- *
  */
 public class MultiRegistryFactory {
 
@@ -48,26 +49,36 @@ public static List<RegistryService> getInstances() {
 
     private static List<RegistryService> buildRegistryServices() {
         List<RegistryService> registryServices = new ArrayList<>();
-        String registryTypeNamesStr =
-            ConfigurationFactory.CURRENT_FILE_INSTANCE.getConfig(ConfigurationKeys.FILE_ROOT_REGISTRY
-                + ConfigurationKeys.FILE_CONFIG_SPLIT_CHAR + ConfigurationKeys.FILE_ROOT_TYPE);
+        Set<String> processedRegistryTypes = new HashSet<>();
+        String registryTypeNamesStr = ConfigurationFactory.CURRENT_FILE_INSTANCE.getConfig(
+                ConfigurationKeys.FILE_ROOT_REGISTRY + ConfigurationKeys.FILE_CONFIG_SPLIT_CHAR + ConfigurationKeys.FILE_ROOT_TYPE);
+
         if (StringUtils.isBlank(registryTypeNamesStr)) {
             registryTypeNamesStr = RegistryType.File.name();
         }
         String[] registryTypeNames = registryTypeNamesStr.split(Constants.REGISTRY_TYPE_SPLIT_CHAR);
+
         if (registryTypeNames.length > 1) {
             LOGGER.info("use multi registry center type: {}", registryTypeNamesStr);
         }
+
         for (String registryTypeName : registryTypeNames) {
             RegistryType registryType;
             try {
                 registryType = RegistryType.getType(registryTypeName);
             } catch (Exception exx) {
                 throw new NotSupportYetException("not support registry type: " + registryTypeName);
             }
+
+            if (processedRegistryTypes.contains(registryType.name())) {
+                LOGGER.warn("The duplicate registration center type '{}' was found in the configuration and has been skipped.", registryType.name());
+                continue;
+            }
+
             RegistryService registryService = EnhancedServiceLoader
-                .load(RegistryProvider.class, Objects.requireNonNull(registryType).name()).provide();
+                    .load(RegistryProvider.class, Objects.requireNonNull(registryType).name()).provide();
             registryServices.add(registryService);
+            processedRegistryTypes.add(registryType.name());
         }
         return registryServices;
     }

discovery/seata-discovery-core/src/main/java/org/apache/seata/discovery/registry/RegistryFactory.java

@@ -20,14 +20,14 @@
 
 import org.apache.seata.common.exception.NotSupportYetException;
 import org.apache.seata.common.loader.EnhancedServiceLoader;
+import org.apache.seata.common.util.StringUtils;
 import org.apache.seata.config.ConfigurationFactory;
 import org.apache.seata.config.ConfigurationKeys;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
  * The type Registry factory.
- *
  */
 public class RegistryFactory {
 
@@ -45,8 +45,12 @@ public static RegistryService getInstance() {
     private static RegistryService buildRegistryService() {
         RegistryType registryType;
         String registryTypeName = ConfigurationFactory.CURRENT_FILE_INSTANCE.getConfig(
-            ConfigurationKeys.FILE_ROOT_REGISTRY + ConfigurationKeys.FILE_CONFIG_SPLIT_CHAR
-                + ConfigurationKeys.FILE_ROOT_TYPE);
+                ConfigurationKeys.FILE_ROOT_REGISTRY + ConfigurationKeys.FILE_CONFIG_SPLIT_CHAR + ConfigurationKeys.FILE_ROOT_TYPE);
+
+        if (StringUtils.isBlank(registryTypeName)) {
+            registryTypeName = RegistryType.File.name();
+        }
+
         LOGGER.info("use registry center type: {}", registryTypeName);
         try {
             registryType = RegistryType.getType(registryTypeName);

discovery/seata-discovery-core/src/test/java/org/apache/seata/discovery/registry/MultiRegistryFactoryTest.java

@@ -0,0 +1,106 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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 org.apache.seata.discovery.registry;
+
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.List;
+
+import org.apache.seata.common.ConfigurationKeys;
+import org.apache.seata.common.Constants;
+import org.apache.seata.common.exception.NotSupportYetException;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+/**
+ * The type Multi registry factory test.
+ */
+public class MultiRegistryFactoryTest {
+
+    private static final String REGISTRY_TYPE_KEY =
+            ConfigurationKeys.FILE_ROOT_REGISTRY + ConfigurationKeys.FILE_CONFIG_SPLIT_CHAR + ConfigurationKeys.FILE_ROOT_TYPE;
+
+    @AfterEach
+    public void tearDown() {
+        System.clearProperty(REGISTRY_TYPE_KEY);
+    }
+
+    /**
+     * Test getInstances with default config.
+     */
+    @Test
+    public void testGetInstancesWithDefaultConfig() {
+        // Set "registry.type = file" as default config
+        System.setProperty(REGISTRY_TYPE_KEY, RegistryType.File.name());
+
+        List<RegistryService> instances = MultiRegistryFactory.getInstances();
+        Assertions.assertNotNull(instances);
+
+        for (RegistryService service : instances) {
+            Assertions.assertNotNull(service);
+        }
+    }
+
+    /**
+     * Test buildRegistryServices with multiple tests of the same registry type.
+     */
+    @Test
+    public void testGetInstancesWithMultiRegistryTypes() throws Throwable {
+        // Set up multiple registration center configurations
+        System.setProperty(REGISTRY_TYPE_KEY, RegistryType.File.name() + Constants.REGISTRY_TYPE_SPLIT_CHAR + RegistryType.File.name());
+
+        List<RegistryService> instances = invokeBuildRegistryServices();
+        Assertions.assertNotNull(instances);
+        Assertions.assertEquals(1, instances.size());
+    }
+
+    /**
+     * Test buildRegistryServices with blank registry type.
+     */
+    @Test
+    public void testGetInstancesWithBlankRegistryType() throws Throwable {
+        System.setProperty(REGISTRY_TYPE_KEY, "");
+
+        List<RegistryService> instances = invokeBuildRegistryServices();
+        Assertions.assertNotNull(instances);
+    }
+
+    /**
+     * Test buildRegistryServices with invalid registry type.
+     */
+    @Test
+    public void testGetInstancesWithInvalidRegistryType() {
+        System.setProperty(REGISTRY_TYPE_KEY, "InvalidRegistryType");
+
+        Assertions.assertThrows(NotSupportYetException.class, MultiRegistryFactoryTest::invokeBuildRegistryServices);
+    }
+
+    /**
+     * Use reflection to call the buildRegistryServices method
+     */
+    private static List<RegistryService> invokeBuildRegistryServices() throws Throwable {
+        Method buildMethod = MultiRegistryFactory.class.getDeclaredMethod("buildRegistryServices");
+        buildMethod.setAccessible(true);
+
+        try {
+            return (List<RegistryService>) buildMethod.invoke(null);
+        } catch (InvocationTargetException e) {
+            throw e.getTargetException();
+        }
+    }
+}

discovery/seata-discovery-core/src/test/java/org/apache/seata/discovery/registry/RegistryFactoryTest.java

@@ -0,0 +1,86 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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 org.apache.seata.discovery.registry;
+
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+
+import org.apache.seata.common.ConfigurationKeys;
+import org.apache.seata.common.exception.NotSupportYetException;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+/**
+ * The type Registry factory test.
+ */
+public class RegistryFactoryTest {
+
+    private static final String REGISTRY_TYPE_KEY =
+            ConfigurationKeys.FILE_ROOT_REGISTRY + ConfigurationKeys.FILE_CONFIG_SPLIT_CHAR + ConfigurationKeys.FILE_ROOT_TYPE;
+
+    @AfterEach
+    public void tearDown() {
+        System.clearProperty(REGISTRY_TYPE_KEY);
+    }
+
+    /**
+     * Test getInstance with default config.
+     */
+    @Test
+    public void testGetInstanceWithDefaultConfig() {
+        System.setProperty(REGISTRY_TYPE_KEY, RegistryType.File.name());
+
+        RegistryService instance = RegistryFactory.getInstance();
+        Assertions.assertNotNull(instance);
+    }
+
+    /**
+     * Test buildRegistryService with invalid registry type.
+     */
+    @Test
+    public void testGetInstanceOfInvalidRegistryType() {
+        System.setProperty(REGISTRY_TYPE_KEY, "InvalidRegistryType");
+
+        Assertions.assertThrows(NotSupportYetException.class, RegistryFactoryTest::invokeBuildRegistryService);
+    }
+
+    /**
+     * Test buildRegistryService with blank registry type.
+     */
+    @Test
+    public void testGetInstancesWithBlankRegistryType() throws Throwable {
+        System.setProperty(REGISTRY_TYPE_KEY, "");
+
+        RegistryService instance = invokeBuildRegistryService();
+        Assertions.assertEquals(instance.getClass(), FileRegistryServiceImpl.class);
+    }
+
+    /**
+     * Use reflection to call the buildRegistryServices method
+     */
+    private static RegistryService invokeBuildRegistryService() throws Throwable {
+        Method buildMethod = RegistryFactory.class.getDeclaredMethod("buildRegistryService");
+
+        buildMethod.setAccessible(true);
+        try {
+            return (RegistryService) buildMethod.invoke(null);
+        } catch (InvocationTargetException e) {
+            throw e.getTargetException();
+        }
+    }
+}