From 8f5da177bcefb48d37686c14326e059878baa344 Mon Sep 17 00:00:00 2001 From: mercyblitz Date: Tue, 14 Apr 2020 19:16:54 +0800 Subject: [PATCH] Polish alibaba/spring-cloud-alibaba#1369 : [Feature] Synchronizing source code to Spring Cloud Alibaba greenwich branch --- ...DubboNonWebApplicationEnvironmentPostProcessor.java | 10 +++++----- .../repository/DubboServiceMetadataRepository.java | 3 +-- .../dubbo/registry/AbstractSpringCloudRegistry.java | 2 +- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/spring-cloud-alibaba-starters/spring-cloud-starter-dubbo/src/main/java/com/alibaba/cloud/dubbo/env/DubboNonWebApplicationEnvironmentPostProcessor.java b/spring-cloud-alibaba-starters/spring-cloud-starter-dubbo/src/main/java/com/alibaba/cloud/dubbo/env/DubboNonWebApplicationEnvironmentPostProcessor.java index 10b7b7433..c13dcef27 100644 --- a/spring-cloud-alibaba-starters/spring-cloud-starter-dubbo/src/main/java/com/alibaba/cloud/dubbo/env/DubboNonWebApplicationEnvironmentPostProcessor.java +++ b/spring-cloud-alibaba-starters/spring-cloud-starter-dubbo/src/main/java/com/alibaba/cloud/dubbo/env/DubboNonWebApplicationEnvironmentPostProcessor.java @@ -34,8 +34,8 @@ import org.springframework.core.env.PropertySource; import org.springframework.util.CollectionUtils; import org.springframework.util.StringUtils; -import static org.apache.dubbo.common.constants.CommonConstants.DEFAULT_PROTOCOL; import static com.alibaba.spring.util.PropertySourcesUtils.getSubProperties; +import static org.apache.dubbo.common.constants.CommonConstants.DEFAULT_PROTOCOL; /** * Dubbo {@link WebApplicationType#NONE Non-Web Application} @@ -84,7 +84,7 @@ public class DubboNonWebApplicationEnvironmentPostProcessor @Override public void postProcessEnvironment(ConfigurableEnvironment environment, - SpringApplication application) { + SpringApplication application) { WebApplicationType webApplicationType = application.getWebApplicationType(); if (!WebApplicationType.NONE.equals(webApplicationType)) { // Just works in @@ -117,7 +117,7 @@ public class DubboNonWebApplicationEnvironmentPostProcessor * @param defaultProperties defaultProperties */ private void resetServerPort(ConfigurableEnvironment environment, - Map defaultProperties) { + Map defaultProperties) { String serverPort = environment.getProperty(SERVER_PORT_PROPERTY_NAME, environment.getProperty(PORT_PROPERTY_NAME)); @@ -181,7 +181,7 @@ public class DubboNonWebApplicationEnvironmentPostProcessor } private void setServerPort(ConfigurableEnvironment environment, String serverPort, - Map defaultProperties) { + Map defaultProperties) { if (serverPort == null) { return; } @@ -196,7 +196,7 @@ public class DubboNonWebApplicationEnvironmentPostProcessor * @param map Default Dubbo Properties */ private void addOrReplace(MutablePropertySources propertySources, - Map map) { + Map map) { MapPropertySource target = null; if (propertySources.contains(PROPERTY_SOURCE_NAME)) { PropertySource source = propertySources.get(PROPERTY_SOURCE_NAME); diff --git a/spring-cloud-alibaba-starters/spring-cloud-starter-dubbo/src/main/java/com/alibaba/cloud/dubbo/metadata/repository/DubboServiceMetadataRepository.java b/spring-cloud-alibaba-starters/spring-cloud-starter-dubbo/src/main/java/com/alibaba/cloud/dubbo/metadata/repository/DubboServiceMetadataRepository.java index 7a79b541a..65ada71e5 100644 --- a/spring-cloud-alibaba-starters/spring-cloud-starter-dubbo/src/main/java/com/alibaba/cloud/dubbo/metadata/repository/DubboServiceMetadataRepository.java +++ b/spring-cloud-alibaba-starters/spring-cloud-starter-dubbo/src/main/java/com/alibaba/cloud/dubbo/metadata/repository/DubboServiceMetadataRepository.java @@ -689,5 +689,4 @@ public class DubboServiceMetadataRepository ApplicationEventPublisher applicationEventPublisher) { this.applicationEventPublisher = applicationEventPublisher; } - -} \ No newline at end of file +} diff --git a/spring-cloud-alibaba-starters/spring-cloud-starter-dubbo/src/main/java/com/alibaba/cloud/dubbo/registry/AbstractSpringCloudRegistry.java b/spring-cloud-alibaba-starters/spring-cloud-starter-dubbo/src/main/java/com/alibaba/cloud/dubbo/registry/AbstractSpringCloudRegistry.java index b4f656b2a..2be28205b 100644 --- a/spring-cloud-alibaba-starters/spring-cloud-starter-dubbo/src/main/java/com/alibaba/cloud/dubbo/registry/AbstractSpringCloudRegistry.java +++ b/spring-cloud-alibaba-starters/spring-cloud-starter-dubbo/src/main/java/com/alibaba/cloud/dubbo/registry/AbstractSpringCloudRegistry.java @@ -398,4 +398,4 @@ public abstract class AbstractSpringCloudRegistry extends FailbackRegistry { return DUBBO_METADATA_SERVICE_CLASS_NAME.equals(url.getServiceInterface()); } -} \ No newline at end of file +}