study/Spring-Cloud-Alibaba
1
0
Fork 0
mirror of https://gitee.com/mirrors/Spring-Cloud-Alibaba.git synced 2021-06-26 13:25:11 +08:00
Code Issues Releases Wiki Activity

Polish alibaba/spring-cloud-alibaba/#1192 : [Infrastructure] Upgrade the Dubbo 2.7.4.1 dependencies

Browse Source
This commit is contained in:
mercyblitz
2020-02-03 15:26:13 +08:00
parent 57e3059d8d
commit 4402ee0bbe
5 changed files with 34 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/autoconfigure/condition/MissingSpringCloudRegistryConfigPropertyCondition.java
View File

@@ -29,7 +29,7 @@ import org.springframework.core.type.AnnotatedTypeMetadata;
import org.springframework.util.StringUtils;
import static com.alibaba.cloud.dubbo.registry.SpringCloudRegistryFactory.PROTOCOL;
import static org.apache.dubbo.config.spring.util.PropertySourcesUtils.getSubProperties;
import static org.apache.dubbo.config.spring.util.PropertySourcesUtils.getPrefixedProperties;
/**
* Missing {@link SpringCloudRegistry} Property {@link Condition}.
@@ -61,8 +61,8 @@ public class MissingSpringCloudRegistryConfigPropertyCondition
"'spring-cloud' protocol was found from 'dubbo.registry.address'");
}
Map<String, Object> properties = getSubProperties(environment,
"dubbo.registries.");
Map<String, Object> properties = getPrefixedProperties(
environment.getPropertySources(), "dubbo.registries.");
boolean found = properties.entrySet().stream().anyMatch(entry -> {
String key = entry.getKey();

12
spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/env/DubboNonWebApplicationEnvironmentPostProcessor.java vendored
View File

@@ -35,7 +35,7 @@ import org.springframework.util.CollectionUtils;
import org.springframework.util.StringUtils;
import static org.apache.dubbo.common.constants.CommonConstants.DEFAULT_PROTOCOL;
import static org.apache.dubbo.config.spring.util.PropertySourcesUtils.getSubProperties;
import static org.apache.dubbo.config.spring.util.PropertySourcesUtils.getPrefixedProperties;
/**
* Dubbo {@link WebApplicationType#NONE Non-Web Application}
@@ -88,7 +88,7 @@ public class DubboNonWebApplicationEnvironmentPostProcessor
WebApplicationType webApplicationType = application.getWebApplicationType();
if (!WebApplicationType.NONE.equals(webApplicationType)) { // Just works in
// Non-Web Application
// Non-Web Application
if (logger.isDebugEnabled()) {
logger.debug(
"Current application is a Web Application, the process will be ignored.");
@@ -149,8 +149,8 @@ public class DubboNonWebApplicationEnvironmentPostProcessor
String restPort = null;
Map<String, Object> subProperties = getSubProperties(environment,
PROTOCOLS_PROPERTY_NAME_PREFIX);
Map<String, Object> subProperties = getPrefixedProperties(
environment.getPropertySources(), PROTOCOLS_PROPERTY_NAME_PREFIX);
Properties properties = new Properties();
@@ -158,8 +158,8 @@ public class DubboNonWebApplicationEnvironmentPostProcessor
for (String propertyName : properties.stringPropertyNames()) {
if (propertyName.endsWith(PROTOCOL_NAME_PROPERTY_NAME_SUFFIX)) { // protocol
// name
// property
// name
// property
String protocol = properties.getProperty(propertyName);
if (isRestProtocol(protocol)) {
String beanName = resolveBeanName(propertyName);