Merge pull request #851 from swagger-api/develop_2.0

merge from develop 2.0 for release

.gitignore

@@ -22,9 +22,22 @@ samples/server-generator/scalatra/output
 samples/server-generator/node/output/node_modules
 samples/server-generator/scalatra/target
 samples/server-generator/scalatra/output/.history
-
+samples/client/petstore/qt5cpp/PetStore/moc_*
+samples/client/petstore/qt5cpp/PetStore/*.o
+samples/client/petstore/objc/PetstoreClient.xcworkspace/xcuserdata
+samples/client/petstore/qt5cpp/build-*
+samples/client/petstore/qt5cpp/PetStore/PetStore
+samples/client/petstore/qt5cpp/PetStore/Makefile
+samples/client/petstore/java/hello.txt
+samples/client/petstore/android-java/hello.txt
+samples/client/petstore/objc/Build
+samples/client/petstore/objc/Pods
+samples/server/petstore/nodejs/node_modules
 target
 .idea
 .lib
 atlassian-ide-plugin.xml
 .DS_Store
+
+samples/client/petstore/php/SwaggerClient-php/composer.lock
+samples/client/petstore/php/SwaggerClient-php/vendor/

.travis.yml

@@ -1,3 +1,4 @@
+sudo: false
 language: java
 script: mvn verify
 jdk:

LICENSE

@@ -0,0 +1,11 @@
+Copyright 2015 SmartBear Software
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at [apache.org/licenses/LICENSE-2.0](http://www.apache.org/licenses/LICENSE-2.0)
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.

README.md

@@ -5,20 +5,15 @@
 ## Overview
 This is the swagger codegen project, which allows generation of client libraries automatically from a Swagger-compliant server.  
 
-## What's Swagger?
-
-The goal of Swagger™ is to define a standard, language-agnostic interface to REST APIs which allows both humans and computers to discover and understand the capabilities of the service without access to source code, documentation, or through network traffic inspection. When properly defined via Swagger, a consumer can understand and interact with the remote service with a minimal amount of implementation logic. Similar to what interfaces have done for lower-level programming, Swagger removes the guesswork in calling the service.
-
-
 Check out [Swagger-Spec](https://github.com/swagger-api/swagger-spec) for additional information about the Swagger project, including additional libraries with support for other languages and more. 
 
 
-## Compatability
+## Compatibility
 The Swagger Specification has undergone 3 revisions since initial creation in 2010.  The swagger-codegen project has the following compatibilies with the swagger specification:
 
-Swagger Codegen Version | Release Date | Swagger Spec compatability | Notes
+Swagger Codegen Version | Release Date | Swagger Spec compatibility | Notes
 ----------------------- | ------------ | -------------------------- | -----
-2.1.0-M1                | 2015-02-16   | 1.0, 1.1, 1.2, 2.0   | [tag v2.1.0-M1](https://github.com/swagger-api/swagger-codegen/tree/v2.1.0-M1)
+2.1.0                   | 2015-06-09   | 1.0, 1.1, 1.2, 2.0   | [master](https://github.com/swagger-api/swagger-codegen)
 2.0.17                  | 2014-08-22   | 1.1, 1.2      | [tag v2.0.17](https://github.com/swagger-api/swagger-codegen/tree/v2.0.17)
 1.0.4                   | 2012-04-12   | 1.0, 1.1      | [tag v1.0.4](https://github.com/swagger-api/swagger-codegen/tree/swagger-codegen_2.9.1-1.1)
 
@@ -29,6 +24,17 @@ You need the following installed and available in your $PATH:
 * [Java 7](http://java.oracle.com)
 
 * [Apache maven 3.0.3 or greater](http://maven.apache.org/)
+ 
+#### OS X Users
+Don't forget to install Java 7. You probably have 1.6 or 1.8.
+
+Export JAVA_HOME in order to user proper Java version:
+```
+export JAVA_HOME=`/usr/libexec/java_home -v 1.7`
+export PATH=${JAVA_HOME}/bin:$PATH
+```
+
+#### Building
 
 After cloning the project, you can build it from source with this command:
 
@@ -46,29 +52,59 @@ You can build a client against the swagger sample [petstore](http://petstore.swa
 This will run the generator with this command:
 
 ```
-java -jar modules/swagger-codegen-distribution/target/swagger-codegen-distribution-2.1.0-M1.jar \
+java -jar modules/swagger-codegen-cli/target/swagger-codegen-cli.jar generate \
   -i http://petstore.swagger.io/v2/swagger.json \
   -l java \
   -o samples/client/petstore/java
 ```
 
-With a number of options.  You can get the options with the -h flag:
+With a number of options.  You can get the options with the `help generate` command:
+
 ```
-usage: Codegen
- -a,--auth                 addes authorization headers when fetching the
-                           swagger definitions remotely. Pass in a
-                           URL-encoded string of name:header with a comma
-                           separating multiple values
- -d,--debug-info           prints additional info for debugging
- -h,--help                 shows this message
- -i,--input-spec <arg>     location of the swagger spec, as URL or file
- -l,--lang <arg>           client language to generate.
-                           Available languages include:
-                           [android, java, jaxrs, nodejs, objc, scalatra,
-                           scala, dynamic-html, html, swagger, tizen, php,
-                           python]
- -o,--output <arg>         where to write the generated files
- -t,--template-dir <arg>   folder containing the template files
+NAME
+        swagger generate - Generate code with chosen lang
+
+SYNOPSIS
+        swagger generate [(-a <authorization> | --auth <authorization>)]
+                [(-c <configuration file> | --config <configuration file>)]
+                [-D <system properties>]
+                (-i <spec file> | --input-spec <spec file>)
+                (-l <language> | --lang <language>)
+                [(-o <output directory> | --output <output directory>)]
+                [(-t <template directory> | --template-dir <template directory>)]
+                [(-v | --verbose)]
+
+OPTIONS
+        -a <authorization>, --auth <authorization>
+            adds authorization headers when fetching the swagger definitions
+            remotely. Pass in a URL-encoded string of name:header with a comma
+            separating multiple values
+
+        -c <configuration file>, --config <configuration file>
+            Path to json configuration file. File content should be in a json
+            format {"optionKey":"optionValue", "optionKey1":"optionValue1"...}
+            Supported options can be different for each language. Run
+            config-help -l {lang} command for language specific config options.
+
+        -D <system properties>
+            sets specified system properties in the format of
+            name=value,name=value
+
+        -i <spec file>, --input-spec <spec file>
+            location of the swagger spec, as URL or file (required)
+
+        -l <language>, --lang <language>
+            client language to generate (maybe class name in classpath,
+            required)
+
+        -o <output directory>, --output <output directory>
+            where to write the generated files (current dir by default)
+
+        -t <template directory>, --template-dir <template directory>
+            folder containing the template files
+
+        -v, --verbose
+            verbose mode
  ```
 
 You can then compile and run the client, as well as unit tests against it:
@@ -91,7 +127,17 @@ It's just as easy--just use the `-i` flag to point to either a server or file.
 ### Modifying the client library format
 Don't like the default swagger client syntax?  Want a different language supported?  No problem!  Swagger codegen processes mustache templates with the [jmustache](https://github.com/samskivert/jmustache) engine.  You can modify our templates or make your own.
 
-You can look at `src/main/resources/${your-language}` for examples.  To make your own templates, create your own files and use the `-t` flag to specify your tempalte folder.  It actually is that easy.
+You can look at `modules/swagger-codegen/src/main/resources/${your-language}` for examples.  To make your own templates, create your own files and use the `-t` flag to specify your template folder.  It actually is that easy.
+
+### Making your own codegen modules
+If you're starting a project with a new language and don't see what you need, swagger-codegen can help you create a project to generate your own libraries:
+
+```
+java -jar modules/swagger-codegen-distribution/target/swagger-codegen-cli.jar meta \
+  -o output/myLibrary -n myClientCodegen -p com.my.company.codegen
+```
+
+This will write, in the folder `output/myLibrary`, all the files you need to get started, including a README.md. Once modified and compiled, you can load your library with the codegen and generate clients with your own, custom-rolled logic.
 
 ### Where is Javascript???
 See our [javascript library](http://github.com/swagger-api/swagger-js)--it's completely dynamic and doesn't require
@@ -114,30 +160,93 @@ Great for creating libraries on your ci server, from the [Swagger Editor](http:/
 There are different aspects of customizing the code generator beyond just creating or modifying templates.  Each language has a supporting configuration file to handle different type mappings, etc:
 
 ```
-$ ls -1 modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/
+$ ls -1 modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/
+AkkaScalaClientCodegen.java
 AndroidClientCodegen.java
+AsyncScalaClientCodegen.java
+CSharpClientCodegen.java
 JavaClientCodegen.java
 JaxRSServerCodegen.java
 NodeJSServerCodegen.java
 ObjcClientCodegen.java
+PerlClientCodegen.java
 PhpClientCodegen.java
+Python3ClientCodegen.java
 PythonClientCodegen.java
+Qt5CPPGenerator.java
+RetrofitClientCodegen.java
+RubyClientCodegen.java
 ScalaClientCodegen.java
 ScalatraServerCodegen.java
+SpringMVCServerCodegen.java
 StaticDocCodegen.java
 StaticHtmlGenerator.java
 SwaggerGenerator.java
+SwaggerYamlGenerator.java
+SwiftGenerator.java
 TizenClientCodegen.java
 ```
 
-Each of these files creates reasonable defaults so you can get running quickly.  But if you want to configure package names, prefixes, model folders, etc., you may want to extend these.
+Each of these files creates reasonable defaults so you can get running quickly.  But if you want to configure package names, prefixes, model folders, etc. you can use a json config file to pass the values.
 
+```
+java -jar modules/swagger-codegen-cli/target/swagger-codegen-cli.jar generate \
+  -i http://petstore.swagger.io/v2/swagger.json \
+  -l java \
+  -o samples/client/petstore/java \
+  -c path/to/config.json
+```
+Supported config options can be different per language. Running `config-help -l {lang}` will show available options.
+
+```
+java -jar modules/swagger-codegen-cli/target/swagger-codegen-cli.jarr config-help -l java
+```
+
+Output
+
+```
+CONFIG OPTIONS
+	modelPackage
+	    package for generated models
+
+	apiPackage
+	    package for generated api classes
+
+	invokerPackage
+	    root package for generated code
+
+	groupId
+	    groupId in generated pom.xml
+
+	artifactId
+	    artifactId in generated pom.xml
+
+	artifactVersion
+	    artifact version in generated pom.xml
+
+	sourceFolder
+	    source folder for generated code
+```
+
+Your config file for java can look like
+
+```
+{
+  "groupId":"com.my.company",
+  "artifactId":"MyClent",
+  "artifactVersion":"1.2.0"
+}
+```
+
+For all the unspecified options default values will be used.
+
+Another way to override default options is to extend config class for specific language.
 To change, for example, the prefix for the Objective-C generated files, simply subclass the ObjcClientCodegen.java:
 
 ```
 package com.mycompany.swagger.codegen;
 
-import com.wordnik.swagger.codegen.languages.*;
+import io.swagger.codegen.languages.*;
 
 public class MyObjcCodegen extends ObjcClientCodegen {
   static {
@@ -149,7 +258,7 @@ public class MyObjcCodegen extends ObjcClientCodegen {
 and specify the `classname` when running the generator:
 
 ```
--i com.mycompany.swagger.codegen.MyObjcCodegen
+-l com.mycompany.swagger.codegen.MyObjcCodegen
 ```
 
 Your subclass will now be loaded and overrides the `PREFIX` value in the superclass.
@@ -189,7 +298,7 @@ You can also use the codegen to generate a server for a couple different framewo
 
 ### node.js
 ```
-java -jar modules/swagger-codegen-distribution/target/swagger-codegen-distribution-2.1.0-M1.jar \
+java -jar modules/swagger-codegen-cli/target/swagger-codegen-cli.jar generate \
   -i http://petstore.swagger.io/v2/swagger.json \
   -l nodejs \
   -o samples/server/petstore/nodejs
@@ -201,7 +310,7 @@ java -jar modules/swagger-codegen-distribution/target/swagger-codegen-distributi
 
 ### scala scalatra
 ```
-java -jar modules/swagger-codegen-distribution/target/swagger-codegen-distribution-2.1.0-M1.jar \
+java -jar modules/swagger-codegen-cli/target/swagger-codegen-cli.jar generate \
   -i http://petstore.swagger.io/v2/swagger.json \
   -l scalatra \
   -o samples/server/petstore/scalatra
@@ -210,12 +319,20 @@ java -jar modules/swagger-codegen-distribution/target/swagger-codegen-distributi
 ### java jax-rs
 
 ```
-java -jar modules/swagger-codegen-distribution/target/swagger-codegen-distribution-2.1.0-M1.jar \
+java -jar modules/swagger-codegen-cli/target/swagger-codegen-cli.jar generate \
   -i http://petstore.swagger.io/v2/swagger.json \
   -l jaxrs \
   -o samples/server/petstore/jaxrs
 ```
 
+### java spring-mvc
+
+```
+java -jar modules/swagger-codegen-cli/target/swagger-codegen-cli.jar generate \
+  -i http://petstore.swagger.io/v2/swagger.json \
+  -l spring-mvc \
+  -o samples/server/petstore/spring-mvc
+```
 ### To build the codegen library
 
 This will create the swagger-codegen library from source.  
@@ -229,7 +346,7 @@ Note!  The templates are included in the library generated.  If you want to modi
 License
 -------
 
-Copyright 2015 Reverb Technologies, Inc.
+Copyright 2015 SmartBear Software
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

bin/Version.scala

@@ -1,6 +0,0 @@
-val version = scala.util.Properties.scalaPropOrElse("version.number", "unknown").toString match {
-  case s if s startsWith "2.10" => "2.10"
-  case s if s startsWith "2.11" => "2.11"
-  case e: String => e
-}
-println(version)

bin/akka-scala-petstore.sh

@@ -0,0 +1,31 @@
+#!/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/akka-scala -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l akka-scala -o samples/client/petstore/akka-scala"
+
+java $JAVA_OPTS -jar $executable $ags

bin/all-petstore.sh

@@ -19,13 +19,18 @@ fi
 
 cd $APP_DIR
 ./bin/android-java-petstore.sh
+./bin/csharp-petstore.sh
 ./bin/dynamic-html.sh
-./bin/html.sh
+./bin/html-petstore.sh
 ./bin/jaxrs-petstore-server.sh
-./bin/java-petstore-filemap.sh
 ./bin/java-petstore.sh
+./bin/qt5-petstore.sh
+./bin/perl-petstore.sh
 ./bin/php-petstore.sh
 ./bin/python-petstore.sh
+./bin/retrofit-petstore.sh
+./bin/ruby-petstore.sh
 ./bin/objc-petstore.sh
 ./bin/scala-petstore.sh
+./bin/spring-mvc-petstore-server.sh
 ./bin/tizen-petstore.sh

bin/android-java-petstore.sh

@@ -17,12 +17,7 @@ if [ ! -d "${APP_DIR}" ]; then
   APP_DIR=`cd "${APP_DIR}"; pwd`
 fi
 
-root=./modules/swagger-codegen-distribution/pom.xml
-
-# gets version of swagger-codegen
-version=$(sed '/<project>/,/<\/project>/d;/<version>/!d;s/ *<\/\?version> *//g' $root | sed -n '2p' | sed -e 's,.*<version>\([^<]*\)</version>.*,\1,g')
-
-executable="./modules/swagger-codegen-distribution/target/swagger-codegen-distribution-$version.jar"
+executable="./modules/swagger-codegen-cli/target/swagger-codegen-cli.jar"
 
 if [ ! -f "$executable" ]
 then
@@ -31,6 +26,6 @@ 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="$@ -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l android -o samples/client/petstore/android-java"
+ags="$@ generate -t modules/swagger-codegen/src/main/resources/android-java -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l android -o samples/client/petstore/android-java"
 
 java $JAVA_OPTS -jar $executable $ags

bin/android-java-wordnik-api.sh

@@ -17,12 +17,7 @@ if [ ! -d "${APP_DIR}" ]; then
   APP_DIR=`cd "${APP_DIR}"; pwd`
 fi
 
-root=./modules/swagger-codegen-distribution/pom.xml
-
-# gets version of swagger-codegen
-version=$(sed '/<project>/,/<\/project>/d;/<version>/!d;s/ *<\/\?version> *//g' $root | sed -n '2p' | sed -e 's,.*<version>\([^<]*\)</version>.*,\1,g')
-
-executable="./modules/swagger-codegen-distribution/target/swagger-codegen-distribution-$version.jar"
+executable="./modules/swagger-codegen-cli/target/swagger-codegen-cli.jar"
 
 if [ ! -f "$executable" ]
 then
@@ -31,6 +26,6 @@ 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="$@ -i modules/swagger-codegen/src/test/resources/2_0/wordnik.json -l android -o samples/client/wordnik/android-java"
+ags="$@ generate -i modules/swagger-codegen/src/test/resources/2_0/wordnik.json -l android -o samples/client/wordnik/android-java"
 
 java $JAVA_OPTS -jar $executable $ags

bin/csharp-petstore.sh

@@ -0,0 +1,31 @@
+#!/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 -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l csharp -o samples/client/petstore/csharp"
+
+java $JAVA_OPTS -jar $executable $ags

bin/dynamic-html.sh

@@ -17,12 +17,7 @@ if [ ! -d "${APP_DIR}" ]; then
   APP_DIR=`cd "${APP_DIR}"; pwd`
 fi
 
-root=./modules/swagger-codegen-distribution/pom.xml
-
-# gets version of swagger-codegen
-version=$(sed '/<project>/,/<\/project>/d;/<version>/!d;s/ *<\/\?version> *//g' $root | sed -n '2p' | sed -e 's,.*<version>\([^<]*\)</version>.*,\1,g')
-
-executable="./modules/swagger-codegen-distribution/target/swagger-codegen-distribution-$version.jar"
+executable="./modules/swagger-codegen-cli/target/swagger-codegen-cli.jar"
 
 if [ ! -f "$executable" ]
 then
@@ -31,6 +26,6 @@ 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="$@ -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l dynamic-html  -o samples/dynamic-html"
+ags="$@ generate -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l dynamic-html  -o samples/dynamic-html"
 
 java $JAVA_OPTS -jar $executable $ags

bin/html-petstore.sh

@@ -17,12 +17,7 @@ if [ ! -d "${APP_DIR}" ]; then
   APP_DIR=`cd "${APP_DIR}"; pwd`
 fi
 
-root=./modules/swagger-codegen-distribution/pom.xml
-
-# gets version of swagger-codegen
-version=$(sed '/<project>/,/<\/project>/d;/<version>/!d;s/ *<\/\?version> *//g' $root | sed -n '2p' | sed -e 's,.*<version>\([^<]*\)</version>.*,\1,g')
-
-executable="./modules/swagger-codegen-distribution/target/swagger-codegen-distribution-$version.jar"
+executable="./modules/swagger-codegen-cli/target/swagger-codegen-cli.jar"
 
 if [ ! -f "$executable" ]
 then
@@ -31,6 +26,6 @@ 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="$@ -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l html  -o samples/html"
+ags="$@ generate -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l html  -o samples/html"
 
 java $JAVA_OPTS -jar $executable $ags

bin/java-petstore.sh

@@ -17,12 +17,7 @@ if [ ! -d "${APP_DIR}" ]; then
   APP_DIR=`cd "${APP_DIR}"; pwd`
 fi
 
-root=./modules/swagger-codegen-distribution/pom.xml
-
-# gets version of swagger-codegen
-version=$(sed '/<project>/,/<\/project>/d;/<version>/!d;s/ *<\/\?version> *//g' $root | sed -n '2p' | sed -e 's,.*<version>\([^<]*\)</version>.*,\1,g')
-
-executable="./modules/swagger-codegen-distribution/target/swagger-codegen-distribution-$version.jar"
+executable="./modules/swagger-codegen-cli/target/swagger-codegen-cli.jar"
 
 if [ ! -f "$executable" ]
 then
@@ -31,6 +26,6 @@ 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="$@ -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l java -o samples/client/petstore/java"
+ags="$@ generate -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l java -o samples/client/petstore/java"
 
 java $JAVA_OPTS -jar $executable $ags

bin/java-wordnik-api.sh

@@ -17,12 +17,7 @@ if [ ! -d "${APP_DIR}" ]; then
   APP_DIR=`cd "${APP_DIR}"; pwd`
 fi
 
-root=./modules/swagger-codegen-distribution/pom.xml
-
-# gets version of swagger-codegen
-version=$(sed '/<project>/,/<\/project>/d;/<version>/!d;s/ *<\/\?version> *//g' $root | sed -n '2p' | sed -e 's,.*<version>\([^<]*\)</version>.*,\1,g')
-
-executable="./modules/swagger-codegen-distribution/target/swagger-codegen-distribution-$version.jar"
+executable="./modules/swagger-codegen-cli/target/swagger-codegen-cli.jar"
 
 if [ ! -f "$executable" ]
 then
@@ -31,6 +26,6 @@ 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="$@ -i modules/swagger-codegen/src/test/resources/2_0/wordnik.json -l java -o samples/client/wordnik/java"
+ags="$@ generate -i modules/swagger-codegen/src/test/resources/2_0/wordnik.json -l java -o samples/client/wordnik/java"
 
 java $JAVA_OPTS -jar $executable $ags

bin/jaxrs-petstore-server.sh

@@ -17,12 +17,7 @@ if [ ! -d "${APP_DIR}" ]; then
   APP_DIR=`cd "${APP_DIR}"; pwd`
 fi
 
-root=./modules/swagger-codegen-distribution/pom.xml
-
-# gets version of swagger-codegen
-version=$(sed '/<project>/,/<\/project>/d;/<version>/!d;s/ *<\/\?version> *//g' $root | sed -n '2p' | sed -e 's,.*<version>\([^<]*\)</version>.*,\1,g')
-
-executable="./modules/swagger-codegen-distribution/target/swagger-codegen-distribution-$version.jar"
+executable="./modules/swagger-codegen-cli/target/swagger-codegen-cli.jar"
 
 if [ ! -f "$executable" ]
 then
@@ -31,6 +26,6 @@ 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="$@ -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l jaxrs -o samples/server/petstore/jaxrs"
+ags="$@ generate -t modules/swagger-codegen/src/main/resources/JavaJaxRS -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l jaxrs -o samples/server/petstore/jaxrs -Dswagger.codegen.jaxrs.impl.source=src/main/java"
 
 java $JAVA_OPTS -jar $executable $ags

bin/nodejs-petstore-server.sh

@@ -17,12 +17,7 @@ if [ ! -d "${APP_DIR}" ]; then
   APP_DIR=`cd "${APP_DIR}"; pwd`
 fi
 
-root=./modules/swagger-codegen-distribution/pom.xml
-
-# gets version of swagger-codegen
-version=$(sed '/<project>/,/<\/project>/d;/<version>/!d;s/ *<\/\?version> *//g' $root | sed -n '2p' | sed -e 's,.*<version>\([^<]*\)</version>.*,\1,g')
-
-executable="./modules/swagger-codegen-distribution/target/swagger-codegen-distribution-$version.jar"
+executable="./modules/swagger-codegen-cli/target/swagger-codegen-cli.jar"
 
 if [ ! -f "$executable" ]
 then
@@ -31,6 +26,6 @@ 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="$@ -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l nodejs -o samples/server/petstore/nodejs"
+ags="$@ generate -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l nodejs -o samples/server/petstore/nodejs"
 
-java $JAVA_OPTS -jar $executable $ags
+java $JAVA_OPTS -Dservice -jar $executable $ags

bin/objc-petstore.sh

@@ -17,12 +17,7 @@ if [ ! -d "${APP_DIR}" ]; then
   APP_DIR=`cd "${APP_DIR}"; pwd`
 fi
 
-root=./modules/swagger-codegen-distribution/pom.xml
-
-# gets version of swagger-codegen
-version=$(sed '/<project>/,/<\/project>/d;/<version>/!d;s/ *<\/\?version> *//g' $root | sed -n '2p' | sed -e 's,.*<version>\([^<]*\)</version>.*,\1,g')
-
-executable="./modules/swagger-codegen-distribution/target/swagger-codegen-distribution-$version.jar"
+executable="./modules/swagger-codegen-cli/target/swagger-codegen-cli.jar"
 
 if [ ! -f "$executable" ]
 then
@@ -31,6 +26,6 @@ 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="$@ -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l objc -o samples/client/petstore/objc"
+ags="$@ generate -t modules/swagger-codegen/src/main/resources/objc -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l objc -o samples/client/petstore/objc"
 
-java $JAVA_OPTS -jar $executable $ags
+java -DappName=PetstoreClient $JAVA_OPTS -jar $executable $ags

bin/objc-wordnik-api.sh

@@ -17,12 +17,7 @@ if [ ! -d "${APP_DIR}" ]; then
   APP_DIR=`cd "${APP_DIR}"; pwd`
 fi
 
-root=./modules/swagger-codegen-distribution/pom.xml
-
-# gets version of swagger-codegen
-version=$(sed '/<project>/,/<\/project>/d;/<version>/!d;s/ *<\/\?version> *//g' $root | sed -n '2p' | sed -e 's,.*<version>\([^<]*\)</version>.*,\1,g')
-
-executable="./modules/swagger-codegen-distribution/target/swagger-codegen-distribution-$version.jar"
+executable="./modules/swagger-codegen-cli/target/swagger-codegen-cli.jar"
 
 if [ ! -f "$executable" ]
 then
@@ -31,6 +26,6 @@ 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="$@ -i modules/swagger-codegen/src/test/resources/2_0/wordnik.json -l objc -o samples/client/wordnik/objc"
+ags="$@ generate -i modules/swagger-codegen/src/test/resources/2_0/wordnik.json -l objc -o samples/client/wordnik/objc"
 
 java $JAVA_OPTS -jar $executable $ags

bin/perl-petstore.sh

@@ -0,0 +1,31 @@
+#!/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 -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l perl -o samples/client/petstore/perl"
+
+java $JAVA_OPTS -jar $executable $ags

bin/php-petstore.sh

@@ -17,12 +17,7 @@ if [ ! -d "${APP_DIR}" ]; then
   APP_DIR=`cd "${APP_DIR}"; pwd`
 fi
 
-root=./modules/swagger-codegen-distribution/pom.xml
-
-# gets version of swagger-codegen
-version=$(sed '/<project>/,/<\/project>/d;/<version>/!d;s/ *<\/\?version> *//g' $root | sed -n '2p' | sed -e 's,.*<version>\([^<]*\)</version>.*,\1,g')
-
-executable="./modules/swagger-codegen-distribution/target/swagger-codegen-distribution-$version.jar"
+executable="./modules/swagger-codegen-cli/target/swagger-codegen-cli.jar"
 
 if [ ! -f "$executable" ]
 then
@@ -31,6 +26,6 @@ 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="$@ -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l php -o samples/client/petstore/php"
+ags="$@ generate -t modules/swagger-codegen/src/main/resources/php -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l php -o samples/client/petstore/php"
 
 java $JAVA_OPTS -jar $executable $ags

bin/python-petstore.sh

@@ -17,12 +17,7 @@ if [ ! -d "${APP_DIR}" ]; then
   APP_DIR=`cd "${APP_DIR}"; pwd`
 fi
 
-root=./modules/swagger-codegen-distribution/pom.xml
-
-# gets version of swagger-codegen
-version=$(sed '/<project>/,/<\/project>/d;/<version>/!d;s/ *<\/\?version> *//g' $root | sed -n '2p' | sed -e 's,.*<version>\([^<]*\)</version>.*,\1,g')
-
-executable="./modules/swagger-codegen-distribution/target/swagger-codegen-distribution-$version.jar"
+executable="./modules/swagger-codegen-cli/target/swagger-codegen-cli.jar"
 
 if [ ! -f "$executable" ]
 then
@@ -31,6 +26,6 @@ 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="$@ -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l python -o samples/client/petstore/python"
+ags="$@ generate -t modules/swagger-codegen/src/main/resources/python -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l python -o samples/client/petstore/python"
 
 java $JAVA_OPTS -jar $executable $ags

bin/python3-petstore.sh

@@ -0,0 +1,31 @@
+#!/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/python3 -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l python3 -o samples/client/petstore/python3"
+
+java $JAVA_OPTS -jar $executable $ags

bin/qt5-petstore.sh

@@ -0,0 +1,31 @@
+#!/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/qt5cpp -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l qt5cpp -o samples/client/petstore/qt5cpp"
+
+java $JAVA_OPTS -jar $executable $ags

bin/retrofit-petstore.sh

@@ -0,0 +1,31 @@
+#!/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/retrofit -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l retrofit -o samples/client/petstore/retrofit"
+
+java $JAVA_OPTS -jar $executable $ags

bin/ruby-petstore.sh

@@ -0,0 +1,31 @@
+#!/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/ruby -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l ruby -o samples/client/petstore/ruby"
+
+java $JAVA_OPTS -jar $executable $ags

bin/scala-async-petstore.sh

@@ -0,0 +1,31 @@
+#!/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/asyncscala -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l async-scala -o samples/client/petstore/async-scala"
+
+java $JAVA_OPTS -jar $executable $ags

bin/scala-petstore.sh

@@ -17,12 +17,7 @@ if [ ! -d "${APP_DIR}" ]; then
   APP_DIR=`cd "${APP_DIR}"; pwd`
 fi
 
-root=./modules/swagger-codegen-distribution/pom.xml
-
-# gets version of swagger-codegen
-version=$(sed '/<project>/,/<\/project>/d;/<version>/!d;s/ *<\/\?version> *//g' $root | sed -n '2p' | sed -e 's,.*<version>\([^<]*\)</version>.*,\1,g')
-
-executable="./modules/swagger-codegen-distribution/target/swagger-codegen-distribution-$version.jar"
+executable="./modules/swagger-codegen-cli/target/swagger-codegen-cli.jar"
 
 if [ ! -f "$executable" ]
 then
@@ -31,6 +26,6 @@ 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="$@ -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l scala -o samples/client/petstore/scala"
+ags="$@ generate -t modules/swagger-codegen/src/main/resources/scala -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l scala -o samples/client/petstore/scala"
 
 java $JAVA_OPTS -jar $executable $ags

bin/scala-wordnik-api.sh

@@ -17,12 +17,7 @@ if [ ! -d "${APP_DIR}" ]; then
   APP_DIR=`cd "${APP_DIR}"; pwd`
 fi
 
-root=./modules/swagger-codegen-distribution/pom.xml
-
-# gets version of swagger-codegen
-version=$(sed '/<project>/,/<\/project>/d;/<version>/!d;s/ *<\/\?version> *//g' $root | sed -n '2p' | sed -e 's,.*<version>\([^<]*\)</version>.*,\1,g')
-
-executable="./modules/swagger-codegen-distribution/target/swagger-codegen-distribution-$version.jar"
+executable="./modules/swagger-codegen-cli/target/swagger-codegen-cli.jar"
 
 if [ ! -f "$executable" ]
 then
@@ -31,6 +26,6 @@ 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="$@ -i modules/swagger-codegen/src/test/resources/2_0/wordnik.json -l scala -o samples/client/wordnik/scala"
+ags="$@ generate -i modules/swagger-codegen/src/test/resources/2_0/wordnik.json -l scala -o samples/client/wordnik/scala"
 
 java $JAVA_OPTS -jar $executable $ags

bin/scalatra-petstore-server.sh

@@ -17,12 +17,7 @@ if [ ! -d "${APP_DIR}" ]; then
   APP_DIR=`cd "${APP_DIR}"; pwd`
 fi
 
-root=./modules/swagger-codegen-distribution/pom.xml
-
-# gets version of swagger-codegen
-version=$(sed '/<project>/,/<\/project>/d;/<version>/!d;s/ *<\/\?version> *//g' $root | sed -n '2p' | sed -e 's,.*<version>\([^<]*\)</version>.*,\1,g')
-
-executable="./modules/swagger-codegen-distribution/target/swagger-codegen-distribution-$version.jar"
+executable="./modules/swagger-codegen-cli/target/swagger-codegen-cli.jar"
 
 if [ ! -f "$executable" ]
 then
@@ -31,6 +26,6 @@ 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="$@ -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l scalatra -o samples/server/petstore/scalatra"
+ags="$@ generate -t modules/swagger-codegen/src/main/resources/scalatra -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l scalatra -o samples/server/petstore/scalatra"
 
 java $JAVA_OPTS -jar $executable $ags

bin/spring-mvc-petstore-server.sh

@@ -0,0 +1,31 @@
+#!/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/JavaSpringMVC -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l spring-mvc -o samples/server/petstore/spring-mvc"
+
+java $JAVA_OPTS -jar $executable $ags

bin/swift-petstore.sh

@@ -0,0 +1,31 @@
+#!/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/swift -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l swift -o samples/client/petstore/swift"
+
+java -DappName=PetstoreClient $JAVA_OPTS -jar $executable $ags

bin/tizen-petstore.sh

@@ -17,12 +17,7 @@ if [ ! -d "${APP_DIR}" ]; then
   APP_DIR=`cd "${APP_DIR}"; pwd`
 fi
 
-root=./modules/swagger-codegen-distribution/pom.xml
-
-# gets version of swagger-codegen
-version=$(sed '/<project>/,/<\/project>/d;/<version>/!d;s/ *<\/\?version> *//g' $root | sed -n '2p' | sed -e 's,.*<version>\([^<]*\)</version>.*,\1,g')
-
-executable="./modules/swagger-codegen-distribution/target/swagger-codegen-distribution-$version.jar"
+executable="./modules/swagger-codegen-cli/target/swagger-codegen-cli.jar"
 
 if [ ! -f "$executable" ]
 then
@@ -31,6 +26,6 @@ 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="$@ -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l tizen -o samples/client/petstore/tizen"
+ags="$@ generate -t modules/swagger-codegen/src/main/resources/tizen -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l tizen -o samples/client/petstore/tizen"
 
 java $JAVA_OPTS -jar $executable $ags

modules/swagger-codegen-cli/pom.xml

@@ -0,0 +1,104 @@
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <parent>
+        <groupId>io.swagger</groupId>
+        <artifactId>swagger-codegen-project</artifactId>
+        <version>2.1.2</version>
+        <relativePath>../..</relativePath>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>swagger-codegen-cli</artifactId>
+    <packaging>jar</packaging>
+
+    <name>swagger-codegen (executable)</name>
+
+    <build>
+        <finalName>swagger-codegen-cli</finalName>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <excludes>
+                    <exclude>logback.xml</exclude>
+                </excludes>
+            </resource>
+        </resources>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <archive>
+                        <manifest>
+                            <mainClass>io.swagger.codegen.SwaggerCodegen</mainClass>
+                        </manifest>
+                    </archive>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <version>2.3</version>
+                <executions>
+                    <execution>
+                        <id>reduced-pom</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                        <configuration>
+                            <minimizeJar>false</minimizeJar>
+                            <createDependencyReducedPom>true</createDependencyReducedPom>
+                            <dependencyReducedPomLocation>
+                                ${java.io.tmpdir}/dependency-reduced-pom.xml
+                            </dependencyReducedPomLocation>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>process-resources</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                        <configuration>
+                            <transformers>
+                                <transformer
+                                        implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
+                            </transformers>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+    <dependencies>
+
+        <dependency>
+            <groupId>io.swagger</groupId>
+            <artifactId>swagger-codegen</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+        <!--https://github.com/airlift/airline-->
+        <dependency>
+            <groupId>io.airlift</groupId>
+            <artifactId>airline</artifactId>
+            <version>0.7</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.googlecode.lambdaj</groupId>
+            <artifactId>lambdaj</artifactId>
+            <version>2.3.3</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-simple</artifactId>
+            <version>${slf4j-version}</version>
+        </dependency>
+
+    </dependencies>
+
+</project>

