Paul Ebermann
21b70a2dad
Fix broken okhttp-gson merge.
2017-03-16 14:49:49 +01:00
Paŭlo Ebermann
9be178b26a
Merge branch 'master' into new-sync-master-to-2.3.0
2017-03-13 21:42:41 +01:00
wing328
1f7374957e
fix java retrofit2 apiclient due to bad merge
2017-03-14 01:11:50 +08:00
wing328
f1e237f76f
resolve java okhttp issue due to merge conflicts
2017-03-14 00:09:01 +08:00
wing328
7733dba002
Merge branch '2-call-visibility' of https://github.com/jdupouy/swagger-codegen into jdupouy-2-call-visibility2
2017-03-13 00:21:22 +08:00
XuXinkun
3c1a8daaf9
fix handleResponse to not leak okhttp connections ( #4997 )
2017-03-11 17:02:49 +08:00
Julien Dupouy
3da8654336
Change build call visibility
2017-03-10 18:05:27 +01:00
wing328
4fe79f0078
Remove default format (JSON) from API operations ( #4987 )
...
* remove default format (json) and update ruby petstore
* update python petstore sample
* update php petstore sample
* update android petstore sample
* update java petstore sample
* update objc sample
* remove default format (json) from perl
2017-03-09 11:12:01 +08:00
Michael Kourlas
2bb7626202
[Java] Fix for issue #3365 : Support for gzip compression ( #4967 )
...
* Fix for issue 3365 for Java
* Added tests
* Convert CRLF to LF
* Convert CRLF to LF in tests
2017-03-08 19:00:50 +08:00
jfiala
6383872b5f
update beanvalidation templates and sample for jersey2 #4719 ( #4735 )
2017-03-07 23:25:21 +08:00
Val Polouchkine
122194c30e
Fix typo ( #4956 )
...
Authorizatoin should be Authorization
2017-03-07 13:49:42 +08:00
Gábor Berényi
39a42d014b
Feature/issue 4698 rxjava2 support ( #4743 )
...
* rx2 support
* NO_NOT_USE_RX is for internal use only; plus sanity check if both v1 and v2 are specified
* minor fixes
* one more small fix
2017-03-03 17:00:20 +08:00
Tony Tam
894f272f89
updated core versions
2017-03-01 08:51:18 -05:00
wing328
8f2e9bce6d
remove trailing whitespaces in java api client ( #4784 )
2017-02-13 18:53:34 +08:00
wing328
acd10318f7
Merge remote-tracking branch 'origin' into sync_master_230
2017-02-10 23:31:36 +08:00
Jan
0d14496bd6
[Java-retrofit] Fix for #4750 String comparison with equals ( #4751 )
...
* [Java-Feign] Fixed String comparison using equals instead of == operator
* [Java-Feign] Updated ApiClient with ./bin/java-petstore-feign.sh
* [Java-retrofit] Fix for #4750 String comparison with equals
2017-02-08 21:54:56 +08:00
Jan
2179b44413
[Java-Feign] Fixed String comparison using equals instead of == operator ( #4740 )
...
* [Java-Feign] Fixed String comparison using equals instead of == operator
* [Java-Feign] Updated ApiClient with ./bin/java-petstore-feign.sh
2017-02-08 15:56:40 +08:00
wing328
a123dd7ef1
Revert "rx2 support" ( #4737 )
2017-02-07 17:52:47 +08:00
Gábor Berényi
d12f428f42
rx2 support ( #4708 )
...
* rx2 support
* NO_NOT_USE_RX is for internal use only; plus sanity check if both v1 and v2 are specified
2017-02-07 17:44:22 +08:00
Johannes Fiala
3ffc4bfa9d
backport support DecimalMin/DecimalMax #4091
2017-01-23 21:26:42 +01:00
wing328
5306b11b4a
[java] Improve pom.xml to qualify for publishing to Maven central ( #4616 )
...
* [java] Attach Javadoc to artifact generation.
* [java] Attach source to artifact generation.
* [java] Add gpg signing to artifact publishing.
* [java] Add artifact URL to pom.xml .
* [java] Add artifact description to pom.xml .
* [java] Add artifact URL and description params to Jax RSS.
* [java] Add developer info to pom.xml .
* [java] Parameterise SCM info in generated pom.xml .
* [java] Move GPG signing to verify phase so that .asc files are uploaded during deploy phase.
* [java] Change GPG signing to be an optional via Maven profile. Can't assume all users will perform a release/deploy from an environment with correct GPG key/pass.
* update java petstore smaples
* camelize tag name, remove invalid file
* add back missing files for okhttp-gson
* fix docstring in java feign client
* fix docstring with various java api clients
2017-01-22 11:40:59 +08:00
wing328
4d4af71446
[CI] Add scripts to detect carriage return and tab ( #4526 )
...
* add script to detect carriage return
* add check for generator as well
* add fail fast to travis config
* remove tab
* move scripts under bin/utils
* remove carriage return
* move scripts to bin/utils
2017-01-09 18:29:41 +08:00
Jeff Haynes
380bed15d3
Issue 4244 - Add x-discriminator-value ( #4252 )
...
* Fixes for issue 4226. Detects and warns about more than one inline object; sets discriminator on CodegenModel; Adds templates to other Java languages
Changes to be committed:
modified: modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java
modified: modules/swagger-codegen/src/main/resources/Java/typeInfoAnnotation.mustache
new file: modules/swagger-codegen/src/main/resources/JavaInflector/typeInfoAnnotation.mustache
new file: modules/swagger-codegen/src/main/resources/JavaJaxRS/typeInfoAnnotation.mustache
new file: modules/swagger-codegen/src/main/resources/JavaSpring/typeInfoAnnotation.mustache
* Add vendor extension for x-discriminator-value
Changes to be committed:
modified: modules/swagger-codegen/src/main/resources/Java/typeInfoAnnotation.mustache
modified: modules/swagger-codegen/src/main/resources/JavaInflector/typeInfoAnnotation.mustache
modified: modules/swagger-codegen/src/main/resources/JavaJaxRS/typeInfoAnnotation.mustache
modified: modules/swagger-codegen/src/main/resources/JavaSpring/typeInfoAnnotation.mustache
* Add "visible = true" to @JsonTypeInfo jackson annotations for Java languages
Changes to be committed:
modified: modules/swagger-codegen/src/main/resources/Java/typeInfoAnnotation.mustache
modified: modules/swagger-codegen/src/main/resources/JavaInflector/typeInfoAnnotation.mustache
modified: modules/swagger-codegen/src/main/resources/JavaJaxRS/typeInfoAnnotation.mustache
modified: modules/swagger-codegen/src/main/resources/JavaSpring/typeInfoAnnotation.mustache
2017-01-09 18:28:27 +08:00
Kevin Locke
409e1a504c
Fix Gson parsing of Joda DateTime without millis ( #4473 )
...
* Fix Gson parsing of Joda DateTime without millis
The DateTimeFormatter returned by ISODateTimeFormat.dateTime() only
parses dates with millisecond values, and throws
IllegalArgumentException when milliseconds are not present. The
date-time construct from RFC 3339 Section 5.6 referenced by the
Swagger/OpenAPI spec allows fractional second values to be omitted.
This results in valid date-time values being rejected by the generated
code.
This commit fixes the problem by using .dateOptionalTimeParser() for
parsing, which correctly handles date-time values without fractional
seconds. A previous version of this commit used .dateTimeParser(),
which accepted a time without a date and was considered too liberal.
Note that .dateTime() must still be used for printing, which is not
supported by .dateTimeParser().
Signed-off-by: Kevin Locke <kevin@kevinlocke.name >
* Fix akka-scala date-time parser with Joda
As in the previous commit, which fixed Java generators,
ISOISODateTimeFormat.dateOptionalTimeParser() should be used for
date-time parsing and ISOISODateTimeFormat.dateTime() for printing.
Apply the same change to akka-scala.
Signed-off-by: Kevin Locke <kevin@kevinlocke.name >
2017-01-07 21:56:14 +08:00
William Cheng
a8bc09056b
update feign pom version
2017-01-05 20:55:38 +08:00
William Cheng
a7e4f542fb
fix feign pom
2017-01-05 19:54:08 +08:00
William Cheng
db03c35973
fix pom for feign and okhttp-gson java api client
2017-01-05 18:56:14 +08:00
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
Cliffano Subagio
3bc3a40073
[java] Add licenseName and licenseUrl options.
2016-12-15 19:30:35 +08:00
wing328
a143e9c10c
add int/long check for @min/@max in java model ( #4395 )
2016-12-14 22:21:52 +08:00
lukoyanov
a13dee7167
[Java] Play! Framework 2.4 WS client support + retrofit2 ( #4270 )
...
* implemented core integration with play 2.4 ws
* added shell script to test on CI
* added shell script to composite file for all java generators
* added some comments
changed promise param to Response<T> to allow access to http status code and raw response if needed
* removed unnecessary whitespace changes
* added java7 compatibility, play ws deps to pom.xml
* added generated play24 client
* fixed imports
2016-12-14 17:32:49 +08:00
wing328
62aabfc6c1
Merge branch 'jfiala-beanval_2549'
2016-12-13 00:05:03 +08:00
wing328
d9de3b540d
Merge branch 'beanval_2549' of https://github.com/jfiala/swagger-codegen into jfiala-beanval_2549
2016-12-13 00:01:44 +08:00
Thomas Hoffmann
7a97c3c375
Still respect super.equals even for models without own vars ( #4259 )
2016-12-09 17:27:55 +08:00
Jens Oberender
c3571b28a5
Some code cleanings of problems reported by SonarQube. ( #4324 )
...
* Some code cleanings of problems reported by SonarQube.
* Updated changes to the petshop sample.
2016-12-09 15:55:33 +08:00
wing328
939a8052f3
[Java] Uncomment @Max @Min syntax in bean validation files ( #4340 )
...
* uncomment max min syntax in bean validation files (java)
* remove eol at the end of the file
2016-12-08 15:22:55 +08:00
wing328
18420dd7f9
add serialVersionUID to java model ( #4311 )
2016-12-02 17:59:35 +08:00
szakrewsky
76965594b9
Issue #2449 SubClass annotations are missing from the base class ( #4085 )
...
* petstore up to latest
* Issue #2449 SubClass annotations are missing from the base class
* include child in all its super types
2016-11-21 17:03:26 +08:00
jfiala
e4f27bc7a7
make test invocations compileable #2549
2016-11-19 11:55:22 +01:00
jfiala
89ee2b1c91
fix JDK 1.7 issue with generics by casting to Set #2549
2016-11-19 11:41:59 +01:00
wing328
4ae3e57932
Merge branch 'beanval_2549' of https://github.com/jfiala/swagger-codegen into jfiala-beanval_2549
2016-11-19 16:39:31 +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
jfiala
a7252e7560
update check for performBeanValidation #2549
2016-11-12 23:31:49 +01:00
jfiala
a9069e8360
add perform beanvalidation flag to ok-http-gson #2549
2016-11-12 22:47:31 +01:00
wing328
15b216d47b
fix feign gradle build file
2016-11-09 18:36:16 +08:00
wing328
d572b08bf1
fix feign threepane version
2016-11-09 17:09:34 +08:00
wing328
255bc02b83
Merge remote-tracking branch 'origin/master' into 2.3.0
2016-11-09 16:37:11 +08:00
Stephan Wienczny
f25f6c265a
Update pojo.mustache
...
Repair vendorExtensions due to broken merge.
2016-11-04 14:59:04 +01:00
Christophe Bornet
901a981f26
[feign] Use feign-form ( #4124 )
...
* [feign] Use feign-form
Fix #4108
* [feign] Convert java.util.Date params to rfc3339 with an Expander
2016-11-04 21:13:18 +08:00