diff --git a/docs/generators/ada-server.md b/docs/generators/ada-server.md
index ae41a6fb725cf39ad1af650b561d42d6b017af6f..bda2ebc4d610e9ce56899658dfb4013788266ff7 100644
--- a/docs/generators/ada-server.md
+++ b/docs/generators/ada-server.md
@@ -8,6 +8,7 @@ title: Documentation for the ada-server Generator
 | -------- | ----- | ----- |
 | generator name | ada-server | pass this to the generate command after -g |
 | generator type | SERVER | |
+| generator language | Ada | |
 | helpTxt | Generates an Ada server implementation (beta). | |
 
 ## CONFIG OPTIONS
diff --git a/docs/generators/ada.md b/docs/generators/ada.md
index ba6a764ac31b9c122c37500e3b0fc20d5bb72440..c7fc549290a9119bcd4630578fabfc097959c945 100644
--- a/docs/generators/ada.md
+++ b/docs/generators/ada.md
@@ -8,6 +8,7 @@ title: Documentation for the ada Generator
 | -------- | ----- | ----- |
 | generator name | ada | pass this to the generate command after -g |
 | generator type | CLIENT | |
+| generator language | Ada | |
 | helpTxt | Generates an Ada client implementation (beta). | |
 
 ## CONFIG OPTIONS
diff --git a/docs/generators/android.md b/docs/generators/android.md
index 53bde3fa48610dcd37d83788e86dcc423ea3debc..78336829f034ac947871a7a56924b895b1bfb9a3 100644
--- a/docs/generators/android.md
+++ b/docs/generators/android.md
@@ -8,6 +8,7 @@ title: Documentation for the android Generator
 | -------- | ----- | ----- |
 | generator name | android | pass this to the generate command after -g |
 | generator type | CLIENT | |
+| generator language | Java | |
 | helpTxt | Generates an Android client library. | |
 
 ## CONFIG OPTIONS
diff --git a/docs/generators/apache2.md b/docs/generators/apache2.md
index c31d64f49863aa58c676ff5ca5589082996584a7..9f5cfa8ed6caf20db7a2f9b2a50386eecb6ed906 100644
--- a/docs/generators/apache2.md
+++ b/docs/generators/apache2.md
@@ -8,6 +8,7 @@ title: Documentation for the apache2 Generator
 | -------- | ----- | ----- |
 | generator name | apache2 | pass this to the generate command after -g |
 | generator type | CONFIG | |
+| generator language | Java | |
 | helpTxt | Generates an Apache2 Config file with the permissions | |
 
 ## CONFIG OPTIONS
diff --git a/docs/generators/apex.md b/docs/generators/apex.md
index 5610d51d22e0fe17310012d39eebe192f0fbb9b7..7fc192390fa8ba36f17ae370defef66e77ade28d 100644
--- a/docs/generators/apex.md
+++ b/docs/generators/apex.md
@@ -8,6 +8,7 @@ title: Documentation for the apex Generator
 | -------- | ----- | ----- |
 | generator name | apex | pass this to the generate command after -g |
 | generator type | CLIENT | |
+| generator language | Apex | |
 | helpTxt | Generates an Apex API client library. | |
 
 ## CONFIG OPTIONS
diff --git a/docs/generators/asciidoc.md b/docs/generators/asciidoc.md
index a3b4795a2c83e8d5f35219cd1eb21822c0b97a62..815a5eea266b00d053ddea4f2c693a07ab79f1ac 100644
--- a/docs/generators/asciidoc.md
+++ b/docs/generators/asciidoc.md
@@ -8,6 +8,7 @@ title: Documentation for the asciidoc Generator
 | -------- | ----- | ----- |
 | generator name | asciidoc | pass this to the generate command after -g |
 | generator type | DOCUMENTATION | |
+| generator language | Java | |
 | helpTxt | Generates asciidoc markup based documentation. | |
 
 ## CONFIG OPTIONS
diff --git a/docs/generators/aspnetcore.md b/docs/generators/aspnetcore.md
index cebbaf9a870f04330ec552b216d0e17cc30ef2cb..f97033ac35a946f9a360cb889dfda532008df7af 100644
--- a/docs/generators/aspnetcore.md
+++ b/docs/generators/aspnetcore.md
@@ -8,6 +8,7 @@ title: Documentation for the aspnetcore Generator
 | -------- | ----- | ----- |
 | generator name | aspnetcore | pass this to the generate command after -g |
 | generator type | SERVER | |
+| generator language | C# | |
 | helpTxt | Generates an ASP.NET Core Web API server. | |
 
 ## CONFIG OPTIONS
diff --git a/docs/generators/avro-schema.md b/docs/generators/avro-schema.md
index 506aca5d85bd6f53f44aab4fc0c5844b2820c6c8..ce8261b07012c7a2bacf99d76a724d56ad58cc05 100644
--- a/docs/generators/avro-schema.md
+++ b/docs/generators/avro-schema.md
@@ -8,6 +8,7 @@ title: Documentation for the avro-schema Generator
 | -------- | ----- | ----- |
 | generator name | avro-schema | pass this to the generate command after -g |
 | generator type | SCHEMA | |
+| generator language | Java | |
 | helpTxt | Generates a Avro model (beta). | |
 
 ## CONFIG OPTIONS
diff --git a/docs/generators/bash.md b/docs/generators/bash.md
index 524c9534fa5750cd5d18319dc89cf4e99166243c..3356189af73dcf55e3f563e6843042cdf7a5158b 100644
--- a/docs/generators/bash.md
+++ b/docs/generators/bash.md
@@ -8,6 +8,7 @@ title: Documentation for the bash Generator
 | -------- | ----- | ----- |
 | generator name | bash | pass this to the generate command after -g |
 | generator type | CLIENT | |
+| generator language | Bash | |
 | helpTxt | Generates a Bash client script based on cURL. | |
 
 ## CONFIG OPTIONS
diff --git a/docs/generators/c.md b/docs/generators/c.md
index 3eb885a9a118899621f42cf8ff21aaab795be55b..d7006f36cc99b7980cef3ad3485e977114a224a5 100644
--- a/docs/generators/c.md
+++ b/docs/generators/c.md
@@ -8,6 +8,7 @@ title: Documentation for the c Generator
 | -------- | ----- | ----- |
 | generator name | c | pass this to the generate command after -g |
 | generator type | CLIENT | |
+| generator language | C | |
 | helpTxt | Generates a C (libcurl) client library (beta). | |
 
 ## CONFIG OPTIONS
diff --git a/docs/generators/clojure.md b/docs/generators/clojure.md
index 2f5fadc54c98358d77d4cd852bafd1f23d55effe..7cc512620edcee9e993034ffc947784184da8ede 100644
--- a/docs/generators/clojure.md
+++ b/docs/generators/clojure.md
@@ -8,6 +8,7 @@ title: Documentation for the clojure Generator
 | -------- | ----- | ----- |
 | generator name | clojure | pass this to the generate command after -g |
 | generator type | CLIENT | |
+| generator language | Clojure | |
 | helpTxt | Generates a Clojure client library. | |
 
 ## CONFIG OPTIONS
diff --git a/docs/generators/cpp-pistache-server.md b/docs/generators/cpp-pistache-server.md
index d58a5f17572d7fb7a17386ff977c731204d9afa5..f9c171feeebed3c658997a07f29a5f4d8dbe1f8b 100644
--- a/docs/generators/cpp-pistache-server.md
+++ b/docs/generators/cpp-pistache-server.md
@@ -8,6 +8,7 @@ title: Documentation for the cpp-pistache-server Generator
 | -------- | ----- | ----- |
 | generator name | cpp-pistache-server | pass this to the generate command after -g |
 | generator type | SERVER | |
+| generator language | C++ | |
 | helpTxt | Generates a C++ API server (based on Pistache) | |
 
 ## CONFIG OPTIONS
diff --git a/docs/generators/cpp-qt-client.md b/docs/generators/cpp-qt-client.md
index 8ad0c33d85cd05c7ab529a769d74022dcf5fd09a..f26b827b8d48af6b24bb8a2426ce0e5bf1adc2d5 100644
--- a/docs/generators/cpp-qt-client.md
+++ b/docs/generators/cpp-qt-client.md
@@ -8,6 +8,7 @@ title: Documentation for the cpp-qt-client Generator
 | -------- | ----- | ----- |
 | generator name | cpp-qt-client | pass this to the generate command after -g |
 | generator type | CLIENT | |
+| generator language | C++ | |
 | helpTxt | Generates a Qt C++ client library. | |
 
 ## CONFIG OPTIONS
diff --git a/docs/generators/cpp-qt-qhttpengine-server.md b/docs/generators/cpp-qt-qhttpengine-server.md
index 99dbeca8759279025962780fa4dbe65e321982b9..42d3f4c7e04b22c0ad1c98542b9283699b40b29b 100644
--- a/docs/generators/cpp-qt-qhttpengine-server.md
+++ b/docs/generators/cpp-qt-qhttpengine-server.md
@@ -8,6 +8,7 @@ title: Documentation for the cpp-qt-qhttpengine-server Generator
 | -------- | ----- | ----- |
 | generator name | cpp-qt-qhttpengine-server | pass this to the generate command after -g |
 | generator type | SERVER | |
+| generator language | C++ | |
 | helpTxt | Generates a Qt C++ Server using the QHTTPEngine HTTP Library. | |
 
 ## CONFIG OPTIONS
diff --git a/docs/generators/cpp-restbed-server.md b/docs/generators/cpp-restbed-server.md
index 193e11cc92d8425ec0140da939e0c48bc8ead70f..065ead399b78d8d773456c8ea515f8941a9b3ddd 100644
--- a/docs/generators/cpp-restbed-server.md
+++ b/docs/generators/cpp-restbed-server.md
@@ -8,6 +8,7 @@ title: Documentation for the cpp-restbed-server Generator
 | -------- | ----- | ----- |
 | generator name | cpp-restbed-server | pass this to the generate command after -g |
 | generator type | SERVER | |
