This is an automated email from the ASF dual-hosted git repository.
wangxin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo.git
commit d036b01248f019190eacbd2dc3e757830267670f
Merge: f63a8bb665 0f5040b19f
Author: Xin Wang <xin.victorw...@gmail.com>
AuthorDate: Mon Apr 12 14:57:23 2021 +0800
Merge remote-tracking branch 'dubbo_rem/master'
.github/workflows/build-and-test.yml | 28 +-
CONTRIBUTING.md | 2 +-
PULL_REQUEST_TEMPLATE.md | 8 +-
README.md | 14 +-
SECURITY.md | 6 +-
dubbo-bom/pom.xml | 26 ++
.../apache/dubbo/rpc/cluster/ClusterInvoker.java | 2 +-
.../cluster/configurator/AbstractConfigurator.java | 21 +-
.../cluster/configurator/parser/ConfigParser.java | 44 +-
.../config/model/ConditionRuleParser.java | 14 +-
.../rpc/cluster/router/script/ScriptRouter.java | 47 +-
.../cluster/router/tag/model/TagRuleParser.java | 19 +-
.../support/migration/MigrationClusterInvoker.java | 4 +-
.../cluster/support/migration/MigrationRule.java | 10 +-
.../support/registry/ZoneAwareClusterInvoker.java | 104 ++---
.../org.apache.dubbo.rpc.cluster.RouterFactory | 1 -
.../configurator/parser/ConfigParserTest.java | 12 +-
.../dubbo/rpc/cluster/router/TagRouterTest.java | 2 +-
.../org.apache.dubbo.rpc.cluster.RouterFactory | 1 +
.../java/org/apache/dubbo/common/Parameters.java | 8 +-
.../main/java/org/apache/dubbo/common/Version.java | 7 +-
.../common/beanutil/JavaBeanSerializeUtil.java | 4 +-
.../org/apache/dubbo/common/bytecode/Mixin.java | 2 +-
.../org/apache/dubbo/common/bytecode/Wrapper.java | 16 +-
.../dubbo/common/compiler/support/ClassUtils.java | 12 +-
.../common/compiler/support/CtClassBuilder.java | 14 +-
.../dubbo/common/constants/CommonConstants.java | 21 +-
.../dubbo/common/constants/RegistryConstants.java | 2 +-
.../extension/AdaptiveClassCodeGenerator.java | 2 +-
.../dubbo/common/extension/ExtensionLoader.java | 11 +-
.../extension/support/ActivateComparator.java | 16 +-
.../java/org/apache/dubbo/common/json/JSON.java | 20 +-
.../common/threadpool/ThreadlessExecutor.java | 8 +-
.../dubbo/common/utils/CompatibleTypeUtils.java | 8 +-
.../org/apache/dubbo/common/utils/MethodUtils.java | 8 +-
.../org/apache/dubbo/common/utils/PojoUtils.java | 155 +++++--
.../apache/dubbo/common/utils/ReflectUtils.java | 2 +-
.../dubbo/common/utils/SerializeClassChecker.java | 150 +++++++
.../org/apache/dubbo/common/utils/StringUtils.java | 4 +-
.../java/org/apache/dubbo/config/Constants.java | 2 +
.../dubbo/config/annotation/DubboReference.java | 7 +
.../dubbo/rpc/support/GroupServiceKeyCache.java | 2 +-
.../main/resources/security/serialize.blockedlist | 167 +++++++
.../apache/dubbo/common/bytecode/WrapperTest.java | 52 ++-
.../common/extension/ExtensionLoaderTest.java | 9 +
.../extension/activate/ActivateWrapperExt1.java | 25 +-
.../activate/impl/ActivateWrapperExt1Impl1.java | 28 +-
.../activate/impl/ActivateWrapperExt1Impl2.java | 28 +-
.../activate/impl/ActivateWrapperExt1Wrapper.java | 32 +-
.../extension/support/ActivateComparatorTest.java | 22 +-
.../threadlocal/InternalThreadLocalTest.java | 1 +
.../apache/dubbo/common/utils/NetUtilsTest.java | 11 +-
.../apache/dubbo/common/utils/PojoUtilsTest.java | 50 +++
.../common/utils/SerializeClassCheckerTest.java | 105 +++++
...o.common.extension.activate.ActivateWrapperExt1 | 3 +
.../org/apache/dubbo/config/ReferenceConfig.java | 40 +-
.../org/apache/dubbo/config/ServiceConfig.java | 5 +-
.../dubbo/config/bootstrap/DubboBootstrap.java | 8 +-
.../dubbo/config/utils/ConfigValidationUtils.java | 14 +-
.../apache/dubbo/config/AbstractConfigTest.java | 15 +-
.../ReferenceAnnotationBeanPostProcessor.java | 73 ++-
.../annotation/ServiceClassPostProcessor.java | 4 +-
.../context/DubboBootstrapApplicationListener.java | 7 +
...bboBootstrapStartStopListenerSpringAdapter.java | 2 +-
...DubboLifecycleComponentApplicationListener.java | 4 +-
.../properties/DefaultDubboConfigBinder.java | 22 +
.../spring/schema/DubboBeanDefinitionParser.java | 4 +-
.../config/spring/util/DubboAnnotationUtils.java | 2 +-
.../ReferenceAnnotationBeanPostProcessorTest.java | 32 +-
.../annotation/ReferenceBeanBuilderTest.java | 4 +-
.../META-INF/spring/dubbo-generic-consumer.xml | 4 +-
.../spring/dubbo-nacos-consumer-context.xml | 12 +-
.../spring/dubbo-nacos-provider-context.xml | 6 +-
.../apollo/ApolloDynamicConfigurationTest.java | 17 +-
.../support/apollo/EmbeddedApolloJunit5.java | 194 ++++++++
.../support/nacos/NacosConfigServiceWrapper.java | 65 +++
.../support/nacos/NacosDynamicConfiguration.java | 8 +-
.../support/zookeeper/CacheListener.java | 60 +--
.../zookeeper/ZookeeperDynamicConfiguration.java | 30 +-
.../ZookeeperDynamicConfigurationTest.java | 11 +-
.../main/java/org/apache/dubbo/container/Main.java | 2 +-
dubbo-dependencies-bom/pom.xml | 4 +-
.../dubbo-dependencies-zookeeper/pom.xml | 2 +-
.../dubbo/cache/support/expiring/ExpiringMap.java | 8 +-
.../DynamicConfigurationServiceNameMapping.java | 5 +-
.../apache/dubbo/metadata/MetadataConstants.java | 2 +-
.../org/apache/dubbo/metadata/MetadataService.java | 2 +-
.../identifier/ServiceMetadataIdentifier.java | 6 +-
.../rest/ClassPathServiceRestMetadataReader.java | 8 +-
.../definition/protobuf/ProtobufTypeBuilder.java | 2 +-
.../store/failover/FailoverMetadataReport.java | 2 +-
.../store/nacos/NacosConfigServiceWrapper.java | 55 +++
.../metadata/store/nacos/NacosMetadataReport.java | 7 +-
.../metadata/store/redis/RedisMetadataReport.java | 22 +-
.../store/zookeeper/ZookeeperMetadataReport.java | 19 +-
.../registry/client/ServiceDiscoveryRegistry.java | 2 +-
.../listener/ServiceInstancesChangedListener.java | 24 +-
.../client/metadata/MetadataServiceURLBuilder.java | 2 +-
.../store/InMemoryWritableMetadataService.java | 9 +-
.../client/migration/MigrationInvoker.java | 30 +-
.../client/migration/MigrationRuleHandler.java | 4 +-
.../client/migration/MigrationRuleListener.java | 6 +-
.../registry/integration/DynamicDirectory.java | 6 +-
.../InterfaceCompatibleRegistryProtocol.java | 18 +-
.../registry/integration/RegistryDirectory.java | 23 +-
.../registry/integration/RegistryProtocol.java | 55 ++-
.../registry/support/AbstractRegistryFactory.java | 4 +
.../apache/dubbo/registry/etcd/EtcdRegistry.java | 11 +-
.../multicast/MulticastServiceDiscovery.java | 66 ---
...g.apache.dubbo.registry.client.ServiceDiscovery | 1 -
...e.dubbo.registry.client.ServiceDiscoveryFactory | 1 -
.../dubbo/registry/multiple/MultipleRegistry.java | 2 +-
.../registry/nacos/NacosNamingServiceWrapper.java | 87 ++++
.../apache/dubbo/registry/nacos/NacosRegistry.java | 7 +-
.../registry/nacos/NacosServiceDiscovery.java | 3 +-
.../nacos/util/NacosNamingServiceUtils.java | 5 +-
.../registry/zookeeper/ZookeeperRegistry.java | 39 +-
.../remoting/exchange/codec/ExchangeCodec.java | 31 +-
.../dubbo/remoting/transport/AbstractClient.java | 4 +-
.../dubbo/remoting/transport/AbstractCodec.java | 21 +-
.../dubbo/remoting/transport/AbstractServer.java | 3 +-
.../dubbo/remoting/codec/ExchangeCodecTest.java | 12 +-
.../exchange/support/DefaultFutureTest.java | 67 +++
.../org/apache/dubbo/remoting/etcd/EtcdClient.java | 6 +-
.../remoting/etcd/jetcd/JEtcdClientWrapper.java | 10 +-
.../remoting/transport/netty4/NettyServer.java | 20 +-
.../transport/netty4/logging/MessageFormatter.java | 14 +-
.../exchange/support/MulticastExchangeGroup.java | 18 +-
.../dubbo/remoting/p2p/support/MulticastGroup.java | 18 +-
.../zookeeper/curator/CuratorZookeeperClient.java | 131 +++---
.../zookeeper/support/AbstractZookeeperClient.java | 11 +-
.../support/AbstractZookeeperTransporter.java | 2 +-
.../curator/CuratorZookeeperClientTest.java | 18 +-
.../java/org/apache/dubbo/rpc/AppResponse.java | 2 +-
.../org/apache/dubbo/rpc/AttachmentsAdapter.java | 6 +-
.../java/org/apache/dubbo/rpc/RpcException.java | 2 +-
.../org/apache/dubbo/rpc/filter/GenericFilter.java | 21 +-
.../org/apache/dubbo/rpc/filter/tps/StatItem.java | 2 +-
.../dubbo/rpc/protocol/AbstractProxyProtocol.java | 7 +
.../apache/dubbo/rpc/filter/GenericFilterTest.java | 4 +
.../rpc/filter/tps/DefaultTPSLimiterTest.java | 22 +-
.../apache/dubbo/rpc/filter/tps/StatItemTest.java | 11 +
.../dubbo/rpc/protocol/dubbo/DubboProtocol.java | 103 +++--
.../protocol/dubbo/LazyConnectExchangeClient.java | 4 +-
.../dubbo/ReferenceCountExchangeClient.java | 7 +-
...bleTest.java => DubboInvokerAvailableTest.java} | 2 +-
.../rpc/protocol/dubbo/DubboProtocolTest.java | 18 +
.../rpc/protocol/dubbo/support/DemoService.java | 2 +
.../protocol/dubbo/support/DemoServiceImpl.java | 8 +
.../rpc/protocol/hessian/HessianProtocolTest.java | 6 +-
.../dubbo/rpc/protocol/rmi/RmiProtocolTest.java | 7 +-
.../support/GenericProtobufJsonSerialization.java | 2 +-
.../JMX_HealthEndpoint.png | Bin 0 -> 230227 bytes
.../dubbo-spring-boot-actuator/README.md | 499 +++++++++++++++++++++
.../dubbo-spring-boot-actuator/pom.xml | 118 +++++
.../DubboEndpointAnnotationAutoConfiguration.java | 88 ++++
.../endpoint/DubboConfigsMetadataEndpoint.java | 43 ++
.../actuate/endpoint/DubboMetadataEndpoint.java | 84 ++--
.../endpoint/DubboPropertiesMetadataEndpoint.java | 43 ++
.../endpoint/DubboReferencesMetadataEndpoint.java | 44 ++
.../endpoint/DubboServicesMetadataEndpoint.java | 44 ++
.../actuate/endpoint/DubboShutdownEndpoint.java | 44 ++
.../CompatibleConditionalOnEnabledEndpoint.java | 51 +++
.../CompatibleOnEnabledEndpointCondition.java | 69 +++
.../META-INF/dubbo-endpoints-default.properties | 21 +
.../src/main/resources/META-INF/spring.factories | 2 +
...bboEndpointAnnotationAutoConfigurationTest.java | 245 ++++++++++
.../boot/actuate/endpoint/DubboEndpointTest.java | 93 ++++
.../dubbo-spring-boot-autoconfigure/README.md | 225 ++++++++++
.../config-popup-window.png | Bin 0 -> 85096 bytes
.../mconfig-popup-window.png | Bin 0 -> 60869 bytes
.../dubbo-spring-boot-autoconfigure/pom.xml | 85 ++++
.../autoconfigure/BinderDubboConfigBinder.java | 79 ++++
.../DubboRelaxedBinding2AutoConfiguration.java | 92 ++++
.../src/main/resources/META-INF/spring.factories | 2 +
.../autoconfigure/BinderDubboConfigBinderTest.java | 72 +++
.../DubboRelaxedBinding2AutoConfigurationTest.java | 94 ++++
...aultPropertiesEnvironmentPostProcessorTest.java | 97 ++++
.../spring/boot/util/EnvironmentUtilsTest.java | 63 +++
.../src/test/resources/dubbo.properties | 5 +
.../dubbo-spring-boot-compatible/actuator/pom.xml | 94 ++++
.../DubboEndpointAutoConfiguration.java | 55 +++
.../DubboEndpointMetadataAutoConfiguration.java | 39 ++
.../DubboHealthIndicatorAutoConfiguration.java | 50 +++
...oMvcEndpointManagementContextConfiguration.java | 49 ++
.../boot/actuate/endpoint/DubboEndpoint.java | 49 ++
.../endpoint/metadata/AbstractDubboMetadata.java | 123 +++++
.../endpoint/metadata/DubboConfigsMetadata.java | 87 ++++
.../actuate/endpoint/metadata/DubboMetadata.java | 62 +++
.../endpoint/metadata/DubboPropertiesMetadata.java | 76 ++--
.../endpoint/metadata/DubboReferencesMetadata.java | 71 +++
.../endpoint/metadata/DubboServicesMetadata.java | 84 ++++
.../endpoint/metadata/DubboShutdownMetadata.java | 78 ++++
.../actuate/endpoint/mvc/DubboMvcEndpoint.java | 112 +++++
.../boot/actuate/health/DubboHealthIndicator.java | 211 +++++++++
.../health/DubboHealthIndicatorProperties.java | 99 ++++
.../src/main/resources/META-INF/spring.factories | 6 +
.../DubboEndpointAutoConfigurationTest.java | 238 ++++++++++
.../actuate/health/DubboHealthIndicatorTest.java | 89 ++++
.../autoconfigure/pom.xml | 88 ++++
.../boot/autoconfigure/DubboAutoConfiguration.java | 110 +++++
.../DubboConfigurationProperties.java | 300 +++++++++++++
.../DubboRelaxedBindingAutoConfiguration.java | 73 +++
.../autoconfigure/RelaxedDubboConfigBinder.java | 96 ++--
.../config/ServiceBeanIdConflictProcessor.java | 115 +++++
.../DubboApplicationContextInitializer.java | 50 +++
.../event/AwaitingNonWebApplicationListener.java | 199 ++++++++
...gBeanDefinitionConflictApplicationListener.java | 121 +++++
.../OverrideDubboConfigApplicationListener.java | 79 ++++
.../event/WelcomeLogoApplicationListener.java | 94 ++++
...oDefaultPropertiesEnvironmentPostProcessor.java | 136 ++++++
.../apache/dubbo/spring/boot/util/DubboUtils.java | 215 +++++++++
.../dubbo/spring/boot/util/EnvironmentUtils.java | 114 +++++
.../src/main/resources/META-INF/spring.factories | 12 +
.../org/apache/dubbo/spring/boot/TestSuite.java | 53 +++
.../CompatibleDubboAutoConfigurationTest.java | 59 +++
...ubboAutoConfigurationTestWithoutProperties.java | 64 +++
...DubboAutoConfigurationOnMultipleConfigTest.java | 277 ++++++++++++
.../DubboAutoConfigurationOnSingleConfigTest.java | 151 +++++++
.../RelaxedDubboConfigBinderTest.java | 90 ++++
.../AwaitingNonWebApplicationListenerTest.java | 75 ++++
...nDefinitionConflictApplicationListenerTest.java | 107 +++++
...eDubboConfigApplicationListenerDisableTest.java | 74 +++
...OverrideDubboConfigApplicationListenerTest.java | 75 ++++
.../event/WelcomeLogoApplicationListenerTest.java | 48 ++
...aultPropertiesEnvironmentPostProcessorTest.java | 97 ++++
.../dubbo/spring/boot/util/DubboUtilsTest.java | 105 +++++
.../spring/boot/util/EnvironmentUtilsTest.java | 63 +++
.../src/test/resources/META-INF/dubbo.properties | 1 +
.../resources/META-INF/spring/dubbo-context.xml | 14 +
.../dubbo-spring-boot-compatible/pom.xml | 53 +++
.../dubbo-spring-boot-starter/pom.xml | 49 ++
dubbo-spring-boot/pom.xml | 193 ++++++++
pom.xml | 3 +-
234 files changed, 9639 insertions(+), 983 deletions(-)
