From d0baa48fcdbb19dd9ab065baba544490e975007e Mon Sep 17 00:00:00 2001 From: wing328 Date: Mon, 27 Jul 2015 11:21:51 +0800 Subject: [PATCH] fix empty operationId --- .../java/io/swagger/codegen/DefaultCodegen.java | 16 +++++++++++++--- .../main/java/io/swagger/client/model/Pet.java | 4 ++-- 2 files changed, 15 insertions(+), 5 deletions(-) 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 bc4f08d7f55..75ea2af9d62 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 @@ -1278,9 +1278,8 @@ public class DefaultCodegen { } else { m.emptyVars = true; } - } public static String camelize(String word) { - return camelize(word, false); } + /** * Remove characters not suitable for variable or method name from the input and camelize it @@ -1301,7 +1300,18 @@ public class DefaultCodegen { name = name.substring(0, 1).toLowerCase() + name.substring(1); } return name; - } public static String camelize(String word, boolean lowercaseFirstLetter) { + } + + public static String camelize(String word) { + return camelize(word, false); + } + + public static String camelize(String word, boolean lowercaseFirstLetter) { + // throw exception if method name is empty + if (StringUtils.isEmpty(word)) { + throw new RuntimeException("Empty method name (operationId) not allowed"); + } + // Replace all slashes with dots (package separator) Pattern p = Pattern.compile("\\/(.?)"); Matcher m = p.matcher(word); diff --git a/samples/client/petstore/java/src/main/java/io/swagger/client/model/Pet.java b/samples/client/petstore/java/src/main/java/io/swagger/client/model/Pet.java index cf7ace02309..d7c2038dead 100644 --- a/samples/client/petstore/java/src/main/java/io/swagger/client/model/Pet.java +++ b/samples/client/petstore/java/src/main/java/io/swagger/client/model/Pet.java @@ -14,8 +14,8 @@ public class Pet { private Long id = null; private Category category = null; private String name = null; - private List photoUrls = new ArrayList() ; - private List tags = new ArrayList() ; + private List photoUrls = new ArrayList(); + private List tags = new ArrayList(); public enum StatusEnum { available, pending, sold, };