update travis config

* Add a test case

* Fix that the inline models couldn't be flatten when "components" doesn't exist

* Rename yaml file

* Rename method name

.github/.test/auto-labeler.js

@@ -0,0 +1,117 @@
+let fs   = require('fs');
+let path = require('path');
+let util = require('util');
+let yaml = require('./js-yaml.js');
+let samples = require('./samples.json');
+
+class LabelMatch {
+    constructor (match, label) {
+        this.match = match;
+        this.label = label;
+    }
+}
+
+class FileError {
+    constructor (file, actualLabels, expectedLabels) {
+        this.file = file;
+        this.actual = actualLabels;
+        this.expected = expectedLabels;
+    }
+}
+
+class TextError {
+    constructor (text, actualLabels, expectedLabels) {
+        this.text = text;
+        this.actual = actualLabels;
+        this.expected = expectedLabels;
+    }
+}
+
+let labels = [];
+
+function labelsForFile(file) {
+    let body = fs.readFileSync(file);
+    return labelsForText(body)
+}
+
+function labelsForText(text) {
+    let addLabels = new Set();
+    let body = text;
+    for (const v of labels) {
+        if (v.match.test(body)) {
+            addLabels.add(v.label)
+        }
+        // reset regex state
+        v.match.lastIndex = 0
+    }
+    return addLabels;
+}
+
+try {
+    let config = yaml.safeLoad(fs.readFileSync('../auto-labeler.yml', 'utf8'));
+
+    if (config && config.labels && Object.keys(config.labels).length > 0) {
+        for (const labelName in config.labels) {
+            if (config.labels.hasOwnProperty(labelName)) {
+                let matchAgainst = config.labels[labelName];
+                if (Array.isArray(matchAgainst)) {
+                    matchAgainst.forEach(regex => {
+                        // noinspection JSCheckFunctionSignatures
+                        labels.push(new LabelMatch(new RegExp(regex, 'g'), labelName));
+                    })
+                }
+            }
+        }
+    }
+
+    if (labels.length === 0) {
+        // noinspection ExceptionCaughtLocallyJS
+        throw new Error("Expected to parse config.labels, but failed.")
+    }
+
+    let fileErrors = [];
+    samples.files.forEach(function(tester){
+        let file = path.normalize(path.join('..', '..', 'bin', tester.input));
+        let expectedLabels = new Set(tester.matches);
+        let actualLabels = labelsForFile(file);
+        let difference = new Set([...actualLabels].filter(x => !expectedLabels.has(x)));
+        if (difference.size > 0) {
+            fileErrors.push(new FileError(file, actualLabels, expectedLabels));
+        }
+    });
+
+    let textErrors = [];
+    samples.text.forEach(function(tester){
+        let expectedLabels = new Set(tester.matches);
+        let actualLabels = labelsForText(tester.input);
+        let difference = new Set([...actualLabels].filter(x => !expectedLabels.has(x)));
+        if (difference.size > 0) {
+            textErrors.push(new TextError(tester.input, actualLabels, expectedLabels));
+        }
+    });
+
+    // These are separate (file vs text) in case we want to preview where these would fail in the file. not priority at the moment.
+    if (fileErrors.length > 0) {
+        console.warn('There were %d file tester errors', fileErrors.length);
+        fileErrors.forEach(function(errs) {
+            console.log("file: %j\n  actual: %j\n  expected: %j", errs.file, util.inspect(errs.actual), util.inspect(errs.expected))
+        });
+    }
+
+    if (textErrors.length > 0) {
+        console.warn('There were %d text tester errors', textErrors.length);
+        textErrors.forEach(function(errs){
+            console.log("input: %j\n  actual: %j\n  expected: %j", errs.text, util.inspect(errs.actual), util.inspect(errs.expected))
+        })
+    }
+
+    let totalErrors = fileErrors.length + textErrors.length;
+    if (totalErrors === 0) {
+        console.log('Success!');
+    } else {
+        console.log('Failure: %d total errors', totalErrors);
+    }
+} catch (e) {
+    console.log(e);
+}
+

.github/ISSUE_TEMPLATE/announcement.md

