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 3ab6695b8f9e11ad5712e977a6f78ca465d942a7 Merge: b273754262 d5f465cef9 Author: ken.lj <[email protected]> AuthorDate: Fri Apr 1 14:49:26 2022 +0800 Merge branch '3.0' of https://github.com/apache/dubbo into 3.0 compiler/src/main/resources/Dubbo3Stub.mustache | 10 - .../support/registry/ZoneAwareClusterInvoker.java | 2 +- .../dubbo/common/CommonScopeModelInitializer.java | 2 + .../src/main/java/org/apache/dubbo/common/URL.java | 4 +- .../org/apache/dubbo/common/convert/Converter.java | 36 -- .../apache/dubbo/common/convert/ConverterUtil.java | 70 ++++ .../convert/multiple/StringToArrayConverter.java | 9 +- .../multiple/StringToBlockingDequeConverter.java | 5 + .../multiple/StringToBlockingQueueConverter.java | 5 + .../multiple/StringToCollectionConverter.java | 5 + .../convert/multiple/StringToDequeConverter.java | 5 + .../multiple/StringToIterableConverter.java | 13 +- .../convert/multiple/StringToListConverter.java | 5 + .../multiple/StringToNavigableSetConverter.java | 5 + .../convert/multiple/StringToQueueConverter.java | 5 + .../convert/multiple/StringToSetConverter.java | 5 + .../multiple/StringToSortedSetConverter.java | 5 + .../multiple/StringToTransferQueueConverter.java | 5 + .../org/apache/dubbo/common/utils/ClassUtils.java | 9 +- .../org/apache/dubbo/config/AbstractConfig.java | 3 +- .../java/org/apache/dubbo/config/MethodConfig.java | 3 +- .../definition/builder/MapTypeBuilder.java | 8 - .../apache/dubbo/common/convert/ConverterTest.java | 26 +- .../multiple/StringToArrayConverterTest.java | 4 +- .../multiple/StringToQueueConverterTest.java | 3 +- .../convert/multiple/StringToSetConverterTest.java | 3 +- .../rest/DefaultServiceRestMetadataResolver.java | 5 +- .../org/apache/dubbo/remoting/api/Connection.java | 37 +- .../dubbo/remoting/api/PortUnificationServer.java | 4 +- .../remoting/api/PortUnificationServerHandler.java | 26 +- .../org/apache/dubbo/rpc/CancellationContext.java | 2 +- .../dubbo/rpc/protocol/tri/RequestMetadata.java | 2 + .../rpc/protocol/tri/TripleHttp2Protocol.java | 24 +- .../dubbo/rpc/protocol/tri/TripleInvoker.java | 13 +- .../{ServerCall.java => AbstractServerCall.java} | 284 ++++++++------- .../tri/call/AbstractServerCallListener.java | 4 +- .../tri/call/BiStreamServerCallListener.java | 9 +- .../dubbo/rpc/protocol/tri/call/ClientCall.java | 315 +++++------------ .../call/ObserverToClientCallListenerAdapter.java | 8 +- ...Call.java => ReflectionAbstractServerCall.java} | 158 ++++----- .../dubbo/rpc/protocol/tri/call/ServerCall.java | 338 ++---------------- .../tri/call/ServerStreamServerCallListener.java | 6 +- ...ServerCall.java => StubAbstractServerCall.java} | 41 +-- .../rpc/protocol/tri/call/TripleClientCall.java | 285 +++++++++++++++ .../protocol/tri/call/UnaryClientCallListener.java | 5 +- .../protocol/tri/call/UnaryServerCallListener.java | 6 +- .../protocol/tri/command/CancelQueueCommand.java | 11 +- .../rpc/protocol/tri/command/QueuedCommand.java | 4 + .../tri/observer/ClientCallToObserverAdapter.java | 10 +- .../tri/observer/ServerCallToObserverAdapter.java | 28 +- .../rpc/protocol/tri/stream/AbstractStream.java | 3 + .../rpc/protocol/tri/stream/ClientStream.java | 329 ++---------------- .../protocol/tri/stream/ClientStreamListener.java | 45 --- .../rpc/protocol/tri/stream/ServerStream.java | 383 ++------------------- .../protocol/tri/stream/ServerStreamListener.java | 31 -- .../dubbo/rpc/protocol/tri/stream/Stream.java | 68 +++- .../rpc/protocol/tri/stream/StreamListener.java | 24 -- .../dubbo/rpc/protocol/tri/stream/StreamUtils.java | 9 +- .../{ClientStream.java => TripleClientStream.java} | 94 +++-- .../{ServerStream.java => TripleServerStream.java} | 175 ++++++---- .../tri/transport/H2TransportListener.java | 4 +- .../TripleHttp2ClientResponseHandler.java | 5 +- .../transport/TripleHttp2FrameServerHandler.java | 29 +- .../rpc/protocol/tri/transport/WriteQueue.java | 27 +- .../dubbo/rpc/protocol/tri/TripleInvokerTest.java | 3 +- .../tri/call/ReflectionServerCallTest.java | 44 +-- .../rpc/protocol/tri/call/StubServerCallTest.java | 15 +- .../protocol/tri/service/TriHealthImplTest.java | 36 +- .../tri/stream/MockClientStreamListener.java | 13 +- ...StreamTest.java => TripleClientStreamTest.java} | 26 +- .../transport/AbstractH2TransportListenerTest.java | 4 +- .../TripleHttp2ClientResponseHandlerTest.java | 6 +- .../rpc/protocol/tri/transport/WriteQueueTest.java | 3 +- 73 files changed, 1376 insertions(+), 1880 deletions(-)
