Skip to content

Commit 1c2dfeb

Browse files
committed
callback for async task waiter
1 parent 8dff6f3 commit 1c2dfeb

29 files changed

+1073
-373
lines changed

codegen/templates/extramethods-only.tpl

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,8 +99,7 @@ func (r *{{$.Name}}) {{.Name}}WithContext_{{.HTTPMethod}}(ctx context.Context{{i
9999
return nil, err
100100
}
101101

102-
asyncResult, _, err := untyped.MaybeWaitAsyncResultWithContext(ctx, result, r.Untyped, waitTimeout)
103-
return asyncResult, err
102+
return untyped.MaybeWaitAsyncResultWithContext(ctx, result, r.Untyped, waitTimeout)
104103
{{else}}{{if .ReturnsNoContent}}{{if and (or (and .HasParams .BodyFields) (and .HasBody .BodyFields)) (not .SimplifiedBody)}}_, err = core.Request[core.Record](ctx, r.Untyped.GetResourceMap()[r.GetResourceType()], http.{{.GoHTTPMethod}}, resourcePath, reqParams, reqBody)
105104
return err{{else}}_, err := core.Request[core.Record](ctx, r.Untyped.GetResourceMap()[r.GetResourceType()], http.{{.GoHTTPMethod}}, resourcePath, reqParams, reqBody)
106105
return err{{end}}

codegen/templates/resource.tpl

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -276,8 +276,7 @@ func (r *{{.Name}}) UpdateWithContext(ctx context.Context, id any{{range .Update
276276
return nil, err
277277
}
278278

279-
asyncResult, _, err := untyped.MaybeWaitAsyncResultWithContext(ctx, record, r.Untyped, waitTimeout)
280-
return asyncResult, err
279+
return untyped.MaybeWaitAsyncResultWithContext(ctx, record, r.Untyped, waitTimeout)
281280
}
282281
{{else}}
283282
// Update updates an existing {{.LowerName}} and returns an async task{{if .UpdateSummary}}
@@ -305,8 +304,7 @@ func (r *{{.Name}}) UpdateWithContext(ctx context.Context, id any, req *{{.Name}
305304
return nil, err
306305
}
307306

308-
asyncResult, _, err := untyped.MaybeWaitAsyncResultWithContext(ctx, record, r.Untyped, waitTimeout)
309-
return asyncResult, err
307+
return untyped.MaybeWaitAsyncResultWithContext(ctx, record, r.Untyped, waitTimeout)
310308
}
311309
{{end}}
312310
{{else}}
@@ -422,8 +420,7 @@ func (r *{{.Name}}) DeleteWithContext(ctx context.Context, req *{{.Name}}SearchP
422420
return nil, err
423421
}
424422

425-
asyncResult, _, err := untyped.MaybeWaitAsyncResultWithContext(ctx, record, r.Untyped, waitTimeout)
426-
return asyncResult, err
423+
return untyped.MaybeWaitAsyncResultWithContext(ctx, record, r.Untyped, waitTimeout)
427424
}
428425
{{else}}
429426
// Delete deletes a {{.LowerName}} with search parameters{{if or .DeleteQueryParams .DeleteBodyParams}}
@@ -493,8 +490,7 @@ func (r *{{.Name}}) DeleteByIdWithContext(ctx context.Context, id any{{range .De
493490
return nil, err
494491
}
495492

496-
asyncResult, _, err := untyped.MaybeWaitAsyncResultWithContext(ctx, record, r.Untyped, waitTimeout)
497-
return asyncResult, err
493+
return untyped.MaybeWaitAsyncResultWithContext(ctx, record, r.Untyped, waitTimeout)
498494
}
499495
{{else}}
500496
// DeleteById deletes a {{.LowerName}} by ID{{if .DeleteSummary}}
@@ -675,8 +671,7 @@ func (r *{{$.Name}}) {{.Name}}WithContext_{{.HTTPMethod}}(ctx context.Context{{i
675671
return nil, err
676672
}
677673

678-
asyncResult, _, err := untyped.MaybeWaitAsyncResultWithContext(ctx, result, r.Untyped, waitTimeout)
679-
return asyncResult, err
674+
return untyped.MaybeWaitAsyncResultWithContext(ctx, result, r.Untyped, waitTimeout)
680675
{{else}}{{if .ReturnsNoContent}}{{if and (or (and .HasParams .BodyFields) (and .HasBody .BodyFields)) (not .SimplifiedBody)}}_, err = core.Request[core.Record](ctx, r.Untyped.GetResourceMap()[r.GetResourceType()], http.{{.GoHTTPMethod}}, resourcePath, reqParams, reqBody)
681676
return err{{else}}_, err := core.Request[core.Record](ctx, r.Untyped.GetResourceMap()[r.GetResourceType()], http.{{.GoHTTPMethod}}, resourcePath, reqParams, reqBody)
682677
return err{{end}}

0 commit comments

Comments
 (0)