[cpp-rest-sdk]: handle trailing commas for vector/map

aminya · aminya · commit 008c12c051ec · 2025-06-04T22:57:13.000-07:00
diff --git a/modules/openapi-generator/src/main/resources/cpp-rest-sdk-client/apiclient-header.mustache b/modules/openapi-generator/src/main/resources/cpp-rest-sdk-client/apiclient-header.mustache
@@ -87,10 +87,15 @@ utility::string_t ApiClient::parameterToString(const std::vector<T>& value)
 {
     utility::stringstream_t ss;
 
-    for( size_t i = 0; i < value.size(); i++)
+    bool isFirst = true;
+    for(const auto& item : value)
     {
-        if( i > 0) ss << utility::conversions::to_string_t(", ");
-        ss << ApiClient::parameterToString(value[i]);
+        if (!isFirst) {
+            ss << utility::conversions::to_string_t(", ");
+        } else {
+            isFirst = false;
+        }
+        ss << ApiClient::parameterToString(item);
     }
 
     return ss.str();
@@ -101,9 +106,15 @@ utility::string_t ApiClient::parameterToString(const std::map<T, U>& value)
 {
     utility::stringstream_t ss;
     ss << "{";
+    bool isFirst = true;
     for(const auto& pair : value)
     {
-        ss << ApiClient::parameterToString(pair.first) << ": " << ApiClient::parameterToString(pair.second) << ", ";
+        if (!isFirst) {
+            ss << ", ";
+        } else {
+            isFirst = false;
+        }
+        ss << ApiClient::parameterToString(pair.first) << ": " << ApiClient::parameterToString(pair.second);
     }
     ss << "}";
     return ss.str();
diff --git a/samples/client/petstore/cpp-restsdk/client/include/CppRestPetstoreClient/ApiClient.h b/samples/client/petstore/cpp-restsdk/client/include/CppRestPetstoreClient/ApiClient.h
@@ -94,10 +94,15 @@ utility::string_t ApiClient::parameterToString(const std::vector<T>& value)
 {
     utility::stringstream_t ss;
 
-    for( size_t i = 0; i < value.size(); i++)
+    bool isFirst = true;
+    for(const auto& item : value)
     {
-        if( i > 0) ss << utility::conversions::to_string_t(", ");
-        ss << ApiClient::parameterToString(value[i]);
+        if (!isFirst) {
+            ss << utility::conversions::to_string_t(", ");
+        } else {
+            isFirst = false;
+        }
+        ss << ApiClient::parameterToString(item);
     }
 
     return ss.str();
@@ -108,9 +113,15 @@ utility::string_t ApiClient::parameterToString(const std::map<T, U>& value)
 {
     utility::stringstream_t ss;
     ss << "{";
+    bool isFirst = true;
     for(const auto& pair : value)
     {
-        ss << ApiClient::parameterToString(pair.first) << ": " << ApiClient::parameterToString(pair.second) << ", ";
+        if (!isFirst) {
+            ss << ", ";
+        } else {
+            isFirst = false;
+        }
+        ss << ApiClient::parameterToString(pair.first) << ": " << ApiClient::parameterToString(pair.second);
     }
     ss << "}";
     return ss.str();

Original file line number	Diff line number	Diff line change
`@@ -87,10 +87,15 @@ utility::string_t ApiClient::parameterToString(const std::vector<T>& value)`
`87`	`87`	`{`
`88`	`88`	`utility::stringstream_t ss;`
`89`	`89`
`90`		`- for( size_t i = 0; i < value.size(); i++)`
	`90`	`+ bool isFirst = true;`
	`91`	`+ for(const auto& item : value)`
`91`	`92`	`{`
`92`		`- if( i > 0) ss << utility::conversions::to_string_t(", ");`
`93`		`- ss << ApiClient::parameterToString(value[i]);`
	`93`	`+ if (!isFirst) {`
	`94`	`+ ss << utility::conversions::to_string_t(", ");`
	`95`	`+ } else {`
	`96`	`+ isFirst = false;`
	`97`	`+ }`
	`98`	`+ ss << ApiClient::parameterToString(item);`
`94`	`99`	`}`
`95`	`100`
`96`	`101`	`return ss.str();`
`@@ -101,9 +106,15 @@ utility::string_t ApiClient::parameterToString(const std::map<T, U>& value)`
`101`	`106`	`{`
`102`	`107`	`utility::stringstream_t ss;`
`103`	`108`	`ss << "{";`
	`109`	`+ bool isFirst = true;`
`104`	`110`	`for(const auto& pair : value)`
`105`	`111`	`{`
`106`		`- ss << ApiClient::parameterToString(pair.first) << ": " << ApiClient::parameterToString(pair.second) << ", ";`
	`112`	`+ if (!isFirst) {`
	`113`	`+ ss << ", ";`
	`114`	`+ } else {`
	`115`	`+ isFirst = false;`
	`116`	`+ }`
	`117`	`+ ss << ApiClient::parameterToString(pair.first) << ": " << ApiClient::parameterToString(pair.second);`
`107`	`118`	`}`
`108`	`119`	`ss << "}";`
`109`	`120`	`return ss.str();`
Original file line number	Diff line number	Diff line change
`@@ -94,10 +94,15 @@ utility::string_t ApiClient::parameterToString(const std::vector<T>& value)`
`94`	`94`	`{`
`95`	`95`	`utility::stringstream_t ss;`
`96`	`96`
`97`		`- for( size_t i = 0; i < value.size(); i++)`
	`97`	`+ bool isFirst = true;`
	`98`	`+ for(const auto& item : value)`
`98`	`99`	`{`
`99`		`- if( i > 0) ss << utility::conversions::to_string_t(", ");`
`100`		`- ss << ApiClient::parameterToString(value[i]);`
	`100`	`+ if (!isFirst) {`
	`101`	`+ ss << utility::conversions::to_string_t(", ");`
	`102`	`+ } else {`
	`103`	`+ isFirst = false;`
	`104`	`+ }`
	`105`	`+ ss << ApiClient::parameterToString(item);`
`101`	`106`	`}`
`102`	`107`
`103`	`108`	`return ss.str();`
`@@ -108,9 +113,15 @@ utility::string_t ApiClient::parameterToString(const std::map<T, U>& value)`
`108`	`113`	`{`
`109`	`114`	`utility::stringstream_t ss;`
`110`	`115`	`ss << "{";`
	`116`	`+ bool isFirst = true;`
`111`	`117`	`for(const auto& pair : value)`
`112`	`118`	`{`
`113`		`- ss << ApiClient::parameterToString(pair.first) << ": " << ApiClient::parameterToString(pair.second) << ", ";`
	`119`	`+ if (!isFirst) {`
	`120`	`+ ss << ", ";`
	`121`	`+ } else {`
	`122`	`+ isFirst = false;`
	`123`	`+ }`
	`124`	`+ ss << ApiClient::parameterToString(pair.first) << ": " << ApiClient::parameterToString(pair.second);`
`114`	`125`	`}`
`115`	`126`	`ss << "}";`
`116`	`127`	`return ss.str();`