fizzgate/fizz-gateway-node
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Optimize PropertiesUtils.java

Browse Source
This commit is contained in:
hongqiaowei
2021-12-23 16:32:00 +08:00
parent 0268eb00e0
commit 95e871f53c
2 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
fizz-common/src/main/java/we/util/PropertiesUtils.java
View File

@@ -1,9 +1,12 @@
package we.util; package we.util;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanWrapperImpl; import org.springframework.beans.BeanWrapperImpl;
import org.springframework.beans.PropertyAccessor; 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.Map;
import java.util.Properties; import java.util.Properties;
@@ -16,6 +19,15 @@ public abstract class PropertiesUtils {
private 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) { public static String normalize(String propertyName) {
char[] chars = propertyName.toCharArray(); char[] chars = propertyName.toCharArray();
StringBuilder b = new StringBuilder(chars.length); StringBuilder b = new StringBuilder(chars.length);

12
fizz-core/src/main/java/we/service_registry/RegistryCenter.java
View File

@@ -20,16 +20,13 @@ package we.service_registry;
import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty; 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.Fizz;
import we.service_registry.eureka.FizzEurekaHelper; import we.service_registry.eureka.FizzEurekaHelper;
import we.service_registry.nacos.FizzNacosHelper; import we.service_registry.nacos.FizzNacosHelper;
import we.util.JacksonUtils; import we.util.JacksonUtils;
import we.util.PropertiesUtils;
import we.util.YmlUtils; import we.util.YmlUtils;
import java.io.IOException;
import java.util.Properties; import java.util.Properties;
/** /**
@@ -91,12 +88,7 @@ public class RegistryCenter {
if (this.clientConfigFormat == YML) { if (this.clientConfigFormat == YML) {
properties = YmlUtils.string2properties(clientConfig); properties = YmlUtils.string2properties(clientConfig);
} else { } else {
Resource resource = new ByteArrayResource(clientConfig.getBytes()); properties = PropertiesUtils.from(clientConfig);
try {
properties = PropertiesLoaderUtils.loadProperties(resource);
} catch (IOException e) {
throw new RuntimeException(e);
}
} }
if (type == EUREKA) { if (type == EUREKA) {
fizzServiceRegistration = FizzEurekaHelper.getServiceRegistration(Fizz.context, properties); fizzServiceRegistration = FizzEurekaHelper.getServiceRegistration(Fizz.context, properties);