Skip to content

[DefaultCodegen] GetReferenceHeader for both calls of headerToCodegenParameter #11756

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

Merged
merged 2 commits into from
Mar 2, 2022
Merged

[DefaultCodegen] GetReferenceHeader for both calls of headerToCodegenParameter #11756

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7e4a2b7
GetReferenceHeader for both calls of headerToCodegenParameter
Mar 1, 2022
71a6354
Moved dereferencing of header outside of headerToCodegenParameter
Mar 2, 2022
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
2 changes: 1 addition & 1 deletion modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4001,7 +4001,7 @@ public CodegenOperation fromOperation(String path,
List<CodegenParameter> responseHeaders = new ArrayList<>();
for (Entry<String, Header> entry : headers.entrySet()) {
String headerName = entry.getKey();
Header header = entry.getValue();
Header header = ModelUtils.getReferencedHeader(this.openAPI, entry.getValue());
CodegenParameter responseHeader = headerToCodegenParameter(header, headerName, imports, String.format(Locale.ROOT, "%sResponseParameter", r.code));
responseHeaders.add(responseHeader);
}
Expand Down
15 changes: 10 additions & 5 deletions modules/openapi-generator/src/test/java/org/openapitools/codegen/DefaultCodegenTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4053,11 +4053,16 @@ public void testResponseContentAndHeader() {

CodegenResponse cr = co.responses.get(0);
List<CodegenParameter> responseHeaders = cr.getResponseHeaders();
assertEquals(1, responseHeaders.size());
CodegenParameter header = responseHeaders.get(0);
assertEquals("X-Rate-Limit", header.baseName);
assertTrue(header.isUnboundedInteger);
assertEquals(header.getSchema().baseName, "X-Rate-Limit");
assertEquals(2, responseHeaders.size());
CodegenParameter header1 = responseHeaders.get(0);
assertEquals("X-Rate-Limit", header1.baseName);
assertTrue(header1.isUnboundedInteger);
assertEquals(header1.getSchema().baseName, "X-Rate-Limit");

CodegenParameter header2 = responseHeaders.get(1);
assertEquals("X-Rate-Limit-Ref", header2.baseName);
assertTrue(header2.isUnboundedInteger);
assertEquals(header2.getSchema().baseName, "X-Rate-Limit-Ref");

content = cr.getContent();
assertEquals(content.keySet(), new HashSet<>(Arrays.asList("application/json", "text/plain")));
Expand Down
7 changes: 7 additions & 0 deletions modules/openapi-generator/src/test/resources/3_0/content-data.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@ paths:
description: "The number of allowed requests in the current period"
schema:
type: integer
X-Rate-Limit-Ref:
$ref: '#/components/headers/X-Rate-Limit'
content:
application/json:
schema:
Expand Down Expand Up @@ -97,6 +99,11 @@ paths:
200:
description: OK
components:
headers:
X-Rate-Limit:
description: "The number of allowed requests in the current period"
schema:
type: integer
schemas:
stringWithMinLength:
type: string
Expand Down