18059 Commits

Author SHA1 Message Date
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
wing328
c0491ccb1d update ruby sample 2016-07-14 15:53:42 +08:00
wing328
3ae0ffa819 Merge branch 'patch-1' of https://github.com/ircecho/swagger-codegen into ircecho-patch-1 2016-07-14 15:32:41 +08:00
wing328
a07d602d78 Merge pull request #3361 from jdebbink/readme
Update README to clean on mvn package
2016-07-14 15:26:30 +08:00
Michael Kourlas
a4c589c346 Correct reference to ApiClient default instance 2016-07-13 13:56:43 -04:00
Justin Debbink
9fc7215d6d Update README to clean on mvn package 2016-07-13 11:44:57 -05:00
wing328
0986acd2a6 Merge pull request #3359 from sinofool/master
Not compare Java String with "=="
2016-07-13 20:50:36 +08:00
wing328
cee45bc9aa Merge pull request #3360 from wing328/csharp_escape_double_hyphen
[C#] fix double hyphen in c# generator
2016-07-13 20:44:55 +08:00
wing328
8da6e0a533 fix csharp enum naming 2016-07-13 19:11:22 +08:00
wing328
cf02d1700a Merge pull request #3289 from d0x/Make_Pre_and_Suffix_Available
[MAVEN] #3284: Made modelNamePrefix and -Suffix available through maven
2016-07-13 18:31:18 +08:00
wing328
e2d74de6ca fix double hyphen in c# generator 2016-07-13 18:16:52 +08:00
Bochun Bai
f75a42f810 Remove more Java String comparison using "==" 2016-07-13 18:06:45 +08:00
Bochun Bai
6d4d81b652 Not compare Java String with "=="
Replaced with equals()
2016-07-13 17:27:11 +08:00
wing328
6e561e116b Merge pull request #3358 from wing328/csharp_fix_doc
[C#] Fix C# sample code
2016-07-13 17:06:49 +08:00
wing328
9bfb52dbc1 fix csharp code sample 2016-07-13 16:22:58 +08:00
wing328
c873a52f84 Merge pull request #3325 from inc-cloitsch/rmCrypto_fixRequiredParams_useAsyncAwait_addMultiQueryParams
dart: fix required params.  add 'multi' query params.  better deserialization.
2016-07-13 16:13:41 +08:00
Christian Loitsch
8003156fd8 feat dart: add pubName to all remaining library parts 2016-07-12 19:42:11 +02:00
ircecho
66619b1a09 fix[ruby]: Problem with List of Enum
Fixes #3323
2016-07-12 18:21:34 +02:00
Christian Loitsch
a5351f7ec0 feat dart: add pubName to library name.
Otherwise projects may not use different apis generated by swagger,
because library names must be unique.
2016-07-12 18:05:40 +02:00
Christian Loitsch
0d0d353b9d feat dart: mv basePath to ApiClient
Changing the basePath is pretty annoying otherwise, because
you would need to set the basePath for every Api.
2016-07-12 17:18:45 +02:00
wing328
394840e352 Add more security samples (#3344)
* add line break test to petstore-security-test.yaml

* add objc/swift security testing

* add go,scala,qt5cpp for security test

* add security test for typescript

* fix go security issue, fix consumes,produces line break
2016-07-12 19:51:28 +08:00
lunat
e6803aed97 Merge pull request #1 from lunat/CSharp-client-header-enhancement
CSharp client header problem
2016-07-11 14:22:11 +02:00
wing328
d4951bbf3c Leverage Shipable.io to validate mustache templates (#3333)
* add run all petstore shell script

* add run all petstore batch file for windows tests

* better output for travis and appveyor

* add shippable config to test all petstore

* show log after test script

* remo all-petstore, update travis build

* update shiippable config

* add run-all-petstore

* failure test using ruby model

* use bash script for run-all-petstore

* update script permission

* fix html batch script

* fix missing doc in jaxrs spec generator

* fix missing api, model test in jaxrs spec generator

* rename licenseInfo for lumen

* remove ruby model failure (for CI test)

* fix "the input line is too long"

* update windows batch file to shorten the commands

* update appveyor config

* update shippable config

* add build script

* update batch file to remove args option

* fix window batch file for spring mvc/boot

* remove logging output to file
2016-07-11 13:54:18 +08:00
wing328
f536295c9d Merge pull request #3331 from wing328/csharp_fix_client_model
[C#] to fix issues when the model name is "Client"
2016-07-10 19:01:36 +08:00
wing328
1c5210581e fix model name "client" issue 2016-07-10 17:42:18 +08:00
wing328
0119a66479 fix https://github.com/swagger-api/swagger-codegen/pull/3313/files#r70178399 2016-07-10 16:55:36 +08:00
christian
8533ca43b4 #3285 replaced setModelNamePrefix by setModelNameSuffix 2016-07-09 23:50:23 +02:00
ant3
bf8e1ade56 Added tests to jersey2-java8 sample
These are the tests from the jersey2 sample - but adapted to use the
java8 time classes (rather than Joda time).
2016-07-09 11:31:25 +01:00
ant3
1ea80ab83a Merge remote-tracking branch 'refs/remotes/swagger-api/master' into JSR310-Clients 2016-07-08 23:54:14 +01:00
ant3
836aed999e Merge remote-tracking branch 'refs/remotes/origin/master' into JSR310-Clients 2016-07-08 23:00:04 +01:00
Christian Loitsch
999ef42e81 doc: explain how to run tests 2016-07-08 15:45:53 +02:00
Christian Loitsch
9a65a5f0db feat: improve / fix deserialization by parsing type String
* added api_helper.dart for a helper function.
* defaultApiClient is now a variable instead of a static field inside
  ApiClient
* a lot of functions inside ApiClient are no longer static.
* optional params are now named params  (needed to introduce a
  justIgnoreFlag as hack)
* queryParams now support the multi format and are therefore no longer a
  Map<String, String>, but a List<QueryParam>
* renamed apiException.mustache to api_exception.mustache to conform
  with other file names.
* removed unused import: 'dart:html'
* removed 'package:crypto/crypto.dart' dependency.  'dart:convert' has a
  base64 converter now.
* use null-aware operator for apiClient assignment in xxxApi
  constructors.
* enable testStoreApi (which returned a Future nobody waited for)
* fix types in tests.  Some ids were passed as Strings instead of ints.
* adapt tests to use the optional named arguments (for optional query
  args)
* generate random ids in tests.  Otherwise insertion will always succeed
  if the test has been called once.
2016-07-08 15:02:28 +02:00
wing328
89741c75f7 Merge pull request #3276 from zhenjun115/issue2499
add more tips about npe;
2016-07-08 14:01:43 +08:00
wing328
cc91231f2a Merge pull request #3216 from qtstc/add-default-value
Add DefaultValue Annotation to @FormParam
2016-07-08 13:51:32 +08:00
tao
638319db09 add DefaultParam annotation 2016-07-07 11:45:22 -07:00
wing328
aaeae3f0d3 Merge branch 'master' of https://github.com/swagger-api/swagger-codegen 2016-07-07 22:18:37 +08:00
wing328
82c3963f62 Merge branch 'maneeshsahu-master' 2016-07-07 22:17:59 +08:00
wing328
89befeb45b fix long issue in python3 2016-07-07 22:17:27 +08:00
wing328
cb71c4ce31 Merge pull request #3313 from lunat/CSharp_documentation_with_anchor_link
CSharp Documentation with working anchor link within document
2016-07-07 21:15:58 +08:00
wing328
41e8273cb8 Merge branch 'master' of https://github.com/maneeshsahu/swagger-codegen into maneeshsahu-master 2016-07-07 19:13:29 +08:00
wing328
ef1666dd55 Merge pull request #3319 from wing328/word_full_java_util
[Java] update wording for fullJavaUtil option
2016-07-07 18:42:46 +08:00