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

Update Dubbo Spring Boot Starter 2.7.1

Browse Source
This commit is contained in:
mercyblitz
2019-04-09 09:56:06 +08:00
parent 3230a61a23
commit c12252566a
3 changed files with 259 additions and 283 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
spring-cloud-alibaba-dubbo/pom.xml
View File

@@ -15,7 +15,6 @@
<properties>
<dubbo.version>2.7.1</dubbo.version>
<dubbo-spring-boot.version>2.7.0</dubbo-spring-boot.version>
<spring-cloud-zookeeper.version>2.1.0.RELEASE</spring-cloud-zookeeper.version>
<spring-cloud-consul.version>2.1.0.RELEASE</spring-cloud-consul.version>
<curator.version>4.0.1</curator.version>
@@ -179,7 +178,7 @@
<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-spring-boot-starter</artifactId>
<version>${dubbo-spring-boot.version}</version>
<version>${dubbo.version}</version>
</dependency>
<!-- Netty -->

170
spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/autoconfigure/DubboServiceAutoConfiguration.java
View File

@@ -16,12 +16,8 @@
*/
package org.springframework.cloud.alibaba.dubbo.autoconfigure;
import org.apache.dubbo.common.utils.Assert;
import org.apache.dubbo.config.spring.util.PropertySourcesUtils;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.boot.context.properties.source.ConfigurationPropertySources;
import org.springframework.cloud.alibaba.dubbo.env.DubboCloudProperties;
import org.springframework.cloud.alibaba.dubbo.service.DubboGenericServiceExecutionContextFactory;
import org.springframework.cloud.alibaba.dubbo.service.DubboGenericServiceFactory;
@@ -32,18 +28,6 @@ import org.springframework.cloud.alibaba.dubbo.service.parameter.RequestParamSer
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
import org.springframework.context.annotation.Primary;
import org.springframework.core.env.AbstractEnvironment;
import org.springframework.core.env.ConfigurableEnvironment;
import org.springframework.core.env.MapPropertySource;
import org.springframework.core.env.MutablePropertySources;
import org.springframework.core.env.PropertyResolver;
import org.springframework.lang.Nullable;
import java.util.Map;
import static org.apache.dubbo.spring.boot.util.DubboUtils.BASE_PACKAGES_PROPERTY_RESOLVER_BEAN_NAME;
import static org.apache.dubbo.spring.boot.util.DubboUtils.DUBBO_SCAN_PREFIX;
/**
* Spring Boot Auto-Configuration class for Dubbo Service
@@ -71,81 +55,81 @@ public class DubboServiceAutoConfiguration {
static class ParameterResolversConfiguration {
}
/**
* Bugfix code for an issue : https://github.com/apache/incubator-dubbo-spring-boot-project/issues/459
*
* @param environment {@link ConfigurableEnvironment}
* @return a Bean of {@link PropertyResolver}
*/
@Primary
@Bean(name = BASE_PACKAGES_PROPERTY_RESOLVER_BEAN_NAME)
public PropertyResolver dubboScanBasePackagesPropertyResolver(ConfigurableEnvironment environment) {
ConfigurableEnvironment propertyResolver = new AbstractEnvironment() {
@Override
protected void customizePropertySources(MutablePropertySources propertySources) {
Map<String, Object> dubboScanProperties = PropertySourcesUtils.getSubProperties(environment, DUBBO_SCAN_PREFIX);
propertySources.addLast(new MapPropertySource("dubboScanProperties", dubboScanProperties));
}
};
ConfigurationPropertySources.attach(propertyResolver);
return new DelegatingPropertyResolver(propertyResolver);
}
private static class DelegatingPropertyResolver implements PropertyResolver {
private final PropertyResolver delegate;
DelegatingPropertyResolver(PropertyResolver delegate) {
Assert.notNull(delegate, "The delegate of PropertyResolver must not be null");
this.delegate = delegate;
}
@Override
public boolean containsProperty(String key) {
return delegate.containsProperty(key);
}
@Override
@Nullable
public String getProperty(String key) {
return delegate.getProperty(key);
}
@Override
public String getProperty(String key, String defaultValue) {
return delegate.getProperty(key, defaultValue);
}
@Override
@Nullable
public <T> T getProperty(String key, Class<T> targetType) {
return delegate.getProperty(key, targetType);
}
@Override
public <T> T getProperty(String key, Class<T> targetType, T defaultValue) {
return delegate.getProperty(key, targetType, defaultValue);
}
@Override
public String getRequiredProperty(String key) throws IllegalStateException {
return delegate.getRequiredProperty(key);
}
@Override
public <T> T getRequiredProperty(String key, Class<T> targetType) throws IllegalStateException {
return delegate.getRequiredProperty(key, targetType);
}
@Override
public String resolvePlaceholders(String text) {
return delegate.resolvePlaceholders(text);
}
@Override
public String resolveRequiredPlaceholders(String text) throws IllegalArgumentException {
return delegate.resolveRequiredPlaceholders(text);
}
}
// /**
// * Bugfix code for an issue : https://github.com/apache/incubator-dubbo-spring-boot-project/issues/459
// *
// * @param environment {@link ConfigurableEnvironment}
// * @return a Bean of {@link PropertyResolver}
// */
// @Primary
// @Bean(name = BASE_PACKAGES_PROPERTY_RESOLVER_BEAN_NAME)
// public PropertyResolver dubboScanBasePackagesPropertyResolver(ConfigurableEnvironment environment) {
// ConfigurableEnvironment propertyResolver = new AbstractEnvironment() {
// @Override
// protected void customizePropertySources(MutablePropertySources propertySources) {
// Map<String, Object> dubboScanProperties = PropertySourcesUtils.getSubProperties(environment, DUBBO_SCAN_PREFIX);
// propertySources.addLast(new MapPropertySource("dubboScanProperties", dubboScanProperties));
// }
// };
// ConfigurationPropertySources.attach(propertyResolver);
// return new DelegatingPropertyResolver(propertyResolver);
// }
//
//
// private static class DelegatingPropertyResolver implements PropertyResolver {
//
// private final PropertyResolver delegate;
//
// DelegatingPropertyResolver(PropertyResolver delegate) {
// Assert.notNull(delegate, "The delegate of PropertyResolver must not be null");
// this.delegate = delegate;
// }
//
// @Override
// public boolean containsProperty(String key) {
// return delegate.containsProperty(key);
// }
//
// @Override
// @Nullable
// public String getProperty(String key) {
// return delegate.getProperty(key);
// }
//
// @Override
// public String getProperty(String key, String defaultValue) {
// return delegate.getProperty(key, defaultValue);
// }
//
// @Override
// @Nullable
// public <T> T getProperty(String key, Class<T> targetType) {
// return delegate.getProperty(key, targetType);
// }
//
// @Override
// public <T> T getProperty(String key, Class<T> targetType, T defaultValue) {
// return delegate.getProperty(key, targetType, defaultValue);
// }
//
// @Override
// public String getRequiredProperty(String key) throws IllegalStateException {
// return delegate.getRequiredProperty(key);
// }
//
// @Override
// public <T> T getRequiredProperty(String key, Class<T> targetType) throws IllegalStateException {
// return delegate.getRequiredProperty(key, targetType);
// }
//
// @Override
// public String resolvePlaceholders(String text) {
// return delegate.resolvePlaceholders(text);
// }
//
// @Override
// public String resolveRequiredPlaceholders(String text) throws IllegalArgumentException {
// return delegate.resolveRequiredPlaceholders(text);
// }
// }
}