From 795d685d9ce6c1fe09a044d958cbb7234b0c93fa Mon Sep 17 00:00:00 2001
From: Thomas Farr <tsfarr@amazon.com>
Date: Tue, 11 Feb 2025 13:24:46 +1300
Subject: [PATCH] Fix camel case query string param naming

Signed-off-by: Thomas Farr <tsfarr@amazon.com>
---
 src/ApiGenerator/Configuration/Overrides/GlobalOverrides.cs | 1 +
 src/ApiGenerator/Domain/ApiRequestParametersPatcher.cs      | 2 +-
 .../Api/RequestParameters/RequestParameters.Ism.cs          | 2 +-
 .../RequestParameters/RequestParameters.Observability.cs    | 4 ++--
 .../Api/RequestParameters/RequestParameters.Sm.cs           | 6 +++---
 .../Api/RequestParameters/RequestParameters.Transforms.cs   | 4 ++--
 6 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/ApiGenerator/Configuration/Overrides/GlobalOverrides.cs b/src/ApiGenerator/Configuration/Overrides/GlobalOverrides.cs
index c7df1b0a46..e931be708e 100644
--- a/src/ApiGenerator/Configuration/Overrides/GlobalOverrides.cs
+++ b/src/ApiGenerator/Configuration/Overrides/GlobalOverrides.cs
@@ -56,6 +56,7 @@ private GlobalOverrides() { }
             { "rest_total_hits_as_int", "total_hits_as_integer" },
             { "docvalue_fields", "doc_value_fields" },
             { "q", "query_on_query_string" },
+            { "queryString", "query_string_param" },
             //make cat parameters more descriptive
             { "h", "Headers" },
             { "s", "sort_by_columns" },
diff --git a/src/ApiGenerator/Domain/ApiRequestParametersPatcher.cs b/src/ApiGenerator/Domain/ApiRequestParametersPatcher.cs
index 94eba43012..f5967a79dc 100644
--- a/src/ApiGenerator/Domain/ApiRequestParametersPatcher.cs
+++ b/src/ApiGenerator/Domain/ApiRequestParametersPatcher.cs
@@ -97,7 +97,7 @@ private static string CreateCSharpName(string queryStringKey, string endpointNam
             if (queryStringKey == "format" && endpointName == "text_structure.find_structure")
                 return "TextStructureFindStructureFormat";
 
-			return queryStringKey.ToPascalCase();
+			return queryStringKey.SplitPascalCase().ToPascalCase();
 		}
 
         private static IList<string> CreateSkipList(IEndpointOverrides local, ICollection<string> declaredKeys) =>
diff --git a/src/OpenSearch.Net/_Generated/Api/RequestParameters/RequestParameters.Ism.cs b/src/OpenSearch.Net/_Generated/Api/RequestParameters/RequestParameters.Ism.cs
index 28d4dbbb6e..749eb7542e 100644
--- a/src/OpenSearch.Net/_Generated/Api/RequestParameters/RequestParameters.Ism.cs
+++ b/src/OpenSearch.Net/_Generated/Api/RequestParameters/RequestParameters.Ism.cs
@@ -140,7 +140,7 @@ public long? IfSequenceNumber
             get => Q<long?>("if_seq_no");
             set => Q("if_seq_no", value);
         }
-        public string Policyid
+        public string PolicyId
         {
             get => Q<string>("policyID");
             set => Q("policyID", value);
diff --git a/src/OpenSearch.Net/_Generated/Api/RequestParameters/RequestParameters.Observability.cs b/src/OpenSearch.Net/_Generated/Api/RequestParameters/RequestParameters.Observability.cs
index aa0d8d2a78..a0081bfde1 100644
--- a/src/OpenSearch.Net/_Generated/Api/RequestParameters/RequestParameters.Observability.cs
+++ b/src/OpenSearch.Net/_Generated/Api/RequestParameters/RequestParameters.Observability.cs
@@ -76,14 +76,14 @@ public partial class DeleteObjectsRequestParameters
         public override bool SupportsBody => false;
 
         /// <summary>The ID of a single Observability Object to delete.</summary>
-        public string Objectid
+        public string ObjectId
         {
             get => Q<string>("objectId");
             set => Q("objectId", value);
         }
 
         /// <summary>A comma-separated list of Observability Object IDs to delete.</summary>
-        public string Objectidlist
+        public string ObjectIdList
         {
             get => Q<string>("objectIdList");
             set => Q("objectIdList", value);
diff --git a/src/OpenSearch.Net/_Generated/Api/RequestParameters/RequestParameters.Sm.cs b/src/OpenSearch.Net/_Generated/Api/RequestParameters/RequestParameters.Sm.cs
index 37609b5de4..1bf913b240 100644
--- a/src/OpenSearch.Net/_Generated/Api/RequestParameters/RequestParameters.Sm.cs
+++ b/src/OpenSearch.Net/_Generated/Api/RequestParameters/RequestParameters.Sm.cs
@@ -91,7 +91,7 @@ public int? From
         }
 
         /// <summary>A query string to filter policies.</summary>
-        public string Querystring
+        public string QueryStringParam
         {
             get => Q<string>("queryString");
             set => Q("queryString", value);
@@ -105,14 +105,14 @@ public int? Size
         }
 
         /// <summary>The field to sort on.</summary>
-        public string Sortfield
+        public string SortField
         {
             get => Q<string>("sortField");
             set => Q("sortField", value);
         }
 
         /// <summary>The order of sorting.</summary>
-        public string Sortorder
+        public string SortOrder
         {
             get => Q<string>("sortOrder");
             set => Q("sortOrder", value);
diff --git a/src/OpenSearch.Net/_Generated/Api/RequestParameters/RequestParameters.Transforms.cs b/src/OpenSearch.Net/_Generated/Api/RequestParameters/RequestParameters.Transforms.cs
index 479192958b..f9774e5204 100644
--- a/src/OpenSearch.Net/_Generated/Api/RequestParameters/RequestParameters.Transforms.cs
+++ b/src/OpenSearch.Net/_Generated/Api/RequestParameters/RequestParameters.Transforms.cs
@@ -115,14 +115,14 @@ public string Search
         }
 
         /// <summary>Specifies the direction to sort results in. Can be `ASC` or `DESC`. Default is `ASC`.</summary>
-        public string Sortdirection
+        public string SortDirection
         {
             get => Q<string>("sortDirection");
             set => Q("sortDirection", value);
         }
 
         /// <summary>The field to sort results with.</summary>
-        public string Sortfield
+        public string SortField
         {
             get => Q<string>("sortField");
             set => Q("sortField", value);