+| generator language | C++ | |
 | helpTxt | Generates a C++ API Server with Restbed (https://github.com/Corvusoft/restbed). | |
 
 ## CONFIG OPTIONS
diff --git a/docs/generators/cpp-restsdk.md b/docs/generators/cpp-restsdk.md
index 480178fdf6220731192ba7064e5067f4337244df..fa04e41dcd7e13063387c16f452ae0136893c82a 100644
--- a/docs/generators/cpp-restsdk.md
+++ b/docs/generators/cpp-restsdk.md
@@ -8,6 +8,7 @@ title: Documentation for the cpp-restsdk Generator
 | -------- | ----- | ----- |
 | generator name | cpp-restsdk | pass this to the generate command after -g |
 | generator type | CLIENT | |
+| generator language | C++ | |
 | helpTxt | Generates a C++ API client with C++ REST SDK (https://github.com/Microsoft/cpprestsdk). | |
 
 ## CONFIG OPTIONS
diff --git a/docs/generators/cpp-tiny.md b/docs/generators/cpp-tiny.md
index 006561e38f7ea6696b0808b1c6c053b497fd9481..e669c1ad7c4dfbbecc86b129028ede0e0d84b535 100644
--- a/docs/generators/cpp-tiny.md
+++ b/docs/generators/cpp-tiny.md
@@ -8,6 +8,7 @@ title: Documentation for the cpp-tiny Generator
 | -------- | ----- | ----- |
 | generator name | cpp-tiny | pass this to the generate command after -g |
 | generator type | CLIENT | |
+| generator language | C++ | |
 | helpTxt | Generates a C++ Arduino REST API client. | |
 
 ## CONFIG OPTIONS
diff --git a/docs/generators/cpp-tizen.md b/docs/generators/cpp-tizen.md
index 4f40b91b7d3b502dd5c47b23348cddea3dfbb335..0528620b7769cf02b6f75f0c555d35516f675392 100644
--- a/docs/generators/cpp-tizen.md
+++ b/docs/generators/cpp-tizen.md
@@ -8,6 +8,7 @@ title: Documentation for the cpp-tizen Generator
 | -------- | ----- | ----- |
 | generator name | cpp-tizen | pass this to the generate command after -g |
 | generator type | CLIENT | |
+| generator language | C++ | |
 | helpTxt | Generates a Samsung Tizen C++ client library. | |
 
 ## CONFIG OPTIONS
diff --git a/docs/generators/cpp-ue4.md b/docs/generators/cpp-ue4.md
index a2961af1612e7baf95172b409166c8e508195e74..56eb1c96799800c99f281b35ec0ff4902aaa7baa 100644
--- a/docs/generators/cpp-ue4.md
+++ b/docs/generators/cpp-ue4.md
@@ -8,6 +8,7 @@ title: Documentation for the cpp-ue4 Generator
 | -------- | ----- | ----- |
 | generator name | cpp-ue4 | pass this to the generate command after -g |
 | generator type | CLIENT | |
+| generator language | C++ | |
 | helpTxt | Generates a Unreal Engine 4 C++ Module (beta). | |
 
 ## CONFIG OPTIONS
diff --git a/docs/generators/crystal.md b/docs/generators/crystal.md
index eaacb566be9448e3fe9e294b167a7e326baf79f2..d44e727ddbb486fbd7074f418ab1bb0dc9df24de 100644
--- a/docs/generators/crystal.md
+++ b/docs/generators/crystal.md
@@ -8,6 +8,7 @@ title: Documentation for the crystal Generator
 | -------- | ----- | ----- |
 | generator name | crystal | pass this to the generate command after -g |
 | generator type | CLIENT | |
+| generator language | Crystal | |
 | helpTxt | Generates a Crystal client library (beta). | |
 
 ## CONFIG OPTIONS
diff --git a/docs/generators/csharp-dotnet2.md b/docs/generators/csharp-dotnet2.md
index b1d47b73ac6d14a6d86b2715eb08fddad1431080..22fbde9e287ce54cd7145c915044bc8370254f21 100644
--- a/docs/generators/csharp-dotnet2.md
+++ b/docs/generators/csharp-dotnet2.md
@@ -8,6 +8,7 @@ title: Documentation for the csharp-dotnet2 Generator
 | -------- | ----- | ----- |
 | generator name | csharp-dotnet2 | pass this to the generate command after -g |
 | generator type | CLIENT | |
+| generator language | C# | |
 | helpTxt | Generates a C# .Net 2.0 client library (beta). | |
 
 ## CONFIG OPTIONS
diff --git a/docs/generators/csharp-nancyfx.md b/docs/generators/csharp-nancyfx.md
index b8b5928ed6309e35fb0d971cfb73826f4677a202..c20541a52f9a03c60500e39c673303c386e287c9 100644
--- a/docs/generators/csharp-nancyfx.md
+++ b/docs/generators/csharp-nancyfx.md
@@ -8,6 +8,7 @@ title: Documentation for the csharp-nancyfx Generator
 | -------- | ----- | ----- |
 | generator name | csharp-nancyfx | pass this to the generate command after -g |
 | generator type | SERVER | |
+| generator language | C# | |
 | helpTxt | Generates a C# NancyFX Web API server. | |
 
 ## CONFIG OPTIONS
diff --git a/docs/generators/csharp-netcore-functions.md b/docs/generators/csharp-netcore-functions.md
index 6d8565773173858c8642efe19a9eff4182842a27..888ada381288ae71a2a98fd139a98a67a6de18e8 100644
--- a/docs/generators/csharp-netcore-functions.md
+++ b/docs/generators/csharp-netcore-functions.md
@@ -8,6 +8,7 @@ title: Documentation for the csharp-netcore-functions Generator
 | -------- | ----- | ----- |
 | generator name | csharp-netcore-functions | pass this to the generate command after -g |
 | generator type | SERVER | |
+| generator language | C# | |
 | helpTxt | Generates a csharp server. | |
 
 ## CONFIG OPTIONS
diff --git a/docs/generators/csharp-netcore.md b/docs/generators/csharp-netcore.md
index 33b124200fb6c069b8cbc24e1846dfadf4008e95..57d4e3ac2b6d3f44f7e97005d86765e8df6d0554 100644
--- a/docs/generators/csharp-netcore.md
+++ b/docs/generators/csharp-netcore.md
@@ -8,6 +8,7 @@ title: Documentation for the csharp-netcore Generator
 | -------- | ----- | ----- |
 | generator name | csharp-netcore | pass this to the generate command after -g |
 | generator type | CLIENT | |
+| generator language | C# | |
 | helpTxt | Generates a C# client library (.NET Standard, .NET Core). | |
 
 ## CONFIG OPTIONS
diff --git a/docs/generators/csharp.md b/docs/generators/csharp.md
index c925eecc8e73730006bce3d98d981d02b9247da4..2a61a6fa326a12ec0655225a90d1178d8dc8c61c 100644
--- a/docs/generators/csharp.md
+++ b/docs/generators/csharp.md
@@ -8,6 +8,7 @@ title: Documentation for the csharp Generator
 | -------- | ----- | ----- |
 | generator name | csharp | pass this to the generate command after -g |
 | generator type | CLIENT | |
+| generator language | C# | |
 | helpTxt | Generates a CSharp client library. | |
 
 ## CONFIG OPTIONS
diff --git a/docs/generators/dart-dio-next.md b/docs/generators/dart-dio-next.md
index 07b20e71d1a433aacfaeea6b120899abdc61ef7f..157fb47af53756065b3796826f69401e9d2049f2 100644
--- a/docs/generators/dart-dio-next.md
+++ b/docs/generators/dart-dio-next.md
@@ -8,6 +8,7 @@ title: Documentation for the dart-dio-next Generator
 | -------- | ----- | ----- |
 | generator name | dart-dio-next | pass this to the generate command after -g |
 | generator type | CLIENT | |
+| generator language | Dart | |
 | helpTxt | Generates a Dart Dio client library with null-safety. | |
 
 ## CONFIG OPTIONS
diff --git a/docs/generators/dart-dio.md b/docs/generators/dart-dio.md
index 77aeaab25381bca9099232a960e5036dfd46895e..2ef52cbffe49be64ccfbf5083a98e573dfb60199 100644
--- a/docs/generators/dart-dio.md
+++ b/docs/generators/dart-dio.md
@@ -8,6 +8,7 @@ title: Documentation for the dart-dio Generator
 | -------- | ----- | ----- |
 | generator name | dart-dio | pass this to the generate command after -g |
 | generator type | CLIENT | |
+| generator language | Dart | |
 | helpTxt | Generates a Dart Dio client library. | |
 
 ## CONFIG OPTIONS
diff --git a/docs/generators/dart-jaguar.md b/docs/generators/dart-jaguar.md
index 1cbdd8bad482a424ad2f4d9eb8b313cecead2ffa..7bae4db6903ef9c50c5f742219200b11eef9bdad 100644
--- a/docs/generators/dart-jaguar.md
+++ b/docs/generators/dart-jaguar.md
@@ -8,6 +8,7 @@ title: Documentation for the dart-jaguar Generator
 | -------- | ----- | ----- |
 | generator name | dart-jaguar | pass this to the generate command after -g |
 | generator type | CLIENT | |
+| generator language | Dart | |
 | helpTxt | Generates a Dart Jaguar client library. | |
 
 ## CONFIG OPTIONS
diff --git a/docs/generators/dart.md b/docs/generators/dart.md
index 7793319b30f176e1b0a32f3f4a4f77602c39ad55..0193acff4a9cb3cf4e99a20eafe37ee68ddbaaf7 100644
--- a/docs/generators/dart.md
+++ b/docs/generators/dart.md
@@ -8,6 +8,7 @@ title: Documentation for the dart Generator
 | -------- | ----- | ----- |
 | generator name | dart | pass this to the generate command after -g |
 | generator type | CLIENT | |
+| generator language | Dart | |
 | helpTxt | Generates a Dart 2.x client library. | |
 
 ## CONFIG OPTIONS
diff --git a/docs/generators/eiffel.md b/docs/generators/eiffel.md
index 151654c6f146e7d8fc3b484fa054643c99f0191a..b9406ac1f60e3f4ff21794a9c69b44e8f55ff328 100644
--- a/docs/generators/eiffel.md
+++ b/docs/generators/eiffel.md
@@ -8,6 +8,7 @@ title: Documentation for the eiffel Generator
 | -------- | ----- | ----- |
 | generator name | eiffel | pass this to the generate command after -g |
 | generator type | CLIENT | |
+| generator language | Eiffel | |
 | helpTxt | Generates a Eiffel client library (beta). | |
 
 ## CONFIG OPTIONS
diff --git a/docs/generators/elixir.md b/docs/generators/elixir.md
index 2a6d9d93e4cae88afc5f634b6aea0d96bad6cdf3..7444741084879dda64493515c0c1c6499d63c473 100644
--- a/docs/generators/elixir.md
+++ b/docs/generators/elixir.md
@@ -8,6 +8,7 @@ title: Documentation for the elixir Generator
 | -------- | ----- | ----- |
 | generator name | elixir | pass this to the generate command after -g |
 | generator type | CLIENT | |
+| generator language | Elixir | |
 | helpTxt | Generates an elixir client library (alpha). | |
 
 ## CONFIG OPTIONS
diff --git a/docs/generators/elm.md b/docs/generators/elm.md
index 79ff7df2e322dbfc54827f675faf621b3abd0884..c26c96f85ebfa7f450e0660af6e52d8d147c943d 100644
--- a/docs/generators/elm.md
+++ b/docs/generators/elm.md
@@ -8,6 +8,7 @@ title: Documentation for the elm Generator
 | -------- | ----- | ----- |
 | generator name | elm | pass this to the generate command after -g |
 | generator type | CLIENT | |
+| generator language | Elm | |
 | helpTxt | Generates an Elm client library. | |
 
 ## CONFIG OPTIONS
diff --git a/docs/generators/erlang-client.md b/docs/generators/erlang-client.md
index 3436fc2faadd3f33ef9eb5fa7ae02397fd91aea1..afa0291fd211acd21dfe0e7caf8f897fb907771b 100644
--- a/docs/generators/erlang-client.md
+++ b/docs/generators/erlang-client.md
@@ -8,6 +8,7 @@ title: Documentation for the erlang-client Generator
 | -------- | ----- | ----- |
 | generator name | erlang-client | pass this to the generate command after -g |
 | generator type | CLIENT | |
+| generator language | Erlang | |
 | helpTxt | Generates an Erlang client library (beta). | |
 
 ## CONFIG OPTIONS
diff --git a/docs/generators/erlang-proper.md b/docs/generators/erlang-proper.md
index 0a50ff9c2850782d861c670cc3be9c38db09843e..48571920cfd59441d6e380eee977b93e6fa31f52 100644
--- a/docs/generators/erlang-proper.md
+++ b/docs/generators/erlang-proper.md
@@ -8,6 +8,7 @@ title: Documentation for the erlang-proper Generator
 | -------- | ----- | ----- |
 | generator name | erlang-proper | pass this to the generate command after -g |
 | generator type | CLIENT | |
+| generator language | Erlang | |
 | helpTxt | Generates an Erlang library with PropEr generators (beta). | |
 
 ## CONFIG OPTIONS
diff --git a/docs/generators/erlang-server.md b/docs/generators/erlang-server.md
index c6bbba108b4526d06e4adf7714d1d596f6a58e02..15a38755f5a94e1e26a40f3b6b27a705511b91ff 100644
--- a/docs/generators/erlang-server.md
+++ b/docs/generators/erlang-server.md
@@ -8,6 +8,7 @@ title: Documentation for the erlang-server Generator
 | -------- | ----- | ----- |
 | generator name | erlang-server | pass this to the generate command after -g |
 | generator type | SERVER | |
+| generator language | Erlang | |
 | helpTxt | Generates an Erlang server library (beta) using OpenAPI Generator (https://openapi-generator.tech). By default, it will also generate service classes, which can be disabled with the `-Dnoservice` environment variable. | |
 
 ## CONFIG OPTIONS
diff --git a/docs/generators/flash-deprecated.md b/docs/generators/flash-deprecated.md
index b82898633d4ab0e773cb0e732100c1c5ac3b4166..b5669b0e2ea7d5329f1ccc0bfde6830e44e91924 100644
--- a/docs/generators/flash-deprecated.md
+++ b/docs/generators/flash-deprecated.md
@@ -8,6 +8,7 @@ title: Documentation for the flash-deprecated Generator
 | -------- | ----- | ----- |
 | generator name | flash-deprecated | pass this to the generate command after -g |
 | generator type | CLIENT | |
+| generator language | Flash | |
 | helpTxt | Generates a Flash (ActionScript) client library (beta). IMPORTANT: this generator has been deprecated in v5.x | |
 
 ## CONFIG OPTIONS
diff --git a/docs/generators/fsharp-functions.md b/docs/generators/fsharp-functions.md
index 534dbbc445f5524bc07b54b286c69d2382b42e11..5d148d8fe2fb5b9b7ba34de4133e95430cb545b8 100644
--- a/docs/generators/fsharp-functions.md
+++ b/docs/generators/fsharp-functions.md
@@ -8,6 +8,7 @@ title: Documentation for the fsharp-functions Generator
 | -------- | ----- | ----- |
 | generator name | fsharp-functions | pass this to the generate command after -g |
 | generator type | SERVER | |
+| generator language | F# | |
 | helpTxt | Generates a fsharp-functions server (beta). | |
 
 ## CONFIG OPTIONS
diff --git a/docs/generators/fsharp-giraffe-server.md b/docs/generators/fsharp-giraffe-server.md
index fe1c0c180b40fe1ffa18a93773c2ed844f4108a0..176603a31355f580ec52a65ca4e27cd9062c994b 100644
--- a/docs/generators/fsharp-giraffe-server.md
+++ b/docs/generators/fsharp-giraffe-server.md
@@ -8,6 +8,7 @@ title: Documentation for the fsharp-giraffe-server Generator
 | -------- | ----- | ----- |
 | generator name | fsharp-giraffe-server | pass this to the generate command after -g |
 | generator type | SERVER | |
+| generator language | F# | |
 | helpTxt | Generates a F# Giraffe server (beta). | |
 
 ## CONFIG OPTIONS
diff --git a/docs/generators/go-deprecated.md b/docs/generators/go-deprecated.md
index cb19432610dd83ec9710f4a02e8adc976a7b91fa..fa44c2c81ad71adb8d91741916d4fe06335b1bb8 100644
--- a/docs/generators/go-deprecated.md
+++ b/docs/generators/go-deprecated.md
@@ -8,6 +8,7 @@ title: Documentation for the go-deprecated Generator
 | -------- | ----- | ----- |
 | generator name | go-deprecated | pass this to the generate command after -g |
 | generator type | CLIENT | |
+| generator language | Go | |
 | helpTxt | Generates a Go client library (beta). NOTE: this generator has been deprecated. Please use `go` client generator instead. | |
 
 ## CONFIG OPTIONS
diff --git a/docs/generators/go-echo-server.md b/docs/generators/go-echo-server.md
index 9ad9e61c95269a1e6c5a40b162b9d63021ef270b..9f4a8e2e2363d2c97ae227c77bebe9c1e633ef29 100644
--- a/docs/generators/go-echo-server.md
+++ b/docs/generators/go-echo-server.md
@@ -8,6 +8,7 @@ title: Documentation for the go-echo-server Generator
 | -------- | ----- | ----- |
 | generator name | go-echo-server | pass this to the generate command after -g |
 | generator type | SERVER | |
+| generator language | Go | |
 | helpTxt | Generates a go-echo server. (Beta) | |
 
 ## CONFIG OPTIONS
diff --git a/docs/generators/go-gin-server.md b/docs/generators/go-gin-server.md
index 85c1e5efbc4b82e8c7cbebba429846ff599c5fdb..86f6b26bdd87a30ae7235eea5c94ec68a31c3caa 100644
--- a/docs/generators/go-gin-server.md
+++ b/docs/generators/go-gin-server.md
@@ -8,6 +8,7 @@ title: Documentation for the go-gin-server Generator
 | -------- | ----- | ----- |
 | generator name | go-gin-server | pass this to the generate command after -g |
 | generator type | SERVER | |
+| generator language | Go | |
 | helpTxt | Generates a Go server library with the gin framework using OpenAPI-Generator.By default, it will also generate service classes. | |
 
 ## CONFIG OPTIONS
diff --git a/docs/generators/go-server.md b/docs/generators/go-server.md
index f3f0a91da944e579a8a7993cffedd1b7260e5812..310a212a504926e5848ae86b383d952073621157 100644
--- a/docs/generators/go-server.md
+++ b/docs/generators/go-server.md
@@ -8,6 +8,7 @@ title: Documentation for the go-server Generator
 | -------- | ----- | ----- |
 | generator name | go-server | pass this to the generate command after -g |
 | generator type | SERVER | |
+| generator language | Go | |
 | helpTxt | Generates a Go server library using OpenAPI-Generator. By default, it will also generate service classes -- which you can disable with the `-Dnoservice` environment variable. | |
 
 ## CONFIG OPTIONS
diff --git a/docs/generators/go.md b/docs/generators/go.md
index 1bb81764435bee0a349b52c0172c5d13538581c6..4a005d47ac0e5fd6f4055dc0c7491fd1ffff1da6 100644
--- a/docs/generators/go.md
+++ b/docs/generators/go.md
@@ -8,6 +8,7 @@ title: Documentation for the go Generator
 | -------- | ----- | ----- |
 | generator name | go | pass this to the generate command after -g |
 | generator type | CLIENT | |
+| generator language | Go | |
 | helpTxt | Generates a Go client library. | |
 
 ## CONFIG OPTIONS
diff --git a/docs/generators/graphql-nodejs-express-server.md b/docs/generators/graphql-nodejs-express-server.md
index a1f1248d285e98f624be1f1487e82d2e555491aa..8d323b1b7bcdb596a73208de7113a7845ab0ab8d 100644
--- a/docs/generators/graphql-nodejs-express-server.md
+++ b/docs/generators/graphql-nodejs-express-server.md
@@ -8,6 +8,7 @@ title: Documentation for the graphql-nodejs-express-server Generator
 | -------- | ----- | ----- |
 | generator name | graphql-nodejs-express-server | pass this to the generate command after -g |
 | generator type | SERVER | |
+| generator language | Javascript | |
 | helpTxt | Generates a GraphQL Node.js Express server (beta) including it's types, queries, mutations, (resolvers) | |
 
 ## CONFIG OPTIONS
diff --git a/docs/generators/graphql-schema.md b/docs/generators/graphql-schema.md
index ecdedafb3daad7fd3b6f838a6ce0496de049213e..a5c60cf1a15074c9b3c8fca61d962d28e4b82e03 100644
--- a/docs/generators/graphql-schema.md
+++ b/docs/generators/graphql-schema.md
@@ -8,6 +8,7 @@ title: Documentation for the graphql-schema Generator
 | -------- | ----- | ----- |
 | generator name | graphql-schema | pass this to the generate command after -g |
 | generator type | SCHEMA | |
+| generator language | GraphQL | |
 | helpTxt | Generates GraphQL schema files (beta) | |
 
 ## CONFIG OPTIONS
diff --git a/docs/generators/groovy.md b/docs/generators/groovy.md
index 18c943c286071e775ca3953dd043a6f27311d9bd..a7d42bb7c05c14062897ecb32f8e613545487689 100644
--- a/docs/generators/groovy.md
+++ b/docs/generators/groovy.md
@@ -8,6 +8,7 @@ title: Documentation for the groovy Generator
 | -------- | ----- | ----- |
 | generator name | groovy | pass this to the generate command after -g |
 | generator type | CLIENT | |
+| generator language | Groovy | |
 | helpTxt | Generates a Groovy API client. | |
 
 ## CONFIG OPTIONS
diff --git a/docs/generators/haskell-http-client.md b/docs/generators/haskell-http-client.md
index 4515d4ad850fd74686e9c02bd636f1c1356822b1..8ffbcdb5cfd09c95972962426cef1ebb699445cc 100644
--- a/docs/generators/haskell-http-client.md
+++ b/docs/generators/haskell-http-client.md
@@ -8,6 +8,7 @@ title: Documentation for the haskell-http-client Generator
 | -------- | ----- | ----- |
 | generator name | haskell-http-client | pass this to the generate command after -g |
 | generator type | CLIENT | |
+| generator language | Haskell | |
 | helpTxt | Generates a Haskell http-client library. | |
 
 ## CONFIG OPTIONS
diff --git a/docs/generators/haskell-yesod.md b/docs/generators/haskell-yesod.md
index 7993d7988b2e486ac105a43bbd971db105c00b8c..3b472c8a28beea66c9c3780a925b95cb206786a5 100644
--- a/docs/generators/haskell-yesod.md
+++ b/docs/generators/haskell-yesod.md
@@ -8,6 +8,7 @@ title: Documentation for the haskell-yesod Generator
 | -------- | ----- | ----- |
 | generator name | haskell-yesod | pass this to the generate command after -g |
 | generator type | SERVER | |
+| generator language | Haskell | |
 | helpTxt | Generates a haskell-yesod server. | |
 
 ## CONFIG OPTIONS
diff --git a/docs/generators/haskell.md b/docs/generators/haskell.md
index 28e698254937ec373b90e3e1cbb17805a4b49600..b2ebcdaa699669715d3bb1460cf4c5cefaab925f 100644
--- a/docs/generators/haskell.md
+++ b/docs/generators/haskell.md
@@ -8,6 +8,7 @@ title: Documentation for the haskell Generator
 | -------- | ----- | ----- |
 | generator name | haskell | pass this to the generate command after -g |
 | generator type | SERVER | |
+| generator language | Haskell | |
 | helpTxt | Generates a Haskell server and client library. | |
 
 ## CONFIG OPTIONS
diff --git a/docs/generators/java-inflector.md b/docs/generators/java-inflector.md
index 48b4070382e90a6000cbd13d0693bb19fa6ea0ca..d397419112fcd503c87d2f8b1a1fa67f038584a4 100644
--- a/docs/generators/java-inflector.md
+++ b/docs/generators/java-inflector.md
@@ -8,6 +8,7 @@ title: Documentation for the java-inflector Generator
 | -------- | ----- | ----- |
 | generator name | java-inflector | pass this to the generate command after -g |
 | generator type | SERVER | |
+| generator language | Java | |
 | helpTxt | Generates a Java Inflector Server application. | |
 
 ## CONFIG OPTIONS
diff --git a/docs/generators/java-micronaut-client.md b/docs/generators/java-micronaut-client.md
index 898f2ee2f334b0d0381ca52c8853edb55d7cb6b6..75c961bcf92de14f9382fc8ba4da485516cf6b13 100644
--- a/docs/generators/java-micronaut-client.md
+++ b/docs/generators/java-micronaut-client.md
@@ -8,6 +8,7 @@ title: Documentation for the java-micronaut-client Generator
 | -------- | ----- | ----- |
 | generator name | java-micronaut-client | pass this to the generate command after -g |
 | generator type | CLIENT | |
+| generator language | Java | |
 | helpTxt | Generates a Java Micronaut Client. | |
 
 ## CONFIG OPTIONS
diff --git a/docs/generators/java-msf4j.md b/docs/generators/java-msf4j.md
index fd0b6ec7c2747ff8677a84416749ae37d69d20da..7b92e9cad42f1f07f5f264037fe098ecbb231e9b 100644
--- a/docs/generators/java-msf4j.md
+++ b/docs/generators/java-msf4j.md
@@ -8,6 +8,7 @@ title: Documentation for the java-msf4j Generator
 | -------- | ----- | ----- |
 | generator name | java-msf4j | pass this to the generate command after -g |
 | generator type | SERVER | |
+| generator language | Java | |
 | helpTxt | Generates a Java Micro Service based on WSO2 Microservices Framework for Java (MSF4J) | |
 
 ## CONFIG OPTIONS
diff --git a/docs/generators/java-pkmst.md b/docs/generators/java-pkmst.md
index 9731d407c37bc4e1ce5b5d3c323c66e0669be8a4..18b27e77430acc881d356e3e5905df03317444b6 100644
--- a/docs/generators/java-pkmst.md
+++ b/docs/generators/java-pkmst.md
@@ -8,6 +8,7 @@ title: Documentation for the java-pkmst Generator
 | -------- | ----- | ----- |
 | generator name | java-pkmst | pass this to the generate command after -g |
 | generator type | SERVER | |
+| generator language | Java | |
 | helpTxt | Generates a PKMST SpringBoot Server application using the SpringFox integration. Also enables EurekaServerClient / Zipkin / Spring-Boot admin | |
 
 ## CONFIG OPTIONS
diff --git a/docs/generators/java-play-framework.md b/docs/generators/java-play-framework.md
index 8137dc2f7a6f21b9e372d310cbb48d1fea5f7bc0..abc3d0b4239ddd53f7cd852908dc180574c4edb3 100644
--- a/docs/generators/java-play-framework.md
+++ b/docs/generators/java-play-framework.md
@@ -8,6 +8,7 @@ title: Documentation for the java-play-framework Generator
 | -------- | ----- | ----- |
 | generator name | java-play-framework | pass this to the generate command after -g |
 | generator type | SERVER | |
+| generator language | Java | |
 | helpTxt | Generates a Java Play Framework Server application. | |
 
 ## CONFIG OPTIONS
diff --git a/docs/generators/java-undertow-server.md b/docs/generators/java-undertow-server.md
index 340ae31025b471e231b237a1c04904c3448c13ef..b359cf88035ce6bbf20a32e86430b94a6ef31bff 100644
--- a/docs/generators/java-undertow-server.md
+++ b/docs/generators/java-undertow-server.md
@@ -8,6 +8,7 @@ title: Documentation for the java-undertow-server Generator
 | -------- | ----- | ----- |
 | generator name | java-undertow-server | pass this to the generate command after -g |
 | generator type | SERVER | |
+| generator language | Java | |
 | helpTxt | Generates a Java Undertow Server application (beta). | |
 
 ## CONFIG OPTIONS
diff --git a/docs/generators/java-vertx-web.md b/docs/generators/java-vertx-web.md
index 5d4946c67d42895bfd57a0a6ef6aaf5469cc6643..4e599a29d086ffc1d61b361401d0feb26285516f 100644
--- a/docs/generators/java-vertx-web.md
+++ b/docs/generators/java-vertx-web.md
@@ -8,6 +8,7 @@ title: Documentation for the java-vertx-web Generator
 | -------- | ----- | ----- |
 | generator name | java-vertx-web | pass this to the generate command after -g |
 | generator type | SERVER | |
+| generator language | Java | |
 | helpTxt | Generates a Java Vert.x-Web Server (beta). | |
 
 ## CONFIG OPTIONS
diff --git a/docs/generators/java-vertx.md b/docs/generators/java-vertx.md
index 82660a9c9eacdff72196b7e76df217770f36d6d5..96ffc3ee9758e9ada0ca91a4faf6d32261440746 100644
--- a/docs/generators/java-vertx.md
+++ b/docs/generators/java-vertx.md
@@ -8,6 +8,7 @@ title: Documentation for the java-vertx Generator
 | -------- | ----- | ----- |
 | generator name | java-vertx | pass this to the generate command after -g |
 | generator type | SERVER | |
+| generator language | Java | |
 | helpTxt | Generates a java-Vert.X Server library. | |
 
 ## CONFIG OPTIONS
diff --git a/docs/generators/java.md b/docs/generators/java.md
index 90aa5d73f66a2e77a430c95ab47ad8663bf25fa3..dae11b0a614db1354fce699cc85f07703ab49a7e 100644
--- a/docs/generators/java.md
+++ b/docs/generators/java.md
@@ -8,6 +8,7 @@ title: Documentation for the java Generator
 | -------- | ----- | ----- |
 | generator name | java | pass this to the generate command after -g |
 | generator type | CLIENT | |
+| generator language | Java | |
 | helpTxt | Generates a Java client library (HTTP lib: Jersey (1.x, 2.x), Retrofit (2.x), OpenFeign (10.x) and more. | |
 
 ## CONFIG OPTIONS
diff --git a/docs/generators/javascript-apollo.md b/docs/generators/javascript-apollo.md
index 3129864fb3315aef1a6185cbe6766ffa1c52d276..9d91580aba7611380c8bd6729adeea6550c92895 100644
--- a/docs/generators/javascript-apollo.md
+++ b/docs/generators/javascript-apollo.md
@@ -8,6 +8,7 @@ title: Documentation for the javascript-apollo Generator
 | -------- | ----- | ----- |
 | generator name | javascript-apollo | pass this to the generate command after -g |
 | generator type | CLIENT | |
+| generator language | Javascript | |
 | helpTxt | Generates a JavaScript client library (beta) using Apollo RESTDatasource. | |
 
 ## CONFIG OPTIONS
diff --git a/docs/generators/javascript-closure-angular.md b/docs/generators/javascript-closure-angular.md
index b9da1dc8f55ce1b2fe42f0793ed90e116e6141ac..aa2b36502f9d96d317e80c8a9be9f471b7c15500 100644
--- a/docs/generators/javascript-closure-angular.md
+++ b/docs/generators/javascript-closure-angular.md
@@ -8,6 +8,7 @@ title: Documentation for the javascript-closure-angular Generator
 | -------- | ----- | ----- |
 | generator name | javascript-closure-angular | pass this to the generate command after -g |
 | generator type | CLIENT | |
+| generator language | Javascript | |
 | helpTxt | Generates a Javascript AngularJS client library (beta) annotated with Google Closure Compiler annotations(https://developers.google.com/closure/compiler/docs/js-for-compiler?hl=en) | |
 
 ## CONFIG OPTIONS
diff --git a/docs/generators/javascript-flowtyped.md b/docs/generators/javascript-flowtyped.md
index 76b81c5aa822af5ad7221091e2e4b124e590f651..e404f23e631d594d1df8de1def2b8412e9978394 100644
--- a/docs/generators/javascript-flowtyped.md
+++ b/docs/generators/javascript-flowtyped.md
@@ -8,6 +8,7 @@ title: Documentation for the javascript-flowtyped Generator
 | -------- | ----- | ----- |
 | generator name | javascript-flowtyped | pass this to the generate command after -g |
 | generator type | CLIENT | |
+| generator language | Javascript | |
 | helpTxt | Generates a Javascript client library (beta) using Flow types and Fetch API. | |
 
 ## CONFIG OPTIONS
diff --git a/docs/generators/javascript.md b/docs/generators/javascript.md
index 2381c5108f3303646668ee7d7f1cf6152bab5117..ce8123c03b293a44e753f14df44b8f8f1555880b 100644
--- a/docs/generators/javascript.md
+++ b/docs/generators/javascript.md
@@ -8,6 +8,7 @@ title: Documentation for the javascript Generator
 | -------- | ----- | ----- |
 | generator name | javascript | pass this to the generate command after -g |
 | generator type | CLIENT | |
+| generator language | Javascript | |
 | helpTxt | Generates a JavaScript client library. | |
 
 ## CONFIG OPTIONS
diff --git a/docs/generators/jaxrs-cxf-cdi.md b/docs/generators/jaxrs-cxf-cdi.md
index 1564b252520f9473351fc47ffa0fe0d7ae60bdb8..b4f16bea4c96788b3ecdd6847b3bbe55c43adb6e 100644
--- a/docs/generators/jaxrs-cxf-cdi.md
+++ b/docs/generators/jaxrs-cxf-cdi.md
@@ -8,6 +8,7 @@ title: Documentation for the jaxrs-cxf-cdi Generator
 | -------- | ----- | ----- |
 | generator name | jaxrs-cxf-cdi | pass this to the generate command after -g |
 | generator type | SERVER | |
+| generator language | Java | |
 | helpTxt | Generates a Java JAXRS Server according to JAXRS 2.0 specification, assuming an Apache CXF runtime and a Java EE runtime with CDI enabled. | |
 
 ## CONFIG OPTIONS
diff --git a/docs/generators/jaxrs-cxf-client.md b/docs/generators/jaxrs-cxf-client.md
index b7fcd7f49423966f46bdc5f7bbb93f6b263d1fff..a31c00fe698329e1c9d033ea5faba953e2d10768 100644
--- a/docs/generators/jaxrs-cxf-client.md
+++ b/docs/generators/jaxrs-cxf-client.md
@@ -8,6 +8,7 @@ title: Documentation for the jaxrs-cxf-client Generator
 | -------- | ----- | ----- |
 | generator name | jaxrs-cxf-client | pass this to the generate command after -g |
 | generator type | CLIENT | |
+| generator language | Java | |
 | helpTxt | Generates a Java JAXRS Client based on Apache CXF framework. | |
 
 ## CONFIG OPTIONS
diff --git a/docs/generators/jaxrs-cxf-extended.md b/docs/generators/jaxrs-cxf-extended.md
index c44b15f100bbf684b179615a533f49e5105e944b..40fa6dfde174b7a0a4899134950a0f09805ed576 100644
--- a/docs/generators/jaxrs-cxf-extended.md
+++ b/docs/generators/jaxrs-cxf-extended.md
@@ -8,6 +8,7 @@ title: Documentation for the jaxrs-cxf-extended Generator
 | -------- | ----- | ----- |
 | generator name | jaxrs-cxf-extended | pass this to the generate command after -g |
 | generator type | SERVER | |
+| generator language | Java | |
 | helpTxt | Extends jaxrs-cxf with options to generate a functional mock server. | |
 
 ## CONFIG OPTIONS
diff --git a/docs/generators/jaxrs-cxf.md b/docs/generators/jaxrs-cxf.md
index f3cb09d41762be163d71efa9844931bead563adf..ed251b835f0ce18019aa7fca2c45f5d9a243d056 100644
--- a/docs/generators/jaxrs-cxf.md
+++ b/docs/generators/jaxrs-cxf.md
@@ -8,6 +8,7 @@ title: Documentation for the jaxrs-cxf Generator
 | -------- | ----- | ----- |
 | generator name | jaxrs-cxf | pass this to the generate command after -g |
 | generator type | SERVER | |
+| generator language | Java | |
 | helpTxt | Generates a Java JAXRS Server application based on Apache CXF framework. | |
 
 ## CONFIG OPTIONS
diff --git a/docs/generators/jaxrs-jersey.md b/docs/generators/jaxrs-jersey.md
index 086f079c0594d27f5dca19ff050c41125aa8aee6..f82ae05541cd9aa1878f1293f99f44c4c8f630f3 100644
--- a/docs/generators/jaxrs-jersey.md
+++ b/docs/generators/jaxrs-jersey.md
@@ -8,6 +8,7 @@ title: Documentation for the jaxrs-jersey Generator
 | -------- | ----- | ----- |
 | generator name | jaxrs-jersey | pass this to the generate command after -g |
 | generator type | SERVER | |
+| generator language | Java | |
 | helpTxt | Generates a Java JAXRS Server application based on Jersey framework. | |
 
 ## CONFIG OPTIONS
diff --git a/docs/generators/jaxrs-resteasy-eap.md b/docs/generators/jaxrs-resteasy-eap.md
index 3670d584186e6abc9144adba26d39a1758fca4cb..7dff1caf8c7e9085915753b32e9a1c76e5194d98 100644
--- a/docs/generators/jaxrs-resteasy-eap.md
+++ b/docs/generators/jaxrs-resteasy-eap.md
@@ -8,6 +8,7 @@ title: Documentation for the jaxrs-resteasy-eap Generator
 | -------- | ----- | ----- |
 | generator name | jaxrs-resteasy-eap | pass this to the generate command after -g |
 | generator type | SERVER | |
+| generator language | Java | |
 | helpTxt | Generates a Java JAXRS-Resteasy Server application. | |
 
 ## CONFIG OPTIONS
diff --git a/docs/generators/jaxrs-resteasy.md b/docs/generators/jaxrs-resteasy.md
index bf56de2f23590320ca6db85f52fe5bfdf10f2d96..32fb664d902b8fd9155a164e8f12bba92a7e6790 100644
--- a/docs/generators/jaxrs-resteasy.md
+++ b/docs/generators/jaxrs-resteasy.md
@@ -8,6 +8,7 @@ title: Documentation for the jaxrs-resteasy Generator
 | -------- | ----- | ----- |
 | generator name | jaxrs-resteasy | pass this to the generate command after -g |
 | generator type | SERVER | |
+| generator language | Java | |
 | helpTxt | Generates a Java JAXRS-Resteasy Server application. | |
 
 ## CONFIG OPTIONS
diff --git a/docs/generators/jaxrs-spec.md b/docs/generators/jaxrs-spec.md
index 84d8b47d5015128acf80844cf995893285e42a1d..91bfa156aea67dfeabb6e37fb8fc30aa31baadf6 100644
--- a/docs/generators/jaxrs-spec.md
+++ b/docs/generators/jaxrs-spec.md
@@ -8,6 +8,7 @@ title: Documentation for the jaxrs-spec Generator
 | -------- | ----- | ----- |
 | generator name | jaxrs-spec | pass this to the generate command after -g |
 | generator type | SERVER | |
+| generator language | Java | |
 | helpTxt | Generates a Java JAXRS Server according to JAXRS 2.0 specification. | |
 
 ## CONFIG OPTIONS
diff --git a/docs/generators/jmeter.md b/docs/generators/jmeter.md
index e47e7fef1771bca0624a09d4fe69e5e56454288a..426ed04b4ccceec9625ac215cf539ad017d8be8f 100644
--- a/docs/generators/jmeter.md
+++ b/docs/generators/jmeter.md
@@ -8,6 +8,7 @@ title: Documentation for the jmeter Generator
 | -------- | ----- | ----- |
 | generator name | jmeter | pass this to the generate command after -g |
 | generator type | CLIENT | |
+| generator language | Java | |
 | helpTxt | Generates a JMeter .jmx file. | |
 
 ## CONFIG OPTIONS
diff --git a/docs/generators/k6.md b/docs/generators/k6.md
index a23aec49d2d1aef505a35bdb0945da2986ce7560..0ab38225e03dbe1f52ee0eca10cd4f9d45832ce9 100644
--- a/docs/generators/k6.md
+++ b/docs/generators/k6.md
@@ -8,6 +8,7 @@ title: Documentation for the k6 Generator
 | -------- | ----- | ----- |
 | generator name | k6 | pass this to the generate command after -g |
 | generator type | CLIENT | |
+| generator language | k6 | |
 | helpTxt | Generates a k6 script (beta). | |
 
 ## CONFIG OPTIONS
diff --git a/docs/generators/kotlin-server-deprecated.md b/docs/generators/kotlin-server-deprecated.md
index 79e12009c63bd1b33ade37e9beae69c51dcd23dc..3c5c6ca448d171685350ae5e6e917595e1c3760a 100644
--- a/docs/generators/kotlin-server-deprecated.md
+++ b/docs/generators/kotlin-server-deprecated.md
@@ -8,6 +8,7 @@ title: Documentation for the kotlin-server-deprecated Generator
 | -------- | ----- | ----- |
 | generator name | kotlin-server-deprecated | pass this to the generate command after -g |
 | generator type | SERVER | |
+| generator language | Kotlin | |
 | helpTxt | Generates a Kotlin server (Ktor v1.1.3). IMPORTANT: this generator has been deprecated. Please migrate to `kotlin-server` which supports Ktor v1.5.2+. | |
 
 ## CONFIG OPTIONS
diff --git a/docs/generators/kotlin-server.md b/docs/generators/kotlin-server.md
index 95dce36a0279113a57f12d0ea1709dd7e4a47e01..c0a473d9fd81a2b33ee85cbab0d06afd4da803aa 100644
--- a/docs/generators/kotlin-server.md
+++ b/docs/generators/kotlin-server.md
@@ -8,6 +8,7 @@ title: Documentation for the kotlin-server Generator
 | -------- | ----- | ----- |
 | generator name | kotlin-server | pass this to the generate command after -g |
 | generator type | SERVER | |
+| generator language | Kotlin | |
 | helpTxt | Generates a Kotlin server. | |
 
 ## CONFIG OPTIONS
diff --git a/docs/generators/kotlin-spring.md b/docs/generators/kotlin-spring.md
index d09124f4a7f22a56f1cdf900135f6d41916bee13..8363a31d4bf5ff4de27847ff1cc529a6f8ec8a59 100644
--- a/docs/generators/kotlin-spring.md
+++ b/docs/generators/kotlin-spring.md
@@ -8,6 +8,7 @@ title: Documentation for the kotlin-spring Generator
 | -------- | ----- | ----- |
 | generator name | kotlin-spring | pass this to the generate command after -g |
 | generator type | SERVER | |
+| generator language | Kotlin | |
 | helpTxt | Generates a Kotlin Spring application. | |
 
 ## CONFIG OPTIONS
diff --git a/docs/generators/kotlin-vertx.md b/docs/generators/kotlin-vertx.md
index 174d19f166932fe1ffc1fbb7039a27dbb265d2d0..30c0474ca761476dce0a41d17fb2d2c2ece58d25 100644
--- a/docs/generators/kotlin-vertx.md
+++ b/docs/generators/kotlin-vertx.md
@@ -8,6 +8,7 @@ title: Documentation for the kotlin-vertx Generator
 | -------- | ----- | ----- |
 | generator name | kotlin-vertx | pass this to the generate command after -g |
 | generator type | SERVER | |
+| generator language | Kotlin | |
 | helpTxt | Generates a kotlin-vertx server. | |
 
 ## CONFIG OPTIONS
diff --git a/docs/generators/kotlin.md b/docs/generators/kotlin.md
index 31f9601161d17cfda39ae27aa349e00a224d7596..d825664c0c83469f66d21f4572fa4cb939b43763 100644
--- a/docs/generators/kotlin.md
+++ b/docs/generators/kotlin.md
@@ -8,6 +8,7 @@ title: Documentation for the kotlin Generator
 | -------- | ----- | ----- |
 | generator name | kotlin | pass this to the generate command after -g |
 | generator type | CLIENT | |
+| generator language | Kotlin | |
 | helpTxt | Generates a Kotlin client. | |
 
 ## CONFIG OPTIONS
diff --git a/docs/generators/ktorm-schema.md b/docs/generators/ktorm-schema.md
index 163fce14c156d67ec56dd898ea1d015e652b02fb..b301b23a3bcea0d1fbae7fb501363b793e640e3c 100644
--- a/docs/generators/ktorm-schema.md
+++ b/docs/generators/ktorm-schema.md
@@ -8,6 +8,7 @@ title: Documentation for the ktorm-schema Generator
 | -------- | ----- | ----- |
 | generator name | ktorm-schema | pass this to the generate command after -g |
 | generator type | SCHEMA | |
+| generator language | Ktorm | |
 | helpTxt | Generates a kotlin-ktorm schema (beta) | |
 
 ## CONFIG OPTIONS
diff --git a/docs/generators/lua.md b/docs/generators/lua.md
index 3f4e6e34c6c3ccdd254588ee886749b893a43ecf..a890b08256f63369e7a1f4826bc5561d82fd475c 100644
--- a/docs/generators/lua.md
+++ b/docs/generators/lua.md
@@ -8,6 +8,7 @@ title: Documentation for the lua Generator
 | -------- | ----- | ----- |
 | generator name | lua | pass this to the generate command after -g |
 | generator type | CLIENT | |
+| generator language | Lua | |
 | helpTxt | Generates a Lua client library (beta). | |
 
 ## CONFIG OPTIONS
diff --git a/docs/generators/mysql-schema.md b/docs/generators/mysql-schema.md
index 3499563f5a8a4c397649c3fbb644d112439a58ef..0fa16e9932818070790caa49e86342459f642348 100644
--- a/docs/generators/mysql-schema.md
+++ b/docs/generators/mysql-schema.md
@@ -8,6 +8,7 @@ title: Documentation for the mysql-schema Generator
 | -------- | ----- | ----- |
 | generator name | mysql-schema | pass this to the generate command after -g |
 | generator type | SCHEMA | |
+| generator language | Mysql | |
 | helpTxt | Generates a MySQL schema based on the model or schema defined in the OpenAPI specification (v2, v3). | |
 
 ## CONFIG OPTIONS
diff --git a/docs/generators/nim.md b/docs/generators/nim.md
index 77a6d5e9046d8212d65490fcaac638091d82108f..669b310cd31f95523aed19a1815873c0b28002d5 100644
--- a/docs/generators/nim.md
+++ b/docs/generators/nim.md
@@ -8,6 +8,7 @@ title: Documentation for the nim Generator
 | -------- | ----- | ----- |
 | generator name | nim | pass this to the generate command after -g |
 | generator type | CLIENT | |
+| generator language | Nim | |
 | helpTxt | Generates a nim client (beta). | |
 
 ## CONFIG OPTIONS
diff --git a/docs/generators/nodejs-express-server.md b/docs/generators/nodejs-express-server.md
index f2bca5103347c56c1e86e90fbd5438a1d9db1dfd..e530fd1a1b5454fa52050d997dad05853e3cd257 100644
--- a/docs/generators/nodejs-express-server.md
+++ b/docs/generators/nodejs-express-server.md
@@ -8,6 +8,7 @@ title: Documentation for the nodejs-express-server Generator
 | -------- | ----- | ----- |
 | generator name | nodejs-express-server | pass this to the generate command after -g |
 | generator type | SERVER | |
+| generator language | Javascript | |
 | helpTxt | Generates a NodeJS Express server (alpha). IMPORTANT: this generator may subject to breaking changes without further notice). | |
 
 ## CONFIG OPTIONS
diff --git a/docs/generators/objc.md b/docs/generators/objc.md
index fa4c1350801e4204d1fbfb75f6e793abe761977a..11e1e4280bc54eb6a5ce677b21856ac5af943879 100644
--- a/docs/generators/objc.md
+++ b/docs/generators/objc.md
@@ -8,6 +8,7 @@ title: Documentation for the objc Generator
 | -------- | ----- | ----- |
 | generator name | objc | pass this to the generate command after -g |
 | generator type | CLIENT | |
+| generator language | Objective-C | |
 | helpTxt | Generates an Objective-C client library. | |
 
 ## CONFIG OPTIONS
diff --git a/docs/generators/ocaml.md b/docs/generators/ocaml.md
index a453f1087924ee5f9c06302957a793c7429e1c44..d1a5175be9187435db024855745b252f48e8407e 100644
--- a/docs/generators/ocaml.md
+++ b/docs/generators/ocaml.md
@@ -8,6 +8,7 @@ title: Documentation for the ocaml Generator
 | -------- | ----- | ----- |
 | generator name | ocaml | pass this to the generate command after -g |
 | generator type | CLIENT | |
+| generator language | OCaml | |
 | helpTxt | Generates an OCaml client library (beta). | |
 
 ## CONFIG OPTIONS
diff --git a/docs/generators/perl.md b/docs/generators/perl.md
index 5d9c89a3a1060e59a1c497d642bd2984061e84a4..82bb14d553f7432f31558cd6678bcf01ed6ce9f9 100644
--- a/docs/generators/perl.md
+++ b/docs/generators/perl.md
@@ -8,6 +8,7 @@ title: Documentation for the perl Generator
 | -------- | ----- | ----- |
 | generator name | perl | pass this to the generate command after -g |
 | generator type | CLIENT | |
+| generator language | Perl | |
 | helpTxt | Generates a Perl client library. | |
 
 ## CONFIG OPTIONS
diff --git a/docs/generators/php-dt.md b/docs/generators/php-dt.md
index 293940f6ca03440de49749a1ae573417aa1f34ae..9ee8556dc2b0ccf79445344d916ee394b87af92d 100644
--- a/docs/generators/php-dt.md
+++ b/docs/generators/php-dt.md
@@ -8,6 +8,7 @@ title: Documentation for the php-dt Generator
 | -------- | ----- | ----- |
 | generator name | php-dt | pass this to the generate command after -g |
 | generator type | CLIENT | |
+| generator language | PHP | |
 | helpTxt | Generates a PHP client relying on Data Transfer ( https://github.com/Articus/DataTransfer ) and compliant with PSR-7, PSR-11, PSR-17 and PSR-18. | |
 
 ## CONFIG OPTIONS
diff --git a/docs/generators/php-laravel.md b/docs/generators/php-laravel.md
index bd374554c82dfb96e9572b673cbef349a02df3a4..0f4c9b9b43a105ab9373ed57b521cd0c5794a084 100644
--- a/docs/generators/php-laravel.md
+++ b/docs/generators/php-laravel.md
@@ -8,6 +8,7 @@ title: Documentation for the php-laravel Generator
 | -------- | ----- | ----- |
 | generator name | php-laravel | pass this to the generate command after -g |
 | generator type | SERVER | |
+| generator language | PHP | |
 | helpTxt | Generates a PHP laravel server library. | |
 
 ## CONFIG OPTIONS
diff --git a/docs/generators/php-lumen.md b/docs/generators/php-lumen.md
index 1b91b92fd9a1772fa7a8b2278deda22935da76a4..44952212bd136f0b82844862322c9d0c5d3f4c32 100644
--- a/docs/generators/php-lumen.md
+++ b/docs/generators/php-lumen.md
@@ -8,6 +8,7 @@ title: Documentation for the php-lumen Generator
 | -------- | ----- | ----- |
 | generator name | php-lumen | pass this to the generate command after -g |
 | generator type | SERVER | |
+| generator language | PHP | |
 | helpTxt | Generates a PHP Lumen server library. | |
 
 ## CONFIG OPTIONS
diff --git a/docs/generators/php-mezzio-ph.md b/docs/generators/php-mezzio-ph.md
index 712683865344aa4100466edce50567440600c11b..1060eb030ed70588f6e35ce81e1dbfe3ca087dc1 100644
--- a/docs/generators/php-mezzio-ph.md
+++ b/docs/generators/php-mezzio-ph.md
@@ -8,6 +8,7 @@ title: Documentation for the php-mezzio-ph Generator
 | -------- | ----- | ----- |
 | generator name | php-mezzio-ph | pass this to the generate command after -g |
 | generator type | SERVER | |
+| generator language | PHP | |
 | helpTxt | Generates PHP server stub using Mezzio ( https://docs.mezzio.dev/mezzio/ ) and Path Handler ( https://github.com/Articus/PathHandler ). | |
 
 ## CONFIG OPTIONS
diff --git a/docs/generators/php-silex-deprecated.md b/docs/generators/php-silex-deprecated.md
index e9af8da6621e134a8716fa3290dfc646b07a1f24..df5ed167aecb1c2b77ee55edc07f8596f9c83c77 100644
--- a/docs/generators/php-silex-deprecated.md
+++ b/docs/generators/php-silex-deprecated.md
@@ -8,6 +8,7 @@ title: Documentation for the php-silex-deprecated Generator
 | -------- | ----- | ----- |
 | generator name | php-silex-deprecated | pass this to the generate command after -g |
 | generator type | SERVER | |
+| generator language | PHP | |
 | helpTxt | Generates a PHP Silex server library. IMPORTANT NOTE: this generator is no longer actively maintained. | |
 
 ## CONFIG OPTIONS
diff --git a/docs/generators/php-slim-deprecated.md b/docs/generators/php-slim-deprecated.md
index 5e88e4e684acf49cd74e4f2d72cab5574270c273..19fb25e9a978a9e4579a1e40e13326be231f1fc1 100644
--- a/docs/generators/php-slim-deprecated.md
+++ b/docs/generators/php-slim-deprecated.md
@@ -8,6 +8,7 @@ title: Documentation for the php-slim-deprecated Generator
 | -------- | ----- | ----- |
 | generator name | php-slim-deprecated | pass this to the generate command after -g |
 | generator type | SERVER | |
+| generator language | PHP | |
 | helpTxt | Generates a PHP Slim Framework server library. IMPORTANT NOTE: this generator (Slim 3.x)  is no longer actively maintained so please use 'php-slim4' generator instead. | |
 
 ## CONFIG OPTIONS
diff --git a/docs/generators/php-slim4.md b/docs/generators/php-slim4.md
index ae8676e2d9aa7ffc02c484461da96cc919ce7494..b021d914077357525b0bdecc7912669e2f8b0ee7 100644
--- a/docs/generators/php-slim4.md
+++ b/docs/generators/php-slim4.md
@@ -8,6 +8,7 @@ title: Documentation for the php-slim4 Generator
 | -------- | ----- | ----- |
 | generator name | php-slim4 | pass this to the generate command after -g |
 | generator type | SERVER | |
+| generator language | PHP | |
 | helpTxt | Generates a PHP Slim 4 Framework server library(with Mock server). | |
 
 ## CONFIG OPTIONS
diff --git a/docs/generators/php-symfony.md b/docs/generators/php-symfony.md
index 8ed3be46e390bd5ccfdb8ac140839cc200c8b7f5..da7aac53103b79b0f07fbc67a693ada741bc1af4 100644
--- a/docs/generators/php-symfony.md
+++ b/docs/generators/php-symfony.md
@@ -8,6 +8,7 @@ title: Documentation for the php-symfony Generator
 | -------- | ----- | ----- |
 | generator name | php-symfony | pass this to the generate command after -g |
 | generator type | SERVER | |
+| generator language | PHP | |
 | helpTxt | Generates a PHP Symfony server bundle. | |
 
 ## CONFIG OPTIONS
diff --git a/docs/generators/php.md b/docs/generators/php.md
index b9a93234cb2a3e168fa1b16efa2fa24086095764..113eb3247552b7a453b822f15749359d18dceb2d 100644
--- a/docs/generators/php.md
+++ b/docs/generators/php.md
@@ -8,6 +8,7 @@ title: Documentation for the php Generator
 | -------- | ----- | ----- |
 | generator name | php | pass this to the generate command after -g |
 | generator type | CLIENT | |
+| generator language | PHP | |
 | helpTxt | Generates a PHP client library. | |
 
 ## CONFIG OPTIONS
diff --git a/docs/generators/powershell.md b/docs/generators/powershell.md
index 36d7ba9e54d4aac1d2c1a968eeb3d2ee4a8e9573..7efbc46ff0813d7bc1f9e52ade4fd24760ac00d5 100644
--- a/docs/generators/powershell.md
+++ b/docs/generators/powershell.md
@@ -8,6 +8,7 @@ title: Documentation for the powershell Generator
 | -------- | ----- | ----- |
 | generator name | powershell | pass this to the generate command after -g |
 | generator type | CLIENT | |
+| generator language | PowerShell | |
 | helpTxt | Generates a PowerShell API client (beta) | |
 
 ## CONFIG OPTIONS
diff --git a/docs/generators/protobuf-schema.md b/docs/generators/protobuf-schema.md
index 2f350f1a1b0b841b3f4f0af876dd15c9563d482a..e8f8361bea03c5ba09e1ae6583a6126592de746a 100644
--- a/docs/generators/protobuf-schema.md
+++ b/docs/generators/protobuf-schema.md
@@ -8,6 +8,7 @@ title: Documentation for the protobuf-schema Generator
 | -------- | ----- | ----- |
 | generator name | protobuf-schema | pass this to the generate command after -g |
 | generator type | SCHEMA | |
+| generator language | Protocol Buffers (Protobuf) | |
 | helpTxt | Generates gRPC and protocol buffer schema files (beta) | |
 
 ## CONFIG OPTIONS
diff --git a/docs/generators/python-aiohttp.md b/docs/generators/python-aiohttp.md
index fdfdf70f306fc7321e1c5ddf00b55bd1d82f175f..79ee486c1ea814f1fb40ac0bedfd7d4fbc9eab4f 100644
--- a/docs/generators/python-aiohttp.md
+++ b/docs/generators/python-aiohttp.md
@@ -8,6 +8,7 @@ title: Documentation for the python-aiohttp Generator
 | -------- | ----- | ----- |
 | generator name | python-aiohttp | pass this to the generate command after -g |
 | generator type | SERVER | |
+| generator language | Python | |
 | helpTxt | Generates a Python server library using the Connexion project. By default, it will also generate service classes -- which you can disable with the `-Dnoservice` environment variable. | |
 
 ## CONFIG OPTIONS
diff --git a/docs/generators/python-blueplanet.md b/docs/generators/python-blueplanet.md
index f8f6d4f63070760922d90706b60ddf26c3589786..bd5d365f4fba211473161208ffa8aebffd544ebb 100644
--- a/docs/generators/python-blueplanet.md
+++ b/docs/generators/python-blueplanet.md
@@ -8,6 +8,7 @@ title: Documentation for the python-blueplanet Generator
 | -------- | ----- | ----- |
 | generator name | python-blueplanet | pass this to the generate command after -g |
 | generator type | SERVER | |
+| generator language | Python | |
 | helpTxt | Generates a Python server library using the Connexion project. By default, it will also generate service classes -- which you can disable with the `-Dnoservice` environment variable. | |
 
 ## CONFIG OPTIONS
diff --git a/docs/generators/python-experimental.md b/docs/generators/python-experimental.md
index e026fdf032a511208952bf80e5b89d9ff639a158..49e06706d543e84fd05775f5b2f39a13b98a0674 100644
--- a/docs/generators/python-experimental.md
+++ b/docs/generators/python-experimental.md
@@ -8,6 +8,7 @@ title: Documentation for the python-experimental Generator
 | -------- | ----- | ----- |
 | generator name | python-experimental | pass this to the generate command after -g |
 | generator type | CLIENT | |
+| generator language | Python | |
 | helpTxt | Generates a Python client library<br><br>Features in this generator:<br>- type hints on endpoints and model creation<br>- model parameter names use the spec defined keys and cases<br>- robust composition (oneOf/anyOf/allOf) where paload data is stored in one instance only<br>- endpoint parameter names use the spec defined keys and cases<br>- inline schemas are supported at any location including composition<br>- multiple content types supported in request body and response bodies<br>- run time type checking<br>- quicker load time for python modules (a single endpoint can be imported and used without loading others)<br>- all instances of schemas dynamically inherit from all matching schemas so one can use isinstance to check if validation passed<br>- composed schemas with type constraints supported (type:object + oneOf/anyOf/allOf)<br>- schemas are not coerced/cast. For example string + date are both stored as string, and there is a date accessor<br>    - Exceptions: int/float is stored as Decimal, When receiving data from headers it will start as str and may need to be cast for example to int | |
 
 ## CONFIG OPTIONS
diff --git a/docs/generators/python-fastapi.md b/docs/generators/python-fastapi.md
index bb88a406076cc572449d4d273c143a4863b41627..72a438df371252210550848578693cd02cccc009 100644
--- a/docs/generators/python-fastapi.md
+++ b/docs/generators/python-fastapi.md
@@ -8,6 +8,7 @@ title: Documentation for the python-fastapi Generator
 | -------- | ----- | ----- |
 | generator name | python-fastapi | pass this to the generate command after -g |
 | generator type | SERVER | |
+| generator language | Python | |
 | helpTxt | Generates a Python FastAPI server (beta). | |
 
 ## CONFIG OPTIONS
diff --git a/docs/generators/python-flask.md b/docs/generators/python-flask.md
index b53c86fded14b0b1f6f3b9d89423af562ef2933b..084f4723afc6c076455b4b94d3138e817f28ce57 100644
--- a/docs/generators/python-flask.md
+++ b/docs/generators/python-flask.md
@@ -8,6 +8,7 @@ title: Documentation for the python-flask Generator
 | -------- | ----- | ----- |
 | generator name | python-flask | pass this to the generate command after -g |
 | generator type | SERVER | |
+| generator language | Python | |
 | helpTxt | Generates a Python server library using the Connexion project. By default, it will also generate service classes -- which you can disable with the `-Dnoservice` environment variable. | |
 
 ## CONFIG OPTIONS
diff --git a/docs/generators/python-legacy.md b/docs/generators/python-legacy.md
index 14821d0ae1cedc6af43670a4c61dda5b43bd19e0..43d89e0b8447c69d86e0ab4fcf7444e47afa3a72 100644
--- a/docs/generators/python-legacy.md
+++ b/docs/generators/python-legacy.md
@@ -8,6 +8,7 @@ title: Documentation for the python-legacy Generator
 | -------- | ----- | ----- |
 | generator name | python-legacy | pass this to the generate command after -g |
 | generator type | CLIENT | |
+| generator language | Python | |
 | helpTxt | Generates a Python client library. | |
 
 ## CONFIG OPTIONS
diff --git a/docs/generators/python.md b/docs/generators/python.md
index 607c71a2604d86a012a6093aad18fb50797a8b21..3db4f227b07bd10c0f030a4244b784e53db333b0 100644
--- a/docs/generators/python.md
+++ b/docs/generators/python.md
@@ -8,6 +8,7 @@ title: Documentation for the python Generator
 | -------- | ----- | ----- |
 | generator name | python | pass this to the generate command after -g |
 | generator type | CLIENT | |
+| generator language | Python | |
 | helpTxt | Generates a Python client library. | |
 
 ## CONFIG OPTIONS
diff --git a/docs/generators/r.md b/docs/generators/r.md
index d2ee1ea68367a046f0d60745c667e53cba822bd3..f2ab5c6383288fb4aea308d549ade25adf2d48e3 100644
--- a/docs/generators/r.md
+++ b/docs/generators/r.md
@@ -8,6 +8,7 @@ title: Documentation for the r Generator
 | -------- | ----- | ----- |
 | generator name | r | pass this to the generate command after -g |
 | generator type | CLIENT | |
+| generator language | R | |
 | helpTxt | Generates a R client library (beta). | |
 
 ## CONFIG OPTIONS
diff --git a/docs/generators/ruby-on-rails.md b/docs/generators/ruby-on-rails.md
index f0be7a29e13328dbc35a179fc4044c40df730f7f..3473ee666cd7b57a844f6dc5f4d95db5e27dd690 100644
--- a/docs/generators/ruby-on-rails.md
+++ b/docs/generators/ruby-on-rails.md
@@ -8,6 +8,7 @@ title: Documentation for the ruby-on-rails Generator
 | -------- | ----- | ----- |
 | generator name | ruby-on-rails | pass this to the generate command after -g |
 | generator type | SERVER | |
+| generator language | Ruby | |
 | helpTxt | Generates a Ruby on Rails (v5) server library. | |
 
 ## CONFIG OPTIONS
diff --git a/docs/generators/ruby-sinatra.md b/docs/generators/ruby-sinatra.md
index f58b4b948b1dfef42a0f23e0673db938f3689b08..981be7d3c32711e1388cc3c3a35f37a2f4ffdc31 100644
--- a/docs/generators/ruby-sinatra.md
+++ b/docs/generators/ruby-sinatra.md
@@ -8,6 +8,7 @@ title: Documentation for the ruby-sinatra Generator
 | -------- | ----- | ----- |
 | generator name | ruby-sinatra | pass this to the generate command after -g |
 | generator type | SERVER | |
+| generator language | Ruby | |
 | helpTxt | Generates a Ruby Sinatra server library. | |
 
 ## CONFIG OPTIONS
diff --git a/docs/generators/ruby.md b/docs/generators/ruby.md
index 56c094bbd9f6b2c280dcda5b18a1c56fb85d570b..126d32b111b7b16d87dd23ae07d1151f7330fc33 100644
--- a/docs/generators/ruby.md
+++ b/docs/generators/ruby.md
@@ -8,6 +8,7 @@ title: Documentation for the ruby Generator
 | -------- | ----- | ----- |
 | generator name | ruby | pass this to the generate command after -g |
 | generator type | CLIENT | |
+| generator language | Ruby | |
 | helpTxt | Generates a Ruby client library. | |
 
 ## CONFIG OPTIONS
diff --git a/docs/generators/rust-server.md b/docs/generators/rust-server.md
index 7822aa5417c79f29fe6b9805bede6399edbfd466..b669ac3fae965181917fa835d153128ea6d5ea3c 100644
--- a/docs/generators/rust-server.md
+++ b/docs/generators/rust-server.md
@@ -8,6 +8,7 @@ title: Documentation for the rust-server Generator
 | -------- | ----- | ----- |
 | generator name | rust-server | pass this to the generate command after -g |
 | generator type | SERVER | |
+| generator language | Rust | |
 | helpTxt | Generates a Rust client/server library (beta) using the openapi-generator project. | |
 
 ## CONFIG OPTIONS
diff --git a/docs/generators/rust.md b/docs/generators/rust.md
index 44b63aee0ec100fa978dd1eb3165e3a652c468b2..6637bf69098abe62307dc91dcee991ebcc8c5911 100644
--- a/docs/generators/rust.md
+++ b/docs/generators/rust.md
@@ -8,6 +8,7 @@ title: Documentation for the rust Generator
 | -------- | ----- | ----- |
 | generator name | rust | pass this to the generate command after -g |
 | generator type | CLIENT | |
+| generator language | Rust | |
 | helpTxt | Generates a Rust client library (beta). | |
 
 ## CONFIG OPTIONS
diff --git a/docs/generators/scala-akka-http-server.md b/docs/generators/scala-akka-http-server.md
index 9c35ef92e7dbd1274c3b4dbf42212e54bceb92ed..33fa8817eb8d23b3ea3c1149ef86c2ce71d44b45 100644
--- a/docs/generators/scala-akka-http-server.md
+++ b/docs/generators/scala-akka-http-server.md
@@ -8,6 +8,7 @@ title: Documentation for the scala-akka-http-server Generator
 | -------- | ----- | ----- |
 | generator name | scala-akka-http-server | pass this to the generate command after -g |
 | generator type | SERVER | |
+| generator language | Scala | |
 | helpTxt | Generates a scala-akka-http server (beta). | |
 
 ## CONFIG OPTIONS
diff --git a/docs/generators/scala-akka.md b/docs/generators/scala-akka.md
index cf8b6909aca5a48c536fcca37f359ce13c5a07df..9612a78014a35832397bfe4f30c0ff5d8357fa6d 100644
--- a/docs/generators/scala-akka.md
+++ b/docs/generators/scala-akka.md
@@ -8,6 +8,7 @@ title: Documentation for the scala-akka Generator
 | -------- | ----- | ----- |
 | generator name | scala-akka | pass this to the generate command after -g |
 | generator type | CLIENT | |
+| generator language | Scala | |
 | helpTxt | Generates a Scala client library (beta) base on Akka/Spray. | |
 
 ## CONFIG OPTIONS
diff --git a/docs/generators/scala-finch.md b/docs/generators/scala-finch.md
index 9796e5d50fdaf8b2242105e947eecad8aab524db..02ebc385796f0068b52ac1dbf2598aa0c0e0ad06 100644
--- a/docs/generators/scala-finch.md
+++ b/docs/generators/scala-finch.md
@@ -8,6 +8,7 @@ title: Documentation for the scala-finch Generator
 | -------- | ----- | ----- |
 | generator name | scala-finch | pass this to the generate command after -g |
 | generator type | SERVER | |
+| generator language | Scala | |
 | helpTxt | Generates a Scala server application with Finch. | |
 
 ## CONFIG OPTIONS
diff --git a/docs/generators/scala-gatling.md b/docs/generators/scala-gatling.md
index 19cd4528952ab80508639a024cd6d9277e5076d5..fc111db20025696908a0fb09948dc903ea89f6e0 100644
--- a/docs/generators/scala-gatling.md
+++ b/docs/generators/scala-gatling.md
@@ -8,6 +8,7 @@ title: Documentation for the scala-gatling Generator
 | -------- | ----- | ----- |
 | generator name | scala-gatling | pass this to the generate command after -g |
 | generator type | CLIENT | |
+| generator language | Scala | |
 | helpTxt | Generates a gatling simulation library (beta). | |
 
 ## CONFIG OPTIONS
diff --git a/docs/generators/scala-httpclient-deprecated.md b/docs/generators/scala-httpclient-deprecated.md
index af714b42ed2dca2cc66c97750887277436f79a10..6760f78c7760f77428262ed43672d95923b4bad7 100644
--- a/docs/generators/scala-httpclient-deprecated.md
+++ b/docs/generators/scala-httpclient-deprecated.md
@@ -8,6 +8,7 @@ title: Documentation for the scala-httpclient-deprecated Generator
 | -------- | ----- | ----- |
 | generator name | scala-httpclient-deprecated | pass this to the generate command after -g |
 | generator type | CLIENT | |
+| generator language | Scala | |
 | helpTxt | Generates a Scala client library (beta). IMPORTANT: This generator is no longer actively maintained and will be deprecated. PLease use 'scala-akka' generator instead. | |
 
 ## CONFIG OPTIONS
diff --git a/docs/generators/scala-lagom-server.md b/docs/generators/scala-lagom-server.md
index aba88bb57ee42cd524766cc7802ddfaabfe9b704..aae66c6de02a8cc4d3bbfa622dc03550b6024a91 100644
--- a/docs/generators/scala-lagom-server.md
+++ b/docs/generators/scala-lagom-server.md
@@ -8,6 +8,7 @@ title: Documentation for the scala-lagom-server Generator
 | -------- | ----- | ----- |
 | generator name | scala-lagom-server | pass this to the generate command after -g |
 | generator type | SERVER | |
+| generator language | Scala | |
 | helpTxt | Generates a Lagom API server (Beta) in scala | |
 
 ## CONFIG OPTIONS
diff --git a/docs/generators/scala-play-server.md b/docs/generators/scala-play-server.md
index 845b9a233b83c3dcd931b5fb735d6773efbc6c19..ebe594a10a95b726c57e20f2d43303ea71253506 100644
--- a/docs/generators/scala-play-server.md
+++ b/docs/generators/scala-play-server.md
@@ -8,6 +8,7 @@ title: Documentation for the scala-play-server Generator
 | -------- | ----- | ----- |
 | generator name | scala-play-server | pass this to the generate command after -g |
 | generator type | SERVER | |
+| generator language | Scala | |
 | helpTxt | Generates a Scala server application (beta) with Play Framework. | |
 
 ## CONFIG OPTIONS
diff --git a/docs/generators/scala-sttp.md b/docs/generators/scala-sttp.md
index 1befd28b70e72a063a80d05db3da49c2d8ae335c..7bd25ecef960c2337016e2c0bb6a7cd8a5dcd653 100644
--- a/docs/generators/scala-sttp.md
+++ b/docs/generators/scala-sttp.md
@@ -8,6 +8,7 @@ title: Documentation for the scala-sttp Generator
 | -------- | ----- | ----- |
 | generator name | scala-sttp | pass this to the generate command after -g |
 | generator type | CLIENT | |
+| generator language | Scala | |
 | helpTxt | Generates a Scala client library (beta) based on Sttp. | |
 
 ## CONFIG OPTIONS
diff --git a/docs/generators/scalatra.md b/docs/generators/scalatra.md
index 56bef75b6cc86e78970e8bc284a7c8fd61eda8b7..3e52e8e9f9abf306d0b2dbabde4a54ca89de9cf6 100644
--- a/docs/generators/scalatra.md
+++ b/docs/generators/scalatra.md
@@ -8,6 +8,7 @@ title: Documentation for the scalatra Generator
 | -------- | ----- | ----- |
 | generator name | scalatra | pass this to the generate command after -g |
 | generator type | SERVER | |
+| generator language | Scala | |
 | helpTxt | Generates a Scala server application with Scalatra. | |
 
 ## CONFIG OPTIONS
diff --git a/docs/generators/scalaz.md b/docs/generators/scalaz.md
index 7c356c9f8e28577f956ff4a55fceb88e04f4cc50..077d1d3d14fb170b2ca83e6257a7e6788242cce0 100644
--- a/docs/generators/scalaz.md
+++ b/docs/generators/scalaz.md
@@ -8,6 +8,7 @@ title: Documentation for the scalaz Generator
 | -------- | ----- | ----- |
 | generator name | scalaz | pass this to the generate command after -g |
 | generator type | CLIENT | |
+| generator language | Scala | |
 | helpTxt | Generates a Scalaz client library (beta) that uses http4s | |
 
 ## CONFIG OPTIONS
diff --git a/docs/generators/spring.md b/docs/generators/spring.md
index 7623c432a75d92790bf31282766ee0693a491bae..8dee03a692ae5d85fa7f12e9e1c0149d695457dc 100644
--- a/docs/generators/spring.md
+++ b/docs/generators/spring.md
@@ -8,6 +8,7 @@ title: Documentation for the spring Generator
 | -------- | ----- | ----- |
 | generator name | spring | pass this to the generate command after -g |
 | generator type | SERVER | |
+| generator language | Java | |
 | helpTxt | Generates a Java SpringBoot Server application using the SpringFox integration. | |
 
 ## CONFIG OPTIONS
diff --git a/docs/generators/swift4-deprecated.md b/docs/generators/swift4-deprecated.md
index 7743ddf5a456bfef3a35604345d47d9e5725f238..26c3dbaf030da088aa8f0e865624ab5f5a4e6398 100644
--- a/docs/generators/swift4-deprecated.md
+++ b/docs/generators/swift4-deprecated.md
@@ -8,6 +8,7 @@ title: Documentation for the swift4-deprecated Generator
 | -------- | ----- | ----- |
 | generator name | swift4-deprecated | pass this to the generate command after -g |
 | generator type | CLIENT | |
+| generator language | Swift | |
 | helpTxt | Generates a Swift 4.x client library (Deprecated and will be removed in 5.x releases. Please use `swift5` instead.) | |
 
 ## CONFIG OPTIONS
diff --git a/docs/generators/swift5.md b/docs/generators/swift5.md
index cb5ea31e1241c3514edcb5bd42195265d8c5044a..2d9b0128973fafa0d0081256472596af232d5a8e 100644
--- a/docs/generators/swift5.md
+++ b/docs/generators/swift5.md
@@ -8,6 +8,7 @@ title: Documentation for the swift5 Generator
 | -------- | ----- | ----- |
 | generator name | swift5 | pass this to the generate command after -g |
 | generator type | CLIENT | |
+| generator language | Swift | |
 | helpTxt | Generates a Swift 5.x client library. | |
 
 ## CONFIG OPTIONS
diff --git a/docs/generators/typescript-angular.md b/docs/generators/typescript-angular.md
index accefab18e0c79ec681567d8effe267e19ea75a8..112ec3f54da9e3843f343841ca090ca5de7759f0 100644
--- a/docs/generators/typescript-angular.md
+++ b/docs/generators/typescript-angular.md
@@ -8,6 +8,7 @@ title: Documentation for the typescript-angular Generator
 | -------- | ----- | ----- |
 | generator name | typescript-angular | pass this to the generate command after -g |
 | generator type | CLIENT | |
+| generator language | Typescript | |
 | helpTxt | Generates a TypeScript Angular (6.x - 13.x) client library. | |
 
 ## CONFIG OPTIONS
diff --git a/docs/generators/typescript-angularjs-deprecated.md b/docs/generators/typescript-angularjs-deprecated.md
index bcacd72ecb8b6297ad16a7d59ffdce3978f73479..4490fc90ba64d98e84feb75bcdc66c5a20b27c4c 100644
--- a/docs/generators/typescript-angularjs-deprecated.md
+++ b/docs/generators/typescript-angularjs-deprecated.md
@@ -8,6 +8,7 @@ title: Documentation for the typescript-angularjs-deprecated Generator
 | -------- | ----- | ----- |
 | generator name | typescript-angularjs-deprecated | pass this to the generate command after -g |
 | generator type | CLIENT | |
+| generator language | Typescript | |
 | helpTxt | Generates a TypeScript AngularJS client library. This generator has been deprecated and will be removed in the future release. | |
 
 ## CONFIG OPTIONS
diff --git a/docs/generators/typescript-aurelia.md b/docs/generators/typescript-aurelia.md
index 0632ee05eb021edfba1fe8217bf872b6e5b0519f..6c2b5d91f999d74f50ca320666d982c5866f5dbb 100644
--- a/docs/generators/typescript-aurelia.md
+++ b/docs/generators/typescript-aurelia.md
@@ -8,6 +8,7 @@ title: Documentation for the typescript-aurelia Generator
 | -------- | ----- | ----- |
 | generator name | typescript-aurelia | pass this to the generate command after -g |
 | generator type | CLIENT | |
+| generator language | Typescript | |
 | helpTxt | Generates a TypeScript client library for the Aurelia framework (beta). | |
 
 ## CONFIG OPTIONS
diff --git a/docs/generators/typescript-axios.md b/docs/generators/typescript-axios.md
index 00bd32f953529f6aa56caff29f630c8a252091a7..244b5471e3d93131cf2a63b79e9245ea32636f5b 100644
--- a/docs/generators/typescript-axios.md
+++ b/docs/generators/typescript-axios.md
@@ -8,6 +8,7 @@ title: Documentation for the typescript-axios Generator
 | -------- | ----- | ----- |
 | generator name | typescript-axios | pass this to the generate command after -g |
 | generator type | CLIENT | |
+| generator language | Typescript | |
 | helpTxt | Generates a TypeScript client library using axios. | |
 
 ## CONFIG OPTIONS
diff --git a/docs/generators/typescript-fetch.md b/docs/generators/typescript-fetch.md
index b272b0bb2bf7a2e88c14eb02f232b63c48872daf..104a33cf7453c8b9c3d4f90ef8cc03a19e57c42c 100644
--- a/docs/generators/typescript-fetch.md
+++ b/docs/generators/typescript-fetch.md
@@ -8,6 +8,7 @@ title: Documentation for the typescript-fetch Generator
 | -------- | ----- | ----- |
 | generator name | typescript-fetch | pass this to the generate command after -g |
 | generator type | CLIENT | |
+| generator language | Typescript | |
 | helpTxt | Generates a TypeScript client library using Fetch API (beta). | |
 
 ## CONFIG OPTIONS
diff --git a/docs/generators/typescript-inversify.md b/docs/generators/typescript-inversify.md
index 5834880e4a40376a6884faa9a160ed2b9dea1f36..ceca00588a329333d23e35c1a13a213ec14a9caf 100644
--- a/docs/generators/typescript-inversify.md
+++ b/docs/generators/typescript-inversify.md
@@ -8,6 +8,7 @@ title: Documentation for the typescript-inversify Generator
 | -------- | ----- | ----- |
 | generator name | typescript-inversify | pass this to the generate command after -g |
 | generator type | CLIENT | |
+| generator language | Typescript | |
 | helpTxt | Generates Typescript services using Inversify IOC | |
 
 ## CONFIG OPTIONS
diff --git a/docs/generators/typescript-jquery.md b/docs/generators/typescript-jquery.md
index e9469f20589f3bccd9737a3b702c6dcc7c58a929..7f89c8e326d757616d27088ea73edb405a8f2bf6 100644
--- a/docs/generators/typescript-jquery.md
+++ b/docs/generators/typescript-jquery.md
@@ -8,6 +8,7 @@ title: Documentation for the typescript-jquery Generator
 | -------- | ----- | ----- |
 | generator name | typescript-jquery | pass this to the generate command after -g |
 | generator type | CLIENT | |
+| generator language | Typescript | |
 | helpTxt | Generates a TypeScript jquery client library. | |
 
 ## CONFIG OPTIONS
diff --git a/docs/generators/typescript-nestjs.md b/docs/generators/typescript-nestjs.md
index 0619d801227d9e90b84815f1a74d13f7a421e53b..f6cd75a328c549cb9b7f05cefa2941e99d730408 100644
--- a/docs/generators/typescript-nestjs.md
+++ b/docs/generators/typescript-nestjs.md
@@ -8,6 +8,7 @@ title: Documentation for the typescript-nestjs Generator
 | -------- | ----- | ----- |
 | generator name | typescript-nestjs | pass this to the generate command after -g |
 | generator type | CLIENT | |
+| generator language | Typescript | |
 | helpTxt | Generates a TypeScript Nestjs 6.x client library. | |
 
 ## CONFIG OPTIONS
diff --git a/docs/generators/typescript-node.md b/docs/generators/typescript-node.md
index b2afd57352d79824045622ec11506d5f88d6a330..03c988d6f259ba67266675f5775225f8c98d440b 100644
--- a/docs/generators/typescript-node.md
+++ b/docs/generators/typescript-node.md
@@ -8,6 +8,7 @@ title: Documentation for the typescript-node Generator
 | -------- | ----- | ----- |
 | generator name | typescript-node | pass this to the generate command after -g |
 | generator type | CLIENT | |
+| generator language | Typescript | |
 | helpTxt | Generates a TypeScript NodeJS client library. | |
 
 ## CONFIG OPTIONS
diff --git a/docs/generators/typescript-redux-query.md b/docs/generators/typescript-redux-query.md
index 022f22d8c5e711705082e46614a064d8b904310b..85fc2a548c77e08298aa426b8705976faf881d01 100644
--- a/docs/generators/typescript-redux-query.md
+++ b/docs/generators/typescript-redux-query.md
@@ -8,6 +8,7 @@ title: Documentation for the typescript-redux-query Generator
 | -------- | ----- | ----- |
 | generator name | typescript-redux-query | pass this to the generate command after -g |
 | generator type | CLIENT | |
+| generator language | Typescript | |
 | helpTxt | Generates a TypeScript client library using redux-query API (beta). | |
 
 ## CONFIG OPTIONS
diff --git a/docs/generators/typescript-rxjs.md b/docs/generators/typescript-rxjs.md
index 52ed0e12ef0f60e1e104ecebdea0f2097b8d610b..06ef6aa84b77eacba3b418ad6437cbc541a2b60c 100644
--- a/docs/generators/typescript-rxjs.md
+++ b/docs/generators/typescript-rxjs.md
@@ -8,6 +8,7 @@ title: Documentation for the typescript-rxjs Generator
 | -------- | ----- | ----- |
 | generator name | typescript-rxjs | pass this to the generate command after -g |
 | generator type | CLIENT | |
+| generator language | Typescript | |
 | helpTxt | Generates a TypeScript client library using Rxjs API. | |
 
 ## CONFIG OPTIONS
diff --git a/docs/generators/typescript.md b/docs/generators/typescript.md
index 3aae708a3bda1fdbc70f9a270c7c896d7f485de4..8659b4fbf96f1f0d6f10d18ee20ebb4c40c79603 100644
--- a/docs/generators/typescript.md
+++ b/docs/generators/typescript.md
@@ -8,6 +8,7 @@ title: Documentation for the typescript Generator
 | -------- | ----- | ----- |
 | generator name | typescript | pass this to the generate command after -g |
 | generator type | CLIENT | |
+| generator language | Typescript | |
 | helpTxt | Generates a TypeScript client library using Fetch API (beta). | |
 
 ## CONFIG OPTIONS
diff --git a/docs/generators/wsdl-schema.md b/docs/generators/wsdl-schema.md
index 47c95920be5a65f4f998f3191fcd174122703726..131d78b443b841807ba839dca9e849563254ca94 100644
--- a/docs/generators/wsdl-schema.md
+++ b/docs/generators/wsdl-schema.md
@@ -8,6 +8,7 @@ title: Documentation for the wsdl-schema Generator
 | -------- | ----- | ----- |
 | generator name | wsdl-schema | pass this to the generate command after -g |
 | generator type | SCHEMA | |
+| generator language | Web Services Description Language (WSDL) | |
 | helpTxt | Generates WSDL files. | |
 
 ## CONFIG OPTIONS
diff --git a/modules/openapi-generator-cli/src/main/java/org/openapitools/codegen/cmd/ConfigHelp.java b/modules/openapi-generator-cli/src/main/java/org/openapitools/codegen/cmd/ConfigHelp.java
index 3c61526cddc3bdc1c3b4aeb66e6a3dcbdd51f8a7..35e16eaf0e3d8391783b1b19d8d8c9b63dfb9658 100644
--- a/modules/openapi-generator-cli/src/main/java/org/openapitools/codegen/cmd/ConfigHelp.java
+++ b/modules/openapi-generator-cli/src/main/java/org/openapitools/codegen/cmd/ConfigHelp.java
@@ -304,6 +304,9 @@ public class ConfigHelp extends OpenApiGeneratorCommand {
         sb.append("| -------- | ----- | ----- |").append(newline);
         sb.append("| generator name | "+config.getName()+" | pass this to the generate command after -g |").append(newline);
         sb.append("| generator type | "+config.getTag()+" | |").append(newline);
+        if (config.generatorLanguage() != null) {
+            sb.append("| generator language | "+config.generatorLanguage().toString()+" | |").append(newline);
+        }
         sb.append("| helpTxt | "+config.getHelp()+" | |").append(newline);
 
         sb.append(newline);
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenConfig.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenConfig.java
index 17b9b978259f192d5a1c4e154cee75d572751923..7e6bc07dede9fdea2fffd4a6a1bbf010717d686a 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenConfig.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenConfig.java
@@ -306,4 +306,6 @@ public interface CodegenConfig {
     Schema unaliasSchema(Schema schema, Map<String, String> usedImportMappings);
 
     public String defaultTemplatingEngine();
+
+    public GeneratorLanguage generatorLanguage();
 }
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java
index 1a9d09441c026c345c895aada7a61b4a18474a6b..1744cb3173662028475e1640e5e51b301478598a 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java
@@ -7361,4 +7361,7 @@ public class DefaultCodegen implements CodegenConfig {
     public String defaultTemplatingEngine() {
         return "mustache";
     }
+
+    @Override
+    public GeneratorLanguage generatorLanguage() { return GeneratorLanguage.JAVA; }
 }
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/GeneratorLanguage.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/GeneratorLanguage.java
new file mode 100644
index 0000000000000000000000000000000000000000..b72483502539ddce1410f7883665c38025ccba84
--- /dev/null
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/GeneratorLanguage.java
@@ -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
+ *
+ *     https://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.codegen;
+
+public enum GeneratorLanguage {
+    /*
+    Not defined because they use the default Java language:
+    Android
+
+    Note: all documentation generators have generatorLanguage set to null
+     */
+    JAVA("Java"), ADA("Ada"), APEX("Apex"), BASH("Bash"), C("C"),
+    CLOJURE("Clojure"), C_PLUS_PLUS("C++"), CRYSTAL("Crystal"), C_SHARP("C#"),
+    DART("Dart"), EIFFEL("Eiffel"), ELIXIR("Elixir"), ELM("Elm"),
+    ERLANG("Erlang"), FLASH("Flash"), F_SHARP("F#"), GO("Go"),
+    JAVASCRIPT("Javascript"), GRAPH_QL("GraphQL"), GROOVY("Groovy"),
+    HASKELL("Haskell"), TYPESCRIPT("Typescript"), K_SIX("k6"), KOTLIN("Kotlin"),
+    KTORM("Ktorm"), LUA("Lua"), MYSQL("Mysql"), NIM("Nim"),
+    OBJECTIVE_C("Objective-C"), OCAML("OCaml"), PERL("Perl"), PHP("PHP"),
+    POWERSHELL("PowerShell"), PROTOBUF("Protocol Buffers (Protobuf)"), PYTHON("Python"),
+    R("R"), RUBY("Ruby"), RUST("Rust"), SCALA("Scala"), SWIFT("Swift"),
+    WSDL("Web Services Description Language (WSDL)");
+
+    private final String label;
+
+    private GeneratorLanguage(String label) {
+        this.label = label;
+    }
+
+    @Override
+    public String toString() {
+        return this.label;
+    }
+}
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractAdaCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractAdaCodegen.java
index 9670576e7dba21688cb10e2830a68d3007731f8a..2473ebd97d1d0ae6470af07549451f45eda5807c 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractAdaCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractAdaCodegen.java
@@ -820,4 +820,7 @@ abstract public class AbstractAdaCodegen extends DefaultCodegen implements Codeg
         }
         return result;
     }
+
+    @Override
+    public GeneratorLanguage generatorLanguage() { return GeneratorLanguage.ADA; }
 }
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractCSharpCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractCSharpCodegen.java
index a42ee2dadabd861d852e202104f93557f7032bbb..a294a59fb04fbeeaa07ecfca5d1466e86bc2e381 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractCSharpCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractCSharpCodegen.java
@@ -1341,4 +1341,7 @@ public abstract class AbstractCSharpCodegen extends DefaultCodegen implements Co
             }
         }
     }
+
+    @Override
+    public GeneratorLanguage generatorLanguage() { return GeneratorLanguage.C_SHARP; }
 }
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractCppCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractCppCodegen.java
index 982980afbc8468b5aedc15b204ab61a5656f09c0..fc4e37066f864c9bfbb5212e7252c42e7b4d0c4d 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractCppCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractCppCodegen.java
@@ -25,14 +25,9 @@ import io.swagger.v3.oas.models.media.Schema;
 import io.swagger.v3.oas.models.servers.Server;
 import io.swagger.v3.oas.models.servers.ServerVariables;
 import io.swagger.v3.oas.models.servers.ServerVariable;
