This is an automated email from the ASF dual-hosted git repository.
liujun pushed a change to branch cloud-native
in repository https://gitbox.apache.org/repos/asf/dubbo.git.
from 758b49f merge and reinit
add 85dd59c Remove duplicate @Override (#4228)
add 492f760 Reverse url of python (#4162)
add 8479906 Improve java doc for dubbo-remoting-netty4 (#4180)
add 8f783fa optimize junit Assert usage (#4214)
add e2965c2 [Test] add test for common-config (#4208)
add 346630e Disclaimer removed (#4231)
add 0b27565 [Dubbo-4218] Fix NPE when the TagRouterRule addresses config
is null (#4218) (#4236)
add d3a5166 Delete useless code (#4242)
add 5d32b86 Merge changes from 2.7.2-release (#4259)
add 78aea48 [Dubbo-4183] Fix unstable tests in ConditionRouterTest
(#4226)
add 76d6562 [CI] Add jenkinsfile for dubbo snapshot deployment (#4205)
add 3acf5b8 fix org.apache.dubbo.common.URL#toMap change password key,
from USERNAME_KEY to PASSWORD_KEY (#4267)
add 6f3a05c 1. 将URL中的默认值使用三目运算符表示。 (#4301)
add 041a6ad [Dubbo-4323]fix use AtomicInteger instead of volatile to inc
(#4324)
add 81e61cc remove unnecessary null check before instance of (#4321)
add 60c9d9d add zookeeper maven dependency so that on change registery
can run the demo (#4352)
add fa619c9 [Dubbo-4355] Fix dubbo.jar do not contain
"serialization-protobuf-json" module issue (#4356) (#4364)
add 7285ce9 [Dubbo-4299]Fix NPE when PojoUtils realize Null element in
collection(#4299) (#4300)
add 18773aa fix qos configuration cannot work after added 'qos-enable'
style support (#4378)
add 1a9ddd8 allow @Service and @Reference to merge attributes form
annotations in lower levels of the annotation hierachy. (#4078)
add a970480 format file: pom.xml of bom module (#4376)
add 52bef81 synchronized local variables or parameters should be set to
final (#4325)
add 024651d fix bug about nacos (#4308)
add e5fe041 remove tomcat-embed-logging-juli (#4430)
add 1956f2d use StringUtils (#4438)
add 9b14464 Add unit tests for org.apache.dubbo.rpc.support.MockInvoker
(#4413)
add 5b7d2a39 Remove oracle jdk (#4448)
add a42fb15 [Dubbo-2.7.2] Fix the protostuff protocol lacks a custom
serialization method for java.sql.Date #4384 (#4386)
add 4c4b931 Refactor MetricsFilterTest to use Mockito (#4398)
add 46215d2 defaultPort can not be null, delete unuse code. (#4480)
add 519df67 Redis metadata supports setting database properties. (#4476)
add ddd7e43 Add -jar for java command in dubbo-demo readme file (#4517)
add 5eec017 Fix length of array is never negative (#4510)
add bfa52b2 [Dubbo-4355] Fix dubbo.jar do not contain
"serialization-protobuf-json" module issue (#4356) (#4364)
add a2f0d9a fix qos configuration cannot work after added 'qos-enable'
style support (#4378)
add a1e4757 Use empty protocol for nacos registry when address list is
empty. (#4349)
add e3c35f2 Add TypeDefinitionBuilderName to TypeDefinition (#4372)
add 6b7d118 fix empty protocol in consul registry (#4354)
add 8534f48 Observation of performance degradation when running under JDK
8 (#4381)
add 64aea16 zipkin 2.6.x package compatible. (#4368)
add e1ce4bc AsyncRpcResult should handle exception when registering
callback (#4379)
add acae8d9 Spring package scan compatibility, support both alibaba
Service and apache Service. (#4375)
add 27789ce duplicate decrease for ExecuteLimitFilter onError (#4380)
add 792b487 fix #4406 (#4408)
add e0d3de3 add bom dependency for new module
'metadata-definition-protobuf' (#4417)
add b5408b7 support handle of exception from onResponse or onError (#4401)
add 9b7c697 spi配置多个tag解析错误问题 (#4346)
add 69a0483 check complete status of async-result before try to update
(#4394)
add d66a2fa disable oraclejdk 11 task & fix ProtobufTypeBuilderTest
(#4434)
add 60ca9f4 DubboComponentScan cannot backward support for alibaba
@Service and @Reference. (#4415)
add cfba520 support method sync timeout (#4436)
add a229d87 Remove unused imports (#4443)
add 3d01797 Fix MulticastSocket setInterface choose an unreachable
address (#4426)
add 8baf929 Add nacos dependencies to dubbo-demo (#4447)
add b30b015 fixes #4345, change zookeeper notification log level from
info to debug
add 1bf5fce Nacos registry enhancement & register reference bean (#4454)
add 1c62678 remove unused imports
add c4e9495 unify config-center model (#4388)
add 6667a6f automatically append env parameters. (#4407)
add 2497dcf make metadata key contain : when version and group is empty
(#4465)
add f456745 Fix url generated from ConfigCenterConfig missed 'config.'
prefix (#4411)
add e3e5460 FutureAdapter depends on AsyncRpcResult (#4471)
add a97d378 add 2.7.3 change list (#4453)
add 208fafb polish 2.7.3 change list
add 0e381aa polish 2.7.3 change list
add 6466e97 update version to 2.7.3 to prepare for release
add 3be09d7 Update CHANGES.md
add 8658fee Update CHANGES.md
add 6e20848 RpcContext cannot getFuture after setFuture (#4502)
add 4365160 Fix #4498, @Reference can't inject the Dubbo service proxy
when its attribute is empty (#4503)
add 0bd5a29 org.apache.dubbo.rpc.RpcContext.getFuture() cannot work in
Filter. (#4504)
add 5bbc1df Upgrade nacos-client dependency version to 1.1.1 (#4534)
add 5d82371 Use special Configuration for Configs (#4522)
add 9632c40 Merge branch '2.7.3-release'
add 4676d22 fix RpcContext compatible problem (#4544)
add a5f6090 [Dubbo-4525] fix Clusterutils.mergeurl, make sure specific
keys from provider side not override by that from consumer. (#4533)
add 1b4586a Merge branch '2.7.3-release'
add 68112e4 Remove duplicate code in AbstractConfig (#4492)
add d20dc68 Merge branch 'master' of
https://github.com/apache/incubator-dubbo
add c304bf3 bump version to 2.7.4-SNAPSHOT (#4549)
add 39b6b0c Optimize Version#isRelease263OrHigher check (#4551) (#4567)
add 668378f use the correct spi ZookeeperTransporter when initialize the
default ConfigCenter's zkClient(#4511) (#4513)
add a88b1e2 single variable name should be singular (#4539)
add 843e2ee fix convertMethodConfig2AsyncInfo spelling error (#4563)
add 05e44db Fix bug #4374 for AccessLogFilter not working (#4566)
add 214ec1f [Dubbo-4575] Upgrade to use fastjson 1.2.58 (#4579)
add aab3a05 #4497 设置属性dubbo.provider.metrics.，里面的值无法放入url参数列表里 (#4505)
add 363cd0c Make code strong, version check compatibility. Fix
https://github.com/apache/dubbo/pull/4488 (#4490)
add 82378a1 fix issue 4328, fix PojoUtils realize issue #4334 (#4521)
add 77a69e0 issue#4314: ZookeeperDynamicConfiguration will be busy wait
if zk is unavailable (#4582)
add d663ad4 [dubbo_4569]optimized code(#4569) (#4584)
add 22670b2
issue#4570:RegistryProtocol.DestroyableExporter_modifiers_order (#4583)
add 63d33d1 [DUBBO-2991][WIP]Enhance the java doc of dubbo-cluster
(#2991) (#4424)
add fba25d2 move isMetaMethod to MethodUtils (#4387)
add 85b96e2 fixed registryConfig equals (#4359)
add e3c9bed fix bug of Etcd3Registry cancel watch #4357 (#4358)
add d727461 fix bug about the generateReturnAndInvocation method of the
class AdaptiveClassCodeGenerator (#4339)
add 5c88dcb Merge branch 'master' of
https://github.com/apache/incubator-dubbo
add 18357d6 1. remove getExecutorService method cexecutor local variables
(#4319)
add e496ca5 add some files list exclude license check (#4318)
add b4afeb9 follow up for pr#4339, remove the space (#4591)
add 0f85bbd [Dubbo-4585] fix when provider throw RpcException consumer do
not invoke mock (#4586)
add 8a50b2f Fixed IndexOutOfBoundsException (#4515)
add d7d4d67 Optimize part of the code in
AnnotatedBeanDefinitionRegistryUtils.java (#4590)
add b89f1fb update change list
add 9b1e78b update change list, fix typesetting problem
add 894651a [Dubbo] Fix StringIndexOutOfBoundsException when len=0 #4402
(#4425)
add 9960d23 update default dependency to the latest version.
add 764b8df optimize some code styles (#4260)
add 443b6ff unused connectionManager in RestProtocol (#4614)
add a5e3f54 Dubbo throws exception when use java serializer #4612 (#4613)
add 5f938bf fix the bug when use protobuf-json (#4634)
add 24e851e use standard protobuf json format to write byte[] (#4638)
add 66684f6 [Dubbo-3420] check EOF of inputstream in IOUtils.write (#4648)
add d4904d4 optimize some code styles (#4655)
add f2af6fd The compilation of static methods should be excluded when
generating the proxy. #4647 (#4649)
new c5dd1ea Merge branch 'master' into cloud-native
new 19c5bab solve conflicts and errors after merged master
new 56c931e Merge remote-tracking branch 'origin/cloud-native' into
cloud-native
new df34800 solve conflicts after merged master
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:
.travis.yml | 2 -
CHANGES.md | 140 ++
DISCLAIMER | 1 -
Jenkinsfile | 138 ++
README.md | 4 +-
dubbo-all/pom.xml | 7 +-
dubbo-bom/pom.xml | 9 +-
.../org/apache/dubbo/bootstrap/DubboBootstrap.java | 13 +-
.../rpc/cluster/loadbalance/RandomLoadBalance.java | 15 +-
.../router/condition/config/ListenableRouter.java | 2 +-
.../router/condition/config/ServiceRouter.java | 2 +-
.../dubbo/rpc/cluster/router/tag/TagRouter.java | 2 +-
.../cluster/router/tag/model/TagRouterRule.java | 8 +-
.../dubbo/rpc/cluster/support/ClusterUtils.java | 51 +-
.../support/wrapper/MockClusterInvoker.java | 13 +-
.../org/apache/dubbo/rpc/cluster/StickyTest.java | 4 +-
.../dubbo/rpc/cluster/merger/ResultMergerTest.java | 18 +-
.../dubbo/rpc/cluster/router/TagRouterTest.java | 45 +
.../router/condition/ConditionRouterTest.java | 131 +-
.../support/AbstractClusterInvokerTest.java | 21 +-
.../rpc/cluster/support/ClusterUtilsTest.java | 72 +
.../support/FailoverClusterInvokerTest.java | 2 +-
.../dubbo/rpc/cluster/support/MenuService.java | 4 +-
.../support/wrapper/MockClusterInvokerTest.java | 38 +-
.../wrapper/MockProviderRpcExceptionTest.java | 238 +++
.../src/main/java/org/apache/dubbo/common/URL.java | 144 +-
.../main/java/org/apache/dubbo/common/Version.java | 19 +-
.../common/beanutil/JavaBeanSerializeUtil.java | 4 +-
.../org/apache/dubbo/common/bytecode/Proxy.java | 5 +-
.../dubbo/common/compiler/support/JdkCompiler.java | 2 +-
.../common/config/AbstractPrefixConfiguration.java | 17 +-
.../apache/dubbo/common/config/Environment.java | 11 +-
.../common/config/EnvironmentConfiguration.java | 8 +-
.../config/configcenter/DynamicConfiguration.java | 54 +-
.../file/FileSystemDynamicConfiguration.java | 6 +-
.../configcenter/nop/NopDynamicConfiguration.java | 4 +-
.../wrapper/CompositeDynamicConfiguration.java | 18 +-
.../dubbo/common/constants/CommonConstants.java | 17 +-
.../dubbo/common/constants/QosConstants.java | 12 +-
.../extension/AdaptiveClassCodeGenerator.java | 765 ++++-----
.../dubbo/common/extension/ExtensionLoader.java | 19 +-
.../extension/support/ActivateComparator.java | 2 +-
.../java/org/apache/dubbo/common/io/Bytes.java | 10 +
.../org/apache/dubbo/common/json/JSONArray.java | 10 +-
.../org/apache/dubbo/common/json/JSONObject.java | 10 +-
.../org/apache/dubbo/common/json/JSONVisitor.java | 2 +-
.../dubbo/common/utils/CompatibleTypeUtils.java | 2 +
.../org/apache/dubbo/common/utils/IOUtils.java | 22 +-
.../org/apache/dubbo/common/utils/MethodUtils.java | 23 +
.../org/apache/dubbo/common/utils/NetUtils.java | 28 +-
.../org/apache/dubbo/common/utils/PojoUtils.java | 7 +-
.../org/apache/dubbo/common/utils/StringUtils.java | 32 +
.../org/apache/dubbo/common/utils/UrlUtils.java | 1 +
.../test/java/org/apache/dubbo/common/URLTest.java | 35 +-
.../common/beanutil/JavaBeanSerializeUtilTest.java | 14 +-
.../apache/dubbo/common/bytecode/MixinTest.java | 7 +-
.../apache/dubbo/common/bytecode/ProxyTest.java | 6 +-
.../apache/dubbo/common/bytecode/WrapperTest.java | 20 +-
.../common/compiler/support/ClassUtilsTest.java | 2 +-
.../config/EnvironmentConfigurationTest.java | 104 ++
.../common/config/InmemoryConfigurationTest.java | 95 ++
.../common/config/SystemConfigurationTest.java | 117 ++
.../file/FileSystemDynamicConfigurationTest.java | 2 +-
.../common/extension/ExtensionLoaderTest.java | 30 +-
.../ext10_multi_names/Ext10MultiNames.java | 7 +-
.../impl/Ext10MultiNamesImpl.java | 6 +-
.../dubbo/common/extension/ext6_inject/Dao.java | 2 +-
.../extension/support/ActivateComparatorTest.java | 1 -
.../java/org/apache/dubbo/common/io/BytesTest.java | 14 +
.../org/apache/dubbo/common/json/JSONTest.java | 6 +-
.../threadlocal/InternalThreadLocalTest.java | 29 +-
.../NamedInternalThreadFactoryTest.java | 2 +-
.../support/eager/EagerThreadPoolExecutorTest.java | 8 +-
.../common/utils/CompatibleTypeUtilsTest.java | 2 +-
.../org/apache/dubbo/common/utils/IOUtilsTest.java | 3 +-
.../apache/dubbo/common/utils/MethodUtilsTest.java | 4 +-
.../apache/dubbo/common/utils/PojoUtilsTest.java | 1699 ++++++++++----------
.../dubbo/common/utils/ReflectUtilsTest.java | 2 +-
.../apache/dubbo/common/utils/StringUtilsTest.java | 14 +
.../apache/dubbo/common/version/VersionTest.java | 7 +
...mon.extension.ext10_multi_names.Ext10MultiNames | 1 +
.../spring/context/annotation/EnableDubbo.java | 12 +-
.../alibaba/dubbo/remoting/RemotingException.java | 4 +
.../{Exchanger.java => ResponseCallback.java} | 19 +-
.../dubbo/remoting/exchange/ResponseFuture.java | 41 +-
.../main/java/com/alibaba/dubbo/rpc/Result.java | 4 +-
.../java/com/alibaba/dubbo/rpc/RpcContext.java | 24 +-
.../dubbo/rpc/protocol/dubbo/FutureAdapter.java | 147 ++
.../com/alibaba/dubbo/rpc/support/RpcUtils.java | 5 -
...atibleReferenceAnnotationBeanPostProcessor.java | 508 ------
.../annotation/CompatibleReferenceBeanBuilder.java | 167 --
...mpatibleServiceAnnotationBeanPostProcessor.java | 525 ------
.../annotation/CompatibleDubboComponentScan.java | 66 -
.../CompatibleDubboComponentScanRegistrar.java | 110 --
.../CompatibleAnnotationBeanDefinitionParser.java | 93 --
.../org/apache/dubbo/config/MethodConfigTest.java | 7 +-
.../java/org/apache/dubbo/rpc/RpcContextTest.java | 37 +-
.../org/apache/dubbo/service/ComplexObject.java | 2 +-
.../alibaba/dubbo/config/annotation/Reference.java | 0
.../alibaba/dubbo/config/annotation/Service.java | 0
.../org/apache/dubbo/config/AbstractConfig.java | 40 +-
.../org/apache/dubbo/config/ApplicationConfig.java | 80 +-
.../apache/dubbo/config/ConfigCenterConfig.java | 18 +-
.../org/apache/dubbo/config/ReferenceConfig.java | 2 +-
.../org/apache/dubbo/config/RegistryConfig.java | 33 +-
.../org/apache/dubbo/config/ServiceConfig.java | 2 +-
.../apache/dubbo/config/annotation/Reference.java | 25 +-
.../config/context/ConfigConfigurationAdapter.java | 22 +-
.../dubbo/config/telnet/ShutdownTelnetHandler.java | 2 +-
.../dubbo/config/utils/ReferenceConfigCache.java | 2 +-
.../apache/dubbo/config/AbstractConfigTest.java | 77 +
.../apache/dubbo/config/ApplicationConfigTest.java | 34 +
.../dubbo/config/ConfigCenterConfigTest.java | 14 +
.../apache/dubbo/config/ReferenceConfigTest.java | 14 +-
.../apache/dubbo/config/RegistryConfigTest.java | 10 +
.../dubbo/config/validation/ValidationTest.java | 2 +-
dubbo-config/dubbo-config-spring/pom.xml | 1 +
.../AbstractAnnotationConfigBeanBuilder.java | 3 +
.../AnnotatedInterfaceConfigBeanBuilder.java | 215 +++
.../AnnotationInjectedBeanPostProcessor.java | 135 +-
.../AnnotationPropertyValuesAdapter.java | 39 +-
.../ReferenceAnnotationBeanPostProcessor.java | 122 +-
.../factory/annotation/ReferenceBeanBuilder.java | 84 +-
.../ServiceAnnotationBeanPostProcessor.java | 126 +-
.../factory/annotation/ServiceBeanNameBuilder.java | 43 +-
.../annotation/DubboConfigConfiguration.java | 7 +-
.../spring/schema/DubboBeanDefinitionParser.java | 2 +-
.../util/AnnotatedBeanDefinitionRegistryUtils.java | 64 +-
.../dubbo/config/spring/util/AnnotationUtils.java | 179 ++-
.../dubbo/config/spring/util/BeanFactoryUtils.java | 6 +
.../config/spring/SimpleRegistryExporter.java | 4 +-
.../spring/annotation/merged/MergedReference.java | 32 +-
.../spring/annotation/merged/MergedService.java | 80 +-
.../AnnotationPropertyValuesAdapterTest.java | 10 +-
.../factory/annotation/MergedAnnotationTest.java | 76 +
.../ReferenceAnnotationBeanPostProcessorTest.java | 60 +-
.../annotation/ReferenceBeanBuilderTest.java | 2 +-
.../spring/context/annotation/EnableDubboTest.java | 5 +
.../annotation/consumer/ConsumerConfiguration.java | 22 +-
.../consumer/test/TestConsumerConfiguration.java | 18 +-
.../annotation/provider/HelloServiceImpl.java | 3 +-
.../DubboComponentScanRegistrarTest.java | 2 +
.../annotation/provider/DefaultHelloService.java | 4 +-
.../annotation/provider/ProviderConfiguration.java | 4 +-
.../AnnotatedBeanDefinitionRegistryUtilsTest.java | 74 +
.../support/apollo/ApolloDynamicConfiguration.java | 10 +-
.../consul/ConsulDynamicConfiguration.java | 36 +-
.../support/etcd/EtcdDynamicConfiguration.java | 27 +-
.../support/etcd/EtcdDynamicConfigurationTest.java | 5 +-
.../support/nacos/NacosDynamicConfiguration.java | 49 +-
.../nacos/NacosDynamicConfigurationTest.java | 55 +-
.../support/zookeeper/CacheListener.java | 13 +-
.../zookeeper/ZookeeperDynamicConfiguration.java | 41 +-
.../ZookeeperDynamicConfigurationTest.java | 31 +-
dubbo-demo/README.md | 4 +-
.../dubbo-demo-annotation-consumer/pom.xml | 24 +
.../dubbo-demo-annotation-provider/pom.xml | 24 +
.../dubbo-demo-xml/dubbo-demo-xml-consumer/pom.xml | 24 +
.../dubbo-demo-xml/dubbo-demo-xml-provider/pom.xml | 24 +
dubbo-dependencies-bom/pom.xml | 15 +-
.../dubbo/cache/support/expiring/ExpiringMap.java | 5 +-
.../apache/dubbo/cache/filter/CacheFilterTest.java | 4 +-
.../support/jvalidation/JValidationTest.java | 1 -
.../jvalidation/mock/JValidatorTestTarget.java | 10 +-
.../dubbo-metadata-definition-protobuf}/pom.xml | 20 +-
...e.dubbo.metadata.definition.builder.TypeBuilder | 1 +
.../definition/protobuf}/model/GooglePB.java | 2 +-
.../protobuf}/model/ServiceInterface.java | 2 +-
.../metadata/definition/TypeDefinitionBuilder.java | 18 +-
.../definition/model/MethodDefinition.java | 18 +-
.../metadata/definition/model/TypeDefinition.java | 9 +
.../report/identifier/MetadataIdentifier.java | 10 +-
.../dubbo/metadata/definition/MetadataTest.java | 10 +-
.../metadata/definition/common/ColorEnum.java | 2 +-
.../metadata/definition/service/ComplexObject.java | 2 +-
.../report/identifier/MetadataIdentifierTest.java | 11 +-
.../report/support/AbstractMetadataReportTest.java | 8 +-
.../metadata/store/InterfaceNameTestService2.java | 2 +-
.../store/etcd/EtcdMetadataReportTest.java | 2 +
.../metadata/store/nacos/NacosMetadataReport.java | 12 +-
.../store/nacos/NacosMetadataReportTest.java | 8 +-
.../metadata/store/redis/RedisMetadataReport.java | 4 +-
dubbo-metadata/pom.xml | 1 +
.../dubbo/monitor/support/MonitorFilterTest.java | 24 +-
.../dubbo/monitor/dubbo/AppResponseBuilder.java | 55 +
.../dubbo/monitor/dubbo/MetricsFilterTest.java | 80 +-
.../dubbo/qos/command/util/CommandHelperTest.java | 1 -
.../integration/AbstractConfiguratorListener.java | 3 +-
.../registry/integration/RegistryDirectory.java | 2 +-
.../registry/integration/RegistryProtocol.java | 4 +-
.../dubbo/registry/PerformanceRegistryTest.java | 1 -
.../java/org/apache/dubbo/registry/ZKTools.java | 3 +-
.../registry/support/AbstractRegistryTest.java | 2 +-
.../registry/support/FailbackRegistryTest.java | 4 +-
.../dubbo/registry/consul/ConsulRegistry.java | 30 +-
.../registry/dubbo/RegistryDirectoryTest.java | 64 +-
.../dubbo/registry/dubbo/RegistryProtocolTest.java | 11 +-
.../registry/dubbo/SimpleRegistryExporter.java | 4 +-
.../dubbo/registry/etcd/EtcdRegistryTest.java | 30 +-
.../registry/multicast/MulticastRegistry.java | 4 +-
.../multiple/MultipleRegistry2S2RTest.java | 30 +-
.../apache/dubbo/registry/nacos/NacosRegistry.java | 86 +-
.../dubbo/registry/nacos/NacosRegistryFactory.java | 2 -
.../dubbo/registry/nacos/NacosServiceName.java | 244 +++
.../nacos/util/NacosNamingServiceUtils.java | 2 +-
.../consumer/DemoServiceConsumerXmlBootstrap.java | 10 +-
.../dubbo/registry/nacos/NacosServiceNameTest.java | 123 ++
.../META-INF/spring/dubbo-consumer-context.xml | 14 +-
.../META-INF/spring/dubbo-provider-context.xml | 3 +-
.../java/org/apache/dubbo/remoting/Constants.java | 6 +-
.../dubbo/remoting/buffer/ChannelBuffer.java | 2 +-
.../support/command/StatusTelnetHandler.java | 2 +-
.../dispatcher/WrappedChannelHandler.java | 7 +-
.../org/apache/dubbo/remoting/utils/UrlUtils.java | 1 +
.../apache/dubbo/remoting/RpcMessageHandler.java | 2 +-
.../dubbo/remoting/codec/ExchangeCodecTest.java | 32 +-
.../handler/ConnectChannelHandlerTest.java | 2 +-
.../handler/HeaderExchangeHandlerTest.java | 2 +-
.../handler/WrappedChannelHandlerTest.java | 2 -
.../remoting/transport/AbstractCodecTest.java | 5 +-
.../org/apache/dubbo/remoting/etcd/EtcdClient.java | 2 +-
.../apache/dubbo/remoting/etcd/RetryPolicy.java | 2 +-
.../dubbo/remoting/etcd/jetcd/JEtcdClient.java | 13 +-
.../dubbo/remoting/etcd/jetcd/JEtcdClientTest.java | 4 +-
.../remoting/transport/netty/NettyHelper.java | 2 +-
.../support/header/HeartbeatHandlerTest.java | 4 +-
.../transport/netty/ClientReconnectTest.java | 8 +-
.../remoting/transport/netty4/NettyChannel.java | 48 +-
.../remoting/transport/netty4/NettyClient.java | 42 +-
.../transport/netty4/NettyClientHandler.java | 1 +
.../remoting/transport/netty4/NettyServer.java | 26 +-
.../transport/netty4/NettyServerHandler.java | 10 +-
.../transport/netty4/NettyTransporter.java | 3 +
.../transport/netty4/ClientReconnectTest.java | 8 +-
.../zookeeper/curator/CuratorZookeeperClient.java | 8 +-
.../curator/CuratorZookeeperClientTest.java | 7 +-
.../curator/CuratorZookeeperTransporterTest.java | 1 -
.../java/org/apache/dubbo/rpc/AppResponse.java | 4 +-
.../org/apache/dubbo/rpc/AsyncContextImpl.java | 4 -
.../java/org/apache/dubbo/rpc/AsyncRpcResult.java | 91 +-
.../main/java/org/apache/dubbo/rpc/Constants.java | 4 -
.../java/org/apache/dubbo/rpc/FutureContext.java | 64 +-
.../main/java/org/apache/dubbo/rpc/InvokeMode.java | 2 +-
.../src/main/java/org/apache/dubbo/rpc/Result.java | 6 +-
.../main/java/org/apache/dubbo/rpc/RpcContext.java | 7 +-
.../java/org/apache/dubbo/rpc/RpcException.java | 7 +
.../java/org/apache/dubbo/rpc/RpcInvocation.java | 2 +-
.../apache/dubbo/rpc/filter/AccessLogFilter.java | 8 +-
.../apache/dubbo/rpc/filter/ActiveLimitFilter.java | 18 +-
.../dubbo/rpc/filter/ExecuteLimitFilter.java | 13 +-
.../rpc/model/invoker/ProviderInvokerWrapper.java | 2 +-
.../dubbo/rpc/protocol/AsyncToSyncInvoker.java | 6 +-
.../dubbo/rpc/protocol/ProtocolFilterWrapper.java | 17 +-
.../dubbo/rpc/protocol/dubbo/FutureAdapter.java | 3 +
.../dubbo/rpc/proxy/AbstractProxyInvoker.java | 6 +-
.../org/apache/dubbo/rpc/support/RpcUtils.java | 18 +-
.../java/org/apache/dubbo/rpc/AppResponseTest.java | 4 +-
.../org/apache/dubbo/rpc/FutureContextTest.java | 53 +
.../java/org/apache/dubbo/rpc/RpcContextTest.java | 8 +-
.../dubbo/rpc/filter/AccessLogFilterTest.java | 20 +-
.../rpc/filter/ConsumerContextFilterTest.java | 3 +-
.../apache/dubbo/rpc/filter/tps/StatItemTest.java | 4 +-
.../apache/dubbo/rpc/support/MockInvokerTest.java | 139 ++
.../org/apache/dubbo/rpc/support/RpcUtilsTest.java | 8 +-
.../rpc/protocol/dubbo/CallbackServiceCodec.java | 4 +-
.../dubbo/rpc/protocol/dubbo/DubboCodec.java | 6 +-
.../dubbo/rpc/protocol/dubbo/DubboInvoker.java | 17 +-
.../protocol/dubbo/telnet/ChangeTelnetHandler.java | 2 +-
.../protocol/dubbo/DubboInvokerAvilableTest.java | 18 +-
.../rpc/protocol/dubbo/DubboProtocolTest.java | 36 +-
.../rpc/protocol/dubbo/ExplicitCallbackTest.java | 12 +-
.../dubbo/rpc/protocol/dubbo/IDemoService.java | 2 +-
.../rpc/protocol/dubbo/ImplicitCallBackTest.java | 22 +-
.../dubbo/ReferenceCountExchangeClientTest.java | 12 +-
.../dubbo/decode/DubboTelnetDecodeTest.java | 2 +-
.../dubbo/telnet/CurrentTelnetHandlerTest.java | 1 -
.../rpc/protocol/hessian/HessianProtocol.java | 2 +-
.../dubbo/rpc/protocol/http/HttpProtocol.java | 2 +-
.../dubbo/rpc/protocol/http/HttpProtocolTest.java | 2 +-
.../rpc/protocol/jsonrpc/JsonRpcProtocol.java | 4 +-
.../rpc/protocol/nativethrift/DemoService.java | 24 +-
.../rpc/protocol/nativethrift/UserService.java | 4 +-
.../dubbo/rpc/protocol/rest/RestProtocol.java | 1 +
.../integration/swagger/DubboSwaggerService.java | 4 +-
.../rpc/protocol/rest/support/LoggingFilter.java | 5 +-
.../DubboSwaggerApiListingResourceTest.java | 2 -
.../dubbo/rpc/protocol/rmi/RmiProtocolTest.java | 7 +-
.../rpc/protocol/thrift/ClassNameGenerator.java | 4 +-
.../dubbo/rpc/protocol/thrift/ThriftInvoker.java | 6 +-
.../src/test/java/ClassNameTestDubbo.java | 2 +-
.../src/test/java/ClassNameTestThrift.java | 4 +-
.../java/org/apache/dubbo/rpc/gen/dubbo/Demo.java | 14 +-
.../java/org/apache/dubbo/rpc/gen/thrift/Demo.java | 30 +-
.../dubbo/rpc/protocol/thrift/ThriftCodecTest.java | 2 +-
.../xml/rpc/protocol/xmlrpc/XmlRpcProtocol.java | 7 +-
.../protocol/xmlrpc/XmlRpcProxyFactoryBean.java | 2 +-
.../common/serialize/avro/AvroObjectInput.java | 3 +-
.../common/serialize/avro/AvroObjectOutput.java | 5 +-
.../support/GenericProtobufObjectInput.java | 37 +-
.../support/GenericProtobufObjectOutput.java | 42 +-
.../serialize/protobuf/support/MapValue.java | 830 ++++++++++
.../{TimeDelegate.java => SqlDateDelegate.java} | 16 +-
.../serialize/protostuff/utils/WrapperUtils.java | 3 +
.../serialize/base/AbstractSerializationTest.java | 8 +-
.../serialize/hessian2/Hessian2PersonOkTest.java | 1 -
.../dubbo/common/serialize/model/AnimalEnum.java | 2 +-
.../support/GenericProtobufObjectOutputTest.java | 122 +-
.../serialize/protobuf/support/model/GooglePB.java | 4 +-
.../protostuff/ProtostuffObjectOutputTest.java | 32 +
.../protostuff/ProtostuffSerializationTest.java | 1 -
.../support/SerializableClassRegistryTest.java | 1 -
pom.xml | 9 +-
312 files changed, 7221 insertions(+), 4353 deletions(-)
delete mode 100644 DISCLAIMER
create mode 100644 Jenkinsfile
create mode 100644
dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/support/wrapper/MockProviderRpcExceptionTest.java
create mode 100644
dubbo-common/src/test/java/org/apache/dubbo/common/config/EnvironmentConfigurationTest.java
create mode 100644
dubbo-common/src/test/java/org/apache/dubbo/common/config/InmemoryConfigurationTest.java
create mode 100644
dubbo-common/src/test/java/org/apache/dubbo/common/config/SystemConfigurationTest.java
copy dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/Merger.java =>
dubbo-common/src/test/java/org/apache/dubbo/common/extension/ext10_multi_names/Ext10MultiNames.java
(89%)
copy
dubbo-compatible/src/main/java/com/alibaba/dubbo/common/logger/LoggerAdapter.java
=>
dubbo-common/src/test/java/org/apache/dubbo/common/extension/ext10_multi_names/impl/Ext10MultiNamesImpl.java
(80%)
create mode 100644
dubbo-common/src/test/resources/META-INF/dubbo/internal/org.apache.dubbo.common.extension.ext10_multi_names.Ext10MultiNames
copy
dubbo-compatible/src/main/java/com/alibaba/dubbo/remoting/exchange/{Exchanger.java
=> ResponseCallback.java} (76%)
copy
dubbo-metadata/dubbo-metadata-api/src/test/java/org/apache/dubbo/metadata/definition/common/TestService.java
=>
dubbo-compatible/src/main/java/com/alibaba/dubbo/remoting/exchange/ResponseFuture.java
(61%)
create mode 100644
dubbo-compatible/src/main/java/com/alibaba/dubbo/rpc/protocol/dubbo/FutureAdapter.java
delete mode 100644
dubbo-compatible/src/main/java/org/apache/dubbo/config/spring/beans/factory/annotation/CompatibleReferenceAnnotationBeanPostProcessor.java
delete mode 100644
dubbo-compatible/src/main/java/org/apache/dubbo/config/spring/beans/factory/annotation/CompatibleReferenceBeanBuilder.java
delete mode 100644
dubbo-compatible/src/main/java/org/apache/dubbo/config/spring/beans/factory/annotation/CompatibleServiceAnnotationBeanPostProcessor.java
delete mode 100644
dubbo-compatible/src/main/java/org/apache/dubbo/config/spring/context/annotation/CompatibleDubboComponentScan.java
delete mode 100644
dubbo-compatible/src/main/java/org/apache/dubbo/config/spring/context/annotation/CompatibleDubboComponentScanRegistrar.java
delete mode 100644
dubbo-compatible/src/main/java/org/apache/dubbo/config/spring/schema/CompatibleAnnotationBeanDefinitionParser.java
copy dubbo-event/src/test/java/org/apache/dubbo/event/EventDispatcherTest.java
=> dubbo-compatible/src/test/java/org/apache/dubbo/rpc/RpcContextTest.java (54%)
rename {dubbo-compatible =>
dubbo-config/dubbo-config-api}/src/main/java/com/alibaba/dubbo/config/annotation/Reference.java
(100%)
rename {dubbo-compatible =>
dubbo-config/dubbo-config-api}/src/main/java/com/alibaba/dubbo/config/annotation/Service.java
(100%)
copy
dubbo-common/src/main/java/org/apache/dubbo/common/config/SystemConfiguration.java
=>
dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/context/ConfigConfigurationAdapter.java
(63%)
create mode 100644
dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/beans/factory/annotation/AnnotatedInterfaceConfigBeanBuilder.java
copy
dubbo-common/src/main/java/com/alibaba/dubbo/common/extension/Activate.java =>
dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/annotation/merged/MergedReference.java
(68%)
copy
dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/telnet/support/Help.java
=>
dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/annotation/merged/MergedService.java
(72%)
create mode 100644
dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/beans/factory/annotation/MergedAnnotationTest.java
create mode 100644
dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/util/AnnotatedBeanDefinitionRegistryUtilsTest.java
copy {dubbo-metadata/dubbo-metadata-report-zookeeper =>
dubbo-metadata-report/dubbo-metadata-definition-protobuf}/pom.xml (75%)
create mode 100644
dubbo-metadata-report/dubbo-metadata-definition-protobuf/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.metadata.definition.builder.TypeBuilder
copy
{dubbo-serialization/dubbo-serialization-test/src/test/java/org/apache/dubbo/common/serialize/protobuf/support
=>
dubbo-metadata-report/dubbo-metadata-definition-protobuf/src/test/java/org/apache/dubbo/metadata/definition/protobuf}/model/GooglePB.java
(99%)
copy
{dubbo-serialization/dubbo-serialization-test/src/test/java/org/apache/dubbo/common/serialize/protobuf/support
=>
dubbo-metadata-report/dubbo-metadata-definition-protobuf/src/test/java/org/apache/dubbo/metadata/definition/protobuf}/model/ServiceInterface.java
(93%)
create mode 100644
dubbo-monitor/dubbo-monitor-default/src/test/java/org/apache/dubbo/monitor/dubbo/AppResponseBuilder.java
create mode 100644
dubbo-registry/dubbo-registry-nacos/src/main/java/org/apache/dubbo/registry/nacos/NacosServiceName.java
create mode 100644
dubbo-registry/dubbo-registry-nacos/src/test/java/org/apache/dubbo/registry/nacos/NacosServiceNameTest.java
rename dubbo-rpc/{dubbo-rpc-dubbo =>
dubbo-rpc-api}/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/FutureAdapter.java
(96%)
create mode 100644
dubbo-rpc/dubbo-rpc-api/src/test/java/org/apache/dubbo/rpc/FutureContextTest.java
create mode 100644
dubbo-rpc/dubbo-rpc-api/src/test/java/org/apache/dubbo/rpc/support/MockInvokerTest.java
create mode 100644
dubbo-serialization/dubbo-serialization-protobuf-json/src/main/java/org/apache/dubbo/common/serialize/protobuf/support/MapValue.java
copy
dubbo-serialization/dubbo-serialization-protostuff/src/main/java/org/apache/dubbo/common/serialize/protostuff/delegate/{TimeDelegate.java
=> SqlDateDelegate.java} (77%)
