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 2022/04/07 07:53:25 UTC
[dubbo] branch fix-3.0-spring-boot-metadata-service created (now 2ba7faa52d)
This is an automated email from the ASF dual-hosted git repository.
liujun pushed a change to branch fix-3.0-spring-boot-metadata-service
in repository https://gitbox.apache.org/repos/asf/dubbo.git
at 2ba7faa52d set not register metadata service
This branch includes the following new commits:
new dd1a1824a7 Merge branch '3.0' of https://github.com/apache/dubbo into 3.0
new b273754262 Merge branch '3.0' of https://github.com/apache/dubbo into 3.0
new 3ab6695b8f Merge branch '3.0' of https://github.com/apache/dubbo into 3.0
new 4429dd1ac8 Merge branch '3.0' of https://github.com/apache/dubbo into 3.0
new ec2fd49942 Merge branch '3.0' of https://github.com/apache/dubbo into 3.0
new 2ba7faa52d set not register metadata service
The 6 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.
[dubbo] 04/06: 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 fix-3.0-spring-boot-metadata-service
in repository https://gitbox.apache.org/repos/asf/dubbo.git
commit 4429dd1ac8997f1c90aa922945a612d3edbdfdf6
Merge: 3ab6695b8f 0bac2faae2
Author: ken.lj <ke...@gmail.com>
AuthorDate: Fri Apr 1 20:22:06 2022 +0800
Merge branch '3.0' of https://github.com/apache/dubbo into 3.0
README.md | 2 +-
dubbo-dependencies-bom/pom.xml | 4 ++--
dubbo-dependencies/dubbo-dependencies-zookeeper-curator5/pom.xml | 2 +-
dubbo-dependencies/dubbo-dependencies-zookeeper/pom.xml | 2 +-
pom.xml | 2 +-
5 files changed, 6 insertions(+), 6 deletions(-)
[dubbo] 03/06: 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 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 <ke...@gmail.com>
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(-)
[dubbo] 06/06: set not register metadata service
Posted by li...@apache.org.
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 2ba7faa52d8c053e72e4238e30925cb6b679d303
Author: ken.lj <ke...@gmail.com>
AuthorDate: Thu Apr 7 15:52:44 2022 +0800
set not register metadata service
---
.../main/java/org/apache/dubbo/common/constants/CommonConstants.java | 2 --
.../src/main/java/org/apache/dubbo/config/ServiceConfig.java | 2 +-
.../dubbo/config/metadata/ConfigurableMetadataServiceExporter.java | 5 ++++-
.../registry/client/metadata/ServiceInstanceMetadataCustomizer.java | 2 +-
4 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/dubbo-common/src/main/java/org/apache/dubbo/common/constants/CommonConstants.java b/dubbo-common/src/main/java/org/apache/dubbo/common/constants/CommonConstants.java
index 457f3a89c8..ffbd77ced9 100644
--- a/dubbo-common/src/main/java/org/apache/dubbo/common/constants/CommonConstants.java
+++ b/dubbo-common/src/main/java/org/apache/dubbo/common/constants/CommonConstants.java
@@ -378,8 +378,6 @@ public interface CommonConstants {
int DEFAULT_FAILBACK_TIMES = 3;
- String REGISTER_KEY = "register";
-
String INTERFACES = "interfaces";
String SSL_ENABLED_KEY = "ssl-enabled";
diff --git a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ServiceConfig.java b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ServiceConfig.java
index 44f1cc7f80..7123818e24 100644
--- a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ServiceConfig.java
+++ b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ServiceConfig.java
@@ -67,7 +67,6 @@ import static org.apache.dubbo.common.constants.CommonConstants.LOCALHOST_VALUE;
import static org.apache.dubbo.common.constants.CommonConstants.METHODS_KEY;
import static org.apache.dubbo.common.constants.CommonConstants.MONITOR_KEY;
import static org.apache.dubbo.common.constants.CommonConstants.PROVIDER_SIDE;
-import static org.apache.dubbo.common.constants.CommonConstants.REGISTER_KEY;
import static org.apache.dubbo.common.constants.CommonConstants.REVISION_KEY;
import static org.apache.dubbo.common.constants.CommonConstants.SERVICE_NAME_MAPPING_KEY;
import static org.apache.dubbo.common.constants.CommonConstants.SIDE_KEY;
@@ -81,6 +80,7 @@ import static org.apache.dubbo.config.Constants.DUBBO_IP_TO_REGISTRY;
import static org.apache.dubbo.config.Constants.DUBBO_PORT_TO_BIND;
import static org.apache.dubbo.config.Constants.DUBBO_PORT_TO_REGISTRY;
import static org.apache.dubbo.config.Constants.SCOPE_NONE;
+import static org.apache.dubbo.registry.Constants.REGISTER_KEY;
import static org.apache.dubbo.remoting.Constants.BIND_IP_KEY;
import static org.apache.dubbo.remoting.Constants.BIND_PORT_KEY;
import static org.apache.dubbo.rpc.Constants.GENERIC_KEY;
diff --git a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/metadata/ConfigurableMetadataServiceExporter.java b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/metadata/ConfigurableMetadataServiceExporter.java
index 5991ea15ba..944b2a8dcc 100644
--- a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/metadata/ConfigurableMetadataServiceExporter.java
+++ b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/metadata/ConfigurableMetadataServiceExporter.java
@@ -162,7 +162,10 @@ public class ConfigurableMetadataServiceExporter {
ServiceConfig<MetadataService> serviceConfig = new ServiceConfig<>();
serviceConfig.setScopeModel(applicationModel.getInternalModule());
serviceConfig.setApplication(applicationConfig);
- serviceConfig.setRegistry(new RegistryConfig("N/A"));
+ RegistryConfig registryConfig = new RegistryConfig("N/A");
+ registryConfig.setId("internal-metadata-registry");
+ serviceConfig.setRegistry(registryConfig);
+ serviceConfig.setRegister(false);
serviceConfig.setProtocol(generateMetadataProtocol());
serviceConfig.setInterface(MetadataService.class);
serviceConfig.setDelay(0);
diff --git a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/metadata/ServiceInstanceMetadataCustomizer.java b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/metadata/ServiceInstanceMetadataCustomizer.java
index fe585f5d1f..b4eeb944da 100644
--- a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/metadata/ServiceInstanceMetadataCustomizer.java
+++ b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/metadata/ServiceInstanceMetadataCustomizer.java
@@ -68,7 +68,7 @@ public class ServiceInstanceMetadataCustomizer implements ServiceInstanceCustomi
}
}
- serviceInstance.getMetadata().putAll(extraParameters);;
+ serviceInstance.getMetadata().putAll(extraParameters);
if (CollectionUtils.isNotEmptyMap(metadataInfo.getInstanceParams())) {
serviceInstance.getMetadata().putAll(metadataInfo.getInstanceParams());
}
[dubbo] 02/06: 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 fix-3.0-spring-boot-metadata-service
in repository https://gitbox.apache.org/repos/asf/dubbo.git
commit b2737542620a279cee521c196b201c16d76baf88
Merge: dd1a1824a7 feb1792b63
Author: ken.lj <ke...@gmail.com>
AuthorDate: Mon Mar 28 17:35:54 2022 +0800
Merge branch '3.0' of https://github.com/apache/dubbo into 3.0
.../apache/dubbo/gen/dubbo/Dubbo3Generator.java | 2 +-
.../src/main/resources/DubboStub3Single.mustache | 78 ++++++++++++++++++++++
.../apache/dubbo/rpc/cluster/ClusterInvoker.java | 2 +-
.../config/model/ConditionRouterRule.java | 3 -
.../router/file/FileStateRouterFactory.java | 3 +-
.../dubbo/rpc/cluster/router/tag/model/Tag.java | 3 -
.../cluster/support/AvailableClusterInvoker.java | 2 +-
.../cluster/support/BroadcastClusterInvoker.java | 11 ++-
.../support/registry/ZoneAwareClusterInvoker.java | 2 +-
.../support/wrapper/MockClusterInvoker.java | 10 +--
.../absent/AbsentConfiguratorTest.java | 8 +--
.../configurator/parser/ConfigParserTest.java | 14 ++--
...uterTest.java => ConditionStateRouterTest.java} | 2 +-
.../virtualservice/match/DubboMethodMatchTest.java | 3 -
.../rpc/cluster/router/tag/TagStateRouterTest.java | 2 -
.../support/wrapper/MockClusterInvokerTest.java | 6 +-
.../apache/dubbo/common/BaseServiceMetadata.java | 4 +-
.../apache/dubbo/common/config/Environment.java | 2 +-
.../dubbo/common/config/ModuleEnvironment.java | 7 +-
.../dubbo/common/extension/ExtensionDirector.java | 2 +
.../org/apache/dubbo/rpc/model/ConsumerModel.java | 2 +-
.../org/apache/dubbo/rpc/model/ModuleModel.java | 5 ++
.../org/apache/dubbo/rpc/model/ProviderModel.java | 3 +-
.../apache/dubbo/rpc/model/ServiceMetadata.java | 3 +-
.../ReferenceAnnotationBeanPostProcessor.java | 6 +-
.../annotation/ServiceAnnotationPostProcessor.java | 2 +-
...onfigDefaultPropertyValueBeanPostProcessor.java | 2 +-
.../context/DubboConfigApplicationListener.java | 2 +-
.../spring/context/DubboSpringInitializer.java | 2 +-
.../spring/reference/ReferenceBeanSupport.java | 2 +-
.../config/spring/util/DubboAnnotationUtils.java | 5 +-
.../dubbo/config/spring/util/DubboBeanUtils.java | 2 +-
.../annotation/MethodConfigCallbackTest.java | 4 +-
.../annotation/ServiceBeanNameBuilderTest.java | 3 -
.../dubbo/metadata/AbstractServiceNameMapping.java | 1 +
.../registry/client/AbstractServiceDiscovery.java | 3 +
.../client/ServiceDiscoveryRegistryTest.java | 1 -
.../dubbo/rpc/protocol/dubbo/DubboProtocol.java | 24 ++++++-
38 files changed, 168 insertions(+), 70 deletions(-)
[dubbo] 01/06: 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 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 <ke...@gmail.com>
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(-)
[dubbo] 05/06: 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 fix-3.0-spring-boot-metadata-service
in repository https://gitbox.apache.org/repos/asf/dubbo.git
commit ec2fd49942e0b883b0744f400b6112d5cf9dbee8
Merge: 4429dd1ac8 49926845c0
Author: ken.lj <ke...@gmail.com>
AuthorDate: Thu Apr 7 12:08:44 2022 +0800
Merge branch '3.0' of https://github.com/apache/dubbo into 3.0
.github/workflows/build-and-test-3.yml | 15 ++--
.../resources/Dubbo3TripleInterfaceStub.mustache | 4 +-
.../src/main/resources/Dubbo3TripleStub.mustache | 9 +--
dubbo-dependencies-bom/pom.xml | 2 +-
.../dubbo/remoting/api/PortUnificationServer.java | 22 ++++--
.../remoting/api/PortUnificationServerHandler.java | 81 ++++++++++++++--------
.../dubbo/rpc/filter/ExecuteLimitFilter.java | 17 ++++-
.../protocol/tri/stream/TripleServerStream.java | 6 +-
8 files changed, 103 insertions(+), 53 deletions(-)