From cdd104d3fb28b508113e0e73abee76ada3e9878f Mon Sep 17 00:00:00 2001 From: Paul Ebermann Date: Fri, 28 Aug 2015 19:39:01 +0200 Subject: [PATCH 1/2] Issue #1146: escape the response description. This prevents line breaks in string literals, which are not allowed in Java. --- .../src/main/java/io/swagger/codegen/DefaultCodegen.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java index aeca659e42a..b1b6566d0e9 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java @@ -963,7 +963,7 @@ public class DefaultCodegen { } else { r.code = responseCode; } - r.message = response.getDescription(); + r.message = escapeText(response.getDescription()); r.schema = response.getSchema(); r.examples = toExamples(response.getExamples()); r.jsonSchema = Json.pretty(response); From 74bffbaadb89c9cde6fc2c27cf7c4755d9e024a5 Mon Sep 17 00:00:00 2001 From: Paul Ebermann Date: Fri, 28 Aug 2015 19:41:32 +0200 Subject: [PATCH 2/2] Issue #1146: fix indentation in the generated API file. --- .../swagger-codegen/src/main/resources/JavaJaxRS/api.mustache | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/api.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/api.mustache index a2213ea6086..65dfa6835bf 100644 --- a/modules/swagger-codegen/src/main/resources/JavaJaxRS/api.mustache +++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/api.mustache @@ -45,7 +45,7 @@ public class {{classname}} { public Response {{nickname}}({{#allParams}}{{>queryParams}}{{>pathParams}}{{>headerParams}}{{>bodyParams}}{{>formParams}}{{#hasMore}}, {{/hasMore}}{{/allParams}}) throws NotFoundException { - return delegate.{{nickname}}({{#allParams}}{{#isFile}}fileDetail{{/isFile}}{{^isFile}}{{paramName}}{{/isFile}}{{#hasMore}},{{/hasMore}}{{/allParams}}); + return delegate.{{nickname}}({{#allParams}}{{#isFile}}fileDetail{{/isFile}}{{^isFile}}{{paramName}}{{/isFile}}{{#hasMore}},{{/hasMore}}{{/allParams}}); } {{/operation}} }