You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dubbo.apache.org by al...@apache.org on 2021/09/03 13:05:58 UTC
[dubbo] branch 3.0 updated (ff39bf3 -> ea151d0)
This is an automated email from the ASF dual-hosted git repository.
albumenj pushed a change to branch 3.0
in repository https://gitbox.apache.org/repos/asf/dubbo.git.
from ff39bf3 Add 3.0 Multi Instance Support (#8662)
add ea151d0 [3.0] New service repository support for multi instance (#8669)
No new revisions were added by this update.
Summary of changes:
.github/workflows/build-and-test-3.yml | 6 +-
.../common/beans/factory/ScopeBeanFactory.java | 24 ++-
.../beans/support/InstantiationStrategy.java | 109 ++++++++++
.../apache/dubbo/common/config/Environment.java | 7 +-
.../common/config/PropertiesConfiguration.java | 5 +-
.../extension/AdaptiveClassCodeGenerator.java | 17 +-
.../dubbo/common/extension/ExtensionLoader.java | 37 +++-
.../org/apache/dubbo/config/AbstractConfig.java | 45 ++++-
.../dubbo/config/AbstractInterfaceConfig.java | 55 +++---
.../apache/dubbo/config/AbstractMethodConfig.java | 16 +-
.../apache/dubbo/config/ReferenceConfigBase.java | 5 +-
.../org/apache/dubbo/config/ServiceConfigBase.java | 5 +-
.../apache/dubbo/config/context/ConfigManager.java | 59 +++---
.../apache/dubbo/rpc/model/ApplicationModel.java | 177 +++++++++--------
.../org/apache/dubbo/rpc/model/FrameworkModel.java | 42 +++-
.../rpc/model/FrameworkServiceRepository.java | 97 +++++++++
.../org/apache/dubbo/rpc/model/ModuleModel.java | 30 ++-
...epository.java => ModuleServiceRepository.java} | 159 ++++-----------
.../org/apache/dubbo/rpc/model/ScopeModel.java | 26 ++-
.../model/ScopeModelAwareExtensionProcessor.java | 26 ++-
.../org/apache/dubbo/rpc/model/ScopeModelUtil.java | 38 +++-
.../apache/dubbo/rpc/model/ServiceRepository.java | 220 +++++----------------
.../org.apache.dubbo.common.context.FrameworkExt | 1 -
.../common/beans/InstantiationStrategyTest.java | 69 +++++++
.../dubbo/common/beans/ScopeBeanFactoryTest.java | 48 +++++
.../beans/model/FooBeanWithApplicationModel.java | 16 +-
.../beans/model/FooBeanWithFrameworkModel.java | 16 +-
.../common/beans/model/FooBeanWithModuleModel.java | 16 +-
.../common/beans/model/FooBeanWithScopeModel.java | 16 +-
.../model/FooBeanWithoutUniqueConstructors.java | 27 +--
.../common/config/PropertiesConfigurationTest.java | 3 +-
.../common/extension/ExtensionDirectorTest.java | 2 -
.../common/extension/ExtensionLoaderTest.java | 45 +++--
.../extension/ext6_wrap/WrappedExtWrapper.java | 6 +-
.../extension/ext6_wrap/impl/Ext5Wrapper1.java | 16 +-
.../extension/ext6_wrap/impl/Ext5Wrapper2.java | 15 +-
.../extension/injection/impl/InjectExtImpl.java | 11 ++
.../extension/adaptive/HasAdaptiveExt$Adaptive | 8 +-
.../apache/dubbo/generic/GenericServiceTest.java | 5 +-
.../org/apache/dubbo/config/ReferenceConfig.java | 8 +-
.../org/apache/dubbo/config/ServiceConfig.java | 8 +-
.../dubbo/config/bootstrap/DubboBootstrap.java | 51 ++---
.../ConfigurableMetadataServiceExporter.java | 2 +-
.../org/apache/dubbo/config/ServiceConfigTest.java | 21 +-
.../bootstrap/DubboBootstrapMultiInstanceTest.java | 154 ++++++++++++---
.../org/apache/dubbo/config/spring/ConfigTest.java | 9 -
.../MultipleServicesWithMethodConfigsTest.java | 10 +-
.../configprops/SpringBootConfigPropsTest.java | 4 +-
.../SpringBootMultipleConfigPropsTest.java | 4 +-
.../DubboComponentScanRegistrarTest.java | 8 -
.../consumer/PropertyConfigurerTest.java | 8 -
.../consumer2/PropertySourcesConfigurerTest.java | 8 -
.../consumer3/PropertySourcesInJavaConfigTest.java | 10 +-
.../LocalCallMultipleReferenceAnnotationsTest.java | 19 +-
.../localcallam/local-call-config.properties | 3 +-
.../spring/multiple-services-with-methods.xml | 2 +-
.../config/spring/provider-nested-service.xml | 4 +-
.../dubbo/config/spring/provider-with-module.xml | 4 +-
.../common/serialize/Serialization$Adaptive.java | 21 +-
.../common/threadpool/ThreadPool$Adaptive.java | 6 +-
.../report/MetadataReportFactory$Adaptive.java | 6 +-
.../dubbo/monitor/MonitorFactory$Adaptive.java | 6 +-
.../dubbo/registry/RegistryFactory$Adaptive.java | 6 +-
.../selector/ServiceInstanceSelector$Adaptive.java | 6 +-
.../org/apache/dubbo/remoting/Codec$Adaptive.java | 9 +-
.../org/apache/dubbo/remoting/Codec2$Adaptive.java | 9 +-
.../apache/dubbo/remoting/Dispatcher$Adaptive.java | 6 +-
.../dubbo/remoting/Transporter$Adaptive.java | 9 +-
.../remoting/exchange/Exchanger$Adaptive.java | 9 +-
.../org/apache/dubbo/rpc/Protocol$Adaptive.java | 21 +-
.../apache/dubbo/rpc/ProxyFactory$Adaptive.java | 30 +--
.../apache/dubbo/rpc/cluster/Cluster$Adaptive.java | 18 +-
.../rpc/cluster/ConfiguratorFactory$Adaptive.java | 6 +-
.../dubbo/rpc/cluster/LoadBalance$Adaptive.java | 6 +-
.../dubbo/rpc/cluster/RouterFactory$Adaptive.java | 6 +-
.../router/state/StateRouterFactory$Adaptive.java | 6 +-
.../apache/dubbo/qos/command/impl/BaseOffline.java | 2 +-
.../apache/dubbo/qos/command/impl/BaseOnline.java | 2 +-
.../qos/probe/impl/ProviderReadinessProbe.java | 2 +-
.../dubbo/qos/command/impl/InvokeTelnetTest.java | 11 +-
.../dubbo/qos/command/impl/SelectTelnetTest.java | 9 +-
.../registry/client/metadata/MetadataUtils.java | 8 +-
.../registry/integration/RegistryProtocol.java | 23 +--
.../dubbo/remoting/transport/AbstractCodec.java | 10 +-
.../dubbo/remoting/transport/AbstractEndpoint.java | 11 +-
.../dubbo/remoting/transport/CodecSupport.java | 8 +-
.../rpc/protocol/ProtocolSerializationWrapper.java | 4 +-
.../org/apache/dubbo/rpc/support/RpcUtilsTest.java | 5 +-
.../rpc/protocol/dubbo/CallbackServiceCodec.java | 51 +++--
.../protocol/dubbo/DecodeableRpcInvocation.java | 19 +-
.../dubbo/rpc/protocol/dubbo/DubboCodec.java | 19 +-
.../dubbo/rpc/protocol/dubbo/DubboCountCodec.java | 9 +-
.../dubbo/rpc/protocol/dubbo/DubboProtocol.java | 28 +--
.../rpc/protocol/dubbo/ArgumentCallbackTest.java | 9 +-
.../rpc/protocol/dubbo/DubboProtocolTest.java | 7 +-
.../dubbo/rpc/protocol/dubbo/MultiThreadTest.java | 5 +-
.../dubbo/rpc/protocol/dubbo/RpcFilterTest.java | 3 +-
.../dubbo/decode/DubboTelnetDecodeTest.java | 15 +-
.../dubbo/rpc/protocol/dubbo/support/EnumBak.java | 7 +-
.../dubbo/rpc/protocol/grpc/GrpcProtocolTest.java | 15 +-
.../dubbo/rpc/protocol/rest/RestProtocolTest.java | 5 +-
.../protocol/tri/service/TriBuiltinService.java | 4 +-
.../dubbo/rpc/protocol/tri/TripleProtocolTest.java | 9 +-
.../apache/dubbo/test/common/ZooKeeperServer.java | 31 +--
104 files changed, 1458 insertions(+), 921 deletions(-)
create mode 100644 dubbo-common/src/main/java/org/apache/dubbo/common/beans/support/InstantiationStrategy.java
create mode 100644 dubbo-common/src/main/java/org/apache/dubbo/rpc/model/FrameworkServiceRepository.java
copy dubbo-common/src/main/java/org/apache/dubbo/rpc/model/{ServiceRepository.java => ModuleServiceRepository.java} (56%)
create mode 100644 dubbo-common/src/test/java/org/apache/dubbo/common/beans/InstantiationStrategyTest.java
create mode 100644 dubbo-common/src/test/java/org/apache/dubbo/common/beans/ScopeBeanFactoryTest.java
copy dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/filter/DemoServiceImpl.java => dubbo-common/src/test/java/org/apache/dubbo/common/beans/model/FooBeanWithApplicationModel.java (67%)
copy dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/filter/DemoServiceImpl.java => dubbo-common/src/test/java/org/apache/dubbo/common/beans/model/FooBeanWithFrameworkModel.java (68%)
copy dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/filter/DemoServiceImpl.java => dubbo-common/src/test/java/org/apache/dubbo/common/beans/model/FooBeanWithModuleModel.java (70%)
copy dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/filter/DemoServiceImpl.java => dubbo-common/src/test/java/org/apache/dubbo/common/beans/model/FooBeanWithScopeModel.java (71%)
copy dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/virtualservice/destination/DubboRouteDestination.java => dubbo-common/src/test/java/org/apache/dubbo/common/beans/model/FooBeanWithoutUniqueConstructors.java (61%)
copy dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/destination/ConnectionPoolSettings.java => dubbo-common/src/test/java/org/apache/dubbo/common/extension/ext6_wrap/WrappedExtWrapper.java (87%)