This is an automated email from the ASF dual-hosted git repository.
alexstocks pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo-go-samples.git
The following commit(s) were added to refs/heads/master by this push:
new f4511359 fix go hessian enum example (#461)
f4511359 is described below
commit f45113596ca66be0a73f7473f757686f267bb48c
Author: 望哥 <[email protected]>
AuthorDate: Thu Oct 27 19:11:15 2022 +0800
fix go hessian enum example (#461)
---
rpc/dubbo/go-client/cmd/client.go | 4 ++--
rpc/dubbo/go-client/pkg/user.go | 10 +++++-----
rpc/dubbo/go-server/pkg/common_user_provider.go | 4 ++--
rpc/dubbo/go-server/pkg/user.go | 18 +++++++++---------
rpc/jsonrpc/go-server/pkg/user.go | 4 ++--
rpc/jsonrpc/go-server/pkg/user_provider.go | 2 +-
rpc/jsonrpc/go-server/pkg/user_provider1.go | 2 +-
rpc/jsonrpc/go-server/pkg/user_provider2.go | 2 +-
8 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/rpc/dubbo/go-client/cmd/client.go
b/rpc/dubbo/go-client/cmd/client.go
index eee23996..188b0379 100644
--- a/rpc/dubbo/go-client/cmd/client.go
+++ b/rpc/dubbo/go-client/cmd/client.go
@@ -40,8 +40,8 @@ var (
// need to setup environment variable "DUBBO_GO_CONFIG_PATH" to
"conf/dubbogo.yml" before run
func main() {
- hessian.RegisterJavaEnum(pkg.Gender(pkg.MAN))
- hessian.RegisterJavaEnum(pkg.Gender(pkg.WOMAN))
+ hessian.RegisterJavaEnum(pkg.MAN)
+ hessian.RegisterJavaEnum(pkg.WOMAN)
hessian.RegisterPOJO(&pkg.User{})
config.SetConsumerService(userProvider)
diff --git a/rpc/dubbo/go-client/pkg/user.go b/rpc/dubbo/go-client/pkg/user.go
index 551c7a3f..ce121ea1 100644
--- a/rpc/dubbo/go-client/pkg/user.go
+++ b/rpc/dubbo/go-client/pkg/user.go
@@ -31,16 +31,16 @@ import (
type Gender hessian.JavaEnum
const (
- MAN hessian.JavaEnum = iota
+ MAN Gender = iota
WOMAN
)
-var genderName = map[hessian.JavaEnum]string{
+var genderName = map[Gender]string{
MAN: "MAN",
WOMAN: "WOMAN",
}
-var genderValue = map[string]hessian.JavaEnum{
+var genderValue = map[string]Gender{
"MAN": MAN,
"WOMAN": WOMAN,
}
@@ -50,7 +50,7 @@ func (g Gender) JavaClassName() string {
}
func (g Gender) String() string {
- s, ok := genderName[hessian.JavaEnum(g)]
+ s, ok := genderName[g]
if ok {
return s
}
@@ -61,7 +61,7 @@ func (g Gender) String() string {
func (g Gender) EnumValue(s string) hessian.JavaEnum {
v, ok := genderValue[s]
if ok {
- return v
+ return hessian.JavaEnum(v)
}
return hessian.InvalidJavaEnum
diff --git a/rpc/dubbo/go-server/pkg/common_user_provider.go
b/rpc/dubbo/go-server/pkg/common_user_provider.go
index 49e6781e..b89e928b 100644
--- a/rpc/dubbo/go-server/pkg/common_user_provider.go
+++ b/rpc/dubbo/go-server/pkg/common_user_provider.go
@@ -107,9 +107,9 @@ func (u *CommonUserProvider) GetUsers(req []string)
([]*User, error) {
func (s *CommonUserProvider) GetGender(i int32) (Gender, error) {
if 1 == i {
- return Gender(WOMAN), nil
+ return WOMAN, nil
}
- return Gender(MAN), nil
+ return MAN, nil
}
func (s *CommonUserProvider) MethodMapper() map[string]string {
diff --git a/rpc/dubbo/go-server/pkg/user.go b/rpc/dubbo/go-server/pkg/user.go
index 09ac3732..ca9f763f 100644
--- a/rpc/dubbo/go-server/pkg/user.go
+++ b/rpc/dubbo/go-server/pkg/user.go
@@ -30,16 +30,16 @@ import (
type Gender hessian.JavaEnum
const (
- MAN hessian.JavaEnum = iota
+ MAN Gender = iota
WOMAN
)
-var genderName = map[hessian.JavaEnum]string{
+var genderName = map[Gender]string{
MAN: "MAN",
WOMAN: "WOMAN",
}
-var genderValue = map[string]hessian.JavaEnum{
+var genderValue = map[string]Gender{
"MAN": MAN,
"WOMAN": WOMAN,
}
@@ -49,7 +49,7 @@ func (g Gender) JavaClassName() string {
}
func (g Gender) String() string {
- s, ok := genderName[hessian.JavaEnum(g)]
+ s, ok := genderName[g]
if ok {
return s
}
@@ -60,7 +60,7 @@ func (g Gender) String() string {
func (g Gender) EnumValue(s string) hessian.JavaEnum {
v, ok := genderValue[s]
if ok {
- return v
+ return hessian.JavaEnum(v)
}
return hessian.InvalidJavaEnum
@@ -80,7 +80,7 @@ type (
var (
DefaultUser = User{
ID: "000", Name: "Alex Stocks", Age: 31,
- Sex: Gender(MAN),
+ Sex: MAN,
}
userMap = make(map[string]User)
@@ -88,9 +88,9 @@ var (
func init() {
userMap["000"] = DefaultUser
- userMap["001"] = User{ID: "001", Name: "ZhangSheng", Age: 18, Sex:
Gender(MAN)}
- userMap["002"] = User{ID: "002", Name: "Lily", Age: 20, Sex:
Gender(WOMAN)}
- userMap["003"] = User{ID: "113", Name: "Moorse", Age: 30, Sex:
Gender(WOMAN)}
+ userMap["001"] = User{ID: "001", Name: "ZhangSheng", Age: 18, Sex: MAN}
+ userMap["002"] = User{ID: "002", Name: "Lily", Age: 20, Sex: WOMAN}
+ userMap["003"] = User{ID: "113", Name: "Moorse", Age: 30, Sex: WOMAN}
for k, v := range userMap {
v.Time = time.Now()
userMap[k] = v
diff --git a/rpc/jsonrpc/go-server/pkg/user.go
b/rpc/jsonrpc/go-server/pkg/user.go
index f8d1841e..39723691 100644
--- a/rpc/jsonrpc/go-server/pkg/user.go
+++ b/rpc/jsonrpc/go-server/pkg/user.go
@@ -24,7 +24,7 @@ import (
type Gender int
const (
- MAN = iota
+ MAN Gender = iota
WOMAN
)
@@ -52,7 +52,7 @@ var (
DefaultUser = User{
ID: "0", Name: "Alex Stocks", Age: 31,
Birth: int(time.Date(1985, 11, 24, 15, 15, 0, 0,
time.Local).Unix()),
- sex: Gender(MAN),
+ sex: MAN,
}
userMap = make(map[string]User)
diff --git a/rpc/jsonrpc/go-server/pkg/user_provider.go
b/rpc/jsonrpc/go-server/pkg/user_provider.go
index 43f07413..70e83395 100644
--- a/rpc/jsonrpc/go-server/pkg/user_provider.go
+++ b/rpc/jsonrpc/go-server/pkg/user_provider.go
@@ -78,7 +78,7 @@ func (u *UserProvider) GetUser2(ctx context.Context, userID
string) (*User, erro
gxlog.CInfo("userID:%#v", userID)
rsp := &User{
ID: userID,
- Sex: Gender(MAN).String(),
+ Sex: MAN.String(),
}
return rsp, err
}
diff --git a/rpc/jsonrpc/go-server/pkg/user_provider1.go
b/rpc/jsonrpc/go-server/pkg/user_provider1.go
index c4568920..dc825953 100644
--- a/rpc/jsonrpc/go-server/pkg/user_provider1.go
+++ b/rpc/jsonrpc/go-server/pkg/user_provider1.go
@@ -78,7 +78,7 @@ func (u *UserProvider1) GetUser2(ctx context.Context, userID
string) (*User, err
gxlog.CInfo("userID:%#v", userID)
rsp := &User{
ID: userID,
- Sex: Gender(MAN).String(),
+ Sex: MAN.String(),
}
return rsp, err
}
diff --git a/rpc/jsonrpc/go-server/pkg/user_provider2.go
b/rpc/jsonrpc/go-server/pkg/user_provider2.go
index 0a96accb..64aa2145 100644
--- a/rpc/jsonrpc/go-server/pkg/user_provider2.go
+++ b/rpc/jsonrpc/go-server/pkg/user_provider2.go
@@ -78,7 +78,7 @@ func (u *UserProvider2) GetUser2(ctx context.Context, userID
string) (*User, err
gxlog.CInfo("userID:%#v", userID)
rsp := &User{
ID: userID,
- Sex: Gender(MAN).String(),
+ Sex: MAN.String(),
}
return rsp, err
}
