loafle/openapi-generator
3
0
Fork 0
forked from loafle/openapi-generator-original
Code Pull Requests Activity

[Java] Escape descriptions in javadocs (#6040)

Browse Source 
The [java8 doclint](http://openjdk.java.net/jeps/172) rejects unescaped
HTML chars such as `<`, making some generated clients unbuildable with
java8. Seems a few property descriptions were using the `{{{` instead
of `{{` preventing those HTML chars from being escaped properly.
This commit is contained in:
Lars Wander 2017-07-14 07:07:19 -07:00 committed by wing328
parent b024d86eab
commit 9c56bb63d8
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/swagger-codegen/src/main/resources/Java/modelEnum.mustache
View File

@ -11,7 +11,7 @@ import com.google.gson.stream.JsonWriter;
{{/gson}} {{/gson}}
/** /**
* {{^description}}Gets or Sets {{{name}}}{{/description}}{{#description}}{{{description}}}{{/description}} * {{^description}}Gets or Sets {{{name}}}{{/description}}{{#description}}{{description}}{{/description}}
*/ */
{{#gson}} {{#gson}}
@JsonAdapter({{#datatypeWithEnum}}{{{.}}}{{/datatypeWithEnum}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}}.Adapter.class) @JsonAdapter({{#datatypeWithEnum}}{{{.}}}{{/datatypeWithEnum}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}}.Adapter.class)

2
modules/swagger-codegen/src/main/resources/Java/pojo.mustache
View File

@ -80,7 +80,7 @@ public class {{classname}} {{#parent}}extends {{{parent}}} {{/parent}}{{#parcela
{{/isReadOnly}} {{/isReadOnly}}
/** /**
{{#description}} {{#description}}
* {{{description}}} * {{description}}
{{/description}} {{/description}}
{{^description}} {{^description}}
* Get {{name}} * Get {{name}}

2
samples/client/petstore-security-test/java/okhttp-gson/src/main/java/io/swagger/client/model/ModelReturn.java
View File

@ -38,7 +38,7 @@ public class ModelReturn {
} }
/** /**
* property description *_/ ' \" =end -- \\r\\n \\n \\r * property description *_/ &#39; \&quot; &#x3D;end -- \\r\\n \\n \\r
* @return _return * @return _return
**/ **/
@ApiModelProperty(value = "property description *_/ ' \" =end -- \\r\\n \\n \\r") @ApiModelProperty(value = "property description *_/ ' \" =end -- \\r\\n \\n \\r")