Update Scala gatling's default value (OpenAPITools#390)

* update powershell script

* update powershell bin script (oas3)

* update html2 generator's default value

* update scala gatling default value

Author: wing328

bin/openapi3/powershell-petstore.sh

@@ -27,6 +27,6 @@ fi
 
 # if you've executed sbt assembly previously it will use that instead.
 export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
-ags="generate -t modules/openapi-generator/src/main/resources/powershell -i modules/openapi-generator/src/test/resources/3_0/petstore.yaml -l powershell -o samples/client/petstore/powershell --additional-properties packageGuid=a27b908d-2a20-467f-bc32-af6f3a654ac5,csharpClientPath=\$ScriptDir\..\..\petstore\csharp\SwaggerClient $@"
+ags="generate -t modules/openapi-generator/src/main/resources/powershell -i modules/openapi-generator/src/test/resources/3_0/petstore.yaml -l powershell -o samples/client/petstore/powershell --additional-properties packageGuid=a27b908d-2a20-467f-bc32-af6f3a654ac5,csharpClientPath=\$ScriptDir\..\..\petstore\csharp\OpenAPIClient $@"
 
 java $JAVA_OPTS -jar $executable $ags

bin/powershell-petstore.sh

@@ -27,6 +27,6 @@ fi
 
 # if you've executed sbt assembly previously it will use that instead.
 export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
-ags="generate -t modules/openapi-generator/src/main/resources/powershell -i modules/openapi-generator/src/test/resources/2_0/petstore.yaml -l powershell -o samples/client/petstore/powershell --additional-properties packageGuid=a27b908d-2a20-467f-bc32-af6f3a654ac5,csharpClientPath=\$ScriptDir\..\..\petstore\csharp\SwaggerClient $@"
+ags="generate -t modules/openapi-generator/src/main/resources/powershell -i modules/openapi-generator/src/test/resources/2_0/petstore.yaml -l powershell -o samples/client/petstore/powershell --additional-properties packageGuid=a27b908d-2a20-467f-bc32-af6f3a654ac5,csharpClientPath=\$ScriptDir\..\..\petstore\csharp\OpenAPIClient $@"
 
 java ${JAVA_OPTS} -jar ${executable} ${ags}

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaGatlingCodegen.java

