Merge pull request #1431 from wing328/fix_empty_operation_id

wing328 · wing328 · commit d2faa63ebc1f · 2015-10-23T18:47:04.000+08:00
Better error message for empty operationId
diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultGenerator.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultGenerator.java
@@ -604,7 +604,8 @@ public void processOperation(String resourcePath, String httpMethod, Operation o
                         + "  Tag: " + tag + "\n"//
                         + "  Operation: " + operation.getOperationId() + "\n" //
                         + "  Resource: " + httpMethod + " " + resourcePath + "\n"//
-                        + "  Definitions: " + swagger.getDefinitions();
+                        + "  Definitions: " + swagger.getDefinitions() + "\n"  //
+                        + "  Exception: " + ex.getMessage();
                     throw new RuntimeException(msg, ex);
                 }
             }
diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaClientCodegen.java
@@ -378,7 +378,7 @@ public String getSwaggerType(Property p) {
     public String toOperationId(String operationId) {
         // throw exception if method name is empty
         if (StringUtils.isEmpty(operationId)) {
-            throw new RuntimeException("Empty method name (operationId) not allowed");
+            throw new RuntimeException("Empty method/operation name (operationId) not allowed");
         }
 
         // method name cannot use reserved keyword, e.g. return

Original file line number	Diff line number	Diff line change
`@@ -604,7 +604,8 @@ public void processOperation(String resourcePath, String httpMethod, Operation o`
`604`	`604`	`+ " Tag: " + tag + "\n"//`
`605`	`605`	`+ " Operation: " + operation.getOperationId() + "\n" //`
`606`	`606`	`+ " Resource: " + httpMethod + " " + resourcePath + "\n"//`
`607`		`- + " Definitions: " + swagger.getDefinitions();`
	`607`	`+ + " Definitions: " + swagger.getDefinitions() + "\n" //`
	`608`	`+ + " Exception: " + ex.getMessage();`
`608`	`609`	`throw new RuntimeException(msg, ex);`
`609`	`610`	`}`
`610`	`611`	`}`
Original file line number	Diff line number	Diff line change
`@@ -378,7 +378,7 @@ public String getSwaggerType(Property p) {`
`378`	`378`	`public String toOperationId(String operationId) {`
`379`	`379`	`// throw exception if method name is empty`
`380`	`380`	`if (StringUtils.isEmpty(operationId)) {`
`381`		`- throw new RuntimeException("Empty method name (operationId) not allowed");`
	`381`	`+ throw new RuntimeException("Empty method/operation name (operationId) not allowed");`
`382`	`382`	`}`
`383`	`383`
`384`	`384`	`// method name cannot use reserved keyword, e.g. return`