This is an automated email from the ASF dual-hosted git repository. liujun pushed a change to branch dev-metadata in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git.
from d11b876 Merge branch 'dev-metadata' of https://github.com/apache/incubator-dubbo into dev-metadata add e94d74b Optimize heartbeat and reconnect task. (#2658) add 195c82d polish the code for pull request 2658: Optimize heartbeat and reconnect task (#2709) add 4d0a36c 重构 ServiceBean 的 isDelay 方法,使其更符合语义 (#2686) add 0a116aa 【Unit Test】FailbackRegistry Test: recover method (#2591) add c21cc05 replace ServiceAnnotationBeanPostProcessor log.isInfoEnabled->log.isWarnEnabled (#2712) add 3cf801b [Dubbo-2678][For Master] Add ability to turn off SPI auto injection, special support for Object type. (#2682) add 0d51bc4 Merge pull request #2725, problems of graceful shutdown in 2.6.3 and some recommendation. add 505d155 enhance comments (#2735) add 2284ede code format (#2730) add 16f7a1e Close all servers/ports after tests finish (#2741) add aed0102 Simplify the code of StringUtils to make it more graceful. (#2740) add 56b2193 Add 'forks' config into xml config (#2568) add 1a88c22 fix typo (#2747) add e3bd693 [DUBBO-2489] MockClusterInvoker provides local forced mock,I tested it locally, but it doesn't work (#2742) add b0107e7 #2748: Provider should disable mock configuration (#2749) add aa9f16e Fix the bug that ReferenceBean refers service more than once when debugging. (#2754) add 20a5efb Close all servers/ports after tests finish (#2755) add a7cf737 add checkstyle rule to check import order (#2745) add dcbd326 Changing URL so tests can run in any order (#2760) add 117d485 [Dubbo-2353]fix Invalid property 'interfaceName' of bean class [org.apache.dubbo.config.spring.ServiceBean]#2353 (#2418) add 7f5fd46 #2762: [Dubbo - qos-http] stopServer should be invoked ? (#2767) add bff16eb #2777: heartbeat threads blocks process shutdown (#2778) add 38a6511 oschina vote (#2786) new dbca54c Merge branch 'master' into dev-metadata new 0d0c955 solve dubbo-bootstrap conficts after merged master new 5f0d8c8 change how DynamicConfiguration instance is fetched. new 46a0580 fix ut The 4 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: README.md | 2 + codestyle/checkstyle.xml | 6 + codestyle/dubbo_codestyle_for_idea.xml | 2 - dubbo-all/pom.xml | 14 -- dubbo-bom/pom.xml | 5 - dubbo-bootstrap/pom.xml | 111 ---------------- .../org/apache/dubbo/bootstrap/DubboBootstrap.java | 110 ---------------- .../dubbo/rpc/cluster/router/tag/TagRouter.java | 8 +- .../java/org/apache/dubbo/common/Constants.java | 17 +++ .../org/apache/dubbo/common/compiler/Compiler.java | 1 - .../common/compiler/support/AdaptiveCompiler.java | 1 - .../dubbo/common/extension/DisableInject.java | 68 +++++----- .../dubbo/common/extension/ExtensionLoader.java | 21 ++- .../apache/dubbo/common/logger/jcl/JclLogger.java | 1 + .../dubbo/common/logger/jcl/JclLoggerAdapter.java | 1 + .../support/eager/EagerThreadPoolExecutor.java | 2 +- .../dubbo/common/timer/HashedWheelTimer.java | 13 +- .../java/org/apache/dubbo/common/timer/Timer.java | 7 + .../common/utils/{Assert.java => ArrayUtils.java} | 32 +++-- .../org/apache/dubbo/common/utils/StringUtils.java | 118 +++++++++++------ .../common/extension/ExtensionLoaderTest.java | 13 +- .../ActivateExt1.java => injection/InjectExt.java} | 10 +- .../extension/injection/impl/InjectExtImpl.java | 60 +++++++++ .../VersionTest.java => utils/ArrayUtilsTest.java} | 25 ++-- .../apache/dubbo/common/utils/StringUtilsTest.java | 30 ++++- ...ache.dubbo.common.extension.injection.InjectExt | 1 + .../main/java/com/alibaba/dubbo/common/URL.java | 103 ++++++++++++++- .../alibaba/dubbo/common/status/StatusChecker.java | 1 + .../spring/context/annotation/EnableDubbo.java | 1 + .../java/com/alibaba/dubbo/monitor/Monitor.java | 1 + .../java/com/alibaba/dubbo/registry/Registry.java | 1 + .../java/com/alibaba/dubbo/remoting/Channel.java | 2 + .../main/java/com/alibaba/dubbo/rpc/Exporter.java | 1 + .../main/java/com/alibaba/dubbo/rpc/Filter.java | 1 + .../java/com/alibaba/dubbo/rpc/Invocation.java | 2 + .../main/java/com/alibaba/dubbo/rpc/Invoker.java | 2 + .../com/alibaba/dubbo/rpc/cluster/Directory.java | 5 +- .../java/com/alibaba/dubbo/rpc/cluster/Router.java | 1 + ...atibleReferenceAnnotationBeanPostProcessor.java | 4 +- .../annotation/CompatibleReferenceBeanBuilder.java | 4 +- ...mpatibleServiceAnnotationBeanPostProcessor.java | 4 +- .../CompatibleDubboComponentScanRegistrar.java | 1 + .../CompatibleAnnotationBeanDefinitionParser.java | 3 +- dubbo-config/dubbo-config-api/pom.xml | 5 + .../org/apache/dubbo/config/AbstractConfig.java | 8 +- .../dubbo/config/AbstractInterfaceConfig.java | 51 +++++--- .../apache/dubbo/config/AbstractMethodConfig.java | 23 +++- .../apache/dubbo/config/ConfigCenterConfig.java | 7 +- .../apache/dubbo/config}/DubboShutdownHook.java | 2 +- .../org/apache/dubbo/config/ProtocolConfig.java | 2 +- .../org/apache/dubbo/config/ReferenceConfig.java | 3 +- .../org/apache/dubbo/config/ServiceConfig.java | 13 +- .../apache/dubbo/config/context/Environment.java | 17 +-- .../apache/dubbo/config/AbstractConfigTest.java | 3 +- .../dubbo/config/AbstractInterfaceConfigTest.java | 27 ++-- .../dubbo/config/AbstractMethodConfigTest.java | 7 + .../dubbo/config/AbstractReferenceConfigTest.java | 0 .../dubbo/config/AbstractServiceConfigTest.java | 0 .../apache/dubbo/config/ApplicationConfigTest.java | 0 .../apache/dubbo/config/ArgumentConfigTest.java | 0 .../apache/dubbo/config/ConsumerConfigTest.java | 0 .../apache/dubbo/config/GenericServiceTest.java | 0 .../org/apache/dubbo/config/MethodConfigTest.java | 0 .../org/apache/dubbo/config/ModuleConfigTest.java | 0 .../org/apache/dubbo/config/MonitorConfigTest.java | 0 .../apache/dubbo/config/ProtocolConfigTest.java | 0 .../apache/dubbo/config/ProviderConfigTest.java | 0 .../apache/dubbo/config/ReferenceConfigTest.java | 0 .../apache/dubbo/config/RegistryConfigTest.java | 0 .../org/apache/dubbo/config/ServiceConfigTest.java | 12 ++ .../test/java/org/apache/dubbo/config/api/Box.java | 0 .../org/apache/dubbo/config/api/DemoException.java | 0 .../org/apache/dubbo/config/api/DemoService.java | 0 .../java/org/apache/dubbo/config/api/Greeting.java | 0 .../java/org/apache/dubbo/config/api/User.java | 0 .../apache/dubbo/config/cache/CacheService.java | 0 .../dubbo/config/cache/CacheServiceImpl.java | 0 .../org/apache/dubbo/config/cache/CacheTest.java | 0 .../config/consumer/DemoActionByAnnotation.java | 0 .../dubbo/config/consumer/DemoActionBySetter.java | 0 .../dubbo/config/consumer/DemoInterceptor.java | 0 .../DelegateProviderMetaDataInvokerTest.java | 0 .../apache/dubbo/config/mock/GreetingLocal1.java | 0 .../apache/dubbo/config/mock/GreetingLocal2.java | 0 .../apache/dubbo/config/mock/GreetingLocal3.java | 0 .../apache/dubbo/config/mock/GreetingMock1.java | 0 .../apache/dubbo/config/mock/GreetingMock2.java | 0 .../org/apache/dubbo/config/mock/MockCluster.java | 0 .../org/apache/dubbo/config/mock/MockCodec.java | 0 .../apache/dubbo/config/mock/MockDispatcher.java | 0 .../apache/dubbo/config/mock/MockExchanger.java | 0 .../dubbo/config/mock/MockExporterListener.java | 0 .../org/apache/dubbo/config/mock/MockFilter.java | 0 .../dubbo/config/mock/MockInvokerListener.java | 0 .../apache/dubbo/config/mock/MockLoadBalance.java | 0 .../org/apache/dubbo/config/mock/MockProtocol.java | 0 .../apache/dubbo/config/mock/MockProtocol2.java | 0 .../apache/dubbo/config/mock/MockProxyFactory.java | 0 .../org/apache/dubbo/config/mock/MockRegistry.java | 0 .../dubbo/config/mock/MockRegistryFactory.java | 0 .../dubbo/config/mock/MockRegistryFactory2.java | 0 .../dubbo/config/mock/MockStatusChecker.java | 0 .../dubbo/config/mock/MockTelnetHandler.java | 0 .../apache/dubbo/config/mock/MockThreadPool.java | 0 .../apache/dubbo/config/mock/MockTransporter.java | 0 .../apache/dubbo/config/mock/TestProxyFactory.java | 0 .../config/provider/impl/DemoServiceImpl.java | 0 .../config/url/ExporterSideConfigUrlTest.java | 0 .../dubbo/config/url/InvokerSideConfigUrlTest.java | 0 .../dubbo/config/url/RpcConfigGetSetProxy.java | 0 .../org/apache/dubbo/config/url/UrlTestBase.java | 0 .../dubbo/config/utils/MockReferenceConfig.java | 0 .../config/utils/ReferenceConfigCacheTest.java | 0 .../config/validation/ValidationParameter.java | 0 .../dubbo/config/validation/ValidationService.java | 0 .../config/validation/ValidationServiceImpl.java | 0 .../dubbo/config/validation/ValidationTest.java | 0 .../org.apache.dubbo.common.status.StatusChecker | 0 .../org.apache.dubbo.common.threadpool.ThreadPool | 0 .../org.apache.dubbo.registry.RegistryFactory | 0 .../services/org.apache.dubbo.remoting.Codec | 0 .../services/org.apache.dubbo.remoting.Dispatcher | 0 .../services/org.apache.dubbo.remoting.Transporter | 0 .../org.apache.dubbo.remoting.exchange.Exchanger | 0 .../org.apache.dubbo.remoting.telnet.TelnetHandler | 0 .../services/org.apache.dubbo.rpc.ExporterListener | 0 .../META-INF/services/org.apache.dubbo.rpc.Filter | 0 .../services/org.apache.dubbo.rpc.InvokerListener | 0 .../services/org.apache.dubbo.rpc.Protocol | 0 .../services/org.apache.dubbo.rpc.ProxyFactory | 0 .../services/org.apache.dubbo.rpc.cluster.Cluster | 0 .../org.apache.dubbo.rpc.cluster.LoadBalance | 0 .../dubbo-config-api/src}/test/resources/log4j.xml | 0 dubbo-config/dubbo-config-spring/pom.xml | 7 +- .../apache/dubbo/config/spring/AnnotationBean.java | 24 ++-- .../apache/dubbo/config/spring/ReferenceBean.java | 1 + .../apache/dubbo/config/spring/ServiceBean.java | 29 +---- .../AbstractAnnotationConfigBeanBuilder.java | 1 + .../DubboConfigBindingBeanPostProcessor.java | 1 + .../ReferenceAnnotationBeanPostProcessor.java | 9 +- .../factory/annotation/ReferenceBeanBuilder.java | 1 + .../ServiceAnnotationBeanPostProcessor.java | 5 +- .../context/annotation/DubboComponentScan.java | 1 + .../annotation/DubboComponentScanRegistrar.java | 1 + .../annotation/DubboConfigBindingRegistrar.java | 1 + .../annotation/DubboConfigBindingsRegistrar.java | 1 + .../DubboConfigConfigurationSelector.java | 1 + .../spring/context/annotation/EnableDubbo.java | 1 + .../context/annotation/EnableDubboConfig.java | 1 + .../annotation/EnableDubboConfigBinding.java | 1 + .../properties/DefaultDubboConfigBinder.java | 1 + .../context/properties/DubboConfigBinder.java | 1 + .../converter/StringArrayToMapConverter.java | 1 + .../spring/extension/SpringExtensionFactory.java | 33 ++++- .../DubboApplicationContextInitializer.java | 39 ------ .../initializer/DubboApplicationListener.java | 49 ------- .../spring/initializer/DubboContextListener.java | 72 ---------- .../schema/AnnotationBeanDefinitionParser.java | 1 + .../spring/schema/DubboNamespaceHandler.java | 1 + .../spring/status/DataSourceStatusChecker.java | 1 + .../config/spring/status/SpringStatusChecker.java | 1 + .../dubbo/config/spring/util/BeanFactoryUtils.java | 28 ++++ .../src/main/resources/META-INF/compat/dubbo.xsd | 10 ++ .../src/main/resources/META-INF/dubbo.xsd | 10 ++ .../src/main/resources/META-INF/web-fragment.xml | 22 ---- .../org/apache/dubbo/config/spring/ConfigTest.java | 33 +++++ .../annotation/provider/HelloServiceImpl.java | 2 +- .../DubboApplicationContextInitializerTest.java | 88 ------------- .../initializer/DubboApplicationListenerTest.java | 59 --------- dubbo-container/dubbo-container-spring/pom.xml | 7 +- .../dubbo/container/spring/SpringContainer.java | 6 +- dubbo-distribution/pom.xml | 5 - .../org/apache/dubbo/cache/filter/CacheFilter.java | 4 +- .../dubbo/cache/support/expiring/ExpiringMap.java | 2 +- .../cache/support/jcache/JCacheFactoryTest.java | 2 +- .../governance/DynamicConfigurationFactory.java | 35 ----- .../nop/NopDynamicConfigurationFactory.java | 42 ------ .../apollo/ApolloDynamicConfigurationFactory.java | 46 ------- .../ArchaiusDynamicConfigurationFactory.java | 44 ------- .../org/apache/dubbo/metrics/MetricRegistry.java | 1 - .../dubbo/qos/protocol/QosProtocolWrapper.java | 9 +- .../java/org/apache/dubbo/qos/server/Server.java | 1 + .../qos/server/handler/HttpProcessHandler.java | 1 + .../qos/server/handler/LocalHostPermitHandler.java | 1 - .../qos/server/handler/TelnetProcessHandler.java | 1 - .../java/org/apache/dubbo/qos/textui/TTable.java | 6 +- .../java/org/apache/dubbo/qos/textui/TTree.java | 2 +- dubbo-registry/dubbo-registry-api/pom.xml | 5 - .../registry/integration/RegistryProtocol.java | 9 +- .../registry/support/FailbackRegistryTest.java | 23 ++++ .../exchange/support/header/AbstractTimerTask.java | 87 +++++++++++++ .../support/header/HeaderExchangeClient.java | 67 +++++----- .../support/header/HeaderExchangeServer.java | 76 +++++------ .../exchange/support/header/HeartBeatTask.java | 97 -------------- .../support/header/HeartbeatTimerTask.java | 62 +++++++++ .../support/header/ReconnectTimerTask.java | 61 +++++++++ .../telnet/support/command/LogTelnetHandler.java | 1 - .../transport/dispatcher/ChannelHandlers.java | 1 - .../exchange/support/header/HeartBeatTaskTest.java | 29 +++-- .../support/header/HeartbeatHandlerTest.java | 8 +- .../transport/netty/NettyClientToServerTest.java | 11 +- .../transport/netty4/NettyBackedChannelBuffer.java | 1 + .../transport/netty4/NettyClientHandler.java | 4 +- .../transport/netty4/NettyServerHandler.java | 2 +- .../transport/netty4/logging/MessageFormatter.java | 1 - .../transport/netty4/NettyClientToServerTest.java | 11 +- .../zookeeper/zkclient/ZkClientWrapper.java | 7 +- .../alibaba/dubbo/rpc/service/GenericService.java | 1 + .../java/org/apache/dubbo/rpc/AbstractResult.java | 1 + .../org/apache/dubbo/rpc/AsyncContextImpl.java | 1 + .../java/org/apache/dubbo/rpc/AsyncRpcResult.java | 1 + .../apache/dubbo/rpc/filter/AccessLogFilter.java | 3 +- .../dubbo/rpc/proxy/AbstractProxyFactory.java | 4 +- .../org/apache/dubbo/rpc/support/MockInvoker.java | 145 +++++++++++++-------- .../rpc/protocol/dubbo/filter/TraceFilter.java | 1 + .../protocol/dubbo/telnet/InvokeTelnetHandler.java | 1 + .../protocol/dubbo/telnet/LogTelnetHandler.java | 1 - .../rpc/protocol/dubbo/DubboProtocolTest.java | 9 +- .../dubbo/ReferenceCountExchangeClientTest.java | 7 + .../hessian/DubboHessianURLConnectionFactory.java | 1 + .../rpc/protocol/hessian/HessianProtocol.java | 2 +- .../dubbo/rpc/protocol/http/HttpProtocol.java | 1 + .../rpc/protocol/http/HttpRemoteInvocation.java | 1 + .../dubbo/rpc/protocol/rest/RpcContextFilter.java | 1 + .../swagger/DubboSwaggerApiListingResource.java | 7 +- .../integration/swagger/DubboSwaggerService.java | 2 +- .../rpc/protocol/rmi/RmiRemoteInvocation.java | 1 + .../dubbo/rpc/protocol/thrift/ThriftCodec.java | 1 - .../serialize/fastjson/FastJsonObjectOutput.java | 1 + .../dubbo/common/serialize/fst/FstFactory.java | 1 + .../serialize/hessian2/Hessian2ObjectInput.java | 3 +- .../serialize/hessian2/Hessian2ObjectOutput.java | 3 +- .../common/serialize/java/JavaObjectOutput.java | 1 - .../common/serialize/kryo/CompatibleKryo.java | 7 +- .../serialize/kryo/utils/AbstractKryoFactory.java | 5 +- .../protostuff/ProtostuffObjectInput.java | 5 +- .../protostuff/ProtostuffObjectOutput.java | 5 +- .../serialize/protostuff/utils/WrapperUtils.java | 5 +- .../dubbo/test/Spring3CompatibilityTest.java | 1 + .../dubbo/test/consumer/ConsumerConfiguration.java | 1 + .../dubbo/test/provider/ProviderConfiguration.java | 1 + pom.xml | 1 - 242 files changed, 1244 insertions(+), 1300 deletions(-) delete mode 100644 dubbo-bootstrap/pom.xml delete mode 100644 dubbo-bootstrap/src/main/java/org/apache/dubbo/bootstrap/DubboBootstrap.java copy dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/telnet/support/Help.java => dubbo-common/src/main/java/org/apache/dubbo/common/extension/DisableInject.java (80%) copy dubbo-common/src/main/java/org/apache/dubbo/common/utils/{Assert.java => ArrayUtils.java} (56%) copy dubbo-common/src/test/java/org/apache/dubbo/common/extension/{activate/ActivateExt1.java => injection/InjectExt.java} (88%) create mode 100644 dubbo-common/src/test/java/org/apache/dubbo/common/extension/injection/impl/InjectExtImpl.java copy dubbo-common/src/test/java/org/apache/dubbo/common/{version/VersionTest.java => utils/ArrayUtilsTest.java} (58%) create mode 100644 dubbo-common/src/test/resources/META-INF/dubbo/internal/org.apache.dubbo.common.extension.injection.InjectExt rename {dubbo-bootstrap/src/main/java/org/apache/dubbo/bootstrap => dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config}/DubboShutdownHook.java (98%) rename {dubbo-bootstrap/src/main => dubbo-config/dubbo-config-api/src}/test/java/org/apache/dubbo/config/AbstractConfigTest.java (99%) rename {dubbo-bootstrap/src/main => dubbo-config/dubbo-config-api/src}/test/java/org/apache/dubbo/config/AbstractInterfaceConfigTest.java (94%) rename {dubbo-bootstrap/src/main => dubbo-config/dubbo-config-api/src}/test/java/org/apache/dubbo/config/AbstractMethodConfigTest.java (95%) rename {dubbo-bootstrap/src/main => dubbo-config/dubbo-config-api/src}/test/java/org/apache/dubbo/config/AbstractReferenceConfigTest.java (100%) rename {dubbo-bootstrap/src/main => dubbo-config/dubbo-config-api/src}/test/java/org/apache/dubbo/config/AbstractServiceConfigTest.java (100%) rename {dubbo-bootstrap/src/main => dubbo-config/dubbo-config-api/src}/test/java/org/apache/dubbo/config/ApplicationConfigTest.java (100%) rename {dubbo-bootstrap/src/main => dubbo-config/dubbo-config-api/src}/test/java/org/apache/dubbo/config/ArgumentConfigTest.java (100%) rename {dubbo-bootstrap/src/main => dubbo-config/dubbo-config-api/src}/test/java/org/apache/dubbo/config/ConsumerConfigTest.java (100%) rename {dubbo-bootstrap/src/main => dubbo-config/dubbo-config-api/src}/test/java/org/apache/dubbo/config/GenericServiceTest.java (100%) rename {dubbo-bootstrap/src/main => dubbo-config/dubbo-config-api/src}/test/java/org/apache/dubbo/config/MethodConfigTest.java (100%) rename {dubbo-bootstrap/src/main => dubbo-config/dubbo-config-api/src}/test/java/org/apache/dubbo/config/ModuleConfigTest.java (100%) rename {dubbo-bootstrap/src/main => dubbo-config/dubbo-config-api/src}/test/java/org/apache/dubbo/config/MonitorConfigTest.java (100%) rename {dubbo-bootstrap/src/main => dubbo-config/dubbo-config-api/src}/test/java/org/apache/dubbo/config/ProtocolConfigTest.java (100%) rename {dubbo-bootstrap/src/main => dubbo-config/dubbo-config-api/src}/test/java/org/apache/dubbo/config/ProviderConfigTest.java (100%) rename {dubbo-bootstrap/src/main => dubbo-config/dubbo-config-api/src}/test/java/org/apache/dubbo/config/ReferenceConfigTest.java (100%) rename {dubbo-bootstrap/src/main => dubbo-config/dubbo-config-api/src}/test/java/org/apache/dubbo/config/RegistryConfigTest.java (100%) rename {dubbo-bootstrap/src/main => dubbo-config/dubbo-config-api/src}/test/java/org/apache/dubbo/config/ServiceConfigTest.java (95%) rename {dubbo-bootstrap/src/main => dubbo-config/dubbo-config-api/src}/test/java/org/apache/dubbo/config/api/Box.java (100%) rename {dubbo-bootstrap/src/main => dubbo-config/dubbo-config-api/src}/test/java/org/apache/dubbo/config/api/DemoException.java (100%) rename {dubbo-bootstrap/src/main => dubbo-config/dubbo-config-api/src}/test/java/org/apache/dubbo/config/api/DemoService.java (100%) rename {dubbo-bootstrap/src/main => dubbo-config/dubbo-config-api/src}/test/java/org/apache/dubbo/config/api/Greeting.java (100%) rename {dubbo-bootstrap/src/main => dubbo-config/dubbo-config-api/src}/test/java/org/apache/dubbo/config/api/User.java (100%) rename {dubbo-bootstrap/src/main => dubbo-config/dubbo-config-api/src}/test/java/org/apache/dubbo/config/cache/CacheService.java (100%) rename {dubbo-bootstrap/src/main => dubbo-config/dubbo-config-api/src}/test/java/org/apache/dubbo/config/cache/CacheServiceImpl.java (100%) rename {dubbo-bootstrap/src/main => dubbo-config/dubbo-config-api/src}/test/java/org/apache/dubbo/config/cache/CacheTest.java (100%) rename {dubbo-bootstrap/src/main => dubbo-config/dubbo-config-api/src}/test/java/org/apache/dubbo/config/consumer/DemoActionByAnnotation.java (100%) rename {dubbo-bootstrap/src/main => dubbo-config/dubbo-config-api/src}/test/java/org/apache/dubbo/config/consumer/DemoActionBySetter.java (100%) rename {dubbo-bootstrap/src/main => dubbo-config/dubbo-config-api/src}/test/java/org/apache/dubbo/config/consumer/DemoInterceptor.java (100%) rename {dubbo-bootstrap/src/main => dubbo-config/dubbo-config-api/src}/test/java/org/apache/dubbo/config/invoker/DelegateProviderMetaDataInvokerTest.java (100%) rename {dubbo-bootstrap/src/main => dubbo-config/dubbo-config-api/src}/test/java/org/apache/dubbo/config/mock/GreetingLocal1.java (100%) rename {dubbo-bootstrap/src/main => dubbo-config/dubbo-config-api/src}/test/java/org/apache/dubbo/config/mock/GreetingLocal2.java (100%) rename {dubbo-bootstrap/src/main => dubbo-config/dubbo-config-api/src}/test/java/org/apache/dubbo/config/mock/GreetingLocal3.java (100%) rename {dubbo-bootstrap/src/main => dubbo-config/dubbo-config-api/src}/test/java/org/apache/dubbo/config/mock/GreetingMock1.java (100%) rename {dubbo-bootstrap/src/main => dubbo-config/dubbo-config-api/src}/test/java/org/apache/dubbo/config/mock/GreetingMock2.java (100%) rename {dubbo-bootstrap/src/main => dubbo-config/dubbo-config-api/src}/test/java/org/apache/dubbo/config/mock/MockCluster.java (100%) rename {dubbo-bootstrap/src/main => dubbo-config/dubbo-config-api/src}/test/java/org/apache/dubbo/config/mock/MockCodec.java (100%) rename {dubbo-bootstrap/src/main => dubbo-config/dubbo-config-api/src}/test/java/org/apache/dubbo/config/mock/MockDispatcher.java (100%) rename {dubbo-bootstrap/src/main => dubbo-config/dubbo-config-api/src}/test/java/org/apache/dubbo/config/mock/MockExchanger.java (100%) rename {dubbo-bootstrap/src/main => dubbo-config/dubbo-config-api/src}/test/java/org/apache/dubbo/config/mock/MockExporterListener.java (100%) rename {dubbo-bootstrap/src/main => dubbo-config/dubbo-config-api/src}/test/java/org/apache/dubbo/config/mock/MockFilter.java (100%) rename {dubbo-bootstrap/src/main => dubbo-config/dubbo-config-api/src}/test/java/org/apache/dubbo/config/mock/MockInvokerListener.java (100%) rename {dubbo-bootstrap/src/main => dubbo-config/dubbo-config-api/src}/test/java/org/apache/dubbo/config/mock/MockLoadBalance.java (100%) rename {dubbo-bootstrap/src/main => dubbo-config/dubbo-config-api/src}/test/java/org/apache/dubbo/config/mock/MockProtocol.java (100%) rename {dubbo-bootstrap/src/main => dubbo-config/dubbo-config-api/src}/test/java/org/apache/dubbo/config/mock/MockProtocol2.java (100%) rename {dubbo-bootstrap/src/main => dubbo-config/dubbo-config-api/src}/test/java/org/apache/dubbo/config/mock/MockProxyFactory.java (100%) rename {dubbo-bootstrap/src/main => dubbo-config/dubbo-config-api/src}/test/java/org/apache/dubbo/config/mock/MockRegistry.java (100%) rename {dubbo-bootstrap/src/main => dubbo-config/dubbo-config-api/src}/test/java/org/apache/dubbo/config/mock/MockRegistryFactory.java (100%) rename {dubbo-bootstrap/src/main => dubbo-config/dubbo-config-api/src}/test/java/org/apache/dubbo/config/mock/MockRegistryFactory2.java (100%) rename {dubbo-bootstrap/src/main => dubbo-config/dubbo-config-api/src}/test/java/org/apache/dubbo/config/mock/MockStatusChecker.java (100%) rename {dubbo-bootstrap/src/main => dubbo-config/dubbo-config-api/src}/test/java/org/apache/dubbo/config/mock/MockTelnetHandler.java (100%) rename {dubbo-bootstrap/src/main => dubbo-config/dubbo-config-api/src}/test/java/org/apache/dubbo/config/mock/MockThreadPool.java (100%) rename {dubbo-bootstrap/src/main => dubbo-config/dubbo-config-api/src}/test/java/org/apache/dubbo/config/mock/MockTransporter.java (100%) rename {dubbo-bootstrap/src/main => dubbo-config/dubbo-config-api/src}/test/java/org/apache/dubbo/config/mock/TestProxyFactory.java (100%) rename {dubbo-bootstrap/src/main => dubbo-config/dubbo-config-api/src}/test/java/org/apache/dubbo/config/provider/impl/DemoServiceImpl.java (100%) rename {dubbo-bootstrap/src/main => dubbo-config/dubbo-config-api/src}/test/java/org/apache/dubbo/config/url/ExporterSideConfigUrlTest.java (100%) rename {dubbo-bootstrap/src/main => dubbo-config/dubbo-config-api/src}/test/java/org/apache/dubbo/config/url/InvokerSideConfigUrlTest.java (100%) rename {dubbo-bootstrap/src/main => dubbo-config/dubbo-config-api/src}/test/java/org/apache/dubbo/config/url/RpcConfigGetSetProxy.java (100%) rename {dubbo-bootstrap/src/main => dubbo-config/dubbo-config-api/src}/test/java/org/apache/dubbo/config/url/UrlTestBase.java (100%) rename {dubbo-bootstrap/src/main => dubbo-config/dubbo-config-api/src}/test/java/org/apache/dubbo/config/utils/MockReferenceConfig.java (100%) rename {dubbo-bootstrap/src/main => dubbo-config/dubbo-config-api/src}/test/java/org/apache/dubbo/config/utils/ReferenceConfigCacheTest.java (100%) rename {dubbo-bootstrap/src/main => dubbo-config/dubbo-config-api/src}/test/java/org/apache/dubbo/config/validation/ValidationParameter.java (100%) rename {dubbo-bootstrap/src/main => dubbo-config/dubbo-config-api/src}/test/java/org/apache/dubbo/config/validation/ValidationService.java (100%) rename {dubbo-bootstrap/src/main => dubbo-config/dubbo-config-api/src}/test/java/org/apache/dubbo/config/validation/ValidationServiceImpl.java (100%) rename {dubbo-bootstrap/src/main => dubbo-config/dubbo-config-api/src}/test/java/org/apache/dubbo/config/validation/ValidationTest.java (100%) rename {dubbo-bootstrap/src/main => dubbo-config/dubbo-config-api/src}/test/resources/META-INF/services/org.apache.dubbo.common.status.StatusChecker (100%) rename {dubbo-bootstrap/src/main => dubbo-config/dubbo-config-api/src}/test/resources/META-INF/services/org.apache.dubbo.common.threadpool.ThreadPool (100%) rename {dubbo-bootstrap/src/main => dubbo-config/dubbo-config-api/src}/test/resources/META-INF/services/org.apache.dubbo.registry.RegistryFactory (100%) rename {dubbo-bootstrap/src/main => dubbo-config/dubbo-config-api/src}/test/resources/META-INF/services/org.apache.dubbo.remoting.Codec (100%) rename {dubbo-bootstrap/src/main => dubbo-config/dubbo-config-api/src}/test/resources/META-INF/services/org.apache.dubbo.remoting.Dispatcher (100%) rename {dubbo-bootstrap/src/main => dubbo-config/dubbo-config-api/src}/test/resources/META-INF/services/org.apache.dubbo.remoting.Transporter (100%) rename {dubbo-bootstrap/src/main => dubbo-config/dubbo-config-api/src}/test/resources/META-INF/services/org.apache.dubbo.remoting.exchange.Exchanger (100%) rename {dubbo-bootstrap/src/main => dubbo-config/dubbo-config-api/src}/test/resources/META-INF/services/org.apache.dubbo.remoting.telnet.TelnetHandler (100%) rename {dubbo-bootstrap/src/main => dubbo-config/dubbo-config-api/src}/test/resources/META-INF/services/org.apache.dubbo.rpc.ExporterListener (100%) rename {dubbo-bootstrap/src/main => dubbo-config/dubbo-config-api/src}/test/resources/META-INF/services/org.apache.dubbo.rpc.Filter (100%) rename {dubbo-bootstrap/src/main => dubbo-config/dubbo-config-api/src}/test/resources/META-INF/services/org.apache.dubbo.rpc.InvokerListener (100%) rename {dubbo-bootstrap/src/main => dubbo-config/dubbo-config-api/src}/test/resources/META-INF/services/org.apache.dubbo.rpc.Protocol (100%) rename {dubbo-bootstrap/src/main => dubbo-config/dubbo-config-api/src}/test/resources/META-INF/services/org.apache.dubbo.rpc.ProxyFactory (100%) rename {dubbo-bootstrap/src/main => dubbo-config/dubbo-config-api/src}/test/resources/META-INF/services/org.apache.dubbo.rpc.cluster.Cluster (100%) rename {dubbo-bootstrap/src/main => dubbo-config/dubbo-config-api/src}/test/resources/META-INF/services/org.apache.dubbo.rpc.cluster.LoadBalance (100%) rename {dubbo-bootstrap/src/main => dubbo-config/dubbo-config-api/src}/test/resources/log4j.xml (100%) delete mode 100644 dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/initializer/DubboApplicationContextInitializer.java delete mode 100644 dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/initializer/DubboApplicationListener.java delete mode 100644 dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/initializer/DubboContextListener.java delete mode 100644 dubbo-config/dubbo-config-spring/src/main/resources/META-INF/web-fragment.xml delete mode 100644 dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/initializer/DubboApplicationContextInitializerTest.java delete mode 100644 dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/initializer/DubboApplicationListenerTest.java delete mode 100644 dubbo-governance/dubbo-governance-api/src/main/java/org/apache/dubbo/governance/DynamicConfigurationFactory.java delete mode 100644 dubbo-governance/dubbo-governance-api/src/main/java/org/apache/dubbo/governance/support/nop/NopDynamicConfigurationFactory.java delete mode 100644 dubbo-governance/dubbo-governance-apollo/src/main/java/org/apache/dubbo/governance/support/apollo/ApolloDynamicConfigurationFactory.java delete mode 100644 dubbo-governance/dubbo-governance-zookeeper/src/main/java/org/apache/dubbo/governance/support/archaius/ArchaiusDynamicConfigurationFactory.java create mode 100644 dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/exchange/support/header/AbstractTimerTask.java delete mode 100644 dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/exchange/support/header/HeartBeatTask.java create mode 100644 dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/exchange/support/header/HeartbeatTimerTask.java create mode 100644 dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/exchange/support/header/ReconnectTimerTask.java