This is an automated email from the ASF dual-hosted git repository. liujun pushed a commit to branch cloud-native in repository https://gitbox.apache.org/repos/asf/dubbo.git
commit 0dad8290ea7e95500db4a2255a23c2d335dde78a Merge: 50f8a51 262bc7c Author: ken.lj <ken.lj...@gmail.com> AuthorDate: Fri Sep 6 21:32:42 2019 +0800 Merge remote-tracking branch 'origin/cloud-native' into cloud-native dubbo-all/pom.xml | 76 +++++++-- dubbo-bootstrap/pom.xml | 7 + .../org/apache/dubbo/bootstrap/DubboBootstrap.java | 22 +++ .../EtcdDubboServiceConsumerBootstrap.java | 2 +- .../EtcdDubboServiceProviderBootstrap.java | 6 +- .../NacosDubboServiceConsumerBootstrap.java | 3 + .../ZookeeperDubboServiceProviderBootstrap.java | 2 +- .../configcenter/AbstractDynamicConfiguration.java | 18 +- .../AbstractDynamicConfigurationFactory.java | 5 +- .../config/configcenter/ConfigChangedEvent.java | 26 +-- .../file/FileSystemDynamicConfiguration.java | 4 +- .../dubbo/common/lang/ShutdownHookCallbacks.java | 2 +- .../org/apache/dubbo/common/utils/UrlUtils.java | 30 +++- .../common/config/InmemoryConfigurationTest.java | 21 ++- .../AbstractDynamicConfigurationFactoryTest.java | 52 ++++++ .../AbstractDynamicConfigurationTest.java | 167 +++++++++++++++++++ .../config/configcenter/ConfigChangeTypeTest.java | 30 ++-- .../configcenter/ConfigChangedEventTest.java | 71 ++++++++ .../FileSystemDynamicConfigurationFactoryTest.java | 40 +++++ .../file/FileSystemDynamicConfigurationTest.java | 11 +- .../extension/AdaptiveClassCodeGeneratorTest.java | 48 ++++++ .../common/extension/ExtensionLoaderTest.java | 133 ++++++++------- .../ThrowableActionTest.java} | 18 +- .../ThrowableConsumerTest.java} | 18 +- .../ThrowableFunctionTest.java} | 18 +- ...sTest.java => DefaultShutdownHookCallback.java} | 15 +- .../apache/dubbo/common/lang/PrioritizedTest.java | 2 +- .../common/lang/ShutdownHookCallbacksTest.java | 32 ++++ .../DefaultCharSequence.java} | 26 ++- .../dubbo/common/utils/DubboServiceLoaderTest.java | 32 ++-- .../META-INF/services/java.lang.CharSequence | 3 + ...g.apache.dubbo.common.lang.ShutdownHookCallback | 1 + .../extension/adaptive/HasAdaptiveExt$Adaptive | 12 ++ .../dubbo/config/AbstractInterfaceConfig.java | 7 +- .../metadata/ServiceInstancePortCustomizer.java | 3 +- .../event/DubboServiceDestroyedEventTest.java | 58 +++++++ .../DubboShutdownHookRegisteredEventTest.java | 59 +++++++ .../DubboShutdownHookUnregisteredEventTest.java | 60 +++++++ .../event/ReferenceConfigDestroyedEventTest.java | 65 ++++++++ .../event/ReferenceConfigInitializedEventTest.java | 59 +++++++ .../ConfigurableMetadataServiceExporterTest.java | 2 +- .../ServiceInstancePortCustomizerTest.java | 60 +++++++ .../context/annotation/EnableDubboLifecycle.java | 3 +- .../annotation/EnableDubboLifecycleTest.java} | 45 +++-- .../spring/context/annotation/MyLifecycle.java} | 54 ++++-- .../org.apache.dubbo.common.context.Lifecycle | 1 + dubbo-dependencies-bom/pom.xml | 2 +- .../dubbo-dependencies-zookeeper/pom.xml | 2 +- .../store/InMemoryWritableMetadataService.java | 52 +++++- .../store/RemoteWritableMetadataService.java | 30 ++-- .../RemoteWritableMetadataServiceDelegate.java | 14 +- .../store/InMemoryWritableMetadataServiceTest.java | 79 +++++++++ .../store/RemoteWritableMeatadataServiceTest.java | 88 ++++++++-- .../RemoteWritableMetadataServiceDelegateTest.java | 182 +++++++++++++++++++++ .../metadata/test/JTestMetadataReport4Test.java | 13 +- .../metadata/store/etcd/EtcdMetadataReport.java | 6 +- .../store/etcd/EtcdMetadataReportTest.java | 125 +++++++++++++- .../zookeeper/ZookeeperMetadataReportTest.java | 118 +++++++++++++ .../metadata/proxy/RemoteMetadataServiceProxy.java | 17 +- .../dubbo/registry/etcd/EtcdServiceDiscovery.java | 12 +- .../registry/etcd/EtcdServiceDiscoveryTest.java | 108 ++++++++++++ pom.xml | 2 +- 62 files changed, 2026 insertions(+), 253 deletions(-)