@@ -96,12 +96,12 @@ public ScalaGatlingCodegen() {
         /**
          * Api Package.  Optional, if needed, this can be used in templates
          */
-        apiPackage = "io.swagger.client.api";
+        apiPackage = "org.openapitools.client.api";
 
         /**
          * Model Package.  Optional, if needed, this can be used in templates
          */
-        modelPackage = "io.swagger.client.model";
+        modelPackage = "org.openapitools.client.model";
 
         /**
          * Additional Properties.  These values can be passed to the templates and
@@ -305,9 +305,9 @@ public void preprocessOpenAPI(OpenAPI openAPI) {
     /**
      * Creates all the necessary openapi vendor extensions and feeder files for gatling
      *
-     * @param operation     Swagger Operation
-     * @param parameters    Swagger Parameters
-     * @param parameterType Swagger Parameter Type
+     * @param operation     OpoenAPI Operation
+     * @param parameters    OpenAPI Parameters
+     * @param parameterType OpenAPI Parameter Type
      */
     private void prepareGatlingData(Operation operation, Set<Parameter> parameters, String parameterType) {
         if (parameters.size() > 0) {

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/StaticHtml2Generator.java

@@ -50,8 +50,8 @@ public class StaticHtml2Generator extends DefaultCodegen implements CodegenConfi
     protected String artifactVersion = "1.0.0";
     protected String jsProjectName;
     protected String jsModuleName;
-    protected String perlModuleName = "WWW::SwaggerClient";
-    protected String pythonPackageName = "swagger_client";
+    protected String perlModuleName = "WWW::OPenAPIClient";
+    protected String pythonPackageName = "openapi_client";
 
     public StaticHtml2Generator() {
         super();
@@ -77,8 +77,8 @@ public StaticHtml2Generator() {
 
         additionalProperties.put("appName", "OpenAPI Sample");
         additionalProperties.put("appDescription", "A sample openapi server");
-        additionalProperties.put("infoUrl", "https://helloreverb.com");
-        additionalProperties.put("infoEmail", "hello@helloreverb.com");
+        additionalProperties.put("infoUrl", "https://openapi-generator.tech");
+        additionalProperties.put("infoEmail", "contributors@openapitools.org");
         additionalProperties.put("licenseInfo", "All rights reserved");
         additionalProperties.put("licenseUrl", "http://apache.org/licenses/LICENSE-2.0.html");
         additionalProperties.put(CodegenConstants.INVOKER_PACKAGE, invokerPackage);
@@ -161,7 +161,7 @@ public void preprocessOpenAPI(OpenAPI openAPI) {
 
         // default values
         if (StringUtils.isBlank(jsProjectName)) {
-            jsProjectName = "swagger-js-client";
+            jsProjectName = "openapi-js-client";
         }
         if (StringUtils.isBlank(jsModuleName)) {
             jsModuleName = camelize(underscore(jsProjectName));

samples/client/petstore/powershell/Build.ps1

@@ -38,7 +38,7 @@ function Get-FunctionsToExport {
 }
 
 $ScriptDir = Split-Path $script:MyInvocation.MyCommand.Path
-$ClientPath = ("$ScriptDir\..\..\petstore\csharp\SwaggerClient" | Resolve-Path).ProviderPath
+$ClientPath = ("$ScriptDir\..\..\petstore\csharp\OpenAPIClient" | Resolve-Path).ProviderPath
 $FunctionPath = 'API', 'Model' | ForEach-Object {Join-Path "$ScriptDir\src\Org.OpenAPITools\" $_}
 $BinPath = "$ScriptDir\src\Org.OpenAPITools\Bin"
 

samples/client/petstore/powershell/README.md

@@ -14,7 +14,7 @@ This PowerShell module is automatically generated by the [OpenAPI Generator](htt
 
 <a name="dependencies"></a>
 ## Dependencies
-- C# API client generated by OpenAPI Generator AND should be located in $ScriptDir\..\..\petstore\csharp\SwaggerClient as stated in Build.ps1
+- C# API client generated by OpenAPI Generator AND should be located in $ScriptDir\..\..\petstore\csharp\OpenAPIClient as stated in Build.ps1
 
 <a name="installation"></a>
 ## Installation

samples/client/petstore/scala-gatling/.openapi-generator/VERSION

@@ -1 +1 @@
-2.4.0-SNAPSHOT
+3.0.0-SNAPSHOT

samples/client/petstore/scala-gatling/build.gradle

@@ -1,5 +1,5 @@
 plugins {
-    id 'com.github.lkishalmi.gatling' version '0.4.1'
+    id 'com.github.lkishalmi.gatling' version '0.7.1'
 }
 
 repositories {

samples/client/petstore/scala-gatling/src/gatling/scala/io/swagger/client/api/PetApiSimulation.scala samples/client/petstore/scala-gatling/src/gatling/scala/org/openapitools/client/api/PetApiSimulation.scala

@@ -1,6 +1,6 @@
-package io.swagger.client.api
+package org.openapitools.client.api
 
-import io.swagger.client.model._
+import org.openapitools.client.model._
 import com.typesafe.config.ConfigFactory
 
 import io.gatling.core.Predef._
@@ -68,27 +68,21 @@ class PetApiSimulation extends Simulation {
     val scenarioBuilders: mutable.MutableList[PopulationBuilder] = new mutable.MutableList[PopulationBuilder]()
 
     // Set up CSV feeders
-    val addPetBodyFeeder = csv(userDataDirectory + File.separator + "addPet-bodyParams.csv", escapeChar = '\\').random
     val deletePetHEADERFeeder = csv(userDataDirectory + File.separator + "deletePet-headerParams.csv").random
     val deletePetPATHFeeder = csv(userDataDirectory + File.separator + "deletePet-pathParams.csv").random
     val findPetsByStatusQUERYFeeder = csv(userDataDirectory + File.separator + "findPetsByStatus-queryParams.csv").random
     val findPetsByTagsQUERYFeeder = csv(userDataDirectory + File.separator + "findPetsByTags-queryParams.csv").random
     val getPetByIdPATHFeeder = csv(userDataDirectory + File.separator + "getPetById-pathParams.csv").random
-    val updatePetBodyFeeder = csv(userDataDirectory + File.separator + "updatePet-bodyParams.csv", escapeChar = '\\').random
-    val updatePetWithFormFORMFeeder = csv(userDataDirectory + File.separator + "updatePetWithForm-formParams.csv").random
     val updatePetWithFormPATHFeeder = csv(userDataDirectory + File.separator + "updatePetWithForm-pathParams.csv").random
-    val uploadFileFORMFeeder = csv(userDataDirectory + File.separator + "uploadFile-formParams.csv").random
     val uploadFilePATHFeeder = csv(userDataDirectory + File.separator + "uploadFile-pathParams.csv").random
 
     // Setup all scenarios
 
 
     val scnaddPet = scenario("addPetSimulation")
-        .feed(addPetBodyFeeder)
         .exec(http("addPet")
         .httpRequest("POST","/pet")
-        .body(StringBody(Pet.toStringBody("${id}","${category}","${name}","${tags}","${status}","${photoUrls}")))
-        )
+)
 
     // Run scnaddPet with warm up and reach a constant rate for entire duration
     scenarioBuilders += scnaddPet.inject(
@@ -159,11 +153,9 @@ class PetApiSimulation extends Simulation {
 
 
     val scnupdatePet = scenario("updatePetSimulation")
-        .feed(updatePetBodyFeeder)
         .exec(http("updatePet")
         .httpRequest("PUT","/pet")
-        .body(StringBody(Pet.toStringBody("${id}","${category}","${name}","${tags}","${status}","${photoUrls}")))
-        )
+)
 
     // Run scnupdatePet with warm up and reach a constant rate for entire duration
     scenarioBuilders += scnupdatePet.inject(
@@ -174,12 +166,9 @@ class PetApiSimulation extends Simulation {
 
 
     val scnupdatePetWithForm = scenario("updatePetWithFormSimulation")
-        .feed(updatePetWithFormFORMFeeder)
         .feed(updatePetWithFormPATHFeeder)
         .exec(http("updatePetWithForm")
         .httpRequest("POST","/pet/${petId}")
-        .formParam("name","${name}")
-        .formParam("status","${status}")
 )
 
     // Run scnupdatePetWithForm with warm up and reach a constant rate for entire duration
@@ -191,12 +180,9 @@ class PetApiSimulation extends Simulation {
 
 
     val scnuploadFile = scenario("uploadFileSimulation")
-        .feed(uploadFileFORMFeeder)
         .feed(uploadFilePATHFeeder)
         .exec(http("uploadFile")
         .httpRequest("POST","/pet/${petId}/uploadImage")
-        .formParam("file","${file}")
-        .formParam("additionalMetadata","${additionalMetadata}")
 )
 
     // Run scnuploadFile with warm up and reach a constant rate for entire duration

samples/client/petstore/scala-gatling/src/gatling/scala/io/swagger/client/api/StoreApiSimulation.scala samples/client/petstore/scala-gatling/src/gatling/scala/org/openapitools/client/api/StoreApiSimulation.scala

@@ -1,6 +1,6 @@
-package io.swagger.client.api
+package org.openapitools.client.api
 
-import io.swagger.client.model._
+import org.openapitools.client.model._
 import com.typesafe.config.ConfigFactory
 
 import io.gatling.core.Predef._
@@ -66,7 +66,6 @@ class StoreApiSimulation extends Simulation {
     // Set up CSV feeders
     val deleteOrderPATHFeeder = csv(userDataDirectory + File.separator + "deleteOrder-pathParams.csv").random
     val getOrderByIdPATHFeeder = csv(userDataDirectory + File.separator + "getOrderById-pathParams.csv").random
-    val placeOrderBodyFeeder = csv(userDataDirectory + File.separator + "placeOrder-bodyParams.csv", escapeChar = '\\').random
 
     // Setup all scenarios
 
@@ -113,11 +112,9 @@ class StoreApiSimulation extends Simulation {
 
 
     val scnplaceOrder = scenario("placeOrderSimulation")
-        .feed(placeOrderBodyFeeder)
         .exec(http("placeOrder")
         .httpRequest("POST","/store/order")
-        .body(StringBody(Order.toStringBody("${id}","${shipDate}","${complete}","${quantity}","${status}","${petId}")))
-        )
+)
 
     // Run scnplaceOrder with warm up and reach a constant rate for entire duration
     scenarioBuilders += scnplaceOrder.inject(

samples/client/petstore/scala-gatling/src/gatling/scala/io/swagger/client/api/UserApiSimulation.scala samples/client/petstore/scala-gatling/src/gatling/scala/org/openapitools/client/api/UserApiSimulation.scala

@@ -1,6 +1,6 @@
-package io.swagger.client.api
+package org.openapitools.client.api
 
-import io.swagger.client.model._
+import org.openapitools.client.model._
 import com.typesafe.config.ConfigFactory
 
 import io.gatling.core.Predef._
@@ -68,22 +68,18 @@ class UserApiSimulation extends Simulation {
     val scenarioBuilders: mutable.MutableList[PopulationBuilder] = new mutable.MutableList[PopulationBuilder]()
 
     // Set up CSV feeders
-    val createUserBodyFeeder = csv(userDataDirectory + File.separator + "createUser-bodyParams.csv", escapeChar = '\\').random
     val deleteUserPATHFeeder = csv(userDataDirectory + File.separator + "deleteUser-pathParams.csv").random
     val getUserByNamePATHFeeder = csv(userDataDirectory + File.separator + "getUserByName-pathParams.csv").random
     val loginUserQUERYFeeder = csv(userDataDirectory + File.separator + "loginUser-queryParams.csv").random
     val updateUserPATHFeeder = csv(userDataDirectory + File.separator + "updateUser-pathParams.csv").random
-    val updateUserBodyFeeder = csv(userDataDirectory + File.separator + "updateUser-bodyParams.csv", escapeChar = '\\').random
 
     // Setup all scenarios
 
 
     val scncreateUser = scenario("createUserSimulation")
-        .feed(createUserBodyFeeder)
         .exec(http("createUser")
         .httpRequest("POST","/user")
-        .body(StringBody(User.toStringBody("${password}","${id}","${lastName}","${firstName}","${email}","${userStatus}","${phone}","${username}")))
-        )
+)
 
     // Run scncreateUser with warm up and reach a constant rate for entire duration
     scenarioBuilders += scncreateUser.inject(
@@ -96,8 +92,7 @@ class UserApiSimulation extends Simulation {
     val scncreateUsersWithArrayInput = scenario("createUsersWithArrayInputSimulation")
         .exec(http("createUsersWithArrayInput")
         .httpRequest("POST","/user/createWithArray")
-        .body(StringBody(StringBody("[]")))
-        )
+)
 
     // Run scncreateUsersWithArrayInput with warm up and reach a constant rate for entire duration
     scenarioBuilders += scncreateUsersWithArrayInput.inject(
@@ -110,8 +105,7 @@ class UserApiSimulation extends Simulation {
     val scncreateUsersWithListInput = scenario("createUsersWithListInputSimulation")
         .exec(http("createUsersWithListInput")
         .httpRequest("POST","/user/createWithList")
-        .body(StringBody(StringBody("[]")))
-        )
+)
 
     // Run scncreateUsersWithListInput with warm up and reach a constant rate for entire duration
     scenarioBuilders += scncreateUsersWithListInput.inject(
@@ -179,12 +173,10 @@ class UserApiSimulation extends Simulation {
 
 
     val scnupdateUser = scenario("updateUserSimulation")
-        .feed(updateUserBodyFeeder)
         .feed(updateUserPATHFeeder)
         .exec(http("updateUser")
         .httpRequest("PUT","/user/${username}")
-        .body(StringBody(User.toStringBody("${password}","${id}","${lastName}","${firstName}","${email}","${userStatus}","${phone}","${username}")))
-        )
+)
 
     // Run scnupdateUser with warm up and reach a constant rate for entire duration
     scenarioBuilders += scnupdateUser.inject(

samples/client/petstore/scala-gatling/src/gatling/scala/io/swagger/client/model/ApiResponse.scala samples/client/petstore/scala-gatling/src/gatling/scala/org/openapitools/client/model/ApiResponse.scala

@@ -1,5 +1,5 @@
 
-package io.swagger.client.model
+package org.openapitools.client.model
 
 
 case class ApiResponse (

samples/client/petstore/scala-gatling/src/gatling/scala/io/swagger/client/model/Category.scala samples/client/petstore/scala-gatling/src/gatling/scala/org/openapitools/client/model/Category.scala

@@ -1,5 +1,5 @@
 
-package io.swagger.client.model
+package org.openapitools.client.model
 
 
 case class Category (

samples/client/petstore/scala-gatling/src/gatling/scala/io/swagger/client/model/Order.scala samples/client/petstore/scala-gatling/src/gatling/scala/org/openapitools/client/model/Order.scala

@@ -1,5 +1,5 @@
 
-package io.swagger.client.model
+package org.openapitools.client.model
 
 import java.util.Date
 

samples/client/petstore/scala-gatling/src/gatling/scala/io/swagger/client/model/Pet.scala samples/client/petstore/scala-gatling/src/gatling/scala/org/openapitools/client/model/Pet.scala

@@ -1,5 +1,5 @@
 
-package io.swagger.client.model
+package org.openapitools.client.model
 
 
 case class Pet (

samples/client/petstore/scala-gatling/src/gatling/scala/io/swagger/client/model/Tag.scala samples/client/petstore/scala-gatling/src/gatling/scala/org/openapitools/client/model/Tag.scala

@@ -1,5 +1,5 @@
 
-package io.swagger.client.model
+package org.openapitools.client.model
 
 
 case class Tag (

samples/client/petstore/scala-gatling/src/gatling/scala/io/swagger/client/model/User.scala samples/client/petstore/scala-gatling/src/gatling/scala/org/openapitools/client/model/User.scala

@@ -1,5 +1,5 @@
 
-package io.swagger.client.model
+package org.openapitools.client.model
 
 
 case class User (