From d914dc2b45ab52577f64fa2247046fa4eafdfa1b Mon Sep 17 00:00:00 2001
From: "akihito.nakano" <sora.akatsuki@gmail.com>
Date: Sun, 24 Jun 2018 13:35:41 +0900
Subject: [PATCH 1/3] Rename JMeter client generator class name
---
.../{JMeterCodegen.java => JMeterClientCodegen.java} | 6 +++---
.../services/org.openapitools.codegen.CodegenConfig | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
rename modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/{JMeterCodegen.java => JMeterClientCodegen.java} (97%)
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JMeterCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JMeterClientCodegen.java
similarity index 97%
rename from modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JMeterCodegen.java
rename to modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JMeterClientCodegen.java
index a4b35051bdd..77776f01a6c 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JMeterCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JMeterClientCodegen.java
@@ -30,7 +30,7 @@ import io.swagger.v3.oas.models.info.Info;
import java.util.*;
import java.io.File;
-public class JMeterCodegen extends DefaultCodegen implements CodegenConfig {
+public class JMeterClientCodegen extends DefaultCodegen implements CodegenConfig {
// source folder where to write the files
protected String sourceFolder = "";
@@ -69,11 +69,11 @@ public class JMeterCodegen extends DefaultCodegen implements CodegenConfig {
return "Generates a JMeter .jmx file.";
}
- public JMeterCodegen() {
+ public JMeterClientCodegen() {
super();
// set the output folder here
- outputFolder = "generated-code/JMeterCodegen";
+ outputFolder = "generated-code/JMeterClientCodegen";
/*
* Api classes. You can write classes for each Api file with the apiTemplateFiles map.
diff --git a/modules/openapi-generator/src/main/resources/META-INF/services/org.openapitools.codegen.CodegenConfig b/modules/openapi-generator/src/main/resources/META-INF/services/org.openapitools.codegen.CodegenConfig
index 85e298d431d..c4dddcc515a 100644
--- a/modules/openapi-generator/src/main/resources/META-INF/services/org.openapitools.codegen.CodegenConfig
+++ b/modules/openapi-generator/src/main/resources/META-INF/services/org.openapitools.codegen.CodegenConfig
@@ -46,7 +46,7 @@ org.openapitools.codegen.languages.JavaResteasyEapServerCodegen
org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen
org.openapitools.codegen.languages.JavascriptClientCodegen
org.openapitools.codegen.languages.JavascriptClosureAngularClientCodegen
-org.openapitools.codegen.languages.JMeterCodegen
+org.openapitools.codegen.languages.JMeterClientCodegen
org.openapitools.codegen.languages.LuaClientCodegen
org.openapitools.codegen.languages.NodeJSServerCodegen
org.openapitools.codegen.languages.ObjcClientCodegen
--
GitLab
From 33e1c42dd2979f28b6b565cd093dc19016309da1 Mon Sep 17 00:00:00 2001
From: "akihito.nakano" <sora.akatsuki@gmail.com>
Date: Sun, 24 Jun 2018 13:39:34 +0900
Subject: [PATCH 2/3] Rename jmeter template folder
---
.../codegen/languages/JMeterClientCodegen.java | 7 +------
.../main/resources/{JMeter => jmeter-client}/api.mustache | 0
.../{JMeter => jmeter-client}/testdata-localhost.mustache | 0
3 files changed, 1 insertion(+), 6 deletions(-)
rename modules/openapi-generator/src/main/resources/{JMeter => jmeter-client}/api.mustache (100%)
rename modules/openapi-generator/src/main/resources/{JMeter => jmeter-client}/testdata-localhost.mustache (100%)
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JMeterClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JMeterClientCodegen.java
index 77776f01a6c..830e5b06ade 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JMeterClientCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JMeterClientCodegen.java
@@ -19,13 +19,8 @@ package org.openapitools.codegen.languages;
import org.openapitools.codegen.*;
import org.openapitools.codegen.utils.*;
-import org.openapitools.codegen.mustache.*;
-import io.swagger.v3.oas.models.security.SecurityScheme;
import io.swagger.v3.oas.models.*;
import io.swagger.v3.oas.models.media.*;
-import io.swagger.v3.oas.models.responses.ApiResponse;
-import io.swagger.v3.oas.models.parameters.*;
-import io.swagger.v3.oas.models.info.Info;
import java.util.*;
import java.io.File;
@@ -90,7 +85,7 @@ public class JMeterClientCodegen extends DefaultCodegen implements CodegenConfig
* Template Location. This is the location which templates will be read from. The generator
* will use the resource stream to attempt to read the templates.
*/
- embeddedTemplateDir = templateDir = "JMeter";
+ embeddedTemplateDir = templateDir = "jmeter-client";
/*
* Api Package. Optional, if needed, this can be used in templates
diff --git a/modules/openapi-generator/src/main/resources/JMeter/api.mustache b/modules/openapi-generator/src/main/resources/jmeter-client/api.mustache
similarity index 100%
rename from modules/openapi-generator/src/main/resources/JMeter/api.mustache
rename to modules/openapi-generator/src/main/resources/jmeter-client/api.mustache
diff --git a/modules/openapi-generator/src/main/resources/JMeter/testdata-localhost.mustache b/modules/openapi-generator/src/main/resources/jmeter-client/testdata-localhost.mustache
similarity index 100%
rename from modules/openapi-generator/src/main/resources/JMeter/testdata-localhost.mustache
rename to modules/openapi-generator/src/main/resources/jmeter-client/testdata-localhost.mustache
--
GitLab
From 491d2aaba4e69b95ceb772390447747cf2184316 Mon Sep 17 00:00:00 2001
From: "akihito.nakano" <sora.akatsuki@gmail.com>
Date: Sun, 24 Jun 2018 13:40:06 +0900
Subject: [PATCH 3/3] Update samples
---
samples/client/petstore/jmeter/.openapi-generator/VERSION | 2 +-
samples/client/petstore/jmeter/PetApi.csv | 2 +-
samples/client/petstore/jmeter/StoreApi.csv | 2 +-
samples/client/petstore/jmeter/UserApi.csv | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/samples/client/petstore/jmeter/.openapi-generator/VERSION b/samples/client/petstore/jmeter/.openapi-generator/VERSION
index 7fea99011a6..82602aa4190 100644
--- a/samples/client/petstore/jmeter/.openapi-generator/VERSION
+++ b/samples/client/petstore/jmeter/.openapi-generator/VERSION
@@ -1 +1 @@
-2.2.3-SNAPSHOT
\ No newline at end of file
+3.0.3-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/jmeter/PetApi.csv b/samples/client/petstore/jmeter/PetApi.csv
index 29b09a1715d..2ab795b50f7 100644
--- a/samples/client/petstore/jmeter/PetApi.csv
+++ b/samples/client/petstore/jmeter/PetApi.csv
@@ -1,2 +1,2 @@
-testCase,httpStatusCode,body,petId,apiKey,status,tags,petId,body,petId,name,status,petId,additionalMetadata,file
+testCase,httpStatusCode,pet,petId,apiKey,status,tags,petId,pet,petId,name,status,petId,additionalMetadata,file
Success,200,0,0,0,0,0,0,0,0,0,0,0,0,0
\ No newline at end of file
diff --git a/samples/client/petstore/jmeter/StoreApi.csv b/samples/client/petstore/jmeter/StoreApi.csv
index 70fd54e2b20..2ccf8884aff 100644
--- a/samples/client/petstore/jmeter/StoreApi.csv
+++ b/samples/client/petstore/jmeter/StoreApi.csv
@@ -1,2 +1,2 @@
-testCase,httpStatusCode,orderId,orderId,body
+testCase,httpStatusCode,orderId,orderId,order
Success,200,0,0,0
\ No newline at end of file
diff --git a/samples/client/petstore/jmeter/UserApi.csv b/samples/client/petstore/jmeter/UserApi.csv
index 92242d4077c..66fcc84a590 100644
--- a/samples/client/petstore/jmeter/UserApi.csv
+++ b/samples/client/petstore/jmeter/UserApi.csv
@@ -1,2 +1,2 @@
-testCase,httpStatusCode,body,body,body,username,username,username,password,username,body
+testCase,httpStatusCode,user,user,user,username,username,username,password,username,user
Success,200,0,0,0,0,0,0,0,0,0
\ No newline at end of file
--
GitLab