Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add WithResult methods to take HTTP headers, if needed. #387

Merged
merged 7 commits into from
Nov 15, 2023
Merged

Add WithResult methods to take HTTP headers, if needed. #387

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
ea62b2c
Add WithResult methods to take HTTP headers, if needed.
tokuhirom Nov 6, 2023
44a1a93
oops
tokuhirom Nov 6, 2023
d4b7f4f
oops
tokuhirom Nov 6, 2023
aa6c1ae
Do not close response body twice.
tokuhirom Nov 8, 2023
7e0f87d
Merge branch 'master' into withrequest
tokuhirom Nov 13, 2023
12f779a
Merge branch 'withrequest' of github.com:tokuhirom/line-bot-sdk-go in…
tokuhirom Nov 13, 2023
c833346
fix: unused varaible
tokuhirom Nov 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
68 changes: 53 additions & 15 deletions generator/src/main/resources/line-bot-sdk-go-generator/api.pebble
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,44 @@ func (client *{{ classname }}) {{ op.operationId }}(
{% endif %}
{% endfor %}
) ({% if op.isResponseFile %}*http.Response{% elseif op.returnType %}*{{ op.returnType }}{% else %}struct{}{% endif %}, error) {
_, body, error := client.{{ op.operationId }}WithHttpInfo(
{% for param in op.allParams %}
{% if param.isBodyParam and param.isFile %}
{{ param.paramName }}ContentType,
{{ param.paramName }}Reader,
{% else %}
{{ param.paramName }},
{% endif %}
{% endfor %}
)
return body, error
}

