This is an automated email from the ASF dual-hosted git repository. liujun pushed a commit to branch fix-3.0-spring-boot-metadata-service in repository https://gitbox.apache.org/repos/asf/dubbo.git
commit dd1a1824a7777e655c39d64c46afd738d92d684c Merge: d31c42cee5 33a29caa0d Author: ken.lj <[email protected]> AuthorDate: Mon Mar 28 09:39:21 2022 +0800 Merge branch '3.0' of https://github.com/apache/dubbo into 3.0 compiler/pom.xml | 2 +- .../org/apache/dubbo/gen/AbstractGenerator.java | 15 + .../dubbo/gen/tri/Dubbo3TripleGenerator.java | 63 +++ .../resources/Dubbo3TripleInterfaceStub.mustache | 67 +++ .../src/main/resources/Dubbo3TripleStub.mustache | 224 ++++++++++ .../configurator/parser/model/ConfigItem.java | 25 +- .../parser/model/ConfiguratorConfig.java | 16 +- dubbo-common/pom.xml | 18 +- .../dubbo/common/constants/CommonConstants.java | 2 + .../dubbo/common/constants/RegistryConstants.java | 2 + .../dubbo/common/url/component/URLItemCache.java | 41 +- .../org/apache/dubbo/config/ApplicationConfig.java | 3 + .../apache/dubbo/config/MetadataReportConfig.java | 3 +- .../java/org/apache/dubbo/config/SslConfig.java | 34 +- .../apache/dubbo/rpc/model/MethodDescriptor.java | 253 +---------- .../dubbo/rpc/model/ModuleServiceRepository.java | 13 +- .../org/apache/dubbo/rpc/model/PackableMethod.java | 73 ++++ .../rpc/model/ReflectionMethodDescriptor.java | 176 ++++++++ ...iptor.java => ReflectionServiceDescriptor.java} | 36 +- .../apache/dubbo/rpc/model/ServiceDescriptor.java | 114 +---- .../dubbo/rpc/model/StreamMethodDescriptor.java | 88 ---- .../dubbo/rpc/model/StubMethodDescriptor.java | 145 ++++++ ...eDescriptor.java => StubServiceDescriptor.java} | 55 +-- .../service/ServiceDescriptorInternalCache.java | 5 +- .../dubbo/descriptor/MethodDescriptorTest.java | 231 ---------- .../rpc/model/ReflectionMethodDescriptorTest.java | 121 +++++ .../rpc/model/ReflectionServiceDescriptorTest.java | 99 +++++ .../ServiceDescriptorInternalCacheTest.java} | 22 +- .../org/apache/dubbo/config/ReferenceConfig.java | 10 +- .../org/apache/dubbo/config/ServiceConfig.java | 24 +- .../config/deploy/DefaultApplicationDeployer.java | 4 - .../dubbo/config/utils/ConfigValidationUtils.java | 19 +- .../dubbo/config/MetadataReportConfigTest.java | 2 +- .../config/utils/ConfigValidationUtilsTest.java | 26 ++ dubbo-distribution/dubbo-all/pom.xml | 2 +- dubbo-distribution/dubbo-core-spi/pom.xml | 2 +- .../apache/dubbo/metadata/MetadataConstants.java | 1 + .../metadata/store/nacos/NacosMetadataReport.java | 5 +- .../apache/dubbo/registry/nacos/NacosRegistry.java | 26 +- .../dubbo/remoting/api/ConnectionManager.java | 3 +- .../api/MultiplexProtocolConnectionManager.java | 3 +- .../api/SingleProtocolConnectionManager.java | 3 +- .../java/org/apache/dubbo/rpc}/PathResolver.java | 7 +- .../java/org/apache/dubbo/rpc/ServerService.java} | 13 +- .../org/apache/dubbo/rpc/StatusRpcException.java} | 18 +- .../java/org/apache/dubbo/rpc/TriRpcStatus.java} | 115 +++-- .../dubbo/rpc/filter/ProfilerServerFilter.java | 10 +- ...rInvocationHandler.java => InvocationUtil.java} | 73 +--- .../dubbo/rpc/proxy/InvokerInvocationHandler.java | 52 +-- .../dubbo/rpc/stub/BiStreamMethodHandler.java} | 29 +- .../dubbo/rpc/stub/FutureToObserverAdaptor.java | 55 +++ .../dubbo/rpc/stub/ServerStreamMethodHandler.java} | 30 +- .../apache/dubbo/rpc/stub/StubInvocationUtil.java | 67 +++ .../org/apache/dubbo/rpc/stub/StubInvoker.java} | 27 +- .../apache/dubbo/rpc/stub/StubMethodHandler.java} | 29 +- .../apache/dubbo/rpc/stub/StubProxyFactory.java} | 38 +- .../org/apache/dubbo/rpc/stub/StubSuppliers.java | 71 +++ .../dubbo/rpc/stub/UnaryStubMethodHandler.java} | 31 +- .../internal/org.apache.dubbo.rpc.ProxyFactory | 3 +- .../apache/dubbo/rpc/StatusRpcExceptionTest.java} | 15 +- .../org/apache/dubbo/rpc/TriRpcStatusTest.java | 225 ++++++++++ .../dubbo/rpc/stub/BiStreamMethodHandlerTest.java} | 33 +- .../rpc/stub/FutureToObserverAdaptorTest.java | 88 ++++ .../rpc/stub/ServerStreamMethodHandlerTest.java | 63 +++ .../dubbo/rpc/stub/StubInvocationUtilTest.java | 304 +++++++++++++ .../org/apache/dubbo/rpc/stub/StubInvokerTest.java | 76 ++++ .../dubbo/rpc/stub/StubProxyFactoryTest.java | 74 ++++ .../apache/dubbo/rpc/stub/StubSuppliersTest.java | 68 +++ dubbo-rpc/dubbo-rpc-triple/pom.xml | 35 +- .../dubbo/rpc/protocol/tri/ClassLoadUtil.java | 1 + .../dubbo/rpc/protocol/tri/DeadlineFuture.java | 185 ++++++++ .../dubbo/rpc/protocol/tri/DefaultFuture2.java | 260 ----------- .../tri/{pack/PbPack.java => PbUnpack.java} | 23 +- .../rpc/protocol/tri/ReflectionPackableMethod.java | 458 +++++++++++++++++++ .../dubbo/rpc/protocol/tri/RequestMetadata.java | 51 ++- .../dubbo/rpc/protocol/tri/TripleConstant.java | 35 +- .../dubbo/rpc/protocol/tri/TripleHeaderEnum.java | 12 +- .../rpc/protocol/tri/TripleHttp2Protocol.java | 78 ++-- .../dubbo/rpc/protocol/tri/TripleInvoker.java | 257 ++++++++--- .../dubbo/rpc/protocol/tri/TriplePathResolver.java | 15 +- .../dubbo/rpc/protocol/tri/TripleProtocol.java | 91 ++-- .../tri/call/AbstractServerCallListener.java | 59 ++- .../tri/call/BiStreamServerCallListener.java | 22 +- .../dubbo/rpc/protocol/tri/call/ClientCall.java | 118 ++--- .../rpc/protocol/tri/call/ClientCallUtil.java | 137 ------ .../call/ObserverToClientCallListenerAdapter.java | 24 +- .../protocol/tri/call/ReflectionServerCall.java | 224 ++++++++++ .../dubbo/rpc/protocol/tri/call/ServerCall.java | 485 ++++++++------------- .../rpc/protocol/tri/call/ServerCallUtil.java | 95 ---- .../tri/call/ServerStreamServerCallListener.java | 16 +- .../rpc/protocol/tri/call/StubServerCall.java | 94 ++++ ...lListener.java => UnaryClientCallListener.java} | 22 +- .../protocol/tri/call/UnaryServerCallListener.java | 24 +- .../tri/call/WrapRequestServerCallListener.java | 51 --- .../tri/call/WrapResponseCallListener.java | 62 --- .../rpc/protocol/tri/command/DataQueueCommand.java | 19 +- .../rpc/protocol/tri/compressor/Compressor.java | 18 +- .../rpc/protocol/tri/compressor/DeCompressor.java | 12 - .../dubbo/rpc/protocol/tri/frame/TriDecoder.java | 5 + .../protocol/tri/observer/CallStreamObserver.java | 3 +- .../tri/observer/ClientCallToObserverAdapter.java | 12 +- .../tri/observer/ServerCallToObserverAdapter.java | 24 +- .../tri/observer/WrapperRequestObserver.java | 82 ---- .../tri/observer/WrapperResponseObserver.java | 66 --- .../dubbo/rpc/protocol/tri/pack/GenericPack.java | 67 --- .../dubbo/rpc/protocol/tri/pack/GenericUnpack.java | 47 -- .../dubbo/rpc/protocol/tri/pack/PbUnpack.java | 39 -- .../rpc/protocol/tri/pack/WrapRequestUnpack.java | 47 -- .../rpc/protocol/tri/pack/WrapResponseUnpack.java | 42 -- .../protocol/tri/service/HealthStatusManager.java | 35 +- .../protocol/tri/service/TriBuiltinService.java | 45 +- .../rpc/protocol/tri/service/TriHealthImpl.java | 62 +-- .../rpc/protocol/tri/stream/AbstractStream.java | 12 - .../rpc/protocol/tri/stream/ClientStream.java | 130 +++--- .../protocol/tri/stream/ClientStreamListener.java | 9 +- .../rpc/protocol/tri/stream/ServerStream.java | 307 +++++++------ .../protocol/tri/stream/ServerStreamListener.java | 11 +- .../dubbo/rpc/protocol/tri/stream/Stream.java | 7 +- .../dubbo/rpc/protocol/tri/stream/StreamUtils.java | 111 ++--- .../tri/transport/AbstractH2TransportListener.java | 9 +- .../tri/transport/H2TransportListener.java | 26 +- .../TripleHttp2ClientResponseHandler.java | 19 +- .../transport/TripleHttp2FrameServerHandler.java | 46 +- .../rpc/protocol/tri/transport/WriteQueue.java | 4 + .../dubbo-rpc-triple/src/main/proto/health.proto | 4 +- .../src/main/proto/triple_wrapper.proto | 26 +- ...hResolver => org.apache.dubbo.rpc.PathResolver} | 0 ...Test.java => CancelableStreamObserverTest.java} | 39 +- .../dubbo/rpc/protocol/tri/ClassLoadUtilTest.java} | 13 +- .../dubbo/rpc/protocol/tri/DeadlineFutureTest.java | 57 +++ .../dubbo/rpc/protocol/tri}/DescriptorService.java | 8 +- .../dubbo/rpc/protocol/tri/ExceptionUtilsTest.java | 73 ++++ .../apache/dubbo/rpc/protocol/tri}/HelloReply.java | 2 +- .../dubbo/rpc/protocol/tri/PbUnpackTest.java} | 25 +- .../protocol/tri/ReflectionPackableMethodTest.java | 260 +++++++++++ .../rpc/protocol/tri/SingleProtobufUtilsTest.java | 6 +- .../ClientCallTest.java => TripleInvokerTest.java} | 42 +- .../rpc/protocol/tri/TriplePathResolverTest.java | 14 +- .../dubbo/rpc/protocol/tri/TripleProtocolTest.java | 42 +- .../rpc/protocol/tri/call/ClientCallTest.java | 31 +- .../tri/call/ReflectionServerCallTest.java | 92 ++++ .../rpc/protocol/tri/call/StubServerCallTest.java | 73 ++++ .../rpc/protocol/tri/compressor/GzipTest.java | 4 + .../tri/service/HealthStatusManagerTest.java | 83 ++++ .../tri/service/TriBuiltinServiceTest.java | 17 +- .../protocol/tri/service/TriHealthImplTest.java | 6 +- .../rpc/protocol/tri/stream/ClientStreamTest.java | 39 +- .../tri/stream/MockClientStreamListener.java | 6 +- .../rpc/protocol/tri/stream/StreamUtilsTest.java} | 26 +- .../transport/AbstractH2TransportListenerTest.java | 8 +- .../TripleHttp2ClientResponseHandlerTest.java | 2 +- .../rpc/protocol/tri/transport/WriteQueueTest.java | 25 +- pom.xml | 1 + 153 files changed, 5553 insertions(+), 3411 deletions(-)