-import org.openapitools.codegen.CodegenServer;
-import org.openapitools.codegen.CodegenServerVariable;
+import org.openapitools.codegen.*;
 import org.apache.commons.io.FilenameUtils;
 import org.apache.commons.lang3.StringUtils;
-import org.openapitools.codegen.CodegenConfig;
-import org.openapitools.codegen.CodegenModel;
-import org.openapitools.codegen.CodegenProperty;
-import org.openapitools.codegen.DefaultCodegen;
 import org.openapitools.codegen.templating.mustache.IndentedLambda;
 import org.openapitools.codegen.utils.ModelUtils;
 import org.openapitools.codegen.utils.URLPathUtils;
@@ -439,4 +434,7 @@ abstract public class AbstractCppCodegen extends DefaultCodegen implements Codeg
         }
         return;
     }
+
+    @Override
+    public GeneratorLanguage generatorLanguage() { return GeneratorLanguage.C_PLUS_PLUS; }
 }
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractDartCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractDartCodegen.java
index 75e466165a55f74b2cb4b4e1bf9ba3b022dcc8a5..92c7fef7470748ac71b8ab960c96c82bf7a8a0e9 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractDartCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractDartCodegen.java
@@ -768,4 +768,7 @@ public abstract class AbstractDartCodegen extends DefaultCodegen {
             }
         }
     }
