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 cff5a7da Fix go hessian enum example (#462)
cff5a7da is described below
commit cff5a7da1c4b25fef7963b92a4d52c7f2b3c6abd
Author: 望哥 <[email protected]>
AuthorDate: Mon Oct 31 17:28:57 2022 +0800
Fix go hessian enum example (#462)
* fix go hessian enum example
* fix change enum define
* upgrade hessian to v1.11.2
* upgrade hessian2 to v1.11.3
---
go.mod | 2 +-
go.sum | 3 ++-
integrate_test/rpc/dubbo/tests/integration/main_test.go | 14 +++++++-------
.../rpc/dubbo/tests/integration/userprovider_test.go | 14 +++++---------
4 files changed, 15 insertions(+), 18 deletions(-)
diff --git a/go.mod b/go.mod
index bce51f3a..ff93c04b 100644
--- a/go.mod
+++ b/go.mod
@@ -4,7 +4,7 @@ require (
dubbo.apache.org/dubbo-go/v3 v3.0.3-0.20220730033103-013f0b2804ce
github.com/SkyAPM/go2sky v1.5.0
github.com/SkyAPM/go2sky-plugins/dubbo-go
v0.0.0-20220718123631-cb8f743b16cf
- github.com/apache/dubbo-go-hessian2 v1.11.1
+ github.com/apache/dubbo-go-hessian2 v1.11.3
github.com/dubbogo/gost v1.12.6-0.20220719055648-01d5bc07b111
github.com/dubbogo/grpc-go v1.42.10
github.com/dubbogo/triple v1.1.9
diff --git a/go.sum b/go.sum
index e62316c8..19ad6b25 100644
--- a/go.sum
+++ b/go.sum
@@ -84,8 +84,9 @@ github.com/apache/dubbo-getty v1.4.8/go.mod
h1:cPJlbcHUTNTpiboMQjMHhE9XBni11LiBi
github.com/apache/dubbo-go-hessian2 v1.9.1/go.mod
h1:xQUjE7F8PX49nm80kChFvepA/AvqAZ0oh/UaB6+6pBE=
github.com/apache/dubbo-go-hessian2 v1.9.3/go.mod
h1:xQUjE7F8PX49nm80kChFvepA/AvqAZ0oh/UaB6+6pBE=
github.com/apache/dubbo-go-hessian2 v1.11.0/go.mod
h1:7rEw9guWABQa6Aqb8HeZcsYPHsOS7XT1qtJvkmI6c5w=
-github.com/apache/dubbo-go-hessian2 v1.11.1
h1:03xs4QCAZHY/gHCOWgOmIUW6Yc842FCLz4R0hxCzPr8=
github.com/apache/dubbo-go-hessian2 v1.11.1/go.mod
h1:7rEw9guWABQa6Aqb8HeZcsYPHsOS7XT1qtJvkmI6c5w=
+github.com/apache/dubbo-go-hessian2 v1.11.3
h1:QSJhGLHBtnvb2kKrZ4uxpXxHGgGHqQkXXLI8rcQmEpg=
+github.com/apache/dubbo-go-hessian2 v1.11.3/go.mod
h1:7rEw9guWABQa6Aqb8HeZcsYPHsOS7XT1qtJvkmI6c5w=
github.com/apache/thrift v0.12.0/go.mod
h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ=
github.com/apache/thrift v0.13.0/go.mod
h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ=
github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod
h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o=
diff --git a/integrate_test/rpc/dubbo/tests/integration/main_test.go
b/integrate_test/rpc/dubbo/tests/integration/main_test.go
index 33f1a0ef..47387a65 100644
--- a/integrate_test/rpc/dubbo/tests/integration/main_test.go
+++ b/integrate_test/rpc/dubbo/tests/integration/main_test.go
@@ -37,8 +37,8 @@ var userProvider = new(UserProvider)
func TestMain(m *testing.M) {
config.SetConsumerService(userProvider)
- hessian.RegisterJavaEnum(Gender(MAN))
- hessian.RegisterJavaEnum(Gender(WOMAN))
+ hessian.RegisterJavaEnum(MAN)
+ hessian.RegisterJavaEnum(WOMAN)
hessian.RegisterPOJO(&User{})
if err := config.Load(); err != nil {
panic(err)
@@ -54,16 +54,16 @@ func init() {
}
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,
}
@@ -73,7 +73,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
}
@@ -84,7 +84,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/integrate_test/rpc/dubbo/tests/integration/userprovider_test.go
b/integrate_test/rpc/dubbo/tests/integration/userprovider_test.go
index 69f15d56..21996f38 100644
--- a/integrate_test/rpc/dubbo/tests/integration/userprovider_test.go
+++ b/integrate_test/rpc/dubbo/tests/integration/userprovider_test.go
@@ -28,10 +28,6 @@ import (
"github.com/stretchr/testify/assert"
)
-import (
- "github.com/apache/dubbo-go-samples/rpc/dubbo/go-server/pkg"
-)
-
func TestGetUserA000(t *testing.T) {
reqUser := &User{}
reqUser.ID = "000"
@@ -40,7 +36,7 @@ func TestGetUserA000(t *testing.T) {
assert.Equal(t, "000", user.ID)
assert.Equal(t, "Alex Stocks", user.Name)
assert.Equal(t, int32(31), user.Age)
- assert.Equal(t, Gender(pkg.MAN), user.Sex)
+ assert.Equal(t, MAN, user.Sex)
assert.NotNil(t, user.Time)
}
@@ -52,7 +48,7 @@ func TestGetUserA001(t *testing.T) {
assert.Equal(t, "001", user.ID)
assert.Equal(t, "ZhangSheng", user.Name)
assert.Equal(t, int32(18), user.Age)
- assert.Equal(t, Gender(pkg.MAN), user.Sex)
+ assert.Equal(t, MAN, user.Sex)
assert.NotNil(t, user.Time)
}
@@ -64,7 +60,7 @@ func TestGetUserA002(t *testing.T) {
assert.Equal(t, "002", user.ID)
assert.Equal(t, "Lily", user.Name)
assert.Equal(t, int32(20), user.Age)
- assert.Equal(t, Gender(pkg.WOMAN), user.Sex)
+ assert.Equal(t, WOMAN, user.Sex)
assert.NotNil(t, user.Time)
}
@@ -76,7 +72,7 @@ func TestGetUserA003(t *testing.T) {
assert.Equal(t, "113", user.ID)
assert.Equal(t, "Moorse", user.Name)
assert.Equal(t, int32(30), user.Age)
- assert.Equal(t, Gender(pkg.WOMAN), user.Sex)
+ assert.Equal(t, WOMAN, user.Sex)
assert.NotNil(t, user.Time)
}
@@ -113,5 +109,5 @@ func TestGetUsers(t *testing.T) {
func TestGetGender(t *testing.T) {
gender, err := userProvider.GetGender(1)
assert.Nil(t, err)
- assert.Equal(t, Gender(pkg.WOMAN), gender)
+ assert.Equal(t, WOMAN, gender)
}
