diff --git a/docs/wiki/en_userguide.md b/docs/wiki/en_userguide.md new file mode 100644 index 000000000..e69de29bb diff --git a/motan-core/src/main/java/com/weibo/api/motan/config/ServiceConfig.java b/motan-core/src/main/java/com/weibo/api/motan/config/ServiceConfig.java index 342d3e98f..e2dc5d5f2 100644 --- a/motan-core/src/main/java/com/weibo/api/motan/config/ServiceConfig.java +++ b/motan-core/src/main/java/com/weibo/api/motan/config/ServiceConfig.java @@ -54,7 +54,7 @@ public class ServiceConfig extends AbstractServiceConfig { // service 对应的exporters,用于管理service服务的生命周期 private List> exporters = new CopyOnWriteArrayList>(); private Class interfaceClass; - private BasicServiceInterfaceConfig basicServiceConfig; + private BasicServiceInterfaceConfig basicService; private AtomicBoolean exported = new AtomicBoolean(false); // service的用于注册的url,用于管理service注册的生命周期,url为regitry url,内部嵌套service url。 private ConcurrentHashSet registereUrls = new ConcurrentHashSet(); @@ -153,8 +153,8 @@ private void doExport(ProtocolConfig protocolConfig, int port, List registr } String hostAddress = host; - if (StringUtils.isBlank(hostAddress) && basicServiceConfig != null) { - hostAddress = basicServiceConfig.getHost(); + if (StringUtils.isBlank(hostAddress) && basicService != null) { + hostAddress = basicService.getHost(); } if (NetUtils.isInvalidLocalHost(hostAddress)) { hostAddress = getLocalHostAddress(registryURLs); @@ -165,7 +165,7 @@ private void doExport(ProtocolConfig protocolConfig, int port, List registr map.put(URLParamType.nodeType.getName(), MotanConstants.NODE_TYPE_SERVICE); map.put(URLParamType.refreshTimestamp.getName(), String.valueOf(System.currentTimeMillis())); - collectConfigParams(map, protocolConfig, basicServiceConfig, extConfig, this); + collectConfigParams(map, protocolConfig, basicService, extConfig, this); collectMethodConfigParams(map, this.getMethods()); URL serviceUrl = new URL(protocolName, hostAddress, port, interfaceClass.getName(), map); @@ -231,12 +231,12 @@ private void afterUnexport() { } @ConfigDesc(excluded = true) - public BasicServiceInterfaceConfig getBasicServiceConfig() { - return basicServiceConfig; + public BasicServiceInterfaceConfig getBasicService() { + return basicService; } - public void setBasicServiceConfig(BasicServiceInterfaceConfig basicServiceConfig) { - this.basicServiceConfig = basicServiceConfig; + public void setBasicService(BasicServiceInterfaceConfig basicService) { + this.basicService = basicService; } public Map getProtocolAndPort() { diff --git a/motan-springsupport/src/main/java/com/weibo/api/motan/config/springsupport/AnnotationBean.java b/motan-springsupport/src/main/java/com/weibo/api/motan/config/springsupport/AnnotationBean.java index ea778bfab..fa5b8dba4 100644 --- a/motan-springsupport/src/main/java/com/weibo/api/motan/config/springsupport/AnnotationBean.java +++ b/motan-springsupport/src/main/java/com/weibo/api/motan/config/springsupport/AnnotationBean.java @@ -202,7 +202,7 @@ public Object postProcessAfterInitialization(Object bean, String beanName) throw serviceConfig.setBeanFactory(beanFactory); if (service.basicService() != null && service.basicService().length() > 0) { - serviceConfig.setBasicServiceConfig(beanFactory.getBean(service.basicService(), BasicServiceInterfaceConfig.class)); + serviceConfig.setBasicService(beanFactory.getBean(service.basicService(), BasicServiceInterfaceConfig.class)); } if (service.export() != null && service.export().length() > 0) { diff --git a/motan-springsupport/src/main/java/com/weibo/api/motan/config/springsupport/ServiceConfigBean.java b/motan-springsupport/src/main/java/com/weibo/api/motan/config/springsupport/ServiceConfigBean.java index a1ce09259..82f50fe4d 100644 --- a/motan-springsupport/src/main/java/com/weibo/api/motan/config/springsupport/ServiceConfigBean.java +++ b/motan-springsupport/src/main/java/com/weibo/api/motan/config/springsupport/ServiceConfigBean.java @@ -100,7 +100,7 @@ public void onApplicationEvent(ContextRefreshedEvent event) { * 检查并配置basicConfig */ private void checkAndConfigBasicConfig() { - if (getBasicServiceConfig() == null) { + if (getBasicService() == null) { if (MotanNamespaceHandler.basicServiceConfigDefineNames.size() == 0) { if (beanFactory instanceof ListableBeanFactory) { ListableBeanFactory listableBeanFactory = (ListableBeanFactory) beanFactory; @@ -116,9 +116,9 @@ private void checkAndConfigBasicConfig() { continue; } if (MotanNamespaceHandler.basicServiceConfigDefineNames.size() == 1) { - setBasicServiceConfig(biConfig); + setBasicService(biConfig); } else if (biConfig.isDefault() != null && biConfig.isDefault().booleanValue()) { - setBasicServiceConfig(biConfig); + setBasicService(biConfig); } } } @@ -128,11 +128,11 @@ private void checkAndConfigBasicConfig() { * 检查是否已经装配export,如果没有则到basicConfig查找 */ private void checkAndConfigExport() { - if (StringUtils.isBlank(getExport()) && getBasicServiceConfig() != null - && !StringUtils.isBlank(getBasicServiceConfig().getExport())) { - setExport(getBasicServiceConfig().getExport()); - if (getBasicServiceConfig().getProtocols() != null) { - setProtocols(new ArrayList(getBasicServiceConfig().getProtocols())); + if (StringUtils.isBlank(getExport()) && getBasicService() != null + && !StringUtils.isBlank(getBasicService().getExport())) { + setExport(getBasicService().getExport()); + if (getBasicService().getProtocols() != null) { + setProtocols(new ArrayList(getBasicService().getProtocols())); } } @@ -169,9 +169,9 @@ private void checkAndConfigExport() { * 检查并配置registry */ private void checkAndConfigRegistry() { - if (CollectionUtil.isEmpty(getRegistries()) && getBasicServiceConfig() != null - && !CollectionUtil.isEmpty(getBasicServiceConfig().getRegistries())) { - setRegistries(getBasicServiceConfig().getRegistries()); + if (CollectionUtil.isEmpty(getRegistries()) && getBasicService() != null + && !CollectionUtil.isEmpty(getBasicService().getRegistries())) { + setRegistries(getBasicService().getRegistries()); } if (CollectionUtil.isEmpty(getRegistries())) { for (String name : MotanNamespaceHandler.registryDefineNames) {