+
+    @Override
+    public GeneratorLanguage generatorLanguage() { return GeneratorLanguage.DART; }
 }
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractEiffelCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractEiffelCodegen.java
index 85cc06c3c6db2db5ad6423070fcea8dc34b37db3..26069c778bb30935e67c1daad4073e4ae0523eed 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractEiffelCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractEiffelCodegen.java
@@ -634,4 +634,6 @@ public abstract class AbstractEiffelCodegen extends DefaultCodegen implements Co
 
     }
 
+    @Override
+    public GeneratorLanguage generatorLanguage() { return GeneratorLanguage.EIFFEL; }
 }
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractFSharpCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractFSharpCodegen.java
index e2e9d96dc9f98bd84bf444843ce260c38542f779..b780186d65b99efaa16b1b37c0dd1fcf446579c6 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractFSharpCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractFSharpCodegen.java
@@ -1130,4 +1130,7 @@ public abstract class AbstractFSharpCodegen extends DefaultCodegen implements Co
             }
         }
     }
+
+    @Override
+    public GeneratorLanguage generatorLanguage() { return GeneratorLanguage.F_SHARP; }
 }
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractGoCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractGoCodegen.java
index 803fc6ace34bf2eca24ebb1a4e21d23827edfeaa..6c206de669da171b997945eddd921f57af30ec96 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractGoCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractGoCodegen.java
@@ -848,4 +848,7 @@ public abstract class AbstractGoCodegen extends DefaultCodegen implements Codege
     protected boolean isNumberType(String datatype) {
         return numberTypes.contains(datatype);
     }
