refactor(generic): refactor existing generic to have new ServiceInfo …

…which has the generic's reader and writer info directly (cloudwego#1365)

client/genericclient/client.go

@@ -31,7 +31,7 @@ var _ Client = &genericServiceClient{}
 
 // NewClient create a generic client
 func NewClient(destService string, g generic.Generic, opts ...client.Option) (Client, error) {
- svcInfo := generic.ServiceInfo(g.PayloadCodecType())
+ svcInfo := generic.ServiceInfoWithCodec(g)
  return NewClientWithServiceInfo(destService, g, svcInfo, opts...)
 }
 
@@ -47,6 +47,7 @@ func NewClientWithServiceInfo(destService string, g generic.Generic, svcInfo *se
  return nil, err
  }
  cli := &genericServiceClient{
+ svcInfo: svcInfo,
  kClient: kc,
  g: g,
  }
@@ -86,24 +87,27 @@ type Client interface {
 }
 
 type genericServiceClient struct {
+ svcInfo *serviceinfo.ServiceInfo
  kClient client.Client
  g generic.Generic
 }
 
 func (gc *genericServiceClient) GenericCall(ctx context.Context, method string, request interface{}, callOptions ...callopt.Option) (response interface{}, err error) {
  ctx = client.NewCtxWithCallOptions(ctx, callOptions)
- var _args generic.Args
+ _args := gc.svcInfo.MethodInfo(method).NewArgs().(*generic.Args)
  _args.Method = method
  _args.Request = request
+
  mt, err := gc.g.GetMethod(request, method)
  if err != nil {
  return nil, err
  }
  if mt.Oneway {
- return nil, gc.kClient.Call(ctx, mt.Name, &_args, nil)
+ return nil, gc.kClient.Call(ctx, mt.Name, _args, nil)
  }
- var _result generic.Result
- if err = gc.kClient.Call(ctx, mt.Name, &_args, &_result); err != nil {
+
+ _result := gc.svcInfo.MethodInfo(method).NewResult().(*generic.Result)
+ if err = gc.kClient.Call(ctx, mt.Name, _args, _result); err != nil {
  return
  }
  return _result.GetSuccess(), nil

pkg/generic/generic.go

@@ -32,13 +32,19 @@ import (
 type Generic interface {
  Closer
  // PayloadCodec return codec implement
+ // this is used for generic which does not need IDL
  PayloadCodec() remote.PayloadCodec
  // PayloadCodecType return the type of codec
  PayloadCodecType() serviceinfo.PayloadCodec
  // RawThriftBinaryGeneric must be framed
  Framed() bool
- // GetMethod to get method name if need
+ // GetMethod is to get method name if needed
  GetMethod(req interface{}, method string) (*Method, error)
+ // IDLServiceName returns idl service name
+ IDLServiceName() string
+ // MessageReaderWriter returns reader and writer
+ // this is used for generic which needs IDL
+ MessageReaderWriter() interface{}
 }
 
 // Method information
@@ -64,22 +70,14 @@ func BinaryThriftGeneric() Generic {
 //
 // SetBinaryWithByteSlice(g, true)
 func MapThriftGeneric(p DescriptorProvider) (Generic, error) {
- codec, err := newMapThriftCodec(p, thriftCodec)
- if err != nil {
- return nil, err
- }
  return &mapThriftGeneric{
- codec: codec,
+ codec: newMapThriftCodec(p),
  }, nil
 }
 
 func MapThriftGenericForJSON(p DescriptorProvider) (Generic, error) {
- codec, err := newMapThriftCodecForJSON(p, thriftCodec)
- if err != nil {
- return nil, err
- }
  return &mapThriftGeneric{
- codec: codec,
+ codec: newMapThriftCodecForJSON(p),
  }, nil
 }
 
@@ -92,20 +90,12 @@ func MapThriftGenericForJSON(p DescriptorProvider) (Generic, error) {
 func HTTPThriftGeneric(p DescriptorProvider, opts ...Option) (Generic, error) {
  gOpts := &Options{dynamicgoConvOpts: DefaultHTTPDynamicGoConvOpts}
  gOpts.apply(opts)
- codec, err := newHTTPThriftCodec(p, thriftCodec, gOpts)
- if err != nil {
- return nil, err
- }
- return &httpThriftGeneric{codec: codec}, nil
+ return &httpThriftGeneric{codec: newHTTPThriftCodec(p, gOpts)}, nil
 }
 
 func HTTPPbThriftGeneric(p DescriptorProvider, pbp PbDescriptorProvider) (Generic, error) {
- codec, err := newHTTPPbThriftCodec(p, pbp, thriftCodec)
- if err != nil {
- return nil, err
- }
  return &httpPbThriftGeneric{
- codec: codec,
+ codec: newHTTPPbThriftCodec(p, pbp),
  }, nil
 }
 
@@ -118,24 +108,15 @@ func HTTPPbThriftGeneric(p DescriptorProvider, pbp PbDescriptorProvider) (Generi
 func JSONThriftGeneric(p DescriptorProvider, opts ...Option) (Generic, error) {
  gOpts := &Options{dynamicgoConvOpts: DefaultJSONDynamicGoConvOpts}
  gOpts.apply(opts)
- codec, err := newJsonThriftCodec(p, thriftCodec, gOpts)
- if err != nil {
- return nil, err
- }
- return &jsonThriftGeneric{codec: codec}, nil
+ return &jsonThriftGeneric{codec: newJsonThriftCodec(p, gOpts)}, nil
 }
 
 // JSONPbGeneric json mapping generic.
 // Uses dynamicgo for json to protobufs conversion, so DynamicGo field is true by default.
 func JSONPbGeneric(p PbDescriptorProviderDynamicGo, opts ...Option) (Generic, error) {
  gOpts := &Options{dynamicgoConvOpts: conv.Options{}}
  gOpts.apply(opts)
-
- codec, err := newJsonPbCodec(p, pbCodec, gOpts)
- if err != nil {
- return nil, err
- }
- return &jsonPbGeneric{codec: codec}, nil
+ return &jsonPbGeneric{codec: newJsonPbCodec(p, gOpts)}, nil
 }
 
 // SetBinaryWithBase64 enable/disable Base64 codec for binary field.
@@ -243,6 +224,14 @@ func (g *binaryThriftGeneric) Close() error {
  return nil
 }
 
+func (g *binaryThriftGeneric) IDLServiceName() string {
+ return ""
+}
+
+func (g *binaryThriftGeneric) MessageReaderWriter() interface{} {
+ return nil
+}
+
 type mapThriftGeneric struct {
  codec *mapThriftCodec
 }
@@ -256,7 +245,7 @@ func (g *mapThriftGeneric) PayloadCodecType() serviceinfo.PayloadCodec {
 }
 
 func (g *mapThriftGeneric) PayloadCodec() remote.PayloadCodec {
- return g.codec
+ return nil
 }
 
 func (g *mapThriftGeneric) GetMethod(req interface{}, method string) (*Method, error) {
@@ -267,6 +256,14 @@ func (g *mapThriftGeneric) Close() error {
  return g.codec.Close()
 }
 
+func (g *mapThriftGeneric) IDLServiceName() string {
+ return g.codec.svcName
+}
+
+func (g *mapThriftGeneric) MessageReaderWriter() interface{} {
+ return g.codec.getMessageReaderWriter()
+}
+
 type jsonThriftGeneric struct {
  codec *jsonThriftCodec
 }
@@ -280,7 +277,7 @@ func (g *jsonThriftGeneric) PayloadCodecType() serviceinfo.PayloadCodec {
 }
 
 func (g *jsonThriftGeneric) PayloadCodec() remote.PayloadCodec {
- return g.codec
+ return nil
 }
 
 func (g *jsonThriftGeneric) GetMethod(req interface{}, method string) (*Method, error) {
@@ -291,6 +288,14 @@ func (g *jsonThriftGeneric) Close() error {
  return g.codec.Close()
 }
 
+func (g *jsonThriftGeneric) IDLServiceName() string {
+ return g.codec.svcName
+}
+
+func (g *jsonThriftGeneric) MessageReaderWriter() interface{} {
+ return g.codec.getMessageReaderWriter()
+}
+
 type jsonPbGeneric struct {
  codec *jsonPbCodec
 }
@@ -304,7 +309,7 @@ func (g *jsonPbGeneric) PayloadCodecType() serviceinfo.PayloadCodec {
 }
 
 func (g *jsonPbGeneric) PayloadCodec() remote.PayloadCodec {
- return g.codec
+ return nil
 }
 
 func (g *jsonPbGeneric) GetMethod(req interface{}, method string) (*Method, error) {
@@ -315,6 +320,14 @@ func (g *jsonPbGeneric) Close() error {
  return g.codec.Close()
 }
 
+func (g *jsonPbGeneric) IDLServiceName() string {
+ return g.codec.svcName
+}
+
+func (g *jsonPbGeneric) MessageReaderWriter() interface{} {
+ return g.codec.getMessageReaderWriter()
+}
+
 type httpThriftGeneric struct {
  codec *httpThriftCodec
 }
@@ -328,7 +341,7 @@ func (g *httpThriftGeneric) PayloadCodecType() serviceinfo.PayloadCodec {
 }
 
 func (g *httpThriftGeneric) PayloadCodec() remote.PayloadCodec {
- return g.codec
+ return nil
 }
 
 func (g *httpThriftGeneric) GetMethod(req interface{}, method string) (*Method, error) {
@@ -339,6 +352,14 @@ func (g *httpThriftGeneric) Close() error {
  return g.codec.Close()
 }
 
+func (g *httpThriftGeneric) IDLServiceName() string {
+ return g.codec.svcName
+}
+
+func (g *httpThriftGeneric) MessageReaderWriter() interface{} {
+ return g.codec.getMessageReaderWriter()
+}
+
 type httpPbThriftGeneric struct {
  codec *httpPbThriftCodec
 }
@@ -352,7 +373,7 @@ func (g *httpPbThriftGeneric) PayloadCodecType() serviceinfo.PayloadCodec {
 }
 
 func (g *httpPbThriftGeneric) PayloadCodec() remote.PayloadCodec {
- return g.codec
+ return nil
 }
 
 func (g *httpPbThriftGeneric) GetMethod(req interface{}, method string) (*Method, error) {
@@ -362,3 +383,11 @@ func (g *httpPbThriftGeneric) GetMethod(req interface{}, method string) (*Method
 func (g *httpPbThriftGeneric) Close() error {
  return g.codec.Close()
 }
+
+func (g *httpPbThriftGeneric) IDLServiceName() string {
+ return g.codec.svcName
+}
+
+func (g *httpPbThriftGeneric) MessageReaderWriter() interface{} {
+ return g.codec.getMessageReaderWriter()
+}