Merge remote-tracking branch 'origin/master' into 3.0.0

README.md

@@ -24,8 +24,8 @@
 ## Overview
 This is the swagger codegen project, which allows generation of API client libraries (SDK generation), server stubs and documentation automatically given an [OpenAPI Spec](https://github.com/OAI/OpenAPI-Specification). Currently, the following languages/frameworks are supported:
 
-- **API clients**: **ActionScript**, **Ada**, **Apex**, **Bash**, **C#** (.net 2.0, 4.0 or later), **C++** (cpprest, Qt5, Tizen), **Clojure**, **Dart**, **Elixir**, **Eiffel**, **Erlang**, **Go**, **Groovy**, **Haskell** (http-client, Servant), **Java** (Jersey1.x, Jersey2.x, OkHttp, Retrofit1.x, Retrofit2.x, Feign, RestTemplate, RESTEasy, Vertx, Google API Client Library for Java), **Kotlin**, **Lua**, **Node.js** (ES5, ES6, AngularJS with Google Closure Compiler annotations) **Objective-C**, **Perl**, **PHP**, **PowerShell**, **Python**, **R**, **Ruby**, **Rust**, **Scala** (akka, http4s, swagger-async-httpclient), **Swift** (2.x, 3.x, 4.x), **Typescript** (Angular1.x, Angular2.x, Fetch, jQuery, Node)
-- **Server stubs**: **C#** (ASP.NET Core, NancyFx), **C++** (Pistache, Restbed), **Erlang**, **Go**, **Haskell** (Servant), **Java** (MSF4J, Spring, Undertow, JAX-RS: CDI, CXF, Inflector, RestEasy, Play Framework), **PHP** (Lumen, Slim, Silex, [Symfony](https://symfony.com/), [Zend Expressive](https://github.com/zendframework/zend-expressive)), **Python** (Flask), **NodeJS**, **Ruby** (Sinatra, Rails5), **Rust**, **Scala** ([Finch](https://github.com/finagle/finch), [Lagom](https://github.com/lagom/lagom), Scalatra)
+- **API clients**: **ActionScript**, **Ada**, **Apex**, **Bash**, **C#** (.net 2.0, 3.5 or later), **C++** (cpprest, Qt5, Tizen), **Clojure**, **Dart**, **Elixir**, **Eiffel**, **Erlang**, **Go**, **Groovy**, **Haskell** (http-client, Servant), **Java** (Jersey1.x, Jersey2.x, OkHttp, Retrofit1.x, Retrofit2.x, Feign, RestTemplate, RESTEasy, Vertx, Google API Client Library for Java), **Kotlin**, **Lua**, **Node.js** (ES5, ES6, AngularJS with Google Closure Compiler annotations) **Objective-C**, **Perl**, **PHP**, **PowerShell**, **Python**, **R**, **Ruby**, **Rust** (rust, rust-server), **Scala** (akka, http4s, swagger-async-httpclient), **Swift** (2.x, 3.x, 4.x), **Typescript** (Angular1.x, Angular2.x, Fetch, jQuery, Node)
+- **Server stubs**: **C#** (ASP.NET Core, NancyFx), **C++** (Pistache, Restbed), **Erlang**, **Go**, **Haskell** (Servant), **Java** (MSF4J, Spring, Undertow, JAX-RS: CDI, CXF, Inflector, RestEasy, Play Framework), **PHP** (Lumen, Slim, Silex, [Symfony](https://symfony.com/), [Zend Expressive](https://github.com/zendframework/zend-expressive)), **Python** (Flask), **NodeJS**, **Ruby** (Sinatra, Rails5), **Rust** (rust-server), **Scala** ([Finch](https://github.com/finagle/finch), [Lagom](https://github.com/lagom/lagom), Scalatra)
 - **API documentation generators**: **HTML**, **Confluence Wiki**
 - **Configuration files**: [**Apache2**](https://httpd.apache.org/)
 - **Others**: **JMeter**
@@ -80,7 +80,7 @@ The OpenAPI Specification has undergone 3 revisions since initial creation in 20
 Swagger Codegen Version    | Release Date | OpenAPI Spec compatibility | Notes
 -------------------------- | ------------ | -------------------------- | -----
 3.0.0 (upcoming major release) [SNAPSHOT](https://oss.sonatype.org/content/repositories/snapshots/io/swagger/swagger-codegen-cli/3.0.0-SNAPSHOT/)| TBD | 1.0, 1.1, 1.2, 2.0, 3.0 | Major release with breaking changes
-2.3.0 (current master, upcoming minor release) [SNAPSHOT](https://oss.sonatype.org/content/repositories/snapshots/io/swagger/swagger-codegen-cli/2.3.0-SNAPSHOT/)| Jul/Aug 2017   | 1.0, 1.1, 1.2, 2.0   | Minor release with breaking changes
+2.3.0 (current master, upcoming minor release) [SNAPSHOT](https://oss.sonatype.org/content/repositories/snapshots/io/swagger/swagger-codegen-cli/2.3.0-SNAPSHOT/)| Dec 2017   | 1.0, 1.1, 1.2, 2.0   | Minor release with breaking changes
 [2.2.3](https://github.com/swagger-api/swagger-codegen/releases/tag/v2.2.3) (**current stable**) | 2017-07-15   | 1.0, 1.1, 1.2, 2.0   | [tag v2.2.3](https://github.com/swagger-api/swagger-codegen/tree/v2.2.3)
 [2.2.2](https://github.com/swagger-api/swagger-codegen/releases/tag/v2.2.2) | 2017-03-01   | 1.0, 1.1, 1.2, 2.0   | [tag v2.2.2](https://github.com/swagger-api/swagger-codegen/tree/v2.2.2)
 [2.2.1](https://github.com/swagger-api/swagger-codegen/releases/tag/v2.2.1) | 2016-08-07   | 1.0, 1.1, 1.2, 2.0   | [tag v2.2.1](https://github.com/swagger-api/swagger-codegen/tree/v2.2.1)
@@ -752,8 +752,9 @@ Here are some companies/projects using Swagger Codegen in production. To add you
 - [Bufferfly Network](https://www.butterflynetinc.com/)
 - [Cachet Financial](http://www.cachetfinancial.com/)
 - [carpolo](http://www.carpolo.co/)
-- [CloudBoost](https://www.CloudBoost.io/)
 - [Cisco](http://www.cisco.com/)
+- [CloudBoost](https://www.CloudBoost.io/)
+- [Cloudsmith](https://cloudsmith.io/)
 - [Conplement](http://www.conplement.de/)
 - [Cummins](http://www.cummins.com/)
 - [Cupix](http://www.cupix.com)
@@ -779,6 +780,7 @@ Here are some companies/projects using Swagger Codegen in production. To add you
 - [Genesys - PureCloud](http://developer.mypurecloud.com/)
 - [Germin8](http://www.germin8.com)
 - [GigaSpaces](http://www.gigaspaces.com)
+- [GMO Pepabo](https://pepabo.com/en/)
 - [goTransverse](http://www.gotransverse.com/api)
 - [GraphHopper](https://graphhopper.com/)
 - [Gravitate Solutions](http://gravitatesolutions.com/)
@@ -878,6 +880,7 @@ Presentations/Videos/Tutorials/Books
 - 2016/01/15 - [How to end manual REST-API client coding](https://www.youtube.com/watch?v=RzZRdqZp6Oo) by [Johannes Fiala](https://github.com/jfiala) @ dotJS 2015
 - 2016/04/27 - [Automated REST API Development](https://yos.io/2016/04/27/automated-api-development/) by [Yos Riady](https://www.linkedin.com/in/yosriady)
 - 2016/05/29 - [Generating Java Spring-MVC code from Swagger Spec](https://www.clianz.com/2016/05/29/java-mvc-swagger-gen/) by [@icha024](https://github.com/icha024)
+- 2016/08/23 - [Generating Dreamfactory Client SDKs based on Swagger API Definitions](http://blog.dreamfactory.com/generating-dreamfactory-client-sdks-based-on-swagger-api-definitions) by [Phil Schuler](https://github.com/philicious/)
 - 2016/09/28 - [1 UNBELIEVABLE TRICK TO CREATE AN EASY TO CONSUME API IN .NET](https://stapp.space/1-simple-trick-to-create-a-good-api-in-net/) by [Piotr Stapp](https://stapp.space/author/piotr-stapp/)
 - 2016/10/10 - [Using swagger-codegen with Marketo](http://developers.marketo.com/blog/using-swagger-codegen-with-marketo/) by [Kenny Elkington](http://developers.marketo.com/blog/using-swagger-codegen-with-marketo/)
 - 2016/10/12 - [Designing a Swagger API](https://sookocheff.com/post/api/swagger/) by [Kevin Sookocheff](https://sookocheff.com/)
@@ -914,7 +917,8 @@ Presentations/Videos/Tutorials/Books
 - 2017/10/08 - [Generating a REST Ada client with OpenAPI and Swagger Codegen](https://blog.vacs.fr/vacs/blogs/post.html?post=2017/10/08/Generating-a-REST-Ada-client-with-OpenAPI-and-Swagger-Codegen) by [Stephane Carrez](https://github.com/stcarrez)
 - 2017/11/08 - [A Beginner's Guide to Code Generation for REST APIs](https://gum.co/swagger_codegen_beginner)(eBook) by [William Cheng](https://twitter.com/wing328)
 - 2017/11/18 - [10年前のレガシーシステムをサーバーサイドKotlinでフルリニューアルしている話 #jjug_ccc #ccc_g2](https://speakerdeck.com/maeharin/10nian-qian-falseregasisisutemuwosabasaidokotlindehururiniyuarusiteiruhua-number-jjug-ccc-number-ccc-g2) by [Hidenori Maehara](https://github.com/maeharin)
-- 2017/11/21 - [swagger-codegen から眺める Swift4](https://speakerdeck.com/d_date/swagger-codegen-karatiao-meru-swift4)
+- 2017/11/21 - [swagger-codegen から眺める Swift4](https://speakerdeck.com/d_date/swagger-codegen-karatiao-meru-swift4) by [Daiki Matsudate](https://github.com/d-date)
+- 2017/12/07 - [API-driven development with OpenAPI and Swagger, Part 2](https://www.itworld.com/article/3199190/apis/api-driven-development-with-openapi-and-swagger-part-2.html) by Matthew Tyson
 
 # Swagger Codegen Core Team
 
@@ -1079,7 +1083,7 @@ If you want to join the committee, please kindly apply by sending an email to wi
 | Android | @jaz-ah (2017/09) |
 | Apex  |     |
 | Bash  | @frol (2017/07) @bkryza (2017/08) @kenjones-cisco (2017/09) |
-| C++      | @ravinikam (2017/07) @stkrwork (2017/07) |  
+| C++      | @ravinikam (2017/07) @stkrwork (2017/07) @fvarose (2017/11) |
 | C#        | @mandrean (2017/08) @jimschubert (2017/09) |
 | Clojure   |  |
 | Dart      | @ircecho (2017/07) |
@@ -1087,7 +1091,7 @@ If you want to join the committee, please kindly apply by sending an email to wi
 | Elixir    |  |
 | Erlang    | @tsloughter (2017/11) |
 | Groovy    |  |
-| Go        |  |
+| Go        | @antihax (2017/11) |
 | Haskell   | |
 | Java      | @bbdouglas (2017/07) @JFCote (2017/08) @sreeshas (2017/08) @jfiala (2017/08) @lukoyanov (2017/09) @cbornet (2017/09) |
 | Kotlin     | @jimschubert (2017/09) |
@@ -1099,7 +1103,7 @@ If you want to join the committee, please kindly apply by sending an email to wi
 | Python   | @taxpon (2017/07) @frol (2017/07) @mbohlool (2017/07) @cbornet (2017/09) @kenjones-cisco (2017/11)|
 | R        |  |
 | Ruby      | @cliffano (2017/07) @zlx (2017/09) |
-| Rust      | @frol (2017/07) @farcaller (2017/08) | 
+| Rust      | @frol (2017/07) @farcaller (2017/08) @bjgill (2017/12) |
 | Scala     | @clasnake (2017/07) @jimschubert (2017/09) |
 | Swift     | @jgavris (2017/07) @ehyche (2017/08) @Edubits (2017/09) @jaz-ah (2017/09) |
 | TypeScript | @TiFu (2017/07) @taxpon (2017/07) @sebastianhaas (2017/07) @kenisteward (2017/07) @Vrolijkx (2017/09) |

bin/swift4-all.sh

@@ -0,0 +1,48 @@
+#!/bin/sh
+
+SCRIPT="$0"
+
+while [ -h "$SCRIPT" ] ; do
+  ls=`ls -ld "$SCRIPT"`
+  link=`expr "$ls" : '.*-> \(.*\)$'`
+  if expr "$link" : '/.*' > /dev/null; then
+    SCRIPT="$link"
+  else
+    SCRIPT=`dirname "$SCRIPT"`/"$link"
+  fi
+done
+
+if [ ! -d "${APP_DIR}" ]; then
+  APP_DIR=`dirname "$SCRIPT"`/..
+  APP_DIR=`cd "${APP_DIR}"; pwd`
+fi
+
+executable="./modules/swagger-codegen-cli/target/swagger-codegen-cli.jar"
+
+if [ ! -f "$executable" ]
+then
+  mvn clean package
+fi
+
+# if you've executed sbt assembly previously it will use that instead.
+export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
+ags="$@ generate -t modules/swagger-codegen/src/main/resources/swift4 -i modules/swagger-codegen/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -l swift4 -c ./bin/swift4-petstore.json -o samples/client/petstore/swift4/default"
+
+echo "#### Petstore Swift API client (default) ####"
+java $JAVA_OPTS -jar $executable $ags
+
+ags="$@ generate -t modules/swagger-codegen/src/main/resources/swift4 -i modules/swagger-codegen/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -l swift4 -c ./bin/swift4-petstore-promisekit.json -o samples/client/petstore/swift4/promisekit"
+echo "#### Petstore Swift API client (promisekit) ####"
+java $JAVA_OPTS -jar $executable $ags
+
+ags="$@ generate -t modules/swagger-codegen/src/main/resources/swift4 -i modules/swagger-codegen/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -l swift4 -c ./bin/swift4-petstore-rxswift.json -o samples/client/petstore/swift4/rxswift"
+echo "#### Petstore Swift API client (rxswift) ####"
+java $JAVA_OPTS -jar $executable $ags
+
+ags="$@ generate -t modules/swagger-codegen/src/main/resources/swift4 -i modules/swagger-codegen/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -l swift4 -c ./bin/swift4-petstore-objcCompatible.json -o samples/client/petstore/swift4/objcCompatible"
+echo "#### Petstore Swift API client (objcCompatible) ####"
+java $JAVA_OPTS -jar $executable $ags
+
+ags="$@ generate -t modules/swagger-codegen/src/main/resources/swift4 -i modules/swagger-codegen/src/test/resources/2_0/swift4Test.json -l swift4 -c ./bin/swift4-test.json -o samples/client/test/swift4/default"
+echo "#### Swift4Test Swift API client (default) ####"
+java $JAVA_OPTS -jar $executable $ags

bin/swift4-petstore-all.sh

@@ -38,3 +38,7 @@ java $JAVA_OPTS -jar $executable $ags
 ags="$@ generate -t modules/swagger-codegen/src/main/resources/swift4 -i modules/swagger-codegen/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -l swift4 -c ./bin/swift4-petstore-rxswift.json -o samples/client/petstore/swift4/rxswift"
 echo "#### Petstore Swift API client (rxswift) ####"
 java $JAVA_OPTS -jar $executable $ags
+
+ags="$@ generate -t modules/swagger-codegen/src/main/resources/swift4 -i modules/swagger-codegen/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -l swift4 -c ./bin/swift4-petstore-objcCompatible.json -o samples/client/petstore/swift4/objcCompatible"
+echo "#### Petstore Swift API client (objcCompatible) ####"
+java $JAVA_OPTS -jar $executable $ags

bin/windows/erlang-petstore-server.bat

@@ -0,0 +1,10 @@
+set executable=.\modules\swagger-codegen-cli\target\swagger-codegen-cli.jar
+
+If Not Exist %executable% (
+  mvn clean package
+)
+
+REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M
+set ags=generate -t modules\swagger-codegen\src\main\resources\erlang-server -i modules\swagger-codegen\src\test\resources\2_0\petstore.yaml -l erlang-server -o samples\client\petstore\erlang-server
+
+java %JAVA_OPTS% -jar %executable% %ags%

bin/windows/go-petstore-server.bat

@@ -0,0 +1,10 @@
+set executable=.\modules\swagger-codegen-cli\target\swagger-codegen-cli.jar
+
+If Not Exist %executable% (
+  mvn clean package
+)
+
+REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M -DloggerPath=conf/log4j.properties
+set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore.yaml -l go-server -o samples\server\petstore\go-api-server -DpackageName=petstoreserver  -Dservice
+
+java %JAVA_OPTS% -jar %executable% %ags%

bin/windows/go-petstore.bat

@@ -5,6 +5,6 @@ If Not Exist %executable% (
 )
 
 REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M -DloggerPath=conf/log4j.properties
-set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore.yaml -l go -o samples\client\petstore\go
+set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore.yaml -l go -o samples\client\petstore\go -DpackageName=petstore
 
 java %JAVA_OPTS% -jar %executable% %ags%

bin/windows/java-petstore-okhttp-gson.bat

@@ -5,6 +5,6 @@ If Not Exist %executable% (
 )
 
 REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M
-set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore.yaml -l java -o samples\client\petstore\java --library=okhttp-gson -DdateLibrary=joda,hideGenerationTimestamp=true
+set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore-with-fake-endpoints-models-for-testing.yaml -l java -o samples\client\petstore\java --library=okhttp-gson -DdateLibrary=joda -DhideGenerationTimestamp=true
 
 java %JAVA_OPTS% -jar %executable% %ags%

bin/windows/java-petstore.bat

@@ -5,6 +5,6 @@ If Not Exist %executable% (
 )
 
 REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M
-set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore.yaml -l java -o samples\client\petstore\java -DdateLibrary=joda,hideGenerationTimestamp=true
+set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore-with-fake-endpoints-models-for-testing.yaml -l java -o samples\client\petstore\java -DdateLibrary=joda -DhideGenerationTimestamp=true
 
 java %JAVA_OPTS% -jar %executable% %ags%

bin/windows/java-play-framework-petstore-server.bat

@@ -5,6 +5,6 @@ If Not Exist %executable% (
 )
 
 REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M
-set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore.yaml -l java-play-framework -o samples\server\petstore\java-play-framework
+set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore.yaml -l java-play-framework -o samples\server\petstore\java-play-framework -DhideGenerationTimestamp=true
 
 java %JAVA_OPTS% -jar %executable% %ags%

bin/windows/java-vertx-async-petstore-server.bat

@@ -5,6 +5,6 @@ If Not Exist %executable% (
 )
 
 REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M
-set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore.yaml -l java-vertx -o samples\server\petstore\java-vertx\async -DvertxSwaggerRouterVersion=1.2.0
+set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore.yaml -l java-vertx -o samples\server\petstore\java-vertx\async -DvertxSwaggerRouterVersion=1.2.0 -DhideGenerationTimestamp=true
 
 java %JAVA_OPTS% -jar %executable% %ags%

bin/windows/java-vertx-rx-petstore-server.bat

@@ -5,6 +5,6 @@ If Not Exist %executable% (
 )
 
 REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M
-set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore.yaml -l java-vertx -o samples\server\petstore\java-vertx\rx -DvertxSwaggerRouterVersion=1.2.0,rxInterface=true
+set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore.yaml -l java-vertx -o samples\server\petstore\java-vertx\rx -DvertxSwaggerRouterVersion=1.2.0 -DrxInterface=true
 
 java %JAVA_OPTS% -jar %executable% %ags%

bin/windows/spring-mvc-petstore-j8-async-server.bat

@@ -5,6 +5,6 @@ If Not Exist %executable% (
 )
 
 REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M
-set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore.yaml -l spring --library=spring-mvc -o samples\server\petstore\spring-mvc-j8-async -c bin\spring-mvc-petstore-j8-async.json
+set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore-with-fake-endpoints-models-for-testing.yaml -l spring --library=spring-mvc -o samples\server\petstore\spring-mvc-j8-async -c bin\spring-mvc-petstore-j8-async.json -DhideGenerationTimestamp=true
 
 java %JAVA_OPTS% -jar %executable% %ags%

bin/windows/spring-mvc-petstore-server.bat

@@ -5,6 +5,6 @@ If Not Exist %executable% (
 )
 
 REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M
-set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore.yaml -l spring --library=spring-mvc -o samples\server\petstore\spring-mvc
+set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore-with-fake-endpoints-models-for-testing.yaml -c bin\spring-mvc-petstore-server.json -l spring --library=spring-mvc -o samples\server\petstore\spring-mvc -DhideGenerationTimestamp=true
 
 java %JAVA_OPTS% -jar %executable% %ags%

bin/windows/springboot-petstore-server.bat

@@ -5,6 +5,6 @@ If Not Exist %executable% (
 )
 
 REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M
-set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore.yaml -l spring -o samples\server\petstore\springboot
+set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore-with-fake-endpoints-models-for-testing.yaml -l spring -o samples\server\petstore\springboot -DhideGenerationTimestamp=true
 
 java %JAVA_OPTS% -jar %executable% %ags%

google_checkstyle.xml

@@ -133,7 +133,7 @@
             <message key="ws.notPreceded" value="GenericWhitespace ''{0}'' is not preceded with whitespace."/>
         </module>
         <module name="Indentation">
-            <!-- Modified defaults for swagger-codegen (multipled Google by 2)-->
+            <!-- Modified defaults for swagger-codegen (multiplied Google by 2)-->
             <property name="basicOffset" value="4"/>
             <property name="braceAdjustment" value="0"/>
             <property name="caseIndent" value="4"/>

modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java

@@ -191,7 +191,7 @@ public class DefaultCodegen {
             for (String name : allModels.keySet()) {
                 CodegenModel cm = allModels.get(name);
                 CodegenModel parent = allModels.get(cm.parent);
-                // if a discriminator exists on the parent, don't add this child to the inheritance heirarchy
+                // if a discriminator exists on the parent, don't add this child to the inheritance hierarchy
                 // TODO Determine what to do if the parent discriminator name == the grandparent discriminator name
                 while (parent != null) {
                     if (parent.children == null) {

modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultGenerator.java

@@ -207,11 +207,17 @@ public class DefaultGenerator extends AbstractGenerator implements Generator {
 
         if (info.getContact() != null) {
             Contact contact = info.getContact();
-            config.additionalProperties().put("infoUrl", config.escapeText(contact.getUrl()));
             if (contact.getEmail() != null) {
                 config.additionalProperties().put("infoEmail", config.escapeText(contact.getEmail()));
             }
+            if (contact.getName() != null) {
+                config.additionalProperties().put("infoName", config.escapeText(contact.getName()));
             }
+            if (contact.getUrl() != null) {
+                config.additionalProperties().put("infoUrl", config.escapeText(contact.getUrl()));
+            }
+        }
+
         if (info.getLicense() != null) {
             License license = info.getLicense();
             if (license.getName() != null) {
@@ -221,12 +227,14 @@ public class DefaultGenerator extends AbstractGenerator implements Generator {
                 config.additionalProperties().put("licenseUrl", config.escapeText(license.getUrl()));
             }
         }
+
         if (info.getVersion() != null) {
             config.additionalProperties().put("version", config.escapeText(info.getVersion()));
         } else {
             LOGGER.error("Missing required field info version. Default version set to 1.0.0");
             config.additionalProperties().put("version", "1.0.0");
         }
+
         if (info.getTermsOfService() != null) {
             config.additionalProperties().put("termsOfService", config.escapeText(info.getTermsOfService()));
         }

modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AbstractCSharpCodegen.java

@@ -422,6 +422,20 @@ public abstract class AbstractCSharpCodegen extends DefaultCodegen implements Co
                         }
                     }
 
+                    if (operation.examples != null){
+                        for (Map<String, String> example : operation.examples)
+                        {
+                            for (Map.Entry<String, String> entry : example.entrySet())
+                            {
+                                // Replace " with \", \r, \n with \\r, \\n
+                                String val = entry.getValue().replace("\"", "\\\"")
+                                    .replace("\r","\\r")
+                                    .replace("\n","\\n");
+                                entry.setValue(val);
+                            }
+                        }
+                    }
+
                     processOperation(operation);
                 }
             }

modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AbstractJavaCodegen.java

@@ -30,6 +30,7 @@ import io.swagger.models.Model;
 import io.swagger.models.Operation;
 import io.swagger.models.Path;
 import io.swagger.models.Swagger;
+import io.swagger.models.parameters.BodyParameter;
 import io.swagger.models.parameters.FormParameter;
 import io.swagger.models.parameters.Parameter;
 import io.swagger.models.properties.ArrayProperty;
@@ -941,13 +942,16 @@ public abstract class AbstractJavaCodegen extends DefaultCodegen implements Code
             }
             for (Operation operation : path.getOperations()) {
                 boolean hasFormParameters = false;
+                boolean hasBodyParameters = false;
                 for (Parameter parameter : operation.getParameters()) {
                     if (parameter instanceof FormParameter) {
                         hasFormParameters = true;
                     }
+                    if (parameter instanceof BodyParameter) {
+                        hasBodyParameters = true;
                     }
-              //only add content-Type if its no a GET-Method
-                if(path.getGet() != null || ! operation.equals(path.getGet())){
+                }
+                if (hasBodyParameters || hasFormParameters){
                     String defaultContentType = hasFormParameters ? "application/x-www-form-urlencoded" : "application/json";
                     String contentType =  operation.getConsumes() == null || operation.getConsumes().isEmpty() ? defaultContentType : operation.getConsumes().get(0);
                     operation.setVendorExtension("x-contentType", contentType);

modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AbstractTypeScriptClientCodegen.java

@@ -147,28 +147,34 @@ public abstract class AbstractTypeScriptClientCodegen extends DefaultCodegen imp
 
     @Override
     public String toParamName(String name) {
-        // replace - with _ e.g. created-at => created_at
-        name = name.replaceAll("-", "_"); // FIXME: a parameter should not be assigned. Also declare the methods parameters as 'final'.
-
-        // if it's all uppper case, do nothing
-        if (name.matches("^[A-Z_]*$"))
-            return name;
-
-        // camelize the variable name
-        // pet_id => petId
-        name = camelize(name, true);
-
-        // for reserved word or word starting with number, append _
-        if (isReservedWord(name) || name.matches("^\\d.*"))
-            name = escapeReservedWord(name);
-
-        return name;
+        // should be the same as variable name
+        return toVarName(name);
     }
 
     @Override
     public String toVarName(String name) {
-        // should be the same as variable name
-        return getNameUsingModelPropertyNaming(name);
+        // sanitize name
+        name = sanitizeName(name);
+
+        if("_".equals(name)) {
+            name = "_u";
+        }
+
+        // if it's all uppper case, do nothing
+        if (name.matches("^[A-Z_]*$")) {
+            return name;
+        }
+
+        // camelize (lower first character) the variable name
+        // pet_id => petId
+        name = camelize(name, true);
+
+        // for reserved word or word starting with number, append _
+        if (isReservedWord(name) || name.matches("^\\d.*")) {
+            name = escapeReservedWord(name);
+        }
+
+        return name;
     }
 
     @Override

modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AkkaScalaClientCodegen.java

@@ -98,7 +98,9 @@ public class AkkaScalaClientCodegen extends AbstractScalaCodegen implements Code
         additionalProperties.put("fnEnumEntry", new EnumEntryLambda());
         additionalProperties.put("onlyOneSuccess", onlyOneSuccess);
 
+        supportingFiles.add(new SupportingFile("README.mustache", "", "README.md"));
         supportingFiles.add(new SupportingFile("pom.mustache", "", "pom.xml"));
+        supportingFiles.add(new SupportingFile("build.sbt.mustache", "", "build.sbt"));
         supportingFiles.add(new SupportingFile("reference.mustache", resourcesFolder, "reference.conf"));
         final String invokerFolder = (sourceFolder + File.separator + invokerPackage).replace(".", File.separator);
         supportingFiles.add(new SupportingFile("apiRequest.mustache", invokerFolder, "ApiRequest.scala"));

modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AspNetCoreServerCodegen.java

@@ -1,15 +1,20 @@
 package io.swagger.codegen.languages;
 
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.core.JsonProcessingException;
+
 import com.samskivert.mustache.Mustache;
-import io.swagger.codegen.CodegenConstants;
-import io.swagger.codegen.CodegenOperation;
-import io.swagger.codegen.CodegenType;
-import io.swagger.codegen.SupportingFile;
+
+import io.swagger.codegen.*;
+import io.swagger.models.*;
+import io.swagger.util.Json;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.io.File;
-import java.util.Arrays;
+import java.util.*;
+import java.util.Map.Entry;
 
 import static java.util.UUID.randomUUID;
 
@@ -103,7 +108,6 @@ public class AspNetCoreServerCodegen extends AbstractCSharpCodegen {
         String packageFolder = sourceFolder + File.separator + packageName;
 
         supportingFiles.add(new SupportingFile("NuGet.Config", "", "NuGet.Config"));
-        supportingFiles.add(new SupportingFile("global.json", "", "global.json"));
         supportingFiles.add(new SupportingFile("build.sh.mustache", "", "build.sh"));
         supportingFiles.add(new SupportingFile("build.bat.mustache", "", "build.bat"));
         supportingFiles.add(new SupportingFile("README.mustache", "", "README.md"));
@@ -112,19 +116,23 @@ public class AspNetCoreServerCodegen extends AbstractCSharpCodegen {
         supportingFiles.add(new SupportingFile("gitignore", packageFolder, ".gitignore"));
         supportingFiles.add(new SupportingFile("appsettings.json", packageFolder, "appsettings.json"));
 
-        supportingFiles.add(new SupportingFile("project.json.mustache", packageFolder, "project.json"));
         supportingFiles.add(new SupportingFile("Startup.mustache", packageFolder, "Startup.cs"));
         supportingFiles.add(new SupportingFile("Program.mustache", packageFolder, "Program.cs"));
         supportingFiles.add(new SupportingFile("validateModel.mustache", packageFolder + File.separator + "Attributes", "ValidateModelStateAttribute.cs"));
         supportingFiles.add(new SupportingFile("web.config", packageFolder, "web.config"));
 
-        supportingFiles.add(new SupportingFile("Project.xproj.mustache", packageFolder, this.packageName + ".xproj"));
+        supportingFiles.add(new SupportingFile("Project.csproj.mustache", packageFolder, this.packageName + ".csproj"));
 
         supportingFiles.add(new SupportingFile("Properties" + File.separator + "launchSettings.json", packageFolder + File.separator + "Properties", "launchSettings.json"));
 
+        supportingFiles.add(new SupportingFile("Filters" + File.separator + "BasePathFilter.mustache", packageFolder + File.separator + "Filters", "BasePathFilter.cs"));
+        supportingFiles.add(new SupportingFile("Filters" + File.separator + "GeneratePathParamsValidationFilter.mustache", packageFolder + File.separator + "Filters", "GeneratePathParamsValidationFilter.cs"));
+
         supportingFiles.add(new SupportingFile("wwwroot" + File.separator + "README.md", packageFolder + File.separator + "wwwroot", "README.md"));
         supportingFiles.add(new SupportingFile("wwwroot" + File.separator + "index.html", packageFolder + File.separator + "wwwroot", "index.html"));
         supportingFiles.add(new SupportingFile("wwwroot" + File.separator + "web.config", packageFolder + File.separator + "wwwroot", "web.config"));
+
+        supportingFiles.add(new SupportingFile("wwwroot" + File.separator + "swagger-original.mustache", packageFolder + File.separator + "wwwroot", "swagger-original.json"));
     }
 
     @Override
@@ -154,6 +162,21 @@ public class AspNetCoreServerCodegen extends AbstractCSharpCodegen {
         return outputFolder + File.separator + sourceFolder + File.separator + packageName + File.separator  + "Models";
     }
 
+
+    @Override
+    public Map<String, Object> postProcessSupportingFileData(Map<String, Object> objs) {
+        Swagger swagger = (Swagger)objs.get("swagger");
+        if(swagger != null) {
+            try {
+                objs.put("swagger-json", Json.pretty().writeValueAsString(swagger).replace("\r\n", "\n"));
+            } catch (JsonProcessingException e) {
+                LOGGER.error(e.getMessage(), e);
+            }
+        }
+        return super.postProcessSupportingFileData(objs);
+    }
+
+
     @Override
     protected void processOperation(CodegenOperation operation) {
         super.processOperation(operation);

modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/ErlangClientCodegen.java

@@ -163,11 +163,13 @@ public class ErlangClientCodegen extends DefaultCodegen implements CodegenConfig
     public String qsEncode(Object o) {
         String r = new String();
         CodegenParameter q = (CodegenParameter) o;
+        if (q.required) {
             if (q.isListContainer) {
                 r += "[{<<\"" + q.baseName + "\">>, X} || X <- " + q.paramName + "]";
             } else {
                 r += "{<<\"" + q.baseName + "\">>, " + q.paramName + "}";
             }
+        }
         return r;
     }
 
@@ -257,7 +259,7 @@ public class ErlangClientCodegen extends DefaultCodegen implements CodegenConfig
         Map<String, Object> operations = (Map<String, Object>) objs.get("operations");
         List<CodegenOperation> os = (List<CodegenOperation>) operations.get("operation");
         List<ExtendedCodegenOperation> newOs = new ArrayList<ExtendedCodegenOperation>();
-        Pattern pattern = Pattern.compile("(.*)\\{([^\\}]+)\\}(.*)");
+        Pattern pattern = Pattern.compile("\\{([^\\}]+)\\}");
         for (CodegenOperation o : os) {
             // force http method to lower case
             o.httpMethod = o.httpMethod.toLowerCase();
@@ -270,10 +272,12 @@ public class ErlangClientCodegen extends DefaultCodegen implements CodegenConfig
             Matcher matcher = pattern.matcher(o.path);
             StringBuffer buffer = new StringBuffer();
             while (matcher.find()) {
-                String pathTemplateName = matcher.group(2);
-                matcher.appendReplacement(buffer, "$1" + "\", " + camelize(pathTemplateName) + ", \"" + "$3");
+                String pathTemplateName = matcher.group(1);
+                matcher.appendReplacement(buffer, "\", " + camelize(pathTemplateName) + ", \"");
                 pathTemplateNames.add(pathTemplateName);
             }
+            matcher.appendTail(buffer);
+
             ExtendedCodegenOperation eco = new ExtendedCodegenOperation(o);
             if (buffer.toString().isEmpty()) {
                 eco.setReplacedPathName(o.path);
@@ -295,8 +299,26 @@ public class ErlangClientCodegen extends DefaultCodegen implements CodegenConfig
         this.packageVersion = packageVersion;
     }
 
-    String length(Object o) {
-        return Integer.toString((((ExtendedCodegenOperation) o).allParams).size());
+    String length(Object os) {
+        int l = 1;
+        for (CodegenParameter o : ((ExtendedCodegenOperation) os).allParams) {
+            CodegenParameter q = (CodegenParameter) o;
+            if (q.required)
+                l++;
+        }
+
+        return Integer.toString(l);
+    }
+
+    int lengthRequired(List<CodegenParameter> allParams) {
+        int l = 0;
+        for (CodegenParameter o : allParams) {
+            CodegenParameter q = (CodegenParameter) o;
+            if (q.required || q.isBodyParam)
+                l++;
+        }
+
+        return l;
     }
 
     @Override
@@ -313,6 +335,8 @@ public class ErlangClientCodegen extends DefaultCodegen implements CodegenConfig
     class ExtendedCodegenOperation extends CodegenOperation {
         private List<String> pathTemplateNames = new ArrayList<String>();
         private String replacedPathName;
+        String arityRequired;
+        String arityOptional;
 
         public ExtendedCodegenOperation(CodegenOperation o) {
             super();
@@ -355,6 +379,8 @@ public class ErlangClientCodegen extends DefaultCodegen implements CodegenConfig
             this.produces = o.produces;
             this.bodyParam = o.bodyParam;
             this.allParams = o.allParams;
+            this.arityRequired = Integer.toString(lengthRequired(o.allParams));
+            this.arityOptional = Integer.toString(lengthRequired(o.allParams)+1);
             this.bodyParams = o.bodyParams;
             this.pathParams = o.pathParams;
             this.queryParams = o.queryParams;

modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/FinchServerCodegen.java

@@ -1,6 +1,5 @@
 package io.swagger.codegen.languages;
 
-import com.google.common.base.Strings;
 import io.swagger.codegen.*;
 import io.swagger.models.Model;
 import io.swagger.models.properties.ArrayProperty;
@@ -81,7 +80,7 @@ public class FinchServerCodegen extends DefaultCodegen implements CodegenConfig
         typeMapping.put("long", "Long");
         typeMapping.put("double", "Double");
         typeMapping.put("number", "BigDecimal");
-        typeMapping.put("date-time", "LocalDateTime");
+        typeMapping.put("date-time", "ZonedDateTime");
         typeMapping.put("date", "LocalDateTime");
         typeMapping.put("file", "File");
         typeMapping.put("array", "Seq");
@@ -90,7 +89,7 @@ public class FinchServerCodegen extends DefaultCodegen implements CodegenConfig
         typeMapping.put("object", "Object");
         typeMapping.put("binary", "Array[Byte]");
         typeMapping.put("Date", "LocalDateTime");
-        typeMapping.put("DateTime", "LocalDateTime");
+        typeMapping.put("DateTime", "ZonedDateTime");
 
         additionalProperties.put("modelPackage", modelPackage());
         additionalProperties.put("apiPackage", apiPackage());
@@ -154,6 +153,7 @@ public class FinchServerCodegen extends DefaultCodegen implements CodegenConfig
         importMapping.put("LocalDateTime", "java.time.LocalDateTime");
         importMapping.put("LocalDate", "java.time.LocalDate");
         importMapping.put("LocalTime", "java.time.LocalTime");
+        importMapping.put("ZonedDateTime", "java.time.ZonedDateTime");
 
         cliOptions.clear();
         cliOptions.add(new CliOption(CodegenConstants.PACKAGE_NAME, "Finch package name (e.g. io.swagger).")
@@ -206,81 +206,31 @@ public class FinchServerCodegen extends DefaultCodegen implements CodegenConfig
         return codegenModel;
     }
 
+
+
+
     @Override
     public Map<String, Object> postProcessOperations(Map<String, Object> objs) {
         Map<String, Object> operations = (Map<String, Object>) objs.get("operations");
         List<CodegenOperation> operationList = (List<CodegenOperation>) operations.get("operation");
         for (CodegenOperation op : operationList) {
-            op.httpMethod = op.httpMethod.toLowerCase();
 
-            String path = new String(op.path);
-            // remove first /
-            if (path.startsWith("/")) {
-                path = path.substring(1);
-            }
-            // remove last /
-            if (path.endsWith("/")) {
-                path = path.substring(0, path.length()-1);
+            // Converts GET /foo/bar => get("foo" :: "bar")
+            generateScalaPath(op);
+
+            // Generates e.g. uuid :: header("boo") :: params("baa") under key "x-codegen-pathParams"
+            // Generates e.g. (id: UUID, headerBoo: String, paramBaa: String) under key "x-codegen-typedInputParams"
+            // Generates e.g. (id, headerBoo, paramBaa) under key "x-codegen-inputParams"
+            generateInputParameters(op);
+
+            //Generate Auth parameters using security: definition
+            //Results in header("apiKey") or param("apiKey")
+            authParameters(op);
+
+            //Concatenates all parameters
+            concatParameters(op);
         }
 
-            String[] items = path.split("/", -1);
-            String scalaPath = "";
-            int pathParamIndex = 0;
-
-            for (int i = 0; i < items.length; ++i) {
-                if (items[i].matches("^\\{(.*)\\}$")) { // wrap in {}
-                    // find the datatype of the parameter
-                    final CodegenParameter cp = op.pathParams.get(pathParamIndex);
-
-                    // TODO: Handle non-primitives…
-                    scalaPath = scalaPath + cp.dataType.toLowerCase();
-
-                    pathParamIndex++;
-                } else {
-                    scalaPath = scalaPath + "\"" + items[i] + "\"";
-                }
-
-                if (i != items.length -1) {
-                    scalaPath = scalaPath + " :: ";
-                }
-            }
-
-            for (CodegenParameter p : op.allParams) {
-                // TODO: This hacky, should be converted to mappings if possible to keep it clean.
-                // This could also be done using template imports
-                if(p.isPathParam && p.isPrimitiveType) {
-                    p.vendorExtensions.put("x-codegen-normalized-path-type", p.dataType.toLowerCase());
-                    p.vendorExtensions.put("x-codegen-normalized-input-type", p.dataType);
-                } else if(p.isHeaderParam) {
-                    if(p.required) {
-                        p.vendorExtensions.put("x-codegen-normalized-path-type", "header(\"" + p.baseName + "\")");
-                        p.vendorExtensions.put("x-codegen-normalized-input-type", p.dataType);
-                    } else {
-                        p.vendorExtensions.put("x-codegen-normalized-path-type", "headerOption(\"" + p.baseName + "\")");
-                        p.vendorExtensions.put("x-codegen-normalized-input-type", "Option["+ p.dataType + "]");
-                    }
-                } else if(p.isQueryParam) {
-                    if(p.isContainer || p.isListContainer) {
-                        p.vendorExtensions.put("x-codegen-normalized-path-type", "params(\"" + p.baseName + "\")");
-                        p.vendorExtensions.put("x-codegen-normalized-input-type", p.dataType.replaceAll("^[^\\[]+", "Seq"));
-                    } else {
-                        p.vendorExtensions.put("x-codegen-normalized-path-type", "param(\"" + p.baseName + "\")");
-                        p.vendorExtensions.put("x-codegen-normalized-input-type", p.dataType);
-                    }
-                } else if(p.isBodyParam) {
-                    p.vendorExtensions.put("x-codegen-normalized-path-type", "jsonBody["+ p.dataType + "]");
-                    p.vendorExtensions.put("x-codegen-normalized-input-type", p.dataType);
-                } else if(p.isFile) {
-                    p.vendorExtensions.put("x-codegen-normalized-path-type", "fileUpload(\""+ p.baseName + "\")");
-                    p.vendorExtensions.put("x-codegen-normalized-input-type", "FileUpload");
-                } else {
-                    p.vendorExtensions.put("x-codegen-normalized-path-type", p.dataType);
-                    p.vendorExtensions.put("x-codegen-normalized-input-type", p.dataType);
-                }
-            }
-
-            op.vendorExtensions.put("x-codegen-path", scalaPath);
-        }
         return objs;
     }
 
@@ -330,4 +280,172 @@ public class FinchServerCodegen extends DefaultCodegen implements CodegenConfig
         this.packageName = packageName;
     }
 
+
+    /**
+     *
+     * @param prim
+     * @param isRequired
+     * @param canBeOptional
+     * @return
+     */
+    private String toPrimitive(String prim, Boolean isRequired, Boolean canBeOptional) {
+
+        String converter = ".map(_.to" + prim + ")";
+        return  (canBeOptional ? (isRequired ? converter : ".map(_" + converter +")") : "");
+    }
+
+    //All path parameters are String initially, for primitives these need to be converted
+    private String toPathParameter(CodegenParameter p, String paramType, Boolean canBeOptional ) {
+
+        Boolean isNotAString = !p.dataType.equals("String");
+
+        return  paramType + (canBeOptional && !p.required ? "Option" : "") + "(\""+ p.baseName + "\")" + (isNotAString ? toPrimitive(p.dataType,p.required,canBeOptional) : "") ;
+    }
+
+    private String toInputParameter(CodegenParameter p){
+        return (p.required ? "" : "Option[")+p.dataType+(p.required ? "" : "]");
+    }
+
+    private String concat(String original, String addition, String op) {
+        return original + (original.isEmpty() ? "" : (addition.isEmpty() ? "" : op)) + addition;
+    }
+
+    // a, b
+    private String csvConcat(String original, String addition) {
+        return concat(original, addition,", ");
+    }
+    // a :: b
+    private String colConcat(String original, String addition) {
+        return concat(original, addition," :: ");
+    }
+
+    private void authParameters(CodegenOperation op) {
+
+        String authParams = "";
+        String authInputParams = "";
+        String typedAuthInputParams = "";
+        //Append apikey security to path params and create input parameters for functions
+        if(op.authMethods != null){
+
+            for(CodegenSecurity s : op.authMethods) {
+                if(s.isApiKey && s.isKeyInHeader){
+                    authParams = colConcat(authParams, "header(\""+ s.keyParamName + "\")");
+                } else if(s.isApiKey && s.isKeyInQuery){
+                    authParams = colConcat(authParams, "param(\""+ s.keyParamName + "\")");
+                }
+                if(s.isApiKey) {
+                    typedAuthInputParams = csvConcat(typedAuthInputParams, "authParam"+ s.name + ": String");
+                    authInputParams = csvConcat(authInputParams,"authParam"+ s.name);
+                }
+            }
+        }
+
+        op.vendorExtensions.put("x-codegen-authParams", authParams);
+        op.vendorExtensions.put("x-codegen-authInputParams", authInputParams);
+        op.vendorExtensions.put("x-codegen-typedAuthInputParams", typedAuthInputParams);
+
+    }
+
+    private void generateScalaPath(CodegenOperation op) {
+        op.httpMethod = op.httpMethod.toLowerCase();
+
+        String path = new String(op.path);
+
+        // remove first /
+        if (path.startsWith("/")) {
+            path = path.substring(1);
+        }
+
+        // remove last /
+        if (path.endsWith("/")) {
+            path = path.substring(0, path.length()-1);
+        }
+
+        String[] items = path.split("/", -1);
+        String scalaPath = "";
+        Integer pathParamIndex = 0;
+
+        for (int i = 0; i < items.length; ++i) {
+
+            if (items[i].matches("^\\{(.*)\\}$")) { // wrap in {}
+                // find the datatype of the parameter
+                final CodegenParameter cp = op.pathParams.get(pathParamIndex);
+
+                // TODO: Handle non-primitives…
+                scalaPath = colConcat(scalaPath, cp.dataType.toLowerCase());
+
+                pathParamIndex++;
+            } else {
+                scalaPath = colConcat(scalaPath, "\"" + items[i] + "\"");
+            }
+        }
+
+        op.vendorExtensions.put("x-codegen-path", scalaPath);
+
+    }
+
+
+    private void concatParameters(CodegenOperation op) {
+
+        String path = colConcat(colConcat(op.vendorExtensions.get("x-codegen-path").toString(),op.vendorExtensions.get("x-codegen-pathParams").toString()), op.vendorExtensions.get("x-codegen-authParams").toString());
+        String parameters = csvConcat(op.vendorExtensions.get("x-codegen-inputParams").toString(), op.vendorExtensions.get("x-codegen-authInputParams").toString());
+        String typedParameters = csvConcat(op.vendorExtensions.get("x-codegen-typedInputParams").toString(), op.vendorExtensions.get("x-codegen-typedAuthInputParams").toString());
+
+        // The input parameters for functions
+        op.vendorExtensions.put("x-codegen-paths",path);
+        op.vendorExtensions.put("x-codegen-params", parameters);
+        op.vendorExtensions.put("x-codegen-typedParams", typedParameters);
+
+    }
+
+
+    private void generateInputParameters(CodegenOperation op) {
+
+        String inputParams = "";
+        String typedInputParams = "";
+        String pathParams = "";
+
+        for (CodegenParameter p : op.allParams) {
+            // TODO: This hacky, should be converted to mappings if possible to keep it clean.
+            // This could also be done using template imports
+
+            if(p.isBodyParam) {
+                p.vendorExtensions.put("x-codegen-normalized-path-type", "jsonBody["+ p.dataType + "]");
+                p.vendorExtensions.put("x-codegen-normalized-input-type", p.dataType);
+            } else if(p.isContainer || p.isListContainer) {
+                p.vendorExtensions.put("x-codegen-normalized-path-type", toPathParameter(p,"params", false));
+                p.vendorExtensions.put("x-codegen-normalized-input-type", p.dataType.replaceAll("^[^\\[]+", "Seq"));
+            } else if(p.isQueryParam) {
+                p.vendorExtensions.put("x-codegen-normalized-path-type", toPathParameter(p, "param",true));
+                p.vendorExtensions.put("x-codegen-normalized-input-type", toInputParameter(p));
+            } else if(p.isHeaderParam) {
+                p.vendorExtensions.put("x-codegen-normalized-path-type", toPathParameter(p,"header", true));
+                p.vendorExtensions.put("x-codegen-normalized-input-type", toInputParameter(p));
+            } else if(p.isFile) {
+                p.vendorExtensions.put("x-codegen-normalized-path-type", "fileUpload(\""+ p.paramName + "\")");
+                p.vendorExtensions.put("x-codegen-normalized-input-type", "FileUpload");
+            } else if(p.isPrimitiveType && !p.isPathParam) {
+                p.vendorExtensions.put("x-codegen-normalized-path-type", p.dataType.toLowerCase());
+                p.vendorExtensions.put("x-codegen-normalized-input-type", toInputParameter(p));
+            } else {
+                //Path paremeters are handled in generateScalaPath()
+                p.vendorExtensions.put("x-codegen-normalized-input-type", p.dataType);
+            }
+            if(p.vendorExtensions.get("x-codegen-normalized-path-type") != null){
+                pathParams = colConcat(pathParams , p.vendorExtensions.get("x-codegen-normalized-path-type").toString());
+            }
+            inputParams = csvConcat(inputParams, p.paramName);
+            typedInputParams = csvConcat(typedInputParams , p.paramName + ": " + p.vendorExtensions.get("x-codegen-normalized-input-type"));
+
+        }
+
+        // All body, path, query and header parameters
+        op.vendorExtensions.put("x-codegen-pathParams", pathParams);
+
+        // The input parameters for functions
+        op.vendorExtensions.put("x-codegen-inputParams", inputParams);
+        op.vendorExtensions.put("x-codegen-typedInputParams", typedInputParams);
+
+    }
+
 }

modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/FlaskConnexionCodegen.java

@@ -473,13 +473,18 @@ public class FlaskConnexionCodegen extends DefaultCodegen implements CodegenConf
 
     @Override
     public String toOperationId(String operationId) {
-        operationId = super.toOperationId(operationId); // FIXME: a parameter should not be assigned. Also declare the methods parameters as 'final'.
-        // Use the part after the last dot, e.g.
-        //     controllers.defaultController.addPet => addPet
-        operationId = operationId.replaceAll(".*\\.", "");
-        // Need to underscore it since it has been processed via removeNonNameElementToCamelCase, e.g.
-        //     addPet => add_pet
-        return underscore(operationId);
+        // throw exception if method name is empty (should not occur as an auto-generated method name will be used)
+        if (StringUtils.isEmpty(operationId)) {
+            throw new RuntimeException("Empty method name (operationId) not allowed");
+        }
+
+        // method name cannot use reserved keyword, e.g. return
+        if (isReservedWord(operationId)) {
+            LOGGER.warn(operationId + " (reserved word) cannot be used as method name. Renamed to " + underscore(sanitizeName("call_" + operationId)));
+            operationId = "call_" + operationId;
+        }
+
+        return underscore(sanitizeName(operationId));
     }
 
     /**

modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaResteasyServerCodegen.java

@@ -23,7 +23,6 @@ public class JavaResteasyServerCodegen extends AbstractJavaJAXRSServerCodegen im
         outputFolder = "generated-code/JavaJaxRS-Resteasy";
         apiTemplateFiles.put("apiService.mustache", ".java");
         apiTemplateFiles.put("apiServiceImpl.mustache", ".java");
-        apiTemplateFiles.put("apiServiceFactory.mustache", ".java");
         apiTestTemplateFiles.clear(); // TODO: add test template
 
         // clear model and api doc template as AbstractJavaJAXRSServerCodegen

modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/NancyFXServerCodegen.java

@@ -121,6 +121,7 @@ public class NancyFXServerCodegen extends AbstractCSharpCodegen {
         modelPackage = isNullOrEmpty(packageName) ? MODEL_NAMESPACE : packageName + "." + MODEL_NAMESPACE;
 
         supportingFiles.add(new SupportingFile("parameters.mustache", sourceFile("Utils"), "Parameters.cs"));
+        supportingFiles.add(new SupportingFile("localDateConverter.mustache", sourceFile("Utils"), "LocalDateConverter.cs"));
         supportingFiles.add(new SupportingFile("packages.config.mustache", sourceFolder(), "packages.config"));
         supportingFiles.add(new SupportingFile("nuspec.mustache", sourceFolder(), packageName + ".nuspec"));
 
@@ -391,12 +392,12 @@ public class NancyFXServerCodegen extends AbstractCSharpCodegen {
     private static Map<String, String> nodaTimeTypesMappings() {
         return ImmutableMap.of(
                 "time", "LocalTime?",
-                "date", "ZonedDateTime?",
+                "date", "LocalDate?",
                 "datetime", "ZonedDateTime?");
     }
 
     private static Set<String> nodaTimePrimitiveTypes() {
-        return ImmutableSet.of("LocalTime?", "ZonedDateTime?");
+        return ImmutableSet.of("LocalTime?", "LocalDate?","ZonedDateTime?");
     }
 
     private class DependencyInfo {

modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/Qt5CPPGenerator.java

@@ -315,19 +315,13 @@ public class Qt5CPPGenerator extends AbstractCppCodegen implements CodegenConfig
         } else if (p instanceof DecimalProperty) {
             return "0.0";
         } else if (p instanceof MapProperty) {
-            MapProperty ap = (MapProperty) p;
-            String inner = getSwaggerType(ap.getAdditionalProperties());
-            if (!languageSpecificPrimitives.contains(inner)) {
-                inner += "*";
-            }
-            return "new QMap<QString, " + inner + ">()";
+            MapProperty mp = (MapProperty) p;
+            Property inner = mp.getAdditionalProperties();
+            return "new QMap<QString, " + getTypeDeclaration(inner) + ">()";
         } else if (p instanceof ArrayProperty) {
             ArrayProperty ap = (ArrayProperty) p;
-            String inner = getSwaggerType(ap.getItems());
-            if (!languageSpecificPrimitives.contains(inner)) {
-                inner += "*";
-            }
-            return "new QList<" + inner + ">()";
+            Property inner = ap.getItems();
+            return "new QList<" + getTypeDeclaration(inner) + ">()";
         }
         // else
         if (p instanceof RefProperty) {

modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/RustServerCodegen.java

@@ -1,13 +1,6 @@
 package io.swagger.codegen.languages;
 
-import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.JsonSerializer;
-import com.fasterxml.jackson.databind.SerializerProvider;
-import com.fasterxml.jackson.databind.module.SimpleModule;
-import com.google.common.collect.ArrayListMultimap;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Multimap;
 import io.swagger.codegen.*;
 import io.swagger.models.*;
 import io.swagger.models.parameters.BodyParameter;
@@ -21,8 +14,6 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.io.File;
-import java.io.IOException;
-import java.math.BigDecimal;
 import java.util.*;
 import java.util.Map.Entry;
 import org.apache.commons.lang3.StringUtils;
@@ -33,7 +24,10 @@ public class RustServerCodegen extends DefaultCodegen implements CodegenConfig {
 
     private HashMap<String, String> modelXmlNames = new HashMap<String, String>();
 
+    private static final String NO_FORMAT = "%%NO_FORMAT";
+
     protected String apiVersion = "1.0.0";
+    protected String serverHost = "localhost";
     protected int serverPort = 8080;
     protected String projectName = "swagger-server";
     protected String apiPath = "rust-server";
@@ -148,7 +142,6 @@ public class RustServerCodegen extends DefaultCodegen implements CodegenConfig {
          * are available in models, apis, and supporting files
          */
         additionalProperties.put("apiVersion", apiVersion);
-        additionalProperties.put("serverPort", serverPort);
         additionalProperties.put("apiPath", apiPath);
 
         /*
@@ -168,6 +161,7 @@ public class RustServerCodegen extends DefaultCodegen implements CodegenConfig {
         supportingFiles.add(new SupportingFile("example-server.mustache", "examples", "server.rs"));
         supportingFiles.add(new SupportingFile("example-client.mustache", "examples", "client.rs"));
         supportingFiles.add(new SupportingFile("example-server_lib.mustache", "examples/server_lib", "mod.rs"));
+        supportingFiles.add(new SupportingFile("example-server_server.mustache", "examples/server_lib", "server.rs"));
         supportingFiles.add(new SupportingFile("example-ca.pem", "examples", "ca.pem"));
         supportingFiles.add(new SupportingFile("example-server-chain.pem", "examples", "server-chain.pem"));
         supportingFiles.add(new SupportingFile("example-server-key.pem", "examples", "server-key.pem"));
@@ -257,6 +251,23 @@ public class RustServerCodegen extends DefaultCodegen implements CodegenConfig {
             versionComponents.add("0");
         }
         info.setVersion(StringUtils.join(versionComponents, "."));
+
+        String host = swagger.getHost();
+        if (host != null) {
+            String[] parts = host.split(":");
+            if (parts.length > 1) {
+                serverHost = parts[0];
+                try {
+                    serverPort = Integer.valueOf(parts[1]);
+                } catch (NumberFormatException e) {
+                    LOGGER.warn("Port of Swagger host is not an integer : " + host, e);
+                }
+            } else {
+                serverHost = host;
+            }
+        }
+        additionalProperties.put("serverHost", serverHost);
+        additionalProperties.put("serverPort", serverPort);
     }
 
     @Override
@@ -512,6 +523,7 @@ public class RustServerCodegen extends DefaultCodegen implements CodegenConfig {
             LOGGER.debug("No consumes defined in operation. Using global consumes (" + swagger.getConsumes() + ") for " + op.operationId);
         }
 
+        boolean consumesPlainText = false;
         boolean consumesXml = false;
         // if "consumes" is defined (per operation or using global definition)
         if (consumes != null && !consumes.isEmpty()) {
@@ -523,6 +535,8 @@ public class RustServerCodegen extends DefaultCodegen implements CodegenConfig {
                 if (mimeType.startsWith("Application/Xml")) {
                     additionalProperties.put("usesXml", true);
                     consumesXml = true;
+                } else if (mimeType.startsWith("Text/Plain")) {
+                    consumesPlainText = true;
                 }
 
                 mediaType.put("mediaType", mimeType);
@@ -545,6 +559,7 @@ public class RustServerCodegen extends DefaultCodegen implements CodegenConfig {
         }
 
         boolean producesXml = false;
+        boolean producesPlainText = false;
         if (produces != null && !produces.isEmpty()) {
             List<Map<String, String>> c = new ArrayList<Map<String, String>>();
             for (String key : produces) {
@@ -554,6 +569,8 @@ public class RustServerCodegen extends DefaultCodegen implements CodegenConfig {
                 if (mimeType.startsWith("Application/Xml")) {
                     additionalProperties.put("usesXml", true);
                     producesXml = true;
+                } else if (mimeType.startsWith("Text/Plain")) {
+                    producesPlainText = true;
                 }
 
                 mediaType.put("mediaType", mimeType);
@@ -572,9 +589,14 @@ public class RustServerCodegen extends DefaultCodegen implements CodegenConfig {
                 op.bodyParam.vendorExtensions.put("model_key", key);
             }
 
+            // Default to consuming json
             op.bodyParam.vendorExtensions.put("uppercase_operation_id", underscore(op.operationId).toUpperCase());
             if (consumesXml) {
                 op.bodyParam.vendorExtensions.put("consumesXml", true);
+            } else if (consumesPlainText) {
+                op.bodyParam.vendorExtensions.put("consumesPlainText", true);
+            } else {
+                op.bodyParam.vendorExtensions.put("consumesJson", true);
             }
 
         }
@@ -586,8 +608,13 @@ public class RustServerCodegen extends DefaultCodegen implements CodegenConfig {
 
             param.vendorExtensions.put("uppercase_operation_id", underscore(op.operationId).toUpperCase());
 
+            // Default to producing json if nothing else is specified
             if (consumesXml) {
                 param.vendorExtensions.put("consumesXml", true);
+            } else if (consumesPlainText) {
+                param.vendorExtensions.put("consumesPlainText", true);
+            } else {
+                param.vendorExtensions.put("consumesJson", true);
             }
         }
         for (CodegenParameter param : op.headerParams) {
@@ -601,8 +628,13 @@ public class RustServerCodegen extends DefaultCodegen implements CodegenConfig {
             if (rsp.dataType != null) {
                 rsp.vendorExtensions.put("uppercase_data_type", (rsp.dataType.replace("models::", "")).toUpperCase());
 
+                // Default to producing json if nothing else is specified
                 if (producesXml) {
                     rsp.vendorExtensions.put("producesXml", true);
+                } else if (producesPlainText) {
+                    rsp.vendorExtensions.put("producesPlainText", true);
+                } else {
+                    rsp.vendorExtensions.put("producesJson", true);
                 }
 
                 // Check whether we're returning an object with a defined XML namespace.
@@ -869,12 +901,47 @@ public class RustServerCodegen extends DefaultCodegen implements CodegenConfig {
             }
         }
 
-        // Handle custom unsigned integer formats.
         if ("integer".equals(property.baseType)) {
+            // custom integer formats (legacy)
             if ("uint32".equals(property.dataFormat)) {
                 property.datatype = "u32";
             } else if ("uint64".equals(property.dataFormat)) {
                 property.datatype = "u64";
+
+            } else {
+                // match int type to schema constraints
+                Long inclusiveMinimum = property.minimum != null ? Long.parseLong(property.minimum): null;
+                if (inclusiveMinimum != null && property.exclusiveMinimum) {
+                    inclusiveMinimum++;
+                }
+
+                // a signed int is required unless a minimum greater than zero is set
+                boolean unsigned = inclusiveMinimum != null && inclusiveMinimum >= 0;
+
+                Long inclusiveMaximum = property.maximum != null ? Long.parseLong(property.maximum): null;
+                if (inclusiveMaximum != null && property.exclusiveMaximum) {
+                    inclusiveMaximum--;
+                }
+
+                switch (property.dataFormat == null ? NO_FORMAT : property.dataFormat) {
+                    // standard swagger formats
+                    case "int32":
+                        property.datatype = unsigned ? "u32" : "i32";
+                        break;
+
+                    case "int64":
+                        property.datatype = unsigned ? "u64" : "i64";
+                        break;
+
+                    case NO_FORMAT:
+                        property.datatype = matchingIntType(unsigned, inclusiveMinimum, inclusiveMaximum);
+                        break;
+
+                    default:
+                        // unknown format
+                        LOGGER.warn("The integer format '{}' is not recognized and will be ignored.", property.dataFormat);
+                        property.datatype = matchingIntType(unsigned, inclusiveMinimum, inclusiveMaximum);
+                }
             }
         }
 
@@ -885,6 +952,46 @@ public class RustServerCodegen extends DefaultCodegen implements CodegenConfig {
         }
     }
 
+    static long requiredBits(Long bound, boolean unsigned) {
+        if (bound == null) return 0;
+
+        if (unsigned) {
+            if (bound < 0) {
+                throw new RuntimeException("Unsigned bound is negative: " + bound);
+            }
+            return 65 - Long.numberOfLeadingZeros(bound >> 1);
+        }
+
+        return 65 - Long.numberOfLeadingZeros(
+                // signed bounds go from (-n) to (n - 1), i.e. i8 goes from -128 to 127
+                bound < 0 ? Math.abs(bound) - 1 : bound);
+    }
+
+    static String matchingIntType(boolean unsigned, Long inclusiveMin, Long inclusiveMax) {
+        long requiredMinBits = requiredBits(inclusiveMin, unsigned);
+        long requiredMaxBits = requiredBits(inclusiveMax, unsigned);
+        long requiredBits = Math.max(requiredMinBits, requiredMaxBits);
+
+        if (requiredMaxBits == 0 && requiredMinBits <= 16) {
+            // rust 'size' types are arch-specific and thus somewhat loose
+            // so they are used when no format or maximum are specified
+            // and as long as minimum stays within plausible smallest ptr size (16 bits)
+            // this way all rust types are obtainable without defining custom formats
+            // this behavior (default int size) could also follow a generator flag
+            return unsigned ? "usize" : "isize";
+
+        } else if (requiredBits <= 8) {
+            return unsigned ? "u8" : "i8";
+
+        } else if (requiredBits <= 16) {
+            return unsigned ? "u16" : "i16";
+
+        } else if (requiredBits <= 32) {
+            return unsigned ? "u32" : "i32";
+        }
+        return unsigned ? "u64" : "i64";
+    }
+
     @Override
     public Map<String, Object> postProcessModels(Map<String, Object> objs) {
         return super.postProcessModelsEnum(objs);

modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SymfonyServerCodegen.java

@@ -140,7 +140,7 @@ public class SymfonyServerCodegen extends AbstractPhpCodegen implements CodegenC
         typeMapping.put("map", "array");
         typeMapping.put("array", "array");
         typeMapping.put("list", "array");
-        typeMapping.put("object", "object");
+        typeMapping.put("object", "array");
         typeMapping.put("binary", "string");
         typeMapping.put("ByteArray", "string");
         typeMapping.put("UUID", "string");
@@ -339,13 +339,23 @@ public class SymfonyServerCodegen extends AbstractPhpCodegen implements CodegenC
             // Loop through all input parameters to determine, whether we have to import something to
             // make the input type available.
             for (CodegenParameter param : op.allParams) {
-                // Determine if the paramter type is supported as a type hint and make it available
+                // Determine if the parameter type is supported as a type hint and make it available
                 // to the templating engine
                 String typeHint = getTypeHint(param.dataType);
                 if (!typeHint.isEmpty()) {
                     param.vendorExtensions.put("x-parameterType", typeHint);
                 }
 
+                if (param.isContainer) {
+                    param.vendorExtensions.put("x-parameterType", getTypeHint(param.dataType+"[]"));
+                }
+
+                // Create a variable to display the correct data type in comments for interfaces
+                param.vendorExtensions.put("x-commentType", param.dataType);
+                if (param.isContainer) {
+                    param.vendorExtensions.put("x-commentType", param.dataType+"[]");
+                }
+
                 // Quote default values for strings
                 // @todo: The default values for headers, forms and query params are handled
                 //        in DefaultCodegen fromParameter with no real possibility to override
@@ -355,16 +365,14 @@ public class SymfonyServerCodegen extends AbstractPhpCodegen implements CodegenC
                 }
             }
 
-            for (CodegenResponse response : op.responses) {
-                final String exception = SYMFONY_EXCEPTIONS.get(response.code);
-                response.vendorExtensions.put("x-symfonyException", exception);
-                response.vendorExtensions.put("x-symfonyExceptionSimple", extractSimpleName(exception));
-
-                // Add simple return type to response
-                if (response.dataType != null) {
-                    final String dataType = extractSimpleName(response.dataType);
-                    response.vendorExtensions.put("x-simpleName", dataType);
+            // Create a variable to display the correct return type in comments for interfaces
+            if (op.returnType != null) {
+                op.vendorExtensions.put("x-commentType", op.returnType);
+                if (!op.returnTypeIsPrimitive) {
+                    op.vendorExtensions.put("x-commentType", op.returnType+"[]");
                 }
+            } else {
+                op.vendorExtensions.put("x-commentType", "void");
             }
 
             // Add operation's authentication methods to whole interface
@@ -389,13 +397,19 @@ public class SymfonyServerCodegen extends AbstractPhpCodegen implements CodegenC
         // Simplify model var type
         for (CodegenProperty var : model.vars) {
             if (var.datatype != null) {
-                // Determine if the paramter type is supported as a type hint and make it available
+                // Determine if the parameter type is supported as a type hint and make it available
                 // to the templating engine
                 String typeHint = getTypeHint(var.datatype);
                 if (!typeHint.isEmpty()) {
                     var.vendorExtensions.put("x-parameterType", typeHint);
                 }
 
+                // Create a variable to display the correct data type in comments for models
+                var.vendorExtensions.put("x-commentType", var.datatype);
+                if (var.isContainer) {
+                    var.vendorExtensions.put("x-commentType", var.datatype+"[]");
+                }
+
                 if (var.isBoolean) {
                     var.getter = var.getter.replaceAll("^get", "is");
                 }
@@ -448,13 +462,13 @@ public class SymfonyServerCodegen extends AbstractPhpCodegen implements CodegenC
         if (p instanceof ArrayProperty) {
             ArrayProperty ap = (ArrayProperty) p;
             Property inner = ap.getItems();
-            return getTypeDeclaration(inner) + "[]";
+            return getTypeDeclaration(inner);
         }
 
         if (p instanceof MapProperty) {
             MapProperty mp = (MapProperty) p;
             Property inner = mp.getAdditionalProperties();
-            return getTypeDeclaration(inner) + "[]";
+            return getTypeDeclaration(inner);
         }
 
         if (p instanceof RefProperty) {

modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/TypeScriptAngularClientCodegen.java

@@ -51,12 +51,16 @@ public class TypeScriptAngularClientCodegen extends AbstractTypeScriptClientCode
         apiPackage = "api";
         modelPackage = "model";
 
-
         this.cliOptions.add(new CliOption(NPM_NAME, "The name under which you want to publish generated npm package"));
         this.cliOptions.add(new CliOption(NPM_VERSION, "The version of your npm package"));
-        this.cliOptions.add(new CliOption(NPM_REPOSITORY, "Use this property to set an url your private npmRepo in the package.json"));
-        this.cliOptions.add(new CliOption(SNAPSHOT, "When setting this property to true the version will be suffixed with -SNAPSHOT.yyyyMMddHHmm", BooleanProperty.TYPE).defaultValue(Boolean.FALSE.toString()));
-        this.cliOptions.add(new CliOption(WITH_INTERFACES, "Setting this property to true will generate interfaces next to the default class implementations.", BooleanProperty.TYPE).defaultValue(Boolean.FALSE.toString()));
+        this.cliOptions.add(new CliOption(NPM_REPOSITORY,
+                "Use this property to set an url your private npmRepo in the package.json"));
+        this.cliOptions.add(new CliOption(SNAPSHOT,
+                "When setting this property to true the version will be suffixed with -SNAPSHOT.yyyyMMddHHmm",
+                BooleanProperty.TYPE).defaultValue(Boolean.FALSE.toString()));
+        this.cliOptions.add(new CliOption(WITH_INTERFACES,
+                "Setting this property to true will generate interfaces next to the default class implementations.",
+                BooleanProperty.TYPE).defaultValue(Boolean.FALSE.toString()));
         this.cliOptions.add(new CliOption(NG_VERSION, "The version of Angular. Default is '4.3'"));
     }
 
@@ -79,11 +83,12 @@ public class TypeScriptAngularClientCodegen extends AbstractTypeScriptClientCode
     @Override
     public void processOpts() {
         super.processOpts();
-        supportingFiles.add(new SupportingFile("models.mustache", modelPackage().replace('.', File.separatorChar), "models.ts"));
-        supportingFiles.add(new SupportingFile("apis.mustache", apiPackage().replace('.', File.separatorChar), "api.ts"));
+        supportingFiles.add(
+                new SupportingFile("models.mustache", modelPackage().replace('.', File.separatorChar), "models.ts"));
+        supportingFiles
+                .add(new SupportingFile("apis.mustache", apiPackage().replace('.', File.separatorChar), "api.ts"));
         supportingFiles.add(new SupportingFile("index.mustache", getIndexDirectory(), "index.ts"));
         supportingFiles.add(new SupportingFile("api.module.mustache", getIndexDirectory(), "api.module.ts"));
-        supportingFiles.add(new SupportingFile("rxjs-operators.mustache", getIndexDirectory(), "rxjs-operators.ts"));
         supportingFiles.add(new SupportingFile("configuration.mustache", getIndexDirectory(), "configuration.ts"));
         supportingFiles.add(new SupportingFile("variables.mustache", getIndexDirectory(), "variables.ts"));
         supportingFiles.add(new SupportingFile("encoder.mustache", getIndexDirectory(), "encoder.ts"));
@@ -114,6 +119,9 @@ public class TypeScriptAngularClientCodegen extends AbstractTypeScriptClientCode
         additionalProperties.put("injectionToken", ngVersion.atLeast("4.0.0") ? "InjectionToken" : "OpaqueToken");
         additionalProperties.put("injectionTokenTyped", ngVersion.atLeast("4.0.0"));
         additionalProperties.put("useHttpClient", ngVersion.atLeast("4.3.0"));
+        if (!ngVersion.atLeast("4.3.0")) {
+            supportingFiles.add(new SupportingFile("rxjs-operators.mustache", getIndexDirectory(), "rxjs-operators.ts"));
+        }
     }
 
     private void addNpmPackageGeneration() {
@@ -125,7 +133,8 @@ public class TypeScriptAngularClientCodegen extends AbstractTypeScriptClientCode
             this.setNpmVersion(additionalProperties.get(NPM_VERSION).toString());
         }
 
-        if (additionalProperties.containsKey(SNAPSHOT) && Boolean.valueOf(additionalProperties.get(SNAPSHOT).toString())) {
+        if (additionalProperties.containsKey(SNAPSHOT)
+                && Boolean.valueOf(additionalProperties.get(SNAPSHOT).toString())) {
             this.setNpmVersion(npmVersion + "-SNAPSHOT." + SNAPSHOT_SUFFIX_FORMAT.format(new Date()));
         }
         additionalProperties.put(NPM_VERSION, npmVersion);

modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/TypeScriptJqueryClientCodegen.java

@@ -130,6 +130,7 @@ public class TypeScriptJqueryClientCodegen extends AbstractTypeScriptClientCodeg
         }
 
         //Files for building our lib
+        supportingFiles.add(new SupportingFile("README.mustache", getPackageRootDirectory(), "README.md"));
         supportingFiles.add(new SupportingFile("package.mustache", getPackageRootDirectory(), "package.json"));
         supportingFiles.add(new SupportingFile("typings.mustache", getPackageRootDirectory(), "typings.json"));
         supportingFiles.add(new SupportingFile("tsconfig.mustache", getPackageRootDirectory(), "tsconfig.json"));

modules/swagger-codegen/src/main/resources/Eiffel/framework/serialization/api_json_custom_deserializer.mustache

@@ -10,7 +10,7 @@ note
 						hobbies: LIST [STRING]
 						photos: LIST [PHOTOS]
 				
-					convertion: 
+					conversion:
 					First go to the feature from_json_to_`model' and then start to set
 					the object attibures as follow.
 					

modules/swagger-codegen/src/main/resources/Java/libraries/feign/api.mustache

@@ -37,8 +37,8 @@ public interface {{classname}} extends ApiClient.Api {
    */
   @RequestLine("{{httpMethod}} {{{path}}}{{#hasQueryParams}}?{{/hasQueryParams}}{{#queryParams}}{{baseName}}={{=<% %>=}}{<%paramName%>}<%={{ }}=%>{{#hasMore}}&{{/hasMore}}{{/queryParams}}")
   @Headers({
-    "Content-Type: {{vendorExtensions.x-contentType}}",
-    "Accept: {{vendorExtensions.x-accepts}}",{{#headerParams}}
+{{#vendorExtensions.x-contentType}}    "Content-Type: {{vendorExtensions.x-contentType}}",
+{{/vendorExtensions.x-contentType}}    "Accept: {{vendorExtensions.x-accepts}}",{{#headerParams}}
     "{{baseName}}: {{=<% %>=}}{<%paramName%>}<%={{ }}=%>"{{#hasMore}},
     {{/hasMore}}{{/headerParams}}
   })
@@ -75,8 +75,8 @@ public interface {{classname}} extends ApiClient.Api {
    */
   @RequestLine("{{httpMethod}} {{{path}}}?{{#queryParams}}{{baseName}}={{=<% %>=}}{<%paramName%>}<%={{ }}=%>{{#hasMore}}&{{/hasMore}}{{/queryParams}}")
   @Headers({
-  "Content-Type: {{vendorExtensions.x-contentType}}",
-  "Accept: {{vendorExtensions.x-accepts}}",{{#headerParams}}
+{{#vendorExtensions.x-contentType}}  "Content-Type: {{vendorExtensions.x-contentType}}",
+{{/vendorExtensions.x-contentType}}  "Accept: {{vendorExtensions.x-accepts}}",{{#headerParams}}
       "{{baseName}}: {{=<% %>=}}{<%paramName%>}<%={{ }}=%>"{{#hasMore}},
       {{/hasMore}}{{/headerParams}}
   })

modules/swagger-codegen/src/main/resources/Java/libraries/feign/pom.mustache

@@ -13,9 +13,6 @@
         <developerConnection>{{scmDeveloperConnection}}</developerConnection>
         <url>{{scmUrl}}</url>
     </scm>
-  <prerequisites>
-    <maven>2.2.0</maven>
-  </prerequisites>
 
     <licenses>
         <license>
@@ -36,6 +33,26 @@
 
     <build>
         <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-enforcer-plugin</artifactId>
+                <version>3.0.0-M1</version>
+                <executions>
+                    <execution>
+                        <id>enforce-maven</id>
+                        <goals>
+                            <goal>enforce</goal>
+                        </goals>
+                        <configuration>
+                            <rules>
+                                <requireMavenVersion>
+                                    <version>2.2.0</version>
+                                </requireMavenVersion>
+                            </rules>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
@@ -96,7 +113,8 @@
                         </goals>
                         <configuration>
                             <sources>
-                <source>src/main/java</source>
+                                <source>
+                                src/main/java</source>
                             </sources>
                         </configuration>
                     </execution>
@@ -108,7 +126,8 @@
                         </goals>
                         <configuration>
                             <sources>
-                <source>src/test/java</source>
+                                <source>
+                                src/test/java</source>
                             </sources>
                         </configuration>
                     </execution>
@@ -270,6 +289,7 @@
         </dependency>
     </dependencies>
     <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <java.version>{{#java8}}1.8{{/java8}}{{^java8}}1.7{{/java8}}</java.version>
         <maven.compiler.source>${java.version}</maven.compiler.source>
         <maven.compiler.target>${java.version}</maven.compiler.target>

modules/swagger-codegen/src/main/resources/Java/libraries/google-api-client/pom.mustache

@@ -13,9 +13,6 @@
         <developerConnection>{{scmDeveloperConnection}}</developerConnection>
         <url>{{scmUrl}}</url>
     </scm>
-  <prerequisites>
-    <maven>2.2.0</maven>
-  </prerequisites>
 
     <licenses>
         <license>
@@ -36,6 +33,26 @@
 
     <build>
         <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-enforcer-plugin</artifactId>
+                <version>3.0.0-M1</version>
+                <executions>
+                    <execution>
+                        <id>enforce-maven</id>
+                        <goals>
+                            <goal>enforce</goal>
+                        </goals>
+                        <configuration>
+                            <rules>
+                                <requireMavenVersion>
+                                    <version>2.2.0</version>
+                                </requireMavenVersion>
+                            </rules>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
@@ -97,7 +114,8 @@
                         </goals>
                         <configuration>
                             <sources>
-                <source>src/main/java</source>
+                                <source>
+                                src/main/java</source>
                             </sources>
                         </configuration>
                     </execution>
@@ -109,7 +127,8 @@
                         </goals>
                         <configuration>
                             <sources>
-                <source>src/test/java</source>
+                                <source>
+                                src/test/java</source>
                             </sources>
                         </configuration>
                     </execution>
@@ -121,11 +140,13 @@
                 <version>3.6.1</version>
                 <configuration>
                     {{#java8}}
-          <source>1.8</source>
+                        <source>
+                        1.8</source>
                         <target>1.8</target>
                     {{/java8}}
                     {{^java8}}
-          <source>1.7</source>
+                        <source>
+                        1.7</source>
                         <target>1.7</target>
                     {{/java8}}
                 </configuration>

modules/swagger-codegen/src/main/resources/Java/libraries/jersey2/pom.mustache

@@ -13,9 +13,6 @@
         <developerConnection>{{scmDeveloperConnection}}</developerConnection>
         <url>{{scmUrl}}</url>
     </scm>
-  <prerequisites>
-    <maven>2.2.0</maven>
-  </prerequisites>
 
     <licenses>
         <license>
@@ -36,6 +33,26 @@
 
     <build>
         <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-enforcer-plugin</artifactId>
+                <version>3.0.0-M1</version>
+                <executions>
+                    <execution>
+                        <id>enforce-maven</id>
+                        <goals>
+                            <goal>enforce</goal>
+                        </goals>
+                        <configuration>
+                            <rules>
+                                <requireMavenVersion>
+                                    <version>2.2.0</version>
+                                </requireMavenVersion>
+                            </rules>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
@@ -96,7 +113,8 @@
                         </goals>
                         <configuration>
                             <sources>
-                <source>src/main/java</source>
+                                <source>
+                                src/main/java</source>
                             </sources>
                         </configuration>
                     </execution>
@@ -108,7 +126,8 @@
                         </goals>
                         <configuration>
                             <sources>
-                <source>src/test/java</source>
+                                <source>
+                                src/test/java</source>
                             </sources>
                         </configuration>
                     </execution>
@@ -120,11 +139,13 @@
                 <version>3.6.1</version>
                 <configuration>
                     {{#java8}}
-          <source>1.8</source>
+                        <source>
+                        1.8</source>
                         <target>1.8</target>
                     {{/java8}}
                     {{^java8}}
-          <source>1.7</source>
+                        <source>
+                        1.7</source>
                         <target>1.7</target>
                     {{/java8}}
                 </configuration>
@@ -291,6 +312,7 @@
         </dependency>
     </dependencies>
     <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <swagger-core-version>1.5.15</swagger-core-version>
         {{^supportJava6}}
             <jersey-version>2.25.1</jersey-version>

modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/pom.mustache

@@ -13,9 +13,6 @@
         <developerConnection>{{scmDeveloperConnection}}</developerConnection>
         <url>{{scmUrl}}</url>
     </scm>
-  <prerequisites>
-    <maven>2.2.0</maven>
-  </prerequisites>
 
     <licenses>
         <license>
@@ -36,6 +33,26 @@
 
     <build>
         <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-enforcer-plugin</artifactId>
+                <version>3.0.0-M1</version>
+                <executions>
+                    <execution>
+                        <id>enforce-maven</id>
+                        <goals>
+                            <goal>enforce</goal>
+                        </goals>
+                        <configuration>
+                            <rules>
+                                <requireMavenVersion>
+                                    <version>2.2.0</version>
+                                </requireMavenVersion>
+                            </rules>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
@@ -97,7 +114,8 @@
                         </goals>
                         <configuration>
                             <sources>
-                <source>src/main/java</source>
+                                <source>
+                                src/main/java</source>
                             </sources>
                         </configuration>
                     </execution>
@@ -109,7 +127,8 @@
                         </goals>
                         <configuration>
                             <sources>
-                <source>src/test/java</source>
+                                <source>
+                                src/test/java</source>
                             </sources>
                         </configuration>
                     </execution>

modules/swagger-codegen/src/main/resources/Java/libraries/resteasy/ApiClient.mustache

@@ -589,18 +589,18 @@ public class ApiClient {
 
     Invocation.Builder invocationBuilder = target.request().accept(accept);
 
-    for (String key : headerParams.keySet()) {
-      String value = headerParams.get(key);
+    for (Entry<String, String> headerParamsEnrty : headerParams.entrySet()) {
+      String value = headerParamsEnrty.getValue();
       if (value != null) {
-        invocationBuilder = invocationBuilder.header(key, value);
+        invocationBuilder = invocationBuilder.header(headerParamsEnrty.getKey(), value);
       }
     }
 
-    for (String key : defaultHeaderMap.keySet()) {
-      if (!headerParams.containsKey(key)) {
-        String value = defaultHeaderMap.get(key);
+    for (Entry<String, String> defaultHeaderEnrty: defaultHeaderMap.entrySet()) {
+      if (!headerParams.containsKey(defaultHeaderEnrty.getKey())) {
+        String value = defaultHeaderEnrty.getKey();
         if (value != null) {
-          invocationBuilder = invocationBuilder.header(key, value);
+          invocationBuilder = invocationBuilder.header(defaultHeaderEnrty.getKey(), value);
         }
       }
     }

modules/swagger-codegen/src/main/resources/Java/libraries/resteasy/pom.mustache

@@ -11,12 +11,29 @@
         <developerConnection>scm:git:git@github.com:swagger-api/swagger-codegen.git</developerConnection>
         <url>https://github.com/swagger-api/swagger-codegen</url>
     </scm>
-  <prerequisites>
-    <maven>2.2.0</maven>
-  </prerequisites>
 
     <build>
         <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-enforcer-plugin</artifactId>
+                <version>3.0.0-M1</version>
+                <executions>
+                    <execution>
+                        <id>enforce-maven</id>
+                        <goals>
+                            <goal>enforce</goal>
+                        </goals>
+                        <configuration>
+                            <rules>
+                                <requireMavenVersion>
+                                    <version>2.2.0</version>
+                                </requireMavenVersion>
+                            </rules>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
@@ -77,7 +94,8 @@
                         </goals>
                         <configuration>
                             <sources>
-                <source>src/main/java</source>
+                                <source>
+                                src/main/java</source>
                             </sources>
                         </configuration>
                     </execution>
@@ -89,7 +107,8 @@
                         </goals>
                         <configuration>
                             <sources>
-                <source>src/test/java</source>
+                                <source>
+                                src/test/java</source>
                             </sources>
                         </configuration>
                     </execution>
@@ -101,11 +120,13 @@
                 <version>2.5.1</version>
                 <configuration>
                     {{#java8}}
-          <source>1.8</source>
+                        <source>
+                        1.8</source>
                         <target>1.8</target>
                     {{/java8}}
                     {{^java8}}
-          <source>1.7</source>
+                        <source>
+                        1.7</source>
                         <target>1.7</target>
                     {{/java8}}
                 </configuration>
@@ -202,7 +223,7 @@
         {{/supportJava6}}
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
-      <artifactId>resteasy-jackson-provider</artifactId>
+            <artifactId>resteasy-jackson2-provider</artifactId>
             <version>3.1.3.Final</version>
         </dependency>
         <dependency>
@@ -224,6 +245,7 @@
         </dependency>
     </dependencies>
     <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <swagger-core-version>1.5.15</swagger-core-version>
         <resteasy-version>3.1.3.Final</resteasy-version>
         <jackson-version>2.6.4</jackson-version>

modules/swagger-codegen/src/main/resources/Java/libraries/resttemplate/api.mustache

@@ -89,11 +89,11 @@ public class {{classname}} {
         {{/hasMore}}{{/formParams}}{{/hasFormParams}}
 
         final String[] {{localVariablePrefix}}accepts = { {{#hasProduces}}
-            {{#produces}}"{{mediaType}}"{{#hasMore}}, {{/hasMore}}{{/produces}}
+            {{#produces}}"{{{mediaType}}}"{{#hasMore}}, {{/hasMore}}{{/produces}}
         {{/hasProduces}}};
         final List<MediaType> {{localVariablePrefix}}accept = {{localVariablePrefix}}apiClient.selectHeaderAccept({{localVariablePrefix}}accepts);
         final String[] {{localVariablePrefix}}contentTypes = { {{#hasConsumes}}
-            {{#consumes}}"{{mediaType}}"{{#hasMore}}, {{/hasMore}}{{/consumes}}
+            {{#consumes}}"{{{mediaType}}}"{{#hasMore}}, {{/hasMore}}{{/consumes}}
         {{/hasConsumes}}};
         final MediaType {{localVariablePrefix}}contentType = {{localVariablePrefix}}apiClient.selectHeaderContentType({{localVariablePrefix}}contentTypes);
 

modules/swagger-codegen/src/main/resources/Java/libraries/resttemplate/pom.mustache

@@ -13,9 +13,6 @@
         <developerConnection>{{scmDeveloperConnection}}</developerConnection>
         <url>{{scmUrl}}</url>
     </scm>
-  <prerequisites>
-    <maven>2.2.0</maven>
-  </prerequisites>
 
     <licenses>
         <license>
@@ -36,6 +33,26 @@
 
     <build>
         <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-enforcer-plugin</artifactId>
+                <version>3.0.0-M1</version>
+                <executions>
+                    <execution>
+                        <id>enforce-maven</id>
+                        <goals>
+                            <goal>enforce</goal>
+                        </goals>
+                        <configuration>
+                            <rules>
+                                <requireMavenVersion>
+                                    <version>2.2.0</version>
+                                </requireMavenVersion>
+                            </rules>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
@@ -97,7 +114,8 @@
                         </goals>
                         <configuration>
                             <sources>
-                <source>src/main/java</source>
+                                <source>
+                                src/main/java</source>
                             </sources>
                         </configuration>
                     </execution>
@@ -109,7 +127,8 @@
                         </goals>
                         <configuration>
                             <sources>
-                <source>src/test/java</source>
+                                <source>
+                                src/test/java</source>
                             </sources>
                         </configuration>
                     </execution>
@@ -121,11 +140,13 @@
                 <version>3.6.1</version>
                 <configuration>
                     {{#java8}}
-          <source>1.8</source>
+                        <source>
+                        1.8</source>
                         <target>1.8</target>
                     {{/java8}}
                     {{^java8}}
-          <source>1.7</source>
+                        <source>
+                        1.7</source>
                         <target>1.7</target>
                     {{/java8}}
                 </configuration>

modules/swagger-codegen/src/main/resources/Java/libraries/retrofit/pom.mustache

@@ -13,9 +13,6 @@
         <developerConnection>{{scmDeveloperConnection}}</developerConnection>
         <url>{{scmUrl}}</url>
     </scm>
-  <prerequisites>
-    <maven>2.2.0</maven>
-  </prerequisites>
 
     <licenses>
         <license>
@@ -36,6 +33,26 @@
 
     <build>
         <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-enforcer-plugin</artifactId>
+                <version>3.0.0-M1</version>
+                <executions>
+                    <execution>
+                        <id>enforce-maven</id>
+                        <goals>
+                            <goal>enforce</goal>
+                        </goals>
+                        <configuration>
+                            <rules>
+                                <requireMavenVersion>
+                                    <version>2.2.0</version>
+                                </requireMavenVersion>
+                            </rules>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
@@ -96,7 +113,8 @@
                         </goals>
                         <configuration>
                             <sources>
-                <source>src/main/java</source>
+                                <source>
+                                src/main/java</source>
                             </sources>
                         </configuration>
                     </execution>
@@ -108,7 +126,8 @@
                         </goals>
                         <configuration>
                             <sources>
-                <source>src/test/java</source>
+                                <source>
+                                src/test/java</source>
                             </sources>
                         </configuration>
                     </execution>
@@ -222,6 +241,7 @@
         </dependency>
     </dependencies>
     <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <swagger-core-version>1.5.15</swagger-core-version>
         <retrofit-version>1.9.0</retrofit-version>
         <okhttp-version>2.7.5</okhttp-version>

modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/api.mustache

@@ -50,7 +50,7 @@ public interface {{classname}} {
   {{#prioritizedContentTypes}}
   {{#-first}}
   @Headers({
-    "Content-Type:{{mediaType}}"
+    "Content-Type:{{{mediaType}}}"
   })
   {{/-first}}
   {{/prioritizedContentTypes}}

modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/play24/Play24CallAdapterFactory.mustache

@@ -50,7 +50,7 @@ public class Play24CallAdapterFactory extends CallAdapter.Factory {
     }
     
     /**
-     * Adpater that coverts values returned by API interface into CompletionStage
+     * Adapter that coverts values returned by API interface into CompletionStage
      */
     private static final class ValueAdapter<R> implements CallAdapter<R, F.Promise<R>> {
 

modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/play24/api.mustache

@@ -42,7 +42,7 @@ public interface {{classname}} {
   {{#prioritizedContentTypes}}
   {{#-first}}
   @Headers({
-    "Content-Type:{{mediaType}}"
+    "Content-Type:{{{mediaType}}}"
   })
   {{/-first}}
   {{/prioritizedContentTypes}}

modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/play25/Play25CallAdapterFactory.mustache

@@ -64,7 +64,7 @@ public class Play25CallAdapterFactory extends CallAdapter.Factory {
     }
 
     /**
-     * Adpater that coverts values returned by API interface into CompletionStage
+     * Adapter that coverts values returned by API interface into CompletionStage
      */
     private static final class ValueAdapter<R> implements CallAdapter<R, CompletionStage<R>> {
 

modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/play25/api.mustache

@@ -42,7 +42,7 @@ public interface {{classname}} {
   {{#prioritizedContentTypes}}
   {{#-first}}
   @Headers({
-    "Content-Type:{{mediaType}}"
+    "Content-Type:{{{mediaType}}}"
   })
   {{/-first}}
   {{/prioritizedContentTypes}}

modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/pom.mustache

@@ -13,9 +13,6 @@
         <developerConnection>{{scmDeveloperConnection}}</developerConnection>
         <url>{{scmUrl}}</url>
     </scm>
-  <prerequisites>
-    <maven>2.2.0</maven>
-  </prerequisites>
 
     <licenses>
         <license>
@@ -36,6 +33,26 @@
 
     <build>
         <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-enforcer-plugin</artifactId>
+                <version>3.0.0-M1</version>
+                <executions>
+                    <execution>
+                        <id>enforce-maven</id>
+                        <goals>
+                            <goal>enforce</goal>
+                        </goals>
+                        <configuration>
+                            <rules>
+                                <requireMavenVersion>
+                                    <version>2.2.0</version>
+                                </requireMavenVersion>
+                            </rules>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
@@ -97,7 +114,8 @@
                         </goals>
                         <configuration>
                             <sources>
-                <source>src/main/java</source>
+                                <source>
+                                src/main/java</source>
                             </sources>
                         </configuration>
                     </execution>
@@ -109,7 +127,8 @@
                         </goals>
                         <configuration>
                             <sources>
-                <source>src/test/java</source>
+                                <source>
+                                src/test/java</source>
                             </sources>
                         </configuration>
                     </execution>

modules/swagger-codegen/src/main/resources/Java/libraries/vertx/pom.mustache

@@ -13,9 +13,6 @@
         <developerConnection>{{scmDeveloperConnection}}</developerConnection>
         <url>{{scmUrl}}</url>
     </scm>
-  <prerequisites>
-    <maven>2.2.0</maven>
-  </prerequisites>
 
     <licenses>
         <license>
@@ -36,6 +33,26 @@
 
     <build>
         <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-enforcer-plugin</artifactId>
+                <version>3.0.0-M1</version>
+                <executions>
+                    <execution>
+                        <id>enforce-maven</id>
+                        <goals>
+                            <goal>enforce</goal>
+                        </goals>
+                        <configuration>
+                            <rules>
+                                <requireMavenVersion>
+                                    <version>2.2.0</version>
+                                </requireMavenVersion>
+                            </rules>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
@@ -97,7 +114,8 @@
                         </goals>
                         <configuration>
                             <sources>
-                <source>src/main/java</source>
+                                <source>
+                                src/main/java</source>
                             </sources>
                         </configuration>
                     </execution>
@@ -109,7 +127,8 @@
                         </goals>
                         <configuration>
                             <sources>
-                <source>src/test/java</source>
+                                <source>
+                                src/test/java</source>
                             </sources>
                         </configuration>
                     </execution>
@@ -120,7 +139,8 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.6.1</version>
                 <configuration>
-          <source>1.8</source>
+                    <source>
+                    1.8</source>
                     <target>1.8</target>
                 </configuration>
             </plugin>

modules/swagger-codegen/src/main/resources/Java/pom.mustache

@@ -13,9 +13,6 @@
         <developerConnection>{{scmDeveloperConnection}}</developerConnection>
         <url>{{scmUrl}}</url>
     </scm>
-  <prerequisites>
-    <maven>2.2.0</maven>
-  </prerequisites>
 
     <licenses>
         <license>
@@ -36,6 +33,26 @@
 
     <build>
         <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-enforcer-plugin</artifactId>
+                <version>3.0.0-M1</version>
+                <executions>
+                    <execution>
+                        <id>enforce-maven</id>
+                        <goals>
+                            <goal>enforce</goal>
+                        </goals>
+                        <configuration>
+                            <rules>
+                                <requireMavenVersion>
+                                    <version>2.2.0</version>
+                                </requireMavenVersion>
+                            </rules>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
@@ -97,7 +114,8 @@
                         </goals>
                         <configuration>
                             <sources>
-                <source>src/main/java</source>
+                                <source>
+                                src/main/java</source>
                             </sources>
                         </configuration>
                     </execution>
@@ -109,7 +127,8 @@
                         </goals>
                         <configuration>
                             <sources>
-                <source>src/test/java</source>
+                                <source>
+                                src/test/java</source>
                             </sources>
                         </configuration>
                     </execution>
@@ -121,11 +140,13 @@
                 <version>3.6.1</version>
                 <configuration>
                     {{#java8}}
-          <source>1.8</source>
+                        <source>
+                        1.8</source>
                         <target>1.8</target>
                     {{/java8}}
                     {{^java8}}
-          <source>1.7</source>
+                        <source>
+                        1.7</source>
                         <target>1.7</target>
                     {{/java8}}
                 </configuration>

modules/swagger-codegen/src/main/resources/JavaInflector/pom.mustache

@@ -1,4 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <parent>
         <groupId>org.sonatype.oss</groupId>
         <artifactId>oss-parent</artifactId>
@@ -10,9 +11,6 @@
     <packaging>jar</packaging>
     <name>{{artifactId}}</name>
     <version>{{artifactVersion}}</version>
-    <prerequisites>
-        <maven>2.2.0</maven>
-    </prerequisites>
 
     <licenses>
         <license>
@@ -27,6 +25,26 @@
         <directory>target</directory>
         <finalName>${project.artifactId}-${project.version}</finalName>
         <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-enforcer-plugin</artifactId>
+                <version>3.0.0-M1</version>
+                <executions>
+                    <execution>
+                        <id>enforce-maven</id>
+                        <goals>
+                            <goal>enforce</goal>
+                        </goals>
+                        <configuration>
+                            <rules>
+                                <requireMavenVersion>
+                                    <version>2.2.0</version>
+                                </requireMavenVersion>
+                            </rules>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>build-helper-maven-plugin</artifactId>
@@ -40,7 +58,8 @@
                         </goals>
                         <configuration>
                             <sources>
-                                <source>src/gen/java</source>
+                                <source>
+                                src/gen/java</source>
                             </sources>
                         </configuration>
                     </execution>
@@ -118,6 +137,7 @@
         </repository>
     </repositories>
     <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven-plugin-version>1.0.0</maven-plugin-version>
         <swagger-inflector-version>1.0.14</swagger-inflector-version>
         <jetty-version>9.2.9.v20150224</jetty-version>

modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf-cdi/api.mustache

@@ -41,8 +41,8 @@ public class {{classname}}  {
 
     @{{httpMethod}}
     {{#subresourceOperation}}@Path("{{{path}}}"){{/subresourceOperation}}
-    {{#hasConsumes}}@Consumes({ {{#consumes}}"{{mediaType}}"{{#hasMore}}, {{/hasMore}}{{/consumes}} }){{/hasConsumes}}
-    {{#hasProduces}}@Produces({ {{#produces}}"{{mediaType}}"{{#hasMore}}, {{/hasMore}}{{/produces}} }){{/hasProduces}}
+    {{#hasConsumes}}@Consumes({ {{#consumes}}"{{{mediaType}}}"{{#hasMore}}, {{/hasMore}}{{/consumes}} }){{/hasConsumes}}
+    {{#hasProduces}}@Produces({ {{#produces}}"{{{mediaType}}}"{{#hasMore}}, {{/hasMore}}{{/produces}} }){{/hasProduces}}
     @ApiOperation(value = "{{{summary}}}", notes = "{{{notes}}}", response = {{{returnBaseType}}}.class{{#returnContainer}}, responseContainer = "{{{returnContainer}}}"{{/returnContainer}}{{#hasAuthMethods}}, authorizations = {
         {{#authMethods}}@Authorization(value = "{{name}}"{{#isOAuth}}, scopes = {
             {{#scopes}}@AuthorizationScope(scope = "{{scope}}", description = "{{description}}"){{#hasMore}},

modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/pojo.mustache

@@ -37,8 +37,13 @@ public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {
    * {{{description}}}  
   **/
 {{/description}}
-  private {{{datatypeWithEnum}}} {{name}} = {{{defaultValue}}};{{/vars}}
-
+{{#isContainer}}
+  private {{{datatypeWithEnum}}} {{name}}{{#required}} = {{{defaultValue}}}{{/required}}{{^required}} = null{{/required}};
+{{/isContainer}}
+{{^isContainer}}
+  private {{{datatypeWithEnum}}} {{name}} = {{{defaultValue}}};
+{{/isContainer}}
+  {{/vars}}
   {{#vars}}
  /**
   {{#description}}

modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/api.mustache

@@ -2,7 +2,6 @@ package {{package}};
 
 import {{modelPackage}}.*;
 import {{package}}.{{classname}}Service;
-import {{package}}.factories.{{classname}}ServiceFactory;
 
 import io.swagger.annotations.ApiParam;
 import io.swagger.jaxrs.*;
@@ -20,6 +19,8 @@ import javax.ws.rs.core.Context;
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.SecurityContext;
 import javax.ws.rs.*;
+import javax.inject.Inject;
+
 {{#useBeanValidation}}
 import javax.validation.constraints.*;
 {{/useBeanValidation}}
@@ -32,7 +33,8 @@ import javax.validation.constraints.*;
 {{>generatedAnnotation}}
 {{#operations}}
 public class {{classname}}  {
-   private final {{classname}}Service delegate = {{classname}}ServiceFactory.get{{classname}}();
+
+    @Inject {{classname}}Service service;
 
 {{#operation}}
     @{{httpMethod}}
@@ -51,7 +53,7 @@ public class {{classname}}  {
         {{/hasMore}}{{/responses}} })
     public Response {{nickname}}({{#isMultipart}}MultipartFormDataInput input,{{/isMultipart}}{{#allParams}}{{>queryParams}}{{>pathParams}}{{>headerParams}}{{>bodyParams}}{{^isMultipart}}{{>formParams}},{{/isMultipart}}{{#isMultipart}}{{^isFormParam}},{{/isFormParam}}{{/isMultipart}}{{/allParams}}@Context SecurityContext securityContext)
     throws NotFoundException {
-        return delegate.{{nickname}}({{#isMultipart}}input,{{/isMultipart}}{{#allParams}}{{^isMultipart}}{{paramName}},{{/isMultipart}}{{#isMultipart}}{{^isFormParam}}{{paramName}},{{/isFormParam}}{{/isMultipart}}{{/allParams}}securityContext);
+        return service.{{nickname}}({{#isMultipart}}input,{{/isMultipart}}{{#allParams}}{{^isMultipart}}{{paramName}},{{/isMultipart}}{{#isMultipart}}{{^isFormParam}}{{paramName}},{{/isFormParam}}{{/isMultipart}}{{/allParams}}securityContext);
     }
 {{/operation}}
 }

modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/apiService.mustache

@@ -18,9 +18,9 @@ import javax.ws.rs.core.SecurityContext;
 
 {{>generatedAnnotation}}
 {{#operations}}
-public abstract class {{classname}}Service {
+public interface {{classname}}Service {
   {{#operation}}
-      public abstract Response {{nickname}}({{#isMultipart}}MultipartFormDataInput input,{{/isMultipart}}{{#allParams}}{{>serviceQueryParams}}{{>servicePathParams}}{{>serviceHeaderParams}}{{>serviceBodyParams}}{{^isMultipart}}{{>serviceFormParams}},{{/isMultipart}}{{#isMultipart}}{{^isFormParam}},{{/isFormParam}}{{/isMultipart}}{{/allParams}}SecurityContext securityContext)
+      Response {{nickname}}({{#isMultipart}}MultipartFormDataInput input,{{/isMultipart}}{{#allParams}}{{>serviceQueryParams}}{{>servicePathParams}}{{>serviceHeaderParams}}{{>serviceBodyParams}}{{^isMultipart}}{{>serviceFormParams}},{{/isMultipart}}{{#isMultipart}}{{^isFormParam}},{{/isFormParam}}{{/isMultipart}}{{/allParams}}SecurityContext securityContext)
       throws NotFoundException;
   {{/operation}}
 }

modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/apiServiceFactory.mustache

@@ -1,15 +0,0 @@
-package {{package}}.factories;
-
-import {{package}}.{{classname}}Service;
-import {{package}}.impl.{{classname}}ServiceImpl;
-
-{{>generatedAnnotation}}
-public class {{classname}}ServiceFactory {
-
-   private final static {{classname}}Service service = new {{classname}}ServiceImpl();
-
-   public static {{classname}}Service get{{classname}}()
-   {
-      return service;
-   }
-}

modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/apiServiceImpl.mustache

@@ -13,14 +13,15 @@ import {{package}}.NotFoundException;
 
 import java.io.InputStream;
 
+import javax.enterprise.context.RequestScoped;
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.SecurityContext;
 
+@RequestScoped
 {{>generatedAnnotation}}
 {{#operations}}
-public class {{classname}}ServiceImpl extends {{classname}}Service {
+public class {{classname}}ServiceImpl implements {{classname}}Service {
   {{#operation}}
-      @Override
       public Response {{nickname}}({{#isMultipart}}MultipartFormDataInput input,{{/isMultipart}}{{#allParams}}{{>serviceQueryParams}}{{>servicePathParams}}{{>serviceHeaderParams}}{{>serviceBodyParams}}{{^isMultipart}}{{>serviceFormParams}},{{/isMultipart}}{{#isMultipart}}{{^isFormParam}},{{/isFormParam}}{{/isMultipart}}{{/allParams}}SecurityContext securityContext)
       throws NotFoundException {
       // do some magic!

modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/gradle.mustache

@@ -13,13 +13,18 @@ dependencies {
     providedCompile 'org.jboss.resteasy:resteasy-validator-provider-11:3.0.11.Final'
     providedCompile 'org.jboss.resteasy:resteasy-multipart-provider:3.0.11.Final'
     providedCompile 'javax.annotation:javax.annotation-api:1.2'
+    providedCompile 'javax:javaee-api:7.0'
     providedCompile 'org.jboss.spec.javax.servlet:jboss-servlet-api_3.0_spec:1.0.0.Final'
     compile         'io.swagger:swagger-annotations:1.5.10'
     compile         'org.jboss.resteasy:resteasy-jackson2-provider:3.0.11.Final'
-{{#joda}}
+{{#useBeanValidation}}
+    providedCompile 'javax.validation:validation-api:1.1.0.Final'
+{{/useBeanValidation}}
     compile         'com.fasterxml.jackson.datatype:jackson-datatype-joda:2.4.1'
     compile         'joda-time:joda-time:2.7'
-{{/joda}}
+    //TODO: swaggerFeature
+    compile 'io.swagger:swagger-jaxrs:1.5.12'
+
     testCompile     'junit:junit:4.12',
                     'org.hamcrest:hamcrest-core:1.3'
 }

modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/pom.mustache

@@ -58,6 +58,14 @@
         </plugins>
     </build>
     <dependencies>
+        <!-- https://mvnrepository.com/artifact/javax/javaee-api -->
+        <dependency>
+            <groupId>javax</groupId>
+            <artifactId>javaee-api</artifactId>
+            <version>7.0</version>
+            <scope>provided</scope>
+        </dependency>
+
         <dependency>
             <groupId>io.swagger</groupId>
             <artifactId>swagger-annotations</artifactId>
@@ -103,6 +111,7 @@
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-jackson2-provider</artifactId>
             <version>${resteasy-version}</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>javax.annotation</groupId>

modules/swagger-codegen/src/main/resources/JavaPlayFramework/application.mustache

@@ -39,7 +39,7 @@ play.http.errorHandler="swagger.ErrorHandler"
 # Play uses Akka internally and exposes Akka Streams and actors in Websockets and
 # other streaming HTTP responses.
 akka {
-# "akka.log-config-on-start" is extraordinarly useful because it log the complete
+# "akka.log-config-on-start" is extraordinarily useful because it log the complete
 # configuration at INFO level, including defaults and overrides, so it s worth
 # putting at the very top.
 #

modules/swagger-codegen/src/main/resources/JavaSpring/formParams.mustache

@@ -1 +1 @@
-{{#isFormParam}}{{#notFile}}@ApiParam(value = "{{{description}}}"{{#required}}, required=true{{/required}}{{#allowableValues}}, allowableValues="{{#values}}{{{.}}}{{^-last}}, {{/-last}}{{#-last}}{{/-last}}{{/values}}"{{/allowableValues}}{{#defaultValue}}, defaultValue="{{{defaultValue}}}"{{/defaultValue}}) @RequestPart(value="{{baseName}}"{{#required}}, required=true{{/required}}{{^required}}, required=false{{/required}})  {{{dataType}}} {{paramName}}{{/notFile}}{{#isFile}}@ApiParam(value = "file detail") {{#useBeanValidation}}@Valid{{/useBeanValidation}} @RequestPart("file") MultipartFile {{baseName}}{{/isFile}}{{/isFormParam}}
+{{#isFormParam}}{{#notFile}}@ApiParam(value = "{{{description}}}"{{#required}}, required=true{{/required}}{{#allowableValues}}, allowableValues="{{#values}}{{{.}}}{{^-last}}, {{/-last}}{{#-last}}{{/-last}}{{/values}}"{{/allowableValues}}{{#defaultValue}}, defaultValue="{{{defaultValue}}}"{{/defaultValue}}) @RequestParam(value="{{baseName}}"{{#required}}, required=true{{/required}}{{^required}}, required=false{{/required}})  {{{dataType}}} {{paramName}}{{/notFile}}{{#isFile}}@ApiParam(value = "file detail") {{#useBeanValidation}}@Valid{{/useBeanValidation}} @RequestPart("file") MultipartFile {{baseName}}{{/isFile}}{{/isFormParam}}

modules/swagger-codegen/src/main/resources/JavaSpring/libraries/spring-boot/pom.mustache

@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>1.5.4.RELEASE</version>
+        <version>1.5.9.RELEASE</version>
     </parent>
     <build>
         <sourceDirectory>src/main/java</sourceDirectory>
@@ -42,7 +42,6 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-tomcat</artifactId>
-            <scope>provided</scope>
         </dependency>
         <!--SpringFox dependencies -->
         <dependency>
@@ -91,8 +90,6 @@
         <dependency>
             <groupId>javax.validation</groupId>
             <artifactId>validation-api</artifactId>
-        <version>1.1.0.Final</version>
-        <scope>provided</scope>
         </dependency>
 {{/useBeanValidation}}        
     </dependencies>

modules/swagger-codegen/src/main/resources/JavaSpring/libraries/spring-cloud/clientConfiguration.mustache

@@ -24,10 +24,10 @@ public class ClientConfiguration {
 
 {{#authMethods}}
     {{#isBasic}}
-  @Value("${ {{{title}}}.security.{{{name}}}.username:}")
+  {{=<% %>=}}@Value("${<%title%>.security.<%name%>.username:}")<%={{ }}=%>
   private String {{{name}}}Username;
 
-  @Value("${ {{{title}}}.security.{{{name}}}.password:}")
+  {{=<% %>=}}@Value("${<%title%>.security.<%name%>.password:}")<%={{ }}=%>
   private String {{{name}}}Password;
 
   @Bean
@@ -38,7 +38,7 @@ public class ClientConfiguration {
 
     {{/isBasic}}
     {{#isApiKey}}
-  @Value("${ {{{title}}}.security.{{{name}}}.key:}")
+  {{=<% %>=}}@Value("${<%title%>.security.<%name%>.key:}")<%={{ }}=%>
   private String {{{name}}}Key;
 
   @Bean

modules/swagger-codegen/src/main/resources/JavaSpring/pathParams.mustache

@@ -1 +1 @@
-{{#isPathParam}}{{#useBeanValidation}}{{>beanValidationPathParams}}{{/useBeanValidation}}@ApiParam(value = "{{{description}}}"{{#required}},required=true{{/required}}{{#allowableValues}}, allowableValues = "{{#values}}{{{.}}}{{^-last}}, {{/-last}}{{#-last}}{{/-last}}{{/values}}"{{/allowableValues}}{{#defaultValue}}, defaultValue="{{{defaultValue}}}"{{/defaultValue}}) @PathVariable("{{baseName}}") {{>optionalDataType}} {{paramName}}{{/isPathParam}}
+{{#isPathParam}}{{#useBeanValidation}}{{>beanValidationPathParams}}{{/useBeanValidation}}@ApiParam(value = "{{{description}}}"{{#required}},required=true{{/required}}{{#allowableValues}}, allowableValues = "{{#enumVars}}{{#lambdaEscapeDoubleQuote}}{{{value}}}{{/lambdaEscapeDoubleQuote}}{{^-last}}, {{/-last}}{{#-last}}{{/-last}}{{/enumVars}}"{{/allowableValues}}{{#defaultValue}}, defaultValue="{{{defaultValue}}}"{{/defaultValue}}) @PathVariable("{{baseName}}") {{>optionalDataType}} {{paramName}}{{/isPathParam}}

modules/swagger-codegen/src/main/resources/MSF4J/Application.mustache

@@ -12,7 +12,7 @@ public class Application {
 
 System.out.println("starting Micro Services");
 //Before you run service replace .deploy(new ()) with your actual service class like .deploy(new ApisAPI()) then it will start that service.
-//If you have multiple service classes add them in , seperated manner.
+//If you have multiple service classes add them in comma separated manner.
 //Ex: .deploy(new PetApi())
         new MicroservicesRunner()
                 .deploy(new PetApi())

modules/swagger-codegen/src/main/resources/MSF4J/api.mustache

@@ -37,7 +37,7 @@ public class {{classname}}  {
     {{#subresourceOperation}}@Path("{{{path}}}"){{/subresourceOperation}}
     {{#hasConsumes}}@Consumes({ {{#consumes}}"{{{mediaType}}}"{{#hasMore}}, {{/hasMore}}{{/consumes}} }){{/hasConsumes}}
     {{#hasProduces}}@Produces({ {{#produces}}"{{{mediaType}}}"{{#hasMore}}, {{/hasMore}}{{/produces}} }){{/hasProduces}}
-    @io.swagger.annotations.ApiOperation(value = "{{{summary}}}", notes = "{{{notes}}}", response = {{{returnType}}}.class{{#returnContainer}}, responseContainer = "{{{returnContainer}}}"{{/returnContainer}}{{#hasAuthMethods}}, authorizations = {
+    @io.swagger.annotations.ApiOperation(value = "{{{summary}}}", notes = "{{{notes}}}", response = {{{returnBaseType}}}.class{{#returnContainer}}, responseContainer = "{{{returnContainer}}}"{{/returnContainer}}{{#hasAuthMethods}}, authorizations = {
         {{#authMethods}}@io.swagger.annotations.Authorization(value = "{{name}}"{{#isOAuth}}, scopes = {
             {{#scopes}}@io.swagger.annotations.AuthorizationScope(scope = "{{scope}}", description = "{{description}}"){{#hasMore}},
             {{/hasMore}}{{/scopes}}
@@ -45,7 +45,7 @@ public class {{classname}}  {
         {{/hasMore}}{{/authMethods}}
     }{{/hasAuthMethods}}, tags={ {{#vendorExtensions.x-tags}}"{{tag}}",{{/vendorExtensions.x-tags}} })
     @io.swagger.annotations.ApiResponses(value = { {{#responses}}
-        @io.swagger.annotations.ApiResponse(code = {{{code}}}, message = "{{{message}}}", response = {{{returnType}}}.class{{#returnContainer}}, responseContainer = "{{{returnContainer}}}"{{/returnContainer}}){{#hasMore}},
+        @io.swagger.annotations.ApiResponse(code = {{{code}}}, message = "{{{message}}}", response = {{{returnBaseType}}}.class{{#returnContainer}}, responseContainer = "{{{returnContainer}}}"{{/returnContainer}}){{#hasMore}},
         {{/hasMore}}{{/responses}} })
     public Response {{nickname}}({{#allParams}}{{>queryParams}}{{>pathParams}}{{>headerParams}}{{>bodyParams}}{{>formParams}}{{#hasMore}},{{/hasMore}}{{/allParams}})
     throws NotFoundException {

modules/swagger-codegen/src/main/resources/akka-scala/README.mustache

@@ -0,0 +1,129 @@
+# NAME
+
+{{appName}}
+
+{{#appDescription}}{{{appDescription}}}{{/appDescription}}
+
+# VERSION
+
+Automatically generated by the [Swagger Codegen](https://github.com/swagger-api/swagger-codegen) project:
+
+- API version: {{appVersion}}
+- Package version: {{moduleVersion}}
+{{^hideGenerationTimestamp}}
+- Build date: {{generatedDate}}
+{{/hideGenerationTimestamp}}
+- Build package: {{generatorClass}}
+{{#infoUrl}}
+For more information, please visit [{{{infoUrl}}}]({{{infoUrl}}})
+{{/infoUrl}}
+
+# Requirements
+
+Building the API client library requires [Maven](https://maven.apache.org/) to be installed.
+
+## Installation
+
+To install the API client library to your local Maven repository, simply execute:
+
+```shell
+mvn install
+```
+
+To deploy it to a remote Maven repository instead, configure the settings of the repository and execute:
+
+```shell
+mvn deploy
+```
+
+Refer to the [official documentation](https://maven.apache.org/plugins/maven-deploy-plugin/usage.html) for more information.
+
+### Maven users
+
+Add this dependency to your project's POM:
+
+```xml
+<dependency>
+    <groupId>{{{groupId}}}</groupId>
+    <artifactId>{{{artifactId}}}</artifactId>
+    <version>{{{artifactVersion}}}</version>
+    <scope>compile</scope>
+</dependency>
+```
+
+### Gradle users
+
+Add this dependency to your project's build file:
+
+```groovy
+compile "{{{groupId}}}:{{{artifactId}}}:{{{artifactVersion}}}"
+```
+
+### SBT users
+
+```scala
+libraryDependencies += "{{{groupId}}}" % "{{{artifactId}}}" % "{{{artifactVersion}}}"
+```
+
+## Documentation for API Endpoints
+
+All URIs are relative to *{{basePath}}*
+
+Class | Method | HTTP request | Description
+------------ | ------------- | ------------- | -------------
+{{#apiInfo}}{{#apis}}{{#operations}}{{#operation}}*{{classname}}* | [**{{operationId}}**]({{apiDocPath}}{{classname}}.md#{{operationId}}) | **{{httpMethod}}** {{path}} | {{#summary}}{{summary}}{{/summary}}
+{{/operation}}{{/operations}}{{/apis}}{{/apiInfo}}
+
+## Documentation for Models
+
+{{#models}}{{#model}} - [{{classname}}]({{modelDocPath}}{{classname}}.md)
+{{/model}}{{/models}}
+
+## Documentation for Authorization
+
+{{^authMethods}}All endpoints do not require authorization.
+{{/authMethods}}Authentication schemes defined for the API:
+{{#authMethods}}### {{name}}
+
+{{#isApiKey}}- **Type**: API key
+- **API key parameter name**: {{keyParamName}}
+- **Location**: {{#isKeyInQuery}}URL query string{{/isKeyInQuery}}{{#isKeyInHeader}}HTTP header{{/isKeyInHeader}}
+{{/isApiKey}}
+{{#isBasic}}- **Type**: HTTP basic authentication
+{{/isBasic}}
+{{#isOAuth}}- **Type**: OAuth
+- **Flow**: {{flow}}
+- **Authorization URL**: {{authorizationUrl}}
+- **Scopes**: {{^scopes}}N/A{{/scopes}}
+{{#scopes}}  - {{scope}}: {{description}}
+{{/scopes}}
+{{/isOAuth}}
+
+{{/authMethods}}
+
+
+# BUILDING YOUR LIBRARY
+
+See the homepage `https://github.com/swagger-api/swagger-codegen` for full details.
+But briefly, clone the git repository, build the codegen codebase, set up your build
+config file, then run the API build script. You will need git, Java 7 or 8 and Apache
+maven 3.0.3 or better already installed.
+
+Your library files will be built under `WWW::MyProjectName`.
+
+          $ git clone https://github.com/swagger-api/swagger-codegen.git
+          $ cd swagger-codegen
+          $ mvn package
+          $ java -jar modules/swagger-codegen-cli/target/swagger-codegen-cli.jar generate \
+    -i [URL or file path to JSON swagger API spec] \
+    -l akka-scala \
+    -c /path/to/config/file.json \
+    -o /path/to/output/folder
+
+Bang, all done. Run the `autodoc` script in the `bin` directory to see the API
+you just built.
+
+## Author
+
+{{#apiInfo}}{{#apis}}{{^hasMore}}{{infoEmail}}
+{{/hasMore}}{{/apis}}{{/apiInfo}}

modules/swagger-codegen/src/main/resources/akka-scala/apiInvoker.mustache

@@ -49,8 +49,8 @@ object ApiInvoker {
 
   def addCustomStatusCode(code: CustomStatusCode): Unit = addCustomStatusCode(code.value, code.reason, code.isSuccess)
 
-  def addCustomStatusCode(code: Int, reason: String = "Application defined code", isSuccess: Boolean = true) = {
-    StatusCodes.getForKey(code) foreach { c =>
+  def addCustomStatusCode(code: Int, reason: String = "Application defined code", isSuccess: Boolean = true): Unit = {
+    StatusCodes.getForKey(code) foreach { _ =>
       StatusCodes.registerCustom(code, reason, reason, isSuccess, allowsEntity = true)
     }
   }
@@ -97,16 +97,15 @@ class ApiInvoker(formats: Formats)(implicit system: ActorSystem) extends Untrust
   import io.swagger.client.core.ApiInvoker._
   import io.swagger.client.core.ParametersMap._
 
-  implicit val ec = system.dispatcher
-  implicit val jsonFormats = formats
+  implicit val ec: ExecutionContextExecutor = system.dispatcher
+  implicit val jsonFormats: Formats = formats
 
   def settings = ApiSettings(system)
 
   import spray.http.MessagePredicate._
 
-  val CompressionFilter = MessagePredicate({ _ => settings.compressionEnabled}) &&
-    Encoder.DefaultFilter &&
-    minEntitySize(settings.compressionSizeThreshold)
+  val CompressionFilter: MessagePredicate= MessagePredicate({ _ => settings.compressionEnabled}) &&
+    Encoder.DefaultFilter && minEntitySize(settings.compressionSizeThreshold)
 
   settings.customCodes.foreach(addCustomStatusCode)
 
@@ -248,22 +247,22 @@ class ApiInvoker(formats: Formats)(implicit system: ActorSystem) extends Untrust
               case ResponseState.Success =>
                 ApiResponse(response.status.intValue, value, response.headers.map(header => (header.name, header.value)).toMap)
               case ResponseState.Error =>
-                throw new ApiError(response.status.intValue, "Error response received",
+                throw ApiError(response.status.intValue, "Error response received",
                   Some(value),
                   headers = response.headers.map(header => (header.name, header.value)).toMap)
             }
 
           case Left(MalformedContent(error, Some(cause))) ⇒
-            throw new ApiError(response.status.intValue, s"Unable to unmarshall content to [$manifest]", Some(response.entity.toString), cause)
+            throw ApiError(response.status.intValue, s"Unable to unmarshall content to [$manifest]", Some(response.entity.toString), cause)
 
           case Left(MalformedContent(error, None)) ⇒
-            throw new ApiError(response.status.intValue, s"Unable to unmarshall content to [$manifest]", Some(response.entity.toString))
+            throw ApiError(response.status.intValue, s"Unable to unmarshall content to [$manifest]", Some(response.entity.toString))
 
           case Left(ContentExpected) ⇒
-            throw new ApiError(response.status.intValue, s"Unable to unmarshall empty response to [$manifest]", Some(response.entity.toString))
+            throw ApiError(response.status.intValue, s"Unable to unmarshall empty response to [$manifest]", Some(response.entity.toString))
         }
 
-      case _ => throw new ApiError(response.status.intValue, "Unexpected response code", Some(response.entity.toString))
+      case _ => throw ApiError(response.status.intValue, "Unexpected response code", Some(response.entity.toString))
     }
   }
 

modules/swagger-codegen/src/main/resources/akka-scala/apiRequest.mustache

@@ -6,9 +6,13 @@
 package {{invokerPackage}}
 
 sealed trait ResponseState
+
 object ResponseState {
+
   case object Success extends ResponseState
+
   case object Error extends ResponseState
+
 }
 
 case class ApiRequest[U](
@@ -27,29 +31,29 @@ case class ApiRequest[U](
   headerParams: Map[String, Any] = Map.empty,
   credentials: Seq[Credentials] = List.empty) {
 
-  def withCredentials(cred: Credentials) = copy[U](credentials = credentials :+ cred)
+  def withCredentials(cred: Credentials): ApiRequest[U] = copy[U](credentials = credentials :+ cred)
 
-  def withApiKey(key: ApiKeyValue, keyName: String, location: ApiKeyLocation) = withCredentials(ApiKeyCredentials(key, keyName, location))
+  def withApiKey(key: ApiKeyValue, keyName: String, location: ApiKeyLocation): ApiRequest[U] = withCredentials(ApiKeyCredentials(key, keyName, location))
 
-  def withSuccessResponse[T](code: Int)(implicit m: Manifest[T]) = copy[U](responses = responses + (code -> (m, ResponseState.Success)))
+  def withSuccessResponse[T](code: Int)(implicit m: Manifest[T]): ApiRequest[U] = copy[U](responses = responses + (code -> (m, ResponseState.Success)))
 
-  def withErrorResponse[T](code: Int)(implicit m: Manifest[T]) = copy[U](responses = responses + (code -> (m, ResponseState.Error)))
+  def withErrorResponse[T](code: Int)(implicit m: Manifest[T]): ApiRequest[U] = copy[U](responses = responses + (code -> (m, ResponseState.Error)))
 
-  def withDefaultSuccessResponse[T](implicit m: Manifest[T]) = withSuccessResponse[T](0)
+  def withDefaultSuccessResponse[T](implicit m: Manifest[T]): ApiRequest[U] = withSuccessResponse[T](0)
 
-  def withDefaultErrorResponse[T](implicit m: Manifest[T]) = withErrorResponse[T](0)
+  def withDefaultErrorResponse[T](implicit m: Manifest[T]): ApiRequest[U] = withErrorResponse[T](0)
 
   def responseForCode(statusCode: Int): Option[(Manifest[_], ResponseState)] = responses.get(statusCode) orElse responses.get(0)
 
-  def withoutBody() = copy[U](bodyParam = None)
+  def withoutBody(): ApiRequest[U] = copy[U](bodyParam = None)
 
-  def withBody(body: Any) = copy[U](bodyParam = Some(body))
+  def withBody(body: Any): ApiRequest[U] = copy[U](bodyParam = Some(body))
 
-  def withFormParam(name: String, value: Any) = copy[U](formParams = formParams + (name -> value))
+  def withFormParam(name: String, value: Any): ApiRequest[U] = copy[U](formParams = formParams + (name -> value))
 
-  def withPathParam(name: String, value: Any) = copy[U](pathParams = pathParams + (name -> value))
+  def withPathParam(name: String, value: Any): ApiRequest[U] = copy[U](pathParams = pathParams + (name -> value))
 
-  def withQueryParam(name: String, value: Any) = copy[U](queryParams = queryParams + (name -> value))
+  def withQueryParam(name: String, value: Any): ApiRequest[U] = copy[U](queryParams = queryParams + (name -> value))
 
-  def withHeaderParam(name: String, value: Any) = copy[U](headerParams = headerParams + (name -> value))
+  def withHeaderParam(name: String, value: Any): ApiRequest[U] = copy[U](headerParams = headerParams + (name -> value))
 }

modules/swagger-codegen/src/main/resources/akka-scala/apiSettings.mustache

@@ -20,18 +20,17 @@ class ApiSettings(config: Config) extends Extension {
 
   private def cfg = config.getConfig("io.swagger.client.apiRequest")
 
-  val alwaysTrustCertificates = cfg.getBoolean("trust-certificates")
-  val defaultHeaders = cfg.getConfig("default-headers").entrySet.toList.map(c => RawHeader(c.getKey, c.getValue.render))
+  val alwaysTrustCertificates: Boolean = cfg.getBoolean("trust-certificates")
+  val defaultHeaders: List[RawHeader] = cfg.getConfig("default-headers").entrySet.toList.map(c => RawHeader(c.getKey, c.getValue.render))
   val connectionTimeout = FiniteDuration(cfg.getDuration("connection-timeout", TimeUnit.MILLISECONDS), TimeUnit.MILLISECONDS)
-  val compressionEnabled = cfg.getBoolean("compression.enabled")
-  val compressionSizeThreshold = cfg.getBytes("compression.size-threshold").toInt
-  val customCodes = cfg.getConfigList("custom-codes").toList.map { c => CustomStatusCode(
+  val compressionEnabled: Boolean = cfg.getBoolean("compression.enabled")
+  val compressionSizeThreshold: Int = cfg.getBytes("compression.size-threshold").toInt
+  val customCodes: List[CustomStatusCode] = cfg.getConfigList("custom-codes").toList.map { c =>
+    CustomStatusCode(
       c.getInt("code"),
       c.getString("reason"),
       c.getBoolean("success"))
   }
-
-
 }
 
 object ApiSettings extends ExtensionKey[ApiSettings]

modules/swagger-codegen/src/main/resources/akka-scala/build.sbt.mustache

@@ -0,0 +1,26 @@
+version := "{{artifactVersion}}"
+name := "{{artifactId}}"
+organization := "{{groupId}}"
+scalaVersion := "2.11.12"
+
+libraryDependencies ++= Seq(
+  "io.swagger" % "swagger-core" % "1.5.15",
+  "com.typesafe" % "config" % "1.3.2",
+  "com.typesafe.akka" %% "akka-actor" % "2.5.8",
+  "io.spray" % "spray-client" % "1.3.1",
+  "joda-time" % "joda-time" % "2.9.9",
+  "org.joda" % "joda-convert" % "1.9.2",
+  "org.json4s" %% "json4s-jackson" % "3.5.3",
+  "org.scalatest" %% "scalatest" % "3.0.4" % "test",
+  "junit" % "junit" % "4.12" % "test"
+)
+
+resolvers ++= Seq(Resolver.mavenLocal)
+
+scalacOptions := Seq(
+  "-unchecked",
+  "-deprecation",
+  "-feature"
+)
+
+publishArtifact in (Compile, packageDoc) := false

modules/swagger-codegen/src/main/resources/akka-scala/enumsSerializers.mustache

@@ -11,20 +11,18 @@ import scala.reflect.ClassTag
 
 object EnumsSerializers {
 
-  def all = Seq[Serializer[_]](){{#models}}{{#model}}{{#hasEnums}}{{#vars}}{{#isEnum}} :+
+  def all: Seq[Serializer[_]] = Seq[Serializer[_]](){{#models}}{{#model}}{{#hasEnums}}{{#vars}}{{#isEnum}} :+
     new EnumNameSerializer({{classname}}Enums.{{datatypeWithEnum}}){{/isEnum}}{{/vars}}{{/hasEnums}}{{/model}}{{/models}}
 
-
-
   private class EnumNameSerializer[E <: Enumeration: ClassTag](enum: E)
     extends Serializer[E#Value] {
     import JsonDSL._
 
-    val EnumerationClass = classOf[E#Value]
+    val EnumerationClass: Class[E#Value] = classOf[E#Value]
 
     def deserialize(implicit format: Formats):
     PartialFunction[(TypeInfo, JValue), E#Value] = {
-      case (t @ TypeInfo(EnumerationClass, _), json) if isValid(json) => {
+      case (t @ TypeInfo(EnumerationClass, _), json) if isValid(json) =>
         json match {
           case JString(value) =>
             enum.withName(value)
@@ -32,7 +30,6 @@ object EnumsSerializers {
             throw new MappingException(s"Can't convert $value to $EnumerationClass")
         }
     }
-    }
 
     private[this] def isValid(json: JValue) = json match {
       case JString(value) if enum.values.exists(_.toString == value) => true

modules/swagger-codegen/src/main/resources/akka-scala/pom.mustache

@@ -1,14 +1,90 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
+
+  <name>{{artifactId}}</name>
+
   <groupId>{{groupId}}</groupId>
   <artifactId>{{artifactId}}</artifactId>
-    <packaging>jar</packaging>
-    <name>{{artifactId}}</name>
   <version>{{artifactVersion}}</version>
-    <prerequisites>
-        <maven>2.2.0</maven>
-    </prerequisites>
+
+  <packaging>jar</packaging>
+
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+    <jdk.version>1.8</jdk.version>
+    <scala-version>2.11.12</scala-version>
+    <json4s-jackson-version>3.5.3</json4s-jackson-version>
+    <json4s-ext-version>3.2.11</json4s-ext-version>
+    <spray-version>1.3.1</spray-version>
+    <akka-version>2.5.8</akka-version>
+    <joda-convert-version>1.9.2</joda-convert-version>
+    <joda-time-version>2.9.9</joda-time-version>
+    <swagger-core-version>1.5.15</swagger-core-version>
+    <maven-plugin.version>1.0.0</maven-plugin.version>
+
+    <junit-version>4.12</junit-version>
+    <scala-test-version>3.0.4</scala-test-version>
+
+    <scala-maven-plugin-version>3.3.1</scala-maven-plugin-version>
+  </properties>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.scala-lang</groupId>
+      <artifactId>scala-library</artifactId>
+      <version>${scala-version}</version>
+    </dependency>
+    <dependency>
+      <groupId>io.swagger</groupId>
+      <artifactId>swagger-core</artifactId>
+      <version>${swagger-core-version}</version>
+    </dependency>
+    <dependency>
+      <groupId>joda-time</groupId>
+      <artifactId>joda-time</artifactId>
+      <version>${joda-time-version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.joda</groupId>
+      <artifactId>joda-convert</artifactId>
+      <version>${joda-convert-version}</version>
+    </dependency>
+    <dependency>
+      <groupId>com.typesafe</groupId>
+      <artifactId>config</artifactId>
+      <version>1.2.1</version>
+    </dependency>
+    <dependency>
+      <groupId>com.typesafe.akka</groupId>
+      <artifactId>akka-actor_2.11</artifactId>
+      <version>${akka-version}</version>
+    </dependency>
+    <dependency>
+      <groupId>io.spray</groupId>
+      <artifactId>spray-client</artifactId>
+      <version>${spray-version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.json4s</groupId>
+      <artifactId>json4s-jackson_2.11</artifactId>
+      <version>${json4s-jackson-version}</version>
+    </dependency>
+    <!--test dependencies-->
+    <dependency>
+      <groupId>org.scalatest</groupId>
+      <artifactId>scalatest_2.11</artifactId>
+      <version>${scala-test-version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>${junit-version}</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
 
   <pluginRepositories>
     <pluginRepository>
@@ -21,10 +97,30 @@
 
   <build>
     <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-enforcer-plugin</artifactId>
+        <version>3.0.0-M1</version>
+        <executions>
+          <execution>
+            <id>enforce-maven</id>
+            <goals>
+              <goal>enforce</goal>
+            </goals>
+            <configuration>
+              <rules>
+                <requireMavenVersion>
+                  <version>2.2.0</version>
+                </requireMavenVersion>
+              </rules>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.12</version>
+        <version>2.20.1</version>
         <configuration>
           <systemProperties>
             <property>
@@ -38,7 +134,9 @@
         </configuration>
       </plugin>
       <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-dependency-plugin</artifactId>
+        <version>3.0.2</version>
         <executions>
           <execution>
             <phase>package</phase>
@@ -56,7 +154,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jar-plugin</artifactId>
-                <version>2.2</version>
+        <version>2.6</version>
         <executions>
           <execution>
             <goals>
@@ -72,6 +170,7 @@
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>build-helper-maven-plugin</artifactId>
+        <version>3.0.0</version>
         <executions>
           <execution>
             <id>add_sources</id>
@@ -82,7 +181,8 @@
             <configuration>
               <sources>
                 <source>
-                                src/main/java</source>
+                  src/main/java
+                </source>
               </sources>
             </configuration>
           </execution>
@@ -95,7 +195,8 @@
             <configuration>
               <sources>
                 <source>
-                                src/test/java</source>
+                  src/test/java
+                </source>
               </sources>
             </configuration>
           </execution>
@@ -104,10 +205,10 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.6.1</version>
+        <version>3.7.0</version>
         <configuration>
-                    <source>1.7</source>
-                    <target>1.7</target>
+          <source>${jdk.version}</source>
+          <target>${jdk.version}</target>
         </configuration>
       </plugin>
       <plugin>
@@ -154,73 +255,4 @@
       </plugin>
     </plugins>
   </reporting>
-    <dependencies>
-        <dependency>
-            <groupId>org.scala-lang</groupId>
-            <artifactId>scala-library</artifactId>
-            <version>${scala-version}</version>
-        </dependency>
-        <dependency>
-            <groupId>io.swagger</groupId>
-            <artifactId>swagger-core</artifactId>
-            <version>${swagger-core-version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.scalatest</groupId>
-            <artifactId>scalatest_2.10</artifactId>
-            <version>${scala-test-version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>${junit-version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>joda-time</groupId>
-            <artifactId>joda-time</artifactId>
-            <version>${joda-time-version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.joda</groupId>
-            <artifactId>joda-convert</artifactId>
-            <version>${joda-version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.typesafe</groupId>
-            <artifactId>config</artifactId>
-            <version>1.2.1</version>
-        </dependency>
-        <dependency>
-            <groupId>com.typesafe.akka</groupId>
-            <artifactId>akka-actor_2.10</artifactId>
-            <version>${akka-version}</version>
-        </dependency>
-        <dependency>
-            <groupId>io.spray</groupId>
-            <artifactId>spray-client</artifactId>
-            <version>${spray-version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.json4s</groupId>
-            <artifactId>json4s-jackson_2.10</artifactId>
-            <version>${json4s-jackson-version}</version>
-        </dependency>
-    </dependencies>
-    <properties>
-        <scala-version>2.10.4</scala-version>
-        <json4s-jackson-version>3.2.11</json4s-jackson-version>
-        <json4s-ext-version>3.2.11</json4s-ext-version>
-        <spray-version>1.3.1</spray-version>
-        <akka-version>2.3.9</akka-version>
-        <joda-version>1.2</joda-version>
-        <joda-time-version>2.2</joda-time-version>
-        <swagger-core-version>1.5.15</swagger-core-version>
-        <maven-plugin.version>1.0.0</maven-plugin.version>
-
-        <junit-version>4.8.1</junit-version>
-        <scala-maven-plugin-version>3.1.5</scala-maven-plugin-version>
-        <scala-test-version>2.1.3</scala-test-version>
-    </properties>
 </project>

modules/swagger-codegen/src/main/resources/akka-scala/requests.mustache

@@ -7,20 +7,34 @@ package {{invokerPackage}}
 
 import java.io.File
 import java.net.URLEncoder
+
 import scala.util.Try
 
 sealed trait ApiReturnWithHeaders {
   def headers: Map[String, String]
+
   def header(name: String): Option[String] = headers.get(name)
-  def getStringHeader(name: String) = header(name)
+
+  def getStringHeader(name: String): Option[String] = header(name)
+
   // workaround: return date time header in string instead of datetime object
-  def getDateTimeHeader(name: String) = header(name)
-  def getIntHeader(name: String) = castedHeader(name, java.lang.Integer.parseInt)
-  def getLongHeader(name: String) = castedHeader(name, java.lang.Long.parseLong)
-  def getFloatHeader(name: String) = castedHeader(name, java.lang.Float.parseFloat)
-  def getDoubleHeader(name: String) = castedHeader(name, java.lang.Double.parseDouble)
-  def getBooleanHeader(name: String) = castedHeader(name, java.lang.Boolean.parseBoolean)
-  private def castedHeader[U](name: String, conversion: String => U): Option[U] = { Try { header(name).map( conversion ) }.get }
+  def getDateTimeHeader(name: String): Option[String] = header(name)
+
+  def getIntHeader(name: String): Option[Int] = castedHeader(name, java.lang.Integer.parseInt)
+
+  def getLongHeader(name: String): Option[Long] = castedHeader(name, java.lang.Long.parseLong)
+
+  def getFloatHeader(name: String): Option[Float] = castedHeader(name, java.lang.Float.parseFloat)
+
+  def getDoubleHeader(name: String): Option[Double] = castedHeader(name, java.lang.Double.parseDouble)
+
+  def getBooleanHeader(name: String): Option[Boolean] = castedHeader(name, java.lang.Boolean.parseBoolean)
+
+  private def castedHeader[U](name: String, conversion: String => U): Option[U] = {
+    Try {
+      header(name).map(conversion)
+    }.get
+  }
 }
 
 sealed case class ApiResponse[T](code: Int, content: T, headers: Map[String, String] = Map.empty)
@@ -74,15 +88,17 @@ object ApiKeyLocations {
   case object QUERY extends ApiKeyLocation
 
   case object HEADER extends ApiKeyLocation
+
 }
 
 
 /**
  * Case class used to unapply numeric values only in pattern matching
+ *
  * @param value the string representation of the numeric value
  */
 sealed case class NumericValue(value: String) {
-  override def toString = value
+  override def toString: String = value
 }
 
 object NumericValue {
@@ -144,9 +160,9 @@ object ParametersMap {
    */
   implicit class ParametersMapImprovements(val m: Map[String, Any]) {
 
-    def asFormattedParamsList = m.toList.flatMap(formattedParams)
+    def asFormattedParamsList: List[(String, Any)] = m.toList.flatMap(formattedParams)
 
-    def asFormattedParams = m.flatMap(formattedParams)
+    def asFormattedParams: Map[String, Any] = m.flatMap(formattedParams)
 
     private def urlEncode(v: Any) = URLEncoder.encode(String.valueOf(v), "utf-8").replaceAll("\\+", "%20")
 
@@ -159,15 +175,13 @@ object ParametersMap {
           case format: MergedArrayFormat => Seq((name, arr.values.mkString(format.separator)))
         }
       case None => Seq.empty
-      case Some(opt) =>
-        formattedParams(name, opt)
-      case s: Seq[Any] =>
-        formattedParams(name, ArrayValues(s))
+      case Some(opt) => formattedParams(name, opt)
+      case s: Seq[Any] => formattedParams(name, ArrayValues(s))
       case v: String => Seq((name, urlEncode(v)))
       case NumericValue(v) => Seq((name, urlEncode(v)))
       case f: File => Seq((name, f))
       case m: ApiModel => Seq((name, m))
     }
+  }
 
 }
-}

modules/swagger-codegen/src/main/resources/android/pom.mustache

@@ -11,12 +11,29 @@
         <developerConnection>scm:git:git@github.com:swagger-api/swagger-codegen.git</developerConnection>
         <url>https://github.com/swagger-api/swagger-codegen</url>
     </scm>
-  <prerequisites>
-    <maven>2.2.0</maven>
-  </prerequisites>
 
     <build>
         <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-enforcer-plugin</artifactId>
+                <version>3.0.0-M1</version>
+                <executions>
+                    <execution>
+                        <id>enforce-maven</id>
+                        <goals>
+                            <goal>enforce</goal>
+                        </goals>
+                        <configuration>
+                            <rules>
+                                <requireMavenVersion>
+                                    <version>2.2.0</version>
+                                </requireMavenVersion>
+                            </rules>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
@@ -77,7 +94,8 @@
                         </goals>
                         <configuration>
                             <sources>
-                <source>src/main/java</source>
+                                <source>
+                                src/main/java</source>
                             </sources>
                         </configuration>
                     </execution>
@@ -89,7 +107,8 @@
                         </goals>
                         <configuration>
                             <sources>
-                <source>src/test/java</source>
+                                <source>
+                                src/test/java</source>
                             </sources>
                         </configuration>
                     </execution>
@@ -145,6 +164,7 @@
         </repository>
     </repositories>
     <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <swagger-core-version>1.5.15</swagger-core-version>
         <gson-version>2.3.1</gson-version>
         <junit-version>4.8.1</junit-version>

modules/swagger-codegen/src/main/resources/apex/api.mustache

@@ -88,13 +88,13 @@ public class {{classname}} {
               {{/headerParams}}
             }{{/hasHeaderParams}}{{^hasHeaderParams}}(){{/hasHeaderParams}},
           {{#hasProduces}}
-            new List<String>{ {{#produces}}'{{mediaType}}'{{#hasMore}}, {{/hasMore}}{{/produces}} },
+            new List<String>{ {{#produces}}'{{{mediaType}}}'{{#hasMore}}, {{/hasMore}}{{/produces}} },
           {{/hasProduces}}
           {{^hasProduces}}
             new List<String>(),
           {{/hasProduces}}
           {{#hasConsumes}}
-            new List<String>{ {{#consumes}}'{{mediaType}}'{{#hasMore}}, {{/hasMore}}{{/consumes}} },
+            new List<String>{ {{#consumes}}'{{{mediaType}}}'{{#hasMore}}, {{/hasMore}}{{/consumes}} },
           {{/hasConsumes}}
           {{^hasConsumes}}
             new List<String>(),

modules/swagger-codegen/src/main/resources/aspnetcore/Filters/BasePathFilter.mustache

@@ -0,0 +1,50 @@
+using System.Linq;
+using System.Text.RegularExpressions;
+using Swashbuckle.AspNetCore.Swagger;
+using Swashbuckle.AspNetCore.SwaggerGen;
+
+namespace {{packageName}}.Filters
+{
+    /// <summary>
+    /// BasePath Document Filter sets BasePath property of Swagger and removes it from the individual URL paths
+    /// </summary>
+    public class BasePathFilter : IDocumentFilter
+    {
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        /// <param name="basePath">BasePath to remove from Operations</param>
+        public BasePathFilter(string basePath)
+        {
+            BasePath = basePath;
+        }
+
+        /// <summary>
+        /// Gets the BasePath of the Swagger Doc
+        /// </summary>
+        /// <returns>The BasePath of the Swagger Doc</returns>
+        public string BasePath { get; }
+
+        /// <summary>
+        /// Apply the filter
+        /// </summary>
+        /// <param name="swaggerDoc">SwaggerDocument</param>
+        /// <param name="context">FilterContext</param>
+        public void Apply(SwaggerDocument swaggerDoc, DocumentFilterContext context)
+        {
+            swaggerDoc.BasePath = this.BasePath;
+
+            var pathsToModify = swaggerDoc.Paths.Where(p => p.Key.StartsWith(this.BasePath)).ToList();
+
+            foreach (var path in pathsToModify)
+            {
+                if (path.Key.StartsWith(this.BasePath))
+                {
+                    string newKey = Regex.Replace(path.Key, $"^{this.BasePath}", string.Empty);
+                    swaggerDoc.Paths.Remove(path.Key);
+                    swaggerDoc.Paths.Add(newKey, path.Value);
+                }
+            }
+        }
+    }
+}

modules/swagger-codegen/src/main/resources/aspnetcore/Filters/GeneratePathParamsValidationFilter.mustache

@@ -0,0 +1,97 @@
+using System.ComponentModel.DataAnnotations;
+using System.Linq;
+using Microsoft.AspNetCore.Mvc.Controllers;
+using Swashbuckle.AspNetCore.Swagger;
+using Swashbuckle.AspNetCore.SwaggerGen;
+
+namespace {{packageName}}.Filters
+{
+    /// <summary>
+    /// Path Parameter Validation Rules Filter
+    /// </summary>
+    public class GeneratePathParamsValidationFilter : IOperationFilter
+    {
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        /// <param name="operation">Operation</param>
+        /// <param name="context">OperationFilterContext</param>
+        public void Apply(Operation operation, OperationFilterContext context)
+        {
+            var pars = context.ApiDescription.ParameterDescriptions;
+
+            foreach (var par in pars)
+            {
+                var swaggerParam = operation.Parameters.SingleOrDefault(p => p.Name == par.Name);
+
+                var attributes = ((ControllerParameterDescriptor)par.ParameterDescriptor).ParameterInfo.CustomAttributes;
+
+                if (attributes != null && attributes.Count() > 0 && swaggerParam != null)
+                {
+                    // Required - [Required]
+                    var requiredAttr = attributes.FirstOrDefault(p => p.AttributeType == typeof(RequiredAttribute));
+                    if (requiredAttr != null)
+                    {
+                        swaggerParam.Required = true;
+                    }
+
+                    // Regex Pattern [RegularExpression]
+                    var regexAttr = attributes.FirstOrDefault(p => p.AttributeType == typeof(RegularExpressionAttribute));
+                    if (regexAttr != null)
+                    {
+                        string regex = (string)regexAttr.ConstructorArguments[0].Value;
+                        if (swaggerParam is NonBodyParameter)
+                        {
+                            ((NonBodyParameter)swaggerParam).Pattern = regex;
+                        }
+                    }
+
+                    // String Length [StringLength]
+                    int? minLenght = null, maxLength = null;
+                    var stringLengthAttr = attributes.FirstOrDefault(p => p.AttributeType == typeof(StringLengthAttribute));
+                    if (stringLengthAttr != null)
+                    {
+                        if (stringLengthAttr.NamedArguments.Count == 1)
+                        {
+                            minLenght = (int)stringLengthAttr.NamedArguments.Single(p => p.MemberName == "MinimumLength").TypedValue.Value;
+                        }
+                        maxLength = (int)stringLengthAttr.ConstructorArguments[0].Value;
+                    }
+
+                    var minLengthAttr = attributes.FirstOrDefault(p => p.AttributeType == typeof(MinLengthAttribute));
+                    if (minLengthAttr != null)
+                    {
+                        minLenght = (int)minLengthAttr.ConstructorArguments[0].Value;
+                    }
+
+                    var maxLengthAttr = attributes.FirstOrDefault(p => p.AttributeType == typeof(MaxLengthAttribute));
+                    if (maxLengthAttr != null)
+                    {
+                        maxLength = (int)maxLengthAttr.ConstructorArguments[0].Value;
+                    }
+
+                    if (swaggerParam is NonBodyParameter)
+                    {
+                        ((NonBodyParameter)swaggerParam).MinLength = minLenght;
+                        ((NonBodyParameter)swaggerParam).MaxLength = maxLength;
+                    }
+
+                    // Range [Range]
+                    var rangeAttr = attributes.FirstOrDefault(p => p.AttributeType == typeof(RangeAttribute));
+                    if (rangeAttr != null)
+                    {
+                        int rangeMin = (int)rangeAttr.ConstructorArguments[0].Value;
+                        int rangeMax = (int)rangeAttr.ConstructorArguments[1].Value;
+
+                        if (swaggerParam is NonBodyParameter)
+                        {
+                            ((NonBodyParameter)swaggerParam).Minimum = rangeMin;
+                            ((NonBodyParameter)swaggerParam).Maximum = rangeMax;
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
+

modules/swagger-codegen/src/main/resources/aspnetcore/Program.mustache

@@ -1,5 +1,11 @@
+using System;
+using System.Collections.Generic;
 using System.IO;
+using System.Linq;
+using System.Threading.Tasks;
 using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore;
 
 namespace {{packageName}}
 {
@@ -14,21 +20,17 @@ namespace {{packageName}}
         /// <param name="args"></param>
         public static void Main(string[] args)
         {
-            var host = new WebHostBuilder()
-                .UseKestrel(options =>
-                {
-                    // options.ThreadCount = 4;
-                    // options.UseHttps("cert.pfx", "certpassword");
-                    options.NoDelay = true;
-                    options.UseConnectionLogging();
-                })
-                .UseUrls("http://+:5000" /*, "https://+:5001" */)
-                .UseContentRoot(Directory.GetCurrentDirectory())
-                .UseIISIntegration()
+            BuildWebHost(args).Run();
+        }
+
+        /// <summary>
+        /// Build Web Host
+        /// </summary>
+        /// <param name="args"></param>
+        /// <returns>Webhost</returns>
+        public static IWebHost BuildWebHost(string[] args) =>
+            WebHost.CreateDefaultBuilder(args)
                 .UseStartup<Startup>()
                 .Build();
-
-            host.Run();
-        }
     }
 }

modules/swagger-codegen/src/main/resources/aspnetcore/Project.csproj.mustache

@@ -0,0 +1,25 @@
+<Project Sdk="Microsoft.NET.Sdk.Web">
+  <PropertyGroup>
+    <Description>{{packageName}}</Description>
+    <Copyright>{{packageName}}</Copyright>
+    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
+    <PreserveCompilationContext>true</PreserveCompilationContext>
+    <AssemblyName>{{packageName}}</AssemblyName>
+    <PackageId>{{packageName}}</PackageId>
+  </PropertyGroup>
+  <ItemGroup>
+    <Folder Include="wwwroot\"/>
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.3"/>
+    <PackageReference Include="Swashbuckle.AspNetCore" Version="1.1.0"/>
+    <PackageReference Include="Newtonsoft.Json" Version="10.0.3"/>
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="2.0.1"/>
+  </ItemGroup>
+  <ItemGroup>
+    <DotNetCliToolReference Include="Microsoft.Extensions.SecretManager.Tools" Version="2.0.0"/>
+    <DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="2.0.1"/>
+    <DotNetCliToolReference Include="Microsoft.DotNet.Watcher.Tools" Version="2.0.0"/>
+  </ItemGroup>
+</Project>

modules/swagger-codegen/src/main/resources/aspnetcore/Project.xproj.mustache

@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-    <PropertyGroup>
-        <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
-        <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
-    </PropertyGroup>
-    <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.Props" Condition="'$(VSToolsPath)' != ''" />
-    <PropertyGroup Label="Globals">
-        <ProjectGuid>{{packageGuid}}</ProjectGuid>
-        <RootNamespace>{{packageName}}</RootNamespace>
-        <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
-        <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
-        <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
-    </PropertyGroup>
-    <PropertyGroup>
-        <SchemaVersion>2.0</SchemaVersion>
-    </PropertyGroup>
-    <Import Project="$(VSToolsPath)\DotNet.Web\Microsoft.DotNet.Web.targets" Condition="'$(VSToolsPath)' != ''" />
-</Project>

modules/swagger-codegen/src/main/resources/aspnetcore/README.mustache

@@ -1,4 +1,4 @@
-# {{packageName}} - ASP.NET Core 1.0 Server
+# {{packageName}} - ASP.NET Core 2.0 Server
 
 {{#appDescription}}
 {{{appDescription}}}

modules/swagger-codegen/src/main/resources/aspnetcore/Solution.mustache

@@ -1,13 +1,8 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25420.1
+# Visual Studio 15
+VisualStudioVersion = 15.0.26114.2
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{AFF6BF88-8A7D-4736-AF81-31BCE86B19BD}"
-        ProjectSection(SolutionItems) = preProject
-                global.json = global.json
-        EndProjectSection
-EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "{{packageName}}", "src\{{packageName}}\{{packageName}}.xproj", "{{packageGuid}}"
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "{{packageName}}", "src\{{packageName}}\{{packageName}}.csproj", "{{packageGuid}}"
 EndProject
 Global
         GlobalSection(SolutionConfigurationPlatforms) = preSolution

modules/swagger-codegen/src/main/resources/aspnetcore/Startup.mustache

@@ -10,6 +10,7 @@ using Newtonsoft.Json.Converters;
 using Newtonsoft.Json.Serialization;
 using Swashbuckle.AspNetCore.Swagger;
 using Swashbuckle.AspNetCore.SwaggerGen;
+using {{packageName}}.Filters;
 
 namespace {{packageName}}
 {
@@ -20,22 +21,17 @@ namespace {{packageName}}
     {
         private readonly IHostingEnvironment _hostingEnv;
 
-        private IConfigurationRoot Configuration { get; }
+        private IConfiguration Configuration { get; }
 
         /// <summary>
         /// Constructor
         /// </summary>
         /// <param name="env"></param>
-        public Startup(IHostingEnvironment env)
+        /// <param name="configuration"></param>
+        public Startup(IHostingEnvironment env, IConfiguration configuration)
         {
             _hostingEnv = env;
-
-            var builder = new ConfigurationBuilder()
-                .SetBasePath(env.ContentRootPath)
-                .AddJsonFile("appsettings.json", optional: true, reloadOnChange: true)
-                .AddJsonFile($"appsettings.{env.EnvironmentName}.json", optional: true)
-                .AddEnvironmentVariables();
-            Configuration = builder.Build();
+            Configuration = configuration;
         }
 
         /// <summary>
@@ -58,15 +54,30 @@ namespace {{packageName}}
             services
                 .AddSwaggerGen(c =>
                 {
-                    c.SwaggerDoc("v1", new Info
+                    c.SwaggerDoc("{{#version}}{{{version}}}{{/version}}{{^version}}v1{{/version}}", new Info
                     {
-                        Version = "v1",
-                        Title = "{{packageName}}",
-                        Description = "{{packageName}} (ASP.NET Core 1.0)"
+                        Version = "{{#version}}{{{version}}}{{/version}}{{^version}}v1{{/version}}",
+                        Title = "{{#appName}}{{{appName}}}{{/appName}}{{^appName}}{{packageName}}{{/appName}}",
+                        Description = "{{#appName}}{{{appName}}}{{/appName}}{{^appName}}{{packageName}}{{/appName}} (ASP.NET Core 2.0)",
+                        Contact = new Contact()
+                        {
+                           Name = "{{#infoName}}{{{infoName}}}{{/infoName}}{{^infoName}}Swagger Codegen Contributors{{/infoName}}",
+                           Url = "{{#infoUrl}}{{{infoUrl}}}{{/infoUrl}}{{^infoUrl}}https://github.com/swagger-api/swagger-codegen{{/infoUrl}}",
+                           Email = "{{#infoEmail}}{{{infoEmail}}}{{/infoEmail}}"
+                        },
+                        TermsOfService = "{{#termsOfService}}{{{termsOfService}}}{{/termsOfService}}"
                     });
                     c.CustomSchemaIds(type => type.FriendlyId(true));
                     c.DescribeAllEnumsAsStrings();
                     c.IncludeXmlComments($"{AppContext.BaseDirectory}{Path.DirectorySeparatorChar}{_hostingEnv.ApplicationName}.xml");
+                    {{#basePathWithoutHost}}
+                    // Sets the basePath property in the Swagger document generated
+                    c.DocumentFilter<BasePathFilter>("{{{basePathWithoutHost}}}");
+                    {{/basePathWithoutHost}}
+
+                    // Include DataAnnotation attributes on Controller Action parameters as Swagger validation rules (e.g required, pattern, ..)
+                    // Use [ValidateModelState] on Actions to actually validate it in C# as well!
+                    c.OperationFilter<GeneratePathParamsValidationFilter>();
                 });
         }
 
@@ -78,10 +89,6 @@ namespace {{packageName}}
         /// <param name="loggerFactory"></param>
         public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerFactory loggerFactory)
         {
-            loggerFactory
-                .AddConsole(Configuration.GetSection("Logging"))
-                .AddDebug();
-
             app
                 .UseMvc()
                 .UseDefaultFiles()
@@ -89,8 +96,22 @@ namespace {{packageName}}
                 .UseSwagger()
                 .UseSwaggerUI(c =>
                 {
-                    c.SwaggerEndpoint("/swagger/v1/swagger.json", "{{packageName}}");
+                    //TODO: Either use the SwaggerGen generated Swagger contract (generated from C# classes)
+                    c.SwaggerEndpoint("/swagger/{{#version}}{{{version}}}{{/version}}{{^version}}v1{{/version}}/swagger.json", "{{#appName}}{{{appName}}}{{/appName}}{{^appName}}{{packageName}}{{/appName}}");
+
+                    //TODO: Or alternatively use the original Swagger contract that's included in the static files
+                    // c.SwaggerEndpoint("/swagger-original.json", "{{#appName}}{{{appName}}}{{/appName}}{{^appName}}{{packageName}}{{/appName}} Original");
                 });
+
+            if (env.IsDevelopment())
+            {
+                app.UseDeveloperExceptionPage();
+            }
+            else
+            {
+                //TODO: Enable production exception handling (https://docs.microsoft.com/en-us/aspnet/core/fundamentals/error-handling)
+                // app.UseExceptionHandler("/Home/Error");
+            }
         }
     }
 }

modules/swagger-codegen/src/main/resources/aspnetcore/build.bat.mustache

@@ -5,5 +5,5 @@
 
 dotnet restore src\{{packageName}}
 dotnet build src\{{packageName}}
-echo Now, run the following to start the project: dotnet run -p src\{{packageName}}\project.json web.
+echo Now, run the following to start the project: dotnet run -p src\{{packageName}}\{{packageName}}.csproj --launch-profile web.
 echo.

modules/swagger-codegen/src/main/resources/aspnetcore/build.sh.mustache

@@ -5,4 +5,4 @@
 
 dotnet restore src/{{packageName}}/ && \
     dotnet build src/{{packageName}}/ && \
-    echo "Now, run the following to start the project: dotnet run -p src/{{packageName}}/project.json web"
+    echo "Now, run the following to start the project: dotnet run -p src/{{packageName}}/{{packageName}}.csproj --launch-profile web"

modules/swagger-codegen/src/main/resources/aspnetcore/controller.mustache

@@ -11,6 +11,7 @@ using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Primitives;
 using Swashbuckle.AspNetCore.SwaggerGen;
 using Newtonsoft.Json;
+using System.ComponentModel.DataAnnotations;
 using {{packageName}}.Attributes;
 using {{packageName}}.Models;
 
@@ -31,13 +32,26 @@ namespace {{packageName}}.Controllers
         [{{httpMethod}}]
         [Route("{{{basePathWithoutHost}}}{{{path}}}")]
         [ValidateModelState]
-        [SwaggerOperation("{{operationId}}")]{{#responses}}{{#returnType}}
-        [SwaggerResponse({{code}}, typeof({{&returnType}}), "{{message}}")]{{/returnType}}{{/responses}}
-        public virtual {{#returnType}}IActionResult{{/returnType}}{{^returnType}}void{{/returnType}} {{operationId}}({{#allParams}}{{>pathParam}}{{>queryParam}}{{>bodyParam}}{{>formParam}}{{>headerParam}}{{#hasMore}}, {{/hasMore}}{{/allParams}})
-        { {{#returnType}}
+        [SwaggerOperation("{{operationId}}")]{{#responses}}{{#dataType}}
+        [SwaggerResponse(statusCode: {{code}}, type: typeof({{&dataType}}), description: "{{message}}")]{{/dataType}}{{^dataType}}{{/dataType}}{{/responses}}
+        public virtual IActionResult {{operationId}}({{#allParams}}{{>pathParam}}{{>queryParam}}{{>bodyParam}}{{>formParam}}{{>headerParam}}{{#hasMore}}, {{/hasMore}}{{/allParams}})
+        { {{#responses}}
+{{#dataType}}
+            //TODO: Uncomment the next line to return response {{code}} or use other options such as return this.NotFound(), return this.BadRequest(..), ...
+            // return StatusCode({{code}}, default({{&dataType}}));
+{{/dataType}}
+{{^dataType}}
+            //TODO: Uncomment the next line to return response {{code}} or use other options such as return this.NotFound(), return this.BadRequest(..), ...
+            // return StatusCode({{code}});
+{{/dataType}}{{/responses}}
+{{#returnType}}
             string exampleJson = null;
+            {{#examples}}
+            exampleJson = "{{{example}}}";
+            {{/examples}}
             {{#isListCollection}}{{>listReturn}}{{/isListCollection}}{{^isListCollection}}{{#isMapContainer}}{{>mapReturn}}{{/isMapContainer}}{{^isMapContainer}}{{>objectReturn}}{{/isMapContainer}}{{/isListCollection}}
             {{!TODO: defaultResponse, examples, auth, consumes, produces, nickname, externalDocs, imports, security}}
+            //TODO: Change the data returned
             return new ObjectResult(example);{{/returnType}}{{^returnType}}
             throw new NotImplementedException();{{/returnType}}
         }

modules/swagger-codegen/src/main/resources/aspnetcore/formParam.mustache

@@ -1 +1 @@
-{{#isFormParam}}[FromForm]{{&dataType}} {{paramName}}{{/isFormParam}}
+{{#isFormParam}}[FromForm]{{#required}}[Required()]{{/required}}{{#pattern}}[RegularExpression("{{{pattern}}}")]{{/pattern}}{{#minLength}}{{#maxLength}}[StringLength({{maxLength}}, MinimumLength={{minLength}}){{/maxLength}}{{/minLength}}{{#minLength}}{{^maxLength}} [MinLength({{minLength}})]{{/maxLength}}{{/minLength}}{{^minLength}}{{#maxLength}} [MaxLength({{maxLength}})]{{/maxLength}}{{/minLength}}{{#minimum}}{{#maximum}}[Range({{minimum}}, {{maximum}})]{{/maximum}}{{/minimum}}{{&dataType}} {{paramName}}{{/isFormParam}}

modules/swagger-codegen/src/main/resources/aspnetcore/global.json

@@ -1,7 +0,0 @@
-{
-  "projects": [ "src" ],
-  "sdk": {
-    "version": "1.0.0-preview2-003121",
-    "runtime": "coreclr"
-  }
-}

modules/swagger-codegen/src/main/resources/aspnetcore/headerParam.mustache

@@ -1 +1 @@
-{{#isHeaderParam}}[FromHeader]{{&dataType}} {{paramName}}{{/isHeaderParam}}
+{{#isHeaderParam}}[FromHeader]{{#required}}[Required()]{{/required}}{{#pattern}}[RegularExpression("{{{pattern}}}")]{{/pattern}}{{#minLength}}{{#maxLength}}[StringLength({{maxLength}}, MinimumLength={{minLength}}){{/maxLength}}{{/minLength}}{{#minLength}}{{^maxLength}} [MinLength({{minLength}})]{{/maxLength}}{{/minLength}}{{^minLength}}{{#maxLength}} [MaxLength({{maxLength}})]{{/maxLength}}{{/minLength}}{{#minimum}}{{#maximum}}[Range({{minimum}}, {{maximum}})]{{/maximum}}{{/minimum}}{{&dataType}} {{paramName}}{{/isHeaderParam}}

modules/swagger-codegen/src/main/resources/aspnetcore/pathParam.mustache

@@ -1 +1 @@
-{{#isPathParam}}[FromRoute]{{&dataType}} {{paramName}}{{/isPathParam}}
+{{#isPathParam}}[FromRoute]{{#required}}[Required]{{/required}}{{#pattern}}[RegularExpression("{{{pattern}}}")]{{/pattern}}{{#minLength}}{{#maxLength}}[StringLength({{maxLength}}, MinimumLength={{minLength}}){{/maxLength}}{{/minLength}}{{#minLength}}{{^maxLength}} [MinLength({{minLength}})]{{/maxLength}}{{/minLength}}{{^minLength}}{{#maxLength}} [MaxLength({{maxLength}})]{{/maxLength}}{{/minLength}}{{#minimum}}{{#maximum}}[Range({{minimum}}, {{maximum}})]{{/maximum}}{{/minimum}}{{&dataType}} {{paramName}}{{/isPathParam}}

modules/swagger-codegen/src/main/resources/aspnetcore/project.json.mustache

@@ -1,89 +0,0 @@
-{
-  "title": "Swagger UI",
-  "version": "{{packageVersion}}-*",
-  "copyright": "{{packageName}}",
-  "description": "{{packageName}}",
-  "dependencies": {
-    "Microsoft.NETCore.App": {
-      "version": "1.0.0",
-      "type": "platform"
-    },
-    "Microsoft.AspNetCore.Mvc": "1.0.0",
-    "Microsoft.AspNetCore.Server.IISIntegration": "1.0.0",
-    "Microsoft.AspNetCore.Server.Kestrel": "1.0.0",
-    "Microsoft.AspNetCore.Server.Kestrel.Https": "1.0.0",
-    "Microsoft.AspNetCore.StaticFiles": "1.0.0",
-    "Microsoft.Extensions.Configuration.EnvironmentVariables": "1.0.0",
-    "Microsoft.Extensions.Configuration.FileExtensions": "1.0.0",
-    "Microsoft.Extensions.Configuration.Json": "1.0.0",
-    "Microsoft.Extensions.Logging": "1.0.0",
-    "Microsoft.Extensions.Logging.Console": "1.0.0",
-    "Microsoft.Extensions.Logging.Debug": "1.0.0",
-    "Microsoft.Extensions.Options.ConfigurationExtensions": "1.0.0",
-    "Microsoft.EntityFrameworkCore": "1.0.0",
-    "Swashbuckle.AspNetCore": "1.0.0-rc3",
-    "Newtonsoft.Json": "10.0.3",
-    "JsonSubTypes": "1.1.3"
-  },
-
-  "tools": {
-    "Microsoft.AspNetCore.Server.IISIntegration.Tools": "1.0.0-preview2-final",
-
-    "Microsoft.Extensions.SecretManager.Tools": {
-      "imports": [
-        "netstandard1.6",
-        "portable-net45+win8+dnxcore50",
-        "portable-net45+win8"
-      ],
-      "version": "1.0.0-preview2-final"
-    }
-  },
-
-  "frameworks": {
-    "netcoreapp1.0": {
-      "imports": [
-        "dotnet5.6",
-        "dnxcore50",
-        "netstandard1.6",
-        "portable-net452+win81"
-      ]
-    }
-  },
-
-  "buildOptions": {
-    "emitEntryPoint": true,
-    "preserveCompilationContext": true,
-    "xmlDoc": true,
-    "compile": {
-      "exclude": [
-        "wwwroot",
-        "node_modules",
-        "bower_components"
-      ]
-    }
-  },
-
-  "runtimeOptions": {
-    "configProperties": {
-      "System.GC.Server": true
-    }
-  },
-
-  "publishOptions": {
-    "include": [
-      "wwwroot",
-      "Views",
-      "Areas/**/Views",
-      "appsettings.json",
-      "web.config"
-    ],
-    "exclude": [
-      "**.user",
-      "**.vspscc"
-    ]
-  },
-
-  "scripts": {
-    "postpublish": [ "dotnet publish-iis --publish-folder %publish:OutputPath% --framework %publish:FullTargetFramework%" ]
-  }
-}

modules/swagger-codegen/src/main/resources/aspnetcore/queryParam.mustache

@@ -1 +1 @@
-{{#isQueryParam}}[FromQuery]{{&dataType}} {{paramName}}{{/isQueryParam}}
+{{#isQueryParam}}[FromQuery]{{#required}}[Required()]{{/required}}{{#pattern}}[RegularExpression("{{{pattern}}}")]{{/pattern}}{{#minLength}}{{#maxLength}}[StringLength({{maxLength}}, MinimumLength={{minLength}}){{/maxLength}}{{/minLength}}{{#minLength}}{{^maxLength}} [MinLength({{minLength}})]{{/maxLength}}{{/minLength}}{{^minLength}}{{#maxLength}} [MaxLength({{maxLength}})]{{/maxLength}}{{/minLength}}{{#minimum}}{{#maximum}}[Range({{minimum}}, {{maximum}})]{{/maximum}}{{/minimum}}{{&dataType}} {{paramName}}{{/isQueryParam}}

modules/swagger-codegen/src/main/resources/aspnetcore/validateModel.mustache

@@ -1,5 +1,9 @@
+using System.ComponentModel.DataAnnotations;
+using System.Reflection;
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.Controllers;
 using Microsoft.AspNetCore.Mvc.Filters;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
 
 namespace {{packageName}}.Attributes
 {
@@ -14,10 +18,44 @@ namespace {{packageName}}.Attributes
         /// <param name="context"></param>
         public override void OnActionExecuting(ActionExecutingContext context)
         {
+            // Per https://blog.markvincze.com/how-to-validate-action-parameters-with-dataannotation-attributes/
+            var descriptor = context.ActionDescriptor as ControllerActionDescriptor;
+            if (descriptor != null)
+            {
+                foreach (var parameter in descriptor.MethodInfo.GetParameters())
+                {
+                    object args = null;
+                    if (context.ActionArguments.ContainsKey(parameter.Name))
+                    { 
+                        args = context.ActionArguments[parameter.Name];
+                    }
+
+                    ValidateAttributes(parameter, args, context.ModelState);
+                }
+            }
+
             if (!context.ModelState.IsValid)
             {
                 context.Result = new BadRequestObjectResult(context.ModelState);
             }
         }
+
+        private void ValidateAttributes(ParameterInfo parameter, object args, ModelStateDictionary modelState)
+        {
+            foreach (var attributeData in parameter.CustomAttributes)
+            {
+                var attributeInstance = parameter.GetCustomAttribute(attributeData.AttributeType);
+
+                var validationAttribute = attributeInstance as ValidationAttribute;
+                if (validationAttribute != null)
+                {
+                    var isValid = validationAttribute.IsValid(args);
+                    if (!isValid)
+                    {
+                        modelState.AddModelError(parameter.Name, validationAttribute.FormatErrorMessage(parameter.Name));
+                    }
+                }
+            }
+        }
     }
 }

modules/swagger-codegen/src/main/resources/aspnetcore/wwwroot/swagger-original.mustache

@@ -0,0 +1 @@
+{{{swagger-json}}}

modules/swagger-codegen/src/main/resources/bash/client.mustache

@@ -92,16 +92,16 @@ fi
 declare -a result_color_table=( "$WHITE" "$WHITE" "$GREEN" "$YELLOW" "$WHITE" "$MAGENTA" "$WHITE" )
 
 ##
-# This array stores the minimum number of required occurences for parameter
+# This array stores the minimum number of required occurrences for parameter
 # 0 - optional
 # 1 - required
-declare -A operation_parameters_minimum_occurences
+declare -A operation_parameters_minimum_occurrences
 {{#apiInfo}}
 {{#apis}}
 {{#operations}}
 {{#operation}}
 {{#allParams}}
-operation_parameters_minimum_occurences["{{operationId}}:::{{baseName}}"]={{#required}}{{#vendorExtensions}}{{#x-codegen-collection-min-items}}{{x-codegen-collection-min-items}}{{/x-codegen-collection-min-items}}{{^x-codegen-collection-min-items}}1{{/x-codegen-collection-min-items}}{{/vendorExtensions}}{{^vendorExtensions}}1{{/vendorExtensions}}{{/required}}{{^required}}0{{/required}}
+operation_parameters_minimum_occurrences["{{operationId}}:::{{baseName}}"]={{#required}}{{#vendorExtensions}}{{#x-codegen-collection-min-items}}{{x-codegen-collection-min-items}}{{/x-codegen-collection-min-items}}{{^x-codegen-collection-min-items}}1{{/x-codegen-collection-min-items}}{{/vendorExtensions}}{{^vendorExtensions}}1{{/vendorExtensions}}{{/required}}{{^required}}0{{/required}}
 {{/allParams}}
 {{/operation}}
 {{/operations}}
@@ -109,18 +109,18 @@ operation_parameters_minimum_occurences["{{operationId}}:::{{baseName}}"]={{#req
 {{/apiInfo}}
 
 ##
-# This array stores the maximum number of allowed occurences for parameter
+# This array stores the maximum number of allowed occurrences for parameter
 # 1 - single value
 # 2 - 2 values
 # N - N values
 # 0 - unlimited
-declare -A operation_parameters_maximum_occurences
+declare -A operation_parameters_maximum_occurrences
 {{#apiInfo}}
 {{#apis}}
 {{#operations}}
 {{#operation}}
 {{#allParams}}
-operation_parameters_maximum_occurences["{{operationId}}:::{{baseName}}"]={{#vendorExtensions}}{{#x-codegen-collection-max-items}}{{x-codegen-collection-max-items}}{{/x-codegen-collection-max-items}}{{^x-codegen-collection-max-items}}0{{/x-codegen-collection-max-items}}{{/vendorExtensions}}{{^vendorExtensions}}0{{/vendorExtensions}}
+operation_parameters_maximum_occurrences["{{operationId}}:::{{baseName}}"]={{#vendorExtensions}}{{#x-codegen-collection-max-items}}{{x-codegen-collection-max-items}}{{/x-codegen-collection-max-items}}{{^x-codegen-collection-max-items}}0{{/x-codegen-collection-max-items}}{{/vendorExtensions}}{{^vendorExtensions}}0{{/vendorExtensions}}
 {{/allParams}}
 {{/operation}}
 {{/operations}}
@@ -326,7 +326,7 @@ header_arguments_to_curl() {
 # Converts an associative array into a simple JSON with keys as top
 # level object attributes
 #
-# \todo Add convertion of more complex attributes using paths
+# \todo Add conversion of more complex attributes using paths
 #
 ##############################################################################
 body_parameters_to_json() {
@@ -376,7 +376,7 @@ build_request_path() {
 
 
     #
-    # Check input paramaters count against minimum and maximum required
+    # Check input parameters count against minimum and maximum required
     #
     if [[ "$force" = false ]]; then
         local was_error=""
@@ -387,7 +387,7 @@ build_request_path() {
             #
             # Check if the number of provided values is not less than minimum required
             #
-            if [[ ${#parameter_values[@]} -lt ${operation_parameters_minimum_occurences["${operation}:::${qparam}"]} ]]; then
+            if [[ ${#parameter_values[@]} -lt ${operation_parameters_minimum_occurrences["${operation}:::${qparam}"]} ]]; then
                 echo "ERROR: Too few values provided for '${qparam}' parameter."
                 was_error=true
             fi
@@ -395,8 +395,8 @@ build_request_path() {
             #
             # Check if the number of provided values is not more than maximum
             #
-            if [[ ${operation_parameters_maximum_occurences["${operation}:::${qparam}"]} -gt 0 \
-                  && ${#parameter_values[@]} -gt ${operation_parameters_maximum_occurences["${operation}:::${qparam}"]} ]]; then
+            if [[ ${operation_parameters_maximum_occurrences["${operation}:::${qparam}"]} -gt 0 \
+                  && ${#parameter_values[@]} -gt ${operation_parameters_maximum_occurrences["${operation}:::${qparam}"]} ]]; then
                 echo "ERROR: Too many values provided for '${qparam}' parameter"
                 was_error=true
             fi
@@ -706,7 +706,7 @@ print_{{operationId}}_help() {
 {{/allParams}}
 {{#allParams}}
 {{#isBodyParam}}
-    echo -e "  * ${GREEN}body${OFF} ${BLUE}[{{#consumes}}{{mediaType}}{{#hasMore}},{{/hasMore}}{{/consumes}}]${OFF}{{#required}} ${RED}(required)${OFF}{{/required}}${OFF} - {{{description}}}" | paste -sd' ' | fold -sw 80 | sed '2,$s/^/    /'
+    echo -e "  * ${GREEN}body${OFF} ${BLUE}[{{#consumes}}{{{mediaType}}}{{#hasMore}},{{/hasMore}}{{/consumes}}]${OFF}{{#required}} ${RED}(required)${OFF}{{/required}}${OFF} - {{{description}}}" | paste -sd' ' | fold -sw 80 | sed '2,$s/^/    /'
     echo -e ""
 {{#vendorExtensions}}
 {{#x-codegen-body-example}}
@@ -791,7 +791,7 @@ call_{{operationId}}() {
 {{#-first}}
 {{^hasMore}}
     if [[ -z $header_content_type ]]; then
-        header_content_type="{{mediaType}}"
+        header_content_type="{{{mediaType}}}"
     fi
 {{/hasMore}}
 {{/-first}}
@@ -805,7 +805,7 @@ call_{{operationId}}() {
         echo "ERROR: Request's content-type not specified!!!"
         echo "This operation expects content-type in one of the following formats:"
 {{#consumes}}
-        echo -e "\\t- {{mediaType}}"
+        echo -e "\\t- {{{mediaType}}}"
 {{/consumes}}
         echo ""
         echo "Use '--content-type' to set proper content type"
@@ -869,7 +869,7 @@ type column >/dev/null 2>&1 || { echo >&2 "ERROR: You do not have 'bsdmainutils'
 #
 # Process command line
 #
-# Pass all arguemnts before 'operation' to cURL except the ones we override
+# Pass all arguments before 'operation' to cURL except the ones we override
 #
 take_user=false
 take_host=false
@@ -978,7 +978,7 @@ case $key in
         body_parameters[${body_key}]=${body_value}
     fi
     ;;
-    +([^=]):*)
+    +\([^=]\):*)
     # Parse header arguments and convert them into curl
     # only after the operation argument
     if [[ "$operation" ]]; then

modules/swagger-codegen/src/main/resources/codegen/pom.mustache

@@ -6,11 +6,28 @@
     <packaging>jar</packaging>
     <name>{{name}}-swagger-codegen</name>
     <version>1.0.0</version>
-  <prerequisites>
-    <maven>2.2.0</maven>
-  </prerequisites>
     <build>
         <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-enforcer-plugin</artifactId>
+                <version>3.0.0-M1</version>
+                <executions>
+                    <execution>
+                        <id>enforce-maven</id>
+                        <goals>
+                            <goal>enforce</goal>
+                        </goals>
+                        <configuration>
+                            <rules>
+                                <requireMavenVersion>
+                                    <version>2.2.0</version>
+                                </requireMavenVersion>
+                            </rules>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
@@ -57,7 +74,8 @@
                         </goals>
                         <configuration>
                             <sources>
-                <source>src/main/java</source>
+                                <source>
+                                src/main/java</source>
                             </sources>
                         </configuration>
                     </execution>
@@ -69,7 +87,8 @@
                         </goals>
                         <configuration>
                             <sources>
-                <source>src/test/java</source>
+                                <source>
+                                src/test/java</source>
                             </sources>
                         </configuration>
                     </execution>
@@ -80,7 +99,8 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.6.1</version>
                 <configuration>
-          <source>1.7</source>
+                    <source>
+                    1.7</source>
                     <target>1.7</target>
                 </configuration>
             </plugin>
@@ -95,6 +115,7 @@
         </dependency>
     </dependencies>
     <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <swagger-codegen-version>{{swaggerCodegenVersion}}</swagger-codegen-version>
         <maven-plugin-version>1.0.0</maven-plugin-version>
         <junit-version>4.8.1</junit-version>

modules/swagger-codegen/src/main/resources/cpprest/api-source.mustache

@@ -48,7 +48,7 @@ pplx::task<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}void{{/r
 
     std::unordered_set<utility::string_t> responseHttpContentTypes;
     {{#produces}}
-    responseHttpContentTypes.insert( utility::conversions::to_string_t("{{mediaType}}") );
+    responseHttpContentTypes.insert( utility::conversions::to_string_t("{{{mediaType}}}") );
     {{/produces}}
 
     utility::string_t responseHttpContentType;
@@ -98,7 +98,7 @@ pplx::task<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}void{{/r
 
     std::unordered_set<utility::string_t> consumeHttpContentTypes;
     {{#consumes}}
-    consumeHttpContentTypes.insert( utility::conversions::to_string_t("{{mediaType}}") );
+    consumeHttpContentTypes.insert( utility::conversions::to_string_t("{{{mediaType}}}") );
     {{/consumes}}
 
     {{#allParams}}

modules/swagger-codegen/src/main/resources/csharp/ApiClient.mustache

@@ -105,7 +105,7 @@ namespace {{packageName}}.Client
         /// <value>An instance of the IReadableConfiguration.</value>
         /// <remarks>
         /// <see cref="IReadableConfiguration"/> helps us to avoid modifying possibly global
-        /// configuration values from within a given client. It does not gaurantee thread-safety
+        /// configuration values from within a given client. It does not guarantee thread-safety
         /// of the <see cref="Configuration"/> instance in any way.
         /// </remarks>
         public IReadableConfiguration Configuration { get; set; }