@@ -0,0 +1,10 @@
+---
+name: Announcement
+about: Announcements related to the project
+title: "[Announcement] TITLE"
+labels: Announcement
+assignees: ''
+
+---
+
+

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,54 @@
+---
+name: Bug report
+about: Create a bug report to help us improve
+title: "[BUG] Description"
+labels: 'Issue: Bug'
+assignees: ''
+
+---
+
+<!--
+Please follow the issue template below for bug reports.
+Also please indicate in the issue title which language/library is concerned. Eg:  [BUG][JAVA] Bug generating foo with bar 
+-->
+
+##### Description
+
+<!-- describe what is the question, suggestion or issue and why this is a problem for you. -->
+
+##### openapi-generator version
+
+<!-- which version of openapi-generator are you using, is it a regression? -->
+
+##### OpenAPI declaration file content or url
+
+<!-- if it is a bug, a json or yaml that produces it.
+If you post the code inline, please wrap it with
+```yaml
+(here your code)
+```
+(for YAML code) or
+```json
+(here your code)
+```
+(for JSON code), so it becomes more readable. If it is longer than about ten lines,
+please create a Gist (https://gist.github.com) or upload it somewhere else and
+link it here.
+  -->
+
+##### Command line used for generation
+
+<!-- including the language, libraries and various options -->
+
+##### Steps to reproduce
+
+<!-- unambiguous set of steps to reproduce the bug.-->
+
+##### Related issues/PRs
+
+<!-- has a similar issue/PR been reported/opened before? Please do a search in https://github.com/openapitools/openapi-generator/issues?utf8=%E2%9C%93&q=is%3Aissue%20 -->
+
+##### Suggest a fix
+
+<!-- if you can't fix the bug yourself, perhaps you can point to what might be
+  causing the problem (line of code or commit), or simply make a suggestion -->

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,24 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: "[REQ] Feature Request Description"
+labels: 'Enhancement: Feature'
+assignees: ''
+
+---
+
+### Is your feature request related to a problem? Please describe.
+
+<!-- A clear and concise description of what the problem is. Ex. I'm always frustrated when [...] -->
+
+## Describe the solution you'd like
+
+<!-- A clear and concise description of what you want to happen. -->
+
+## Describe alternatives you've considered
+
+<!-- A clear and concise description of any alternative solutions or features you've considered. -->
+
+## Additional context
+
+<!-- Add any other context or screenshots about the feature request here. -->

.github/PULL_REQUEST_TEMPLATE.md

@@ -2,7 +2,7 @@
 
 - [ ] Read the [contribution guidelines](https://github.com/openapitools/openapi-generator/blob/master/CONTRIBUTING.md).
 - [ ] Ran the shell script under `./bin/` to update Petstore sample so that CIs can verify the change. (For instance, only need to run `./bin/{LANG}-petstore.sh` and `./bin/security/{LANG}-petstore.sh` if updating the {LANG} (e.g. php, ruby, python, etc) code generator or {LANG} client's mustache templates). Windows batch files can be found in `.\bin\windows\`.
-- [ ] Filed the PR against the [correct branch](https://github.com/OpenAPITools/openapi-generator/wiki/Git-Branches): `master`, `3.4.x`, `4.0.x`. Default: `master`.
+- [ ] Filed the PR against the [correct branch](https://github.com/OpenAPITools/openapi-generator/wiki/Git-Branches): `master`~~, `3.4.x`, `4.0.x`~~. Default: `master`.
 - [ ] Copied the [technical committee](https://github.com/openapitools/openapi-generator/#62---openapi-generator-technical-committee) to review the pull request if your PR is targeting a particular programming language.
 
 ### Description of the PR

.github/auto-labeler.yml

@@ -0,0 +1,290 @@
+comment: |
+    👍 Thanks for opening this issue!
+    🏷 I have applied any labels matching special text in your issue.
+
+    The team will review the labels and make any necessary changes.
+labels:
+    'Announcement':
+      - '\s*?\[[Aa]nnouncement\]\s*?'
+    'Breaking change (with fallback)':
+      - '\s*?[bB]reaking [cC]hange [wW]ith [fF]allback\s*?'
+    'Breaking change (without fallback)':
+      - '\s*?[bB]reaking [cC]hange [wW]ithout [fF]allback\s*?'
+    'Client: Ada':
+      - '\s*?\[ada\]\s*?'
+      - '\s*?-[gl] ada(?!-)\b'
+    'Client: Android':
+      - '\s*?\[android\]\s*?'
+      - '\s*?-[gl] android(?!-)\b'
+    'Client: Apex':
+      - '\s*?\[apex\]\s*?'
+      - '\s*?-[gl] apex(?!-)\b'
+    'Client: Bash':
+      - '\s*?\[bash\]\s*?'
+      - '\s*?-[gl] bash(?!-)\b'
+    'Client: C':
+      - '\s*?\[[cC]\]\s*?'
+      - '\s*?-[gl] c(?!-)\b'
+    # 'Client: Ceylon':
+    'Client: C++':
+      - '\s*?\[cpp(-.*)?-client\]\s*?'
+      - '\s*?-[gl] cpp(-.*)?-client\s*?'
+      - '\s*?-[gl] cpp-restsdk(?!-)\b'
+      - '\s*?-[gl] cpp-tizen(?!-)\b'
+    'Client: C-Sharp':
+      - '\s*?-[gl] csharp(?!-)\b'
+      - '\s*?[cC]-[sS]harp [cC]lient\s*?'
+      - '\s*?-[gl] csharp-dotnet2\s*?'
+      - '\s*?-[gl] csharp-refactor?\s*?'
+      - '\s*?\[[Cc]#\]'
+      - '\s*?\[csharp\]\s*?'
+    'Client: Clojure':
+      - '\s*?\[clojure\]\s*?'
+      - '\s*?-[gl] clojure(?!-)\b'
+    # 'Client: Crystal':
+    'Client: Dart':
+      - '\s*?\[dart\]\s*?'
+      - '\s*?-[gl] dart(?!-)\b'
+    'Client: Dukescript':
+      - '\s*?\[dukescript\]\s*?'
+      - '\s*?-g dukescript\s*?'
+    'Client: Eiffel':
+      - '\s*?\[eiffel\]\s*?'
+      - '\s*?-[gl] eiffel(?!-)\b'
+    'Client: Elixir':
+      - '\s*?\[elixir\]\s*?'
+      - '\s*?-[gl] elixir(?!-)\b'
+    'Client: Elm':
+      - '\s*?\[elm\]\s*?'
+      - '\s*?-[gl] elm(?!-)\b'
+    'Client: Erlang':
+      - '\s*?\[erlang(-.*)?-client\]\s*?'
+      - '\s*?-[gl] erlang(-.*)?-client\s*?'
+      - '\s*?\[erlang-proper\]\s*?'
+      - '\s*?-[gl] erlang-proper\s*?'
+    'Client: Flash/ActionScript':
+      - '\s*?\[flash\]\s*?'
+      - '\s*?-[gl] flash(?!-)\b'
+    'Client: Go':
+      - '\s*?\[go\]\s*?'
+      - '\s*?-[gl] go(?!-)\b'
+    'Client: Groovy':
+      - '\s*?\[groovy\]\s*?'
+      - '\s*?-[gl] groovy(?!-)\b'
+    'Client: HTML':
+      - '\s*?\[html[2]?\]\s*?'
+      - '\s*?-[gl] html[2]?\s*?'
+    'Client: Haskell':
+      - '\s*?\[haskell(-.*)?-client\]\s*?'
+      - '\s*?-[gl] haskell(-.*)?-client\s*?'
+    'Client: JMeter':
+      - '\s*?\[jmeter\]\s*?'
+      - '\s*?-[gl] jmeter\s*?'
+    'Client: Java':
+      - '\s*?\[java\]\s*?'
+      - '\s*?-[gl] java(?!-)\b'
+    'Client: JavaScript/Node.js':
+      - '\s*?\[javascript\]\s*?'
+      - '\s*?-[gl] javascript\s*?'
+      - '\s*?-[gl] javascript-(\S)*\s*?'
+    # 'Client: Julia': # NOTE: Not yet implemented
+    'Client: Kotlin':
+      - '\s*?\[kotlin\]\s*?'
+      - '\s*?-[gl] kotlin(?!-)\b'
+    'Client: Lisp':
+      - '\s*?\[lisp\]\s*?'
+      - '\s*?-[gl] lisp(?!-)\b'
+    'Client: Lua':
+      - '\s*?\[lua\]\s*?'
+      - '\s*?-[gl] lua(?!-)\b'
+    'Client: Objc':
+      - '\s*?\[objc\]\s*?'
+      - '\s*?-[gl] objc\s*?'
+    # 'Client: OCaml':
+    'Client: Perl':
+      - '\s*?\[perl\]\s*?'
+      - '\s*?-[gl] perl(?!-)\b'
+    # 'Client: PHP':
+    'Client: PowerShell':
+      - '\s*?\[powershell\]\s*?'
+      - '\s*?-[gl] powershell\s*?'
+    'Client: Python':
+      - '\s*?\[python\]\s*?'
+      - '\s*?-[gl] python(?!-)\b'
+    'Client: QT':
+      - '\s*?\[cpp-qt5-client\]\s*?'
+      - '\s*?-[gl] cpp-qt5-client\s*?'
+    'Client: R':
+      - '\s*?\[[rR]\]\s*?'
+      - '\s*?-[gl] r(?!-)\b'
+    'Client: Reason ML':
+      - '\s*?\[reasonml\]\s*?'
+      - '\s*?-[g] reasonml\s*?'
+    'Client: Retrofit':
+      - '\s*?retrofit.*?\s*?'
+    'Client: Ruby':
+      - '\s*?\[ruby\]\s*?'
+      - '\s*?-[gl] ruby(?!-)\b'
+    'Client: Rust':
+      - '\s*?\[rust\]\s*?'
+      - '\s*?-[gl] rust(?!-)\b'
+    'Client: Scala':
+      - '\s*?\[scalaz\]\s*?'
+      - '\s*?-[gl] scalaz\s*?'
+      - '\s*?\[scala-(?!finch)[a-z]+\]\b'
+      - '\s*?-[gl] scala-(?!finch)[a-z]+?(?!-)\b'
+    'Client: Swift':
+      - '\s*?\[swift[34]+\]\s*?'
+      - '\s*?-[gl] swift[34]+\s*?'
+      - '\s*?-[gl] swift2-deprecated\s*?'
+    'Client: TypeScript':
+      - '\s*?\[typescript-[\-a-z]+\]\s*?'
+      - '\s*?-[gl] typescript-[\-a-z]+\s*?'
+    # 'Client: VB/VB.net': # NOTE: Not yet implemented
+    # 'Client: Visual Basic': # TODO: REMOVE UNUSED LABEL
+    'Config: Apache':
+      - '\s*?\[apache2\]\s*?'
+      - '\s*?-[gl] apache2\s*?'
+    'Docker':
+      - '\s*?\[docker\]\s*?'
+    'Documentation: Cwiki':
+      - '\s*?\[cwiki\]\s*?'
+      - '\s*?-[gl] cwiki\s*?'
+    'Documentation: Dynamic HTML':
+      - '\s*?\[dynamic-html\]\s*?'
+      - '\s*?-[gl] dynamic-html\s*?'
+    'Enhancement: CI/Test':
+      - '\s*?\[ci\]\s*?'
+    'Enhancement: Code format':
+      - '\s*?\[format(ting)?\]\s*?'
+    # 'Enhancement: Compatibility':
+    'Enhancement: Feature':
+      - '\s*?\[feat(ure)?s*?'
+    'Enhancement: General':
+      - '\s*?\[general\]\s*?'
+      - '\s*?\[core\]\s*?'
+    # 'Enhancement: New generator':
+    'Enhancement: Performance':
+      - '\s*?\[perf\]\s*?'
+    # 'Feature List: API clients':
+    # 'Feature List: API documentations':
+    # 'Feature List: API servers':
+    # 'Feature: Authentication':
+    # 'Feature: Composition / Inheritance':
+    # 'Feature: Documentation':
+    # 'Feature: Enum':
+    # 'Feature: Generator':
+    'Feature: OAS 3.0 spec support':
+      - '\s*?\[oas3[\.0]?\]\s*?'
+    # 'General: Awaiting feedback':
+    'General: Discussion':
+      - '\s*?\[discussion\]\s*?'
+    'General: Question':
+      - '\s*?\[question\]\s*?'
+    'General: Suggestion':
+      - '\s*?\[suggestion\]\s*?'
+    'General: Support':
+      - '\s*?\[support\]\s*?'
+    'Issue: Bug':
+      - '\s*?\[bug(s)?\]\s*?'
+      - '\s*?\[fix(es)?\]\s*?'
+    # 'Issue: Invalid spec':
+    # 'Issue: Migration':
+    # 'Issue: Non-operational':
+    # 'Issue: Platform':
+    # 'Issue: Regression':
+    'Issue: Security':
+      - '\s*?\[security\]\s*?'
+    # 'Issue: Unable to reproduce':
+    # 'Issue: Undo changes':
+    # 'Issue: Usage/Installation':
+    # 'Issue: Workaround available':
+    'OpenAPI Generator CLI':
+      - '\s*?\[cli\]\s*?'
+    'OpenAPI Generator Gradle Plugin':
+      - '\s*?\[gradle\]\s*?'
+    'OpenAPI Generator Maven Plugin':
+      - '\s*?\[maven\]\s*?'
+    'OpenAPI Generator Online':
+      - '\s*?\[online\]\s*?'
+    'Schema: MySQL':
+      - '\s*?\[mysql\]\s*?'
+      - '\s*?-[gl] mysql\s*?'
+    'Schema: GraphQL':
+      - '\s*?\[graphql-schema\]\s*?'
+      - '\s*?-[gl] graphql-schema\s*?'
+    'Server: Ada':
+      - '\s*?\[ada(-.*)?-server\]\s*?'
+      - '\s*?-[gl] ada(-.*)?-server\s*?'
+    'Server: C++':
+      - '\s*?\[cpp(-.*)?-server\]\s*?'
+      - '\s*?-[gl] cpp(-.*)?-server\s*?'
+    'Server: C-Sharp':
+      - '\s*?\[aspnetcore\]\s*?'
+      - '\s*?-[gl] aspnetcore\s*?'
+      - '\s*?\[csharp-nancyfx\]\s*?'
+      - '\s*?-[gl] csharp-nancyfx\s*?'
+    # 'Server: Ceylon': # TODO: REMOVE UNUSED LABEL
+    'Server: Eiffel':
+      - '\s*?\[eiffel(-.*)?-server\]\s*?'
+      - '\s*?-[gl] eiffel(-.*)?-server\s*?'
+    'Server: Elixir':
+      - '\s*?\[elixir(-.*)?-server\]\s*?'
+      - '\s*?-[gl] elixir(-.*)?-server\s*?'
+    'Server: Erlang':
+      - '\s*?\[erlang-server\]\s*?'
+      - '\s*?-[gl] erlang-server\s*?'
+    'Server: Go':
+      - '\s*?\[go(-.*)?-server\]\s*?'
+      - '\s*?-[gl] go(-.*)?-server\s*?'
+    'Server: GraphQL':
+      - '\s*?\[graphql(-.*)?-server\]\s*?'
+      - '\s*?-[gl] graphql(-.*)?-server\s*?'
+    'Server: Haskell':
+      - '\s*?\[haskell]\s*?'
+      - '\s*?-[gl] haskell(?!-)\b'
+    'Server: Java':
+      - '\s*?\[java-.*?\]\s*?'
+      - '\s*?-[gl] java-.*?\s*?'
+      - '\s*?-[gl] jaxrx-.*?\s*?'
+    'Server: Kotlin':
+      - '\s*?\[ktor]\s*?'
+      - '\s*?\[kotlin-spring]\s*?'
+      - '\s*?\[kotlin(-.*)?-server\]\s*?'
+      - '\s*?-[gl] kotlin(-.*)?-server\s*?'
+      - '\s*?-[gl] kotlin-spring\s*?'
+    'Server: Nodejs':
+      - '\s*?\[nodejs(-.*)?-server\]\s*?'
+      - '\s*?-[gl] nodejs(-.*)?-server\s*?'
+    'Server: PHP':
+      - '\s*?\[php-.*?\]\s*?'
+      - '\s*?-[gl] php-.*?\s*?'
+    'Server: Perl':
+      - '\s*?\[perl(-.*)?-server\]\s*?'
+      - '\s*?-g perl(-.*)?-server\s*?'
+    'Server: Python':
+      - '\s*?\[python-.*?\]\s*?'
+      - '\s*?-[gl] python-.*?\s*?'
+    'Server: Ruby':
+      - '\s*?\[ruby-.*?\]\s*?'
+      - '\s*?-[gl] ruby-.*?\s*?'
+    'Server: Rust':
+      - '\s*?\[rust(-.*)?-server\]\s*?'
+      - '\s*?-[gl] rust(-.*)?-server\s*?'
+    'Server: Scala':
+      - '\s*?\[scala(-.*)?-server\]\s*?'
+      - '\s*?-[gl] scala(-.*)?-server\s*?'
+      - '\s*?\[scalatra\]\s*?'
+      - '\s*?-[gl] scalatra\s*?'
+      - '\s*?\[scala-finch\]\s*?'
+      - '\s*?-[gl] scala-finch\s*?'
+    'Server: Spring':
+      - '\s*?\[spring\]\s*?'
+      - '\s*?-[g] spring\s*?'
+    # 'Swagger-Parser':
+    'WIP':
+      - '\s*?\[wip\]\s*?'
+      - '\s*?\[WIP\]\s*?'
+      - '\bWIP:.*?'
+    'help wanted':
+      - '\s*?\[help wanted\]\s*?'

.gitignore

@@ -146,6 +146,8 @@ samples/client/petstore/csharp/SwaggerClient/bin/Debug/
 samples/client/petstore/csharp/SwaggerClient/packages
 samples/client/petstore/csharp/SwaggerClient/TestResult.xml
 samples/client/petstore/csharp/SwaggerClientWithPropertyChanged/IO.Swagger.userprefs
+samples/client/petstore/csharp-refactor/OpenAPIClient/TestResult.xml
+samples/client/petstore/csharp-refactor/OpenAPIClient/nuget.exe
 
 # Python
 *.pyc
@@ -178,12 +180,16 @@ samples/client/petstore/kotlin/src/main/kotlin/test/
 samples/client/petstore/kotlin-threetenbp/build
 samples/client/petstore/kotlin-string/build
 samples/server/petstore/kotlin-server/ktor/build
+samples/openapi3/client/petstore/kotlin/build
 \?
 
 # haskell
 .stack-work
 .cabal-sandbox
 cabal.project.local
+samples/client/petstore/haskell-http-client/docs/haddock-bundle.min.js
+samples/client/petstore/haskell-http-client/docs/meta.json
+samples/client/petstore/haskell-http-client/docs/quick-jump.css
 
 # R
 .Rproj.user
@@ -199,6 +205,8 @@ samples/client/petstore/groovy/build
 # erlang
 samples/client/petstore/erlang-client/_build/
 samples/client/petstore/erlang-client/rebar.lock
+samples/client/petstore/erlang-proper/_build/
+samples/client/petstore/erlang-proper/rebar.lock
 samples/server/petstore/erlang-server/_build/
 samples/server/petstore/erlang-server/rebar.lock
 
@@ -212,3 +220,7 @@ samples/client/petstore/javascript/package-lock.json
 
 # elm
 samples/client/petstore/elm/index.html
+
+# C
+samples/client/petstore/c/build
+samples/client/petstore/c/*.so

.travis.yml

@@ -51,9 +51,9 @@ addons:
 
 before_install:
   # install haskell
-  #- curl -sSL https://get.haskellstack.org/ | sh
-  #- stack upgrade
-  #- stack --version
+  - curl -sSL https://get.haskellstack.org/ | sh
+  - stack upgrade
+  - stack --version
   # install rust
   - curl https://sh.rustup.rs -sSf | sh -s -- -y -v
   # required when sudo: required for the Ruby petstore tests
@@ -80,6 +80,9 @@ before_install:
   #- sudo sh -c 'curl https://storage.googleapis.com/download.dartlang.org/linux/debian/dart_stable.list > /etc/apt/sources.list.d/dart_stable.list'
   #- sudo apt-get update
   #- sudo apt-get install dart
+  # switch to php7
+  - phpenv global 7.1
+  - php -v
   # install perl module
   #- cpanm --local-lib=~/perl5 local::lib && eval $(perl -I ~/perl5/lib/perl5/ -Mlocal::lib)
   #- cpanm Test::Exception Test::More Log::Any LWP::UserAgent JSON URI:Query Module::Runtime DateTime Module::Find Moose::Role
@@ -94,7 +97,7 @@ before_install:
   - cat /etc/hosts
   # show java version
   - java -version
-  - if [ "$TRAVIS_BRANCH" = "master" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ]; then
+  - if [ "$TRAVIS_BRANCH" = "4.0.0-beta" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ]; then
       openssl aes-256-cbc -K $encrypted_6e2c8bba47c6_key -iv $encrypted_6e2c8bba47c6_iv -in sec.gpg.enc -out sec.gpg -d ;
       gpg --keyserver keyserver.ubuntu.com --recv-key $SIGNING_KEY ;
       gpg --check-trustdb ;
@@ -127,7 +130,7 @@ script:
 after_success:
   # push to maven repo
   - if [ $SONATYPE_USERNAME ] && [ -z $TRAVIS_TAG ] && [ "$TRAVIS_PULL_REQUEST" == "false" ]; then
-      if [ "$TRAVIS_BRANCH" = "master" ]; then
+      if [ "$TRAVIS_BRANCH" = "4.0.0-beta" ]; then
         mvn clean deploy -DskipTests=true -B -U -P release --settings CI/settings.xml;
         echo "Finished mvn clean deploy for $TRAVIS_BRANCH";
         pushd .;
@@ -146,9 +149,9 @@ after_success:
       fi;
     fi;
   ## docker: build and push openapi-generator-online to DockerHub
-  - if [ $DOCKER_HUB_USERNAME ]; then echo "$DOCKER_HUB_PASSWORD" | docker login --username=$DOCKER_HUB_USERNAME --password-stdin && docker build -t $DOCKER_GENERATOR_IMAGE_NAME ./modules/openapi-generator-online && if [ ! -z "$TRAVIS_TAG" ]; then docker tag $DOCKER_GENERATOR_IMAGE_NAME:latest $DOCKER_GENERATOR_IMAGE_NAME:$TRAVIS_TAG; fi && if [ ! -z "$TRAVIS_TAG" ] || [ "$TRAVIS_BRANCH" = "master" ]; then docker push $DOCKER_GENERATOR_IMAGE_NAME && echo "Pushed to $DOCKER_GENERATOR_IMAGE_NAME"; fi; fi
+  - if [ $DOCKER_HUB_USERNAME ]; then echo "$DOCKER_HUB_PASSWORD" | docker login --username=$DOCKER_HUB_USERNAME --password-stdin && docker build -t $DOCKER_GENERATOR_IMAGE_NAME ./modules/openapi-generator-online && if [ ! -z "$TRAVIS_TAG" ]; then docker tag $DOCKER_GENERATOR_IMAGE_NAME:latest $DOCKER_GENERATOR_IMAGE_NAME:$TRAVIS_TAG; fi && if [ ! -z "$TRAVIS_TAG" ] || [ "$TRAVIS_BRANCH" = "4.0.0-beta" ]; then docker push $DOCKER_GENERATOR_IMAGE_NAME && echo "Pushed to $DOCKER_GENERATOR_IMAGE_NAME"; fi; fi
   ## docker: build cli image and push to Docker Hub
-  - if [ $DOCKER_HUB_USERNAME ]; then echo "$DOCKER_HUB_PASSWORD" | docker login --username=$DOCKER_HUB_USERNAME --password-stdin && cp docker-entrypoint.sh ./modules/openapi-generator-cli && docker build -t $DOCKER_CODEGEN_CLI_IMAGE_NAME ./modules/openapi-generator-cli && if [ ! -z "$TRAVIS_TAG" ]; then docker tag $DOCKER_CODEGEN_CLI_IMAGE_NAME:latest $DOCKER_CODEGEN_CLI_IMAGE_NAME:$TRAVIS_TAG; fi && if [ ! -z "$TRAVIS_TAG" ] || [ "$TRAVIS_BRANCH" = "master" ]; then docker push $DOCKER_CODEGEN_CLI_IMAGE_NAME && echo "Pushed to $DOCKER_CODEGEN_CLI_IMAGE_NAME"; fi; fi
+  - if [ $DOCKER_HUB_USERNAME ]; then echo "$DOCKER_HUB_PASSWORD" | docker login --username=$DOCKER_HUB_USERNAME --password-stdin && cp docker-entrypoint.sh ./modules/openapi-generator-cli && docker build -t $DOCKER_CODEGEN_CLI_IMAGE_NAME ./modules/openapi-generator-cli && if [ ! -z "$TRAVIS_TAG" ]; then docker tag $DOCKER_CODEGEN_CLI_IMAGE_NAME:latest $DOCKER_CODEGEN_CLI_IMAGE_NAME:$TRAVIS_TAG; fi && if [ ! -z "$TRAVIS_TAG" ] || [ "$TRAVIS_BRANCH" = "4.0.0-beta" ]; then docker push $DOCKER_CODEGEN_CLI_IMAGE_NAME && echo "Pushed to $DOCKER_CODEGEN_CLI_IMAGE_NAME"; fi; fi
 
 env:
   - DOCKER_GENERATOR_IMAGE_NAME=openapitools/openapi-generator-online DOCKER_CODEGEN_CLI_IMAGE_NAME=openapitools/openapi-generator-cli NODE_ENV=test CC=gcc-5 CXX=g++-5

CI/samples.ci/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj

@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+OpenAPI Petstore
+
+This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+
+OpenAPI spec version: 1.0.0
+
+-->
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{19F1DEBC-DE5E-4517-8062-F000CD499087}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Org.OpenAPITools.Test</RootNamespace>
+    <AssemblyName>Org.OpenAPITools.Test</AssemblyName>
+    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="System.ComponentModel.DataAnnotations" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Runtime.Serialization" />
+    <Reference Include="System.Xml" />
+    <Reference Include="Newtonsoft.Json">
+        <HintPath Condition="Exists('$(SolutionDir)\packages')">$(SolutionDir)\packages\Newtonsoft.Json.12.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+        <HintPath Condition="Exists('..\packages')">..\packages\Newtonsoft.Json.12.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+        <HintPath Condition="Exists('..\..\packages')">..\..\packages\Newtonsoft.Json.12.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+        <HintPath Condition="Exists('..\..\vendor')">..\..\vendor\Newtonsoft.Json.12.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+    </Reference>
+    <Reference Include="JsonSubTypes">
+        <HintPath Condition="Exists('$(SolutionDir)\packages')">$(SolutionDir)\packages\JsonSubTypes.1.5.1\lib\net45\JsonSubTypes.dll</HintPath>
+        <HintPath Condition="Exists('..\packages')">..\packages\JsonSubTypes.1.5.1\lib\net45\JsonSubTypes.dll</HintPath>
+        <HintPath Condition="Exists('..\..\packages')">..\..\packages\JsonSubTypes.1.5.1\lib\net45\JsonSubTypes.dll</HintPath>
+        <HintPath Condition="Exists('..\..\vendor')">..\..\vendor\JsonSubTypes.1.5.1\lib\net45\JsonSubTypes.dll</HintPath>
+    </Reference>
+    <Reference Include="RestSharp">
+        <HintPath Condition="Exists('$(SolutionDir)\packages')">$(SolutionDir)\packages\RestSharp.106.5.4\lib\net452\RestSharp.dll</HintPath>
+        <HintPath Condition="Exists('..\packages')">..\packages\RestSharp.106.5.4\lib\net452\RestSharp.dll</HintPath>
+        <HintPath Condition="Exists('..\..\packages')">..\..\packages\RestSharp.106.5.4\lib\net452\RestSharp.dll</HintPath>
+        <HintPath Condition="Exists('..\..\vendor')">..\..\vendor\RestSharp.106.5.4\lib\net452\RestSharp.dll</HintPath>
+    </Reference>
+    <Reference Include="nunit.framework">
+        <HintPath Condition="Exists('$(SolutionDir)\packages')">$(SolutionDir)\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
+        <HintPath Condition="Exists('..\packages')">..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
+        <HintPath Condition="Exists('..\..\packages')">..\..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
+        <HintPath Condition="Exists('..\..\vendor')">..\..\vendor\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="**\*.cs" Exclude="obj\**" />
+  </ItemGroup>
+  <ItemGroup>
+      <None Include="packages.config" />
+  </ItemGroup>
+  <Import Project="$(MsBuildToolsPath)\Microsoft.CSharp.targets" />
+  <ItemGroup>
+      <ProjectReference Include="..\Org.OpenAPITools\Org.OpenAPITools.csproj">
+          <Project>{321C8C3F-0156-40C1-AE42-D59761FB9B6C}</Project>
+          <Name>Org.OpenAPITools</Name>
+      </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="linux-logo.png" />
+  </ItemGroup>
+</Project>
+

CI/samples.ci/client/petstore/java/test-manual/okhttp-gson/model/ArrayOfArrayOfNumberOnlyTest.java

@@ -0,0 +1,70 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import org.apache.commons.lang3.builder.EqualsBuilder;
+import com.google.gson.TypeAdapter;
+import com.google.gson.annotations.JsonAdapter;
+import com.google.gson.annotations.SerializedName;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.io.IOException;
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+
+/**
+ * Model tests for ArrayOfArrayOfNumberOnly
+ */
+public class ArrayOfArrayOfNumberOnlyTest {
+    private final ArrayOfArrayOfNumberOnly model = new ArrayOfArrayOfNumberOnly();
+
+    /**
+     * Model tests for ArrayOfArrayOfNumberOnly
+     */
+    @Test
+    public void test() {
+        // TODO: test ArrayOfArrayOfNumberOnly
+    }
+
+    /**
+     * Test the property 'arrayArrayNumber'
+     */
+    @Test
+    public void arrayArrayNumberTest() {
+        BigDecimal b1 = new BigDecimal("12.3");
+        BigDecimal b2 = new BigDecimal("5.6");
+        List<BigDecimal> arrayArrayNumber = new ArrayList<BigDecimal>();
+        arrayArrayNumber.add(b1);
+        arrayArrayNumber.add(b2);
+        model.getArrayArrayNumber().add(arrayArrayNumber);
+
+        // create another instance for comparison
+        BigDecimal b3 = new BigDecimal("12.3");
+        BigDecimal b4 = new BigDecimal("5.6");
+        ArrayOfArrayOfNumberOnly model2 = new ArrayOfArrayOfNumberOnly();
+        List<BigDecimal> arrayArrayNumber2 = new ArrayList<BigDecimal>();
+        arrayArrayNumber2.add(b1);
+        arrayArrayNumber2.add(b2);
+        model2.getArrayArrayNumber().add(arrayArrayNumber2);
+
+        Assert.assertTrue(model2.equals(model));
+    }
+
+}

CI/samples.ci/client/petstore/java/test-manual/okhttp-gson/model/PetTest.java

@@ -0,0 +1,103 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import com.google.gson.TypeAdapter;
+import com.google.gson.annotations.JsonAdapter;
+import com.google.gson.annotations.SerializedName;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import org.openapitools.client.model.Category;
+import org.openapitools.client.model.Tag;
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+
+
+/**
+ * Model tests for Pet
+ */
+public class PetTest {
+    private final Pet model = new Pet();
+
+    /**
+     * Model tests for Pet
+     */
+    @Test
+    public void testPet() {
+        // test Pet
+        model.setId(1029L);
+        model.setName("Dog");
+
+        Pet model2 = new Pet();
+        model2.setId(1029L);
+        model2.setName("Dog");
+
+        Assert.assertTrue(model.equals(model2));
+    }
+
+    /**
+     * Test the property 'id'
+     */
+    @Test
+    public void idTest() {
+        // TODO: test id
+    }
+
+    /**
+     * Test the property 'category'
+     */
+    @Test
+    public void categoryTest() {
+        // TODO: test category
+    }
+
+    /**
+     * Test the property 'name'
+     */
+    @Test
+    public void nameTest() {
+        // TODO: test name
+    }
+
+    /**
+     * Test the property 'photoUrls'
+     */
+    @Test
+    public void photoUrlsTest() {
+        // TODO: test photoUrls
+    }
+
+    /**
+     * Test the property 'tags'
+     */
+    @Test
+    public void tagsTest() {
+        // TODO: test tags
+    }
+
+    /**
+     * Test the property 'status'
+     */
+    @Test
+    public void statusTest() {
+        // TODO: test status
+    }
+
+}

CI/samples.ci/client/petstore/typescript-fetch/builds/default/pom.xml

@@ -0,0 +1,26 @@
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>org.openapitools</groupId>
+    <artifactId>TypeScriptAngularBuildPestoreClientTests</artifactId>
+    <packaging>pom</packaging>
+    <version>1.0-SNAPSHOT</version>
+    <name>TS Fetch Default Petstore Client</name>
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>copy-dependencies</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${project.build.directory}</outputDirectory>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>

CI/samples.ci/client/petstore/typescript-fetch/builds/es6-target/pom.xml

@@ -0,0 +1,59 @@
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>org.openapitools</groupId>
+    <artifactId>TypeScriptAngularBuildES6PestoreClientTests</artifactId>
+    <packaging>pom</packaging>
+    <version>1.0-SNAPSHOT</version>
+    <name>TS Fetch ES6 Petstore Client</name>
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>copy-dependencies</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${project.build.directory}</outputDirectory>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>exec-maven-plugin</artifactId>
+                <version>1.2.1</version>
+                <executions>
+                    <execution>
+                        <id>npm-install</id>
+                        <phase>integration-test</phase>
+                        <goals>
+                            <goal>exec</goal>
+                        </goals>
+                        <configuration>
+                            <executable>npm</executable>
+                            <arguments>
+                                <argument>install</argument>
+                            </arguments>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>npm-test</id>
+                        <phase>integration-test</phase>
+                        <goals>
+                            <goal>exec</goal>
+                        </goals>
+                        <configuration>
+                            <executable>npm</executable>
+                            <arguments>
+                                <argument>test</argument>
+                            </arguments>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>

CI/samples.ci/client/petstore/typescript-fetch/builds/with-npm-version/pom.xml

@@ -0,0 +1,73 @@
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>org.openapitools</groupId>
+    <artifactId>TypeScriptAngularBuildWithNPMVersionPestoreClientTests</artifactId>
+    <packaging>pom</packaging>
+    <version>1.0-SNAPSHOT</version>
+    <name>TS Fetch Petstore Client (with npm)</name>
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>copy-dependencies</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${project.build.directory}</outputDirectory>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>exec-maven-plugin</artifactId>
+                <version>1.2.1</version>
+                <executions>
+                    <execution>
+                        <id>npm-install</id>
+                        <phase>integration-test</phase>
+                        <goals>
+                            <goal>exec</goal>
+                        </goals>
+                        <configuration>
+                            <executable>npm</executable>
+                            <arguments>
+                                <argument>install</argument>
+                            </arguments>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>npm-build</id>
+                        <phase>integration-test</phase>
+                        <goals>
+                            <goal>exec</goal>
+                        </goals>
+                        <configuration>
+                            <executable>npm</executable>
+                            <arguments>
+                                <argument>run</argument>
+                                <argument>build</argument>
+                            </arguments>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>npm-test</id>
+                        <phase>integration-test</phase>
+                        <goals>
+                            <goal>exec</goal>
+                        </goals>
+                        <configuration>
+                            <executable>npm</executable>
+                            <arguments>
+                                <argument>test</argument>
+                            </arguments>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>

CI/samples.ci/client/petstore/typescript-fetch/tests/default/pom.xml

@@ -0,0 +1,59 @@
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>org.openapitools</groupId>
+    <artifactId>TypeScriptFetchPestoreClientTests</artifactId>
+    <packaging>pom</packaging>
+    <version>1.0-SNAPSHOT</version>
+    <name>TS Fetch Petstore Test Client</name>
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>copy-dependencies</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${project.build.directory}</outputDirectory>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>exec-maven-plugin</artifactId>
+                <version>1.2.1</version>
+                <executions>
+                    <execution>
+                        <id>npm-install</id>
+                        <phase>pre-integration-test</phase>
+                        <goals>
+                            <goal>exec</goal>
+                        </goals>
+                        <configuration>
+                            <executable>npm</executable>
+                            <arguments>
+                                <argument>install</argument>
+                            </arguments>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>npm-test</id>
+                        <phase>integration-test</phase>
+                        <goals>
+                            <goal>exec</goal>
+                        </goals>
+                        <configuration>
+                            <executable>npm</executable>
+                            <arguments>
+                                <argument>test</argument>
+                            </arguments>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>

CI/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/obj/Debug/Org.OpenAPITools.Test.csproj.CoreCompileInputs.cache

@@ -0,0 +1 @@
+c2fcc2ae9693a8e8d02b25e286844aad88188fcb

README.md

@@ -2,15 +2,11 @@
 
 <div align="center">
 
-[Master](https://github.com/OpenAPITools/openapi-generator/tree/master) (`3.3.4`): [![Build Status](https://img.shields.io/travis/OpenAPITools/openapi-generator/master.svg?label=Integration%20Test)](https://travis-ci.org/OpenAPITools/openapi-generator)
+[Master](https://github.com/OpenAPITools/openapi-generator/tree/master) (`4.0.0`): [![Build Status](https://img.shields.io/travis/OpenAPITools/openapi-generator/master.svg?label=Integration%20Test)](https://travis-ci.org/OpenAPITools/openapi-generator)
 [![Integration Test2](https://circleci.com/gh/OpenAPITools/openapi-generator.svg?style=shield)](https://circleci.com/gh/OpenAPITools/openapi-generator)
 [![Run Status](https://api.shippable.com/projects/5af6bf74e790f4070084a115/badge?branch=master)](https://app.shippable.com/github/OpenAPITools/openapi-generator)
 [![Windows Test](https://ci.appveyor.com/api/projects/status/github/openapitools/openapi-generator?branch=master&svg=true&passingText=Windows%20Test%20-%20OK&failingText=Windows%20Test%20-%20Fails)](https://ci.appveyor.com/project/WilliamCheng/openapi-generator-wh2wu)
 
-[`4.0.x`](https://github.com/OpenAPITools/openapi-generator/tree/4.0.x) branch: [![Build Status](https://img.shields.io/travis/OpenAPITools/openapi-generator/4.0.x.svg?label=Integration%20Test)](https://travis-ci.org/OpenAPITools/openapi-generator)
-[![Integration Test2](https://circleci.com/gh/OpenAPITools/openapi-generator/tree/4.0.x.svg?style=shield)](https://circleci.com/gh/OpenAPITools/openapi-generator)
-[![Run Status](https://api.shippable.com/projects/5af6bf74e790f4070084a115/badge?branch=4.0.x)](https://app.shippable.com/github/OpenAPITools/openapi-generator)
-[![Windows Test](https://ci.appveyor.com/api/projects/status/github/openapitools/openapi-generator?branch=4.0.x&svg=true&passingText=Windows%20Test%20-%20OK&failingText=Windows%20Test%20-%20Fails)](https://ci.appveyor.com/project/WilliamCheng/openapi-generator-wh2wu)
 </div>
 
 <div align="center">
@@ -31,7 +27,7 @@
 
 :notebook_with_decorative_cover: The eBook [A Beginner's Guide to Code Generation for REST APIs](https://gumroad.com/l/swagger_codegen_beginner) is a good starting point for beginners :notebook_with_decorative_cover:
 
-:warning: If the OpenAPI spec, templates or any input (e.g. options, envirionment variables) is obtained from an untrusted source or environment, please make sure you've reviewed these inputs before using OpenAPI Generator to generate the API client, server stub or documentation to avoid potential security issues (e.g. [code injection](https://en.wikipedia.org/wiki/Code_injection)) :warning:
+:warning: If the OpenAPI spec, templates or any input (e.g. options, environment variables) is obtained from an untrusted source or environment, please make sure you've reviewed these inputs before using OpenAPI Generator to generate the API client, server stub or documentation to avoid potential security issues (e.g. [code injection](https://en.wikipedia.org/wiki/Code_injection)) :warning:
 
 :bangbang: Both "OpenAPI Tools" (https://OpenAPITools.org - the parent organization of OpenAPI Generator) and "OpenAPI Generator" are not affiliated with OpenAPI Initiative (OAI) :bangbang:
 
@@ -46,7 +42,7 @@ OpenAPI Generator allows generation of API client libraries (SDK generation), se
 **Server stubs**                 | **Ada**, **C#** (ASP.NET Core, NancyFx), **C++** (Pistache, Restbed), **Erlang**, **Go** (net/http, Gin), **Haskell** (Servant), **Java** (MSF4J, Spring, Undertow, JAX-RS: CDI, CXF, Inflector, RestEasy, Play Framework, [PKMST](https://github.com/ProKarma-Inc/pkmst-getting-started-examples)), **Kotlin** (Spring Boot), **PHP** (Laravel, Lumen, Slim, Silex, [Symfony](https://symfony.com/), [Zend Expressive](https://github.com/zendframework/zend-expressive)), **Python** (Flask), **NodeJS**, **Ruby** (Sinatra, Rails5), **Rust** (rust-server), **Scala** ([Finch](https://github.com/finagle/finch), [Lagom](https://github.com/lagom/lagom), Scalatra)
 **API documentation generators** | **HTML**, **Confluence Wiki**
 **Configuration files**          | [**Apache2**](https://httpd.apache.org/)
-**Others**                       | **JMeter**, **MySQL Schema**
+**Others**                       | **GraphQL**, **JMeter**, **MySQL Schema**
 
 ## Table of contents
 
@@ -83,7 +79,7 @@ The OpenAPI Specification has undergone 3 revisions since initial creation in 20
 
 OpenAPI Generator Version    | Release Date | Notes
 ---------------------------- | ------------ | -----
-4.0.0 (upcoming major release) [SNAPSHOT](https://oss.sonatype.org/content/repositories/snapshots/org/openapitools/openapi-generator-cli/4.0.0-SNAPSHOT/)| 20.12.2018 | Major release with breaking changes (with or without fallback)
+4.0.0 (upcoming release) [SNAPSHOT](https://oss.sonatype.org/content/repositories/snapshots/org/openapitools/openapi-generator-cli/4.0.0-SNAPSHOT/)| 20.12.2018 | Major release with breaking changes (with or without fallback)
 [3.3.4](https://github.com/OpenAPITools/openapi-generator/releases/tag/v3.3.4) (latest stable release) | 30.11.2018 | Bugfix release
 
 OpenAPI Spec compatibility: 1.0, 1.1, 1.2, 2.0, 3.0
@@ -429,7 +425,6 @@ SYNOPSIS
                 [--import-mappings <import mappings>...]
                 [--instantiation-types <instantiation types>...]
                 [--invoker-package <invoker package>]
-                [(-l <language> | --lang <language>)]
                 [--language-specific-primitives <language specific primitives>...]
                 [--library <library>] [--log-to-stderr]
                 [--model-name-prefix <model name prefix>]
@@ -505,16 +500,19 @@ When code is generated from this project, it shall be considered **AS IS** and o
 Here are some companies/projects (alphabetical order) using OpenAPI Generator in production. To add your company/project to the list, please visit [README.md](README.md) and click on the icon to edit the page.
 
 - [Angular.Schule](https://angular.schule/)
+- [ASKUL](https://www.askul.co.jp)
 - [b<>com](https://b-com.com/en)
 - [Bithost GmbH](https://www.bithost.ch)
 - [Boxever](https://www.boxever.com/)
 - [GMO Pepabo](https://pepabo.com/en/)
 - [JustStar](https://www.juststarinfo.com)
 - [Klarna](https://www.klarna.com/)
+- [Metaswitch](https://www.metaswitch.com/)
 - [Myworkout](https://myworkout.com)
 - [Raiffeisen Schweiz Genossenschaft](https://www.raiffeisen.ch)
 - [RepreZen API Studio](https://www.reprezen.com/swagger-openapi-code-generation-api-first-microservices-enterprise-development)
 - [REST United](https://restunited.com)
+- [Stingray](http://www.stingray.com)
 - [Suva](https://www.suva.ch/)
 - [Telstra](https://dev.telstra.com)
 - [TUI InfoTec GmbH](http://www.tui-infotec.com/)
@@ -621,6 +619,7 @@ Here is a list of template creators:
    * Erlang Server: @galaxie
    * Go Server: @guohuang
    * Go (Gin) Server: @kemokemo
+   * GraphQL Express Server: @renepardon
    * Haskell Servant: @algas
    * Java MSF4J: @sanjeewa-malalgoda
    * Java Spring Boot: @diyfr
@@ -648,6 +647,7 @@ Here is a list of template creators:
  * Configuration
    * Apache2: @stkrwork
  * Schema
+   * GraphQL: @wing328
    * MySQL: @ybelenko
 
 #### How to join the core team
@@ -696,6 +696,7 @@ If you want to join the committee, please kindly apply by sending an email to te
 | Elm       | @trenneman (2018/09) |
 | Erlang    | @tsloughter (2017/11) @jfacorro (2018/10) @robertoaloi (2018/10) |
 | Go        | @antihax (2017/11) @bvwells (2017/12) @grokify (2018/07) @kemokemo (2018/09 |
+| GraphQL   | @renepardon (2018/12) |
 | Groovy    |  |
 | Haskell   |  |
 | Java      | @bbdouglas (2017/07) @JFCote (2017/08) @sreeshas (2017/08) @jfiala (2017/08) @lukoyanov (2017/09) @cbornet (2017/09) @jeff9finger (2018/01) |
@@ -704,7 +705,7 @@ If you want to join the committee, please kindly apply by sending an email to te
 | NodeJS/Javascript | @CodeNinjai (2017/07) @frol (2017/07) @cliffano (2017/07) |
 | ObjC      |  |
 | Perl      | @wing328 (2017/07) |
-| PHP       | @jebentier (2017/07) @dkarlovi (2017/07) @mandrean (2017/08) @jfastnacht (2017/09) @ackintosh (2017/09) @ybelenko (2018/07) |
+| PHP       | @jebentier (2017/07) @dkarlovi (2017/07) @mandrean (2017/08) @jfastnacht (2017/09) @ackintosh (2017/09) @ybelenko (2018/07) @renepardon (2018/12) |
 | PowerShell | |
 | Python    | @taxpon (2017/07) @frol (2017/07) @mbohlool (2017/07) @cbornet (2017/09) @kenjones-cisco (2017/11) @tomplus (2018/10) |
 | R         |  |

appveyor.yml

@@ -23,6 +23,9 @@ install:
   - git clone https://github.com/wing328/swagger-samples
   - ps: Start-Process -FilePath 'C:\maven\apache-maven-3.2.5\bin\mvn' -ArgumentList 'jetty:run' -WorkingDirectory "$env:appveyor_build_folder\swagger-samples\java\java-jersey-jaxrs-ci"
 build_script:
+  # build C# API client (refactor)
+  - nuget restore samples\client\petstore\csharp-refactor\OpenAPIClient\Org.OpenAPITools.sln
+  - msbuild samples\client\petstore\csharp-refactor\OpenAPIClient\Org.OpenAPITools.sln /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
   # build C# API client
   - nuget restore samples\client\petstore\csharp\OpenAPIClient\Org.OpenAPITools.sln
   - msbuild samples\client\petstore\csharp\OpenAPIClient\Org.OpenAPITools.sln /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
@@ -37,6 +40,8 @@ build_script:
 test_script:
   # restore test-related files
   - copy /b/v/y CI\samples.ci\client\petstore\csharp\OpenAPIClient\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj samples\client\petstore\csharp\OpenAPIClient\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
+  # test c# API client (refactor)
+  - nunit-console samples\client\petstore\csharp-refactor\OpenAPIClient\src\Org.OpenAPITools.Test\bin\Debug\Org.OpenAPITools.Test.dll --result=myresults.xml;format=AppVeyor
   # test c# API client
   - nunit-console samples\client\petstore\csharp\OpenAPIClient\src\Org.OpenAPITools.Test\bin\Debug\Org.OpenAPITools.Test.dll --result=myresults.xml;format=AppVeyor
   # test c# API client (with PropertyChanged)

bin/cpp-qt5-petstore.sh

@@ -27,6 +27,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="generate -t modules/openapi-generator/src/main/resources/cpp-qt5-client -i modules/openapi-generator/src/test/resources/2_0/petstore.yaml -g cpp-qt5 -o samples/client/petstore/cpp-qt5 $@"
+ags="generate -t modules/openapi-generator/src/main/resources/cpp-qt5-client -i modules/openapi-generator/src/test/resources/2_0/petstore.yaml -g cpp-qt5-client -o samples/client/petstore/cpp-qt5 $@"
 
 java $JAVA_OPTS -jar $executable $ags

bin/csharp-refactor-petstore.sh

@@ -27,11 +27,11 @@ 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/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -g csharp-refactor -o samples/client/petstore/csharp-refactor/OpenAPIClient --additional-properties packageGuid={321C8C3F-0156-40C1-AE42-D59761FB9B6C} $@"
+ags="generate -t modules/openapi-generator/src/main/resources/csharp-refactor/ -i modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -g csharp-refactor -o samples/client/petstore/csharp-refactor/OpenAPIClient --additional-properties packageGuid={321C8C3F-0156-40C1-AE42-D59761FB9B6C},useCompareNetObjects=true $@"
 
 java $JAVA_OPTS -jar $executable $ags
 
 # restore csproj file
-#echo "restore csproject file: CI/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj"
-#cp ./CI/samples.ci/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj ./samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools.Test/
+echo "restore csproject file: CI/samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj"
+cp ./CI/samples.ci/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj ./samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools.Test/
 

bin/dart-jaguar-petstore.sh

@@ -28,11 +28,11 @@ fi
 export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
 
 # Generate client
-ags="$@ generate -t modules/openapi-generator/src/main/resources/dart-jaguar -i modules/openapi-generator/src/test/resources/2_0/petstore.yaml -l dart-jaguar -o samples/client/petstore/dart-jaguar/openapi -DhideGenerationTimestamp=true -DpubName=openapi"
+ags="$@ generate -t modules/openapi-generator/src/main/resources/dart-jaguar -i modules/openapi-generator/src/test/resources/2_0/petstore.yaml -g dart-jaguar -o samples/client/petstore/dart-jaguar/openapi -DhideGenerationTimestamp=true -DpubName=openapi"
 java $JAVA_OPTS -jar $executable $ags
 
 # Generate non-browserClient and put it to the flutter sample app
-ags="$@ generate -t modules/openapi-generator/src/main/resources/dart-jaguar -i modules/openapi-generator/src/test/resources/2_0/petstore.yaml -l dart-jaguar -o samples/client/petstore/dart-jaguar/flutter_petstore/openapi -DhideGenerationTimestamp=true -DpubName=openapi"
+ags="$@ generate -t modules/openapi-generator/src/main/resources/dart-jaguar -i modules/openapi-generator/src/test/resources/2_0/petstore.yaml -g dart-jaguar -o samples/client/petstore/dart-jaguar/flutter_petstore/openapi -DhideGenerationTimestamp=true -DpubName=openapi"
 java $JAVA_OPTS -jar $executable $ags
 
 # There is a proposal to allow importing different libraries depending on the environment:

bin/graphql-schema-petstore.sh

@@ -0,0 +1,32 @@
+#!/bin/sh
+
+SCRIPT="$0"
+echo "# START SCRIPT: $SCRIPT"
+
+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/openapi-generator-cli/target/openapi-generator-cli.jar"
+
+if [ ! -f "$executable" ]
+then
+  mvn -B clean package
+fi
+
+# if you've executed sbt assembly previously it will use that instead.
+export JAVA_OPTS="${JAVA_OPTS} -Xmx1024M -DloggerPath=conf/log4j.properties $@"
+ags="generate -t modules/openapi-generator/src/main/resources/graphql-schema -i modules/openapi-generator/src/test/resources/2_0/petstore.yaml -g graphql-schema -o samples/config/petstore/graphql-schema -DpackageName=petstore $@"
+
+java $JAVA_OPTS -jar $executable $ags

bin/graphql-server-petstore.sh

@@ -0,0 +1,32 @@
+#!/bin/sh
+
+SCRIPT="$0"
+echo "# START SCRIPT: $SCRIPT"
+
+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/openapi-generator-cli/target/openapi-generator-cli.jar"
+
+if [ ! -f "$executable" ]
+then
+  mvn -B clean package
+fi
+
+# if you've executed sbt assembly previously it will use that instead.
+export JAVA_OPTS="${JAVA_OPTS} -Xmx1024M -DloggerPath=conf/log4j.properties $@"
+ags="generate -t modules/openapi-generator/src/main/resources/graphql-server -i modules/openapi-generator/src/test/resources/2_0/petstore.yaml -g graphql-server -o samples/server/petstore/graphql-server -DpackageName=petstore $@"
+
+java $JAVA_OPTS -jar $executable $ags

bin/java-petstore-okhttp-gson.sh

@@ -44,4 +44,6 @@ cp CI/samples.ci/client/petstore/java/test-manual/common/ConfigurationTest.java
 cp CI/samples.ci/client/petstore/java/test-manual/okhttp-gson/auth/ApiKeyAuthTest.java samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/auth/ApiKeyAuthTest.java
 cp CI/samples.ci/client/petstore/java/test-manual/okhttp-gson/auth/HttpBasicAuthTest.java samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/auth/HttpBasicAuthTest.java
 cp CI/samples.ci/client/petstore/java/test-manual/okhttp-gson/model/EnumValueTest.java samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/EnumValueTest.java
+cp CI/samples.ci/client/petstore/java/test-manual/okhttp-gson/model/PetTest.java samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/PetTest.java
+cp CI/samples.ci/client/petstore/java/test-manual/okhttp-gson/model/ArrayOfArrayOfNumberOnly.java samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnlyTest.java
 cp CI/samples.ci/client/petstore/java/test-manual/okhttp-gson/JSONTest.java samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/JSONTest.java

bin/openapi3/cpp-qt5-petstore.sh

@@ -27,6 +27,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="generate -t modules/openapi-generator/src/main/resources/cpp-qt5-client -i modules/openapi-generator/src/test/resources/3_0/petstore.yaml -g cpp-qt5 -o samples/client/petstore/cpp-qt5 $@"
+ags="generate -t modules/openapi-generator/src/main/resources/cpp-qt5-client -i modules/openapi-generator/src/test/resources/3_0/petstore.yaml -g cpp-qt5-client -o samples/client/petstore/cpp-qt5 $@"
 
 java $JAVA_OPTS -jar $executable $ags

bin/openapi3/graphql-petstore-server.sh

@@ -0,0 +1,42 @@
+#!/bin/bash
+
+SCRIPT="$0"
+echo "# START SCRIPT: $SCRIPT"
+
+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
+
+# Make sure that the working directory is the root dir
+SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+cd "${SCRIPT_DIR}/../"
+
+if [ ! -d "${APP_DIR}" ]; then
+  APP_DIR=`dirname "$SCRIPT"`/..
+  APP_DIR=`cd "${APP_DIR}"; pwd`
+fi
+
+# Make sure that we are regenerating the sample by removing any existing target directory
+TARGET_DIR="$SCRIPT_DIR/../../samples/server/petstore/graphql-server"
+if [ -d "$TARGET_DIR" ]; then
+	rm -rf $TARGET_DIR
+fi
+
+executable="$SCRIPT_DIR/../../modules/openapi-generator-cli/target/openapi-generator-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} -Xmx1024M -DloggerPath=conf/log4j.properties"
+ags="generate -t $SCRIPT_DIR/../../modules/openapi-generator/src/main/resources/graphql-server -i $SCRIPT_DIR/../../modules/openapi-generator/src/test/resources/3_0/petstore.yaml -g graphql-server -o $TARGET_DIR $@"
+
+java $JAVA_OPTS -jar $executable $ags

bin/openapi3/kotlin-client-petstore.sh

@@ -0,0 +1,35 @@
+#!/bin/sh
+
+SCRIPT="$0"
+echo "# START SCRIPT: $SCRIPT"
+
+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/openapi-generator-cli/target/openapi-generator-cli.jar"
+
+if [ ! -f "$executable" ]
+then
+  mvn clean package
+fi
+
+export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
+ags="$@ generate -i modules/openapi-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml -t modules/openapi-generator/src/main/resources/kotlin-client -g kotlin --artifact-id kotlin-petstore-client -D dateLibrary=java8 -o samples/openapi3/client/petstore/kotlin $@"
+
+echo "Cleaning previously generated files if any from samples/openapi3/client/petstore/kotlin"
+rm -rf samples/openapi3/client/petstore/kotlin
+
+echo "Generating Kotling client..."
+java $JAVA_OPTS -jar $executable $ags

bin/openapi3/perl-petstore.sh

@@ -28,6 +28,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"
 # complex module name used for testing
-ags="generate -i modules/openapi-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml  -g perl -o samples/client/petstore/perl -DhideGenerationTimestamp=true $@"
+ags="generate -t modules/openapi-generator/src/main/resources/perl -i modules/openapi-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml  -g perl -o samples/client/petstore/perl -DhideGenerationTimestamp=true $@"
 
 java $JAVA_OPTS -jar $executable $ags

bin/security/cpp-qt5-petstore.sh

@@ -27,6 +27,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="generate -t modules/openapi-generator/src/main/resources/cpp-qt5-client -i modules/openapi-generator/src/test/resources/2_0/petstore-security-test.yaml -g cpp-qt5 -o samples/client/petstore-security-test/cpp-qt5 $@"
+ags="generate -t modules/openapi-generator/src/main/resources/cpp-qt5-client -i modules/openapi-generator/src/test/resources/2_0/petstore-security-test.yaml -g cpp-qt5-client -o samples/client/petstore-security-test/cpp-qt5 $@"
 
 java $JAVA_OPTS -jar $executable $ags

bin/security/perl-petstore.sh

@@ -28,7 +28,7 @@ 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"
 # complex module name used for testing
-ags="generate -i modules/openapi-generator/src/test/resources/2_0/petstore-security-test.yaml  -l perl -o samples/client/petstore-security-test/perl $@"
+ags="generate -i modules/openapi-generator/src/test/resources/2_0/petstore-security-test.yaml -g perl -o samples/client/petstore-security-test/perl $@"
 
 java $JAVA_OPTS -jar $executable $ags
 

bin/swift3-petstore-objcCompatible.sh

@@ -27,6 +27,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="generate -t modules/openapi-generator/src/main/resources/swift3 -i modules/openapi-generator/src/test/resources/2_0/swift/petstore-with-fake-endpoints-models-for-testing.yaml -g swift3 -c ./bin/swift3-petstore-objcCompatible.json -o samples/client/petstore/swift3/objcCompatible $@"
+ags="generate -t modules/openapi-generator/src/main/resources/swift3 -i modules/openapi-generator/src/test/resources/2_0/swift/petstore-with-fake-endpoints-models-for-testing.yaml -g swift3-deprecated -c ./bin/swift3-petstore-objcCompatible.json -o samples/client/petstore/swift3/objcCompatible $@"
 
 java $JAVA_OPTS -jar $executable $ags

bin/swift3-petstore-promisekit.sh

@@ -27,6 +27,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="generate -t modules/openapi-generator/src/main/resources/swift3 -i modules/openapi-generator/src/test/resources/2_0/swift/petstore-with-fake-endpoints-models-for-testing.yaml -g swift3 -c ./bin/swift3-petstore-promisekit.json -o samples/client/petstore/swift3/promisekit $@"
+ags="generate -t modules/openapi-generator/src/main/resources/swift3 -i modules/openapi-generator/src/test/resources/2_0/swift/petstore-with-fake-endpoints-models-for-testing.yaml -g swift3-deprecated -c ./bin/swift3-petstore-promisekit.json -o samples/client/petstore/swift3/promisekit $@"
 
 java $JAVA_OPTS -jar $executable $ags

bin/swift3-petstore-rxswift.sh

@@ -27,6 +27,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="generate -t modules/openapi-generator/src/main/resources/swift3 -i modules/openapi-generator/src/test/resources/2_0/swift/petstore-with-fake-endpoints-models-for-testing.yaml -g swift3 -c ./bin/swift3-petstore-rxswift.json -o samples/client/petstore/swift3/rxswift $@"
+ags="generate -t modules/openapi-generator/src/main/resources/swift3 -i modules/openapi-generator/src/test/resources/2_0/swift/petstore-with-fake-endpoints-models-for-testing.yaml -g swift3-deprecated -c ./bin/swift3-petstore-rxswift.json -o samples/client/petstore/swift3/rxswift $@"
 
 java $JAVA_OPTS -jar $executable $ags

bin/swift3-petstore-unwraprequired.sh

@@ -27,6 +27,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="generate -t modules/openapi-generator/src/main/resources/swift3 -i modules/openapi-generator/src/test/resources/2_0/swift/petstore-with-fake-endpoints-models-for-testing.yaml -g swift3 -c ./bin/swift3-petstore-unwraprequired.json -o samples/client/petstore/swift3/unwraprequired $@"
+ags="generate -t modules/openapi-generator/src/main/resources/swift3 -i modules/openapi-generator/src/test/resources/2_0/swift/petstore-with-fake-endpoints-models-for-testing.yaml -g swift3-deprecated -c ./bin/swift3-petstore-unwraprequired.json -o samples/client/petstore/swift3/unwraprequired $@"
 
 java $JAVA_OPTS -jar $executable $ags

bin/swift3-petstore.sh

@@ -27,6 +27,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="generate -t modules/openapi-generator/src/main/resources/swift3 -i modules/openapi-generator/src/test/resources/2_0/swift/petstore-with-fake-endpoints-models-for-testing.yaml -g swift3 -c ./bin/swift3-petstore.json -o samples/client/petstore/swift3/default $@"
+ags="generate -t modules/openapi-generator/src/main/resources/swift3 -i modules/openapi-generator/src/test/resources/2_0/swift/petstore-with-fake-endpoints-models-for-testing.yaml -g swift3-deprecated -c ./bin/swift3-petstore.json -o samples/client/petstore/swift3/default $@"
 
 java $JAVA_OPTS -jar $executable $ags

bin/typescript-angular-petstore-all.sh

@@ -9,3 +9,7 @@
 ./bin/typescript-angular-v6-petstore-not-provided-in-root-with-npm.sh
 ./bin/typescript-angular-v6-petstore-provided-in-root.sh
 ./bin/typescript-angular-v6-petstore-provided-in-root-with-npm.sh
+./bin/typescript-angular-v7-petstore-not-provided-in-root.sh
+./bin/typescript-angular-v7-petstore-not-provided-in-root-with-npm.sh
+./bin/typescript-angular-v7-petstore-provided-in-root.sh
+./bin/typescript-angular-v7-petstore-provided-in-root-with-npm.sh

bin/typescript-angular-v7-petstore-not-provided-in-root-with-npm.json

@@ -0,0 +1,6 @@
+{
+  "npmName": "@swagger/typescript-angular-petstore",
+  "npmVersion": "1.0.0",
+  "npmRepository" : "https://skimdb.npmjs.com/registry",
+  "snapshot" : false
+}

bin/typescript-angular-v7-petstore-not-provided-in-root-with-npm.sh

@@ -0,0 +1,32 @@
+#!/bin/sh
+
+SCRIPT="$0"
+echo "# START SCRIPT: $SCRIPT"
+
+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/openapi-generator-cli/target/openapi-generator-cli.jar"
+
+if [ ! -f "$executable" ]
+then
+  mvn -B 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/openapi-generator/src/test/resources/2_0/petstore.yaml -g typescript-angular -c bin/typescript-angular-v7-petstore-not-provided-in-root-with-npm.json -o samples/client/petstore/typescript-angular-v7-not-provided-in-root/builds/with-npm -D providedInRoot=false --additional-properties ngVersion=7.0.0 $@"
+
+java $JAVA_OPTS -jar $executable $ags

bin/typescript-angular-v7-petstore-not-provided-in-root.sh

@@ -0,0 +1,32 @@
+#!/bin/sh
+
+SCRIPT="$0"
+echo "# START SCRIPT: $SCRIPT"
+
+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/openapi-generator-cli/target/openapi-generator-cli.jar"
+
+if [ ! -f "$executable" ]
+then
+  mvn -B 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/openapi-generator/src/test/resources/2_0/petstore.yaml -g typescript-angular -o samples/client/petstore/typescript-angular-v7-not-provided-in-root/builds/default -D providedInRoot=false --additional-properties ngVersion=7.0.0 $@"
+
+java $JAVA_OPTS -jar $executable $ags

bin/typescript-angular-v7-petstore-provided-in-root-with-npm.json

@@ -0,0 +1,6 @@
+{
+  "npmName": "@swagger/typescript-angular-petstore",
+  "npmVersion": "1.0.0",
+  "npmRepository" : "https://skimdb.npmjs.com/registry",
+  "snapshot" : false
+}

bin/typescript-angular-v7-petstore-provided-in-root-with-npm.sh

@@ -0,0 +1,32 @@
+#!/bin/sh
+
+SCRIPT="$0"
+echo "# START SCRIPT: $SCRIPT"
+
+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/openapi-generator-cli/target/openapi-generator-cli.jar"
+
+if [ ! -f "$executable" ]
+then
+  mvn -B 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/openapi-generator/src/test/resources/2_0/petstore.yaml -g typescript-angular -c bin/typescript-angular-v7-petstore-provided-in-root-with-npm.json -o samples/client/petstore/typescript-angular-v7-provided-in-root/builds/with-npm --additional-properties ngVersion=7.0.0 $@"
+
+java $JAVA_OPTS -jar $executable $ags

bin/typescript-angular-v7-petstore-provided-in-root.sh

@@ -0,0 +1,32 @@
+#!/bin/sh
+
+SCRIPT="$0"
+echo "# START SCRIPT: $SCRIPT"
+
+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/openapi-generator-cli/target/openapi-generator-cli.jar"
+
+if [ ! -f "$executable" ]
+then
+  mvn -B 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/openapi-generator/src/test/resources/2_0/petstore.yaml -g typescript-angular -o samples/client/petstore/typescript-angular-v7-provided-in-root/builds/default --additional-properties ngVersion=7.0.0 $@"
+
+java $JAVA_OPTS -jar $executable $ags

bin/typescript-fetch-petstore-target-es6.sh

@@ -30,3 +30,5 @@ export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/
 ags="generate -i modules/openapi-generator/src/test/resources/2_0/petstore.yaml -g typescript-fetch -c bin/typescript-fetch-petstore-target-es6.json -o samples/client/petstore/typescript-fetch/builds/es6-target $@"
 
 java $JAVA_OPTS -jar $executable $ags
+cp CI/samples.ci/client/petstore/typescript-fetch/builds/es6-target/pom.xml samples/client/petstore/typescript-fetch/builds/es6-target/pom.xml
+cp CI/samples.ci/client/petstore/typescript-fetch/tests/default/pom.xml samples/client/petstore/typescript-fetch/tests/default/pom.xml 

bin/typescript-fetch-petstore-with-npm-version.sh

@@ -30,3 +30,5 @@ export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/
 ags="generate -i modules/openapi-generator/src/test/resources/2_0/petstore.yaml -g typescript-fetch -c bin/typescript-fetch-petstore-with-npm-version.json -o samples/client/petstore/typescript-fetch/builds/with-npm-version $@"
 
 java $JAVA_OPTS -jar $executable $ags
+cp CI/samples.ci/client/petstore/typescript-fetch/builds/with-npm-version/pom.xml samples/client/petstore/typescript-fetch/builds/with-npm-version/pom.xml
+cp CI/samples.ci/client/petstore/typescript-fetch/tests/default/pom.xml samples/client/petstore/typescript-fetch/tests/default/pom.xml 

bin/typescript-fetch-petstore.sh

@@ -30,3 +30,5 @@ export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/
 ags="generate -i modules/openapi-generator/src/test/resources/2_0/petstore.yaml -g typescript-fetch -o samples/client/petstore/typescript-fetch/builds/default $@"
 
 java $JAVA_OPTS -jar $executable $ags
+cp CI/samples.ci/client/petstore/typescript-fetch/builds/default/pom.xml samples/client/petstore/typescript-fetch/builds/default/pom.xml
+cp CI/samples.ci/client/petstore/typescript-fetch/tests/default/pom.xml samples/client/petstore/typescript-fetch/tests/default/pom.xml 

bin/utils/release_checkout.rb

@@ -1,8 +1,26 @@
-#release_chekcout.rb
+#!/usr/bin/env ruby
+#
+# release_chekcout.rb
+#
 require 'rubygems'
 require 'open-uri'
 require 'net/http'
 
+def check_npmjs
+  print "Checking npmjs... "
+
+  url = "https://www.npmjs.com/package/@openapitools/openapi-generator-cli?activeTab=versions"
+  open(url) do |f|
+    content = f.read
+    if !content.nil? && content.include?($version)
+      puts "[OK]"
+    else
+      puts "[ERROR]"
+      puts "> #{url} not yet updated with #{$version}"
+    end
+  end
+end
+
 def check_homebrew
   print "Checking homebrew forumla ... "
 
@@ -184,6 +202,7 @@ $version = ARGV[0]
 
 puts "Running checkout on OpenAPI Generator release #{$version}"
 
+check_npmjs
 check_homebrew
 check_openapi_generator_jar
 check_openapi_generator_cli_jar

bin/windows/cpp-qt5-petstore.bat

@@ -5,6 +5,6 @@ If Not Exist %executable% (
 )
 
 REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M
-set ags=generate -i modules\openapi-generator\src\test\resources\2_0\petstore.yaml -g cpp-qt5 -o samples\client\petstore\cpp-qt5
+set ags=generate -i modules\openapi-generator\src\test\resources\2_0\petstore.yaml -g cpp-qt5-client -o samples\client\petstore\cpp-qt5
 
 java %JAVA_OPTS% -jar %executable% %ags%

bin/windows/dart-client-petstore.bat

@@ -5,8 +5,8 @@ If Not Exist %executable% (
 )
 
 REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M -DloggerPath=conf/log4j.properties
-set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore.yaml -l dart-jaguar -o samples\client\petstore\dart-jaguar\swagger -DhideGenerationTimestamp=true -DbrowserClient=false
+set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore.yaml -g dart-jaguar -o samples\client\petstore\dart-jaguar\swagger -DhideGenerationTimestamp=true -DbrowserClient=false
 java %JAVA_OPTS% -jar %executable% %ags%
 
-set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore.yaml -l dart-jaguar -o samples\client\petstore\dart-jaguar\flutter_petstore\swagger -DhideGenerationTimestamp=true
+set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore.yaml -g dart-jaguar -o samples\client\petstore\dart-jaguar\flutter_petstore\swagger -DhideGenerationTimestamp=true
 java %JAVA_OPTS% -jar %executable% %ags%

bin/windows/graphql-petstore-server.bat

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

bin/windows/graphql-schema-petstore.bat

@@ -0,0 +1,10 @@
+set executable=.\modules\openapi-generator-cli\target\openapi-generator-cli.jar
+
+If Not Exist %executable% (
+  mvn clean package
+)
+
+REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M
+set ags=generate -t modules\openapi-generator\src\main\resources\graphql-schema -i modules\openapi-generator\src\test\resources\2_0\petstore.yaml -g graphql-schema -o samples\config\petstore\graphql-schema
+
+java %JAVA_OPTS% -jar %executable% %ags%

bin/windows/swift3-petstore-promisekit.bat

@@ -5,6 +5,6 @@ If Not Exist %executable% (
 )
 
 REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M
-set ags=generate -i modules\openapi-generator\src\test\resources\2_0\petstore-with-fake-endpoints-models-for-testing.yaml -g swift3 -c bin\swift3-petstore-promisekit.json -o samples\client\petstore\swift3\promisekit
+set ags=generate -i modules\openapi-generator\src\test\resources\2_0\petstore-with-fake-endpoints-models-for-testing.yaml -g swift3-deprecated -c bin\swift3-petstore-promisekit.json -o samples\client\petstore\swift3\promisekit
 
 java %JAVA_OPTS% -jar %executable% %ags%

bin/windows/swift3-petstore-rxswift.bat

@@ -5,6 +5,6 @@ If Not Exist %executable% (
 )
 
 REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M
-set ags=generate -i modules\openapi-generator\src\test\resources\2_0\petstore-with-fake-endpoints-models-for-testing.yaml -g swift3 -c bin\swift3-petstore-rxswift.json -o samples\client\petstore\swift3\rxswift
+set ags=generate -i modules\openapi-generator\src\test\resources\2_0\petstore-with-fake-endpoints-models-for-testing.yaml -g swift3-deprecated -c bin\swift3-petstore-rxswift.json -o samples\client\petstore\swift3\rxswift
 
 java %JAVA_OPTS% -jar %executable% %ags%

bin/windows/swift3-petstore.bat

@@ -5,6 +5,6 @@ If Not Exist %executable% (
 )
 
 REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M
-set ags=generate -i modules\openapi-generator\src\test\resources\2_0\petstore-with-fake-endpoints-models-for-testing.yaml -g swift3 -o samples\client\petstore\swift3\default
+set ags=generate -i modules\openapi-generator\src\test\resources\2_0\petstore-with-fake-endpoints-models-for-testing.yaml -g swift3-deprecated -o samples\client\petstore\swift3\default
 
 java %JAVA_OPTS% -jar %executable% %ags%

bin/windows/typescript-angular-petstore-all.bat

@@ -7,5 +7,8 @@ call .\bin\windows\typescript-angular-v6-provided-in-root.bat
 call .\bin\windows\typescript-angular-v6-provided-in-root-with-npm.bat
 call .\bin\windows\typescript-angular-v6-not-provided-in-root.bat
 call .\bin\windows\typescript-angular-v6-not-provided-in-root-with-npm.bat
-
+call .\bin\windows\typescript-angular-v7-provided-in-root.bat
+call .\bin\windows\typescript-angular-v7-provided-in-root-with-npm.bat
+call .\bin\windows\typescript-angular-v7-not-provided-in-root.bat
+call .\bin\windows\typescript-angular-v7-not-provided-in-root-with-npm.bat
 

bin/windows/typescript-angular-v6-not-provided-in-root-with-npm.bat

@@ -5,6 +5,6 @@ If Not Exist %executable% (
 )
 
 REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M
-set ags=generate -i modules\openapi-generator\src\test\resources\2_0\petstore.yaml -l typescript-angular -c bin\typescript-angular-v6-petstore-not-provided-in-root-with-npm.json -o samples\client\petstore\typescript-angular-v6-not-provided-in-root\builds\with-npm -D providedInRoot=false --additional-properties ngVersion=6.0.0
+set ags=generate -i modules\openapi-generator\src\test\resources\2_0\petstore.yaml -g typescript-angular -c bin\typescript-angular-v6-petstore-not-provided-in-root-with-npm.json -o samples\client\petstore\typescript-angular-v6-not-provided-in-root\builds\with-npm -D providedInRoot=false --additional-properties ngVersion=6.0.0
 
 java %JAVA_OPTS% -jar %executable% %ags%

bin/windows/typescript-angular-v6-not-provided-in-root.bat

@@ -5,6 +5,6 @@ If Not Exist %executable% (
 )
 
 REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M
-set ags=generate -i modules\openapi-generator\src\test\resources\2_0\petstore.yaml -l typescript-angular -o samples\client\petstore\typescript-angular-v6-not-provided-in-root\builds\default -D providedInRoot=false --additional-properties ngVersion=6.0.0
+set ags=generate -i modules\openapi-generator\src\test\resources\2_0\petstore.yaml -g typescript-angular -o samples\client\petstore\typescript-angular-v6-not-provided-in-root\builds\default -D providedInRoot=false --additional-properties ngVersion=6.0.0
 
 java %JAVA_OPTS% -jar %executable% %ags%

bin/windows/typescript-angular-v6-provided-in-root-with-npm.bat

@@ -4,6 +4,6 @@ If Not Exist %executable% (
   mvn clean package
 )
 
-set ags=generate -i modules\openapi-generator\src\test\resources\2_0\petstore.yaml -l typescript-angular -c bin/typescript-angular-v6-petstore-provided-in-root-with-npm.json -o samples\client\petstore\typescript-angular-v6-provided-in-root\builds\with-npm --additional-properties ngVersion=6.0.0
+set ags=generate -i modules\openapi-generator\src\test\resources\2_0\petstore.yaml -g typescript-angular -c bin/typescript-angular-v6-petstore-provided-in-root-with-npm.json -o samples\client\petstore\typescript-angular-v6-provided-in-root\builds\with-npm --additional-properties ngVersion=6.0.0
 
 java %JAVA_OPTS% -jar %executable% %ags%

bin/windows/typescript-angular-v6-provided-in-root.bat

@@ -4,6 +4,6 @@ If Not Exist %executable% (
   mvn clean package
 )
 
-set ags=generate -i modules\openapi-generator\src\test\resources\2_0\petstore.yaml -l typescript-angular -o samples\client\petstore\typescript-angular-v6-provided-in-root\builds\default --additional-properties ngVersion=6.0.0
+set ags=generate -i modules\openapi-generator\src\test\resources\2_0\petstore.yaml -g typescript-angular -o samples\client\petstore\typescript-angular-v6-provided-in-root\builds\default --additional-properties ngVersion=6.0.0
 
 java %JAVA_OPTS% -jar %executable% %ags%

bin/windows/typescript-angular-v7-not-provided-in-root-with-npm.bat

@@ -0,0 +1,10 @@
+set executable=.\modules\openapi-generator-cli\target\openapi-generator-cli.jar
+
+If Not Exist %executable% (
+  mvn clean package
+)
+
+REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M
+set ags=generate -i modules\openapi-generator\src\test\resources\2_0\petstore.yaml -g typescript-angular -c bin\typescript-angular-v7-petstore-not-provided-in-root-with-npm.json -o samples\client\petstore\typescript-angular-v7-not-provided-in-root\builds\with-npm -D providedInRoot=false --additional-properties ngVersion=7.0.0
+
+java %JAVA_OPTS% -jar %executable% %ags%

bin/windows/typescript-angular-v7-not-provided-in-root.bat

@@ -0,0 +1,10 @@
+set executable=.\modules\openapi-generator-cli\target\openapi-generator-cli.jar
+
+If Not Exist %executable% (
+  mvn clean package
+)
+
+REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M
+set ags=generate -i modules\openapi-generator\src\test\resources\2_0\petstore.yaml -g typescript-angular -o samples\client\petstore\typescript-angular-v7-not-provided-in-root\builds\default -D providedInRoot=false --additional-properties ngVersion=7.0.0
+
+java %JAVA_OPTS% -jar %executable% %ags%

bin/windows/typescript-angular-v7-provided-in-root-with-npm.bat

@@ -0,0 +1,9 @@
+set executable=.\modules\openapi-generator-cli\target\openapi-generator-cli.jar
+
+If Not Exist %executable% (
+  mvn clean package
+)
+
+set ags=generate -i modules\openapi-generator\src\test\resources\2_0\petstore.yaml -g typescript-angular -c bin/typescript-angular-v7-petstore-provided-in-root-with-npm.json -o samples\client\petstore\typescript-angular-v7-provided-in-root\builds\with-npm --additional-properties ngVersion=7.0.0
+
+java %JAVA_OPTS% -jar %executable% %ags%

bin/windows/typescript-angular-v7-provided-in-root.bat

@@ -0,0 +1,9 @@
+set executable=.\modules\openapi-generator-cli\target\openapi-generator-cli.jar
+
+If Not Exist %executable% (
+  mvn clean package
+)
+
+set ags=generate -i modules\openapi-generator\src\test\resources\2_0\petstore.yaml -g typescript-angular -o samples\client\petstore\typescript-angular-v7-provided-in-root\builds\default --additional-properties ngVersion=7.0.0
+
+java %JAVA_OPTS% -jar %executable% %ags%

docs/generators/clojure.md

@@ -17,7 +17,7 @@ CONFIG OPTIONS for clojure
 	    name of the project (Default: generated from info.title or "openapi-clj-client")
 
 	projectDescription
-	    description of the project (Default: using info.description or "Client library of <projectNname>")
+	    description of the project (Default: using info.description or "Client library of <projectName>")
 
 	projectVersion
 	    version of the project (Default: using info.version or "1.0.0")

docs/generators/cpp-qt5-qhttpengine-server.md

@@ -16,4 +16,7 @@ CONFIG OPTIONS for cpp-qt5-qhttpengine-server
 	cppNamespace
 	    C++ namespace (convention: name::space::for::api). (Default: OpenAPI)
 
+	cppNamespace
+	    C++ namespace (convention: name::space::for::api). (Default: OpenAPI)
+
 Back to the [generators list](README.md)

docs/generators/csharp.md

@@ -69,4 +69,7 @@ CONFIG OPTIONS for csharp
 	validatable
 	    Generates self-validatable models. (Default: true)
 
+	useCompareNetObjects
+	    Use KellermanSoftware.CompareNetObjects for deep recursive object comparison. WARNING: this option incurs potential performance impact. (Default: false)
+
 Back to the [generators list](README.md)

docs/generators/dart-jaguar.md

@@ -34,4 +34,7 @@ CONFIG OPTIONS for dart-jaguar
 	supportDart2
 	    support dart2 (Default: true)
 
+	nullableFields
+	    Is the null fields should be in the JSON payload
+
 Back to the [generators list](README.md)

docs/generators/elm.md

@@ -9,4 +9,10 @@ CONFIG OPTIONS for elm
 	elmPrefixCustomTypeVariants
 	    Prefix custom type variants (Default: false)
 
+	elmEnableCustomBasePaths
+	    Enable setting the base path for each request (Default: false)
+
+	elmEnableHttpRequestTrackers
+	    Enable adding a tracker to each http request (Default: false)
+
 Back to the [generators list](README.md)

docs/generators/java.md

@@ -146,6 +146,9 @@ CONFIG OPTIONS for java
 	feignVersion
 	    Version of OpenFeign: '10.x', '9.x' (default) (Default: false)
 
+	useReflectionEqualsHashCode
+	    Use org.apache.commons.lang3.builder for equals and hashCode in the models. WARNING: This will fail under a security manager, unless the appropriate permissions are set up correctly and also there's potential performance impact. (Default: false)
+
 	library
 	    library template (sub-template) to use (Default: okhttp-gson)
 	        jersey1 - HTTP client: Jersey client 1.19.4. JSON processing: Jackson 2.8.9. Enable Java6 support using '-DsupportJava6=true'. Enable gzip request encoding using '-DuseGzipFeature=true'.

docs/generators/php-slim.md

@@ -40,7 +40,4 @@ CONFIG OPTIONS for php-slim
 	artifactVersion
 	    The version to use in the composer package version field. e.g. 1.2.3
 
-	phpcsStandard
-	    PHP CodeSniffer <standard> option. Accepts name or path of the coding standard to use. (Default: PSR12)
-
 Back to the [generators list](README.md)

docs/migration-guide.adoc

@@ -11,6 +11,17 @@ Another approach to find breaking changes is to look at issue and pull requests
 * link:https://github.com/OpenAPITools/openapi-generator/labels/Breaking%20change%20%28with%20fallback%29[Breaking change (with fallback)]
 * link:https://github.com/OpenAPITools/openapi-generator/labels/Breaking%20change%20%28without%20fallback%29[Breaking change (without fallback)]
 
+=== From 3.x to 4.0.0
+
+Version `4.0.0` is a major release, which contains some breaking changes without fallback.
+
+==== The `-l` (`--lang`) option has been deleted
+
+The option is replaced with `-g` (`--generator-name`).
+
+* `-g` allows the same values as `-l`
+* See `langs` command for the list of generator name
+
 === From 3.1.x to 3.2.0
 
 Version `3.2.0` is a minor version of OpenAPI-Generator, in comparison to `3.1.x` it contains some breaking changes, but with the possibility to fallback to the old behavior.

modules/openapi-generator-cli/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.openapitools</groupId>
         <artifactId>openapi-generator-project</artifactId>
-        <version>3.3.4</version>
+        <version>4.0.0-beta</version>
         <relativePath>../..</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

modules/openapi-generator-cli/src/main/java/org/openapitools/codegen/OpenAPIGenerator.java

@@ -72,7 +72,7 @@ public class OpenAPIGenerator {
                 System.exit(1);
             }
         } catch (ParseArgumentsUnexpectedException e) {
-            System.err.printf(Locale.ROOT,"[error] %s%n%nSee 'openapi-generator-cli help' for usage.%n", e.getMessage());
+            System.err.printf(Locale.ROOT,"[error] %s%n%nSee 'openapi-generator help' for usage.%n", e.getMessage());
             System.exit(1);
         } catch (ParseOptionMissingException | ParseOptionMissingValueException e) {
             System.err.printf(Locale.ROOT,"[error] %s%n", e.getMessage());

modules/openapi-generator-cli/src/main/java/org/openapitools/codegen/cmd/ConfigHelp.java

@@ -37,10 +37,6 @@ public class ConfigHelp implements Runnable {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(Generate.class);
 
-    @Option(name = {"-l", "--lang"}, title = "language",
-            description = "language to get config help for")
-    private String lang;
-
     @Option(name = {"-g", "--generator-name"}, title = "generator name",
             description = "generator to get config help for")
     private String generatorName;
@@ -57,16 +53,9 @@ public class ConfigHelp implements Runnable {
 
     @Override
     public void run() {
-
-        // TODO: After 3.0.0 release (maybe for 3.1.0): Fully deprecate lang.
         if (isEmpty(generatorName)) {
-            if (isNotEmpty(lang)) {
-                LOGGER.warn("The '--lang' and '-l' are deprecated and may reference language names only in the next major release (4.0). Please use --generator-name /-g instead.");
-                generatorName = lang;
-            } else {
-                System.err.println("[error] A generator name (--generator-name / -g) is required.");
-                System.exit(1);
-            }
+            System.err.println("[error] A generator name (--generator-name / -g) is required.");
+            System.exit(1);
         }
 
         try {

modules/openapi-generator-cli/src/main/java/org/openapitools/codegen/cmd/Generate.java

@@ -49,10 +49,6 @@ public class Generate implements Runnable {
     @Option(name = {"-v", "--verbose"}, description = "verbose mode")
     private Boolean verbose;
 
-    @Option(name = {"-l", "--lang"}, title = "language",
-            description = "client language to generate (maybe class name in classpath, required)")
-    private String lang;
-
     @Option(name = {"-g", "--generator-name"}, title = "generator name",
             description = "generator to use (see langs command for list)")
     private String generatorName;
@@ -212,6 +208,9 @@ public class Generate implements Runnable {
     @Option(name = {"--enable-post-process-file"}, title = "enable post-process file", description = CodegenConstants.ENABLE_POST_PROCESS_FILE)
     private Boolean enablePostProcessFile;
 
+    @Option(name = {"--generate-alias-as-model"}, title = "generate alias (array, map) as model", description = CodegenConstants.GENERATE_ALIAS_AS_MODEL_DESC)
+    private Boolean generateAliasAsModel;
+
     @Override
     public void run() {
         if (logToStderr != null) {
@@ -255,12 +254,8 @@ public class Generate implements Runnable {
             configurator.setInputSpec(spec);
         }
 
-        // TODO: After 3.0.0 release (maybe for 3.1.0): Fully deprecate lang.
         if (isNotEmpty(generatorName)) {
             configurator.setGeneratorName(generatorName);
-        } else if (isNotEmpty(lang)) {
-            LOGGER.warn("The '--lang' and '-l' are deprecated and may reference language names only in the next major release (4.0). Please use --generator-name /-g instead.");
-            configurator.setGeneratorName(lang);
         } else {
             System.err.println("[error] A generator name (--generator-name / -g) is required.");
             System.exit(1);
@@ -342,6 +337,10 @@ public class Generate implements Runnable {
             configurator.setEnablePostProcessFile(enablePostProcessFile);
         }
 
+        if (generateAliasAsModel != null) {
+            configurator.setGenerateAliasAsModel(generateAliasAsModel);
+        }
+
         applySystemPropertiesKvpList(systemProperties, configurator);
         applyInstantiationTypesKvpList(instantiationTypes, configurator);
         applyImportMappingsKvpList(importMappings, configurator);

modules/openapi-generator-gradle-plugin/bin/main/org/openapitools/generator/gradle/plugin/OpenApiGeneratorPlugin.kt

@@ -0,0 +1,131 @@
+/*
+ * Copyright 2018 OpenAPI-Generator Contributors (https://openapi-generator.tech)
+ *
+ * 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 org.openapitools.generator.gradle.plugin
+
+import org.gradle.api.Plugin
+import org.gradle.api.Project
+import org.gradle.kotlin.dsl.invoke
+import org.openapitools.generator.gradle.plugin.extensions.OpenApiGeneratorGenerateExtension
+import org.openapitools.generator.gradle.plugin.extensions.OpenApiGeneratorMetaExtension
+import org.openapitools.generator.gradle.plugin.extensions.OpenApiGeneratorValidateExtension
+import org.openapitools.generator.gradle.plugin.tasks.GenerateTask
+import org.openapitools.generator.gradle.plugin.tasks.GeneratorsTask
+import org.openapitools.generator.gradle.plugin.tasks.MetaTask
+import org.openapitools.generator.gradle.plugin.tasks.ValidateTask
+
+/**
+ * A plugin providing common Open API Generator use cases.
+ *
+ * @author Jim Schubert
+ */
+@Suppress("unused")
+class OpenApiGeneratorPlugin : Plugin<Project> {
+    override fun apply(project: Project) {
+        project.run {
+            val meta = extensions.create(
+                    "openApiMeta",
+                    OpenApiGeneratorMetaExtension::class.java,
+                    project
+            )
+
+            val validate = extensions.create(
+                    "openApiValidate",
+                    OpenApiGeneratorValidateExtension::class.java,
+                    project
+            )
+
+            val generate = extensions.create(
+                    "openApiGenerate",
+                    OpenApiGeneratorGenerateExtension::class.java,
+                    project
+            )
+
+            generate.outputDir.set("$buildDir/generate-resources/main")
+
+            tasks {
+                "openApiGenerators"(GeneratorsTask::class) {
+                    group = pluginGroup
+                    description = "Lists generators available via Open API Generators."
+                }
+                "openApiMeta"(MetaTask::class) {
+                    group = pluginGroup
+                    description = "Generates a new generator to be consumed via Open API Generator."
+
+                    generatorName.set(meta.generatorName)
+                    packageName.set(meta.packageName)
+                    outputFolder.set(meta.outputFolder)
+                }
+                "openApiValidate"(ValidateTask::class) {
+                    group = pluginGroup
+                    description = "Validates an Open API 2.0 or 3.x specification document."
+
+                    inputSpec.set(validate.inputSpec)
+                }
+                "openApiGenerate"(GenerateTask::class) {
+                    group = pluginGroup
+                    description = "Generate code via Open API Tools Generator for Open API 2.0 or 3.x specification documents."
+
+                    verbose.set(generate.verbose)
+                    validateSpec.set(generate.validateSpec)
+                    generatorName.set(generate.generatorName)
+                    outputDir.set(generate.outputDir)
+                    inputSpec.set(generate.inputSpec)
+                    templateDir.set(generate.templateDir)
+                    auth.set(generate.auth)
+                    systemProperties.set(generate.systemProperties)
+                    configFile.set(generate.configFile)
+                    skipOverwrite.set(generate.skipOverwrite)
+                    apiPackage.set(generate.apiPackage)
+                    modelPackage.set(generate.modelPackage)
+                    modelNamePrefix.set(generate.modelNamePrefix)
+                    modelNameSuffix.set(generate.modelNameSuffix)
+                    instantiationTypes.set(generate.instantiationTypes)
+                    typeMappings.set(generate.typeMappings)
+                    additionalProperties.set(generate.additionalProperties)
+                    languageSpecificPrimitives.set(generate.languageSpecificPrimitives)
+                    importMappings.set(generate.importMappings)
+                    invokerPackage.set(generate.invokerPackage)
+                    groupId.set(generate.groupId)
+                    id.set(generate.id)
+                    version.set(generate.version)
+                    library.set(generate.library)
+                    gitUserId.set(generate.gitUserId)
+                    gitRepoId.set(generate.gitRepoId)
+                    releaseNote.set(generate.releaseNote)
+                    httpUserAgent.set(generate.httpUserAgent)
+                    reservedWordsMappings.set(generate.reservedWordsMappings)
+                    ignoreFileOverride.set(generate.ignoreFileOverride)
+                    removeOperationIdPrefix.set(generate.removeOperationIdPrefix)
+                    apiFilesConstrainedTo.set(generate.apiFilesConstrainedTo)
+                    modelFilesConstrainedTo.set(generate.modelFilesConstrainedTo)
+                    supportingFilesConstrainedTo.set(generate.supportingFilesConstrainedTo)
+                    generateModelTests.set(generate.generateModelTests)
+                    generateModelDocumentation.set(generate.generateModelDocumentation)
+                    generateApiTests.set(generate.generateApiTests)
+                    generateApiDocumentation.set(generate.generateApiDocumentation)
+                    withXml.set(generate.withXml)
+                    configOptions.set(generate.configOptions)
+                }
+            }
+        }
+    }
+
+    companion object {
+        const val pluginGroup = "OpenAPI Tools"
+    }
+}
+

modules/openapi-generator-gradle-plugin/bin/main/org/openapitools/generator/gradle/plugin/extensions/OpenApiGeneratorGenerateExtension.kt

@@ -0,0 +1,286 @@
+/*
+ * Copyright 2018 OpenAPI-Generator Contributors (https://openapi-generator.tech)
+ *
+ * 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 org.openapitools.generator.gradle.plugin.extensions
+
+import org.gradle.api.Project
+import org.gradle.kotlin.dsl.listProperty
+import org.gradle.kotlin.dsl.property
+
+/**
+ * Gradle project level extension object definition for the generate task
+ *
+ * @author Jim Schubert
+ */
+open class OpenApiGeneratorGenerateExtension(project: Project) {
+
+    /**
+     * The verbosity of generation
+     */
+    val verbose = project.objects.property<Boolean>()
+
+    /**
+     * Whether or not an input specification should be validated upon generation.
+     */
+    val validateSpec = project.objects.property<Boolean>()
+
+    /**
+     * The name of the generator which will handle codegen. (see "openApiGenerators" task)
+     */
+    val generatorName = project.objects.property<String>()
+
+    /**
+     * The output target directory into which code will be generated.
+     */
+    val outputDir = project.objects.property<String>()
+
+    /**
+     * The Open API 2.0/3.x specification location.
+     */
+    val inputSpec = project.objects.property<String>()
+
+    /**
+     * The template directory holding a custom template.
+     */
+    val templateDir = project.objects.property<String?>()
+
+    /**
+     * Adds authorization headers when fetching the OpenAPI definitions remotely.
+     * Pass in a URL-encoded string of name:header with a comma separating multiple values
+     */
+    val auth = project.objects.property<String>()
+
+    /**
+     * Sets specified system properties.
+     */
+    val systemProperties = project.objects.property<Map<String, String>>()
+
+    /**
+     * 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 -g {generator name} command for language specific config options.
+     */
+    val configFile = project.objects.property<String>()
+
+    /**
+     * Specifies if the existing files should be overwritten during the generation.
+     */
+    val skipOverwrite = project.objects.property<Boolean?>()
+
+    /**
+     * Package for generated api classes
+     */
+    val apiPackage = project.objects.property<String>()
+
+    /**
+     * Package for generated models
+     */
+    val modelPackage = project.objects.property<String>()
+
+    /**
+     * Prefix that will be prepended to all model names. Default is the empty string.
+     */
+    val modelNamePrefix = project.objects.property<String>()
+
+    /**
+     * Suffix that will be appended to all model names. Default is the empty string.
+     */
+    val modelNameSuffix = project.objects.property<String>()
+
+    /**
+     * Sets instantiation type mappings.
+     */
+    val instantiationTypes = project.objects.property<Map<String, String>>()
+
+    /**
+     * Sets mappings between OpenAPI spec types and generated code types.
+     */
+    val typeMappings = project.objects.property<Map<String, String>>()
+
+    /**
+     * Sets additional properties that can be referenced by the mustache templates.
+     */
+    val additionalProperties = project.objects.property<Map<String, String>>()
+
+    /**
+     * Specifies additional language specific primitive types in the format of type1,type2,type3,type3. For example: String,boolean,Boolean,Double.
+     */
+    val languageSpecificPrimitives = project.objects.listProperty<String>()
+
+    /**
+     * Specifies mappings between a given class and the import that should be used for that class.
+     */
+    val importMappings = project.objects.property<Map<String, String>>()
+
+    /**
+     * Root package for generated code.
+     */
+    val invokerPackage = project.objects.property<String>()
+
+    /**
+     * GroupId in generated pom.xml/build.gradle or other build script. Language-specific conversions occur in non-jvm generators.
+     */
+    val groupId = project.objects.property<String>()
+
+    /**
+     * ArtifactId in generated pom.xml/build.gradle or other build script. Language-specific conversions occur in non-jvm generators.
+     */
+    val id = project.objects.property<String>()
+
+    /**
+     * Artifact version in generated pom.xml/build.gradle or other build script. Language-specific conversions occur in non-jvm generators.
+     */
+    val version = project.objects.property<String>()
+
+    /**
+     * Reference the library template (sub-template) of a generator.
+     */
+    val library = project.objects.property<String?>()
+
+    /**
+     * Git user ID, e.g. openapitools.
+     */
+    val gitUserId = project.objects.property<String?>()
+
+    /**
+     * Git repo ID, e.g. openapi-generator.
+     */
+    val gitRepoId = project.objects.property<String?>()
+
+    /**
+     * Release note, default to 'Minor update'.
+     */
+    val releaseNote = project.objects.property<String?>()
+
+    /**
+     * HTTP user agent, e.g. codegen_csharp_api_client, default to 'OpenAPI-Generator/{packageVersion}}/{language}'
+     */
+    val httpUserAgent = project.objects.property<String?>()
+
+    /**
+     * Specifies how a reserved name should be escaped to. Otherwise, the default _<name> is used.
+     */
+    val reservedWordsMappings = project.objects.property<Map<String, String>>()
+
+    /**
+     * Specifies an override location for the .openapi-generator-ignore file. Most useful on initial generation.
+     */
+    val ignoreFileOverride = project.objects.property<String?>()
+
+    /**
+     * Remove prefix of operationId, e.g. config_getId => getId
+     */
+    val removeOperationIdPrefix = project.objects.property<Boolean?>()
+
+    /**
+     * Defines which API-related files should be generated. This allows you to create a subset of generated files (or none at all).
+     *
+     * NOTE: Configuring any one of [apiFilesConstrainedTo], [modelFilesConstrainedTo], or [supportingFilesConstrainedTo] results
+     *   in others being disabled. That is, OpenAPI Generator considers any one of these to define a subset of generation.
+     *   For more control over generation of individual files, configure an ignore file and refer to it via [ignoreFileOverride].
+     */
+    val apiFilesConstrainedTo = project.objects.listProperty<String>()
+
+    /**
+     * Defines which model-related files should be generated. This allows you to create a subset of generated files (or none at all).
+     *
+     * NOTE: Configuring any one of [apiFilesConstrainedTo], [modelFilesConstrainedTo], or [supportingFilesConstrainedTo] results
+     *   in others being disabled. That is, OpenAPI Generator considers any one of these to define a subset of generation.
+     *   For more control over generation of individual files, configure an ignore file and refer to it via [ignoreFileOverride].
+     */
+    val modelFilesConstrainedTo = project.objects.listProperty<String>()
+
+    /**
+     * Defines which supporting files should be generated. This allows you to create a subset of generated files (or none at all).
+     *
+     * Supporting files are those related to projects/frameworks which may be modified
+     * by consumers.
+     *
+     * NOTE: Configuring any one of [apiFilesConstrainedTo], [modelFilesConstrainedTo], or [supportingFilesConstrainedTo] results
+     *   in others being disabled. That is, OpenAPI Generator considers any one of these to define a subset of generation.
+     *   For more control over generation of individual files, configure an ignore file and refer to it via [ignoreFileOverride].
+     */
+    val supportingFilesConstrainedTo = project.objects.listProperty<String>()
+
+    /**
+     * Defines whether or not model-related _test_ files should be generated.
+     *
+     * This option enables/disables generation of ALL model-related _test_ files.
+     *
+     * For more control over generation of individual files, configure an ignore file and
+     * refer to it via [ignoreFileOverride].
+     */
+    val generateModelTests = project.objects.property<Boolean>()
+
+    /**
+     * Defines whether or not model-related _documentation_ files should be generated.
+     *
+     * This option enables/disables generation of ALL model-related _documentation_ files.
+     *
+     * For more control over generation of individual files, configure an ignore file and
+     * refer to it via [ignoreFileOverride].
+     */
+    val generateModelDocumentation = project.objects.property<Boolean>()
+
+    /**
+     * Defines whether or not api-related _test_ files should be generated.
+     *
+     * This option enables/disables generation of ALL api-related _test_ files.
+     *
+     * For more control over generation of individual files, configure an ignore file and
+     * refer to it via [ignoreFileOverride].
+     */
+    val generateApiTests = project.objects.property<Boolean>()
+
+    /**
+     * Defines whether or not api-related _documentation_ files should be generated.
+     *
+     * This option enables/disables generation of ALL api-related _documentation_ files.
+     *
+     * For more control over generation of individual files, configure an ignore file and
+     * refer to it via [ignoreFileOverride].
+     */
+    val generateApiDocumentation = project.objects.property<Boolean>()
+
+    /**
+     * A special-case setting which configures some generators with XML support. In some cases,
+     * this forces json OR xml, so the default here is false.
+     */
+    val withXml = project.objects.property<Boolean>()
+
+    /**
+     * A map of options specific to a generator.
+     */
+    val configOptions = project.objects.property<Map<String, String>>()
+
+    init {
+        applyDefaults()
+    }
+
+    @Suppress("MemberVisibilityCanBePrivate")
+    fun applyDefaults(){
+        releaseNote.set("Minor update")
+        modelNamePrefix.set("")
+        modelNameSuffix.set("")
+        generateModelTests.set(true)
+        generateModelDocumentation.set(true)
+        generateApiTests.set(true)
+        generateApiDocumentation.set(true)
+        withXml.set(false)
+        configOptions.set(mapOf())
+        validateSpec.set(true)
+    }
+}

modules/openapi-generator-gradle-plugin/bin/main/org/openapitools/generator/gradle/plugin/extensions/OpenApiGeneratorMetaExtension.kt

@@ -0,0 +1,48 @@
+/*
+ * Copyright 2018 OpenAPI-Generator Contributors (https://openapi-generator.tech)
+ *
+ * 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 org.openapitools.generator.gradle.plugin.extensions
+
+import org.gradle.api.Project
+import org.gradle.kotlin.dsl.property
+
+/**
+ * Gradle project level extension object definition for the meta-generator task
+ *
+ * @author Jim Schubert
+ */
+open class OpenApiGeneratorMetaExtension(project: Project) {
+    /**
+     * The human-readable generator name of the newly created template generator.
+     */
+    val generatorName = project.objects.property<String>()
+
+    /**
+     * The packageName generatorName to put the main class into (defaults to org.openapitools.codegen)
+     */
+    val packageName = project.objects.property<String>()
+
+    /**
+     * Where to write the generated files (current dir by default).
+     */
+    val outputFolder = project.objects.property<String>()
+
+    init {
+        generatorName.set("default")
+        packageName.set("org.openapitools.codegen")
+        outputFolder.set("")
+    }
+}

modules/openapi-generator-gradle-plugin/bin/main/org/openapitools/generator/gradle/plugin/extensions/OpenApiGeneratorValidateExtension.kt

@@ -0,0 +1,32 @@
+/*
+ * Copyright 2018 OpenAPI-Generator Contributors (https://openapi-generator.tech)
+ *
+ * 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 org.openapitools.generator.gradle.plugin.extensions
+
+import org.gradle.api.Project
+import org.gradle.kotlin.dsl.property
+
+/**
+ * Gradle project level extension object definition for the generators task
+ *
+ * @author Jim Schubert
+ */
+open class OpenApiGeneratorValidateExtension(project: Project) {
+    /**
+     * The input specification to validate. Supports all formats supported by the Parser.
+     */
+    val inputSpec = project.objects.property<String>()
+}

modules/openapi-generator-gradle-plugin/bin/main/org/openapitools/generator/gradle/plugin/tasks/GenerateTask.kt

@@ -0,0 +1,549 @@
+/*
+ * Copyright 2018 OpenAPI-Generator Contributors (https://openapi-generator.tech)
+ *
+ * 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 org.openapitools.generator.gradle.plugin.tasks
+
+import org.gradle.api.DefaultTask
+import org.gradle.api.GradleException
+import org.gradle.api.provider.Property
+import org.gradle.api.tasks.Internal
+import org.gradle.api.tasks.TaskAction
+import org.gradle.internal.logging.text.StyledTextOutput
+import org.gradle.internal.logging.text.StyledTextOutputFactory
+import org.gradle.kotlin.dsl.listProperty
+import org.gradle.kotlin.dsl.property
+import org.openapitools.codegen.CodegenConstants
+import org.openapitools.codegen.DefaultGenerator
+import org.openapitools.codegen.config.CodegenConfigurator
+import org.openapitools.codegen.config.GeneratorProperties
+
+
+/**
+ * A task which generates the desired code.
+ *
+ * Example (CLI):
+ *
+ * ./gradlew -q openApiGenerate
+ *
+ * @author Jim Schubert
+ */
+open class GenerateTask : DefaultTask() {
+
+    /**
+     * The verbosity of generation
+     */
+    @get:Internal
+    val verbose = project.objects.property<Boolean>()
+
+    /**
+     * Whether or not an input specification should be validated upon generation.
+     */
+    @get:Internal
+    val validateSpec = project.objects.property<Boolean>()
+
+    /**
+     * The name of the generator which will handle codegen. (see "openApiGenerators" task)
+     */
+    @get:Internal
+    val generatorName = project.objects.property<String>()
+
+    /**
+     * The output target directory into which code will be generated.
+     */
+    @get:Internal
+    val outputDir = project.objects.property<String>()
+
+    /**
+     * The Open API 2.0/3.x specification location.
+     */
+    @get:Internal
+    val inputSpec = project.objects.property<String>()
+
+    /**
+     * The template directory holding a custom template.
+     */
+    @get:Internal
+    val templateDir = project.objects.property<String?>()
+
+    /**
+     * Adds authorization headers when fetching the OpenAPI definitions remotely.
+     * Pass in a URL-encoded string of name:header with a comma separating multiple values
+     */
+    @get:Internal
+    val auth = project.objects.property<String>()
+
+    /**
+     * Sets specified system properties.
+     */
+    @get:Internal
+    val systemProperties = project.objects.property<Map<String, String>>()
+
+    /**
+     * 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 -g {generator name} command for language specific config options.
+     */
+    @get:Internal
+    val configFile = project.objects.property<String>()
+
+    /**
+     * Specifies if the existing files should be overwritten during the generation.
+     */
+    @get:Internal
+    val skipOverwrite = project.objects.property<Boolean?>()
+
+    /**
+     * Package for generated api classes
+     */
+    @get:Internal
+    val apiPackage = project.objects.property<String>()
+
+    /**
+     * Package for generated models
+     */
+    @get:Internal
+    val modelPackage = project.objects.property<String>()
+
+    /**
+     * Prefix that will be prepended to all model names. Default is the empty string.
+     */
+    @get:Internal
+    val modelNamePrefix = project.objects.property<String>()
+
+    /**
+     * Suffix that will be appended to all model names. Default is the empty string.
+     */
+    @get:Internal
+    val modelNameSuffix = project.objects.property<String>()
+
+    /**
+     * Sets instantiation type mappings.
+     */
+    @get:Internal
+    val instantiationTypes = project.objects.property<Map<String, String>>()
+
+    /**
+     * Sets mappings between OpenAPI spec types and generated code types.
+     */
+    @get:Internal
+    val typeMappings = project.objects.property<Map<String, String>>()
+
+    /**
+     * Sets additional properties that can be referenced by the mustache templates in the format of name=value,name=value.
+     * You can also have multiple occurrences of this option.
+     */
+    @get:Internal
+    val additionalProperties = project.objects.property<Map<String, String>>()
+
+    /**
+     * Specifies additional language specific primitive types in the format of type1,type2,type3,type3. For example: String,boolean,Boolean,Double.
+     */
+    @get:Internal
+    val languageSpecificPrimitives = project.objects.listProperty<String>()
+
+    /**
+     * Specifies mappings between a given class and the import that should be used for that class.
+     */
+    @get:Internal
+    val importMappings = project.objects.property<Map<String, String>>()
+
+    /**
+     * Root package for generated code.
+     */
+    @get:Internal
+    val invokerPackage = project.objects.property<String>()
+
+    /**
+     * GroupId in generated pom.xml/build.gradle or other build script. Language-specific conversions occur in non-jvm generators.
+     */
+    @get:Internal
+    val groupId = project.objects.property<String>()
+
+    /**
+     * ArtifactId in generated pom.xml/build.gradle or other build script. Language-specific conversions occur in non-jvm generators.
+     */
+    @get:Internal
+    val id = project.objects.property<String>()
+
+    /**
+     * Artifact version in generated pom.xml/build.gradle or other build script. Language-specific conversions occur in non-jvm generators.
+     */
+    @get:Internal
+    val version = project.objects.property<String>()
+
+    /**
+     * Reference the library template (sub-template) of a generator.
+     */
+    @get:Internal
+    val library = project.objects.property<String?>()
+
+    /**
+     * Git user ID, e.g. openapitools.
+     */
+    @get:Internal
+    val gitUserId = project.objects.property<String?>()
+
+    /**
+     * Git repo ID, e.g. openapi-generator.
+     */
+    @get:Internal
+    val gitRepoId = project.objects.property<String?>()
+
+    /**
+     * Release note, default to 'Minor update'.
+     */
+    @get:Internal
+    val releaseNote = project.objects.property<String?>()
+
+    /**
+     * HTTP user agent, e.g. codegen_csharp_api_client, default to 'OpenAPI-Generator/{packageVersion}}/{language}'
+     */
+    @get:Internal
+    val httpUserAgent = project.objects.property<String?>()
+
+    /**
+     * Specifies how a reserved name should be escaped to.
+     */
+    @get:Internal
+    val reservedWordsMappings = project.objects.property<Map<String, String>>()
+
+    /**
+     * Specifies an override location for the .openapi-generator-ignore file. Most useful on initial generation.
+     */
+    @get:Internal
+    val ignoreFileOverride = project.objects.property<String?>()
+
+    /**
+     * Remove prefix of operationId, e.g. config_getId => getId
+     */
+    @get:Internal
+    val removeOperationIdPrefix = project.objects.property<Boolean?>()
+
+    /**
+     * Defines which API-related files should be generated. This allows you to create a subset of generated files (or none at all).
+     *
+     * This option enables/disables generation of ALL api-related files.
+     *
+     * NOTE: Configuring any one of [apiFilesConstrainedTo], [modelFilesConstrainedTo], or [supportingFilesConstrainedTo] results
+     *   in others being disabled. That is, OpenAPI Generator considers any one of these to define a subset of generation.
+     *   For more control over generation of individual files, configure an ignore file and refer to it via [ignoreFileOverride].
+     */
+    @get:Internal
+    val apiFilesConstrainedTo = project.objects.listProperty<String>()
+
+    /**
+     * Defines which model-related files should be generated. This allows you to create a subset of generated files (or none at all).
+     *
+     * NOTE: Configuring any one of [apiFilesConstrainedTo], [modelFilesConstrainedTo], or [supportingFilesConstrainedTo] results
+     *   in others being disabled. That is, OpenAPI Generator considers any one of these to define a subset of generation.
+     *   For more control over generation of individual files, configure an ignore file and refer to it via [ignoreFileOverride].
+     */
+    @get:Internal
+    val modelFilesConstrainedTo = project.objects.listProperty<String>()
+
+    /**
+     * Defines which supporting files should be generated. This allows you to create a subset of generated files (or none at all).
+     *
+     * Supporting files are those related to projects/frameworks which may be modified
+     * by consumers.
+     *
+     * NOTE: Configuring any one of [apiFilesConstrainedTo], [modelFilesConstrainedTo], or [supportingFilesConstrainedTo] results
+     *   in others being disabled. That is, OpenAPI Generator considers any one of these to define a subset of generation.
+     *   For more control over generation of individual files, configure an ignore file and refer to it via [ignoreFileOverride].
+     */
+    @get:Internal
+    val supportingFilesConstrainedTo = project.objects.listProperty<String>()
+
+    /**
+     * Defines whether or not model-related _test_ files should be generated.
+     *
+     * This option enables/disables generation of ALL model-related _test_ files.
+     *
+     * For more control over generation of individual files, configure an ignore file and
+     * refer to it via [ignoreFileOverride].
+     */
+    @get:Internal
+    val generateModelTests = project.objects.property<Boolean>()
+
+    /**
+     * Defines whether or not model-related _documentation_ files should be generated.
+     *
+     * This option enables/disables generation of ALL model-related _documentation_ files.
+     *
+     * For more control over generation of individual files, configure an ignore file and
+     * refer to it via [ignoreFileOverride].
+     */
+    @get:Internal
+    val generateModelDocumentation = project.objects.property<Boolean>()
+
+    /**
+     * Defines whether or not api-related _test_ files should be generated.
+     *
+     * This option enables/disables generation of ALL api-related _test_ files.
+     *
+     * For more control over generation of individual files, configure an ignore file and
+     * refer to it via [ignoreFileOverride].
+     */
+    @get:Internal
+    val generateApiTests = project.objects.property<Boolean>()
+
+    /**
+     * Defines whether or not api-related _documentation_ files should be generated.
+     *
+     * This option enables/disables generation of ALL api-related _documentation_ files.
+     *
+     * For more control over generation of individual files, configure an ignore file and
+     * refer to it via [ignoreFileOverride].
+     */
+    @get:Internal
+    val generateApiDocumentation = project.objects.property<Boolean>()
+
+    /**
+     * A special-case setting which configures some generators with XML support. In some cases,
+     * this forces json OR xml, so the default here is false.
+     */
+    @get:Internal
+    val withXml = project.objects.property<Boolean>()
+
+    /**
+     * A dynamic map of options specific to a generator.
+     */
+    @get:Internal
+    val configOptions = project.objects.property<Map<String, String>>()
+
+    private val originalEnvironmentVariables = mutableMapOf<String, String?>()
+
+    private fun <T : Any?> Property<T>.ifNotEmpty(block: Property<T>.(T) -> Unit) {
+        if (isPresent) {
+            val item: T? = get()
+            if (item != null) {
+                when (get()) {
+                    is String -> if ((get() as String).isNotEmpty()) {
+                        block(get())
+                    }
+                    is String? -> if (true == (get() as String?)?.isNotEmpty()) {
+                        block(get())
+                    }
+                    else -> block(get())
+                }
+            }
+        }
+    }
+
+    @Suppress("unused")
+    @TaskAction
+    fun doWork() {
+        val configurator: CodegenConfigurator = if (configFile.isPresent) {
+            CodegenConfigurator.fromFile(configFile.get())
+        } else CodegenConfigurator()
+
+        try {
+            if (systemProperties.isPresent) {
+                systemProperties.get().forEach { (key, value) ->
+                    // GeneratorProperties.setProperty returns the original value for a key, or null.
+                    // Cache the original value or null…we will late put the properties back in their original state.
+                    originalEnvironmentVariables[key] = GeneratorProperties.setProperty(key, value)
+                    configurator.addSystemProperty(key, value)
+                }
+            }
+
+            if (supportingFilesConstrainedTo.isPresent && supportingFilesConstrainedTo.get().isNotEmpty()) {
+                GeneratorProperties.setProperty(CodegenConstants.SUPPORTING_FILES, supportingFilesConstrainedTo.get().joinToString(","))
+            } else {
+                GeneratorProperties.clearProperty(CodegenConstants.SUPPORTING_FILES)
+            }
+
+            if (modelFilesConstrainedTo.isPresent && modelFilesConstrainedTo.get().isNotEmpty()) {
+                GeneratorProperties.setProperty(CodegenConstants.MODELS, modelFilesConstrainedTo.get().joinToString(","))
+            } else {
+                GeneratorProperties.clearProperty(CodegenConstants.MODELS)
+            }
+
+            if (apiFilesConstrainedTo.isPresent && apiFilesConstrainedTo.get().isNotEmpty()) {
+                GeneratorProperties.setProperty(CodegenConstants.APIS, apiFilesConstrainedTo.get().joinToString(","))
+            } else {
+                GeneratorProperties.clearProperty(CodegenConstants.APIS)
+            }
+
+            GeneratorProperties.setProperty(CodegenConstants.API_DOCS, generateApiDocumentation.get().toString())
+            GeneratorProperties.setProperty(CodegenConstants.MODEL_DOCS, generateModelDocumentation.get().toString())
+            GeneratorProperties.setProperty(CodegenConstants.MODEL_TESTS, generateModelTests.get().toString())
+            GeneratorProperties.setProperty(CodegenConstants.API_TESTS, generateApiTests.get().toString())
+            GeneratorProperties.setProperty(CodegenConstants.WITH_XML, withXml.get().toString())
+
+            // now override with any specified parameters
+            verbose.ifNotEmpty { value ->
+                configurator.isVerbose = value
+            }
+
+            validateSpec.ifNotEmpty { value ->
+                configurator.isValidateSpec = value
+            }
+
+            skipOverwrite.ifNotEmpty { value ->
+                configurator.isSkipOverwrite = value ?: false
+            }
+
+            inputSpec.ifNotEmpty { value ->
+                configurator.inputSpec = value
+            }
+
+            generatorName.ifNotEmpty { value ->
+                configurator.generatorName = value
+            }
+
+            outputDir.ifNotEmpty { value ->
+                configurator.outputDir = value
+            }
+
+            auth.ifNotEmpty { value ->
+                configurator.auth = value
+            }
+
+            templateDir.ifNotEmpty { value ->
+                configurator.templateDir = value
+            }
+
+            apiPackage.ifNotEmpty { value ->
+                configurator.apiPackage = value
+            }
+
+            modelPackage.ifNotEmpty { value ->
+                configurator.modelPackage = value
+            }
+
+            modelNamePrefix.ifNotEmpty { value ->
+                configurator.modelNamePrefix = value
+            }
+
+            modelNameSuffix.ifNotEmpty { value ->
+                configurator.modelNameSuffix = value
+            }
+
+            invokerPackage.ifNotEmpty { value ->
+                configurator.invokerPackage = value
+            }
+
+            groupId.ifNotEmpty { value ->
+                configurator.groupId = value
+            }
+
+            id.ifNotEmpty { value ->
+                configurator.artifactId = value
+            }
+
+            version.ifNotEmpty { value ->
+                configurator.artifactVersion = value
+            }
+
+            library.ifNotEmpty { value ->
+                configurator.library = value
+            }
+
+            gitUserId.ifNotEmpty { value ->
+                configurator.gitUserId = value
+            }
+
+            gitRepoId.ifNotEmpty { value ->
+                configurator.gitRepoId = value
+            }
+
+            releaseNote.ifNotEmpty { value ->
+                configurator.releaseNote = value
+            }
+
+            httpUserAgent.ifNotEmpty { value ->
+                configurator.httpUserAgent = value
+            }
+
+            ignoreFileOverride.ifNotEmpty { value ->
+                configurator.ignoreFileOverride = value
+            }
+
+            removeOperationIdPrefix.ifNotEmpty { value ->
+                configurator.removeOperationIdPrefix = value!!
+            }
+
+            if (systemProperties.isPresent) {
+                systemProperties.get().forEach { entry ->
+                    configurator.addSystemProperty(entry.key, entry.value)
+                }
+            }
+
+            if (instantiationTypes.isPresent) {
+                instantiationTypes.get().forEach { entry ->
+                    configurator.addInstantiationType(entry.key, entry.value)
+                }
+            }
+
+            if (importMappings.isPresent) {
+                importMappings.get().forEach { entry ->
+                    configurator.addImportMapping(entry.key, entry.value)
+                }
+            }
+
+            if (typeMappings.isPresent) {
+                typeMappings.get().forEach { entry ->
+                    configurator.addTypeMapping(entry.key, entry.value)
+                }
+            }
+
+            if (additionalProperties.isPresent) {
+                additionalProperties.get().forEach { entry ->
+                    configurator.addAdditionalProperty(entry.key, entry.value)
+                }
+            }
+
+            if (languageSpecificPrimitives.isPresent) {
+                languageSpecificPrimitives.get().forEach {
+                    configurator.addLanguageSpecificPrimitive(it)
+                }
+            }
+
+            if (reservedWordsMappings.isPresent) {
+                reservedWordsMappings.get().forEach { entry ->
+                    configurator.addAdditionalReservedWordMapping(entry.key, entry.value)
+                }
+            }
+
+            val clientOptInput = configurator.toClientOptInput()
+            val codgenConfig = clientOptInput.config
+
+            if (configOptions.isPresent) {
+                val userSpecifiedConfigOptions = configOptions.get()
+                codgenConfig.cliOptions().forEach {
+                    if (userSpecifiedConfigOptions.containsKey(it.opt)) {
+                        clientOptInput.config.additionalProperties()[it.opt] = userSpecifiedConfigOptions[it.opt]
+                    }
+                }
+            }
+
+            try {
+                val out = services.get(StyledTextOutputFactory::class.java).create("openapi")
+                out.withStyle(StyledTextOutput.Style.Success)
+
+                DefaultGenerator().opts(clientOptInput).generate()
+
+                out.println("Successfully generated code to ${configurator.outputDir}")
+            } catch (e: RuntimeException) {
+                throw GradleException("Code generation failed.", e)
+            }
+        } finally {
+            // Reset all modified system properties back to their original state
+            GeneratorProperties.reset()
+        }
+    }
+}

modules/openapi-generator-gradle-plugin/bin/main/org/openapitools/generator/gradle/plugin/tasks/GeneratorsTask.kt

@@ -0,0 +1,71 @@
+/*
+ * Copyright 2018 OpenAPI-Generator Contributors (https://openapi-generator.tech)
+ *
+ * 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 org.openapitools.generator.gradle.plugin.tasks
+
+import org.gradle.api.DefaultTask
+import org.gradle.api.tasks.TaskAction
+import org.gradle.internal.logging.text.StyledTextOutput
+import org.gradle.internal.logging.text.StyledTextOutputFactory
+import org.openapitools.codegen.CodegenConfigLoader
+import org.openapitools.codegen.CodegenType
+
+/**
+ * A task which lists out the generators available in OpenAPI Generator
+ *
+ * Example (CLI):
+ *
+ * ./gradlew -q openApiGenerators
+ *
+ * @author Jim Schubert
+ */
+open class GeneratorsTask : DefaultTask() {
+    @Suppress("unused")
+    @TaskAction
+    fun doWork() {
+        val generators = CodegenConfigLoader.getAll()
+
+        val out = services.get(StyledTextOutputFactory::class.java).create("openapi")
+
+        StringBuilder().apply {
+            val types = CodegenType.values()
+
+            append("The following generators are available:")
+
+            append(System.lineSeparator())
+            append(System.lineSeparator())
+
+            for (type in types) {
+                append(type.name).append(" generators:")
+                append(System.lineSeparator())
+
+                generators.filter { it.tag == type }
+                        .sortedBy { it.name }
+                        .forEach({ generator ->
+                            append("    - ")
+                            append(generator.name)
+                            append(System.lineSeparator())
+                        })
+
+                append(System.lineSeparator())
+                append(System.lineSeparator())
+            }
+
+            out.withStyle(StyledTextOutput.Style.Success)
+            out.formatln("%s%n", toString())
+        }
+    }
+}

modules/openapi-generator-gradle-plugin/bin/main/org/openapitools/generator/gradle/plugin/tasks/MetaTask.kt

@@ -0,0 +1,132 @@
+/*
+ * Copyright 2018 OpenAPI-Generator Contributors (https://openapi-generator.tech)
+ *
+ * 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 org.openapitools.generator.gradle.plugin.tasks
+
+import com.samskivert.mustache.Mustache
+import org.gradle.api.DefaultTask
+import org.gradle.api.GradleException
+import org.gradle.api.tasks.Internal
+import org.gradle.api.tasks.TaskAction
+import org.gradle.internal.logging.text.StyledTextOutput
+import org.gradle.internal.logging.text.StyledTextOutputFactory
+import org.gradle.kotlin.dsl.property
+import org.openapitools.codegen.CodegenConfig
+import org.openapitools.codegen.CodegenConstants
+import org.openapitools.codegen.DefaultGenerator
+import org.openapitools.codegen.SupportingFile
+import java.io.File
+import java.io.IOException
+import java.nio.charset.Charset
+
+/**
+ * A task which generates a new generator (meta). Useful for redistributable generator packages.
+ *
+ * @author Jim Schubert
+ */
+open class MetaTask : DefaultTask() {
+
+    @get:Internal
+    val generatorName = project.objects.property<String>()
+
+    @get:Internal
+    val packageName = project.objects.property<String>()
+
+    @get:Internal
+    val outputFolder = project.objects.property<String>()
+
+    @Suppress("unused")
+    @TaskAction
+    fun doWork() {
+
+        val packageToPath = packageName.get().replace(".", File.separator)
+        val dir = File(outputFolder.get())
+        val klass = "${generatorName.get().titleCasedTextOnly()}Generator"
+
+        val templateResourceDir = generatorName.get().hyphenatedTextOnly()
+
+        val out = services.get(StyledTextOutputFactory::class.java).create("openapi")
+
+        out.withStyle(StyledTextOutput.Style.Info)
+
+        logger.debug("package: {}", packageName.get())
+        logger.debug("dir: {}", dir.absolutePath)
+        logger.debug("generator class: {}", klass)
+
+        val supportingFiles = listOf(
+                SupportingFile("pom.mustache", "", "pom.xml"),
+                SupportingFile("generatorClass.mustache", dir("src", "main", "java", packageToPath), "$klass.java"),
+                SupportingFile("README.mustache", "", "README.md"),
+                SupportingFile("api.template", dir("src", "main", "resources", templateResourceDir), "api.mustache"),
+                SupportingFile("model.template", dir("src", "main", "resources", templateResourceDir), "model.mustache"),
+                SupportingFile("myFile.template", dir("src", "main", "resources", templateResourceDir), "myFile.mustache"),
+                SupportingFile("services.mustache", dir("src", "main", "resources", "META-INF", "services"), CodegenConfig::class.java.canonicalName))
+
+        val currentVersion = CodegenConstants::class.java.`package`.implementationVersion
+
+        val data = mapOf("generatorPackage" to packageToPath,
+                "generatorClass" to klass,
+                "name" to templateResourceDir,
+                "fullyQualifiedGeneratorClass" to "${packageName.get()}.$klass",
+                "openapiGeneratorVersion" to currentVersion)
+
+        val generator = DefaultGenerator()
+        supportingFiles.map {
+            try {
+                val destinationFolder = File(File(dir.absolutePath), it.folder)
+                destinationFolder.mkdirs()
+                val outputFile = File(destinationFolder, it.destinationFilename)
+
+                val template = generator.readTemplate(File("codegen", it.templateFile).path)
+                var formatted = template
+
+                if (it.templateFile.endsWith(".mustache")) {
+                    formatted = Mustache.compiler()
+                            .withLoader(loader(generator))
+                            .defaultValue("")
+                            .compile(template).execute(data)
+                }
+
+                outputFile.writeText(formatted, Charset.forName("UTF8"))
+
+                out.formatln("Wrote file to %s", outputFile.absolutePath)
+
+                // TODO: register outputs
+                // return outputFile
+            } catch (e: IOException) {
+                logger.error(e.message)
+                throw GradleException("Can't generate project", e)
+            }
+        }
+        out.withStyle(StyledTextOutput.Style.Success)
+        out.formatln("Created generator %s", klass)
+    }
+
+    private fun loader(generator: DefaultGenerator): Mustache.TemplateLoader {
+        return Mustache.TemplateLoader { name ->
+            generator.getTemplateReader("codegen${File.separator}$name.mustache")
+        }
+    }
+
+    private fun String.titleCasedTextOnly(): String =
+            this.split(Regex("[^a-zA-Z0-9]")).joinToString(separator = "", transform = String::capitalize)
+
+    private fun String.hyphenatedTextOnly(): String =
+            this.split(Regex("[^a-zA-Z0-9]")).joinToString(separator = "-", transform = String::toLowerCase)
+
+    private fun dir(vararg parts: String): String =
+            parts.joinToString(separator = File.separator)
+}

modules/openapi-generator-gradle-plugin/bin/main/org/openapitools/generator/gradle/plugin/tasks/ValidateTask.kt

@@ -0,0 +1,82 @@
+/*
+ * Copyright 2018 OpenAPI-Generator Contributors (https://openapi-generator.tech)
+ *
+ * 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 org.openapitools.generator.gradle.plugin.tasks
+
+import io.swagger.parser.OpenAPIParser
+import org.gradle.api.DefaultTask
+import org.gradle.api.GradleException
+import org.gradle.api.tasks.Internal
+import org.gradle.api.tasks.TaskAction
+import org.gradle.api.tasks.options.Option
+import org.gradle.internal.logging.text.StyledTextOutput
+import org.gradle.internal.logging.text.StyledTextOutputFactory
+import org.gradle.kotlin.dsl.property
+
+/**
+ * A generator which validates an Open API spec. This task outputs a list of validation issues and errors.
+ *
+ * Example:
+ * cli:
+ *
+ *   ./gradlew openApiValidate --input=/path/to/file
+ *
+ * build.gradle:
+ *
+ *   openApiMeta {
+ *      inputSpec = "path/to/spec.yaml"
+ *   }
+ *
+ * @author Jim Schubert
+ */
+open class ValidateTask : DefaultTask() {
+    @get:Internal
+    var inputSpec = project.objects.property<String>()
+
+    @Suppress("unused")
+    @get:Internal
+    @set:Option(option = "input", description = "The input specification.")
+    var input: String? = null
+        set(value) {
+            inputSpec.set(value)
+        }
+
+    @Suppress("unused")
+    @TaskAction
+    fun doWork() {
+        val spec = inputSpec.get()
+        logger.quiet("Validating spec $spec")
+        val result = OpenAPIParser().readLocation(spec, null, null)
+        val messages = result.messages.toSet()
+        val out = services.get(StyledTextOutputFactory::class.java).create("openapi")
+
+        if (messages.isNotEmpty()) {
+
+            out.withStyle(StyledTextOutput.Style.Error)
+            out.println("\nSpec is invalid.\nIssues:\n")
+
+            messages.forEach {
+                out.withStyle(StyledTextOutput.Style.Error)
+                out.println("\t$it\n")
+            }
+
+            throw GradleException("Validation failed.")
+        } else {
+            out.withStyle(StyledTextOutput.Style.Success)
+            out.println("Spec is valid.")
+        }
+    }
+}

modules/openapi-generator-gradle-plugin/bin/test/GenerateTaskDslTest.kt

@@ -0,0 +1,71 @@
+package org.openapitools.generator.gradle.plugin
+
+import org.gradle.testkit.runner.GradleRunner
+import org.gradle.testkit.runner.TaskOutcome
+import org.testng.annotations.Test
+import java.io.File
+import kotlin.test.assertEquals
+import kotlin.test.assertTrue
+
+class GenerateTaskDslTest : TestBase()  {
+    override var temp: File = createTempDir(javaClass.simpleName)
+
+    private val defaultBuildGradle = """
+        plugins {
+          id 'org.openapi.generator'
+        }
+        openApiGenerate {
+            generatorName = "kotlin"
+            inputSpec = file("spec.yaml").absolutePath
+            outputDir = file("build/kotlin").absolutePath
+            apiPackage = "org.openapitools.example.api"
+            invokerPackage = "org.openapitools.example.invoker"
+            modelPackage = "org.openapitools.example.model"
+            configOptions = [
+                    dateLibrary: "java8"
+            ]
+        }
+    """.trimIndent()
+
+    @Test
+    fun `openApiGenerate should create an expected file structure from DSL config`() {
+        // Arrange
+        val projectFiles = mapOf(
+                "spec.yaml" to javaClass.classLoader.getResourceAsStream("specs/petstore-v3.0.yaml")
+        )
+        withProject(defaultBuildGradle, projectFiles)
+
+        // Act
+        val result = GradleRunner.create()
+                .withProjectDir(temp)
+                .withArguments("openApiGenerate")
+                .withPluginClasspath()
+                .build()
+
+        // Assert
+        assertTrue(result.output.contains("Successfully generated code to"), "User friendly generate notice is missing.")
+
+        listOf(
+            "build/kotlin/.openapi-generator-ignore",
+            "build/kotlin/docs/PetsApi.md",
+            "build/kotlin/docs/Pets.md",
+            "build/kotlin/docs/Error.md",
+            "build/kotlin/docs/Pet.md",
+            "build/kotlin/README.md",
+            "build/kotlin/build.gradle",
+            "build/kotlin/.openapi-generator/VERSION",
+            "build/kotlin/settings.gradle",
+            "build/kotlin/src/main/kotlin/org/openapitools/example/model/Pets.kt",
+            "build/kotlin/src/main/kotlin/org/openapitools/example/model/Pet.kt",
+            "build/kotlin/src/main/kotlin/org/openapitools/example/model/Error.kt",
+            "build/kotlin/src/main/kotlin/org/openapitools/example/api/PetsApi.kt",
+            "build/kotlin/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt"
+        ).map {
+            val f = File(temp, it)
+            assertTrue(f.exists() && f.isFile, "An expected file was not generated when invoking the generation.")
+        }
+
+        assertEquals(TaskOutcome.SUCCESS, result.task(":openApiGenerate")?.outcome,
+                "Expected a successful run, but found ${result.task(":openApiGenerate")?.outcome}")
+    }
+}

modules/openapi-generator-gradle-plugin/bin/test/GeneratorsTaskDslTest.kt

@@ -0,0 +1,38 @@
+package org.openapitools.generator.gradle.plugin
+
+import org.gradle.testkit.runner.GradleRunner
+import org.gradle.testkit.runner.TaskOutcome
+import org.testng.annotations.Test
+import java.io.File
+import kotlin.test.assertEquals
+import kotlin.test.assertTrue
+
+class GeneratorsTaskDslTest : TestBase() {
+    override var temp: File = createTempDir(javaClass.simpleName)
+
+    @Test
+    fun `openApiGenerators should list generators available to the user`() {
+        // Arrange
+        withProject("""
+            | plugins {
+            |   id 'org.openapi.generator'
+            | }
+        """.trimMargin())
+
+        // Act
+        val result = GradleRunner.create()
+                .withProjectDir(temp)
+                .withArguments("openApiGenerators")
+                .withPluginClasspath()
+                .build()
+
+        // Assert
+        assertTrue(result.output.contains("The following generators are available:"), "User friendly generator notice is missing.")
+        assertTrue(result.output.contains("CLIENT generators:"), "Expected client generator header is missing.")
+        assertTrue(result.output.contains("android"), "Spot-checking listed client generators is missing a client generator.")
+        assertTrue(result.output.contains("SERVER generators:"), "Expected server generator header is missing.")
+        assertTrue(result.output.contains("kotlin-server"), "Spot-checking listed server generators is missing a server generator.")
+        assertEquals(TaskOutcome.SUCCESS, result.task(":openApiGenerators")?.outcome,
+                "Expected a successful run, but found ${result.task(":openApiGenerators")?.outcome}")
+    }
+}

modules/openapi-generator-gradle-plugin/bin/test/MetaTaskDslTest.kt

@@ -0,0 +1,58 @@
+package org.openapitools.generator.gradle.plugin
+
+import org.gradle.testkit.runner.GradleRunner
+import org.gradle.testkit.runner.TaskOutcome
+import org.testng.annotations.Test
+import java.io.File
+import kotlin.test.assertEquals
+import kotlin.test.assertTrue
+
+class MetaTaskDslTest : TestBase() {
+    override var temp: File = createTempDir(javaClass.simpleName)
+
+    @Test
+    fun `openApiMeta should generate desired project contents`() {
+        // Arrange
+        val buildDirReplacement = "\$buildDir/meta"
+        withProject("""
+            | plugins {
+            |   id 'org.openapi.generator'
+            | }
+            |
+            | openApiMeta {
+            |     generatorName = "Sample"
+            |     packageName = "org.openapitools.example"
+            |     outputFolder = "$buildDirReplacement".toString()
+            | }
+        """.trimMargin())
+
+        // Act
+        val result = GradleRunner.create()
+                .withProjectDir(temp)
+                .withArguments("openApiMeta")
+                .withPluginClasspath()
+                .build()
+
+        // Assert
+        assertTrue(result.output.contains("Wrote file to"), "User friendly write notice is missing.")
+
+        // To avoid any OS-specific output causing issues with our stdout comparisons, only compare on expected filenames.
+        listOf(
+                "SampleGenerator.java",
+                "README.md",
+                "api.mustache",
+                "model.mustache",
+                "myFile.mustache",
+                "org.openapitools.codegen.CodegenConfig",
+                "pom.xml"
+        ).map {
+            assertTrue(result.output.contains(it), "Expected $it to be listed in gradle stdout.")
+        }
+
+        assertEquals(
+                TaskOutcome.SUCCESS,
+                result.task(":openApiMeta")?.outcome,
+                "Expected a successful run, but found ${result.task(":openApiMeta")?.outcome}"
+        )
+    }
+}

modules/openapi-generator-gradle-plugin/bin/test/TestBase.kt

@@ -0,0 +1,34 @@
+package org.openapitools.generator.gradle.plugin
+
+import org.testng.annotations.AfterMethod
+import org.testng.annotations.BeforeMethod
+import java.io.File
+import java.io.InputStream
+
+abstract class TestBase {
+    protected open lateinit var temp: File
+
+    @BeforeMethod
+    protected fun before() {
+        temp = createTempDir(javaClass.simpleName)
+        temp.deleteOnExit()
+    }
+
+    @AfterMethod
+    protected fun after(){
+        temp.deleteRecursively()
+    }
+
+    protected fun withProject(
+            buildContents: String,
+            projectFiles: Map<String, InputStream> = mapOf()
+    ) {
+        val buildFile = File(temp,"build.gradle")
+        buildFile.writeText(buildContents)
+
+        projectFiles.forEach { entry ->
+            val target = File(temp, entry.key)
+            entry.value.copyTo(target.outputStream())
+        }
+    }
+}

modules/openapi-generator-gradle-plugin/bin/test/ValidateTaskDslTest.kt

@@ -0,0 +1,99 @@
+package org.openapitools.generator.gradle.plugin
+
+import org.gradle.testkit.runner.GradleRunner
+import org.gradle.testkit.runner.TaskOutcome.FAILED
+import org.gradle.testkit.runner.TaskOutcome.SUCCESS
+import org.testng.annotations.Test
+import java.io.File
+import kotlin.test.assertEquals
+import kotlin.test.assertTrue
+
+class ValidateTaskDslTest : TestBase() {
+    override var temp: File = createTempDir(javaClass.simpleName)
+
+    @Test
+    fun `openApiValidate should fail on non-file spec`() {
+        // Arrange
+        withProject("""
+            | plugins {
+            |   id 'org.openapi.generator'
+            | }
+            |
+            | openApiValidate {
+            |   inputSpec = "some_location"
+            | }
+        """.trimMargin())
+
+        // Act
+        val result = GradleRunner.create()
+                .withProjectDir(temp)
+                .withArguments("openApiValidate")
+                .withPluginClasspath()
+                .buildAndFail()
+
+        // Assert
+        assertTrue(result.output.contains("unable to read location `some_location`"), "Unexpected/no message presented to the user for a spec pointing to an invalid URI.")
+        assertEquals(FAILED, result.task(":openApiValidate")?.outcome,
+                "Expected a failed run, but found ${result.task(":openApiValidate")?.outcome}")
+    }
+
+    @Test
+    fun `openApiValidate should succeed on valid spec`() {
+        // Arrange
+        val projectFiles = mapOf(
+                "spec.yaml" to javaClass.classLoader.getResourceAsStream("specs/petstore-v3.0.yaml")
+        )
+
+        withProject("""
+            | plugins {
+            |   id 'org.openapi.generator'
+            | }
+            |
+            | openApiValidate {
+            |   inputSpec = file("spec.yaml").absolutePath
+            | }
+        """.trimMargin(), projectFiles)
+
+        // Act
+        val result = GradleRunner.create()
+                .withProjectDir(temp)
+                .withArguments("openApiValidate")
+                .withPluginClasspath()
+                .build()
+
+        // Assert
+        assertTrue(result.output.contains("Spec is valid."), "Unexpected/no message presented to the user for a valid spec.")
+        assertEquals(SUCCESS, result.task(":openApiValidate")?.outcome,
+                "Expected a successful run, but found ${result.task(":openApiValidate")?.outcome}")
+    }
+
+    @Test
+    fun `openApiValidate should fail on invalid spec`() {
+        // Arrange
+        val projectFiles = mapOf(
+                "spec.yaml" to javaClass.classLoader.getResourceAsStream("specs/petstore-v3.0-invalid.yaml")
+        )
+        withProject("""
+            | plugins {
+            |   id 'org.openapi.generator'
+            | }
+            |
+            | openApiValidate {
+            |   inputSpec = file('spec.yaml').absolutePath
+            | }
+        """.trimMargin(), projectFiles)
+
+        // Act
+        val result = GradleRunner.create()
+                .withProjectDir(temp)
+                .withArguments("openApiValidate")
+                .withPluginClasspath()
+                .buildAndFail()
+
+        // Assert
+        assertTrue(result.output.contains("Spec is invalid."), "Unexpected/no message presented to the user for an invalid spec.")
+        assertEquals(FAILED, result.task(":openApiValidate")?.outcome,
+                "Expected a failed run, but found ${result.task(":openApiValidate")?.outcome}")
+    }
+
+}

modules/openapi-generator-gradle-plugin/bin/test/specs/petstore-v3.0-invalid.yaml

@@ -0,0 +1,103 @@
+openapi: "3.0.0"
+servers:
+  - url: http://petstore.swagger.io/v1
+paths:
+  /pets:
+    get:
+      summary: List all pets
+      operationId: listPets
+      tags:
+        - pets
+      parameters:
+        - name: limit
+          in: query
+          description: How many items to return at one time (max 100)
+          required: false
+          schema:
+            type: integer
+            format: int32
+      responses:
+        '200':
+          description: A paged array of pets
+          headers:
+            x-next:
+              description: A link to the next page of responses
+              schema:
+                type: string
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/Pets"
+        default:
+          description: unexpected error
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/Error"
+    post:
+      summary: Create a pet
+      tags:
+        - pets
+      responses:
+        '201':
+          description: Null response
+        default:
+          description: unexpected error
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/Error"
+  /pets/{petId}:
+    get:
+      summary: Info for a specific pet
+      operationId: showPetById
+      tags:
+        - pets
+      parameters:
+        - name: petId
+          in: path
+          required: true
+          description: The id of the pet to retrieve
+          schema:
+            type: string
+      responses:
+        '200':
+          description: Expected response to a valid request
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/Pets"
+        default:
+          description: unexpected error
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/Error"
+components:
+  schemas:
+    Pet:
+      required:
+        - id
+        - name
+      properties:
+        id:
+          type: integer
+          format: int64
+        name:
+          type: string
+        tag:
+          type: string
+    Pets:
+      type: array
+      items:
+        $ref: "#/components/schemas/Pet"
+    Error:
+      required:
+        - code
+        - message
+      properties:
+        code:
+          type: integer
+          format: int32
+        message:
+          type: string

modules/openapi-generator-gradle-plugin/bin/test/specs/petstore-v3.0.yaml

@@ -0,0 +1,109 @@
+openapi: "3.0.0"
+info:
+  version: 1.0.0
+  title: Swagger Petstore
+  license:
+    name: MIT
+servers:
+  - url: http://petstore.swagger.io/v1
+paths:
+  /pets:
+    get:
+      summary: List all pets
+      operationId: listPets
+      tags:
+        - pets
+      parameters:
+        - name: limit
+          in: query
+          description: How many items to return at one time (max 100)
+          required: false
+          schema:
+            type: integer
+            format: int32
+      responses:
+        '200':
+          description: A paged array of pets
+          headers:
+            x-next:
+              description: A link to the next page of responses
+              schema:
+                type: string
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/Pets"
+        default:
+          description: unexpected error
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/Error"
+    post:
+      summary: Create a pet
+      operationId: createPets
+      tags:
+        - pets
+      responses:
+        '201':
+          description: Null response
+        default:
+          description: unexpected error
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/Error"
+  /pets/{petId}:
+    get:
+      summary: Info for a specific pet
+      operationId: showPetById
+      tags:
+        - pets
+      parameters:
+        - name: petId
+          in: path
+          required: true
+          description: The id of the pet to retrieve
+          schema:
+            type: string
+      responses:
+        '200':
+          description: Expected response to a valid request
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/Pets"
+        default:
+          description: unexpected error
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/Error"
+components:
+  schemas:
+    Pet:
+      required:
+        - id
+        - name
+      properties:
+        id:
+          type: integer
+          format: int64
+        name:
+          type: string
+        tag:
+          type: string
+    Pets:
+      type: array
+      items:
+        $ref: "#/components/schemas/Pet"
+    Error:
+      required:
+        - code
+        - message
+      properties:
+        code:
+          type: integer
+          format: int32
+        message:
+          type: string

modules/openapi-generator-gradle-plugin/gradle.properties

@@ -1,4 +1,4 @@
-openApiGeneratorVersion=3.3.4
+openApiGeneratorVersion=4.0.0-beta
 
 # BEGIN placeholders
 # these are just placeholders to allow contributors to build directly

modules/openapi-generator-gradle-plugin/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.openapitools</groupId>
         <artifactId>openapi-generator-project</artifactId>
-        <version>3.3.4</version>
+        <version>4.0.0-beta</version>
         <relativePath>../..</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

modules/openapi-generator-gradle-plugin/src/main/kotlin/org/openapitools/generator/gradle/plugin/tasks/GenerateTask.kt

@@ -28,6 +28,7 @@ import org.gradle.kotlin.dsl.property
 import org.openapitools.codegen.CodegenConstants
 import org.openapitools.codegen.DefaultGenerator
 import org.openapitools.codegen.config.CodegenConfigurator
+import org.openapitools.codegen.config.GeneratorProperties
 
 
 /**
@@ -323,8 +324,6 @@ open class GenerateTask : DefaultTask() {
     @get:Internal
     val configOptions = project.objects.property<Map<String, String>>()
 
-    private val originalEnvironmentVariables = mutableMapOf<String, String?>()
-
     private fun <T : Any?> Property<T>.ifNotEmpty(block: Property<T>.(T) -> Unit) {
         if (isPresent) {
             val item: T? = get()
@@ -352,36 +351,33 @@ open class GenerateTask : DefaultTask() {
         try {
             if (systemProperties.isPresent) {
                 systemProperties.get().forEach { (key, value) ->
-                    // System.setProperty returns the original value for a key, or null.
-                    // Cache the original value or null…we will late put the properties back in their original state.
-                    originalEnvironmentVariables[key] = System.setProperty(key, value)
                     configurator.addSystemProperty(key, value)
                 }
             }
 
             if (supportingFilesConstrainedTo.isPresent && supportingFilesConstrainedTo.get().isNotEmpty()) {
-                System.setProperty(CodegenConstants.SUPPORTING_FILES, supportingFilesConstrainedTo.get().joinToString(","))
+                GeneratorProperties.setProperty(CodegenConstants.SUPPORTING_FILES, supportingFilesConstrainedTo.get().joinToString(","))
             } else {
-                System.clearProperty(CodegenConstants.SUPPORTING_FILES)
+                GeneratorProperties.clearProperty(CodegenConstants.SUPPORTING_FILES)
             }
 
             if (modelFilesConstrainedTo.isPresent && modelFilesConstrainedTo.get().isNotEmpty()) {
-                System.setProperty(CodegenConstants.MODELS, modelFilesConstrainedTo.get().joinToString(","))
+                GeneratorProperties.setProperty(CodegenConstants.MODELS, modelFilesConstrainedTo.get().joinToString(","))
             } else {
-                System.clearProperty(CodegenConstants.MODELS)
+                GeneratorProperties.clearProperty(CodegenConstants.MODELS)
             }
 
             if (apiFilesConstrainedTo.isPresent && apiFilesConstrainedTo.get().isNotEmpty()) {
-                System.setProperty(CodegenConstants.APIS, apiFilesConstrainedTo.get().joinToString(","))
+                GeneratorProperties.setProperty(CodegenConstants.APIS, apiFilesConstrainedTo.get().joinToString(","))
             } else {
-                System.clearProperty(CodegenConstants.APIS)
+                GeneratorProperties.clearProperty(CodegenConstants.APIS)
             }
 
-            System.setProperty(CodegenConstants.API_DOCS, generateApiDocumentation.get().toString())
-            System.setProperty(CodegenConstants.MODEL_DOCS, generateModelDocumentation.get().toString())
-            System.setProperty(CodegenConstants.MODEL_TESTS, generateModelTests.get().toString())
-            System.setProperty(CodegenConstants.API_TESTS, generateApiTests.get().toString())
-            System.setProperty(CodegenConstants.WITH_XML, withXml.get().toString())
+            GeneratorProperties.setProperty(CodegenConstants.API_DOCS, generateApiDocumentation.get().toString())
+            GeneratorProperties.setProperty(CodegenConstants.MODEL_DOCS, generateModelDocumentation.get().toString())
+            GeneratorProperties.setProperty(CodegenConstants.MODEL_TESTS, generateModelTests.get().toString())
+            GeneratorProperties.setProperty(CodegenConstants.API_TESTS, generateApiTests.get().toString())
+            GeneratorProperties.setProperty(CodegenConstants.WITH_XML, withXml.get().toString())
 
             // now override with any specified parameters
             verbose.ifNotEmpty { value ->
@@ -541,14 +537,7 @@ open class GenerateTask : DefaultTask() {
                 throw GradleException("Code generation failed.", e)
             }
         } finally {
-            // Reset all modified system properties back to their original state
-            originalEnvironmentVariables.forEach {
-                when {
-                    it.value == null -> System.clearProperty(it.key)
-                    else -> System.setProperty(it.key, it.value)
-                }
-            }
-            originalEnvironmentVariables.clear()
+            GeneratorProperties.reset()
         }
     }
 }

modules/openapi-generator-maven-plugin/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.openapitools</groupId>
         <artifactId>openapi-generator-project</artifactId>
-        <version>3.3.4</version>
+        <version>4.0.0-beta</version>
         <relativePath>../..</relativePath>
     </parent>
     <artifactId>openapi-generator-maven-plugin</artifactId>
@@ -23,7 +23,7 @@
         <dependency>
             <groupId>org.apache.maven</groupId>
             <artifactId>maven-core</artifactId>
-            <version>3.2.5</version>
+            <version>3.3.1</version>
         </dependency>
         <dependency>
             <groupId>org.apache.maven</groupId>
@@ -34,12 +34,12 @@
         <dependency>
             <groupId>org.apache.maven</groupId>
             <artifactId>maven-compat</artifactId>
-            <version>3.2.5</version>
+            <version>3.5.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.maven</groupId>
             <artifactId>maven-plugin-api</artifactId>
-            <version>3.2.5</version>
+            <version>3.3.1</version>
         </dependency>
         <dependency>
             <groupId>org.apache.maven.plugin-tools</groupId>

modules/openapi-generator-maven-plugin/src/main/java/org/openapitools/codegen/plugin/CodeGenMojo.java

@@ -51,6 +51,7 @@ import org.openapitools.codegen.CodegenConfig;
 import org.openapitools.codegen.CodegenConstants;
 import org.openapitools.codegen.DefaultGenerator;
 import org.openapitools.codegen.config.CodegenConfigurator;
+import org.openapitools.codegen.config.GeneratorProperties;
 import org.sonatype.plexus.build.incremental.BuildContext;
 import org.sonatype.plexus.build.incremental.DefaultBuildContext;
 import org.slf4j.Logger;
@@ -499,28 +500,28 @@ public class CodeGenMojo extends AbstractMojo {
 
             // Set generation options
             if (null != generateApis && generateApis) {
-                System.setProperty(CodegenConstants.APIS, "");
+                GeneratorProperties.setProperty(CodegenConstants.APIS, "");
             } else {
-                System.clearProperty(CodegenConstants.APIS);
+                GeneratorProperties.clearProperty(CodegenConstants.APIS);
             }
 
             if (null != generateModels && generateModels) {
-                System.setProperty(CodegenConstants.MODELS, modelsToGenerate);
+                GeneratorProperties.setProperty(CodegenConstants.MODELS, modelsToGenerate);
             } else {
-                System.clearProperty(CodegenConstants.MODELS);
+                GeneratorProperties.clearProperty(CodegenConstants.MODELS);
             }
 
             if (null != generateSupportingFiles && generateSupportingFiles) {
-                System.setProperty(CodegenConstants.SUPPORTING_FILES, supportingFilesToGenerate);
+                GeneratorProperties.setProperty(CodegenConstants.SUPPORTING_FILES, supportingFilesToGenerate);
             } else {
-                System.clearProperty(CodegenConstants.SUPPORTING_FILES);
+                GeneratorProperties.clearProperty(CodegenConstants.SUPPORTING_FILES);
             }
 
-            System.setProperty(CodegenConstants.MODEL_TESTS, generateModelTests.toString());
-            System.setProperty(CodegenConstants.MODEL_DOCS, generateModelDocumentation.toString());
-            System.setProperty(CodegenConstants.API_TESTS, generateApiTests.toString());
-            System.setProperty(CodegenConstants.API_DOCS, generateApiDocumentation.toString());
-            System.setProperty(CodegenConstants.WITH_XML, withXml.toString());
+            GeneratorProperties.setProperty(CodegenConstants.MODEL_TESTS, generateModelTests.toString());
+            GeneratorProperties.setProperty(CodegenConstants.MODEL_DOCS, generateModelDocumentation.toString());
+            GeneratorProperties.setProperty(CodegenConstants.API_TESTS, generateApiTests.toString());
+            GeneratorProperties.setProperty(CodegenConstants.API_DOCS, generateApiDocumentation.toString());
+            GeneratorProperties.setProperty(CodegenConstants.WITH_XML, withXml.toString());
 
             if (configOptions != null) {
                 // Retained for backwards-compataibility with configOptions -> instantiation-types
@@ -593,13 +594,13 @@ public class CodeGenMojo extends AbstractMojo {
             if (environmentVariables != null) {
 
                 for (String key : environmentVariables.keySet()) {
-                    originalEnvironmentVariables.put(key, System.getProperty(key));
+                    originalEnvironmentVariables.put(key, GeneratorProperties.getProperty(key));
                     String value = environmentVariables.get(key);
                     if (value == null) {
                         // don't put null values
                         value = "";
                     }
-                    System.setProperty(key, value);
+                    GeneratorProperties.setProperty(key, value);
                     configurator.addSystemProperty(key, value);
                 }
             }
@@ -680,9 +681,9 @@ public class CodeGenMojo extends AbstractMojo {
         // when running the plugin multiple consecutive times with different configurations.
         for (Map.Entry<String, String> entry : originalEnvironmentVariables.entrySet()) {
             if (entry.getValue() == null) {
-                System.clearProperty(entry.getKey());
+                GeneratorProperties.clearProperty(entry.getKey());
             } else {
-                System.setProperty(entry.getKey(), entry.getValue());
+                GeneratorProperties.setProperty(entry.getKey(), entry.getValue());
             }
         }
     }

modules/openapi-generator-online/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.openapitools</groupId>
         <artifactId>openapi-generator-project</artifactId>
-        <version>3.3.4</version>
+        <version>4.0.0-beta</version>
         <relativePath>../..</relativePath>
     </parent>
     <artifactId>openapi-generator-online</artifactId>
@@ -13,7 +13,9 @@
         <java.version>1.8</java.version>
         <maven.compiler.source>${java.version}</maven.compiler.source>
         <maven.compiler.target>${java.version}</maven.compiler.target>
+        <spring-boot-version>2.0.7.RELEASE</spring-boot-version>
         <springfox-version>2.8.0</springfox-version>
+        <junit-version>4.12</junit-version>
     </properties>
     <dependencyManagement>
         <dependencies>
@@ -85,5 +87,23 @@
             <artifactId>openapi-generator</artifactId>
             <version>${project.parent.version}</version>
         </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.hamcrest</groupId>
+            <artifactId>java-hamcrest</artifactId>
+            <version>2.0.0.0</version>
+            <scope>test</scope>
+        </dependency>
+
     </dependencies>
 </project>

modules/openapi-generator-online/src/main/java/org/openapitools/codegen/online/service/GenApiService.java

@@ -69,12 +69,8 @@ public class GenApiService implements GenApiDelegate {
         servers.sort(String.CASE_INSENSITIVE_ORDER);
     }
 
-    private final NativeWebRequest request;
-
     @Autowired
-    public GenApiService(NativeWebRequest request) {
-        this.request = request;
-    }
+    private NativeWebRequest request;
 
     @Override
     public Optional<NativeWebRequest> getRequest() {

modules/openapi-generator-online/src/main/java/org/openapitools/codegen/online/service/Generator.java

@@ -50,7 +50,7 @@ public class Generator {
         try {
             config = CodegenConfigLoader.forName(language);
         } catch (Exception e) {
-            throw new ResponseStatusException(HttpStatus.BAD_REQUEST, String.format(Locale.ROOT,"Unsupported target %s supplied. %s",
+            throw new ResponseStatusException(HttpStatus.NOT_FOUND, String.format(Locale.ROOT,"Unsupported target %s supplied. %s",
                     language, e));
         }
         Map<String, CliOption> map = new LinkedHashMap<>();