Skip to content

Fix: Inline models can't be generated #1768

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
wing328 merged 5 commits into from
Dec 31, 2018
Merged

Fix: Inline models can't be generated #1768

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
aa272e7
Add a test case
ackintosh Dec 28, 2018
3b4d6dd
Fix that the inline models couldn't be flatten when "components" does…
ackintosh Dec 28, 2018
1b3c860
Rename yaml file
ackintosh Dec 28, 2018
2511af4
Rename method name
ackintosh Dec 28, 2018
b79d484
Merge branch 'master' into fix-inline-model-resolver
wing328 Dec 31, 2018
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
3 changes: 2 additions & 1 deletion modules/openapi-generator/src/main/java/org/openapitools/codegen/InlineModelResolver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@

package org.openapitools.codegen;

import io.swagger.v3.oas.models.Components;
import io.swagger.v3.oas.models.OpenAPI;
import io.swagger.v3.oas.models.media.Schema;
import io.swagger.v3.oas.models.media.ArraySchema;
Expand Down Expand Up @@ -49,7 +50,7 @@ void flatten(OpenAPI openapi) {
this.openapi = openapi;

if (openapi.getComponents() == null) {
return; // There's nothing here
openapi.setComponents(new Components());
}

if (openapi.getComponents().getSchemas() == null) {
Expand Down
12 changes: 12 additions & 0 deletions ...les/openapi-generator/src/test/java/org/openapitools/codegen/InlineModelResolverTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,9 @@
import io.swagger.v3.oas.models.responses.ApiResponse;
import io.swagger.v3.oas.models.responses.ApiResponses;
import io.swagger.v3.parser.core.models.ParseOptions;
import org.apache.commons.lang3.StringUtils;
import org.openapitools.codegen.utils.ModelUtils;
import org.testng.Assert;
import org.testng.annotations.Test;

import java.util.HashMap;
Expand Down Expand Up @@ -274,6 +276,16 @@ public void testInlineResponseModelWithTitle() throws Exception {
assertTrue(model.getProperties().get("name") instanceof StringSchema);
}

@Test
public void resolveInlineRequestBodyWhenNoComponents() {
OpenAPI openAPI = new OpenAPIParser().readLocation("src/test/resources/3_0/inline_request_body_no_components.yaml", null, new ParseOptions()).getOpenAPI();
new InlineModelResolver().flatten(openAPI);

assertNotNull(openAPI.getComponents());
assertNotNull(openAPI.getComponents().getRequestBodies());
}

/*
@Test
public void resolveInlineArraySchemaWithTitle() {
OpenAPI openAPI = new OpenAPIParser().readLocation("src/test/resources/3_0/inline_model_resolver.yaml", null, new ParseOptions()).getOpenAPI();
Expand Down
24 changes: 24 additions & 0 deletions modules/openapi-generator/src/test/resources/3_0/inline_request_body_no_components.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
openapi: 3.0.1
info:
version: 1.0.0
title: Example
license:
name: MIT
servers:
- url: http://api.example.xyz/v1
paths:
/test1:
post:
requestBody:
description: test
content:
application/json:
schema:
type: object
properties:
name:
type: string
operationId: test1
responses:
'200':
description: OK