Skip to content

Commit 409369b

Browse files
authored
Merge pull request #748 from swagger-api/html2_examples
fixed examples in html2 generator
2 parents 3fd5cd3 + 74cb77f commit 409369b

File tree

2 files changed

+22
-3
lines changed

2 files changed

+22
-3
lines changed

src/main/java/io/swagger/codegen/v3/generators/DefaultCodegenConfig.java

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2290,7 +2290,26 @@ public CodegenResponse fromResponse(String responseCode, ApiResponse response) {
22902290
final Schema responseSchema = getSchemaFromResponse(response);
22912291
codegenResponse.schema = responseSchema;
22922292
codegenResponse.message = escapeText(response.getDescription());
2293-
// TODO: codegenResponse.examples = toExamples(response.getExamples());
2293+
2294+
if (response.getContent()!= null) {
2295+
Map<String, Object> examples = new HashMap<>();
2296+
for (String name : response.getContent().keySet()) {
2297+
if (response.getContent().get(name) != null) {
2298+
2299+
if (response.getContent().get(name).getExample() != null) {
2300+
examples.put(name, response.getContent().get(name).getExample());
2301+
}
2302+
if (response.getContent().get(name).getExamples() != null) {
2303+
2304+
for (String exampleName : response.getContent().get(name).getExamples().keySet()) {
2305+
examples.put(exampleName, response.getContent().get(name).getExamples().get(exampleName).getValue());
2306+
}
2307+
}
2308+
}
2309+
}
2310+
codegenResponse.examples = toExamples(examples);
2311+
}
2312+
22942313
codegenResponse.jsonSchema = Json.pretty(response);
22952314
if (response.getExtensions() != null && !response.getExtensions().isEmpty()) {
22962315
codegenResponse.vendorExtensions.putAll(response.getExtensions());

src/main/resources/handlebars/htmlDocs2/index.mustache

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -335,7 +335,7 @@
335335

336336
{{#examples}}
337337
<li class="">
338-
<a data-toggle="tab" href="#responses-{{nickname}}-{{code}}-example">Response Example</a>
338+
<a data-toggle="tab" href="#responses-{{nickname}}-{{code}}-example-{{@index}}">Response Example</a>
339339
</li>
340340
{{/examples}}
341341
{{/schema}}
@@ -376,7 +376,7 @@
376376
<input id='responses-{{nickname}}-{{code}}-schema-data' type='hidden' value=''></input>
377377
</div>
378378
{{#examples}}
379-
<div class="tab-pane" id="responses-{{nickname}}-{{code}}-example">
379+
<div class="tab-pane" id="responses-{{nickname}}-{{code}}-example-{{@index}}">
380380
<pre class="prettyprint"><code class="json">{{example}}</code></pre>
381381
</div>
382382
{{/examples}}

0 commit comments

Comments
 (0)