You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dubbo.apache.org by ph...@apache.org on 2022/07/13 12:27:02 UTC
[dubbo-go] branch rest-protocol updated (efc451328 -> 0ea7f741e)
This is an automated email from the ASF dual-hosted git repository.
phily pushed a change to branch rest-protocol
in repository https://gitbox.apache.org/repos/asf/dubbo-go.git
from efc451328 Merge pull request #1855 from complone/rest-protocol-adapter
add 2431dec90 mesh router (#1917)
add f5da6d34a 3.0.2 change log (#1915)
add 026711bc0 Fix: ProviderConfig.Filter and ReferenceConfig.Filter not work
add 07defad2e Merge pull request #1919 from ray2011/master
add d127e5096 build(deps): bump google.golang.org/grpc from 1.46.2 to 1.47.0 (#1920)
add 0ccec74a1 build(deps): bump github.com/emicklei/go-restful/v3 from 3.7.4 to 3.8.0 (#1922)
add 35f4e8c19 fix: typo correction (#1924)
add e4690d1ea chore: remove apollo config center (#1932)
add dfe215b7c build(deps): bump github.com/RoaringBitmap/roaring from 1.1.0 to 1.2.0 (#1934)
add f21044aa4 build(deps): bump github.com/stretchr/testify from 1.7.1 to 1.7.3 (#1939)
add ae18c8220 build(deps): bump github.com/hashicorp/vault/sdk from 0.3.0 to 0.5.2 (#1942)
add e10e2087a Fix: fix revision calc (#1926)
add 48fad4bd9 feat: Grpc based Health check. (#1935)
add c52fa6119 build(deps): bump github.com/knadh/koanf from 1.4.1 to 1.4.2 (#1941)
add ada752c51 build(deps): bump github.com/stretchr/testify from 1.7.3 to 1.7.5 (#1944)
add f164c8105 build(deps): bump github.com/stretchr/testify from 1.7.5 to 1.8.0 (#1951)
add 148404b40 build(deps): bump github.com/dubbogo/gost from 1.11.25 to 1.12.5 (#1950)
add 53221faec reduce common directory (#1948)
add 1abbc2e77 fix(adaptive-service): remove useless time format. (#1955)
add b7e348319 build(deps): bump github.com/emicklei/go-restful/v3 from 3.7.4 to 3.8.0 (#1929)
add c62236c0c Merge branch 'master' of https://github.com/apache/dubbo-go
add 7b99da6a8 bugfix: remove consumer of polaris (#1962)
add de6fcfbcc fix(proto): fix getting attributes issue (#1968)
new 0ea7f741e merge 3.0
The 1 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.
Summary of changes:
CHANGELOG.md | 35 +++
README.md | 2 +-
README_CN.md | 2 +-
cluster/cluster/adaptivesvc/cluster_invoker.go | 3 +-
cluster/cluster/base/cluster_invoker.go | 3 +-
cluster/cluster/broadcast/cluster_invoker.go | 5 +-
cluster/cluster/failback/cluster_invoker.go | 3 +-
cluster/cluster/failover/cluster_invoker.go | 3 +-
cluster/cluster/failsafe/cluster_invoker.go | 5 +-
cluster/cluster/forking/cluster_invoker.go | 3 +-
cluster/cluster/mock.go | 3 +-
cluster/loadbalance/p2c/loadbalance.go | 5 +-
cluster/loadbalance/ringhash/ringhash.go | 5 +-
cluster/router/chain/chain.go | 3 +-
cluster/router/{tag => meshrouter}/factory.go | 25 +-
cluster/router/meshrouter/meshrouter.go | 149 ++++++++++
cluster/router/tag/match.go | 5 +-
cluster/router/tag/router.go | 3 +-
common/{ => constant}/file/suffix.go | 0
common/constant/key.go | 9 +-
common/extension/proxy_factory.go | 7 +-
common/logger/file_log.yml | 36 ---
common/logger/logger.go | 172 -----------
common/logger/logging.go | 68 -----
common/metadata_info.go | 8 +-
common/observer/event.go | 68 -----
common/observer/event_listener.go | 50 ----
common/rpc_service.go | 6 +-
common/yaml/testdata/config.yml | 7 -
common/yaml/yaml.go | 61 ----
common/yaml/yaml_test.go | 70 -----
config/config_center_config.go | 3 +-
config/config_center_config_test.go | 90 ------
config/config_loader_options.go | 5 +-
config/config_loader_options_test.go | 2 +-
config/config_resolver.go | 2 +-
config/consumer_config.go | 3 +-
config/graceful_shutdown.go | 2 +-
config/graceful_shutdown_config.go | 3 +-
config/logger_config.go | 5 +-
config/logger_config_test.go | 6 +-
config/metadata_report_config.go | 3 +-
config/provider_config.go | 21 +-
config/provider_config_test.go | 3 +-
config/reference_config.go | 9 +-
config/reference_config_test.go | 2 +-
config/registry_config.go | 3 +-
config/root_config.go | 3 +-
config/root_config_test.go | 3 +-
config/service_config.go | 5 +-
config/service_config_test.go | 2 +-
config/testdata/config/center/apollo.yaml | 8 -
.../consumer_config_with_configcenter_apollo.yml | 24 --
config_center/apollo/doc.go | 19 --
config_center/apollo/factory.go | 45 ---
config_center/apollo/impl.go | 171 -----------
config_center/apollo/impl_test.go | 216 --------------
config_center/apollo/listener.go | 77 -----
config_center/apollo/mockDubbogo.yaml.json | 1 -
config_center/file/listener.go | 3 +-
config_center/nacos/client.go | 2 +-
config_center/nacos/facade.go | 2 +-
config_center/nacos/impl.go | 2 +-
config_center/nacos/listener.go | 3 +-
config_center/parser/configuration_parser.go | 3 +-
config_center/zookeeper/impl.go | 2 +-
filter/accesslog/filter.go | 5 +-
filter/active/filter.go | 5 +-
filter/adaptivesvc/filter.go | 3 +-
filter/adaptivesvc/limiter/hill_climbing.go | 2 +-
filter/adaptivesvc/limiter/utils.go | 2 +-
filter/auth/provider_auth_filter.go | 5 +-
filter/auth/sign_util.go | 2 +-
filter/exec_limit/filter.go | 3 +-
filter/generic/filter.go | 3 +-
filter/generic/generalizer/gson.go | 3 +-
filter/generic/generalizer/map.go | 3 +-
filter/generic/service_filter.go | 3 +-
filter/generic/util.go | 5 +-
filter/graceful_shutdown/consumer_filter.go | 5 +-
filter/graceful_shutdown/provider_filter.go | 5 +-
.../handler/rejected_execution_handler_only_log.go | 5 +-
filter/hystrix/filter.go | 3 +-
filter/seata/filter.go | 5 +-
filter/sentinel/filter.go | 3 +-
filter/tps/filter.go | 5 +-
filter/tps/limiter/method_service.go | 3 +-
filter/xds/cb/filter.go | 5 +-
go.mod | 16 +-
go.sum | 74 ++---
imports/imports.go | 5 +-
metadata/mapping/metadata/service_name_mapping.go | 2 +-
metadata/report/delegate/delegate_report.go | 3 +-
metadata/report/delegate/delegate_report_test.go | 3 +-
metadata/report/etcd/report.go | 2 +-
metadata/report/nacos/report.go | 2 +-
metadata/report/zookeeper/report.go | 2 +-
metadata/service/exporter/configurable/exporter.go | 5 +-
.../service/exporter/configurable/exporter_test.go | 2 +-
.../local/metadata_service_proxy_factory.go | 5 +-
metadata/service/local/service.go | 3 +-
metadata/service/local/service_proxy.go | 5 +-
metadata/service/remote/service.go | 3 +-
metadata/service/remote/service_test.go | 2 +-
metrics/prometheus/reporter.go | 3 +-
protocol/dubbo/dubbo_codec.go | 3 +-
protocol/dubbo/dubbo_exporter.go | 5 +-
protocol/dubbo/dubbo_invoker.go | 3 +-
protocol/dubbo/dubbo_invoker_test.go | 2 +-
protocol/dubbo/dubbo_protocol.go | 3 +-
protocol/dubbo/dubbo_protocol_test.go | 2 +-
protocol/dubbo/hessian2/hessian_request.go | 6 +-
protocol/dubbo/hessian2/hessian_response.go | 6 +-
protocol/dubbo/impl/codec.go | 3 +-
protocol/dubbo/impl/hessian.go | 3 +-
protocol/dubbo3/dubbo3_exporter.go | 3 +-
protocol/dubbo3/dubbo3_invoker.go | 3 +-
protocol/dubbo3/dubbo3_protocol.go | 3 +-
protocol/dubbo3/health/serverhealth.go | 186 ++++++++++++
.../dubbo3/health/triple_health_v1/health.pb.go | 314 +++++++++++++++++++++
.../dubbo3/health/triple_health_v1/health.proto | 62 ++++
.../health/triple_health_v1/health_triple.pb.go | 286 +++++++++++++++++++
protocol/dubbo3/internal/server.go | 7 +-
protocol/dubbo3/reflection/serverreflection.go | 30 +-
protocol/grpc/client.go | 3 +-
protocol/grpc/grpc_exporter.go | 5 +-
protocol/grpc/grpc_invoker.go | 3 +-
protocol/grpc/grpc_protocol.go | 5 +-
protocol/grpc/internal/helloworld/server.go | 6 +-
protocol/grpc/internal/routeguide/client.go | 5 +-
protocol/grpc/internal/routeguide/server.go | 6 +-
protocol/grpc/server.go | 3 +-
protocol/invocation/rpcinvocation.go | 2 +-
protocol/invoker.go | 3 +-
protocol/jsonrpc/http.go | 3 +-
protocol/jsonrpc/http_test.go | 2 +-
protocol/jsonrpc/jsonrpc_exporter.go | 5 +-
protocol/jsonrpc/jsonrpc_invoker.go | 5 +-
protocol/jsonrpc/jsonrpc_invoker_test.go | 2 +-
protocol/jsonrpc/jsonrpc_protocol.go | 5 +-
protocol/jsonrpc/server.go | 3 +-
protocol/protocol.go | 5 +-
.../protocolwrapper/protocol_filter_wrapper.go | 5 +-
.../protocol_filter_wrapper_test.go | 3 +-
protocol/rest/config/reader/rest_config_reader.go | 3 +-
.../rest/config/reader/rest_config_reader_test.go | 31 +-
protocol/rest/rest_exporter.go | 5 +-
protocol/rest/rest_protocol.go | 9 +
protocol/rest/server/go_restful_server.go | 11 +
protocol/rest/server/rest_server.go | 2 +
protocol/rpc_status.go | 3 +-
{common/proxy => proxy}/proxy.go | 3 +-
{common/proxy => proxy}/proxy_factory.go | 0
{common/proxy => proxy}/proxy_factory/default.go | 5 +-
.../proxy => proxy}/proxy_factory/default_test.go | 0
.../proxy => proxy}/proxy_factory/pass_through.go | 5 +-
.../proxy_factory/pass_through_test.go | 0
{common/proxy => proxy}/proxy_factory/utils.go | 0
{common/proxy => proxy}/proxy_test.go | 0
registry/base_configuration_listener.go | 3 +-
registry/base_registry.go | 3 +-
registry/directory/directory.go | 3 +-
registry/etcdv3/listener.go | 2 +-
registry/etcdv3/registry.go | 2 +-
registry/etcdv3/service_discovery.go | 2 +-
registry/event.go | 5 +-
registry/event/base_configuration_listener.go | 3 +-
.../metadata_service_url_params_customizer.go | 2 +-
.../event/protocol_ports_metadata_customizer.go | 5 +-
.../service_instances_changed_listener_impl.go | 4 +-
registry/event/service_revision_customizer.go | 5 +-
registry/mock_registry.go | 3 +-
registry/nacos/listener.go | 2 +-
registry/nacos/registry.go | 2 +-
registry/nacos/service_discovery.go | 6 +-
registry/polaris/listener.go | 11 +-
registry/polaris/registry.go | 49 +---
registry/polaris/service_discovery.go | 2 +-
registry/protocol/protocol.go | 6 +-
registry/service_instance.go | 2 +-
registry/service_instances_changed_listener.go | 5 +-
.../servicediscovery/service_discovery_registry.go | 2 +-
registry/xds/registry.go | 3 +-
registry/zookeeper/listener.go | 2 +-
registry/zookeeper/registry.go | 2 +-
registry/zookeeper/service_discovery.go | 2 +-
registry/zookeeper/service_discovery_test.go | 2 +-
remoting/etcdv3/client.go | 5 +-
remoting/etcdv3/facade.go | 2 +-
remoting/etcdv3/listener.go | 2 +-
remoting/exchange.go | 3 +-
remoting/exchange_client.go | 3 +-
remoting/getty/getty_client.go | 4 +-
remoting/getty/getty_client_test.go | 2 +-
remoting/getty/getty_server.go | 4 +-
remoting/getty/listener.go | 4 +-
remoting/getty/pool.go | 5 +-
remoting/getty/readwriter.go | 5 +-
remoting/getty/readwriter_test.go | 2 +-
remoting/nacos/builder.go | 2 +-
remoting/xds/client.go | 3 +-
remoting/xds/error.go | 2 +-
remoting/xds/ewatcher/ewatcher.go | 5 +-
remoting/xds/mapping/handler.go | 3 +-
remoting/zookeeper/client.go | 2 +-
.../curator_discovery/service_discovery.go | 2 +-
remoting/zookeeper/facade.go | 2 +-
remoting/zookeeper/listener.go | 2 +-
xds/balancer/cdsbalancer/cdsbalancer.go | 7 +-
xds/balancer/clusterimpl/clusterimpl.go | 7 +-
xds/balancer/clusterimpl/picker.go | 5 +-
.../clustermanager/balancerstateaggregator.go | 10 +-
xds/balancer/clustermanager/clustermanager.go | 7 +-
xds/balancer/clusterresolver/clusterresolver.go | 11 +-
xds/balancer/clusterresolver/configbuilder.go | 7 +-
xds/balancer/orca/orca.go | 3 +-
xds/balancer/priority/balancer.go | 7 +-
xds/balancer/ringhash/picker.go | 10 +-
xds/balancer/ringhash/ringhash.go | 9 +-
xds/client/authority.go | 5 +-
xds/client/bootstrap/bootstrap.go | 15 +-
xds/client/client.go | 7 +-
xds/client/controller.go | 5 +-
xds/client/controller/controller.go | 7 +-
xds/client/controller/version/v2/client.go | 7 +-
xds/client/controller/version/v3/client.go | 7 +-
xds/client/controller/version/version.go | 5 +-
xds/client/pubsub/pubsub.go | 9 +-
xds/client/resource/filter_chain.go | 7 +-
xds/client/resource/unmarshal.go | 8 +-
xds/client/resource/unmarshal_cds.go | 7 +-
xds/client/resource/unmarshal_eds.go | 7 +-
xds/client/resource/unmarshal_lds.go | 13 +-
xds/client/resource/unmarshal_rds.go | 13 +-
xds/csds/csds.go | 8 +-
xds/resolver/watch_service.go | 9 +-
xds/resolver/xds_resolver.go | 7 +-
xds/server/listener_wrapper.go | 7 +-
xds/utils/balancergroup/balancergroup.go | 7 +-
xds/utils/grpclog/grpclog.go | 2 +-
xds/utils/serviceconfig/serviceconfig.go | 6 +-
241 files changed, 1690 insertions(+), 1648 deletions(-)
copy cluster/router/{tag => meshrouter}/factory.go (59%)
create mode 100644 cluster/router/meshrouter/meshrouter.go
rename common/{ => constant}/file/suffix.go (100%)
delete mode 100644 common/logger/file_log.yml
delete mode 100644 common/logger/logger.go
delete mode 100644 common/logger/logging.go
delete mode 100644 common/observer/event.go
delete mode 100644 common/observer/event_listener.go
delete mode 100644 common/yaml/testdata/config.yml
delete mode 100644 common/yaml/yaml.go
delete mode 100644 common/yaml/yaml_test.go
delete mode 100644 config/config_center_config_test.go
delete mode 100644 config/testdata/config/center/apollo.yaml
delete mode 100644 config/testdata/consumer_config_with_configcenter_apollo.yml
delete mode 100644 config_center/apollo/doc.go
delete mode 100644 config_center/apollo/factory.go
delete mode 100644 config_center/apollo/impl.go
delete mode 100644 config_center/apollo/impl_test.go
delete mode 100644 config_center/apollo/listener.go
delete mode 100644 config_center/apollo/mockDubbogo.yaml.json
create mode 100644 protocol/dubbo3/health/serverhealth.go
create mode 100644 protocol/dubbo3/health/triple_health_v1/health.pb.go
create mode 100644 protocol/dubbo3/health/triple_health_v1/health.proto
create mode 100644 protocol/dubbo3/health/triple_health_v1/health_triple.pb.go
copy config/mock_rpcservice_test.go => protocol/rest/config/reader/rest_config_reader_test.go (55%)
rename {common/proxy => proxy}/proxy.go (99%)
rename {common/proxy => proxy}/proxy_factory.go (100%)
rename {common/proxy => proxy}/proxy_factory/default.go (98%)
rename {common/proxy => proxy}/proxy_factory/default_test.go (100%)
rename {common/proxy => proxy}/proxy_factory/pass_through.go (97%)
rename {common/proxy => proxy}/proxy_factory/pass_through_test.go (100%)
rename {common/proxy => proxy}/proxy_factory/utils.go (100%)
rename {common/proxy => proxy}/proxy_test.go (100%)
[dubbo-go] 01/01: merge 3.0
Posted by ph...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
phily pushed a commit to branch rest-protocol
in repository https://gitbox.apache.org/repos/asf/dubbo-go.git
commit 0ea7f741e3e0e03c89d741ce6531501954b80f78
Merge: efc451328 de6fcfbcc
Author: PhilYue <ph...@foxmail.com>
AuthorDate: Wed Jul 13 20:26:48 2022 +0800
merge 3.0
CHANGELOG.md | 35 +++
README.md | 2 +-
README_CN.md | 2 +-
cluster/cluster/adaptivesvc/cluster_invoker.go | 3 +-
cluster/cluster/base/cluster_invoker.go | 3 +-
cluster/cluster/broadcast/cluster_invoker.go | 5 +-
cluster/cluster/failback/cluster_invoker.go | 3 +-
cluster/cluster/failover/cluster_invoker.go | 3 +-
cluster/cluster/failsafe/cluster_invoker.go | 5 +-
cluster/cluster/forking/cluster_invoker.go | 3 +-
cluster/cluster/mock.go | 3 +-
cluster/loadbalance/p2c/loadbalance.go | 5 +-
cluster/loadbalance/ringhash/ringhash.go | 5 +-
cluster/router/chain/chain.go | 3 +-
.../router/meshrouter/factory.go | 36 +--
cluster/router/meshrouter/meshrouter.go | 149 ++++++++++
cluster/router/tag/match.go | 5 +-
cluster/router/tag/router.go | 3 +-
common/{ => constant}/file/suffix.go | 0
common/constant/key.go | 9 +-
common/extension/proxy_factory.go | 7 +-
common/logger/file_log.yml | 36 ---
common/logger/logger.go | 172 -----------
common/logger/logging.go | 68 -----
common/metadata_info.go | 8 +-
common/observer/event.go | 68 -----
common/observer/event_listener.go | 50 ----
common/rpc_service.go | 6 +-
common/yaml/testdata/config.yml | 7 -
common/yaml/yaml.go | 61 ----
common/yaml/yaml_test.go | 70 -----
config/config_center_config.go | 3 +-
config/config_center_config_test.go | 90 ------
config/config_loader_options.go | 5 +-
config/config_loader_options_test.go | 2 +-
config/config_resolver.go | 2 +-
config/consumer_config.go | 3 +-
config/graceful_shutdown.go | 2 +-
config/graceful_shutdown_config.go | 3 +-
config/logger_config.go | 5 +-
config/logger_config_test.go | 6 +-
config/metadata_report_config.go | 3 +-
config/provider_config.go | 21 +-
config/provider_config_test.go | 3 +-
config/reference_config.go | 9 +-
config/reference_config_test.go | 2 +-
config/registry_config.go | 3 +-
config/root_config.go | 3 +-
config/root_config_test.go | 3 +-
config/service_config.go | 5 +-
config/service_config_test.go | 2 +-
config/testdata/config/center/apollo.yaml | 8 -
.../consumer_config_with_configcenter_apollo.yml | 24 --
config_center/apollo/doc.go | 19 --
config_center/apollo/factory.go | 45 ---
config_center/apollo/impl.go | 171 -----------
config_center/apollo/impl_test.go | 216 --------------
config_center/apollo/listener.go | 77 -----
config_center/apollo/mockDubbogo.yaml.json | 1 -
config_center/file/listener.go | 3 +-
config_center/nacos/client.go | 2 +-
config_center/nacos/facade.go | 2 +-
config_center/nacos/impl.go | 2 +-
config_center/nacos/listener.go | 3 +-
config_center/parser/configuration_parser.go | 3 +-
config_center/zookeeper/impl.go | 2 +-
filter/accesslog/filter.go | 5 +-
filter/active/filter.go | 5 +-
filter/adaptivesvc/filter.go | 3 +-
filter/adaptivesvc/limiter/hill_climbing.go | 2 +-
filter/adaptivesvc/limiter/utils.go | 2 +-
filter/auth/provider_auth_filter.go | 5 +-
filter/auth/sign_util.go | 2 +-
filter/exec_limit/filter.go | 3 +-
filter/generic/filter.go | 3 +-
filter/generic/generalizer/gson.go | 3 +-
filter/generic/generalizer/map.go | 3 +-
filter/generic/service_filter.go | 3 +-
filter/generic/util.go | 5 +-
filter/graceful_shutdown/consumer_filter.go | 5 +-
filter/graceful_shutdown/provider_filter.go | 5 +-
.../handler/rejected_execution_handler_only_log.go | 5 +-
filter/hystrix/filter.go | 3 +-
filter/seata/filter.go | 5 +-
filter/sentinel/filter.go | 3 +-
filter/tps/filter.go | 5 +-
filter/tps/limiter/method_service.go | 3 +-
filter/xds/cb/filter.go | 5 +-
go.mod | 16 +-
go.sum | 74 ++---
imports/imports.go | 5 +-
metadata/mapping/metadata/service_name_mapping.go | 2 +-
metadata/report/delegate/delegate_report.go | 3 +-
metadata/report/delegate/delegate_report_test.go | 3 +-
metadata/report/etcd/report.go | 2 +-
metadata/report/nacos/report.go | 2 +-
metadata/report/zookeeper/report.go | 2 +-
metadata/service/exporter/configurable/exporter.go | 5 +-
.../service/exporter/configurable/exporter_test.go | 2 +-
.../local/metadata_service_proxy_factory.go | 5 +-
metadata/service/local/service.go | 3 +-
metadata/service/local/service_proxy.go | 5 +-
metadata/service/remote/service.go | 3 +-
metadata/service/remote/service_test.go | 2 +-
metrics/prometheus/reporter.go | 3 +-
protocol/dubbo/dubbo_codec.go | 3 +-
protocol/dubbo/dubbo_exporter.go | 5 +-
protocol/dubbo/dubbo_invoker.go | 3 +-
protocol/dubbo/dubbo_invoker_test.go | 2 +-
protocol/dubbo/dubbo_protocol.go | 3 +-
protocol/dubbo/dubbo_protocol_test.go | 2 +-
protocol/dubbo/hessian2/hessian_request.go | 6 +-
protocol/dubbo/hessian2/hessian_response.go | 6 +-
protocol/dubbo/impl/codec.go | 3 +-
protocol/dubbo/impl/hessian.go | 3 +-
protocol/dubbo3/dubbo3_exporter.go | 3 +-
protocol/dubbo3/dubbo3_invoker.go | 3 +-
protocol/dubbo3/dubbo3_protocol.go | 3 +-
protocol/dubbo3/health/serverhealth.go | 186 ++++++++++++
.../dubbo3/health/triple_health_v1/health.pb.go | 314 +++++++++++++++++++++
.../dubbo3/health/triple_health_v1/health.proto | 62 ++++
.../health/triple_health_v1/health_triple.pb.go | 286 +++++++++++++++++++
protocol/dubbo3/internal/server.go | 7 +-
protocol/dubbo3/reflection/serverreflection.go | 30 +-
protocol/grpc/client.go | 3 +-
protocol/grpc/grpc_exporter.go | 5 +-
protocol/grpc/grpc_invoker.go | 3 +-
protocol/grpc/grpc_protocol.go | 5 +-
protocol/grpc/internal/helloworld/server.go | 6 +-
protocol/grpc/internal/routeguide/client.go | 5 +-
protocol/grpc/internal/routeguide/server.go | 6 +-
protocol/grpc/server.go | 3 +-
protocol/invocation/rpcinvocation.go | 2 +-
protocol/invoker.go | 3 +-
protocol/jsonrpc/http.go | 3 +-
protocol/jsonrpc/http_test.go | 2 +-
protocol/jsonrpc/jsonrpc_exporter.go | 5 +-
protocol/jsonrpc/jsonrpc_invoker.go | 5 +-
protocol/jsonrpc/jsonrpc_invoker_test.go | 2 +-
protocol/jsonrpc/jsonrpc_protocol.go | 5 +-
protocol/jsonrpc/server.go | 3 +-
protocol/protocol.go | 5 +-
.../protocolwrapper/protocol_filter_wrapper.go | 5 +-
.../protocol_filter_wrapper_test.go | 3 +-
protocol/rest/config/reader/rest_config_reader.go | 3 +-
.../rest/config/reader/rest_config_reader_test.go | 50 ++--
protocol/rest/rest_exporter.go | 5 +-
protocol/rest/rest_protocol.go | 9 +
protocol/rest/server/go_restful_server.go | 11 +
protocol/rest/server/rest_server.go | 2 +
protocol/rpc_status.go | 3 +-
{common/proxy => proxy}/proxy.go | 3 +-
{common/proxy => proxy}/proxy_factory.go | 0
{common/proxy => proxy}/proxy_factory/default.go | 5 +-
.../proxy => proxy}/proxy_factory/default_test.go | 0
.../proxy => proxy}/proxy_factory/pass_through.go | 5 +-
.../proxy_factory/pass_through_test.go | 0
{common/proxy => proxy}/proxy_factory/utils.go | 0
{common/proxy => proxy}/proxy_test.go | 0
registry/base_configuration_listener.go | 3 +-
registry/base_registry.go | 3 +-
registry/directory/directory.go | 3 +-
registry/etcdv3/listener.go | 2 +-
registry/etcdv3/registry.go | 2 +-
registry/etcdv3/service_discovery.go | 2 +-
registry/event.go | 5 +-
registry/event/base_configuration_listener.go | 3 +-
.../metadata_service_url_params_customizer.go | 2 +-
.../event/protocol_ports_metadata_customizer.go | 5 +-
.../service_instances_changed_listener_impl.go | 4 +-
registry/event/service_revision_customizer.go | 5 +-
registry/mock_registry.go | 3 +-
registry/nacos/listener.go | 2 +-
registry/nacos/registry.go | 2 +-
registry/nacos/service_discovery.go | 6 +-
registry/polaris/listener.go | 11 +-
registry/polaris/registry.go | 49 +---
registry/polaris/service_discovery.go | 2 +-
registry/protocol/protocol.go | 6 +-
registry/service_instance.go | 2 +-
registry/service_instances_changed_listener.go | 5 +-
.../servicediscovery/service_discovery_registry.go | 2 +-
registry/xds/registry.go | 3 +-
registry/zookeeper/listener.go | 2 +-
registry/zookeeper/registry.go | 2 +-
registry/zookeeper/service_discovery.go | 2 +-
registry/zookeeper/service_discovery_test.go | 2 +-
remoting/etcdv3/client.go | 5 +-
remoting/etcdv3/facade.go | 2 +-
remoting/etcdv3/listener.go | 2 +-
remoting/exchange.go | 3 +-
remoting/exchange_client.go | 3 +-
remoting/getty/getty_client.go | 4 +-
remoting/getty/getty_client_test.go | 2 +-
remoting/getty/getty_server.go | 4 +-
remoting/getty/listener.go | 4 +-
remoting/getty/pool.go | 5 +-
remoting/getty/readwriter.go | 5 +-
remoting/getty/readwriter_test.go | 2 +-
remoting/nacos/builder.go | 2 +-
remoting/xds/client.go | 3 +-
remoting/xds/error.go | 2 +-
remoting/xds/ewatcher/ewatcher.go | 5 +-
remoting/xds/mapping/handler.go | 3 +-
remoting/zookeeper/client.go | 2 +-
.../curator_discovery/service_discovery.go | 2 +-
remoting/zookeeper/facade.go | 2 +-
remoting/zookeeper/listener.go | 2 +-
xds/balancer/cdsbalancer/cdsbalancer.go | 7 +-
xds/balancer/clusterimpl/clusterimpl.go | 7 +-
xds/balancer/clusterimpl/picker.go | 5 +-
.../clustermanager/balancerstateaggregator.go | 10 +-
xds/balancer/clustermanager/clustermanager.go | 7 +-
xds/balancer/clusterresolver/clusterresolver.go | 11 +-
xds/balancer/clusterresolver/configbuilder.go | 7 +-
xds/balancer/orca/orca.go | 3 +-
xds/balancer/priority/balancer.go | 7 +-
xds/balancer/ringhash/picker.go | 10 +-
xds/balancer/ringhash/ringhash.go | 9 +-
xds/client/authority.go | 5 +-
xds/client/bootstrap/bootstrap.go | 15 +-
xds/client/client.go | 7 +-
xds/client/controller.go | 5 +-
xds/client/controller/controller.go | 7 +-
xds/client/controller/version/v2/client.go | 7 +-
xds/client/controller/version/v3/client.go | 7 +-
xds/client/controller/version/version.go | 5 +-
xds/client/pubsub/pubsub.go | 9 +-
xds/client/resource/filter_chain.go | 7 +-
xds/client/resource/unmarshal.go | 8 +-
xds/client/resource/unmarshal_cds.go | 7 +-
xds/client/resource/unmarshal_eds.go | 7 +-
xds/client/resource/unmarshal_lds.go | 13 +-
xds/client/resource/unmarshal_rds.go | 13 +-
xds/csds/csds.go | 8 +-
xds/resolver/watch_service.go | 9 +-
xds/resolver/xds_resolver.go | 7 +-
xds/server/listener_wrapper.go | 7 +-
xds/utils/balancergroup/balancergroup.go | 7 +-
xds/utils/grpclog/grpclog.go | 2 +-
xds/utils/serviceconfig/serviceconfig.go | 6 +-
241 files changed, 1694 insertions(+), 1674 deletions(-)
diff --cc config/config_resolver.go
index 7f92fb26e,0e4eefd4a..068328053
--- a/config/config_resolver.go
+++ b/config/config_resolver.go
@@@ -27,9 -28,8 +27,9 @@@ import
)
import (
- "dubbo.apache.org/dubbo-go/v3/common/file"
+ "dubbo.apache.org/dubbo-go/v3/common/constant/file"
"dubbo.apache.org/dubbo-go/v3/config/parsers/properties"
+ "dubbo.apache.org/dubbo-go/v3/config/parsers/yaml"
)
// GetConfigResolver get config resolver
diff --cc protocol/rest/config/reader/rest_config_reader.go
index 18ee6e111,57565c92d..2935f249f
--- a/protocol/rest/config/reader/rest_config_reader.go
+++ b/protocol/rest/config/reader/rest_config_reader.go
@@@ -61,9 -61,8 +63,8 @@@ func (cr *RestConfigReader) ReadConsume
restConsumerServiceConfigMap := make(map[string]*config.RestServiceConfig, len(restConsumerConfig.RestServiceConfigsMap))
for key, rc := range restConsumerConfig.RestServiceConfigsMap {
- rc.Client = getNotEmptyStr(rc.Client, restConsumerConfig.Client, constant.DefaultRestClient)
- rc.RestMethodConfigsMap = initMethodConfigMap(rc, restConsumerConfig.Consumes, restConsumerConfig.Produces)
+ rc.Client = common.GetNotEmptyStr(rc.Client, restConsumerConfig.Client, constant.DefaultRestClient)
- //初始化每个方法的配置
+ rc.RestMethodConfigs = initMethodConfigMap(rc, restConsumerConfig.Consumes, restConsumerConfig.Produces)
restConsumerServiceConfigMap[key] = rc
}
config.SetRestConsumerServiceConfigMap(restConsumerServiceConfigMap)
diff --cc protocol/rest/config/reader/rest_config_reader_test.go
index 05ef1c53d,71f8a0b12..1f672f24d
--- a/protocol/rest/config/reader/rest_config_reader_test.go
+++ b/protocol/rest/config/reader/rest_config_reader_test.go
@@@ -1,3 -1,3 +1,4 @@@
++
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@@ -27,34 -29,23 +30,23 @@@ import
)
import (
- "dubbo.apache.org/dubbo-go/v3/common"
- "dubbo.apache.org/dubbo-go/v3/protocol"
+ "dubbo.apache.org/dubbo-go/v3/protocol/rest/config"
)
- func TestGetProxy(t *testing.T) {
- proxyFactory := NewDefaultProxyFactory()
- url := common.NewURLWithOptions()
- proxy := proxyFactory.GetProxy(protocol.NewBaseInvoker(url), url)
- assert.NotNil(t, proxy)
- }
-
- type TestAsync struct{}
-
- func (u *TestAsync) CallBack(res common.CallbackResponse) {
- fmt.Println("CallBack res:", res)
- }
-
- func TestGetAsyncProxy(t *testing.T) {
- proxyFactory := NewDefaultProxyFactory()
- url := common.NewURLWithOptions()
- async := &TestAsync{}
- proxy := proxyFactory.GetAsyncProxy(protocol.NewBaseInvoker(url), async.CallBack, url)
- assert.NotNil(t, proxy)
+ func TestRestConfigReaderReadConsumerConfig(t *testing.T) {
+ bs, err := yaml.LoadYMLConfig("./testdata/consumer_config.yml")
+ assert.NoError(t, err)
+ configReader := NewRestConfigReader()
+ err = configReader.ReadConsumerConfig(bytes.NewBuffer(bs))
+ assert.NoError(t, err)
+ assert.NotEmpty(t, config.GetRestConsumerServiceConfigMap())
}
- func TestGetInvoker(t *testing.T) {
- proxyFactory := NewDefaultProxyFactory()
- url := common.NewURLWithOptions()
- invoker := proxyFactory.GetInvoker(url)
- assert.True(t, invoker.IsAvailable())
- }
+ func TestRestConfigReaderReadProviderConfig(t *testing.T) {
+ bs, err := yaml.LoadYMLConfig("./testdata/provider_config.yml")
+ assert.NoError(t, err)
+ configReader := NewRestConfigReader()
+ err = configReader.ReadProviderConfig(bytes.NewBuffer(bs))
+ assert.NoError(t, err)
+ assert.NotEmpty(t, config.GetRestProviderServiceConfigMap())
-}
++}
diff --cc protocol/rest/rest_protocol.go
index 2890c3461,303b45353..5a4cfae1f
--- a/protocol/rest/rest_protocol.go
+++ b/protocol/rest/rest_protocol.go
@@@ -39,11 -43,9 +43,16 @@@ var restProtocol *RestProtoco
const REST = "rest"
-// nolint
++//// nolint
++//func init() {
++// extension.SetProtocol(REST, GetRestProtocol)
++//}
++
func init() {
+ SetRestServer(constant.DefaultRestServer, server.NewGoRestfulServer)
+ extension.SetRestClient(constant.DefaultRestClient, client_impl.NewRestyClient)
extension.SetProtocol(REST, GetRestProtocol)
+
}
// nolint
diff --cc protocol/rest/server/go_restful_server.go
index 142377cd3,642d28b67..31e80a495
--- a/protocol/rest/server/go_restful_server.go
+++ b/protocol/rest/server/go_restful_server.go
@@@ -34,10 -36,16 +36,14 @@@ import
import (
"dubbo.apache.org/dubbo-go/v3/common"
- "dubbo.apache.org/dubbo-go/v3/common/constant"
- "dubbo.apache.org/dubbo-go/v3/common/extension"
- "dubbo.apache.org/dubbo-go/v3/protocol/rest/config"
- "dubbo.apache.org/dubbo-go/v3/protocol/rest/server"
+ "dubbo.apache.org/dubbo-go/v3/common/logger"
+ "dubbo.apache.org/dubbo-go/v3/config"
)
-func init() {
- extension.SetRestServer(constant.DefaultRestServer, NewGoRestfulServer)
-}
++//func init() {
++// extension.SetRestServer(constant.DefaultRestServer, NewGoRestfulServer)
++//}
+
var filterSlice []restful.FilterFunction
// GoRestfulServer a rest server implement by go-restful
@@@ -46,8 -54,8 +52,13 @@@ type GoRestfulServer struct
ws *restful.WebService
}
++//// NewGoRestfulServer a constructor of GoRestfulServer
++//func NewGoRestfulServer() server.RestServer {
++// return &GoRestfulServer{}
++//}
++
// NewGoRestfulServer a constructor of GoRestfulServer
-func NewGoRestfulServer() server.RestServer {
+func NewGoRestfulServer() RestServer {
return &GoRestfulServer{}
}