This is an automated email from the ASF dual-hosted git repository.
mercyblitz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo-spring-boot-project.git
The following commit(s) were added to refs/heads/master by this push:
new 2b66783 fix costyle squid:S1161 (#518)
2b66783 is described below
commit 2b66783344f0e87d8d863debfcffd71539be1e48
Author: pengzai <[email protected]>
AuthorDate: Wed Oct 30 14:40:54 2019 +0800
fix costyle squid:S1161 (#518)
---
.../boot/autoconfigure/DubboRelaxedBinding2AutoConfiguration.java | 1 +
.../spring/boot/env/DubboDefaultPropertiesEnvironmentPostProcessor.java | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git
a/dubbo-spring-boot-autoconfigure/src/main/java/org/apache/dubbo/spring/boot/autoconfigure/DubboRelaxedBinding2AutoConfiguration.java
b/dubbo-spring-boot-autoconfigure/src/main/java/org/apache/dubbo/spring/boot/autoconfigure/DubboRelaxedBinding2AutoConfiguration.java
index 2b57273..85f8ffd 100644
---
a/dubbo-spring-boot-autoconfigure/src/main/java/org/apache/dubbo/spring/boot/autoconfigure/DubboRelaxedBinding2AutoConfiguration.java
+++
b/dubbo-spring-boot-autoconfigure/src/main/java/org/apache/dubbo/spring/boot/autoconfigure/DubboRelaxedBinding2AutoConfiguration.java
@@ -55,6 +55,7 @@ public class DubboRelaxedBinding2AutoConfiguration {
@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));
diff --git
a/dubbo-spring-boot-compatible/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/env/DubboDefaultPropertiesEnvironmentPostProcessor.java
b/dubbo-spring-boot-compatible/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/env/DubboDefaultPropertiesEnvironmentPostProcessor.java
index a8546ec..b3f87f9 100644
---
a/dubbo-spring-boot-compatible/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/env/DubboDefaultPropertiesEnvironmentPostProcessor.java
+++
b/dubbo-spring-boot-compatible/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/env/DubboDefaultPropertiesEnvironmentPostProcessor.java
@@ -70,7 +70,7 @@ public class DubboDefaultPropertiesEnvironmentPostProcessor
implements Environme
}
private Map<String, Object>
createDefaultProperties(ConfigurableEnvironment environment) {
- Map<String, Object> defaultProperties = new HashMap<String, Object>();
+ Map<String, Object> defaultProperties = new HashMap<>();
setDubboApplicationNameProperty(environment, defaultProperties);
setDubboConfigMultipleProperty(defaultProperties);
setDubboApplicationQosEnableProperty(defaultProperties);