+
+    @Override
+    public GeneratorLanguage generatorLanguage() { return GeneratorLanguage.GO; }
 }
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractKotlinCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractKotlinCodegen.java
index 0cd24435d482cf3370696c3209030e981330fcd9..ad48b483a9b252af812ba9bfceff8dc0b205da4c 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractKotlinCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractKotlinCodegen.java
@@ -1016,4 +1016,7 @@ public abstract class AbstractKotlinCodegen extends DefaultCodegen implements Co
 
         return null;
     }
+
+    @Override
+    public GeneratorLanguage generatorLanguage() { return GeneratorLanguage.KOTLIN; }
 }
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractPhpCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractPhpCodegen.java
index db9c3e42029d320efa14c9a8635e8d6df816dab9..bfbeb59452a538e21f3f1f0c37a4ac8edfe64581 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractPhpCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractPhpCodegen.java
@@ -809,4 +809,7 @@ public abstract class AbstractPhpCodegen extends DefaultCodegen implements Codeg
     public boolean isDataTypeString(String dataType) {
         return "string".equals(dataType);
     }
+
+    @Override
+    public GeneratorLanguage generatorLanguage() { return GeneratorLanguage.PHP; }
 }
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractPythonCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractPythonCodegen.java
index f07cef7e4dec41bcaabde13aacbd891fe8d63373..1d406e00ac5452dd990e1e72f2d938bd046bc3f1 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractPythonCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractPythonCodegen.java
@@ -700,4 +700,7 @@ public abstract class AbstractPythonCodegen extends DefaultCodegen implements Co
     protected static String dropDots(String str) {
         return str.replaceAll("\\.", "_");
     }
