diff --git a/config/config_loader.go b/config/config_loader.go index ff164ac9ed210fc671bc4637bbaefb071e91f7fd..f36eb676617fddacb05dfa02c25fe0b136af9c35 100644 --- a/config/config_loader.go +++ b/config/config_loader.go @@ -240,7 +240,7 @@ func Load() (map[string]*ReferenceConfig, map[string]*ServiceConfig) { length := len(consumerConfig.References) for index := 0; index < length; index++ { con := &consumerConfig.References[index] - rpcService := GetConService(con.InterfaceName) + rpcService := GetConsumerService(con.InterfaceName) if rpcService == nil { log.Warn("%s is not exsist!", con.InterfaceName) continue @@ -283,7 +283,7 @@ func Load() (map[string]*ReferenceConfig, map[string]*ServiceConfig) { length := len(providerConfig.Services) for index := 0; index < length; index++ { pro := &providerConfig.Services[index] - rpcService := GetProService(pro.InterfaceName) + rpcService := GetProviderService(pro.InterfaceName) if rpcService == nil { log.Warn("%s is not exsist!", pro.InterfaceName) continue diff --git a/config/config_loader_test.go b/config/config_loader_test.go index 9464fd570e1651f75d7d8df8ae4a3250f049b168..0fcd76b95535c09770a0a72e6a8ca8f5f5007d7a 100644 --- a/config/config_loader_test.go +++ b/config/config_loader_test.go @@ -56,8 +56,8 @@ func TestLoad(t *testing.T) { doInit() doinit() - SetConService(&MockService{}) - SetProService(&MockService{}) + SetConsumerService(&MockService{}) + SetProviderService(&MockService{}) extension.SetProtocol("registry", GetProtocol) extension.SetCluster("registryAware", cluster_impl.NewRegistryAwareCluster) diff --git a/config/service.go b/config/service.go index ff87e296c551b69667309eb316c0839d8a6d8f2b..507bee4542a666de63d946509c15e320a876ed8b 100644 --- a/config/service.go +++ b/config/service.go @@ -24,19 +24,19 @@ var ( ) // SetConService is called by init() of implement of RPCService -func SetConService(service common.RPCService) { +func SetConsumerService(service common.RPCService) { conServices[service.Service()] = service } // SetProService is called by init() of implement of RPCService -func SetProService(service common.RPCService) { +func SetProviderService(service common.RPCService) { proServices[service.Service()] = service } -func GetConService(name string) common.RPCService { +func GetConsumerService(name string) common.RPCService { return conServices[name] } -func GetProService(name string) common.RPCService { +func GetProviderService(name string) common.RPCService { return proServices[name] } diff --git a/examples/dubbo/go-client/app/user.go b/examples/dubbo/go-client/app/user.go index 4ec6c5af35013e1c9707ca50b5329494f5ee5a90..9ac1974d3e7ac2cebfe6c7cadd369a27a7853a62 100644 --- a/examples/dubbo/go-client/app/user.go +++ b/examples/dubbo/go-client/app/user.go @@ -32,7 +32,7 @@ import ( type Gender hessian.JavaEnum func init() { - config.SetConService(new(UserProvider)) + config.SetConsumerService(new(UserProvider)) } const ( diff --git a/examples/dubbo/go-server/app/user.go b/examples/dubbo/go-server/app/user.go index 02aa25413237be3e90cce936234fe13e074e076b..12119b0b6d2bf909cc2605fc83ac263e2c97cebf 100644 --- a/examples/dubbo/go-server/app/user.go +++ b/examples/dubbo/go-server/app/user.go @@ -33,7 +33,7 @@ import ( type Gender hessian.JavaEnum func init() { - config.SetProService(new(UserProvider)) + config.SetProviderService(new(UserProvider)) } const ( diff --git a/examples/jsonrpc/go-client/app/user.go b/examples/jsonrpc/go-client/app/user.go index 8cfc84bca8c02851a85d8416ab280bd7aee92a79..17a24dbec781f28245ebdf899d4f0004ff5e2da5 100644 --- a/examples/jsonrpc/go-client/app/user.go +++ b/examples/jsonrpc/go-client/app/user.go @@ -25,7 +25,7 @@ import ( ) func init() { - config.SetConService(new(UserProvider)) + config.SetConsumerService(new(UserProvider)) } type JsonRPCUser struct { diff --git a/examples/jsonrpc/go-server/app/user.go b/examples/jsonrpc/go-server/app/user.go index cdf95ba07c54067c06872597693152b94010f307..5adcde0ccc7135735314d0e65a98aac75ce08366 100644 --- a/examples/jsonrpc/go-server/app/user.go +++ b/examples/jsonrpc/go-server/app/user.go @@ -31,7 +31,7 @@ import ( type Gender int func init() { - config.SetProService(new(UserProvider)) + config.SetProviderService(new(UserProvider)) } const (