// {{ op.operationId | capitalize }}
// If you want to take advantage of the HTTPResponse object for status codes and headers, use this signature.
// {{ op.summary }}
// {{ op.notes }}
// Parameters:
{% for param in op.allParams %}
{%- if param.isBodyParam and param.isFile -%}
// {{ param.paramName }}ContentType {{ param.description }} content-type
// {{ param.paramName }}Reader {{ param.description }} file content
{%- else -%}
// {{ param.paramName }} {{ param.description }}
{%- endif %}
{% endfor %}
{% if op.isResponseFile %}// You must close the response body when finished with it.{% endif %}
{% if op.externalDocs != null -%}// {{op.externalDocs.url}}{% endif %}
func (client *{{ classname }}) {{ op.operationId }}WithHttpInfo(
{% for param in op.allParams %}
{% if param.isBodyParam and param.isFile %}
{{ param.paramName }}ContentType string,
{{ param.paramName }}Reader io.Reader,
{% else %}
{{ param.paramName }} {% if not (param.isPrimitiveType or param.isEnumRef) %}*{% endif %}{{ param.dataType }},
{% endif %}
{% endfor %}
) (*http.Response, {% if op.isResponseFile %}*http.Response{% elseif op.returnType %}*{{ op.returnType }}{% else %}struct{}{% endif %}, error) {
path := "{{ op.path }}"
{% for pp in op.pathParams %}
path = strings.Replace(path, "{{ "{" }}{{ pp.paramName }}{{ "}" }}", {% if pp.isInteger or pp.isLong %}strconv.FormatInt({{ pp.paramName }}, 10){% else %}{{ pp.paramName }}{% endif %}, -1)
Expand All @@ -150,19 +188,19 @@ func (client *{{ classname }}) {{ op.operationId }}(
log.Printf("Sending request: method={{ op.httpMethod }} path=%s bodyContentType=%s\n", path, {{ op.bodyParam.paramName }}ContentType)
req, err := http.NewRequest(http.Method{{ op.httpMethod }}, client.Url(path), {{ op.bodyParam.paramName }}Reader)
if err != nil {
return {{ nilval }}, err
return nil, {{ nilval }}, err
}
req.Header.Set("Content-Type", {{ op.bodyParam.paramName }}ContentType)
{% elseif op.bodyParam != null %}
var buf bytes.Buffer
enc := json.NewEncoder(&buf)
if err := enc.Encode({{ op.bodyParam.paramName }}); err != nil {
return {{ nilval }}, err
return nil, {{ nilval }}, err
}
log.Printf("Sending request: method={{ op.httpMethod }} path=%s body=%s\n", path, buf.String())
req, err := http.NewRequest(http.Method{{ op.httpMethod }}, client.Url(path), &buf)
if err != nil {
return {{ nilval }}, err
return nil, {{ nilval }}, err
}
req.Header.Set("Content-Type", "application/json; charset=UTF-8")
{% elseif op.hasFormParams and op.isMultipart %}
Expand All @@ -172,7 +210,7 @@ func (client *{{ classname }}) {{ op.operationId }}(
{% if fp.isFile %}
fileWriter, err := writer.CreateFormFile("{{ fp.baseName }}", {{ fp.paramName }}.Name())
if err != nil {
return {{ nilval }}, err
return nil, {{ nilval }}, err
}
io.Copy(fileWriter, {{ fp.paramName }})
{% else %}
Expand All @@ -181,13 +219,13 @@ func (client *{{ classname }}) {{ op.operationId }}(
{% endfor %}
err = writer.Close()
if err != nil {
return {{ nilval }}, err
return nil, {{ nilval }}, err
}

log.Printf("Sending request: method={{ op.httpMethod }} path=%s\n", path)
req, err := http.NewRequest(http.Method{{ op.httpMethod }}, client.Url(path), body)
if err != nil {
return {{ nilval }}, err
return nil, {{ nilval }}, err
}
req.Header.Set("Content-Type", writer.FormDataContentType())
{% elseif op.hasFormParams %}
Expand All @@ -202,14 +240,14 @@ func (client *{{ classname }}) {{ op.operationId }}(
log.Printf("Sending request: method={{ op.httpMethod }} path=%s body=%s\n", path, buf)
req, err := http.NewRequest(http.Method{{ op.httpMethod }}, client.Url(path), body)
if err != nil {
return {{ nilval }}, err
return nil, {{ nilval }}, err
}
req.Header.Set("Content-Type", "application/x-www-form-urlencoded")
{% else %}
log.Printf("Sending request: method={{ op.httpMethod }} path=%s\n", path)
req, err := http.NewRequest(http.Method{{ op.httpMethod }}, client.Url(path), nil)
if err != nil {
return {{ nilval }}, err
return nil, {{ nilval }}, err
}
{% endif %}

Expand All @@ -229,31 +267,31 @@ func (client *{{ classname }}) {{ op.operationId }}(
log.Printf("Got response from '%s %s': status=%d, contentLength=%d", req.Method, req.URL, res.StatusCode, res.ContentLength)

if err != nil {
return {{ nilval }}, err
return res, {{ nilval }}, err
}

if res.StatusCode/100 != 2 {
body, err := io.ReadAll(res.Body)
if err != nil {
return {{ nilval }}, fmt.Errorf("failed to read response body: %w", err)
return res, {{ nilval }}, fmt.Errorf("failed to read response body: %w", err)
}
return {{ nilval }}, fmt.Errorf("unexpected status code: %d, %s", res.StatusCode, string(body))
return res, {{ nilval }}, fmt.Errorf("unexpected status code: %d, %s", res.StatusCode, string(body))
}

{% if op.isResponseFile %}
return res, nil
return res, res, nil
{% else %}
defer res.Body.Close()

{% if op.returnType %}
decoder := json.NewDecoder(res.Body)
result := {{ op.returnType }}{}
if err := decoder.Decode(&result); err != nil {
return nil, fmt.Errorf("failed to decode JSON: %w", err)
return res, nil, fmt.Errorf("failed to decode JSON: %w", err)
}
return &result, nil
return res, &result, nil
{% else %}
return struct{}{}, nil
return res, struct{}{}, nil
{% endif %}
{% endif %}
}
Expand Down
Loading