+
+    @Override
+    public GeneratorLanguage generatorLanguage() { return GeneratorLanguage.PYTHON; }
 }
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractRubyCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractRubyCodegen.java
index 67fe9bc6d93fde1f19e049e252879d36734498ff..a57af7989a1858dfe9a69718c7336ff6adbc47f7 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractRubyCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractRubyCodegen.java
@@ -23,6 +23,7 @@ import org.apache.commons.io.FilenameUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.openapitools.codegen.CodegenConfig;
 import org.openapitools.codegen.DefaultCodegen;
+import org.openapitools.codegen.GeneratorLanguage;
 import org.openapitools.codegen.utils.ModelUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -262,4 +263,7 @@ abstract public class AbstractRubyCodegen extends DefaultCodegen implements Code
             }
         }
     }
+
+    @Override
+    public GeneratorLanguage generatorLanguage() { return GeneratorLanguage.RUBY; }
 }
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractScalaCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractScalaCodegen.java
index c3132a06f42a7f15f9480e92404de525c29036ca..6a1f0d3307144622c7afb2236e4e1ddb640f9e3a 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractScalaCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractScalaCodegen.java
@@ -575,4 +575,6 @@ public abstract class AbstractScalaCodegen extends DefaultCodegen {
         this.invokerPackage = invokerPackage;
     }
 
