From 53963d4acbf1340cc128f2af2724c63e01f337e3 Mon Sep 17 00:00:00 2001
From: PeineLiang <peineliang@163.com>
Date: Tue, 26 May 2020 14:40:47 +0800
Subject: [PATCH] optimize: optimize get config type from configuration (#2730)

---
 .../src/main/java/io/seata/config/ConfigType.java         | 2 +-
 .../main/java/io/seata/config/ConfigurationFactory.java   | 8 +++++++-
 .../java/io/seata/discovery/registry/RegistryType.java    | 4 +---
 .../main/java/io/seata/metrics/exporter/ExporterType.java | 4 +---
 .../main/java/io/seata/metrics/registry/RegistryType.java | 4 +---
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/config/seata-config-core/src/main/java/io/seata/config/ConfigType.java b/config/seata-config-core/src/main/java/io/seata/config/ConfigType.java
index 27fbd702d40..326a1d47fca 100644
--- a/config/seata-config-core/src/main/java/io/seata/config/ConfigType.java
+++ b/config/seata-config-core/src/main/java/io/seata/config/ConfigType.java
@@ -66,6 +66,6 @@ public static ConfigType getType(String name) {
                 return configType;
             }
         }
-        throw new IllegalArgumentException("illegal type:" + name);
+        throw new IllegalArgumentException("not support config type: " + name);
     }
 }
diff --git a/config/seata-config-core/src/main/java/io/seata/config/ConfigurationFactory.java b/config/seata-config-core/src/main/java/io/seata/config/ConfigurationFactory.java
index 445d54859f2..5b08c4dddbc 100644
--- a/config/seata-config-core/src/main/java/io/seata/config/ConfigurationFactory.java
+++ b/config/seata-config-core/src/main/java/io/seata/config/ConfigurationFactory.java
@@ -20,6 +20,7 @@
 import io.seata.common.exception.NotSupportYetException;
 import io.seata.common.loader.EnhancedServiceLoader;
 import io.seata.common.loader.EnhancedServiceNotFoundException;
+import io.seata.common.util.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -101,9 +102,14 @@ private static Configuration buildConfiguration() {
             configTypeName = CURRENT_FILE_INSTANCE.getConfig(
                 ConfigurationKeys.FILE_ROOT_CONFIG + ConfigurationKeys.FILE_CONFIG_SPLIT_CHAR
                     + ConfigurationKeys.FILE_ROOT_TYPE);
+
+            if (StringUtils.isBlank(configTypeName)) {
+                throw new NotSupportYetException("config type can not be null");
+            }
+
             configType = ConfigType.getType(configTypeName);
         } catch (Exception e) {
-            throw new NotSupportYetException("not support register type: " + configTypeName, e);
+            throw e;
         }
         if (ConfigType.File == configType) {
             String pathDataId = String.join(ConfigurationKeys.FILE_CONFIG_SPLIT_CHAR, ConfigurationKeys.FILE_ROOT_CONFIG, FILE_TYPE, NAME_KEY);
diff --git a/discovery/seata-discovery-core/src/main/java/io/seata/discovery/registry/RegistryType.java b/discovery/seata-discovery-core/src/main/java/io/seata/discovery/registry/RegistryType.java
index 574e95f2327..87b109180c3 100644
--- a/discovery/seata-discovery-core/src/main/java/io/seata/discovery/registry/RegistryType.java
+++ b/discovery/seata-discovery-core/src/main/java/io/seata/discovery/registry/RegistryType.java
@@ -15,8 +15,6 @@
  */
 package io.seata.discovery.registry;
 
-import io.seata.common.exception.NotSupportYetException;
-
 /**
  * The enum Registry type.
  *
@@ -72,6 +70,6 @@ public static RegistryType getType(String name) {
                 return registryType;
             }
         }
-        throw new NotSupportYetException("unsupported type:" + name);
+        throw new IllegalArgumentException("not support registry type: " + name);
     }
 }
diff --git a/metrics/seata-metrics-core/src/main/java/io/seata/metrics/exporter/ExporterType.java b/metrics/seata-metrics-core/src/main/java/io/seata/metrics/exporter/ExporterType.java
index 5342149902e..a147a4d5039 100644
--- a/metrics/seata-metrics-core/src/main/java/io/seata/metrics/exporter/ExporterType.java
+++ b/metrics/seata-metrics-core/src/main/java/io/seata/metrics/exporter/ExporterType.java
@@ -15,8 +15,6 @@
  */
 package io.seata.metrics.exporter;
 
-import io.seata.common.exception.NotSupportYetException;
-
 /**
  * Supported metrics exporter type
  *
@@ -42,7 +40,7 @@ public static ExporterType getType(String name) {
         if (PROMETHEUS.name().equalsIgnoreCase(name)) {
             return PROMETHEUS;
         } else {
-            throw new NotSupportYetException("unsupported type:" + name);
+            throw new IllegalArgumentException("not support exporter type: " + name);
         }
     }
 }
diff --git a/metrics/seata-metrics-core/src/main/java/io/seata/metrics/registry/RegistryType.java b/metrics/seata-metrics-core/src/main/java/io/seata/metrics/registry/RegistryType.java
index 5b15d4a4204..6c3f5bc6193 100644
--- a/metrics/seata-metrics-core/src/main/java/io/seata/metrics/registry/RegistryType.java
+++ b/metrics/seata-metrics-core/src/main/java/io/seata/metrics/registry/RegistryType.java
@@ -15,8 +15,6 @@
  */
 package io.seata.metrics.registry;
 
-import io.seata.common.exception.NotSupportYetException;
-
 /**
  * Supported metrics registry type
  *
@@ -42,7 +40,7 @@ public static RegistryType getType(String name) {
         if (COMPACT.name().equalsIgnoreCase(name)) {
             return COMPACT;
         } else {
-            throw new NotSupportYetException("unsupported type:" + name);
+            throw new IllegalArgumentException("not support registry type: " + name);
         }
     }
 }