From 60e5899dc355bdd4baab53432fe9ddf1dbb4509b Mon Sep 17 00:00:00 2001 From: Tony Tam Date: Fri, 3 Apr 2015 23:02:38 -0700 Subject: [PATCH] updated codegen --- .../java/com/wordnik/swagger/codegen/CodegenConfig.java | 1 + .../java/com/wordnik/swagger/codegen/DefaultGenerator.java | 6 +++++- .../swagger/codegen/languages/SpringfoxServerCodegen.java | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/CodegenConfig.java b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/CodegenConfig.java index 86ff0f16650..ca73a819fb5 100644 --- a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/CodegenConfig.java +++ b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/CodegenConfig.java @@ -22,6 +22,7 @@ public interface CodegenConfig { String toApiVarName(String name); String toModelName(String name); String toParamName(String name); + String escapeText(String text); String escapeReservedWord(String name); String getTypeDeclaration(Property p); String getTypeDeclaration(String name); diff --git a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/DefaultGenerator.java b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/DefaultGenerator.java index 1937b03ca53..fa0212eb7e3 100644 --- a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/DefaultGenerator.java +++ b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/DefaultGenerator.java @@ -67,7 +67,11 @@ public class DefaultGenerator extends AbstractGenerator implements Generator { config.additionalProperties().put("appVersion", info.getVersion()); } if (info.getDescription() != null) { - config.additionalProperties().put("appDescription", info.getDescription()); + System.out.println(info.getDescription()); + System.out.println("escaped"); + System.out.println(config.escapeText(info.getDescription())); + config.additionalProperties().put("appDescription", + config.escapeText(info.getDescription())); } if (info.getContact() != null) { Contact contact = info.getContact(); diff --git a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/SpringfoxServerCodegen.java b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/SpringfoxServerCodegen.java index 0e278267bd3..0f210a33b3e 100644 --- a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/SpringfoxServerCodegen.java +++ b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/SpringfoxServerCodegen.java @@ -20,7 +20,7 @@ public class SpringfoxServerCodegen extends JavaClientCodegen implements Codegen protected String configPackage = ""; public CodegenType getTag() { - return CodegenType.OTHER; + return CodegenType.SERVER; } public String getName() {