You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dubbo.apache.org by li...@apache.org on 2020/08/04 07:11:55 UTC
[dubbo] branch 3.0-to-master updated (043da68 -> 0b3ecd2)
This is an automated email from the ASF dual-hosted git repository.
liujun pushed a change to branch 3.0-to-master
in repository https://gitbox.apache.org/repos/asf/dubbo.git.
from 043da68 update all version to 2.7.9-SNAPSHOT (#6531)
new 1ed9f16 change version to 3.0.0-SNAPSHOT
add 292f861 fix alibaba RpcContext setAttachment(String,String)
add 85a97f7 Merge branch 'master' of https://github.com/apache/dubbo
add 117620f fix #5916, default behaviour of DynamicConfiguration.publishConfig: do nothing if not implemented.
add 2919c31 Merge branch 'master' of https://github.com/apache/dubbo
add 2f6e9c7 Merge branch 'master' of https://github.com/apache/dubbo
add 1850f5d Merge branch 'master' of https://github.com/apache/dubbo
add e4dc8e9 Merge branch 'master' of https://github.com/apache/dubbo
add 497fc6a pick the first valid interface address before choosing 127.0.0.1
add ffdd9cc service instance subscription
new 4b3a794 Merge branch '3.0' of https://github.com/apache/dubbo into 3.0
add eea2237 metadata read & write
add 6de9634 metadata read & write
add ef8cdfc redefine MetadataReport
add 2ad4fbe service discovery demo
add 0ba9ffc skip when metadata is null
add 80b22d6 Service Discovery Enhancement
new e550cd3 Merge branch '3.0' of https://github.com/apache/dubbo into 3.0
add 838dfd6 metadata report status
add 3d234d2 service discovery
add 42f0529 can basically work with InstanceAddressURL
add 3124dd8 set metadata proxy timeout
new 994f272 Merge branch '3.0' of https://github.com/apache/dubbo into 3.0
add 6649dd8 fix uts
new a385d42 Merge branch '3.0' of https://github.com/apache/dubbo into 3.0
add eaddea2 fix uts
add 7bef551 update version to 3.0.0-SNAPSHOT
add cd34cc5 Merge branch 'master' of https://github.com/apache/dubbo
add 7645134 Merge branch 'master' of https://github.com/apache/dubbo
add 7702fcf Merge branch 'master' of https://github.com/apache/dubbo
add 0d785f1 Merge branch 'master' into 3.0
add a587759 fix metadata conflicts after master merged
add a27494f refactor param filter to support both service and instance customization
new e17b477 Merge branch '3.0' of https://github.com/apache/dubbo into 3.0
add f5ee266 unify registry_cluster key
add 53f2322 customize instance metadata.
add 0cd52b9 unify registry-cluster key
add f5b2ded fix compilation error
add c63b990 add demo
add 51aa427 add side key to MetadataService
add 29c5945 enhance url notification
add 6558cf9 migrating from interface address pool to instance address pool
add 99c4166 fix address notification issue
new 7d95d1a Merge branch '3.0' of https://github.com/apache/dubbo into 3.0
add adba6d0 Merge branch 'master' of https://github.com/apache/dubbo
add 20cf141 service instance subscription
add b33aef3 metadata read & write
add c682389 metadata read & write
add 3810536 redefine MetadataReport
add 1934655 service discovery demo
add adffd92 skip when metadata is null
add c572c2c Service Discovery Enhancement
add 8a414bf metadata report status
add ca62d83 service discovery
add 71189cb can basically work with InstanceAddressURL
add a001f98 set metadata proxy timeout
add 52b146f fix uts
add 730602c fix uts
add e7fcaed update version to 3.0.0-SNAPSHOT
add 4cacf33 fix metadata conflicts after master merged
add 596ba5b refactor param filter to support both service and instance customization
add cd44607 unify registry_cluster key
add 69202d8 customize instance metadata.
add 540f495 unify registry-cluster key
add 4b1b563 fix compilation error
add bf34c16 add demo
add 0f53367 add side key to MetadataService
add 9f13240 enhance url notification
add 5db015c migrating from interface address pool to instance address pool
add 7acf2db fix address notification issue
add 0e4bbb8 Merge branch '3.0' of https://github.com/apache/dubbo into 3.0
new 0b3ecd2 Merge branch '3.0' of https://github.com/apache/dubbo into 3.0
The 8 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:
.../apache/dubbo/rpc/cluster/ClusterInvoker.java | 2 +
.../org/apache/dubbo/rpc/cluster/Directory.java | 2 +
.../rpc/cluster/directory/AbstractDirectory.java | 16 +-
.../cluster/support/AbstractClusterInvoker.java | 5 +
.../support/wrapper/MockClusterInvoker.java | 5 +
.../rpc/cluster/directory/MockDirInvocation.java | 5 +
.../router/condition/ConditionRouterTest.java | 2 +-
.../support/AbstractClusterInvokerTest.java | 6 +-
.../org/apache/dubbo/common/ConfigurationURL.java | 5 +-
.../src/main/java/org/apache/dubbo/common/URL.java | 409 ++++-
.../dubbo/common/config/ConfigurationUtils.java | 6 +-
.../dubbo/common/constants/CommonConstants.java | 6 +
.../dubbo/common/constants/RegistryConstants.java | 10 +
.../manager/DefaultExecutorRepository.java | 8 +-
.../dubbo/config/AbstractInterfaceConfig.java | 2 +
.../org/apache/dubbo/config/ApplicationConfig.java | 8 +-
.../apache/dubbo/config/MetadataReportConfig.java | 13 +
.../org/apache/dubbo/config/RegistryConfig.java | 5 +
.../apache/dubbo/config/context/ConfigManager.java | 8 +
.../org/apache/dubbo/rpc/model/ConsumerModel.java | 6 +
.../java/com/alibaba/dubbo/rpc/Invocation.java | 5 +
.../java/com/alibaba/dubbo/rpc/RpcInvocation.java | 5 +
.../java/org/apache/dubbo/cache/CacheTest.java | 5 +
.../org/apache/dubbo/filter/LegacyInvocation.java | 5 +
.../org/apache/dubbo/service/MockInvocation.java | 5 +
.../org/apache/dubbo/config/ReferenceConfig.java | 23 +-
.../org/apache/dubbo/config/ServiceConfig.java | 19 +-
.../dubbo/config/bootstrap/DubboBootstrap.java | 128 +-
.../event/listener/ServiceNameMappingListener.java | 49 -
.../metadata/AbstractMetadataServiceExporter.java | 150 --
.../ConfigurableMetadataServiceExporter.java | 69 +-
.../metadata/RemoteMetadataServiceExporter.java | 79 -
.../dubbo/config/utils/ConfigValidationUtils.java | 30 +-
.../org/apache/dubbo/config/cache/CacheTest.java | 2 +-
.../PublishingServiceDefinitionListenerTest.java | 2 +-
.../RemoteMetadataServiceExporterTest.java | 106 --
.../src/main/resources/META-INF/compat/dubbo.xsd | 5 +
.../src/main/resources/META-INF/dubbo.xsd | 5 +
.../apache/dubbo/demo/consumer/Application.java | 26 +-
.../src/main/resources/spring/dubbo-consumer.xml | 13 +-
.../dubbo/demo/provider/GreetingServiceImpl.java | 15 +-
.../src/main/resources/spring/dubbo-provider.xml | 16 +-
dubbo-dependencies-bom/pom.xml | 2 +-
.../dubbo-dependencies-zookeeper/pom.xml | 2 +-
.../metadata/CompositeServiceNameMapping.java | 96 --
.../metadata/DefaultMetadataParamsFilter.java | 55 +
.../DynamicConfigurationServiceNameMapping.java | 60 +-
.../dubbo/metadata/MappingChangedEvent.java} | 38 +-
.../org/apache/dubbo/metadata/MappingListener.java | 8 +-
.../apache/dubbo/metadata/MetadataConstants.java | 29 +-
.../org/apache/dubbo/metadata/MetadataInfo.java | 449 ++++++
.../dubbo/metadata/MetadataParamsFilter.java | 17 +-
.../org/apache/dubbo/metadata/MetadataService.java | 5 +
.../metadata/ParameterizedServiceNameMapping.java | 47 -
.../metadata/PropertiesFileServiceNameMapping.java | 148 --
.../dubbo/metadata/ReadOnlyServiceNameMapping.java | 45 -
.../apache/dubbo/metadata/RevisionResolver.java | 59 +
.../apache/dubbo/metadata/ServiceNameMapping.java | 62 +-
.../apache/dubbo/metadata/URLRevisionResolver.java | 152 --
.../dubbo/metadata/WritableMetadataService.java | 27 +-
.../dubbo/metadata/report/MetadataReport.java | 143 +-
.../metadata/report/MetadataReportInstance.java | 36 +-
.../report/support/AbstractMetadataReport.java | 133 +-
.../support/ConfigCenterBasedMetadataReport.java | 162 --
.../ConfigCenterBasedMetadataReportFactory.java | 90 --
.../file/FileSystemMetadataReportFactory.java | 33 -
.../store/RemoteWritableMetadataService.java | 122 --
.../org.apache.dubbo.metadata.MetadataParamsFilter | 1 +
.../org.apache.dubbo.metadata.ServiceNameMapping | 10 +-
...g.apache.dubbo.metadata.WritableMetadataService | 2 -
...che.dubbo.metadata.report.MetadataReportFactory | 1 -
.../metadata/CompositeServiceNameMappingTest.java | 107 --
.../org/apache/dubbo/metadata}/DemoService.java | 8 +-
...DynamicConfigurationServiceNameMappingTest.java | 109 --
.../InMemoryWritableMetadataServiceTest.java | 157 --
...adataServiceTest.java => MetadataInfoTest.java} | 22 +-
.../ParameterizedServiceNameMappingTest.java | 67 -
.../PropertiesFileServiceNameMappingTest.java | 60 -
.../dubbo/metadata/ServiceNameMappingTest.java | 8 +-
.../dubbo/metadata/URLRevisionResolverTest.java | 50 -
.../support/AbstractMetadataReportFactoryTest.java | 270 ++--
.../report/support/AbstractMetadataReportTest.java | 58 +-
.../ConfigCenterBasedMetadataReportTest.java | 155 --
.../store/InMemoryWritableMetadataServiceTest.java | 111 --
.../store/RemoteWritableMetadataServiceTest.java | 188 ---
.../store/zookeeper/ZookeeperMetadataReport.java | 29 -
.../zookeeper/ZookeeperMetadataReportFactory.java | 22 +-
dubbo-metadata/pom.xml | 12 +-
.../dubbo/monitor/support/MonitorFilterTest.java | 8 +-
.../dubbo/monitor/dubbo/MetricsFilterTest.java | 20 +-
.../dubbo/qos/command/impl/PublishMetadata.java | 63 +
.../org.apache.dubbo.qos.command.BaseCommand | 1 +
.../org/apache/dubbo/registry/NotifyListener.java | 4 +
.../client/DefaultRegistryClusterIdentifier.java | 18 +-
.../registry/client/DefaultServiceInstance.java | 72 +-
.../client/EventPublishingServiceDiscovery.java | 10 +
.../client/FileSystemServiceDiscovery.java | 13 +
.../dubbo/registry/client/InstanceAddressURL.java | 376 +++++
.../registry/client/RegistryClusterIdentifier.java | 24 +-
.../{integration => client}/RegistryProtocol.java | 1650 ++++++++++----------
.../dubbo/registry/client/ServiceDiscovery.java | 11 +-
.../registry/client/ServiceDiscoveryRegistry.java | 705 ++-------
.../client/ServiceDiscoveryRegistryDirectory.java | 291 ++++
.../client/ServiceDiscoveryRegistryProtocol.java | 47 -
.../ServiceDiscoveryRegistryProtocolListener.java | 74 +-
.../dubbo/registry/client/ServiceInstance.java | 8 +
.../registry/client/ServiceInstanceCustomizer.java | 3 -
.../client/ServiceInstanceMetadataCustomizer.java | 73 -
.../client/event/ServiceInstancesChangedEvent.java | 12 +-
.../CustomizableServiceInstanceListener.java | 44 -
.../listener/ServiceInstancesChangedListener.java | 183 ++-
...ExportedServicesRevisionMetadataCustomizer.java | 57 -
.../metadata/MetadataServiceNameMapping.java | 89 ++
...MetadataServiceURLParamsMetadataCustomizer.java | 39 +-
.../registry/client/metadata/MetadataUtils.java | 102 ++
.../metadata/ProtocolPortsMetadataCustomizer.java | 7 +-
.../ServiceInstanceMetadataCustomizer.java | 88 ++
.../metadata/ServiceInstanceMetadataUtils.java | 67 +-
.../StandardMetadataServiceURLBuilder.java | 10 +-
...bscribedServicesRevisionMetadataCustomizer.java | 58 -
.../proxy/BaseMetadataServiceProxyFactory.java | 58 -
.../CompositeMetadataServiceProxyFactory.java | 133 --
.../proxy/DefaultMetadataServiceProxyFactory.java | 85 -
.../proxy/MetadataServiceProxyFactory.java | 56 -
.../metadata/proxy/RemoteMetadataServiceProxy.java | 111 --
.../proxy/RemoteMetadataServiceProxyFactory.java | 34 -
.../store/InMemoryWritableMetadataService.java | 114 +-
.../metadata/store/RemoteMetadataServiceImpl.java | 139 ++
.../registry/integration/DynamicDirectory.java | 250 +++
.../InterfaceCompatibleRegistryProtocol.java | 177 +++
.../registry/integration/RegistryDirectory.java | 150 +-
.../integration/RegistryInvokerWrapper.java | 79 -
.../integration/RegistryProtocolListener.java | 1 +
.../registry/support/AbstractRegistryFactory.java | 12 +
.../internal/org.apache.dubbo.event.EventListener | 5 +-
.../org.apache.dubbo.metadata.ServiceNameMapping | 1 +
...g.apache.dubbo.metadata.WritableMetadataService | 1 +
...dubbo.registry.client.RegistryClusterIdentifier | 1 +
...dubbo.registry.client.ServiceInstanceCustomizer | 1 +
...ient.metadata.proxy.MetadataServiceProxyFactory | 3 -
...o.registry.integration.RegistryProtocolListener | 1 +
.../dubbo/internal/org.apache.dubbo.rpc.Protocol | 4 +-
.../registry/client/InMemoryServiceDiscovery.java | 8 +
.../CustomizableServiceInstanceListenerTest.java | 39 -
.../event/listener/LoggingEventListenerTest.java | 5 +-
.../ServiceInstancesChangedListenerTest.java | 27 -
.../proxy/BaseMetadataServiceProxyFactoryTest.java | 78 -
.../CompositeMetadataServiceProxyFactoryTest.java | 96 --
.../proxy/MetadataServiceProxyFactoryTest.java | 49 -
.../proxy/MyMetadataServiceProxyFactory.java | 29 -
.../registry/consul/ConsulServiceDiscovery.java | 7 +-
...ory.java => ConsulServiceDiscoveryFactory.java} | 16 +-
...g.apache.dubbo.registry.client.ServiceDiscovery | 1 -
...e.dubbo.registry.client.ServiceDiscoveryFactory | 1 +
.../registry/dubbo/RegistryDirectoryTest.java | 2 +-
.../dubbo/registry/etcd/EtcdServiceDiscovery.java | 2 +-
.../registry/nacos/NacosServiceDiscovery.java | 13 +-
.../nacos/NacosServiceDiscoveryFactory.java} | 67 +-
...e.dubbo.registry.client.ServiceDiscoveryFactory | 1 +
.../zookeeper/ZookeeperServiceDiscovery.java | 45 +-
.../ZookeeperServiceDiscoveryChangeWatcher.java | 8 +-
.../ZookeeperServiceDiscoveryFactory.java | 16 +-
dubbo-registry/pom.xml | 18 +-
.../apache/dubbo/remoting/exchange/Exchangers.java | 2 +-
.../dubbo/remoting/transport/AbstractEndpoint.java | 2 +-
.../main/java/org/apache/dubbo/rpc/Invocation.java | 2 +
.../main/java/org/apache/dubbo/rpc/RpcContext.java | 61 +
.../java/org/apache/dubbo/rpc/RpcInvocation.java | 32 +-
.../org/apache/dubbo/rpc/filter/GenericFilter.java | 2 +-
.../apache/dubbo/rpc/protocol/AbstractInvoker.java | 2 +-
.../dubbo/rpc/proxy/AbstractProxyInvoker.java | 2 +-
.../dubbo/rpc/proxy/InvokerInvocationHandler.java | 15 +-
.../dubbo/rpc/filter/ExceptionFilterTest.java | 8 +-
.../apache/dubbo/rpc/filter/GenericFilterTest.java | 8 +-
.../dubbo/rpc/filter/GenericImplFilterTest.java | 8 +-
.../apache/dubbo/rpc/proxy/AbstractProxyTest.java | 4 +-
.../apache/dubbo/rpc/support/MockInvocation.java | 5 +
.../org/apache/dubbo/rpc/support/RpcUtilsTest.java | 48 +-
.../rpc/protocol/dubbo/CallbackServiceCodec.java | 10 +-
.../dubbo/rpc/protocol/dubbo/DubboProtocol.java | 2 +-
.../dubbo/ReferenceCountExchangeClient.java | 9 +-
.../dubbo/rpc/protocol/rest/RestProtocolTest.java | 2 +-
.../dubbo/rpc/protocol/thrift/ThriftProtocol.java | 2 +-
pom.xml | 2 +-
184 files changed, 5050 insertions(+), 6107 deletions(-)
copy dubbo-rpc/dubbo-rpc-grpc/src/main/java/org/apache/dubbo/rpc/protocol/grpc/GrpcConfig.java => dubbo-common/src/main/java/org/apache/dubbo/common/ConfigurationURL.java (91%)
delete mode 100644 dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/event/listener/ServiceNameMappingListener.java
delete mode 100644 dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/metadata/AbstractMetadataServiceExporter.java
delete mode 100644 dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/metadata/RemoteMetadataServiceExporter.java
delete mode 100644 dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/metadata/RemoteMetadataServiceExporterTest.java
copy dubbo-registry/dubbo-registry-default/src/test/java/org/apache/dubbo/registry/dubbo/DemoServiceImpl.java => dubbo-demo/dubbo-demo-xml/dubbo-demo-xml-provider/src/main/java/org/apache/dubbo/demo/provider/GreetingServiceImpl.java (79%)
delete mode 100644 dubbo-metadata/dubbo-metadata-api/src/main/java/org/apache/dubbo/metadata/CompositeServiceNameMapping.java
create mode 100644 dubbo-metadata/dubbo-metadata-api/src/main/java/org/apache/dubbo/metadata/DefaultMetadataParamsFilter.java
rename dubbo-metadata/dubbo-metadata-api/src/{test/java/org/apache/dubbo/metadata/MetadataConstantsTest.java => main/java/org/apache/dubbo/metadata/MappingChangedEvent.java} (58%)
rename dubbo-common/src/test/java/org/apache/dubbo/common/config/AbstractPrefixConfigurationTest.java => dubbo-metadata/dubbo-metadata-api/src/main/java/org/apache/dubbo/metadata/MappingListener.java (87%)
create mode 100644 dubbo-metadata/dubbo-metadata-api/src/main/java/org/apache/dubbo/metadata/MetadataInfo.java
copy dubbo-common/src/main/java/org/apache/dubbo/rpc/model/BuiltinServiceDetector.java => dubbo-metadata/dubbo-metadata-api/src/main/java/org/apache/dubbo/metadata/MetadataParamsFilter.java (70%)
delete mode 100644 dubbo-metadata/dubbo-metadata-api/src/main/java/org/apache/dubbo/metadata/ParameterizedServiceNameMapping.java
delete mode 100644 dubbo-metadata/dubbo-metadata-api/src/main/java/org/apache/dubbo/metadata/PropertiesFileServiceNameMapping.java
delete mode 100644 dubbo-metadata/dubbo-metadata-api/src/main/java/org/apache/dubbo/metadata/ReadOnlyServiceNameMapping.java
create mode 100644 dubbo-metadata/dubbo-metadata-api/src/main/java/org/apache/dubbo/metadata/RevisionResolver.java
delete mode 100644 dubbo-metadata/dubbo-metadata-api/src/main/java/org/apache/dubbo/metadata/URLRevisionResolver.java
delete mode 100644 dubbo-metadata/dubbo-metadata-api/src/main/java/org/apache/dubbo/metadata/report/support/ConfigCenterBasedMetadataReport.java
delete mode 100644 dubbo-metadata/dubbo-metadata-api/src/main/java/org/apache/dubbo/metadata/report/support/ConfigCenterBasedMetadataReportFactory.java
delete mode 100644 dubbo-metadata/dubbo-metadata-api/src/main/java/org/apache/dubbo/metadata/report/support/file/FileSystemMetadataReportFactory.java
delete mode 100644 dubbo-metadata/dubbo-metadata-api/src/main/java/org/apache/dubbo/metadata/store/RemoteWritableMetadataService.java
create mode 100644 dubbo-metadata/dubbo-metadata-api/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.metadata.MetadataParamsFilter
delete mode 100644 dubbo-metadata/dubbo-metadata-api/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.metadata.WritableMetadataService
delete mode 100644 dubbo-metadata/dubbo-metadata-api/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.metadata.report.MetadataReportFactory
delete mode 100644 dubbo-metadata/dubbo-metadata-api/src/test/java/org/apache/dubbo/metadata/CompositeServiceNameMappingTest.java
copy {dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/api => dubbo-metadata/dubbo-metadata-api/src/test/java/org/apache/dubbo/metadata}/DemoService.java (87%)
delete mode 100644 dubbo-metadata/dubbo-metadata-api/src/test/java/org/apache/dubbo/metadata/DynamicConfigurationServiceNameMappingTest.java
delete mode 100644 dubbo-metadata/dubbo-metadata-api/src/test/java/org/apache/dubbo/metadata/InMemoryWritableMetadataServiceTest.java
rename dubbo-metadata/dubbo-metadata-api/src/test/java/org/apache/dubbo/metadata/{LocalMetadataServiceTest.java => MetadataInfoTest.java} (61%)
delete mode 100644 dubbo-metadata/dubbo-metadata-api/src/test/java/org/apache/dubbo/metadata/ParameterizedServiceNameMappingTest.java
delete mode 100644 dubbo-metadata/dubbo-metadata-api/src/test/java/org/apache/dubbo/metadata/PropertiesFileServiceNameMappingTest.java
delete mode 100644 dubbo-metadata/dubbo-metadata-api/src/test/java/org/apache/dubbo/metadata/URLRevisionResolverTest.java
delete mode 100644 dubbo-metadata/dubbo-metadata-api/src/test/java/org/apache/dubbo/metadata/report/support/ConfigCenterBasedMetadataReportTest.java
delete mode 100644 dubbo-metadata/dubbo-metadata-api/src/test/java/org/apache/dubbo/metadata/store/InMemoryWritableMetadataServiceTest.java
delete mode 100644 dubbo-metadata/dubbo-metadata-api/src/test/java/org/apache/dubbo/metadata/store/RemoteWritableMetadataServiceTest.java
create mode 100644 dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/command/impl/PublishMetadata.java
copy dubbo-rpc/dubbo-rpc-api/src/test/java/org/apache/dubbo/rpc/support/RuntimeExceptionInvoker.java => dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/DefaultRegistryClusterIdentifier.java (67%)
create mode 100644 dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/InstanceAddressURL.java
copy dubbo-common/src/test/java/org/apache/dubbo/common/extension/adaptive/impl/HasAdaptiveExt_ManualAdaptive.java => dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/RegistryClusterIdentifier.java (60%)
rename dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/{integration => client}/RegistryProtocol.java (91%)
create mode 100644 dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/ServiceDiscoveryRegistryDirectory.java
delete mode 100644 dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/ServiceDiscoveryRegistryProtocol.java
copy dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/listener/ExporterListenerAdapter.java => dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/ServiceDiscoveryRegistryProtocolListener.java (65%)
delete mode 100644 dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/ServiceInstanceMetadataCustomizer.java
delete mode 100644 dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/event/listener/CustomizableServiceInstanceListener.java
delete mode 100644 dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/metadata/ExportedServicesRevisionMetadataCustomizer.java
create mode 100644 dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/metadata/MetadataServiceNameMapping.java
create mode 100644 dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/metadata/MetadataUtils.java
create mode 100644 dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/metadata/ServiceInstanceMetadataCustomizer.java
delete mode 100644 dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/metadata/SubscribedServicesRevisionMetadataCustomizer.java
delete mode 100644 dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/metadata/proxy/BaseMetadataServiceProxyFactory.java
delete mode 100644 dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/metadata/proxy/CompositeMetadataServiceProxyFactory.java
delete mode 100644 dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/metadata/proxy/DefaultMetadataServiceProxyFactory.java
delete mode 100644 dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/metadata/proxy/MetadataServiceProxyFactory.java
delete mode 100644 dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/metadata/proxy/RemoteMetadataServiceProxy.java
delete mode 100644 dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/metadata/proxy/RemoteMetadataServiceProxyFactory.java
rename {dubbo-metadata/dubbo-metadata-api/src/main/java/org/apache/dubbo => dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client}/metadata/store/InMemoryWritableMetadataService.java (60%)
create mode 100644 dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/metadata/store/RemoteMetadataServiceImpl.java
create mode 100644 dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/integration/DynamicDirectory.java
create mode 100644 dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/integration/InterfaceCompatibleRegistryProtocol.java
delete mode 100644 dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/integration/RegistryInvokerWrapper.java
create mode 100644 dubbo-registry/dubbo-registry-api/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.metadata.ServiceNameMapping
create mode 100644 dubbo-registry/dubbo-registry-api/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.metadata.WritableMetadataService
create mode 100644 dubbo-registry/dubbo-registry-api/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.registry.client.RegistryClusterIdentifier
delete mode 100644 dubbo-registry/dubbo-registry-api/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.registry.client.metadata.proxy.MetadataServiceProxyFactory
create mode 100644 dubbo-registry/dubbo-registry-api/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.registry.integration.RegistryProtocolListener
delete mode 100644 dubbo-registry/dubbo-registry-api/src/test/java/org/apache/dubbo/registry/client/event/listener/CustomizableServiceInstanceListenerTest.java
delete mode 100644 dubbo-registry/dubbo-registry-api/src/test/java/org/apache/dubbo/registry/client/metadata/proxy/BaseMetadataServiceProxyFactoryTest.java
delete mode 100644 dubbo-registry/dubbo-registry-api/src/test/java/org/apache/dubbo/registry/client/metadata/proxy/CompositeMetadataServiceProxyFactoryTest.java
delete mode 100644 dubbo-registry/dubbo-registry-api/src/test/java/org/apache/dubbo/registry/client/metadata/proxy/MetadataServiceProxyFactoryTest.java
delete mode 100644 dubbo-registry/dubbo-registry-api/src/test/java/org/apache/dubbo/registry/client/metadata/proxy/MyMetadataServiceProxyFactory.java
copy dubbo-registry/dubbo-registry-consul/src/main/java/org/apache/dubbo/registry/consul/{ConsulRegistryFactory.java => ConsulServiceDiscoveryFactory.java} (73%)
delete mode 100644 dubbo-registry/dubbo-registry-consul/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.registry.client.ServiceDiscovery
create mode 100644 dubbo-registry/dubbo-registry-consul/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.registry.client.ServiceDiscoveryFactory
copy dubbo-registry/{dubbo-registry-redis/src/main/java/org/apache/dubbo/registry/redis/RedisRegistryFactory.java => dubbo-registry-nacos/src/main/java/org/apache/dubbo/registry/nacos/NacosServiceDiscoveryFactory.java} (70%)
create mode 100644 dubbo-registry/dubbo-registry-nacos/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.registry.client.ServiceDiscoveryFactory
copy dubbo-compatible/src/main/java/com/alibaba/dubbo/common/threadpool/ThreadPool.java => dubbo-registry/dubbo-registry-zookeeper/src/main/java/org/apache/dubbo/registry/zookeeper/ZookeeperServiceDiscoveryFactory.java (69%)
[dubbo] 08/08: Merge branch '3.0' of
https://github.com/apache/dubbo into 3.0
Posted by li...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
liujun pushed a commit to branch 3.0-to-master
in repository https://gitbox.apache.org/repos/asf/dubbo.git
commit 0b3ecd2c3a56c8258fafb8b8cac8bfce2a1473a5
Merge: 7d95d1a 0e4bbb8
Author: ken.lj <ke...@gmail.com>
AuthorDate: Tue Aug 4 15:09:22 2020 +0800
Merge branch '3.0' of https://github.com/apache/dubbo into 3.0
README.md | 2 +-
.../src/main/java/org/apache/dubbo/common/URL.java | 70 +++++++++++-----------
.../org/apache/dubbo/config/AbstractConfig.java | 8 ++-
.../apache/dubbo/config/MetadataReportConfig.java | 26 ++++----
.../consul/ConsulDynamicConfiguration.java | 24 +++++---
5 files changed, 76 insertions(+), 54 deletions(-)
[dubbo] 05/08: Merge branch '3.0' of
https://github.com/apache/dubbo into 3.0
Posted by li...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
liujun pushed a commit to branch 3.0-to-master
in repository https://gitbox.apache.org/repos/asf/dubbo.git
commit a385d42588841e3c88472709b2067066b4234111
Merge: 994f272 6649dd8
Author: ken.lj <ke...@gmail.com>
AuthorDate: Tue Jul 21 13:58:01 2020 +0800
Merge branch '3.0' of https://github.com/apache/dubbo into 3.0
.../dubbo/monitor/dubbo/MetricsFilterTest.java | 20 ++++++++++----------
.../dubbo/rpc/protocol/rest/RestProtocolTest.java | 2 +-
2 files changed, 11 insertions(+), 11 deletions(-)
[dubbo] 03/08: Merge branch '3.0' of
https://github.com/apache/dubbo into 3.0
Posted by li...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
liujun pushed a commit to branch 3.0-to-master
in repository https://gitbox.apache.org/repos/asf/dubbo.git
commit e550cd3505065b8015a97c28061188c567b0445c
Merge: 4b3a794 80b22d6
Author: ken.lj <ke...@gmail.com>
AuthorDate: Mon Jul 20 11:03:27 2020 +0800
Merge branch '3.0' of https://github.com/apache/dubbo into 3.0
dubbo-all/pom.xml | 4 +
.../rpc/cluster/directory/AbstractDirectory.java | 14 +-
.../org.apache.dubbo.rpc.cluster.RouterFactory | 1 +
.../src/main/java/org/apache/dubbo/common/URL.java | 60 +++--
.../dubbo/common/config/ConfigurationUtils.java | 2 +-
.../dubbo/common/constants/CommonConstants.java | 6 +
.../manager/DefaultExecutorRepository.java | 8 +-
.../dubbo/config/AbstractInterfaceConfig.java | 2 +
.../apache/dubbo/config/MetadataReportConfig.java | 13 ++
.../org/apache/dubbo/config/RegistryConfig.java | 5 +
.../apache/dubbo/config/context/ConfigManager.java | 8 +
.../org/apache/dubbo/config/ReferenceConfig.java | 23 +-
.../org/apache/dubbo/config/ServiceConfig.java | 19 +-
.../dubbo/config/bootstrap/DubboBootstrap.java | 69 +++++-
.../event/listener/ServiceNameMappingListener.java | 55 -----
.../src/main/resources/META-INF/compat/dubbo.xsd | 5 +
.../src/main/resources/META-INF/dubbo.xsd | 5 +
.../apache/dubbo/demo/consumer/Application.java | 7 +-
.../src/main/resources/spring/dubbo-consumer.xml | 12 +-
.../src/main/resources/spring/dubbo-provider.xml | 11 +-
.../metadata/DefaultMetadataParamsFilter.java | 49 ++++
.../DynamicConfigurationServiceNameMapping.java | 33 +--
.../dubbo/metadata/MappingChangedEvent.java} | 28 ++-
.../org/apache/dubbo/metadata/MappingListener.java | 8 +-
.../org/apache/dubbo/metadata/MetadataInfo.java | 149 ++++++++++--
.../dubbo/metadata/MetadataParamsFilter.java | 11 +-
.../org/apache/dubbo/metadata/MetadataService.java | 5 +
.../dubbo/metadata/MetadataServiceNameMapping.java | 76 +++++++
.../org/apache/dubbo/metadata/MetadataUtil.java | 49 ----
.../apache/dubbo/metadata/RevisionResolver.java | 59 +++++
.../apache/dubbo/metadata/ServiceNameMapping.java | 33 ++-
.../dubbo/metadata/WritableMetadataService.java | 19 +-
.../dubbo/metadata/report/MetadataReport.java | 41 +++-
.../metadata/report/MetadataReportInstance.java | 28 ++-
.../store/BaseWritableMetadataService.java | 73 ------
.../store/RemoteWritableMetadataService.java | 233 -------------------
.../RemoteWritableMetadataServiceDelegate.java | 100 --------
.../org.apache.dubbo.metadata.ServiceNameMapping | 3 +-
...g.apache.dubbo.metadata.WritableMetadataService | 2 -
.../org/apache/dubbo/metadata/DemoService.java | 22 +-
...DynamicConfigurationServiceNameMappingTest.java | 90 --------
.../InMemoryWritableMetadataServiceTest.java | 149 ------------
.../apache/dubbo/metadata/MetadataInfoTest.java | 27 +--
.../store/InMemoryWritableMetadataServiceTest.java | 111 ---------
.../store/RemoteWritableMeatadataServiceTest.java | 190 ----------------
.../RemoteWritableMetadataServiceDelegateTest.java | 216 ------------------
.../org/apache/dubbo/registry/NotifyListener.java | 2 -
.../client/DefaultRegistryClusterIdentifier.java | 28 +--
.../registry/client/DefaultServiceInstance.java | 26 ++-
.../client/EventPublishingServiceDiscovery.java | 5 +
.../client/FileSystemServiceDiscovery.java | 5 +
.../dubbo/registry/client/InstanceAddressURL.java | 100 +++++---
.../registry/client/RegistryClusterIdentifier.java | 27 ++-
.../dubbo/registry/client/ServiceDiscovery.java | 6 +
.../registry/client/ServiceDiscoveryRegistry.java | 183 ++++++++-------
.../client/ServiceDiscoveryRegistryDirectory.java | 253 +++++++++++++++++++++
.../client/ServiceDiscoveryRegistryProtocol.java | 6 +-
.../ServiceDiscoveryRegistryProtocolListener.java | 29 +--
.../dubbo/registry/client/ServiceInstance.java | 8 +-
.../registry/client/ServiceInstanceCustomizer.java | 3 -
.../CustomizableServiceInstanceListener.java | 42 ----
.../listener/ServiceInstancesChangedListener.java | 190 ++++++++++------
...ExportedServicesRevisionMetadataCustomizer.java | 56 -----
...MetadataServiceURLParamsMetadataCustomizer.java | 8 +-
.../registry/client/metadata/MetadataUtils.java | 99 ++++++++
.../metadata/ProtocolPortsMetadataCustomizer.java | 7 +-
.../metadata/RefreshServiceMetadataCustomizer.java | 47 ----
.../metadata/ServiceInstanceMetadataUtils.java | 7 +
...bscribedServicesRevisionMetadataCustomizer.java | 57 -----
.../client/metadata/URLRevisionResolver.java | 111 ---------
.../proxy/BaseMetadataServiceProxyFactory.java | 38 ----
.../proxy/DefaultMetadataServiceProxyFactory.java | 85 -------
.../proxy/MetadataServiceProxyFactory.java | 57 -----
.../metadata/proxy/RemoteMetadataServiceProxy.java | 95 --------
.../store/InMemoryWritableMetadataService.java | 48 +++-
.../metadata/store/RemoteMetadataServiceImpl.java | 137 +++++++++++
.../registry/integration/DynamicDirectory.java | 243 ++++++++++++++++++++
.../registry/integration/RegistryDirectory.java | 177 +++-----------
.../integration/RegistryInvokerWrapper.java | 6 +-
.../registry/integration/RegistryProtocol.java | 11 +-
.../internal/org.apache.dubbo.event.EventListener | 1 -
...g.apache.dubbo.metadata.WritableMetadataService | 1 +
...dubbo.registry.client.RegistryClusterIdentifier | 1 +
...ient.metadata.proxy.MetadataServiceProxyFactory | 2 -
...o.registry.integration.RegistryProtocolListener | 1 +
.../event/listener/LoggingEventListenerTest.java | 5 +-
.../ServiceInstancesChangedListenerTest.java | 27 ---
.../client/metadata/URLRevisionResolverTest.java | 47 ----
.../registry/consul/ConsulServiceDiscovery.java | 7 +-
.../consul/ConsulServiceDiscoveryFactory.java | 17 +-
...g.apache.dubbo.registry.client.ServiceDiscovery | 1 -
...e.dubbo.registry.client.ServiceDiscoveryFactory | 1 +
.../registry/dubbo/RegistryDirectoryTest.java | 2 +-
.../dubbo/registry/etcd/EtcdServiceDiscovery.java | 2 +-
.../registry/nacos/NacosServiceDiscovery.java | 13 +-
.../nacos/NacosServiceDiscoveryFactory.java} | 17 +-
...e.dubbo.registry.client.ServiceDiscoveryFactory | 1 +
.../zookeeper/ZookeeperServiceDiscovery.java | 27 +--
.../ZookeeperServiceDiscoveryChangeWatcher.java | 8 +-
.../ZookeeperServiceDiscoveryFactory.java | 16 +-
dubbo-registry/pom.xml | 18 +-
.../main/java/org/apache/dubbo/rpc/RpcContext.java | 79 +++++++
.../dubbo/rpc/proxy/InvokerInvocationHandler.java | 5 +-
103 files changed, 2047 insertions(+), 2587 deletions(-)
[dubbo] 02/08: Merge branch '3.0' of
https://github.com/apache/dubbo into 3.0
Posted by li...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
liujun pushed a commit to branch 3.0-to-master
in repository https://gitbox.apache.org/repos/asf/dubbo.git
commit 4b3a794668a53eee60badc987603d204b822dd08
Merge: 1ed9f16 ffdd9cc
Author: ken.lj <ke...@gmail.com>
AuthorDate: Fri Jun 12 10:14:30 2020 +0800
Merge branch '3.0' of https://github.com/apache/dubbo into 3.0
Conflicts:
dubbo-dependencies-bom/pom.xml
dubbo-dependencies/dubbo-dependencies-zookeeper/pom.xml
pom.xml
.../org/apache/dubbo/common/utils/NetUtils.java | 19 +
dubbo-dependencies-bom/pom.xml | 2 +-
.../dubbo-dependencies-zookeeper/pom.xml | 2 +-
.../org/apache/dubbo/metadata/MetadataInfo.java | 181 ++++++++
.../org/apache/dubbo/registry/NotifyListener.java | 6 +
.../registry/client/DefaultServiceInstance.java | 18 +
.../dubbo/registry/client/InstanceAddressURL.java | 132 ++++++
.../dubbo/registry/client/ServiceDiscovery.java | 3 +-
.../registry/client/ServiceDiscoveryRegistry.java | 491 +--------------------
.../dubbo/registry/client/ServiceInstance.java | 4 +
.../client/event/ServiceInstancesChangedEvent.java | 12 +-
.../listener/ServiceInstancesChangedListener.java | 113 ++++-
.../registry/integration/RegistryDirectory.java | 33 ++
pom.xml | 2 +-
14 files changed, 533 insertions(+), 485 deletions(-)
[dubbo] 04/08: Merge branch '3.0' of
https://github.com/apache/dubbo into 3.0
Posted by li...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
liujun pushed a commit to branch 3.0-to-master
in repository https://gitbox.apache.org/repos/asf/dubbo.git
commit 994f272e92e460151809a4c973084df66c26cde0
Merge: e550cd3 3124dd8
Author: ken.lj <ke...@gmail.com>
AuthorDate: Tue Jul 21 13:57:02 2020 +0800
Merge branch '3.0' of https://github.com/apache/dubbo into 3.0
.../org.apache.dubbo.rpc.cluster.RouterFactory | 1 -
.../rpc/cluster/directory/MockDirInvocation.java | 5 +
.../router/condition/ConditionRouterTest.java | 2 +-
.../support/AbstractClusterInvokerTest.java | 6 +-
.../org/apache/dubbo/common/ConfigurationURL.java | 10 +-
.../src/main/java/org/apache/dubbo/common/URL.java | 302 +++++++++++++++++++--
.../dubbo/common/config/ConfigurationUtils.java | 4 +
.../dubbo/config/bootstrap/DubboBootstrap.java | 58 ++--
.../org/apache/dubbo/config/cache/CacheTest.java | 2 +-
.../apache/dubbo/metadata/MetadataConstants.java | 4 +
.../org/apache/dubbo/metadata/MetadataInfo.java | 178 ++++++++++--
.../dubbo/monitor/support/MonitorFilterTest.java | 8 +-
.../dubbo/qos/command/impl/PublishMetadata.java | 63 +++++
.../org.apache.dubbo.qos.command.BaseCommand | 1 +
.../registry/client/DefaultServiceInstance.java | 35 ++-
.../client/EventPublishingServiceDiscovery.java | 5 +
.../client/FileSystemServiceDiscovery.java | 8 +
.../dubbo/registry/client/InstanceAddressURL.java | 270 +++++++++++++++---
.../dubbo/registry/client/ServiceDiscovery.java | 2 +
.../registry/client/ServiceDiscoveryRegistry.java | 4 +-
.../client/ServiceDiscoveryRegistryDirectory.java | 137 ++++++----
.../dubbo/registry/client/ServiceInstance.java | 2 +
.../listener/ServiceInstancesChangedListener.java | 28 +-
.../registry/client/metadata/MetadataUtils.java | 3 +-
.../metadata/ServiceInstanceMetadataUtils.java | 55 ++--
.../StandardMetadataServiceURLBuilder.java | 7 +-
.../store/InMemoryWritableMetadataService.java | 12 +
.../metadata/store/RemoteMetadataServiceImpl.java | 20 +-
.../registry/integration/DynamicDirectory.java | 9 +-
.../registry/integration/RegistryDirectory.java | 2 +-
.../registry/support/AbstractRegistryFactory.java | 12 +
.../registry/client/InMemoryServiceDiscovery.java | 8 +
.../zookeeper/ZookeeperServiceDiscovery.java | 18 +-
.../apache/dubbo/remoting/exchange/Exchangers.java | 2 +-
.../dubbo/remoting/transport/AbstractEndpoint.java | 2 +-
.../main/java/org/apache/dubbo/rpc/Invocation.java | 2 +
.../main/java/org/apache/dubbo/rpc/RpcContext.java | 66 ++---
.../java/org/apache/dubbo/rpc/RpcInvocation.java | 32 ++-
.../org/apache/dubbo/rpc/filter/GenericFilter.java | 2 +-
.../apache/dubbo/rpc/protocol/AbstractInvoker.java | 2 +-
.../dubbo/rpc/proxy/AbstractProxyInvoker.java | 2 +-
.../dubbo/rpc/proxy/InvokerInvocationHandler.java | 10 +-
.../dubbo/rpc/filter/ExceptionFilterTest.java | 8 +-
.../apache/dubbo/rpc/filter/GenericFilterTest.java | 8 +-
.../dubbo/rpc/filter/GenericImplFilterTest.java | 8 +-
.../apache/dubbo/rpc/proxy/AbstractProxyTest.java | 4 +-
.../apache/dubbo/rpc/support/MockInvocation.java | 5 +
.../org/apache/dubbo/rpc/support/RpcUtilsTest.java | 48 ++--
.../rpc/protocol/dubbo/CallbackServiceCodec.java | 10 +-
.../dubbo/rpc/protocol/dubbo/DubboProtocol.java | 2 +-
.../dubbo/ReferenceCountExchangeClient.java | 9 +-
.../dubbo/rpc/protocol/thrift/ThriftProtocol.java | 2 +-
52 files changed, 1147 insertions(+), 358 deletions(-)
[dubbo] 06/08: Merge branch '3.0' of
https://github.com/apache/dubbo into 3.0
Posted by li...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
liujun pushed a commit to branch 3.0-to-master
in repository https://gitbox.apache.org/repos/asf/dubbo.git
commit e17b4771ee4f77b71ad5d883b87557863ef2f474
Merge: a385d42 a27494f
Author: ken.lj <ke...@gmail.com>
AuthorDate: Fri Jul 24 14:34:40 2020 +0800
Merge branch '3.0' of https://github.com/apache/dubbo into 3.0
.gitignore | 3 +
README.md | 8 +-
dubbo-all/pom.xml | 8 +
.../java/org/apache/dubbo/rpc/cluster/Cluster.java | 15 +-
.../cluster/{Cluster.java => ClusterInvoker.java} | 84 +-
.../org/apache/dubbo/rpc/cluster/Configurator.java | 5 +-
.../cluster/configurator/parser/ConfigParser.java | 26 +
.../router/condition/config/ListenableRouter.java | 2 +-
.../cluster/router/mock/MockInvokersSelector.java | 2 +-
.../dubbo/rpc/cluster/router/tag/TagRouter.java | 12 +
.../cluster/support/AbstractClusterInvoker.java | 3 +-
.../support/registry/ZoneAwareClusterInvoker.java | 32 +-
.../support/wrapper/MockClusterInvoker.java | 8 +-
.../configurator/parser/ConfigParserTest.java | 16 +
.../support/AbstractClusterInvokerTest.java | 2 +-
.../src/main/java/org/apache/dubbo/common/URL.java | 60 +-
.../configcenter/AbstractDynamicConfiguration.java | 103 +-
.../AbstractDynamicConfigurationFactory.java | 2 +-
.../config/configcenter/DynamicConfiguration.java | 10 +
.../configcenter/TreePathDynamicConfiguration.java | 186 ++
.../file/FileSystemDynamicConfiguration.java | 150 +-
.../dubbo/common/constants/CommonConstants.java | 41 +-
.../dubbo/common/constants/RegistryConstants.java | 2 +
.../org/apache/dubbo/common/convert/Converter.java | 17 +
.../convert/multiple/MultiValueConverter.java | 28 +
.../dubbo/common/extension/ExtensionLoader.java | 2069 ++++++++++----------
.../org/apache/dubbo/common/extension/Wrapper.java | 17 +-
.../extension/support/ActivateComparator.java | 4 +-
...ivateComparator.java => WrapperComparator.java} | 232 +--
.../org/apache/dubbo/common/utils/ArrayUtils.java | 22 +
.../org/apache/dubbo/common/utils/PathUtils.java | 7 +-
.../org/apache/dubbo/common/utils/PojoUtils.java | 56 +-
.../utils/StringConstantFieldValuePredicate.java | 67 +
.../org/apache/dubbo/common/utils/StringUtils.java | 57 +-
.../apache/dubbo/config/MetadataReportConfig.java | 4 +-
.../java/org/apache/dubbo/config/MethodConfig.java | 7 +-
.../apache/dubbo/config/ReferenceConfigBase.java | 7 +-
.../org/apache/dubbo/config/RegistryConfig.java | 37 +-
.../org/apache/dubbo/config/ServiceConfigBase.java | 25 +-
.../dubbo/config/annotation/DubboReference.java | 9 +
.../apache/dubbo/config/context/ConfigManager.java | 13 +-
.../java/org/apache/dubbo/event/EventListener.java | 2 +-
.../org/apache/dubbo/rpc/model/ConsumerModel.java | 7 +-
.../test/java/org/apache/dubbo/common/URLTest.java | 1777 ++++++++---------
.../AbstractDynamicConfigurationTest.java | 60 +-
.../file/FileSystemDynamicConfigurationTest.java | 45 +-
.../common/constants/CommonConstantsTest.java | 41 +
.../convert/ConverterTest.java} | 39 +-
.../convert/StringToBooleanConverterTest.java | 5 +-
.../convert/StringToCharArrayConverterTest.java | 5 +-
.../convert/StringToCharacterConverterTest.java | 5 +-
.../convert/StringToDoubleConverterTest.java | 5 +-
.../convert/StringToFloatConverterTest.java | 5 +-
.../convert/StringToIntegerConverterTest.java | 5 +-
.../convert/StringToLongConverterTest.java | 5 +-
.../convert/StringToOptionalConverterTest.java | 5 +-
.../convert/StringToShortConverterTest.java | 5 +-
.../convert/StringToStringConverterTest.java | 5 +-
.../convert/multiple/MultiValueConverterTest.java | 72 +
.../multiple/StringToArrayConverterTest.java | 4 +-
.../StringToBlockingDequeConverterTest.java | 4 +-
.../StringToBlockingQueueConverterTest.java | 4 +-
.../multiple/StringToCollectionConverterTest.java | 5 +-
.../multiple/StringToDequeConverterTest.java | 4 +-
.../multiple/StringToListConverterTest.java | 4 +-
.../StringToNavigableSetConverterTest.java | 6 +-
.../multiple/StringToQueueConverterTest.java | 3 +-
.../convert/multiple/StringToSetConverterTest.java | 3 +-
.../multiple/StringToSortedSetConverterTest.java | 6 +-
.../StringToTransferQueueConverterTest.java | 6 +-
.../apache/dubbo/common/utils/PojoUtilsTest.java | 36 +
.../StringConstantFieldValuePredicateTest.java} | 44 +-
.../apache/dubbo/common/utils/StringUtilsTest.java | 73 +-
.../dubbo/config/context/ConfigManagerTest.java | 7 +-
.../org/apache/dubbo/event/EchoEventListener2.java | 2 +-
.../dubbo/common/extension/ExtensionFactory.java | 3 +
.../java/com/alibaba/dubbo/rpc/Invocation.java | 5 +
.../java/com/alibaba/dubbo/rpc/RpcInvocation.java | 5 +
.../java/org/apache/dubbo/cache/CacheTest.java | 5 +
.../java/org/apache/dubbo/config/ConfigTest.java | 4 +-
.../apache/dubbo/config/ReferenceConfigTest.java | 4 +-
.../org/apache/dubbo/filter/LegacyInvocation.java | 5 +
.../org/apache/dubbo/service/MockInvocation.java | 5 +
dubbo-config/dubbo-config-api/pom.xml | 31 +
.../org/apache/dubbo/config/ReferenceConfig.java | 83 +-
.../org/apache/dubbo/config/ServiceConfig.java | 2 +-
.../dubbo/config/bootstrap/DubboBootstrap.java | 223 ++-
.../bootstrap/builders/ReferenceBuilder.java | 22 +
.../config/bootstrap/builders/RegistryBuilder.java | 12 +-
.../config/bootstrap/builders/ServiceBuilder.java | 18 +-
.../dubbo/config/utils/ConfigValidationUtils.java | 14 +-
...g.apache.dubbo.metadata.MetadataServiceExporter | 3 +
.../apache/dubbo/config/ReferenceConfigTest.java | 5 +-
.../org/apache/dubbo/config/ServiceConfigTest.java | 30 +-
...va => ConsulDubboServiceConsumerBootstrap.java} | 10 +-
...va => ConsulDubboServiceProviderBootstrap.java} | 10 +-
.../NacosDubboServiceConsumerBootstrap.java | 21 +-
.../NacosDubboServiceProviderBootstrap.java | 18 +-
.../ZookeeperDubboServiceConsumerBootstrap.java | 13 +-
.../ZookeeperDubboServiceProviderBootstrap.java | 9 +-
.../bootstrap/builders/ReferenceBuilderTest.java | 15 +-
.../bootstrap/builders/RegistryBuilderTest.java | 2 +-
.../bootstrap/builders/ServiceBuilderTest.java | 32 +-
.../PublishingServiceDefinitionListenerTest.java | 94 +
.../config/url/ExporterSideConfigUrlTest.java | 5 +-
.../metadata/MetadataServiceExporterTest.java | 38 +-
dubbo-config/dubbo-config-spring/pom.xml | 21 +
.../apache/dubbo/config/spring/ServiceBean.java | 6 +-
.../ReferenceAnnotationBeanPostProcessor.java | 92 +-
.../annotation/ServiceClassPostProcessor.java | 4 +-
.../spring/context/annotation/EnableDubbo.java | 2 +-
.../context/annotation/EnableDubboConfig.java | 2 +-
.../spring/extension/SpringExtensionFactory.java | 2 +-
.../schema/AnnotationBeanDefinitionParser.java | 10 +-
.../spring/schema/DubboBeanDefinitionParser.java | 45 +-
.../spring/schema/DubboNamespaceHandler.java | 25 +-
.../src/main/resources/META-INF/dubbo.xsd | 17 +-
.../ReferenceAnnotationBeanPostProcessorTest.java | 13 +
.../annotation/ReferenceBeanBuilderTest.java | 29 +-
.../ServiceAnnotationBeanPostProcessorTest.java | 13 +
.../annotation/ServiceClassPostProcessorTest.java | 13 +
.../MultipleServicesWithMethodConfigsTest.java} | 30 +-
.../DubboComponentScanRegistrarTest.java | 4 +-
.../spring/context/annotation/EnableDubboTest.java | 4 +-
.../consumer/test/TestConsumerConfiguration.java | 5 +-
.../properties/DefaultDubboConfigBinderTest.java | 13 +
.../dubbo/config/spring/issues/Issue6252Test.java | 50 +
.../ZookeeperDubboSpringConsumerBootstrap.java | 53 +
.../ZookeeperDubboSpringConsumerXmlBootstrap.java | 39 +-
.../ZookeeperDubboSpringProviderBootstrap.java | 60 +
.../spring/schema/DubboNamespaceHandlerTest.java | 4 +-
.../config/spring/schema/GenericServiceTest.java | 13 +
.../src/test/resources/META-INF/config.properties | 2 +
.../resources/META-INF/issue-6252-test.properties | 15 +
.../zookeeper-dubbb-consumer.properties | 14 +
.../zookeeper-dubbb-provider.properties | 10 +
.../zookeeper-dubbo-consumer.xml | 34 +
.../spring/multiple-services-with-methods.xml | 45 +
.../consul/ConsulDynamicConfiguration.java | 123 +-
.../consul/ConsulDynamicConfigurationTest.java | 20 +-
.../support/nacos/NacosDynamicConfiguration.java | 64 +-
.../zookeeper/ZookeeperDynamicConfiguration.java | 68 +-
.../ZookeeperDynamicConfigurationTest.java | 4 +-
.../demo/consumer/comp/DemoServiceComponent.java | 4 +-
.../dubbo/demo/provider/DemoServiceImpl.java | 4 +-
dubbo-dependencies-bom/pom.xml | 10 +-
.../dubbo-dependencies-zookeeper/pom.xml | 2 +-
.../validation/support/jvalidation/JValidator.java | 6 +-
.../metadata/DefaultMetadataParamsFilter.java | 8 +-
.../org/apache/dubbo/metadata/MetadataInfo.java | 6 +-
.../dubbo/metadata/MetadataParamsFilter.java | 15 +-
.../org/apache/dubbo/metadata/MetadataService.java | 7 +-
.../dubbo/metadata/MetadataServiceExporter.java | 41 +-
.../apache/dubbo/metadata/MetadataServiceType.java | 72 +
.../metadata/definition/TypeDefinitionBuilder.java | 10 +-
.../metadata/definition/builder/TypeBuilder.java | 3 +-
.../BaseApplicationMetadataIdentifier.java | 9 +-
.../identifier/BaseServiceMetadataIdentifier.java | 2 +-
.../metadata/report/identifier/KeyTypeEnum.java | 40 +-
.../AbstractAbstractWritableMetadataService.java | 100 +
.../org.apache.dubbo.metadata.MetadataParamsFilter | 1 +
...che.dubbo.metadata.report.MetadataReportFactory | 1 +
.../dubbo/metadata/MetadataServiceTypeTest.java | 40 +-
.../dubbo/metadata/ServiceNameMappingTest.java | 125 ++
.../metadata/definition/Test3TypeBuilder.java} | 30 +-
.../metadata/definition/TestTypeBuilder.java} | 30 +-
.../definition/TypeDefinitionBuilderTest.java | 21 +-
.../report/identifier/KeyTypeEnumTest.java} | 20 +-
.../support/AbstractMetadataReportFactoryTest.java | 265 +--
.../report/support/AbstractMetadataReportTest.java | 149 +-
...e.dubbo.metadata.definition.builder.TypeBuilder | 2 +
.../META-INF/dubbo/service-name-mapping.properties | 3 +
.../dubbo-metadata-report-consul/pom.xml | 8 +-
.../store/consul/ConsulMetadataReport.java | 4 +
.../store/consul/ConsulMetadataReportFactory.java | 13 +-
dubbo-metadata/dubbo-metadata-report-nacos/pom.xml | 9 +-
.../metadata/store/nacos/NacosMetadataReport.java | 131 +-
.../store/nacos/NacosMetadataReportFactory.java | 13 +-
.../store/nacos/NacosMetadataReportTest.java | 247 ---
.../dubbo-metadata-report-zookeeper/pom.xml | 2 +-
.../zookeeper/ZookeeperMetadataReportTest.java | 553 +++---
dubbo-metadata/pom.xml | 12 +-
.../dubbo/qos/legacy/InvokerTelnetHandlerTest.java | 14 +
.../dubbo/qos/legacy/service/DemoService.java | 2 +
.../dubbo/qos/legacy/service/DemoServiceImpl.java | 5 +
.../registry/client/ServiceDiscoveryRegistry.java | 4 +-
.../dubbo/registry/client/ServiceInstance.java | 22 +
.../metadata/ServiceInstanceMetadataUtils.java | 4 +-
.../StandardMetadataServiceURLBuilder.java | 1 +
.../registry/integration/RegistryDirectory.java | 4 +-
.../integration/RegistryInvokerWrapper.java | 18 +-
.../registry/integration/RegistryProtocol.java | 22 +-
...dubbo.registry.client.ServiceInstanceCustomizer | 3 +-
.../client/DefaultServiceInstanceTest.java | 9 +
...ient.metadata.proxy.MetadataServiceProxyFactory | 2 +
.../dubbo/registry/consul/ConsulParameter.java | 87 +
.../dubbo/registry/consul/ConsulRegistry.java | 32 +-
.../registry/consul/ConsulServiceDiscovery.java | 89 +-
.../consul/ConsulServiceDiscoveryTest.java | 16 +-
.../registry/dubbo/RegistryDirectoryTest.java | 2 +-
.../dubbo/registry/dubbo/RegistryProtocolTest.java | 5 +-
.../registry/eureka/EurekaServiceDiscovery.java | 5 +-
.../nacos/util/NacosNamingServiceUtils.java | 48 +-
.../remoting/http/tomcat/TomcatHttpServer.java | 10 +-
.../remoting/transport/netty4/NettyServer.java | 6 +-
.../org/apache/dubbo/rpc/AttachmentsAdapter.java | 48 +-
.../main/java/org/apache/dubbo/rpc/Constants.java | 1 +
.../org/apache/dubbo/rpc/filter/ContextFilter.java | 4 +-
.../apache/dubbo/rpc/filter/GenericImplFilter.java | 3 +-
.../dubbo/rpc/protocol/ProtocolFilterWrapper.java | 2 +
.../rpc/protocol/ProtocolListenerWrapper.java | 2 +
.../org/apache/dubbo/rpc/support/MockInvoker.java | 24 +-
.../org/apache/dubbo/rpc/support/RpcUtils.java | 16 +-
.../dubbo/internal/org.apache.dubbo.rpc.Filter | 3 +-
.../java/org/apache/dubbo/rpc/RpcContextTest.java | 3 +-
.../rpc/protocol/dubbo/CallbackServiceCodec.java | 3 +
.../protocol/dubbo/DecodeableRpcInvocation.java | 2 +-
.../dubbo/rpc/protocol/dubbo/DubboInvoker.java | 6 +-
.../rpc/protocol/dubbo/ArgumentCallbackTest.java | 22 +
.../protocol/webservice/WebServiceProtocol.java | 9 +-
.../dubbo/internal/org.apache.dubbo.rpc.Protocol | 2 +-
.../webservice/WebserviceProtocolTest.java | 90 +
.../serialize/hessian2/Hessian2ObjectInput.java | 3 +-
.../serialize/hessian2/Hessian2ObjectOutput.java | 3 +-
.../hessian2/Hessian2SerializerFactory.java | 6 +-
.../AbstractHessian2FactoryInitializer.java} | 21 +-
.../DefaultHessian2FactoryInitializer.java} | 17 +-
.../hessian2/dubbo/Hessian2FactoryInitializer.java | 43 +
.../dubbo/WhitelistHessian2FactoryInitializer.java | 50 +
...alize.hessian2.dubbo.Hessian2FactoryInitializer | 2 +
pom.xml | 2 +-
231 files changed, 6276 insertions(+), 4015 deletions(-)
[dubbo] 01/08: change version to 3.0.0-SNAPSHOT
Posted by li...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
liujun pushed a commit to branch 3.0-to-master
in repository https://gitbox.apache.org/repos/asf/dubbo.git
commit 1ed9f16a1236c94ac6c1c05e6181643bd2b9dc0a
Author: ken.lj <ke...@gmail.com>
AuthorDate: Fri May 29 13:49:25 2020 +0800
change version to 3.0.0-SNAPSHOT
---
dubbo-dependencies-bom/pom.xml | 2 +-
dubbo-dependencies/dubbo-dependencies-zookeeper/pom.xml | 2 +-
pom.xml | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/dubbo-dependencies-bom/pom.xml b/dubbo-dependencies-bom/pom.xml
index 9bf5a1c..92f2a90 100644
--- a/dubbo-dependencies-bom/pom.xml
+++ b/dubbo-dependencies-bom/pom.xml
@@ -163,7 +163,7 @@
<mortbay_jetty_version>6.1.26</mortbay_jetty_version>
<portlet_version>2.0</portlet_version>
<maven_flatten_version>1.1.0</maven_flatten_version>
- <revision>2.7.7-SNAPSHOT</revision>
+ <revision>3.0.0-SNAPSHOT</revision>
</properties>
<dependencyManagement>
diff --git a/dubbo-dependencies/dubbo-dependencies-zookeeper/pom.xml b/dubbo-dependencies/dubbo-dependencies-zookeeper/pom.xml
index fbe2e3c..1ff9f7f 100644
--- a/dubbo-dependencies/dubbo-dependencies-zookeeper/pom.xml
+++ b/dubbo-dependencies/dubbo-dependencies-zookeeper/pom.xml
@@ -32,7 +32,7 @@
<packaging>pom</packaging>
<properties>
- <revision>2.7.7-SNAPSHOT</revision>
+ <revision>3.0.0-SNAPSHOT</revision>
<maven_flatten_version>1.1.0</maven_flatten_version>
</properties>
diff --git a/pom.xml b/pom.xml
index 4248fcb..e49eed2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -126,7 +126,7 @@
<arguments />
<checkstyle.skip>true</checkstyle.skip>
<rat.skip>true</rat.skip>
- <revision>2.7.7-SNAPSHOT</revision>
+ <revision>3.0.0-SNAPSHOT</revision>
</properties>
<modules>
[dubbo] 07/08: Merge branch '3.0' of
https://github.com/apache/dubbo into 3.0
Posted by li...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
liujun pushed a commit to branch 3.0-to-master
in repository https://gitbox.apache.org/repos/asf/dubbo.git
commit 7d95d1a82fae6eb902e47fd2454bff36f5bcad0d
Merge: e17b477 99c4166
Author: ken.lj <ke...@gmail.com>
AuthorDate: Tue Aug 4 14:51:50 2020 +0800
Merge branch '3.0' of https://github.com/apache/dubbo into 3.0
.../apache/dubbo/rpc/cluster/ClusterInvoker.java | 2 +
.../org/apache/dubbo/rpc/cluster/Directory.java | 2 +
.../rpc/cluster/directory/AbstractDirectory.java | 1 +
.../cluster/support/AbstractClusterInvoker.java | 5 +
.../support/wrapper/MockClusterInvoker.java | 5 +
.../dubbo/common/constants/RegistryConstants.java | 10 +
.../org/apache/dubbo/config/ApplicationConfig.java | 8 +-
.../org/apache/dubbo/rpc/model/ConsumerModel.java | 6 +
.../dubbo/config/utils/ConfigValidationUtils.java | 30 +-
.../apache/dubbo/demo/consumer/Application.java | 19 +
.../src/main/resources/spring/dubbo-consumer.xml | 7 +-
.../dubbo/demo/provider/GreetingServiceImpl.java | 29 +-
.../src/main/resources/spring/dubbo-provider.xml | 7 +-
.../DynamicConfigurationServiceNameMapping.java | 2 +-
.../apache/dubbo/metadata/MappingChangedEvent.java | 9 +
.../org/apache/dubbo/metadata/MetadataInfo.java | 35 +-
.../apache/dubbo/metadata/ServiceNameMapping.java | 3 +-
.../metadata/report/MetadataReportInstance.java | 10 +
.../org.apache.dubbo.metadata.ServiceNameMapping | 3 +-
...che.dubbo.metadata.report.MetadataReportFactory | 1 -
.../apache/dubbo/metadata/MetadataInfoTest.java | 2 +-
.../client/DefaultRegistryClusterIdentifier.java | 9 +-
.../registry/client/DefaultServiceInstance.java | 1 +
.../dubbo/registry/client/InstanceAddressURL.java | 18 +-
.../registry/client/RegistryClusterIdentifier.java | 7 +-
.../{integration => client}/RegistryProtocol.java | 1655 ++++++++++----------
.../registry/client/ServiceDiscoveryRegistry.java | 26 +-
.../client/ServiceDiscoveryRegistryDirectory.java | 53 +-
.../client/ServiceDiscoveryRegistryProtocol.java | 51 -
.../ServiceDiscoveryRegistryProtocolListener.java | 1 -
.../client/ServiceInstanceMetadataCustomizer.java | 73 -
.../listener/ServiceInstancesChangedListener.java | 30 +-
.../metadata/MetadataServiceNameMapping.java | 51 +-
...MetadataServiceURLParamsMetadataCustomizer.java | 31 +-
.../registry/client/metadata/MetadataUtils.java | 2 +
.../ServiceInstanceMetadataCustomizer.java | 88 ++
.../metadata/ServiceInstanceMetadataUtils.java | 9 +-
.../StandardMetadataServiceURLBuilder.java | 5 +-
.../store/InMemoryWritableMetadataService.java | 20 +-
.../metadata/store/RemoteMetadataServiceImpl.java | 18 +-
.../registry/integration/DynamicDirectory.java | 2 +-
.../InterfaceCompatibleRegistryProtocol.java | 177 +++
.../registry/integration/RegistryDirectory.java | 2 +-
.../integration/RegistryInvokerWrapper.java | 79 -
.../integration/RegistryProtocolListener.java | 1 +
.../org.apache.dubbo.metadata.ServiceNameMapping | 1 +
...dubbo.registry.client.ServiceInstanceCustomizer | 1 +
.../dubbo/internal/org.apache.dubbo.rpc.Protocol | 4 +-
48 files changed, 1426 insertions(+), 1185 deletions(-)