Skip to content

Commit 0682462

Browse files
jminiwing328
authored andcommitted
[html] Use ModelUtils to avoid NullPointerException (#1948)
1 parent c163542 commit 0682462

File tree

2 files changed

+14
-1
lines changed

2 files changed

+14
-1
lines changed

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/StaticHtmlGenerator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ public void preprocessOpenAPI(OpenAPI openAPI) {
194194
Info info = openAPI.getInfo();
195195
info.setDescription(toHtml(info.getDescription()));
196196
info.setTitle(toHtml(info.getTitle()));
197-
Map<String, Schema> models = openAPI.getComponents().getSchemas();
197+
Map<String, Schema> models = ModelUtils.getSchemas(openAPI);
198198
for (Schema model : models.values()) {
199199
model.setDescription(toHtml(model.getDescription()));
200200
model.setTitle(toHtml(model.getTitle()));

modules/openapi-generator/src/test/java/org/openapitools/codegen/html/StaticHtmlGeneratorTest.java

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,13 @@
1717

1818
package org.openapitools.codegen.html;
1919

20+
import io.swagger.parser.OpenAPIParser;
21+
import io.swagger.v3.oas.models.OpenAPI;
2022
import io.swagger.v3.oas.models.media.IntegerSchema;
2123
import io.swagger.v3.oas.models.media.ObjectSchema;
2224
import io.swagger.v3.oas.models.media.Schema;
2325
import io.swagger.v3.oas.models.media.StringSchema;
26+
import io.swagger.v3.parser.core.models.ParseOptions;
2427

2528
import org.openapitools.codegen.CodegenModel;
2629
import org.openapitools.codegen.languages.StaticHtmlGenerator;
@@ -43,4 +46,14 @@ public void testAdditionalPropertiesFalse() {
4346
Assert.assertNotNull(cm);
4447
}
4548

49+
@Test
50+
public void testSpecWithoutSchema() throws Exception {
51+
final OpenAPI openAPI = new OpenAPIParser().readLocation("src/test/resources/3_0/ping.yaml", null, new ParseOptions()).getOpenAPI();
52+
53+
final StaticHtmlGenerator codegen = new StaticHtmlGenerator();
54+
codegen.preprocessOpenAPI(openAPI);
55+
56+
Assert.assertEquals(openAPI.getInfo().getTitle(), "ping test");
57+
}
58+
4659
}

0 commit comments

Comments
 (0)