Schema support for std::unordered_set (microsoft#6634)

achamayou · Nov 13, 2024 · 2eb532a · 2eb532a
1 parent ff1ec38
commit 2eb532a
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -12,6 +12,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 ### Added
 
 - Added a `ccf::any_cert_auth_policy` (C++), or `any_cert` (JS/TS), implementing TLS client certificate authentication, but without checking for the presence of the certificate in the governance user or member tables. This enables applications wanting to do so to perform user management in application space, using application tables (#6608).
+- Added OpenAPI support for `std::unordered_set`.
 
 ## [6.0.0-dev5]
 

diff --git a/include/ccf/ds/json_schema.h b/include/ccf/ds/json_schema.h
@@ -9,6 +9,7 @@
 #include <fmt/format.h>
 #include <nlohmann/json.hpp>
 #include <set>
+#include <unordered_set>
 
 namespace ccf::ds
 {
@@ -113,7 +114,9 @@ namespace ccf::ds
           return fmt::format("{}_array", schema_name<typename T::value_type>());
         }
       }
-      else if constexpr (ccf::nonstd::is_specialization<T, std::set>::value)
+      else if constexpr (
+        ccf::nonstd::is_specialization<T, std::set>::value ||
+        ccf::nonstd::is_specialization<T, std::unordered_set>::value)
       {
         return fmt::format("{}_set", schema_name<typename T::value_type>());
       }
@@ -204,7 +207,8 @@ namespace ccf::ds
       }
       else if constexpr (
         ccf::nonstd::is_specialization<T, std::vector>::value ||
-        ccf::nonstd::is_specialization<T, std::set>::value)
+        ccf::nonstd::is_specialization<T, std::set>::value ||
+        ccf::nonstd::is_specialization<T, std::unordered_set>::value)
       {
         if constexpr (std::is_same<T, std::vector<uint8_t>>::value)
         {

diff --git a/include/ccf/ds/openapi.h b/include/ccf/ds/openapi.h
@@ -12,6 +12,7 @@
 #include <regex>
 #include <set>
 #include <string_view>
+#include <unordered_set>
 
 namespace ccf::ds
 {
@@ -281,7 +282,8 @@ namespace ccf::ds
         }
         else if constexpr (
           ccf::nonstd::is_specialization<T, std::vector>::value ||
-          ccf::nonstd::is_specialization<T, std::set>::value)
+          ccf::nonstd::is_specialization<T, std::set>::value ||
+          ccf::nonstd::is_specialization<T, std::unordered_set>::value)
         {
           if constexpr (std::is_same<T, std::vector<uint8_t>>::value)
           {

diff --git a/src/ds/test/openapi.cpp b/src/ds/test/openapi.cpp
@@ -160,6 +160,8 @@ TEST_CASE("Complex custom types")
     doc, "/app/complex", HTTP_POST);
   openapi::add_response_schema<std::map<Baz, std::vector<Buzz>>>(
     doc, "/app/complex", HTTP_POST, HTTP_STATUS_OK);
+  openapi::add_response_schema<std::unordered_set<Baz>>(
+    doc, "/app/complex", HTTP_POST, HTTP_STATUS_OK);
 
   required_doc_elements(doc);
 }