From 95e871f53c639501fb39b94025d458b3d6d2e9d2 Mon Sep 17 00:00:00 2001
From: hongqiaowei <hongqiaowei@163.com>
Date: Thu, 23 Dec 2021 16:32:00 +0800
Subject: [PATCH] Optimize PropertiesUtils.java

---
 .../src/main/java/we/util/PropertiesUtils.java     | 14 +++++++++++++-
 .../java/we/service_registry/RegistryCenter.java   | 12 ++----------
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/fizz-common/src/main/java/we/util/PropertiesUtils.java b/fizz-common/src/main/java/we/util/PropertiesUtils.java
index 6510412..db7c46b 100644
--- a/fizz-common/src/main/java/we/util/PropertiesUtils.java
+++ b/fizz-common/src/main/java/we/util/PropertiesUtils.java
@@ -1,9 +1,12 @@
 package we.util;
 
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanWrapperImpl;
 import org.springframework.beans.PropertyAccessor;
+import org.springframework.core.io.ByteArrayResource;
+import org.springframework.core.io.Resource;
+import org.springframework.core.io.support.PropertiesLoaderUtils;
 
+import java.io.IOException;
 import java.util.Map;
 import java.util.Properties;
 
@@ -16,6 +19,15 @@ public abstract class PropertiesUtils {
     private PropertiesUtils() {
     }
 
+    public static Properties from(String config) {
+        Resource resource = new ByteArrayResource(config.getBytes());
+        try {
+            return PropertiesLoaderUtils.loadProperties(resource);
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
     public static String normalize(String propertyName) {
         char[] chars = propertyName.toCharArray();
         StringBuilder b = new StringBuilder(chars.length);
diff --git a/fizz-core/src/main/java/we/service_registry/RegistryCenter.java b/fizz-core/src/main/java/we/service_registry/RegistryCenter.java
index 1bc2878..7de2c8d 100644
--- a/fizz-core/src/main/java/we/service_registry/RegistryCenter.java
+++ b/fizz-core/src/main/java/we/service_registry/RegistryCenter.java
@@ -20,16 +20,13 @@ package we.service_registry;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import org.springframework.core.io.ByteArrayResource;
-import org.springframework.core.io.Resource;
-import org.springframework.core.io.support.PropertiesLoaderUtils;
 import we.Fizz;
 import we.service_registry.eureka.FizzEurekaHelper;
 import we.service_registry.nacos.FizzNacosHelper;
 import we.util.JacksonUtils;
+import we.util.PropertiesUtils;
 import we.util.YmlUtils;
 
-import java.io.IOException;
 import java.util.Properties;
 
 /**
@@ -91,12 +88,7 @@ public class RegistryCenter {
             if (this.clientConfigFormat == YML) {
                 properties = YmlUtils.string2properties(clientConfig);
             } else {
-                Resource resource = new ByteArrayResource(clientConfig.getBytes());
-                try {
-                    properties = PropertiesLoaderUtils.loadProperties(resource);
-                } catch (IOException e) {
-                    throw new RuntimeException(e);
-                }
+                properties = PropertiesUtils.from(clientConfig);
             }
             if (type == EUREKA) {
                 fizzServiceRegistration = FizzEurekaHelper.getServiceRegistration(Fizz.context, properties);