+    @Override
+    public GeneratorLanguage generatorLanguage() { return GeneratorLanguage.SCALA; }
 }
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractTypeScriptClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractTypeScriptClientCodegen.java
index 647ecda7a043e12023b986c2b1edb21049e7481e..ee69893ecf70722ea3277554e6c3ea6d358cb5f7 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractTypeScriptClientCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractTypeScriptClientCodegen.java
@@ -956,4 +956,7 @@ public abstract class AbstractTypeScriptClientCodegen extends DefaultCodegen imp
             return schemaType;
         }).distinct().collect(Collectors.toList());
     }
+
+    @Override
+    public GeneratorLanguage generatorLanguage() { return GeneratorLanguage.TYPESCRIPT; }
 }
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ApexClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ApexClientCodegen.java
index 4c56b3c0eefb1e43ae85a95ebf26c4e1df94e837..f8d43504d27f211a6ac639c753506fcbaedeba3e 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ApexClientCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ApexClientCodegen.java
@@ -23,6 +23,7 @@ import io.swagger.v3.oas.models.media.Schema;
 import org.apache.commons.lang3.StringUtils;
 import org.openapitools.codegen.CliOption;
 import org.openapitools.codegen.CodegenProperty;
+import org.openapitools.codegen.GeneratorLanguage;
 import org.openapitools.codegen.SupportingFile;
 import org.openapitools.codegen.utils.ModelUtils;
 import org.slf4j.Logger;
@@ -326,5 +327,6 @@ public class ApexClientCodegen extends AbstractApexCodegen {
 
     }
 
-
+    @Override
+    public GeneratorLanguage generatorLanguage() { return GeneratorLanguage.APEX; }
 }
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/BashClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/BashClientCodegen.java
index 5ca5fbb156beff80ec27e40d37d12810de59b5ad..5cc50db1415aa3ca4182799bb4b424bcacec7745 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/BashClientCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/BashClientCodegen.java
@@ -828,4 +828,6 @@ public class BashClientCodegen extends DefaultCodegen implements CodegenConfig {
         return camelize(sanitizeName(operationId), true);
     }
 
+    @Override
+    public GeneratorLanguage generatorLanguage() { return GeneratorLanguage.BASH; }
 }
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CLibcurlClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CLibcurlClientCodegen.java
index 788639ab1d776eb69fdebe86fa0597d0d5cdfca1..e7aa24c603de86ca92f73c1974832fc991eb01d3 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CLibcurlClientCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CLibcurlClientCodegen.java
@@ -920,4 +920,7 @@ public class CLibcurlClientCodegen extends DefaultCodegen implements CodegenConf
         System.out.println("# > Niklas Werner - https://paypal.me/wernerdevelopment                        #");
         System.out.println("################################################################################");
     }
+
+    @Override
+    public GeneratorLanguage generatorLanguage() { return GeneratorLanguage.C; }
 }
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ClojureClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ClojureClientCodegen.java
index df4a237bd85f2e4dd143dbc31a0477e5574f166b..8527aba03f64f0441e374a4f5b8daeb37b0cfa41 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ClojureClientCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ClojureClientCodegen.java
@@ -382,4 +382,7 @@ public class ClojureClientCodegen extends DefaultCodegen implements CodegenConfi
         // ref: https://clojurebridge.github.io/community-docs/docs/clojure/comment/
         return input.replace("(comment", "(_comment");
     }
+
+    @Override
+    public GeneratorLanguage generatorLanguage() { return GeneratorLanguage.CLOJURE; }
 }
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ConfluenceWikiCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ConfluenceWikiCodegen.java
index edb5f81cd0d3146d496e910c5abfcbf56a037520..20c3fb253737791ca90411d421e0386518d355e8 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ConfluenceWikiCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ConfluenceWikiCodegen.java
@@ -150,4 +150,7 @@ public class ConfluenceWikiCodegen extends DefaultCodegen implements CodegenConf
         // chomp tailing newline because it breaks the tables and keep all other sign to show documentation properly
         return StringUtils.chomp(input);
     }
+
+    @Override
+    public GeneratorLanguage generatorLanguage() { return null; }
 }
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CrystalClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CrystalClientCodegen.java
index 21b18e18154bd86010e7eb4ffb083770e89bdb29..d4c83e5d5f011a9309c478230495a8a86e9db56e 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CrystalClientCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CrystalClientCodegen.java
@@ -898,4 +898,7 @@ public class CrystalClientCodegen extends DefaultCodegen {
             }
         }
     }
+
+    @Override
+    public GeneratorLanguage generatorLanguage() { return GeneratorLanguage.CRYSTAL; }
 }
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ElixirClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ElixirClientCodegen.java
index 62c9d6dcc5f5ac61e05debae9043c46cadc7ad82..e3291df861143d919462c74c173a946ab0da5cc3 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ElixirClientCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ElixirClientCodegen.java
@@ -915,4 +915,7 @@ public class ElixirClientCodegen extends DefaultCodegen implements CodegenConfig
     public void setModuleName(String moduleName) {
         this.moduleName = moduleName;
     }
+
+    @Override
+    public GeneratorLanguage generatorLanguage() { return GeneratorLanguage.ELIXIR; }
 }
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ElmClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ElmClientCodegen.java
index 20b2ac0c944bf766c3af84e5e7bea2ca282895c8..78241218e217f0c9b1041ad723f5a69fc40a0bc0 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ElmClientCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ElmClientCodegen.java
@@ -465,4 +465,7 @@ public class ElmClientCodegen extends DefaultCodegen implements CodegenConfig {
             writer.write(fragment.execute().replaceAll("\\s+", ""));
         }
     }
+
+    @Override
+    public GeneratorLanguage generatorLanguage() { return GeneratorLanguage.ELM; }
 }
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ErlangClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ErlangClientCodegen.java
index 541456a824e3907e0b2300022f2eddfb1388c320..3ba5232be169588e0120e08ace25b462db5da482 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ErlangClientCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ErlangClientCodegen.java
@@ -479,4 +479,7 @@ public class ErlangClientCodegen extends DefaultCodegen implements CodegenConfig
     public String addRegularExpressionDelimiter(String pattern) {
         return pattern;
     }
+
+    @Override
+    public GeneratorLanguage generatorLanguage() { return GeneratorLanguage.ERLANG; }
 }
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ErlangProperCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ErlangProperCodegen.java
index aec9866414908c41cf2efd1cf69f778f68874e75..e065ca217eeac47b3e273c04f2ac019162d0b798 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ErlangProperCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ErlangProperCodegen.java
@@ -573,4 +573,7 @@ public class ErlangProperCodegen extends DefaultCodegen implements CodegenConfig
     public String addRegularExpressionDelimiter(String pattern) {
         return pattern;
     }
+
+    @Override
+    public GeneratorLanguage generatorLanguage() { return GeneratorLanguage.ERLANG; }
 }
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ErlangServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ErlangServerCodegen.java
index 0c9fc2dcc19f43f69dbf4c09ce6aede06f3173b3..05e488e5354a22c914f5549a8b56376a753ed270 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ErlangServerCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ErlangServerCodegen.java
@@ -330,4 +330,7 @@ public class ErlangServerCodegen extends DefaultCodegen implements CodegenConfig
     public String addRegularExpressionDelimiter(String pattern) {
         return pattern;
     }
+
+    @Override
+    public GeneratorLanguage generatorLanguage() { return GeneratorLanguage.ERLANG; }
 }
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/FlashClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/FlashClientCodegen.java
index 2dfcbfcafbe8a759f156285f08fb0199ffddff4b..2b89404ce7d290fa9880dc183fede9a5e2382ed1 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/FlashClientCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/FlashClientCodegen.java
@@ -410,4 +410,7 @@ public class FlashClientCodegen extends DefaultCodegen implements CodegenConfig
     public String escapeUnsafeCharacters(String input) {
         return input.replace("*/", "*_/").replace("/*", "/_*");
     }
+
+    @Override
+    public GeneratorLanguage generatorLanguage() { return GeneratorLanguage.FLASH; }
 }
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/GraphQLNodeJSExpressServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/GraphQLNodeJSExpressServerCodegen.java
index edfe46026a278860630b9949bd8221c1a056708c..fc68c05827a9254b23056f2f62a6b2eabce21687 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/GraphQLNodeJSExpressServerCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/GraphQLNodeJSExpressServerCodegen.java
@@ -166,4 +166,7 @@ public class GraphQLNodeJSExpressServerCodegen extends AbstractGraphQLCodegen im
             return StringUtils.capitalize(enumName) + "Enum";
         }
     }
+
+    @Override
+    public GeneratorLanguage generatorLanguage() { return GeneratorLanguage.JAVASCRIPT; }
 }
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/GraphQLSchemaCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/GraphQLSchemaCodegen.java
index 9835ee9d0e5258fe837d94c1b7adba1ca68a7df4..5215b9d3bed0b53cb7ea74a1d8e91a809e81d069 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/GraphQLSchemaCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/GraphQLSchemaCodegen.java
@@ -16,10 +16,7 @@
 
 package org.openapitools.codegen.languages;
 
-import org.openapitools.codegen.CliOption;
-import org.openapitools.codegen.CodegenConfig;
-import org.openapitools.codegen.CodegenConstants;
-import org.openapitools.codegen.CodegenType;
+import org.openapitools.codegen.*;
 import org.openapitools.codegen.meta.features.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -102,4 +99,7 @@ public class GraphQLSchemaCodegen extends AbstractGraphQLCodegen implements Code
         //supportingFiles.add(new SupportingFile("gitignore.mustache", "", ".gitignore"))
         //supportingFiles.add(new SupportingFile(".travis.yml", "", ".travis.yml"));
     }
+
+    @Override
+    public GeneratorLanguage generatorLanguage() { return GeneratorLanguage.GRAPH_QL; }
 }
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/GroovyClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/GroovyClientCodegen.java
index 77844538e47390bc3497dbf6fef485d71585d2ed..c12ce8393750e3cbe3254f49612c3b33cc1daf38 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/GroovyClientCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/GroovyClientCodegen.java
@@ -24,10 +24,7 @@ import java.util.EnumSet;
 import java.util.List;
 import java.util.Map;
 
-import org.openapitools.codegen.CodegenConstants;
-import org.openapitools.codegen.CodegenOperation;
-import org.openapitools.codegen.CodegenType;
-import org.openapitools.codegen.SupportingFile;
+import org.openapitools.codegen.*;
 import org.openapitools.codegen.meta.features.ClientModificationFeature;
 import org.openapitools.codegen.meta.features.DocumentationFeature;
 import org.openapitools.codegen.meta.features.GlobalFeature;
@@ -157,4 +154,7 @@ public class GroovyClientCodegen extends AbstractJavaCodegen {
     public String escapeUnsafeCharacters(String input) {
         return input.replace("*/", "*_/").replace("/*", "/_*");
     }
+
+    @Override
+    public GeneratorLanguage generatorLanguage() { return GeneratorLanguage.GROOVY; }
 }
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/HaskellHttpClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/HaskellHttpClientCodegen.java
index 645069903b8ec6e35a82fd566a98019a03907be6..3f7845bfa7c374eea7e1f96801414e3f20c09e2b 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/HaskellHttpClientCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/HaskellHttpClientCodegen.java
@@ -1473,4 +1473,7 @@ public class HaskellHttpClientCodegen extends DefaultCodegen implements CodegenC
     static boolean ContainsJsonMimeType(String mime) {
             return mime != null && CONTAINS_JSON_MIME_PATTERN.matcher(mime).matches();
     }
+
+    @Override
+    public GeneratorLanguage generatorLanguage() { return GeneratorLanguage.HASKELL; }
 }
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/HaskellServantCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/HaskellServantCodegen.java
index 9b44c0b2d6803ea277de9cf86391fe0f4fff80b8..477df4715077670da7102f63f61ec8a086764908 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/HaskellServantCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/HaskellServantCodegen.java
@@ -701,4 +701,7 @@ public class HaskellServantCodegen extends DefaultCodegen implements CodegenConf
             }
         }
     }
+
+    @Override
+    public GeneratorLanguage generatorLanguage() { return GeneratorLanguage.HASKELL; }
 }
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/HaskellYesodServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/HaskellYesodServerCodegen.java
index 736b9d599b115a6e8d29b0e699823dc6e83d608b..d30093ce7c933fc176b9473cf6fccaa37b45f95f 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/HaskellYesodServerCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/HaskellYesodServerCodegen.java
@@ -630,4 +630,7 @@ public class HaskellYesodServerCodegen extends DefaultCodegen implements Codegen
             }
         }
     }
+
+    @Override
+    public GeneratorLanguage generatorLanguage() { return GeneratorLanguage.HASKELL; }
 }
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavascriptApolloClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavascriptApolloClientCodegen.java
index 32b601491d37f78f383c5ee3ea251bd7efa957c8..2764949534630d381ae31d8c79e4cf611e2919df 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavascriptApolloClientCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavascriptApolloClientCodegen.java
@@ -1143,4 +1143,7 @@ public class JavascriptApolloClientCodegen extends DefaultCodegen implements Cod
             }
         }
     }
+
+    @Override
+    public GeneratorLanguage generatorLanguage() { return GeneratorLanguage.JAVASCRIPT; }
 }
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavascriptClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavascriptClientCodegen.java
index 4e9ddd2a007a3763b9f8fe328ad3fa27ed84f1b4..1f8f973e029ca5d0b52cbe8b6a5b52739cf239c4 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavascriptClientCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavascriptClientCodegen.java
@@ -1240,4 +1240,7 @@ public class JavascriptClientCodegen extends DefaultCodegen implements CodegenCo
         }
         return super.getCollectionFormat(codegenParameter);
     }
+
+    @Override
+    public GeneratorLanguage generatorLanguage() { return GeneratorLanguage.JAVASCRIPT; }
 }
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavascriptClosureAngularClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavascriptClosureAngularClientCodegen.java
index edc3c21e4d5f1c30f208c3018e8e371dec059881..8744934020a6325b140c20605b003a99ca7e940c 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavascriptClosureAngularClientCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavascriptClosureAngularClientCodegen.java
@@ -319,4 +319,7 @@ public class JavascriptClosureAngularClientCodegen extends DefaultCodegen implem
     public void setUseEs6(boolean useEs6) {
         this.useEs6 = useEs6;
     }
