add refresh token setting, use oauth_client_secret instead

.github/workflows/openapi-generator.yaml

@@ -217,7 +217,5 @@ jobs:
       - name: Run tests
         run: |
           mvn --no-snapshot-updates --batch-mode --quiet install -DskipTests -Dorg.slf4j.simpleLogger.defaultLogLevel=error
-          (cd modules/openapi-generator-gradle-plugin/samples/local-spec && ./gradlew buildGoSdk) # using gradle-6.8.3 via wrapper
+          (cd modules/openapi-generator-gradle-plugin/samples/local-spec && ./gradlew buildGoSdk)
           (cd modules/openapi-generator-gradle-plugin/samples/local-spec && ./gradlew openApiGenerate)
-          (cd modules/openapi-generator-gradle-plugin/samples/local-spec && ./gradlew buildDotnetSdk)
-          (cd modules/openapi-generator-gradle-plugin/samples/local-spec && gradle buildJavaResttemplateSdk) # not using gradle wrapper

.github/workflows/samples-scala.yaml

@@ -19,7 +19,6 @@ jobs:
         sample:
           # clients
           - samples/client/petstore/scalaz
-          #- samples/client/petstore/scala-sttp # won't pass while the same tests in circleci pass
           # servers
           - samples/server/petstore/scala-lagom-server
           - samples/server/petstore/scala-play-server

.gitignore

@@ -224,8 +224,6 @@ samples/client/petstore/R/**/petstore.Rcheck/
 samples/client/petstore/R/**/*.tar.gz
 samples/client/petstore/R/R.Rproj
 samples/client/petstore/R/man/
-samples/client/petstore/R-httr2-wrapper/man/
-samples/client/petstore/R-httr2/man/
 
 # elixir
 samples/client/petstore/elixir/_build/
@@ -253,7 +251,6 @@ samples/server/petstore/erlang-server/rebar.lock
 # JS
 samples/client/petstore/javascript-es6/package-lock.json
 samples/client/petstore/javascript-promise-es6/package-lock.json
-samples/client/petstore/javascript-apollo/package-lock.json
 
 # elm
 samples/client/petstore/elm/index.html

.travis.yml

@@ -111,8 +111,6 @@ before_install:
   - cmake --version
   # install Qt5
   #- sudo apt install -y --no-install-recommends qt5-default
-  # install boost
-  - sudo apt install -y --no-install-recommends libboost-all-dev
   # perl dep
   - cpanm --local-lib=~/perl5 local::lib && eval $(perl -I ~/perl5/lib/perl5/ -Mlocal::lib)
   - cpanm --quiet --no-interactive Test::Exception Test::More Log::Any LWP::UserAgent URI::Query Module::Runtime DateTime Module::Find Moose::Role JSON || echo "Ignored failure from cpanm"

README.md

