Commit Graph

7 Commits

Author SHA1 Message Date
Tony Tam
ac7856d009 formatting 2015-12-30 12:27:31 -08:00
xhh
ba549a966e Merge branch 'master' into not-escape-enum-value
Conflicts:
	modules/swagger-codegen/src/main/resources/Java/enumClass.mustache
2015-11-30 21:00:05 +08:00
xhh
7731bc9d37 Fix issue of escaping HTML elements in enum values
See swagger-api/swagger-editor#727
2015-11-27 17:32:31 +08:00
dantran
dfda666806 Honor Enum's value 2015-11-26 21:57:37 -08:00
xhh
6dcaa890cf Improvements on enum var name in Java client
* Place each enum var in a separate line
* Truncate common prefix when present
2015-09-21 17:29:26 +08:00
xhh
2c64e0893b Fix bug of hard-coded enum name in Java client 2015-09-01 20:06:44 +08:00
xhh
8408a97aef Java: Support special characters in enum values
and use upper case for enum names

Conflicts:
	samples/client/petstore/java/default/src/main/java/io/swagger/client/JSON.java
	samples/client/petstore/java/default/src/main/java/io/swagger/client/model/Order.java
	samples/client/petstore/java/default/src/main/java/io/swagger/client/model/Pet.java
2015-08-24 18:21:16 +08:00