+
+    @Override
+    public GeneratorLanguage generatorLanguage() { return GeneratorLanguage.JAVASCRIPT; }
 }
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavascriptFlowtypedClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavascriptFlowtypedClientCodegen.java
index c82f5e1c68e403d69144b539ece8136fbf404286..cf344c8281c23fb3dc21b2a9ac6acd8fd9d16af7 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavascriptFlowtypedClientCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavascriptFlowtypedClientCodegen.java
@@ -223,4 +223,6 @@ public class JavascriptFlowtypedClientCodegen extends AbstractTypeScriptClientCo
         this.npmRepository = npmRepository;
     }
 
+    @Override
+    public GeneratorLanguage generatorLanguage() { return GeneratorLanguage.JAVASCRIPT; }
 }
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/K6ClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/K6ClientCodegen.java
index 982a3fefbe03c074c7f693d0ff6b68d746fe4186..05a9d1536d4d2627a3655b192a257f565c521f35 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/K6ClientCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/K6ClientCodegen.java
@@ -46,16 +46,7 @@ import javax.annotation.Nullable;
 import com.google.common.collect.ImmutableMap;
 import org.apache.commons.text.StringEscapeUtils;
 import org.apache.commons.lang3.StringUtils;
-import org.openapitools.codegen.CodegenConfig;
-import org.openapitools.codegen.CodegenConstants;
-import org.openapitools.codegen.CodegenModel;
-import org.openapitools.codegen.CodegenOperation;
-import org.openapitools.codegen.CodegenParameter;
-import org.openapitools.codegen.CodegenProperty;
-import org.openapitools.codegen.CodegenResponse;
-import org.openapitools.codegen.CodegenType;
-import org.openapitools.codegen.DefaultCodegen;
-import org.openapitools.codegen.SupportingFile;
+import org.openapitools.codegen.*;
 import org.openapitools.codegen.meta.GeneratorMetadata;
 import org.openapitools.codegen.meta.Stability;
 import org.openapitools.codegen.utils.ModelUtils;
@@ -1155,4 +1146,6 @@ public class K6ClientCodegen extends DefaultCodegen implements CodegenConfig {
         }
     }
 
+    @Override
+    public GeneratorLanguage generatorLanguage() { return GeneratorLanguage.K_SIX; }
 }
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KtormSchemaCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KtormSchemaCodegen.java
index 876a1b3b479e2ed76dbb15cadd7eeda83d85dae3..d69af302d54e4df883ab8d767c3920592a042974 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KtormSchemaCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KtormSchemaCodegen.java
@@ -1224,4 +1224,6 @@ public class KtormSchemaCodegen extends AbstractKotlinCodegen {
         return StringUtils.removeEnd(packagePath, File.separator);
     }
 
+    @Override
+    public GeneratorLanguage generatorLanguage() { return GeneratorLanguage.KTORM; }
 }
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/LuaClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/LuaClientCodegen.java
index 795b829036a1faaaa48d746ad0d514b5ae815000..84af5454e0d67efe80764839f4a1b57e1e20985f 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/LuaClientCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/LuaClientCodegen.java
@@ -594,4 +594,7 @@ public class LuaClientCodegen extends DefaultCodegen implements CodegenConfig {
         System.out.println("# Pls support his work directly via https://github.com/sponsors/daurnimator \uD83D\uDE4F #");
         System.out.println("################################################################################");
     }
+
+    @Override
+    public GeneratorLanguage generatorLanguage() { return GeneratorLanguage.LUA; }
 }
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/MarkdownDocumentationCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/MarkdownDocumentationCodegen.java
index 3a3e081f7b81bc12f00b1b7c4cacd8102db05cdf..0e4ad861cb38d40a530ce1cc8dc6fd29e7985a9a 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/MarkdownDocumentationCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/MarkdownDocumentationCodegen.java
@@ -1,11 +1,6 @@
 package org.openapitools.codegen.languages;
 
-import org.openapitools.codegen.CodegenConfig;
-import org.openapitools.codegen.CodegenModel;
-import org.openapitools.codegen.CodegenProperty;
-import org.openapitools.codegen.CodegenType;
-import org.openapitools.codegen.DefaultCodegen;
-import org.openapitools.codegen.SupportingFile;
+import org.openapitools.codegen.*;
 import org.openapitools.codegen.meta.GeneratorMetadata;
 import org.openapitools.codegen.meta.Stability;
 import org.slf4j.Logger;
@@ -112,4 +107,7 @@ public class MarkdownDocumentationCodegen extends DefaultCodegen implements Code
     public String toModelFilename(String name) {
         return name;
     }
+
+    @Override
+    public GeneratorLanguage generatorLanguage() { return null; }
 }
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/MysqlSchemaCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/MysqlSchemaCodegen.java
index 97748d8d6db00f1b56b5028c7efd68b74a4f1fb7..d1f95897135805b0256bc69b8c28b27eb1f87820 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/MysqlSchemaCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/MysqlSchemaCodegen.java
@@ -1254,4 +1254,7 @@ public class MysqlSchemaCodegen extends DefaultCodegen implements CodegenConfig
         // Trim trailing file separators from the overall path
         return StringUtils.removeEnd(packagePath, File.separator);
     }
+
+    @Override
+    public GeneratorLanguage generatorLanguage() { return GeneratorLanguage.MYSQL; }
 }
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/NimClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/NimClientCodegen.java
index 572cbacc66f8725dc7855608b6d6383ba8fd2e5b..4db55bcb17e7a16b6a470bd2919bf60ac4d9350b 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/NimClientCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/NimClientCodegen.java
@@ -368,4 +368,7 @@ public class NimClientCodegen extends DefaultCodegen implements CodegenConfig {
             return name;
         }
     }
+
+    @Override
+    public GeneratorLanguage generatorLanguage() { return GeneratorLanguage.NIM; }
 }
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/NodeJSExpressServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/NodeJSExpressServerCodegen.java
index 3af6d99b96ffc6f3436198c34593521ad4e9177b..774df093e1d02ac9163016e68103c4118c8fe86f 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/NodeJSExpressServerCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/NodeJSExpressServerCodegen.java
@@ -455,4 +455,7 @@ public class NodeJSExpressServerCodegen extends DefaultCodegen implements Codege
             }
         }
     }
+
+    @Override
+    public GeneratorLanguage generatorLanguage() { return GeneratorLanguage.JAVASCRIPT; }
 }
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/OCamlClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/OCamlClientCodegen.java
index 3b62750ae02d544b77d78b34ce7e5072420492d5..c9319b48ea43da8c010d1af7ed16d71192829ee7 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/OCamlClientCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/OCamlClientCodegen.java
@@ -828,4 +828,7 @@ public class OCamlClientCodegen extends DefaultCodegen implements CodegenConfig
             }
         }
     }
+
+    @Override
+    public GeneratorLanguage generatorLanguage() { return GeneratorLanguage.OCAML; }
 }
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ObjcClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ObjcClientCodegen.java
index 0075bcb8a5754bd3f27403eee6a80efd0213fffe..5667e3e29189e1b42291dd9a0e1b4f3f3d03137c 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ObjcClientCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ObjcClientCodegen.java
@@ -791,4 +791,6 @@ public class ObjcClientCodegen extends DefaultCodegen implements CodegenConfig {
         return input.replace("*/", "*_/").replace("/*", "/_*");
     }
 
+    @Override
+    public GeneratorLanguage generatorLanguage() { return GeneratorLanguage.OBJECTIVE_C; }
 }
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/OpenAPIGenerator.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/OpenAPIGenerator.java
index ccd3ff685d61dfd0f8c6e9805569812bf49719ce..8e65252b1a30a854c508f296254fb27f348b3b8f 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/OpenAPIGenerator.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/OpenAPIGenerator.java
@@ -106,4 +106,7 @@ public class OpenAPIGenerator extends DefaultCodegen implements CodegenConfig {
         // just return the original string
         return input;
     }
+
+    @Override
+    public GeneratorLanguage generatorLanguage() { return null; }
 }
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/OpenAPIYamlGenerator.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/OpenAPIYamlGenerator.java
index d697fe54fa1d73a94d2780c48fa8e151be4f8b24..d60fa609d39c5adfb20fb43897fd2c77fe166c35 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/OpenAPIYamlGenerator.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/OpenAPIYamlGenerator.java
@@ -120,4 +120,6 @@ public class OpenAPIYamlGenerator extends DefaultCodegen implements CodegenConfi
         return input;
     }
 
+    @Override
+    public GeneratorLanguage generatorLanguage() { return null; }
 }
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PerlClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PerlClientCodegen.java
index 2a4a8d1905ff12e5bba6e39df2e076c6cb606c8c..2f48cbc9b90a46bcc44aee63f21aba520c35f869 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PerlClientCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PerlClientCodegen.java
@@ -643,4 +643,7 @@ public class PerlClientCodegen extends DefaultCodegen implements CodegenConfig {
         System.out.println("# - OpenAPI Generator for Perl Developers            https://bit.ly/2OId6p3    #");
         System.out.println("################################################################################");
     }
+
+    @Override
+    public GeneratorLanguage generatorLanguage() { return GeneratorLanguage.PERL; }
 }
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpSilexServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpSilexServerCodegen.java
index a6efee11fb18f604e8ad3aa1724be394ac3541f2..212459d8d3403cd33f48ee929ae8ee9d91395e8f 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpSilexServerCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpSilexServerCodegen.java
@@ -281,4 +281,6 @@ public class PhpSilexServerCodegen extends DefaultCodegen implements CodegenConf
         return objs;
     }
 
+    @Override
+    public GeneratorLanguage generatorLanguage() { return GeneratorLanguage.PHP; }
 }
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PlantumlDocumentationCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PlantumlDocumentationCodegen.java
index ad63034acbe6e992c0d17d160d923d78b17d7d9f..8df3f2a3c4d232102ddd9d6176e2cfaca854d802 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PlantumlDocumentationCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PlantumlDocumentationCodegen.java
@@ -215,4 +215,7 @@ public class PlantumlDocumentationCodegen extends DefaultCodegen implements Code
         // to suppress the warning message
         return input;
     }
+
+    @Override
+    public GeneratorLanguage generatorLanguage() { return null; }
 }
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PowerShellClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PowerShellClientCodegen.java
index c7d4028d84a00e6c51d24bdc7b587f3b348cd078..fee739c2c8203c7a7624a7441d29d5df4231bcfd 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PowerShellClientCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PowerShellClientCodegen.java
@@ -1538,4 +1538,7 @@ public class PowerShellClientCodegen extends DefaultCodegen implements CodegenCo
         System.out.println("# - OpenAPI Generator for PowerShell Developers      https://bit.ly/3qBWfRJ    #");
         System.out.println("################################################################################");
     }
+
+    @Override
+    public GeneratorLanguage generatorLanguage() { return GeneratorLanguage.POWERSHELL; }
 }
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ProtobufSchemaCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ProtobufSchemaCodegen.java
index 777f6fc5169088b5481b96bea8e77602a3e19081..769d143091d326f2eff51d03d38611839ae7921f 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ProtobufSchemaCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ProtobufSchemaCodegen.java
@@ -603,4 +603,7 @@ public class ProtobufSchemaCodegen extends DefaultCodegen implements CodegenConf
         }
         return containsVar;
     }
+
+    @Override
+    public GeneratorLanguage generatorLanguage() { return GeneratorLanguage.PROTOBUF; }
 }
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/RClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/RClientCodegen.java
index b24d527646affd9c209f71c54b822dbc904bcf60..99294b06a150dea53be525d0e67de2193a5371f2 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/RClientCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/RClientCodegen.java
@@ -796,4 +796,6 @@ public class RClientCodegen extends DefaultCodegen implements CodegenConfig {
         System.out.println("################################################################################");
     }
 
+    @Override
+    public GeneratorLanguage generatorLanguage() { return GeneratorLanguage.R; }
 }
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/RustClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/RustClientCodegen.java
index 265a9afc20805c3f4751375d618ad4233afce970..5e8e5ac03080cdf3024e6aaac29ba798b470b2b7 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/RustClientCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/RustClientCodegen.java
@@ -690,4 +690,7 @@ public class RustClientCodegen extends DefaultCodegen implements CodegenConfig {
             return null;
         }
     }
+
+    @Override
+    public GeneratorLanguage generatorLanguage() { return GeneratorLanguage.RUST; }
 }
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/RustServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/RustServerCodegen.java
index 328e18387eadd19f0ed2d48fcfe9244988077a74..e4eb0dc9d79d98e41638f830d2c97d4e43d5d691 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/RustServerCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/RustServerCodegen.java
@@ -1742,4 +1742,7 @@ public class RustServerCodegen extends DefaultCodegen implements CodegenConfig {
             updatePropertyForMap(property, p);
         }
     }
+
+    @Override
+    public GeneratorLanguage generatorLanguage() { return GeneratorLanguage.RUST; }
 }
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaFinchServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaFinchServerCodegen.java
index 146ddf06ccf587b28148c2e74a83408cbaf53806..7aa5bfcce9782aee156a6a2d289cb0a4ec822d68 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaFinchServerCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaFinchServerCodegen.java
@@ -484,4 +484,6 @@ public class ScalaFinchServerCodegen extends DefaultCodegen implements CodegenCo
         System.out.println("################################################################################");
     }
 
+    @Override
+    public GeneratorLanguage generatorLanguage() { return GeneratorLanguage.SCALA; }
 }
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/StaticDocCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/StaticDocCodegen.java
index ce43779dfd745fc94319ef01ae0c05dc948baad8..7e20738885213abfbb798ec6e0897caa0afcf374 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/StaticDocCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/StaticDocCodegen.java
@@ -129,4 +129,7 @@ public class StaticDocCodegen extends DefaultCodegen implements CodegenConfig {
         // just return the original string
         return input;
     }
+
+    @Override
+    public GeneratorLanguage generatorLanguage() { return null; }
 }
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/StaticHtml2Generator.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/StaticHtml2Generator.java
index 523c7de0d09479b4d008a5730eb0fa958e3fe768..a6a2c81328f085a72fb04a9a477be0b7e55186a5 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/StaticHtml2Generator.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/StaticHtml2Generator.java
@@ -286,4 +286,7 @@ public class StaticHtml2Generator extends DefaultCodegen implements CodegenConfi
         // just return the original string
         return input;
     }
+
+    @Override
+    public GeneratorLanguage generatorLanguage() { return null; }
 }
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/StaticHtmlGenerator.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/StaticHtmlGenerator.java
index 910528d74989b44cff384d7735138c69a71422e5..b3a34018238d72e1c4eb20e133479d52f03837dc 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/StaticHtmlGenerator.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/StaticHtmlGenerator.java
@@ -229,4 +229,6 @@ public class StaticHtmlGenerator extends DefaultCodegen implements CodegenConfig
                 property.unescapedDescription);
     }
 
+    @Override
+    public GeneratorLanguage generatorLanguage() { return null; }
 }
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/Swift4Codegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/Swift4Codegen.java
index 0762835b4a58637ac7ff21b66c205963a7f45465..5adc13172bf7bedf83b24575304d5698e62a8b52 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/Swift4Codegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/Swift4Codegen.java
@@ -1091,4 +1091,7 @@ public class Swift4Codegen extends DefaultCodegen implements CodegenConfig {
         example += ")";
         return example;
     }
+
+    @Override
+    public GeneratorLanguage generatorLanguage() { return GeneratorLanguage.SWIFT; }
 }
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/Swift5ClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/Swift5ClientCodegen.java
index b853bf351cce1d92e8df8345d31eb026ef49fb80..ed0dc45e1b9c50a8af1337c02c115f9d0634f574 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/Swift5ClientCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/Swift5ClientCodegen.java
@@ -1320,4 +1320,7 @@ public class Swift5ClientCodegen extends DefaultCodegen implements CodegenConfig
         System.out.println("# Please support his work directly via https://paypal.com/paypalme/4brunu \uD83D\uDE4F   #");
         System.out.println("################################################################################");
     }
+
+    @Override
+    public GeneratorLanguage generatorLanguage() { return GeneratorLanguage.SWIFT; }
 }
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptClientCodegen.java
index d371f6177187aeaeab60dd7b74f0e7e39461ab49..51cc382c09d86412dc9fc93598bb2130c0498f3f 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptClientCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptClientCodegen.java
@@ -1573,4 +1573,7 @@ public class TypeScriptClientCodegen extends DefaultCodegen implements CodegenCo
             }
         }
     }
+
+    @Override
+    public GeneratorLanguage generatorLanguage() { return GeneratorLanguage.TYPESCRIPT; }
 }
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/WsdlSchemaCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/WsdlSchemaCodegen.java
index ac29e7caba7717902b3a0a893b20b4976c16545b..42b22298758168c082087dd42488b3f753cef218 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/WsdlSchemaCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/WsdlSchemaCodegen.java
@@ -280,4 +280,7 @@ public class WsdlSchemaCodegen extends DefaultCodegen implements CodegenConfig {
         // just return the original string
         return input;
     }
+
+    @Override
+    public GeneratorLanguage generatorLanguage() { return GeneratorLanguage.WSDL; }
 }