Squashed commit of the following:

commit 8c9f377c1654c6fd89adacbacda667b6a51cbb6f
Author: stkrwork <[email protected]>
Date:   Tue Jun 20 18:59:31 2017 +0200

    [CPP] [CPPREST] isMapContainer fix for models (#5884)

    * - Added Restbed Generator

    * - Added Json processing functions to model
    - Removed unnused code from restbed codegen class
    - Added response header processing to api template

    * Changed it to respect alphabetical order

    * Made the string joining java 7 compatible

    * Added samples

    * First step in fixing the cpp rest template
    regenerated new samples

    TODO: Fix the other functions

    * Updated samples

    * Added isMapContainer check

    * Fixed item selection in json object for MapContainer

commit 8d0c7128b0d02aa5d158df70e7a4c3d989c1e165
Author: wing328 <[email protected]>
Date:   Wed Jun 21 00:58:29 2017 +0800

    add option to specify c# client path in powershell generator (#5887)

commit 2b8e9689771b2fa706f7ea548c45c09c01c9da5f
Author: wing328 <[email protected]>
Date:   Tue Jun 20 23:28:14 2017 +0800

    remove duplicated kotlin template creator

commit 4920da6ac791b1c2486ca3cd77b052ea6312da27
Author: wing328 <[email protected]>
Date:   Tue Jun 20 23:26:19 2017 +0800

    add beatcracker as template creator of PowerShell

commit e53b3a03aaa496bf9b912423d4132ba5f1043d89
Author: wing328 <[email protected]>
Date:   Tue Jun 20 22:20:05 2017 +0800

    [PowerShell] Add PowerShell API client generator (WIP) (#5789)

    * add powershell generator (wip)

    * minor fix to api template

    * rename model files

    * Powershell generator fix (#11)

    * Fix typo

    pacakge -> package

    * Add missing `petstore` subfolder to $ClientPath

    * Resolve $ClientPath to absolute path

    Start-Process needs WorkingDirectory to be absolute

    * Fix spaces in variable name

    ${ somevar } is a vairable that literally has spaces in name. We need to
    temporarily redifine mustache delimiters so we can generate var. names
    without spaces.

    * Fix typo

    Remove stray `r`

    * Fix *.ps1 import in module

    Directory structure has changed + we should export functions using
    manifest.

    * Remove erroneous file

    * various fixes and enhancements

    * remove nullable for string

    * change function name based on feedback by beatcracker

    * set index to start at 0

    * fix file type

    * Powershell generator fix 1 (#12)

    * Add closing curly brace

    * Fix duplicated '['

    * Get FunctionsToExport using AST

    Discussion: swagger-api/swagger-codegen#5789

    * add guid option to powershell generator

    * add test files, remove docs

    * fix array of items

    * clean up powershell comment, update model/api test files

commit c26b5a1e1bd83ef7b27032f2ce453d08224ff0d4
Author: Vlad Frolov <[email protected]>
Date:   Tue Jun 20 11:27:07 2017 +0300

    [JavaScript] Fixed *WithHttpInfo methods in 'usePromises' mode to be ES5 compatible (#3654) (#4902) (#5871)

commit 3546361b33800408c7b7a27ca825cdbdf1d42067
Author: Vlad Frolov <[email protected]>
Date:   Tue Jun 20 11:25:06 2017 +0300

    [JavaScript] Added README section for Webpack configuration (howto disable AMD) (#3466) (#5872)

commit 8ab2b84c972c47770a14152b4e629c9c9b5b2416
Author: stkrwork <[email protected]>
Date:   Mon Jun 19 19:29:42 2017 +0200

    [CPP] [CPPREST] first steps on fixing the template (#5877)

    * - Added Restbed Generator

    * - Added Json processing functions to model
    - Removed unnused code from restbed codegen class
    - Added response header processing to api template

    * Changed it to respect alphabetical order

    * Made the string joining java 7 compatible

    * Added samples

    * First step in fixing the cpp rest template
    regenerated new samples

    TODO: Fix the other functions

    * Updated samples

commit 24c55d1f0edce4284fe793deae61a428cf43a06b
Author: sabras75 <[email protected]>
Date:   Mon Jun 19 17:08:32 2017 +0200

    Fix#5856 - Add support for PATCH (#5875)

    * Changing QBuffer to use a QByteArray solves the issue for me since there is no real use-case for using a QBuffer.

    Documentation of QT5 states:

    QBuffer::QBuffer(QByteArray *byteArray, QObject *parent = Q_NULLPTR)

    Constructs a QBuffer that uses the QByteArray pointed to by byteArray as its internal buffer, and with the given parent. The caller is responsible for ensuring that byteArray remains valid until the QBuffer is destroyed, or until setBuffer() is called to change the buffer. QBuffer doesn't take ownership of the QByteArray.

    Since the variable “request_content” is allocated on the stack, this is clearly wrong and a bug. The construction of QBuffer is designed this way so that whenever you write to the buffer, it is also written to the byte array that it is pointing to

    * Add a retro-compatible solution based on QNetworkAccessManager SourceCode

    * update samples

commit 981ad60050a8e175dd9242c9367ea2fb571c1e64
Author: stkrwork <[email protected]>
Date:   Mon Jun 19 16:56:01 2017 +0200

    [C++] [Restbed] Reworked the model template for restbed to create generic models (#5873)

    * - Added Restbed Generator

    * - Added Json processing functions to model
    - Removed unnused code from restbed codegen class
    - Added response header processing to api template

    * Changed it to respect alphabetical order

    * Made the string joining java 7 compatible

    * Added samples

    * - Reworked the getter setter generation

commit 3a3285779064fd60f2fe2438eb2f86171cdc1a33
Author: wing328 <[email protected]>
Date:   Mon Jun 19 11:19:21 2017 +0800

    PR to roll back #5569 (#5868)

commit 84334146f9d168a0a0886e326d2eeb9a02d928d7
Author: wing328 <[email protected]>
Date:   Mon Jun 19 09:59:19 2017 +0800

    better code format for cpprest

commit b5411a94f0cb0d2b72327b8337e02aa277950c08
Author: wing328 <[email protected]>
Date:   Mon Jun 19 01:29:41 2017 +0800

    update swfit3 petstore samples

commit 3808d679538a83d75ea805b847d88e9c5edb8b47
Author: wing328 <[email protected]>
Date:   Mon Jun 19 01:28:39 2017 +0800

    move javascript-es6 templates under subfolder in Javascript

commit 3ad576a53d007d330d331dad0179ecdc542d7d5e
Author: wing328 <[email protected]>
Date:   Mon Jun 19 01:21:22 2017 +0800

    update js es6 samples

commit 6fef7acf9f83058d4b42dcb0966b58d82c30f055
Author: Kevin Murphy <[email protected]>
Date:   Sun Jun 18 09:28:12 2017 -0700

    [javascript] Fix usages of `exports` in generated ES6 code (#5835)

commit aa37b9747fd6665c6bfcdc474b00e6eb666866e6
Author: Kevin Murphy <[email protected]>
Date:   Sun Jun 18 09:27:52 2017 -0700

    [javascript] Use arrow function with usePromises in ES6 ApiClient.js for superagent callback to preserve `this` context (#5814)

commit 7893f759e008c0543a9667cc934a62a7862c6158
Author: wing328 <[email protected]>
Date:   Mon Jun 19 00:07:27 2017 +0800

    fix JS es6 script template folder

commit 3ced146a65bc83636c8408616afd2e7dc357caff
Author: Ahmet Taha Sakar <[email protected]>
Date:   Fri Jun 16 19:25:03 2017 +0300

    Swift3 configuration (#5725)

    * added headers to makeRequest function for swift3 template

    * Added configuration file to Swift3 template

    * added comments about the value read only once

    * added comments about the value read only once

    * comments fix

    * Added Configuration.swift to Project File

    * swift 3 promisekit, rxswift updates

commit f27143fc081bc37c0a4bf5d65c84e4ec5c09c398
Merge: bbe27581c ec448a616
Author: wing328 <[email protected]>
Date:   Fri Jun 16 23:15:45 2017 +0800

    Merge branch 'master' of https://github.com/swagger-api/swagger-codegen

commit bbe27581c940b6b1ee66c74e467a843886cf2490
Merge: 1f1e92d96 0bb610494
Author: wing328 <[email protected]>
Date:   Fri Jun 16 23:12:33 2017 +0800

    Merge branch 'shawkinsl-user/shawkins/fix/dont_modify_parameter_names'

commit 0bb610494e6e91a7a67b3fa82049d55c85e05bc4
Merge: 1f1e92d96 5dcda9416
Author: wing328 <[email protected]>
Date:   Fri Jun 16 23:12:17 2017 +0800

    Merge branch 'user/shawkins/fix/dont_modify_parameter_names' of https://github.com/shawkinsl/swagger-codegen into shawkinsl-user/shawkins/fix/dont_modify_parameter_names

commit ec448a61674f0cec0f47cbe5365f83cdca25844e
Author: Paŭlo Ebermann <[email protected]>
Date:   Fri Jun 16 11:29:44 2017 +0200

    [CLI] #5147: make -D work like system properties (#5191)

    * Issue #5147: allow empty values for properties.

    * Issue #5147: Allow multiple `-D` options.

    * Issue #5147: take advantage (and demonstrate) the new usage of -D.

    * Issue #5147: also update windows script and security ones.

commit 1f1e92d96409abe37a6b7f72bab25072f0244cd7
Author: wing328 <[email protected]>
Date:   Fri Jun 16 17:28:57 2017 +0800

    update run xcodebuild command for objc client to reduce log

commit 1a803af54af687779a09abfb5b9088c225233087
Author: Paŭlo Ebermann <[email protected]>
Date:   Thu Jun 15 16:17:02 2017 +0200

    Update samples for typescript-angular2. (#5826)

commit 85850b28468e022179bf33838302a2e4b0d2235b
Author: miguelvaladez <[email protected]>
Date:   Thu Jun 15 18:44:34 2017 +1000

    Feature/es6 angular (#5495)

    * module code added for es6-angular client code generation

    * typescript wiped out the core gitignore file

    * added USE_ES6 cli option to javascript-closure-angular, will use the javascript-es6-angular templates instead

    * fixed issue with module file

    * added annotations to the templates

    * moved default output folder declaration

    * moved es6 template folder under closure-angular

commit ba4ecea408c9b39259b202b1bab2c84f178fd9b8
Merge: b752c0a03 e58342bac
Author: wing328 <[email protected]>
Date:   Thu Jun 15 15:09:55 2017 +0800

    Merge branch 'update_spring_samples'

commit e58342bacb31e6e5111f742fd7bb55d4388537bf
Author: wing328 <[email protected]>
Date:   Thu Jun 15 14:33:16 2017 +0800

    udpate spring samples

commit b752c0a03021cd4a2579d7866958205ae351f1fb
Author: Elizabeth Thomas <[email protected]>
Date:   Thu Jun 15 00:59:42 2017 -0500

    Adding the generator version template to api mustache file (#5691)

commit 5c10e243375c2a25ca6bdcb720704bf8079a9ffe
Author: wing328 <[email protected]>
Date:   Thu Jun 15 00:55:47 2017 +0800

    use file.separator instead of "/" (#5846)

commit f2276e5b35ea12b64f9a151d363f8b1388584bfc
Author: Moscagus <[email protected]>
Date:   Wed Jun 14 13:45:14 2017 -0300

    Fix for issue #5777 - java/jersey2 ApiClient.invokeAPI doesn´t close the Response object (#5782)

    * Update ApiClient.mustache

    Fix for issue #5777

    * Update ApiClient.mustache

    * Create ApiClient.mustache

    * Run java-petstore-jersey2.sh

commit 77c14bca39eb83178d1c38aef2db6c91c21f75d5
Author: wing328 <[email protected]>
Date:   Thu Jun 15 00:10:32 2017 +0800

    use file.separator, minor code format enhancement (#5844)

commit 6d9e862381780b94669630e36dbdf43130e6ca6f
Merge: 66c64495a b63193824
Author: wing328 <[email protected]>
Date:   Wed Jun 14 23:29:47 2017 +0800

    Merge branch 'JuH33-master'

commit b63193824a1c36347a46f365664622ca7438f42a
Author: wing328 <[email protected]>
Date:   Wed Jun 14 23:29:31 2017 +0800

    update html2 petstore sample

commit c74fc6e0ee7ce0651cac78bccb86eadaf211d897
Merge: 66c64495a e0d7c7dbd
Author: wing328 <[email protected]>
Date:   Wed Jun 14 23:23:24 2017 +0800

    Merge branch 'master' of https://github.com/JuH33/swagger-codegen into JuH33-master

commit e0d7c7dbd59d6ae4ffe84b6975292e1290ff25a6
Author: JuH33 <[email protected]>
Date:   Tue May 30 11:21:17 2017 +0200

    Html2 speed Up | Raw html using java parser instead of JS parser

commit 66c64495a9dd0f14021c0d01b3a25466f8acf45c
Author: wing328 <[email protected]>
Date:   Wed Jun 14 22:41:24 2017 +0800

    add sebymiano as Pistache template creator

commit e66eceeaaaed35dc580031ca37650a261d76f391
Author: Sebastiano Miano <[email protected]>
Date:   Wed Jun 14 16:40:00 2017 +0200

    [C++] Server Stub Code Generator based on Pistache (#5838)

    * Added C++ generator for Pistache

    * Revert of CodegenOperation

    * Updated template

    * Removed isRestful from method declaration

    * Updated httpMethod variable

    * Changed isRestfulCreate

commit 4b9988c4f22a3a4d5e1823d5426b26539fd30fa3
Author: Paŭlo Ebermann <[email protected]>
Date:   Tue Jun 13 19:17:31 2017 +0200

    Update samples for several language (just whitespace changes, reordering, VERSION) (#5828)

    * Update samples for several languages.

    Just whitespace changes and some reordering where the order doesn't matter.

    * Adding generated .swagger-codegen/VERSION files.

commit e8cdfa8185f737c7372d9af1f45bd182ca9e49f4
Author: Paŭlo Ebermann <[email protected]>
Date:   Tue Jun 13 18:48:42 2017 +0200

    Update samples for html2. (#5827)

commit 29db258e651f4ca093aab7a5d9857458dfd7b060
Author: Paŭlo Ebermann <[email protected]>
Date:   Tue Jun 13 18:48:31 2017 +0200

    Update samples for akka-scala. (#5825)

commit ceff3762cc21cafd1c695dad59a73e5241354fbf
Author: Paŭlo Ebermann <[email protected]>
Date:   Tue Jun 13 18:42:24 2017 +0200

    Update samples for ze-ph. (#5823)

commit b288991c6c813048d53e43e7508e2c89f1d24284
Author: Paŭlo Ebermann <[email protected]>
Date:   Tue Jun 13 18:41:53 2017 +0200

    Updating samples for csharp. (#5822)

commit d6c717263ce378c6de55deec13b3d3b56fc72c30
Author: wing328 <[email protected]>
Date:   Wed Jun 14 00:18:54 2017 +0800

    [Python] add project name to setup.py in python client (#5836)

    * add project name to setup.py in python client

    * update python README to use project name

    * add cli option project name for python

commit b61dfefa5b27bd777611ab509237bb8d4b8d6e73
Author: Alex Chauvin <[email protected]>
Date:   Tue Jun 13 09:57:55 2017 +0200

    serverPort add from cli (#5821)

    in order to change the serverPort from the codegen cli

commit 2c7cd07cc3fd63b1349ecd7893ed823f3a44b585
Author: wing328 <[email protected]>
Date:   Mon Jun 12 20:55:53 2017 +0800

    add back petstore-security-test/typescript-angular

commit ab1ecbff38455931957cd564c06de6ec6932157c
Author: wing328 <[email protected]>
Date:   Mon Jun 12 20:52:40 2017 +0800

    remove petstore-security-test/typescript-angular folder

commit 62db9a09eee9401dd9a05ec05d6785badfc04c58
Author: mmosemmle <[email protected]>
Date:   Sun Jun 11 15:06:19 2017 +0100

    Fix issue 5793 (#5794)

    * cast character to string.

    * Check if variable name is reversed.

    * Guard against reservedWordsMappings.

commit dc7c1f8cb92712d88c6732982fb90b677f80f185
Author: Cliffano Subagio <[email protected]>
Date:   Sun Jun 11 23:42:36 2017 +1000

    [JS] Fix JavaScript string return type (#5819)

    * [javascript] Fix response body when return type is String.

    * [javascript] Regenerate javascript petstores with fixed String return type.

    * [javascript-es6] Fix response body when return type is string.

commit f163fdb980d156a604d2478927fd0d231ce476ef
Author: wing328 <[email protected]>
Date:   Sun Jun 11 15:39:08 2017 +0800

    update spring samples

commit c5335081ea9750fa06036abb4fb086ee047ebc2d
Author: manuc66 <[email protected]>
Date:   Sun Jun 11 09:34:09 2017 +0200

    fix the mustache file (#5736)

commit 21bf3a5a5e1218bd15a44df898427ff559ff8f0c
Author: harishchoragudi <[email protected]>
Date:   Fri Jun 9 19:50:40 2017 -0500

    Create README.md (#5813)

    Added GE in the list of companies using swagger-codegen

commit 7cddd17acc4718653e450e208d5ba98d2c7debe1
Author: wing328 <[email protected]>
Date:   Fri Jun 9 21:46:40 2017 +0800

    [Java] Add JSON-patch support to other Java API clients (#5808)

    * add JSON-patch support to other Java API clients

    * minor fix to java jersey1 json check

commit 53bd931f5c57eeb805ef38e47a880d73e3dbdc5d
Author: Brendan Burns <[email protected]>
Date:   Fri Jun 9 01:47:38 2017 -0700

    Add JSON-patch as a JSON mime-type (#5764)

commit e9a0d7ea8367aee9322838c7d78ed5a2ae9ac74a
Author: Björn Petersen <[email protected]>
Date:   Fri Jun 9 10:16:53 2017 +0200

    Add android dependency to pom if 'parcelableModel' is set (#5801) (#5802)

    * Add android dependency to pom if 'parcelableModel' is set

    * Update java-okhttp-gson-parcelableModel sample

commit 7e98e59e53465f425e8f71d185f1df8aa6d6beeb
Author: wing328 <[email protected]>
Date:   Fri Jun 9 16:11:34 2017 +0800

    move swift/objc test to the end

commit 8f7e2a1563a98ee72e494af612555a4d689180fe
Author: Mads Hvelplund <[email protected]>
Date:   Fri Jun 9 10:09:27 2017 +0200

    Allow overriding the service delegate (#5662)

    * Added support for injecting service implementations via web.xml

    * Updated samples

commit dabf01c3fa457928858dd4074bfb46eba71b409e
Author: Jim Schubert <[email protected]>
Date:   Fri Jun 9 03:40:18 2017 -0400

    [kotlin] support collection format multi (#5792)

    * [kotlin] support collectionFormat:multi

    Adds "multi" support to collections.

    Also changes generic lists (List<T>) to arrays. Generic lists and nested
    lists can be problematic and require customized json factories. The
    previous implement appeared to work because the results in the test were
    LinkedHashMap with count greather than 0. The functional test has been
    updated to force serialization and verify the results.

    * [kotlin] Regenerate sample

    * [kotlin] Update model test for Array changes

commit 2d008be1813f278d0bbaa331dc6d105ebca6da47
Author: harishchoragudi <[email protected]>
Date:   Thu Jun 8 12:41:20 2017 -0500

    Fix for issue#5788 -CPPRest generated models are not using inheritance as specified in contract (#5791)

    * fixed map to use value instead of mapentry while doing fromJson.

    * cpprest models now use inheritance properly instead of always extending from ModelBase

    * cpprest models now use inheritance properly instead of always extending from ModelBase

    * removed a sysout used for debugging

    * toJson() and fromJson() now leverages parent class's corresponding methods

    * virtual is not needed as override essentially does the same thing.

    * added docstring for getModelByName

    * corrected the javadoc

    * fixed @param issue in javadoc

    * fixed @param uncapitalized P in param in javadoc

commit 73f52665963c291796b4ab9c344dbea5de5b4ec4
Author: Romain d'Alverny <[email protected]>
Date:   Thu Jun 8 03:10:21 2017 +0200

    [Swift3] Set more liberal Swift3 decoder, behind lenientTypeCast option (#5795)

    * [Swift3] Add lenientTypeCast option

    When set to true, this generates a client JSON decoder
    that will accept and cast mistyped values.

    Here:
     - String => Bool ("true" instead of true),
     - String => Int ("123" instead of 123),
     - NSNumber => String (123 instead of "123").

    The point is to allow the same client code to handle several
    server implementations that may (sadly) not be up to spec,
    or still be "evolving".

    The conversion is not guaranteed if the input

    Not a perfect/complete solution, not sure if it should be
    activated along other casts, so kept behind an option.

    * Update Petstore client code

commit 691c14fa1acd65b204848af0b5c9c36d7ffc52c0
Author: wing328 <[email protected]>
Date:   Wed Jun 7 23:09:08 2017 +0800

    add --rm=false to circleci docker build commands

commit e43595a0a13014d304b96495ebe1747abc3544b1
Merge: 544b7b77a ec19e8f40
Author: wing328 <[email protected]>
Date:   Wed Jun 7 20:04:12 2017 +0800

    Merge branch 'master' of https://github.com/swagger-api/swagger-codegen

commit 544b7b77acf9ea5fd107c2d90cf87f537f91b4a7
Author: wing328 <[email protected]>
Date:   Wed Jun 7 20:03:48 2017 +0800

    comment out docker update while we're working on the issue

commit ec19e8f4079f84c59386de52ddea4c7d9448f04e
Author: Ralph Langendam <[email protected]>
Date:   Wed Jun 7 12:37:45 2017 +0200

    Fixed minor compiler error and warning (#5762)

    * 5762 Fixed minor compiler error and warning

    * 5762 Regenerated cpprest petstore client

commit 9f81aa4bfced6eddbce0131853d27592653ee3e2
Author: Julien - JuH <[email protected]>
Date:   Wed Jun 7 12:35:17 2017 +0200

    StaticHtml2Gen | Speed up appDescription rendering (#5722)

commit 676e2a04f589b77915fe43f45bc44c8f8af627c2
Author: Trent Albright <[email protected]>
Date:   Wed Jun 7 06:15:06 2017 -0400

    Fix issue with buffered sink handling in OkHttp (#5786)

    * Fix issue with buffered sink handling in okhttp

    Fixes unexpected end of stream exceptions when using the okhttp-gson library
    and making asynchronous calls.

    * update petstore samples for okhttp-gson

    $ ./bin/java-petstore-okhttp-gson.sh
    $ ./bin/security/java-petstore-okhttp-gson.sh

    * WIP: trigger ci

commit 2bef56c7bddcd4ebaf64ffad20c20bf883fb071d
Author: wing328 <[email protected]>
Date:   Wed Jun 7 18:01:36 2017 +0800

    add env variables for circleci

commit ccf2f2ff07f94772a8b374d43c31a9d703777281
Author: Jean-François Côté <[email protected]>
Date:   Wed Jun 7 05:12:30 2017 -0400

    Add basic support for collection. (#5776)

commit 6a986975e4dc76bbf720e198367310c5cb1021e3
Author: Vlad Frolov <[email protected]>
Date:   Wed Jun 7 12:01:47 2017 +0300

    [javascript] Fixed `fs` files support for Electron (#5765)

commit 6239ec0807e6657067536d66f86083d514abeb64
Author: Kevin Murphy <[email protected]>
Date:   Tue Jun 6 02:09:50 2017 -0700

    [javascript] Mark "fs" package as absent in browser in package.mustache (#5768)

commit 9b93d3363f3852e351f6eaf4afcbe89061177b34
Author: Kevin Murphy <[email protected]>
Date:   Tue Jun 6 01:19:35 2017 -0700

    Fix bug in ES6 ApiClient.mustache (#5766)

    ES6 static properties cannot self-reference.

commit 151d1b2783660cdad73aeaf39b033936e60d27a4
Author: Kevin Murphy <[email protected]>
Date:   Tue Jun 6 01:03:36 2017 -0700

    [javascript] Fix documentation for ES6 ApiClient (#5783)

commit f770477d4824de5d63469f92a27d497818ad30f0
Merge: c3ea24cef 0b998f068
Author: wing328 <[email protected]>
Date:   Tue Jun 6 16:02:54 2017 +0800

    Merge branch 'objc_xcpretty'

commit 0b998f068402ab3cd009a8fb4b84cc2ab255a6d9
Author: wing328 <[email protected]>
Date:   Tue Jun 6 15:23:15 2017 +0800

    add xcpretty to objc test output

commit c3ea24cefaf29ae9f80a9372e810b6ca4071eae0
Merge: 6ee332a51 d6743b459
Author: wing328 <[email protected]>
Date:   Tue Jun 6 00:20:31 2017 +0800

    Merge branch 'objc_ci'

commit d6743b4597730ccd75ae3514aad0e41ef2ca50f1
Author: wing328 <[email protected]>
Date:   Mon Jun 5 23:35:17 2017 +0800

    uncomment objc tests

commit 6ee332a5130f471c264c266af29247a8004e9131
Author: wing328 <[email protected]>
Date:   Mon Jun 5 22:22:56 2017 +0800

    [Swift] Fix issue with Swift Petstore integration tests due to pod install (#5774)

    * add pod file for swift3

    * skip pod install

    * avoid pod install in swift3 petstore (promisekit,rxswift)

    * use https instead of http for cocoapod spec

    * avoid timeout in swift3 test

commit 3cbe96f3c6a396852e0e86b2698d9f295a375552
Author: wing328 <[email protected]>
Date:   Mon Jun 5 18:03:20 2017 +0800

    comment out pod repo update

commit bbe019a3ceca9d8ea471b5b8bfc456caba49e4a2
Author: wing328 <[email protected]>
Date:   Mon Jun 5 17:54:25 2017 +0800

    move docker tasks from travis to circleci

commit faf082589dbdc0aad050ba0ea7b5dd89564bc940
Author: wing328 <[email protected]>
Date:   Mon Jun 5 15:43:20 2017 +0800

    Enable Travis CI tests for Swift, ObjC clients and move some tests to CircleCI (#5687)

    * enable travis CI tests for swift, objc, move some tests to circleci

    * fix comment in xml file

    * use xcode8.3

    * use ruby 2.2.5

    * fix objc core data pom.xml

    * use cocoapods 1.2.1

    * use xcpretty for clearer test results

    * fix pom with relative path to script

    * comment out objc test

    * fix xcpretty exit code

    * add && exit ${PIPESTATUS[0]} for swift3 xcodebuild script

    * use xcode 8.2

    * update promisekit version for swift 2x, 3x

    * add pod repo update

    * remove Pods directory

    * update swift dependencies to the latest version

    * update podfile.lock

    * rollback Alamofire to 4.0 for swift3

    * fix swift3 rxswift api cliiet

    * fix testDeletePet test in Swift3 rxswift petstore

    * update clojure petstore

    * comment out clojure test in travis (already covered in circleci)

    * run pestore server locally

    * use wing328/swagger-samples to run petstore

    * run petstore server in the background

    * test ruby petstore client

    * add /Users/travis/.cocoapods/repos/master to cache

    * add back ruby test, use public pestore server

    * add back bash client test

    * add npm config set registry to avoid time out

    * use docker branch in swagger samples

    * remove bash test

    * show go version, reorder

    * debug go petstore client

    * reinstall go

    * comment out pod repo update

    * uncomment pod repo update

    * test go in circleci

    * remove go from travis test

    * brew install sbt

commit 40163b26d2cecddc51c3b0fde2ba53dffd1bcc34
Author: wing328 <[email protected]>
Date:   Mon Jun 5 12:25:51 2017 +0800

    update objc petstore to use petstore.json

commit f3da691a7292a8e5eb17a203443ee45688b2b5e8
Author: Zack Lemmon <[email protected]>
Date:   Sun Jun 4 23:19:29 2017 -0400

    Fix typo in Ruby examples/mustache files (#5773)

commit 4fd52d17c5fc7aea1b0fa84ed63ecfaeaaec5c8e
Author: wing328 <[email protected]>
Date:   Mon Jun 5 01:05:19 2017 +0800

    minor build warning fix for C# client

commit bc8fe0fd03f01134610f56d07ba7a66992ebda0b
Author: Jim Schubert <[email protected]>
Date:   Sun Jun 4 12:57:00 2017 -0400

    [csharp] date proper format (#5734)

    * [csharp] Honor Swagger/OpenAPI 'date' format

    Per spec
    (https://github.com/OAI/OpenAPI-Specification/blob/master/versions/2.0.md#data-types),
    DateTime instances defined as 'date' datatype need to be serialized as
    defined by full-date - RFC3339, which has the format:

    full-date       = date-fullyear "-" date-month "-" date-mday

    ref:
    https://xml2rfc.tools.ietf.org/public/rfc/html/rfc3339.html#anchor14

    see #5513
    see #5531

    * [csharp] Regenerate sample

    * [csharp] Include date format test

commit d5b3cc0534eeb69324de169f72ddcaf5d28e3ad9
Author: Arne Jørgensen <[email protected]>
Date:   Sun Jun 4 18:47:56 2017 +0200

    [PHP] Fix `date` format serialization (#5754)

    * [PHP] Honor Swagger/OpenAPI 'date' format

    Per spec
    (https://github.com/OAI/OpenAPI-Specification/blob/master/versions/2.0.md#data-types),
    DateTime instances defined as 'date' datatype need to be serialized as
    defined by full-date - RFC3339, which has the format:

    full-date       = date-fullyear "-" date-month "-" date-mday

    ref:
    https://xml2rfc.tools.ietf.org/public/rfc/html/rfc3339.html#anchor14

    see #5531
    fixes #5607

    * [PHP] Add `date` and `date-time` serializer tests

    See #5531
    See #5607

    * [PHP] Improve codestyle of generated code

    * [PHP] Regenerate PHP Petstore sample

    * [PHP] Regenerate PHP Security sample

commit 00f2dc422d85b18316d69f82f1376e43487bbe75
Author: davidgri <[email protected]>
Date:   Sun Jun 4 18:38:43 2017 +0200

    Issue5613 (#5616)

    * Fixed Issue5162 consumes in GET-Methods

    * Fixed Issue5613

    * Ran the shell scripts under bin

    * Tab removed

commit 9bc8f37aa6e08677406f71eb9d1c97452d5e7587
Author: Cliffano Subagio <[email protected]>
Date:   Mon Jun 5 02:20:11 2017 +1000

    [javascript] Fix empty response body when schema type is string (#5759)

    * [javascript] Fix response body when return type is String.

    * [javascript] Regenerate javascript petstores with fixed String return type.

commit ef07a02a0128c78da48aaa40a4135241ddfb4d23
Author: Jim Schubert <[email protected]>
Date:   Sun Jun 4 12:04:58 2017 -0400

    [kotlin] Support nested enums in models (#5769)

    * [kotlin] Add model enum support

    Model variables marked isEnum=true are nested class enums. Top-level
    enums will not be isEnum=true, but rather have a datatype specific to
    the enum's type.

    * [kotlin] Regenerate client sample

commit 879149bb699d3909c49c7c715438e1351bef9bfb
Author: wing328 <[email protected]>
Date:   Sun Jun 4 16:52:50 2017 +0800

    Revert "[javascript] Added README section for Webpack configuration (closes #3466) (#5767)" (#5770)

    This reverts commit 54f5d73ee245811baf0b82eaae0b0ef3949b9f0a.

commit 54f5d73ee245811baf0b82eaae0b0ef3949b9f0a
Author: Vlad Frolov <[email protected]>
Date:   Sun Jun 4 10:42:41 2017 +0300

    [javascript] Added README section for Webpack configuration (closes #3466) (#5767)

commit 034fc44bdd360eccbaf6e8e4bc83bf55598dd62f
Author: wing328 <[email protected]>
Date:   Sat Jun 3 01:14:08 2017 +0800

    add Play Framework

commit ffc0d32b9cd684efb18569cf080926891908dba1
Author: sdoeringNew <[email protected]>
Date:   Fri Jun 2 10:03:32 2017 +0200

    #5712 put @JsonValue to appropriate place in generated enum, add TypeAdapter for Gson enums, enhance tests (#5713)

commit 71d1d05b98470dfd9c3126c54a4041e919371f78
Author: wing328 <[email protected]>
Date:   Fri Jun 2 14:51:43 2017 +0800

    add owner for restbed

commit b53a668517a29606f199c4f35cb400f5494449b9
Author: stkrwork <[email protected]>
Date:   Fri Jun 2 08:40:07 2017 +0200

    [C++] Restbed Server Stub Code Generator (#5742)

    * - Added Restbed Generator

    * - Added Json processing functions to model
    - Removed unnused code from restbed codegen class
    - Added response header processing to api template

    * Changed it to respect alphabetical order

    * Made the string joining java 7 compatible

    * Added samples

commit e0e5bdde764e5e249dd9629a66e9e72400c79d65
Author: Alexander Popiak <[email protected]>
Date:   Thu Jun 1 18:40:32 2017 +0200

    fix cpprest model source mustache template (#5716)

    (which was generating code that doesn't compile because of a wrong variable name)

commit fa8e8fdc3c8f3eb112ad4d23878942f4776097e1
Author: Johnny-Bee <[email protected]>
Date:   Thu Jun 1 15:10:43 2017 +0200

    Update README.md (#5757)

commit 77555bfab10a6a394af44ca341b4ae7ae24523a3
Merge: 9070c7133 bd9142150
Author: Tony Tam <[email protected]>
Date:   Wed May 31 12:45:19 2017 -0700

    Merge pull request #5749 from swagger-api/issue-5748-2.2.x

    Updated parser to v1.0.29

commit bd9142150e565682f936b71f35de9c278537175b
Author: Tony Tam <[email protected]>
Date:   Wed May 31 10:44:24 2017 -0700

    updated to 1.0.29

commit 9070c7133ceacaf96898d32105625a380cea04e2
Author: wing328 <[email protected]>
Date:   Wed May 31 23:14:37 2017 +0800

    minor code format enhancement to ZipUtil.java

commit bda5f1a5d541f4dcedd3509b10b7253c8b34f3fd
Author: wing328 <[email protected]>
Date:   Wed May 31 17:39:58 2017 +0800

    add npm config set to avoid time out

commit d6f242415279849e6c22c46983c453faa96318e1
Author: Jonathan Leitschuh <[email protected]>
Date:   Wed May 31 05:27:32 2017 -0400

    Fix spring generated controller annotations only generating for first return type (#5399)

    Fixes the spring java code generator so that the ApiResponse fields are populated correctly
    on the controller.

    Related to #4693

commit bee999056a9a13a37891a9c7810f30ef63eb4f38
Author: imgx64 <[email protected]>
Date:   Wed May 31 01:13:22 2017 -0800

    [typescript-angular2] Avoid tslint "Unused import" warnings (#5723)

    Move the tslint comment that disables `no-unused-variable` to before the
    import statements, to avoid "Unused import" warnings

commit 31a8ac6987c3b39a92d619d7e498dfddae60d29c
Author: Casey Fulton <[email protected]>
Date:   Wed May 31 17:47:42 2017 +0930

    [docker] Run as non-root user, fixes permissions. (#5702)

commit 34b742355b188f1c14de398200b074d44826c213
Merge: 23cf641e8 647394973
Author: wing328 <[email protected]>
Date:   Wed May 31 00:28:30 2017 +0800

    Merge branch 'jimschubert-kotlin-api-model-docs'

commit 6473949737ec60ed9a5c129dc530f51bf1f0d45e
Merge: 23cf641e8 87265d9ac
Author: wing328 <[email protected]>
Date:   Wed May 31 00:28:08 2017 +0800

    Merge branch 'kotlin-api-model-docs' of https://github.com/jimschubert/swagger-codegen into jimschubert-kotlin-api-model-docs

commit 23cf641e8a9583a9a9e3c52038780c6c42db14a1
Author: Jim Schubert <[email protected]>
Date:   Tue May 30 12:18:37 2017 -0400

    Kotlin client lists (#5729)

    * [kotlin] array->List instead of Array

    Serialization to/from primitive arrays can cause issues with valid
    responses. This commit considers swagger 'array' types as 'List' which,
    although not as memory efficient should provide a cleaner interface for
    users (and avoid serialization issues).

    Also, updates README.md to list new generator and excludes
    folder at samples/client/kotlin/bin/, which is not used.

    * [kotlin] Move sample under conventional directory

    samples/client/kotlin/ -> samples/client/petstore/kotlin/

    Updated new.sh to generate client/server/docs into similar structure.
    Current documentation generators (cwiki, html, html.md, html2) aren't
    following a convention like client/server generators.

commit 9282098d722b5f66d5297c9c74f0eea867e64363
Author: wing328 <[email protected]>
Date:   Tue May 30 22:07:53 2017 +0800

    remove unused folder

commit 51f9874da6bd9059b29af6e2c7f2173cd95df474
Author: wing328 <[email protected]>
Date:   Tue May 30 16:11:01 2017 +0800

    update appveyor to use java-jersey-jaxrs-ci

commit d830ed717b47d6fab0028407491fffce31b1e5f2
Author: wing328 <[email protected]>
Date:   Tue May 30 15:34:13 2017 +0800

    sort CodegenConfig

commit 156c63db0e7371c3c7f74d3ca7c2f93bb73aaca9
Author: wing328 <[email protected]>
Date:   Tue May 30 15:16:51 2017 +0800

    show CI test results for 2.3.0

commit e607aedf5b0266383c84a699ba6679ce17c74ec7
Author: wing328 <[email protected]>
Date:   Tue May 30 15:09:25 2017 +0800

    add kotlin and jimschubert as the template owner

commit 87265d9ac7e777d0ee78440ed556a2d752ac4a24
Author: Jim Schubert <[email protected]>
Date:   Mon May 29 20:47:31 2017 -0400

    [kotlin] api/model docs

    This commit adds Api/Model/Auth documentation to the generated
    README.md. Because auth support is not yet fully implemented (users can
    manually set default headers globally), there aren't examples for helper
    auth methods.

    Models with inline enums document allowed values rather than pointing to
    a generated enum class.

    Two global additionalProperties were added (generateApiDocs,
    generateModelDocs) to allow templates to conditionally display
    documentatoin depending on these mutually exclusive settings. All
    current generators supporting docs will attempt to link to generated
    models when only api docs are specified.

    This also moves the $@ bash parameter in bin/kotlin-client-petstore.sh
    to the end of the args variable. This is because $@ can only be used to
    pass System properties like -DdebugModels, can can already be passed as:

    JAVA_OPTS="$JAVA_OPTS -DdebugModels" ./bin/kotlin-client-petstore.sh

    By moving the $@ to the end of the args, it allows us to pass additional
    properties and other switches directly to the script.

commit d6a98fa444627788ef9ad2a81c6f1406ad5b5905
Author: Jim Schubert <[email protected]>
Date:   Mon May 29 12:38:15 2017 -0400

    Kotlin client (#5727)

    * Add new.sh helper script to create generator files

    * [kotlin] Initial Kotlin client generator

    * [kotlin] Generate sample

    * [kotlin] Sample helper files not needed for generation, but for sample evaluation

commit b84769d1e37d54ea5fe0c2220678f7f9ab9f05b8
Author: wing328 <[email protected]>
Date:   Mon May 29 22:16:42 2017 +0800

    fix enum float value in C#, minor format fix in doc (#5726)

commit 3df5b6f30373677343564b92c7ead673943b67cd
Author: wing328 <[email protected]>
Date:   Mon May 29 19:34:04 2017 +0800

    [Java] Fix float enum value by adding "f" (#5724)

    * fix java float enum value

    * update java petstore samples

    * add comment explaining the fix

commit ea30a4a7f84b020bddde06ef7e81468a0fb96316
Author: Cliffano Subagio <[email protected]>
Date:   Mon May 29 16:56:48 2017 +1000

    [Ruby] Chunked file download (#5718)

    * [Ruby] Modify file download to be written in chunks in order to handle large files. #5704

    * [Ruby] Update Ruby Petstore with file download improvement. #5704

commit ef35b80bd873281266389941382a6ecea65eb17a
Author: wing328 <[email protected]>
Date:   Mon May 29 11:45:28 2017 +0800

    Fixed missing isWildcard method used in templates

commit 3d97d83f7a45e01da84df1adc3e7de6f05517055
Author: René Winkelmeyer <[email protected]>
Date:   Mon May 29 05:16:06 2017 +0200

    Apex update for NamedCredentials and Salesforce DX (#5717)

    * Added mustache file for namedCredentials

    * Removed Basic and OAuth from Apex API in favor of NamedCredentials

    * Moved old README to README for ant deployment

    * Added SFDX OSS descriptor

    * Removed remoteSite mustache

    * Changed package.xml from RemoteSite to NamedCredential

    * Update ApexClientCodegen to support SFDX and namedCredentials

    * Created initial README for Salesforce DX

    * Ran Petstore test for Apex commit

    * Fixed error in README mustache

commit 999f901d2bdcc83b220f5c038c8352479112c8fb
Author: wing328 <[email protected]>
Date:   Sat May 27 00:33:49 2017 +0800

    update clojure petstore cient

commit b1ccaf69ac68a9b7a4e3067cc6c20592bed20739
Author: Michael Langford <[email protected]>
Date:   Fri May 26 12:27:11 2017 -0400

    Updates http-client dependency to correctly handles certificates (#5707)

    * Updates http-client dependency to one that correctly handles certificates

    This is important as amazon AWS gateway and several other types of certificates will not work correctly due to the old java library used by the 2.0.0 version of http-client.

    * Runs the petstore updates switch for clojure

    * Runs the petstore updates switch for clojure

commit d315ba2984b2d833168a70514e365b3d924ef170
Author: wing328 <[email protected]>
Date:   Sat May 27 00:04:17 2017 +0800

    add SAS to list of companies using swagger codegen

commit 39d79de6f766b440918fcd2bc31ab8b13717bd28
Merge: 54119a7ac 4d705081c
Author: wing328 <[email protected]>
Date:   Fri May 26 22:50:06 2017 +0800

    Merge branch 'master' of https://github.com/swagger-api/swagger-codegen

commit 54119a7ac16845f023b47df92b973ea2718d65ad
Author: wing328 <[email protected]>
Date:   Fri May 26 22:49:30 2017 +0800

    roll back clojure petstore to use petstore.json

commit 4d705081c85ad1b36ac0191d42ba89c451b842ee
Author: wing328 <[email protected]>
Date:   Fri May 26 21:47:49 2017 +0800

    [PHP] Fix broken links in the auto-generated documentation (#5715)

    * remove trailing space in cpprest, update samples

    * remove unused pom.xml in go pestore

    * fix broken links in php api doc by fixing baseType

    * fix csharp api doc

    * fix php examples

    * fix examples for abstract php generator

commit f2e149c237700f059887173403f9227eb1c2a3de
Author: wing328 <[email protected]>
Date:   Fri May 26 17:28:45 2017 +0800

    add Apex to the list of supported API clients

commit a2240ac619df5d0bdedad884b1374dc06ab772e3
Author: Takuro Wada <[email protected]>
Date:   Fri May 26 18:24:06 2017 +0900

    [htmlDocs2] inconsistent python method name between html2 and python generator (#5711)

commit 84df23f0259320c2b4ab43315c588cc31e7257d5
Author: Svarog <[email protected]>
Date:   Fri May 26 12:19:09 2017 +0300

    Made httpMethod in curl example actually upper case in html2 to support firefox (#5558) (#5705)

commit e2c91967a1168490eaba1b7a098fdffd9fecd47b
Author: wing328 <[email protected]>
Date:   Thu May 25 17:42:35 2017 +0800

    add phiz71's article on vert.x-swagger project

commit 0c0a401829308d965a5c2851494a2f35b3f3aea5
Author: wing328 <[email protected]>
Date:   Thu May 25 15:57:34 2017 +0800

    add link for https://github.com/icha024

commit 5b3bcf8a54e2666f69904d26c5aa10d61fe1da28
Author: wing328 <[email protected]>
Date:   Thu May 25 14:34:31 2017 +0800

    fix link to vpolouchkine

commit b4a2cd0888bf390529bab52ebeb4022dabbe3b93
Author: wing328 <[email protected]>
Date:   Thu May 25 12:42:49 2017 +0800

    add "Using Open API Specification To Put Lyft SDK Support in the Fast Lane"

commit ef53f08b09e87e0ee7bc021bd5446b5aeb0d902a
Author: rompic <[email protected]>
Date:   Wed May 24 17:26:33 2017 +0200

    fixed #5692 and regenerated samples (#5698)

commit b024288df2640d5235136e76fc2e3e3a46020dbb
Author: wing328 <[email protected]>
Date:   Wed May 24 16:50:32 2017 +0800

    JS ES6 enhancements

commit ca139ffc057155fb338801101ca942df1e6f0bb0
Author: Dinuka De Silva <[email protected]>
Date:   Wed May 24 14:05:54 2017 +0530

    Gh-4044: Enabling ES6 in `javascript` client (#5593)

    * gh-4044: Added useES6 as an option for javascript templates

    * gh-4044: Enabled ES6 in `javascript/api.mustache`

    * gh-4044: Enabled ES6 in `javascript/ApiClient.mustache`

    * gh-4044: Enabled ES6 in `javascript/enumClass.mustache`

    * gh-4044: Added useES6 cli option to `javascript` clients and updated the test cases

    * gh-4044: Enabled ES6 in `javascript/index.mustache`

    * gh-4044: Enabled ES6 in `javascript` model templates
    * `javascript/model.mustache`
    * `javascript/partial_model_generic.mustache`
    * `javascript/partial_model_enum_class.mustache`
    * `javascript/partial_model_inner_enum.mustache`

    * gh-4044: Separated `javascript-es6` templates to another folder

    * gh-4044: Updated `javascript-es6/index.mustache`

    * gh-4044: Enabled ES6 in `javascript-es6/api_doc.mustache`

    * gh-4044: Added required dependencies for ES6

    * gh-4044: Updated Supportig files for ES6 and non ES6

    * gh-4044: Added test scripts to verify `javascript` useEs6 option

    * gh-4044: Commented `javascript-es6` scripts due to the permission issues.

commit 296e0288eadc86a42b2cb20f81a5994d47b886c8
Merge: bd227df4d 165c11666
Author: wing328 <[email protected]>
Date:   Wed May 24 15:56:00 2017 +0800

    Merge branch 'master' of https://github.com/swagger-api/swagger-codegen

commit bd227df4db32161f0bd1847d8a95944cf31526bc
Author: wing328 <[email protected]>
Date:   Wed May 24 15:55:34 2017 +0800

    update ts angualr2 petstore clients

commit 165c11666162381992fe743ad5278243502ec9a2
Author: mtakaki <[email protected]>
Date:   Tue May 23 06:46:27 2017 -0700

    Moving import-mappings out of configOptions and converting it into a list, rather than being a comma-separated string. (#5384)

    * Moving import-mappings out of configOptions and converting it into a list, rather than being a comma-separated string. #5383

    * Making the change to importMappings backwards compatible

commit e12b22d5ce59151d99000dcebb45a2d2be06f044
Author: kirpit <[email protected]>
Date:   Tue May 23 23:40:21 2017 +1000

    Implement generating interfaces option for api resources, closes #5453. (#5519)

    * Implement generating interfaces option for api resources, closes swagger-api/swagger-codegen#5453.

    This commit introduces another _system property_ for typescript-angular2, called `withInterfaces` that is default to `false`. You can activate this flag by:

    ```
    java -jar modules/swagger-codegen-cli/target/swagger-codegen-cli.jar generate \
    -i http://petstore.swagger.io/v2/swagger.json \
    -l typescript-angular2 -o samples/server/petstore/springboot/typescript-angular2 \
    -D withInterfaces=true
    ```

    If set to `true`, generated api resource classes will be implemented with their interfaces in separate files.

    This change should not break and change the behaviour even though `withInterfaces` flag set to `true`. You are also welcome to create your own custom resource class by implementing those generated interfaces as they support defining new attributes with `[others: string]: any;` signature.

    * Fix unit test for typescript/angular2 client options for "withInterfaces"

    * Use double quote to follow coding standard

    * Respect interface naming convention for typescript/angular2

     Create respectful interface names that ends with `Interface` suffix, instead of prefixing with `I` according to typescript naming convention. This is also consistent with their file names that also ends with `Interface.ts`.

     Also fixes the merge conflicts.

    * Have better explanation for the `withInterfaces` system config

commit ebcd8489bc6bca1d7bb1cc3f98cd9d3a175a68f7
Merge: 5c46929ec 82740de5a
Author: wing328 <[email protected]>
Date:   Tue May 23 19:21:42 2017 +0800

    Merge branch 'christof-vollrath-bild-de-master'

commit 82740de5a027abcdce8bd980cd8be7fc701626cd
Merge: 5c46929ec 1c8e07a94
Author: wing328 <[email protected]>
Date:   Tue May 23 17:57:54 2017 +0800

    Merge branch 'master' of https://github.com/christof-vollrath-bild-de/swagger-codegen into christof-vollrath-bild-de-master

commit 5c46929ec2e9c5bc947f2e59c236c61cb06e9396
Author: wing328 <[email protected]>
Date:   Tue May 23 00:26:58 2017 +0800

    add link to "Diseño de APIs con OpenAPI"

commit d16eeb4046e3c90d92e5d10d2027f427c4ebd024
Author: wing328 <[email protected]>
Date:   Mon May 22 23:36:12 2017 +0800

    remove trailing )

commit 8b37ccb153870327c62fc1f8a3399e791d327442
Author: wing328 <[email protected]>
Date:   Mon May 22 23:32:42 2017 +0800

    add more presentations/tutorials

commit 35e20976fbdbd4ab5e1e0037fd013c116ff8e768
Author: wing328 <[email protected]>
Date:   Mon May 22 23:20:58 2017 +0800

    add Presentations/Videos/Tutorials/Books section

commit 802641bf919225cad6c924f681942576982d3d3a
Author: wing328 <[email protected]>
Date:   Sun May 21 16:12:47 2017 +0800

    update apex petstore client

commit 9f1c3e3e509c8d2e943cbaf0c5c88fa82cd7153b
Author: René Winkelmeyer <[email protected]>
Date:   Sun May 21 10:04:37 2017 +0200

    Updated default Apex API version to v39 (Spring '17 release) (#5678)

commit 8314f4e78a481554eb3cf1acfdcaa634b6661916
Author: wing328 <[email protected]>
Date:   Sun May 21 01:28:06 2017 +0800

    Add removeOperationIdPrefix option (#5674)

    * add removeOperationIdPrefix option

    * remove removeOperationIdPrefix from cli option for generators

commit 7edf74442664243a639255ec6635b27260d786f7
Author: wing328 <[email protected]>
Date:   Sat May 20 01:02:08 2017 +0800

    [Apex] add petstore samples, shell scripts, batch files (#5672)

    * add apex petstore samples, shell scripts, batch files

    * add wording "beta" to Apex help

commit 1aeef5f41f95f86d5f2d5982db25b92656ac3971
Author: wing328 <[email protected]>
Date:   Fri May 19 23:32:10 2017 +0800

    add @asnelling as the template owner of apex

commit a0482a40389cd54a9cd24bed0e4511c811c5bea3
Author: wing328 <[email protected]>
Date:   Fri May 19 23:18:52 2017 +0800

    Add support for Apex API client (#5669)

    * Salesforce Apex support

    * typo in function name

    * comments for clarification

    * DoubleProperty and FloatProperty are both DecimalProperty

    * test models with default and provided example property values

    * adding some more default example values

commit ef2028e53f81702b65676e204ba66e95154a4289
Author: Jean-François Côté <[email protected]>
Date:   Fri May 19 10:32:19 2017 -0400

    [Java Play Framework] Warnings removal and default value fix (#5660)

    * First commit of the Java Play Framework server generator. It is highly based on Spring so there might me a couple of things that don't make sense (like options or parameters) for the Play Framework.

    * Fix suggestions in the PR discussion + add .bat and .sh file as requested.

    * Updated Readme.md file

    * Remove unused mustache file + fix baseName vs paramName in all the mustache files.

    * Fix the compilation error when we have a body which is a list or map. Doesn't fix the problem with the annotation itself.

    * Fix the problem with the Http.MultipartFormData.FilePart

    * Removal of warning (final) and fix of a missing default value for boolean query parameters

commit ad0838f0a013adb460afa4d2d4693c122cb1b53f
Author: Takuro Wada <[email protected]>
Date:   Fri May 19 19:23:17 2017 +0900

    [ts-ng2] add check whether header parameter is undefined or not (#5668)

commit bc34062c2b3ee0e48db07ff68982660ceeccfcb1
Merge: 4479382ce bd2f03f1c
Author: wing328 <[email protected]>
Date:   Fri May 19 00:54:41 2017 +0800

    Merge branch 'update_swift_objc_petstore'

commit bd2f03f1c09ecb373a9a7b3f91e057cc93ed96ac
Author: wing328 <[email protected]>
Date:   Thu May 18 17:22:20 2017 +0800

    update objc, swift2,3 petstore samples

commit 4479382ced52f37cc62e5245230e5d9d508bc790
Author: Jean-François Côté <[email protected]>
Date:   Thu May 18 04:19:48 2017 -0400

    [Java Play Framework] Fix conversions (#5604)

    * First commit of the Java Play Framework server generator. It is highly based on Spring so there might me a couple of things that don't make sense (like options or parameters) for the Play Framework.

    * Fix suggestions in the PR discussion + add .bat and .sh file as requested.

    * Updated Readme.md file

    * Remove unused mustache file + fix baseName vs paramName in all the mustache files.

    * Fix the compilation error when we have a body which is a list or map. Doesn't fix the problem with the annotation itself.

    * Fix the problem with the Http.MultipartFormData.FilePart

    * Fix the conversion of boolean type

    * Add samples for the fix with the boolean

    * Fix bugs introduced by polci related to the bean validation.

    * Refactor to use the "beanValidationCore". Asked by @wing328

commit 632a2e394987b7463aef7bfda528e9675f255efa
Author: David Biesack <[email protected]>
Date:   Thu May 18 03:16:42 2017 -0400

    Fix #5653 so body parameter schema link matches model anchor (#5655)

    * Sync with upstream/master

    * Fix for issue #5653

    Override the toModelName(String name) [from DefaultCodegen] in StaticHtmlGenerator to return `name` unmodified
    so that the anchors for models and the href for body parameters match case (do not convert model names to TitleCase.

    * Revert "Fix for issue #5653"

    This reverts commit 5472aa10a3101ea5dd417bc509c5d9c5351a3d66.

    * Fix for issue #5653

    Override the toModelName(String name) [from DefaultCodegen] in StaticHtmlGenerator to return `name` unmodified
    so that the anchors for models and the href for body parameters match case (do not convert model names to TitleCase.

commit 4417bb6b32634298cbcadd555036c4e01966ded2
Author: Harald Walker <[email protected]>
Date:   Thu May 18 09:12:53 2017 +0200

    #5649 Fix FileAlreadyExistsException when downloading file using jersey2 (#5654)

    * #5649 Fix download file copy

    * Include generated pet store samples and fix indentation

    * Regenerate petstore sample to fix indentation

commit 07df7d47ebb08f8bb6bbb939f7fe22083a11c87e
Author: wing328 <[email protected]>
Date:   Wed May 17 22:12:06 2017 +0800

    update shell scripts, remove execute permission for json files

commit a6b7f60ac74a4cc525d5e93e23bdfed7ae0d46d8
Author: Cas Perl <[email protected]>
Date:   Wed May 17 15:18:51 2017 +0200

    Python improved (#5512)

    * ignore .vscode

    * fixed test case for models requiring mandatory attributes. added deserialize test for enum class

    * construct model with mandatory attributes. improve class reflection (e.g. deserialize). disable generated empty model unit test for further FIXME

    * rebuilt samples

    * FIXME comment

    * FIXME comment

    * fix deserialization enum test

commit 5bfd723ecc4793d56f279c9456683a6f49d70fd6
Author: Benjamin Douglas <[email protected]>
Date:   Wed May 17 00:08:29 2017 -0700

    Add Yelp to list of companies using swagger-codegen (#5651)

commit be3cfda3cec6558249afbb975e8051e4b4e0ed78
Author: Benjamin Douglas <[email protected]>
Date:   Tue May 16 06:20:05 2017 -0700

    Disable Jackson FAIL_ON_INVALID_SUBTYPE in feign (#5597)

    * Disable Jackson FAIL_ON_INVALID_SUBTYPE in feign

    With this change, Jackson does not fail even if it doesn't recognize a
    discriminator type name. This is helpful when upgrading a microservice with
    a new subtype while keeping compatibility with its old clients. The instance
    is returned as null instead of throwing an exception deep in the feign
    framework, allowing clients to gracefully degrade.

    * Disable FAIL_ON_INVALID_SUBTYPE for all Jackson-based projects

commit de427297ec468903945d5ee2214b4b1472df535c
Author: wing328 <[email protected]>
Date:   Tue May 16 21:09:16 2017 +0800

    update petstore samples for flask connexion

commit 046b73044646e72846f19d87cd366367576513d0
Author: Kyle Cacciatore <[email protected]>
Date:   Tue May 16 09:07:21 2017 -0400

    Upgraded connexion to 1.1.9 - required change to encoder as connexion is isolating implementation specific code (#5645)

commit 09a0edc4d94a24e271452dabea470733de6b2cd8
Merge: 27686c7e6 0a67696de
Author: wing328 <[email protected]>
Date:   Tue May 16 18:07:39 2017 +0800

    Merge branch 'bbdouglas-empty_classes'

commit 0a67696de875d357318fa044bc549bcc8c1f9041
Merge: 27686c7e6 7d2260547
Author: wing328 <[email protected]>
Date:   Tue May 16 17:51:42 2017 +0800

    Merge branch 'empty_classes' of https://github.com/bbdouglas/swagger-codegen into bbdouglas-empty_classes

commit 27686c7e6486e44805bbc2d18afaf113b2b0b3a7
Merge: c5d1c5d73 1fc969b05
Author: wing328 <[email protected]>
Date:   Tue May 16 17:09:32 2017 +0800

    Merge branch 'bbdouglas-sync_samples'

commit 1fc969b050634833b9a237c16774f63db6b9785b
Merge: c5d1c5d73 7406d07ac
Author: wing328 <[email protected]>
Date:   Tue May 16 16:51:41 2017 +0800

    Merge branch 'sync_samples' of https://github.com/bbdouglas/swagger-codegen into bbdouglas-sync_samples

commit c5d1c5d73bfcde6aa83dcc1914e50645fff6cc71
Author: Brendan Burns <[email protected]>
Date:   Mon May 15 22:59:06 2017 -0700

    Extract out a new helper method from java ApiClients (#5648)

commit 63facc0b0b6d8c7436af94ab332b33e444825979
Author: wing328 <[email protected]>
Date:   Tue May 16 00:02:27 2017 +0800

    add null/nil as reserved keyword (#5647)

commit 5b250aa18f3862fcdbdb69b414b84c6012b4c4e6
Author: wing328 <[email protected]>
Date:   Mon May 15 16:11:51 2017 +0800

    add warning message to window batch file

commit 2a70655c98eac9eb9ee706f99bf7cfb96aa32b5e
Author: wing328 <[email protected]>
Date:   Mon May 15 15:37:05 2017 +0800

    add warning message for run-all-petstore

commit 9c46ab2599924fc4f4d3720adfe085c4a5c66fa6
Author: mtakaki <[email protected]>
Date:   Sun May 14 07:26:02 2017 -0700

    Fixing import-mappings and using it when generating API stub. #2502 (#5373)

commit 54febc38e6ca8291d4afa844d3b890f1957bcf57
Author: René Pfeuffer <[email protected]>
Date:   Sun May 14 05:59:13 2017 +0200

    #5615 [Java] recognize 'null' as a reserved keyword (#5617)

commit a7d5684679afa000ca9173aad4e032b318595319
Author: Takuro Wada <[email protected]>
Date:   Sun May 14 12:54:26 2017 +0900

    [Python] add an option to Config in order to specify safe chars for path parameter (#5628)

commit 11baad6e4bbd9120cfc201c12697e6baf9363a57
Author: Takuro Wada <[email protected]>
Date:   Sun May 14 12:36:09 2017 +0900

    [TypeScript-jquery] set default return type as any (#5630)

    * [TypeScript-jquery] fix bug of empty returnType appearing if returnType is not provided

    * chore: add security sample for typescript-jquery

commit fe1fa188da3f393084893181a91e7efb878ae2d3
Author: wing328 <[email protected]>
Date:   Sat May 13 07:41:50 2017 +0800

    add box to the list of companies using codegen

commit 98d53bc8d2aca65a805774a696299b662bc05106
Author: sdoeringNew <[email protected]>
Date:   Fri May 12 18:03:44 2017 +0200

    #5619 added getValue() method in generated Enum classes in Java (#5620)

commit e7a1f5fb1797b56a77908182b2899eee56905ff4
Author: Brendan Burns <[email protected]>
Date:   Fri May 12 08:49:00 2017 -0700

    [Java] Add custom SSL KeyManagers for okhttp-gson Java clients (#5629)

    * Add the ability to set SSL KeyManagers for okhttp-gson Java clients

    * Update generated code.

    * Update security model files.

commit 68864a2eeac7225e9e5a9582bb51fd41172649b7
Author: wing328 <[email protected]>
Date:   Fri May 12 16:49:20 2017 +0800

    [JavaScript] Minor fix to JS doc and add swagger-codegen version to the file header (#5623)

    * fix JS doc using instance instead of default

    * update JS header with codegen version

    * roll back change in swagger codegen version in pom.xml

commit eaa2dc6d21250c024ef8a14e4113dabace06b5a0
Author: Jim Schubert <[email protected]>
Date:   Wed May 10 13:01:45 2017 -0400

    [csharp] Fix project glob pattern (#5605)

    This fixes the glob pattern to remove hard-coded namespaces, and exclude
    the obj folder. This removes a newly introduced issue that breaks
    apiPackage and modelPackage support and fixes a problem with Xamarin
    pulling in obj/**.cs when globbing **/*.cs.

commit 9b68f02f83cf653ea4d8c0758d439f1598fdb553
Author: wing328 <[email protected]>
Date:   Wed May 10 17:31:43 2017 +0800

    [Java][Spring] Undo "Add examples defined in the spec to Spring MVC server generator " (#5599)

    * remove unused pom.xml in go pestore

    * remove example support in JavaSprin (undo changes)

commit ec7b80abab7d99139130e93a1bc21f09e9feec74
Author: kenisteward <[email protected]>
Date:   Wed May 10 03:46:33 2017 -0400

    #4962 Empty Response body handling in typescript-angular2 - added returning an empty object on response.json() failure (#5585)

commit 5a257a055817dfaf4e2054d3950da2533f11afe2
Author: Voydz <[email protected]>
Date:   Wed May 10 09:24:43 2017 +0200

    [csharp] fixes for netstandard (json serializing and project files) (#5590)

commit fd3cae6c4b817778af4bab60f46685ff965a5395
Author: wing328 <[email protected]>
Date:   Tue May 9 17:07:45 2017 +0800

    rename .swagger folder to .swagger-codegen

commit f25a7575d3b68a2af8d17041a296a53e1016daa0
Author: Jim Schubert <[email protected]>
Date:   Tue May 9 04:59:48 2017 -0400

    [generator] Adds a .swagger/VERSION file for all generators (#5556)

commit 824842290df65e4bbc62811a7486d379d610deb8
Author: sabras75 <[email protected]>
Date:   Tue May 9 10:34:17 2017 +0200

    Fix#5510 (#5582)

    * Add overloads on signals.
    The overload adds the NetworkError and the error string to the signal. Both signal will be emitted. Clients are supposed to subscribe to  only one of the overloads.

    * refactor generated code alignement

    * Do not use method overload for signals. Instead, have another naming convention for signal that carries Error information.
     Why ? Because signal overloading and QT5 connector with method referencing do not mix well (see http://stackoverflow.com/questions/16794695/connecting-overloaded-signals-and-slots-in-qt-5). It would need to specify exactly which overload to take. That is cumbersome to write AND is a breaking change for the consumer of the generated code.

    * update qt5 sample files

commit fa2e575762dc71939cfcf8ae8bc1d058bce5cdab
Author: Eric Bélanger <[email protected]>
Date:   Mon May 8 12:38:59 2017 -0400

    [JavaSpring] add support for cascading bean validation (#5393)

commit 621ff06a896e9af3a15abd1dadcca4991ca9bc94
Author: wing328 <[email protected]>
Date:   Mon May 8 18:33:25 2017 +0800

    update java petstore sample

commit 409638676ee5f2b13d19abca644254952f16cf14
Author: Vincent Coetzee <[email protected]>
Date:   Mon May 8 12:26:30 2017 +0200

    Added code to templates to ensure correct generation of code for Swift3 (#5390)

    * Added code to templates to ensure generation of code for Swift3 that builds on both Apple platforms and Linux. Fixed a bug in the Model decoders that prevented code from building for Linux

    * Ran the script to generate the PetStore API

commit f5f3dbd94ae215143e03eb0ee9022ea600f6c6bf
Author: Peter Pentchev <[email protected]>
Date:   Mon May 8 13:12:13 2017 +0300

    Run all the CLI commands in the Docker environment (#5564)

    * [docker] Allow "validate" and "version" in Docker

    * [docker] Allow all the available CLI commands

    * [docker] Quote some more variables

commit a81cff0ed03cd3d45b4fa4da6f034b8e9e90f5d6
Author: Takuro Wada <[email protected]>
Date:   Mon May 8 19:08:54 2017 +0900

    [typescript-angular2] change OpaqueToken to InjectionToken<string> (Issue #5565) (#5569)

    * change OpaqueToken to InjectionToken<string> and add useOpaqueToken option for typescript-angular2 (#5565)

    * run security shell

commit adb213bc00637403b56cea954d51685b816f56ae
Author: Marcus Low Junxiang <[email protected]>
Date:   Mon May 8 09:55:13 2017 +0800

    Modifying resty dependency to use stable release instead of HEAD (#5579)

    * Modifying resty dependency to use stable release instead of HEAD

    * adding dependency to pre-integration test

commit ea16da813c0455074db9610b3e563046f3561635
Author: Luca Favatella <[email protected]>
Date:   Sat May 6 04:23:30 2017 +0100

    [Erlang] Plant CI for server (#5559)

    * [Erlang] Address apparent reproducibily issue of sample

    Spotted running `bin/erlang-petstore-server.sh` on d08d55d41 .

    Apart from newlines, this is the opposite change of ec6248cbc .

    * [Erlang] Perform basic testing of sample server on CI

    * [Erlang] Install recent Erlang/OTP version

    ... in order to satisfy `jesse` compilation.

    The error I faced is:
    ```
    $ curl -f -L -o ./rebar3 https://s3.amazonaws.com/rebar3/rebar3 && chmod +x ./rebar3 && ./rebar3 version && export PATH="${TRAVIS_BUILD_DIR}:$PATH"
      % Total    % Received % Xferd  Average Speed   Time    Time     Time  Current
                                     Dload  Upload   Total   Spent    Left  Speed
    100  766k  100  766k    0     0  1041k      0 --:--:-- --:--:-- --:--:-- 1041k
    rebar 3.3.6 on Erlang/OTP R16B03 Erts 5.10.4
    ...
    ===> Verifying dependencies...
    ===> Fetching jesse ({git,"https://github.com/for-GET/jesse.git",
                                     {tag,"1.4.0"}})
    ===> Fetching jsx ({git,"https://github.com/talentdeficit/jsx.git",
                                   {branch,"v2.8.0"}})
    ===> Skipping jsx (from {git,"git://github.com/talentdeficit/jsx.git",
                                        {tag,"2.8.0"}}) as an app of the same name has already been fetched
    ===> Compiling jsx
    ===> Compiling jesse
    ===> Compiling _build/default/lib/jesse/src/jesse_tests_util.erl failed
    _build/default/lib/jesse/src/jesse_tests_util.erl:28: can't find include lib "common_test/include/ct.hrl"
    _build/default/lib/jesse/src/jesse_tests_util.erl:55: undefined macro 'config/2'

    _build/default/lib/jesse/src/jesse_tests_util.erl:24: function do_test/2 undefined

    _build/default/lib/jesse/src/jesse_tests_util.erl:72: function test_schema/3 is unused
    _build/default/lib/jesse/src/jesse_tests_util.erl:102: function get_path/2 is unused
    _build/default/lib/jesse/src/jesse_tests_util.erl:105: function load_schema/1 is unused

    [ERROR] Command execution failed.
    org.apache.commons.exec.ExecuteException: Process exited with an error: 1 (Exit value: 1)
    	at org.apache.commons.exec.DefaultExecutor.executeInternal(DefaultExecutor.java:404)
    	at org.apache.commons.exec.DefaultExecutor.execute(DefaultExecutor.java:166)
    	at org.codehaus.mojo.exec.ExecMojo.executeCommandLine(ExecMojo.java:804)
    	at org.codehaus.mojo.exec.ExecMojo.executeCommandLine(ExecMojo.java:751)
    	at org.codehaus.mojo.exec.ExecMojo.execute(ExecMojo.java:313)
    	at org.apache.maven.plugin.DefaultBuildPluginManager.executeMojo(DefaultBuildPluginManager.java:106)
    	at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:208)
    	at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:153)
    	at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:145)
    	at org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject(LifecycleModuleBuilder.java:84)
    	at org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject(LifecycleModuleBuilder.java:59)
    	at org.apache.maven.lifecycle.internal.LifecycleStarter.singleThreadedBuild(LifecycleStarter.java:183)
    	at org.apache.maven.lifecycle.internal.LifecycleStarter.execute(LifecycleStarter.java:161)
    	at …

Author: panduka-desilva-deltatre

.dockerignore

@@ -1,3 +1,4 @@
+.git/
 *.iml
 out/
 *.ipr
@@ -13,35 +14,13 @@ generated-sources/*
 generated-code/*
 *.swp
 *.swo
-
-/target
-/generated-files
-/nbactions.xml
-*.pyc
-__pycache__
-samples/server-generator/scalatra/output
-samples/server-generator/node/output/node_modules
-samples/server-generator/scalatra/target
-samples/server-generator/scalatra/output/.history
-samples/client/petstore/qt5cpp/PetStore/moc_*
-samples/client/petstore/qt5cpp/PetStore/*.o
-samples/client/petstore/objc/PetstoreClient.xcworkspace/xcuserdata
-samples/client/petstore/qt5cpp/build-*
-samples/client/petstore/qt5cpp/PetStore/PetStore
-samples/client/petstore/qt5cpp/PetStore/Makefile
-samples/client/petstore/java/hello.txt
-samples/client/petstore/android/default/hello.txt
-samples/client/petstore/objc/Build
-samples/client/petstore/objc/Pods
-samples/server/petstore/nodejs/node_modules
-target
-.idea
-.lib
-atlassian-ide-plugin.xml
+*.bak
+project/
+samples/*
+target/
+.idea/
+.lib/
 .DS_Store
 
-samples/client/petstore/php/SwaggerClient-php/composer.lock
-samples/client/petstore/php/SwaggerClient-php/vendor/
-
-samples/client/petstore/silex/SwaggerServer/composer.lock
-samples/client/petstore/silex/SwaggerServer/venodr/
+# Not needed in a linux container
+bin/windows/*

.github/ISSUE_TEMPLATE.md

@@ -14,17 +14,17 @@ Also please indicate in the issue title which language/library is concerned. Eg:
 ##### Swagger declaration file content or url
 
 <!-- if it is a bug, a json or yaml that produces it.
-    If you post the code inline, please wrap it with
-    ```yaml
-    (here your code)
-    ```
-    (for YAML code) or
-    ```json
-    (here your code)
-    ```
-    (for JSON code), so it becomes more readable. If it is longer than about ten lines,
-    please create a Gist (https://gist.github.com) or upload it somewhere else and
-    link it here.
+If you post the code inline, please wrap it with
+```yaml
+(here your code)
+```
+(for YAML code) or
+```json
+(here your code)
+```
+(for JSON code), so it becomes more readable. If it is longer than about ten lines,
+please create a Gist (https://gist.github.com) or upload it somewhere else and
+link it here.
   -->
 
 ##### Command line used for generation

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,6 +1,6 @@
 ### PR checklist
 
-- [ ] Read the [contribution guildelines](https://github.com/swagger-api/swagger-codegen/blob/master/CONTRIBUTING.md).
+- [ ] Read the [contribution guidelines](https://github.com/swagger-api/swagger-codegen/blob/master/CONTRIBUTING.md).
 - [ ] Ran the shell/batch script under `./bin/` to update Petstore sample so that CIs can verify the change. (For instance, only need to run `./bin/{LANG}-petstore.sh` and `./bin/security/{LANG}-petstore.sh` if updating the {LANG} (e.g. php, ruby, python, etc) code generator or {LANG} client's mustache templates)
 - [ ] Filed the PR against the correct branch: master for non-breaking changes and `2.3.0` branch for breaking (non-backward compatible) changes.
 

.gitignore

@@ -23,6 +23,7 @@ packages/
 .pub
 .packages
 .vagrant/
+.vscode/
 
 .settings
 
@@ -61,6 +62,7 @@ samples/client/petstore/java/hello.txt
 samples/client/petstore/java/okhttp-gson/hello.txt
 samples/client/petstore/java/jersey1/hello.txt
 samples/client/petstore/java/jersey2-java8/hello.txt
+samples/client/petstore/java/jersey2/hello.txt
 samples/client/petstore/android/default/hello.txt
 samples/client/petstore/android/volley/.gradle/
 samples/client/petstore/android/volley/build/
@@ -100,11 +102,19 @@ samples/client/petstore/objc/core-data/SwaggerClientTests/SwaggerClient.xcworksp
 samples/client/petstore/objc/core-data/SwaggerClientTests/Podfile.lock
 
 # Swift
-samples/client/petstore/swift/SwaggerClientTests/SwaggerClient.xcodeproj/xcuserdata
-samples/client/petstore/swift/SwaggerClientTests/SwaggerClient.xcworkspace/xcuserdata
-samples/client/petstore/swift/SwaggerClientTests/Pods/Pods.xcodeproj/xcuserdata
-samples/client/petstore/swift/SwaggerClientTests/Pods/Pods.xcodeproj/xcshareddata/xcschemes
+samples/client/petstore/swift/**/SwaggerClientTests/SwaggerClient.xcodeproj/xcuserdata
+samples/client/petstore/swift/**/SwaggerClientTests/SwaggerClient.xcworkspace/xcuserdata
+samples/client/petstore/swift/**/SwaggerClientTests/Pods/
+#samples/client/petstore/swift/**/SwaggerClientTests/Pods/Pods.xcodeproj/xcuserdata
+#samples/client/petstore/swift/**/SwaggerClientTests/Pods/Pods.xcodeproj/xcshareddata/xcschemes
 samples/client/petstore/swift/**/SwaggerClientTests/Podfile.lock 
+# Swift3
+samples/client/petstore/swift3/**/SwaggerClientTests/SwaggerClient.xcodeproj/xcuserdata
+samples/client/petstore/swift3/**/SwaggerClientTests/SwaggerClient.xcworkspace/xcuserdata
+#samples/client/petstore/swift3/**/SwaggerClientTests/Pods/
+#samples/client/petstore/swift3/**/SwaggerClientTests/Pods/Pods.xcodeproj/xcuserdata
+#samples/client/petstore/swift3/**/SwaggerClientTests/Pods/Pods.xcodeproj/xcshareddata/xcschemes
+samples/client/petstore/swift3/**/SwaggerClientTests/Podfile.lock 
 
 # C#
 *.csproj.user
@@ -143,7 +153,8 @@ samples/client/petstore/typescript-node/**/typings
 samples/client/petstore/typescript-angular/**/typings
 samples/client/petstore/typescript-fetch/**/dist/
 samples/client/petstore/typescript-fetch/**/typings
+samples/client/petstore/typescript-angular2/npm/npm-debug.log
+samples/client/petstore/typescript-node/npm/npm-debug.log
 
 # aspnetcore
 samples/server/petstore/aspnetcore/.vs/
-

.travis.objc_swift_test.yml

@@ -0,0 +1,57 @@
+sudo: required
+language: objective-c 
+osx_image: xcode7.3 
+
+cache:
+  directories:
+  - $HOME/.m2
+  - $HOME/.gem
+  - $HOME/.rvm
+  - $HOME/.cocoapods
+  - swagger-api/swagger-codegen/samples/client/petstore/objc/default/SwaggerClientTests/Pods
+  - swagger-api/swagger-codegen/samples/client/petstore/objc/core-data/SwaggerClientTests/Pods
+  - swagger-api/swagger-codegen/samples/client/petstore/swift/default/SwaggerClientTests/Pods
+  - swagger-api/swagger-codegen/samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods
+
+services:
+  - docker
+
+addons:
+  hosts:
+    - petstore.swagger.io
+
+before_install:
+   - export SW=`pwd`
+   # show host table to confirm petstore.swagger.io is mapped to localhost
+   - cat /private/etc/hosts
+   #- rvm install 2.2.2 > /dev/null 2>&1
+   - rvm use 2.2.4
+   - gem environment 
+   - gem install cocoapods -v 1.0.1 -N --no-ri --no-rdoc
+   - gem install xcpretty -N --no-ri --no-rdoc
+   - pod --version
+   - pod setup --silent > /dev/null
+   # xctool already pre-installed
+   #- brew install xctool
+   - git clone https://github.com/wing328/swagger-samples
+   - cd swagger-samples/java/java-jersey-jaxrs && sudo mvn -q jetty:run &
+
+install:
+
+script:
+   # test default objc client
+   - cd $SW/samples/client/petstore/objc/default/SwaggerClientTests && pod install && xctool -workspace "SwaggerClient.xcworkspace" -scheme "SwaggerClient-Example" -destination platform='iOS Simulator',OS=8.4,name='iPhone 6' test -test-sdk iphonesimulator CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO
+   # test objc client with coredata
+   - cd $SW/samples/client/petstore/objc/core-data/SwaggerClientTests && pod install && xctool -workspace "SwaggerClient.xcworkspace" -scheme "SwaggerClient-Example" -destination platform='iOS Simulator',OS=8.4,name='iPhone 6' test -test-sdk iphonesimulator CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO
+   - set -o pipefail
+   # test swift client with promisekit
+   - cd $SW/samples/client/petstore/swift/promisekit/SwaggerClientTests && pod install && xcodebuild clean test -workspace "SwaggerClient.xcworkspace" -scheme "SwaggerClient" -sdk iphonesimulator GCC_INSTRUMENT_PROGRAM_FLOW_ARCS=YES GCC_GENERATE_TEST_COVERAGE_FILES=YES | xcpretty
+   # test default swift client
+   - cd $SW/samples/client/petstore/swift/default/SwaggerClientTests && pod install && xcodebuild clean test -workspace "SwaggerClient.xcworkspace" -scheme "SwaggerClient" -sdk iphonesimulator GCC_INSTRUMENT_PROGRAM_FLOW_ARCS=YES GCC_GENERATE_TEST_COVERAGE_FILES=YES | xcpretty
+   # test swift3 client with promisekit
+   - cd $SW/samples/client/petstore/swift3/promisekit/SwaggerClientTests && pod install && xcodebuild clean test -workspace "SwaggerClient.xcworkspace" -scheme "SwaggerClient" -sdk iphonesimulator GCC_INSTRUMENT_PROGRAM_FLOW_ARCS=YES GCC_GENERATE_TEST_COVERAGE_FILES=YES | xcpretty
+   # test default swift3 client
+   - cd $SW/samples/client/petstore/swift3/default/SwaggerClientTests && pod install && xcodebuild clean test -workspace "SwaggerClient.xcworkspace" -scheme "SwaggerClient" -sdk iphonesimulator GCC_INSTRUMENT_PROGRAM_FLOW_ARCS=YES GCC_GENERATE_TEST_COVERAGE_FILES=YES | xcpretty
+
+env:
+  - DOCKER_IMAGE_NAME=swaggerapi/swagger-generator

.travis.yml

@@ -1,31 +1,81 @@
 sudo: required
-language: java
-jdk:
-  - oraclejdk7
-  - oraclejdk8
-
+language: objective-c
+osx_image: xcode8.2
 cache:
   directories:
   - $HOME/.m2
+  - $HOME/.ivy2
+  - $HOME/.gradle/caches/
+  - $HOME/.gradle/wrapper/
+  - $HOME/samples/client/petstore/php/SwaggerClient-php/vendor
+  - $HOME/samples/client/petstore/ruby/venodr/bundle
+  - $HOME/samples/client/petstore/python/.venv/
+  - $HOME/samples/client/petstore/typescript-node/npm/node_modules
+  - $HOME/samples/client/petstore/typescript-node/npm/typings/
+  - $HOME/samples/client/petstore/typescript-fetch/tests/default/node_modules
+  - $HOME/samples/client/petstore/typescript-fetch/tests/default/typings
+  - $HOME/samples/client/petstore/typescript-fetch/builds/default/node_modules
+  - $HOME/samples/client/petstore/typescript-fetch/builds/default/typings
+  - $HOME/samples/client/petstore/typescript-fetch/builds/es6-target/node_modules
+  - $HOME/samples/client/petstore/typescript-fetch/builds/es6-target/typings
+  - $HOME/samples/client/petstore/typescript-fetch/builds/with-npm-version/node_modules
+  - $HOME/samples/client/petstore/typescript-fetch/npm/with-npm-version/typings
+  - $HOME/samples/client/petstore/typescript-angular/node_modules
+  - $HOME/samples/client/petstore/typescript-angular/typings
+  - $HOME/.cocoapods/repos/master
+# note: docker is not yet supported in iOS build
+#services:
+#  - docker
 
-services:
-  - docker
-
+# comment out the host table change to use the public petstore server
 addons:
   hosts:
     - petstore.swagger.io
 
 before_install:
-  # required when sudo: required for the Ruby petstore tests
-  - gem install bundler
+  - export SW=`pwd`
+  - rvm list
+  - rvm use 2.2.5
+  - gem environment 
+  - gem install bundler -N --no-ri --no-rdoc
+  - gem install cocoapods -v 1.2.1 -N --no-ri --no-rdoc
+  - gem install xcpretty -N --no-ri --no-rdoc
+  - pod --version
+  # comment out below to avoid errors
+  #- pod repo update
+  - pod setup --silent > /dev/null
   - npm install -g typescript
-  - sudo pip install virtualenv
+  - npm config set registry http://registry.npmjs.org/
+  - brew install sbt
+  - brew install leiningen
+  - brew install bats
+  - brew install curl
+  - brew install python3
+  - pip install virtualenv
+  # start local petstore server
+  - git clone -b docker --single-branch https://github.com/wing328/swagger-samples
+  - cd swagger-samples/java/java-jersey-jaxrs
+  - sudo mvn jetty:run &
+  - cd $SW
+  # NOTE: iOS build not support docker at the moment
   # to run petstore server locally via docker
-  - docker pull swaggerapi/petstore
-  - docker run -d -e SWAGGER_HOST=http://petstore.swagger.io -e SWAGGER_BASE_PATH=/v2 -p 80:8080 swaggerapi/petstore
-  - docker ps -a
+  #- docker pull swaggerapi/petstore
+  #- docker run -d -e SWAGGER_HOST=http://petstore.swagger.io -e SWAGGER_BASE_PATH=/v2 -p 80:8080 swaggerapi/petstore
+  #- docker ps -a
+  # Add rebar3 build tool and recent Erlang/OTP for Erlang petstore server tests.
+  # - Travis CI does not support rebar3 [yet](https://github.com/travis-ci/travis-ci/issues/6506#issuecomment-275189490).
+  # - Rely on `kerl` for [pre-compiled versions available](https://docs.travis-ci.com/user/languages/erlang#Choosing-OTP-releases-to-test-against). Rely on installation path chosen by [`travis-erlang-builder`](https://github.com/travis-ci/travis-erlang-builder/blob/e6d016b1a91ca7ecac5a5a46395bde917ea13d36/bin/compile#L18).
+
   # show host table to confirm petstore.swagger.io is mapped to localhost
   - cat /etc/hosts
+  # show java version
+  - java -version
+  # show brew version
+  - brew --version
+  # show xcpretty version
+  - xcpretty -v
+  # show go version
+  - go version
 
 install:
   # Add Godeps dependencies to GOPATH and PATH
@@ -34,8 +84,18 @@ install:
    - export PATH="${TRAVIS_BUILD_DIR}/Godeps/_workspace/bin:$PATH"
 
 script:
-  - mvn verify -Psamples
-  - if [ $DOCKER_HUB_USERNAME ]; then docker login --email=$DOCKER_HUB_EMAIL --username=$DOCKER_HUB_USERNAME --password=$DOCKER_HUB_PASSWORD && docker build -t $DOCKER_IMAGE_NAME ./modules/swagger-generator && if [ ! -z "$TRAVIS_TAG" ]; then docker tag $DOCKER_IMAGE_NAME:latest $DOCKER_IMAGE_NAME:$TRAVIS_TAG; fi && docker push $DOCKER_IMAGE_NAME; fi
+  # fail fast
+  - set -e
+  # fail if templates/generators contain carriage return '\r'
+  - /bin/bash ./bin/utils/detect_carriage_return.sh
+  # fail if generators contain tab '\t'
+  - /bin/bash ./bin/utils/detect_tab_in_java_class.sh
+  # run integration tests defined in maven pom.xml
+  - mvn -q --batch-mode verify -Psamples
+  # docker: build generator image and push to Docker Hub
+  #- if [ $DOCKER_HUB_USERNAME ]; then docker login --email=$DOCKER_HUB_EMAIL --username=$DOCKER_HUB_USERNAME --password=$DOCKER_HUB_PASSWORD && docker build -t $DOCKER_GENERATOR_IMAGE_NAME ./modules/swagger-generator && if [ ! -z "$TRAVIS_TAG" ]; then docker tag $DOCKER_GENERATOR_IMAGE_NAME:latest $DOCKER_GENERATOR_IMAGE_NAME:$TRAVIS_TAG; fi && if [ ! -z "$TRAVIS_TAG" ] || [ "$TRAVIS_BRANCH" = "master" ]; then docker push $DOCKER_GENERATOR_IMAGE_NAME; fi; fi
+  ## docker: build cli image and push to Docker Hub
+  #- if [ $DOCKER_HUB_USERNAME ]; then docker login --email=$DOCKER_HUB_EMAIL --username=$DOCKER_HUB_USERNAME --password=$DOCKER_HUB_PASSWORD && docker build -t $DOCKER_CODEGEN_CLI_IMAGE_NAME ./modules/swagger-codegen-cli && if [ ! -z "$TRAVIS_TAG" ]; then docker tag $DOCKER_CODEGEN_CLI_IMAGE_NAME:latest $DOCKER_CODEGEN_CLI_IMAGE_NAME:$TRAVIS_TAG; fi && if [ ! -z "$TRAVIS_TAG" ] || [ "$TRAVIS_BRANCH" = "master" ]; then docker push $DOCKER_CODEGEN_CLI_IMAGE_NAME; fi; fi
 
 env:
-  - DOCKER_IMAGE_NAME=swaggerapi/swagger-generator
+  - DOCKER_GENERATOR_IMAGE_NAME=swaggerapi/swagger-generator DOCKER_CODEGEN_CLI_IMAGE_NAME=swaggerapi/swagger-codegen-cli

CONTRIBUTING.md

@@ -16,6 +16,12 @@
 
 ## How to contribute
 
+### git
+
+If you're new to git, you may find the following FAQs useful:
+
+https://github.com/swagger-api/swagger-codegen/wiki/FAQ#git
+
 ### Code generators
 
 All the code generators can be found in [modules/swagger-codegen/src/main/java/io/swagger/codegen/languages](https://github.com/swagger-api/swagger-codegen/tree/master/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages)
@@ -28,13 +34,17 @@ For a list of variables available in the template, please refer to this [page](h
 
 
 ### Style guide
-Code change should conform to the programming style guide of the respective langauages:
+Code change should conform to the programming style guide of the respective languages:
 - Android: https://source.android.com/source/code-style.html
+- Bash: https://github.com/bahamas10/bash-style-guide
 - C#: https://msdn.microsoft.com/en-us/library/vstudio/ff926074.aspx
 - C++: https://google.github.io/styleguide/cppguide.html
+- Clojure: https://github.com/bbatsov/clojure-style-guide
+- Elixir: https://github.com/christopheradams/elixir_style_guide
+- Erlang: https://github.com/inaka/erlang_guidelines
 - Haskell: https://github.com/tibbe/haskell-style-guide/blob/master/haskell-style.md
 - Java: https://google.github.io/styleguide/javaguide.html
-- JavaScript: https://github.com/airbnb/javascript/tree/master/es5
+- JavaScript: https://github.com/airbnb/javascript/
 - Groovy: http://groovy-lang.org/style-guide.html
 - Go: https://github.com/golang/go/wiki/CodeReviewComments
 - ObjC: https://github.com/NYTimes/objective-c-style-guide
@@ -52,8 +62,8 @@ You may find the current code base not 100% conform to the coding style and we w
 
 For [Vendor Extensions](https://github.com/OAI/OpenAPI-Specification/blob/master/versions/2.0.md#vendorExtensions), please follow the naming convention below:
 - For general vendor extension, use lower case and hyphen. e.g. `x-is-unique`, `x-content-type`
-- For language-specified vendor extension, put it in the form of `x-{lang}-{extension-name}`. e.g. `x-objc-operation-id`, `x-java-feign-retry-limit` 
-- For a list of existing vendor extensions in use, please refer to https://github.com/swagger-api/swagger-codegen/wiki/Vendor-Extensions. If you've addaed new vendor extensions as part of your PR, please update the wiki page.
+- For language-specified vendor extension, put it in the form of `x-{lang}-{extension-name}`. e.g. `x-objc-operation-id`, `x-java-feign-retry-limit`
+- For a list of existing vendor extensions in use, please refer to https://github.com/swagger-api/swagger-codegen/wiki/Vendor-Extensions. If you've added new vendor extensions as part of your PR, please update the wiki page.
 
 ### Testing
 
@@ -74,3 +84,5 @@ To start the CI tests, you can run `mvn verify -Psamples` (assuming you've all t
 - Document the fix in the code to make the code more readable
 - Make sure test cases passed after the change (one way is to leverage https://travis-ci.org/ to run the CI tests)
 - File a PR with meaningful title, description and commit messages. A good example is [PR-3306](https://github.com/swagger-api/swagger-codegen/pull/3306)
+- Recommended git settings
+   - `git config --global core.autocrlf input` to tell Git convert CRLF to LF on commit but not the other way around 

Dockerfile

@@ -1,13 +1,22 @@
-FROM maven:3.3-jdk-7
+FROM jimschubert/8-jdk-alpine-mvn:1.0
 
-WORKDIR /src
-VOLUME  /src
-VOLUME  /root/.m2/repository
+ENV GEN_DIR /opt/swagger-codegen
 
-ADD . /opt/swagger-codegen
+RUN set -x && \
+    apk add --no-cache bash
 
-RUN cd /opt/swagger-codegen && mvn package
+RUN mkdir /opt
 
-ENTRYPOINT ["java", "-jar", "/opt/swagger-codegen/modules/swagger-codegen-cli/target/swagger-codegen-cli.jar"]
+ADD . ${GEN_DIR}
 
-CMD ["help"]
+VOLUME  ${MAVEN_HOME}/.m2/repository
+
+WORKDIR ${GEN_DIR}
+
+RUN mvn -am -pl "modules/swagger-codegen-cli" package
+
+COPY docker-entrypoint.sh /usr/local/bin/
+
+ENTRYPOINT ["docker-entrypoint.sh"]
+
+CMD ["build"]