foomo/gotsrpc
1
0
Fork 0
mirror of https://github.com/foomo/gotsrpc.git synced 2025-10-16 12:35:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: remove args as it could end up unused

Browse Source
This commit is contained in:
franklin 2021-05-21 14:17:06 +02:00
parent 2a65056e5f
commit 5e630c0631
1 changed files with 16 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
go.go
View File

@ -181,10 +181,10 @@ func extractImports(fields []*Field, fullPackageName string, aliases map[string]
func renderTSRPCServiceProxies(services ServiceList, fullPackageName string, packageName string, config *config.Target, g *code) error { func renderTSRPCServiceProxies(services ServiceList, fullPackageName string, packageName string, config *config.Target, g *code) error {
aliases := map[string]string{ aliases := map[string]string{
"time": "time", "time": "time",
"net/http": "http", "net/http": "http",
"io": "io", "io": "io",
"io/ioutil": "ioutil", "io/ioutil": "ioutil",
"github.com/foomo/gotsrpc/v2": "gotsrpc", "github.com/foomo/gotsrpc/v2": "gotsrpc",
} }
for _, service := range services { for _, service := range services {
@ -244,16 +244,6 @@ func renderTSRPCServiceProxies(services ServiceList, fullPackageName string, pac
} }
defer io.Copy(ioutil.Discard, r.Body) // Drain Request Body defer io.Copy(ioutil.Discard, r.Body) // Drain Request Body
`) `)
needsArgs := false
for _, method := range service.Methods {
if len(method.Args) > 0 {
needsArgs = true
break
}
}
if needsArgs {
g.l(`var args []interface{}`)
}
g.l("funcName := gotsrpc.GetCalledFunc(r, p.EndPoint)") g.l("funcName := gotsrpc.GetCalledFunc(r, p.EndPoint)")
g.l("callStats := gotsrpc.GetStatsForRequest(r)") g.l("callStats := gotsrpc.GetStatsForRequest(r)")
@ -275,18 +265,16 @@ func renderTSRPCServiceProxies(services ServiceList, fullPackageName string, pac
callArgs := []string{} callArgs := []string{}
isSessionRequest := false isSessionRequest := false
if len(method.Args) > 0 { if len(method.Args) > 0 {
args := []string{} args := []string{}
argsDecls := []string{} argsDecls := []string{}
skipArgI := 0 skipArgI := 0
nonHTTPReleatedArgs := goMethodArgsWithoutHTTPContextRelatedArgs(method) nonHTTPRelatedArgs := goMethodArgsWithoutHTTPContextRelatedArgs(method)
isSessionRequest = len(method.Args)-len(nonHTTPReleatedArgs) == 2 isSessionRequest = len(method.Args)-len(nonHTTPRelatedArgs) == 2
for _, arg := range nonHTTPReleatedArgs {
for _, arg := range nonHTTPRelatedArgs {
argName := "arg_" + arg.Name //strconv.Itoa(argI) argName := "arg_" + arg.Name //strconv.Itoa(argI)
//argsDecls = append(argsDecls, argName+" := "+arg.Value.emptyLiteral(aliases)) //argsDecls = append(argsDecls, argName+" := "+arg.Value.emptyLiteral(aliases))
@ -301,7 +289,7 @@ func renderTSRPCServiceProxies(services ServiceList, fullPackageName string, pac
g.l(argDecl) g.l(argDecl)
} }
g.l(")") g.l(")")
g.l("args = []interface{}{" + strings.Join(args, ", ") + "}") g.l("args := []interface{}{" + strings.Join(args, ", ") + "}")
g.l("err := gotsrpc.LoadArgs(&args, callStats, r)") g.l("err := gotsrpc.LoadArgs(&args, callStats, r)")
g.l("if err != nil {") g.l("if err != nil {")
g.ind(1) g.ind(1)
@ -391,7 +379,7 @@ func (ms *goMethod) renderSignature() string {
func renderTSRPCServiceClients(services ServiceList, fullPackageName string, packageName string, config *config.Target, g *code) error { func renderTSRPCServiceClients(services ServiceList, fullPackageName string, packageName string, config *config.Target, g *code) error {
aliases := map[string]string{ aliases := map[string]string{
"github.com/foomo/gotsrpc/v2": "gotsrpc", "github.com/foomo/gotsrpc/v2": "gotsrpc",
"net/http": "net_http", "net/http": "net_http",
} }
for _, service := range services { for _, service := range services {
@ -467,13 +455,13 @@ func renderTSRPCServiceClients(services ServiceList, fullPackageName string, pac
func renderGoRPCServiceProxies(services ServiceList, fullPackageName string, packageName string, config *config.Target, g *code) error { func renderGoRPCServiceProxies(services ServiceList, fullPackageName string, packageName string, config *config.Target, g *code) error {
aliases := map[string]string{ aliases := map[string]string{
"fmt": "fmt", "fmt": "fmt",
"time": "time", "time": "time",
"strings": "strings", "strings": "strings",
"reflect": "reflect", "reflect": "reflect",
"crypto/tls": "tls", "crypto/tls": "tls",
"encoding/gob": "gob", "encoding/gob": "gob",
"github.com/valyala/gorpc": "gorpc", "github.com/valyala/gorpc": "gorpc",
"github.com/foomo/gotsrpc/v2": "gotsrpc", "github.com/foomo/gotsrpc/v2": "gotsrpc",
} }