From bce0eb6c8fcf4de9c108c8e7076497b03f48a973 Mon Sep 17 00:00:00 2001
From: William Cheng <wing328hk@gmail.com>
Date: Mon, 8 Mar 2021 21:35:04 +0800
Subject: [PATCH] fix header parameter naming (#8861)

---
 .../src/main/resources/jmeter-client/api.mustache           | 2 +-
 samples/client/petstore/jmeter/.openapi-generator/FILES     | 6 ++++++
 samples/client/petstore/jmeter/.openapi-generator/VERSION   | 2 +-
 samples/client/petstore/jmeter/PetApi.jmx                   | 2 +-
 4 files changed, 9 insertions(+), 3 deletions(-)
 create mode 100644 samples/client/petstore/jmeter/.openapi-generator/FILES

diff --git a/modules/openapi-generator/src/main/resources/jmeter-client/api.mustache b/modules/openapi-generator/src/main/resources/jmeter-client/api.mustache
index 1717071e100..8a92846c5c1 100644
--- a/modules/openapi-generator/src/main/resources/jmeter-client/api.mustache
+++ b/modules/openapi-generator/src/main/resources/jmeter-client/api.mustache
@@ -83,7 +83,7 @@
         <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
           <collectionProp name="HeaderManager.headers">{{#headerParams}}
             <elementProp name="" elementType="Header">
-              <stringProp name="Header.name">{{paramName}}</stringProp>
+              <stringProp name="Header.name">{{baseName}}</stringProp>
               <stringProp name="Header.value">${__RandomString(10,qwertyuiopasdfghjklzxcvbnm)}</stringProp>
             </elementProp>{{/headerParams}}{{#consumes.0}}
             <elementProp name="" elementType="Header">
diff --git a/samples/client/petstore/jmeter/.openapi-generator/FILES b/samples/client/petstore/jmeter/.openapi-generator/FILES
new file mode 100644
index 00000000000..87541f4daaa
--- /dev/null
+++ b/samples/client/petstore/jmeter/.openapi-generator/FILES
@@ -0,0 +1,6 @@
+PetApi.csv
+PetApi.jmx
+StoreApi.csv
+StoreApi.jmx
+UserApi.csv
+UserApi.jmx
diff --git a/samples/client/petstore/jmeter/.openapi-generator/VERSION b/samples/client/petstore/jmeter/.openapi-generator/VERSION
index 82602aa4190..c30f0ec2be7 100644
--- a/samples/client/petstore/jmeter/.openapi-generator/VERSION
+++ b/samples/client/petstore/jmeter/.openapi-generator/VERSION
@@ -1 +1 @@
-3.0.3-SNAPSHOT
\ No newline at end of file
+5.1.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/jmeter/PetApi.jmx b/samples/client/petstore/jmeter/PetApi.jmx
index 6fdef6ad04e..fa9c1963bed 100644
--- a/samples/client/petstore/jmeter/PetApi.jmx
+++ b/samples/client/petstore/jmeter/PetApi.jmx
@@ -198,7 +198,7 @@
         <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
           <collectionProp name="HeaderManager.headers">
             <elementProp name="" elementType="Header">
-              <stringProp name="Header.name">apiKey</stringProp>
+              <stringProp name="Header.name">api_key</stringProp>
               <stringProp name="Header.value">${__RandomString(10,qwertyuiopasdfghjklzxcvbnm)}</stringProp>
             </elementProp>
             <elementProp name="" elementType="Header">