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
131cbeb350
remove generation timestamp
2016-12-15 19:34:15 +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
c1e6f00242
Merge remote-tracking branch 'origin/master' into 2.3.0
2016-11-02 15:43:00 +08:00
raj k
23fee386f2
Vendor Mime-type support in retrofit2
2016-10-19 16:19:41 -07:00
wing328
b3caf1d0c0
Merge remote-tracking branch 'origin/master' into 2.3.0
2016-10-12 17:54:16 +08:00
wing328
47d3c3a767
update retrofit1,2 samples
2016-10-12 15:48:34 +08:00
wing328
21dec4dbbc
Merge branch 'gson_date' of https://github.com/cbornet/swagger-codegen into cbornet-gson_date
2016-10-11 00:32:20 +08:00
Stas Shakirov
26faf6cf4e
remove newline char in *.mustache; added generated code
2016-10-10 14:42:08 +03: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
Kamil
9301db60e6
redundant quotation mark ( #3837 )
...
* Removed redundant quotation mark
This additional quotation mark is causing problems in out project and should be removed.
ngrep output:
```
Content-Disposition: form-data; name="file"; filename="file""
..Content-Transfer-Encoding: binary..Content-Type: image/jpg..Content-Length: 27855..........JFIF....
```
* updated petstore sample
* removed line break
2016-09-23 18:33:27 +08:00
Brent Ryan
d334524adc
Re-apply fix after major conflicts upstream
2016-09-17 16:06:23 -04:00
cbornet
f5f959716e
[retrofit2] use gson ISO8601Utils to parse dates
...
See #3727
2016-09-13 21:29:02 +02:00
Ville Skyttä
0363858672
java: Javadoc fixes
2016-09-01 18:07:35 +03:00
wing328
453f80a1d3
add new java client files
2016-08-09 18:59:59 +08:00
Cliffano Subagio
3f7127b042
[Java] Add maven-javadoc-plugin to all Java clients. ( #3503 )
...
* Add maven-javadoc-plugin to all Java clients.
* Update sample petstores for other Java clients.
* Fix unknown parameter on api_client's update_params_for_auth method.
* Revert "Fix unknown parameter on api_client's update_params_for_auth method."
To be moved to a separate PR.
This reverts commit 1ee186694241bb6d9a0dccefcdca5afe3f5a1dd2.
2016-08-08 18:27:05 +08:00
wing328
d8cdcbf042
fix jsoncreator annotation issue with java api clients using gson
2016-08-08 00:16:12 +08:00
cbornet
3b4465d999
add fluent methods to add items to list and put items to maps
2016-07-27 18:18:48 +02: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
Bochun Bai
f75a42f810
Remove more Java String comparison using "=="
2016-07-13 18:06:45 +08:00
wing328
430f49aae6
fix javadoc error
2016-07-05 20:38:04 +08:00
wing328
5e6a6de351
fix javadoc error
2016-07-05 19:38:33 +08:00
wing328
5608c73938
update pom to cover gralde, sbt, javadoc test
2016-07-05 17:59:13 +08:00
wing328
dfc05f4bba
fix doc warning in java retrofit2 client
2016-07-05 17:49:50 +08:00
cbornet
f54b505704
use okttp builder instead of instance in retrofit2
...
Fix #3188
2016-06-29 17:07:39 +02:00
cbornet
48564079be
add support for jsr310 dates to retrofit2 client
...
See #2874
2016-06-20 14:32:18 +02:00
wing328
8283b701e8
fix java property with the name "class"
2016-06-20 14:51:17 +08:00
cbornet
0f3569e982
set joda as default dateLibrary for java codegens that support it
...
Fix #3087
2016-06-10 12:17:36 +02:00
cbornet
acf17c85ad
add joda support to retrofit clients and use it in samples
...
also adds back the petstore tests
2016-06-08 18:50:49 +02:00
clasnake
503fb138f5
Add sbt support for retrofit2 and retrofit2rx.
2016-06-04 21:13:10 +08:00
zhenjun115
09a29063be
add markdown docs for java api client using retrofit2;
2016-05-25 23:44:44 +08:00
zhenjun115
a093e7b74d
gradle wrapper for java api client;
2016-05-17 23:40:57 +08:00
cbornet
596a076077
fix wrong method call
2016-05-17 10:35:37 +02:00
cbornet
fc1d06d810
update retrofit2 samples
2016-05-17 10:25:52 +02:00
Aditya Kajla
5633fdfb3d
Java: Add basic junit test templates for api clients
2016-05-16 17:55:29 -07: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
6370165912
fix retrofit 1, 2 java sample
2016-05-03 11:19:59 +08:00
wing328
3913388331
fix java okhttp enum mismatche tab
2016-05-03 11:19:59 +08:00
Silvio Heuberger
39c08b2cfc
Regenrate samples after updating the libraries in pom and build.gradle mustache
2016-04-27 10:03:45 +02: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
ad258a34cc
Fix test cases for Java petstore clients
2016-04-21 18:14:11 +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