modules/swagger-codegen-cli/src/main/java/io/swagger/codegen/SwaggerCodegen.java

@@ -0,0 +1,37 @@
+package io.swagger.codegen;
+
+import io.airlift.airline.Cli;
+import io.airlift.airline.Help;
+import io.swagger.codegen.cmd.ConfigHelp;
+import io.swagger.codegen.cmd.Generate;
+import io.swagger.codegen.cmd.Langs;
+import io.swagger.codegen.cmd.Meta;
+
+/**
+ * User: lanwen
+ * Date: 24.03.15
+ * Time: 17:56
+ * <p>
+ * Command line interface for swagger codegen
+ * use `swagger-codegen-cli.jar help` for more info
+ *
+ * @since 2.1.3-M1
+ */
+public class SwaggerCodegen {
+
+
+    public static void main(String[] args) {
+        Cli.CliBuilder<Runnable> builder = Cli.<Runnable>builder("swagger")
+                .withDescription("Swagger code generator CLI. More info on swagger.io")
+                .withDefaultCommand(Langs.class)
+                .withCommands(
+                        Generate.class,
+                        Meta.class,
+                        Langs.class,
+                        Help.class,
+                        ConfigHelp.class
+                );
+
+        builder.build().parse(args).run();
+    }
+}

modules/swagger-codegen-cli/src/main/java/io/swagger/codegen/cmd/ConfigHelp.java

@@ -0,0 +1,52 @@
+package io.swagger.codegen.cmd;
+
+import io.airlift.airline.Command;
+import io.airlift.airline.Option;
+import io.swagger.codegen.CliOption;
+import io.swagger.codegen.CodegenConfig;
+
+import java.util.ServiceLoader;
+
+import static java.util.ServiceLoader.load;
+
+@Command(name = "config-help", description = "Config help for chosen lang")
+public class ConfigHelp implements Runnable {
+
+    @Option(name = {"-l", "--lang"}, title = "language", required = true,
+            description = "language to get config help for")
+    private String lang;
+
+    /**
+     * Tries to load config class with SPI first, then with class name directly from classpath
+     *
+     * @param name name of config, or full qualified class name in classpath
+     * @return config class
+     */
+    private static CodegenConfig forName(String name) {
+        ServiceLoader<CodegenConfig> loader = load(CodegenConfig.class);
+        for (CodegenConfig config : loader) {
+            if (config.getName().equals(name)) {
+                return config;
+            }
+        }
+
+        // else try to load directly
+        try {
+            return (CodegenConfig) Class.forName(name).newInstance();
+        } catch (Exception e) {
+            throw new RuntimeException("Can't load config class with name ".concat(name), e);
+        }
+    }
+
+    @Override
+    public void run() {
+        System.out.println();
+        CodegenConfig config = forName(lang);
+        System.out.println("CONFIG OPTIONS");
+        for (CliOption langCliOption : config.cliOptions()) {
+            System.out.println("\t" + langCliOption.getOpt());
+            System.out.println("\t    " + langCliOption.getDescription());
+            System.out.println();
+        }
+    }
+}

modules/swagger-codegen-cli/src/main/java/io/swagger/codegen/cmd/Generate.java

@@ -0,0 +1,158 @@
+package io.swagger.codegen.cmd;
+
+import config.Config;
+import config.ConfigParser;
+import io.airlift.airline.Command;
+import io.airlift.airline.Option;
+import io.swagger.codegen.CliOption;
+import io.swagger.codegen.ClientOptInput;
+import io.swagger.codegen.ClientOpts;
+import io.swagger.codegen.CodegenConfig;
+import io.swagger.codegen.DefaultGenerator;
+import io.swagger.models.Swagger;
+import io.swagger.parser.SwaggerParser;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.File;
+import java.util.ServiceLoader;
+
+import static java.util.ServiceLoader.load;
+import static org.apache.commons.lang3.StringUtils.isNotEmpty;
+
+/**
+ * User: lanwen
+ * Date: 24.03.15
+ * Time: 20:22
+ */
+
+@Command(name = "generate", description = "Generate code with chosen lang")
+public class Generate implements Runnable {
+
+    public static final Logger LOG = LoggerFactory.getLogger(Generate.class);
+
+    public static final String TEMPLATE_DIR_PARAM = "templateDir";
+
+    @Option(name = {"-v", "--verbose"}, description = "verbose mode")
+    private boolean verbose;
+
+    @Option(name = {"-l", "--lang"}, title = "language", required = true,
+            description = "client language to generate (maybe class name in classpath, required)")
+    private String lang;
+
+    @Option(name = {"-o", "--output"}, title = "output directory",
+            description = "where to write the generated files (current dir by default)")
+    private String output = "";
+
+    @Option(name = {"-i", "--input-spec"}, title = "spec file", required = true,
+            description = "location of the swagger spec, as URL or file (required)")
+    private String spec;
+
+    @Option(name = {"-t", "--template-dir"}, title = "template directory",
+            description = "folder containing the template files")
+    private String templateDir;
+
+    @Option(name = {"-a", "--auth"}, title = "authorization",
+            description = "adds authorization headers when fetching the swagger definitions remotely. " +
+                    "Pass in a URL-encoded string of name:header with a comma separating multiple values")
+    private String auth;
+
+    @Option(name = {"-D"}, title = "system properties", description = "sets specified system properties in " +
+            "the format of name=value,name=value")
+    private String systemProperties;
+
+    @Option(name = {"-c", "--config"}, title = "configuration file", description = "Path to json configuration file. " +
+            "File content should be in a json format {\"optionKey\":\"optionValue\", \"optionKey1\":\"optionValue1\"...} " +
+            "Supported options can be different for each language. Run config-help -l {lang} command for language specific config options.")
+    private String configFile;
+
+    /**
+     * Tries to load config class with SPI first, then with class name directly from classpath
+     *
+     * @param name name of config, or full qualified class name in classpath
+     * @return config class
+     */
+    private static CodegenConfig forName(String name) {
+        ServiceLoader<CodegenConfig> loader = load(CodegenConfig.class);
+        for (CodegenConfig config : loader) {
+            if (config.getName().equals(name)) {
+                return config;
+            }
+        }
+
+        // else try to load directly
+        try {
+            return (CodegenConfig) Class.forName(name).newInstance();
+        } catch (Exception e) {
+            throw new RuntimeException("Can't load config class with name ".concat(name), e);
+        }
+    }
+
+    @Override
+    public void run() {
+        verbosed(verbose);
+
+        setSystemProperties();
+
+        ClientOptInput input = new ClientOptInput();
+
+        if (isNotEmpty(auth)) {
+            input.setAuth(auth);
+        }
+
+        CodegenConfig config = forName(lang);
+        config.setOutputDir(new File(output).getAbsolutePath());
+
+        if (null != templateDir) {
+            config.additionalProperties().put(TEMPLATE_DIR_PARAM, new File(templateDir).getAbsolutePath());
+        }
+
+        if (null != configFile) {
+            Config genConfig = ConfigParser.read(configFile);
+            if (null != genConfig) {
+                for (CliOption langCliOption : config.cliOptions()) {
+                    if (genConfig.hasOption(langCliOption.getOpt())) {
+                        config.additionalProperties().put(langCliOption.getOpt(), genConfig.getOption(langCliOption.getOpt()));
+                    }
+                }
+            }
+        }
+
+        input.setConfig(config);
+
+        Swagger swagger = new SwaggerParser().read(spec, input.getAuthorizationValues(), true);
+        new DefaultGenerator().opts(input.opts(new ClientOpts()).swagger(swagger)).generate();
+    }
+
+    private void setSystemProperties() {
+        if (systemProperties != null && systemProperties.length() > 0) {
+            for (String property : systemProperties.split(",")) {
+                int ix = property.indexOf('=');
+                if (ix > 0 && ix < property.length() - 1) {
+                    System.setProperty(property.substring(0, ix), property.substring(ix + 1));
+                }
+            }
+        }
+    }
+
+    /**
+     * If true parameter, adds system properties which enables debug mode in generator
+     *
+     * @param verbose - if true, enables debug mode
+     */
+    private void verbosed(boolean verbose) {
+        if (!verbose) {
+            return;
+        }
+        LOG.info("\nVERBOSE MODE: ON. Additional debug options are injected" +
+                "\n - [debugSwagger] prints the swagger specification as interpreted by the codegen" +
+                "\n - [debugModels] prints models passed to the template engine" +
+                "\n - [debugOperations] prints operations passed to the template engine" +
+                "\n - [debugSupportingFiles] prints additional data passed to the template engine");
+
+        System.setProperty("debugSwagger", "");
+        System.setProperty("debugModels", "");
+        System.setProperty("debugOperations", "");
+        System.setProperty("debugSupportingFiles", "");
+    }
+}

modules/swagger-codegen-cli/src/main/java/io/swagger/codegen/cmd/Langs.java

@@ -0,0 +1,23 @@
+package io.swagger.codegen.cmd;
+
+import ch.lambdaj.collection.LambdaIterable;
+import io.airlift.airline.Command;
+import io.swagger.codegen.CodegenConfig;
+
+import static ch.lambdaj.Lambda.on;
+import static ch.lambdaj.collection.LambdaCollections.with;
+import static java.util.ServiceLoader.load;
+
+/**
+ * User: lanwen
+ * Date: 24.03.15
+ * Time: 20:25
+ */
+@Command(name = "langs", description = "Shows available langs")
+public class Langs implements Runnable {
+    @Override
+    public void run() {
+        LambdaIterable<String> langs = with(load(CodegenConfig.class)).extract(on(CodegenConfig.class).getName());
+        System.out.printf("Available languages: %s%n", langs);
+    }
+}

modules/swagger-codegen-cli/src/main/java/io/swagger/codegen/cmd/Meta.java

@@ -0,0 +1,147 @@
+package io.swagger.codegen.cmd;
+
+import ch.lambdaj.function.convert.Converter;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+import com.samskivert.mustache.Mustache;
+import io.airlift.airline.Command;
+import io.airlift.airline.Option;
+import io.swagger.codegen.DefaultGenerator;
+import io.swagger.codegen.SupportingFile;
+import org.apache.commons.io.FileUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.Reader;
+import java.util.List;
+import java.util.Map;
+
+import static ch.lambdaj.collection.LambdaCollections.with;
+import static com.google.common.base.Joiner.on;
+
+/**
+ * User: lanwen
+ * Date: 24.03.15
+ * Time: 20:22
+ */
+
+@Command(name = "meta", description = "MetaGenerator. Generator for creating a new template set " +
+        "and configuration for Codegen.  The output will be based on the language you " +
+        "specify, and includes default templates to include.")
+public class Meta implements Runnable {
+
+    private static final Logger LOG = LoggerFactory.getLogger(Meta.class);
+
+    private static final String TEMPLATE_DIR_CLASSPATH = "codegen";
+    private static final String MUSTACHE_EXTENSION = ".mustache";
+
+    @Option(name = {"-o", "--output"}, title = "output directory",
+            description = "where to write the generated files (current dir by default)")
+    private String outputFolder = "";
+
+    @Option(name = {"-n", "--name"}, title = "name",
+            description = "the human-readable name of the generator")
+    private String name = "default";
+
+    @Option(name = {"-p", "--package"}, title = "package",
+            description = "the package to put the main class into (defaults to io.swagger.codegen)")
+    private String targetPackage = "io.swagger.codegen";
+
+    @Override
+    public void run() {
+        final File targetDir = new File(outputFolder);
+        LOG.info("writing to folder [{}]", targetDir.getAbsolutePath());
+
+        String mainClass = StringUtils.capitalize(name) + "Generator";
+
+        List<SupportingFile> supportingFiles = ImmutableList.of(
+                new SupportingFile("pom.mustache", "", "pom.xml"),
+                new SupportingFile("generatorClass.mustache",
+                        on(File.separator).join("src/main/java", asPath(targetPackage)), mainClass.concat(".java")),
+                new SupportingFile("README.mustache", "", "README.md"),
+                new SupportingFile("api.template", "src/main/resources" + File.separator + name, "api.mustache"),
+                new SupportingFile("model.template", "src/main/resources" + File.separator + name, "model.mustache"),
+                new SupportingFile("services.mustache",
+                        "src/main/resources/META-INF/services", "io.swagger.codegen.CodegenConfig")
+        );
+
+        Map<String, Object> data = new ImmutableMap.Builder<String, Object>()
+                .put("generatorPackage", targetPackage)
+                .put("generatorClass", mainClass)
+                .put("name", name)
+                .put("fullyQualifiedGeneratorClass", targetPackage + "." + mainClass).build();
+
+
+        with(supportingFiles).convert(processFiles(targetDir, data));
+    }
+
+    /**
+     * Converter method to process supporting files: execute with mustache,
+     * or simply copy to destination directory
+     *
+     * @param targetDir - destination directory
+     * @param data      - map with additional params needed to process templates
+     * @return converter object to pass to lambdaj
+     */
+    private Converter<SupportingFile, File> processFiles(final File targetDir, final Map<String, Object> data) {
+        return new Converter<SupportingFile, File>() {
+            private DefaultGenerator generator = new DefaultGenerator();
+
+            @Override
+            public File convert(SupportingFile support) {
+                try {
+                    File destinationFolder = new File(new File(targetDir.getAbsolutePath()), support.folder);
+                    File outputFile = new File(destinationFolder, support.destinationFilename);
+
+                    String template = generator
+                            .readTemplate(new File(TEMPLATE_DIR_CLASSPATH, support.templateFile).getPath());
+                    String formatted = template;
+
+                    if (support.templateFile.endsWith(MUSTACHE_EXTENSION)) {
+                        LOG.info("writing file to {}", outputFile.getAbsolutePath());
+                        formatted = Mustache.compiler().withLoader(loader(generator))
+                                .defaultValue("")
+                                .compile(template)
+                                .execute(data);
+                    } else {
+                        LOG.info("copying file to {}", outputFile.getAbsolutePath());
+                    }
+
+                    FileUtils.writeStringToFile(outputFile, formatted);
+                    return outputFile;
+
+                } catch (IOException e) {
+                    throw new RuntimeException("Can't generate project", e);
+                }
+            }
+        };
+    }
+
+    /**
+     * Creates mustache loader for template using classpath loader
+     *
+     * @param generator - class with reader getter
+     * @return loader for template
+     */
+    private Mustache.TemplateLoader loader(final DefaultGenerator generator) {
+        return new Mustache.TemplateLoader() {
+            public Reader getTemplate(String name) {
+                return generator.getTemplateReader(TEMPLATE_DIR_CLASSPATH
+                        + File.separator + name.concat(MUSTACHE_EXTENSION));
+            }
+        };
+    }
+
+    /**
+     * Converts package name to path on file system
+     *
+     * @param packageName - package name to convert
+     * @return relative path
+     */
+    private String asPath(String packageName) {
+        return packageName.replace(".", File.separator);
+    }
+}

modules/swagger-codegen-cli/src/main/resources/logback.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <layout class="ch.qos.logback.classic.PatternLayout">
+            <Pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</Pattern>
+        </layout>
+    </appender>
+    <logger name="io.swagger" level="debug"/>
+    <root level="error">
+        <appender-ref ref="STDOUT"/>
+    </root>
+</configuration>

modules/swagger-codegen-distribution/pom.xml

@@ -1,62 +0,0 @@
-<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>com.wordnik</groupId>
-    <artifactId>swagger-codegen-project</artifactId>
-    <version>2.1.0-M1</version>
-    <relativePath>../..</relativePath>
-  </parent>
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.wordnik</groupId>
-  <artifactId>swagger-codegen-distribution</artifactId>
-  <packaging>jar</packaging>
-  <name>swagger-codegen (executable)</name>
-  <version>2.1.0-M1</version>
-  <build>
-    <testSourceDirectory>src/test/scala</testSourceDirectory>
-    <outputDirectory>target/classes</outputDirectory>
-    <testOutputDirectory>target/test-classes</testOutputDirectory>
-    <defaultGoal>install</defaultGoal>
-    <directory>target</directory>
-    <finalName>${project.artifactId}-${project.version}</finalName>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-shade-plugin</artifactId>
-        <version>2.3</version>
-        <executions>
-          <execution>
-            <phase>package</phase>
-            <goals>
-              <goal>shade</goal>
-            </goals>
-            <configuration>
-              <minimizeJar>false</minimizeJar>
-              <createDependencyReducedPom>true</createDependencyReducedPom>
-              <dependencyReducedPomLocation>
-                ${java.io.tmpdir}/dependency-reduced-pom.xml
-              </dependencyReducedPomLocation>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-jar-plugin</artifactId>
-        <configuration>
-          <archive>
-            <manifest>
-              <mainClass>com.wordnik.swagger.codegen.Codegen</mainClass>
-            </manifest>
-          </archive>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-  <dependencies>
-    <dependency>
-      <groupId>com.wordnik</groupId>
-      <artifactId>swagger-codegen</artifactId>
-      <version>${project.parent.version}</version>
-    </dependency>
-  </dependencies>
-</project>

modules/swagger-codegen-distribution/src/main/java/com/wordnik/swagger/codegen/Readme.java

@@ -1,7 +0,0 @@
-package com.wordnik.swagger.codegen;
-
-public class Readme {
-  public String getInfo() {
-    return "See the documentation for swagger-codegen";
-  }
-}

modules/swagger-codegen/pom.xml

@@ -1,341 +1,357 @@
-<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>com.wordnik</groupId>
-    <artifactId>swagger-codegen-project</artifactId>
-    <version>2.1.0-M1</version>
-    <relativePath>../..</relativePath>
-  </parent>
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.wordnik</groupId>
-  <artifactId>swagger-codegen</artifactId>
-  <packaging>jar</packaging>
-  <name>swagger-codegen (core library)</name>
-  <version>2.1.0-M1</version>
-  <build>
-    <sourceDirectory>src/main/java</sourceDirectory>
-    <defaultGoal>install</defaultGoal>
-    <extensions>
-      <extension>
-        <groupId>org.jvnet.wagon-svn</groupId>
-        <artifactId>wagon-svn</artifactId>
-        <version>1.8</version>
-      </extension>
-      <extension>
-        <groupId>org.apache.maven.wagon</groupId>
-        <artifactId>wagon-ssh-external</artifactId>
-        <version>1.0-alpha-6</version>
-      </extension>
-      <extension>
-        <groupId>org.apache.maven.wagon</groupId>
-        <artifactId>wagon-webdav</artifactId>
-        <version>1.0-beta-1</version>
-      </extension>
-    </extensions>
-    <directory>target</directory>
-    <finalName>${project.artifactId}-${project.version}</finalName>
-    <plugins>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>exec-maven-plugin</artifactId>
-        <version>1.3.2</version>
-        <executions>
-          <execution>
-            <goals>
-              <goal>java</goal>
-            </goals>
-          </execution>
-        </executions>
-        <configuration>
-          <mainClass>com.wordnik.swagger.codegen.Codegen</mainClass>
-        </configuration>
-      </plugin>
-      <plugin>
-        <artifactId>maven-dependency-plugin</artifactId>
-        <executions>
-          <execution>
-            <phase>package</phase>
-            <goals>
-              <goal>copy-dependencies</goal>
-            </goals>
-            <configuration>
-              <outputDirectory>${project.build.directory}/lib</outputDirectory>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>net.alchim31.maven</groupId>
-        <artifactId>scala-maven-plugin</artifactId>
-        <executions>
-          <execution>
-            <goals>
-              <goal>add-source</goal>
-              <goal>compile</goal>
-              <goal>testCompile</goal>
-            </goals>
-          </execution>
-        </executions>
-        <configuration>
-          <configuration>
-            <recompileMode>incremental</recompileMode>
-          </configuration>
-          <jvmArgs>
-            <jvmArg>-Xmx384m</jvmArg>
-          </jvmArgs>
-          <args>
-            <arg>-target:jvm-1.6</arg>
-            <arg>-deprecation</arg>
-          </args>
-          <launchers>
-            <launcher>
-              <id>run-scalatest</id>
-              <mainClass>org.scalatest.tools.Runner</mainClass>
-              <args>
-                <arg>-p</arg>
-                <arg>${project.build.testOutputDirectory}</arg>
-              </args>
-              <jvmArgs>
-                <jvmArg>-Xmx512m</jvmArg>
-              </jvmArgs>
-            </launcher>
-          </launchers>
-        </configuration>
-      </plugin>
-      <plugin>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.0</version>
-        <configuration>
-          <source>1.6</source>
-          <target>1.6</target>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-jar-plugin</artifactId>
-        <version>2.4</version>
-        <configuration>
-          <archive>
-            <manifestEntries>
-              <mode>development</mode>
-              <url>${project.url}</url>
-              <implementation-version>${project.version}</implementation-version>
-              <package>com.wordnik</package>
-            </manifestEntries>
-          </archive>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-site-plugin</artifactId>
-        <version>2.1</version>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-release-plugin</artifactId>
-        <version>2.1</version>
-      </plugin>
-    </plugins>
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <groupId>net.alchim31.maven</groupId>
-          <artifactId>scala-maven-plugin</artifactId>
-          <version>${scala-maven-plugin-version}</version>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-gpg-plugin</artifactId>
-          <configuration>
-            <releaseProfiles>release</releaseProfiles>
-            <goals>sign</goals>
-          </configuration>
-        </plugin>
-      </plugins>
-    </pluginManagement>
-  </build>
-  <profiles>
-    <profile>
-      <id>release-profile</id>
-      <properties>
-        <skipTests>true</skipTests>
-      </properties>
-      <build>
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <parent>
+        <groupId>io.swagger</groupId>
+        <artifactId>swagger-codegen-project</artifactId>
+        <version>2.1.2</version>
+        <relativePath>../..</relativePath>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>swagger-codegen</artifactId>
+    <packaging>jar</packaging>
+    <name>swagger-codegen (core library)</name>
+    <build>
+        <sourceDirectory>src/main/java</sourceDirectory>
+        <defaultGoal>install</defaultGoal>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <excludes>
+                    <exclude>logback.xml</exclude>
+                </excludes>
+            </resource>
+        </resources>
+        <extensions>
+            <extension>
+                <groupId>org.jvnet.wagon-svn</groupId>
+                <artifactId>wagon-svn</artifactId>
+                <version>1.8</version>
+            </extension>
+            <extension>
+                <groupId>org.apache.maven.wagon</groupId>
+                <artifactId>wagon-ssh-external</artifactId>
+                <version>1.0-alpha-6</version>
+            </extension>
+            <extension>
+                <groupId>org.apache.maven.wagon</groupId>
+                <artifactId>wagon-webdav</artifactId>
+                <version>1.0-beta-1</version>
+            </extension>
+        </extensions>
+        <directory>target</directory>
+        <finalName>${project.artifactId}-${project.version}</finalName>
         <plugins>
-          <plugin>
-            <groupId>net.alchim31.maven</groupId>
-            <artifactId>scala-maven-plugin</artifactId>
-            <executions>
-              <execution>
-                <goals>
-                  <goal>compile</goal>
-                  <goal>testCompile</goal>
-                </goals>
-              </execution>
-            </executions>
-            <configuration />
-          </plugin>
-          <plugin>
-            <groupId>org.codehaus.mojo</groupId>
-            <artifactId>build-helper-maven-plugin</artifactId>
-            <executions>
-              <execution>
-                <id>add-source</id>
-                <phase>prepare-package</phase>
-                <goals>
-                  <goal>add-source</goal>
-                </goals>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>exec-maven-plugin</artifactId>
+                <version>1.3.2</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>java</goal>
+                        </goals>
+                    </execution>
+                </executions>
                 <configuration>
-                  <sources>
-                    <source>src/main/scala</source>
-                  </sources>
+                    <mainClass>io.swagger.codegen.Codegen</mainClass>
                 </configuration>
-              </execution>
-            </executions>
-          </plugin>
+            </plugin>
+            <plugin>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>copy-dependencies</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${project.build.directory}/lib</outputDirectory>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>net.alchim31.maven</groupId>
+                <artifactId>scala-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>add-source</goal>
+                            <goal>compile</goal>
+                            <goal>testCompile</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <configuration>
+                        <recompileMode>incremental</recompileMode>
+                    </configuration>
+                    <jvmArgs>
+                        <jvmArg>-Xmx384m</jvmArg>
+                    </jvmArgs>
+                    <args>
+                        <arg>-target:jvm-1.6</arg>
+                        <arg>-deprecation</arg>
+                    </args>
+                    <launchers>
+                        <launcher>
+                            <id>run-scalatest</id>
+                            <mainClass>org.scalatest.tools.Runner</mainClass>
+                            <args>
+                                <arg>-p</arg>
+                                <arg>${project.build.testOutputDirectory}</arg>
+                            </args>
+                            <jvmArgs>
+                                <jvmArg>-Xmx512m</jvmArg>
+                            </jvmArgs>
+                        </launcher>
+                    </launchers>
+                </configuration>
+            </plugin>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.0</version>
+                <configuration>
+                    <source>1.6</source>
+                    <target>1.6</target>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <version>2.4</version>
+                <configuration>
+                    <archive>
+                        <manifestEntries>
+                            <mode>development</mode>
+                            <url>${project.url}</url>
+                            <implementation-version>${project.version}</implementation-version>
+                            <package>io.swagger</package>
+                        </manifestEntries>
+                    </archive>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-site-plugin</artifactId>
+                <version>2.1</version>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-release-plugin</artifactId>
+                <version>2.1</version>
+            </plugin>
         </plugins>
-      </build>
-    </profile>
-    <profile>
-      <id>release-sign-artifacts</id>
-      <activation>
-        <property>
-          <name>performRelease</name>
-          <value>true</value>
-        </property>
-      </activation>
-      <build>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>net.alchim31.maven</groupId>
+                    <artifactId>scala-maven-plugin</artifactId>
+                    <version>${scala-maven-plugin-version}</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-gpg-plugin</artifactId>
+                    <configuration>
+                        <releaseProfiles>release</releaseProfiles>
+                        <goals>sign</goals>
+                    </configuration>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+    </build>
+    <profiles>
+        <profile>
+            <id>release-profile</id>
+            <properties>
+                <skipTests>true</skipTests>
+            </properties>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>net.alchim31.maven</groupId>
+                        <artifactId>scala-maven-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <goals>
+                                    <goal>compile</goal>
+                                    <goal>testCompile</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                        <configuration>
+                            <scala-version>${scala-version}</scala-version>
+                        </configuration>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>build-helper-maven-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>add-source</id>
+                                <phase>prepare-package</phase>
+                                <goals>
+                                    <goal>add-source</goal>
+                                </goals>
+                                <configuration>
+                                    <sources>
+                                        <source>src/main/scala</source>
+                                    </sources>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+        <profile>
+            <id>release-sign-artifacts</id>
+            <activation>
+                <property>
+                    <name>performRelease</name>
+                    <value>true</value>
+                </property>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-gpg-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>sign-artifacts</id>
+                                <phase>verify</phase>
+                                <goals>
+                                    <goal>sign</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+    <reporting>
+        <outputDirectory>target/site</outputDirectory>
         <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-gpg-plugin</artifactId>
-            <executions>
-              <execution>
-                <id>sign-artifacts</id>
-                <phase>verify</phase>
-                <goals>
-                  <goal>sign</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <version>2.9</version>
+                <configuration>
+                    <aggregate>true</aggregate>
+                    <debug>true</debug>
+                    <links>
+                        <link>http://java.sun.com/javaee/5/docs/api</link>
+                        <link>http://java.sun.com/j2se/1.5.0/docs/api</link>
+                    </links>
+                    <excludePackageNames/>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>net.alchim31.maven</groupId>
+                <artifactId>scala-maven-plugin</artifactId>
+                <version>${scala-maven-plugin-version}</version>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jxr-plugin</artifactId>
+                <version>2.3</version>
+                <configuration>
+                    <aggregate>true</aggregate>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-project-info-reports-plugin</artifactId>
+                <version>2.6</version>
+                <reportSets>
+                    <reportSet>
+                        <reports>
+                            <report>project-team</report>
+                        </reports>
+                    </reportSet>
+                </reportSets>
+            </plugin>
         </plugins>
