William Cheng
ce899e3776
Merge remote-tracking branch 'origin/master' into 2.3.0
...
Conflicts:
appveyor.yml
modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AbstractJavaCodegen.java
modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AbstractTypeScriptClientCodegen.java
modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaClientCodegen.java
modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SpringCodegen.java
modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/TypeScriptAngular2ClientCodegen.java
modules/swagger-codegen/src/main/resources/Java/libraries/feign/pom.mustache
modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/pom.mustache
modules/swagger-codegen/src/main/resources/TypeScript-Fetch/api.mustache
modules/swagger-codegen/src/main/resources/go/api.mustache
modules/swagger-codegen/src/main/resources/objc/api-body.mustache
modules/swagger-codegen/src/main/resources/objc/api-header.mustache
modules/swagger-codegen/src/main/resources/typescript-angular2/configuration.mustache
modules/swagger-codegen/src/main/resources/typescript-angular2/tsconfig.mustache
modules/swagger-codegen/src/test/java/io/swagger/codegen/swift/SwiftModelTest.java
modules/swagger-codegen/src/test/java/io/swagger/codegen/swift3/Swift3ModelTest.java
modules/swagger-codegen/src/test/java/io/swagger/codegen/typescript/typescriptangular2/TypeScriptAngular2ModelTest.java
samples/client/petstore-security-test/typescript-angular2/configuration.ts
samples/client/petstore/go/go-petstore/docs/FakeApi.md
samples/client/petstore/go/go-petstore/fake_api.go
samples/client/petstore/go/go-petstore/pet_api.go
samples/client/petstore/java/feign/pom.xml
samples/client/petstore/java/feign/src/main/java/io/swagger/client/api/FakeApi.java
samples/client/petstore/java/feign/src/main/java/io/swagger/client/api/PetApi.java
samples/client/petstore/java/jersey1/src/main/java/io/swagger/client/api/FakeApi.java
samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/RFC3339DateFormat.java
samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/model/Animal.java
samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/model/EnumTest.java
samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/model/FormatTest.java
samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/api/FakeApi.java
samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/JSON.java
samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/api/FakeApi.java
samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/api/PetApi.java
samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/api/FakeApi.java
samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/api/PetApi.java
samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/api/FakeApi.java
samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/api/FakeApi.java
samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/api/PetApi.java
samples/client/petstore/objc/core-data/SwaggerClient/Api/SWGPetApi.h
samples/client/petstore/objc/core-data/SwaggerClient/Api/SWGPetApi.m
samples/client/petstore/objc/core-data/SwaggerClient/Api/SWGStoreApi.h
samples/client/petstore/objc/core-data/SwaggerClient/Api/SWGStoreApi.m
samples/client/petstore/objc/core-data/SwaggerClient/Api/SWGUserApi.h
samples/client/petstore/objc/core-data/SwaggerClient/Api/SWGUserApi.m
samples/client/petstore/objc/core-data/SwaggerClient/Core/SWGApiClient.h
samples/client/petstore/objc/core-data/SwaggerClient/Core/SWGConfiguration.h
samples/client/petstore/objc/default/SwaggerClient/Api/SWGPetApi.h
samples/client/petstore/objc/default/SwaggerClient/Api/SWGPetApi.m
samples/client/petstore/objc/default/SwaggerClient/Api/SWGStoreApi.h
samples/client/petstore/objc/default/SwaggerClient/Api/SWGStoreApi.m
samples/client/petstore/objc/default/SwaggerClient/Api/SWGUserApi.h
samples/client/petstore/objc/default/SwaggerClient/Api/SWGUserApi.m
samples/client/petstore/objc/default/SwaggerClient/Core/SWGApiClient.h
samples/client/petstore/objc/default/SwaggerClient/Core/SWGConfiguration.h
samples/client/petstore/objc/default/SwaggerClient/Core/SWGJSONResponseSerializer.h
samples/client/petstore/qt5cpp/client/SWGPetApi.h
samples/client/petstore/qt5cpp/client/SWGStoreApi.h
samples/client/petstore/qt5cpp/client/SWGUserApi.h
samples/client/petstore/typescript-angular2/default/configuration.ts
samples/client/petstore/typescript-angular2/npm/README.md
samples/client/petstore/typescript-angular2/npm/configuration.ts
samples/client/petstore/typescript-angular2/npm/package.json
samples/client/petstore/typescript-angular2/npm/tsconfig.json
samples/client/petstore/typescript-fetch/builds/default/api.ts
samples/client/petstore/typescript-fetch/builds/es6-target/api.ts
samples/client/petstore/typescript-fetch/builds/with-npm-version/api.ts
samples/client/petstore/typescript-fetch/tests/default/test/PetApiFactory.ts
samples/client/petstore/typescript-fetch/tests/default/test/StoreApiFactory.ts
samples/server/petstore/jaxrs-resteasy/default/src/gen/java/io/swagger/api/PetApi.java
samples/server/petstore/jaxrs-resteasy/default/src/gen/java/io/swagger/api/PetApiService.java
samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/io/swagger/model/User.java
samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/FakeApi.java
samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/FakeApiController.java
samples/server/petstore/springboot/src/main/java/io/swagger/api/FakeApi.java
samples/server/petstore/springboot/src/main/java/io/swagger/api/FakeApiController.java
2017-01-05 17:44:39 +08:00
wing328
a143e9c10c
add int/long check for @min/@max in java model ( #4395 )
2016-12-14 22:21:52 +08:00
menchauser
6ebc2fc051
Fix support for 'class' properties in Java codegen ( #4237 )
...
* Fix support for 'class' properties in Java codegen
Currently Java codegen works successfully for property named 'class' but
fails on '_class', '__class', etc, because of 'Object.getClass()'
overloading.
This fix is intended to avoid all Object method overloading cases.
* Regenerated samples for Java petstore-security-test
2016-11-23 00:18:40 +08:00
wing328
4e2c037e21
[Java] fix Java (Jersey1.x) test case ( #4239 )
...
* fix java jersey 1 test case
* fix test for java jersey2.x api client
2016-11-23 00:16:28 +08:00
wing328
90512e6326
Remove Apache license from API client generators ( #4197 )
...
* remove php apache license
* remove apache license from C#
* remove apache license in objc code
* remove license from swift 3 code
* remove apache license from perl code
* remove license from scala code
* remove license from ts, go, android, cpp, scala
* remove license from java api client
* restore clojure petstore files
* remove license from travis file
* clean up apache-related terms in php, ruby, python mustache tempaltes
* remove license from JS API cilent
2016-11-16 21:44:49 +08:00
Christophe Bornet
70d93883cf
[Java] Threetenbp dates support ( #4029 )
...
* [feign] add threetenbp support for feign clients
* [okhttp] add threetenbp support for okhttp clients
* [jersey] add threetenbp support for jersey clients
* [retrofit2] add threetenbp support for retrofit2 clients
* [spring] add threetenbp support for spring generators
* add a workaround in tests for a bug in the petstore
The petstore doesn't manage fractional digits of dates correctly when there are less than 3
2016-11-04 17:55:16 +08:00
wing328
a6287bed1d
Merge branch '2.3.0' of https://github.com/swagger-api/swagger-codegen into 2.3.0
2016-10-02 17:24:37 +08:00
wing328
f59c28d08a
escape callback parameter for java(okhttp) and python
2016-09-29 17:41:47 +08:00
Brent Ryan
d334524adc
Re-apply fix after major conflicts upstream
2016-09-17 16:06:23 -04:00
Ville Skyttä
0363858672
java: Javadoc fixes
2016-09-01 18:07:35 +03:00
wing328
670f103859
better enum naming for symbol (java)
2016-08-04 16:37:48 +08:00
wing328
1fde95f997
fix java okhttp (array of enum property)
2016-08-03 01:36:34 +08:00
wing328
25fa3e86f9
add enumName to store the enum prefix
2016-08-03 01:36:13 +08:00
cbornet
421c462ba9
set supportInheritance to true for java based gens
2016-07-18 16:33:20 +02:00
wing328
9e0c865c08
update java petstore sample
2016-07-15 17:45:06 +08:00
wing328
3b780e30d8
change java default lib to okhttp-gson
2016-07-07 15:53:16 +08:00
wing328
aaf7b99220
comment out test case for map of map of enum as many lang don't support
2016-06-29 17:46:45 +08:00
wing328
77c4164b3c
better code injection handling for java
2016-06-29 02:00:43 +08:00
wing328
8283b701e8
fix java property with the name "class"
2016-06-20 14:51:17 +08:00
cbornet
61884211bb
add joda support to okhttp-gson and use it in the samples
2016-06-09 18:20:52 +02:00
wing328
73ab94dfbf
fix sbt build for okhttp-gson
2016-05-31 22:22:54 +08:00
xhh
020a9fcdc0
Fix enum model docs for JS and Java clients
2016-05-06 18:41:15 +08:00
wing328
fc982d1205
add new files for java petstore
2016-05-03 11:20:44 +08:00
wing328
3913388331
fix java okhttp enum mismatche tab
2016-05-03 11:19:59 +08:00
wing328
8c27f296fb
update maven and gradle version for java api client
2016-04-22 23:13:12 +08:00
wing328
fb04bb7d4d
Revert "Revert "[Java] Add auto-generated documentation in Markdown to Java clients""
2016-04-22 10:13:54 +08:00
wing328
c171356d24
Revert "[Java] Add auto-generated documentation in Markdown to Java clients"
2016-04-22 00:21:04 +08:00
xhh
f8489c1fcf
Fix typo, regenerate Java petstore clients
2016-04-21 18:34:00 +08:00
xhh
a3f57d6cbd
Escape model name in Java okhttp-gson client
2016-04-19 20:29:49 +08:00
xhh
f10d4c8e23
Merge branch 'master' into java-docs
...
Conflicts:
modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaClientCodegen.java
samples/client/petstore/java/default/pom.xml
samples/client/petstore/java/default/src/main/java/io/swagger/client/model/Animal.java
samples/client/petstore/java/default/src/main/java/io/swagger/client/model/Cat.java
samples/client/petstore/java/default/src/main/java/io/swagger/client/model/Dog.java
samples/client/petstore/java/default/src/main/java/io/swagger/client/model/Name.java
samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Name.java
samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/Cat.java
samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/Dog.java
samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/Name.java
samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/StringUtil.java
samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/Model200Response.java
samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/ModelReturn.java
samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/Name.java
samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/StringUtil.java
samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/Model200Response.java
samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/ModelReturn.java
samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/Name.java
samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/StringUtil.java
samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/Model200Response.java
samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/ModelReturn.java
samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/Name.java
2016-04-19 20:19:10 +08:00
xhh
7a0eef61d0
Add enum to Java docs
...
* Parameter enum values
* Inner enum class (model property)
* Outer enum class (enum model/definition)
2016-03-29 18:17:51 +08:00
xhh
df7c255cd4
Java client: generate markdown docs for jersey2 and okhttp-gson clients
2016-03-23 20:32:33 +08:00