@@ -68,13 +68,13 @@ If you find OpenAPI Generator useful for work, please consider asking your compa
 ## Overview
 OpenAPI Generator allows generation of API client libraries (SDK generation), server stubs,  documentation and configuration automatically given an [OpenAPI Spec](https://github.com/OAI/OpenAPI-Specification) (both 2.0 and 3.0 are supported). Currently, the following languages/frameworks are supported:
 
-|                                  | Languages/Frameworks                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            |
-| -------------------------------- |-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+|                                  | Languages/Frameworks                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          |
+| -------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
 | **API clients**                  | **ActionScript**, **Ada**, **Apex**, **Bash**, **C**, **C#** (.net 2.0, 3.5 or later, .NET Standard 1.3 - 2.1, .NET Core 3.1, .NET 5.0. Libraries: RestSharp, GenericHost, HttpClient), **C++** (Arduino, cpp-restsdk, Qt5, Tizen, Unreal Engine 4), **Clojure**, **Crystal**, **Dart**, **Elixir**, **Elm**, **Eiffel**, **Erlang**, **Go**, **Groovy**, **Haskell** (http-client, Servant), **Java** (Apache HttpClient, Jersey1.x, Jersey2.x, OkHttp, Retrofit1.x, Retrofit2.x, Feign, RestTemplate, RESTEasy, Vertx, Google API Client Library for Java, Rest-assured, Spring 5 Web Client, MicroProfile Rest Client), **k6**, **Kotlin**, **Lua**, **Nim**, **Node.js/JavaScript** (ES5, ES6, AngularJS with Google Closure Compiler annotations, Flow types, Apollo GraphQL DataStore), **Objective-C**, **OCaml**, **Perl**, **PHP**, **PowerShell**, **Python**, **R**, **Ruby**, **Rust** (hyper, reqwest, rust-server), **Scala** (akka, http4s, scalaz, sttp, swagger-async-httpclient), **Swift** (2.x, 3.x, 4.x, 5.x), **Typescript** (AngularJS, Angular (2.x - 13.x), Aurelia, Axios, Fetch, Inversify, jQuery, Nestjs, Node, redux-query, Rxjs) |
-| **Server stubs**                 | **Ada**, **C#** (ASP.NET Core, Azure Functions), **C++** (Pistache, Restbed, Qt5 QHTTPEngine), **Erlang**, **F#** (Giraffe), **Go** (net/http, Gin, Echo), **Haskell** (Servant, Yesod), **Java** (MSF4J, Spring, Undertow, JAX-RS: CDI, CXF, Inflector, Jersey, RestEasy, Play Framework, [PKMST](https://github.com/ProKarma-Inc/pkmst-getting-started-examples), [Vert.x](https://vertx.io/), [Apache Camel](https://camel.apache.org/)), **Kotlin** (Spring Boot, Ktor, Vertx), **PHP** (Laravel, Lumen, [Mezzio (fka Zend Expressive)](https://github.com/mezzio/mezzio), Slim, Silex, [Symfony](https://symfony.com/)), **Python** (FastAPI, Flask), **NodeJS**, **Ruby** (Sinatra, Rails5), **Rust** ([rust-server](https://openapi-generator.tech/docs/generators/rust-server/)), **Scala** (Akka, [Finch](https://github.com/finagle/finch), [Lagom](https://github.com/lagom/lagom), [Play](https://www.playframework.com/), Scalatra)                                                                                                                                                                                                                                                                           |
-| **API documentation generators** | **HTML**, **Confluence Wiki**, **Asciidoc**, **Markdown**, **PlantUML**                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         |
-| **Configuration files**          | [**Apache2**](https://httpd.apache.org/)                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        |
-| **Others**                       | **GraphQL**, **JMeter**, **Ktorm**, **MySQL Schema**, **Protocol Buffer**, **WSDL**                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             |
+| **Server stubs**                 | **Ada**, **C#** (ASP.NET Core, Azure Functions), **C++** (Pistache, Restbed, Qt5 QHTTPEngine), **Erlang**, **F#** (Giraffe), **Go** (net/http, Gin, Echo), **Haskell** (Servant, Yesod), **Java** (MSF4J, Spring, Undertow, JAX-RS: CDI, CXF, Inflector, Jersey, RestEasy, Play Framework, [PKMST](https://github.com/ProKarma-Inc/pkmst-getting-started-examples), [Vert.x](https://vertx.io/), [Apache Camel](https://camel.apache.org/)), **Kotlin** (Spring Boot, Ktor, Vertx), **PHP** (Laravel, Lumen, [Mezzio (fka Zend Expressive)](https://github.com/mezzio/mezzio), Slim, Silex, [Symfony](https://symfony.com/)), **Python** (FastAPI, Flask), **NodeJS**, **Ruby** (Sinatra, Rails5), **Rust** (rust-server), **Scala** (Akka, [Finch](https://github.com/finagle/finch), [Lagom](https://github.com/lagom/lagom), [Play](https://www.playframework.com/), Scalatra)                                                                                                                                                                                         |
+| **API documentation generators** | **HTML**, **Confluence Wiki**, **Asciidoc**, **Markdown**, **PlantUML**                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   |
+| **Configuration files**          | [**Apache2**](https://httpd.apache.org/)                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      |
+| **Others**                       | **GraphQL**, **JMeter**, **Ktorm**, **MySQL Schema**, **Protocol Buffer**, **WSDL**                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                |
 
 ## Table of contents
 
@@ -1094,7 +1094,7 @@ If you want to join the committee, please kindly apply by sending an email to te
 | Groovy            |                                                                                                                                                                                                                                   |
 | Haskell           |                                                                                                                                                                                                                                   |
 | Java              | @bbdouglas (2017/07) @sreeshas (2017/08) @jfiala (2017/08) @lukoyanov (2017/09) @cbornet (2017/09) @jeff9finger (2018/01) @karismann (2019/03) @Zomzog (2019/04) @lwlee2608 (2019/10)                        |
-| Java Spring             | @cachescrubber (2022/02) @welshm (2022/02) @MelleD (2022/02) @atextor (2022/02) @manedev79 (2022/02) @javisst (2022/02) @borsch (2022/02) @banlevente (2022/02) @Zomzog (2022/09)                   |
+| Java Spring             | @cachescrubber (2022/02) @welshm (2022/02) @MelleD (2022/02) @atextor (2022/02) @manedev79 (2022/02) @javisst (2022/02) @borsch (2022/02) @banlevente (2022/02)                    |
 | JMeter               | @kannkyo (2021/01)                                                                                                                                                                                                            |
 | Kotlin            | @jimschubert (2017/09) [:heart:](https://www.patreon.com/jimschubert), @dr4ke616 (2018/08) @karismann (2019/03) @Zomzog (2019/04) @andrewemery (2019/10) @4brunu (2019/11) @yutaka0m (2020/03)                                                        |
 | Lua               | @daurnimator (2017/08)                                                                                                                                                                                                            |

bin/configs/avro-schema.yaml

@@ -1,4 +1,4 @@
 generatorName: avro-schema
 outputDir: samples/openapi3/schema/petstore/avro-schema
-inputSpec: modules/openapi-generator/src/test/resources/3_0/avro-schema/petstore.yaml
+inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
 templateDir: modules/openapi-generator/src/main/resources/avro-schema

bin/configs/cpp-restbed-server.yaml

@@ -1,4 +0,0 @@
-generatorName: cpp-restbed-server
-outputDir: samples/server/petstore/cpp-restbed/generated/3_0
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml
-templateDir: modules/openapi-generator/src/main/resources/cpp-restbed-server

bin/configs/dart-dio-oneof-polymorphism-and-inheritance.yaml

@@ -1,11 +0,0 @@
-generatorName: dart-dio
-outputDir: samples/openapi3/client/petstore/dart-dio/oneof_polymorphism_and_inheritance
-inputSpec: modules/openapi-generator/src/test/resources/3_0/oneof_polymorphism_and_inheritance.yaml
-templateDir: modules/openapi-generator/src/main/resources/dart/libraries/dio
-typeMappings:
-  Client: "ModelClient"
-  File: "ModelFile"
-  EnumClass: "ModelEnumClass"
-additionalProperties:
-  hideGenerationTimestamp: "true"
-  enumUnknownDefaultCase: "true"

bin/configs/dart-dio-oneof-primitive.yaml

@@ -1,11 +0,0 @@
-generatorName: dart-dio
-outputDir: samples/openapi3/client/petstore/dart-dio/oneof_primitive
-inputSpec: modules/openapi-generator/src/test/resources/3_0/oneOf_primitive.yaml
-templateDir: modules/openapi-generator/src/main/resources/dart/libraries/dio
-typeMappings:
-  Client: "ModelClient"
-  File: "ModelFile"
-  EnumClass: "ModelEnumClass"
-additionalProperties:
-  hideGenerationTimestamp: "true"
-  enumUnknownDefaultCase: "true"

bin/configs/dart-dio-oneof.yaml

@@ -1,11 +0,0 @@
-generatorName: dart-dio
-outputDir: samples/openapi3/client/petstore/dart-dio/oneof
-inputSpec: modules/openapi-generator/src/test/resources/3_0/oneOf.yaml
-templateDir: modules/openapi-generator/src/main/resources/dart/libraries/dio
-typeMappings:
-  Client: "ModelClient"
-  File: "ModelFile"
-  EnumClass: "ModelEnumClass"
-additionalProperties:
-  hideGenerationTimestamp: "true"
-  enumUnknownDefaultCase: "true"

bin/configs/javascript-apollo.yaml

@@ -1,7 +0,0 @@
-generatorName: javascript
-outputDir: samples/client/petstore/javascript-apollo
-library: apollo
-inputSpec: modules/openapi-generator/src/test/resources/3_0/javascript/petstore-with-fake-endpoints-models-for-testing.yaml
-templateDir: modules/openapi-generator/src/main/resources/Javascript
-additionalProperties:
-  appName: PetstoreClient

bin/configs/javascript-es6.yaml

@@ -1,7 +1,6 @@
 generatorName: javascript
 outputDir: samples/client/petstore/javascript-es6
-library: javascript
 inputSpec: modules/openapi-generator/src/test/resources/3_0/javascript/petstore-with-fake-endpoints-models-for-testing.yaml
-templateDir: modules/openapi-generator/src/main/resources/Javascript
+templateDir: modules/openapi-generator/src/main/resources/Javascript/es6
 additionalProperties:
   appName: PetstoreClient

bin/configs/javascript-promise-es6.yaml

@@ -1,8 +1,7 @@
 generatorName: javascript
 outputDir: samples/client/petstore/javascript-promise-es6
-library: javascript
 inputSpec: modules/openapi-generator/src/test/resources/3_0/javascript/petstore-with-fake-endpoints-models-for-testing.yaml
-templateDir: modules/openapi-generator/src/main/resources/Javascript
+templateDir: modules/openapi-generator/src/main/resources/Javascript/es6
 additionalProperties:
   usePromises: "true"
   appName: PetstoreClient

bin/configs/other/cpp-restbed-server-cpp-restbed.yaml

@@ -1,4 +1,4 @@
 generatorName: cpp-restbed-server
-outputDir: samples/server/petstore/cpp-restbed/generated/2_0
+outputDir: samples/server/petstore/cpp-restbed
 inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
 templateDir: modules/openapi-generator/src/main/resources/cpp-restbed-server

bin/configs/other/javascript-apollo.yaml

@@ -0,0 +1,6 @@
+generatorName: javascript-apollo
+outputDir: samples/client/petstore/javascript-apollo
+inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
+templateDir: modules/openapi-generator/src/main/resources/Javascript-Apollo
+additionalProperties:
+  appName: PetstoreClient

bin/configs/other/openapi3/cpp-restbed-server-cpp-restbed.yaml

@@ -1,4 +1,4 @@
 generatorName: cpp-restbed-server
-outputDir: samples/server/petstore/cpp-restbed/generated/3_0
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml
+outputDir: samples/server/petstore/cpp-restbed
+inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
 templateDir: modules/openapi-generator/src/main/resources/cpp-restbed-server