-      </build>
-    </profile>
-  </profiles>
-  <reporting>
-    <outputDirectory>target/site</outputDirectory>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-javadoc-plugin</artifactId>
-        <version>2.9</version>
-        <configuration>
-          <aggregate>true</aggregate>
-          <debug>true</debug>
-          <links>
-            <link>http://java.sun.com/javaee/5/docs/api</link>
-            <link>http://java.sun.com/j2se/1.5.0/docs/api</link>
-          </links>
-          <excludePackageNames />
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>net.alchim31.maven</groupId>
-        <artifactId>scala-maven-plugin</artifactId>
-        <version>${scala-maven-plugin-version}</version>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-jxr-plugin</artifactId>
-        <version>2.3</version>
-        <configuration>
-          <aggregate>true</aggregate>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-project-info-reports-plugin</artifactId>
-        <version>2.6</version>
-        <reportSets>
-          <reportSet>
-            <reports>
-              <report>project-team</report>
-            </reports>
-          </reportSet>
-        </reportSets>
-      </plugin>
-    </plugins>
-  </reporting>
-  <dependencies>
-    <dependency>
-      <groupId>io.swagger</groupId>
-      <artifactId>swagger-parser</artifactId>
-      <version>${swagger-parser-version}</version>
-    </dependency>
-    <dependency>
-      <groupId>io.swagger</groupId>
-      <artifactId>swagger-compat-spec-parser</artifactId>
-      <version>${swagger-parser-version}</version>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>swagger-core</artifactId>
-      <version>${swagger-core-version}</version>
-    </dependency>
-    <dependency>
-      <groupId>com.samskivert</groupId>
-      <artifactId>jmustache</artifactId>
-      <version>${jmustache-version}</version>
-    </dependency>
-    <dependency>
-      <groupId>commons-io</groupId>
-      <artifactId>commons-io</artifactId>
-      <version>${commons-io-version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-plugin-tools-api</artifactId>
-      <version>2.0</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.felix</groupId>
-      <artifactId>maven-bundle-plugin</artifactId>
-      <version>${felix-version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-ext</artifactId>
-      <version>${slf4j-version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-api</artifactId>
-      <version>${slf4j-version}</version>
-    </dependency>
-    <dependency>
-      <groupId>commons-lang</groupId>
-      <artifactId>commons-lang</artifactId>
-      <version>${commons-lang-version}</version>
-    </dependency>
-    <dependency>
-      <groupId>commons-cli</groupId>
-      <artifactId>commons-cli</artifactId>
-      <version>${commons-cli-version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.scalatest</groupId>
-      <artifactId>scalatest_2.11</artifactId>
-      <version>${scala-test-version}</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-  <repositories>
-    <repository>
-      <id>sonatype-snapshots</id>
-      <url>https://oss.sonatype.org/content/repositories/snapshots</url>
-      <snapshots>
-        <enabled>true</enabled>
-      </snapshots>
-    </repository>
-  </repositories>
+    </reporting>
+    <dependencies>
+        <dependency>
+            <groupId>io.swagger</groupId>
+            <artifactId>swagger-parser</artifactId>
+            <version>${swagger-parser-version}</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.swagger</groupId>
+            <artifactId>swagger-compat-spec-parser</artifactId>
+            <version>${swagger-parser-version}</version>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>swagger-core</artifactId>
+            <version>${swagger-core-version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.samskivert</groupId>
+            <artifactId>jmustache</artifactId>
+            <version>${jmustache-version}</version>
+        </dependency>
+        <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+            <version>${commons-io-version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.maven</groupId>
+            <artifactId>maven-plugin-tools-api</artifactId>
+            <version>2.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.felix</groupId>
+            <artifactId>maven-bundle-plugin</artifactId>
+            <version>${felix-version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-ext</artifactId>
+            <version>${slf4j-version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <version>${slf4j-version}</version>
+        </dependency>
+        <dependency>
+            <groupId>commons-lang</groupId>
+            <artifactId>commons-lang</artifactId>
+            <version>${commons-lang-version}</version>
+        </dependency>
+        <dependency>
+            <groupId>commons-cli</groupId>
+            <artifactId>commons-cli</artifactId>
+            <version>${commons-cli-version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.scalatest</groupId>
+            <artifactId>scalatest_2.11</artifactId>
+            <version>${scala-test-version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.scala-lang</groupId>
+            <artifactId>scala-library</artifactId>
+            <version>${scala-version}</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+    <repositories>
+        <repository>
+            <id>sonatype-snapshots</id>
+            <url>https://oss.sonatype.org/content/repositories/snapshots</url>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+        </repository>
+    </repositories>
 </project>

modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/ClientOptInput.java

@@ -1,104 +0,0 @@
-/**
- *  Copyright 2015 Reverb, Inc.
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-
-package com.wordnik.swagger.codegen;
-
-import com.wordnik.swagger.codegen.ClientOpts;
-import com.wordnik.swagger.annotations.*;
-import com.wordnik.swagger.models.Swagger;
-import com.wordnik.swagger.models.auth.AuthorizationValue;
-
-import java.util.*;
-import java.net.URLEncoder;
-import java.net.URLDecoder;
-
-public class ClientOptInput {
-  private ClientOpts opts;
-  private Swagger swagger;
-  private List<AuthorizationValue> auths;
-  protected CodegenConfig config;
-
-  public ClientOptInput swagger(Swagger swagger) {
-    this.setSwagger(swagger);
-    return this;
-  }
-  public ClientOptInput opts(ClientOpts opts) {
-    this.setOpts(opts);
-    return this;
-  }
-
-  public void setAuth(String urlEncodedAuthString) {
-    List<AuthorizationValue> auths = new ArrayList<AuthorizationValue>();
-    if(urlEncodedAuthString != null && !"".equals(urlEncodedAuthString)) {
-      String[] parts = urlEncodedAuthString.split(",");
-      for(String part : parts) {
-        String[] kvPair = part.split(":");
-        if(kvPair.length == 2) {
-          auths.add(new AuthorizationValue(URLDecoder.decode(kvPair[0]), URLDecoder.decode(kvPair[1]), "header"));
-        }
-      }
-    }
-    this.auths = auths;
-  }
-  public String getAuth() {
-    if(auths != null) {
-      StringBuilder b = new StringBuilder();
-      for(AuthorizationValue v : auths) {
-        try {
-          if(b.toString().length() > 0)
-            b.append(",");
-          b.append(URLEncoder.encode(v.getKeyName(), "UTF-8"))
-            .append(":")
-            .append(URLEncoder.encode(v.getValue(), "UTF-8"));
-        }
-        catch (Exception e) {
-          // continue
-          e.printStackTrace();
-        }  
-      }
-      return b.toString();
-    }
-    else
-      return null;
-  }
-  public List<AuthorizationValue> getAuthorizationValues() {
-    return auths;
-  }
-
-  public CodegenConfig getConfig() {
-    return config;
-  }
-  public void setConfig(CodegenConfig config) {
-    this.config = config;
-  }
-
-  public void setOpts(ClientOpts opts) {
-    this.opts = opts;
-  }
-
-  public ClientOpts getOpts() {
-    return opts;
-  }
-
-  public void setSwagger(Swagger swagger) {
-    this.swagger = swagger;
-  }
-
-  @ApiModelProperty(dataType="Object")
-  public Swagger getSwagger() {
-    return swagger;
-  }
-}

modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/ClientOpts.java

@@ -1,52 +0,0 @@
-package com.wordnik.swagger.codegen;
-
-import com.wordnik.swagger.codegen.auth.*;
-
-import java.util.*;
-
-public class ClientOpts {
-  protected String uri;
-  protected String target;
-  protected AuthMethod auth;
-  protected Map<String, String> properties = new HashMap<String, String>();
-  protected String outputDirectory;
-
-  public String getUri() {
-    return uri;
-  }
-  public void setUri(String uri) {
-    this.uri = uri;
-  }
-
-  public String getTarget() {
-    return target;
-  }
-  public void setTarget(String target) {
-    this.target = target;
-  }
-
-  public Map<String, String> getProperties() {
-    return properties;
-  }
-  public void setProperties(Map<String, String> properties) {
-    this.properties = properties;
-  }  
-
-  public String getOutputDirectory() {
-    return outputDirectory;
-  }
-  public void setOutputDirectory(String outputDirectory) {
-    this.outputDirectory = outputDirectory;
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("ClientOpts: {\n");
-    sb.append("  uri: ").append(uri).append(",");
-    sb.append("  auth: ").append(auth).append(",");
-    sb.append(properties);
-    sb.append("}");
-    return sb.toString();
-  }
-}

modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/Codegen.java

@@ -1,138 +0,0 @@
-package com.wordnik.swagger.codegen;
-
-import com.wordnik.swagger.codegen.languages.*;
-import com.wordnik.swagger.models.Swagger;
-import com.wordnik.swagger.models.auth.AuthorizationValue;
-import com.wordnik.swagger.util.*;
-
-import io.swagger.parser.SwaggerParser;
-
-import org.apache.commons.cli.*;
-
-import java.io.File;
-import java.util.*;
-
-public class Codegen extends DefaultGenerator {
-  static Map<String, CodegenConfig> configs = new HashMap<String, CodegenConfig>();
-  static String configString;
-  static {
-    List<CodegenConfig> extensions = getExtensions();
-    StringBuilder sb = new StringBuilder();
-
-    for(CodegenConfig config : extensions) {
-      if(sb.toString().length() != 0)
-        sb.append(", ");
-      sb.append(config.getName());
-      configs.put(config.getName(), config);
-      configString = sb.toString();
-    }
-  }
-
-  static String debugInfoOptions = "\nThe following additional debug options are available for all codegen targets:" +
-    "\n -DdebugSwagger prints the swagger specification as interpreted by the codegen" +
-    "\n -DdebugModels prints models passed to the template engine" +
-    "\n -DdebugOperations prints operations passed to the template engine" +
-    "\n -DdebugSupportingFiles prints additional data passed to the template engine";
-  public static void main(String[] args) {
-
-    StringBuilder sb = new StringBuilder();
-
-    Options options = new Options();
-    options.addOption("h", "help", false, "shows this message");
-    options.addOption("l", "lang", true, "client language to generate.\nAvailable languages include:\n\t[" + configString + "]");
-    options.addOption("o", "output", true, "where to write the generated files");
-    options.addOption("i", "input-spec", true, "location of the swagger spec, as URL or file");
-    options.addOption("t", "template-dir", true, "folder containing the template files");
-    options.addOption("d", "debug-info", false, "prints additional info for debugging");
-    options.addOption("a", "auth", false, "addes authorization headers when fetching the swagger definitions remotely. Pass in a URL-encoded string of name:header with a comma separating multiple values");
-
-    ClientOptInput clientOptInput = new ClientOptInput();
-    ClientOpts clientOpts = new ClientOpts();
-    Swagger swagger = null;
-
-    CommandLine cmd = null;
-    try {
-      CommandLineParser parser = new BasicParser();
-      CodegenConfig config = null;
-
-      cmd = parser.parse(options, args);
-      if (cmd.hasOption("d")) {
-        usage(options);
-        System.out.println(debugInfoOptions);
-        return;
-      }
-      if (cmd.hasOption("a"))
-        clientOptInput.setAuth(cmd.getOptionValue("a"));
-      if (cmd.hasOption("l"))
-        clientOptInput.setConfig(getConfig(cmd.getOptionValue("l")));
-      else {
-        usage(options);
-        return;
-      }
-      if (cmd.hasOption("o"))
-        clientOptInput.getConfig().setOutputDir(cmd.getOptionValue("o"));
-      if (cmd.hasOption("h")) {
-        if(cmd.hasOption("l")) {
-          config = getConfig(String.valueOf(cmd.getOptionValue("l")));
-          if(config != null) {
-            options.addOption("h", "help", true, config.getHelp());
-            usage(options);
-            return;
-          }
-        }
-        usage(options);
-        return;
-      }
-      if (cmd.hasOption("i"))
-        swagger = new SwaggerParser().read(cmd.getOptionValue("i"), clientOptInput.getAuthorizationValues());
-      if (cmd.hasOption("t"))
-        clientOpts.getProperties().put("templateDir", String.valueOf(cmd.getOptionValue("t")));
-    }
-    catch (Exception e) {
-      usage(options);
-      return;
-    }
-    try{
-      clientOptInput
-        .opts(clientOpts)
-        .swagger(swagger);
-      new Codegen().opts(clientOptInput).generate();
-    }
-    catch (Exception e) {
-      e.printStackTrace();
-    }
-  }
-
-  public static List<CodegenConfig> getExtensions() {
-    ServiceLoader<CodegenConfig> loader = ServiceLoader.load(CodegenConfig.class);
-    List<CodegenConfig> output = new ArrayList<CodegenConfig>();
-    Iterator<CodegenConfig> itr = loader.iterator();
-    while(itr.hasNext()) {
-      output.add(itr.next());
-    }
-    return output;
-  }
-
-  static void usage(Options options) {
-    HelpFormatter formatter = new HelpFormatter();
-    formatter.printHelp( "Codegen", options );
-  }
-
-  public static CodegenConfig getConfig(String name) {
-    if(configs.containsKey(name)) {
-      return configs.get(name);
-    }
-    else {
-      // see if it's a class
-      try {
-        System.out.println("loading class " + name);
-        Class customClass = Class.forName(name);
-        System.out.println("loaded");
-        return (CodegenConfig)customClass.newInstance();
-      }
-      catch (Exception e) {
-        throw new RuntimeException("can't load class " + name);
-      }
-    }
-  }
-}

modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/CodegenConfig.java

@@ -1,53 +0,0 @@
-package com.wordnik.swagger.codegen;
-
-import com.wordnik.swagger.models.*;
-import com.wordnik.swagger.models.properties.*;
-
-import java.util.*;
-
-public interface CodegenConfig {
-  CodegenType getTag();
-  String getName();
-  String getHelp();
-  Map<String, Object> additionalProperties();
-  String apiPackage();
-  String apiFileFolder();
-  String fileSuffix();
-  String outputFolder();
-  String templateDir();
-  String modelFileFolder();
-  String modelPackage();
-  String toApiName(String name);
-  String toModelName(String name);
-  String toParamName(String name);
-  String escapeReservedWord(String name);
-  String getTypeDeclaration(Property p);
-  String getTypeDeclaration(String name);
-  void processOpts();
-
-  Set<String> reservedWords();
-
-  List<SupportingFile> supportingFiles();
-
-  void setOutputDir(String dir);
-  String getOutputDir();
-
-  CodegenModel fromModel(String name, Model model);
-  CodegenOperation fromOperation(String resourcePath, String httpMethod, Operation operation);
-  Set<String> defaultIncludes();
-  Map<String, String> typeMapping();
-  Map<String, String> instantiationTypes();
-  Map<String, String> importMapping();
-  Map<String, String> apiTemplateFiles();
-  Map<String, String> modelTemplateFiles();
-  void processSwagger(Swagger swagger);
-
-  String toApiFilename(String name);
-  String toModelFilename(String name);
-  String toModelImport(String name);
-  String toApiImport(String name);
-  void addOperationToGroup(String tag, String resourcePath, Operation operation, CodegenOperation co, Map<String, List<CodegenOperation>> operations);
-  Map<String, Object> postProcessModels(Map<String, Object> objs);
-  Map<String, Object> postProcessOperations(Map<String, Object> objs);
-  Map<String, Object> postProcessSupportingFileData(Map<String, Object> objs);
-}

modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/CodegenModel.java

@@ -1,16 +0,0 @@
-package com.wordnik.swagger.codegen;
-
-import com.wordnik.swagger.models.*;
-import com.wordnik.swagger.models.properties.*;
-
-import java.util.*;
-
-public class CodegenModel {
-  public String parent;
-  public String name, classname, description, classVarName, modelJson;
-  public String defaultValue;
-  public List<CodegenProperty> vars = new ArrayList<CodegenProperty>();
-  public Set<String> imports = new HashSet<String>();
-  public Boolean hasVars, emptyVars, hasMoreModels;
-  public ExternalDocs externalDocs;
-}

modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/CodegenModelFactory.java

@@ -1,38 +0,0 @@
-package com.wordnik.swagger.codegen;
-
-import java.util.HashMap;
-import java.util.Map;
-
-public final class CodegenModelFactory {
-
-  private static final Map<CodegenModelType, Class<?>> typeMapping = new HashMap<CodegenModelType, Class<?>>();
-
-  /**
-   * Configure a different implementation class.
-   * @param type the type that shall be replaced
-   * @param implementation the implementation class must extend the default class and must provide a public no-arg constructor
-   */
-  public static void setTypeMapping(CodegenModelType type, Class<?> implementation) {
-    if (!type.getDefaultImplementation().isAssignableFrom(implementation)) {
-      throw new IllegalArgumentException(implementation.getSimpleName() + " doesn't extend " + type.getDefaultImplementation().getSimpleName());
-    }
-    try {
-      implementation.newInstance();
-    } catch (Exception e) {
-      throw new IllegalArgumentException(e);
-    }
-    typeMapping.put(type, implementation);
-  }
-
-  @SuppressWarnings("unchecked")
-  public static <T> T newInstance(CodegenModelType type) {
-    Class<?> classType = typeMapping.get(type);
-    try {
-      return (T) (classType != null ? classType : type.getDefaultImplementation()).newInstance();
-    } catch (InstantiationException e) {
-      throw new RuntimeException(e);
-    } catch (IllegalAccessException e) {
-      throw new RuntimeException(e);
-    }
-  }
-}

modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/CodegenModelType.java

@@ -1,20 +0,0 @@
-package com.wordnik.swagger.codegen;
-
-public enum CodegenModelType {
-
-  MODEL(CodegenModel.class),
-  OPERATION(CodegenOperation.class),
-  PARAMETER(CodegenParameter.class),
-  PROPERTY(CodegenProperty.class),
-  RESPONSE(CodegenResponse.class);
-
-  private final Class<?> defaultImplementation;
-
-  private CodegenModelType(Class<?> defaultImplementation) {
-    this.defaultImplementation = defaultImplementation;
-  }
-
-  public Class<?> getDefaultImplementation() {
-    return defaultImplementation;
-  }
-}

modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/CodegenOperation.java

@@ -1,30 +0,0 @@
-package com.wordnik.swagger.codegen;
-
-import com.wordnik.swagger.models.*;
-
-import java.util.*;
-
-public class CodegenOperation {
-  public Boolean hasConsumes, hasProduces, hasParams, returnTypeIsPrimitive,
-    returnSimpleType, subresourceOperation, isMapContainer, isListContainer;
-  public String path, operationId, returnType, httpMethod, returnBaseType,
-    returnContainer, summary, notes, baseName, defaultResponse;
-
-  public List<Map<String, String>> consumes, produces;
-  public CodegenParameter bodyParam;
-  public List<CodegenParameter> allParams = new ArrayList<CodegenParameter>();
-  public List<CodegenParameter> bodyParams = new ArrayList<CodegenParameter>();
-  public List<CodegenParameter> pathParams = new ArrayList<CodegenParameter>();
-  public List<CodegenParameter> queryParams = new ArrayList<CodegenParameter>();
-  public List<CodegenParameter> headerParams = new ArrayList<CodegenParameter>();
-  public List<CodegenParameter> formParams = new ArrayList<CodegenParameter>();
-  public List<String> tags;
-  public List<CodegenResponse> responses = new ArrayList<CodegenResponse>();
-  public final List<CodegenProperty> responseHeaders = new ArrayList<CodegenProperty>();
-  public Set<String> imports = new HashSet<String>();
-  public List<Map<String, String>> examples;
-  public ExternalDocs externalDocs;
-
-  // legacy support
-  public String nickname;
-}

modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/CodegenParameter.java

@@ -1,37 +0,0 @@
-package com.wordnik.swagger.codegen;
-
-public class CodegenParameter {
-  public Boolean isFormParam, isQueryParam, isPathParam, isHeaderParam,
-    isCookieParam, isBodyParam, isFile, notFile, hasMore, isContainer, secondaryParam;
-  public String baseName, paramName, dataType, collectionFormat, description, baseType;
-  /**
-   * Determines whether this parameter is mandatory. If the parameter is in "path",
-   * this property is required and its value MUST be true. Otherwise, the property
-   * MAY be included and its default value is false.
-   */
-  public Boolean required;
-
-  public CodegenParameter copy() {
-    CodegenParameter output = new CodegenParameter();
-    output.isFile = this.isFile;
-    output.notFile = this.notFile;
-    output.hasMore = this.hasMore;
-    output.isContainer = this.isContainer;
-    output.secondaryParam = this.secondaryParam;
-    output.baseName = this.baseName;
-    output.paramName = this.paramName;
-    output.dataType = this.dataType;
-    output.collectionFormat = this.collectionFormat;
-    output.description = this.description;
-    output.baseType = this.baseType;
-    output.isFormParam = this.isFormParam;
-    output.isQueryParam = this.isQueryParam;
-    output.isPathParam = this.isPathParam;
-    output.isHeaderParam = this.isHeaderParam;
-    output.isCookieParam = this.isCookieParam;
-    output.isBodyParam = this.isBodyParam;
-    output.required = this.required;
-
-    return output;
-  }
-}

modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/CodegenProperty.java

@@ -1,24 +0,0 @@
-package com.wordnik.swagger.codegen;
-
-import java.util.*;
-
-public class CodegenProperty {
-  public String baseName, complexType, getter, setter, description, datatype, datatypeWithEnum,
-    name, min, max, defaultValue, baseType, containerType;
-
-  /** maxLength validation for strings, see http://json-schema.org/latest/json-schema-validation.html#rfc.section.5.2.1 */
-  public Integer maxLength;
-  /** minLength validation for strings, see http://json-schema.org/latest/json-schema-validation.html#rfc.section.5.2.2 */
-  public Integer minLength;
-  /** pattern validation for strings, see http://json-schema.org/latest/json-schema-validation.html#rfc.section.5.2.3 */
-  public String pattern;
-  /** A free-form property to include an example of an instance for this schema. */
-  public String example;
-
-  public Double minimum, maximum, exclusiveMinimum, exclusiveMaximum;
-  public Boolean hasMore = null, required = null, secondaryParam = null;
-  public Boolean isPrimitiveType, isContainer, isNotContainer;
-  public boolean isEnum;
-  public List<String> _enum;
-  public Map<String, Object> allowableValues;
-}

modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/CodegenResponse.java

@@ -1,10 +0,0 @@
-package com.wordnik.swagger.codegen;
-
-import java.util.*;
-
-public class CodegenResponse {
-  public String code, message;
-  public Boolean hasMore;
-  public List<Map<String, String>> examples;
-  Object schema;
-}

modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/CodegenType.java

@@ -1,34 +0,0 @@
-package com.wordnik.swagger.codegen;
-
-import com.fasterxml.jackson.annotation.*;
-
-import java.util.Map;
-import java.util.HashMap;
-
-public enum CodegenType {
-  CLIENT, SERVER, DOCUMENTATION, OTHER;
-
-  private static Map<String, CodegenType> names = new HashMap<String, CodegenType>();
-
-  static {
-    names.put("client", CLIENT);
-    names.put("server", SERVER);
-    names.put("documentation", DOCUMENTATION);
-    names.put("other", OTHER);
-  }
-
-  @JsonCreator
-  public static CodegenType forValue(String value) {
-    return names.get(value.toLowerCase());
-  }
-
-  @JsonValue
-  public String toValue() {
-    for (Map.Entry<String, CodegenType> entry : names.entrySet()) {
-      if (entry.getValue() == this)
-        return entry.getKey();
-    }
-
-    return null; // or fail
-  }
-}

modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/DefaultCodegen.java

@@ -1,901 +0,0 @@
-package com.wordnik.swagger.codegen;
-
-import com.wordnik.swagger.models.*;
-import com.wordnik.swagger.models.parameters.*;
-import com.wordnik.swagger.models.properties.*;
-import com.wordnik.swagger.util.Json;
-
-import org.apache.commons.lang.StringUtils;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.*;
-
-public class DefaultCodegen {
-  Logger LOGGER = LoggerFactory.getLogger(DefaultCodegen.class);
-
-  protected String outputFolder = "";
-  protected Set<String> defaultIncludes = new HashSet<String>();
-  protected Map<String, String> typeMapping = new HashMap<String, String>();
-  protected Map<String, String> instantiationTypes = new HashMap<String, String>();
-  protected Set<String> reservedWords = new HashSet<String>();
-  protected Set<String> languageSpecificPrimitives = new HashSet<String>();
-  protected Map<String, String> importMapping = new HashMap<String, String>();
-  protected String modelPackage = "", apiPackage = "", fileSuffix;
-  protected Map<String, String> apiTemplateFiles = new HashMap<String, String>();
-  protected Map<String, String> modelTemplateFiles = new HashMap<String, String>();
-  protected String templateDir;
-  protected Map<String, Object> additionalProperties = new HashMap<String, Object>();
-  protected List<SupportingFile> supportingFiles = new ArrayList<SupportingFile>();
-
-  public void processOpts(){
-    if(additionalProperties.containsKey("templateDir")) {
-      this.setTemplateDir((String)additionalProperties.get("templateDir"));
-    }
-  }
-
-  // override with any special post-processing
-  public Map<String, Object> postProcessModels(Map<String, Object> objs) {
-    return objs;
-  }
-
-  // override with any special post-processing
-  public Map<String, Object> postProcessOperations(Map<String, Object> objs) {
-    return objs;
-  }
-
-  // override with any special post-processing
-  public Map<String, Object> postProcessSupportingFileData(Map<String, Object> objs) {
-    return objs;
-  }
-
-  // override with any special handling of the entire swagger spec
-  public void processSwagger(Swagger swagger) {}
-  
-  // override with any special text escaping logic
-  public String escapeText(String input) {
-    if(input != null) {
-      String output = input.replaceAll("\n", " ");
-      output = output.replace("\"", "\\\"");
-      return output;
-    }
-    return input;
-  }
-
-  public Set<String> defaultIncludes() {
-    return defaultIncludes;
-  }
-  public Map<String, String> typeMapping() {
-    return typeMapping;
-  }
-  public Map<String, String> instantiationTypes() {
-    return instantiationTypes;
-  }
-  public Set<String> reservedWords() {
-    return reservedWords;
-  }
-  public Set<String> languageSpecificPrimitives() {
-    return languageSpecificPrimitives;
-  }
-  public Map<String, String> importMapping() {
-    return importMapping;
-  }
-  public String modelPackage() {
-    return modelPackage;
-  }
-  public String apiPackage() {
-    return apiPackage;
-  }
-  public String fileSuffix() {
-    return fileSuffix;
-  }
-  public String templateDir() {
-    return templateDir;
-  }
-  public Map<String, String> apiTemplateFiles() {
-    return apiTemplateFiles;
-  }
-  public Map<String, String> modelTemplateFiles() {
-    return modelTemplateFiles;
-  }
-
-  public String apiFileFolder() {
-    return outputFolder + "/" + apiPackage().replaceAll("\\.", "/");
-  }
-
-  public String modelFileFolder() {
-    return outputFolder + "/" + modelPackage().replaceAll("\\.", "/");
-  }
-
-  public Map<String, Object> additionalProperties() {
-    return additionalProperties;
-  }
-  public List<SupportingFile> supportingFiles() {
-    return supportingFiles;
-  }
-  public String outputFolder() {
-    return outputFolder;
-  }
-
-  public void setOutputDir(String dir) {
-    this.outputFolder = dir;
-  }
-  public String getOutputDir() {
-    return outputFolder();
-  }
-
-  public void setTemplateDir(String templateDir) {
-    this.templateDir = templateDir;
-  }
-
-  public String toApiFilename(String name) {
-    return initialCaps(name) + "Api";
-  }
-
-  public String toModelFilename(String name) {
-    return name;
-  }
-
-  public String toVarName(String name) {
-    if(reservedWords.contains(name))
-      return escapeReservedWord(name);
-    else
-      return name;
-  }
-
-  public String toParamName(String name) {
-    if(reservedWords.contains(name)) {
-      return escapeReservedWord(name);
-    }
-    return name;
-  }
-
-  public String escapeReservedWord(String name) {
-    throw new RuntimeException("reserved word " + name + " not allowed");
-  }
-
-  public String toModelImport(String name) {
-    if("".equals(modelPackage()))
-      return name;
-    else
-      return modelPackage() + "." + name;
-  }
-
-  public String toApiImport(String name) {
-    return apiPackage() + "." + name;
-  }
-
-  public DefaultCodegen() {
-    defaultIncludes = new HashSet<String>(
-      Arrays.asList("double",
-        "int",
-        "long",
-        "short",
-        "char",
-        "float",
-        "String",
-        "boolean",
-        "Boolean",
-        "Double",
-        "Void",
-        "Integer",
-        "Long",
-        "Float")
-      );
-
-    typeMapping = new HashMap<String, String>();
-    typeMapping.put("array", "List");
-    typeMapping.put("map", "Map");
-    typeMapping.put("List", "List");
-    typeMapping.put("boolean", "Boolean");
-    typeMapping.put("string", "String");
-    typeMapping.put("int", "Integer");
-    typeMapping.put("float", "Float");
-    typeMapping.put("number", "BigDecimal");
-    typeMapping.put("DateTime", "Date");
-    typeMapping.put("long", "Long");
-    typeMapping.put("short", "Short");
-    typeMapping.put("char", "String");
-    typeMapping.put("double", "Double");
-    typeMapping.put("object", "Object");
-    typeMapping.put("integer", "Integer");
-
-    instantiationTypes = new HashMap<String, String>();
-
-    reservedWords = new HashSet<String>();
-
-    importMapping = new HashMap<String, String>();
-    importMapping.put("BigDecimal", "java.math.BigDecimal");
-    importMapping.put("UUID", "java.util.UUID");
-    importMapping.put("File", "java.io.File");
-    importMapping.put("Date", "java.util.Date");
-    importMapping.put("Timestamp", "java.sql.Timestamp");
-    importMapping.put("Map", "java.util.Map");
-    importMapping.put("HashMap", "java.util.HashMap");
-    importMapping.put("Array", "java.util.List");
-    importMapping.put("ArrayList", "java.util.ArrayList");
-    importMapping.put("List", "java.util.*");
-    importMapping.put("Set", "java.util.*");
-    importMapping.put("DateTime", "org.joda.time.*");
-    importMapping.put("LocalDateTime", "org.joda.time.*");
-    importMapping.put("LocalDate", "org.joda.time.*");
-    importMapping.put("LocalTime", "org.joda.time.*");
-  }
-
-  public String toInstantiationType(Property p) {
-    if (p instanceof MapProperty) {
-      MapProperty ap = (MapProperty) p;
-      String inner = getSwaggerType(ap.getAdditionalProperties());
-      return instantiationTypes.get("map") + "<String, " + inner + ">";
-    }
-    else if (p instanceof ArrayProperty) {
-      ArrayProperty ap = (ArrayProperty) p;
-      String inner = getSwaggerType(ap.getItems());
-      return instantiationTypes.get("array") + "<" + inner + ">";
-    }
-    else
-      return null;
-  }
-
-  public String toDefaultValue(Property p) {
-    if(p instanceof StringProperty)
-      return "null";
-    else if (p instanceof BooleanProperty)
-      return "null";
-    else if(p instanceof DateProperty)
-      return "null";
-    else if(p instanceof DateTimeProperty)
-      return "null";
-    else if (p instanceof DoubleProperty)
-      return "null";
-    else if (p instanceof FloatProperty)
-      return "null";
-    else if (p instanceof IntegerProperty)
-      return "null";
-    else if (p instanceof LongProperty)
-      return "null";
-    else if (p instanceof MapProperty) {
-      MapProperty ap = (MapProperty) p;
-      String inner = getSwaggerType(ap.getAdditionalProperties());
-      return "new HashMap<String, " + inner + ">() ";
-    }
-    else if (p instanceof ArrayProperty) {
-      ArrayProperty ap = (ArrayProperty) p;
-      String inner = getSwaggerType(ap.getItems());
-      return "new ArrayList<" + inner + ">() ";
-    }
-    else
-      return "null";
-  }
-
-  /**
-   * returns the swagger type for the property
-   **/
-  public String getSwaggerType(Property p) {
-    String datatype = null;
-    if(p instanceof StringProperty)
-      datatype = "string";
-    else if (p instanceof BooleanProperty)
-      datatype = "boolean";
-    else if(p instanceof DateProperty)
-      datatype = "date";
-    else if(p instanceof DateTimeProperty)
-      datatype = "DateTime";
-    else if (p instanceof DoubleProperty)
-      datatype = "double";
-    else if (p instanceof FloatProperty)
-      datatype = "float";
-    else if (p instanceof IntegerProperty)
-      datatype = "integer";
-    else if (p instanceof LongProperty)
-      datatype = "long";
-    else if (p instanceof MapProperty)
-      datatype = "map";
-    else if (p instanceof DecimalProperty)
-      datatype = "number";
-    else if (p instanceof RefProperty) {
-      RefProperty r = (RefProperty)p;
-      datatype = r.get$ref();
-      if(datatype.indexOf("#/definitions/") == 0)
-        datatype = datatype.substring("#/definitions/".length());
-    }
-    else {
-      if(p != null) datatype = p.getType();
-    }
-    return datatype;
-  }
-
-  public String initialCaps(String name) {
-    return Character.toUpperCase(name.charAt(0)) + name.substring(1);
-  }
-
-  public String getTypeDeclaration(String name) {
-    return name;
-  }
-
-  public String getTypeDeclaration(Property p) {
-    String swaggerType = getSwaggerType(p);
-    if(typeMapping.containsKey(swaggerType))
-      return typeMapping.get(swaggerType);
-    return swaggerType;
-  }
-
-  public String toApiName(String name) {
-    if(name.length() == 0)
-      return "DefaultApi";
-    return initialCaps(name) + "Api";
-  }
-
-  public String toModelName(String name) {
-    return initialCaps(name);
-  }
-
-  public CodegenModel fromModel(String name, Model model) {
-    CodegenModel m = CodegenModelFactory.newInstance(CodegenModelType.MODEL);
-    if(reservedWords.contains(name))
-      m.name = escapeReservedWord(name);
-    else
-      m.name = name;
-    m.description = model.getDescription();
-    m.classname = toModelName(name);
-    m.classVarName = toVarName(name);
-    m.modelJson = Json.pretty(model);
-    m.externalDocs = model.getExternalDocs();
-    int count = 0;
-    if(model instanceof ArrayModel) {
-      ArrayModel am = (ArrayModel) model;
-      ArrayProperty arrayProperty = new ArrayProperty(am.getItems());
-      CodegenProperty cp = fromProperty(name, arrayProperty);
-      if(cp.complexType != null && !defaultIncludes.contains(cp.complexType))
-        m.imports.add(cp.complexType);
-      m.parent = toInstantiationType(arrayProperty);
-      String containerType = cp.containerType;
-      if(instantiationTypes.containsKey(containerType))
-        m.imports.add(instantiationTypes.get(containerType));
-      if(typeMapping.containsKey(containerType)) {
-        containerType = typeMapping.get(containerType);
-        cp.containerType = containerType;
-        m.imports.add(containerType);
-      }
-    }
-    else if (model instanceof RefModel) {
-      // TODO
-    }
-    else {
-      ModelImpl impl = (ModelImpl) model;
-      if(impl.getAdditionalProperties() != null) {
-        MapProperty mapProperty = new MapProperty(impl.getAdditionalProperties());
-        CodegenProperty cp = fromProperty(name, mapProperty);
-        if(cp.complexType != null && !defaultIncludes.contains(cp.complexType))
-          m.imports.add(cp.complexType);
-        m.parent = toInstantiationType(mapProperty);
-        String containerType = cp.containerType;
-        if(instantiationTypes.containsKey(containerType))
-          m.imports.add(instantiationTypes.get(containerType));
-        if(typeMapping.containsKey(containerType)) {
-          containerType = typeMapping.get(containerType);
-          cp.containerType = containerType;
-          m.imports.add(containerType);
-        }
-      }
-      if(impl.getProperties() != null && impl.getProperties().size() > 0) {
-        m.hasVars = true;
-        for(String key: impl.getProperties().keySet()) {
-          Property prop = impl.getProperties().get(key);
-
-          if(prop == null) {
-            LOGGER.warn("null property for " + key);
-          }
-          else {
-            CodegenProperty cp = fromProperty(key, prop);
-            cp.required = false;
-            if(impl.getRequired() != null) {
-              for(String req : impl.getRequired()) {
-                if(key.equals(req))
-                  cp.required = true;
-              }
-            }
-            if(cp.complexType != null && !defaultIncludes.contains(cp.complexType)) {
-              m.imports.add(cp.complexType);
-            }
-            m.vars.add(cp);
-            count += 1;
-            if(count != impl.getProperties().keySet().size())
-              cp.hasMore = new Boolean(true);
-            if(cp.isContainer != null) {
-              String arrayImport = typeMapping.get("array");
-              if(arrayImport != null &&
-                !languageSpecificPrimitives.contains(arrayImport) && 
-                !defaultIncludes.contains(arrayImport))
-                m.imports.add(arrayImport);
-            }
-
-            if(cp.complexType != null &&
-              !languageSpecificPrimitives.contains(cp.complexType) && 
-              !defaultIncludes.contains(cp.complexType))
-              m.imports.add(cp.complexType);
-
-            if(cp.baseType != null &&
-              !languageSpecificPrimitives.contains(cp.baseType) && 
-              !defaultIncludes.contains(cp.baseType))
-              m.imports.add(cp.baseType);
-          }
-        }
-      }
-      else {
-        m.emptyVars = true;
-      }
-    }
-    return m;
-  }
-
-  public CodegenProperty fromProperty(String name, Property p) {
-    if(p == null) {
-      LOGGER.error("unexpected missing property for name " + null);
-      return null;
-    }
-    CodegenProperty property = CodegenModelFactory.newInstance(CodegenModelType.PROPERTY);
-
-    property.name = toVarName(name);
-    property.baseName = name;
-    property.description = escapeText(p.getDescription());
-    property.getter = "get" + initialCaps(name);
-    property.setter = "set" + initialCaps(name);
-    property.example = p.getExample();
-    property.defaultValue = toDefaultValue(p);
-
-    String type = getSwaggerType(p);
-
-    if(p instanceof AbstractNumericProperty) {
-      AbstractNumericProperty np = (AbstractNumericProperty) p;
-      property.minimum = np.getMinimum();
-      property.maximum = np.getMaximum();
-      property.exclusiveMinimum = np.getExclusiveMinimum();
-      property.exclusiveMaximum = np.getExclusiveMaximum();
-
-      // legacy support
-      Map<String, Object> allowableValues = new HashMap<String, Object>();
-      if(np.getMinimum() != null)
-        allowableValues.put("min", np.getMinimum());
-      if(np.getMaximum() != null)
-        allowableValues.put("max", np.getMaximum());
-      property.allowableValues = allowableValues;
-    }
-
-    if(p instanceof StringProperty) {
-      StringProperty sp = (StringProperty) p;
-      property.maxLength = sp.getMaxLength();
-      property.minLength = sp.getMinLength();
-      property.pattern = sp.getPattern();
-      if(sp.getEnum() != null) {
-        List<String> _enum = sp.getEnum();
-        property._enum = _enum;
-        property.isEnum = true;
-
-        // legacy support
-        Map<String, Object> allowableValues = new HashMap<String, Object>();
-        allowableValues.put("values", _enum);
-        property.allowableValues = allowableValues;
-      }
-    }
-
-    property.datatype = getTypeDeclaration(p);
-
-    // this can cause issues for clients which don't support enums
-    if(property.isEnum)
-      property.datatypeWithEnum = StringUtils.capitalize(property.name) + "Enum";
-    else
-      property.datatypeWithEnum = property.datatype;
-
-    property.baseType = getSwaggerType(p);
-
-    if(p instanceof ArrayProperty) {
-      property.isContainer = true;
-      property.containerType = "array";
-      ArrayProperty ap = (ArrayProperty) p;
-      CodegenProperty cp = fromProperty("inner", ap.getItems());
-      if(cp == null) {
-        LOGGER.warn("skipping invalid property " + Json.pretty(p));
-      }
-      else {
-        property.baseType = getSwaggerType(p);
-        if(!languageSpecificPrimitives.contains(cp.baseType))
-          property.complexType = cp.baseType;
-        else
-          property.isPrimitiveType = true;
-      }
-    }
-    else if(p instanceof MapProperty) {
-      property.isContainer = true;
-      property.containerType = "map";
-      MapProperty ap = (MapProperty) p;
-      CodegenProperty cp = fromProperty("inner", ap.getAdditionalProperties());
-
-      property.baseType = getSwaggerType(p);
-      if(!languageSpecificPrimitives.contains(cp.baseType))
-        property.complexType = cp.baseType;
-      else
-        property.isPrimitiveType = true;
-    }
-    else {
-      property.isNotContainer = true;
-      if(languageSpecificPrimitives().contains(type))
-        property.isPrimitiveType = true;
-      else
-        property.complexType = property.baseType;
-    }
-    return property;
-  }
-
-  public CodegenOperation fromOperation(String path, String httpMethod, Operation operation){
-    CodegenOperation op = CodegenModelFactory.newInstance(CodegenModelType.OPERATION);
-    Set<String> imports = new HashSet<String>();
-
-    String operationId = operation.getOperationId();
-    if(operationId == null) {
-      String tmpPath = path;
-      tmpPath = tmpPath.replaceAll("\\{", "");
-      tmpPath = tmpPath.replaceAll("\\}", "");
-      String[] parts = (tmpPath + "/" + httpMethod).split("/");
-      StringBuilder builder = new StringBuilder();
-      if("/".equals(tmpPath)) {
-        // must be root tmpPath
-        builder.append("root");
-      }
-      for(int i = 0; i < parts.length; i++) {
-        String part = parts[i];
-        if(part.length() > 0) {
-          if(builder.toString().length() == 0)
-            part = Character.toLowerCase(part.charAt(0)) + part.substring(1);
-          else
-            part = initialCaps(part);
-          builder.append(part);
-        }
-      }
-      operationId = builder.toString();
-      LOGGER.warn("generated operationId " + operationId);
-    }
-    op.path = path;
-    op.operationId = operationId;
-    op.summary = escapeText(operation.getSummary());
-    op.notes = escapeText(operation.getDescription());
-    op.tags = operation.getTags();
-
-    Response methodResponse = null;
-
-    if(operation.getConsumes() != null && operation.getConsumes().size() > 0) {
-      List<Map<String, String>> c = new ArrayList<Map<String, String>>();
-      int count = 0;
-      for(String key: operation.getConsumes()) {
-        Map<String, String> mediaType = new HashMap<String, String>();
-        mediaType.put("mediaType", key);
-        count += 1;
-        if (count < operation.getConsumes().size())
-          mediaType.put("hasMore", "true");
-        c.add(mediaType);
-      }
-      op.consumes = c;
-      op.hasConsumes = true;
-    }
-
-    if(operation.getProduces() != null && operation.getProduces().size() > 0) {
-      List<Map<String, String>> c = new ArrayList<Map<String, String>>();
-      int count = 0;
-      for(String key: operation.getProduces()) {
-        Map<String, String> mediaType = new HashMap<String, String>();
-        mediaType.put("mediaType", key);
-        count += 1;
-        if (count < operation.getProduces().size())
-          mediaType.put("hasMore", "true");
-        c.add(mediaType);
-      }
-      op.produces = c;
-      op.hasProduces = true;
-    }
-
-    if(operation.getResponses() != null) {
-      for(String responseCode: new TreeSet<String>(operation.getResponses().keySet())) {
-        Response response = operation.getResponses().get(responseCode);
-        if (responseCode.startsWith("2")) {
-          // use the first, i.e. the smallest 2xx response status as methodResponse
-          methodResponse = response;
-          break;
-        }
-      }
-      if(methodResponse == null && operation.getResponses().keySet().contains("default")) {
-        methodResponse = operation.getResponses().get("default");
-      }
-      for(String responseCode: operation.getResponses().keySet()) {
-        Response response = operation.getResponses().get(responseCode);
-        if(response != methodResponse) {
-          CodegenResponse r = fromResponse(responseCode, response);
-          op.responses.add(r);
-        }
-        for(int i = 0; i < op.responses.size() - 1; i++) {
-          CodegenResponse r = op.responses.get(i);
-          r.hasMore = new Boolean(true);
-        }
-      }
-    }
-
-    if(methodResponse != null) {
-     if (methodResponse.getSchema() != null) {
-      CodegenProperty cm = fromProperty("response", methodResponse.getSchema());
-
-      Property responseProperty = methodResponse.getSchema();
-
-      if(responseProperty instanceof ArrayProperty) {
-        ArrayProperty ap = (ArrayProperty) responseProperty;
-        CodegenProperty innerProperty = fromProperty("response", ap.getItems());
-        op.returnBaseType = innerProperty.baseType;
-      }
-      else {
-        if(cm.complexType != null)
-          op.returnBaseType = cm.complexType;
-        else
-          op.returnBaseType = cm.baseType;
-      }
-      op.examples = toExamples(methodResponse.getExamples());
-      op.defaultResponse = toDefaultValue(responseProperty);
-      op.returnType = cm.datatype;
-      if(cm.isContainer != null) {
-        op.returnContainer = cm.containerType;
-        if("map".equals(cm.containerType))
-          op.isMapContainer = Boolean.TRUE;
-        else if ("list".equalsIgnoreCase(cm.containerType))
-          op.isListContainer = Boolean.TRUE;
-      }
-      else
-        op.returnSimpleType = true;
-      if (languageSpecificPrimitives().contains(op.returnBaseType) || op.returnBaseType == null)
-        op.returnTypeIsPrimitive = true;
-     }
-     addHeaders(methodResponse, op.responseHeaders);
-    }
-
-    if(op.returnBaseType == null) {
-      op.returnTypeIsPrimitive = true;
-      op.returnSimpleType = true;
-    }
-
-    if(op.returnBaseType != null &&
-      !defaultIncludes.contains(op.returnBaseType) &&
-      !languageSpecificPrimitives.contains(op.returnBaseType))
-      imports.add(op.returnBaseType);
-
-    List<Parameter> parameters = operation.getParameters();
-    CodegenParameter bodyParam = null;
-    List<CodegenParameter> allParams = new ArrayList<CodegenParameter>();
-    List<CodegenParameter> bodyParams = new ArrayList<CodegenParameter>();
-    List<CodegenParameter> pathParams = new ArrayList<CodegenParameter>();
-    List<CodegenParameter> queryParams = new ArrayList<CodegenParameter>();
-    List<CodegenParameter> headerParams = new ArrayList<CodegenParameter>();
-    List<CodegenParameter> cookieParams = new ArrayList<CodegenParameter>();
-    List<CodegenParameter> formParams = new ArrayList<CodegenParameter>();
-
-    if(parameters != null) {
-      for(Parameter param : parameters) {
-        CodegenParameter p = fromParameter(param, imports);
-        allParams.add(p);
-        if(param instanceof QueryParameter) {
-          p.isQueryParam = new Boolean(true);
-          queryParams.add(p.copy());
-        }
-        else if(param instanceof PathParameter) {
-          p.required = true;
-          p.isPathParam = new Boolean(true);
-          pathParams.add(p.copy());
-        }
-        else if(param instanceof HeaderParameter) {
-          p.isHeaderParam = new Boolean(true);
-          headerParams.add(p.copy());
-        }
-        else if(param instanceof CookieParameter) {
-          p.isCookieParam = new Boolean(true);
-          cookieParams.add(p.copy());
-        }
-        else if(param instanceof BodyParameter) {
-          p.isBodyParam = new Boolean(true);
-          bodyParam = p;
-          bodyParams.add(p.copy());
-        }
-        else if(param instanceof FormParameter) {
-          if("file".equalsIgnoreCase(((FormParameter)param).getType()))
-            p.isFile = true;
-          else
-            p.notFile = true;
-          p.isFormParam = new Boolean(true);
-          formParams.add(p.copy());
-        }
-      }
-    }
-    for(String i: imports) {
-      if(!defaultIncludes.contains(i) && !languageSpecificPrimitives.contains(i)){
-        op.imports.add(i);
-      }
-    }
-    op.bodyParam = bodyParam;
-    op.httpMethod = httpMethod.toUpperCase();
-    op.allParams = addHasMore(allParams);
-    op.bodyParams = addHasMore(bodyParams);
-    op.pathParams = addHasMore(pathParams);
-    op.queryParams = addHasMore(queryParams);
-    op.headerParams = addHasMore(headerParams);
-    // op.cookieParams = cookieParams;
-    op.formParams = addHasMore(formParams);
-    // legacy support
-    op.nickname = operationId;
-
-    if(op.allParams.size() > 0) 
-      op.hasParams = true;
-    op.externalDocs = operation.getExternalDocs();
-
-    return op;
-  }
-
-  public CodegenResponse fromResponse(String responseCode, Response response) {
-    CodegenResponse r = CodegenModelFactory.newInstance(CodegenModelType.RESPONSE);
-    if("default".equals(responseCode))
-      r.code = "0";
-    else
-      r.code = responseCode;
-    r.message = response.getDescription();
-    r.schema = response.getSchema();
-    r.examples = toExamples(response.getExamples());
-    return r;
-  }
-
-  public CodegenParameter fromParameter(Parameter param, Set<String> imports) {
-    CodegenParameter p = CodegenModelFactory.newInstance(CodegenModelType.PARAMETER);
-    p.baseName = param.getName();
-    p.description = param.getDescription();
-    p.required = param.getRequired();
-
-    if(param instanceof SerializableParameter) {
-      SerializableParameter qp = (SerializableParameter) param;
-      Property property = null;
-      String collectionFormat = null;
-      if("array".equals(qp.getType())) {
-        Property inner = qp.getItems();
-        if(inner == null) {
-          LOGGER.warn("warning!  No inner type supplied for array parameter \"" + qp.getName() + "\", using String");
-          inner = new StringProperty().description("//TODO automatically added by swagger-codegen");
-        }
-        property = new ArrayProperty(inner);
-        collectionFormat = qp.getCollectionFormat();
-        CodegenProperty pr = fromProperty("inner", inner);
-        p.baseType = pr.datatype;
-        imports.add(pr.baseType);
-      }
-      else
-        property = PropertyBuilder.build(qp.getType(), qp.getFormat(), null);
-      if(property == null) {
-        LOGGER.warn("warning!  Property type \"" + qp.getType() + "\" not found for parameter \"" + param.getName() + "\", using String");
-        property = new StringProperty().description("//TODO automatically added by swagger-codegen.  Type was " + qp.getType() + " but not supported");
-      }
-      CodegenProperty model = fromProperty(qp.getName(), property);
-      p.collectionFormat = collectionFormat;
-      p.dataType = model.datatype;
-      p.paramName = toParamName(qp.getName());
-
-      if(model.complexType != null) {
-        imports.add(model.complexType);
-      }
-    }
-    else {
-      BodyParameter bp = (BodyParameter) param;
-      Model model = bp.getSchema();
-
-      if(model instanceof ModelImpl) {
-        ModelImpl impl = (ModelImpl) model;
-        CodegenModel cm = fromModel(bp.getName(), impl);
-        if(cm.emptyVars != null && cm.emptyVars == false) {
-          p.dataType = getTypeDeclaration(cm.classname);
-          imports.add(p.dataType);
-        }
-        else {
-          // TODO: missing format, so this will not always work
-          Property prop = PropertyBuilder.build(impl.getType(), null, null);
-          CodegenProperty cp = fromProperty("property", prop);
-          if(cp != null) {
-            p.dataType = cp.datatype;
-          }
-        }
-      }
-      else if(model instanceof ArrayModel) {
-        // to use the built-in model parsing, we unwrap the ArrayModel
-        // and get a single property from it
-        ArrayModel impl = (ArrayModel) model;
-        CodegenModel cm = fromModel(bp.getName(), impl);
-        // get the single property
-        ArrayProperty ap = new ArrayProperty().items(impl.getItems());
-        CodegenProperty cp = fromProperty("inner", ap);
-        if(cp.complexType != null) {
-          imports.add(cp.complexType);
-        }
-        imports.add(cp.baseType);
-        p.dataType = cp.datatype;
-        p.isContainer = true;
-      }
-      else{
-        Model sub = bp.getSchema();
-        if(sub instanceof RefModel) {
-          String name = ((RefModel)sub).getSimpleRef();
-          if(typeMapping.containsKey(name))
-            name = typeMapping.get(name);
-          else {
-            name = toModelName(name);
-            if(defaultIncludes.contains(name)) {
-              imports.add(name);
-            }
-            imports.add(name);
-            name = getTypeDeclaration(name);
-          }
-          p.dataType = name;
-        }
-      }
-      p.paramName = toParamName(bp.getName());
-    }
-    return p;
-  }
-
-  protected List<Map<String, String>> toExamples(Map<String, String> examples) {
-    if(examples == null)
-      return null;
-
-    List<Map<String, String>> output = new ArrayList<Map<String, String>>();
-    for(String key: examples.keySet()) {
-      String value = examples.get(key);
-
-      Map<String, String> kv = new HashMap<String, String>();
-      kv.put("contentType", key);
-      kv.put("example", value);
-      output.add(kv);
-    }
-    return output;
-  }
-
-  private void addHeaders(Response response, List<CodegenProperty> target) {
-    if (response.getHeaders() != null) {
-      for (Map.Entry<String, Property> headers : response.getHeaders().entrySet()) {
-        target.add(fromProperty(headers.getKey(), headers.getValue()));
-      }
-    }
-  }
-
-  private List<CodegenParameter> addHasMore(List<CodegenParameter> objs) {
-    if(objs != null) {
-      for(int i = 0; i < objs.size(); i++) {
-        if(i > 0)
-          objs.get(i).secondaryParam = new Boolean(true);
-        if(i < objs.size() - 1)
-          objs.get(i).hasMore = new Boolean(true);
-      }
-    }
-    return objs;
-  }
-
-  private Map<String, Object> addHasMore(Map<String, Object> objs) {
-    if(objs != null) {
-      for(int i = 0; i < objs.size() - 1; i++) {
-        if(i > 0)
-          objs.put("secondaryParam", new Boolean(true));
-        if(i < objs.size() - 1)
-          objs.put("hasMore", true);
-      }
-    }
-    return objs;
-  }
-
-
-  public void addOperationToGroup(String tag, String resourcePath, Operation operation, CodegenOperation co, Map<String, List<CodegenOperation>> operations) {
-    List<CodegenOperation> opList = operations.get(tag);
-    if(opList == null) {
-      opList = new ArrayList<CodegenOperation>();
-      operations.put(tag, opList);
-    }
-    opList.add(co);
-    co.baseName = tag;    
-  }
-}

modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/DefaultGenerator.java

@@ -1,381 +0,0 @@
-package com.wordnik.swagger.codegen;
-
-import com.wordnik.swagger.models.*;
-import com.wordnik.swagger.util.*;
-import com.samskivert.mustache.*;
-
-import org.apache.commons.io.FileUtils;
-
-import java.util.*;
-import java.util.regex.*;
-import java.io.*;
-
-public class DefaultGenerator implements Generator {
-  protected CodegenConfig config;
-  protected ClientOptInput opts = null;
-  protected Swagger swagger = null;
-
-  public Generator opts(ClientOptInput opts) {
-    this.opts = opts;
-
-    this.swagger = opts.getSwagger();
-    ClientOpts clientOpts = opts.getOpts();
-    this.config = opts.getConfig();
-    this.config.additionalProperties().putAll(clientOpts.getProperties());
-
-    return this;
-  }
-
-  public List<File> generate() {
-    if(swagger == null || config == null) {
-      throw new RuntimeException("missing swagger input or config!");
-    }
-    if(System.getProperty("debugSwagger") != null) {
-      Json.prettyPrint(swagger);
-    }
-    List<File> files = new ArrayList<File>();
-    try {
-      config.processOpts();
-      if(swagger.getInfo() != null) {
-        Info info = swagger.getInfo();
-        if(info.getTitle() != null)
-          config.additionalProperties().put("appName", info.getTitle());
-        if(info.getDescription() != null)
-          config.additionalProperties().put("appDescription", info.getDescription());
-        if(info.getContact() != null) {
-          Contact contact = info.getContact();
-          config.additionalProperties().put("infoUrl", contact.getUrl());
-          if(contact.getEmail() != null)
-            config.additionalProperties().put("infoEmail", contact.getEmail());
-        }
-        if(info.getLicense() != null) {
-          License license = info.getLicense();
-          if(license.getName() != null)
-            config.additionalProperties().put("licenseInfo", license.getName());
-          if(license.getUrl() != null)
-            config.additionalProperties().put("licenseUrl", license.getUrl());
-        }
-      }
-
-      StringBuilder hostBuilder = new StringBuilder();
-      if(swagger.getSchemes() != null && swagger.getSchemes().size() > 0) {
-        hostBuilder.append(swagger.getSchemes().get(0).toValue());
-        hostBuilder.append("://");
-      }
-      else
-        hostBuilder.append("https://");
-      hostBuilder.append(swagger.getHost()).append(swagger.getBasePath());
-      String basePath = hostBuilder.toString();
-
-      List<Object> allOperations = new ArrayList<Object>();
-      List<Object> allModels = new ArrayList<Object>();
-
-      // models
-      Map<String, Model> definitions = swagger.getDefinitions();
-      if(definitions != null) {
-        for(String name: definitions.keySet()) {
-          Model model = definitions.get(name);
-          Map<String, Model> modelMap = new HashMap<String, Model>();
-          modelMap.put(name, model);
-          Map<String, Object> models = processModels(config, modelMap);
-          models.putAll(config.additionalProperties());
-
-          allModels.add(((List<Object>)models.get("models")).get(0));
-
-          for(String templateName : config.modelTemplateFiles().keySet()) {
-            String suffix = config.modelTemplateFiles().get(templateName);
-            String filename = config.modelFileFolder() + File.separator + config.toModelFilename(name) + suffix;
-            String template = readTemplate(config.templateDir() + File.separator + templateName);
-            Template tmpl = Mustache.compiler()
-              .withLoader(new Mustache.TemplateLoader() {
-                public Reader getTemplate (String name) {
-                  return getTemplateReader(config.templateDir() + File.separator + name + ".mustache");
-                };
-              })
-              .defaultValue("")
-              .compile(template);
-            writeToFile(filename, tmpl.execute(models));
-            files.add(new File(filename));
-          }
-        }
-      }
-      if(System.getProperty("debugModels") != null) {
-        System.out.println("############ Model info ############");
-        Json.prettyPrint(allModels);
-      }
-
-      // apis
-      Map<String, List<CodegenOperation>> paths = processPaths(swagger.getPaths());
-      for(String tag : paths.keySet()) {
-        List<CodegenOperation> ops = paths.get(tag);
-        Map<String, Object> operation = processOperations(config, tag, ops);
-        operation.put("basePath", basePath);
-        operation.put("baseName", tag);
-        operation.put("modelPackage", config.modelPackage());
-        operation.putAll(config.additionalProperties());
-        operation.put("classname", config.toApiName(tag));
-        allOperations.add(operation);
-        for(String templateName : config.apiTemplateFiles().keySet()) {
-          String suffix = config.apiTemplateFiles().get(templateName);
-          String filename = config.apiFileFolder() +
-            File.separator +
-            config.toApiFilename(tag) +
-            suffix;
-
-          String template = readTemplate(config.templateDir() + File.separator + templateName);
-          Template tmpl = Mustache.compiler()
-            .withLoader(new Mustache.TemplateLoader() {
-              public Reader getTemplate (String name) {
-                return getTemplateReader(config.templateDir() + File.separator + name + ".mustache");
-              };
-            })
-            .defaultValue("")
-            .compile(template);
-
-          writeToFile(filename, tmpl.execute(operation));
-          files.add(new File(filename));
-        }
-      }
-      if(System.getProperty("debugOperations") != null) {
-        System.out.println("############ Operation info ############");
-        Json.prettyPrint(allOperations);
-      }
-
-      // supporting files
-      Map<String, Object> bundle = new HashMap<String, Object>();
-      bundle.putAll(config.additionalProperties());
-      bundle.put("apiPackage", config.apiPackage());
-
-      Map<String, Object> apis = new HashMap<String, Object>();
-      apis.put("apis", allOperations);
-      if(swagger.getBasePath() != null) {
-        bundle.put("basePath", swagger.getBasePath());
-      }
-      bundle.put("apiInfo", apis);
-      bundle.put("models", allModels);
-      bundle.put("apiFolder", config.apiPackage().replaceAll("\\.", "/"));
-      bundle.put("modelPackage", config.modelPackage());
-      if (swagger.getExternalDocs() != null) {
-        bundle.put("externalDocs", swagger.getExternalDocs());
-      }
-      for(int i = 0; i < allModels.size() - 1; i++) {
-        HashMap<String, CodegenModel> cm = (HashMap<String, CodegenModel>) allModels.get(i);
-        CodegenModel m = cm.get("model");
-        m.hasMoreModels = true;
-      }
-
-      config.postProcessSupportingFileData(bundle);
-
-      if(System.getProperty("debugSupportingFiles") != null) {
-        System.out.println("############ Supporting file info ############");
-        Json.prettyPrint(bundle);
-      }
-
-      for(SupportingFile support : config.supportingFiles()) {
-        String outputFolder = config.outputFolder();
-        if(support.folder != null && !"".equals(support.folder))
-          outputFolder += File.separator + support.folder;
-        File of = new File(outputFolder);
-        if(!of.isDirectory())
-          of.mkdirs();
-        String outputFilename = outputFolder + File.separator + support.destinationFilename;
-
-        if(support.templateFile.endsWith("mustache")) {
-          String template = readTemplate(config.templateDir() + File.separator + support.templateFile);
-          Template tmpl = Mustache.compiler()
-            .withLoader(new Mustache.TemplateLoader() {
-              public Reader getTemplate (String name) {
-                return getTemplateReader(config.templateDir() + File.separator + name + ".mustache");
-              };
-            })
-            .defaultValue("")
-            .compile(template);
-
-          writeToFile(outputFilename, tmpl.execute(bundle));
-          files.add(new File(outputFilename));
-        }
-        else {
-          String template = readTemplate(config.templateDir() + File.separator + support.templateFile);
-          FileUtils.writeStringToFile(new File(outputFilename), template);
-          System.out.println("copying file to " + outputFilename);
-          files.add(new File(outputFilename));
-        }
-      }
-
-      config.processSwagger(swagger);
-    }
-    catch (Exception e) {
-      e.printStackTrace();
-    }
-    return files;
-  }
-
-  public Map<String, List<CodegenOperation>> processPaths(Map<String, Path> paths) {
-    Map<String, List<CodegenOperation>> ops = new HashMap<String, List<CodegenOperation>>();
-    List<String> tags = null;
-
-    for(String resourcePath : paths.keySet()) {
-      Path path = paths.get(resourcePath);
-      processOperation(resourcePath, "get", path.getGet(), ops);
-      processOperation(resourcePath, "put", path.getPut(), ops);
-      processOperation(resourcePath, "post", path.getPost(), ops);
-      processOperation(resourcePath, "delete", path.getDelete(), ops);
-      processOperation(resourcePath, "patch", path.getPatch(), ops);
-      processOperation(resourcePath, "options", path.getOptions(), ops);
-    }
-    return ops;
-  }
-
-  public void processOperation(String resourcePath, String httpMethod, Operation operation, Map<String, List<CodegenOperation>> operations) {
-    if(operation != null) {
-      List<String> tags = operation.getTags();
-      if(tags == null) {
-        tags = new ArrayList<String>();
-        tags.add("default");
-      }
-
-      for(String tag : tags) {
-        CodegenOperation co = config.fromOperation(resourcePath, httpMethod, operation);
-        co.tags = new ArrayList<String>();
-        co.tags.add(sanitizeTag(tag));
-
-        config.addOperationToGroup(sanitizeTag(tag), resourcePath, operation, co, operations);
-      }
-    }
-  }
-
-  protected String sanitizeTag(String tag) {
-    // remove spaces and make strong case
-    String [] parts = tag.split(" ");
-    StringBuffer buf = new StringBuffer();
-    for(String part: parts) {
-      if(!"".equals(part)) {
-        buf.append(Character.toUpperCase(part.charAt(0)));
-        if(part.length() > 1)
-          buf.append(part.substring(1));
-      }
-    }
-    return buf.toString().replaceAll("[^a-zA-Z ]", "");
-  }
-
-  public File writeToFile(String filename, String contents) throws IOException {
-    System.out.println("writing file " + filename);
-    File output = new File(filename);
-
-    if(output.getParent() != null && !new File(output.getParent()).exists()) {
-      File parent = new File(output.getParent());
-      parent.mkdirs();
-    }
-    Writer out = new BufferedWriter(new OutputStreamWriter(
-      new FileOutputStream(output), "UTF-8"));
-
-    out.write(contents);
-    out.close();
-    return output;
-  }
-
-  public String readTemplate(String name) {
-    try{
-      Reader reader = getTemplateReader(name);
-      if(reader == null)
-        throw new RuntimeException("no file found");
-      java.util.Scanner s = new java.util.Scanner(reader).useDelimiter("\\A");
-      return s.hasNext() ? s.next() : "";
-    }
-    catch(Exception e) {
-      e.printStackTrace();
-    }
-    throw new RuntimeException("can't load template " + name);
-  }
-
-  public Reader getTemplateReader(String name) {
-    try{
-      InputStream is = this.getClass().getClassLoader().getResourceAsStream(getCPResourcePath(name));
-      if(is == null)
-        is = new FileInputStream(new File(name));
-      if(is == null)
-        throw new RuntimeException("no file found");
-      return new InputStreamReader(is);
-    }
-    catch(Exception e) {
-      e.printStackTrace();
-    }
-    throw new RuntimeException("can't load template " + name);
-  }
-  
-  private String getCPResourcePath(String name) {
-    if (!"/".equals(File.separator))
-      return name.replaceAll(Pattern.quote(File.separator), "/");
-    return name;
-  }
-
-public Map<String, Object> processOperations(CodegenConfig config, String tag, List<CodegenOperation> ops) {
-    Map<String, Object> operations = new HashMap<String, Object>();
-    Map<String, Object> objs = new HashMap<String, Object>();
-    objs.put("classname", config.toApiName(tag));
-    objs.put("operation", ops);
-    operations.put("operations", objs);
-    operations.put("package", config.apiPackage());
-
-    Set<String> allImports = new LinkedHashSet<String>();
-    for(CodegenOperation op: ops) {
-      allImports.addAll(op.imports);
-    }
-
-    List<Map<String, String>> imports = new ArrayList<Map<String, String>>();
-    for(String i: allImports) {
-      Map<String, String> im = new LinkedHashMap<String, String>();
-      String m = config.importMapping().get(i);
-      if(m == null)
-        m = config.toModelImport(i);
-      if(m != null) {
-        im.put("import", m);
-        imports.add(im);
-      }
-    }
-
-    operations.put("imports", imports);
-    config.postProcessOperations(operations);
-    return operations;
-  }
-
-  public Map<String, Object> processModels(CodegenConfig config, Map<String, Model> definitions) {
-    Map<String, Object> objs = new HashMap<String, Object>();
-    objs.put("package", config.modelPackage());
-    List<Object> models = new ArrayList<Object>();
-    List<Object> model = new ArrayList<Object>();
-    Set<String> allImports = new LinkedHashSet<String>();
-    for(String key: definitions.keySet()) {
-      Model mm = definitions.get(key);
-      CodegenModel cm = config.fromModel(key, mm);
-      Map<String, Object> mo = new HashMap<String, Object>();
-      mo.put("model", cm);
-      models.add(mo);
-      allImports.addAll(cm.imports);
-    }
-    objs.put("models", models);
-
-    List<Map<String, String>> imports = new ArrayList<Map<String, String>>();
-    for(String i: allImports) {
-      Map<String, String> im = new LinkedHashMap<String, String>();
-      String m = config.importMapping().get(i);
-      if(m == null)
-        m = config.toModelImport(i);
-      if(m != null && !config.defaultIncludes().contains(m)) {
-        im.put("import", m);
-        imports.add(im);
-      }
-      // add instantiation types
-      m = config.instantiationTypes().get(i);
-      if(m != null && !config.defaultIncludes().contains(m)) {
-        im.put("import", m);
-        imports.add(im);
-      }
-    }
-
-    objs.put("imports", imports);
-    config.postProcessModels(objs);
-
-    return objs;
-  }
-}

modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/Generator.java

@@ -1,11 +0,0 @@
-package com.wordnik.swagger.codegen;
-
-import com.wordnik.swagger.models.Swagger;
-
-import java.io.File;
-import java.util.List;
-
-public interface Generator {
-  Generator opts(ClientOptInput opts);
-  List<File> generate();
-}

modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/SupportingFile.java

@@ -1,13 +0,0 @@
-package com.wordnik.swagger.codegen;
-
-public class SupportingFile {
-  public String templateFile;
-  public String folder;
-  public String destinationFilename;
-
-  public SupportingFile(String templateFile, String folder, String destinationFilename) {
-    this.templateFile = templateFile;
-    this.folder = folder;
-    this.destinationFilename = destinationFilename;
-  }
-}

modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/auth/AuthMethod.java

@@ -1,6 +0,0 @@
-package com.wordnik.swagger.codegen.auth;
-
-public interface AuthMethod {
-  String getType();
-  void setType(String type);
-}

modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/haproxy.cfg

@@ -1,86 +0,0 @@
-#---------------------------------------------------------------------
-# Global settings
-#---------------------------------------------------------------------
-global
-    log         127.0.0.1 local2 
-    chroot      /var/lib/haproxy
-    pidfile     /var/run/haproxy.pid
-    maxconn     4000
-    user        haproxy
-    group       haproxy
-    daemon
-
-#---------------------------------------------------------------------
-# common defaults that all the 'listen' and 'backend' sections will 
-# use if not designated in their block
-#---------------------------------------------------------------------
-defaults
-    mode        http
-    log         global
-    option      dontlognull
-    option      httpclose
-    option      httplog
-    option      forwardfor
-    option      redispatch
-    timeout connect 10000 # default 10 second time out if a backend is not found
-    timeout client 300000
-    timeout server 300000
-    maxconn     60000
-    retries     3
-
-#---------------------------------------------------------------------
-# main frontend which proxys to the backends
-#---------------------------------------------------------------------
-frontend  main *:80
-    default_backend             app
-
-    acl is_swagger_online hdr_beg(host) -i online.swagger.io
-    acl is_swagger_io hdr_beg(host) -i swagger.io
-    acl is_old hdr_beg(host) -i swagger.wordnik.com
-    acl is_old_editor hdr_beg(host) -i editor.swagger.wordnik.com
-    acl is_validator_swagger path_beg /swagger.json
-
-    # online spec validator
-    reqrep ([^\ ]*)\ /validator/(.*) \1\ /validator/validator/\2 if is_swagger_online
-
-    # something that didn't work
-    reqrep ([^\ ]*)\ /swagger.json(.*) \1\ /validator/swagger.json if is_validator_swagger
-
-    # swagger schema
-    reqrep ^([^\ :]*)\ /v2/schema.json(.*) \1\ /swagger-api/swagger-spec/master/schemas/v2.0/schema.json\2
-    acl is_swagger_spec path_beg /swagger-api/swagger-spec
-
-    # swagger docs
-    reqrep ^([^\ :]*)\ /swagger-core/documentation/annotations/apidocs/current(.*) \1\ /swagger-core/apidocs/\2
-    acl is_swagger_docs path_beg /swagger-core/apidocs
-
-    use_backend github_swagger_io if is_swagger_docs
-    use_backend validator if is_swagger_online
-    use_backend validator if is_validator_swagger
-    use_backend github_swagger_io if is_swagger_io !is_swagger_spec
-    use_backend github_swagger_spec if is_swagger_spec
-
-    redirect location http://editor.swagger.io if is_old_editor
-    redirect location http://swagger.io    if is_old
-
-#---------------------------------------------------------------------
-# round robin balancing between the various backends
-#---------------------------------------------------------------------
-backend github_swagger_io
-    balance roundrobin
-    server  gh1  swagger-api.github.io:80 check
-
-backend github_swagger_spec
-    http-request set-header Host raw.githubusercontent.com
-    rspirep ^Content-type:(.*) Content-Type:\ application/json
-    rspirep ^Access-Control-Allow-Origin:(.*) Access-Control-Allow-Origin:*
-    balance roundrobin
-    server  gh2  raw.githubusercontent.com:443 check ssl verify none
-
-backend validator
-    balance roundrobin
-    server  app1 127.0.0.1:8000 check
-
-backend app
-    balance roundrobin
-    server  app1 127.0.0.1:8000 check

modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/AndroidClientCodegen.java

@@ -1,110 +0,0 @@
-package com.wordnik.swagger.codegen.languages;
-
-import com.wordnik.swagger.codegen.*;
-import com.wordnik.swagger.models.properties.*;
-
-import java.util.*;
-import java.io.File;
-
-public class AndroidClientCodegen extends DefaultCodegen implements CodegenConfig {
-  protected String invokerPackage = "io.swagger.client";
-  protected String groupId = "io.swagger";
-  protected String artifactId = "swagger-client";
-  protected String artifactVersion = "1.0.0";
-  protected String sourceFolder = "src/main/java";
-
-  public CodegenType getTag() {
-    return CodegenType.CLIENT;
-  }
-
-  public String getName() {
-    return "android";
-  }
-
-  public String getHelp() {
-    return "Generates an Android client library.";
-  }
-
-  public AndroidClientCodegen() {
-    super();
-    outputFolder = "generated-code/android";
-    modelTemplateFiles.put("model.mustache", ".java");
-    apiTemplateFiles.put("api.mustache", ".java");
-    templateDir = "android-java";
-    apiPackage = "io.swagger.client.api";
-    modelPackage = "io.swagger.client.model";
-
-    additionalProperties.put("invokerPackage", invokerPackage);
-    additionalProperties.put("groupId", groupId);
-    additionalProperties.put("artifactId", artifactId);
-    additionalProperties.put("artifactVersion", artifactVersion);
-
-    supportingFiles.add(new SupportingFile("pom.mustache", "", "pom.xml"));
-    supportingFiles.add(new SupportingFile("apiInvoker.mustache", 
-      (sourceFolder + File.separator + invokerPackage).replace(".", java.io.File.separator), "ApiInvoker.java"));
-    supportingFiles.add(new SupportingFile("httpPatch.mustache", 
-      (sourceFolder + File.separator + invokerPackage).replace(".", java.io.File.separator), "HttpPatch.java"));
-    supportingFiles.add(new SupportingFile("jsonUtil.mustache", 
-      (sourceFolder + File.separator + invokerPackage).replace(".", java.io.File.separator), "JsonUtil.java"));
-    supportingFiles.add(new SupportingFile("apiException.mustache", 
-      (sourceFolder + File.separator + invokerPackage).replace(".", java.io.File.separator), "ApiException.java"));
-
-    languageSpecificPrimitives = new HashSet<String>(
-      Arrays.asList(
-        "String",
-        "boolean",
-        "Boolean",
-        "Double",
-        "Integer",
-        "Long",
-        "Float",
-        "Object")
-      );
-    instantiationTypes.put("array", "ArrayList");
-    instantiationTypes.put("map", "HashMap");
-  }
-
-  @Override
-  public String escapeReservedWord(String name) {
-    return "_" + name;
-  }
-
-  @Override
-  public String apiFileFolder() {
-    return outputFolder + "/" + sourceFolder + "/" + apiPackage().replaceAll("\\.", "/");
-  }
-
-  public String modelFileFolder() {
-    return outputFolder + "/" + sourceFolder + "/" + modelPackage().replaceAll("\\.", "/");
-  }
-
-  @Override
-  public String getTypeDeclaration(Property p) {
-    if(p instanceof ArrayProperty) {
-      ArrayProperty ap = (ArrayProperty) p;
-      Property inner = ap.getItems();
-      return getSwaggerType(p) + "<" + getTypeDeclaration(inner) + ">";
-    }
-    else if (p instanceof MapProperty) {
-      MapProperty mp = (MapProperty) p;
-      Property inner = mp.getAdditionalProperties();
-
-      return getSwaggerType(p) + "<String, " + getTypeDeclaration(inner) + ">";
-    }
-    return super.getTypeDeclaration(p);
-  }
-
-  @Override
-  public String getSwaggerType(Property p) {
-    String swaggerType = super.getSwaggerType(p);
-    String type = null;
-    if(typeMapping.containsKey(swaggerType)) {
-      type = typeMapping.get(swaggerType);
-      if(languageSpecificPrimitives.contains(type))
-        return toModelName(type);
-    }
-    else
-      type = swaggerType;
-    return toModelName(type);
-  }
-}

modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/JavaClientCodegen.java

@@ -1,119 +0,0 @@
-package com.wordnik.swagger.codegen.languages;
-
-import com.wordnik.swagger.codegen.*;
-import com.wordnik.swagger.models.properties.*;
-
-import java.util.*;
-import java.io.File;
-
-public class JavaClientCodegen extends DefaultCodegen implements CodegenConfig {
-  protected String invokerPackage = "io.swagger.client";
-  protected String groupId = "io.swagger";
-  protected String artifactId = "swagger-client";
-  protected String artifactVersion = "1.0.0";
-  protected String sourceFolder = "src/main/java";
-
-  public CodegenType getTag() {
-    return CodegenType.CLIENT;
-  }
-
-  public String getName() {
-    return "java";
-  }
-
-  public String getHelp() {
-    return "Generates a Java client library.";
-  }
-
-  public JavaClientCodegen() {
-    super();
-    outputFolder = "generated-code/java";
-    modelTemplateFiles.put("model.mustache", ".java");
-    apiTemplateFiles.put("api.mustache", ".java");
-    templateDir = "Java";
-    apiPackage = "io.swagger.client.api";
-    modelPackage = "io.swagger.client.model";
-
-    reservedWords = new HashSet<String> (
-      Arrays.asList(
-        "abstract", "continue", "for", "new", "switch", "assert", 
-        "default", "if", "package", "synchronized", "boolean", "do", "goto", "private", 
-        "this", "break", "double", "implements", "protected", "throw", "byte", "else", 
-        "import", "public", "throws", "case", "enum", "instanceof", "return", "transient", 
-        "catch", "extends", "int", "short", "try", "char", "final", "interface", "static", 
-        "void", "class", "finally", "long", "strictfp", "volatile", "const", "float", 
-        "native", "super", "while")
-    );
-
-    additionalProperties.put("invokerPackage", invokerPackage);
-    additionalProperties.put("groupId", groupId);
-    additionalProperties.put("artifactId", artifactId);
-    additionalProperties.put("artifactVersion", artifactVersion);
-
-    supportingFiles.add(new SupportingFile("pom.mustache", "", "pom.xml"));
-    supportingFiles.add(new SupportingFile("apiInvoker.mustache", 
-      (sourceFolder + File.separator + invokerPackage).replace(".", java.io.File.separator), "ApiInvoker.java"));
-    supportingFiles.add(new SupportingFile("JsonUtil.mustache", 
-      (sourceFolder + File.separator + invokerPackage).replace(".", java.io.File.separator), "JsonUtil.java"));
-    supportingFiles.add(new SupportingFile("apiException.mustache", 
-      (sourceFolder + File.separator + invokerPackage).replace(".", java.io.File.separator), "ApiException.java"));
-
-    languageSpecificPrimitives = new HashSet<String>(
-      Arrays.asList(
-        "String",
-        "boolean",
-        "Boolean",
-        "Double",
-        "Integer",
-        "Long",
-        "Float",
-        "Object")
-      );
-    instantiationTypes.put("array", "ArrayList");
-    instantiationTypes.put("map", "HashMap");
-  }
-
-  @Override
-  public String escapeReservedWord(String name) {
-    return "_" + name;
-  }
-
-  @Override
-  public String apiFileFolder() {
-    return outputFolder + "/" + sourceFolder + "/" + apiPackage().replaceAll("\\.", "/");
-  }
-
-  public String modelFileFolder() {
-    return outputFolder + "/" + sourceFolder + "/" + modelPackage().replaceAll("\\.", "/");
-  }
-
-  @Override
-  public String getTypeDeclaration(Property p) {
-    if(p instanceof ArrayProperty) {
-      ArrayProperty ap = (ArrayProperty) p;
-      Property inner = ap.getItems();
-      return getSwaggerType(p) + "<" + getTypeDeclaration(inner) + ">";
-    }
-    else if (p instanceof MapProperty) {
-      MapProperty mp = (MapProperty) p;
-      Property inner = mp.getAdditionalProperties();
-
-      return getSwaggerType(p) + "<String, " + getTypeDeclaration(inner) + ">";
-    }
-    return super.getTypeDeclaration(p);
-  }
-
-  @Override
-  public String getSwaggerType(Property p) {
-    String swaggerType = super.getSwaggerType(p);
-    String type = null;
-    if(typeMapping.containsKey(swaggerType)) {
-      type = typeMapping.get(swaggerType);
-      if(languageSpecificPrimitives.contains(type))
-        return toModelName(type);
-    }
-    else
-      type = swaggerType;
-    return toModelName(type);
-  }
-}

modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/JaxRSServerCodegen.java

@@ -1,149 +0,0 @@
-package com.wordnik.swagger.codegen.languages;
-
-import com.wordnik.swagger.models.Operation;
-import com.wordnik.swagger.models.Path;
-import com.wordnik.swagger.util.Json;
-import com.wordnik.swagger.codegen.*;
-import com.wordnik.swagger.models.properties.*;
-
-import java.util.*;
-import java.io.File;
-
-public class JaxRSServerCodegen extends JavaClientCodegen implements CodegenConfig {
-  protected String invokerPackage = "io.swagger.api";
-  protected String groupId = "io.swagger";
-  protected String artifactId = "swagger-server";
-  protected String artifactVersion = "1.0.0";
-  protected String sourceFolder = "src/main/java";
-  protected String title = "Swagger Server";
-
-  public CodegenType getTag() {
-    return CodegenType.SERVER;
-  }
-
-  public String getName() {
-    return "jaxrs";
-  }
-
-  public String getHelp() {
-    return "Generates a Java JAXRS Server application.";
-  }
-
-  public JaxRSServerCodegen() {
-    super();
-    outputFolder = "generated-code/javaJaxRS";
-    modelTemplateFiles.put("model.mustache", ".java");
-    apiTemplateFiles.put("api.mustache", ".java");
-    templateDir = "JavaJaxRS";
-    apiPackage = "io.swagger.api";
-    modelPackage = "io.swagger.model";
-
-    additionalProperties.put("invokerPackage", invokerPackage);
-    additionalProperties.put("groupId", groupId);
-    additionalProperties.put("artifactId", artifactId);
-    additionalProperties.put("artifactVersion", artifactVersion);
-    additionalProperties.put("title", title);
-
-    supportingFiles.clear();
-    supportingFiles.add(new SupportingFile("pom.mustache", "", "pom.xml"));
-    supportingFiles.add(new SupportingFile("README.mustache", "", "README.md"));
-    supportingFiles.add(new SupportingFile("ApiException.mustache", 
-      (sourceFolder + File.separator + apiPackage).replace(".", java.io.File.separator), "ApiException.java"));
-    supportingFiles.add(new SupportingFile("ApiOriginFilter.mustache", 
-      (sourceFolder + File.separator + apiPackage).replace(".", java.io.File.separator), "ApiOriginFilter.java"));
-    supportingFiles.add(new SupportingFile("ApiResponseMessage.mustache", 
-      (sourceFolder + File.separator + apiPackage).replace(".", java.io.File.separator), "ApiResponseMessage.java"));
-    supportingFiles.add(new SupportingFile("NotFoundException.mustache", 
-      (sourceFolder + File.separator + apiPackage).replace(".", java.io.File.separator), "NotFoundException.java"));
-    supportingFiles.add(new SupportingFile("web.mustache", 
-      ("src/main/webapp/WEB-INF"), "web.xml"));
-
-    languageSpecificPrimitives = new HashSet<String>(
-      Arrays.asList(
-        "String",
-        "boolean",
-        "Boolean",
-        "Double",
-        "Integer",
-        "Long",
-        "Float")
-      );
-  }
-
-  @Override
-  public String getTypeDeclaration(Property p) {
-    if(p instanceof ArrayProperty) {
-      ArrayProperty ap = (ArrayProperty) p;
-      Property inner = ap.getItems();
-      return getSwaggerType(p) + "<" + getTypeDeclaration(inner) + ">";
-    }
-    else if (p instanceof MapProperty) {
-      MapProperty mp = (MapProperty) p;
-      Property inner = mp.getAdditionalProperties();
-
-      return getTypeDeclaration(inner);
-    }
-    return super.getTypeDeclaration(p);
-  }
-
-  @Override
-  public void addOperationToGroup(String tag, String resourcePath, Operation operation, CodegenOperation co, Map<String, List<CodegenOperation>> operations) {
-    String basePath = resourcePath;
-    if(basePath.startsWith("/"))
-      basePath = basePath.substring(1);
-    int pos = basePath.indexOf("/");
-    if(pos > 0)
-      basePath = basePath.substring(0, pos);
-
-    if(basePath == "")
-      basePath = "default";
-    else {
-      if(co.path.startsWith("/" + basePath))
-        co.path = co.path.substring(("/" + basePath).length());
-        co.subresourceOperation = !co.path.isEmpty();
-    }
-    List<CodegenOperation> opList = operations.get(basePath);
-    if(opList == null) {
-      opList = new ArrayList<CodegenOperation>();
-      operations.put(basePath, opList);
-    }
-    opList.add(co);
-    co.baseName = basePath;
-  }
-
-  public Map<String, Object> postProcessOperations(Map<String, Object> objs) {
-    Map<String, Object> operations = (Map<String, Object>)objs.get("operations");
-    if(operations != null) {
-      List<CodegenOperation> ops = (List<CodegenOperation>) operations.get("operation");
-      for(CodegenOperation operation : ops) {
-        if(operation.returnType == null)
-          operation.returnType = "Void";
-        else if(operation.returnType.startsWith("List")) {
-          String rt = operation.returnType;
-          int end = rt.lastIndexOf(">");
-          if(end > 0) {
-            operation.returnType = rt.substring("List<".length(), end);
-            operation.returnContainer = "List";
-          }
-        }
-        else if(operation.returnType.startsWith("Map")) {
-          String rt = operation.returnType;
-          int end = rt.lastIndexOf(">");
-          if(end > 0) {
-            operation.returnType = rt.substring("Map<".length(), end);
-            operation.returnContainer = "Map";
-          }
-        }
-        else if(operation.returnType.startsWith("Set")) {
-          String rt = operation.returnType;
-          int end = rt.lastIndexOf(">");
-          if(end > 0) {
-            operation.returnType = rt.substring("Set<".length(), end);
-            operation.returnContainer = "Set";
-          }
-        }
-      }
-    }
-    return objs;
-  }
-}

modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/NodeJSServerCodegen.java

@@ -1,110 +0,0 @@
-package com.wordnik.swagger.codegen.languages;
-
-import com.wordnik.swagger.codegen.*;
-import com.wordnik.swagger.models.Model;
-import com.wordnik.swagger.models.properties.*;
-import com.wordnik.swagger.util.Json;
-
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.node.*;
-
-import java.util.*;
-import java.io.File;
-
-public class NodeJSServerCodegen extends DefaultCodegen implements CodegenConfig {
-  protected String invokerPackage = "com.wordnik.client";
-  protected String groupId = "com.wordnik";
-  protected String artifactId = "swagger-client";
-  protected String artifactVersion = "1.0.0";
-
-  public CodegenType getTag() {
-    return CodegenType.SERVER;
-  }
-
-  public String getName() {
-    return "nodejs";
-  }
-
-  public String getHelp() {
-    return "Generates a node.js server application compatible with the 1.2 swagger specification.";
-  }
-
-  public NodeJSServerCodegen() {
-    super();
-    outputFolder = "generated-code/nodejs";
-    apiTemplateFiles.put("api.mustache", ".js");
-    templateDir = "nodejs";
-    apiPackage = "app.apis";
-    modelPackage = "app";
-
-    additionalProperties.put("invokerPackage", invokerPackage);
-    additionalProperties.put("groupId", groupId);
-    additionalProperties.put("artifactId", artifactId);
-    additionalProperties.put("artifactVersion", artifactVersion);
-
-    supportingFiles.add(new SupportingFile("package.mustache", "", "package.json"));
-    supportingFiles.add(new SupportingFile("models.mustache", modelPackage, "models.js"));
-    supportingFiles.add(new SupportingFile("main.mustache", "", "main.js"));
-    supportingFiles.add(new SupportingFile("README.mustache", "", "README.md"));
-
-    languageSpecificPrimitives = new HashSet<String>(
-      Arrays.asList(
-        "String",
-        "boolean",
-        "Boolean",
-        "Double",
-        "Integer",
-        "Long",
-        "Float")
-      );
-    typeMapping.put("array", "array");
-  }
-
-  @Override
-  public String escapeReservedWord(String name) {
-    return "_" + name;
-  }
-
-  @Override
-  public Map<String, Object> postProcessSupportingFileData(Map<String, Object> objs) {
-    List<Map<String, Object>> o = (List<Map<String, Object>>)objs.get("models");
-
-    for(Map<String, Object> modelMap : o) {
-      try {
-        CodegenModel m = (CodegenModel) modelMap.get("model");
-        ObjectNode on = (ObjectNode) Json.mapper().readTree(m.modelJson);
-        // inject the id field
-        on.put("id", m.name);
-
-        // remove the definitions qualifier with this nasty hack
-        m.modelJson = Json.pretty(on).replaceAll("\"#/definitions/", "\"");
-      }
-      catch (Exception e) {
-        e.printStackTrace();
-        // skip conversion
-      }
-    }
-    return objs;
-  }
-
-  @Override
-  public String apiFileFolder() {
-    return outputFolder + File.separator + apiPackage().replaceAll("\\.", File.separator);
-  }
-
-  public String modelFileFolder() {
-    return outputFolder + File.separator + modelPackage().replaceAll("\\.", File.separator);
-  }
-
-  @Override
-  public String getSwaggerType(Property p) {
-    String swaggerType = super.getSwaggerType(p);
-    String type = null;
-    if(typeMapping.containsKey(swaggerType)) {
-      return typeMapping.get(swaggerType);
-    }
-    else
-      type = swaggerType;
-    return toModelName(type);
-  }
-}

modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/ObjcClientCodegen.java

@@ -1,221 +0,0 @@
-package com.wordnik.swagger.codegen.languages;
-
-import com.wordnik.swagger.util.Json;
-import com.wordnik.swagger.codegen.*;
-import com.wordnik.swagger.models.properties.*;
-
-import java.util.*;
-import java.io.File;
-
-public class ObjcClientCodegen extends DefaultCodegen implements CodegenConfig {
-  protected Set<String> foundationClasses = new HashSet<String>();
-  protected String sourceFolder = "client";
-  protected static String PREFIX = "SWG";
-
-  public CodegenType getTag() {
-    return CodegenType.CLIENT;
-  }
-  
-  public String getName() {
-    return "objc";
-  }
-
-  public String getHelp() {
-    return "Generates an Objective-C client library.";
-  }
-
-  public ObjcClientCodegen() {
-    super();
-    outputFolder = "generated-code/objc";
-    modelTemplateFiles.put("model-header.mustache", ".h");
-    modelTemplateFiles.put("model-body.mustache", ".m");
-    apiTemplateFiles.put("api-header.mustache", ".h");
-    apiTemplateFiles.put("api-body.mustache", ".m");
-    templateDir = "objc";
-    modelPackage = "";
-
-    additionalProperties.put("projectName", "swaggerClient");
-
-    defaultIncludes = new HashSet<String>(
-      Arrays.asList(
-        "bool",
-        "int",
-        "NSString",
-        "NSObject", 
-        "NSArray",
-        "NSNumber",
-        "NSDictionary",
-        "NSMutableArray",
-        "NSMutableDictionary")
-      );
-    languageSpecificPrimitives = new HashSet<String>(
-      Arrays.asList(
-        "NSNumber",
-        "NSString",
-        "NSObject",
-        "bool")
-      );
-
-    reservedWords = new HashSet<String>(
-      Arrays.asList(
-        "void", "char", "short", "int", "void", "char", "short", "int",
-        "long", "float", "double", "signed", "unsigned", "id", "const",
-        "volatile", "in", "out", "inout", "bycopy", "byref", "oneway",
-        "self", "super", "description"
-      ));
-
-    typeMapping = new HashMap<String, String>();
-    typeMapping.put("enum", "NSString");
-    typeMapping.put("Date", "SWGDate");
-    typeMapping.put("DateTime", "SWGDate");
-    // typeMapping.put("Date", "SWGDate");
-    typeMapping.put("boolean", "NSNumber");
-    typeMapping.put("string", "NSString");
-    typeMapping.put("integer", "NSNumber");
-    typeMapping.put("int", "NSNumber");
-    typeMapping.put("float", "NSNumber");
-    typeMapping.put("long", "NSNumber");
-    typeMapping.put("double", "NSNumber");
-    typeMapping.put("array", "NSArray");
-    typeMapping.put("map", "NSDictionary");
-    typeMapping.put("number", "NSNumber");
-    typeMapping.put("List", "NSArray");
-    typeMapping.put("object", "NSObject");
-
-    importMapping = new HashMap<String, String> ();
-    importMapping.put("Date", "SWGDate");
-
-    foundationClasses = new HashSet<String> (
-      Arrays.asList(
-        "NSNumber",
-        "NSObject",
-        "NSString",
-        "NSDictionary")
-      );
-
-    instantiationTypes.put("array", "NSMutableArray");
-    instantiationTypes.put("map", "NSMutableDictionary");
-
-    supportingFiles.add(new SupportingFile("SWGObject.h", sourceFolder, "SWGObject.h"));
-    supportingFiles.add(new SupportingFile("SWGObject.m", sourceFolder, "SWGObject.m"));
-    supportingFiles.add(new SupportingFile("SWGApiClient.h", sourceFolder, "SWGApiClient.h"));
-    supportingFiles.add(new SupportingFile("SWGApiClient.m", sourceFolder, "SWGApiClient.m"));
-    supportingFiles.add(new SupportingFile("SWGFile.h", sourceFolder, "SWGFile.h"));
-    supportingFiles.add(new SupportingFile("SWGFile.m", sourceFolder, "SWGFile.m"));
-    supportingFiles.add(new SupportingFile("SWGDate.h", sourceFolder, "SWGDate.h"));
-    supportingFiles.add(new SupportingFile("SWGDate.m", sourceFolder, "SWGDate.m"));
-    supportingFiles.add(new SupportingFile("Podfile.mustache", "", "Podfile"));
-  }
-
-  @Override
-  public String toInstantiationType(Property p) {
-    if (p instanceof MapProperty) {
-      MapProperty ap = (MapProperty) p;
-      String inner = getSwaggerType(ap.getAdditionalProperties());
-      return instantiationTypes.get("map");
-    }
-    else if (p instanceof ArrayProperty) {
-      ArrayProperty ap = (ArrayProperty) p;
-      String inner = getSwaggerType(ap.getItems());
-      return instantiationTypes.get("array");
-    }
-    else
-      return null;
-  }
-
-  @Override
-  public String getTypeDeclaration(String name) {
-    if(languageSpecificPrimitives.contains(name) && !foundationClasses.contains(name))
-      return name;
-    else
-      return name + "*";
-  }
-
-  @Override
-  public String getSwaggerType(Property p) {
-    String swaggerType = super.getSwaggerType(p);
-    String type = null;
-    if(typeMapping.containsKey(swaggerType)) {
-      type = typeMapping.get(swaggerType);
-      if(languageSpecificPrimitives.contains(type) && !foundationClasses.contains(type))
-        return toModelName(type);
-    }
-    else
-      type = swaggerType;
-    return toModelName(type);
-  }
-
-  @Override
-  public String getTypeDeclaration(Property p) {
-    String swaggerType = getSwaggerType(p);
-    if(languageSpecificPrimitives.contains(swaggerType) && !foundationClasses.contains(swaggerType))
-      return toModelName(swaggerType);
-    else
-      return swaggerType + "*";
-  }
-
-  @Override
-  public String toModelName(String type) {
-    if(typeMapping.keySet().contains(type) ||
-      foundationClasses.contains(type) ||
-      importMapping.values().contains(type) ||
-      defaultIncludes.contains(type) ||
-      languageSpecificPrimitives.contains(type)) {
-      return Character.toUpperCase(type.charAt(0)) + type.substring(1);
-    }
-    else {
-      return PREFIX + Character.toUpperCase(type.charAt(0)) + type.substring(1);
-    }
-  }
-
-  @Override
-  public String toModelImport(String name) {
-    if("".equals(modelPackage()))
-      return name;
-    else
-      return modelPackage() + "." + name;
-  }
-
-  @Override
-  public String toDefaultValue(Property p) {
-    return null;
-  }
-
-  @Override
-  public String apiFileFolder() {
-    return outputFolder + File.separator + sourceFolder;
-  }
-
-  @Override
-  public String modelFileFolder() {
-    return outputFolder + File.separator + sourceFolder;
-  }
-
-  @Override
-  public String toModelFilename(String name) {
-    return PREFIX + initialCaps(name);
-  }
-
-  @Override
-  public String toApiName(String name) {
-    return PREFIX + initialCaps(name) + "Api";
-  }
-
-  public String toApiFilename(String name) {
-    return PREFIX + initialCaps(name) + "Api";
-  }
-
-  @Override
-  public String toVarName(String name) {
-    String paramName = name.replaceAll("[^a-zA-Z0-9_]","");
-    if(paramName.startsWith("new") || reservedWords.contains(paramName)) {
-      return escapeReservedWord(paramName);
-    }
-    else
-      return paramName;
-  }
-
-  public String escapeReservedWord(String name) {
-    return "_" + name;
-  }
-}

modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/PhpClientCodegen.java

@@ -1,114 +0,0 @@
-package com.wordnik.swagger.codegen.languages;
-
-import com.wordnik.swagger.codegen.*;
-import com.wordnik.swagger.util.Json;
-import com.wordnik.swagger.models.properties.*;
-
-import java.util.*;
-import java.io.File;
-
-public class PhpClientCodegen extends DefaultCodegen implements CodegenConfig {
-  protected String invokerPackage = "com.wordnik.client";
-  protected String groupId = "com.wordnik";
-  protected String artifactId = "swagger-client";
-  protected String artifactVersion = "1.0.0";
-
-  public CodegenType getTag() {
-    return CodegenType.CLIENT;
-  }
-
-  public String getName() {
-    return "php";
-  }
-
-  public String getHelp() {
-    return "Generates a PHP client library.";
-  }
-
-  public PhpClientCodegen() {
-    super();
-    modelPackage = "models";
-    outputFolder = "generated-code/php";
-    modelTemplateFiles.put("model.mustache", ".php");
-    apiTemplateFiles.put("api.mustache", ".php");
-    templateDir = "php";
-
-    typeMapping.clear();
-    languageSpecificPrimitives.clear();
-
-    reservedWords = new HashSet<String> (
-      Arrays.asList(
-        "int")
-    );
-
-    additionalProperties.put("invokerPackage", invokerPackage);
-    additionalProperties.put("groupId", groupId);
-    additionalProperties.put("artifactId", artifactId);
-    additionalProperties.put("artifactVersion", artifactVersion);
-
-    languageSpecificPrimitives.add("int");
-    languageSpecificPrimitives.add("array");
-    languageSpecificPrimitives.add("map");
-    languageSpecificPrimitives.add("string");
-    languageSpecificPrimitives.add("DateTime");
-
-    typeMapping.put("long", "int");
-    typeMapping.put("integer", "int");
-    typeMapping.put("Array", "array");
-    typeMapping.put("String", "string");
-    typeMapping.put("List", "array");
-    typeMapping.put("map", "map");
-
-    supportingFiles.add(new SupportingFile("Swagger.mustache", "", "Swagger.php"));
-  }
-
-  @Override
-  public String escapeReservedWord(String name) {
-    return "_" + name;
-  }
-
-  @Override
-  public String apiFileFolder() {
-    return outputFolder + "/" + apiPackage().replaceAll("\\.", "/");
-  }
-
-  public String modelFileFolder() {
-    return outputFolder + "/" + modelPackage().replaceAll("\\.", "/");
-  }
-
-  @Override
-  public String getTypeDeclaration(Property p) {
-    if(p instanceof ArrayProperty) {
-      ArrayProperty ap = (ArrayProperty) p;
-      Property inner = ap.getItems();
-      return getSwaggerType(p) + "[" + getTypeDeclaration(inner) + "]";
-    }
-    else if (p instanceof MapProperty) {
-      MapProperty mp = (MapProperty) p;
-      Property inner = mp.getAdditionalProperties();
-      return getSwaggerType(p) + "[string," + getTypeDeclaration(inner) + "]";
-    }
-    return super.getTypeDeclaration(p);
-  }
-
-  @Override
-  public String getSwaggerType(Property p) {
-    String swaggerType = super.getSwaggerType(p);
-    String type = null;
-    if(typeMapping.containsKey(swaggerType)) {
-      type = typeMapping.get(swaggerType);
-      if(languageSpecificPrimitives.contains(type)) {
-        return type;
-      }
-    }
-    else
-      type = swaggerType;
-    if(type == null)
-      return null;
-    return type;
-  }
-
-  public String toDefaultValue(Property p) {
-    return "null";
-  }
-}

modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/PythonClientCodegen.java

@@ -1,109 +0,0 @@
-package com.wordnik.swagger.codegen.languages;
-
-import com.wordnik.swagger.codegen.*;
-import com.wordnik.swagger.models.properties.*;
-
-import java.io.File;
-
-public class PythonClientCodegen extends DefaultCodegen implements CodegenConfig {
-  String module = "client";
-
-  public CodegenType getTag() {
-    return CodegenType.CLIENT;
-  }
-
-  public String getName() {
-    return "python";
-  }
-
-  public String getHelp() {
-    return "Generates a Python client library.";
-  }
-
-  public PythonClientCodegen() {
-    super();
-    outputFolder = "generated-code/python";
-    modelTemplateFiles.put("model.mustache", ".py");
-    apiTemplateFiles.put("api.mustache", ".py");
-    templateDir = "python";
-    
-    apiPackage = module;
-    modelPackage = module + ".models";
-    
-    languageSpecificPrimitives.clear();
-    languageSpecificPrimitives.add("int");
-    languageSpecificPrimitives.add("float");
-    languageSpecificPrimitives.add("long");
-    languageSpecificPrimitives.add("list");
-    languageSpecificPrimitives.add("bool");
-    languageSpecificPrimitives.add("str");
-    languageSpecificPrimitives.add("datetime");
-
-    typeMapping.clear();
-    typeMapping.put("integer", "int");
-    typeMapping.put("float", "float");
-    typeMapping.put("long", "long");
-    typeMapping.put("double", "float");
-    typeMapping.put("array", "list");
-    typeMapping.put("map", "map");
-    typeMapping.put("boolean", "bool");
-    typeMapping.put("string", "str");
-    typeMapping.put("date", "datetime");
-
-    
-    supportingFiles.add(new SupportingFile("README.mustache", "", "README.md"));
-    supportingFiles.add(new SupportingFile("swagger.mustache", module, "swagger.py"));
-    supportingFiles.add(new SupportingFile("__init__.mustache", module, "__init__.py"));
-    supportingFiles.add(new SupportingFile("__init__.mustache", modelPackage.replaceAll("\\.", File.separator), "__init__.py"));
-  }
-
-  @Override
-  public String escapeReservedWord(String name) {
-    return "_" + name;
-  }
-
-  @Override
-  public String apiFileFolder() {
-    return outputFolder + "/" + apiPackage().replaceAll("\\.", "/");
-  }
-
-  public String modelFileFolder() {
-    return outputFolder + "/" + modelPackage().replaceAll("\\.", "/");
-  }
-
-  @Override
-  public String getTypeDeclaration(Property p) {
-    if(p instanceof ArrayProperty) {
-      ArrayProperty ap = (ArrayProperty) p;
-      Property inner = ap.getItems();
-      return getSwaggerType(p) + "[" + getTypeDeclaration(inner) + "]";
-    }
-    else if (p instanceof MapProperty) {
-      MapProperty mp = (MapProperty) p;
-      Property inner = mp.getAdditionalProperties();
-
-      return getSwaggerType(p) + "(String, " + getTypeDeclaration(inner) + ")";
-    }
-    return super.getTypeDeclaration(p);
-  }
-
-  @Override
-  public String getSwaggerType(Property p) {
-    String swaggerType = super.getSwaggerType(p);
-    String type = null;
-    if(typeMapping.containsKey(swaggerType)) {
-      type = typeMapping.get(swaggerType);
-      if(languageSpecificPrimitives.contains(type)) {
-        return type;
-      }
-    }
-    else
-      type = swaggerType;
-    return type;
-  }
-
-  public String toDefaultValue(Property p) {
-	// TODO: Support Python def value
-    return "null";
-  }	
-}

modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/ScalaClientCodegen.java

@@ -1,192 +0,0 @@
-package com.wordnik.swagger.codegen.languages;
-
-import com.wordnik.swagger.codegen.*;
-import com.wordnik.swagger.models.properties.*;
-
-import java.util.*;
-import java.io.File;
-
-public class ScalaClientCodegen extends DefaultCodegen implements CodegenConfig {
-  protected String invokerPackage = "io.swagger.client";
-  protected String groupId = "com.wordnik";
-  protected String artifactId = "swagger-client";
-  protected String artifactVersion = "1.0.0";
-  protected String sourceFolder = "src/main/java";
-  protected String authScheme = "";
-  protected boolean authPreemptive = false;
-  protected boolean asyncHttpClient = !authScheme.isEmpty();
-
-  public CodegenType getTag() {
-    return CodegenType.CLIENT;
-  }
-  
-  public String getName() {
-    return "scala";
-  }
-
-  public String getHelp() {
-    return "Generates a Scala client library.";
-  }
-
-  public ScalaClientCodegen() {
-    super();
-    outputFolder = "generated-code/scala";
-    modelTemplateFiles.put("model.mustache", ".scala");
-    apiTemplateFiles.put("api.mustache", ".scala");
-    templateDir = "scala";
-    apiPackage = "io.swagger.client.api";
-    modelPackage = "io.swagger.client.model";
-
-    reservedWords = new HashSet<String> (
-      Arrays.asList(
-        "abstract", "case", "catch", "class", "def", "do", "else", "extends",
-        "false", "final", "finally", "for", "forSome", "if", "implicit", 
-        "import", "lazy", "match", "new", "null", "object", "override", "package", 
-        "private", "protected", "return", "sealed", "super", "this", "throw", 
-        "trait", "try", "true", "type", "val", "var", "while", "with", "yield")
-    );
-
-    additionalProperties.put("invokerPackage", invokerPackage);
-    additionalProperties.put("groupId", groupId);
-    additionalProperties.put("artifactId", artifactId);
-    additionalProperties.put("artifactVersion", artifactVersion);
-    additionalProperties.put("asyncHttpClient", asyncHttpClient);
-    additionalProperties.put("authScheme", authScheme);
-    additionalProperties.put("authPreemptive", authPreemptive);
-
-    supportingFiles.add(new SupportingFile("pom.mustache", "", "pom.xml"));
-    supportingFiles.add(new SupportingFile("apiInvoker.mustache", 
-      (sourceFolder + File.separator + invokerPackage).replace(".", java.io.File.separator), "ApiInvoker.scala"));
-
-    importMapping.remove("List");
-    importMapping.remove("Set");
-    importMapping.remove("Map");
-
-    importMapping.put("DateTime", "org.joda.time.DateTime");
-    importMapping.put("ListBuffer", "scala.collections.mutable.ListBuffer");
-
-    typeMapping = new HashMap<String, String>();
-    typeMapping.put("enum", "NSString");
-    typeMapping.put("array", "List");
-    typeMapping.put("set", "Set");
-    typeMapping.put("boolean", "Boolean");
-    typeMapping.put("string", "String");
-    typeMapping.put("int", "Int");
-    typeMapping.put("long", "Long");
-    typeMapping.put("float", "Float");
-    typeMapping.put("byte", "Byte");
-    typeMapping.put("short", "Short");
-    typeMapping.put("char", "Char");
-    typeMapping.put("long", "Long");
-    typeMapping.put("double", "Double");
-    typeMapping.put("object", "Any");
-    typeMapping.put("file", "File");
-
-    languageSpecificPrimitives = new HashSet<String>(
-      Arrays.asList(
-        "String",
-        "boolean",
-        "Boolean",
-        "Double",
-        "Int",
-        "Long",
-        "Float",
-        "Object",
-        "List",
-        "Map")
-      );
-    instantiationTypes.put("array", "ListBuffer");
-    instantiationTypes.put("map", "HashMap");
-  }
-
-  @Override
-  public String escapeReservedWord(String name) {
-    return "_" + name;
-  }
-
-  @Override
-  public String apiFileFolder() {
-    return outputFolder + "/" + sourceFolder + "/" + apiPackage().replaceAll("\\.", "/");
-  }
-
-  public String modelFileFolder() {
-    return outputFolder + "/" + sourceFolder + "/" + modelPackage().replaceAll("\\.", "/");
-  }
-
-  @Override
-  public String getTypeDeclaration(Property p) {
-    if(p instanceof ArrayProperty) {
-      ArrayProperty ap = (ArrayProperty) p;
-      Property inner = ap.getItems();
-      return getSwaggerType(p) + "[" + getTypeDeclaration(inner) + "]";
-    }
-    else if (p instanceof MapProperty) {
-      MapProperty mp = (MapProperty) p;
-      Property inner = mp.getAdditionalProperties();
-
-      return getSwaggerType(p) + "[String, " + getTypeDeclaration(inner) + "]";
-    }
-    return super.getTypeDeclaration(p);
-  }
-
-  @Override
-  public String getSwaggerType(Property p) {
-    String swaggerType = super.getSwaggerType(p);
-    String type = null;
-    if(typeMapping.containsKey(swaggerType)) {
-      type = typeMapping.get(swaggerType);
-      if(languageSpecificPrimitives.contains(type))
-        return toModelName(type);
-    }
-    else
-      type = swaggerType;
-    return toModelName(type);
-  }
-
-  @Override
-  public String toInstantiationType(Property p) {
-    if (p instanceof MapProperty) {
-      MapProperty ap = (MapProperty) p;
-      String inner = getSwaggerType(ap.getAdditionalProperties());
-      return instantiationTypes.get("map") + "[String, " + inner + "]";
-    }
-    else if (p instanceof ArrayProperty) {
-      ArrayProperty ap = (ArrayProperty) p;
-      String inner = getSwaggerType(ap.getItems());
-      return instantiationTypes.get("array") + "[" + inner + "]";
-    }
-    else
-      return null;
-  }
-
-  public String toDefaultValue(Property p) {
-    if(p instanceof StringProperty)
-      return "null";
-    else if (p instanceof BooleanProperty)
-      return "null";
-    else if(p instanceof DateProperty)
-      return "null";
-    else if(p instanceof DateTimeProperty)
-      return "null";
-    else if (p instanceof DoubleProperty)
-      return "null";
-    else if (p instanceof FloatProperty)
-      return "null";
-    else if (p instanceof IntegerProperty)
-      return "null";
-    else if (p instanceof LongProperty)
-      return "null";
-    else if (p instanceof MapProperty) {
-      MapProperty ap = (MapProperty) p;
-      String inner = getSwaggerType(ap.getAdditionalProperties());
-      return "new HashMap[String, " + inner + "]() ";
-    }
-    else if (p instanceof ArrayProperty) {
-      ArrayProperty ap = (ArrayProperty) p;
-      String inner = getSwaggerType(ap.getItems());
-      return "new ListBuffer[" + inner + "]() ";
-    }
-    else
-      return "null";
-  }
-}

modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/ScalatraServerCodegen.java

@@ -1,178 +0,0 @@
-package com.wordnik.swagger.codegen.languages;
-
-import com.wordnik.swagger.codegen.*;
-import com.wordnik.swagger.models.properties.*;
-import com.wordnik.swagger.util.Json;
-
-import java.util.*;
-import java.io.File;
-
-public class ScalatraServerCodegen extends DefaultCodegen implements CodegenConfig {
-  protected String invokerPackage = "com.wordnik.client";
-  protected String groupId = "com.wordnik";
-  protected String artifactId = "swagger-client";
-  protected String artifactVersion = "1.0.0";
-  protected String sourceFolder = "src/main/scala";
-
-  public CodegenType getTag() {
-    return CodegenType.SERVER;
-  }
-
-  public String getName() {
-    return "scalatra";
-  }
-
-  public String getHelp() {
-    return "Generates a Scala server application with Scalatra.";
-  }
-
-  public ScalatraServerCodegen() {
-    super();
-    outputFolder = "generated-code/scalatra";
-    modelTemplateFiles.put("model.mustache", ".scala");
-    apiTemplateFiles.put("api.mustache", ".scala");
-    templateDir = "scalatra";
-    apiPackage = "com.wordnik.client.api";
-    modelPackage = "com.wordnik.client.model";
-
-    reservedWords = new HashSet<String> (
-      Arrays.asList(
-        "abstract", "continue", "for", "new", "switch", "assert", 
-        "default", "if", "package", "synchronized", "boolean", "do", "goto", "private", 
-        "this", "break", "double", "implements", "protected", "throw", "byte", "else", 
-        "import", "public", "throws", "case", "enum", "instanceof", "return", "transient", 
-        "catch", "extends", "int", "short", "try", "char", "final", "interface", "static", 
-        "void", "class", "finally", "long", "strictfp", "volatile", "const", "float", 
-        "native", "super", "while")
-    );
-
-    defaultIncludes = new HashSet<String>(
-      Arrays.asList("double",
-        "Int",
-        "Long",
-        "Float",
-        "Double",
-        "char",
-        "float",
-        "String",
-        "boolean",
-        "Boolean",
-        "Double",
-        "Integer",
-        "Long",
-        "Float",
-        "List",
-        "Set",
-        "Map")
-      );
-
-    typeMapping.put("integer", "Int");
-    typeMapping.put("long", "Long");
-
-    additionalProperties.put("appName", "Swagger Sample");
-    additionalProperties.put("appName", "Swagger Sample");
-    additionalProperties.put("appDescription", "A sample swagger server");
-    additionalProperties.put("infoUrl", "http://developers.helloreverb.com");
-    additionalProperties.put("infoEmail", "hello@helloreverb.com");
-    additionalProperties.put("licenseInfo", "All rights reserved");
-    additionalProperties.put("licenseUrl", "http://apache.org/licenses/LICENSE-2.0.html");
-    additionalProperties.put("invokerPackage", invokerPackage);
-    additionalProperties.put("groupId", groupId);
-    additionalProperties.put("artifactId", artifactId);
-    additionalProperties.put("artifactVersion", artifactVersion);
-
-    supportingFiles.add(new SupportingFile("README.mustache", "", "README.md"));
-    supportingFiles.add(new SupportingFile("build.sbt", "", "build.sbt")); 
-    supportingFiles.add(new SupportingFile("web.xml", "/src/main/webapp/WEB-INF", "web.xml"));
-    supportingFiles.add(new SupportingFile("JettyMain.scala", sourceFolder, "JettyMain.scala"));
-    supportingFiles.add(new SupportingFile("Bootstrap.mustache", sourceFolder, "ScalatraBootstrap.scala"));
-    supportingFiles.add(new SupportingFile("ServletApp.mustache", sourceFolder, "ServletApp.scala"));
-    supportingFiles.add(new SupportingFile("project/build.properties", "project", "build.properties"));
-    supportingFiles.add(new SupportingFile("project/plugins.sbt", "project", "plugins.sbt"));
-    supportingFiles.add(new SupportingFile("sbt", "", "sbt"));
-
-    languageSpecificPrimitives = new HashSet<String>(
-      Arrays.asList(
-        "String",
-        "boolean",
-        "Boolean",
-        "Double",
-        "Integer",
-        "Long",
-        "Float",
-        "Object")
-      );
-    instantiationTypes.put("array", "ArrayList");
-    instantiationTypes.put("map", "HashMap");
-
-    importMapping = new HashMap<String, String> ();
-    importMapping.put("BigDecimal", "java.math.BigDecimal");
-    importMapping.put("UUID", "java.util.UUID");
-    importMapping.put("File", "java.io.File");
-    importMapping.put("Date", "java.util.Date");
-    importMapping.put("Timestamp", "java.sql.Timestamp");
-    importMapping.put("Map", "java.util.Map");
-    importMapping.put("HashMap", "java.util.HashMap");
-    importMapping.put("Array", "java.util.List");
-    importMapping.put("ArrayList", "java.util.ArrayList");
-    importMapping.put("DateTime", "org.joda.time.DateTime");
-    importMapping.put("LocalDateTime", "org.joda.time.LocalDateTime");
-    importMapping.put("LocalDate", "org.joda.time.LocalDate");
-    importMapping.put("LocalTime", "org.joda.time.LocalTime");
-  }
-
-  @Override
-  public String escapeReservedWord(String name) {
-    return "_" + name;
-  }
-
-  @Override
-  public String apiFileFolder() {
-    return outputFolder + "/" + sourceFolder + "/" + apiPackage().replaceAll("\\.", "/");
-  }
-
-  public String modelFileFolder() {
-    return outputFolder + "/" + sourceFolder + "/" + modelPackage().replaceAll("\\.", "/");
-  }
-
-  @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();
-    }
-    return objs;
-  }
-
-
-  @Override
-  public String getTypeDeclaration(Property p) {
-    if(p instanceof ArrayProperty) {
-      ArrayProperty ap = (ArrayProperty) p;
-      Property inner = ap.getItems();
-      return getSwaggerType(p) + "[" + getTypeDeclaration(inner) + "]";
-    }
-    else if (p instanceof MapProperty) {
-      MapProperty mp = (MapProperty) p;
-      Property inner = mp.getAdditionalProperties();
-
-      return getSwaggerType(p) + "[String, " + getTypeDeclaration(inner) + "]";
-    }
-    return super.getTypeDeclaration(p);
-  }
-
-  @Override
-  public String getSwaggerType(Property p) {
-    String swaggerType = super.getSwaggerType(p);
-    String type = null;
-    if(typeMapping.containsKey(swaggerType)) {
-      type = typeMapping.get(swaggerType);
-      if(languageSpecificPrimitives.contains(type))
-        return toModelName(type);
-    }
-    else
-      type = swaggerType;
-    return toModelName(type);
-  }
-}

modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/StaticDocCodegen.java

@@ -1,76 +0,0 @@
-package com.wordnik.swagger.codegen.languages;
-
-import com.wordnik.swagger.codegen.*;
-import com.wordnik.swagger.models.properties.*;
-
-import java.util.*;
-import java.io.File;
-
-public class StaticDocCodegen extends DefaultCodegen implements CodegenConfig {
-  protected String invokerPackage = "com.wordnik.client";
-  protected String groupId = "com.wordnik";
-  protected String artifactId = "swagger-client";
-  protected String artifactVersion = "1.0.0";
-  protected String sourceFolder = "docs";
-
-  public CodegenType getTag() {
-    return CodegenType.DOCUMENTATION;
-  }
-
-  public String getName() {
-    return "dynamic-html";
-  }
-
-  public String getHelp() {
-    return "Generates a dynamic HTML site.";
-  }
-
-  public StaticDocCodegen() {
-    super();
-    outputFolder = "docs";
-    modelTemplateFiles.put("model.mustache", ".html");
-    apiTemplateFiles.put("operation.mustache", ".html");
-    templateDir = "swagger-static";
-
-    additionalProperties.put("invokerPackage", invokerPackage);
-    additionalProperties.put("groupId", groupId);
-    additionalProperties.put("artifactId", artifactId);
-    additionalProperties.put("artifactVersion", artifactVersion);
-
-    supportingFiles.add(new SupportingFile("package.mustache", "", "package.json"));
-    supportingFiles.add(new SupportingFile("main.mustache", "", "main.js"));
-    supportingFiles.add(new SupportingFile("assets/css/bootstrap-responsive.css",
-      outputFolder + "/assets/css", "bootstrap-responsive.css"));
-    supportingFiles.add(new SupportingFile("assets/css/bootstrap.css",
-      outputFolder + "/assets/css", "bootstrap.css"));
-    supportingFiles.add(new SupportingFile("assets/css/style.css",
-      outputFolder + "/assets/css", "style.css"));
-    supportingFiles.add(new SupportingFile("assets/images/logo.png",
-      outputFolder + "/assets/images", "logo.png"));
-    supportingFiles.add(new SupportingFile("assets/js/bootstrap.js",
-      outputFolder + "/assets/js", "bootstrap.js"));
-    supportingFiles.add(new SupportingFile("assets/js/jquery-1.8.3.min.js",
-      outputFolder + "/assets/js", "jquery-1.8.3.min.js"));
-    supportingFiles.add(new SupportingFile("assets/js/main.js",
-      outputFolder + "/assets/js", "main.js"));
-    supportingFiles.add(new SupportingFile("index.mustache",
-      outputFolder, "index.html"));
-
-    instantiationTypes.put("array", "ArrayList");
-    instantiationTypes.put("map", "HashMap");
-  }
-
-  @Override
-  public String escapeReservedWord(String name) {
-    return "_" + name;
-  }
-
-  @Override
-  public String apiFileFolder() {
-    return outputFolder + File.separator + sourceFolder + File.separator + "operations";
-  }
-
-  public String modelFileFolder() {
-    return outputFolder + File.separator + sourceFolder + File.separator + "models";
-  }
-}

modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/StaticHtmlGenerator.java

@@ -1,85 +0,0 @@
-package com.wordnik.swagger.codegen.languages;
-
-import com.wordnik.swagger.codegen.*;
-import com.wordnik.swagger.models.properties.*;
-import com.wordnik.swagger.util.Json;
-
-import java.util.*;
-import java.io.File;
-
-public class StaticHtmlGenerator extends DefaultCodegen implements CodegenConfig {
-  protected String invokerPackage = "com.wordnik.client";
-  protected String groupId = "com.wordnik";
-  protected String artifactId = "swagger-client";
-  protected String artifactVersion = "1.0.0";
-  protected String sourceFolder = "src/main/scala";
-
-  public CodegenType getTag() {
-    return CodegenType.DOCUMENTATION;
-  }
-
-  public String getName() {
-    return "html";
-  }
-
-  public String getHelp() {
-    return "Generates a static HTML file.";
-  }
-
-  public StaticHtmlGenerator() {
-    super();
-    outputFolder = "docs";
-    templateDir = "htmlDocs";
-
-    defaultIncludes = new HashSet<String>();
-
-    String partner = "our Partner";
-
-    if(System.getProperty("partner") != null)
-      partner = System.getProperty("partner");
-
-    additionalProperties.put("partner", partner);
-    additionalProperties.put("appName", "Swagger Sample");
-    additionalProperties.put("appDescription", "A sample swagger server");
-    additionalProperties.put("infoUrl", "https://helloreverb.com");
-    additionalProperties.put("infoEmail", "hello@helloreverb.com");
-    additionalProperties.put("licenseInfo", "All rights reserved");
-    additionalProperties.put("licenseUrl", "http://apache.org/licenses/LICENSE-2.0.html");
-    additionalProperties.put("invokerPackage", invokerPackage);
-    additionalProperties.put("groupId", groupId);
-    additionalProperties.put("artifactId", artifactId);
-    additionalProperties.put("artifactVersion", artifactVersion);
-  
-    supportingFiles.add(new SupportingFile("index.mustache", "", "index.html")); 
-    reservedWords = new HashSet<String>();
-
-    languageSpecificPrimitives = new HashSet<String>();
-    importMapping = new HashMap<String, String> ();
-  }
-
-  @Override
-  public String getTypeDeclaration(Property p) {
-    if(p instanceof ArrayProperty) {
-      ArrayProperty ap = (ArrayProperty) p;
-      Property inner = ap.getItems();
-      return getSwaggerType(p) + "[" + getTypeDeclaration(inner) + "]";
-    }
-    else if (p instanceof MapProperty) {
-      MapProperty mp = (MapProperty) p;
-      Property inner = mp.getAdditionalProperties();
-
-      return getSwaggerType(p) + "[String, " + getTypeDeclaration(inner) + "]";
-    }
-    return super.getTypeDeclaration(p);
-  }
-
-  @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();
-    }
-    return objs;
-  }
-}

modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/SwaggerGenerator.java

@@ -1,42 +0,0 @@
-package com.wordnik.swagger.codegen.languages;
-
-import com.wordnik.swagger.codegen.*;
-import com.wordnik.swagger.util.*;
-import com.wordnik.swagger.models.Swagger;
-
-import org.apache.commons.io.FileUtils;
-
-import java.io.File;
-
-public class SwaggerGenerator extends DefaultCodegen implements CodegenConfig {
-  public CodegenType getTag() {
-    return CodegenType.DOCUMENTATION;
-  }
-
-  public String getName() {
-    return "swagger";
-  }
-
-  public String getHelp() {
-    return "Creates a static swagger.json file.";
-  }
-
-  public SwaggerGenerator() {
-    super();
-    outputFolder = "generated-code/swagger";
-  }
-
-  @Override
-  public void processSwagger(Swagger swagger) {
-    String swaggerString = Json.pretty(swagger);
-
-    try{
-      String outputFile = outputFolder + File.separator + "swagger.json";
-      FileUtils.writeStringToFile(new File(outputFile), swaggerString);
-      System.out.println("wrote file to " + outputFile);
-    }
-    catch(Exception e) {
-      e.printStackTrace();
-    }
-  }
-}

modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/TizenClientCodegen.java

@@ -1,247 +0,0 @@
-package com.wordnik.swagger.codegen.languages;
-
-import com.wordnik.swagger.util.Json;
-import com.wordnik.swagger.codegen.*;
-import com.wordnik.swagger.models.properties.*;
-
-import java.util.*;
-import java.io.File;
-
-public class TizenClientCodegen extends DefaultCodegen implements CodegenConfig {
-  protected Set<String> foundationClasses = new HashSet<String>();
-  protected String sourceFolder = "client";
-  protected static String PREFIX = "Sami";
-  protected Map<String, String> namespaces = new HashMap<String, String>();
-
-  public CodegenType getTag() {
-    return CodegenType.CLIENT;
-  }
-  
-  public String getName() {
-    return "tizen";
-  }
-
-  public String getHelp() {
-    return "Generates a Samsung Tizen C++ client library.";
-  }
-
-  public TizenClientCodegen() {
-    super();
-    outputFolder = "generated-code/tizen";
-    modelTemplateFiles.put("model-header.mustache", ".h");
-    modelTemplateFiles.put("model-body.mustache", ".cpp");
-    apiTemplateFiles.put("api-header.mustache", ".h");
-    apiTemplateFiles.put("api-body.mustache", ".cpp");
-    templateDir = "tizen";
-    modelPackage = "";
-
-    defaultIncludes = new HashSet<String>(
-      Arrays.asList(
-        "bool",
-        "int",
-        "long")
-      );
-    languageSpecificPrimitives = new HashSet<String>();
-
-    additionalProperties().put("prefix", PREFIX);
-
-    reservedWords = new HashSet<String>(
-      // VERIFY
-      Arrays.asList(
-        "void", "char", "short", "int", "void", "char", "short", "int",
-        "long", "float", "double", "signed", "unsigned", "id", "const",
-        "volatile", "in", "out", "inout", "bycopy", "byref", "oneway",
-        "self", "super"
-      ));
-
-    super.typeMapping = new HashMap<String, String>();
-
-    typeMapping.put("Date", "DateTime");
-    typeMapping.put("DateTime", "DateTime");
-    typeMapping.put("string", "String");
-    typeMapping.put("integer", "Integer");
-    typeMapping.put("float", "Float");
-    typeMapping.put("long", "Long");
-    typeMapping.put("boolean", "Boolean");
-    typeMapping.put("double", "Double");
-    typeMapping.put("array", "IList");
-    typeMapping.put("map", "HashMap");
-    typeMapping.put("number", "Long");
-    typeMapping.put("object", PREFIX + "Object");
-
-    importMapping = new HashMap<String, String>();
-
-    namespaces = new HashMap<String, String> ();
-    namespaces.put("DateTime", "Tizen::Base::DateTime");
-    namespaces.put("Integer", "Tizen::Base::Integer");
-    namespaces.put("Long", "Tizen::Base::Long");
-    namespaces.put("Boolean", "Tizen::Base::Boolean");
-    namespaces.put("Float", "Tizen::Base::Float");
-    namespaces.put("String", "Tizen::Base::String");
-    namespaces.put("Double", "Tizen::Base::Double");
-    namespaces.put("IList", "Tizen::Base::Collection::IList");
-    namespaces.put("HashMap", "Tizen::Base::Collection::HashMap");
-    namespaces.put("ArrayList", "Tizen::Base::Collection::ArrayList");
-    namespaces.put("JsonNumber", "Tizen::Web::Json");
-    namespaces.put("JsonString", "Tizen::Web::Json");
-
-    foundationClasses = new HashSet<String> (
-      Arrays.asList(
-        "String",
-        "Integer",
-        "Float")
-      );
-    supportingFiles.clear();
-    supportingFiles.add(new SupportingFile("modelFactory.mustache", sourceFolder, PREFIX + "ModelFactory.h"));
-    supportingFiles.add(new SupportingFile("helpers-header.mustache", sourceFolder, PREFIX + "Helpers.h"));
-    supportingFiles.add(new SupportingFile("helpers-body.mustache", sourceFolder, PREFIX + "Helpers.cpp"));
-    supportingFiles.add(new SupportingFile("apiclient-header.mustache", sourceFolder, PREFIX + "ApiClient.h"));
-    supportingFiles.add(new SupportingFile("apiclient-body.mustache", sourceFolder, PREFIX + "ApiClient.cpp"));
-    supportingFiles.add(new SupportingFile("object.mustache", sourceFolder, PREFIX + "Object.h"));
-    supportingFiles.add(new SupportingFile("error-header.mustache", sourceFolder, PREFIX + "Error.h"));
-    supportingFiles.add(new SupportingFile("error-body.mustache", sourceFolder, PREFIX + "Error.cpp"));
-  }
-
-  @Override
-  public String toInstantiationType(Property p) {
-    if (p instanceof MapProperty) {
-      MapProperty ap = (MapProperty) p;
-      String inner = getSwaggerType(ap.getAdditionalProperties());
-      return instantiationTypes.get("map");
-    }
-    else if (p instanceof ArrayProperty) {
-      ArrayProperty ap = (ArrayProperty) p;
-      String inner = getSwaggerType(ap.getItems());
-      return instantiationTypes.get("array");
-    }
-    else
-      return null;
-  }
-
-  @Override
-  public String getTypeDeclaration(String name) {
-    if(languageSpecificPrimitives.contains(name) && !foundationClasses.contains(name))
-      return name;
-    else
-      return name + "*";
-  }
-
-  @Override
-  public String getSwaggerType(Property p) {
-    String swaggerType = super.getSwaggerType(p);
-    String type = null;
-    if(typeMapping.containsKey(swaggerType)) {
-      type = typeMapping.get(swaggerType);
-      if(languageSpecificPrimitives.contains(type) && !foundationClasses.contains(type))
-        return toModelName(type);
-    }
-    else
-      type = swaggerType;
-    return toModelName(type);
-  }
-
-  @Override
-  public String getTypeDeclaration(Property p) {
-    String swaggerType = getSwaggerType(p);
-    if(languageSpecificPrimitives.contains(swaggerType) && !foundationClasses.contains(swaggerType))
-      return toModelName(swaggerType);
-    else
-      return swaggerType + "*";
-  }
-
-  @Override
-  public String toModelName(String type) {
-    if(typeMapping.keySet().contains(type) ||
-      typeMapping.values().contains(type) || 
-      foundationClasses.contains(type) ||
-      importMapping.values().contains(type) ||
-      defaultIncludes.contains(type) ||
-      languageSpecificPrimitives.contains(type)) {
-      return type;
-    }
-    else {
-      return PREFIX + Character.toUpperCase(type.charAt(0)) + type.substring(1);
-    }
-  }
-
-  @Override
-  public String toModelImport(String name) {
-    if(namespaces.containsKey(name)) {
-      return "using " + namespaces.get(name) + ";";
-    }
-    return "#include \"" + name + ".h\"";
-  }
-
-  @Override
-  public String toDefaultValue(Property p) {
-    if(p instanceof StringProperty)
-      return "new String()";
-    else if (p instanceof BooleanProperty)
-      return "new Boolean(false)";
-    else if(p instanceof DateProperty)
-      return "new DateTime()";
-    else if(p instanceof DateTimeProperty)
-      return "new DateTime()";
-    else if (p instanceof DoubleProperty)
-      return "new Double()";
-    else if (p instanceof FloatProperty)
-      return "new Float()";
-    else if (p instanceof IntegerProperty)
-      return "new Integer()";
-    else if (p instanceof LongProperty)
-      return "new Long()";
-    else if (p instanceof DecimalProperty)
-      return "new Long()";
-    else if (p instanceof MapProperty) {
-      MapProperty ap = (MapProperty) p;
-      String inner = getSwaggerType(ap.getAdditionalProperties());
-      return "new HashMap()";
-    }
-    else if (p instanceof ArrayProperty) {
-      ArrayProperty ap = (ArrayProperty) p;
-      String inner = getSwaggerType(ap.getItems());
-      return "new ArrayList()";
-    }
-    // else
-    if(p instanceof RefProperty) {
-      RefProperty rp = (RefProperty) p;
-      return "new " + toModelName(rp.getSimpleRef()) + "()";
-    }
-    return "null";
-  }
-
-  @Override
-  public String apiFileFolder() {
-    return outputFolder + File.separator + sourceFolder;
-  }
-
-  @Override
-  public String modelFileFolder() {
-    return outputFolder + File.separator + sourceFolder;
-  }
-
-  @Override
-  public String toModelFilename(String name) {
-    return PREFIX + initialCaps(name);
-  }
-
-  @Override
-  public String toApiName(String name) {
-    return PREFIX + initialCaps(name) + "Api";
-  }
-
-  public String toApiFilename(String name) {
-    return PREFIX + initialCaps(name) + "Api";
-  }
-
-  @Override
-  public String toVarName(String name) {
-    String paramName = name.replaceAll("[^a-zA-Z0-9_]","");
-    paramName = Character.toUpperCase(paramName.charAt(0)) + paramName.substring(1);
-    return "p" + paramName;
-  }
-
-  public String escapeReservedWord(String name) {
-    return "_" + name;
-  }
-}

modules/swagger-codegen/src/main/java/config/Config.java

@@ -0,0 +1,34 @@
+package config;
+
+import com.google.common.collect.ImmutableMap;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class Config {
+    private Map<String, String> options;
+
+    public Config() {
+        this.options = new HashMap<String, String>();
+    }
+
+    public Config(Map<String, String> properties) {
+        this.options = properties;
+    }
+
+    public Map<String, String> getOptions() {
+        return ImmutableMap.copyOf(options);
+    }
+
+    public boolean hasOption(String opt) {
+        return options.containsKey(opt);
+    }
+
+    public String getOption(String opt) {
+        return options.get(opt);
+    }
+
+    public void setOption(String opt, String value) {
+        options.put(opt, value);
+    }
+}

modules/swagger-codegen/src/main/java/config/ConfigParser.java

@@ -0,0 +1,40 @@
+package config;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+import java.io.File;
+import java.util.Iterator;
+import java.util.Map;
+
+public class ConfigParser {
+
+    public static Config read(String location) {
+
+        System.out.println("reading config from " + location);
+
+        ObjectMapper mapper = new ObjectMapper();
+
+        Config config = new Config();
+
+        try {
+            JsonNode rootNode = mapper.readTree(new File(location));
+            Iterator<Map.Entry<String, JsonNode>> optionNodes = rootNode.fields();
+
+            while (optionNodes.hasNext()) {
+                Map.Entry<String, JsonNode> optionNode = (Map.Entry<String, JsonNode>) optionNodes.next();
+
+                if (optionNode.getValue().isValueNode()) {
+                    config.setOption(optionNode.getKey(), optionNode.getValue().asText());
+                } else {
+                    System.out.println("omitting non-value node " + optionNode.getKey());
+                }
+            }
+        } catch (Exception e) {
+            System.out.println(e.getMessage());
+            return null;
+        }
+
+        return config;
+    }
+}

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

@@ -0,0 +1,69 @@
+package io.swagger.codegen;
+
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.OutputStreamWriter;
+import java.io.Reader;
+import java.io.Writer;
+import java.util.regex.Pattern;
+
+public abstract class AbstractGenerator {
+
+    public File writeToFile(String filename, String contents) throws IOException {
+        System.out.println("writing file " + filename);
+        File output = new File(filename);
+
+        if (output.getParent() != null && !new File(output.getParent()).exists()) {
+            File parent = new File(output.getParent());
+            parent.mkdirs();
+        }
+        Writer out = new BufferedWriter(new OutputStreamWriter(
+                new FileOutputStream(output), "UTF-8"));
+
+        out.write(contents);
+        out.close();
+        return output;
+    }
+
+    public String readTemplate(String name) {
+        try {
+            Reader reader = getTemplateReader(name);
+            if (reader == null) {
+                throw new RuntimeException("no file found");
+            }
+            java.util.Scanner s = new java.util.Scanner(reader).useDelimiter("\\A");
+            return s.hasNext() ? s.next() : "";
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        throw new RuntimeException("can't load template " + name);
+    }
+
+    public Reader getTemplateReader(String name) {
+        try {
+            InputStream is = this.getClass().getClassLoader().getResourceAsStream(getCPResourcePath(name));
+            if (is == null) {
+                is = new FileInputStream(new File(name));
+            }
+            if (is == null) {
+                throw new RuntimeException("no file found");
+            }
+            return new InputStreamReader(is);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        throw new RuntimeException("can't load template " + name);
+    }
+
+    private String getCPResourcePath(String name) {
+        if (!"/".equals(File.separator)) {
+            return name.replaceAll(Pattern.quote(File.separator), "/");
+        }
+        return name;
+    }
+}

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

@@ -0,0 +1,23 @@
+package io.swagger.codegen;
+
+public class CliOption {
+    private final String opt;
+    private String description;
+
+    public CliOption(String opt, String description) {
+        this.opt = opt;
+        this.description = description;
+    }
+
+    public String getOpt() {
+        return opt;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+}

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

@@ -0,0 +1,92 @@
+package io.swagger.codegen;
+
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.models.Swagger;
+import io.swagger.models.auth.AuthorizationValue;
+
+import java.net.URLDecoder;
+import java.net.URLEncoder;
+import java.util.ArrayList;
+import java.util.List;
+
+public class ClientOptInput {
+    protected CodegenConfig config;
+    private ClientOpts opts;
+    private Swagger swagger;
+    private List<AuthorizationValue> auths;
+
+    public ClientOptInput swagger(Swagger swagger) {
+        this.setSwagger(swagger);
+        return this;
+    }
+
+    public ClientOptInput opts(ClientOpts opts) {
+        this.setOpts(opts);
+        return this;
+    }
+
+    public String getAuth() {
+        if (auths != null) {
+            StringBuilder b = new StringBuilder();
+            for (AuthorizationValue v : auths) {
+                try {
+                    if (b.toString().length() > 0) {
+                        b.append(",");
+                    }
+                    b.append(URLEncoder.encode(v.getKeyName(), "UTF-8"))
+                            .append(":")
+                            .append(URLEncoder.encode(v.getValue(), "UTF-8"));
+                } catch (Exception e) {
+                    // continue
+                    e.printStackTrace();
+                }
+            }
+            return b.toString();
+        } else {
+            return null;
+        }
+    }
+
+    public void setAuth(String urlEncodedAuthString) {
+        List<AuthorizationValue> auths = new ArrayList<AuthorizationValue>();
+        if (urlEncodedAuthString != null && !"".equals(urlEncodedAuthString)) {
+            String[] parts = urlEncodedAuthString.split(",");
+            for (String part : parts) {
+                String[] kvPair = part.split(":");
+                if (kvPair.length == 2) {
+                    auths.add(new AuthorizationValue(URLDecoder.decode(kvPair[0]), URLDecoder.decode(kvPair[1]), "header"));
+                }
+            }
+        }
+        this.auths = auths;
+    }
+
+    public List<AuthorizationValue> getAuthorizationValues() {
+        return auths;
+    }
+
+    public CodegenConfig getConfig() {
+        return config;
+    }
+
+    public void setConfig(CodegenConfig config) {
+        this.config = config;
+    }
+
+    public ClientOpts getOpts() {
+        return opts;
+    }
+
+    public void setOpts(ClientOpts opts) {
+        this.opts = opts;
+    }
+
+    @ApiModelProperty(dataType = "Object")
+    public Swagger getSwagger() {
+        return swagger;
+    }
+
+    public void setSwagger(Swagger swagger) {
+        this.swagger = swagger;
+    }
+}

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

@@ -0,0 +1,57 @@
+package io.swagger.codegen;
+
+import io.swagger.codegen.auth.AuthMethod;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class ClientOpts {
+    protected String uri;
+    protected String target;
+    protected AuthMethod auth;
+    protected Map<String, String> properties = new HashMap<String, String>();
+    protected String outputDirectory;
+
+    public String getUri() {
+        return uri;
+    }
+
+    public void setUri(String uri) {
+        this.uri = uri;
+    }
+
+    public String getTarget() {
+        return target;
+    }
+
+    public void setTarget(String target) {
+        this.target = target;
+    }
+
+    public Map<String, String> getProperties() {
+        return properties;
+    }
+
+    public void setProperties(Map<String, String> properties) {
+        this.properties = properties;
+    }
+
+    public String getOutputDirectory() {
+        return outputDirectory;
+    }
+
+    public void setOutputDirectory(String outputDirectory) {
+        this.outputDirectory = outputDirectory;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("ClientOpts: {\n");
+        sb.append("  uri: ").append(uri).append(",");
+        sb.append("  auth: ").append(auth).append(",");
+        sb.append(properties);
+        sb.append("}");
+        return sb.toString();
+    }
+}

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

@@ -0,0 +1,148 @@
+package io.swagger.codegen;
+
+import io.swagger.models.Swagger;
+import io.swagger.parser.SwaggerParser;
+import org.apache.commons.cli.BasicParser;
+import org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.CommandLineParser;
+import org.apache.commons.cli.HelpFormatter;
+import org.apache.commons.cli.Options;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.ServiceLoader;
+
+/**
+ * @deprecated use instead {@link io.swagger.codegen.DefaultGenerator}
+ * or cli interface from https://github.com/swagger-api/swagger-codegen/pull/547
+ */
+@Deprecated
+public class Codegen extends DefaultGenerator {
+    static Map<String, CodegenConfig> configs = new HashMap<String, CodegenConfig>();
+    static String configString;
+    static String debugInfoOptions = "\nThe following additional debug options are available for all codegen targets:" +
+            "\n -DdebugSwagger prints the swagger specification as interpreted by the codegen" +
+            "\n -DdebugModels prints models passed to the template engine" +
+            "\n -DdebugOperations prints operations passed to the template engine" +
+            "\n -DdebugSupportingFiles prints additional data passed to the template engine";
+
+    public static void main(String[] args) {
+
+        StringBuilder sb = new StringBuilder();
+
+        Options options = new Options();
+        options.addOption("h", "help", false, "shows this message");
+        options.addOption("l", "lang", true, "client language to generate.\nAvailable languages include:\n\t[" + configString + "]");
+        options.addOption("o", "output", true, "where to write the generated files");
+        options.addOption("i", "input-spec", true, "location of the swagger spec, as URL or file");
+        options.addOption("t", "template-dir", true, "folder containing the template files");
+        options.addOption("d", "debug-info", false, "prints additional info for debugging");
+        options.addOption("a", "auth", true, "adds authorization headers when fetching the swagger definitions remotely. Pass in a URL-encoded string of name:header with a comma separating multiple values");
+
+        ClientOptInput clientOptInput = new ClientOptInput();
+        ClientOpts clientOpts = new ClientOpts();
+        Swagger swagger = null;
+
+        CommandLine cmd = null;
+        try {
+            CommandLineParser parser = new BasicParser();
+            CodegenConfig config = null;
+
+            cmd = parser.parse(options, args);
+            if (cmd.hasOption("d")) {
+                usage(options);
+                System.out.println(debugInfoOptions);
+                return;
+            }
+            if (cmd.hasOption("a")) {
+                clientOptInput.setAuth(cmd.getOptionValue("a"));
+            }
+            if (cmd.hasOption("l")) {
+                clientOptInput.setConfig(getConfig(cmd.getOptionValue("l")));
+            } else {
+                usage(options);
+                return;
+            }
+            if (cmd.hasOption("o")) {
+                clientOptInput.getConfig().setOutputDir(cmd.getOptionValue("o"));
+            }
+            if (cmd.hasOption("h")) {
+                if (cmd.hasOption("l")) {
+                    config = getConfig(String.valueOf(cmd.getOptionValue("l")));
+                    if (config != null) {
+                        options.addOption("h", "help", true, config.getHelp());
+                        usage(options);
+                        return;
+                    }
+                }
+                usage(options);
+                return;
+            }
+            if (cmd.hasOption("i")) {
+                swagger = new SwaggerParser().read(cmd.getOptionValue("i"), clientOptInput.getAuthorizationValues(), true);
+            }
+            if (cmd.hasOption("t")) {
+                clientOpts.getProperties().put("templateDir", String.valueOf(cmd.getOptionValue("t")));
+            }
+        } catch (Exception e) {
+            usage(options);
+            return;
+        }
+        try {
+            clientOptInput
+                    .opts(clientOpts)
+                    .swagger(swagger);
+            new Codegen().opts(clientOptInput).generate();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    public static List<CodegenConfig> getExtensions() {
+        ServiceLoader<CodegenConfig> loader = ServiceLoader.load(CodegenConfig.class);
+        List<CodegenConfig> output = new ArrayList<CodegenConfig>();
+        Iterator<CodegenConfig> itr = loader.iterator();
+        while (itr.hasNext()) {
+            output.add(itr.next());
+        }
+        return output;
+    }
+
+    static void usage(Options options) {
+        HelpFormatter formatter = new HelpFormatter();
+        formatter.printHelp("Codegen", options);
+    }
+
+    public static CodegenConfig getConfig(String name) {
+        if (configs.containsKey(name)) {
+            return configs.get(name);
+        } else {
+            // see if it's a class
+            try {
+                System.out.println("loading class " + name);
+                Class customClass = Class.forName(name);
+                System.out.println("loaded");
+                return (CodegenConfig) customClass.newInstance();
+            } catch (Exception e) {
+                throw new RuntimeException("can't load class " + name);
+            }
+        }
+    }
+
+    static {
+        List<CodegenConfig> extensions = getExtensions();
+        StringBuilder sb = new StringBuilder();
+
+        for (CodegenConfig config : extensions) {
+            if (sb.toString().length() != 0) {
+                sb.append(", ");
+            }
+            sb.append(config.getName());
+            configs.put(config.getName(), config);
+            configString = sb.toString();
+        }
+    }
+}

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

@@ -0,0 +1,105 @@
+package io.swagger.codegen;
+
+import io.swagger.models.Model;
+import io.swagger.models.Operation;
+import io.swagger.models.Swagger;
+import io.swagger.models.auth.SecuritySchemeDefinition;
+import io.swagger.models.properties.Property;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+public interface CodegenConfig {
+    CodegenType getTag();
+
+    String getName();
+
+    String getHelp();
+
+    Map<String, Object> additionalProperties();
+
+    String apiPackage();
+
+    String apiFileFolder();
+
+    String fileSuffix();
+
+    String outputFolder();
+
+    String templateDir();
+
+    String modelFileFolder();
+
+    String modelPackage();
+
+    String toApiName(String name);
+
+    String toApiVarName(String name);
+
+    String toModelName(String name);
+
+    String toParamName(String name);
+
+    String escapeText(String text);
+
+    String escapeReservedWord(String name);
+
+    String getTypeDeclaration(Property p);
+
+    String getTypeDeclaration(String name);
+
+    void processOpts();
+
+    List<CliOption> cliOptions();
+
+    String generateExamplePath(String path, Operation operation);
+
+    Set<String> reservedWords();
+
+    List<SupportingFile> supportingFiles();
+
+    String getOutputDir();
+
+    void setOutputDir(String dir);
+
+    CodegenModel fromModel(String name, Model model);
+
+    CodegenOperation fromOperation(String resourcePath, String httpMethod, Operation operation, Map<String, Model> definitions);
+
+    List<CodegenSecurity> fromSecurity(Map<String, SecuritySchemeDefinition> schemes);
+
+    Set<String> defaultIncludes();
+
+    Map<String, String> typeMapping();
+
+    Map<String, String> instantiationTypes();
+
+    Map<String, String> importMapping();
+
+    Map<String, String> apiTemplateFiles();
+
+    Map<String, String> modelTemplateFiles();
+
+    void processSwagger(Swagger swagger);
+
+    String toApiFilename(String name);
+
+    String toModelFilename(String name);
+
+    String toModelImport(String name);
+
+    String toApiImport(String name);
+
+    void addOperationToGroup(String tag, String resourcePath, Operation operation, CodegenOperation co, Map<String, List<CodegenOperation>> operations);
+
+    Map<String, Object> postProcessModels(Map<String, Object> objs);
+
+    Map<String, Object> postProcessOperations(Map<String, Object> objs);
+
+    Map<String, Object> postProcessSupportingFileData(Map<String, Object> objs);
+
+    String apiFilename(String templateName, String tag);
+
+    boolean shouldOverwrite(String filename);
+}

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

@@ -0,0 +1,18 @@
+package io.swagger.codegen;
+
+import io.swagger.models.ExternalDocs;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+public class CodegenModel {
+    public String parent;
+    public String name, classname, description, classVarName, modelJson;
+    public String defaultValue;
+    public List<CodegenProperty> vars = new ArrayList<CodegenProperty>();
+    public Set<String> imports = new HashSet<String>();
+    public Boolean hasVars, emptyVars, hasMoreModels, hasEnums;
+    public ExternalDocs externalDocs;
+}

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

@@ -0,0 +1,39 @@
+package io.swagger.codegen;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public final class CodegenModelFactory {
+
+    private static final Map<CodegenModelType, Class<?>> typeMapping = new HashMap<CodegenModelType, Class<?>>();
+
+    /**
+     * Configure a different implementation class.
+     *
+     * @param type           the type that shall be replaced
+     * @param implementation the implementation class must extend the default class and must provide a public no-arg constructor
+     */
+    public static void setTypeMapping(CodegenModelType type, Class<?> implementation) {
+        if (!type.getDefaultImplementation().isAssignableFrom(implementation)) {
+            throw new IllegalArgumentException(implementation.getSimpleName() + " doesn't extend " + type.getDefaultImplementation().getSimpleName());
+        }
+        try {
+            implementation.newInstance();
+        } catch (Exception e) {
+            throw new IllegalArgumentException(e);
+        }
+        typeMapping.put(type, implementation);
+    }
+
+    @SuppressWarnings("unchecked")
+    public static <T> T newInstance(CodegenModelType type) {
+        Class<?> classType = typeMapping.get(type);
+        try {
+            return (T) (classType != null ? classType : type.getDefaultImplementation()).newInstance();
+        } catch (InstantiationException e) {
+            throw new RuntimeException(e);
+        } catch (IllegalAccessException e) {
+            throw new RuntimeException(e);
+        }
+    }
+}

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

@@ -0,0 +1,21 @@
+package io.swagger.codegen;
+
+public enum CodegenModelType {
+
+    MODEL(CodegenModel.class),
+    OPERATION(CodegenOperation.class),
+    PARAMETER(CodegenParameter.class),
+    PROPERTY(CodegenProperty.class),
+    RESPONSE(CodegenResponse.class),
+    SECURITY(CodegenSecurity.class);
+
+    private final Class<?> defaultImplementation;
+
+    private CodegenModelType(Class<?> defaultImplementation) {
+        this.defaultImplementation = defaultImplementation;
+    }
+
+    public Class<?> getDefaultImplementation() {
+        return defaultImplementation;
+    }
+}

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

@@ -0,0 +1,35 @@
+package io.swagger.codegen;
+
+import io.swagger.models.ExternalDocs;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+public class CodegenOperation {
+    public final List<CodegenProperty> responseHeaders = new ArrayList<CodegenProperty>();
+    public Boolean hasConsumes, hasProduces, hasParams, returnTypeIsPrimitive,
+            returnSimpleType, subresourceOperation, isMapContainer, isListContainer,
+            hasMore = Boolean.TRUE, isMultipart;
+    public String path, operationId, returnType, httpMethod, returnBaseType,
+            returnContainer, summary, notes, baseName, defaultResponse;
+    public List<Map<String, String>> consumes, produces;
+    public CodegenParameter bodyParam;
+    public List<CodegenParameter> allParams = new ArrayList<CodegenParameter>();
+    public List<CodegenParameter> bodyParams = new ArrayList<CodegenParameter>();
+    public List<CodegenParameter> pathParams = new ArrayList<CodegenParameter>();
+    public List<CodegenParameter> queryParams = new ArrayList<CodegenParameter>();
+    public List<CodegenParameter> headerParams = new ArrayList<CodegenParameter>();
+    public List<CodegenParameter> formParams = new ArrayList<CodegenParameter>();
+    public List<CodegenSecurity> authMethods;
+    public List<String> tags;
+    public List<CodegenResponse> responses = new ArrayList<CodegenResponse>();
+    public Set<String> imports = new HashSet<String>();
+    public List<Map<String, String>> examples;
+    public ExternalDocs externalDocs;
+
+    // legacy support
+    public String nickname;
+}

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

@@ -0,0 +1,41 @@
+package io.swagger.codegen;
+
+public class CodegenParameter {
+    public Boolean isFormParam, isQueryParam, isPathParam, isHeaderParam,
+            isCookieParam, isBodyParam, isFile, notFile, hasMore, isContainer, secondaryParam;
+    public String baseName, paramName, dataType, collectionFormat, description, baseType, defaultValue;
+    public String jsonSchema;
+
+    /**
+     * Determines whether this parameter is mandatory. If the parameter is in "path",
+     * this property is required and its value MUST be true. Otherwise, the property
+     * MAY be included and its default value is false.
+     */
+    public Boolean required;
+
+    public CodegenParameter copy() {
+        CodegenParameter output = new CodegenParameter();
+        output.isFile = this.isFile;
+        output.notFile = this.notFile;
+        output.hasMore = this.hasMore;
+        output.isContainer = this.isContainer;
+        output.secondaryParam = this.secondaryParam;
+        output.baseName = this.baseName;
+        output.paramName = this.paramName;
+        output.dataType = this.dataType;
+        output.collectionFormat = this.collectionFormat;
+        output.description = this.description;
+        output.baseType = this.baseType;
+        output.isFormParam = this.isFormParam;
+        output.isQueryParam = this.isQueryParam;
+        output.isPathParam = this.isPathParam;
+        output.isHeaderParam = this.isHeaderParam;
+        output.isCookieParam = this.isCookieParam;
+        output.isBodyParam = this.isBodyParam;
+        output.required = this.required;
+        output.jsonSchema = this.jsonSchema;
+        output.defaultValue = this.defaultValue;
+
+        return output;
+    }
+}

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

@@ -0,0 +1,37 @@
+package io.swagger.codegen;
+
+import java.util.List;
+import java.util.Map;
+
+public class CodegenProperty {
+    public String baseName, complexType, getter, setter, description, datatype, datatypeWithEnum,
+            name, min, max, defaultValue, baseType, containerType;
+
+    /**
+     * maxLength validation for strings, see http://json-schema.org/latest/json-schema-validation.html#rfc.section.5.2.1
+     */
+    public Integer maxLength;
+    /**
+     * minLength validation for strings, see http://json-schema.org/latest/json-schema-validation.html#rfc.section.5.2.2
+     */
+    public Integer minLength;
+    /**
+     * pattern validation for strings, see http://json-schema.org/latest/json-schema-validation.html#rfc.section.5.2.3
+     */
+    public String pattern;
+    /**
+     * A free-form property to include an example of an instance for this schema.
+     */
+    public String example;
+
+    public String jsonSchema;
+    public Double minimum;
+    public Double maximum;
+    public Boolean exclusiveMinimum;
+    public Boolean exclusiveMaximum;
+    public Boolean hasMore = null, required = null, secondaryParam = null;
+    public Boolean isPrimitiveType, isContainer, isNotContainer;
+    public boolean isEnum;
+    public List<String> _enum;
+    public Map<String, Object> allowableValues;
+}

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

@@ -0,0 +1,24 @@
+package io.swagger.codegen;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+public class CodegenResponse {
+    public final List<CodegenProperty> headers = new ArrayList<CodegenProperty>();
+    public String code, message;
+    public Boolean hasMore;
+    public List<Map<String, Object>> examples;
+    public String dataType, baseType, containerType;
+    public Boolean isDefault;
+    public Boolean simpleType;
+    public Boolean primitiveType;
+    public Boolean isMapContainer;
+    public Boolean isListContainer;
+    public Object schema;
+    public String jsonSchema;
+
+    public boolean isWildcard() {
+        return "0".equals(code) || "default".equals(code);
+    }
+}

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

@@ -0,0 +1,10 @@
+package io.swagger.codegen;
+
+public class CodegenSecurity {
+    public String name;
+    public String type;
+    public Boolean hasMore, isBasic, isOAuth, isApiKey;
+    // ApiKey specific
+    public String keyParamName;
+    public Boolean isKeyInQuery, isKeyInHeader;
+}

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

@@ -0,0 +1,36 @@
+package io.swagger.codegen;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public enum CodegenType {
+    CLIENT, SERVER, DOCUMENTATION, OTHER;
+
+    private static Map<String, CodegenType> names = new HashMap<String, CodegenType>();
+
+    @JsonCreator
+    public static CodegenType forValue(String value) {
+        return names.get(value.toLowerCase());
+    }
+
+    @JsonValue
+    public String toValue() {
+        for (Map.Entry<String, CodegenType> entry : names.entrySet()) {
+            if (entry.getValue() == this) {
+                return entry.getKey();
+            }
+        }
+
+        return null; // or fail
+    }
+
+    static {
+        names.put("client", CLIENT);
+        names.put("server", SERVER);
+        names.put("documentation", DOCUMENTATION);
+        names.put("other", OTHER);
+    }
+}

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

@@ -0,0 +1,484 @@
+package io.swagger.codegen;
+
+import com.samskivert.mustache.Mustache;
+import com.samskivert.mustache.Template;
+import io.swagger.models.Contact;
+import io.swagger.models.Info;
+import io.swagger.models.License;
+import io.swagger.models.Model;
+import io.swagger.models.Operation;
+import io.swagger.models.Path;
+import io.swagger.models.Swagger;
+import io.swagger.models.auth.SecuritySchemeDefinition;
+import io.swagger.util.Json;
+import org.apache.commons.io.IOUtils;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.Reader;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import static org.apache.commons.lang3.StringUtils.capitalize;
+import static org.apache.commons.lang3.StringUtils.isNotEmpty;
+
+public class DefaultGenerator extends AbstractGenerator implements Generator {
+    protected CodegenConfig config;
+    protected ClientOptInput opts = null;
+    protected Swagger swagger = null;
+
+    public Generator opts(ClientOptInput opts) {
+        this.opts = opts;
+
+        this.swagger = opts.getSwagger();
+        this.config = opts.getConfig();
+        this.config.additionalProperties().putAll(opts.getOpts().getProperties());
+
+        return this;
+    }
+
+    public List<File> generate() {
+        if (swagger == null || config == null) {
+            throw new RuntimeException("missing swagger input or config!");
+        }
+        if (System.getProperty("debugSwagger") != null) {
+            Json.prettyPrint(swagger);
+        }
+        List<File> files = new ArrayList<File>();
+        try {
+            config.processOpts();
+            if (swagger.getInfo() != null) {
+                Info info = swagger.getInfo();
+                if (info.getTitle() != null) {
+                    config.additionalProperties().put("appName", info.getTitle());
+                }
+                if (info.getVersion() != null) {
+                    config.additionalProperties().put("appVersion", info.getVersion());
+                }
+                if (info.getDescription() != null) {
+                    config.additionalProperties().put("appDescription",
+                            config.escapeText(info.getDescription()));
+                }
+                if (info.getContact() != null) {
+                    Contact contact = info.getContact();
+                    config.additionalProperties().put("infoUrl", contact.getUrl());
+                    if (contact.getEmail() != null) {
+                        config.additionalProperties().put("infoEmail", contact.getEmail());
+                    }
+                }
+                if (info.getLicense() != null) {
+                    License license = info.getLicense();
+                    if (license.getName() != null) {
+                        config.additionalProperties().put("licenseInfo", license.getName());
+                    }
+                    if (license.getUrl() != null) {
+                        config.additionalProperties().put("licenseUrl", license.getUrl());
+                    }
+                }
+                if (info.getVersion() != null) {
+                    config.additionalProperties().put("version", info.getVersion());
+                }
+            }
+
+            StringBuilder hostBuilder = new StringBuilder();
+            String scheme;
+            if (swagger.getSchemes() != null && swagger.getSchemes().size() > 0) {
+                scheme = swagger.getSchemes().get(0).toValue();
+            } else {
+                scheme = "https";
+            }
+            hostBuilder.append(scheme);
+            hostBuilder.append("://");
+            if (swagger.getHost() != null) {
+                hostBuilder.append(swagger.getHost());
+            } else {
+                hostBuilder.append("localhost");
+            }
+            if (swagger.getBasePath() != null) {
+                hostBuilder.append(swagger.getBasePath());
+            } else {
+                hostBuilder.append("/");
+            }
+            String contextPath = swagger.getBasePath() == null ? "/" : swagger.getBasePath();
+            String basePath = hostBuilder.toString();
+
+
+            List<Object> allOperations = new ArrayList<Object>();
+            List<Object> allModels = new ArrayList<Object>();
+
+            // models
+            Map<String, Model> definitions = swagger.getDefinitions();
+            if (definitions != null) {
+                for (String name : definitions.keySet()) {
+                    Model model = definitions.get(name);
+                    Map<String, Model> modelMap = new HashMap<String, Model>();
+                    modelMap.put(name, model);
+                    Map<String, Object> models = processModels(config, modelMap);
+                    models.putAll(config.additionalProperties());
+
+                    allModels.add(((List<Object>) models.get("models")).get(0));
+
+                    for (String templateName : config.modelTemplateFiles().keySet()) {
+                        String suffix = config.modelTemplateFiles().get(templateName);
+                        String filename = config.modelFileFolder() + File.separator + config.toModelFilename(name) + suffix;
+                        String template = readTemplate(config.templateDir() + File.separator + templateName);
+                        Template tmpl = Mustache.compiler()
+                                .withLoader(new Mustache.TemplateLoader() {
+                                    public Reader getTemplate(String name) {
+                                        return getTemplateReader(config.templateDir() + File.separator + name + ".mustache");
+                                    }
+                                })
+                                .defaultValue("")
+                                .compile(template);
+                        writeToFile(filename, tmpl.execute(models));
+                        files.add(new File(filename));
+                    }
+                }
+            }
+            if (System.getProperty("debugModels") != null) {
+                System.out.println("############ Model info ############");
+                Json.prettyPrint(allModels);
+            }
+
+            // apis
+            Map<String, List<CodegenOperation>> paths = processPaths(swagger.getPaths());
+            for (String tag : paths.keySet()) {
+                List<CodegenOperation> ops = paths.get(tag);
+                Map<String, Object> operation = processOperations(config, tag, ops);
+
+                operation.put("basePath", basePath);
+                operation.put("contextPath", contextPath);
+                operation.put("baseName", tag);
+                operation.put("modelPackage", config.modelPackage());
+                operation.putAll(config.additionalProperties());
+                operation.put("classname", config.toApiName(tag));
+                operation.put("classVarName", config.toApiVarName(tag));
+                operation.put("importPath", config.toApiImport(tag));
+
+                processMimeTypes(swagger.getConsumes(), operation, "consumes");
+                processMimeTypes(swagger.getProduces(), operation, "produces");
+
+                allOperations.add(new HashMap<String, Object>(operation));
+                for (int i = 0; i < allOperations.size(); i++) {
+                    Map<String, Object> oo = (Map<String, Object>) allOperations.get(i);
+                    if (i < (allOperations.size() - 1)) {
+                        oo.put("hasMore", "true");
+                    }
+                }
+
+                for (String templateName : config.apiTemplateFiles().keySet()) {
+
+                    String filename = config.apiFilename(templateName, tag);
+                    if (new File(filename).exists() && !config.shouldOverwrite(filename)) {
+                        continue;
+                    }
+
+                    String template = readTemplate(config.templateDir() + File.separator + templateName);
+                    Template tmpl = Mustache.compiler()
+                            .withLoader(new Mustache.TemplateLoader() {
+                                public Reader getTemplate(String name) {
+                                    return getTemplateReader(config.templateDir() + File.separator + name + ".mustache");
+                                }
+                            })
+                            .defaultValue("")
+                            .compile(template);
+
+                    writeToFile(filename, tmpl.execute(operation));
+                    files.add(new File(filename));
+                }
+            }
+            if (System.getProperty("debugOperations") != null) {
+                System.out.println("############ Operation info ############");
+                Json.prettyPrint(allOperations);
+            }
+
+            // supporting files
+            Map<String, Object> bundle = new HashMap<String, Object>();
+            bundle.putAll(config.additionalProperties());
+            bundle.put("apiPackage", config.apiPackage());
+
+            Map<String, Object> apis = new HashMap<String, Object>();
+            apis.put("apis", allOperations);
+            if (swagger.getHost() != null) {
+                bundle.put("host", swagger.getHost());
+            }
+            bundle.put("basePath", basePath);
+            bundle.put("scheme", scheme);
+            bundle.put("contextPath", contextPath);
+            bundle.put("apiInfo", apis);
+            bundle.put("models", allModels);
+            bundle.put("apiFolder", config.apiPackage().replace('.', File.separatorChar));
+            bundle.put("modelPackage", config.modelPackage());
+            bundle.put("authMethods", config.fromSecurity(swagger.getSecurityDefinitions()));
+            if (swagger.getExternalDocs() != null) {
+                bundle.put("externalDocs", swagger.getExternalDocs());
+            }
+            for (int i = 0; i < allModels.size() - 1; i++) {
+                HashMap<String, CodegenModel> cm = (HashMap<String, CodegenModel>) allModels.get(i);
+                CodegenModel m = cm.get("model");
+                m.hasMoreModels = true;
+            }
+
+            config.postProcessSupportingFileData(bundle);
+
+            if (System.getProperty("debugSupportingFiles") != null) {
+                System.out.println("############ Supporting file info ############");
+                Json.prettyPrint(bundle);
+            }
+
+            for (SupportingFile support : config.supportingFiles()) {
+                String outputFolder = config.outputFolder();
+                if (isNotEmpty(support.folder)) {
+                    outputFolder += File.separator + support.folder;
+                }
+                File of = new File(outputFolder);
+                if (!of.isDirectory()) {
+                    of.mkdirs();
+                }
+                String outputFilename = outputFolder + File.separator + support.destinationFilename;
+
+                if (support.templateFile.endsWith("mustache")) {
+                    String template = readTemplate(config.templateDir() + File.separator + support.templateFile);
+                    Template tmpl = Mustache.compiler()
+                            .withLoader(new Mustache.TemplateLoader() {
+                                public Reader getTemplate(String name) {
+                                    return getTemplateReader(config.templateDir() + File.separator + name + ".mustache");
+                                }
+                            })
+                            .defaultValue("")
+                            .compile(template);
+
+                    writeToFile(outputFilename, tmpl.execute(bundle));
+                    files.add(new File(outputFilename));
+                } else {
+                    InputStream in = null;
+
+                    try {
+                        in = new FileInputStream(config.templateDir() + File.separator + support.templateFile);
+                    } catch (Exception e) {
+                        // continue
+                    }
+                    if (in == null) {
+                        in = this.getClass().getClassLoader().getResourceAsStream(config.templateDir() + File.separator + support.templateFile);
+                    }
+                    File outputFile = new File(outputFilename);
+                    OutputStream out = new FileOutputStream(outputFile, false);
+                    if (in != null && out != null) {
+                        IOUtils.copy(in, out);
+                    } else {
+                        if (in == null) {
+                            System.out.println("can't open " + config.templateDir() + File.separator + support.templateFile + " for input");
+                        }
+                        if (out == null) {
+                            System.out.println("can't open " + outputFile + " for output");
+                        }
+                    }
+
+                    files.add(outputFile);
+                }
+            }
+
+            config.processSwagger(swagger);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return files;
+    }
+
+    private void processMimeTypes(List<String> mimeTypeList, Map<String, Object> operation, String source) {
+        if (mimeTypeList != null && mimeTypeList.size() > 0) {
+            List<Map<String, String>> c = new ArrayList<Map<String, String>>();
+            int count = 0;
+            for (String key : mimeTypeList) {
+                Map<String, String> mediaType = new HashMap<String, String>();
+                mediaType.put("mediaType", key);
+                count += 1;
+                if (count < mimeTypeList.size()) {
+                    mediaType.put("hasMore", "true");
+                } else {
+                    mediaType.put("hasMore", null);
+                }
+                c.add(mediaType);
+            }
+            operation.put(source, c);
+            String flagFieldName = "has" + source.substring(0, 1).toUpperCase() + source.substring(1);
+            operation.put(flagFieldName, true);
+        }
+    }
+
+    public Map<String, List<CodegenOperation>> processPaths(Map<String, Path> paths) {
+        Map<String, List<CodegenOperation>> ops = new HashMap<String, List<CodegenOperation>>();
+
+        for (String resourcePath : paths.keySet()) {
+            Path path = paths.get(resourcePath);
+            processOperation(resourcePath, "get", path.getGet(), ops);
+            processOperation(resourcePath, "put", path.getPut(), ops);
+            processOperation(resourcePath, "post", path.getPost(), ops);
+            processOperation(resourcePath, "delete", path.getDelete(), ops);
+            processOperation(resourcePath, "patch", path.getPatch(), ops);
+            processOperation(resourcePath, "options", path.getOptions(), ops);
+        }
+        return ops;
+    }
+
+    public SecuritySchemeDefinition fromSecurity(String name) {
+        Map<String, SecuritySchemeDefinition> map = swagger.getSecurityDefinitions();
+        if (map == null) {
+            return null;
+        }
+        return map.get(name);
+    }
+
+
+    public void processOperation(String resourcePath, String httpMethod, Operation operation, Map<String, List<CodegenOperation>> operations) {
+        if (operation != null) {
+            List<String> tags = operation.getTags();
+            if (tags == null) {
+                tags = new ArrayList<String>();
+                tags.add("default");
+            }
+
+            for (String tag : tags) {
+                CodegenOperation co = config.fromOperation(resourcePath, httpMethod, operation, swagger.getDefinitions());
+                co.tags = new ArrayList<String>();
+                co.tags.add(sanitizeTag(tag));
+                config.addOperationToGroup(sanitizeTag(tag), resourcePath, operation, co, operations);
+
+                List<Map<String, List<String>>> securities = operation.getSecurity();
+                if (securities == null) {
+                    continue;
+                }
+                Map<String, SecuritySchemeDefinition> authMethods = new HashMap<String, SecuritySchemeDefinition>();
+                for (Map<String, List<String>> security : securities) {
+                    if (security.size() != 1) {
+                        //Not sure what to do
+                        continue;
+                    }
+                    String securityName = security.keySet().iterator().next();
+                    SecuritySchemeDefinition securityDefinition = fromSecurity(securityName);
+                    if (securityDefinition != null) {
+                        authMethods.put(securityName, securityDefinition);
+                    }
+                }
+                if (!authMethods.isEmpty()) {
+                    co.authMethods = config.fromSecurity(authMethods);
+                }
+            }
+        }
+    }
+
+    protected String sanitizeTag(String tag) {
+        // remove spaces and make strong case
+        String[] parts = tag.split(" ");
+        StringBuilder buf = new StringBuilder();
+        for (String part : parts) {
+            if (isNotEmpty(part)) {
+                buf.append(capitalize(part));
+            }
+        }
+        return buf.toString().replaceAll("[^a-zA-Z ]", "");
+    }
+
+    public Map<String, Object> processOperations(CodegenConfig config, String tag, List<CodegenOperation> ops) {
+        Map<String, Object> operations = new HashMap<String, Object>();
+        Map<String, Object> objs = new HashMap<String, Object>();
+        objs.put("classname", config.toApiName(tag));
+
+        // check for operationId uniqueness
+        Set<String> opIds = new HashSet<String>();
+        int counter = 0;
+        for (CodegenOperation op : ops) {
+            String opId = op.nickname;
+            if (opIds.contains(opId)) {
+                counter++;
+                op.nickname += "_" + counter;
+            }
+            opIds.add(opId);
+        }
+        objs.put("operation", ops);
+
+        operations.put("operations", objs);
+        operations.put("package", config.apiPackage());
+
+
+        Set<String> allImports = new LinkedHashSet<String>();
+        for (CodegenOperation op : ops) {
+            allImports.addAll(op.imports);
+        }
+
+        List<Map<String, String>> imports = new ArrayList<Map<String, String>>();
+        for (String nextImport : allImports) {
+            Map<String, String> im = new LinkedHashMap<String, String>();
+            String mapping = config.importMapping().get(nextImport);
+            if (mapping == null) {
+                mapping = config.toModelImport(nextImport);
+            }
+            if (mapping != null) {
+                im.put("import", mapping);
+                imports.add(im);
+            }
+        }
+
+        operations.put("imports", imports);
+        config.postProcessOperations(operations);
+        if (objs.size() > 0) {
+            List<CodegenOperation> os = (List<CodegenOperation>) objs.get("operation");
+
+            if (os != null && os.size() > 0) {
+                CodegenOperation op = os.get(os.size() - 1);
+                op.hasMore = null;
+            }
+        }
+        return operations;
+    }
+
+    public Map<String, Object> processModels(CodegenConfig config, Map<String, Model> definitions) {
+        Map<String, Object> objs = new HashMap<String, Object>();
+        objs.put("package", config.modelPackage());
+        List<Object> models = new ArrayList<Object>();
+        Set<String> allImports = new LinkedHashSet<String>();
+        for (String key : definitions.keySet()) {
+            Model mm = definitions.get(key);
+            CodegenModel cm = config.fromModel(key, mm);
+            Map<String, Object> mo = new HashMap<String, Object>();
+            mo.put("model", cm);
+            mo.put("importPath", config.toModelImport(key));
+            models.add(mo);
+            allImports.addAll(cm.imports);
+        }
+        objs.put("models", models);
+
+        List<Map<String, String>> imports = new ArrayList<Map<String, String>>();
+        for (String nextImport : allImports) {
+            Map<String, String> im = new LinkedHashMap<String, String>();
+            String mapping = config.importMapping().get(nextImport);
+            if (mapping == null) {
+                mapping = config.toModelImport(nextImport);
+            }
+            if (mapping != null && !config.defaultIncludes().contains(mapping)) {
+                im.put("import", mapping);
+                imports.add(im);
+            }
+            // add instantiation types
+            mapping = config.instantiationTypes().get(nextImport);
+            if (mapping != null && !config.defaultIncludes().contains(mapping)) {
+                im.put("import", mapping);
+                imports.add(im);
+            }
+        }
+
+        objs.put("imports", imports);
+        config.postProcessModels(objs);
+
+        return objs;
+    }
+}

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

@@ -0,0 +1,10 @@
+package io.swagger.codegen;
+
+import java.io.File;
+import java.util.List;
+
+public interface Generator {
+    Generator opts(ClientOptInput opts);
+
+    List<File> generate();
+}

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

@@ -0,0 +1,196 @@
+package io.swagger.codegen;
+
+import com.samskivert.mustache.Mustache;
+import com.samskivert.mustache.Template;
+import io.swagger.models.Swagger;
+import org.apache.commons.cli.BasicParser;
+import org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.CommandLineParser;
+import org.apache.commons.cli.HelpFormatter;
+import org.apache.commons.cli.Options;
+import org.apache.commons.io.FileUtils;
+
+import java.io.File;
+import java.io.Reader;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.ServiceLoader;
+
+/**
+ * @deprecated use instead {@link io.swagger.codegen.DefaultGenerator}
+ * or cli interface from https://github.com/swagger-api/swagger-codegen/pull/547
+ */
+@Deprecated
+public class MetaGenerator extends AbstractGenerator {
+    static Map<String, CodegenConfig> configs = new HashMap<String, CodegenConfig>();
+    static String configString;
+
+    public static void main(String[] args) {
+        new MetaGenerator().generate(args);
+    }
+
+    public static List<CodegenConfig> getExtensions() {
+        ServiceLoader<CodegenConfig> loader = ServiceLoader.load(CodegenConfig.class);
+        List<CodegenConfig> output = new ArrayList<CodegenConfig>();
+        Iterator<CodegenConfig> itr = loader.iterator();
+        while (itr.hasNext()) {
+            output.add(itr.next());
+        }
+        return output;
+    }
+
+    static void usage(Options options) {
+        HelpFormatter formatter = new HelpFormatter();
+        formatter.printHelp("MetaGenerator. Generator for creating a new template set " +
+                "and configuration for Codegen.  The output will be based on the language you " +
+                "specify, and includes default templates to include.", options);
+    }
+
+    public static CodegenConfig getConfig(String name) {
+        if (configs.containsKey(name)) {
+            return configs.get(name);
+        }
+        return null;
+    }
+
+    protected void generate(String[] args) {
+        StringBuilder sb = new StringBuilder();
+        String targetLanguage = null;
+        String outputFolder = null;
+        String name = null;
+        String targetPackage = "io.swagger.codegen";
+        final String templateDir = "codegen";
+
+        Options options = new Options();
+        options.addOption("h", "help", false, "shows this message");
+        options.addOption("l", "lang", false, "client language to generate.\nAvailable languages include:\n\t[" + configString + "]");
+        options.addOption("o", "output", true, "where to write the generated files");
+        options.addOption("n", "name", true, "the human-readable name of the generator");
+        options.addOption("p", "package", true, "the package to put the main class into (defaults to io.swagger.codegen");
+
+        ClientOptInput clientOptInput = new ClientOptInput();
+        Swagger swagger = null;
+        CommandLine cmd = null;
+        try {
+            CommandLineParser parser = new BasicParser();
+
+            cmd = parser.parse(options, args);
+            if (cmd.hasOption("h")) {
+                usage(options);
+                return;
+            }
+            if (cmd.hasOption("n")) {
+                name = cmd.getOptionValue("n");
+            } else {
+                System.out.println("name is required");
+                usage(options);
+                return;
+            }
+            if (cmd.hasOption("l")) {
+                targetLanguage = cmd.getOptionValue("l");
+            }
+            if (cmd.hasOption("p")) {
+                targetPackage = cmd.getOptionValue("p");
+            }
+            if (cmd.hasOption("o")) {
+                outputFolder = cmd.getOptionValue("o");
+            } else {
+                System.out.println("output folder is required");
+                usage(options);
+                return;
+            }
+        } catch (Exception e) {
+            usage(options);
+            return;
+        }
+        System.out.println("writing to folder " + outputFolder);
+        File outputFolderLocation = new File(outputFolder);
+        if (!outputFolderLocation.exists()) {
+            outputFolderLocation.mkdirs();
+        }
+        File sourceFolder = new File(outputFolder + File.separator + "src/main/java/" + targetPackage.replace('.', File.separatorChar));
+        if (!sourceFolder.exists()) {
+            sourceFolder.mkdirs();
+        }
+        File resourcesFolder = new File(outputFolder + File.separator + "src/main/resources/META-INF/services");
+        if (!resourcesFolder.exists()) {
+            resourcesFolder.mkdirs();
+        }
+
+        String mainClass = Character.toUpperCase(name.charAt(0)) + name.substring(1) + "Generator";
+
+        List<SupportingFile> supportingFiles = new ArrayList<SupportingFile>();
+        supportingFiles.add(new SupportingFile("pom.mustache", "", "pom.xml"));
+        supportingFiles.add(new SupportingFile("generatorClass.mustache",
+                "src/main/java/" + File.separator + targetPackage.replace('.', File.separatorChar),
+                mainClass + ".java"));
+        supportingFiles.add(new SupportingFile("README.mustache", "", "README.md"));
+        supportingFiles.add(new SupportingFile("api.template", "src/main/resources" + File.separator + name, "api.mustache"));
+        supportingFiles.add(new SupportingFile("model.template", "src/main/resources" + File.separator + name, "model.mustache"));
+
+        supportingFiles.add(new SupportingFile("services.mustache", "src/main/resources/META-INF/services", "io.swagger.codegen.CodegenConfig"));
+
+        List<File> files = new ArrayList<File>();
+
+        Map<String, Object> data = new HashMap<String, Object>();
+        data.put("generatorPackage", targetPackage);
+        data.put("generatorClass", mainClass);
+        data.put("name", name);
+        data.put("fullyQualifiedGeneratorClass", targetPackage + "." + mainClass);
+
+        for (SupportingFile support : supportingFiles) {
+            try {
+                String destinationFolder = outputFolder;
+                if (support.folder != null && !"".equals(support.folder)) {
+                    destinationFolder += File.separator + support.folder;
+                }
+                File of = new File(destinationFolder);
+                if (!of.isDirectory()) {
+                    of.mkdirs();
+                }
+                String outputFilename = destinationFolder + File.separator + support.destinationFilename;
+
+                if (support.templateFile.endsWith("mustache")) {
+                    String template = readTemplate(templateDir + File.separator + support.templateFile);
+                    Template tmpl = Mustache.compiler()
+                            .withLoader(new Mustache.TemplateLoader() {
+                                public Reader getTemplate(String name) {
+                                    return getTemplateReader(templateDir + File.separator + name + ".mustache");
+                                }
+
+                                ;
+                            })
+                            .defaultValue("")
+                            .compile(template);
+
+                    writeToFile(outputFilename, tmpl.execute(data));
+                    files.add(new File(outputFilename));
+                } else {
+                    String template = readTemplate(templateDir + File.separator + support.templateFile);
+                    FileUtils.writeStringToFile(new File(outputFilename), template);
+                    System.out.println("copying file to " + outputFilename);
+                    files.add(new File(outputFilename));
+                }
+            } catch (java.io.IOException e) {
+                e.printStackTrace();
+            }
+        }
+    }
+
+    static {
+        List<CodegenConfig> extensions = getExtensions();
+        StringBuilder sb = new StringBuilder();
+
+        for (CodegenConfig config : extensions) {
+            if (sb.toString().length() != 0) {
+                sb.append(", ");
+            }
+            sb.append(config.getName());
+            configs.put(config.getName(), config);
+            configString = sb.toString();
+        }
+    }
+}

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

@@ -0,0 +1,13 @@
+package io.swagger.codegen;
+
+public class SupportingFile {
+    public String templateFile;
+    public String folder;
+    public String destinationFilename;
+
+    public SupportingFile(String templateFile, String folder, String destinationFilename) {
+        this.templateFile = templateFile;
+        this.folder = folder;
+        this.destinationFilename = destinationFilename;
+    }
+}

modules/swagger-codegen/src/main/java/io/swagger/codegen/auth/AuthMethod.java

@@ -0,0 +1,7 @@
+package io.swagger.codegen.auth;
+
+public interface AuthMethod {
+    String getType();
+
+    void setType(String type);
+}

modules/swagger-codegen/src/main/java/io/swagger/codegen/examples/ExampleGenerator.java

@@ -0,0 +1,158 @@
+package io.swagger.codegen.examples;
+
+import io.swagger.models.Model;
+import io.swagger.models.ModelImpl;
+import io.swagger.models.properties.ArrayProperty;
+import io.swagger.models.properties.BooleanProperty;
+import io.swagger.models.properties.DateProperty;
+import io.swagger.models.properties.DateTimeProperty;
+import io.swagger.models.properties.DecimalProperty;
+import io.swagger.models.properties.DoubleProperty;
+import io.swagger.models.properties.FileProperty;
+import io.swagger.models.properties.FloatProperty;
+import io.swagger.models.properties.IntegerProperty;
+import io.swagger.models.properties.LongProperty;
+import io.swagger.models.properties.MapProperty;
+import io.swagger.models.properties.ObjectProperty;
+import io.swagger.models.properties.Property;
+import io.swagger.models.properties.RefProperty;
+import io.swagger.models.properties.StringProperty;
+import io.swagger.models.properties.UUIDProperty;
+import io.swagger.util.Json;
+
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+public class ExampleGenerator {
+    protected Map<String, Model> examples;
+
+    public ExampleGenerator(Map<String, Model> examples) {
+        this.examples = examples;
+    }
+
+    public List<Map<String, String>> generate(Map<String, Object> examples, List<String> mediaTypes, Property property) {
+        List<Map<String, String>> output = new ArrayList<Map<String, String>>();
+        Set<String> processedModels = new HashSet<String>();
+        if (examples == null) {
+            if (mediaTypes == null) {
+                // assume application/json for this
+                mediaTypes = Arrays.asList("application/json");
+            }
+            for (String mediaType : mediaTypes) {
+                Map<String, String> kv = new HashMap<String, String>();
+                kv.put("contentType", mediaType);
+                if (property != null && mediaType.startsWith("application/json")) {
+                    String example = Json.pretty(resolvePropertyToExample(mediaType, property, processedModels));
+
+                    if (example != null) {
+                        kv.put("example", example);
+                        output.add(kv);
+                    }
+                } else if (property != null && mediaType.startsWith("application/xml")) {
+                    String example = new XmlExampleGenerator(this.examples).toXml(property);
+                    if (example != null) {
+                        kv.put("example", example);
+                        output.add(kv);
+                    }
+                }
+            }
+        } else {
+            for (Map.Entry<String, Object> entry : examples.entrySet()) {
+                final Map<String, String> kv = new HashMap<String, String>();
+                kv.put("contentType", entry.getKey());
+                kv.put("example", Json.pretty(entry.getValue()));
+                output.add(kv);
+            }
+        }
+        if (output.size() == 0) {
+            Map<String, String> kv = new HashMap<String, String>();
+            kv.put("output", "none");
+            output.add(kv);
+        }
+        return output;
+    }
+
+    protected Object resolvePropertyToExample(String mediaType, Property property, Set<String> processedModels) {
+        if (property.getExample() != null) {
+            return property.getExample();
+        } else if (property instanceof StringProperty) {
+            return "aeiou";
+        } else if (property instanceof BooleanProperty) {
+            return Boolean.TRUE;
+        } else if (property instanceof ArrayProperty) {
+            Property innerType = ((ArrayProperty) property).getItems();
+            if (innerType != null) {
+                Object[] output = new Object[]{
+                        resolvePropertyToExample(mediaType, innerType, processedModels)
+                };
+                return output;
+            }
+        } else if (property instanceof DateProperty) {
+            return new java.util.Date(System.currentTimeMillis());
+        } else if (property instanceof DateTimeProperty) {
+            return new java.util.Date(System.currentTimeMillis());
+        } else if (property instanceof DecimalProperty) {
+            return new BigDecimal(1.3579);
+        } else if (property instanceof DoubleProperty) {
+            return new Double(3.149);
+        } else if (property instanceof FileProperty) {
+            return "";  // TODO
+        } else if (property instanceof FloatProperty) {
+            return new Float(1.23);
+        } else if (property instanceof IntegerProperty) {
+            return new Integer(123);
+        } else if (property instanceof LongProperty) {
+            return new Long(123456789);
+        } else if (property instanceof MapProperty) {
+            Map<String, Object> mp = new HashMap<String, Object>();
+            if (property.getName() != null) {
+                mp.put(property.getName(),
+                        resolvePropertyToExample(mediaType, ((MapProperty) property).getAdditionalProperties(), processedModels));
+            } else {
+                mp.put("key",
+                        resolvePropertyToExample(mediaType, ((MapProperty) property).getAdditionalProperties(), processedModels));
+            }
+            return mp;
+        } else if (property instanceof ObjectProperty) {
+            return "{}";
+        } else if (property instanceof RefProperty) {
+            String simpleName = ((RefProperty) property).getSimpleRef();
+            Model model = examples.get(simpleName);
+            if (model != null) {
+                return resolveModelToExample(simpleName, mediaType, model, processedModels);
+            }
+        } else if (property instanceof UUIDProperty) {
+            return "046b6c7f-0b8a-43b9-b35d-6489e6daee91";
+        }
+
+        return "";
+    }
+
+    public Object resolveModelToExample(String name, String mediaType, Model model, Set<String> processedModels) {
+        if (processedModels.contains(name)) {
+            return "";
+        }
+        if (model instanceof ModelImpl) {
+            processedModels.add(name);
+            ModelImpl impl = (ModelImpl) model;
+            Map<String, Object> values = new HashMap<String, Object>();
+
+            if (impl != null && impl.getProperties() != null) {
+                for (String propertyName : impl.getProperties().keySet()) {
+                    Property property = impl.getProperties().get(propertyName);
+                    values.put(propertyName, resolvePropertyToExample(mediaType, property, processedModels));
+                }
+            }
+
+            return values;
+        }
+
+        return "";
+    }
+}

modules/swagger-codegen/src/main/java/io/swagger/codegen/examples/XmlExampleGenerator.java

@@ -0,0 +1,226 @@
+package io.swagger.codegen.examples;
+
+
+import io.swagger.models.Model;
+import io.swagger.models.ModelImpl;
+import io.swagger.models.RefModel;
+import io.swagger.models.Xml;
+import io.swagger.models.properties.ArrayProperty;
+import io.swagger.models.properties.BooleanProperty;
+import io.swagger.models.properties.DateProperty;
+import io.swagger.models.properties.DateTimeProperty;
+import io.swagger.models.properties.IntegerProperty;
+import io.swagger.models.properties.LongProperty;
+import io.swagger.models.properties.Property;
+import io.swagger.models.properties.RefProperty;
+import io.swagger.models.properties.StringProperty;
+import org.codehaus.plexus.util.StringUtils;
+
+import java.text.SimpleDateFormat;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.Set;
+
+public class XmlExampleGenerator {
+    public static String NEWLINE = "\n";
+    public static String TAG_START = "<";
+    public static String CLOSE_TAG = ">";
+    public static String TAG_END = "</";
+    private static String EMPTY = "";
+    protected Map<String, Model> examples;
+    protected SimpleDateFormat dtFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'");
+    protected SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'");
+
+    public XmlExampleGenerator(Map<String, Model> examples) {
+        this.examples = examples;
+        if (examples == null) {
+            examples = new HashMap<String, Model>();
+        }
+    }
+
+    public String toXml(Property property) {
+        return toXml(null, property, 0, Collections.<String>emptySet());
+    }
+
+    protected String toXml(Model model, int indent, Collection<String> path) {
+        if (model instanceof RefModel) {
+            RefModel ref = (RefModel) model;
+            Model actualModel = examples.get(ref.getSimpleRef());
+            if (actualModel instanceof ModelImpl) {
+                return modelImplToXml((ModelImpl) actualModel, indent, path);
+            }
+        } else if (model instanceof ModelImpl) {
+            return modelImplToXml((ModelImpl) model, indent, path);
+        }
+        return null;
+    }
+
+    protected String modelImplToXml(ModelImpl model, int indent, Collection<String> path) {
+        final String modelName = model.getName();
+        if (path.contains(modelName)) {
+            return EMPTY;
+        }
+        final Set<String> selfPath = new HashSet<String>(path);
+        selfPath.add(modelName);
+
+        StringBuilder sb = new StringBuilder();
+        // attributes
+        Map<String, Property> attributes = new LinkedHashMap<String, Property>();
+        Map<String, Property> elements = new LinkedHashMap<String, Property>();
+
+        String name = modelName;
+        String namespace;
+        String prefix;
+        Boolean wrapped;
+
+        Xml xml = model.getXml();
+        if (xml != null) {
+            if (xml.getName() != null) {
+                name = xml.getName();
+            }
+        }
+        for (String pName : model.getProperties().keySet()) {
+            Property p = model.getProperties().get(pName);
+            if (p != null && p.getXml() != null && p.getXml().getAttribute() != null && p.getXml().getAttribute()) {
+                attributes.put(pName, p);
+            } else {
+                elements.put(pName, p);
+            }
+        }
+        sb.append(indent(indent)).append(TAG_START);
+        sb.append(name);
+        for (String pName : attributes.keySet()) {
+            Property p = attributes.get(pName);
+            sb.append(" ").append(pName).append("=").append(quote(toXml(null, p, 0, selfPath)));
+        }
+        sb.append(CLOSE_TAG);
+        sb.append(NEWLINE);
+        for (String pName : elements.keySet()) {
+            Property p = elements.get(pName);
+            final String asXml = toXml(pName, p, indent + 1, selfPath);
+            if (StringUtils.isEmpty(asXml)) {
+                continue;
+            }
+            sb.append(asXml);
+            sb.append(NEWLINE);
+        }
+        sb.append(indent(indent)).append(TAG_END).append(name).append(CLOSE_TAG);
+
+        return sb.toString();
+    }
+
+    protected String quote(String string) {
+        return "\"" + string + "\"";
+    }
+
+    protected String toXml(String name, Property property, int indent, Collection<String> path) {
+        if (property == null) {
+            return "";
+        }
+        StringBuilder sb = new StringBuilder();
+
+        if (property instanceof ArrayProperty) {
+            ArrayProperty p = (ArrayProperty) property;
+            Property inner = p.getItems();
+            boolean wrapped = false;
+            if (property.getXml() != null && property.getXml().getWrapped()) {
+                wrapped = true;
+            }
+            if (wrapped) {
+                String prefix = EMPTY;
+                if (name != null) {
+                    sb.append(indent(indent));
+                    sb.append(openTag(name));
+                    prefix = NEWLINE;
+                }
+                final String asXml = toXml(name, inner, indent + 1, path);
+                if (StringUtils.isNotEmpty(asXml)) {
+                    sb.append(prefix).append(asXml);
+                }
+                if (name != null) {
+                    sb.append(NEWLINE);
+                    sb.append(indent(indent));
+                    sb.append(closeTag(name));
+                }
+            } else {
+                sb.append(toXml(name, inner, indent, path));
+            }
+        } else if (property instanceof RefProperty) {
+            RefProperty ref = (RefProperty) property;
+            Model actualModel = examples.get(ref.getSimpleRef());
+            sb.append(toXml(actualModel, indent, path));
+        } else {
+            if (name != null) {
+                sb.append(indent(indent));
+                sb.append(openTag(name));
+            }
+            sb.append(getExample(property));
+            if (name != null) {
+                sb.append(closeTag(name));
+            }
+        }
+        return sb.toString();
+    }
+
+    protected String getExample(Property property) {
+        if (property instanceof DateTimeProperty) {
+            if (property.getExample() != null) {
+                return property.getExample();
+            } else {
+                return dtFormat.format(new Date());
+            }
+        } else if (property instanceof StringProperty) {
+            if (property.getExample() != null) {
+                return property.getExample();
+            } else {
+                return "string";
+            }
+        } else if (property instanceof DateProperty) {
+            if (property.getExample() != null) {
+                return property.getExample();
+            } else {
+                return dateFormat.format(new Date());
+            }
+        } else if (property instanceof IntegerProperty) {
+            if (property.getExample() != null) {
+                return property.getExample();
+            } else {
+                return "0";
+            }
+        } else if (property instanceof BooleanProperty) {
+            if (property.getExample() != null) {
+                return property.getExample();
+            } else {
+                return "true";
+            }
+        } else if (property instanceof LongProperty) {
+            if (property.getExample() != null) {
+                return property.getExample();
+            } else {
+                return "123456";
+            }
+        }
+        return "not implemented " + property;
+    }
+
+    protected String openTag(String name) {
+        return "<" + name + ">";
+    }
+
+    protected String closeTag(String name) {
+        return "</" + name + ">";
+    }
+
+    protected String indent(int indent) {
+        StringBuffer sb = new StringBuffer();
+        for (int i = 0; i < indent; i++) {
+            sb.append("  ");
+        }
+        return sb.toString();
+    }
+}

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

@@ -0,0 +1,399 @@
+package io.swagger.codegen.languages;
+
+import com.google.common.base.CaseFormat;
+import com.samskivert.mustache.Mustache;
+import com.samskivert.mustache.Template;
+import io.swagger.codegen.CodegenConfig;
+import io.swagger.codegen.CodegenOperation;
+import io.swagger.codegen.CodegenProperty;
+import io.swagger.codegen.CodegenResponse;
+import io.swagger.codegen.CodegenSecurity;
+import io.swagger.codegen.CodegenType;
+import io.swagger.codegen.DefaultCodegen;
+import io.swagger.codegen.SupportingFile;
+import io.swagger.models.auth.SecuritySchemeDefinition;
+import io.swagger.models.properties.ArrayProperty;
+import io.swagger.models.properties.BooleanProperty;
+import io.swagger.models.properties.DateProperty;
+import io.swagger.models.properties.DateTimeProperty;
+import io.swagger.models.properties.DoubleProperty;
+import io.swagger.models.properties.FloatProperty;
+import io.swagger.models.properties.IntegerProperty;
+import io.swagger.models.properties.LongProperty;
+import io.swagger.models.properties.MapProperty;
+import io.swagger.models.properties.Property;
+import io.swagger.models.properties.StringProperty;
+import org.apache.commons.lang.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.StringWriter;
+import java.io.Writer;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+public class AkkaScalaClientCodegen extends DefaultCodegen implements CodegenConfig {
+    protected String mainPackage = "io.swagger.client";
+    protected String invokerPackage = mainPackage + ".core";
+    protected String groupId = "io.swagger";
+    protected String artifactId = "swagger-client";
+    protected String artifactVersion = "1.0.0";
+    protected String sourceFolder = "src/main/scala";
+    protected String resourcesFolder = "src/main/resources";
+    protected String configKey = "apiRequest";
+    protected int defaultTimeoutInMs = 5000;
+    protected String configKeyPath = mainPackage;
+    protected boolean registerNonStandardStatusCodes = true;
+    protected boolean renderJavadoc = true;
+    protected boolean removeOAuthSecurities = true;
+    /**
+     * If set to true, only the default response (the one with le lowest 2XX code) will be considered as a success, and all
+     * others as ApiErrors.
+     * If set to false, all responses defined in the model will be considered as a success upon reception. Only http errors,
+     * unmarshalling problems and any other RuntimeException will be considered as ApiErrors.
+     */
+    protected boolean onlyOneSuccess = true;
+    Logger LOGGER = LoggerFactory.getLogger(AkkaScalaClientCodegen.class);
+
+    public AkkaScalaClientCodegen() {
+        super();
+        outputFolder = "generated-code/scala";
+        modelTemplateFiles.put("model.mustache", ".scala");
+        apiTemplateFiles.put("api.mustache", ".scala");
+        templateDir = "akka-scala";
+        apiPackage = mainPackage + ".api";
+        modelPackage = mainPackage + ".model";
+
+        reservedWords = new HashSet<String>(
+                Arrays.asList(
+                        "abstract", "case", "catch", "class", "def", "do", "else", "extends",
+                        "false", "final", "finally", "for", "forSome", "if", "implicit",
+                        "import", "lazy", "match", "new", "null", "object", "override", "package",
+                        "private", "protected", "return", "sealed", "super", "this", "throw",
+                        "trait", "try", "true", "type", "val", "var", "while", "with", "yield")
+        );
+
+        additionalProperties.put("invokerPackage", invokerPackage);
+        additionalProperties.put("groupId", groupId);
+        additionalProperties.put("artifactId", artifactId);
+        additionalProperties.put("artifactVersion", artifactVersion);
+        additionalProperties.put("configKey", configKey);
+        additionalProperties.put("configKeyPath", configKeyPath);
+        additionalProperties.put("defaultTimeout", defaultTimeoutInMs);
+        if (renderJavadoc) {
+            additionalProperties.put("javadocRenderer", new JavadocLambda());
+        }
+        additionalProperties.put("fnCapitalize", new CapitalizeLambda());
+        additionalProperties.put("fnCamelize", new CamelizeLambda(false));
+        additionalProperties.put("fnEnumEntry", new EnumEntryLambda());
+        additionalProperties.put("onlyOneSuccess", onlyOneSuccess);
+
+        supportingFiles.add(new SupportingFile("pom.mustache", "", "pom.xml"));
+        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"));
+        supportingFiles.add(new SupportingFile("apiInvoker.mustache", invokerFolder, "ApiInvoker.scala"));
+        supportingFiles.add(new SupportingFile("requests.mustache", invokerFolder, "requests.scala"));
+        supportingFiles.add(new SupportingFile("apiSettings.mustache", invokerFolder, "ApiSettings.scala"));
+        final String apiFolder = (sourceFolder + File.separator + apiPackage).replace(".", File.separator);
+        supportingFiles.add(new SupportingFile("enumsSerializers.mustache", apiFolder, "EnumsSerializers.scala"));
+
+        importMapping.remove("Seq");
+        importMapping.remove("List");
+        importMapping.remove("Set");
+        importMapping.remove("Map");
+
+        importMapping.put("DateTime", "org.joda.time.DateTime");
+
+        typeMapping = new HashMap<String, String>();
+        typeMapping.put("array", "Seq");
+        typeMapping.put("set", "Set");
+        typeMapping.put("boolean", "Boolean");
+        typeMapping.put("string", "String");
+        typeMapping.put("int", "Int");
+        typeMapping.put("integer", "Int");
+        typeMapping.put("long", "Long");
+        typeMapping.put("float", "Float");
+        typeMapping.put("byte", "Byte");
+        typeMapping.put("short", "Short");
+        typeMapping.put("char", "Char");
+        typeMapping.put("long", "Long");
+        typeMapping.put("double", "Double");
+        typeMapping.put("object", "Any");
+        typeMapping.put("file", "File");
+        typeMapping.put("number", "Double");
+
+        languageSpecificPrimitives = new HashSet<String>(
+                Arrays.asList(
+                        "String",
+                        "boolean",
+                        "Boolean",
+                        "Double",
+                        "Int",
+                        "Long",
+                        "Float",
+                        "Object",
+                        "List",
+                        "Seq",
+                        "Map")
+        );
+        instantiationTypes.put("array", "ListBuffer");
+        instantiationTypes.put("map", "Map");
+    }
+
+    public CodegenType getTag() {
+        return CodegenType.CLIENT;
+    }
+
+    public String getName() {
+        return "akka-scala";
+    }
+
+    public String getHelp() {
+        return "Generates a Scala client library base on Akka/Spray.";
+    }
+
+    @Override
+    public String escapeReservedWord(String name) {
+        return "`" + name + "`";
+    }
+
+    @Override
+    public String apiFileFolder() {
+        return outputFolder + "/" + sourceFolder + "/" + apiPackage().replace('.', File.separatorChar);
+    }
+
+    public String modelFileFolder() {
+        return outputFolder + "/" + sourceFolder + "/" + modelPackage().replace('.', File.separatorChar);
+    }
+
+    @Override
+    public Map<String, Object> postProcessOperations(Map<String, Object> objs) {
+        if (registerNonStandardStatusCodes) {
+            try {
+                @SuppressWarnings("unchecked")
+                Map<String, ArrayList<CodegenOperation>> opsMap = (Map<String, ArrayList<CodegenOperation>>) objs.get("operations");
+                HashSet<Integer> unknownCodes = new HashSet<Integer>();
+                for (CodegenOperation operation : opsMap.get("operation")) {
+                    for (CodegenResponse response : operation.responses) {
+                        if ("default".equals(response.code)) {
+                            continue;
+                        }
+                        try {
+                            int code = Integer.parseInt(response.code);
+                            if (code >= 600) {
+                                unknownCodes.add(code);
+                            }
+                        } catch (NumberFormatException e) {
+                            LOGGER.error("Status code is not an integer : response.code", e);
+                        }
+                    }
+                }
+                if (!unknownCodes.isEmpty()) {
+                    additionalProperties.put("unknownStatusCodes", unknownCodes);
+                }
+            } catch (Exception e) {
+                LOGGER.error("Unable to find operations List", e);
+            }
+        }
+        return super.postProcessOperations(objs);
+    }
+
+    @Override
+    public String getTypeDeclaration(Property p) {
+        if (p instanceof ArrayProperty) {
+            ArrayProperty ap = (ArrayProperty) p;
+            Property inner = ap.getItems();
+            return getSwaggerType(p) + "[" + getTypeDeclaration(inner) + "]";
+        } else if (p instanceof MapProperty) {
+            MapProperty mp = (MapProperty) p;
+            Property inner = mp.getAdditionalProperties();
+
+            return getSwaggerType(p) + "[String, " + getTypeDeclaration(inner) + "]";
+        }
+        return super.getTypeDeclaration(p);
+    }
+
+    @Override
+    public List<CodegenSecurity> fromSecurity(Map<String, SecuritySchemeDefinition> schemes) {
+        final List<CodegenSecurity> codegenSecurities = super.fromSecurity(schemes);
+        if (!removeOAuthSecurities) {
+            return codegenSecurities;
+        }
+
+        // Remove OAuth securities
+        Iterator<CodegenSecurity> it = codegenSecurities.iterator();
+        while (it.hasNext()) {
+            final CodegenSecurity security = it.next();
+            if (security.isOAuth) {
+                it.remove();
+            }
+        }
+        // Adapt 'hasMore'
+        it = codegenSecurities.iterator();
+        while (it.hasNext()) {
+            final CodegenSecurity security = it.next();
+            security.hasMore = it.hasNext();
+        }
+
+        if (codegenSecurities.isEmpty()) {
+            return null;
+        }
+        return codegenSecurities;
+    }
+
+    @Override
+    public String toOperationId(String operationId) {
+        return super.toOperationId(CaseFormat.UPPER_CAMEL.to(CaseFormat.LOWER_CAMEL, operationId));
+    }
+
+    private String formatIdentifier(String name, boolean capitalized) {
+        String identifier = camelize(name, true);
+        if (capitalized) {
+            identifier = StringUtils.capitalize(identifier);
+        }
+        if (identifier.matches("[a-zA-Z_$][\\w_$]+") && !reservedWords.contains(identifier)) {
+            return identifier;
+        }
+        return escapeReservedWord(identifier);
+    }
+
+    @Override
+    public String toParamName(String name) {
+        return formatIdentifier(name, false);
+    }
+
+    @Override
+    public String toVarName(String name) {
+        return formatIdentifier(name, false);
+    }
+
+    @Override
+    public String toEnumName(CodegenProperty property) {
+        return formatIdentifier(property.baseName, true);
+    }
+
+    @Override
+    public String getSwaggerType(Property p) {
+        String swaggerType = super.getSwaggerType(p);
+        String type;
+        if (typeMapping.containsKey(swaggerType)) {
+            type = typeMapping.get(swaggerType);
+            if (languageSpecificPrimitives.contains(type)) {
+                return toModelName(type);
+            }
+        } else {
+            type = swaggerType;
+        }
+        return toModelName(type);
+    }
+
+    @Override
+    public String toInstantiationType(Property p) {
+        if (p instanceof MapProperty) {
+            MapProperty ap = (MapProperty) p;
+            String inner = getSwaggerType(ap.getAdditionalProperties());
+            return instantiationTypes.get("map") + "[String, " + inner + "]";
+        } else if (p instanceof ArrayProperty) {
+            ArrayProperty ap = (ArrayProperty) p;
+            String inner = getSwaggerType(ap.getItems());
+            return instantiationTypes.get("array") + "[" + inner + "]";
+        } else {
+            return null;
+        }
+    }
+
+    public String toDefaultValue(Property p) {
+        if (!p.getRequired()) {
+            return "None";
+        }
+        if (p instanceof StringProperty) {
+            return "null";
+        } else if (p instanceof BooleanProperty) {
+            return "null";
+        } else if (p instanceof DateProperty) {
+            return "null";
+        } else if (p instanceof DateTimeProperty) {
+            return "null";
+        } else if (p instanceof DoubleProperty) {
+            return "null";
+        } else if (p instanceof FloatProperty) {
+            return "null";
+        } else if (p instanceof IntegerProperty) {
+            return "null";
+        } else if (p instanceof LongProperty) {
+            return "null";
+        } else if (p instanceof MapProperty) {
+            MapProperty ap = (MapProperty) p;
+            String inner = getSwaggerType(ap.getAdditionalProperties());
+            return "Map[String, " + inner + "].empty ";
+        } else if (p instanceof ArrayProperty) {
+            ArrayProperty ap = (ArrayProperty) p;
+            String inner = getSwaggerType(ap.getItems());
+            return "Seq[" + inner + "].empty ";
+        } else {
+            return "null";
+        }
+    }
+
+    private static abstract class CustomLambda implements Mustache.Lambda {
+        @Override
+        public void execute(Template.Fragment frag, Writer out) throws IOException {
+            final StringWriter tempWriter = new StringWriter();
+            frag.execute(tempWriter);
+            out.write(formatFragment(tempWriter.toString()));
+        }
+
+        public abstract String formatFragment(String fragment);
+    }
+
+
+    private static class JavadocLambda extends CustomLambda {
+        @Override
+        public String formatFragment(String fragment) {
+            final String[] lines = fragment.split("\\r?\\n");
+            final StringBuilder sb = new StringBuilder();
+            sb.append("  /**\n");
+            for (String line : lines) {
+                sb.append("   * ").append(line).append("\n");
+            }
+            sb.append("   */\n");
+            return sb.toString();
+        }
+    }
+
+    private static class CapitalizeLambda extends CustomLambda {
+        @Override
+        public String formatFragment(String fragment) {
+            return StringUtils.capitalize(fragment);
+        }
+    }
+
+    private static class CamelizeLambda extends CustomLambda {
+        private final boolean capitalizeFirst;
+
+        public CamelizeLambda(boolean capitalizeFirst) {
+            this.capitalizeFirst = capitalizeFirst;
+        }
+
+        @Override
+        public String formatFragment(String fragment) {
+            return camelize(fragment, !capitalizeFirst);
+        }
+    }
+
+    private class EnumEntryLambda extends CustomLambda {
+        @Override
+        public String formatFragment(String fragment) {
+            return formatIdentifier(fragment, true);
+        }
+    }
+
+}

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

@@ -0,0 +1,265 @@
+package io.swagger.codegen.languages;
+
+import io.swagger.codegen.CliOption;
+import io.swagger.codegen.CodegenConfig;
+import io.swagger.codegen.CodegenType;
+import io.swagger.codegen.DefaultCodegen;
+import io.swagger.codegen.SupportingFile;
+import io.swagger.models.properties.ArrayProperty;
+import io.swagger.models.properties.MapProperty;
+import io.swagger.models.properties.Property;
+
+import java.io.File;
+import java.util.Arrays;
+import java.util.HashSet;
+
+public class AndroidClientCodegen extends DefaultCodegen implements CodegenConfig {
+    protected String invokerPackage = "io.swagger.client";
+    protected String groupId = "io.swagger";
+    protected String artifactId = "swagger-android-client";
+    protected String artifactVersion = "1.0.0";
+    protected String projectFolder = "src/main";
+    protected String sourceFolder = projectFolder + "/java";
+    protected Boolean useAndroidMavenGradlePlugin = true;
+
+    public AndroidClientCodegen() {
+        super();
+        outputFolder = "generated-code/android";
+        modelTemplateFiles.put("model.mustache", ".java");
+        apiTemplateFiles.put("api.mustache", ".java");
+        templateDir = "android-java";
+        apiPackage = "io.swagger.client.api";
+        modelPackage = "io.swagger.client.model";
+
+        reservedWords = new HashSet<String>(
+                Arrays.asList(
+                        "abstract", "continue", "for", "new", "switch", "assert",
+                        "default", "if", "package", "synchronized", "boolean", "do", "goto", "private",
+                        "this", "break", "double", "implements", "protected", "throw", "byte", "else",
+                        "import", "public", "throws", "case", "enum", "instanceof", "return", "transient",
+                        "catch", "extends", "int", "short", "try", "char", "final", "interface", "static",
+                        "void", "class", "finally", "long", "strictfp", "volatile", "const", "float",
+                        "native", "super", "while")
+        );
+
+        languageSpecificPrimitives = new HashSet<String>(
+                Arrays.asList(
+                        "String",
+                        "boolean",
+                        "Boolean",
+                        "Double",
+                        "Integer",
+                        "Long",
+                        "Float",
+                        "Object")
+        );
+        instantiationTypes.put("array", "ArrayList");
+        instantiationTypes.put("map", "HashMap");
+
+        cliOptions.add(new CliOption("invokerPackage", "root package to use for the generated code"));
+        cliOptions.add(new CliOption("groupId", "groupId for use in the generated build.gradle and pom.xml"));
+        cliOptions.add(new CliOption("artifactId", "artifactId for use in the generated build.gradle and pom.xml"));
+        cliOptions.add(new CliOption("artifactVersion", "artifact version for use in the generated build.gradle and pom.xml"));
+        cliOptions.add(new CliOption("sourceFolder", "source folder for generated code"));
+        cliOptions.add(new CliOption("useAndroidMavenGradlePlugin", "A flag to toggle android-maven gradle plugin. Default is true."));
+    }
+
+    public CodegenType getTag() {
+        return CodegenType.CLIENT;
+    }
+
+    public String getName() {
+        return "android";
+    }
+
+    public String getHelp() {
+        return "Generates an Android client library.";
+    }
+
+    @Override
+    public String escapeReservedWord(String name) {
+        return "_" + name;
+    }
+
+    @Override
+    public String apiFileFolder() {
+        return outputFolder + "/" + sourceFolder + "/" + apiPackage().replace('.', File.separatorChar);
+    }
+
+    public String modelFileFolder() {
+        return outputFolder + "/" + sourceFolder + "/" + modelPackage().replace('.', File.separatorChar);
+    }
+
+    @Override
+    public String getTypeDeclaration(Property p) {
+        if (p instanceof ArrayProperty) {
+            ArrayProperty ap = (ArrayProperty) p;
+            Property inner = ap.getItems();
+            return getSwaggerType(p) + "<" + getTypeDeclaration(inner) + ">";
+        } else if (p instanceof MapProperty) {
+            MapProperty mp = (MapProperty) p;
+            Property inner = mp.getAdditionalProperties();
+
+            return getSwaggerType(p) + "<String, " + getTypeDeclaration(inner) + ">";
+        }
+        return super.getTypeDeclaration(p);
+    }
+
+    @Override
+    public String getSwaggerType(Property p) {
+        String swaggerType = super.getSwaggerType(p);
+        String type = null;
+        if (typeMapping.containsKey(swaggerType)) {
+            type = typeMapping.get(swaggerType);
+            if (languageSpecificPrimitives.contains(type)) {
+                return toModelName(type);
+            }
+        } else {
+            type = swaggerType;
+        }
+        return toModelName(type);
+    }
+
+    @Override
+    public String toVarName(String name) {
+        // replace - with _ e.g. created-at => created_at
+        name = name.replaceAll("-", "_");
+
+        // 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 (reservedWords.contains(name) || name.matches("^\\d.*")) {
+            name = escapeReservedWord(name);
+        }
+
+        return name;
+    }
+
+    @Override
+    public String toParamName(String name) {
+        // should be the same as variable name
+        return toVarName(name);
+    }
+
+    @Override
+    public String toModelName(String name) {
+        // model name cannot use reserved keyword, e.g. return
+        if (reservedWords.contains(name)) {
+            throw new RuntimeException(name + " (reserved word) cannot be used as a model name");
+        }
+
+        // camelize the model name
+        // phone_number => PhoneNumber
+        return camelize(name);
+    }
+
+    @Override
+    public String toModelFilename(String name) {
+        // should be the same as the model name
+        return toModelName(name);
+    }
+
+    @Override
+    public String toOperationId(String operationId) {
+        // method name cannot use reserved keyword, e.g. return
+        if (reservedWords.contains(operationId)) {
+            throw new RuntimeException(operationId + " (reserved word) cannot be used as method name");
+        }
+
+        return camelize(operationId, true);
+    }
+
+    @Override
+    public void processOpts() {
+        super.processOpts();
+
+        if (additionalProperties.containsKey("invokerPackage")) {
+            this.setInvokerPackage((String) additionalProperties.get("invokerPackage"));
+        } else {
+            //not set, use default to be passed to template
+            additionalProperties.put("invokerPackage", invokerPackage);
+        }
+
+        if (additionalProperties.containsKey("groupId")) {
+            this.setGroupId((String) additionalProperties.get("groupId"));
+        } else {
+            //not set, use to be passed to template
+            additionalProperties.put("groupId", groupId);
+        }
+
+        if (additionalProperties.containsKey("artifactId")) {
+            this.setArtifactId((String) additionalProperties.get("artifactId"));
+        } else {
+            //not set, use to be passed to template
+            additionalProperties.put("artifactId", artifactId);
+        }
+
+        if (additionalProperties.containsKey("artifactVersion")) {
+            this.setArtifactVersion((String) additionalProperties.get("artifactVersion"));
+        } else {
+            //not set, use to be passed to template
+            additionalProperties.put("artifactVersion", artifactVersion);
+        }
+
+        if (additionalProperties.containsKey("sourceFolder")) {
+            this.setSourceFolder((String) additionalProperties.get("sourceFolder"));
+        }
+
+        if (additionalProperties.containsKey("useAndroidMavenGradlePlugin")) {
+            this.setUseAndroidMavenGradlePlugin((Boolean) additionalProperties.get("useAndroidMavenGradlePlugin"));
+        } else {
+            additionalProperties.put("useAndroidMavenGradlePlugin", useAndroidMavenGradlePlugin);
+        }
+
+        supportingFiles.add(new SupportingFile("pom.mustache", "", "pom.xml"));
+        additionalProperties.put("useAndroidMavenGradlePlugin", useAndroidMavenGradlePlugin);
+
+        supportingFiles.add(new SupportingFile("settings.gradle.mustache", "", "settings.gradle"));
+        supportingFiles.add(new SupportingFile("build.mustache", "", "build.gradle"));
+        supportingFiles.add(new SupportingFile("manifest.mustache", projectFolder, "AndroidManifest.xml"));
+        supportingFiles.add(new SupportingFile("apiInvoker.mustache",
+                (sourceFolder + File.separator + invokerPackage).replace(".", java.io.File.separator), "ApiInvoker.java"));
+        supportingFiles.add(new SupportingFile("httpPatch.mustache",
+                (sourceFolder + File.separator + invokerPackage).replace(".", java.io.File.separator), "HttpPatch.java"));
+        supportingFiles.add(new SupportingFile("jsonUtil.mustache",
+                (sourceFolder + File.separator + invokerPackage).replace(".", java.io.File.separator), "JsonUtil.java"));
+        supportingFiles.add(new SupportingFile("apiException.mustache",
+                (sourceFolder + File.separator + invokerPackage).replace(".", java.io.File.separator), "ApiException.java"));
+    }
+
+    public Boolean getUseAndroidMavenGradlePlugin() {
+        return useAndroidMavenGradlePlugin;
+    }
+
+    public void setUseAndroidMavenGradlePlugin(Boolean useAndroidMavenGradlePlugin) {
+        this.useAndroidMavenGradlePlugin = useAndroidMavenGradlePlugin;
+    }
+
+    public void setInvokerPackage(String invokerPackage) {
+        this.invokerPackage = invokerPackage;
+    }
+
+    public void setGroupId(String groupId) {
+        this.groupId = groupId;
+    }
+
+    public void setArtifactId(String artifactId) {
+        this.artifactId = artifactId;
+    }
+
+    public void setArtifactVersion(String artifactVersion) {
+        this.artifactVersion = artifactVersion;
+    }
+
+    public void setSourceFolder(String sourceFolder) {
+        this.sourceFolder = sourceFolder;
+    }
+
+}