From 9c56bb63d8fc5834e111045f83d38dc60ef38e9b Mon Sep 17 00:00:00 2001 From: Lars Wander Date: Fri, 14 Jul 2017 07:07:19 -0700 Subject: [PATCH] [Java] Escape descriptions in javadocs (#6040) 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. --- .../swagger-codegen/src/main/resources/Java/modelEnum.mustache | 2 +- modules/swagger-codegen/src/main/resources/Java/pojo.mustache | 2 +- .../src/main/java/io/swagger/client/model/ModelReturn.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/swagger-codegen/src/main/resources/Java/modelEnum.mustache b/modules/swagger-codegen/src/main/resources/Java/modelEnum.mustache index 6ceb8e8e8b0..209d310172b 100644 --- a/modules/swagger-codegen/src/main/resources/Java/modelEnum.mustache +++ b/modules/swagger-codegen/src/main/resources/Java/modelEnum.mustache @@ -11,7 +11,7 @@ import com.google.gson.stream.JsonWriter; {{/gson}} /** - * {{^description}}Gets or Sets {{{name}}}{{/description}}{{#description}}{{{description}}}{{/description}} + * {{^description}}Gets or Sets {{{name}}}{{/description}}{{#description}}{{description}}{{/description}} */ {{#gson}} @JsonAdapter({{#datatypeWithEnum}}{{{.}}}{{/datatypeWithEnum}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}}.Adapter.class) diff --git a/modules/swagger-codegen/src/main/resources/Java/pojo.mustache b/modules/swagger-codegen/src/main/resources/Java/pojo.mustache index 78a36f61a0d..d0a4c70f3a8 100644 --- a/modules/swagger-codegen/src/main/resources/Java/pojo.mustache +++ b/modules/swagger-codegen/src/main/resources/Java/pojo.mustache @@ -80,7 +80,7 @@ public class {{classname}} {{#parent}}extends {{{parent}}} {{/parent}}{{#parcela {{/isReadOnly}} /** {{#description}} - * {{{description}}} + * {{description}} {{/description}} {{^description}} * Get {{name}} diff --git a/samples/client/petstore-security-test/java/okhttp-gson/src/main/java/io/swagger/client/model/ModelReturn.java b/samples/client/petstore-security-test/java/okhttp-gson/src/main/java/io/swagger/client/model/ModelReturn.java index f5e8e737d41..9a210422cb1 100644 --- a/samples/client/petstore-security-test/java/okhttp-gson/src/main/java/io/swagger/client/model/ModelReturn.java +++ b/samples/client/petstore-security-test/java/okhttp-gson/src/main/java/io/swagger/client/model/ModelReturn.java @@ -38,7 +38,7 @@ public class ModelReturn { } /** - * property description *_/ ' \" =end -- \\r\\n \\n \\r + * property description *_/ ' \" =end -- \\r\\n \\n \\r * @return _return **/ @ApiModelProperty(value = "property description *_/ ' \" =end -- \\r\\n \\n \\r")