Skip to content

Commit e183c9c

Browse files
committed
update stub generator template
1 parent 8b62ce0 commit e183c9c

3 files changed

Lines changed: 31 additions & 51 deletions

File tree

desc/service.go

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -177,9 +177,11 @@ func (s Service) dtoStub(stub *Stub) error {
177177
if err != nil {
178178
return err
179179
}
180-
err = stub.addDTO(reflect.TypeOf(c.Output))
181-
if err != nil {
182-
return err
180+
if c.Output != nil {
181+
err = stub.addDTO(reflect.TypeOf(c.Output))
182+
if err != nil {
183+
return err
184+
}
183185
}
184186

185187
for _, pe := range s.PossibleErrors {

exmples/simple-rest-server/stub/sampleservice.go

Lines changed: 24 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -58,70 +58,58 @@ func NewSampleServiceStub(hostPort string, opts ...stub.Option) *SampleServiceSt
5858
return s
5959
}
6060

61-
type cannedEchoResponse struct {
62-
EchoResponse *EchoResponse
63-
}
64-
65-
func (s SampleServiceStub) Echo(req *EchoRequest) (cannedEchoResponse, error) {
66-
res := cannedEchoResponse{
67-
EchoResponse: &EchoResponse{},
68-
}
61+
func (s SampleServiceStub) Echo(req *EchoRequest) (*EchoResponse, error) {
62+
res := &EchoResponse{}
6963
err := s.s.REST().
7064
SetMethod("GET").
7165
DefaultResponseHandler(nil).
7266
AutoRun("/echo/:randomID", ronykit.JSON, req).
7367
Err()
68+
if err != nil {
69+
return nil, err
70+
}
7471

75-
return res, err
76-
}
77-
78-
type cannedSum1Response struct {
79-
SumResponse *SumResponse
72+
return res, nil
8073
}
8174

82-
func (s SampleServiceStub) Sum1(req *SumRequest) (cannedSum1Response, error) {
83-
res := cannedSum1Response{
84-
SumResponse: &SumResponse{},
85-
}
75+
func (s SampleServiceStub) Sum1(req *SumRequest) (*SumResponse, error) {
76+
res := &SumResponse{}
8677
err := s.s.REST().
8778
SetMethod("GET").
8879
DefaultResponseHandler(nil).
8980
AutoRun("/sum/:val1/:val2", ronykit.JSON, req).
9081
Err()
82+
if err != nil {
83+
return nil, err
84+
}
9185

92-
return res, err
93-
}
94-
95-
type cannedSum2Response struct {
96-
SumResponse *SumResponse
86+
return res, nil
9787
}
9888

99-
func (s SampleServiceStub) Sum2(req *SumRequest) (cannedSum2Response, error) {
100-
res := cannedSum2Response{
101-
SumResponse: &SumResponse{},
102-
}
89+
func (s SampleServiceStub) Sum2(req *SumRequest) (*SumResponse, error) {
90+
res := &SumResponse{}
10391
err := s.s.REST().
10492
SetMethod("POST").
10593
DefaultResponseHandler(nil).
10694
AutoRun("/sum", ronykit.JSON, req).
10795
Err()
96+
if err != nil {
97+
return nil, err
98+
}
10899

109-
return res, err
110-
}
111-
112-
type cannedSumRedirectResponse struct {
113-
SumResponse *SumResponse
100+
return res, nil
114101
}
115102

116-
func (s SampleServiceStub) SumRedirect(req *SumRequest) (cannedSumRedirectResponse, error) {
117-
res := cannedSumRedirectResponse{
118-
SumResponse: &SumResponse{},
119-
}
103+
func (s SampleServiceStub) SumRedirect(req *SumRequest) (*SumResponse, error) {
104+
res := &SumResponse{}
120105
err := s.s.REST().
121106
SetMethod("GET").
122107
DefaultResponseHandler(nil).
123108
AutoRun("/sum-redirect/:val1/:val2", ronykit.JSON, req).
124109
Err()
110+
if err != nil {
111+
return nil, err
112+
}
125113

126-
return res, err
114+
return res, nil
127115
}

stub/gen/go/tpl/stub.gotmpl

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -51,18 +51,8 @@ func New{{$serviceName}}Stub(hostPort string, opts ...stub.Option) *{{$serviceNa
5151
{{ range .RESTs }}
5252
{{$methodName := .Name}}
5353
{{- if ne $methodName "" }}
54-
{{$cannedResponse := lowerCamelCase (print "canned" $methodName "Response")}}
55-
type {{$cannedResponse}} struct {
56-
{{ range .Response -}}
57-
{{.Name}} *{{.Name}}
58-
{{- end }}
59-
}
60-
func (s {{$serviceName}}Stub) {{$methodName}}(req *{{.Request.Name}}) (*{{$cannedResponse}}, error){
61-
res := {{$cannedResponse}}{
62-
{{ range .Response -}}
63-
{{.Name}}: &{{.Name}}{},
64-
{{- end }}
65-
}
54+
func (s {{$serviceName}}Stub) {{$methodName}}(req *{{.Request.Name}}) (*{{.Response.Name}}, error){
55+
res := &{{.Response.Name}}{}
6656
err := s.s.REST().
6757
SetMethod("{{.Method}}").
6858
DefaultResponseHandler(nil).

0 commit comments

Comments
 (0)