Skip to content
Snippets Groups Projects
Commit 0640cad8 authored by zaifeng's avatar zaifeng
Browse files

use url to simplify config and registry center

parent 556ba85e
No related branches found
No related tags found
No related merge requests found
......@@ -52,12 +52,7 @@ public enum ConfigType {
/**
* Custom config type
*/
Custom,
/**
* Url config type
*/
Url;
Custom;
/**
* Gets type.
......
......@@ -102,12 +102,14 @@ public final class ConfigurationFactory {
String configTypeName = CURRENT_FILE_INSTANCE.getConfig(
ConfigurationKeys.FILE_ROOT_CONFIG + ConfigurationKeys.FILE_CONFIG_SPLIT_CHAR
+ ConfigurationKeys.FILE_ROOT_TYPE);
String urlType = CURRENT_FILE_INSTANCE.getConfig(
ConfigurationKeys.FILE_ROOT_CONFIG + ConfigurationKeys.FILE_CONFIG_SPLIT_CHAR
+ ConfigurationKeys.URL);
if (StringUtils.isBlank(configTypeName)) {
throw new NotSupportYetException("config type can not be null");
}
ConfigType configType;
if (StringUtils.equals(configTypeName, ConfigurationKeys.URL)) {
if (StringUtils.isNotBlank(urlType)) {
configType = ConfigType.getType(CONFIG_URL.getProtocol());
} else {
configType = ConfigType.getType(configTypeName);
......
......@@ -99,7 +99,7 @@ public class NacosConfiguration extends AbstractConfiguration {
private NacosConfiguration() {
if (configService == null) {
try {
if (StringUtils.equals(FILE_CONFIG.getConfig(getConfigUrlKey()), ConfigurationKeys.URL)) {
if (StringUtils.isNotBlank(FILE_CONFIG.getConfig(getConfigUrlKey()))) {
configService = NacosFactory.createConfigService(getConfigPropertiesWithUrl());
} else {
configService = NacosFactory.createConfigService(getConfigProperties());
......@@ -289,7 +289,7 @@ public class NacosConfiguration extends AbstractConfiguration {
}
private static String getConfigUrlKey() {
return ConfigurationKeys.FILE_ROOT_CONFIG + ConfigurationKeys.FILE_CONFIG_SPLIT_CHAR + ConfigurationKeys.FILE_ROOT_TYPE;
return ConfigurationKeys.FILE_ROOT_CONFIG + ConfigurationKeys.FILE_CONFIG_SPLIT_CHAR + ConfigurationKeys.URL;
}
private static String getNacosAddrFileKey() {
......@@ -315,7 +315,7 @@ public class NacosConfiguration extends AbstractConfiguration {
}
private static String getNacosGroup() {
if (StringUtils.equals(FILE_CONFIG.getConfig(getConfigUrlKey()), ConfigurationKeys.URL)) {
if (StringUtils.isNotBlank(FILE_CONFIG.getConfig(getConfigUrlKey()))) {
return CONFIG_URL.getParameters().get(GROUP_KEY);
} else {
return FILE_CONFIG.getConfig(getNacosGroupKey(), DEFAULT_GROUP);
......@@ -323,7 +323,7 @@ public class NacosConfiguration extends AbstractConfiguration {
}
private static String getNacosDataId() {
if (StringUtils.equals(FILE_CONFIG.getConfig(getConfigUrlKey()), ConfigurationKeys.URL)) {
if (StringUtils.isNotBlank(FILE_CONFIG.getConfig(getConfigUrlKey()))) {
return CONFIG_URL.getParameters().get(NACOS_DATA_ID_KEY) != null ? CONFIG_URL.getParameters().get(NACOS_DATA_ID_KEY) : DEFAULT_DATA_ID;
} else {
return FILE_CONFIG.getConfig(getNacosDataIdKey(), DEFAULT_DATA_ID);
......
......@@ -52,8 +52,10 @@ public class RegistryFactory {
RegistryType registryType;
String registryTypeName = ConfigurationFactory.CURRENT_FILE_INSTANCE.getConfig(ConfigurationKeys.FILE_ROOT_REGISTRY + ConfigurationKeys.FILE_CONFIG_SPLIT_CHAR
+ ConfigurationKeys.FILE_ROOT_TYPE);
String urlType = ConfigurationFactory.CURRENT_FILE_INSTANCE.getConfig(ConfigurationKeys.FILE_ROOT_REGISTRY + ConfigurationKeys.FILE_CONFIG_SPLIT_CHAR
+ ConfigurationKeys.URL);
try {
if (StringUtils.equals(registryTypeName, ConfigurationKeys.URL)) {
if (StringUtils.isNotBlank(urlType)) {
registryType = RegistryType.getType(REGISTRY_URL.getProtocol());
} else {
registryType = RegistryType.getType(registryTypeName);
......
......@@ -56,12 +56,7 @@ public enum RegistryType {
/**
* Custom registry type
*/
Custom,
/**
* Url registry type
*/
Url;
Custom;
/**
* Gets type.
......
......@@ -168,7 +168,7 @@ public class NacosRegistryServiceImpl implements RegistryService<EventListener>
public static NamingService getNamingInstance() throws Exception {
if (naming == null) {
synchronized (NacosRegistryServiceImpl.class) {
if (StringUtils.equals(FILE_CONFIG.getConfig(getRegistryType()),ConfigurationKeys.URL)) {
if (StringUtils.isBlank(FILE_CONFIG.getConfig(getRegistryType()))) {
naming = NacosFactory.createNamingService(getNamingPropertiesWithUrl());
} else {
naming = NacosFactory.createNamingService(getNamingProperties());
......@@ -298,7 +298,7 @@ public class NacosRegistryServiceImpl implements RegistryService<EventListener>
}
private static String getRegistryType() {
return String.join(ConfigurationKeys.FILE_CONFIG_SPLIT_CHAR, ConfigurationKeys.FILE_ROOT_REGISTRY, ConfigurationKeys.FILE_ROOT_TYPE);
return String.join(ConfigurationKeys.FILE_CONFIG_SPLIT_CHAR, ConfigurationKeys.FILE_ROOT_REGISTRY, ConfigurationKeys.URL);
}
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment