Commit Graph

7139 Commits

Author SHA1 Message Date
wing328
b3a6535d1e Merge pull request #3385 from wing328/fix_mvn_warning
Fix maven warning and update maven plug-ins to the latest version
2016-07-19 13:10:49 +08:00
wing328
dc8eb8e8ad Merge pull request #3394 from clasnake/3171/scalatra_petstore_error
Fix the scalatra petstore sample compile error.
2016-07-19 13:10:26 +08:00
Jason Gavris
cd79ae1ab4 [Swift] Add support for NSUUID 2016-07-18 23:30:01 -04:00
Jason Gavris
87b79e5946 [Swift] Expose NSProgress to RequestBuilder 2016-07-18 23:29:29 -04:00
Jason Gavris
be65a26db0 [Python] Fix flaky test with id collisions 2016-07-18 23:29:17 -04:00
wing328
3659767e0a Merge pull request #3399 from cbornet/fix_jetty
Make jersey tests wait that jetty is closed before terminating
2016-07-19 11:18:46 +08:00
cbornet
34d3a5e8d0 make jersey tests wait that jetty is closed before terminating 2016-07-18 23:21:12 +02:00
clasnake
5e4e84ffe7 Fix the scalatra petstore sample compile error. 2016-07-18 23:58:03 +08:00
cbornet
421c462ba9 set supportInheritance to true for java based gens 2016-07-18 16:33:20 +02:00
wing328
0d9878373c Merge pull request #3377 from ButterflyNetwork/maven-cache
[Travis] Cache maven directory
2016-07-18 22:18:00 +08:00
wing328
4da6ecf6a6 Merge pull request #3384 from keithballdotnet/patch-1
[Go] ParameterToString can panic
2016-07-18 22:17:12 +08:00
Wolfgang Berger
d4611e4645 remove custom codegen 2016-07-18 13:05:07 +02:00
Wolfgang Berger
f37bd4ab49 rename ApiClient to ApiSessionManager, return cancellable tasks instead of request IDs which greatly reduces state while offering real cancellation, change to a protocol-based configuration with a default implementation, include a workarount for current JSONModel concurrency issues, add missing super call in QueryParamCollection initWithValuesAndFormat 2016-07-18 13:01:57 +02:00
Wolfgang Berger
e73f2a5c64 Merge branch 'upstream-master' into feature/objc-sessionmanager-integration
* upstream-master:
  update JAR URL to 2.2.0
  updated dev versions
  set interface with discriminator as parent
  null check
  updated readme
  updated versions for release
  update java petstore sample
  derive invoker package name from api/modoel package name
2016-07-18 12:02:32 +02:00
Wolfgang Berger
749a17d292 cleanup 2016-07-18 12:00:22 +02:00
wing328
e6f08df30c update JAR URL to 2.2.0 2016-07-18 17:32:29 +08:00
Wolfgang Berger
07d2e7245e updates iso lib version requirement 2016-07-18 11:20:29 +02:00
Wolfgang Berger
e077e80dcb add missing assignment to task 2016-07-18 10:45:22 +02:00
Tony Tam
39cb6a24db updated dev versions 2016-07-17 15:43:30 -07:00
Tony Tam
46545c14da Merge pull request #3388 from swagger-api/release-prepare
updated versions for release
2016-07-17 15:25:14 -07:00
cbornet
8740b4d0ea set interface with discriminator as parent
If a composed model (allOf) doesn't have any parent and one of its interface has a discriminator field, then set this interface as parent.

See #2096
See https://github.com/swagger-api/swagger-parser/pull/246
2016-07-17 14:38:03 -07:00
Tony Tam
bd0340327b Merge branch 'wing328-java_fix_apiclient' into release-prepare 2016-07-15 22:37:35 -07:00
Tony Tam
3346388056 null check 2016-07-15 21:39:58 -07:00
Tony Tam
fbada6ef11 Merge branch 'java_fix_apiclient' of https://github.com/wing328/swagger-codegen into wing328-java_fix_apiclient 2016-07-15 14:41:46 -07:00
Tony Tam
d9aa1dd985 updated readme 2016-07-15 13:46:47 -07:00
Tony Tam
c49db091ef updated versions for release 2016-07-15 13:45:22 -07:00
Wolfgang Berger
d120902e4b integrate latest objc changes into objc-sessionmanager 2016-07-15 15:36:24 +02:00
wing328
9056a5a56c fix mvn warning, update mvn plug-in version 2016-07-15 21:21:58 +08:00
keithballdotnet
cb547c113a ParameterToString can panic
Let the fmt package help convert the obj to a string.  Previously this could panic if the obj was an int.
2016-07-15 14:55:11 +02:00
wing328
9e0c865c08 update java petstore sample 2016-07-15 17:45:06 +08:00
wing328
67a674bf3d derive invoker package name from api/modoel package name 2016-07-15 17:42:05 +08:00
Wolfgang Berger
fab499e612 Merge branch 'upstream-master' into feature/objc-sessionmanager-integration
* upstream-master:
  add more companies
  added env variable override
  add link to appveyor build
  fix defeault rspec test for ruby, update security petstore
  [Swift] Use ISO-8601 date format
2016-07-15 10:09:15 +02:00
wing328
bd7904d42a add more companies 2016-07-15 12:20:19 +08:00
Jason Gavris
4d9b5feb77 [Travis] Cache maven directory 2016-07-14 21:57:24 -04:00
wing328
0405db7a97 Merge pull request #3264 from ButterflyNetwork/swift-iso-date
[Swift] Use ISO-8601 date format
2016-07-15 08:33:49 +08:00
Tony Tam
ac06825f08 Merge pull request #3373 from swagger-api/issue-3372
added env variable override
2016-07-14 13:02:24 -07:00
Tony Tam
20216a9418 added env variable override 2016-07-14 12:05:36 -07:00
wing328
ac3b60e390 add link to appveyor build 2016-07-14 22:47:38 +08:00
wing328
2d35743b0d Merge pull request #3368 from wing328/ruby_fix_rspec
[Ruby] fix default rspec test cases for Ruby API client
2016-07-14 22:13:34 +08:00
Wolfgang Berger
fb68c6c93d update naming 2016-07-14 15:38:05 +02:00
Wolfgang Berger
f14f4c1e93 Merge branch 'upstream-master' into feature/objc-sessionmanager-master-merge
* upstream-master: (1081 commits)
  improve ts node enum naming
  update ruby samples
  update ruby sample
  Update README to clean on mvn package
  fix csharp enum naming
  fix double hyphen in c# generator
  Remove more Java String comparison using "=="
  Not compare Java String with "=="
  fix csharp code sample
  feat dart: add pubName to all remaining library parts
  fix[ruby]: Problem with List of Enum
  feat dart: add pubName to library name.
  feat dart: mv basePath to ApiClient
  Add more security samples (#3344)
  Leverage Shipable.io to validate mustache templates (#3333)
  fix model name "client" issue
  fix https://github.com/swagger-api/swagger-codegen/pull/3313/files#r70178399
  #3285 replaced setModelNamePrefix by setModelNameSuffix
  doc: explain how to run tests
  feat: improve / fix deserialization by parsing type String
  ...

Conflicts:
	modules/swagger-codegen/src/main/resources/objc/Object-body.mustache
2016-07-14 15:18:08 +02:00
Wolfgang Berger
83e7cdb6a3 Merge branch 'feature/objc-sessionmanager' into feature/objc-sessionmanager-merge
* feature/objc-sessionmanager:
  updates templates with JSONModel workaround
  updates for ISO8601 0.5.1
  updates templates according to https://github.com/NYTimes/objective-c-style-guide
  first version of session manager
2016-07-14 12:28:20 +02:00
wing328
069a6b2917 fix defeault rspec test for ruby, update security petstore 2016-07-14 18:22:01 +08:00
wing328
d3a1326405 Merge pull request #3367 from wing328/typescript_enum_naming
[Typescript][Node] Better enum naming
2016-07-14 17:34:42 +08:00
wing328
4f52cebf7a improve ts node enum naming 2016-07-14 17:14:06 +08:00
wing328
748f4b21f4 Merge branch 'master' of https://github.com/swagger-api/swagger-codegen 2016-07-14 16:44:34 +08:00
wing328
59a73a7732 Merge branch 'ircecho-patch-1' 2016-07-14 16:19:21 +08:00
wing328
7c8333e2f8 update ruby samples 2016-07-14 16:19:05 +08:00
wing328
4be11452ce Merge branch 'patch-1' of https://github.com/ircecho/swagger-codegen into ircecho-patch-1 2016-07-14 16:11:29 +08:00
wing328
6a2ff14edb Merge branch 'ircecho-patch-1' 2016-07-14 15:54:13 +08:00