fix: not need streaming mode

cloudwego · Nov 14, 2024 · 930282c · 930282c
1 parent 4ef13e1
commit 930282c
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 20 deletions.
diff --git a/thrift/descriptor.go b/thrift/descriptor.go
@@ -338,8 +338,7 @@ type FunctionDescriptor struct {
 	name              string
 	endpoints         []http.Endpoint
 	annotations       []parser.Annotation
-	isClientStreaming bool
-	isServerStreaming bool
+	isWithoutWrapping bool
 }
 
 // Name returns the name of the function
@@ -379,19 +378,9 @@ func (f FunctionDescriptor) Annotations() []parser.Annotation {
 	return f.annotations
 }
 
-// IsClientStreaming returns if the function is client streaming
-func (f FunctionDescriptor) IsClientStreaming() bool {
-	return f.isClientStreaming
-}
-
-// IsServerStreaming returns if the function is server streaming
-func (f FunctionDescriptor) IsServerStreaming() bool {
-	return f.isServerStreaming
-}
-
 // IsWithoutWrapping returns if the request and response are not wrapped in struct
 func (f FunctionDescriptor) IsWithoutWrapping() bool {
-	return f.isClientStreaming || f.isServerStreaming
+	return f.isWithoutWrapping
 }
 
 // ServiceDescriptor is the runtime descriptor of a service

diff --git a/thrift/idl.go b/thrift/idl.go
@@ -407,8 +407,7 @@ func addFunction(ctx context.Context, fn *parser.Function, tree *parser.Thrift,
 		hasRequestBase:    hasRequestBase,
 		endpoints:         enpdoints,
 		annotations:       annos,
-		isClientStreaming: st.ClientStreaming,
-		isServerStreaming: st.ServerStreaming,
+		isWithoutWrapping: isStreaming,
 	}
 	sDsc.functions[fn.Name] = fnDsc
 	return nil

diff --git a/thrift/idl_test.go b/thrift/idl_test.go
@@ -428,12 +428,12 @@ func TestStreamingFunctionDescriptorFromContent(t *testing.T) {
 	`
 	dsc, err := NewDescritorFromContent(context.Background(), path, content, nil, false)
 	require.Nil(t, err)
-	require.Equal(t, true, dsc.Functions()["Echo"].IsClientStreaming())
-	require.Equal(t, true, dsc.Functions()["EchoServer"].IsServerStreaming())
-	require.Equal(t, false, dsc.Functions()["EchoUnary"].IsClientStreaming())
-	require.Equal(t, true, dsc.Functions()["EchoBizException"].IsClientStreaming())
+	require.Equal(t, true, dsc.Functions()["Echo"].IsWithoutWrapping())
 	require.Equal(t, true, dsc.Functions()["EchoClient"].IsWithoutWrapping())
-	require.Equal(t, "Request", dsc.Functions()["EchoClient"].Request().Struct().Name())
+	require.Equal(t, true, dsc.Functions()["EchoServer"].IsWithoutWrapping())
 	require.Equal(t, false, dsc.Functions()["EchoUnary"].IsWithoutWrapping())
+	require.Equal(t, true, dsc.Functions()["EchoBizException"].IsWithoutWrapping())
+	require.Equal(t, false, dsc.Functions()["EchoPingPong"].IsWithoutWrapping())
+	require.Equal(t, "Request", dsc.Functions()["EchoClient"].Request().Struct().Name())
 	require.Equal(t, "", dsc.Functions()["EchoUnary"].Request().Struct().Name())
 }