modify FromError

pkg/hessian2/exception/exception.go

@@ -21,7 +21,6 @@ package exception
 
 import (
 	"github.com/apache/dubbo-go-hessian2/java_exception"
-	"github.com/cloudwego/kitex/pkg/kerrors"
 )
 
 type Throwabler interface {
@@ -36,18 +35,22 @@ func NewException(detailMessage string) Throwabler {
 //
 //   - If err is nil, it returns nil and false
 //
-//   - If err is of type *kerrors.DetailedError, it would unwrap err to get the
-//     real cause. Then it would check cause whether implementing Throwabler. If
-//     yes, it returns Throwabler and true.
+//   - If err implents Unwrap(), it would unwrap err until getting the real cause.
+//     Then it would check cause whether implementing Throwabler. If yes, it returns
+//     Throwabler and true.
 //
 //     If not, it checks err whether implementing Throwabler directly. If yes,
 //     it returns Throwabler and true.
 func FromError(err error) (Throwabler, bool) {
 	if err == nil {
 		return nil, false
 	}
-	if detailedErr, ok := err.(*kerrors.DetailedError); ok {
-		err = detailedErr.Unwrap()
+	for {
+		if wrapper, ok := err.(interface{ Unwrap() error }); ok {
+			err = wrapper.Unwrap()
+		} else {
+			break
+		}
 	}
 	if exception, ok := err.(Throwabler); ok {
 		return exception, true

pkg/hessian2/exception/exception_test.go

@@ -22,6 +22,8 @@ package exception
 import (
 	"testing"
 
+	"github.com/cloudwego/kitex/pkg/remote"
+
 	"github.com/cloudwego/kitex/pkg/kerrors"
 	"github.com/stretchr/testify/assert"
 )
@@ -58,6 +60,15 @@ func TestFromError(t *testing.T) {
 				assert.True(t, ok)
 			},
 		},
+		{
+			desc:     "TransError wraps DetailedError, DetailedError wraps Throwabler",
+			inputErr: remote.NewTransError(remote.InternalError, kerrors.ErrRemoteOrNetwork.WithCause(NewException("FromError test"))),
+			expected: func(t *testing.T, exception Throwabler, ok bool) {
+				assert.Equal(t, "java.lang.Exception", exception.JavaClassName())
+				assert.Equal(t, "FromError test", exception.Error())
+				assert.True(t, ok)
+			},
+		},
 	}
 
 	for _, test := range tests {