chore: get namespace from annos

Author: AsterDY

thrift/descriptor.go

@@ -117,29 +117,17 @@ func (p Type) IsComplex() bool {
 
 // TypeDescriptor is the runtime descriptor of a thrift type
 type TypeDescriptor struct {
-	typ       Type
-	name      string
-	key       *TypeDescriptor   // for map key
-	elem      *TypeDescriptor   // for slice or map element
-	struc     *StructDescriptor // for struct
-	namespace string            // for idl namespace
-	file      string            // for idl absolute filepath
+	typ   Type
+	name  string
+	key   *TypeDescriptor   // for map key
+	elem  *TypeDescriptor   // for slice or map element
+	struc *StructDescriptor // for struct
 }
 
 const (
 	nameBinary = "binary"
 )
 
-// Namespace returns the namespace of the type
-func (d TypeDescriptor) Namespace() string {
-	return d.namespace
-}
-
-// File returns the file of the type
-func (d TypeDescriptor) File() string {
-	return d.file
-}
-
 // IsBinary tells if the type is binary type ([]byte)
 func (d TypeDescriptor) IsBinary() bool {
 	if d.name == nameBinary {

thrift/idl.go

@@ -597,22 +597,16 @@ func parseType(ctx context.Context, t *parser.Type, tree *parser.Thrift, cache c
 	switch t.Name {
 	case "list":
 		ty := &TypeDescriptor{name: t.Name}
-		ty.namespace = thriftNamespace(tree)
-		ty.file = tree.GetFilename()
 		ty.typ = LIST
 		ty.elem, err = parseType(ctx, t.ValueType, tree, cache, nextRecursionDepth, opts, nextAnns, parseTarget)
 		return ty, err
 	case "set":
 		ty := &TypeDescriptor{name: t.Name}
-		ty.namespace = thriftNamespace(tree)
-		ty.file = tree.GetFilename()
 		ty.typ = SET
 		ty.elem, err = parseType(ctx, t.ValueType, tree, cache, nextRecursionDepth, opts, nextAnns, parseTarget)
 		return ty, err
 	case "map":
 		ty := &TypeDescriptor{name: t.Name}
-		ty.namespace = thriftNamespace(tree)
-		ty.file = tree.GetFilename()
 		ty.typ = MAP
 		if ty.key, err = parseType(ctx, t.KeyType, tree, cache, nextRecursionDepth, opts, nextAnns, parseTarget); err != nil {
 			return nil, err
@@ -686,8 +680,6 @@ func parseType(ctx context.Context, t *parser.Type, tree *parser.Thrift, cache c
 				annotations: oannos,
 			},
 		}
-		ty.namespace = thriftNamespace(tree)
-		ty.file = tree.GetFilename()
 
 		if recursionDepth == 0 {
 			ctx = context.WithValue(ctx, CtxKeyIsBodyRoot, true)

thrift/idl_test.go

@@ -580,9 +580,6 @@ func TestNewDescriptorByName(t *testing.T) {
 
 		// Test parsing User struct with cross-file reference notation
 		desc, err := opts.NewDescriptorByName(context.Background(), mainPath, "base.User", includes)
-		// verify file and namespace correctness
-		require.Equal(t, "base.thrift", desc.File())
-		require.Equal(t, "kitex.test.base", desc.Namespace())
 
 		require.NoError(t, err)
 		require.NotNil(t, desc)
@@ -638,9 +635,6 @@ func TestNewDescriptorByName(t *testing.T) {
 
 		// Test parsing UserRequest with relative path that goes up directories
 		desc, err := opts.NewDescriptorByName(context.Background(), mainPath, "UserRequest", includes)
-		// verify file and namespace correctness
-		require.Equal(t, "a/b/main.thrift", desc.File())
-		require.Equal(t, "kitex.test.server", desc.Namespace())
 
 		require.NoError(t, err)
 		require.NotNil(t, desc)